Clean up command groupings

Author: alicerunsonfedora

Alidade/Entrypoint.swift

@@ -63,34 +63,8 @@ struct MCMapsApp: App {
             }
         }
         .commands {
-            CommandMenu("Map") {
-                Button("Go To...", systemImage: "figure.walk") {
-                    redWindowEnvironment.currentModalRoute = .warpToLocation
-                }
-                .disabled(redWindowEnvironment.currentRoute != .map)
-                .keyboardShortcut("G", modifiers: [.command])
-                Button("Pin Here...", systemImage: "mappin.circle") {
-                    redWindowEnvironment.currentModalRoute = .createPin
-                }
-                .disabled(redWindowEnvironment.currentRoute != .map)
-                .keyboardShortcut("P", modifiers: [.command])
-                Divider()
-                Toggle(isOn: $naturalColors) {
-                    Label("Natural Colors", systemImage: "paintpalette")
-                }
-                WorldDimensionPickerView(selection: $redWindowEnvironment.currentDimension)
-                    .labelsVisibility(.visible)
-            }
-            CommandGroup(replacing: .help) {
-                Link("\(Self.information.name) Help", destination: URL(appLink: .help)!)
-                Divider()
-                if let docs = URL(appLink: .docs) {
-                    Link("View \(Self.information.name) Documentation", destination: docs)
-                }
-                if let feedback = URL(appLink: .issues) {
-                    Link("Send \(Self.information.name) Feedback", destination: feedback)
-                }
-            }
+            MapCommands(environment: redWindowEnvironment)
+            HelpCommands()
             CommandGroup(after: .pasteboard) {
                 Button("Configure World...", systemImage: "globe") {
                     redWindowEnvironment.currentRoute = .worldEdit

Alidade/Views/Commands/HelpCommands.swift

@@ -0,0 +1,24 @@
+//
+//  HelpCommands.swift
+//  Alidade
+//
+//  Created by Marquis Kurt on 18-01-2026.
+//
+
+import SwiftUI
+
+/// A group of commands that make up the "Help" menu.
+struct HelpCommands: Commands {
+    var body: some Commands {
+        CommandGroup(replacing: .help) {
+            Link("\(MCMapsApp.information.name) Help", destination: URL(appLink: .help)!)
+            Divider()
+            if let docs = URL(appLink: .docs) {
+                Link("View \(MCMapsApp.information.name) Documentation", destination: docs)
+            }
+            if let feedback = URL(appLink: .issues) {
+                Link("Send \(MCMapsApp.information.name) Feedback", destination: feedback)
+            }
+        }
+    }
+}

Alidade/Views/Commands/MapCommands.swift

@@ -0,0 +1,40 @@
+//
+//  MapCommands.swift
+//  Alidade
+//
+//  Created by Marquis Kurt on 18-01-2026.
+//
+
+import Foundation
+import SwiftUI
+
+/// A group of commands used to control the map in Alidade.
+struct MapCommands: Commands {
+    @AppStorage(UserDefaults.Keys.mapNaturalColors.rawValue) private var naturalColors = true
+    @Bindable var redWindowEnvironment: RedWindowEnvironment
+
+    init(environment: RedWindowEnvironment) {
+        self.redWindowEnvironment = environment
+    }
+
+    var body: some Commands {
+        CommandMenu("Map") {
+            Button("Go To...", systemImage: "figure.walk") {
+                redWindowEnvironment.currentModalRoute = .warpToLocation
+            }
+            .disabled(redWindowEnvironment.currentRoute != .map)
+            .keyboardShortcut("G", modifiers: [.command])
+            Button("Pin Here...", systemImage: "mappin.circle") {
+                redWindowEnvironment.currentModalRoute = .createPin
+            }
+            .disabled(redWindowEnvironment.currentRoute != .map)
+            .keyboardShortcut("P", modifiers: [.command])
+            Divider()
+            Toggle(isOn: $naturalColors) {
+                Label("Natural Colors", systemImage: "paintpalette")
+            }
+            WorldDimensionPickerView(selection: $redWindowEnvironment.currentDimension)
+                .labelsVisibility(.visible)
+        }
+    }
+}