diff --git a/quickshell/Modules/DankBar/Widgets/WorkspaceSwitcher.qml b/quickshell/Modules/DankBar/Widgets/WorkspaceSwitcher.qml
index b818304d0..f0f94e6d1 100644
--- a/quickshell/Modules/DankBar/Widgets/WorkspaceSwitcher.qml
+++ b/quickshell/Modules/DankBar/Widgets/WorkspaceSwitcher.qml
@@ -1629,7 +1629,7 @@ Item {
                                             text: loadedIconData?.value ?? ""
                                             color: (isActive || isUrgent) ? Theme.withAlpha(Theme.surfaceContainer, 0.95) : isPlaceholder ? Theme.surfaceTextAlpha : Theme.surfaceTextMedium
                                             font.pixelSize: Theme.barTextSize(barThickness, barConfig?.fontScale, barConfig?.maximizeWidgetText)
-                                            font.weight: (isActive && !isPlaceholder) ? Font.DemiBold : Font.Normal
+                                            font.weight: (isActive && !isPlaceholder) ? Math.max(Theme.fontWeight, Font.DemiBold) : Theme.fontWeight
                                         }
                                     }
 
@@ -1644,7 +1644,7 @@ Item {
                                             text: loadedHasIcon ? (modelData?.name ?? "") : root.getWorkspaceIndex(modelData, index)
                                             color: (isActive || isUrgent) ? Theme.withAlpha(Theme.surfaceContainer, 0.95) : isPlaceholder ? Theme.surfaceTextAlpha : Theme.surfaceTextMedium
                                             font.pixelSize: Theme.barTextSize(barThickness, barConfig?.fontScale, barConfig?.maximizeWidgetText)
-                                            font.weight: (isActive && !isPlaceholder) ? Font.DemiBold : Font.Normal
+                                            font.weight: (isActive && !isPlaceholder) ? Math.max(Theme.fontWeight, Font.DemiBold) : Theme.fontWeight
                                         }
                                     }
 
@@ -1805,7 +1805,7 @@ Item {
                                         text: loadedIconData?.value ?? ""
                                         color: (isActive || isUrgent) ? Theme.withAlpha(Theme.surfaceContainer, 0.95) : isPlaceholder ? Theme.surfaceTextAlpha : Theme.surfaceTextMedium
                                         font.pixelSize: Theme.barTextSize(barThickness, barConfig?.fontScale, barConfig?.maximizeWidgetText)
-                                        font.weight: (isActive && !isPlaceholder) ? Font.DemiBold : Font.Normal
+                                        font.weight: (isActive && !isPlaceholder) ? Math.max(Theme.fontWeight, Font.DemiBold) : Theme.fontWeight
                                     }
 
                                     StyledText {
@@ -1814,7 +1814,7 @@ Item {
                                         text: loadedHasIcon ? (root.isVertical ? (modelData?.name ?? "").charAt(0) : (modelData?.name ?? "")) : root.getWorkspaceIndex(modelData, index)
                                         color: (isActive || isUrgent) ? Theme.withAlpha(Theme.surfaceContainer, 0.95) : isPlaceholder ? Theme.surfaceTextAlpha : Theme.surfaceTextMedium
                                         font.pixelSize: Theme.barTextSize(barThickness, barConfig?.fontScale, barConfig?.maximizeWidgetText)
-                                        font.weight: (isActive && !isPlaceholder) ? Font.DemiBold : Font.Normal
+                                        font.weight: (isActive && !isPlaceholder) ? Math.max(Theme.fontWeight, Font.DemiBold) : Theme.fontWeight
                                     }
 
                                     Repeater {
diff --git a/quickshell/Modules/Settings/DankBarTab.qml b/quickshell/Modules/Settings/DankBarTab.qml
index 807c10b0c..51c21c98e 100644
--- a/quickshell/Modules/Settings/DankBarTab.qml
+++ b/quickshell/Modules/Settings/DankBarTab.qml
@@ -1133,10 +1133,6 @@ Item {
                 }
             }
 
-            WorkspaceAppearanceCard {
-                visible: dankBarTab.appearanceOnly
-            }
-
             SettingsCard {
                 tab: "appearance"
                 iconName: "rounded_corner"
diff --git a/quickshell/Modules/Settings/WorkspacesTab.qml b/quickshell/Modules/Settings/WorkspacesTab.qml
index cf750fa69..1bd8fa225 100644
--- a/quickshell/Modules/Settings/WorkspacesTab.qml
+++ b/quickshell/Modules/Settings/WorkspacesTab.qml
@@ -198,6 +198,10 @@ Item {
                 }
             }
 
+            WorkspaceAppearanceCard {
+                width: parent.width
+            }
+
             SettingsCard {
                 width: parent.width
                 iconName: "label"
diff --git a/quickshell/translations/extract_settings_index.py b/quickshell/translations/extract_settings_index.py
index 35c5bc7c6..8bd213a86 100755
--- a/quickshell/translations/extract_settings_index.py
+++ b/quickshell/translations/extract_settings_index.py
@@ -101,7 +101,7 @@ TAB_INDEX_MAP = {
     "WindowRulesTab.qml": 38,
     "DockTab.qml": 5,
     "DankBarAppearanceTab.qml": 6,
-    "WorkspaceAppearanceCard.qml": 6,
+    "WorkspaceAppearanceCard.qml": 4,
     "NetworkStatusTab.qml": 7,
     "NetworkEthernetTab.qml": 39,
     "NetworkWifiTab.qml": 40,
diff --git a/quickshell/translations/settings_search_index.json b/quickshell/translations/settings_search_index.json
index 819c8cc60..93abaf165 100644
--- a/quickshell/translations/settings_search_index.json
+++ b/quickshell/translations/settings_search_index.json
@@ -872,6 +872,57 @@
     "description": "Drag workspace indicators to reorder them",
     "conditionKey": "isNiri"
   },
+  {
+    "section": "workspaceFocusedBorderEnabled",
+    "label": "Focused Border",
+    "tabIndex": 4,
+    "category": "Dank Bar",
+    "keywords": [
+      "around",
+      "bar",
+      "border",
+      "dank",
+      "desktop",
+      "focused",
+      "indicator",
+      "outline",
+      "panel",
+      "ring",
+      "show",
+      "statusbar",
+      "topbar",
+      "virtual",
+      "workspace"
+    ],
+    "description": "Show an outline ring around the focused workspace indicator"
+  },
+  {
+    "section": "workspaceUnfocusedMonitorBorderEnabled",
+    "label": "Focused Border",
+    "tabIndex": 4,
+    "category": "Dank Bar",
+    "keywords": [
+      "around",
+      "bar",
+      "border",
+      "dank",
+      "desktop",
+      "display",
+      "focused",
+      "indicator",
+      "monitor",
+      "outline",
+      "panel",
+      "ring",
+      "show",
+      "statusbar",
+      "topbar",
+      "unfocused",
+      "virtual",
+      "workspace"
+    ],
+    "description": "Show an outline ring around the focused workspace indicator"
+  },
   {
     "section": "workspaceFollowFocus",
     "label": "Follow Monitor Focus",
@@ -1026,6 +1077,44 @@
     "description": "Reverse workspace switch direction when scrolling over the bar",
     "conditionKey": "isNiri"
   },
+  {
+    "section": "workspaceUnfocusedMonitorSeparateAppearance",
+    "label": "Separate Appearance for Unfocused Display(s)",
+    "tabIndex": 4,
+    "category": "Dank Bar",
+    "keywords": [
+      "appearance",
+      "bar",
+      "color",
+      "colors",
+      "colour",
+      "colours",
+      "dank",
+      "desktop",
+      "different",
+      "display",
+      "display(s)",
+      "displays",
+      "focused",
+      "hue",
+      "monitor",
+      "monitors",
+      "output",
+      "outputs",
+      "palette",
+      "panel",
+      "screen",
+      "screens",
+      "separate",
+      "statusbar",
+      "tint",
+      "topbar",
+      "unfocused",
+      "virtual",
+      "workspace"
+    ],
+    "description": "Use different workspace colors on displays that are not focused"
+  },
   {
     "section": "dwlShowAllTags",
     "label": "Show All Tags",
@@ -1106,6 +1195,33 @@
     "description": "Display application icons in workspace indicators",
     "conditionKey": "isNiri"
   },
+  {
+    "section": "workspaceAppearance",
+    "label": "Workspace Appearance",
+    "tabIndex": 4,
+    "category": "Dank Bar",
+    "keywords": [
+      "appearance",
+      "around",
+      "bar",
+      "color",
+      "custom",
+      "dank",
+      "desktop",
+      "focused",
+      "indicator",
+      "outline",
+      "panel",
+      "ring",
+      "show",
+      "statusbar",
+      "topbar",
+      "virtual",
+      "workspace"
+    ],
+    "icon": "palette",
+    "description": "Show an outline ring around the focused workspace indicator"
+  },
   {
     "section": "showWorkspaceIndex",
     "label": "Workspace Index Numbers",
@@ -1875,57 +1991,6 @@
     ],
     "description": "Choose how this bar resolves shadow direction"
   },
-  {
-    "section": "workspaceFocusedBorderEnabled",
-    "label": "Focused Border",
-    "tabIndex": 6,
-    "category": "Dank Bar",
-    "keywords": [
-      "around",
-      "bar",
-      "border",
-      "dank",
-      "desktop",
-      "focused",
-      "indicator",
-      "outline",
-      "panel",
-      "ring",
-      "show",
-      "statusbar",
-      "topbar",
-      "virtual",
-      "workspace"
-    ],
-    "description": "Show an outline ring around the focused workspace indicator"
-  },
-  {
-    "section": "workspaceUnfocusedMonitorBorderEnabled",
-    "label": "Focused Border",
-    "tabIndex": 6,
-    "category": "Dank Bar",
-    "keywords": [
-      "around",
-      "bar",
-      "border",
-      "dank",
-      "desktop",
-      "display",
-      "focused",
-      "indicator",
-      "monitor",
-      "outline",
-      "panel",
-      "ring",
-      "show",
-      "statusbar",
-      "topbar",
-      "unfocused",
-      "virtual",
-      "workspace"
-    ],
-    "description": "Show an outline ring around the focused workspace indicator"
-  },
   {
     "section": "barFontScale",
     "label": "Font Scale",
@@ -2006,44 +2071,6 @@
     "icon": "opacity",
     "description": "Controls opacity of the bar background"
   },
-  {
-    "section": "workspaceUnfocusedMonitorSeparateAppearance",
-    "label": "Separate Appearance for Unfocused Display(s)",
-    "tabIndex": 6,
-    "category": "Dank Bar",
-    "keywords": [
-      "appearance",
-      "bar",
-      "color",
-      "colors",
-      "colour",
-      "colours",
-      "dank",
-      "desktop",
-      "different",
-      "display",
-      "display(s)",
-      "displays",
-      "focused",
-      "hue",
-      "monitor",
-      "monitors",
-      "output",
-      "outputs",
-      "palette",
-      "panel",
-      "screen",
-      "screens",
-      "separate",
-      "statusbar",
-      "tint",
-      "topbar",
-      "unfocused",
-      "virtual",
-      "workspace"
-    ],
-    "description": "Use different workspace colors on displays that are not focused"
-  },
   {
     "section": "barShadow",
     "label": "Shadow Override",
@@ -2148,33 +2175,6 @@
     "icon": "highlight",
     "description": "Theme color used for the widget outline"
   },
-  {
-    "section": "workspaceAppearance",
-    "label": "Workspace Appearance",
-    "tabIndex": 6,
-    "category": "Dank Bar",
-    "keywords": [
-      "appearance",
-      "around",
-      "bar",
-      "color",
-      "custom",
-      "dank",
-      "desktop",
-      "focused",
-      "indicator",
-      "outline",
-      "panel",
-      "ring",
-      "show",
-      "statusbar",
-      "topbar",
-      "virtual",
-      "workspace"
-    ],
-    "icon": "palette",
-    "description": "Show an outline ring around the focused workspace indicator"
-  },
   {
     "section": "_tab_7",
     "label": "Network",