diff --git a/internal/agents/manager.go b/internal/agents/manager.go
index d1587c8..ade4759 100644
--- a/internal/agents/manager.go
+++ b/internal/agents/manager.go
@@ -855,7 +855,7 @@ func (m *Manager) startLive(ctx context.Context, sess api.AgentSession, task api
 	if err != nil {
 		return nil, err
 	}
-	tools := append([]mcp.Tool{m.askTool(l), m.cancelQuestionTool(l), m.setTitlesTool(l),m.stopMergeTool(l), m.mergeToMainTool(l), m.setTaskSummaryTool(l), m.searchClosedTool(l), m.exposePortTool(l), m.takeSnapshotTool(l), m.terminalReadTool(l), m.terminalTypeTool(l), m.bashTool(l), m.readKnowledgeTool()}, append(append(m.fileTools(l), m.subtaskTools(l)...), m.clientTools(l)...)...)
+	tools := append([]mcp.Tool{m.askTool(l), m.cancelQuestionTool(l), m.setTitlesTool(l), m.stopMergeTool(l), m.mergeToMainTool(l), m.setTaskSummaryTool(l), m.searchClosedTool(l), m.exposePortTool(l), m.takeSnapshotTool(l), m.terminalReadTool(l), m.terminalTypeTool(l), m.bashTool(l), m.readKnowledgeTool()}, append(append(m.fileTools(l), m.subtaskTools(l)...), m.clientTools(l)...)...)
 	lead := true
 	if sess.Role == api.Implementer {
 		g += longTitleGuidance(task)
diff --git a/mac/Sources/Byre/Server.swift b/mac/Sources/Byre/Server.swift
index 70edf6f..0f783a9 100644
--- a/mac/Sources/Byre/Server.swift
+++ b/mac/Sources/Byre/Server.swift
@@ -269,6 +269,7 @@ private struct UsageCommandsForm: View {
         GridRow {
             Text(vendor)
             TextField("Built in", text: Binding(get: { draft?[keyPath: key] ?? "" }, set: { draft?[keyPath: key] = $0 }))
+                .font(Fonts.font(13, mono: true))
                 .modifier(FieldStyle())
                 .onSubmit(save)
         }
diff --git a/mac/Sources/Byre/Settings.swift b/mac/Sources/Byre/Settings.swift
index ec56b07..1998431 100644
--- a/mac/Sources/Byre/Settings.swift
+++ b/mac/Sources/Byre/Settings.swift
@@ -251,7 +251,7 @@ private struct SavedCommands: View {
                         VStack(alignment: .leading, spacing: 2) {
                             Text(c.name)
                             Text(c.command)
-                                .font(Fonts.font(12))
+                                .font(Fonts.font(12, mono: true))
                                 .foregroundStyle(Palette.muted)
                                 .textSelection(.enabled)
                                 .fixedSize(horizontal: false, vertical: true)
@@ -303,6 +303,7 @@ private struct SavedCommands: View {
                     save(id, valid)
                 }
             TextField("Command", text: $command)
+                .font(Fonts.font(13, mono: true))
                 .modifier(FieldStyle())
                 .onSubmit {
                     save(id, valid)