diff --git a/quickshell/Common/SettingsData.qml b/quickshell/Common/SettingsData.qml
index b3c4581d..321fdc64 100644
--- a/quickshell/Common/SettingsData.qml
+++ b/quickshell/Common/SettingsData.qml
@@ -1,5 +1,5 @@
 pragma Singleton
-pragma ComponentBehavior
+pragma ComponentBehavior: Bound
 
 import QtCore
 import QtQuick
@@ -200,10 +200,16 @@ Singleton {
     property bool showWorkspaceApps: false
     property bool groupWorkspaceApps: true
     property int maxWorkspaceIcons: 3
-    property bool workspacesPerMonitor: true
+    property bool workspaceFollowFocus: false
     property bool showOccupiedWorkspacesOnly: false
     property bool reverseScrolling: false
     property bool dwlShowAllTags: false
+    property string workspaceColorMode: "default"
+    property string workspaceUnfocusedColorMode: "default"
+    property string workspaceUrgentColorMode: "default"
+    property bool workspaceFocusedBorderEnabled: false
+    property string workspaceFocusedBorderColor: "primary"
+    property int workspaceFocusedBorderThickness: 2
     property var workspaceNameIcons: ({})
     property bool waveProgressEnabled: true
     property bool scrollTitleEnabled: true
diff --git a/quickshell/Common/settings/SettingsSpec.js b/quickshell/Common/settings/SettingsSpec.js
index 15d0d2c0..3b2fd9e8 100644
--- a/quickshell/Common/settings/SettingsSpec.js
+++ b/quickshell/Common/settings/SettingsSpec.js
@@ -94,10 +94,16 @@ var SPEC = {
     showWorkspaceApps: { def: false },
     maxWorkspaceIcons: { def: 3 },
     groupWorkspaceApps: { def: true },
-    workspacesPerMonitor: { def: true },
+    workspaceFollowFocus: { def: false },
     showOccupiedWorkspacesOnly: { def: false },
     reverseScrolling: { def: false },
     dwlShowAllTags: { def: false },
+    workspaceColorMode: { def: "default" },
+    workspaceUnfocusedColorMode: { def: "default" },
+    workspaceUrgentColorMode: { def: "default" },
+    workspaceFocusedBorderEnabled: { def: false },
+    workspaceFocusedBorderColor: { def: "primary" },
+    workspaceFocusedBorderThickness: { def: 2 },
     workspaceNameIcons: { def: {} },
     waveProgressEnabled: { def: true },
     scrollTitleEnabled: { def: true },
diff --git a/quickshell/Modules/DankBar/DankBarContent.qml b/quickshell/Modules/DankBar/DankBarContent.qml
index 7fee50c7..8c797631 100644
--- a/quickshell/Modules/DankBar/DankBarContent.qml
+++ b/quickshell/Modules/DankBar/DankBarContent.qml
@@ -39,7 +39,7 @@ Item {
 
     function getRealWorkspaces() {
         if (CompositorService.isNiri) {
-            if (!barWindow.screenName || !SettingsData.workspacesPerMonitor) {
+            if (!barWindow.screenName || SettingsData.workspaceFollowFocus) {
                 return NiriService.getCurrentOutputWorkspaceNumbers();
             }
             const workspaces = NiriService.allWorkspaces.filter(ws => ws.output === barWindow.screenName).map(ws => ws.idx + 1);
@@ -47,7 +47,7 @@ Item {
         } else if (CompositorService.isHyprland) {
             const workspaces = Hyprland.workspaces?.values || [];
 
-            if (!barWindow.screenName || !SettingsData.workspacesPerMonitor) {
+            if (!barWindow.screenName || SettingsData.workspaceFollowFocus) {
                 const sorted = workspaces.slice().sort((a, b) => a.id - b.id);
                 const filtered = sorted.filter(ws => ws.id > -1);
                 return filtered.length > 0 ? filtered : [
@@ -91,7 +91,7 @@ Item {
                     }
                 ];
 
-            if (!barWindow.screenName || !SettingsData.workspacesPerMonitor) {
+            if (!barWindow.screenName || SettingsData.workspaceFollowFocus) {
                 return workspaces.slice().sort((a, b) => a.num - b.num);
             }
 
@@ -107,7 +107,7 @@ Item {
 
     function getCurrentWorkspace() {
         if (CompositorService.isNiri) {
-            if (!barWindow.screenName || !SettingsData.workspacesPerMonitor) {
+            if (!barWindow.screenName || SettingsData.workspaceFollowFocus) {
                 return NiriService.getCurrentWorkspaceNumber();
             }
             const activeWs = NiriService.allWorkspaces.find(ws => ws.output === barWindow.screenName && ws.is_active);
@@ -125,7 +125,7 @@ Item {
             const activeTags = DwlService.getActiveTags(barWindow.screenName);
             return activeTags.length > 0 ? activeTags[0] : 0;
         } else if (CompositorService.isSway || CompositorService.isScroll) {
-            if (!barWindow.screenName || !SettingsData.workspacesPerMonitor) {
+            if (!barWindow.screenName || SettingsData.workspaceFollowFocus) {
                 const focusedWs = I3.workspaces?.values?.find(ws => ws.focused === true);
                 return focusedWs ? focusedWs.num : 1;
             }
diff --git a/quickshell/Modules/DankBar/Widgets/WorkspaceSwitcher.qml b/quickshell/Modules/DankBar/Widgets/WorkspaceSwitcher.qml
index 93307862..171e21c5 100644
--- a/quickshell/Modules/DankBar/Widgets/WorkspaceSwitcher.qml
+++ b/quickshell/Modules/DankBar/Widgets/WorkspaceSwitcher.qml
@@ -24,6 +24,26 @@ Item {
         return CompositorService.filterCurrentWorkspace(CompositorService.sortedToplevels, screenName);
     }
 
+    readonly property string effectiveScreenName: {
+        if (!SettingsData.workspaceFollowFocus)
+            return root.screenName;
+
+        switch (CompositorService.compositor) {
+        case "niri":
+            return NiriService.currentOutput || root.screenName;
+        case "hyprland":
+            return Hyprland.focusedWorkspace?.monitor?.name || root.screenName;
+        case "dwl":
+            return DwlService.activeOutput || root.screenName;
+        case "sway":
+        case "scroll":
+            const focusedWs = I3.workspaces?.values?.find(ws => ws.focused === true);
+            return focusedWs?.monitor?.name || root.screenName;
+        default:
+            return root.screenName;
+        }
+    }
+
     readonly property bool useExtWorkspace: DMSService.forceExtWorkspace || (!CompositorService.isNiri && !CompositorService.isHyprland && !CompositorService.isDwl && !CompositorService.isSway && !CompositorService.isScroll && ExtWorkspaceService.extWorkspaceAvailable)
 
     Connections {
@@ -94,7 +114,7 @@ Item {
                 }
             ];
 
-        if (!root.screenName || !SettingsData.workspacesPerMonitor) {
+        if (!root.screenName || SettingsData.workspaceFollowFocus) {
             return workspaces.slice().sort((a, b) => a.num - b.num);
         }
 
@@ -107,7 +127,7 @@ Item {
     }
 
     function getSwayActiveWorkspace() {
-        if (!root.screenName || !SettingsData.workspacesPerMonitor) {
+        if (!root.screenName || SettingsData.workspaceFollowFocus) {
             const focusedWs = I3.workspaces?.values?.find(ws => ws.focused === true);
             return focusedWs ? focusedWs.num : 1;
         }
@@ -137,7 +157,7 @@ Item {
             ];
         }
 
-        if (!root.screenName || !SettingsData.workspacesPerMonitor) {
+        if (!root.screenName || SettingsData.workspaceFollowFocus) {
             filtered = filtered.slice().sort((a, b) => a.id - b.id);
         } else {
             const monitorWorkspaces = filtered.filter(ws => ws.monitor?.name === root.screenName);
@@ -163,7 +183,7 @@ Item {
     }
 
     function getHyprlandActiveWorkspace() {
-        if (!root.screenName || !SettingsData.workspacesPerMonitor) {
+        if (!root.screenName || SettingsData.workspaceFollowFocus) {
             return Hyprland.focusedWorkspace?.id || 1;
         }
 
@@ -183,7 +203,7 @@ Item {
             if (wsNumber <= 0) {
                 return [];
             }
-            const workspace = NiriService.allWorkspaces.find(w => w.idx + 1 === wsNumber && w.output === root.screenName);
+            const workspace = NiriService.allWorkspaces.find(w => w.idx + 1 === wsNumber && w.output === root.effectiveScreenName);
             if (!workspace) {
                 return [];
             }
@@ -211,7 +231,7 @@ Item {
             const focusedWs = I3.workspaces?.values?.find(ws => ws.focused === true);
             isActiveWs = focusedWs ? (focusedWs.num === targetWorkspaceId) : false;
         } else if (CompositorService.isDwl) {
-            const output = DwlService.getOutputState(root.screenName);
+            const output = DwlService.getOutputState(root.effectiveScreenName);
             if (output && output.tags) {
                 const tag = output.tags.find(t => t.tag === targetWorkspaceId);
                 isActiveWs = tag ? (tag.state === 1) : false;
@@ -308,7 +328,7 @@ Item {
         }
 
         let workspaces;
-        if (!root.screenName || !SettingsData.workspacesPerMonitor) {
+        if (!root.screenName || SettingsData.workspaceFollowFocus) {
             workspaces = NiriService.getCurrentOutputWorkspaceNumbers();
         } else {
             const displayWorkspaces = NiriService.allWorkspaces.filter(ws => ws.output === root.screenName).map(ws => ws.idx + 1);
@@ -320,7 +340,7 @@ Item {
         }
 
         return workspaces.filter(wsNum => {
-            const workspace = NiriService.allWorkspaces.find(w => w.idx + 1 === wsNum && w.output === root.screenName);
+            const workspace = NiriService.allWorkspaces.find(w => w.idx + 1 === wsNum && w.output === root.effectiveScreenName);
             if (!workspace)
                 return false;
             if (workspace.is_active)
@@ -334,7 +354,7 @@ Item {
             return 1;
         }
 
-        if (!root.screenName || !SettingsData.workspacesPerMonitor) {
+        if (!root.screenName || SettingsData.workspaceFollowFocus) {
             return NiriService.getCurrentWorkspaceNumber();
         }
 
@@ -343,14 +363,13 @@ Item {
     }
 
     function getDwlTags() {
-        if (!DwlService.dwlAvailable) {
+        if (!DwlService.dwlAvailable)
             return [];
-        }
 
-        const output = DwlService.getOutputState(root.screenName);
-        if (!output || !output.tags || output.tags.length === 0) {
+        const targetScreen = root.effectiveScreenName;
+        const output = DwlService.getOutputState(targetScreen);
+        if (!output || !output.tags || output.tags.length === 0)
             return [];
-        }
 
         if (SettingsData.dwlShowAllTags) {
             return output.tags.map(tag => ({
@@ -361,7 +380,7 @@ Item {
                     }));
         }
 
-        const visibleTagIndices = DwlService.getVisibleTags(root.screenName);
+        const visibleTagIndices = DwlService.getVisibleTags(targetScreen);
         return visibleTagIndices.map(tagIndex => {
             const tagData = output.tags.find(t => t.tag === tagIndex);
             return {
@@ -374,12 +393,10 @@ Item {
     }
 
     function getDwlActiveTags() {
-        if (!DwlService.dwlAvailable) {
+        if (!DwlService.dwlAvailable)
             return [];
-        }
 
-        const activeTags = DwlService.getActiveTags(root.screenName);
-        return activeTags;
+        return DwlService.getActiveTags(root.effectiveScreenName);
     }
 
     function getExtWorkspaceWorkspaces() {
@@ -790,6 +807,68 @@ Item {
                 readonly property real visualWidth: baseWidth + iconsExtraWidth
                 readonly property real visualHeight: baseHeight + iconsExtraHeight
 
+                readonly property color unfocusedColor: {
+                    switch (SettingsData.workspaceUnfocusedColorMode) {
+                    case "s":
+                        return Theme.surface;
+                    case "sc":
+                        return Theme.surfaceContainer;
+                    case "sch":
+                        return Theme.surfaceContainerHigh;
+                    default:
+                        return Theme.surfaceTextAlpha;
+                    }
+                }
+
+                readonly property color activeColor: {
+                    switch (SettingsData.workspaceColorMode) {
+                    case "s":
+                        return Theme.surface;
+                    case "sc":
+                        return Theme.surfaceContainer;
+                    case "sch":
+                        return Theme.surfaceContainerHigh;
+                    case "none":
+                        return unfocusedColor;
+                    default:
+                        return Theme.primary;
+                    }
+                }
+
+                readonly property color urgentColor: {
+                    switch (SettingsData.workspaceUrgentColorMode) {
+                    case "primary":
+                        return Theme.primary;
+                    case "secondary":
+                        return Theme.secondary;
+                    case "s":
+                        return Theme.surface;
+                    case "sc":
+                        return Theme.surfaceContainer;
+                    default:
+                        return Theme.error;
+                    }
+                }
+
+                readonly property color focusedBorderColor: {
+                    switch (SettingsData.workspaceFocusedBorderColor) {
+                    case "surfaceText":
+                        return Theme.surfaceText;
+                    case "secondary":
+                        return Theme.secondary;
+                    default:
+                        return Theme.primary;
+                    }
+                }
+
+                function getContrastingIconColor(bgColor) {
+                    const luminance = 0.299 * bgColor.r + 0.587 * bgColor.g + 0.114 * bgColor.b;
+                    return luminance > 0.4 ? Qt.rgba(0.15, 0.15, 0.15, 1) : Qt.rgba(0.8, 0.8, 0.8, 1);
+                }
+
+                readonly property color quickshellIconActiveColor: getContrastingIconColor(activeColor)
+                readonly property color quickshellIconInactiveColor: getContrastingIconColor(unfocusedColor)
+
                 MouseArea {
                     id: mouseArea
                     anchors.fill: parent
@@ -850,7 +929,7 @@ Item {
                         if (root.useExtWorkspace) {
                             wsData = modelData;
                         } else if (CompositorService.isNiri) {
-                            wsData = NiriService.allWorkspaces.find(ws => ws.idx + 1 === modelData && ws.output === root.screenName) || null;
+                            wsData = NiriService.allWorkspaces.find(ws => ws.idx + 1 === modelData && ws.output === root.effectiveScreenName) || null;
                         } else if (CompositorService.isHyprland) {
                             wsData = modelData;
                         } else if (CompositorService.isDwl) {
@@ -892,16 +971,61 @@ Item {
                 width: root.isVertical ? root.barThickness : visualWidth
                 height: root.isVertical ? visualHeight : root.barThickness
 
+                Rectangle {
+                    id: focusedBorderRing
+                    anchors.centerIn: parent
+                    width: {
+                        const borderWidth = (SettingsData.workspaceFocusedBorderEnabled && isActive && !isPlaceholder) ? SettingsData.workspaceFocusedBorderThickness : 0;
+                        return delegateRoot.visualWidth + borderWidth * 2;
+                    }
+                    height: {
+                        const borderWidth = (SettingsData.workspaceFocusedBorderEnabled && isActive && !isPlaceholder) ? SettingsData.workspaceFocusedBorderThickness : 0;
+                        return delegateRoot.visualHeight + borderWidth * 2;
+                    }
+                    radius: Theme.cornerRadius
+                    color: "transparent"
+                    border.width: (SettingsData.workspaceFocusedBorderEnabled && isActive && !isPlaceholder) ? SettingsData.workspaceFocusedBorderThickness : 0
+                    border.color: (SettingsData.workspaceFocusedBorderEnabled && isActive && !isPlaceholder) ? focusedBorderColor : "transparent"
+
+                    Behavior on width {
+                        NumberAnimation {
+                            duration: Theme.mediumDuration
+                            easing.type: Theme.emphasizedEasing
+                        }
+                    }
+
+                    Behavior on height {
+                        NumberAnimation {
+                            duration: Theme.mediumDuration
+                            easing.type: Theme.emphasizedEasing
+                        }
+                    }
+
+                    Behavior on border.width {
+                        NumberAnimation {
+                            duration: Theme.mediumDuration
+                            easing.type: Theme.emphasizedEasing
+                        }
+                    }
+
+                    Behavior on border.color {
+                        ColorAnimation {
+                            duration: Theme.mediumDuration
+                            easing.type: Theme.emphasizedEasing
+                        }
+                    }
+                }
+
                 Rectangle {
                     id: visualContent
                     width: delegateRoot.visualWidth
                     height: delegateRoot.visualHeight
                     anchors.centerIn: parent
                     radius: Theme.cornerRadius
-                    color: isActive ? Theme.primary : isUrgent ? Theme.error : isPlaceholder ? Theme.surfaceTextLight : isHovered ? Theme.withAlpha(Theme.surfaceText, 0.45) : Theme.surfaceTextAlpha
+                    color: isActive ? activeColor : isUrgent ? urgentColor : isPlaceholder ? Theme.surfaceTextLight : isHovered ? Theme.withAlpha(unfocusedColor, 0.7) : unfocusedColor
 
                     border.width: isUrgent ? 2 : 0
-                    border.color: isUrgent ? Theme.error : Theme.withAlpha(Theme.error, 0)
+                    border.color: isUrgent ? urgentColor : "transparent"
 
                     Behavior on width {
                         NumberAnimation {
@@ -1025,7 +1149,7 @@ Item {
                                                 layer.effect: MultiEffect {
                                                     saturation: 0
                                                     colorization: 1
-                                                    colorizationColor: isActive ? Theme.primaryContainer : Theme.primary
+                                                    colorizationColor: isActive ? quickshellIconActiveColor : quickshellIconInactiveColor
                                                 }
                                             }
 
@@ -1128,7 +1252,7 @@ Item {
                                                 layer.effect: MultiEffect {
                                                     saturation: 0
                                                     colorization: 1
-                                                    colorizationColor: isActive ? Theme.primaryContainer : Theme.primary
+                                                    colorizationColor: isActive ? quickshellIconActiveColor : quickshellIconInactiveColor
                                                 }
                                             }
 
diff --git a/quickshell/Modules/Settings/DesktopWidgetBrowser.qml b/quickshell/Modules/Settings/DesktopWidgetBrowser.qml
index 0f3017de..9680b953 100644
--- a/quickshell/Modules/Settings/DesktopWidgetBrowser.qml
+++ b/quickshell/Modules/Settings/DesktopWidgetBrowser.qml
@@ -1,4 +1,4 @@
-pragma ComponentBehavior
+pragma ComponentBehavior: Bound
 
 import QtQuick
 import Quickshell
diff --git a/quickshell/Modules/Settings/WorkspacesTab.qml b/quickshell/Modules/Settings/WorkspacesTab.qml
index d3b5bea3..6eccab82 100644
--- a/quickshell/Modules/Settings/WorkspacesTab.qml
+++ b/quickshell/Modules/Settings/WorkspacesTab.qml
@@ -114,12 +114,13 @@ Item {
                 }
 
                 SettingsToggleRow {
-                    settingKey: "workspacesPerMonitor"
-                    tags: ["workspace", "per-monitor", "multi-monitor"]
-                    text: I18n.tr("Per-Monitor Workspaces")
-                    description: I18n.tr("Show only workspaces belonging to each specific monitor.")
-                    checked: SettingsData.workspacesPerMonitor
-                    onToggled: checked => SettingsData.set("workspacesPerMonitor", checked)
+                    settingKey: "workspaceFollowFocus"
+                    tags: ["workspace", "focus", "follow", "monitor"]
+                    text: I18n.tr("Follow Monitor Focus")
+                    description: I18n.tr("Show workspaces of the currently focused monitor")
+                    checked: SettingsData.workspaceFollowFocus
+                    visible: CompositorService.isNiri || CompositorService.isHyprland || CompositorService.isDwl || CompositorService.isSway || CompositorService.isScroll
+                    onToggled: checked => SettingsData.set("workspaceFollowFocus", checked)
                 }
 
                 SettingsToggleRow {
@@ -153,6 +154,189 @@ Item {
                 }
             }
 
+            SettingsCard {
+                width: parent.width
+                iconName: "palette"
+                title: I18n.tr("Workspace Appearance")
+                settingKey: "workspaceAppearance"
+
+                SettingsButtonGroupRow {
+                    text: I18n.tr("Focused Color")
+                    model: ["pri", "s", "sc", "sch", "none"]
+                    buttonHeight: 22
+                    minButtonWidth: 36
+                    buttonPadding: Theme.spacingS
+                    checkIconSize: Theme.iconSizeSmall - 2
+                    textSize: Theme.fontSizeSmall - 1
+                    spacing: 1
+                    currentIndex: {
+                        switch (SettingsData.workspaceColorMode) {
+                        case "s":
+                            return 1;
+                        case "sc":
+                            return 2;
+                        case "sch":
+                            return 3;
+                        case "none":
+                            return 4;
+                        default:
+                            return 0;
+                        }
+                    }
+                    onSelectionChanged: (index, selected) => {
+                        if (!selected)
+                            return;
+                        const modes = ["default", "s", "sc", "sch", "none"];
+                        SettingsData.set("workspaceColorMode", modes[index]);
+                    }
+                }
+
+                Rectangle {
+                    width: parent.width
+                    height: 1
+                    color: Theme.outline
+                    opacity: 0.15
+                }
+
+                SettingsButtonGroupRow {
+                    text: I18n.tr("Unfocused Color")
+                    model: ["def", "s", "sc", "sch"]
+                    buttonHeight: 22
+                    minButtonWidth: 36
+                    buttonPadding: Theme.spacingS
+                    checkIconSize: Theme.iconSizeSmall - 2
+                    textSize: Theme.fontSizeSmall - 1
+                    spacing: 1
+                    currentIndex: {
+                        switch (SettingsData.workspaceUnfocusedColorMode) {
+                        case "s":
+                            return 1;
+                        case "sc":
+                            return 2;
+                        case "sch":
+                            return 3;
+                        default:
+                            return 0;
+                        }
+                    }
+                    onSelectionChanged: (index, selected) => {
+                        if (!selected)
+                            return;
+                        const modes = ["default", "s", "sc", "sch"];
+                        SettingsData.set("workspaceUnfocusedColorMode", modes[index]);
+                    }
+                }
+
+                Rectangle {
+                    width: parent.width
+                    height: 1
+                    color: Theme.outline
+                    opacity: 0.15
+                    visible: CompositorService.isNiri || CompositorService.isHyprland || CompositorService.isDwl || CompositorService.isSway || CompositorService.isScroll
+                }
+
+                SettingsButtonGroupRow {
+                    text: I18n.tr("Urgent Color")
+                    visible: CompositorService.isNiri || CompositorService.isHyprland || CompositorService.isDwl || CompositorService.isSway || CompositorService.isScroll
+                    model: ["err", "pri", "sec", "s", "sc"]
+                    buttonHeight: 22
+                    minButtonWidth: 36
+                    buttonPadding: Theme.spacingS
+                    checkIconSize: Theme.iconSizeSmall - 2
+                    textSize: Theme.fontSizeSmall - 1
+                    spacing: 1
+                    currentIndex: {
+                        switch (SettingsData.workspaceUrgentColorMode) {
+                        case "primary":
+                            return 1;
+                        case "secondary":
+                            return 2;
+                        case "s":
+                            return 3;
+                        case "sc":
+                            return 4;
+                        default:
+                            return 0;
+                        }
+                    }
+                    onSelectionChanged: (index, selected) => {
+                        if (!selected)
+                            return;
+                        const modes = ["default", "primary", "secondary", "s", "sc"];
+                        SettingsData.set("workspaceUrgentColorMode", modes[index]);
+                    }
+                }
+
+                Rectangle {
+                    width: parent.width
+                    height: 1
+                    color: Theme.outline
+                    opacity: 0.15
+                }
+
+                SettingsToggleRow {
+                    settingKey: "workspaceFocusedBorderEnabled"
+                    tags: ["workspace", "border", "outline", "focused", "ring"]
+                    text: I18n.tr("Focused Border")
+                    description: I18n.tr("Show an outline ring around the focused workspace indicator")
+                    checked: SettingsData.workspaceFocusedBorderEnabled
+                    onToggled: checked => SettingsData.set("workspaceFocusedBorderEnabled", checked)
+                }
+
+                Column {
+                    width: parent.width
+                    spacing: Theme.spacingS
+                    visible: SettingsData.workspaceFocusedBorderEnabled
+                    leftPadding: Theme.spacingM
+
+                    SettingsButtonGroupRow {
+                        width: parent.width - parent.leftPadding
+                        text: I18n.tr("Border Color")
+                        model: [I18n.tr("Surface"), I18n.tr("Secondary"), I18n.tr("Primary")]
+                        currentIndex: {
+                            switch (SettingsData.workspaceFocusedBorderColor) {
+                            case "surfaceText":
+                                return 0;
+                            case "secondary":
+                                return 1;
+                            case "primary":
+                                return 2;
+                            default:
+                                return 2;
+                            }
+                        }
+                        onSelectionChanged: (index, selected) => {
+                            if (!selected)
+                                return;
+                            let newColor = "primary";
+                            switch (index) {
+                            case 0:
+                                newColor = "surfaceText";
+                                break;
+                            case 1:
+                                newColor = "secondary";
+                                break;
+                            case 2:
+                                newColor = "primary";
+                                break;
+                            }
+                            SettingsData.set("workspaceFocusedBorderColor", newColor);
+                        }
+                    }
+
+                    SettingsSliderRow {
+                        width: parent.width - parent.leftPadding
+                        text: I18n.tr("Thickness")
+                        value: SettingsData.workspaceFocusedBorderThickness
+                        minimum: 1
+                        maximum: 6
+                        unit: "px"
+                        defaultValue: 2
+                        onSliderValueChanged: newValue => SettingsData.set("workspaceFocusedBorderThickness", newValue)
+                    }
+                }
+            }
+
             SettingsCard {
                 width: parent.width
                 iconName: "label"
diff --git a/quickshell/Services/KeybindsService.qml b/quickshell/Services/KeybindsService.qml
index 2a1633c7..662df557 100644
--- a/quickshell/Services/KeybindsService.qml
+++ b/quickshell/Services/KeybindsService.qml
@@ -1,5 +1,5 @@
 pragma Singleton
-pragma ComponentBehavior
+pragma ComponentBehavior: Bound
 
 import QtCore
 import QtQuick
diff --git a/quickshell/Services/NiriService.qml b/quickshell/Services/NiriService.qml
index c6e27151..e6458667 100644
--- a/quickshell/Services/NiriService.qml
+++ b/quickshell/Services/NiriService.qml
@@ -1,5 +1,5 @@
 pragma Singleton
-pragma ComponentBehavior
+pragma ComponentBehavior: Bound
 
 import QtCore
 import QtQuick
diff --git a/quickshell/Widgets/KeybindItem.qml b/quickshell/Widgets/KeybindItem.qml
index de6b1542..d34e6d3a 100644
--- a/quickshell/Widgets/KeybindItem.qml
+++ b/quickshell/Widgets/KeybindItem.qml
@@ -1,4 +1,4 @@
-pragma ComponentBehavior
+pragma ComponentBehavior: Bound
 
 import QtQuick
 import QtQuick.Layouts
diff --git a/quickshell/translations/en.json b/quickshell/translations/en.json
index 140e3dba..2e287dd2 100644
--- a/quickshell/translations/en.json
+++ b/quickshell/translations/en.json
@@ -2,7 +2,7 @@
   {
     "term": "%1 DMS bind(s) may be overridden by config binds that come after the include.",
     "context": "%1 DMS bind(s) may be overridden by config binds that come after the include.",
-    "reference": "Modules/Settings/KeybindsTab.qml:322",
+    "reference": "Modules/Settings/KeybindsTab.qml:328",
     "comment": ""
   },
   {
@@ -44,7 +44,7 @@
   {
     "term": "%1 exists but is not included in config. Custom keybinds will not work until this is fixed.",
     "context": "%1 exists but is not included in config. Custom keybinds will not work until this is fixed.",
-    "reference": "Modules/Settings/KeybindsTab.qml:319",
+    "reference": "Modules/Settings/KeybindsTab.qml:325",
     "comment": ""
   },
   {
@@ -68,7 +68,7 @@
   {
     "term": "%1 notifications",
     "context": "%1 notifications",
-    "reference": "Modules/Lock/LockScreenContent.qml:446",
+    "reference": "Modules/Lock/LockScreenContent.qml:453",
     "comment": ""
   },
   {
@@ -104,7 +104,7 @@
   {
     "term": "+ %1 more",
     "context": "+ %1 more",
-    "reference": "Modules/Lock/LockScreenContent.qml:526, Modules/Lock/LockScreenContent.qml:641",
+    "reference": "Modules/Lock/LockScreenContent.qml:533, Modules/Lock/LockScreenContent.qml:648",
     "comment": ""
   },
   {
@@ -134,7 +134,7 @@
   {
     "term": "1 notification",
     "context": "1 notification",
-    "reference": "Modules/Lock/LockScreenContent.qml:446",
+    "reference": "Modules/Lock/LockScreenContent.qml:453",
     "comment": ""
   },
   {
@@ -338,7 +338,7 @@
   {
     "term": "Action",
     "context": "Action",
-    "reference": "Widgets/KeybindItem.qml:889, Widgets/KeybindItem.qml:1084",
+    "reference": "Widgets/KeybindItem.qml:895, Widgets/KeybindItem.qml:1090",
     "comment": ""
   },
   {
@@ -398,7 +398,7 @@
   {
     "term": "Add",
     "context": "Add",
-    "reference": "Widgets/KeybindItem.qml:1677, Modules/Plugins/ListSettingWithInput.qml:126",
+    "reference": "Widgets/KeybindItem.qml:1683, Modules/Plugins/ListSettingWithInput.qml:126",
     "comment": ""
   },
   {
@@ -422,7 +422,7 @@
   {
     "term": "Add Widget",
     "context": "Add Widget",
-    "reference": "Modules/Settings/WidgetsTabSection.qml:767, Modules/Settings/WidgetSelectionPopup.qml:92, Modules/Settings/DesktopWidgetsTab.qml:65, Modules/ControlCenter/Components/EditControls.qml:61, Modules/ControlCenter/Components/EditControls.qml:164",
+    "reference": "Modules/Settings/WidgetsTabSection.qml:767, Modules/Settings/WidgetSelectionPopup.qml:92, Modules/Settings/DesktopWidgetsTab.qml:69, Modules/ControlCenter/Components/EditControls.qml:61, Modules/ControlCenter/Components/EditControls.qml:164",
     "comment": ""
   },
   {
@@ -446,7 +446,7 @@
   {
     "term": "Add and configure widgets that appear on your desktop",
     "context": "Add and configure widgets that appear on your desktop",
-    "reference": "Modules/Settings/DesktopWidgetsTab.qml:55",
+    "reference": "Modules/Settings/DesktopWidgetsTab.qml:58",
     "comment": ""
   },
   {
@@ -470,7 +470,7 @@
   {
     "term": "All",
     "context": "notification history filter",
-    "reference": "Services/AppSearchService.qml:514, Services/AppSearchService.qml:528, Modules/AppDrawer/CategorySelector.qml:11, Modules/AppDrawer/AppLauncher.qml:14, Modules/AppDrawer/AppLauncher.qml:47, Modules/AppDrawer/AppLauncher.qml:48, Modules/AppDrawer/AppLauncher.qml:90, Modules/AppDrawer/AppLauncher.qml:295, Modules/AppDrawer/AppDrawerPopout.qml:58, Modules/Settings/KeybindsTab.qml:380, Modules/Settings/DisplayConfig/NiriOutputSettings.qml:94, Modules/Settings/DisplayConfig/NiriOutputSettings.qml:97, Modules/Settings/DisplayConfig/NiriOutputSettings.qml:109, Modules/Notifications/Center/HistoryNotificationList.qml:86",
+    "reference": "Services/AppSearchService.qml:514, Services/AppSearchService.qml:528, Modules/AppDrawer/CategorySelector.qml:11, Modules/AppDrawer/AppLauncher.qml:14, Modules/AppDrawer/AppLauncher.qml:47, Modules/AppDrawer/AppLauncher.qml:48, Modules/AppDrawer/AppLauncher.qml:90, Modules/AppDrawer/AppLauncher.qml:295, Modules/AppDrawer/AppDrawerPopout.qml:58, Modules/Settings/KeybindsTab.qml:387, Modules/Settings/DisplayConfig/NiriOutputSettings.qml:94, Modules/Settings/DisplayConfig/NiriOutputSettings.qml:97, Modules/Settings/DisplayConfig/NiriOutputSettings.qml:109, Modules/Notifications/Center/HistoryNotificationList.qml:86",
     "comment": ""
   },
   {
@@ -494,7 +494,7 @@
   {
     "term": "All displays",
     "context": "All displays",
-    "reference": "Modules/Plugins/PluginSettings.qml:237, Modules/Settings/DisplayWidgetsTab.qml:386, Modules/Settings/DankBarTab.qml:403, Modules/Settings/DankBarTab.qml:522, Modules/Settings/Widgets/SettingsDisplayPicker.qml:43",
+    "reference": "Modules/Plugins/PluginSettings.qml:237, Modules/Settings/DisplayWidgetsTab.qml:400, Modules/Settings/DankBarTab.qml:403, Modules/Settings/DankBarTab.qml:522, Modules/Settings/Widgets/SettingsDisplayPicker.qml:43",
     "comment": ""
   },
   {
@@ -536,13 +536,13 @@
   {
     "term": "Always show when there's only one connected display",
     "context": "Always show when there's only one connected display",
-    "reference": "Modules/Settings/DisplayWidgetsTab.qml:408",
+    "reference": "Modules/Settings/DisplayWidgetsTab.qml:422",
     "comment": ""
   },
   {
     "term": "Amount",
     "context": "Amount",
-    "reference": "Widgets/KeybindItem.qml:933",
+    "reference": "Widgets/KeybindItem.qml:939",
     "comment": ""
   },
   {
@@ -602,7 +602,7 @@
   {
     "term": "Application Dock",
     "context": "Application Dock",
-    "reference": "Modules/Settings/DisplayWidgetsTab.qml:28",
+    "reference": "Modules/Settings/DisplayWidgetsTab.qml:31",
     "comment": ""
   },
   {
@@ -920,13 +920,13 @@
   {
     "term": "Available Plugins",
     "context": "Available Plugins",
-    "reference": "Modules/Settings/PluginsTab.qml:284",
+    "reference": "Modules/Settings/PluginsTab.qml:299",
     "comment": ""
   },
   {
     "term": "Available Screens (%1)",
     "context": "Available Screens (%1)",
-    "reference": "Modules/Settings/DisplayWidgetsTab.qml:193",
+    "reference": "Modules/Settings/DisplayWidgetsTab.qml:199",
     "comment": ""
   },
   {
@@ -1028,7 +1028,7 @@
   {
     "term": "Binds Include Missing",
     "context": "Binds Include Missing",
-    "reference": "Modules/Settings/KeybindsTab.qml:303",
+    "reference": "Modules/Settings/KeybindsTab.qml:309",
     "comment": ""
   },
   {
@@ -1106,7 +1106,7 @@
   {
     "term": "Border Color",
     "context": "Border Color",
-    "reference": "Modules/Settings/DockTab.qml:224",
+    "reference": "Modules/Settings/DockTab.qml:224, Modules/Settings/WorkspacesTab.qml:294",
     "comment": ""
   },
   {
@@ -1154,7 +1154,7 @@
   {
     "term": "Bottom dock for pinned and running applications",
     "context": "Bottom dock for pinned and running applications",
-    "reference": "Modules/Settings/DisplayWidgetsTab.qml:29",
+    "reference": "Modules/Settings/DisplayWidgetsTab.qml:32",
     "comment": ""
   },
   {
@@ -1184,13 +1184,13 @@
   {
     "term": "Browse",
     "context": "Browse",
-    "reference": "Modules/Settings/PluginsTab.qml:198",
+    "reference": "Modules/Settings/PluginsTab.qml:208",
     "comment": ""
   },
   {
     "term": "Browse Plugins",
     "context": "plugin browser header | plugin browser window title",
-    "reference": "Modules/Settings/PluginBrowser.qml:138, Modules/Settings/PluginBrowser.qml:248, Modules/Settings/DesktopWidgetsTab.qml:71",
+    "reference": "Modules/Settings/PluginBrowser.qml:138, Modules/Settings/PluginBrowser.qml:248, Modules/Settings/DesktopWidgetsTab.qml:75",
     "comment": ""
   },
   {
@@ -1274,7 +1274,7 @@
   {
     "term": "Cancel",
     "context": "Cancel",
-    "reference": "Modals/BluetoothPairingModal.qml:272, Modals/PolkitAuthModal.qml:292, Modals/WifiPasswordModal.qml:736, Widgets/KeybindItem.qml:1661, Modals/FileBrowser/FileBrowserOverwriteDialog.qml:83, Modules/Settings/PluginBrowser.qml:113, Modules/Settings/PluginBrowser.qml:772, Modules/Settings/ThemeBrowser.qml:120",
+    "reference": "Modals/BluetoothPairingModal.qml:272, Modals/PolkitAuthModal.qml:292, Modals/WifiPasswordModal.qml:736, Widgets/KeybindItem.qml:1667, Modals/FileBrowser/FileBrowserOverwriteDialog.qml:83, Modules/Settings/PluginBrowser.qml:113, Modules/Settings/PluginBrowser.qml:772, Modules/Settings/ThemeBrowser.qml:120",
     "comment": ""
   },
   {
@@ -1484,7 +1484,7 @@
   {
     "term": "Click 'Setup' to create %1 and add include to config.",
     "context": "Click 'Setup' to create %1 and add include to config.",
-    "reference": "Modules/Settings/KeybindsTab.qml:317",
+    "reference": "Modules/Settings/KeybindsTab.qml:323",
     "comment": ""
   },
   {
@@ -1508,13 +1508,13 @@
   {
     "term": "Click any shortcut to edit. Changes save to %1",
     "context": "Click any shortcut to edit. Changes save to %1",
-    "reference": "Modules/Settings/KeybindsTab.qml:217",
+    "reference": "Modules/Settings/KeybindsTab.qml:222",
     "comment": ""
   },
   {
     "term": "Click to capture",
     "context": "Click to capture",
-    "reference": "Widgets/KeybindItem.qml:611",
+    "reference": "Widgets/KeybindItem.qml:616",
     "comment": ""
   },
   {
@@ -1664,7 +1664,7 @@
   {
     "term": "Command",
     "context": "Command",
-    "reference": "Widgets/KeybindItem.qml:1390, Modules/Settings/DesktopWidgetInstanceCard.qml:280",
+    "reference": "Widgets/KeybindItem.qml:1396, Modules/Settings/DesktopWidgetInstanceCard.qml:281",
     "comment": ""
   },
   {
@@ -1718,7 +1718,7 @@
   {
     "term": "Config action: %1",
     "context": "Config action: %1",
-    "reference": "Widgets/KeybindItem.qml:460",
+    "reference": "Widgets/KeybindItem.qml:465",
     "comment": ""
   },
   {
@@ -1766,13 +1766,13 @@
   {
     "term": "Configure icons for named workspaces. Icons take priority over numbers when both are enabled.",
     "context": "Configure icons for named workspaces. Icons take priority over numbers when both are enabled.",
-    "reference": "Modules/Settings/WorkspacesTab.qml:165",
+    "reference": "Modules/Settings/WorkspacesTab.qml:349",
     "comment": ""
   },
   {
     "term": "Configure which displays show shell components",
     "context": "Configure which displays show shell components",
-    "reference": "Modules/Settings/DisplayWidgetsTab.qml:171",
+    "reference": "Modules/Settings/DisplayWidgetsTab.qml:176",
     "comment": ""
   },
   {
@@ -1802,7 +1802,7 @@
   {
     "term": "Conflicts with: %1",
     "context": "Conflicts with: %1",
-    "reference": "Widgets/KeybindItem.qml:769",
+    "reference": "Widgets/KeybindItem.qml:774",
     "comment": ""
   },
   {
@@ -1838,7 +1838,7 @@
   {
     "term": "Connected Displays",
     "context": "Connected Displays",
-    "reference": "Modules/Settings/DisplayWidgetsTab.qml:164",
+    "reference": "Modules/Settings/DisplayWidgetsTab.qml:167",
     "comment": ""
   },
   {
@@ -1892,13 +1892,13 @@
   {
     "term": "Cooldown",
     "context": "Cooldown",
-    "reference": "Widgets/KeybindItem.qml:1582",
+    "reference": "Widgets/KeybindItem.qml:1588",
     "comment": ""
   },
   {
     "term": "Copied to clipboard",
     "context": "Copied to clipboard",
-    "reference": "dms-plugins/DankLauncherKeys/DankLauncherKeys.qml:154, Modals/Settings/SettingsModal.qml:286, Modals/Settings/SettingsModal.qml:303, Modals/Clipboard/ClipboardHistoryModal.qml:150, Modules/Settings/DesktopWidgetInstanceCard.qml:318",
+    "reference": "dms-plugins/DankLauncherKeys/DankLauncherKeys.qml:154, Modals/Settings/SettingsModal.qml:286, Modals/Settings/SettingsModal.qml:303, Modals/Clipboard/ClipboardHistoryModal.qml:150, Modules/Settings/DesktopWidgetInstanceCard.qml:321",
     "comment": ""
   },
   {
@@ -1958,7 +1958,7 @@
   {
     "term": "Create Dir",
     "context": "Create Dir",
-    "reference": "Modules/Settings/PluginsTab.qml:220",
+    "reference": "Modules/Settings/PluginsTab.qml:230",
     "comment": ""
   },
   {
@@ -2066,7 +2066,7 @@
   {
     "term": "Custom",
     "context": "Custom",
-    "reference": "Widgets/KeybindItem.qml:1327, dms-plugins/DankDesktopWeather/DankDesktopWeatherSettings.qml:47, Modules/Settings/TypographyMotionTab.qml:225, Modules/Settings/LauncherTab.qml:73, Modules/Settings/LauncherTab.qml:179, Modules/Settings/Widgets/SettingsColorPicker.qml:52",
+    "reference": "Widgets/KeybindItem.qml:1333, dms-plugins/DankDesktopWeather/DankDesktopWeatherSettings.qml:47, Modules/Settings/TypographyMotionTab.qml:225, Modules/Settings/LauncherTab.qml:73, Modules/Settings/LauncherTab.qml:179, Modules/Settings/Widgets/SettingsColorPicker.qml:52",
     "comment": ""
   },
   {
@@ -2174,13 +2174,13 @@
   {
     "term": "DEMO MODE - Click anywhere to exit",
     "context": "DEMO MODE - Click anywhere to exit",
-    "reference": "Modules/Lock/LockScreenContent.qml:1098",
+    "reference": "Modules/Lock/LockScreenContent.qml:1105",
     "comment": ""
   },
   {
     "term": "DMS Plugin Manager Unavailable",
     "context": "DMS Plugin Manager Unavailable",
-    "reference": "Modules/Settings/PluginsTab.qml:106",
+    "reference": "Modules/Settings/PluginsTab.qml:114",
     "comment": ""
   },
   {
@@ -2204,7 +2204,7 @@
   {
     "term": "DMS shell actions (launcher, clipboard, etc.)",
     "context": "DMS shell actions (launcher, clipboard, etc.)",
-    "reference": "Widgets/KeybindItem.qml:802",
+    "reference": "Widgets/KeybindItem.qml:808",
     "comment": ""
   },
   {
@@ -2396,19 +2396,19 @@
   {
     "term": "Desktop Widget",
     "context": "Desktop Widget",
-    "reference": "Modules/Settings/PluginListItem.qml:158",
+    "reference": "Modules/Settings/PluginListItem.qml:161",
     "comment": ""
   },
   {
     "term": "Desktop Widgets",
     "context": "Desktop Widgets",
-    "reference": "Modals/Settings/SettingsSidebar.qml:167, Modules/Settings/DesktopWidgetsTab.qml:46",
+    "reference": "Modals/Settings/SettingsSidebar.qml:167, Modules/Settings/DesktopWidgetsTab.qml:49",
     "comment": ""
   },
   {
     "term": "Desktop background images",
     "context": "Desktop background images",
-    "reference": "Modules/Settings/DisplayWidgetsTab.qml:41",
+    "reference": "Modules/Settings/DisplayWidgetsTab.qml:44",
     "comment": ""
   },
   {
@@ -2426,7 +2426,7 @@
   {
     "term": "Device",
     "context": "Device",
-    "reference": "Widgets/KeybindItem.qml:980, Modules/ProcessList/SystemTab.qml:420, Modules/Settings/PrinterTab.qml:279",
+    "reference": "Widgets/KeybindItem.qml:986, Modules/ProcessList/SystemTab.qml:420, Modules/Settings/PrinterTab.qml:279",
     "comment": ""
   },
   {
@@ -2540,7 +2540,7 @@
   {
     "term": "Display Name Format",
     "context": "Display Name Format",
-    "reference": "Modules/Settings/DisplayWidgetsTab.qml:210",
+    "reference": "Modules/Settings/DisplayWidgetsTab.qml:217",
     "comment": ""
   },
   {
@@ -2600,7 +2600,7 @@
   {
     "term": "Display only workspaces that contain windows",
     "context": "Display only workspaces that contain windows",
-    "reference": "Modules/Settings/WorkspacesTab.qml:129",
+    "reference": "Modules/Settings/WorkspacesTab.qml:130",
     "comment": ""
   },
   {
@@ -3206,7 +3206,7 @@
   {
     "term": "Failed to parse plugin_settings.json",
     "context": "Failed to parse plugin_settings.json",
-    "reference": "Common/SettingsData.qml:946",
+    "reference": "Common/SettingsData.qml:952",
     "comment": ""
   },
   {
@@ -3218,7 +3218,7 @@
   {
     "term": "Failed to parse settings.json",
     "context": "Failed to parse settings.json",
-    "reference": "Common/SettingsData.qml:883, Common/SettingsData.qml:2071",
+    "reference": "Common/SettingsData.qml:889, Common/SettingsData.qml:2077",
     "comment": ""
   },
   {
@@ -3428,25 +3428,25 @@
   {
     "term": "First Time Setup",
     "context": "First Time Setup",
-    "reference": "Modules/Settings/KeybindsTab.qml:301, Modules/Settings/DisplayConfig/IncludeWarningBox.qml:45",
+    "reference": "Modules/Settings/KeybindsTab.qml:307, Modules/Settings/DisplayConfig/IncludeWarningBox.qml:45",
     "comment": ""
   },
   {
     "term": "Fix Now",
     "context": "Fix Now",
-    "reference": "Modules/Settings/ThemeColorsTab.qml:1472, Modules/Settings/KeybindsTab.qml:341, Modules/Settings/DisplayConfig/IncludeWarningBox.qml:78",
+    "reference": "Modules/Settings/ThemeColorsTab.qml:1472, Modules/Settings/KeybindsTab.qml:348, Modules/Settings/DisplayConfig/IncludeWarningBox.qml:78",
     "comment": ""
   },
   {
     "term": "Fixing...",
     "context": "Fixing...",
-    "reference": "Modules/Settings/ThemeColorsTab.qml:1472, Modules/Settings/KeybindsTab.qml:338, Modules/Settings/DisplayConfig/IncludeWarningBox.qml:75",
+    "reference": "Modules/Settings/ThemeColorsTab.qml:1472, Modules/Settings/KeybindsTab.qml:345, Modules/Settings/DisplayConfig/IncludeWarningBox.qml:75",
     "comment": ""
   },
   {
     "term": "Flags",
     "context": "Flags",
-    "reference": "Widgets/KeybindItem.qml:1475",
+    "reference": "Widgets/KeybindItem.qml:1481",
     "comment": ""
   },
   {
@@ -3479,16 +3479,34 @@
     "reference": "Modules/Settings/DisplayConfig/NiriOutputSettings.qml:70, Modules/Settings/DisplayConfig/DisplayConfigState.qml:870",
     "comment": ""
   },
+  {
+    "term": "Focused Border",
+    "context": "Focused Border",
+    "reference": "Modules/Settings/WorkspacesTab.qml:280",
+    "comment": ""
+  },
+  {
+    "term": "Focused Color",
+    "context": "Focused Color",
+    "reference": "Modules/Settings/WorkspacesTab.qml:164",
+    "comment": ""
+  },
   {
     "term": "Focused Window",
     "context": "Focused Window",
     "reference": "Modules/Settings/WidgetsTab.qml:58",
     "comment": ""
   },
+  {
+    "term": "Follow Monitor Focus",
+    "context": "Follow Monitor Focus",
+    "reference": "Modules/Settings/WorkspacesTab.qml:119",
+    "comment": ""
+  },
   {
     "term": "Follow focus",
     "context": "Follow focus",
-    "reference": "Widgets/KeybindItem.qml:1259",
+    "reference": "Widgets/KeybindItem.qml:1265",
     "comment": ""
   },
   {
@@ -3800,7 +3818,7 @@
   {
     "term": "Help",
     "context": "Help",
-    "reference": "Modules/Settings/DesktopWidgetsTab.qml:138",
+    "reference": "Modules/Settings/DesktopWidgetsTab.qml:142",
     "comment": ""
   },
   {
@@ -3944,7 +3962,7 @@
   {
     "term": "Hotkey overlay title (optional)",
     "context": "Hotkey overlay title (optional)",
-    "reference": "Widgets/KeybindItem.qml:1461",
+    "reference": "Widgets/KeybindItem.qml:1467",
     "comment": ""
   },
   {
@@ -4082,7 +4100,7 @@
   {
     "term": "Incompatible Plugins Loaded",
     "context": "Incompatible Plugins Loaded",
-    "reference": "Modules/Settings/PluginsTab.qml:158",
+    "reference": "Modules/Settings/PluginsTab.qml:167",
     "comment": ""
   },
   {
@@ -4106,7 +4124,7 @@
   {
     "term": "Individual bar configuration",
     "context": "Individual bar configuration",
-    "reference": "Modules/Settings/DisplayWidgetsTab.qml:16",
+    "reference": "Modules/Settings/DisplayWidgetsTab.qml:19",
     "comment": ""
   },
   {
@@ -4286,7 +4304,7 @@
   {
     "term": "Key",
     "context": "Key",
-    "reference": "Widgets/KeybindItem.qml:570",
+    "reference": "Widgets/KeybindItem.qml:575",
     "comment": ""
   },
   {
@@ -4322,13 +4340,13 @@
   {
     "term": "Keyboard Shortcuts",
     "context": "Keyboard Shortcuts",
-    "reference": "Modals/Settings/SettingsSidebar.qml:195, Modules/Settings/KeybindsTab.qml:209",
+    "reference": "Modals/Settings/SettingsSidebar.qml:195, Modules/Settings/KeybindsTab.qml:212",
     "comment": ""
   },
   {
     "term": "Keys",
     "context": "Keys",
-    "reference": "Widgets/KeybindItem.qml:483",
+    "reference": "Widgets/KeybindItem.qml:488",
     "comment": ""
   },
   {
@@ -4484,7 +4502,7 @@
   {
     "term": "Loading keybinds...",
     "context": "Loading keybinds...",
-    "reference": "Modules/Settings/KeybindsTab.qml:545",
+    "reference": "Modules/Settings/KeybindsTab.qml:552",
     "comment": ""
   },
   {
@@ -4562,7 +4580,7 @@
   {
     "term": "Locked",
     "context": "Locked",
-    "reference": "Widgets/KeybindItem.qml:1524",
+    "reference": "Widgets/KeybindItem.qml:1530",
     "comment": ""
   },
   {
@@ -4586,7 +4604,7 @@
   {
     "term": "Long press",
     "context": "Long press",
-    "reference": "Widgets/KeybindItem.qml:1568",
+    "reference": "Widgets/KeybindItem.qml:1574",
     "comment": ""
   },
   {
@@ -4616,7 +4634,7 @@
   {
     "term": "Manage and configure plugins for extending DMS functionality",
     "context": "Manage and configure plugins for extending DMS functionality",
-    "reference": "Modules/Settings/PluginsTab.qml:73",
+    "reference": "Modules/Settings/PluginsTab.qml:79",
     "comment": ""
   },
   {
@@ -4772,7 +4790,7 @@
   {
     "term": "Media",
     "context": "Media",
-    "reference": "Services/AppSearchService.qml:452, Services/AppSearchService.qml:453, Services/AppSearchService.qml:454, Widgets/DankIconPicker.qml:40, Widgets/KeybindItem.qml:1043, Widgets/KeybindItem.qml:1052, Widgets/KeybindItem.qml:1058, Modules/DankDash/DankDashPopout.qml:276",
+    "reference": "Services/AppSearchService.qml:452, Services/AppSearchService.qml:453, Services/AppSearchService.qml:454, Widgets/DankIconPicker.qml:40, Widgets/KeybindItem.qml:1049, Widgets/KeybindItem.qml:1058, Widgets/KeybindItem.qml:1064, Modules/DankDash/DankDashPopout.qml:276",
     "comment": ""
   },
   {
@@ -4934,7 +4952,7 @@
   {
     "term": "Model",
     "context": "Model",
-    "reference": "Modules/Settings/DisplayWidgetsTab.qml:218, Modules/Settings/PrinterTab.qml:812, Modules/Settings/DisplayConfigTab.qml:103, Modules/Settings/DisplayConfig/DisplayConfigState.qml:845",
+    "reference": "Modules/Settings/DisplayWidgetsTab.qml:225, Modules/Settings/PrinterTab.qml:812, Modules/Settings/DisplayConfigTab.qml:103, Modules/Settings/DisplayConfig/DisplayConfigState.qml:845",
     "comment": ""
   },
   {
@@ -5006,7 +5024,7 @@
   {
     "term": "Move Widget",
     "context": "Move Widget",
-    "reference": "Modules/Settings/DesktopWidgetsTab.qml:167",
+    "reference": "Modules/Settings/DesktopWidgetsTab.qml:172",
     "comment": ""
   },
   {
@@ -5036,13 +5054,13 @@
   {
     "term": "Name",
     "context": "Name",
-    "reference": "Modules/Settings/DisplayWidgetsTab.qml:218, Modules/Settings/DesktopWidgetInstanceCard.qml:197, Modules/Settings/PrinterTab.qml:414, Modules/Settings/DisplayConfigTab.qml:103, Modules/Settings/DisplayConfig/DisplayConfigState.qml:845, Modules/Settings/Widgets/SystemMonitorVariantCard.qml:144",
+    "reference": "Modules/Settings/DisplayWidgetsTab.qml:225, Modules/Settings/DesktopWidgetInstanceCard.qml:197, Modules/Settings/PrinterTab.qml:414, Modules/Settings/DisplayConfigTab.qml:103, Modules/Settings/DisplayConfig/DisplayConfigState.qml:845, Modules/Settings/Widgets/SystemMonitorVariantCard.qml:144",
     "comment": ""
   },
   {
     "term": "Named Workspace Icons",
     "context": "Named Workspace Icons",
-    "reference": "Modules/Settings/WorkspacesTab.qml:159",
+    "reference": "Modules/Settings/WorkspacesTab.qml:343",
     "comment": ""
   },
   {
@@ -5114,13 +5132,13 @@
   {
     "term": "New Key",
     "context": "New Key",
-    "reference": "Widgets/KeybindItem.qml:570",
+    "reference": "Widgets/KeybindItem.qml:575",
     "comment": ""
   },
   {
     "term": "New Keybind",
     "context": "New Keybind",
-    "reference": "Modules/Settings/KeybindsTab.qml:459",
+    "reference": "Modules/Settings/KeybindsTab.qml:466",
     "comment": ""
   },
   {
@@ -5186,7 +5204,7 @@
   {
     "term": "Niri compositor actions (focus, move, etc.)",
     "context": "Niri compositor actions (focus, move, etc.)",
-    "reference": "Widgets/KeybindItem.qml:803",
+    "reference": "Widgets/KeybindItem.qml:809",
     "comment": ""
   },
   {
@@ -5252,7 +5270,7 @@
   {
     "term": "No action",
     "context": "No action",
-    "reference": "Widgets/KeybindItem.qml:323",
+    "reference": "Widgets/KeybindItem.qml:326",
     "comment": ""
   },
   {
@@ -5276,7 +5294,7 @@
   {
     "term": "No changes",
     "context": "No changes",
-    "reference": "Widgets/KeybindItem.qml:1654",
+    "reference": "Widgets/KeybindItem.qml:1660",
     "comment": ""
   },
   {
@@ -5354,7 +5372,7 @@
   {
     "term": "No keybinds found",
     "context": "No keybinds found",
-    "reference": "Modules/Settings/KeybindsTab.qml:553",
+    "reference": "Modules/Settings/KeybindsTab.qml:560",
     "comment": ""
   },
   {
@@ -5372,7 +5390,7 @@
   {
     "term": "No plugins found.",
     "context": "No plugins found.",
-    "reference": "Modules/Settings/PluginsTab.qml:319",
+    "reference": "Modules/Settings/PluginsTab.qml:336",
     "comment": ""
   },
   {
@@ -5492,7 +5510,7 @@
   {
     "term": "Notepad Slideout",
     "context": "Notepad Slideout",
-    "reference": "Modules/Settings/DisplayWidgetsTab.qml:58",
+    "reference": "Modules/Settings/DisplayWidgetsTab.qml:61",
     "comment": ""
   },
   {
@@ -5522,7 +5540,7 @@
   {
     "term": "Notification Popups",
     "context": "Notification Popups",
-    "reference": "Modules/Settings/DisplayWidgetsTab.qml:34, Modules/Settings/NotificationsTab.qml:92",
+    "reference": "Modules/Settings/DisplayWidgetsTab.qml:37, Modules/Settings/NotificationsTab.qml:92",
     "comment": ""
   },
   {
@@ -5540,7 +5558,7 @@
   {
     "term": "Notification toast popups",
     "context": "Notification toast popups",
-    "reference": "Modules/Settings/DisplayWidgetsTab.qml:35",
+    "reference": "Modules/Settings/DisplayWidgetsTab.qml:38",
     "comment": ""
   },
   {
@@ -5600,7 +5618,7 @@
   {
     "term": "On-Screen Displays",
     "context": "On-Screen Displays",
-    "reference": "Modules/Settings/DisplayWidgetsTab.qml:46",
+    "reference": "Modules/Settings/DisplayWidgetsTab.qml:49",
     "comment": ""
   },
   {
@@ -5672,7 +5690,7 @@
   {
     "term": "Options",
     "context": "Options",
-    "reference": "Widgets/KeybindItem.qml:1170",
+    "reference": "Widgets/KeybindItem.qml:1176",
     "comment": ""
   },
   {
@@ -5708,13 +5726,13 @@
   {
     "term": "Overridden by config",
     "context": "Overridden by config",
-    "reference": "Widgets/KeybindItem.qml:364",
+    "reference": "Widgets/KeybindItem.qml:368",
     "comment": ""
   },
   {
     "term": "Override",
     "context": "Override",
-    "reference": "Widgets/KeybindItem.qml:350",
+    "reference": "Widgets/KeybindItem.qml:354",
     "comment": ""
   },
   {
@@ -5744,13 +5762,13 @@
   {
     "term": "Overrides",
     "context": "Overrides",
-    "reference": "Modules/Settings/KeybindsTab.qml:73",
+    "reference": "Modules/Settings/KeybindsTab.qml:76",
     "comment": ""
   },
   {
     "term": "Overview",
     "context": "Overview",
-    "reference": "Widgets/KeybindItem.qml:1049, Widgets/KeybindItem.qml:1052, Modules/DankDash/DankDashPopout.qml:272",
+    "reference": "Widgets/KeybindItem.qml:1055, Widgets/KeybindItem.qml:1058, Modules/DankDash/DankDashPopout.qml:272",
     "comment": ""
   },
   {
@@ -5849,12 +5867,6 @@
     "reference": "Modules/Settings/WallpaperTab.qml:783",
     "comment": ""
   },
-  {
-    "term": "Per-Monitor Workspaces",
-    "context": "Per-Monitor Workspaces",
-    "reference": "Modules/Settings/WorkspacesTab.qml:119",
-    "comment": ""
-  },
   {
     "term": "Per-screen config",
     "context": "greeter feature card description",
@@ -5900,13 +5912,13 @@
   {
     "term": "Place plugin directories here. Each plugin should have a plugin.json manifest file.",
     "context": "Place plugin directories here. Each plugin should have a plugin.json manifest file.",
-    "reference": "Modules/Settings/PluginsTab.qml:260",
+    "reference": "Modules/Settings/PluginsTab.qml:274",
     "comment": ""
   },
   {
     "term": "Place plugins in %1",
     "context": "Place plugins in %1",
-    "reference": "Modules/Settings/PluginsTab.qml:319",
+    "reference": "Modules/Settings/PluginsTab.qml:336",
     "comment": ""
   },
   {
@@ -5960,13 +5972,13 @@
   {
     "term": "Plugin Directory",
     "context": "Plugin Directory",
-    "reference": "Modules/Settings/PluginsTab.qml:246",
+    "reference": "Modules/Settings/PluginsTab.qml:256",
     "comment": ""
   },
   {
     "term": "Plugin Management",
     "context": "Plugin Management",
-    "reference": "Modules/Settings/PluginsTab.qml:66",
+    "reference": "Modules/Settings/PluginsTab.qml:70",
     "comment": ""
   },
   {
@@ -5984,7 +5996,7 @@
   {
     "term": "Pointer",
     "context": "Pointer",
-    "reference": "Widgets/KeybindItem.qml:1287",
+    "reference": "Widgets/KeybindItem.qml:1293",
     "comment": ""
   },
   {
@@ -6020,7 +6032,7 @@
   {
     "term": "Possible Override Conflicts",
     "context": "Possible Override Conflicts",
-    "reference": "Modules/Settings/KeybindsTab.qml:305",
+    "reference": "Modules/Settings/KeybindsTab.qml:311",
     "comment": ""
   },
   {
@@ -6116,7 +6128,7 @@
   {
     "term": "Press key...",
     "context": "Press key...",
-    "reference": "Widgets/KeybindItem.qml:611",
+    "reference": "Widgets/KeybindItem.qml:616",
     "comment": ""
   },
   {
@@ -6134,7 +6146,7 @@
   {
     "term": "Primary",
     "context": "Primary",
-    "reference": "dms-plugins/DankDesktopWeather/DankDesktopWeatherSettings.qml:39, Modules/Settings/LauncherTab.qml:179, Modules/Settings/NetworkTab.qml:174, Modules/Settings/Widgets/SettingsColorPicker.qml:42",
+    "reference": "dms-plugins/DankDesktopWeather/DankDesktopWeatherSettings.qml:39, Modules/Settings/LauncherTab.qml:179, Modules/Settings/WorkspacesTab.qml:295, Modules/Settings/NetworkTab.qml:174, Modules/Settings/Widgets/SettingsColorPicker.qml:42",
     "comment": ""
   },
   {
@@ -6260,7 +6272,7 @@
   {
     "term": "Quick note-taking slideout panel",
     "context": "Quick note-taking slideout panel",
-    "reference": "Modules/Settings/DisplayWidgetsTab.qml:59",
+    "reference": "Modules/Settings/DisplayWidgetsTab.qml:62",
     "comment": ""
   },
   {
@@ -6338,13 +6350,13 @@
   {
     "term": "Release",
     "context": "Release",
-    "reference": "Widgets/KeybindItem.qml:1546",
+    "reference": "Widgets/KeybindItem.qml:1552",
     "comment": ""
   },
   {
     "term": "Reload Plugin",
     "context": "Reload Plugin",
-    "reference": "Modules/Settings/PluginListItem.qml:297",
+    "reference": "Modules/Settings/PluginListItem.qml:301",
     "comment": ""
   },
   {
@@ -6362,7 +6374,7 @@
   {
     "term": "Repeat",
     "context": "Repeat",
-    "reference": "Widgets/KeybindItem.qml:1502",
+    "reference": "Widgets/KeybindItem.qml:1508",
     "comment": ""
   },
   {
@@ -6392,7 +6404,7 @@
   {
     "term": "Requires DMS %1",
     "context": "Requires DMS %1",
-    "reference": "Modules/Settings/PluginListItem.qml:130",
+    "reference": "Modules/Settings/PluginListItem.qml:133",
     "comment": ""
   },
   {
@@ -6428,7 +6440,7 @@
   {
     "term": "Resize Widget",
     "context": "Resize Widget",
-    "reference": "Modules/Settings/DesktopWidgetsTab.qml:203",
+    "reference": "Modules/Settings/DesktopWidgetsTab.qml:213",
     "comment": ""
   },
   {
@@ -6464,13 +6476,13 @@
   {
     "term": "Reverse Scrolling Direction",
     "context": "Reverse Scrolling Direction",
-    "reference": "Modules/Settings/WorkspacesTab.qml:138",
+    "reference": "Modules/Settings/WorkspacesTab.qml:139",
     "comment": ""
   },
   {
     "term": "Reverse workspace switch direction when scrolling over the bar",
     "context": "Reverse workspace switch direction when scrolling over the bar",
-    "reference": "Modules/Settings/WorkspacesTab.qml:139",
+    "reference": "Modules/Settings/WorkspacesTab.qml:140",
     "comment": ""
   },
   {
@@ -6500,13 +6512,13 @@
   {
     "term": "Right-click and drag anywhere on the widget",
     "context": "Right-click and drag anywhere on the widget",
-    "reference": "Modules/Settings/DesktopWidgetsTab.qml:174",
+    "reference": "Modules/Settings/DesktopWidgetsTab.qml:181",
     "comment": ""
   },
   {
     "term": "Right-click and drag the bottom-right corner",
     "context": "Right-click and drag the bottom-right corner",
-    "reference": "Modules/Settings/DesktopWidgetsTab.qml:210",
+    "reference": "Modules/Settings/DesktopWidgetsTab.qml:222",
     "comment": ""
   },
   {
@@ -6560,13 +6572,13 @@
   {
     "term": "Run a program (e.g., firefox, kitty)",
     "context": "Run a program (e.g., firefox, kitty)",
-    "reference": "Widgets/KeybindItem.qml:804",
+    "reference": "Widgets/KeybindItem.qml:810",
     "comment": ""
   },
   {
     "term": "Run a shell command (e.g., notify-send)",
     "context": "Run a shell command (e.g., notify-send)",
-    "reference": "Widgets/KeybindItem.qml:805",
+    "reference": "Widgets/KeybindItem.qml:811",
     "comment": ""
   },
   {
@@ -6602,7 +6614,7 @@
   {
     "term": "Save",
     "context": "Save",
-    "reference": "Modals/DankColorPickerModal.qml:704, Widgets/KeybindItem.qml:1312, Widgets/KeybindItem.qml:1677, Modals/FileBrowser/FileBrowserSaveRow.qml:55, Modules/Notepad/NotepadTextEditor.qml:511, Modules/Notepad/Notepad.qml:461",
+    "reference": "Modals/DankColorPickerModal.qml:704, Widgets/KeybindItem.qml:1318, Widgets/KeybindItem.qml:1683, Modals/FileBrowser/FileBrowserSaveRow.qml:55, Modules/Notepad/NotepadTextEditor.qml:511, Modules/Notepad/Notepad.qml:461",
     "comment": ""
   },
   {
@@ -6674,7 +6686,7 @@
   {
     "term": "Scan",
     "context": "Scan",
-    "reference": "Modules/Settings/PluginsTab.qml:207, Modules/ControlCenter/Details/BluetoothDetail.qml:119",
+    "reference": "Modules/Settings/PluginsTab.qml:217, Modules/ControlCenter/Details/BluetoothDetail.qml:119",
     "comment": ""
   },
   {
@@ -6758,7 +6770,7 @@
   {
     "term": "Search keybinds...",
     "context": "Search keybinds...",
-    "reference": "Modules/Settings/KeybindsTab.qml:234",
+    "reference": "Modules/Settings/KeybindsTab.qml:240",
     "comment": ""
   },
   {
@@ -6800,7 +6812,7 @@
   {
     "term": "Secondary",
     "context": "Secondary",
-    "reference": "dms-plugins/DankDesktopWeather/DankDesktopWeatherSettings.qml:43, Modules/Settings/Widgets/SettingsColorPicker.qml:47",
+    "reference": "dms-plugins/DankDesktopWeather/DankDesktopWeatherSettings.qml:43, Modules/Settings/WorkspacesTab.qml:295, Modules/Settings/Widgets/SettingsColorPicker.qml:47",
     "comment": ""
   },
   {
@@ -6956,7 +6968,7 @@
   {
     "term": "Select...",
     "context": "Select...",
-    "reference": "Widgets/KeybindItem.qml:899, Widgets/KeybindItem.qml:1113, Modules/Settings/DisplayConfig/NiriOutputSettings.qml:95, Modules/Settings/DisplayConfig/NiriOutputSettings.qml:97, Modules/Settings/DisplayConfig/NiriOutputSettings.qml:114",
+    "reference": "Widgets/KeybindItem.qml:905, Widgets/KeybindItem.qml:1119, Modules/Settings/DisplayConfig/NiriOutputSettings.qml:95, Modules/Settings/DisplayConfig/NiriOutputSettings.qml:97, Modules/Settings/DisplayConfig/NiriOutputSettings.qml:114",
     "comment": ""
   },
   {
@@ -6992,7 +7004,7 @@
   {
     "term": "Set key and action to save",
     "context": "Set key and action to save",
-    "reference": "Widgets/KeybindItem.qml:1654",
+    "reference": "Widgets/KeybindItem.qml:1660",
     "comment": ""
   },
   {
@@ -7010,7 +7022,7 @@
   {
     "term": "Setup",
     "context": "Setup",
-    "reference": "Modules/Settings/ThemeColorsTab.qml:1472, Modules/Settings/KeybindsTab.qml:340, Modules/Settings/DisplayConfig/IncludeWarningBox.qml:77",
+    "reference": "Modules/Settings/ThemeColorsTab.qml:1472, Modules/Settings/KeybindsTab.qml:347, Modules/Settings/DisplayConfig/IncludeWarningBox.qml:77",
     "comment": ""
   },
   {
@@ -7022,7 +7034,7 @@
   {
     "term": "Shell",
     "context": "Shell",
-    "reference": "Widgets/KeybindItem.qml:1422",
+    "reference": "Widgets/KeybindItem.qml:1428",
     "comment": ""
   },
   {
@@ -7046,19 +7058,19 @@
   {
     "term": "Shortcuts",
     "context": "Shortcuts",
-    "reference": "Modules/Settings/KeybindsTab.qml:515",
+    "reference": "Modules/Settings/KeybindsTab.qml:522",
     "comment": ""
   },
   {
     "term": "Shortcuts (%1)",
     "context": "Shortcuts (%1)",
-    "reference": "Modules/Settings/KeybindsTab.qml:515",
+    "reference": "Modules/Settings/KeybindsTab.qml:522",
     "comment": ""
   },
   {
     "term": "Show All Tags",
     "context": "Show All Tags",
-    "reference": "Modules/Settings/WorkspacesTab.qml:148",
+    "reference": "Modules/Settings/WorkspacesTab.qml:149",
     "comment": ""
   },
   {
@@ -7196,7 +7208,7 @@
   {
     "term": "Show Occupied Workspaces Only",
     "context": "Show Occupied Workspaces Only",
-    "reference": "Modules/Settings/WorkspacesTab.qml:128",
+    "reference": "Modules/Settings/WorkspacesTab.qml:129",
     "comment": ""
   },
   {
@@ -7316,7 +7328,13 @@
   {
     "term": "Show all 9 tags instead of only occupied tags (DWL only)",
     "context": "Show all 9 tags instead of only occupied tags (DWL only)",
-    "reference": "Modules/Settings/WorkspacesTab.qml:149",
+    "reference": "Modules/Settings/WorkspacesTab.qml:150",
+    "comment": ""
+  },
+  {
+    "term": "Show an outline ring around the focused workspace indicator",
+    "context": "Show an outline ring around the focused workspace indicator",
+    "reference": "Modules/Settings/WorkspacesTab.qml:281",
     "comment": ""
   },
   {
@@ -7340,37 +7358,37 @@
   {
     "term": "Show on Last Display",
     "context": "Show on Last Display",
-    "reference": "Modules/Settings/DisplayWidgetsTab.qml:407, Modules/Settings/DankBarTab.qml:534",
+    "reference": "Modules/Settings/DisplayWidgetsTab.qml:421, Modules/Settings/DankBarTab.qml:534",
     "comment": ""
   },
   {
     "term": "Show on Overlay",
     "context": "Show on Overlay",
-    "reference": "Modules/Settings/DesktopWidgetInstanceCard.qml:221",
+    "reference": "Modules/Settings/DesktopWidgetInstanceCard.qml:222",
     "comment": ""
   },
   {
     "term": "Show on Overview",
     "context": "Show on Overview",
-    "reference": "Modules/Settings/DockTab.qml:95, Modules/Settings/DesktopWidgetInstanceCard.qml:238, Modules/Settings/DankBarTab.qml:758",
+    "reference": "Modules/Settings/DockTab.qml:95, Modules/Settings/DesktopWidgetInstanceCard.qml:239, Modules/Settings/DankBarTab.qml:758",
     "comment": ""
   },
   {
     "term": "Show on Overview Only",
     "context": "Show on Overview Only",
-    "reference": "Modules/Settings/DesktopWidgetInstanceCard.qml:255",
+    "reference": "Modules/Settings/DesktopWidgetInstanceCard.qml:256",
     "comment": ""
   },
   {
     "term": "Show on all connected displays",
     "context": "Show on all connected displays",
-    "reference": "Modules/Settings/DisplayWidgetsTab.qml:387",
+    "reference": "Modules/Settings/DisplayWidgetsTab.qml:401",
     "comment": ""
   },
   {
     "term": "Show on screens:",
     "context": "Show on screens:",
-    "reference": "Modules/Settings/DisplayWidgetsTab.qml:372",
+    "reference": "Modules/Settings/DisplayWidgetsTab.qml:384",
     "comment": ""
   },
   {
@@ -7427,12 +7445,6 @@
     "reference": "Modules/Settings/RunningAppsTab.qml:30",
     "comment": ""
   },
-  {
-    "term": "Show only workspaces belonging to each specific monitor.",
-    "context": "Show only workspaces belonging to each specific monitor.",
-    "reference": "Modules/Settings/WorkspacesTab.qml:120",
-    "comment": ""
-  },
   {
     "term": "Show password",
     "context": "Show password",
@@ -7457,6 +7469,12 @@
     "reference": "Modules/Settings/WorkspacesTab.qml:42",
     "comment": ""
   },
+  {
+    "term": "Show workspaces of the currently focused monitor",
+    "context": "Show workspaces of the currently focused monitor",
+    "reference": "Modules/Settings/WorkspacesTab.qml:120",
+    "comment": ""
+  },
   {
     "term": "Shows all running applications with focus indication",
     "context": "Shows all running applications with focus indication",
@@ -7544,7 +7562,7 @@
   {
     "term": "Some plugins require a newer version of DMS:",
     "context": "Some plugins require a newer version of DMS:",
-    "reference": "Modules/Settings/PluginsTab.qml:167",
+    "reference": "Modules/Settings/PluginsTab.qml:176",
     "comment": ""
   },
   {
@@ -7712,7 +7730,7 @@
   {
     "term": "Surface",
     "context": "shadow color option",
-    "reference": "Modules/Settings/LauncherTab.qml:179, Modules/Settings/DankBarTab.qml:1112",
+    "reference": "Modules/Settings/LauncherTab.qml:179, Modules/Settings/WorkspacesTab.qml:295, Modules/Settings/DankBarTab.qml:1112",
     "comment": ""
   },
   {
@@ -7844,7 +7862,7 @@
   {
     "term": "System toast notifications",
     "context": "System toast notifications",
-    "reference": "Modules/Settings/DisplayWidgetsTab.qml:53",
+    "reference": "Modules/Settings/DisplayWidgetsTab.qml:56",
     "comment": ""
   },
   {
@@ -7856,7 +7874,7 @@
   {
     "term": "Tab",
     "context": "Tab",
-    "reference": "Widgets/KeybindItem.qml:1026",
+    "reference": "Widgets/KeybindItem.qml:1032",
     "comment": ""
   },
   {
@@ -7904,7 +7922,7 @@
   {
     "term": "The DMS_SOCKET environment variable is not set or the socket is unavailable. Automated plugin management requires the DMS_SOCKET.",
     "context": "The DMS_SOCKET environment variable is not set or the socket is unavailable. Automated plugin management requires the DMS_SOCKET.",
-    "reference": "Modules/Settings/PluginsTab.qml:115",
+    "reference": "Modules/Settings/PluginsTab.qml:123",
     "comment": ""
   },
   {
@@ -7946,7 +7964,7 @@
   {
     "term": "Thickness",
     "context": "Thickness",
-    "reference": "Modules/Settings/DankBarTab.qml:1249, Modules/Settings/DankBarTab.qml:1337",
+    "reference": "Modules/Settings/WorkspacesTab.qml:329, Modules/Settings/DankBarTab.qml:1249, Modules/Settings/DankBarTab.qml:1337",
     "comment": ""
   },
   {
@@ -7964,7 +7982,7 @@
   {
     "term": "This bind is overridden by config.kdl",
     "context": "This bind is overridden by config.kdl",
-    "reference": "Widgets/KeybindItem.qml:451",
+    "reference": "Widgets/KeybindItem.qml:455",
     "comment": ""
   },
   {
@@ -8036,7 +8054,7 @@
   {
     "term": "Title",
     "context": "Title",
-    "reference": "Widgets/KeybindItem.qml:1450",
+    "reference": "Widgets/KeybindItem.qml:1456",
     "comment": ""
   },
   {
@@ -8054,13 +8072,13 @@
   {
     "term": "To use this DMS bind, remove or change the keybind in your config.kdl",
     "context": "To use this DMS bind, remove or change the keybind in your config.kdl",
-    "reference": "Widgets/KeybindItem.qml:468",
+    "reference": "Widgets/KeybindItem.qml:473",
     "comment": ""
   },
   {
     "term": "Toast Messages",
     "context": "Toast Messages",
-    "reference": "Modules/Settings/DisplayWidgetsTab.qml:52",
+    "reference": "Modules/Settings/DisplayWidgetsTab.qml:55",
     "comment": ""
   },
   {
@@ -8186,7 +8204,7 @@
   {
     "term": "Type",
     "context": "Type",
-    "reference": "Widgets/KeybindItem.qml:782",
+    "reference": "Widgets/KeybindItem.qml:788",
     "comment": ""
   },
   {
@@ -8213,6 +8231,12 @@
     "reference": "Modules/Settings/PrinterTab.qml:146, Modules/Settings/NetworkTab.qml:389",
     "comment": ""
   },
+  {
+    "term": "Unfocused Color",
+    "context": "Unfocused Color",
+    "reference": "Modules/Settings/WorkspacesTab.qml:202",
+    "comment": ""
+  },
   {
     "term": "Uninstall",
     "context": "uninstall action button",
@@ -8222,7 +8246,7 @@
   {
     "term": "Uninstall Plugin",
     "context": "Uninstall Plugin",
-    "reference": "Modules/Settings/PluginListItem.qml:256",
+    "reference": "Modules/Settings/PluginListItem.qml:260",
     "comment": ""
   },
   {
@@ -8246,7 +8270,7 @@
   {
     "term": "Unknown",
     "context": "unknown author",
-    "reference": "Modules/Lock/LockScreenContent.qml:376, Modules/Lock/LockScreenContent.qml:496, Modules/Lock/LockScreenContent.qml:592, Modules/Settings/PluginBrowser.qml:493, Modules/Settings/PrinterTab.qml:1285, Modules/Settings/ThemeBrowser.qml:526, Modules/Settings/NetworkTab.qml:122, Modules/Settings/NetworkTab.qml:164, Modules/Settings/NetworkTab.qml:370, Modules/Settings/NetworkTab.qml:391, Modules/Settings/NetworkTab.qml:539, Modules/Settings/NetworkTab.qml:682, Modules/Settings/NetworkTab.qml:1098, Modules/ControlCenter/Details/BatteryDetail.qml:183, Modules/ControlCenter/Components/HeaderPane.qml:63",
+    "reference": "Modules/Lock/LockScreenContent.qml:383, Modules/Lock/LockScreenContent.qml:503, Modules/Lock/LockScreenContent.qml:599, Modules/Settings/PluginBrowser.qml:493, Modules/Settings/PrinterTab.qml:1285, Modules/Settings/ThemeBrowser.qml:526, Modules/Settings/NetworkTab.qml:122, Modules/Settings/NetworkTab.qml:164, Modules/Settings/NetworkTab.qml:370, Modules/Settings/NetworkTab.qml:391, Modules/Settings/NetworkTab.qml:539, Modules/Settings/NetworkTab.qml:682, Modules/Settings/NetworkTab.qml:1098, Modules/ControlCenter/Details/BatteryDetail.qml:183, Modules/ControlCenter/Components/HeaderPane.qml:63",
     "comment": ""
   },
   {
@@ -8294,7 +8318,7 @@
   {
     "term": "Unsaved changes",
     "context": "Unsaved changes",
-    "reference": "Widgets/KeybindItem.qml:1654, Modules/Notepad/NotepadTextEditor.qml:588",
+    "reference": "Widgets/KeybindItem.qml:1660, Modules/Notepad/NotepadTextEditor.qml:588",
     "comment": ""
   },
   {
@@ -8318,7 +8342,13 @@
   {
     "term": "Update Plugin",
     "context": "Update Plugin",
-    "reference": "Modules/Settings/PluginListItem.qml:213",
+    "reference": "Modules/Settings/PluginListItem.qml:217",
+    "comment": ""
+  },
+  {
+    "term": "Urgent Color",
+    "context": "Urgent Color",
+    "reference": "Modules/Settings/WorkspacesTab.qml:239",
     "comment": ""
   },
   {
@@ -8648,7 +8678,7 @@
   {
     "term": "Volume, brightness, and other system OSDs",
     "context": "Volume, brightness, and other system OSDs",
-    "reference": "Modules/Settings/DisplayWidgetsTab.qml:47",
+    "reference": "Modules/Settings/DisplayWidgetsTab.qml:50",
     "comment": ""
   },
   {
@@ -8660,7 +8690,7 @@
   {
     "term": "Wallpaper",
     "context": "greeter settings link",
-    "reference": "Widgets/KeybindItem.qml:1045, Widgets/KeybindItem.qml:1052, Widgets/KeybindItem.qml:1061, Modals/Greeter/GreeterCompletePage.qml:381, Modals/Settings/SettingsSidebar.qml:72, Modules/Settings/DisplayWidgetsTab.qml:40, Modules/Settings/WallpaperTab.qml:43",
+    "reference": "Widgets/KeybindItem.qml:1051, Widgets/KeybindItem.qml:1058, Widgets/KeybindItem.qml:1067, Modals/Greeter/GreeterCompletePage.qml:381, Modals/Settings/SettingsSidebar.qml:72, Modules/Settings/DisplayWidgetsTab.qml:43, Modules/Settings/WallpaperTab.qml:43",
     "comment": ""
   },
   {
@@ -8720,7 +8750,7 @@
   {
     "term": "Weather",
     "context": "Weather",
-    "reference": "Widgets/KeybindItem.qml:1047, Widgets/KeybindItem.qml:1052, Widgets/KeybindItem.qml:1064, Modules/DankDash/DankDashPopout.qml:287, Modules/Settings/TimeWeatherTab.qml:330",
+    "reference": "Widgets/KeybindItem.qml:1053, Widgets/KeybindItem.qml:1058, Widgets/KeybindItem.qml:1070, Modules/DankDash/DankDashPopout.qml:287, Modules/Settings/TimeWeatherTab.qml:330",
     "comment": ""
   },
   {
@@ -8846,13 +8876,13 @@
   {
     "term": "Widget added",
     "context": "Widget added",
-    "reference": "Modules/Settings/DesktopWidgetsTab.qml:20",
+    "reference": "Modules/Settings/DesktopWidgetsTab.qml:23",
     "comment": ""
   },
   {
     "term": "Widget removed",
     "context": "Widget removed",
-    "reference": "Modules/Settings/DesktopWidgetsTab.qml:119",
+    "reference": "Modules/Settings/DesktopWidgetsTab.qml:123",
     "comment": ""
   },
   {
@@ -8927,6 +8957,12 @@
     "reference": "Widgets/DankIconPicker.qml:28, Modules/Settings/DankBarTab.qml:792, Modules/Settings/DankBarTab.qml:792, Modules/Settings/DankBarTab.qml:829",
     "comment": ""
   },
+  {
+    "term": "Workspace Appearance",
+    "context": "Workspace Appearance",
+    "reference": "Modules/Settings/WorkspacesTab.qml:160",
+    "comment": ""
+  },
   {
     "term": "Workspace Index Numbers",
     "context": "Workspace Index Numbers",
@@ -9062,19 +9098,19 @@
   {
     "term": "e.g., firefox, kitty --title foo",
     "context": "e.g., firefox, kitty --title foo",
-    "reference": "Widgets/KeybindItem.qml:1401",
+    "reference": "Widgets/KeybindItem.qml:1407",
     "comment": ""
   },
   {
     "term": "e.g., focus-workspace 3, resize-column -10",
     "context": "e.g., focus-workspace 3, resize-column -10",
-    "reference": "Widgets/KeybindItem.qml:1338",
+    "reference": "Widgets/KeybindItem.qml:1344",
     "comment": ""
   },
   {
     "term": "e.g., notify-send 'Hello' && sleep 1",
     "context": "e.g., notify-send 'Hello' && sleep 1",
-    "reference": "Widgets/KeybindItem.qml:1433",
+    "reference": "Widgets/KeybindItem.qml:1439",
     "comment": ""
   },
   {
@@ -9092,7 +9128,7 @@
   {
     "term": "leave empty for default",
     "context": "leave empty for default",
-    "reference": "Widgets/KeybindItem.qml:993",
+    "reference": "Widgets/KeybindItem.qml:999",
     "comment": ""
   },
   {
@@ -9116,7 +9152,7 @@
   {
     "term": "ms",
     "context": "ms",
-    "reference": "Widgets/KeybindItem.qml:1618",
+    "reference": "Widgets/KeybindItem.qml:1624",
     "comment": ""
   },
   {
diff --git a/quickshell/translations/poexports/es.json b/quickshell/translations/poexports/es.json
index de4ea262..df6841e4 100644
--- a/quickshell/translations/poexports/es.json
+++ b/quickshell/translations/poexports/es.json
@@ -1670,9 +1670,18 @@
   "Focus at Startup": {
     "Focus at Startup": "Centrarse en el inicio"
   },
+  "Focused Border": {
+    "Focused Border": ""
+  },
+  "Focused Color": {
+    "Focused Color": ""
+  },
   "Focused Window": {
     "Focused Window": "Ventana enfocada"
   },
+  "Follow Monitor Focus": {
+    "Follow Monitor Focus": ""
+  },
   "Follow focus": {
     "Follow focus": "Seguir foco"
   },
@@ -3386,6 +3395,9 @@
   "Show all 9 tags instead of only occupied tags (DWL only)": {
     "Show all 9 tags instead of only occupied tags (DWL only)": "Mostrar las 9 etiquetas en lugar de solo las ocupadas (solo DWL)"
   },
+  "Show an outline ring around the focused workspace indicator": {
+    "Show an outline ring around the focused workspace indicator": ""
+  },
   "Show cava audio visualizer in media widget": {
     "Show cava audio visualizer in media widget": "Mostrar visualizador de auido cava en el widget de multimedia"
   },
@@ -3455,6 +3467,9 @@
   "Show workspace name on horizontal bars, and first letter on vertical bars": {
     "Show workspace name on horizontal bars, and first letter on vertical bars": "Mostrar el nombre del espacio de trabajo en las barras horizontales y la primera letra en las verticales"
   },
+  "Show workspaces of the currently focused monitor": {
+    "Show workspaces of the currently focused monitor": ""
+  },
   "Shows all running applications with focus indication": {
     "Shows all running applications with focus indication": "Mostrar todas las ventanas abiertas destacando la enfocada"
   },
@@ -3821,6 +3836,9 @@
   "Unavailable": {
     "Unavailable": "No disponible"
   },
+  "Unfocused Color": {
+    "Unfocused Color": ""
+  },
   "Uninstall Plugin": {
     "Uninstall Plugin": "Desinstalar complemento"
   },
@@ -3863,6 +3881,9 @@
   "Update Plugin": {
     "Update Plugin": "Actualizar complemento"
   },
+  "Urgent Color": {
+    "Urgent Color": ""
+  },
   "Usage Tips": {
     "Usage Tips": ""
   },
@@ -4156,6 +4177,9 @@
   "Workspace": {
     "Workspace": "Espacio de trabajo"
   },
+  "Workspace Appearance": {
+    "Workspace Appearance": ""
+  },
   "Workspace Index Numbers": {
     "Workspace Index Numbers": "Espacios de trabajo numerados"
   },
diff --git a/quickshell/translations/poexports/fa.json b/quickshell/translations/poexports/fa.json
index f7008e90..7673102a 100644
--- a/quickshell/translations/poexports/fa.json
+++ b/quickshell/translations/poexports/fa.json
@@ -1670,9 +1670,18 @@
   "Focus at Startup": {
     "Focus at Startup": "فوکوس در هنگام راه‌اندازی"
   },
+  "Focused Border": {
+    "Focused Border": ""
+  },
+  "Focused Color": {
+    "Focused Color": ""
+  },
   "Focused Window": {
     "Focused Window": "پنجره فوکوس‌شده"
   },
+  "Follow Monitor Focus": {
+    "Follow Monitor Focus": ""
+  },
   "Follow focus": {
     "Follow focus": "پیروی از فوکوس"
   },
@@ -3386,6 +3395,9 @@
   "Show all 9 tags instead of only occupied tags (DWL only)": {
     "Show all 9 tags instead of only occupied tags (DWL only)": "نمایش کل ۹ برچسب به جای تنها برچسب‌های اشغال شده (تنها DWL)"
   },
+  "Show an outline ring around the focused workspace indicator": {
+    "Show an outline ring around the focused workspace indicator": ""
+  },
   "Show cava audio visualizer in media widget": {
     "Show cava audio visualizer in media widget": "نمایش مصورساز صوتی cava در ابزارک رسانه"
   },
@@ -3455,6 +3467,9 @@
   "Show workspace name on horizontal bars, and first letter on vertical bars": {
     "Show workspace name on horizontal bars, and first letter on vertical bars": "نام  workspace را در نوارهای افقی و اولین حرف را در نوار‌های عمودی نمایش بده"
   },
+  "Show workspaces of the currently focused monitor": {
+    "Show workspaces of the currently focused monitor": ""
+  },
   "Shows all running applications with focus indication": {
     "Shows all running applications with focus indication": "همه برنامه‌های درحال اجرا را با نشانگر متمرکز نمایش می‌دهد"
   },
@@ -3821,6 +3836,9 @@
   "Unavailable": {
     "Unavailable": "ناموجود"
   },
+  "Unfocused Color": {
+    "Unfocused Color": ""
+  },
   "Uninstall Plugin": {
     "Uninstall Plugin": "حذف افزونه"
   },
@@ -3863,6 +3881,9 @@
   "Update Plugin": {
     "Update Plugin": "بروزرسانی افزونه"
   },
+  "Urgent Color": {
+    "Urgent Color": ""
+  },
   "Usage Tips": {
     "Usage Tips": ""
   },
@@ -4156,6 +4177,9 @@
   "Workspace": {
     "Workspace": "Workspace"
   },
+  "Workspace Appearance": {
+    "Workspace Appearance": ""
+  },
   "Workspace Index Numbers": {
     "Workspace Index Numbers": "شماره شاخص workspace"
   },
diff --git a/quickshell/translations/poexports/he.json b/quickshell/translations/poexports/he.json
index c73f83d2..12c81672 100644
--- a/quickshell/translations/poexports/he.json
+++ b/quickshell/translations/poexports/he.json
@@ -1670,9 +1670,18 @@
   "Focus at Startup": {
     "Focus at Startup": ""
   },
+  "Focused Border": {
+    "Focused Border": ""
+  },
+  "Focused Color": {
+    "Focused Color": ""
+  },
   "Focused Window": {
     "Focused Window": "חלון ממוקד"
   },
+  "Follow Monitor Focus": {
+    "Follow Monitor Focus": ""
+  },
   "Follow focus": {
     "Follow focus": ""
   },
@@ -3386,6 +3395,9 @@
   "Show all 9 tags instead of only occupied tags (DWL only)": {
     "Show all 9 tags instead of only occupied tags (DWL only)": "הצג/י את כל 9 התגים במקום רק את התגים הפעילים (DWL בלבד)"
   },
+  "Show an outline ring around the focused workspace indicator": {
+    "Show an outline ring around the focused workspace indicator": ""
+  },
   "Show cava audio visualizer in media widget": {
     "Show cava audio visualizer in media widget": ""
   },
@@ -3455,6 +3467,9 @@
   "Show workspace name on horizontal bars, and first letter on vertical bars": {
     "Show workspace name on horizontal bars, and first letter on vertical bars": ""
   },
+  "Show workspaces of the currently focused monitor": {
+    "Show workspaces of the currently focused monitor": ""
+  },
   "Shows all running applications with focus indication": {
     "Shows all running applications with focus indication": "מציג את כל האפליקציות הפעילות עם סימון למיקוד"
   },
@@ -3821,6 +3836,9 @@
   "Unavailable": {
     "Unavailable": "לא זמין"
   },
+  "Unfocused Color": {
+    "Unfocused Color": ""
+  },
   "Uninstall Plugin": {
     "Uninstall Plugin": "הסר/י תוסף"
   },
@@ -3863,6 +3881,9 @@
   "Update Plugin": {
     "Update Plugin": "עדכן/י תוסף"
   },
+  "Urgent Color": {
+    "Urgent Color": ""
+  },
   "Usage Tips": {
     "Usage Tips": ""
   },
@@ -4156,6 +4177,9 @@
   "Workspace": {
     "Workspace": "סביבת עבודה"
   },
+  "Workspace Appearance": {
+    "Workspace Appearance": ""
+  },
   "Workspace Index Numbers": {
     "Workspace Index Numbers": "מספרי אינדקס של סביבות העבודה"
   },
diff --git a/quickshell/translations/poexports/hu.json b/quickshell/translations/poexports/hu.json
index 1dbe7d0d..64110ba0 100644
--- a/quickshell/translations/poexports/hu.json
+++ b/quickshell/translations/poexports/hu.json
@@ -1670,9 +1670,18 @@
   "Focus at Startup": {
     "Focus at Startup": "Fókusz indításkor"
   },
+  "Focused Border": {
+    "Focused Border": ""
+  },
+  "Focused Color": {
+    "Focused Color": ""
+  },
   "Focused Window": {
     "Focused Window": "Fókuszált ablak"
   },
+  "Follow Monitor Focus": {
+    "Follow Monitor Focus": ""
+  },
   "Follow focus": {
     "Follow focus": "Fókusz követése"
   },
@@ -3386,6 +3395,9 @@
   "Show all 9 tags instead of only occupied tags (DWL only)": {
     "Show all 9 tags instead of only occupied tags (DWL only)": "Mind a 9 címke megjelenítése a csak foglalt címkék helyett (csak DWL)"
   },
+  "Show an outline ring around the focused workspace indicator": {
+    "Show an outline ring around the focused workspace indicator": ""
+  },
   "Show cava audio visualizer in media widget": {
     "Show cava audio visualizer in media widget": "Cava hangvizualizáló megjelenítése a média widgeten"
   },
@@ -3455,6 +3467,9 @@
   "Show workspace name on horizontal bars, and first letter on vertical bars": {
     "Show workspace name on horizontal bars, and first letter on vertical bars": ""
   },
+  "Show workspaces of the currently focused monitor": {
+    "Show workspaces of the currently focused monitor": ""
+  },
   "Shows all running applications with focus indication": {
     "Shows all running applications with focus indication": "Megjeleníti az összes futó alkalmazást fókuszjelzéssel"
   },
@@ -3821,6 +3836,9 @@
   "Unavailable": {
     "Unavailable": "Nem elérhető"
   },
+  "Unfocused Color": {
+    "Unfocused Color": ""
+  },
   "Uninstall Plugin": {
     "Uninstall Plugin": "Bővítmény eltávolítása"
   },
@@ -3863,6 +3881,9 @@
   "Update Plugin": {
     "Update Plugin": "Bővítmény frissítése"
   },
+  "Urgent Color": {
+    "Urgent Color": ""
+  },
   "Usage Tips": {
     "Usage Tips": ""
   },
@@ -4156,6 +4177,9 @@
   "Workspace": {
     "Workspace": "Munkaterület"
   },
+  "Workspace Appearance": {
+    "Workspace Appearance": ""
+  },
   "Workspace Index Numbers": {
     "Workspace Index Numbers": "Munkaterület-indexszámok"
   },
diff --git a/quickshell/translations/poexports/it.json b/quickshell/translations/poexports/it.json
index b19973d4..2823a07a 100644
--- a/quickshell/translations/poexports/it.json
+++ b/quickshell/translations/poexports/it.json
@@ -21,10 +21,10 @@
     "%1 display(s)": "%1 schermo(i)"
   },
   "%1 exists but is not included in config. Custom keybinds will not work until this is fixed.": {
-    "%1 exists but is not included in config. Custom keybinds will not work until this is fixed.": ""
+    "%1 exists but is not included in config. Custom keybinds will not work until this is fixed.": "%1 esiste ma non è incluso nella configurazione. Le scorciatoie personalizzate non funzioneranno finché non sarà risolto."
   },
   "%1 is now included in config": {
-    "%1 is now included in config": ""
+    "%1 is now included in config": "%1 è ora incluso nella configurazione"
   },
   "%1 job(s)": {
     "%1 job(s)": "%1 stampa/e"
@@ -708,7 +708,7 @@
     "Clear at Startup": "Cancella all'Avvio"
   },
   "Click 'Setup' to create %1 and add include to config.": {
-    "Click 'Setup' to create %1 and add include to config.": ""
+    "Click 'Setup' to create %1 and add include to config.": "Clicca 'Configura' per creare %1 e aggiungere l'inclusione alla configurazione."
   },
   "Click 'Setup' to create cursor config and add include to your compositor config.": {
     "Click 'Setup' to create cursor config and add include to your compositor config.": "Clicca \"Configura\" per creare la configurazione del cursore e aggiungere l'inclusione al tuo file di configurazione del compositor."
@@ -723,7 +723,7 @@
     "Click Import to add a .ovpn or .conf": "Clicca su Importa per aggiungere un file .ovpn o .conf"
   },
   "Click any shortcut to edit. Changes save to %1": {
-    "Click any shortcut to edit. Changes save to %1": ""
+    "Click any shortcut to edit. Changes save to %1": "Clicca su qualsiasi scorciatoia per modificare. Le modifiche vengono salvate in %1"
   },
   "Click any shortcut to edit. Changes save to dms/binds.kdl": {
     "Click any shortcut to edit. Changes save to dms/binds.kdl": "Clicca su qualsiasi scorciatoia per modificarla. Le modifiche vengono salvate in dms/binds.kdl"
@@ -861,7 +861,7 @@
     "Connect": "Connetti"
   },
   "Connect to Hidden Network": {
-    "Connect to Hidden Network": ""
+    "Connect to Hidden Network": "Connetti a Rete Nascosta"
   },
   "Connect to VPN": {
     "Connect to VPN": "Connetti alla VPN"
@@ -1419,7 +1419,7 @@
     "Enter launch prefix (e.g., 'uwsm-app')": "Inserisci il prefisso di avvio (es. 'uwsm-app')"
   },
   "Enter network name and password": {
-    "Enter network name and password": ""
+    "Enter network name and password": "Inserisci nome rete e password"
   },
   "Enter passkey for ": {
     "Enter passkey for ": "Inserisci passkey per "
@@ -1653,7 +1653,7 @@
     "Fixing...": "Correzione in Corso..."
   },
   "Flags": {
-    "Flags": ""
+    "Flags": "Flag"
   },
   "Flipped": {
     "Flipped": "Ruotato"
@@ -1670,9 +1670,18 @@
   "Focus at Startup": {
     "Focus at Startup": "Attiva all'Avvio"
   },
+  "Focused Border": {
+    "Focused Border": ""
+  },
+  "Focused Color": {
+    "Focused Color": ""
+  },
   "Focused Window": {
     "Focused Window": "Finestra Attiva"
   },
+  "Follow Monitor Focus": {
+    "Follow Monitor Focus": ""
+  },
   "Follow focus": {
     "Follow focus": "Segui il focus"
   },
@@ -1818,10 +1827,10 @@
     "Hibernate": "Iberna"
   },
   "Hidden": {
-    "Hidden": ""
+    "Hidden": "Nascosto"
   },
   "Hidden Network": {
-    "Hidden Network": ""
+    "Hidden Network": "Rete Nascosta"
   },
   "Hide Delay": {
     "Hide Delay": "Ritardo Nascondi"
@@ -2139,7 +2148,7 @@
     "Lock fade grace period": "Periodo di attesa per la dissolvenza al blocco"
   },
   "Locked": {
-    "Locked": ""
+    "Locked": "Bloccato"
   },
   "Log Out": {
     "Log Out": "Termina Sessione"
@@ -2151,7 +2160,7 @@
     "Long Text": "Testo Lungo"
   },
   "Long press": {
-    "Long press": ""
+    "Long press": "Premuta prolungata"
   },
   "Longitude": {
     "Longitude": "Longitudine"
@@ -2379,7 +2388,7 @@
     "Network Information": "Informazioni Rete"
   },
   "Network Name (SSID)": {
-    "Network Name (SSID)": ""
+    "Network Name (SSID)": "Nome della rete (SSID)"
   },
   "Network Speed Monitor": {
     "Network Speed Monitor": "Monitor Velocità Rete"
@@ -2958,7 +2967,7 @@
     "Reject Jobs": "Rifiuta Stampe"
   },
   "Release": {
-    "Release": ""
+    "Release": "Rilascio"
   },
   "Reload Plugin": {
     "Reload Plugin": "Ricarica Plugin"
@@ -2970,7 +2979,7 @@
     "Remove gaps and border when windows are maximized": "Rimuovi spazi e bordo quando le finestre sono massimizzate"
   },
   "Repeat": {
-    "Repeat": ""
+    "Repeat": "Ripetizione"
   },
   "Report": {
     "Report": "Riepilogo"
@@ -3386,6 +3395,9 @@
   "Show all 9 tags instead of only occupied tags (DWL only)": {
     "Show all 9 tags instead of only occupied tags (DWL only)": "Mostra tutti i 9 tag invece di quelli occupati (solo DWL)"
   },
+  "Show an outline ring around the focused workspace indicator": {
+    "Show an outline ring around the focused workspace indicator": ""
+  },
   "Show cava audio visualizer in media widget": {
     "Show cava audio visualizer in media widget": "Mostra il visualizzatore audio cava nel widget multimediale"
   },
@@ -3455,6 +3467,9 @@
   "Show workspace name on horizontal bars, and first letter on vertical bars": {
     "Show workspace name on horizontal bars, and first letter on vertical bars": "Mostra il nome dello spazio di lavoro nelle barre orizzontali e la prima lettera in quelle verticali"
   },
+  "Show workspaces of the currently focused monitor": {
+    "Show workspaces of the currently focused monitor": ""
+  },
   "Shows all running applications with focus indication": {
     "Shows all running applications with focus indication": "Mostra tutte le applicazioni in esecuzione con indicazione focus"
   },
@@ -3821,6 +3836,9 @@
   "Unavailable": {
     "Unavailable": "Non disponibile"
   },
+  "Unfocused Color": {
+    "Unfocused Color": ""
+  },
   "Uninstall Plugin": {
     "Uninstall Plugin": "Disinstalla Plugin"
   },
@@ -3863,6 +3881,9 @@
   "Update Plugin": {
     "Update Plugin": "Aggiorna Plugin"
   },
+  "Urgent Color": {
+    "Urgent Color": ""
+  },
   "Usage Tips": {
     "Usage Tips": "Suggerimenti d'Uso"
   },
@@ -4156,6 +4177,9 @@
   "Workspace": {
     "Workspace": "Spazio di Lavoro"
   },
+  "Workspace Appearance": {
+    "Workspace Appearance": ""
+  },
   "Workspace Index Numbers": {
     "Workspace Index Numbers": "Numeri Indice Spazi di Lavoro"
   },
@@ -4343,7 +4367,7 @@
     "Night mode & gamma": "Modalità notte e gamma",
     "Per-screen config": "Configurazione per schermo",
     "Quick system toggles": "Comandi rapidi di sistema",
-    "Security & privacy": ""
+    "Security & privacy": "Sicurezza & privacy"
   },
   "greeter feature card title": {
     "App Theming": "Theming Applicazioni",
@@ -4361,7 +4385,7 @@
     "DankBar": "DankBar"
   },
   "greeter feature card title | lock screen notifications settings card": {
-    "Lock Screen": ""
+    "Lock Screen": "Schermata di Blocco"
   },
   "greeter finish button": {
     "Finish": "Fine"
@@ -4607,7 +4631,7 @@
     "update dms for NM integration.": "aggiorna dms per l'integrazione NM."
   },
   "version requirement": {
-    "Requires %1": ""
+    "Requires %1": "Richiede %1"
   },
   "wallpaper directory file browser title": {
     "Select Wallpaper Directory": "Seleziona Cartella Sfondo"
diff --git a/quickshell/translations/poexports/ja.json b/quickshell/translations/poexports/ja.json
index 705909d6..75af0452 100644
--- a/quickshell/translations/poexports/ja.json
+++ b/quickshell/translations/poexports/ja.json
@@ -1670,9 +1670,18 @@
   "Focus at Startup": {
     "Focus at Startup": ""
   },
+  "Focused Border": {
+    "Focused Border": ""
+  },
+  "Focused Color": {
+    "Focused Color": ""
+  },
   "Focused Window": {
     "Focused Window": "フォーカスされたウィンドウ"
   },
+  "Follow Monitor Focus": {
+    "Follow Monitor Focus": ""
+  },
   "Follow focus": {
     "Follow focus": ""
   },
@@ -3386,6 +3395,9 @@
   "Show all 9 tags instead of only occupied tags (DWL only)": {
     "Show all 9 tags instead of only occupied tags (DWL only)": "占有タグのみではなく、9 つのタグをすべて表示 (DWL のみ)"
   },
+  "Show an outline ring around the focused workspace indicator": {
+    "Show an outline ring around the focused workspace indicator": ""
+  },
   "Show cava audio visualizer in media widget": {
     "Show cava audio visualizer in media widget": ""
   },
@@ -3455,6 +3467,9 @@
   "Show workspace name on horizontal bars, and first letter on vertical bars": {
     "Show workspace name on horizontal bars, and first letter on vertical bars": ""
   },
+  "Show workspaces of the currently focused monitor": {
+    "Show workspaces of the currently focused monitor": ""
+  },
   "Shows all running applications with focus indication": {
     "Shows all running applications with focus indication": "実行中のすべてのアプリケーションをフォーカス状態で表示"
   },
@@ -3821,6 +3836,9 @@
   "Unavailable": {
     "Unavailable": ""
   },
+  "Unfocused Color": {
+    "Unfocused Color": ""
+  },
   "Uninstall Plugin": {
     "Uninstall Plugin": "プラグインをアンインストール"
   },
@@ -3863,6 +3881,9 @@
   "Update Plugin": {
     "Update Plugin": "プラグインを更新"
   },
+  "Urgent Color": {
+    "Urgent Color": ""
+  },
   "Usage Tips": {
     "Usage Tips": ""
   },
@@ -4156,6 +4177,9 @@
   "Workspace": {
     "Workspace": "ワークスペース"
   },
+  "Workspace Appearance": {
+    "Workspace Appearance": ""
+  },
   "Workspace Index Numbers": {
     "Workspace Index Numbers": "ワークスペースのインデックス番号"
   },
diff --git a/quickshell/translations/poexports/pl.json b/quickshell/translations/poexports/pl.json
index 44b80844..fcccc76d 100644
--- a/quickshell/translations/poexports/pl.json
+++ b/quickshell/translations/poexports/pl.json
@@ -1670,9 +1670,18 @@
   "Focus at Startup": {
     "Focus at Startup": "Aktywuj przy starcie"
   },
+  "Focused Border": {
+    "Focused Border": ""
+  },
+  "Focused Color": {
+    "Focused Color": ""
+  },
   "Focused Window": {
     "Focused Window": "Aktywne okno"
   },
+  "Follow Monitor Focus": {
+    "Follow Monitor Focus": ""
+  },
   "Follow focus": {
     "Follow focus": "Podążaj za kursorem"
   },
@@ -3386,6 +3395,9 @@
   "Show all 9 tags instead of only occupied tags (DWL only)": {
     "Show all 9 tags instead of only occupied tags (DWL only)": "Pokaż wszystkie 9 tagów zamiast tylko zajętych (tylko DWL)"
   },
+  "Show an outline ring around the focused workspace indicator": {
+    "Show an outline ring around the focused workspace indicator": ""
+  },
   "Show cava audio visualizer in media widget": {
     "Show cava audio visualizer in media widget": "Pokaż wizualizację audio cava w widżecie multimediów"
   },
@@ -3455,6 +3467,9 @@
   "Show workspace name on horizontal bars, and first letter on vertical bars": {
     "Show workspace name on horizontal bars, and first letter on vertical bars": ""
   },
+  "Show workspaces of the currently focused monitor": {
+    "Show workspaces of the currently focused monitor": ""
+  },
   "Shows all running applications with focus indication": {
     "Shows all running applications with focus indication": "Pokazuje wszystkie uruchomione aplikacje ze wskaźnikiem fokusu"
   },
@@ -3821,6 +3836,9 @@
   "Unavailable": {
     "Unavailable": "Niedostępny"
   },
+  "Unfocused Color": {
+    "Unfocused Color": ""
+  },
   "Uninstall Plugin": {
     "Uninstall Plugin": "Odinstaluj wtyczkę"
   },
@@ -3863,6 +3881,9 @@
   "Update Plugin": {
     "Update Plugin": "Zaktualizuj wtyczkę"
   },
+  "Urgent Color": {
+    "Urgent Color": ""
+  },
   "Usage Tips": {
     "Usage Tips": ""
   },
@@ -4156,6 +4177,9 @@
   "Workspace": {
     "Workspace": "Obszar roboczy"
   },
+  "Workspace Appearance": {
+    "Workspace Appearance": ""
+  },
   "Workspace Index Numbers": {
     "Workspace Index Numbers": "Numery indeksów obszarów roboczych"
   },
diff --git a/quickshell/translations/poexports/pt.json b/quickshell/translations/poexports/pt.json
index f4ccf332..21cd93f5 100644
--- a/quickshell/translations/poexports/pt.json
+++ b/quickshell/translations/poexports/pt.json
@@ -1670,9 +1670,18 @@
   "Focus at Startup": {
     "Focus at Startup": ""
   },
+  "Focused Border": {
+    "Focused Border": ""
+  },
+  "Focused Color": {
+    "Focused Color": ""
+  },
   "Focused Window": {
     "Focused Window": "Janela Focada"
   },
+  "Follow Monitor Focus": {
+    "Follow Monitor Focus": ""
+  },
   "Follow focus": {
     "Follow focus": "Seguir foco"
   },
@@ -3386,6 +3395,9 @@
   "Show all 9 tags instead of only occupied tags (DWL only)": {
     "Show all 9 tags instead of only occupied tags (DWL only)": "Mostrar todas as 9 tags ao invés de apenas tags ocupadas (apenas DWL)"
   },
+  "Show an outline ring around the focused workspace indicator": {
+    "Show an outline ring around the focused workspace indicator": ""
+  },
   "Show cava audio visualizer in media widget": {
     "Show cava audio visualizer in media widget": ""
   },
@@ -3455,6 +3467,9 @@
   "Show workspace name on horizontal bars, and first letter on vertical bars": {
     "Show workspace name on horizontal bars, and first letter on vertical bars": ""
   },
+  "Show workspaces of the currently focused monitor": {
+    "Show workspaces of the currently focused monitor": ""
+  },
   "Shows all running applications with focus indication": {
     "Shows all running applications with focus indication": "Mostra todos os aplicativos em execução, destacando o que está em foco"
   },
@@ -3821,6 +3836,9 @@
   "Unavailable": {
     "Unavailable": "Indisponível"
   },
+  "Unfocused Color": {
+    "Unfocused Color": ""
+  },
   "Uninstall Plugin": {
     "Uninstall Plugin": "Desinstalar Plugin"
   },
@@ -3863,6 +3881,9 @@
   "Update Plugin": {
     "Update Plugin": "Atualizar Plugin"
   },
+  "Urgent Color": {
+    "Urgent Color": ""
+  },
   "Usage Tips": {
     "Usage Tips": ""
   },
@@ -4156,6 +4177,9 @@
   "Workspace": {
     "Workspace": "Área de Trabalho"
   },
+  "Workspace Appearance": {
+    "Workspace Appearance": ""
+  },
   "Workspace Index Numbers": {
     "Workspace Index Numbers": "Índices das Áreas de Trabalho"
   },
diff --git a/quickshell/translations/poexports/tr.json b/quickshell/translations/poexports/tr.json
index d3bc54df..1aa5a782 100644
--- a/quickshell/translations/poexports/tr.json
+++ b/quickshell/translations/poexports/tr.json
@@ -1670,9 +1670,18 @@
   "Focus at Startup": {
     "Focus at Startup": "Başlangıçta Odakla"
   },
+  "Focused Border": {
+    "Focused Border": ""
+  },
+  "Focused Color": {
+    "Focused Color": ""
+  },
   "Focused Window": {
     "Focused Window": "Odaklanılmış Pencere"
   },
+  "Follow Monitor Focus": {
+    "Follow Monitor Focus": ""
+  },
   "Follow focus": {
     "Follow focus": "Odağı takip et"
   },
@@ -3386,6 +3395,9 @@
   "Show all 9 tags instead of only occupied tags (DWL only)": {
     "Show all 9 tags instead of only occupied tags (DWL only)": "Sadece dolu etiketleri değil, tüm 9 etiketi göster (sadece DWL)"
   },
+  "Show an outline ring around the focused workspace indicator": {
+    "Show an outline ring around the focused workspace indicator": ""
+  },
   "Show cava audio visualizer in media widget": {
     "Show cava audio visualizer in media widget": "Medya widget'ında cava ses görselleştiricisini göster"
   },
@@ -3455,6 +3467,9 @@
   "Show workspace name on horizontal bars, and first letter on vertical bars": {
     "Show workspace name on horizontal bars, and first letter on vertical bars": ""
   },
+  "Show workspaces of the currently focused monitor": {
+    "Show workspaces of the currently focused monitor": ""
+  },
   "Shows all running applications with focus indication": {
     "Shows all running applications with focus indication": "Odak göstergesiyle çalışan tüm uygulamaları gösterir"
   },
@@ -3821,6 +3836,9 @@
   "Unavailable": {
     "Unavailable": "Mevcut Değil"
   },
+  "Unfocused Color": {
+    "Unfocused Color": ""
+  },
   "Uninstall Plugin": {
     "Uninstall Plugin": "Eklentiyi Kaldır"
   },
@@ -3863,6 +3881,9 @@
   "Update Plugin": {
     "Update Plugin": "Eklentiyi Güncelle"
   },
+  "Urgent Color": {
+    "Urgent Color": ""
+  },
   "Usage Tips": {
     "Usage Tips": ""
   },
@@ -4156,6 +4177,9 @@
   "Workspace": {
     "Workspace": "Çalışma Alanı"
   },
+  "Workspace Appearance": {
+    "Workspace Appearance": ""
+  },
   "Workspace Index Numbers": {
     "Workspace Index Numbers": "Çalışma Alanı Sıra Numarası"
   },
diff --git a/quickshell/translations/poexports/zh_CN.json b/quickshell/translations/poexports/zh_CN.json
index 353c098a..ca407c72 100644
--- a/quickshell/translations/poexports/zh_CN.json
+++ b/quickshell/translations/poexports/zh_CN.json
@@ -861,7 +861,7 @@
     "Connect": "连接"
   },
   "Connect to Hidden Network": {
-    "Connect to Hidden Network": ""
+    "Connect to Hidden Network": "连接到隐藏的网络"
   },
   "Connect to VPN": {
     "Connect to VPN": "连接到 VPN"
@@ -1419,7 +1419,7 @@
     "Enter launch prefix (e.g., 'uwsm-app')": "输入启动前缀（例如 uwsm-app）"
   },
   "Enter network name and password": {
-    "Enter network name and password": ""
+    "Enter network name and password": "输入网络名称与密码"
   },
   "Enter passkey for ": {
     "Enter passkey for ": "输入密钥 "
@@ -1670,9 +1670,18 @@
   "Focus at Startup": {
     "Focus at Startup": "启动时聚焦"
   },
+  "Focused Border": {
+    "Focused Border": ""
+  },
+  "Focused Color": {
+    "Focused Color": ""
+  },
   "Focused Window": {
     "Focused Window": "当前窗口"
   },
+  "Follow Monitor Focus": {
+    "Follow Monitor Focus": ""
+  },
   "Follow focus": {
     "Follow focus": "跟随焦点"
   },
@@ -1821,7 +1830,7 @@
     "Hidden": ""
   },
   "Hidden Network": {
-    "Hidden Network": ""
+    "Hidden Network": "隐藏的网络"
   },
   "Hide Delay": {
     "Hide Delay": "隐藏延迟"
@@ -2379,7 +2388,7 @@
     "Network Information": "网络信息"
   },
   "Network Name (SSID)": {
-    "Network Name (SSID)": ""
+    "Network Name (SSID)": "网络名称 (SSID)"
   },
   "Network Speed Monitor": {
     "Network Speed Monitor": "实时网速显示"
@@ -3386,6 +3395,9 @@
   "Show all 9 tags instead of only occupied tags (DWL only)": {
     "Show all 9 tags instead of only occupied tags (DWL only)": "显示所有 9 个标签，而非仅占用的标签（仅限 DWL）"
   },
+  "Show an outline ring around the focused workspace indicator": {
+    "Show an outline ring around the focused workspace indicator": ""
+  },
   "Show cava audio visualizer in media widget": {
     "Show cava audio visualizer in media widget": "在多媒体部件中显示cava音频可视化"
   },
@@ -3455,6 +3467,9 @@
   "Show workspace name on horizontal bars, and first letter on vertical bars": {
     "Show workspace name on horizontal bars, and first letter on vertical bars": "在水平状态栏上显示工作区名称，而在垂直状态栏上显示首字母。"
   },
+  "Show workspaces of the currently focused monitor": {
+    "Show workspaces of the currently focused monitor": ""
+  },
   "Shows all running applications with focus indication": {
     "Shows all running applications with focus indication": "显示所有正在运行应用程序，并标记焦点所在"
   },
@@ -3821,6 +3836,9 @@
   "Unavailable": {
     "Unavailable": "不可用"
   },
+  "Unfocused Color": {
+    "Unfocused Color": ""
+  },
   "Uninstall Plugin": {
     "Uninstall Plugin": "卸载插件"
   },
@@ -3863,6 +3881,9 @@
   "Update Plugin": {
     "Update Plugin": "更新插件"
   },
+  "Urgent Color": {
+    "Urgent Color": ""
+  },
   "Usage Tips": {
     "Usage Tips": "使用提示"
   },
@@ -4156,6 +4177,9 @@
   "Workspace": {
     "Workspace": "工作区"
   },
+  "Workspace Appearance": {
+    "Workspace Appearance": ""
+  },
   "Workspace Index Numbers": {
     "Workspace Index Numbers": "工作区序号"
   },
@@ -4361,7 +4385,7 @@
     "DankBar": "DankBar"
   },
   "greeter feature card title | lock screen notifications settings card": {
-    "Lock Screen": ""
+    "Lock Screen": "锁屏"
   },
   "greeter finish button": {
     "Finish": "完成"
diff --git a/quickshell/translations/poexports/zh_TW.json b/quickshell/translations/poexports/zh_TW.json
index d75a1582..4a280fbd 100644
--- a/quickshell/translations/poexports/zh_TW.json
+++ b/quickshell/translations/poexports/zh_TW.json
@@ -21,10 +21,10 @@
     "%1 display(s)": "%1 個螢幕"
   },
   "%1 exists but is not included in config. Custom keybinds will not work until this is fixed.": {
-    "%1 exists but is not included in config. Custom keybinds will not work until this is fixed.": ""
+    "%1 exists but is not included in config. Custom keybinds will not work until this is fixed.": "%1 存在但未包含在設定中。自訂快捷鍵在修正此問題前將無法運作。"
   },
   "%1 is now included in config": {
-    "%1 is now included in config": ""
+    "%1 is now included in config": "%1 現已包含在設定中"
   },
   "%1 job(s)": {
     "%1 job(s)": "%1 個工作"
@@ -420,7 +420,7 @@
     "Automatically determine your location using your IP address": "使用您的 IP 位址自動確定您的位置"
   },
   "Automatically lock after": {
-    "Automatically lock after": "自動鎖定後"
+    "Automatically lock after": "指定時間後自動鎖定"
   },
   "Automatically lock the screen when the system prepares to suspend": {
     "Automatically lock the screen when the system prepares to suspend": "睡眠時自動鎖定螢幕"
@@ -708,7 +708,7 @@
     "Clear at Startup": "啟動時清除"
   },
   "Click 'Setup' to create %1 and add include to config.": {
-    "Click 'Setup' to create %1 and add include to config.": ""
+    "Click 'Setup' to create %1 and add include to config.": "點擊「設定」以建立 %1 並新增到設定中。"
   },
   "Click 'Setup' to create cursor config and add include to your compositor config.": {
     "Click 'Setup' to create cursor config and add include to your compositor config.": "點擊「設定」以建立游標設定檔，並將其包含至您的合成器設定中。"
@@ -723,7 +723,7 @@
     "Click Import to add a .ovpn or .conf": "點擊匯入以新增 .ovpn 或 .conf"
   },
   "Click any shortcut to edit. Changes save to %1": {
-    "Click any shortcut to edit. Changes save to %1": ""
+    "Click any shortcut to edit. Changes save to %1": "點擊任一快捷鍵進行編輯。變更會儲存到 %1"
   },
   "Click any shortcut to edit. Changes save to dms/binds.kdl": {
     "Click any shortcut to edit. Changes save to dms/binds.kdl": "點擊任何快捷方式進行編輯。更改將保存到 dms/binds.kdl"
@@ -861,7 +861,7 @@
     "Connect": "連線"
   },
   "Connect to Hidden Network": {
-    "Connect to Hidden Network": ""
+    "Connect to Hidden Network": "連線到隱藏網路"
   },
   "Connect to VPN": {
     "Connect to VPN": "連線到 VPN"
@@ -1419,7 +1419,7 @@
     "Enter launch prefix (e.g., 'uwsm-app')": "輸入啟動前綴（例如：「uwsm-app」）"
   },
   "Enter network name and password": {
-    "Enter network name and password": ""
+    "Enter network name and password": "輸入網路名稱和密碼"
   },
   "Enter passkey for ": {
     "Enter passkey for ": "請輸入密碼給 "
@@ -1653,7 +1653,7 @@
     "Fixing...": "正在修復..."
   },
   "Flags": {
-    "Flags": ""
+    "Flags": "標幟"
   },
   "Flipped": {
     "Flipped": "翻轉"
@@ -1670,9 +1670,18 @@
   "Focus at Startup": {
     "Focus at Startup": "啟動時聚焦"
   },
+  "Focused Border": {
+    "Focused Border": ""
+  },
+  "Focused Color": {
+    "Focused Color": ""
+  },
   "Focused Window": {
     "Focused Window": "視窗對焦"
   },
+  "Follow Monitor Focus": {
+    "Follow Monitor Focus": ""
+  },
   "Follow focus": {
     "Follow focus": "跟隨焦點"
   },
@@ -1818,10 +1827,10 @@
     "Hibernate": "休眠"
   },
   "Hidden": {
-    "Hidden": ""
+    "Hidden": "隱藏的"
   },
   "Hidden Network": {
-    "Hidden Network": ""
+    "Hidden Network": "隱藏網路"
   },
   "Hide Delay": {
     "Hide Delay": "隱藏延遲"
@@ -2139,7 +2148,7 @@
     "Lock fade grace period": "鎖定淡出緩衝期"
   },
   "Locked": {
-    "Locked": ""
+    "Locked": "已鎖定"
   },
   "Log Out": {
     "Log Out": "登出"
@@ -2151,7 +2160,7 @@
     "Long Text": "長文字"
   },
   "Long press": {
-    "Long press": ""
+    "Long press": "長按"
   },
   "Longitude": {
     "Longitude": "經度"
@@ -2379,7 +2388,7 @@
     "Network Information": "網路資訊"
   },
   "Network Name (SSID)": {
-    "Network Name (SSID)": ""
+    "Network Name (SSID)": "網路名稱 (SSID)"
   },
   "Network Speed Monitor": {
     "Network Speed Monitor": "網速監視"
@@ -2958,7 +2967,7 @@
     "Reject Jobs": "拒絕工作"
   },
   "Release": {
-    "Release": ""
+    "Release": "放開"
   },
   "Reload Plugin": {
     "Reload Plugin": "重新載入插件"
@@ -2970,7 +2979,7 @@
     "Remove gaps and border when windows are maximized": "視窗最大化時移除間距與邊框"
   },
   "Repeat": {
-    "Repeat": ""
+    "Repeat": "重複"
   },
   "Report": {
     "Report": "報告"
@@ -3386,6 +3395,9 @@
   "Show all 9 tags instead of only occupied tags (DWL only)": {
     "Show all 9 tags instead of only occupied tags (DWL only)": "顯示所有 9 個標籤，而非僅顯示已佔用的標籤 (僅限 DWL)"
   },
+  "Show an outline ring around the focused workspace indicator": {
+    "Show an outline ring around the focused workspace indicator": ""
+  },
   "Show cava audio visualizer in media widget": {
     "Show cava audio visualizer in media widget": "在媒體小工具中顯示 cava 音訊視覺化工具"
   },
@@ -3455,6 +3467,9 @@
   "Show workspace name on horizontal bars, and first letter on vertical bars": {
     "Show workspace name on horizontal bars, and first letter on vertical bars": "在水平列顯示工作區名稱，垂直列顯示首字母"
   },
+  "Show workspaces of the currently focused monitor": {
+    "Show workspaces of the currently focused monitor": ""
+  },
   "Shows all running applications with focus indication": {
     "Shows all running applications with focus indication": "顯示所有正在運行的應用程式並帶有焦點指示"
   },
@@ -3585,7 +3600,7 @@
     "Suspend behavior": "睡眠行為"
   },
   "Suspend system after": {
-    "Suspend system after": "系統睡眠後"
+    "Suspend system after": "指定時間後系統睡眠"
   },
   "Swap": {
     "Swap": "交換區"
@@ -3804,7 +3819,7 @@
     "Trigger Prefix": "觸發前綴"
   },
   "Turn off monitors after": {
-    "Turn off monitors after": "關閉螢幕之後"
+    "Turn off monitors after": "指定時間後關閉螢幕"
   },
   "Type": {
     "Type": "類型"
@@ -3821,6 +3836,9 @@
   "Unavailable": {
     "Unavailable": "不可用"
   },
+  "Unfocused Color": {
+    "Unfocused Color": ""
+  },
   "Uninstall Plugin": {
     "Uninstall Plugin": "解除安裝插件"
   },
@@ -3863,6 +3881,9 @@
   "Update Plugin": {
     "Update Plugin": "更新插件"
   },
+  "Urgent Color": {
+    "Urgent Color": ""
+  },
   "Usage Tips": {
     "Usage Tips": "使用提示"
   },
@@ -4156,6 +4177,9 @@
   "Workspace": {
     "Workspace": "工作區"
   },
+  "Workspace Appearance": {
+    "Workspace Appearance": ""
+  },
   "Workspace Index Numbers": {
     "Workspace Index Numbers": "工作區編號"
   },
@@ -4343,7 +4367,7 @@
     "Night mode & gamma": "夜間模式與伽瑪",
     "Per-screen config": "依螢幕設定",
     "Quick system toggles": "快速系統切換",
-    "Security & privacy": ""
+    "Security & privacy": "安全與隱私"
   },
   "greeter feature card title": {
     "App Theming": "應用程式主題",
@@ -4361,7 +4385,7 @@
     "DankBar": "DankBar"
   },
   "greeter feature card title | lock screen notifications settings card": {
-    "Lock Screen": ""
+    "Lock Screen": "鎖定螢幕"
   },
   "greeter finish button": {
     "Finish": "完成"
@@ -4607,7 +4631,7 @@
     "update dms for NM integration.": "更新 dms 以進行 NM 整合。"
   },
   "version requirement": {
-    "Requires %1": ""
+    "Requires %1": "需要 %1"
   },
   "wallpaper directory file browser title": {
     "Select Wallpaper Directory": "選擇桌布目錄"
diff --git a/quickshell/translations/settings_search_index.json b/quickshell/translations/settings_search_index.json
index 41f22f13..9f682b8b 100644
--- a/quickshell/translations/settings_search_index.json
+++ b/quickshell/translations/settings_search_index.json
@@ -708,6 +708,51 @@
     ],
     "icon": "visibility_off"
   },
+  {
+    "section": "workspaceFocusedBorderEnabled",
+    "label": "Focused Border",
+    "tabIndex": 4,
+    "category": "Workspaces",
+    "keywords": [
+      "around",
+      "border",
+      "desktop",
+      "focused",
+      "indicator",
+      "outline",
+      "ring",
+      "show",
+      "spaces",
+      "virtual",
+      "virtual desktops",
+      "workspace",
+      "workspaces"
+    ],
+    "description": "Show an outline ring around the focused workspace indicator"
+  },
+  {
+    "section": "workspaceFollowFocus",
+    "label": "Follow Monitor Focus",
+    "tabIndex": 4,
+    "category": "Workspaces",
+    "keywords": [
+      "currently",
+      "desktop",
+      "desktops",
+      "focus",
+      "focused",
+      "follow",
+      "monitor",
+      "show",
+      "spaces",
+      "virtual",
+      "virtual desktops",
+      "workspace",
+      "workspaces"
+    ],
+    "description": "Show workspaces of the currently focused monitor",
+    "conditionKey": "isNiri"
+  },
   {
     "section": "groupWorkspaceApps",
     "label": "Group Workspace Apps",
@@ -751,29 +796,6 @@
     ],
     "icon": "label"
   },
-  {
-    "section": "workspacesPerMonitor",
-    "label": "Per-Monitor Workspaces",
-    "tabIndex": 4,
-    "category": "Workspaces",
-    "keywords": [
-      "belonging",
-      "desktop",
-      "desktops",
-      "monitor",
-      "multi-monitor",
-      "per",
-      "per-monitor",
-      "show",
-      "spaces",
-      "specific",
-      "virtual",
-      "virtual desktops",
-      "workspace",
-      "workspaces"
-    ],
-    "description": "Show only workspaces belonging to each specific monitor."
-  },
   {
     "section": "reverseScrolling",
     "label": "Reverse Scrolling Direction",
@@ -873,6 +895,31 @@
     "description": "Display application icons in workspace indicators",
     "conditionKey": "isNiri"
   },
+  {
+    "section": "workspaceAppearance",
+    "label": "Workspace Appearance",
+    "tabIndex": 4,
+    "category": "Workspaces",
+    "keywords": [
+      "appearance",
+      "around",
+      "border",
+      "desktop",
+      "focused",
+      "indicator",
+      "outline",
+      "ring",
+      "show",
+      "spaces",
+      "virtual",
+      "virtual desktops",
+      "workspace",
+      "workspaces"
+    ],
+    "icon": "palette",
+    "description": "Show an outline ring around the focused workspace indicator",
+    "conditionKey": "isNiri"
+  },
   {
     "section": "showWorkspaceIndex",
     "label": "Workspace Index Numbers",
diff --git a/quickshell/translations/template.json b/quickshell/translations/template.json
index acf25a87..9148d3d3 100644
--- a/quickshell/translations/template.json
+++ b/quickshell/translations/template.json
@@ -4059,6 +4059,20 @@
     "reference": "",
     "comment": ""
   },
+  {
+    "term": "Focused Border",
+    "translation": "",
+    "context": "",
+    "reference": "",
+    "comment": ""
+  },
+  {
+    "term": "Focused Color",
+    "translation": "",
+    "context": "",
+    "reference": "",
+    "comment": ""
+  },
   {
     "term": "Focused Window",
     "translation": "",
@@ -4066,6 +4080,13 @@
     "reference": "",
     "comment": ""
   },
+  {
+    "term": "Follow Monitor Focus",
+    "translation": "",
+    "context": "",
+    "reference": "",
+    "comment": ""
+  },
   {
     "term": "Follow focus",
     "translation": "",
@@ -6824,13 +6845,6 @@
     "reference": "",
     "comment": ""
   },
-  {
-    "term": "Per-Monitor Workspaces",
-    "translation": "",
-    "context": "",
-    "reference": "",
-    "comment": ""
-  },
   {
     "term": "Per-screen config",
     "translation": "",
@@ -8539,6 +8553,13 @@
     "reference": "",
     "comment": ""
   },
+  {
+    "term": "Show an outline ring around the focused workspace indicator",
+    "translation": "",
+    "context": "",
+    "reference": "",
+    "comment": ""
+  },
   {
     "term": "Show cava audio visualizer in media widget",
     "translation": "",
@@ -8665,13 +8686,6 @@
     "reference": "",
     "comment": ""
   },
-  {
-    "term": "Show only workspaces belonging to each specific monitor.",
-    "translation": "",
-    "context": "",
-    "reference": "",
-    "comment": ""
-  },
   {
     "term": "Show password",
     "translation": "",
@@ -8700,6 +8714,13 @@
     "reference": "",
     "comment": ""
   },
+  {
+    "term": "Show workspaces of the currently focused monitor",
+    "translation": "",
+    "context": "",
+    "reference": "",
+    "comment": ""
+  },
   {
     "term": "Shows all running applications with focus indication",
     "translation": "",
@@ -9582,6 +9603,13 @@
     "reference": "",
     "comment": ""
   },
+  {
+    "term": "Unfocused Color",
+    "translation": "",
+    "context": "",
+    "reference": "",
+    "comment": ""
+  },
   {
     "term": "Uninstall",
     "translation": "",
@@ -9708,6 +9736,13 @@
     "reference": "",
     "comment": ""
   },
+  {
+    "term": "Urgent Color",
+    "translation": "",
+    "context": "",
+    "reference": "",
+    "comment": ""
+  },
   {
     "term": "Usage Tips",
     "translation": "",
@@ -10415,6 +10450,13 @@
     "reference": "",
     "comment": ""
   },
+  {
+    "term": "Workspace Appearance",
+    "translation": "",
+    "context": "",
+    "reference": "",
+    "comment": ""
+  },
   {
     "term": "Workspace Index Numbers",
     "translation": "",