clipboard: fix reliability of modal/popout

* fix: add TrayRecoveryService with bidirectional SNI dedup (Go server)

Add TrayRecoveryService manager that re-registers lost tray icons after
resume from suspend via native DBus scanning in the Go server.

The service resolves every registered SNI item (both well-known names and
:1.xxx connection IDs) to a canonical connection ID, building a unified
registeredConnIDs set before either scan section runs. This prevents
duplicates in both directions:

- If an app registered via well-known name, the connection-ID section
  skips its :1.xxx entry.
- If an app registered via connection ID, the well-known-name section
  skips its well-known name (checked through registeredConnIDs).
- After successfully registering via well-known name, registeredConnIDs
  is updated immediately so the connection-ID section won't probe the
  same app in the same run.

A startup scan (3 s delay) covers the common case where the DMS process
is killed during suspend and restarted by systemd (Type=dbus), so the
loginctl PrepareForSleep watcher alone is not sufficient. The startup
scan is harmless on a normal boot — it finds all items already registered
and exits early.

Go port of quickshell commit 1470aa3.

* fix: 'interface{}' can be replaced by 'any'

* TrayRecoveryService: Remove objPath parameter from registerSNI

core/cmd/dms/commands_clipboard.go

@@ -53,6 +53,7 @@ var (
 	clipCopyPasteOnce  bool
 	clipCopyType       string
 	clipCopyDownload   bool
+	clipCopyCacheFile  string
 	clipJSONOutput     bool
 )
 
@@ -191,6 +192,8 @@ func init() {
 	clipCopyCmd.Flags().BoolVarP(&clipCopyPasteOnce, "paste-once", "o", false, "Exit after first paste")
 	clipCopyCmd.Flags().StringVarP(&clipCopyType, "type", "t", "text/plain;charset=utf-8", "MIME type")
 	clipCopyCmd.Flags().BoolVarP(&clipCopyDownload, "download", "d", false, "Download URL as image and copy as file")
+	clipCopyCmd.Flags().StringVar(&clipCopyCacheFile, "cache-file", "", "")
+	clipCopyCmd.Flags().MarkHidden("cache-file")
 
 	clipWatchCmd.Flags().BoolVar(&clipJSONOutput, "json", false, "Output as JSON")
 	clipHistoryCmd.Flags().BoolVar(&clipJSONOutput, "json", false, "Output as JSON")
@@ -221,6 +224,13 @@ func init() {
 }
 
 func runClipCopy(cmd *cobra.Command, args []string) {
+	if clipCopyCacheFile != "" {
+		if err := clipboard.ServeCacheFile(clipCopyCacheFile, clipCopyType, clipCopyPasteOnce); err != nil {
+			log.Fatalf("serve cache file: %v", err)
+		}
+		return
+	}
+
 	var data []byte
 	copyFromStdin := false
 

core/cmd/dms/commands_features.go

@@ -109,16 +109,41 @@ func updateArchLinux() error {
 	}
 
 	var packageName string
-	if isArchPackageInstalled("dms-shell-bin") {
-		packageName = "dms-shell-bin"
+	var isAUR bool
+	if isArchPackageInstalled("dms-shell") {
+		packageName = "dms-shell"
 	} else if isArchPackageInstalled("dms-shell-git") {
 		packageName = "dms-shell-git"
+		isAUR = true
+	} else if isArchPackageInstalled("dms-shell-bin") {
+		packageName = "dms-shell-bin"
+		isAUR = true
 	} else {
-		fmt.Println("Info: Neither dms-shell-bin nor dms-shell-git package found.")
+		fmt.Println("Info: No dms-shell package found.")
 		fmt.Println("Info: Falling back to git-based update method...")
 		return updateOtherDistros()
 	}
 
+	if !isAUR {
+		fmt.Printf("This will update %s using pacman.\n", packageName)
+		if !confirmUpdate() {
+			return errdefs.ErrUpdateCancelled
+		}
+
+		fmt.Printf("\nRunning: sudo pacman -S %s\n", packageName)
+		cmd := exec.Command("sudo", "pacman", "-S", "--noconfirm", packageName)
+		cmd.Stdin = os.Stdin
+		cmd.Stdout = os.Stdout
+		cmd.Stderr = os.Stderr
+		if err := cmd.Run(); err != nil {
+			fmt.Printf("Error: Failed to update using pacman: %v\n", err)
+			return err
+		}
+
+		fmt.Println("dms successfully updated")
+		return nil
+	}
+
 	var helper string
 	var updateCmd *exec.Cmd
 

core/internal/clipboard/clipboard.go

@@ -1,7 +1,6 @@
 package clipboard
 
 import (
-	"bytes"
 	"fmt"
 	"io"
 	"os"
@@ -14,7 +13,7 @@ import (
 )
 
 func Copy(data []byte, mimeType string) error {
-	return CopyReader(bytes.NewReader(data), mimeType, false, false)
+	return copyForkCached(data, mimeType, false)
 }
 
 func CopyOpts(data []byte, mimeType string, foreground, pasteOnce bool) error {
@@ -34,7 +33,7 @@ func CopyOpts(data []byte, mimeType string, foreground, pasteOnce bool) error {
 			return nil
 		}, mimeType, pasteOnce)
 	}
-	return CopyReader(bytes.NewReader(data), mimeType, foreground, pasteOnce)
+	return copyForkCached(data, mimeType, pasteOnce)
 }
 
 func CopyReader(data io.Reader, mimeType string, foreground, pasteOnce bool) error {
@@ -44,6 +43,53 @@ func CopyReader(data io.Reader, mimeType string, foreground, pasteOnce bool) err
 	return copyServeReader(data, mimeType, pasteOnce)
 }
 
+func copyForkCached(data []byte, mimeType string, pasteOnce bool) error {
+	cacheFile, err := createClipboardCacheFile()
+	if err != nil {
+		return fmt.Errorf("create cache file: %w", err)
+	}
+	cachePath := cacheFile.Name()
+
+	if _, err := cacheFile.Write(data); err != nil {
+		cacheFile.Close()
+		os.Remove(cachePath)
+		return fmt.Errorf("write cache file: %w", err)
+	}
+	if err := cacheFile.Close(); err != nil {
+		os.Remove(cachePath)
+		return fmt.Errorf("close cache file: %w", err)
+	}
+
+	args := []string{os.Args[0], "cl", "copy", "--foreground", "--cache-file", cachePath}
+	if pasteOnce {
+		args = append(args, "--paste-once")
+	}
+	args = append(args, "--type", mimeType)
+
+	cmd := exec.Command(args[0], args[1:]...)
+	cmd.Stdin = nil
+	cmd.Stderr = nil
+	cmd.SysProcAttr = &syscall.SysProcAttr{Setsid: true}
+	cmd.Env = append(os.Environ(), "DMS_CLIP_FORKED=1")
+
+	stdout, err := cmd.StdoutPipe()
+	if err != nil {
+		os.Remove(cachePath)
+		return fmt.Errorf("stdout pipe: %w", err)
+	}
+
+	if err := cmd.Start(); err != nil {
+		os.Remove(cachePath)
+		return fmt.Errorf("start: %w", err)
+	}
+
+	var buf [1]byte
+	if _, err := stdout.Read(buf[:]); err != nil {
+		return fmt.Errorf("waiting for clipboard ready: %w", err)
+	}
+	return nil
+}
+
 func copyFork(data io.Reader, mimeType string, pasteOnce bool) error {
 	args := []string{os.Args[0], "cl", "copy", "--foreground"}
 	if pasteOnce {
@@ -99,6 +145,19 @@ func signalReady() {
 	os.Stdout.Write([]byte{1})
 }
 
+func ServeCacheFile(path, mimeType string, pasteOnce bool) error {
+	defer os.Remove(path)
+	return copyServeWithWriter(func(writer io.Writer) error {
+		f, err := os.Open(path)
+		if err != nil {
+			return fmt.Errorf("open cache file: %w", err)
+		}
+		defer f.Close()
+		_, err = io.Copy(writer, f)
+		return err
+	}, mimeType, pasteOnce)
+}
+
 func copyServeReader(data io.Reader, mimeType string, pasteOnce bool) error {
 	cachedData, err := createClipboardCacheFile()
 	if err != nil {

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

@@ -137,7 +137,7 @@ bind = SUPER, bracketright, layoutmsg, preselect r
 
 # === Sizing & Layout ===
 bind = SUPER, R, layoutmsg, togglesplit
-bind = SUPER CTRL, F, resizeactive, exact 100%
+bind = SUPER CTRL, F, resizeactive, exact 100% 100%
 
 # === Move/resize windows with mainMod + LMB/RMB and dragging ===
 bindmd = SUPER, mouse:272, Move window, movewindow

core/internal/config/embedded/hyprland.conf

@@ -94,6 +94,7 @@ windowrule = tile on, match:class ^(gnome-control-center)$
 windowrule = tile on, match:class ^(pavucontrol)$
 windowrule = tile on, match:class ^(nm-connection-editor)$
 
+windowrule = float on, match:class ^(org\.gnome\.Calculator)$
 windowrule = float on, match:class ^(gnome-calculator)$
 windowrule = float on, match:class ^(galculator)$
 windowrule = float on, match:class ^(blueman-manager)$

core/internal/config/embedded/niri.kdl

@@ -224,6 +224,7 @@ window-rule {
     open-floating false
 }
 window-rule {
+    match app-id=r#"^org\.gnome\.Calculator$"#
     match app-id=r#"^gnome-calculator$"#
     match app-id=r#"^galculator$"#
     match app-id=r#"^blueman-manager$"#

core/internal/distros/arch.go

@@ -242,11 +242,7 @@ func (a *ArchDistribution) getDMSMapping(variant deps.PackageVariant) PackageMap
 		return PackageMapping{Name: "dms-shell-git", Repository: RepoTypeAUR}
 	}
 
-	if a.packageInstalled("dms-shell-bin") {
-		return PackageMapping{Name: "dms-shell-bin", Repository: RepoTypeAUR}
-	}
-
-	return PackageMapping{Name: "dms-shell-bin", Repository: RepoTypeAUR}
+	return PackageMapping{Name: "dms-shell", Repository: RepoTypeSystem}
 }
 
 func (a *ArchDistribution) detectXwaylandSatellite() deps.Dependency {
@@ -540,7 +536,7 @@ func (a *ArchDistribution) reorderAURPackages(packages []string) []string {
 	var dmsShell []string
 
 	for _, pkg := range packages {
-		if pkg == "dms-shell-git" || pkg == "dms-shell-bin" {
+		if pkg == "dms-shell-git" {
 			dmsShell = append(dmsShell, pkg)
 		} else {
 			isDep := false
@@ -621,7 +617,7 @@ func (a *ArchDistribution) installSingleAURPackageInternal(ctx context.Context,
 		}
 	}
 
-	if pkg == "dms-shell-git" || pkg == "dms-shell-bin" {
+	if pkg == "dms-shell-git" {
 		srcinfoPath := filepath.Join(packageDir, ".SRCINFO")
 		depsToRemove := []string{
 			"depends = quickshell",
@@ -644,15 +640,7 @@ func (a *ArchDistribution) installSingleAURPackageInternal(ctx context.Context,
 	}
 
 	srcinfoPath = filepath.Join(packageDir, ".SRCINFO")
-	if pkg == "dms-shell-bin" {
-		progressChan <- InstallProgressMsg{
-			Phase:      PhaseAURPackages,
-			Progress:   startProgress + 0.35*(endProgress-startProgress),
-			Step:       fmt.Sprintf("Skipping dependency installation for %s (manually managed)...", pkg),
-			IsComplete: false,
-			LogOutput:  fmt.Sprintf("Dependencies for %s are installed separately", pkg),
-		}
-	} else {
+	{
 		progressChan <- InstallProgressMsg{
 			Phase:       PhaseAURPackages,
 			Progress:    startProgress + 0.3*(endProgress-startProgress),
@@ -739,42 +727,9 @@ func (a *ArchDistribution) installSingleAURPackageInternal(ctx context.Context,
 		CommandInfo: "sudo pacman -U built-package",
 	}
 
-	// Find .pkg.tar* files - for split packages, install the base and any installed compositor variants
 	var files []string
-	if pkg == "dms-shell-git" || pkg == "dms-shell-bin" {
-		// For DMS split packages, install base package
-		pattern := filepath.Join(packageDir, fmt.Sprintf("%s-%s*.pkg.tar*", pkg, "*"))
-		matches, err := filepath.Glob(pattern)
-		if err == nil {
-			for _, match := range matches {
-				basename := filepath.Base(match)
-				// Always include base package
-				if !strings.Contains(basename, "hyprland") && !strings.Contains(basename, "niri") {
-					files = append(files, match)
-				}
-			}
-		}
-
-		// Also update compositor-specific packages if they're installed
-		if strings.HasSuffix(pkg, "-git") {
-			if a.packageInstalled("dms-shell-hyprland-git") {
-				hyprlandPattern := filepath.Join(packageDir, "dms-shell-hyprland-git-*.pkg.tar*")
-				if hyprlandMatches, err := filepath.Glob(hyprlandPattern); err == nil && len(hyprlandMatches) > 0 {
-					files = append(files, hyprlandMatches[0])
-				}
-			}
-			if a.packageInstalled("dms-shell-niri-git") {
-				niriPattern := filepath.Join(packageDir, "dms-shell-niri-git-*.pkg.tar*")
-				if niriMatches, err := filepath.Glob(niriPattern); err == nil && len(niriMatches) > 0 {
-					files = append(files, niriMatches[0])
-				}
-			}
-		}
-	} else {
-		// For other packages, install all built packages
-		matches, _ := filepath.Glob(filepath.Join(packageDir, "*.pkg.tar*"))
-		files = matches
-	}
+	matches, _ := filepath.Glob(filepath.Join(packageDir, "*.pkg.tar*"))
+	files = matches
 
 	if len(files) == 0 {
 		return fmt.Errorf("no package files found after building %s", pkg)

core/internal/server/server.go

@@ -31,6 +31,7 @@ import (
 	"github.com/AvengeMedia/DankMaterialShell/core/internal/server/models"
 	"github.com/AvengeMedia/DankMaterialShell/core/internal/server/network"
 	"github.com/AvengeMedia/DankMaterialShell/core/internal/server/thememode"
+	"github.com/AvengeMedia/DankMaterialShell/core/internal/server/trayrecovery"
 	"github.com/AvengeMedia/DankMaterialShell/core/internal/server/wayland"
 	"github.com/AvengeMedia/DankMaterialShell/core/internal/server/wlcontext"
 	"github.com/AvengeMedia/DankMaterialShell/core/internal/server/wlroutput"
@@ -72,6 +73,7 @@ var clipboardManager *clipboard.Manager
 var dbusManager *serverDbus.Manager
 var wlContext *wlcontext.SharedContext
 var themeModeManager *thememode.Manager
+var trayRecoveryManager *trayrecovery.Manager
 var locationManager *location.Manager
 var geoClientInstance geolocation.Client
 
@@ -394,6 +396,18 @@ func InitializeThemeModeManager() error {
 	return nil
 }
 
+func InitializeTrayRecoveryManager() error {
+	manager, err := trayrecovery.NewManager()
+	if err != nil {
+		return err
+	}
+
+	trayRecoveryManager = manager
+
+	log.Info("TrayRecovery manager initialized")
+	return nil
+}
+
 func InitializeLocationManager(geoClient geolocation.Client) error {
 	manager, err := location.NewManager(geoClient)
 	if err != nil {
@@ -1325,6 +1339,9 @@ func cleanupManagers() {
 	if themeModeManager != nil {
 		themeModeManager.Close()
 	}
+	if trayRecoveryManager != nil {
+		trayRecoveryManager.Close()
+	}
 	if wlContext != nil {
 		wlContext.Close()
 	}
@@ -1610,6 +1627,18 @@ func Start(printDocs bool) error {
 		}()
 	}
 
+	go func() {
+		<-loginctlReady
+		if loginctlManager == nil {
+			return
+		}
+		if err := InitializeTrayRecoveryManager(); err != nil {
+			log.Warnf("TrayRecovery manager unavailable: %v", err)
+		} else {
+			trayRecoveryManager.WatchLoginctl(loginctlManager)
+		}
+	}()
+
 	go func() {
 		geoClient := geolocation.NewClient()
 		geoClientInstance = geoClient

core/internal/server/trayrecovery/manager.go

@@ -0,0 +1,93 @@
+package trayrecovery
+
+import (
+	"fmt"
+	"sync"
+	"time"
+
+	"github.com/AvengeMedia/DankMaterialShell/core/internal/log"
+	"github.com/AvengeMedia/DankMaterialShell/core/internal/server/loginctl"
+	"github.com/godbus/dbus/v5"
+)
+
+const resumeDelay = 3 * time.Second
+
+type Manager struct {
+	conn     *dbus.Conn
+	stopChan chan struct{}
+	wg       sync.WaitGroup
+}
+
+func NewManager() (*Manager, error) {
+	conn, err := dbus.ConnectSessionBus()
+	if err != nil {
+		return nil, fmt.Errorf("failed to connect to session bus: %w", err)
+	}
+
+	m := &Manager{
+		conn:     conn,
+		stopChan: make(chan struct{}),
+	}
+
+	// Run a startup scan after a delay — covers the case where the process
+	// was killed during suspend and restarted by systemd (Type=dbus).
+	// The fresh process never sees the PrepareForSleep true→false transition,
+	// so the loginctl watcher alone is not enough.
+	go m.scheduleRecovery()
+
+	return m, nil
+}
+
+// WatchLoginctl subscribes to loginctl session state changes and triggers
+// tray recovery after resume from suspend (PrepareForSleep false transition).
+// This handles the case where the process survives suspend.
+func (m *Manager) WatchLoginctl(lm *loginctl.Manager) {
+	ch := lm.Subscribe("tray-recovery")
+	m.wg.Add(1)
+	go func() {
+		defer m.wg.Done()
+		defer lm.Unsubscribe("tray-recovery")
+
+		wasSleeping := false
+		for {
+			select {
+			case <-m.stopChan:
+				return
+			case state, ok := <-ch:
+				if !ok {
+					return
+				}
+				if state.PreparingForSleep {
+					wasSleeping = true
+					continue
+				}
+				if wasSleeping {
+					wasSleeping = false
+					go m.scheduleRecovery()
+				}
+			}
+		}
+	}()
+}
+
+func (m *Manager) scheduleRecovery() {
+	select {
+	case <-time.After(resumeDelay):
+		m.recoverTrayItems()
+	case <-m.stopChan:
+	}
+}
+
+func (m *Manager) Close() {
+	select {
+	case <-m.stopChan:
+		return
+	default:
+		close(m.stopChan)
+	}
+	m.wg.Wait()
+	if m.conn != nil {
+		m.conn.Close()
+	}
+	log.Info("TrayRecovery manager closed")
+}

core/internal/server/trayrecovery/recovery.go

@@ -0,0 +1,262 @@
+package trayrecovery
+
+import (
+	"context"
+	"strings"
+	"sync"
+	"time"
+
+	"github.com/AvengeMedia/DankMaterialShell/core/internal/log"
+	"github.com/godbus/dbus/v5"
+)
+
+const (
+	sniWatcherDest   = "org.kde.StatusNotifierWatcher"
+	sniWatcherPath   = "/StatusNotifierWatcher"
+	sniWatcherIface  = "org.kde.StatusNotifierWatcher"
+	sniItemIface     = "org.kde.StatusNotifierItem"
+	dbusIface        = "org.freedesktop.DBus"
+	propsIface       = "org.freedesktop.DBus.Properties"
+	probeTimeout     = 300 * time.Millisecond
+	connProbeTimeout = 150 * time.Millisecond
+	batchSize        = 30
+)
+
+var excludedPrefixes = []string{
+	"org.freedesktop.",
+	"org.gnome.",
+	"org.kde.StatusNotifier",
+	"com.canonical.AppMenu",
+	"org.mpris.",
+	"org.pipewire.",
+	"org.pulseaudio",
+	"fi.epitaph",
+	"quickshell",
+	"org.kde.quickshell",
+}
+
+func (m *Manager) recoverTrayItems() {
+	registeredItems := m.getRegisteredItems()
+	allNames := m.getDBusNames()
+	if allNames == nil {
+		return
+	}
+
+	registeredConnIDs := m.buildRegisteredConnIDs(registeredItems)
+
+	count := len(registeredItems)
+	log.Infof("TrayRecoveryService: scanning DBus for unregistered SNI items (%d already registered)...", count)
+
+	m.scanWellKnownNames(allNames, registeredItems, registeredConnIDs)
+	m.scanConnectionIDs(allNames, registeredItems, registeredConnIDs)
+}
+
+func (m *Manager) getRegisteredItems() []string {
+	obj := m.conn.Object(sniWatcherDest, sniWatcherPath)
+	variant, err := obj.GetProperty(sniWatcherIface + ".RegisteredStatusNotifierItems")
+	if err != nil {
+		log.Warnf("TrayRecoveryService: failed to get registered items: %v", err)
+		return nil
+	}
+
+	switch v := variant.Value().(type) {
+	case []string:
+		return v
+	case []any:
+		items := make([]string, 0, len(v))
+		for _, elem := range v {
+			if s, ok := elem.(string); ok {
+				items = append(items, s)
+			}
+		}
+		return items
+	}
+	return nil
+}
+
+func (m *Manager) getDBusNames() []string {
+	var names []string
+	err := m.conn.BusObject().Call(dbusIface+".ListNames", 0).Store(&names)
+	if err != nil {
+		log.Warnf("TrayRecoveryService: failed to list bus names: %v", err)
+		return nil
+	}
+	return names
+}
+
+func (m *Manager) getNameOwner(name string) string {
+	var owner string
+	err := m.conn.BusObject().Call(dbusIface+".GetNameOwner", 0, name).Store(&owner)
+	if err != nil {
+		return ""
+	}
+	return owner
+}
+
+// buildRegisteredConnIDs resolves every registered SNI item (well-known name
+// or :1.xxx connection ID) to a canonical connection ID. This prevents
+// duplicates in both directions.
+func (m *Manager) buildRegisteredConnIDs(registeredItems []string) map[string]bool {
+	connIDs := make(map[string]bool, len(registeredItems))
+	for _, item := range registeredItems {
+		name := extractName(item)
+		if strings.HasPrefix(name, ":1.") {
+			connIDs[name] = true
+		} else {
+			owner := m.getNameOwner(name)
+			if owner != "" {
+				connIDs[owner] = true
+			}
+		}
+	}
+	return connIDs
+}
+
+// scanWellKnownNames probes well-known names (e.g. DinoX, nm-applet) for
+// unregistered SNI items and re-registers them.
+func (m *Manager) scanWellKnownNames(allNames []string, registeredItems []string, registeredConnIDs map[string]bool) {
+	registeredRaw := strings.Join(registeredItems, "\n")
+
+	for _, name := range allNames {
+		if strings.HasPrefix(name, ":") {
+			continue
+		}
+
+		if strings.Contains(registeredRaw, name) {
+			continue
+		}
+
+		// Skip if this name's connection ID is already in the registered set
+		// (handles the case where the app registered via connection ID instead)
+		connForName := m.getNameOwner(name)
+		if connForName != "" && registeredConnIDs[connForName] {
+			continue
+		}
+
+		if isExcludedName(name) {
+			continue
+		}
+
+		short := shortName(name)
+		objectPaths := []string{
+			"/StatusNotifierItem",
+			"/org/ayatana/NotificationItem/" + short,
+		}
+
+		for _, objPath := range objectPaths {
+			if m.probeSNI(name, objPath, probeTimeout) {
+				m.registerSNI(name)
+				// Update set so the connection-ID section won't double-register this app
+				if connForName != "" {
+					registeredConnIDs[connForName] = true
+				}
+				break
+			}
+		}
+	}
+}
+
+// scanConnectionIDs probes all :1.xxx connections in parallel for unregistered
+// SNI items (e.g. Vesktop, Electron apps). Most non-SNI connections return an
+// error instantly, so this is fast.
+func (m *Manager) scanConnectionIDs(allNames []string, registeredItems []string, registeredConnIDs map[string]bool) {
+	registeredRaw := strings.Join(registeredItems, "\n")
+	registeredLower := strings.ToLower(registeredRaw)
+
+	var wg sync.WaitGroup
+	sem := make(chan struct{}, batchSize)
+
+	for _, name := range allNames {
+		if !strings.HasPrefix(name, ":1.") {
+			continue
+		}
+		if registeredConnIDs[name] {
+			continue
+		}
+
+		sem <- struct{}{}
+		wg.Add(1)
+		go func(conn string) {
+			defer wg.Done()
+			defer func() { <-sem }()
+
+			sniID := m.getSNIId(conn, connProbeTimeout)
+			if sniID == "" {
+				return
+			}
+
+			// Skip if an item with the same Id is already registered (case-insensitive)
+			if strings.Contains(registeredLower, strings.ToLower(sniID)) {
+				return
+			}
+
+			m.registerSNI(conn)
+			log.Infof("TrayRecovery: re-registered %s (Id: %s)", conn, sniID)
+		}(name)
+	}
+	wg.Wait()
+}
+
+func (m *Manager) probeSNI(dest, path string, timeout time.Duration) bool {
+	ctx, cancel := context.WithTimeout(context.Background(), timeout)
+	defer cancel()
+
+	obj := m.conn.Object(dest, dbus.ObjectPath(path))
+	var props map[string]dbus.Variant
+	err := obj.CallWithContext(ctx, propsIface+".GetAll", 0, sniItemIface).Store(&props)
+	if err != nil {
+		return false
+	}
+
+	_, hasID := props["Id"]
+	return hasID
+}
+
+func (m *Manager) getSNIId(dest string, timeout time.Duration) string {
+	ctx, cancel := context.WithTimeout(context.Background(), timeout)
+	defer cancel()
+
+	obj := m.conn.Object(dest, "/StatusNotifierItem")
+	var variant dbus.Variant
+	err := obj.CallWithContext(ctx, propsIface+".Get", 0, sniItemIface, "Id").Store(&variant)
+	if err != nil {
+		return ""
+	}
+
+	id, _ := variant.Value().(string)
+	return id
+}
+
+func (m *Manager) registerSNI(name string) {
+	obj := m.conn.Object(sniWatcherDest, sniWatcherPath)
+	call := obj.Call(sniWatcherIface+".RegisterStatusNotifierItem", 0, name)
+	if call.Err != nil {
+		log.Warnf("TrayRecovery: failed to register %s: %v", name, call.Err)
+		return
+	}
+	log.Infof("TrayRecovery: re-registered %s", name)
+}
+
+func extractName(item string) string {
+	if idx := strings.IndexByte(item, '/'); idx != -1 {
+		return item[:idx]
+	}
+	return item
+}
+
+func shortName(name string) string {
+	parts := strings.Split(name, ".")
+	if len(parts) > 0 {
+		return parts[len(parts)-1]
+	}
+	return name
+}
+
+func isExcludedName(name string) bool {
+	for _, prefix := range excludedPrefixes {
+		if strings.HasPrefix(name, prefix) {
+			return true
+		}
+	}
+	return false
+}

core/internal/tui/views_install.go

@@ -139,7 +139,7 @@ func dmsPackageName(distroID string, dependencies []deps.Dependency) string {
 		if isGit {
 			return "dms-shell-git"
 		}
-		return "dms-shell-bin"
+		return "dms-shell"
 	case distros.FamilyFedora, distros.FamilyUbuntu, distros.FamilyDebian, distros.FamilySUSE:
 		if isGit {
 			return "dms-git"

quickshell/Common/SettingsData.qml

@@ -14,7 +14,7 @@ import "settings/SettingsStore.js" as Store
 Singleton {
     id: root
 
-    readonly property int settingsConfigVersion: 11
+    readonly property int settingsConfigVersion: 5
 
     readonly property bool isGreeterMode: Quickshell.env("DMS_RUN_GREETER") === "1" || Quickshell.env("DMS_RUN_GREETER") === "true"
 
@@ -186,7 +186,6 @@ Singleton {
     onPopoutElevationEnabledChanged: saveSettings()
     property bool barElevationEnabled: true
     onBarElevationEnabledChanged: saveSettings()
-
     property bool blurEnabled: false
     onBlurEnabledChanged: saveSettings()
     property string blurBorderColor: "outline"
@@ -199,33 +198,6 @@ Singleton {
     property bool blurredWallpaperLayer: false
     property bool blurWallpaperOnOverview: false
 
-    property bool frameEnabled: false
-    onFrameEnabledChanged: saveSettings()
-    property real frameThickness: 16
-    onFrameThicknessChanged: saveSettings()
-    property real frameRounding: 23
-    onFrameRoundingChanged: saveSettings()
-    property string frameColor: ""
-    onFrameColorChanged: saveSettings()
-    property real frameOpacity: 1.0
-    onFrameOpacityChanged: saveSettings()
-    property var frameScreenPreferences: ["all"]
-    onFrameScreenPreferencesChanged: saveSettings()
-    property real frameBarSize: 40
-    onFrameBarSizeChanged: saveSettings()
-    property bool frameShowOnOverview: false
-    onFrameShowOnOverviewChanged: saveSettings()
-    property bool frameBlurEnabled: true
-    onFrameBlurEnabledChanged: saveSettings()
-
-    readonly property color effectiveFrameColor: {
-        const fc = frameColor;
-        if (!fc || fc === "default") return Theme.surfaceContainer;
-        if (fc === "primary") return Theme.primary;
-        if (fc === "surface") return Theme.surface;
-        return fc;
-    }
-
     property bool showLauncherButton: true
     property bool showWorkspaceSwitcher: true
     property bool showFocusedWindow: true
@@ -1966,66 +1938,6 @@ Singleton {
         return filtered;
     }
 
-    function getFrameFilteredScreens() {
-        var prefs = frameScreenPreferences || ["all"];
-        if (!prefs || prefs.length === 0 || prefs.includes("all")) {
-            return Quickshell.screens;
-        }
-        return Quickshell.screens.filter(screen => isScreenInPreferences(screen, prefs));
-    }
-
-    function getActiveBarEdgeForScreen(screen) {
-        if (!screen) return "";
-        for (var i = 0; i < barConfigs.length; i++) {
-            var bc = barConfigs[i];
-            if (!bc.enabled) continue;
-            var prefs = bc.screenPreferences || ["all"];
-            if (!prefs.includes("all") && !isScreenInPreferences(screen, prefs)) continue;
-            switch (bc.position ?? 0) {
-            case SettingsData.Position.Top:    return "top";
-            case SettingsData.Position.Bottom: return "bottom";
-            case SettingsData.Position.Left:   return "left";
-            case SettingsData.Position.Right:  return "right";
-            }
-        }
-        return "";
-    }
-
-    function getActiveBarEdgesForScreen(screen) {
-        if (!screen) return [];
-        var edges = [];
-        for (var i = 0; i < barConfigs.length; i++) {
-            var bc = barConfigs[i];
-            if (!bc.enabled) continue;
-            var prefs = bc.screenPreferences || ["all"];
-            if (!prefs.includes("all") && !isScreenInPreferences(screen, prefs)) continue;
-            switch (bc.position ?? 0) {
-            case SettingsData.Position.Top:    edges.push("top"); break;
-            case SettingsData.Position.Bottom: edges.push("bottom"); break;
-            case SettingsData.Position.Left:   edges.push("left"); break;
-            case SettingsData.Position.Right:  edges.push("right"); break;
-            }
-        }
-        return edges;
-    }
-
-    function getActiveBarThicknessForScreen(screen) {
-        if (frameEnabled) return frameBarSize;
-        if (!screen) return frameThickness;
-        for (var i = 0; i < barConfigs.length; i++) {
-            var bc = barConfigs[i];
-            if (!bc.enabled) continue;
-            var prefs = bc.screenPreferences || ["all"];
-            if (!prefs.includes("all") && !isScreenInPreferences(screen, prefs)) continue;
-            const innerPadding = bc.innerPadding ?? 4;
-            const barT = Math.max(26 + innerPadding * 0.6, Theme.barHeight - 4 - (8 - innerPadding));
-            const spacing = bc.spacing ?? 4;
-            const bottomGap = bc.bottomGap ?? 0;
-            return barT + spacing + bottomGap;
-        }
-        return frameThickness;
-    }
-
     function sendTestNotifications() {
         NotificationService.dismissAllPopups();
         sendTestNotification(0);

quickshell/Common/settings/SettingsSpec.js

@@ -547,17 +547,7 @@ var SPEC = {
     clipboardEnterToPaste: { def: false },
 
     launcherPluginVisibility: { def: {} },
-    launcherPluginOrder: { def: [] },
-
-    frameEnabled: { def: false },
-    frameThickness: { def: 16 },
-    frameRounding: { def: 23 },
-    frameColor: { def: "" },
-    frameOpacity: { def: 1.0 },
-    frameScreenPreferences: { def: ["all"] },
-    frameBarSize: { def: 40 },
-    frameShowOnOverview: { def: false },
-    frameBlurEnabled: { def: true }
+    launcherPluginOrder: { def: [] }
 };
 
 function getValidKeys() {

quickshell/Common/settings/SettingsStore.js

@@ -248,10 +248,6 @@ function migrateToVersion(obj, targetVersion) {
         settings.configVersion = 6;
     }
 
-    if (currentVersion < 11) {
-        settings.configVersion = 11;
-    }
-
     return settings;
 }
 

quickshell/DMSShell.qml

@@ -21,7 +21,6 @@ import qs.Modules.OSD
 import qs.Modules.ProcessList
 import qs.Modules.DankBar
 import qs.Modules.DankBar.Popouts
-import qs.Modules.Frame
 import qs.Modules.WorkspaceOverlays
 import qs.Services
 
@@ -177,8 +176,6 @@ Item {
         }
     }
 
-    Frame {}
-
     Repeater {
         id: dankBarRepeater
         model: ScriptModel {

quickshell/DMSShellIPC.qml

@@ -369,9 +369,7 @@ Item {
         }
 
         function previous(): void {
-            if (MprisController.activePlayer && MprisController.activePlayer.canGoPrevious) {
-                MprisController.activePlayer.previous();
-            }
+            MprisController.previousOrRewind();
         }
 
         function next(): void {

quickshell/Modals/Clipboard/ClipboardContent.qml

@@ -122,7 +122,7 @@ Item {
             }
 
             StyledText {
-                text: I18n.tr("No recent clipboard entries found")
+                text: clipboardContent.modal.clipboardAvailable ? I18n.tr("No recent clipboard entries found") : I18n.tr("Connecting to clipboard service…")
                 anchors.centerIn: parent
                 font.pixelSize: Theme.fontSizeMedium
                 color: Theme.surfaceVariantText
@@ -181,7 +181,7 @@ Item {
             }
 
             StyledText {
-                text: I18n.tr("No saved clipboard entries")
+                text: clipboardContent.modal.clipboardAvailable ? I18n.tr("No saved clipboard entries") : I18n.tr("Connecting to clipboard service…")
                 anchors.centerIn: parent
                 font.pixelSize: Theme.fontSizeMedium
                 color: Theme.surfaceVariantText

quickshell/Modals/Clipboard/ClipboardHistoryModal.qml

@@ -60,15 +60,12 @@ DankModal {
     }
 
     function show() {
-        if (!clipboardAvailable) {
-            ToastService.showError(I18n.tr("Clipboard service not available"));
-            return;
-        }
         open();
         activeImageLoads = 0;
         shouldHaveFocus = true;
         ClipboardService.reset();
-        ClipboardService.refresh();
+        if (clipboardAvailable)
+            ClipboardService.refresh();
         keyboardController.reset();
 
         Qt.callLater(function () {

quickshell/Modals/Clipboard/ClipboardHistoryPopout.qml

@@ -50,14 +50,11 @@ DankPopout {
     }
 
     function show() {
-        if (!clipboardAvailable) {
-            ToastService.showError(I18n.tr("Clipboard service not available"));
-            return;
-        }
         open();
         activeImageLoads = 0;
         ClipboardService.reset();
-        ClipboardService.refresh();
+        if (clipboardAvailable)
+            ClipboardService.refresh();
         keyboardController.reset();
 
         Qt.callLater(function () {
@@ -122,10 +119,10 @@ DankPopout {
     onBackgroundClicked: hide()
 
     onShouldBeVisibleChanged: {
-        if (!shouldBeVisible) {
+        if (!shouldBeVisible)
             return;
-        }
-        ClipboardService.refresh();
+        if (clipboardAvailable)
+            ClipboardService.refresh();
         keyboardController.reset();
         Qt.callLater(function () {
             if (contentLoader.item?.searchField) {

quickshell/Modals/Settings/SettingsContent.qml

@@ -518,20 +518,5 @@ FocusScope {
                     Qt.callLater(() => item.forceActiveFocus());
             }
         }
-
-        Loader {
-            id: frameLoader
-            anchors.fill: parent
-            active: root.currentIndex === 33
-            visible: active
-            focus: active
-
-            sourceComponent: FrameTab {}
-
-            onActiveChanged: {
-                if (active && item)
-                    Qt.callLater(() => item.forceActiveFocus());
-            }
-        }
     }
 }

quickshell/Modals/Settings/SettingsSidebar.qml

@@ -120,12 +120,6 @@ Rectangle {
                     "text": I18n.tr("Widgets"),
                     "icon": "widgets",
                     "tabIndex": 22
-                },
-                {
-                    "id": "frame",
-                    "text": I18n.tr("Frame"),
-                    "icon": "frame_source",
-                    "tabIndex": 33
                 }
             ]
         },

quickshell/Modules/DankBar/BarCanvas.qml

@@ -10,8 +10,6 @@ Item {
     required property var axis
     required property var barConfig
 
-    visible: !SettingsData.frameEnabled
-
     anchors.fill: parent
 
     anchors.left: parent.left
@@ -39,8 +37,6 @@ Item {
     }
 
     property real rt: {
-        if (SettingsData.frameEnabled)
-            return SettingsData.frameRounding;
         if (barConfig?.squareCorners ?? false)
             return 0;
         if (barWindow.hasMaximizedToplevel)
@@ -259,12 +255,11 @@ Item {
         h = h - wing;
         const r = wing;
         const cr = rt;
-        const crE = SettingsData.frameEnabled ? 0 : cr;
 
-        let d = `M ${crE} 0`;
-        d += ` L ${w - crE} 0`;
-        if (crE > 0)
-            d += ` A ${crE} ${crE} 0 0 1 ${w} ${crE}`;
+        let d = `M ${cr} 0`;
+        d += ` L ${w - cr} 0`;
+        if (cr > 0)
+            d += ` A ${cr} ${cr} 0 0 1 ${w} ${cr}`;
         if (r > 0) {
             d += ` L ${w} ${h + r}`;
             d += ` A ${r} ${r} 0 0 0 ${w - r} ${h}`;
@@ -278,9 +273,9 @@ Item {
             if (cr > 0)
                 d += ` A ${cr} ${cr} 0 0 1 0 ${h - cr}`;
         }
-        d += ` L 0 ${crE}`;
-        if (crE > 0)
-            d += ` A ${crE} ${crE} 0 0 1 ${crE} 0`;
+        d += ` L 0 ${cr}`;
+        if (cr > 0)
+            d += ` A ${cr} ${cr} 0 0 1 ${cr} 0`;
         d += " Z";
         return d;
     }
@@ -290,12 +285,11 @@ Item {
         h = h - wing;
         const r = wing;
         const cr = rt;
-        const crE = SettingsData.frameEnabled ? 0 : cr;
 
-        let d = `M ${crE} ${fullH}`;
-        d += ` L ${w - crE} ${fullH}`;
-        if (crE > 0)
-            d += ` A ${crE} ${crE} 0 0 0 ${w} ${fullH - crE}`;
+        let d = `M ${cr} ${fullH}`;
+        d += ` L ${w - cr} ${fullH}`;
+        if (cr > 0)
+            d += ` A ${cr} ${cr} 0 0 0 ${w} ${fullH - cr}`;
         if (r > 0) {
             d += ` L ${w} 0`;
             d += ` A ${r} ${r} 0 0 1 ${w - r} ${r}`;
@@ -309,9 +303,9 @@ Item {
             if (cr > 0)
                 d += ` A ${cr} ${cr} 0 0 0 0 ${cr}`;
         }
-        d += ` L 0 ${fullH - crE}`;
-        if (crE > 0)
-            d += ` A ${crE} ${crE} 0 0 0 ${crE} ${fullH}`;
+        d += ` L 0 ${fullH - cr}`;
+        if (cr > 0)
+            d += ` A ${cr} ${cr} 0 0 0 ${cr} ${fullH}`;
         d += " Z";
         return d;
     }
@@ -320,12 +314,11 @@ Item {
         w = w - wing;
         const r = wing;
         const cr = rt;
-        const crE = SettingsData.frameEnabled ? 0 : cr;
 
-        let d = `M 0 ${crE}`;
-        d += ` L 0 ${h - crE}`;
-        if (crE > 0)
-            d += ` A ${crE} ${crE} 0 0 0 ${crE} ${h}`;
+        let d = `M 0 ${cr}`;
+        d += ` L 0 ${h - cr}`;
+        if (cr > 0)
+            d += ` A ${cr} ${cr} 0 0 0 ${cr} ${h}`;
         if (r > 0) {
             d += ` L ${w + r} ${h}`;
             d += ` A ${r} ${r} 0 0 1 ${w} ${h - r}`;
@@ -339,9 +332,9 @@ Item {
             if (cr > 0)
                 d += ` A ${cr} ${cr} 0 0 0 ${w - cr} 0`;
         }
-        d += ` L ${crE} 0`;
-        if (crE > 0)
-            d += ` A ${crE} ${crE} 0 0 0 0 ${crE}`;
+        d += ` L ${cr} 0`;
+        if (cr > 0)
+            d += ` A ${cr} ${cr} 0 0 0 0 ${cr}`;
         d += " Z";
         return d;
     }
@@ -351,12 +344,11 @@ Item {
         w = w - wing;
         const r = wing;
         const cr = rt;
-        const crE = SettingsData.frameEnabled ? 0 : cr;
 
-        let d = `M ${fullW} ${crE}`;
-        d += ` L ${fullW} ${h - crE}`;
-        if (crE > 0)
-            d += ` A ${crE} ${crE} 0 0 1 ${fullW - crE} ${h}`;
+        let d = `M ${fullW} ${cr}`;
+        d += ` L ${fullW} ${h - cr}`;
+        if (cr > 0)
+            d += ` A ${cr} ${cr} 0 0 1 ${fullW - cr} ${h}`;
         if (r > 0) {
             d += ` L 0 ${h}`;
             d += ` A ${r} ${r} 0 0 0 ${r} ${h - r}`;
@@ -370,9 +362,9 @@ Item {
             if (cr > 0)
                 d += ` A ${cr} ${cr} 0 0 1 ${cr} 0`;
         }
-        d += ` L ${fullW - crE} 0`;
-        if (crE > 0)
-            d += ` A ${crE} ${crE} 0 0 1 ${fullW} ${crE}`;
+        d += ` L ${fullW - cr} 0`;
+        if (cr > 0)
+            d += ` A ${cr} ${cr} 0 0 1 ${fullW} ${cr}`;
         d += " Z";
         return d;
     }

quickshell/Modules/DankBar/DankBarContent.qml

@@ -23,31 +23,6 @@ Item {
     readonly property real innerPadding: barConfig?.innerPadding ?? 4
     readonly property real outlineThickness: (barConfig?.widgetOutlineEnabled ?? false) ? (barConfig?.widgetOutlineThickness ?? 1) : 0
 
-    readonly property real _frameLeftInset: {
-        if (!SettingsData.frameEnabled || barWindow.isVertical) return 0
-        return barWindow.hasAdjacentLeftBar
-            ? SettingsData.frameBarSize
-            : 0
-    }
-    readonly property real _frameRightInset: {
-        if (!SettingsData.frameEnabled || barWindow.isVertical) return 0
-        return barWindow.hasAdjacentRightBar
-            ? SettingsData.frameBarSize
-            : 0
-    }
-    readonly property real _frameTopInset: {
-        if (!SettingsData.frameEnabled || !barWindow.isVertical) return 0
-        return barWindow.hasAdjacentTopBar
-            ? SettingsData.frameThickness
-            : 0
-    }
-    readonly property real _frameBottomInset: {
-        if (!SettingsData.frameEnabled || !barWindow.isVertical) return 0
-        return barWindow.hasAdjacentBottomBar
-            ? SettingsData.frameThickness
-            : 0
-    }
-
     property alias hLeftSection: hLeftSection
     property alias hCenterSection: hCenterSection
     property alias hRightSection: hRightSection
@@ -56,14 +31,10 @@ Item {
     property alias vRightSection: vRightSection
 
     anchors.fill: parent
-    anchors.leftMargin:   Math.max(Theme.spacingXS, innerPadding * 0.8) + _frameLeftInset
-    anchors.rightMargin:  Math.max(Theme.spacingXS, innerPadding * 0.8) + _frameRightInset
-    anchors.topMargin:    (barWindow.isVertical
-        ? (barWindow.hasAdjacentTopBar ? outlineThickness : Theme.spacingXS)
-        : 0) + _frameTopInset
-    anchors.bottomMargin: (barWindow.isVertical
-        ? (barWindow.hasAdjacentBottomBar ? outlineThickness : Theme.spacingXS)
-        : 0) + _frameBottomInset
+    anchors.leftMargin: Math.max(Theme.spacingXS, innerPadding * 0.8)
+    anchors.rightMargin: Math.max(Theme.spacingXS, innerPadding * 0.8)
+    anchors.topMargin: barWindow.isVertical ? (barWindow.hasAdjacentTopBar ? outlineThickness : Theme.spacingXS) : 0
+    anchors.bottomMargin: barWindow.isVertical ? (barWindow.hasAdjacentBottomBar ? outlineThickness : Theme.spacingXS) : 0
     clip: false
 
     property int componentMapRevision: 0

quickshell/Modules/DankBar/DankBarWindow.qml

@@ -133,11 +133,6 @@ PanelWindow {
             teardown();
             if (!BlurService.enabled || !BlurService.available)
                 return;
-            // In frame mode, FrameWindow owns the blur region for the entire screen edge
-            // (including the bar area). The bar must not set its own competing blur region
-            // so that frameBlurEnabled acts as the single control for all blur in frame mode.
-            if (SettingsData.frameEnabled)
-                return;
 
             const widgets = barWindow._blurWidgetItems.filter(w => w && w.visible && w.width > 0 && w.height > 0);
             const hasBar = barHasTransparency;
@@ -192,11 +187,6 @@ PanelWindow {
             }
         }
 
-        Connections {
-            target: SettingsData
-            function onFrameEnabledChanged() { barBlur.rebuild(); }
-        }
-
         Connections {
             target: topBarSlide
             function onXChanged() {
@@ -248,9 +238,7 @@ PanelWindow {
     readonly property color _surfaceContainer: Theme.surfaceContainer
     readonly property string _barId: barConfig?.id ?? "default"
     property real _backgroundAlpha: barConfig?.transparency ?? 1.0
-    readonly property color _bgColor: SettingsData.frameEnabled
-        ? Qt.rgba(SettingsData.effectiveFrameColor.r, SettingsData.effectiveFrameColor.g, SettingsData.effectiveFrameColor.b, SettingsData.frameOpacity)
-        : Theme.withAlpha(_surfaceContainer, _backgroundAlpha)
+    readonly property color _bgColor: Theme.withAlpha(_surfaceContainer, _backgroundAlpha)
 
     function _updateBackgroundAlpha() {
         const live = SettingsData.barConfigs.find(c => c.id === _barId);
@@ -396,7 +384,7 @@ PanelWindow {
         shouldHideForWindows = filtered.length > 0;
     }
 
-    property real effectiveSpacing: SettingsData.frameEnabled ? 0 : (hasMaximizedToplevel ? 0 : (barConfig?.spacing ?? 4))
+    property real effectiveSpacing: hasMaximizedToplevel ? 0 : (barConfig?.spacing ?? 4)
 
     Behavior on effectiveSpacing {
         enabled: barWindow.visible
@@ -407,12 +395,7 @@ PanelWindow {
     }
 
     readonly property int notificationCount: NotificationService.notifications.length
-    readonly property real effectiveBarThickness: SettingsData.frameEnabled
-        ? SettingsData.frameBarSize
-        : Theme.snap(Math.max(barWindow.widgetThickness + (barConfig?.innerPadding ?? 4) + 4, Theme.barHeight - 4 - (8 - (barConfig?.innerPadding ?? 4))), _dpr)
-    readonly property bool effectiveOpenOnOverview: SettingsData.frameEnabled
-        ? SettingsData.frameShowOnOverview
-        : (barConfig?.openOnOverview ?? false)
+    readonly property real effectiveBarThickness: Theme.snap(Math.max(barWindow.widgetThickness + (barConfig?.innerPadding ?? 4) + 4, Theme.barHeight - 4 - (8 - (barConfig?.innerPadding ?? 4))), _dpr)
     readonly property real widgetThickness: Theme.snap(Math.max(20, 26 + (barConfig?.innerPadding ?? 4) * 0.6), _dpr)
 
     readonly property bool hasAdjacentTopBar: {
@@ -668,7 +651,7 @@ PanelWindow {
 
         readonly property int barThickness: Theme.px(barWindow.effectiveBarThickness + barWindow.effectiveSpacing, barWindow._dpr)
 
-        readonly property bool inOverviewWithShow: CompositorService.isNiri && NiriService.inOverview && barWindow.effectiveOpenOnOverview
+        readonly property bool inOverviewWithShow: CompositorService.isNiri && NiriService.inOverview && (barConfig?.openOnOverview ?? false)
         readonly property bool effectiveVisible: (barConfig?.visible ?? true) || inOverviewWithShow
         readonly property bool showing: effectiveVisible && (topBarCore.reveal || inOverviewWithShow || !topBarCore.autoHide)
 
@@ -809,7 +792,7 @@ PanelWindow {
         }
 
         property bool reveal: {
-            const inOverviewWithShow = CompositorService.isNiri && NiriService.inOverview && barWindow.effectiveOpenOnOverview;
+            const inOverviewWithShow = CompositorService.isNiri && NiriService.inOverview && (barConfig?.openOnOverview ?? false);
             if (inOverviewWithShow)
                 return true;
 
@@ -906,7 +889,7 @@ PanelWindow {
                 top: barWindow.isVertical ? parent.top : undefined
                 bottom: barWindow.isVertical ? parent.bottom : undefined
             }
-            readonly property bool inOverview: CompositorService.isNiri && NiriService.inOverview && barWindow.effectiveOpenOnOverview
+            readonly property bool inOverview: CompositorService.isNiri && NiriService.inOverview && (barConfig?.openOnOverview ?? false)
             hoverEnabled: (barConfig?.autoHide ?? false) && !inOverview && !topBarCore.hasActivePopout
             acceptedButtons: Qt.NoButton
             enabled: (barConfig?.autoHide ?? false) && !inOverview

quickshell/Modules/DankBar/Widgets/Battery.qml

@@ -1,4 +1,5 @@
 import QtQuick
+import Quickshell.Services.UPower
 import qs.Common
 import qs.Modules.Plugins
 import qs.Services
@@ -10,6 +11,8 @@ BasePill {
     property bool batteryPopupVisible: false
     property var popoutTarget: null
 
+    property real touchpadAccumulator: 0
+
     readonly property int barPosition: {
         switch (axis?.edge) {
         case "top":
@@ -119,5 +122,44 @@ BasePill {
             battery.triggerRipple(this, mouse.x, mouse.y);
             toggleBatteryPopup();
         }
+        onWheel: wheel => {
+            var delta = wheel.angleDelta.y;
+            if (delta === 0)
+                return;
+
+            // Check if this is a touchpad
+            if (delta !== 120 && delta !== -120) {
+                touchpadAccumulator += delta;
+                console.info("Acc: "+touchpadAccumulator);
+                if (Math.abs(touchpadAccumulator) < 500)
+                    return;
+                delta = touchpadAccumulator;
+                touchpadAccumulator = 0;
+            }
+            console.info("Trigger! Delta: "+delta)
+
+            // This is after the other delta checks so it only shows on valid Y scroll
+            if (typeof PowerProfiles === "undefined") {
+                ToastService.showError("power-profiles-daemon not available");
+                return;
+            }
+
+            // Get list of profiles, and current index
+            const profiles = [PowerProfile.PowerSaver, PowerProfile.Balanced].concat(PowerProfiles.hasPerformanceProfile ? [PowerProfile.Performance] : []);
+            var index = profiles.findIndex(profile => PowerProfiles.profile === profile);
+
+            // Step once based on mouse wheel direction
+            if (delta > 0) index += 1;
+            else index -= 1;
+
+            // Already at end of list, can't go further
+            if (index < 0 || index >= profiles.length) return;
+
+            // Set new profile
+            PowerProfiles.profile = profiles[index];
+            if (PowerProfiles.profile !== profiles[index]) {
+                ToastService.showError("Failed to set power profile");
+            }
+        }
     }
 }

quickshell/Modules/DankBar/Widgets/CpuMonitor.qml

@@ -102,7 +102,7 @@ BasePill {
                     StyledTextMetrics {
                         id: cpuBaseline
                         font.pixelSize: Theme.barTextSize(root.barThickness, root.barConfig?.fontScale, root.barConfig?.maximizeWidgetText)
-                        text: "88%"
+                        text: "100%"
                     }
 
                     StyledTextMetrics {

quickshell/Modules/DankBar/Widgets/FocusedApp.qml

@@ -17,7 +17,7 @@ BasePill {
     property int availableWidth: 400
     readonly property int maxNormalWidth: 456
     readonly property int maxCompactWidth: 288
-    readonly property Toplevel activeWindow: ToplevelManager.activeToplevel
+    property Toplevel activeWindow: null
     property var activeDesktopEntry: null
     property bool isHovered: mouseArea.containsMouse
     property bool isAutoHideBar: false
@@ -38,10 +38,44 @@ BasePill {
         return 0;
     }
 
+    function updateActiveWindow() {
+        const active = ToplevelManager.activeToplevel;
+
+        if (!active) {
+            // Only clear if our tracked window is no longer alive
+            if (activeWindow) {
+                const alive = ToplevelManager.toplevels?.values;
+                if (alive && !Array.from(alive).some(t => t === activeWindow))
+                    activeWindow = null;
+            }
+            return;
+        }
+
+        if (!parentScreen || CompositorService.filterCurrentDisplay([active], parentScreen?.name)?.length > 0) {
+            activeWindow = active;
+        }
+        // else: active window is on a different screen so keep the previous value
+    }
+
     Component.onCompleted: {
+        updateActiveWindow();
         updateDesktopEntry();
     }
 
+    Connections {
+        target: ToplevelManager
+        function onActiveToplevelChanged() {
+            root.updateActiveWindow();
+        }
+    }
+
+    Connections {
+        target: CompositorService
+        function onToplevelsChanged() {
+            root.updateActiveWindow();
+        }
+    }
+
     Connections {
         target: DesktopEntries
         function onApplicationsChanged() {

quickshell/Modules/DankBar/Widgets/Media.qml

@@ -99,7 +99,7 @@ BasePill {
 
             if (isMouseWheelY) {
                 if (deltaY > 0) {
-                    activePlayer.previous();
+                    MprisController.previousOrRewind();
                 } else {
                     activePlayer.next();
                 }
@@ -107,7 +107,7 @@ BasePill {
                 scrollAccumulatorY += deltaY;
                 if (Math.abs(scrollAccumulatorY) >= touchpadThreshold) {
                     if (scrollAccumulatorY > 0) {
-                        activePlayer.previous();
+                        MprisController.previousOrRewind();
                     } else {
                         activePlayer.next();
                     }
@@ -214,7 +214,7 @@ BasePill {
                             if (mouse.button === Qt.LeftButton) {
                                 activePlayer.togglePlaying();
                             } else if (mouse.button === Qt.MiddleButton) {
-                                activePlayer.previous();
+                                MprisController.previousOrRewind();
                             } else if (mouse.button === Qt.RightButton) {
                                 activePlayer.next();
                             }
@@ -370,11 +370,7 @@ BasePill {
                             anchors.fill: parent
                             enabled: root.playerAvailable
                             cursorShape: Qt.PointingHandCursor
-                            onClicked: {
-                                if (activePlayer) {
-                                    activePlayer.previous();
-                                }
-                            }
+                            onClicked: MprisController.previousOrRewind()
                         }
                     }
 

quickshell/Modules/DankDash/MediaPlayerTab.qml

@@ -487,17 +487,7 @@ Item {
                                     anchors.fill: parent
                                     hoverEnabled: true
                                     cursorShape: Qt.PointingHandCursor
-                                    onClicked: {
-                                        if (!activePlayer) {
-                                            return;
-                                        }
-
-                                        if (activePlayer.position > 8 && activePlayer.canSeek) {
-                                            activePlayer.position = 0;
-                                        } else {
-                                            activePlayer.previous();
-                                        }
-                                    }
+                                    onClicked: MprisController.previousOrRewind()
                                 }
                             }
                         }

quickshell/Modules/DankDash/Overview/MediaOverviewCard.qml

@@ -145,14 +145,7 @@ Card {
                     anchors.fill: parent
                     hoverEnabled: true
                     cursorShape: Qt.PointingHandCursor
-                    onClicked: {
-                        if (!activePlayer) return
-                        if (activePlayer.position > 8 && activePlayer.canSeek) {
-                            activePlayer.position = 0
-                        } else {
-                            activePlayer.previous()
-                        }
-                    }
+                    onClicked: MprisController.previousOrRewind()
                 }
             }
 

quickshell/Modules/Frame/Frame.qml

@@ -1,17 +0,0 @@
-pragma ComponentBehavior: Bound
-
-import QtQuick
-import Quickshell
-import qs.Common
-
-Variants {
-    id: root
-
-    model: Quickshell.screens
-
-    FrameInstance {
-        required property var modelData
-
-        screen: modelData
-    }
-}

quickshell/Modules/Frame/FrameBorder.qml

@@ -1,59 +0,0 @@
-pragma ComponentBehavior: Bound
-
-import QtQuick
-import QtQuick.Effects
-import qs.Common
-
-Item {
-    id: root
-
-    anchors.fill: parent
-
-    required property real cutoutTopInset
-    required property real cutoutBottomInset
-    required property real cutoutLeftInset
-    required property real cutoutRightInset
-    required property real cutoutRadius
-
-    Rectangle {
-        id: borderRect
-
-        anchors.fill: parent
-        // Bake frameOpacity into the color alpha rather than using the `opacity` property.
-        // Qt Quick can skip layer.effect processing on items with opacity < 1 as an
-        // optimization, causing the MultiEffect inverted mask to stop working and the
-        // Rectangle to render as a plain square at low opacity values.
-        color: Qt.rgba(SettingsData.effectiveFrameColor.r,
-                       SettingsData.effectiveFrameColor.g,
-                       SettingsData.effectiveFrameColor.b,
-                       SettingsData.frameOpacity)
-
-        layer.enabled: true
-        layer.effect: MultiEffect {
-            maskSource:        cutoutMask
-            maskEnabled:       true
-            maskInverted:      true
-            maskThresholdMin:  0.5
-            maskSpreadAtMin:   1
-        }
-    }
-
-    Item {
-        id: cutoutMask
-
-        anchors.fill: parent
-        layer.enabled: true
-        visible: false
-
-        Rectangle {
-            anchors {
-                fill:         parent
-                topMargin:    root.cutoutTopInset
-                bottomMargin: root.cutoutBottomInset
-                leftMargin:   root.cutoutLeftInset
-                rightMargin:  root.cutoutRightInset
-            }
-            radius: root.cutoutRadius
-        }
-    }
-}

quickshell/Modules/Frame/FrameExclusions.qml

@@ -1,87 +0,0 @@
-pragma ComponentBehavior: Bound
-
-import QtQuick
-import Quickshell
-import Quickshell.Wayland
-import qs.Common
-
-Scope {
-    id: root
-
-    required property var screen
-
-    readonly property var barEdges: {
-        SettingsData.barConfigs; // force re-eval when bar configs change
-        return SettingsData.getActiveBarEdgesForScreen(screen);
-    }
-
-    // One thin invisible PanelWindow per edge.
-    // Skips any edge where a bar already provides its own exclusiveZone.
-
-    readonly property bool screenEnabled: SettingsData.frameEnabled && SettingsData.isScreenInPreferences(root.screen, SettingsData.frameScreenPreferences)
-
-    Loader {
-        active: root.screenEnabled && !root.barEdges.includes("top")
-        sourceComponent: EdgeExclusion {
-            targetScreen:  root.screen
-            anchorTop:    true
-            anchorLeft:   true
-            anchorRight:  true
-        }
-    }
-
-    Loader {
-        active: root.screenEnabled && !root.barEdges.includes("bottom")
-        sourceComponent: EdgeExclusion {
-            targetScreen:  root.screen
-            anchorBottom:  true
-            anchorLeft:    true
-            anchorRight:   true
-        }
-    }
-
-    Loader {
-        active: root.screenEnabled && !root.barEdges.includes("left")
-        sourceComponent: EdgeExclusion {
-            targetScreen:  root.screen
-            anchorLeft:    true
-            anchorTop:     true
-            anchorBottom:  true
-        }
-    }
-
-    Loader {
-        active: root.screenEnabled && !root.barEdges.includes("right")
-        sourceComponent: EdgeExclusion {
-            targetScreen:  root.screen
-            anchorRight:   true
-            anchorTop:     true
-            anchorBottom:  true
-        }
-    }
-
-    component EdgeExclusion: PanelWindow {
-        required property var targetScreen
-
-        screen: targetScreen
-        property bool anchorTop:    false
-        property bool anchorBottom: false
-        property bool anchorLeft:   false
-        property bool anchorRight:  false
-
-        WlrLayershell.namespace: "dms:frame-exclusion"
-        WlrLayershell.layer: WlrLayer.Top
-        exclusiveZone: SettingsData.frameThickness
-        color: "transparent"
-        mask: Region {}
-        implicitWidth:  1
-        implicitHeight: 1
-
-        anchors {
-            top:    anchorTop
-            bottom: anchorBottom
-            left:   anchorLeft
-            right:  anchorRight
-        }
-    }
-}

quickshell/Modules/Frame/FrameInstance.qml

@@ -1,18 +0,0 @@
-pragma ComponentBehavior: Bound
-
-import QtQuick
-import Quickshell
-
-Item {
-    id: root
-
-    required property var screen
-
-    FrameWindow {
-        targetScreen: root.screen
-    }
-
-    FrameExclusions {
-        screen: root.screen
-    }
-}

quickshell/Modules/Frame/FrameWindow.qml

@@ -1,169 +0,0 @@
-pragma ComponentBehavior: Bound
-
-import QtQuick
-import Quickshell
-import Quickshell.Wayland
-import qs.Common
-import qs.Services
-
-PanelWindow {
-    id: win
-
-    required property var targetScreen
-
-    screen: targetScreen
-    visible: true
-
-    WlrLayershell.namespace: "dms:frame"
-    WlrLayershell.layer: WlrLayer.Top
-    WlrLayershell.exclusionMode: ExclusionMode.Ignore
-
-    anchors {
-        top: true
-        bottom: true
-        left: true
-        right: true
-    }
-
-    color: "transparent"
-
-    // No input — pass everything through to apps and bar
-    mask: Region {}
-
-    readonly property var barEdges: {
-        SettingsData.barConfigs;
-        return SettingsData.getActiveBarEdgesForScreen(win.screen);
-    }
-
-    readonly property real _dpr: CompositorService.getScreenScale(win.screen)
-    readonly property bool _frameActive: SettingsData.frameEnabled
-        && SettingsData.isScreenInPreferences(win.screen, SettingsData.frameScreenPreferences)
-    readonly property int _windowRegionWidth:  win._regionInt(win.width)
-    readonly property int _windowRegionHeight: win._regionInt(win.height)
-
-    function _regionInt(value) {
-        return Math.max(0, Math.round(Theme.px(value, win._dpr)));
-    }
-
-    readonly property int cutoutTopInset:    win._regionInt(barEdges.includes("top")    ? SettingsData.frameBarSize : SettingsData.frameThickness)
-    readonly property int cutoutBottomInset: win._regionInt(barEdges.includes("bottom") ? SettingsData.frameBarSize : SettingsData.frameThickness)
-    readonly property int cutoutLeftInset:   win._regionInt(barEdges.includes("left")   ? SettingsData.frameBarSize : SettingsData.frameThickness)
-    readonly property int cutoutRightInset:  win._regionInt(barEdges.includes("right")  ? SettingsData.frameBarSize : SettingsData.frameThickness)
-    readonly property int cutoutWidth:  Math.max(0, win._windowRegionWidth - win.cutoutLeftInset - win.cutoutRightInset)
-    readonly property int cutoutHeight: Math.max(0, win._windowRegionHeight - win.cutoutTopInset - win.cutoutBottomInset)
-    readonly property int cutoutRadius: {
-        const requested = win._regionInt(SettingsData.frameRounding);
-        const maxRadius = Math.floor(Math.min(win.cutoutWidth, win.cutoutHeight) / 2);
-        return Math.max(0, Math.min(requested, maxRadius));
-    }
-
-    // Slightly expand the subtractive blur cutout at very low opacity levels
-    readonly property int _blurCutoutCompensation: SettingsData.frameOpacity <= 0.2 ? 1 : 0
-    readonly property int _blurCutoutLeft: Math.max(0, win.cutoutLeftInset - win._blurCutoutCompensation)
-    readonly property int _blurCutoutTop: Math.max(0, win.cutoutTopInset - win._blurCutoutCompensation)
-    readonly property int _blurCutoutRight: Math.min(win._windowRegionWidth, win._windowRegionWidth - win.cutoutRightInset + win._blurCutoutCompensation)
-    readonly property int _blurCutoutBottom: Math.min(win._windowRegionHeight, win._windowRegionHeight - win.cutoutBottomInset + win._blurCutoutCompensation)
-    readonly property int _blurCutoutRadius: {
-        const requested = win.cutoutRadius + win._blurCutoutCompensation;
-        const maxRadius = Math.floor(Math.min(_blurCutout.width, _blurCutout.height) / 2);
-        return Math.max(0, Math.min(requested, maxRadius));
-    }
-
-    // Must stay visible so Region.item can resolve scene coordinates.
-    Item {
-        id: _blurCutout
-        x: win._blurCutoutLeft
-        y: win._blurCutoutTop
-        width: Math.max(0, win._blurCutoutRight - win._blurCutoutLeft)
-        height: Math.max(0, win._blurCutoutBottom - win._blurCutoutTop)
-    }
-
-    property var _frameBlurRegion: null
-
-    function _buildBlur() {
-        _teardownBlur();
-        // Follow the global blur toggle
-        if (!BlurService.enabled || !SettingsData.frameBlurEnabled || !win._frameActive || !win.visible)
-            return;
-        try {
-            const region = Qt.createQmlObject(
-                'import QtQuick; import Quickshell; Region {' +
-                '  property Item cutoutItem;' +
-                '  property int cutoutRadius: 0;' +
-                '  Region {' +
-                '    item: cutoutItem;' +
-                '    intersection: Intersection.Subtract;' +
-                '    radius: cutoutRadius;' +
-                '  }' +
-                '}',
-                win, "FrameBlurRegion");
-
-            region.x = Qt.binding(() => 0);
-            region.y = Qt.binding(() => 0);
-            region.width = Qt.binding(() => win._windowRegionWidth);
-            region.height = Qt.binding(() => win._windowRegionHeight);
-            region.cutoutItem = _blurCutout;
-            region.cutoutRadius = Qt.binding(() => win._blurCutoutRadius);
-
-            win.BackgroundEffect.blurRegion = region;
-            win._frameBlurRegion = region;
-        } catch (e) {
-            console.warn("FrameWindow: Failed to create blur region:", e);
-        }
-    }
-
-    function _teardownBlur() {
-        if (!win._frameBlurRegion)
-            return;
-        try {
-            win.BackgroundEffect.blurRegion = null;
-        } catch (e) {}
-        win._frameBlurRegion.destroy();
-        win._frameBlurRegion = null;
-    }
-
-    Timer {
-        id: _blurRebuildTimer
-        interval: 1
-        onTriggered: win._buildBlur()
-    }
-
-    Connections {
-        target: SettingsData
-        function onFrameBlurEnabledChanged()  { _blurRebuildTimer.restart(); }
-        function onFrameEnabledChanged()      { _blurRebuildTimer.restart(); }
-        function onFrameThicknessChanged()    { _blurRebuildTimer.restart(); }
-        function onFrameBarSizeChanged()      { _blurRebuildTimer.restart(); }
-        function onFrameOpacityChanged()      { _blurRebuildTimer.restart(); }
-        function onFrameRoundingChanged()     { _blurRebuildTimer.restart(); }
-        function onFrameScreenPreferencesChanged() { _blurRebuildTimer.restart(); }
-        function onBarConfigsChanged()        { _blurRebuildTimer.restart(); }
-    }
-
-    Connections {
-        target: BlurService
-        function onEnabledChanged() { _blurRebuildTimer.restart(); }
-    }
-
-    onVisibleChanged: {
-        if (visible) {
-            win._frameBlurRegion = null;
-            _blurRebuildTimer.restart();
-        } else {
-            _teardownBlur();
-        }
-    }
-
-    Component.onCompleted: Qt.callLater(() => win._buildBlur())
-    Component.onDestruction: win._teardownBlur()
-
-    FrameBorder {
-        anchors.fill: parent
-        visible: win._frameActive
-        cutoutTopInset: win.cutoutTopInset
-        cutoutBottomInset: win.cutoutBottomInset
-        cutoutLeftInset: win.cutoutLeftInset
-        cutoutRightInset: win.cutoutRightInset
-        cutoutRadius: win.cutoutRadius
-    }
-}

quickshell/Modules/Lock/LockScreenContent.qml

@@ -1338,7 +1338,7 @@ Item {
                             enabled: MprisController.activePlayer?.canGoPrevious ?? false
                             hoverEnabled: enabled
                             cursorShape: enabled ? Qt.PointingHandCursor : Qt.ArrowCursor
-                            onClicked: MprisController.activePlayer?.previous()
+                            onClicked: MprisController.previousOrRewind()
                         }
                     }
 

quickshell/Modules/Settings/DankBarTab.qml

@@ -693,8 +693,6 @@ Item {
 
                 SettingsToggleRow {
                     visible: CompositorService.isNiri
-                    enabled: !SettingsData.frameEnabled
-                    opacity: SettingsData.frameEnabled ? 0.5 : 1.0
                     text: I18n.tr("Show on Overview")
                     checked: selectedBarConfig?.openOnOverview ?? false
                     onToggled: toggled => {
@@ -800,42 +798,11 @@ Item {
                 }
             }
 
-            Item {
-                visible: SettingsData.frameEnabled
-                width: parent.width
-                implicitHeight: frameNote.implicitHeight + Theme.spacingS * 2
-
-                Row {
-                    id: frameNote
-                    x: Theme.spacingM
-                    width: parent.width - Theme.spacingM * 2
-                    anchors.verticalCenter: parent.verticalCenter
-                    spacing: Theme.spacingS
-
-                    DankIcon {
-                        name: "frame_source"
-                        size: Theme.fontSizeMedium
-                        color: Theme.primary
-                        anchors.verticalCenter: parent.verticalCenter
-                    }
-
-                    StyledText {
-                        text: I18n.tr("Spacing and size are managed by Frame mode")
-                        font.pixelSize: Theme.fontSizeSmall
-                        color: Theme.surfaceVariantText
-                        wrapMode: Text.WordWrap
-                        width: parent.width - Theme.fontSizeMedium - Theme.spacingS
-                    }
-                }
-            }
-
             SettingsCard {
                 iconName: "space_bar"
                 title: I18n.tr("Spacing")
                 settingKey: "barSpacing"
                 visible: selectedBarConfig?.enabled
-                enabled: !SettingsData.frameEnabled
-                opacity: SettingsData.frameEnabled ? 0.5 : 1.0
 
                 SettingsSliderRow {
                     id: edgeSpacingSlider
@@ -1036,8 +1003,6 @@ Item {
 
                 SettingsSliderRow {
                     id: barTransparencySlider
-                    enabled: !SettingsData.frameEnabled
-                    opacity: SettingsData.frameEnabled ? 0.5 : 1.0
                     text: I18n.tr("Bar Transparency")
                     value: (selectedBarConfig?.transparency ?? 1.0) * 100
                     minimum: 0
@@ -1079,35 +1044,6 @@ Item {
                         restoreMode: Binding.RestoreBinding
                     }
                 }
-
-                Item {
-                    visible: SettingsData.frameEnabled
-                    width: parent.width
-                    implicitHeight: transparencyFrameNote.implicitHeight + Theme.spacingS * 2
-
-                    Row {
-                        id: transparencyFrameNote
-                        x: Theme.spacingM
-                        width: parent.width - Theme.spacingM * 2
-                        anchors.verticalCenter: parent.verticalCenter
-                        spacing: Theme.spacingS
-
-                        DankIcon {
-                            name: "frame_source"
-                            size: Theme.fontSizeMedium
-                            color: Theme.primary
-                            anchors.verticalCenter: parent.verticalCenter
-                        }
-
-                        StyledText {
-                            text: I18n.tr("Opacity is controlled by Frame Border Opacity in Frame settings")
-                            font.pixelSize: Theme.fontSizeSmall
-                            color: Theme.surfaceVariantText
-                            wrapMode: Text.WordWrap
-                            width: parent.width - Theme.fontSizeMedium - Theme.spacingS
-                        }
-                    }
-                }
             }
 
             SettingsCard {
@@ -1351,8 +1287,6 @@ Item {
 
                 SettingsToggleRow {
                     text: I18n.tr("Square Corners")
-                    enabled: !SettingsData.frameEnabled
-                    opacity: SettingsData.frameEnabled ? 0.5 : 1.0
                     checked: selectedBarConfig?.squareCorners ?? false
                     onToggled: checked => SettingsData.updateBarConfig(selectedBarId, {
                             squareCorners: checked
@@ -1400,8 +1334,6 @@ Item {
 
                 SettingsToggleRow {
                     text: I18n.tr("Goth Corners")
-                    enabled: !SettingsData.frameEnabled
-                    opacity: SettingsData.frameEnabled ? 0.5 : 1.0
                     checked: selectedBarConfig?.gothCornersEnabled ?? false
                     onToggled: checked => SettingsData.updateBarConfig(selectedBarId, {
                             gothCornersEnabled: checked

quickshell/Modules/Settings/FrameTab.qml

@@ -1,295 +0,0 @@
-pragma ComponentBehavior: Bound
-
-import QtQuick
-import qs.Common
-import qs.Services
-import qs.Widgets
-import qs.Modules.Settings.Widgets
-
-Item {
-    id: root
-
-    LayoutMirroring.enabled: I18n.isRtl
-    LayoutMirroring.childrenInherit: true
-
-    DankFlickable {
-        anchors.fill: parent
-        clip: true
-        contentHeight: mainColumn.height + Theme.spacingXL
-        contentWidth: width
-
-        Column {
-            id: mainColumn
-            topPadding: 4
-            width: Math.min(550, parent.width - Theme.spacingL * 2)
-            anchors.horizontalCenter: parent.horizontalCenter
-            spacing: Theme.spacingXL
-
-            // ── Enable Frame ──────────────────────────────────────────────────
-            SettingsCard {
-                width: parent.width
-                iconName: "frame_source"
-                title: I18n.tr("Frame")
-                settingKey: "frameEnabled"
-
-                SettingsToggleRow {
-                    settingKey: "frameEnable"
-                    tags: ["frame", "border", "outline", "display"]
-                    text: I18n.tr("Enable Frame")
-                    description: I18n.tr("Draw a connected picture-frame border around the entire display")
-                    checked: SettingsData.frameEnabled
-                    onToggled: checked => SettingsData.set("frameEnabled", checked)
-                }
-            }
-
-            // ── Border ────────────────────────────────────────────────────────
-            SettingsCard {
-                width: parent.width
-                iconName: "border_outer"
-                title: I18n.tr("Border")
-                settingKey: "frameBorder"
-                collapsible: true
-                visible: SettingsData.frameEnabled
-
-                SettingsSliderRow {
-                    id: roundingSlider
-                    settingKey: "frameRounding"
-                    tags: ["frame", "border", "rounding", "radius", "corner"]
-                    text: I18n.tr("Border Radius")
-                    unit: "px"
-                    minimum: 0
-                    maximum: 100
-                    step: 1
-                    defaultValue: 23
-                    value: SettingsData.frameRounding
-                    onSliderDragFinished: v => SettingsData.set("frameRounding", v)
-
-                    Binding {
-                        target: roundingSlider
-                        property: "value"
-                        value: SettingsData.frameRounding
-                    }
-                }
-
-                SettingsSliderRow {
-                    id: thicknessSlider
-                    settingKey: "frameThickness"
-                    tags: ["frame", "border", "thickness", "size", "width"]
-                    text: I18n.tr("Border Width")
-                    unit: "px"
-                    minimum: 2
-                    maximum: 100
-                    step: 1
-                    defaultValue: 16
-                    value: SettingsData.frameThickness
-                    onSliderDragFinished: v => SettingsData.set("frameThickness", v)
-
-                    Binding {
-                        target: thicknessSlider
-                        property: "value"
-                        value: SettingsData.frameThickness
-                    }
-                }
-
-                SettingsSliderRow {
-                    id: barThicknessSlider
-                    settingKey: "frameBarSize"
-                    tags: ["frame", "bar", "thickness", "size", "height", "width"]
-                    text: I18n.tr("Size")
-                    description: I18n.tr("Height of horizontal bars / width of vertical bars in frame mode")
-                    unit: "px"
-                    minimum: 24
-                    maximum: 100
-                    step: 1
-                    defaultValue: 40
-                    value: SettingsData.frameBarSize
-                    onSliderDragFinished: v => SettingsData.set("frameBarSize", v)
-
-                    Binding {
-                        target: barThicknessSlider
-                        property: "value"
-                        value: SettingsData.frameBarSize
-                    }
-                }
-
-                SettingsSliderRow {
-                    id: opacitySlider
-                    settingKey: "frameOpacity"
-                    tags: ["frame", "border", "opacity", "transparency"]
-                    text: I18n.tr("Frame Opacity")
-                    unit: "%"
-                    minimum: 0
-                    maximum: 100
-                    defaultValue: 100
-                    value: SettingsData.frameOpacity * 100
-                    onSliderDragFinished: v => SettingsData.set("frameOpacity", v / 100)
-
-                    Binding {
-                        target: opacitySlider
-                        property: "value"
-                        value: SettingsData.frameOpacity * 100
-                    }
-                }
-
-                SettingsToggleRow {
-                    id: frameBlurToggle
-                    settingKey: "frameBlurEnabled"
-                    tags: ["frame", "blur", "background", "glass", "transparency", "frosted"]
-                    text: I18n.tr("Frame Blur")
-                    description: !BlurService.available
-                        ? I18n.tr("Requires a newer version of Quickshell")
-                        : I18n.tr("Apply compositor blur behind the frame border")
-                    checked: SettingsData.frameBlurEnabled
-                    onToggled: checked => SettingsData.set("frameBlurEnabled", checked)
-                    enabled: BlurService.available && SettingsData.blurEnabled
-                    opacity: enabled ? 1.0 : 0.5
-                    visible: BlurService.available
-                }
-
-                Item {
-                    visible: BlurService.available && !SettingsData.blurEnabled
-                    width: parent.width
-                    height: blurToggleNote.height + Theme.spacingM * 2
-
-                    Row {
-                        id: blurToggleNote
-                        x: Theme.spacingM
-                        width: parent.width - Theme.spacingM * 2
-                        anchors.verticalCenter: parent.verticalCenter
-                        spacing: Theme.spacingS
-
-                        DankIcon {
-                            name: "blur_on"
-                            size: Theme.fontSizeMedium
-                            color: Theme.primary
-                            anchors.verticalCenter: parent.verticalCenter
-                        }
-
-                        StyledText {
-                            text: I18n.tr("Frame Blur is controlled by Background Blur in Theme & Colors")
-                            font.pixelSize: Theme.fontSizeSmall
-                            color: Theme.surfaceVariantText
-                            wrapMode: Text.WordWrap
-                            width: parent.width - Theme.fontSizeMedium - Theme.spacingS
-                        }
-                    }
-                }
-
-                // Color mode buttons
-                SettingsButtonGroupRow {
-                    settingKey: "frameColor"
-                    tags: ["frame", "border", "color", "theme", "primary", "surface", "default"]
-                    text: I18n.tr("Border color")
-                    model: [I18n.tr("Default"), I18n.tr("Primary"), I18n.tr("Surface"), I18n.tr("Custom")]
-                    currentIndex: {
-                        const fc = SettingsData.frameColor;
-                        if (!fc || fc === "default") return 0;
-                        if (fc === "primary") return 1;
-                        if (fc === "surface") return 2;
-                        return 3;
-                    }
-                    onSelectionChanged: (index, selected) => {
-                        if (!selected) return;
-                        switch (index) {
-                        case 0: SettingsData.set("frameColor", ""); break;
-                        case 1: SettingsData.set("frameColor", "primary"); break;
-                        case 2: SettingsData.set("frameColor", "surface"); break;
-                        case 3:
-                            const cur = SettingsData.frameColor;
-                            const isPreset = !cur || cur === "primary" || cur === "surface";
-                            if (isPreset) SettingsData.set("frameColor", "#2a2a2a");
-                            break;
-                        }
-                    }
-                }
-
-                // Custom color swatch — only visible when a hex color is stored (Custom mode)
-                Item {
-                    visible: {
-                        const fc = SettingsData.frameColor;
-                        return !!(fc && fc !== "primary" && fc !== "surface");
-                    }
-                    width: parent.width
-                    height: customColorRow.height + Theme.spacingM * 2
-
-                    Row {
-                        id: customColorRow
-                        width: parent.width - Theme.spacingM * 2
-                        x: Theme.spacingM
-                        anchors.verticalCenter: parent.verticalCenter
-                        spacing: Theme.spacingM
-
-                        StyledText {
-                            anchors.verticalCenter: parent.verticalCenter
-                            text: I18n.tr("Custom color")
-                            font.pixelSize: Theme.fontSizeMedium
-                            font.weight: Font.Medium
-                            color: Theme.surfaceText
-                        }
-
-                        Rectangle {
-                            id: colorSwatch
-                            anchors.verticalCenter: parent.verticalCenter
-                            width: 32
-                            height: 32
-                            radius: 16
-                            color: SettingsData.effectiveFrameColor
-                            border.color: Theme.outline
-                            border.width: 1
-
-                            MouseArea {
-                                anchors.fill: parent
-                                cursorShape: Qt.PointingHandCursor
-                                onClicked: {
-                                    PopoutService.colorPickerModal.selectedColor = SettingsData.effectiveFrameColor;
-                                    PopoutService.colorPickerModal.pickerTitle = I18n.tr("Frame Border Color");
-                                    PopoutService.colorPickerModal.onColorSelectedCallback = function (color) {
-                                        SettingsData.set("frameColor", color.toString());
-                                    };
-                                    PopoutService.colorPickerModal.show();
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-
-            // ── Bar Integration ───────────────────────────────────────────────
-            SettingsCard {
-                width: parent.width
-                iconName: "toolbar"
-                title: I18n.tr("Bar Integration")
-                settingKey: "frameBarIntegration"
-                collapsible: true
-                expanded: false
-                visible: SettingsData.frameEnabled
-
-                SettingsToggleRow {
-                    visible: CompositorService.isNiri
-                    settingKey: "frameShowOnOverview"
-                    tags: ["frame", "overview", "show", "hide", "niri"]
-                    text: I18n.tr("Show on Overview")
-                    description: I18n.tr("Show the bar and frame during Niri overview mode")
-                    checked: SettingsData.frameShowOnOverview
-                    onToggled: checked => SettingsData.set("frameShowOnOverview", checked)
-                }
-            }
-
-            // ── Display Assignment ────────────────────────────────────────────
-            SettingsCard {
-                width: parent.width
-                iconName: "monitor"
-                title: I18n.tr("Display Assignment")
-                settingKey: "frameDisplays"
-                collapsible: true
-                expanded: false
-                visible: SettingsData.frameEnabled
-
-                SettingsDisplayPicker {
-                    displayPreferences: SettingsData.frameScreenPreferences
-                    onPreferencesChanged: prefs => SettingsData.set("frameScreenPreferences", prefs)
-                }
-            }
-        }
-    }
-}

quickshell/Modules/Settings/Widgets/SettingsDisplayPicker.qml

@@ -83,6 +83,7 @@ Item {
                     description: modelData.width + "×" + modelData.height
                     checked: localChecked
                     onToggled: isChecked => {
+                        localChecked = isChecked;
                         var prefs = JSON.parse(JSON.stringify(root.displayPreferences));
                         if (!Array.isArray(prefs) || prefs.includes("all"))
                             prefs = [];
@@ -93,11 +94,6 @@ Item {
                                 model: modelData.model || ""
                             });
                         }
-                        if (prefs.length === 0) {
-                            localChecked = true;
-                            return;
-                        }
-                        localChecked = isChecked;
                         root.preferencesChanged(prefs);
                     }
                 }

quickshell/Services/ClipboardService.qml

@@ -255,6 +255,12 @@ Singleton {
         return pinnedEntries.some(pinnedEntry => pinnedEntry.hash === entryHash);
     }
 
+    onClipboardAvailableChanged: {
+        if (!clipboardAvailable || refCount <= 0)
+            return;
+        refresh();
+    }
+
     Connections {
         target: DMSService
         enabled: root.refCount > 0

quickshell/Services/MprisController.qml

@@ -10,4 +10,20 @@ Singleton {
 
     readonly property list<MprisPlayer> availablePlayers: Mpris.players.values
     property MprisPlayer activePlayer: availablePlayers.find(p => p.isPlaying) ?? availablePlayers.find(p => p.canControl && p.canPlay) ?? null
+
+    Timer {
+        interval: 1000
+        running: root.activePlayer?.playbackState === MprisPlaybackState.Playing
+        repeat: true
+        onTriggered: root.activePlayer?.positionChanged()
+    }
+
+    function previousOrRewind(): void {
+        if (!activePlayer)
+            return;
+        if (activePlayer.position > 8 && activePlayer.canSeek)
+            activePlayer.position = 0;
+        else if (activePlayer.canGoPrevious)
+            activePlayer.previous();
+    }
 }

quickshell/translations/extract_translations.py

@@ -86,13 +86,13 @@ def create_poeditor_json(translations):
             references.append(ref)
 
         contexts = sorted(data['contexts']) if data['contexts'] else []
-        context_str = " | ".join(contexts) if contexts else term
+        comment = " | ".join(contexts) if contexts else ""
 
         entry = {
             "term": term,
-            "context": context_str,
+            "context": term,
             "reference": ", ".join(references),
-            "comment": ""
+            "comment": comment
         }
         poeditor_data.append(entry)
 

quickshell/translations/settings_search_index.json

@@ -2112,6 +2112,26 @@
     ],
     "icon": "history"
   },
+  {
+    "section": "rememberLastQuery",
+    "label": "Remember Last Query",
+    "tabIndex": 9,
+    "category": "Launcher",
+    "keywords": [
+      "autofill",
+      "drawer",
+      "last",
+      "launcher",
+      "menu",
+      "opened",
+      "query",
+      "remember",
+      "remembered",
+      "search",
+      "start"
+    ],
+    "description": "Autofill last remembered query when opened"
+  },
   {
     "section": "searchAppActions",
     "label": "Search App Actions",
@@ -2378,6 +2398,47 @@
     ],
     "icon": "schedule"
   },
+  {
+    "section": "blurEnabled",
+    "label": "Background Blur",
+    "tabIndex": 10,
+    "category": "Theme & Colors",
+    "keywords": [
+      "alert",
+      "alerts",
+      "appearance",
+      "background",
+      "bars",
+      "behind",
+      "blur",
+      "colors",
+      "compositor",
+      "config",
+      "configuration",
+      "configure",
+      "frosted",
+      "glass",
+      "look",
+      "modals",
+      "notif",
+      "notifications",
+      "notifs",
+      "panel",
+      "popouts",
+      "requires",
+      "scheme",
+      "setup",
+      "statusbar",
+      "style",
+      "support",
+      "taskbar",
+      "theme",
+      "topbar",
+      "transparency"
+    ],
+    "icon": "blur_on",
+    "description": "Blur the background behind bars, popouts, modals, and notifications. Requires compositor support and configuration."
+  },
   {
     "section": "barElevationEnabled",
     "label": "Bar Shadows",
@@ -2405,6 +2466,49 @@
     ],
     "description": "Shadow elevation on bars and panels"
   },
+  {
+    "section": "blurBorderColor",
+    "label": "Blur Border Color",
+    "tabIndex": 10,
+    "category": "Theme & Colors",
+    "keywords": [
+      "appearance",
+      "around",
+      "blur",
+      "blurred",
+      "border",
+      "color",
+      "colors",
+      "colour",
+      "edge",
+      "hue",
+      "look",
+      "outline",
+      "scheme",
+      "style",
+      "surfaces",
+      "theme",
+      "tint"
+    ],
+    "description": "Border color around blurred surfaces"
+  },
+  {
+    "section": "blurBorderOpacity",
+    "label": "Blur Border Opacity",
+    "tabIndex": 10,
+    "category": "Theme & Colors",
+    "keywords": [
+      "appearance",
+      "blur",
+      "border",
+      "colors",
+      "look",
+      "opacity",
+      "scheme",
+      "style",
+      "theme"
+    ]
+  },
   {
     "section": "niriLayoutBorderSize",
     "label": "Border Size",
@@ -4384,27 +4488,6 @@
     ],
     "description": "Automatically lock the screen when DMS starts"
   },
-  {
-    "section": "lockBeforeSuspend",
-    "label": "Lock before suspend",
-    "tabIndex": 11,
-    "category": "Lock Screen",
-    "keywords": [
-      "automatic",
-      "automatically",
-      "before",
-      "lock",
-      "login",
-      "password",
-      "prepares",
-      "screen",
-      "security",
-      "sleep",
-      "suspend",
-      "system"
-    ],
-    "description": "Automatically lock the screen when the system prepares to suspend"
-  },
   {
     "section": "lockScreenNotificationMode",
     "label": "Notification Display",
@@ -6407,6 +6490,27 @@
     "icon": "schedule",
     "description": "Gradually fade the screen before locking with a configurable grace period"
   },
+  {
+    "section": "lockBeforeSuspend",
+    "label": "Lock before suspend",
+    "tabIndex": 21,
+    "category": "Power & Sleep",
+    "keywords": [
+      "automatically",
+      "before",
+      "energy",
+      "lock",
+      "power",
+      "prepares",
+      "screen",
+      "security",
+      "shutdown",
+      "sleep",
+      "suspend",
+      "system"
+    ],
+    "description": "Automatically lock the screen when the system prepares to suspend"
+  },
   {
     "section": "fadeToLockGracePeriod",
     "label": "Lock fade grace period",

quickshell/translations/template.json

@@ -1182,6 +1182,13 @@
     "reference": "",
     "comment": ""
   },
+  {
+    "term": "Applying authentication changes…",
+    "translation": "",
+    "context": "",
+    "reference": "",
+    "comment": ""
+  },
   {
     "term": "Apps",
     "translation": "",
@@ -1378,6 +1385,34 @@
     "reference": "",
     "comment": ""
   },
+  {
+    "term": "Authentication changes applied.",
+    "translation": "",
+    "context": "",
+    "reference": "",
+    "comment": ""
+  },
+  {
+    "term": "Authentication changes apply automatically.",
+    "translation": "",
+    "context": "",
+    "reference": "",
+    "comment": ""
+  },
+  {
+    "term": "Authentication changes apply automatically. Fingerprint-only login may not unlock Keyring.",
+    "translation": "",
+    "context": "",
+    "reference": "",
+    "comment": ""
+  },
+  {
+    "term": "Authentication changes need sudo. Opening terminal so you can use password or fingerprint.",
+    "translation": "",
+    "context": "",
+    "reference": "",
+    "comment": ""
+  },
   {
     "term": "Authentication error - try again",
     "translation": "",
@@ -1518,6 +1553,13 @@
     "reference": "",
     "comment": ""
   },
+  {
+    "term": "Autofill last remembered query when opened",
+    "translation": "",
+    "context": "",
+    "reference": "",
+    "comment": ""
+  },
   {
     "term": "Automatic Color Mode",
     "translation": "",
@@ -1672,6 +1714,13 @@
     "reference": "",
     "comment": ""
   },
+  {
+    "term": "Background Blur",
+    "translation": "",
+    "context": "",
+    "reference": "",
+    "comment": ""
+  },
   {
     "term": "Background Opacity",
     "translation": "",
@@ -1679,6 +1728,13 @@
     "reference": "",
     "comment": ""
   },
+  {
+    "term": "Background authentication sync failed. Trying terminal mode.",
+    "translation": "",
+    "context": "",
+    "reference": "",
+    "comment": ""
+  },
   {
     "term": "Background image",
     "translation": "",
@@ -1875,6 +1931,20 @@
     "reference": "",
     "comment": ""
   },
+  {
+    "term": "Blur Border Color",
+    "translation": "",
+    "context": "",
+    "reference": "",
+    "comment": ""
+  },
+  {
+    "term": "Blur Border Opacity",
+    "translation": "",
+    "context": "",
+    "reference": "",
+    "comment": ""
+  },
   {
     "term": "Blur Wallpaper Layer",
     "translation": "",
@@ -1889,6 +1959,13 @@
     "reference": "",
     "comment": ""
   },
+  {
+    "term": "Blur the background behind bars, popouts, modals, and notifications. Requires compositor support and configuration.",
+    "translation": "",
+    "context": "",
+    "reference": "",
+    "comment": ""
+  },
   {
     "term": "Blur wallpaper when niri overview is open",
     "translation": "",
@@ -1938,6 +2015,13 @@
     "reference": "",
     "comment": ""
   },
+  {
+    "term": "Border color around blurred surfaces",
+    "translation": "",
+    "context": "",
+    "reference": "",
+    "comment": ""
+  },
   {
     "term": "Border with BG",
     "translation": "",
@@ -2289,7 +2373,7 @@
     "comment": ""
   },
   {
-    "term": "Check sync status on demand. Sync copies your theme, settings, PAM config, and wallpaper to the login screen in one step. Must run Sync to apply changes.",
+    "term": "Check sync status on demand. Sync copies your theme, settings, and wallpaper configuration to the login screen. Authentication changes apply automatically.",
     "translation": "",
     "context": "",
     "reference": "",
@@ -3544,7 +3628,7 @@
   {
     "term": "Custom",
     "translation": "",
-    "context": "shadow color option | theme category option",
+    "context": "blur border color | shadow color option | theme category option",
     "reference": "",
     "comment": ""
   },
@@ -3717,7 +3801,7 @@
     "comment": ""
   },
   {
-    "term": "DMS greeter needs: greetd, dms-greeter. Fingerprint: fprintd, pam_fprintd. Security keys: pam_u2f. Add your user to the greeter group. Sync checks sudo first and opens a terminal when interactive authentication is required.",
+    "term": "DMS greeter needs: greetd, dms-greeter. Fingerprint: fprintd, pam_fprintd. Security keys: pam_u2f. Add your user to the greeter group. Authentication changes apply automatically and may open a terminal when sudo authentication is required.",
     "translation": "",
     "context": "",
     "reference": "",
@@ -4788,7 +4872,7 @@
     "comment": ""
   },
   {
-    "term": "Enable fingerprint or security key for DMS Greeter. Run Sync to apply and configure PAM.",
+    "term": "Enable fingerprint or security key for DMS Greeter. Authentication changes apply automatically.",
     "translation": "",
     "context": "",
     "reference": "",
@@ -4836,6 +4920,13 @@
     "reference": "",
     "comment": ""
   },
+  {
+    "term": "Enabled, but no prints are enrolled yet. Authentication changes apply automatically once you enroll fingerprints.",
+    "translation": "",
+    "context": "",
+    "reference": "",
+    "comment": ""
+  },
   {
     "term": "Enabled, but no prints are enrolled yet. Enroll fingerprints and run Sync.",
     "translation": "",
@@ -4844,7 +4935,7 @@
     "comment": ""
   },
   {
-    "term": "Enabled, but no prints are enrolled yet. Enroll fingerprints to use it.",
+    "term": "Enabled, but no registered security key was found yet. Authentication changes apply automatically once your key is registered or your U2F config is updated.",
     "translation": "",
     "context": "",
     "reference": "",
@@ -4857,13 +4948,6 @@
     "reference": "",
     "comment": ""
   },
-  {
-    "term": "Enabled, but no registered security key was found yet. Register a key or update your U2F config.",
-    "translation": "",
-    "context": "",
-    "reference": "",
-    "comment": ""
-  },
   {
     "term": "Enabled, but security-key availability could not be confirmed.",
     "translation": "",
@@ -5809,6 +5893,27 @@
     "reference": "",
     "comment": ""
   },
+  {
+    "term": "Fingerprint error",
+    "translation": "",
+    "context": "",
+    "reference": "",
+    "comment": ""
+  },
+  {
+    "term": "Fingerprint error: %1",
+    "translation": "",
+    "context": "",
+    "reference": "",
+    "comment": ""
+  },
+  {
+    "term": "Fingerprint not recognized (%1/%2). Please try again or use password.",
+    "translation": "",
+    "context": "",
+    "reference": "",
+    "comment": ""
+  },
   {
     "term": "Fingerprint reader detected, but no prints are enrolled yet. You can enable this now and enroll later.",
     "translation": "",
@@ -7139,6 +7244,13 @@
     "reference": "",
     "comment": ""
   },
+  {
+    "term": "Incorrect password - try again",
+    "translation": "",
+    "context": "",
+    "reference": "",
+    "comment": ""
+  },
   {
     "term": "Indicator Style",
     "translation": "",
@@ -7202,6 +7314,13 @@
     "reference": "",
     "comment": ""
   },
+  {
+    "term": "Insert your security key...",
+    "translation": "",
+    "context": "",
+    "reference": "",
+    "comment": ""
+  },
   {
     "term": "Install",
     "translation": "",
@@ -7930,6 +8049,13 @@
     "reference": "",
     "comment": ""
   },
+  {
+    "term": "Lock screen authentication changes apply automatically and may open a terminal when sudo authentication is required.",
+    "translation": "",
+    "context": "",
+    "reference": "",
+    "comment": ""
+  },
   {
     "term": "Locked",
     "translation": "",
@@ -8315,6 +8441,13 @@
     "reference": "",
     "comment": ""
   },
+  {
+    "term": "Maximum fingerprint attempts reached. Please use password.",
+    "translation": "",
+    "context": "",
+    "reference": "",
+    "comment": ""
+  },
   {
     "term": "Maximum number of clipboard entries to keep",
     "translation": "",
@@ -10131,7 +10264,7 @@
   {
     "term": "Outline",
     "translation": "",
-    "context": "outline color",
+    "context": "blur border color | outline color",
     "reference": "",
     "comment": ""
   },
@@ -11062,7 +11195,7 @@
   {
     "term": "Primary",
     "translation": "",
-    "context": "button color option | color option | primary color | shadow color option | tile color option",
+    "context": "blur border color | button color option | color option | primary color | shadow color option | tile color option",
     "reference": "",
     "comment": ""
   },
@@ -11479,6 +11612,13 @@
     "reference": "",
     "comment": ""
   },
+  {
+    "term": "Remember Last Query",
+    "translation": "",
+    "context": "",
+    "reference": "",
+    "comment": ""
+  },
   {
     "term": "Remember last session",
     "translation": "",
@@ -11605,6 +11745,13 @@
     "reference": "",
     "comment": ""
   },
+  {
+    "term": "Requires a newer version of Quickshell",
+    "translation": "",
+    "context": "",
+    "reference": "",
+    "comment": ""
+  },
   {
     "term": "Requires night mode support",
     "translation": "",
@@ -11850,20 +11997,6 @@
     "reference": "",
     "comment": ""
   },
-  {
-    "term": "Run Sync to apply.",
-    "translation": "",
-    "context": "",
-    "reference": "",
-    "comment": ""
-  },
-  {
-    "term": "Run Sync to apply. Fingerprint-only login may not unlock GNOME Keyring.",
-    "translation": "",
-    "context": "",
-    "reference": "",
-    "comment": ""
-  },
   {
     "term": "Run User Templates",
     "translation": "",
@@ -12259,7 +12392,7 @@
   {
     "term": "Secondary",
     "translation": "",
-    "context": "button color option | color option | secondary color | tile color option",
+    "context": "blur border color | button color option | color option | secondary color | tile color option",
     "reference": "",
     "comment": ""
   },
@@ -14055,6 +14188,13 @@
     "reference": "",
     "comment": ""
   },
+  {
+    "term": "Terminal fallback failed. Install a supported terminal emulator or run 'dms auth sync' manually.",
+    "translation": "",
+    "context": "",
+    "reference": "",
+    "comment": ""
+  },
   {
     "term": "Terminal fallback failed. Install one of the supported terminal emulators or run 'dms greeter sync' manually.",
     "translation": "",
@@ -14062,6 +14202,13 @@
     "reference": "",
     "comment": ""
   },
+  {
+    "term": "Terminal fallback opened. Complete authentication setup there; it will close automatically when done.",
+    "translation": "",
+    "context": "",
+    "reference": "",
+    "comment": ""
+  },
   {
     "term": "Terminal fallback opened. Complete sync there; it will close automatically when done.",
     "translation": "",
@@ -14076,6 +14223,13 @@
     "reference": "",
     "comment": ""
   },
+  {
+    "term": "Terminal opened. Complete authentication setup there; it will close automatically when done.",
+    "translation": "",
+    "context": "",
+    "reference": "",
+    "comment": ""
+  },
   {
     "term": "Terminal opened. Complete sync authentication there; it will close automatically when done.",
     "translation": "",
@@ -14128,7 +14282,7 @@
   {
     "term": "Text Color",
     "translation": "",
-    "context": "shadow color option",
+    "context": "blur border color | shadow color option",
     "reference": "",
     "comment": ""
   },
@@ -14489,6 +14643,13 @@
     "reference": "",
     "comment": ""
   },
+  {
+    "term": "Too many attempts - locked out",
+    "translation": "",
+    "context": "",
+    "reference": "",
+    "comment": ""
+  },
   {
     "term": "Too many failed attempts - account may be locked",
     "translation": "",
@@ -14573,6 +14734,13 @@
     "reference": "",
     "comment": ""
   },
+  {
+    "term": "Touch your security key...",
+    "translation": "",
+    "context": "",
+    "reference": "",
+    "comment": ""
+  },
   {
     "term": "Transform",
     "translation": "",
@@ -14678,20 +14846,6 @@
     "reference": "",
     "comment": ""
   },
-  {
-    "term": "Type to search",
-    "translation": "",
-    "context": "",
-    "reference": "",
-    "comment": ""
-  },
-  {
-    "term": "Type to search apps",
-    "translation": "",
-    "context": "",
-    "reference": "",
-    "comment": ""
-  },
   {
     "term": "Type to search files",
     "translation": "",