diff --git a/OrionToolbar/OrionMenuView.swift b/OrionToolbar/OrionMenuView.swift
index 2916d5b..52812e9 100644
--- a/OrionToolbar/OrionMenuView.swift
+++ b/OrionToolbar/OrionMenuView.swift
@@ -264,9 +264,22 @@ struct OrionMenuView: View {
         let machine = vm.discoveredVMs.first { $0.id == server.vmUUID || $0.name == server.vmName }
         let status = machine?.status ?? "unavailable"
         return HStack(spacing: 10) {
-            if let machine { icon(machine) }
-            else { Image(systemName: "server.rack").frame(width: 36, height: 36).foregroundStyle(.cyan) }
-            Text(server.name).font(.system(size: 12, weight: .semibold)).lineLimit(1).frame(width: 185, alignment: .leading)
+            Group {
+                if let image = vm.icon(for: server) {
+                    Image(nsImage: image).resizable().scaledToFit()
+                } else if let machine {
+                    icon(machine)
+                } else {
+                    Image(systemName: "server.rack").foregroundStyle(.cyan)
+                }
+            }.frame(width: 36, height: 36)
+            HStack(spacing: 5) {
+                Image(systemName: "line.3.horizontal").foregroundStyle(OrionStyle.muted)
+                Text(server.name).lineLimit(1)
+            }
+            .font(.system(size: 12, weight: .semibold))
+            .frame(width: 185, alignment: .leading)
+            .draggable(server.id.uuidString)
             state(status)
             Text(server.host.isEmpty ? "—" : server.host)
                 .font(.system(size: 11, design: .monospaced)).foregroundStyle(OrionStyle.muted)
@@ -288,6 +301,12 @@ struct OrionMenuView: View {
         .disabled(machine.map { vm.busyVMIDs.contains($0.id) } ?? false)
         .padding(.horizontal, 10).padding(.vertical, 7)
         .background(OrionStyle.card.opacity(0.75), in: RoundedRectangle(cornerRadius: 10))
+        .dropDestination(for: String.self) { items, _ in
+            guard let value = items.first,
+                  let id = UUID(uuidString: value) else { return false }
+            vm.reorderServer(draggedID: id, onto: server.id)
+            return true
+        }
     }
 
     private func action(_ title: String, _ symbol: String, tint: Color, perform: @escaping () -> Void) -> some View {
diff --git a/OrionToolbar/OrionVMController.swift b/OrionToolbar/OrionVMController.swift
index 5e37a0f..cf10237 100644
--- a/OrionToolbar/OrionVMController.swift
+++ b/OrionToolbar/OrionVMController.swift
@@ -139,11 +139,19 @@ final class OrionVMController: ObservableObject {
             // Resolve Parallels VM bundles without requiring the guest to run.
             for i in discoveredVMs.indices where discoveredVMs[i].bundlePath == nil {
                 if let detail = try? await runPrlctl(["list", "-i", discoveredVMs[i].id]) {
-                    let pattern = #"(?m)^\s*Home:\s*(.+?\.pvm)\s*$"#
-                    if let range = detail.range(of: pattern, options: .regularExpression) {
-                        let line = String(detail[range.lowerBound..<range.upperBound])
-                        let path = line.replacingOccurrences(of: #"^\s*Home:\s*"#, with: "", options: .regularExpression)
-                        discoveredVMs[i].bundlePath = path.trimmingCharacters(in: .whitespacesAndNewlines)
+                    // `Home:` ends with .pvm/ on this Parallels installation.
+                    if let homeLine = detail.split(separator: "\n").first(where: {
+                        $0.trimmingCharacters(in: .whitespaces).hasPrefix("Home:")
+                    }) {
+                        let trimmed = homeLine.trimmingCharacters(in: .whitespaces)
+                        let raw = String(trimmed.dropFirst("Home:".count))
+                            .trimmingCharacters(in: .whitespacesAndNewlines)
+                            .trimmingCharacters(in: CharacterSet(charactersIn: "\"'"))
+                        let expanded = (raw as NSString).expandingTildeInPath
+                        let normalized = (expanded as NSString).standardizingPath
+                        if FileManager.default.fileExists(atPath: normalized) {
+                            discoveredVMs[i].bundlePath = normalized
+                        }
                     }
                 }
             }
@@ -221,11 +229,31 @@ final class OrionVMController: ObservableObject {
 
     func icon(for machine: ParallelsVM) -> NSImage? {
         guard let path = machine.bundlePath,
-              FileManager.default.fileExists(atPath: path) else {
-            return nil
-        }
+              FileManager.default.fileExists(atPath: path) else { return nil }
+        let bundle = URL(fileURLWithPath: path, isDirectory: true)
 
-        return NSWorkspace.shared.icon(forFile: path)
+        // Parallels stores the per-VM application under <VM>.pvm/VM.app.
+        // The .pvm Finder icon itself is generic and must not be used.
+        let app = bundle.appendingPathComponent("VM.app", isDirectory: true)
+        let plist = app.appendingPathComponent("Contents/Info.plist")
+        if let info = NSDictionary(contentsOf: plist) as? [String: Any] {
+            let resourceDir = app.appendingPathComponent("Contents/Resources", isDirectory: true)
+            for key in ["CFBundleIconFile", "CFBundleIconName"] {
+                if let name = info[key] as? String, !name.isEmpty {
+                    let names = name.lowercased().hasSuffix(".icns") ? [name] : [name + ".icns", name]
+                    for candidate in names {
+                        if let image = NSImage(contentsOf: resourceDir.appendingPathComponent(candidate)) {
+                            return image
+                        }
+                    }
+                }
+            }
+        }
+        for name in ["icon.png", "Icon.png", "icon.icns", "Icon.icns", ".VolumeIcon.icns"] {
+            if let image = NSImage(contentsOf: bundle.appendingPathComponent(name)) { return image }
+        }
+        // Never return NSWorkspace.icon(forFile: path): it is the generic .pvm icon.
+        return nil
     }
 
     func status(for server: ServerDefinition) -> VMStatus { statuses[server.id] ?? .checking }
@@ -308,6 +336,14 @@ final class OrionVMController: ObservableObject {
         servers.swapAt(index, target)
     }
 
+    func reorderServer(draggedID: UUID, onto targetID: UUID) {
+        guard draggedID != targetID,
+              let from = servers.firstIndex(where: { $0.id == draggedID }),
+              let to = servers.firstIndex(where: { $0.id == targetID }) else { return }
+        let moved = servers.remove(at: from)
+        servers.insert(moved, at: to) // @Published didSet persists the order.
+    }
+
     func icon(for server: ServerDefinition) -> NSImage? {
         if let path = server.customIconPath, let image = NSImage(contentsOfFile: path) {
             return image
diff --git a/OrionToolbar/SettingsView.swift b/OrionToolbar/SettingsView.swift
index 4d027b6..c3f9dd7 100644
--- a/OrionToolbar/SettingsView.swift
+++ b/OrionToolbar/SettingsView.swift
@@ -9,15 +9,44 @@ struct SettingsView: View {
     @State private var pendingRemoval: ServerDefinition?
     var body: some View {
         HStack(spacing: 0) {
-            List(selection: $selection) { ForEach(vm.servers) { s in HStack {
-                        if let icon = vm.icon(for: s) { Image(nsImage: icon).resizable().scaledToFit().frame(width: 22, height: 22) }
-                        else { Image(systemName: vm.status(for: s).symbolName) }
-                        Text(s.name)
+            // ORION_REORDER_ICONS_V3: explicit drop targets; no List/onMove interception.
+            ScrollView {
+                LazyVStack(spacing: 3) {
+                    ForEach(vm.servers) { server in
+                        HStack(spacing: 8) {
+                            Image(systemName: "line.3.horizontal")
+                                .foregroundStyle(.secondary)
+                                .help("Drag this server to reorder")
+                            Group {
+                                if let image = vm.icon(for: server) {
+                                    Image(nsImage: image).resizable().scaledToFit()
+                                } else {
+                                    Image(systemName: "server.rack")
+                                }
+                            }.frame(width: 23, height: 23)
+                            Text(server.name).lineLimit(1)
+                            Spacer(minLength: 0)
+                        }
+                        .padding(.horizontal, 9)
+                        .padding(.vertical, 9)
+                        .frame(maxWidth: .infinity, alignment: .leading)
+                        .background(selection == server.id ? Color.accentColor.opacity(0.3) : Color.clear,
+                                    in: RoundedRectangle(cornerRadius: 7))
+                        .contentShape(Rectangle())
+                        .onTapGesture { selection = server.id }
+                        .draggable(server.id.uuidString)
+                        .dropDestination(for: String.self) { values, _ in
+                            guard let first = values.first,
+                                  let dragged = UUID(uuidString: first),
+                                  dragged != server.id else { return false }
+                            vm.reorderServer(draggedID: dragged, onto: server.id)
+                            return true
+                        }
                     }
-                    .contentShape(Rectangle())
-                    .onTapGesture { selection = s.id }
-                    .tag(s.id) }.onMove(perform: vm.moveServer) }
-                .frame(width: 190)
+                }
+                .padding(6)
+            }
+            .frame(width: 220)
             Divider()
             VStack(alignment: .leading, spacing: 14) {
                 if let id = selection, let server = vm.servers.first(where: { $0.id == id }) {
@@ -44,7 +73,7 @@ struct SettingsView: View {
                     .disabled(selection == nil)
                 }
             }.padding(20)
-        }.frame(width: 650, height: 380)
+        }.frame(width: 730, height: 420)
         .confirmationDialog(
             "Remove this server definition?",
             isPresented: Binding(
diff --git a/backups/20261023-101231-986867/OrionToolbar/OrionMenuView.swift b/backups/20261023-101231-986867/OrionToolbar/OrionMenuView.swift
new file mode 100644
index 0000000..2916d5b
--- /dev/null
+++ b/backups/20261023-101231-986867/OrionToolbar/OrionMenuView.swift
@@ -0,0 +1,390 @@
+import AppKit
+import SwiftUI
+
+private enum OrionStyle {
+    static let panel = Color(red: 0.105, green: 0.14, blue: 0.20)
+    static let card = Color(red: 0.15, green: 0.19, blue: 0.25)
+    static let blue = Color(red: 0.08, green: 0.39, blue: 0.91)
+    static let green = Color(red: 0.05, green: 0.88, blue: 0.49)
+    static let red = Color(red: 0.91, green: 0.19, blue: 0.23)
+    static let muted = Color(red: 0.62, green: 0.73, blue: 0.86)
+}
+
+struct OrionMenuView: View {
+    @EnvironmentObject private var vm: OrionVMController
+    @State private var showRunning = true
+    @State private var showAll = true
+    @State private var showIntegrated = true
+    @State private var pendingRemoval: ServerDefinition?
+    @State private var pendingForceStop: ParallelsVM?
+
+    private var running: [ParallelsVM] {
+        vm.discoveredVMs.filter { $0.status.lowercased() == "running" }
+    }
+
+    var body: some View {
+        VStack(spacing: 0) {
+            header
+            Divider().overlay(.white.opacity(0.10))
+            ScrollView {
+                VStack(alignment: .leading, spacing: 15) {
+                    section(icon: "play.fill", title: "Running Virtual Machines", count: "\(running.count) running", accent: OrionStyle.green, expanded: $showRunning) {
+                        if running.isEmpty {
+                            emptyState("No running virtual machines", icon: "moon.zzz")
+                        } else {
+                            ForEach(running) { machine in
+                                runningRow(machine)
+                            }
+                        }
+                    }
+                    section(icon: "desktopcomputer", title: "All Virtual Machines", count: "\(vm.discoveredVMs.count) VMs", accent: .cyan, expanded: $showAll) {
+                        if vm.discoveredVMs.isEmpty {
+                            emptyState(vm.discovering ? "Discovering Parallels VMs…" : "No virtual machines found", icon: "desktopcomputer.trianglebadge.exclamationmark")
+                        } else {
+                            ForEach(vm.discoveredVMs) { machine in
+                                machineRow(machine)
+                            }
+                        }
+                    }
+                    section(icon: "server.rack", title: "Integrated Servers", count: "\(vm.servers.count) servers", accent: OrionStyle.blue, expanded: $showIntegrated) {
+                        if vm.servers.isEmpty {
+                            emptyState("No integrations. Add a VM using + above.", icon: "plus.circle")
+                        } else {
+                            ForEach(vm.servers) { server in
+                                integratedRow(server)
+                            }
+                        }
+                    }
+                }
+                .padding(14)
+            }
+            .frame(height: 610)
+            Divider().overlay(.white.opacity(0.10))
+            footer
+        }
+        .frame(width: 960)
+        .background(
+            LinearGradient(colors: [Color(red: 0.10, green: 0.15, blue: 0.23), Color(red: 0.075, green: 0.09, blue: 0.13)], startPoint: .topTrailing, endPoint: .bottomLeading)
+        )
+
+        .preferredColorScheme(.dark)
+        .task { await vm.discoverVMs(); await vm.refreshAll() }
+        .alert("OrionToolbar", isPresented: Binding(get: { vm.lastError != nil }, set: { if !$0 { vm.lastError = nil } })) {
+            Button("OK") { vm.lastError = nil }
+        } message: { Text(vm.lastError ?? "") }
+        .confirmationDialog("Remove server integration?", isPresented: Binding(get: { pendingRemoval != nil }, set: { if !$0 { pendingRemoval = nil } }), titleVisibility: .visible) {
+            Button("Remove Integration", role: .destructive) {
+                if let server = pendingRemoval { vm.removeDefinition(server) }
+                pendingRemoval = nil
+            }
+            Button("Cancel", role: .cancel) { pendingRemoval = nil }
+        } message: {
+            Text("The Parallels virtual machine will not be deleted.")
+        }
+        .confirmationDialog("Force stop virtual machine?", isPresented: Binding(get: { pendingForceStop != nil }, set: { if !$0 { pendingForceStop = nil } }), titleVisibility: .visible) {
+            Button("Force Stop", role: .destructive) {
+                if let machine = pendingForceStop { vm.operate(machine, action: "force-stop") }
+                pendingForceStop = nil
+            }
+            Button("Cancel", role: .cancel) { pendingForceStop = nil }
+        } message: { Text("Force Stop immediately powers off the VM and can cause data loss.") }
+    }
+
+    private var header: some View {
+        HStack(spacing: 12) {
+            Image(systemName: "server.rack")
+                .font(.system(size: 22, weight: .bold))
+                .foregroundStyle(.cyan)
+                .frame(width: 37, height: 37)
+                .background(OrionStyle.blue.opacity(0.24), in: RoundedRectangle(cornerRadius: 10))
+            Text("OrionToolbar").font(.system(size: 21, weight: .bold))
+            Circle().fill(vm.discoveredVMs.isEmpty ? Color.orange : OrionStyle.green).frame(width: 8, height: 8)
+            Text(vm.discoveredVMs.isEmpty ? "Waiting for Parallels" : "Parallels Connected")
+                .foregroundStyle(OrionStyle.muted).font(.subheadline)
+            Spacer()
+            if vm.discovering { ProgressView().controlSize(.small) }
+            Button { Task { await vm.discoverVMs(); await vm.refreshAll() } } label: {
+                Image(systemName: "arrow.clockwise").font(.system(size: 16, weight: .semibold))
+            }.buttonStyle(OrionActionStyle(tint: OrionStyle.card)).help("Refresh virtual machines")
+            Button { showSettings() } label: {
+                Image(systemName: "gearshape.fill").font(.system(size: 16))
+            }.buttonStyle(OrionActionStyle(tint: OrionStyle.card)).help("Settings")
+        }.padding(.horizontal, 17).padding(.vertical, 13)
+    }
+
+    private func section<Content: View>(icon: String, title: String, count: String, accent: Color, expanded: Binding<Bool>, @ViewBuilder content: () -> Content) -> some View {
+        VStack(spacing: 4) {
+            Button { expanded.wrappedValue.toggle() } label: {
+                HStack(spacing: 10) {
+                    Image(systemName: icon).font(.system(size: 17, weight: .bold))
+                        .foregroundStyle(accent).frame(width: 27)
+                    Text(title).font(.system(size: 16, weight: .semibold))
+                    Spacer()
+                    Text(count).font(.caption.weight(.medium))
+                        .foregroundStyle(accent)
+                        .padding(.horizontal, 10).padding(.vertical, 5)
+                        .background(accent.opacity(0.13), in: RoundedRectangle(cornerRadius: 8))
+                    Image(systemName: expanded.wrappedValue ? "chevron.up" : "chevron.down")
+                        .font(.caption.weight(.bold)).foregroundStyle(OrionStyle.muted)
+                }
+                .contentShape(Rectangle())
+                .padding(.horizontal, 11).padding(.vertical, 10)
+            }.buttonStyle(.plain)
+            if expanded.wrappedValue {
+                VStack(spacing: 3) { content() }
+                    .padding(.horizontal, 5).padding(.bottom, 7)
+            }
+        }
+        .background(OrionStyle.panel.opacity(0.92), in: RoundedRectangle(cornerRadius: 16))
+        .overlay(RoundedRectangle(cornerRadius: 16).strokeBorder(.white.opacity(0.09)))
+    }
+
+    private func emptyState(_ title: String, icon: String) -> some View {
+        Label(title, systemImage: icon)
+            .font(.subheadline).foregroundStyle(OrionStyle.muted)
+            .frame(maxWidth: .infinity, alignment: .leading)
+            .padding(15)
+    }
+
+    private func icon(_ machine: ParallelsVM) -> some View {
+        Group {
+            if let image = vm.icon(for: machine) {
+                Image(nsImage: image).resizable().scaledToFit()
+            } else {
+                Image(systemName: machine.operatingSystem == "Windows" ? "desktopcomputer" : "server.rack")
+                    .font(.system(size: 21, weight: .medium))
+                    .foregroundStyle(.white)
+                    .frame(maxWidth: .infinity, maxHeight: .infinity)
+                    .background(osColor(machine.operatingSystem), in: Circle())
+            }
+        }.frame(width: 36, height: 36)
+    }
+
+    private func osColor(_ os: String) -> Color {
+        switch os {
+        case "Ubuntu": return .orange
+        case "Debian": return .pink
+        case "Fedora": return .blue
+        case "CentOS": return .purple
+        case "Alpine": return .teal
+        case "Windows": return .cyan
+        default: return OrionStyle.blue
+        }
+    }
+
+    private func state(_ status: String) -> some View {
+        let s = status.lowercased()
+        let color: Color = s == "running" ? OrionStyle.green : (s == "stopped" ? OrionStyle.muted : .orange)
+        return HStack(spacing: 6) {
+            Circle().fill(color).frame(width: 8, height: 8)
+            Text(status.capitalized).font(.system(size: 12, weight: .medium))
+                .foregroundStyle(color)
+        }.frame(width: 90, alignment: .leading)
+    }
+
+    private func integrated(_ machine: ParallelsVM) -> ServerDefinition? {
+        vm.servers.first { $0.vmUUID == machine.id || $0.vmName == machine.name }
+    }
+
+    private func runningRow(_ machine: ParallelsVM) -> some View {
+        HStack(spacing: 10) {
+            icon(machine)
+            Text(machine.name).font(.system(size: 12, weight: .semibold)).lineLimit(1).frame(width: 210, alignment: .leading)
+            state(machine.status)
+            Text(machine.ipAddress.isEmpty ? "—" : machine.ipAddress)
+                .font(.system(size: 11, design: .monospaced))
+                .foregroundStyle(OrionStyle.muted).lineLimit(1).frame(width: 125, alignment: .leading)
+            Spacer(minLength: 0)
+            if let server = integrated(machine) {
+                action("SSH", "terminal", tint: OrionStyle.blue) { vm.openSSH(server) }
+                    .disabled(server.host.isEmpty || server.sshUser.isEmpty)
+                action("Mailpit", "globe", tint: OrionStyle.blue) { vm.openMailpit(server) }
+                    .disabled(server.host.isEmpty || server.mailpitPort == nil)
+            }
+            if vm.busyVMIDs.contains(machine.id) {
+                ProgressView().controlSize(.small)
+                    .frame(width: 70)
+                    .help("Waiting for Parallels to complete the operation")
+            } else {
+                action("Restart", "arrow.clockwise", tint: OrionStyle.card) { vm.operate(machine, action: "restart") }
+                action("Stop", "stop.fill", tint: OrionStyle.red) { vm.operate(machine, action: "stop") }
+            }
+            Menu {
+                Button("Force Stop", role: .destructive) { pendingForceStop = machine }
+            } label: {
+                Image(systemName: "ellipsis").frame(width: 16)
+            }.menuStyle(.borderlessButton).frame(width: 22)
+            .help("More VM actions")
+        }
+        .disabled(vm.busyVMIDs.contains(machine.id))
+        .padding(.horizontal, 10).padding(.vertical, 7)
+        .background(OrionStyle.card.opacity(0.75), in: RoundedRectangle(cornerRadius: 10))
+    }
+
+    private func machineRow(_ machine: ParallelsVM) -> some View {
+        HStack(spacing: 10) {
+            icon(machine)
+            Text(machine.name).font(.system(size: 12, weight: .semibold)).lineLimit(1).frame(width: 230, alignment: .leading)
+            state(machine.status)
+            Text(machine.ipAddress.isEmpty ? "—" : machine.ipAddress)
+                .font(.system(size: 11, design: .monospaced))
+                .foregroundStyle(OrionStyle.muted).lineLimit(1)
+            Spacer(minLength: 2)
+            if vm.busyVMIDs.contains(machine.id) { ProgressView().controlSize(.small) }
+            else if machine.status.lowercased() == "running" {
+                action("Stop", "stop.fill", tint: OrionStyle.red) { vm.operate(machine, action: "stop") }
+            } else if ["suspended", "paused"].contains(machine.status.lowercased()) {
+                action("Resume", "play.fill", tint: OrionStyle.blue) { vm.operate(machine, action: "resume") }
+            } else {
+                action("Start", "play.fill", tint: OrionStyle.blue) { vm.operate(machine, action: "start") }
+            }
+            if vm.isIntegrated(machine) {
+                Image(systemName: "checkmark.circle.fill").foregroundStyle(OrionStyle.green)
+                    .frame(width: 28).help("Integrated")
+            } else {
+                Button { vm.integrate(machine) } label: {
+                    Image(systemName: "plus.circle").font(.system(size: 20))
+                }.buttonStyle(.plain).foregroundStyle(OrionStyle.muted)
+                    .frame(width: 28).help("Integrate VM")
+            }
+            Menu {
+                Button("Open in Parallels") { vm.openParallels() }
+                if machine.status.lowercased() == "running" {
+                    Button("Restart") { vm.operate(machine, action: "restart") }
+                    Button("Force Stop", role: .destructive) { pendingForceStop = machine }
+                }
+            } label: { Image(systemName: "chevron.right").foregroundStyle(OrionStyle.muted) }
+                .menuStyle(.borderlessButton).frame(width: 22)
+        }
+        .padding(.horizontal, 10).padding(.vertical, 7)
+        .background(OrionStyle.card.opacity(0.75), in: RoundedRectangle(cornerRadius: 10))
+    }
+
+    private func integratedRow(_ server: ServerDefinition) -> some View {
+        let machine = vm.discoveredVMs.first { $0.id == server.vmUUID || $0.name == server.vmName }
+        let status = machine?.status ?? "unavailable"
+        return HStack(spacing: 10) {
+            if let machine { icon(machine) }
+            else { Image(systemName: "server.rack").frame(width: 36, height: 36).foregroundStyle(.cyan) }
+            Text(server.name).font(.system(size: 12, weight: .semibold)).lineLimit(1).frame(width: 185, alignment: .leading)
+            state(status)
+            Text(server.host.isEmpty ? "—" : server.host)
+                .font(.system(size: 11, design: .monospaced)).foregroundStyle(OrionStyle.muted)
+                .lineLimit(1).frame(width: 125, alignment: .leading)
+            Spacer(minLength: 0)
+            if let machine {
+                if status.lowercased() == "running" {
+                    action("Stop", "stop.fill", tint: OrionStyle.red) { vm.operate(machine, action: "stop") }
+                } else {
+                    action("Start", "play.fill", tint: OrionStyle.blue) { vm.operate(machine, action: "start") }
+                }
+            }
+            action("SSH", "terminal", tint: OrionStyle.card) { vm.openSSH(server) }
+                .disabled(status.lowercased() != "running" || server.host.isEmpty || server.sshUser.isEmpty)
+            action("Mailpit", "globe", tint: OrionStyle.card) { vm.openMailpit(server) }
+                .disabled(status.lowercased() != "running" || server.host.isEmpty || server.mailpitPort == nil)
+            action("Remove", "trash", tint: OrionStyle.card) { pendingRemoval = server }
+        }
+        .disabled(machine.map { vm.busyVMIDs.contains($0.id) } ?? false)
+        .padding(.horizontal, 10).padding(.vertical, 7)
+        .background(OrionStyle.card.opacity(0.75), in: RoundedRectangle(cornerRadius: 10))
+    }
+
+    private func action(_ title: String, _ symbol: String, tint: Color, perform: @escaping () -> Void) -> some View {
+        Button(action: perform) {
+            Label(title, systemImage: symbol)
+                .font(.system(size: 11, weight: .semibold))
+                .lineLimit(1)
+                .frame(minWidth: 48)
+        }.buttonStyle(OrionActionStyle(tint: tint))
+    }
+
+    private var footer: some View {
+        HStack {
+            action("Open Parallels", "macwindow", tint: OrionStyle.card) { vm.openParallels() }
+            Spacer()
+            action("Settings…", "gearshape", tint: OrionStyle.card) { showSettings() }
+            action("Quit", "power", tint: OrionStyle.card) { NSApplication.shared.terminate(nil) }
+        }.padding(.horizontal, 17).padding(.vertical, 12)
+    }
+
+    private func showSettings() {
+        OrionSettingsWindowPresenter.present(vm: vm)
+    }
+}
+
+private struct OrionActionStyle: ButtonStyle {
+    let tint: Color
+    func makeBody(configuration: Configuration) -> some View {
+        configuration.label
+            .foregroundStyle(.white)
+            .padding(.horizontal, 8).padding(.vertical, 7)
+            .background(tint.opacity(configuration.isPressed ? 0.65 : 1), in: RoundedRectangle(cornerRadius: 8))
+            .opacity(configuration.isPressed ? 0.8 : 1)
+    }
+}
+
+
+// Keep Settings above its originating MenuBarExtra panel.
+@MainActor
+private final class OrionSettingsWindowPresenter: NSObject, NSWindowDelegate {
+    private static var current: OrionSettingsWindowPresenter?
+
+    private var window: NSWindow?
+    private weak var parentWindow: NSWindow?
+
+    static func present(vm: OrionVMController) {
+        if let current, let window = current.window {
+            NSApp.activate(ignoringOtherApps: true)
+            window.makeKeyAndOrderFront(nil)
+            return
+        }
+
+        let presenter = OrionSettingsWindowPresenter()
+        current = presenter
+        presenter.open(vm: vm)
+    }
+
+    private func open(vm: OrionVMController) {
+        // Capture the currently active menu-bar panel.
+        let parent = NSApp.keyWindow
+            ?? NSApp.windows.first(where: { $0.isVisible })
+
+        let content = SettingsView()
+            .environmentObject(vm)
+            .preferredColorScheme(.dark)
+
+        let window = NSWindow(
+            contentRect: NSRect(x: 0, y: 0, width: 650, height: 380),
+            styleMask: [.titled, .closable],
+            backing: .buffered,
+            defer: false
+        )
+
+        window.title = "OrionToolbar Settings"
+        window.contentViewController = NSHostingController(rootView: content)
+        window.delegate = self
+        window.isReleasedWhenClosed = false
+        window.center()
+
+        self.window = window
+        self.parentWindow = parent
+
+        if let parent {
+            parent.addChildWindow(window, ordered: .above)
+        }
+
+        NSApp.activate(ignoringOtherApps: true)
+        window.makeKeyAndOrderFront(nil)
+        window.orderFrontRegardless()
+    }
+
+    func windowWillClose(_ notification: Notification) {
+        if let window {
+            parentWindow?.removeChildWindow(window)
+        }
+
+        window = nil
+        Self.current = nil
+    }
+}
diff --git a/backups/20261023-101231-986867/OrionToolbar/OrionVMController.swift b/backups/20261023-101231-986867/OrionToolbar/OrionVMController.swift
new file mode 100644
index 0000000..5e37a0f
--- /dev/null
+++ b/backups/20261023-101231-986867/OrionToolbar/OrionVMController.swift
@@ -0,0 +1,380 @@
+import AppKit
+import Foundation
+
+struct ServerDefinition: Identifiable, Codable, Hashable {
+    var id = UUID()
+    var name: String
+    var vmName: String
+    var vmUUID: String? = nil
+    var host: String
+    var sshUser: String
+    var sshPort: Int = 22
+    var sshIdentityFile: String = ""
+    var mailpitPort: Int?
+    var customIconPath: String? = nil
+
+    static let orion = ServerDefinition(name: "Orion", vmName: "Ubuntu Linux Server", host: "10.211.55.100", sshUser: "sysadmin", sshPort: 22, sshIdentityFile: "", mailpitPort: 8025)
+}
+
+
+struct ParallelsVM: Identifiable, Hashable {
+    let id: String
+    let name: String
+    let status: String
+    let ipAddress: String
+    let operatingSystem: String
+    var bundlePath: String?
+
+    var symbol: String {
+        switch operatingSystem {
+        case "Windows": return "desktopcomputer"
+        case "Ubuntu": return "server.rack"
+        case "Debian": return "server.rack"
+        case "Fedora": return "server.rack"
+        case "CentOS": return "server.rack"
+        case "Alpine": return "server.rack"
+        case "Oracle Linux": return "server.rack"
+        default: return "desktopcomputer"
+        }
+    }
+
+    static func detectOS(_ name: String) -> String {
+        let value = name.lowercased()
+
+        if value.contains("windows") { return "Windows" }
+        if value.contains("ubuntu") { return "Ubuntu" }
+        if value.contains("debian") { return "Debian" }
+        if value.contains("fedora") { return "Fedora" }
+        if value.contains("centos") { return "CentOS" }
+        if value.contains("alpine") { return "Alpine" }
+        if value.contains("oracle") { return "Oracle Linux" }
+        if value.contains("rocky") { return "Rocky Linux" }
+        if value.contains("alma") { return "AlmaLinux" }
+        if value.contains("arch") { return "Arch Linux" }
+        if value.contains("gentoo") { return "Gentoo" }
+        if value.contains("freebsd") { return "FreeBSD" }
+
+        return "Other"
+    }
+}
+
+@MainActor
+final class OrionVMController: ObservableObject {
+    enum VMStatus: Equatable {
+        case checking, running, stopped, suspended, transitioning, unavailable(String)
+        var title: String { switch self { case .checking: "Checking…"; case .running: "Running"; case .stopped: "Stopped"; case .suspended: "Suspended"; case .transitioning: "Working…"; case .unavailable: "Unavailable" } }
+        var symbolName: String { switch self { case .running: "server.rack"; case .stopped: "power"; case .suspended: "pause.circle"; case .transitioning, .checking: "arrow.triangle.2.circlepath"; case .unavailable: "exclamationmark.triangle" } }
+    }
+
+    @Published var servers: [ServerDefinition] { didSet { saveServers() } }
+    @Published var statuses: [UUID: VMStatus] = [:]
+    @Published var busyServers: Set<UUID> = []
+    @Published var lastError: String?
+    @Published var discoveredVMs: [ParallelsVM] = []
+    @Published var selectedVMIDs: Set<String> = []
+    @Published var discovering = false
+    @Published var busyVMIDs: Set<String> = []
+    private var timer: Timer?
+    private let defaultsKey = "serverDefinitions.v2"
+
+    init() {
+        if let data = UserDefaults.standard.data(forKey: defaultsKey), let saved = try? JSONDecoder().decode([ServerDefinition].self, from: data) { servers = saved }
+        else { servers = [.orion] }
+        Task {
+            await discoverVMs()
+            await refreshAll()
+        }
+        timer = Timer.scheduledTimer(withTimeInterval: 15, repeats: true) { [weak self] _ in Task { @MainActor in guard let self else { return }; await self.discoverVMs(); await self.refreshAll() } }
+    }
+    deinit { timer?.invalidate() }
+
+
+    func discoverVMs() async {
+        guard !discovering else { return }
+
+        discovering = true
+        defer { discovering = false }
+
+        do {
+            let output = try await runPrlctl(["list", "-a", "-j"])
+
+            guard let data = output.data(using: .utf8),
+                  let records = try JSONSerialization.jsonObject(
+                    with: data
+                  ) as? [[String: Any]] else {
+                throw OrionError.commandFailed(
+                    "Invalid Parallels VM discovery response."
+                )
+            }
+
+            let knownBundlePaths = Dictionary(uniqueKeysWithValues:
+                discoveredVMs.compactMap { machine -> (String, String)? in
+                    guard let path = machine.bundlePath else { return nil }
+                    return (machine.id, path)
+                }
+            )
+            discoveredVMs = records.compactMap { record in
+                guard let uuid = record["uuid"] as? String,
+                      let name = record["name"] as? String else {
+                    return nil
+                }
+
+                let status = record["status"] as? String ?? "unknown"
+                let ip = record["ip_configured"] as? String ?? ""
+
+                return ParallelsVM(
+                    id: uuid,
+                    name: name,
+                    status: status,
+                    ipAddress: ip == "-" ? "" : ip,
+                    operatingSystem: ParallelsVM.detectOS(name),
+                    bundlePath: knownBundlePaths[uuid]
+                )
+            }
+            .sorted {
+                $0.name.localizedStandardCompare($1.name)
+                    == .orderedAscending
+            }
+
+            // Resolve Parallels VM bundles without requiring the guest to run.
+            for i in discoveredVMs.indices where discoveredVMs[i].bundlePath == nil {
+                if let detail = try? await runPrlctl(["list", "-i", discoveredVMs[i].id]) {
+                    let pattern = #"(?m)^\s*Home:\s*(.+?\.pvm)\s*$"#
+                    if let range = detail.range(of: pattern, options: .regularExpression) {
+                        let line = String(detail[range.lowerBound..<range.upperBound])
+                        let path = line.replacingOccurrences(of: #"^\s*Home:\s*"#, with: "", options: .regularExpression)
+                        discoveredVMs[i].bundlePath = path.trimmingCharacters(in: .whitespacesAndNewlines)
+                    }
+                }
+            }
+            // Keep selections only for VMs still present.
+            let available = Set(discoveredVMs.map(\.id))
+            selectedVMIDs.formIntersection(available)
+
+            // Associate existing configurations with discovered VMs.
+            // This preserves the original Orion configuration.
+            for machine in discoveredVMs {
+                guard let index = servers.firstIndex(where: {
+                    $0.vmUUID == machine.id ||
+                    ($0.vmUUID == nil && $0.vmName == machine.name)
+                }) else {
+                    continue
+                }
+
+                if servers[index].vmUUID == nil {
+                    servers[index].vmUUID = machine.id
+                }
+            }
+
+        } catch {
+            lastError = error.localizedDescription
+        }
+    }
+
+    func isIntegrated(_ machine: ParallelsVM) -> Bool {
+        servers.contains {
+            $0.vmUUID == machine.id ||
+            ($0.vmUUID == nil && $0.vmName == machine.name)
+        }
+    }
+
+    func toggleSelection(_ machine: ParallelsVM) {
+        if selectedVMIDs.contains(machine.id) {
+            selectedVMIDs.remove(machine.id)
+        } else {
+            selectedVMIDs.insert(machine.id)
+        }
+    }
+
+    func selectAllVMs() {
+        selectedVMIDs = Set(discoveredVMs.map(\.id))
+    }
+
+    func clearVMSelection() {
+        selectedVMIDs.removeAll()
+    }
+
+    func integrateSelectedVMs() {
+        let selected = discoveredVMs.filter {
+            selectedVMIDs.contains($0.id)
+        }
+
+        for machine in selected {
+            guard !isIntegrated(machine) else { continue }
+
+            let server = ServerDefinition(
+                name: machine.name,
+                vmName: machine.name,
+                vmUUID: machine.id,
+                host: machine.ipAddress,
+                sshUser: "sysadmin",
+                sshPort: 22,
+                sshIdentityFile: "",
+                mailpitPort: nil
+            )
+
+            add(server)
+        }
+
+        selectedVMIDs.removeAll()
+    }
+
+    func icon(for machine: ParallelsVM) -> NSImage? {
+        guard let path = machine.bundlePath,
+              FileManager.default.fileExists(atPath: path) else {
+            return nil
+        }
+
+        return NSWorkspace.shared.icon(forFile: path)
+    }
+
+    func status(for server: ServerDefinition) -> VMStatus { statuses[server.id] ?? .checking }
+    func isBusy(_ server: ServerDefinition) -> Bool { busyServers.contains(server.id) }
+    func add(_ server: ServerDefinition) { servers.append(server); Task { await refreshStatus(server) } }
+    func update(_ server: ServerDefinition) { if let i = servers.firstIndex(where: { $0.id == server.id }) { servers[i] = server; Task { await refreshStatus(server) } } }
+    func delete(at offsets: IndexSet) { for i in offsets { statuses[servers[i].id] = nil }; servers.remove(atOffsets: offsets) }
+
+    func refreshAll() async {
+        for server in servers { await refreshStatus(server) }
+    }
+
+    func refreshStatus(_ server: ServerDefinition) async {
+        guard !isBusy(server) else { return }
+        guard let machine = discoveredVMs.first(where: {
+            $0.id == server.vmUUID || $0.name == server.vmName
+        }) else {
+            statuses[server.id] = .unavailable("VM not found in Parallels")
+            return
+        }
+        switch machine.status.lowercased() {
+        case "running": statuses[server.id] = .running
+        case "stopped": statuses[server.id] = .stopped
+        case "suspended", "paused": statuses[server.id] = .suspended
+        default: statuses[server.id] = .unavailable(machine.status)
+        }
+    }
+
+    func removeDefinition(_ server: ServerDefinition) {
+        servers.removeAll { $0.id == server.id }
+        statuses.removeValue(forKey: server.id)
+        busyServers.remove(server.id)
+    }
+
+    var runningVMs: [ParallelsVM] {
+        discoveredVMs.filter { $0.status.lowercased() == "running" }
+    }
+
+    func start(_ s: ServerDefinition) { perform(["start", s.vmUUID ?? s.vmName], server: s) }
+    func stop(_ s: ServerDefinition) { perform(["stop", s.vmUUID ?? s.vmName], server: s) }
+    func restart(_ s: ServerDefinition) { perform(["restart", s.vmUUID ?? s.vmName], server: s) }
+    func forceStop(_ s: ServerDefinition) { perform(["stop", s.vmUUID ?? s.vmName, "--kill"], server: s) }
+
+    private func perform(_ arguments: [String], server: ServerDefinition) {
+        guard !isBusy(server) else { return }; busyServers.insert(server.id); statuses[server.id] = .transitioning; lastError = nil
+        Task { do { _ = try await runPrlctl(arguments) } catch { lastError = error.localizedDescription }; busyServers.remove(server.id); try? await Task.sleep(for: .seconds(1)); await refreshStatus(server) }
+    }
+
+    func operate(_ machine: ParallelsVM, action: String) {
+        guard !busyVMIDs.contains(machine.id) else { return }
+        busyVMIDs.insert(machine.id)
+        lastError = nil
+        Task {
+            let arguments = action == "force-stop"
+                ? ["stop", machine.id, "--kill"]
+                : [action, machine.id]
+            do { _ = try await runPrlctl(arguments) }
+            catch { lastError = error.localizedDescription }
+            busyVMIDs.remove(machine.id)
+            await discoverVMs()
+            await refreshAll()
+        }
+    }
+
+    func integrate(_ machine: ParallelsVM) {
+        guard !isIntegrated(machine) else { return }
+        add(ServerDefinition(name: machine.name, vmName: machine.name,
+            vmUUID: machine.id, host: machine.ipAddress, sshUser: "",
+            sshPort: 22, sshIdentityFile: "", mailpitPort: nil))
+    }
+
+    func moveServer(from source: IndexSet, to destination: Int) {
+        servers.move(fromOffsets: source, toOffset: destination)
+    }
+
+    func moveServer(_ id: UUID, by delta: Int) {
+        guard let index = servers.firstIndex(where: { $0.id == id }) else { return }
+        let target = index + delta
+        guard servers.indices.contains(target) else { return }
+        servers.swapAt(index, target)
+    }
+
+    func icon(for server: ServerDefinition) -> NSImage? {
+        if let path = server.customIconPath, let image = NSImage(contentsOfFile: path) {
+            return image
+        }
+
+        guard let machine = discoveredVMs.first(where: {
+            $0.id == server.vmUUID || $0.name == server.vmName
+        }) else { return nil }
+        return icon(for: machine)
+    }
+
+    func openSSH(_ s: ServerDefinition) {
+        let userHost = "\(s.sshUser)@\(s.host)"
+        var command = "/usr/bin/ssh -p \(s.sshPort)"
+        let identity = s.sshIdentityFile.trimmingCharacters(in: .whitespacesAndNewlines)
+        if !identity.isEmpty {
+            command += " -i \(shellQuote((identity as NSString).expandingTildeInPath))"
+        }
+        command += " \(shellQuote(userHost))"
+
+        do {
+            // Terminal reliably opens executable .command files without requiring
+            // Apple Events/Automation permission from this menu-bar application.
+            let directory = FileManager.default.temporaryDirectory
+                .appendingPathComponent("OrionToolbar", isDirectory: true)
+            try FileManager.default.createDirectory(at: directory, withIntermediateDirectories: true)
+
+            let safeName = s.name.replacingOccurrences(of: "/", with: "-")
+            let scriptURL = directory.appendingPathComponent("SSH-\(safeName).command")
+            let script = """
+            #!/bin/zsh
+            clear
+            echo "Connecting to \(s.name) (\(userHost))..."
+            exec \(command)
+            """
+            try script.write(to: scriptURL, atomically: true, encoding: .utf8)
+            try FileManager.default.setAttributes([.posixPermissions: 0o700], ofItemAtPath: scriptURL.path)
+
+            guard let terminalURL = NSWorkspace.shared.urlForApplication(withBundleIdentifier: "com.apple.Terminal") else {
+                lastError = "Terminal.app could not be found."
+                return
+            }
+
+            let configuration = NSWorkspace.OpenConfiguration()
+            configuration.activates = true
+            NSWorkspace.shared.open([scriptURL], withApplicationAt: terminalURL, configuration: configuration) { _, error in
+                Task { @MainActor in
+                    if let error { self.lastError = "Could not open Terminal: \(error.localizedDescription)" }
+                }
+            }
+        } catch {
+            lastError = "Could not create SSH launcher: \(error.localizedDescription)"
+        }
+    }
+
+    private func shellQuote(_ value: String) -> String {
+        "'" + value.replacingOccurrences(of: "'", with: "'\"'\"'") + "'"
+    }
+    func openMailpit(_ s: ServerDefinition) { if let p = s.mailpitPort, let url = URL(string: "http://\(s.host):\(p)") { NSWorkspace.shared.open(url) } }
+    func openParallels() { NSWorkspace.shared.openApplication(at: URL(fileURLWithPath: "/Applications/Parallels Desktop.app"), configuration: .init()) }
+
+    private func saveServers() { if let data = try? JSONEncoder().encode(servers) { UserDefaults.standard.set(data, forKey: defaultsKey) } }
+    private func prlctlURL() -> URL? { ["/usr/local/bin/prlctl", "/Applications/Parallels Desktop.app/Contents/MacOS/prlctl"].map(URL.init(fileURLWithPath:)).first { FileManager.default.isExecutableFile(atPath: $0.path) } }
+    private func runPrlctl(_ arguments: [String]) async throws -> String {
+        guard let executable = prlctlURL() else { throw OrionError.prlctlNotFound }
+        return try await Task.detached(priority: .userInitiated) { let p = Process(); let pipe = Pipe(); p.executableURL = executable; p.arguments = arguments; p.standardOutput = pipe; p.standardError = pipe; try p.run(); let data = pipe.fileHandleForReading.readDataToEndOfFile(); p.waitUntilExit(); let out = String(decoding: data, as: UTF8.self); guard p.terminationStatus == 0 else { throw OrionError.commandFailed(out) }; return out }.value
+    }
+}
+
+enum OrionError: LocalizedError { case prlctlNotFound, commandFailed(String); var errorDescription: String? { switch self { case .prlctlNotFound: "Parallels prlctl was not found."; case .commandFailed(let o): o.trimmingCharacters(in: .whitespacesAndNewlines) } } }
diff --git a/backups/20261023-101231-986867/OrionToolbar/SettingsView.swift b/backups/20261023-101231-986867/OrionToolbar/SettingsView.swift
new file mode 100644
index 0000000..4d027b6
--- /dev/null
+++ b/backups/20261023-101231-986867/OrionToolbar/SettingsView.swift
@@ -0,0 +1,162 @@
+import SwiftUI
+import UniformTypeIdentifiers
+
+struct SettingsView: View {
+    @EnvironmentObject var vm: OrionVMController
+    @State private var selection: UUID?
+    @State private var editing: ServerDefinition?
+    @State private var addingVMs = false
+    @State private var pendingRemoval: ServerDefinition?
+    var body: some View {
+        HStack(spacing: 0) {
+            List(selection: $selection) { ForEach(vm.servers) { s in HStack {
+                        if let icon = vm.icon(for: s) { Image(nsImage: icon).resizable().scaledToFit().frame(width: 22, height: 22) }
+                        else { Image(systemName: vm.status(for: s).symbolName) }
+                        Text(s.name)
+                    }
+                    .contentShape(Rectangle())
+                    .onTapGesture { selection = s.id }
+                    .tag(s.id) }.onMove(perform: vm.moveServer) }
+                .frame(width: 190)
+            Divider()
+            VStack(alignment: .leading, spacing: 14) {
+                if let id = selection, let server = vm.servers.first(where: { $0.id == id }) {
+                    Text(server.name).font(.title2).fontWeight(.semibold)
+                    LabeledContent("Parallels VM", value: server.vmName); LabeledContent("Host", value: server.host); LabeledContent("SSH user", value: server.sshUser); LabeledContent("SSH port", value: String(server.sshPort)); LabeledContent("SSH key", value: server.sshIdentityFile.isEmpty ? "Default SSH configuration" : server.sshIdentityFile); LabeledContent("Mailpit", value: server.mailpitPort.map(String.init) ?? "Disabled")
+                    HStack {
+                        Button("Edit…") { editing = server }
+                        Button("Move Up", systemImage: "arrow.up") { vm.moveServer(server.id, by: -1) }
+                            .disabled(vm.servers.first?.id == server.id)
+                        Button("Move Down", systemImage: "arrow.down") { vm.moveServer(server.id, by: 1) }
+                            .disabled(vm.servers.last?.id == server.id)
+                        Button("Force Stop", role: .destructive) { vm.forceStop(server) }
+                            .disabled(vm.status(for: server) == .stopped)
+                    }
+                    Spacer()
+                } else { ContentUnavailableView("Select a Server", systemImage: "server.rack") }
+                Divider()
+                HStack {
+                    Button("Add Server…", systemImage: "plus") { addingVMs = true }
+                    Spacer()
+                    Button("Remove Definition", role: .destructive) {
+                        pendingRemoval = vm.servers.first { $0.id == selection }
+                    }
+                    .disabled(selection == nil)
+                }
+            }.padding(20)
+        }.frame(width: 650, height: 380)
+        .confirmationDialog(
+            "Remove this server definition?",
+            isPresented: Binding(
+                get: { pendingRemoval != nil },
+                set: { if !$0 { pendingRemoval = nil } }
+            ),
+            titleVisibility: .visible
+        ) {
+            Button("Remove Definition", role: .destructive) {
+                if let server = pendingRemoval {
+                    vm.removeDefinition(server)
+                    selection = nil
+                }
+                pendingRemoval = nil
+            }
+            Button("Cancel", role: .cancel) { pendingRemoval = nil }
+        } message: {
+            Text("This removes the OrionToolbar integration only. The Parallels virtual machine is not deleted.")
+        }
+        .sheet(isPresented: $addingVMs) {
+            VStack(alignment: .leading, spacing: 12) {
+                Text("Add Parallels Virtual Machines").font(.title2.bold())
+                List(vm.discoveredVMs) { machine in
+                    HStack {
+                        Toggle(machine.name, isOn: Binding(
+                            get: { vm.selectedVMIDs.contains(machine.id) },
+                            set: { value in
+                                if value { vm.selectedVMIDs.insert(machine.id) }
+                                else { vm.selectedVMIDs.remove(machine.id) }
+                            }
+                        ))
+                        Spacer()
+                        if vm.isIntegrated(machine) { Text("Integrated").foregroundStyle(.secondary) }
+                    }
+                }
+                HStack {
+                    Button("Refresh") { Task { await vm.discoverVMs() } }
+                    Spacer()
+                    Button("Cancel") { addingVMs = false }
+                    Button("Integrate Selected") { vm.integrateSelectedVMs(); addingVMs = false }
+                        .disabled(vm.selectedVMIDs.isEmpty)
+                }
+            }.padding(20).frame(width: 530, height: 420)
+            .task { await vm.discoverVMs() }
+        }
+        .sheet(item: $editing) { server in ServerEditor(server: server, isNew: !vm.servers.contains(where: {$0.id == server.id})) { value, isNew in if isNew { vm.add(value) } else { vm.update(value) }; selection = value.id } }
+    }
+}
+
+struct ServerEditor: View {
+    @EnvironmentObject private var vm: OrionVMController
+    @Environment(\.dismiss) private var dismiss
+    @State var server: ServerDefinition
+    @State private var iconError: String?
+    let isNew: Bool
+    let save: (ServerDefinition, Bool) -> Void
+    var body: some View {
+        VStack(alignment: .leading, spacing: 14) {
+            Text(isNew ? "Add Server" : "Edit Server").font(.title2).fontWeight(.semibold)
+            Form {
+                TextField("Display name", text: $server.name)
+                HStack(spacing: 12) {
+                    Group {
+                        if let path = server.customIconPath, let image = NSImage(contentsOfFile: path) {
+                            Image(nsImage: image).resizable().scaledToFit()
+                        } else if let image = vm.icon(for: server) {
+                            Image(nsImage: image).resizable().scaledToFit()
+                        } else {
+                            Image(systemName: "server.rack").resizable().scaledToFit()
+                        }
+                    }
+                    .frame(width: 38, height: 38)
+                    VStack(alignment: .leading) {
+                        Text(server.customIconPath == nil ? "Parallels VM icon (automatic)" : "Custom icon")
+                            .font(.caption)
+                        HStack {
+                            Button("Choose Icon…") { chooseIcon() }
+                            Button("Use Parallels Icon") { server.customIconPath = nil }
+                        }
+                    }
+                }
+                if let iconError { Text(iconError).font(.caption).foregroundStyle(.red) }
+                TextField("Parallels VM name", text: $server.vmName)
+                TextField("IP address / host", text: $server.host)
+                TextField("SSH user", text: $server.sshUser)
+                TextField("SSH port", value: $server.sshPort, format: .number)
+                TextField("SSH identity file (optional)", text: $server.sshIdentityFile, prompt: Text("~/.ssh/id_ed25519"))
+                TextField("Mailpit port (optional)", text: Binding(get: { server.mailpitPort.map(String.init) ?? "" }, set: { server.mailpitPort = Int($0) }))
+            }
+            HStack { Spacer(); Button("Cancel") { dismiss() }; Button("Save") { save(server, isNew); dismiss() }.keyboardShortcut(.defaultAction).disabled(server.name.isEmpty || server.vmName.isEmpty || server.sshPort < 1 || server.sshPort > 65535) }
+        }.padding(20).frame(width: 470)
+    }
+
+    private func chooseIcon() {
+        let panel = NSOpenPanel()
+        panel.allowedContentTypes = [.png, .jpeg, .tiff, .icns, .heic]
+        panel.allowsMultipleSelection = false
+        panel.canChooseDirectories = false
+        guard panel.runModal() == .OK, let source = panel.url else { return }
+        do {
+            let folder = FileManager.default.homeDirectoryForCurrentUser
+                .appendingPathComponent("Library/Application Support/OrionToolbar/Icons", isDirectory: true)
+            try FileManager.default.createDirectory(at: folder, withIntermediateDirectories: true)
+            let destination = folder.appendingPathComponent("\(server.id.uuidString).\(source.pathExtension)")
+            if FileManager.default.fileExists(atPath: destination.path) {
+                try FileManager.default.removeItem(at: destination)
+            }
+            try FileManager.default.copyItem(at: source, to: destination)
+            server.customIconPath = destination.path
+            iconError = nil
+        } catch {
+            iconError = error.localizedDescription
+        }
+    }
+}
diff --git a/backups/20261023-101509-799254/OrionToolbar/OrionMenuView.swift b/backups/20261023-101509-799254/OrionToolbar/OrionMenuView.swift
new file mode 100644
index 0000000..52812e9
--- /dev/null
+++ b/backups/20261023-101509-799254/OrionToolbar/OrionMenuView.swift
@@ -0,0 +1,409 @@
+import AppKit
+import SwiftUI
+
+private enum OrionStyle {
+    static let panel = Color(red: 0.105, green: 0.14, blue: 0.20)
+    static let card = Color(red: 0.15, green: 0.19, blue: 0.25)
+    static let blue = Color(red: 0.08, green: 0.39, blue: 0.91)
+    static let green = Color(red: 0.05, green: 0.88, blue: 0.49)
+    static let red = Color(red: 0.91, green: 0.19, blue: 0.23)
+    static let muted = Color(red: 0.62, green: 0.73, blue: 0.86)
+}
+
+struct OrionMenuView: View {
+    @EnvironmentObject private var vm: OrionVMController
+    @State private var showRunning = true
+    @State private var showAll = true
+    @State private var showIntegrated = true
+    @State private var pendingRemoval: ServerDefinition?
+    @State private var pendingForceStop: ParallelsVM?
+
+    private var running: [ParallelsVM] {
+        vm.discoveredVMs.filter { $0.status.lowercased() == "running" }
+    }
+
+    var body: some View {
+        VStack(spacing: 0) {
+            header
+            Divider().overlay(.white.opacity(0.10))
+            ScrollView {
+                VStack(alignment: .leading, spacing: 15) {
+                    section(icon: "play.fill", title: "Running Virtual Machines", count: "\(running.count) running", accent: OrionStyle.green, expanded: $showRunning) {
+                        if running.isEmpty {
+                            emptyState("No running virtual machines", icon: "moon.zzz")
+                        } else {
+                            ForEach(running) { machine in
+                                runningRow(machine)
+                            }
+                        }
+                    }
+                    section(icon: "desktopcomputer", title: "All Virtual Machines", count: "\(vm.discoveredVMs.count) VMs", accent: .cyan, expanded: $showAll) {
+                        if vm.discoveredVMs.isEmpty {
+                            emptyState(vm.discovering ? "Discovering Parallels VMs…" : "No virtual machines found", icon: "desktopcomputer.trianglebadge.exclamationmark")
+                        } else {
+                            ForEach(vm.discoveredVMs) { machine in
+                                machineRow(machine)
+                            }
+                        }
+                    }
+                    section(icon: "server.rack", title: "Integrated Servers", count: "\(vm.servers.count) servers", accent: OrionStyle.blue, expanded: $showIntegrated) {
+                        if vm.servers.isEmpty {
+                            emptyState("No integrations. Add a VM using + above.", icon: "plus.circle")
+                        } else {
+                            ForEach(vm.servers) { server in
+                                integratedRow(server)
+                            }
+                        }
+                    }
+                }
+                .padding(14)
+            }
+            .frame(height: 610)
+            Divider().overlay(.white.opacity(0.10))
+            footer
+        }
+        .frame(width: 960)
+        .background(
+            LinearGradient(colors: [Color(red: 0.10, green: 0.15, blue: 0.23), Color(red: 0.075, green: 0.09, blue: 0.13)], startPoint: .topTrailing, endPoint: .bottomLeading)
+        )
+
+        .preferredColorScheme(.dark)
+        .task { await vm.discoverVMs(); await vm.refreshAll() }
+        .alert("OrionToolbar", isPresented: Binding(get: { vm.lastError != nil }, set: { if !$0 { vm.lastError = nil } })) {
+            Button("OK") { vm.lastError = nil }
+        } message: { Text(vm.lastError ?? "") }
+        .confirmationDialog("Remove server integration?", isPresented: Binding(get: { pendingRemoval != nil }, set: { if !$0 { pendingRemoval = nil } }), titleVisibility: .visible) {
+            Button("Remove Integration", role: .destructive) {
+                if let server = pendingRemoval { vm.removeDefinition(server) }
+                pendingRemoval = nil
+            }
+            Button("Cancel", role: .cancel) { pendingRemoval = nil }
+        } message: {
+            Text("The Parallels virtual machine will not be deleted.")
+        }
+        .confirmationDialog("Force stop virtual machine?", isPresented: Binding(get: { pendingForceStop != nil }, set: { if !$0 { pendingForceStop = nil } }), titleVisibility: .visible) {
+            Button("Force Stop", role: .destructive) {
+                if let machine = pendingForceStop { vm.operate(machine, action: "force-stop") }
+                pendingForceStop = nil
+            }
+            Button("Cancel", role: .cancel) { pendingForceStop = nil }
+        } message: { Text("Force Stop immediately powers off the VM and can cause data loss.") }
+    }
+
+    private var header: some View {
+        HStack(spacing: 12) {
+            Image(systemName: "server.rack")
+                .font(.system(size: 22, weight: .bold))
+                .foregroundStyle(.cyan)
+                .frame(width: 37, height: 37)
+                .background(OrionStyle.blue.opacity(0.24), in: RoundedRectangle(cornerRadius: 10))
+            Text("OrionToolbar").font(.system(size: 21, weight: .bold))
+            Circle().fill(vm.discoveredVMs.isEmpty ? Color.orange : OrionStyle.green).frame(width: 8, height: 8)
+            Text(vm.discoveredVMs.isEmpty ? "Waiting for Parallels" : "Parallels Connected")
+                .foregroundStyle(OrionStyle.muted).font(.subheadline)
+            Spacer()
+            if vm.discovering { ProgressView().controlSize(.small) }
+            Button { Task { await vm.discoverVMs(); await vm.refreshAll() } } label: {
+                Image(systemName: "arrow.clockwise").font(.system(size: 16, weight: .semibold))
+            }.buttonStyle(OrionActionStyle(tint: OrionStyle.card)).help("Refresh virtual machines")
+            Button { showSettings() } label: {
+                Image(systemName: "gearshape.fill").font(.system(size: 16))
+            }.buttonStyle(OrionActionStyle(tint: OrionStyle.card)).help("Settings")
+        }.padding(.horizontal, 17).padding(.vertical, 13)
+    }
+
+    private func section<Content: View>(icon: String, title: String, count: String, accent: Color, expanded: Binding<Bool>, @ViewBuilder content: () -> Content) -> some View {
+        VStack(spacing: 4) {
+            Button { expanded.wrappedValue.toggle() } label: {
+                HStack(spacing: 10) {
+                    Image(systemName: icon).font(.system(size: 17, weight: .bold))
+                        .foregroundStyle(accent).frame(width: 27)
+                    Text(title).font(.system(size: 16, weight: .semibold))
+                    Spacer()
+                    Text(count).font(.caption.weight(.medium))
+                        .foregroundStyle(accent)
+                        .padding(.horizontal, 10).padding(.vertical, 5)
+                        .background(accent.opacity(0.13), in: RoundedRectangle(cornerRadius: 8))
+                    Image(systemName: expanded.wrappedValue ? "chevron.up" : "chevron.down")
+                        .font(.caption.weight(.bold)).foregroundStyle(OrionStyle.muted)
+                }
+                .contentShape(Rectangle())
+                .padding(.horizontal, 11).padding(.vertical, 10)
+            }.buttonStyle(.plain)
+            if expanded.wrappedValue {
+                VStack(spacing: 3) { content() }
+                    .padding(.horizontal, 5).padding(.bottom, 7)
+            }
+        }
+        .background(OrionStyle.panel.opacity(0.92), in: RoundedRectangle(cornerRadius: 16))
+        .overlay(RoundedRectangle(cornerRadius: 16).strokeBorder(.white.opacity(0.09)))
+    }
+
+    private func emptyState(_ title: String, icon: String) -> some View {
+        Label(title, systemImage: icon)
+            .font(.subheadline).foregroundStyle(OrionStyle.muted)
+            .frame(maxWidth: .infinity, alignment: .leading)
+            .padding(15)
+    }
+
+    private func icon(_ machine: ParallelsVM) -> some View {
+        Group {
+            if let image = vm.icon(for: machine) {
+                Image(nsImage: image).resizable().scaledToFit()
+            } else {
+                Image(systemName: machine.operatingSystem == "Windows" ? "desktopcomputer" : "server.rack")
+                    .font(.system(size: 21, weight: .medium))
+                    .foregroundStyle(.white)
+                    .frame(maxWidth: .infinity, maxHeight: .infinity)
+                    .background(osColor(machine.operatingSystem), in: Circle())
+            }
+        }.frame(width: 36, height: 36)
+    }
+
+    private func osColor(_ os: String) -> Color {
+        switch os {
+        case "Ubuntu": return .orange
+        case "Debian": return .pink
+        case "Fedora": return .blue
+        case "CentOS": return .purple
+        case "Alpine": return .teal
+        case "Windows": return .cyan
+        default: return OrionStyle.blue
+        }
+    }
+
+    private func state(_ status: String) -> some View {
+        let s = status.lowercased()
+        let color: Color = s == "running" ? OrionStyle.green : (s == "stopped" ? OrionStyle.muted : .orange)
+        return HStack(spacing: 6) {
+            Circle().fill(color).frame(width: 8, height: 8)
+            Text(status.capitalized).font(.system(size: 12, weight: .medium))
+                .foregroundStyle(color)
+        }.frame(width: 90, alignment: .leading)
+    }
+
+    private func integrated(_ machine: ParallelsVM) -> ServerDefinition? {
+        vm.servers.first { $0.vmUUID == machine.id || $0.vmName == machine.name }
+    }
+
+    private func runningRow(_ machine: ParallelsVM) -> some View {
+        HStack(spacing: 10) {
+            icon(machine)
+            Text(machine.name).font(.system(size: 12, weight: .semibold)).lineLimit(1).frame(width: 210, alignment: .leading)
+            state(machine.status)
+            Text(machine.ipAddress.isEmpty ? "—" : machine.ipAddress)
+                .font(.system(size: 11, design: .monospaced))
+                .foregroundStyle(OrionStyle.muted).lineLimit(1).frame(width: 125, alignment: .leading)
+            Spacer(minLength: 0)
+            if let server = integrated(machine) {
+                action("SSH", "terminal", tint: OrionStyle.blue) { vm.openSSH(server) }
+                    .disabled(server.host.isEmpty || server.sshUser.isEmpty)
+                action("Mailpit", "globe", tint: OrionStyle.blue) { vm.openMailpit(server) }
+                    .disabled(server.host.isEmpty || server.mailpitPort == nil)
+            }
+            if vm.busyVMIDs.contains(machine.id) {
+                ProgressView().controlSize(.small)
+                    .frame(width: 70)
+                    .help("Waiting for Parallels to complete the operation")
+            } else {
+                action("Restart", "arrow.clockwise", tint: OrionStyle.card) { vm.operate(machine, action: "restart") }
+                action("Stop", "stop.fill", tint: OrionStyle.red) { vm.operate(machine, action: "stop") }
+            }
+            Menu {
+                Button("Force Stop", role: .destructive) { pendingForceStop = machine }
+            } label: {
+                Image(systemName: "ellipsis").frame(width: 16)
+            }.menuStyle(.borderlessButton).frame(width: 22)
+            .help("More VM actions")
+        }
+        .disabled(vm.busyVMIDs.contains(machine.id))
+        .padding(.horizontal, 10).padding(.vertical, 7)
+        .background(OrionStyle.card.opacity(0.75), in: RoundedRectangle(cornerRadius: 10))
+    }
+
+    private func machineRow(_ machine: ParallelsVM) -> some View {
+        HStack(spacing: 10) {
+            icon(machine)
+            Text(machine.name).font(.system(size: 12, weight: .semibold)).lineLimit(1).frame(width: 230, alignment: .leading)
+            state(machine.status)
+            Text(machine.ipAddress.isEmpty ? "—" : machine.ipAddress)
+                .font(.system(size: 11, design: .monospaced))
+                .foregroundStyle(OrionStyle.muted).lineLimit(1)
+            Spacer(minLength: 2)
+            if vm.busyVMIDs.contains(machine.id) { ProgressView().controlSize(.small) }
+            else if machine.status.lowercased() == "running" {
+                action("Stop", "stop.fill", tint: OrionStyle.red) { vm.operate(machine, action: "stop") }
+            } else if ["suspended", "paused"].contains(machine.status.lowercased()) {
+                action("Resume", "play.fill", tint: OrionStyle.blue) { vm.operate(machine, action: "resume") }
+            } else {
+                action("Start", "play.fill", tint: OrionStyle.blue) { vm.operate(machine, action: "start") }
+            }
+            if vm.isIntegrated(machine) {
+                Image(systemName: "checkmark.circle.fill").foregroundStyle(OrionStyle.green)
+                    .frame(width: 28).help("Integrated")
+            } else {
+                Button { vm.integrate(machine) } label: {
+                    Image(systemName: "plus.circle").font(.system(size: 20))
+                }.buttonStyle(.plain).foregroundStyle(OrionStyle.muted)
+                    .frame(width: 28).help("Integrate VM")
+            }
+            Menu {
+                Button("Open in Parallels") { vm.openParallels() }
+                if machine.status.lowercased() == "running" {
+                    Button("Restart") { vm.operate(machine, action: "restart") }
+                    Button("Force Stop", role: .destructive) { pendingForceStop = machine }
+                }
+            } label: { Image(systemName: "chevron.right").foregroundStyle(OrionStyle.muted) }
+                .menuStyle(.borderlessButton).frame(width: 22)
+        }
+        .padding(.horizontal, 10).padding(.vertical, 7)
+        .background(OrionStyle.card.opacity(0.75), in: RoundedRectangle(cornerRadius: 10))
+    }
+
+    private func integratedRow(_ server: ServerDefinition) -> some View {
+        let machine = vm.discoveredVMs.first { $0.id == server.vmUUID || $0.name == server.vmName }
+        let status = machine?.status ?? "unavailable"
+        return HStack(spacing: 10) {
+            Group {
+                if let image = vm.icon(for: server) {
+                    Image(nsImage: image).resizable().scaledToFit()
+                } else if let machine {
+                    icon(machine)
+                } else {
+                    Image(systemName: "server.rack").foregroundStyle(.cyan)
+                }
+            }.frame(width: 36, height: 36)
+            HStack(spacing: 5) {
+                Image(systemName: "line.3.horizontal").foregroundStyle(OrionStyle.muted)
+                Text(server.name).lineLimit(1)
+            }
+            .font(.system(size: 12, weight: .semibold))
+            .frame(width: 185, alignment: .leading)
+            .draggable(server.id.uuidString)
+            state(status)
+            Text(server.host.isEmpty ? "—" : server.host)
+                .font(.system(size: 11, design: .monospaced)).foregroundStyle(OrionStyle.muted)
+                .lineLimit(1).frame(width: 125, alignment: .leading)
+            Spacer(minLength: 0)
+            if let machine {
+                if status.lowercased() == "running" {
+                    action("Stop", "stop.fill", tint: OrionStyle.red) { vm.operate(machine, action: "stop") }
+                } else {
+                    action("Start", "play.fill", tint: OrionStyle.blue) { vm.operate(machine, action: "start") }
+                }
+            }
+            action("SSH", "terminal", tint: OrionStyle.card) { vm.openSSH(server) }
+                .disabled(status.lowercased() != "running" || server.host.isEmpty || server.sshUser.isEmpty)
+            action("Mailpit", "globe", tint: OrionStyle.card) { vm.openMailpit(server) }
+                .disabled(status.lowercased() != "running" || server.host.isEmpty || server.mailpitPort == nil)
+            action("Remove", "trash", tint: OrionStyle.card) { pendingRemoval = server }
+        }
+        .disabled(machine.map { vm.busyVMIDs.contains($0.id) } ?? false)
+        .padding(.horizontal, 10).padding(.vertical, 7)
+        .background(OrionStyle.card.opacity(0.75), in: RoundedRectangle(cornerRadius: 10))
+        .dropDestination(for: String.self) { items, _ in
+            guard let value = items.first,
+                  let id = UUID(uuidString: value) else { return false }
+            vm.reorderServer(draggedID: id, onto: server.id)
+            return true
+        }
+    }
+
+    private func action(_ title: String, _ symbol: String, tint: Color, perform: @escaping () -> Void) -> some View {
+        Button(action: perform) {
+            Label(title, systemImage: symbol)
+                .font(.system(size: 11, weight: .semibold))
+                .lineLimit(1)
+                .frame(minWidth: 48)
+        }.buttonStyle(OrionActionStyle(tint: tint))
+    }
+
+    private var footer: some View {
+        HStack {
+            action("Open Parallels", "macwindow", tint: OrionStyle.card) { vm.openParallels() }
+            Spacer()
+            action("Settings…", "gearshape", tint: OrionStyle.card) { showSettings() }
+            action("Quit", "power", tint: OrionStyle.card) { NSApplication.shared.terminate(nil) }
+        }.padding(.horizontal, 17).padding(.vertical, 12)
+    }
+
+    private func showSettings() {
+        OrionSettingsWindowPresenter.present(vm: vm)
+    }
+}
+
+private struct OrionActionStyle: ButtonStyle {
+    let tint: Color
+    func makeBody(configuration: Configuration) -> some View {
+        configuration.label
+            .foregroundStyle(.white)
+            .padding(.horizontal, 8).padding(.vertical, 7)
+            .background(tint.opacity(configuration.isPressed ? 0.65 : 1), in: RoundedRectangle(cornerRadius: 8))
+            .opacity(configuration.isPressed ? 0.8 : 1)
+    }
+}
+
+
+// Keep Settings above its originating MenuBarExtra panel.
+@MainActor
+private final class OrionSettingsWindowPresenter: NSObject, NSWindowDelegate {
+    private static var current: OrionSettingsWindowPresenter?
+
+    private var window: NSWindow?
+    private weak var parentWindow: NSWindow?
+
+    static func present(vm: OrionVMController) {
+        if let current, let window = current.window {
+            NSApp.activate(ignoringOtherApps: true)
+            window.makeKeyAndOrderFront(nil)
+            return
+        }
+
+        let presenter = OrionSettingsWindowPresenter()
+        current = presenter
+        presenter.open(vm: vm)
+    }
+
+    private func open(vm: OrionVMController) {
+        // Capture the currently active menu-bar panel.
+        let parent = NSApp.keyWindow
+            ?? NSApp.windows.first(where: { $0.isVisible })
+
+        let content = SettingsView()
+            .environmentObject(vm)
+            .preferredColorScheme(.dark)
+
+        let window = NSWindow(
+            contentRect: NSRect(x: 0, y: 0, width: 650, height: 380),
+            styleMask: [.titled, .closable],
+            backing: .buffered,
+            defer: false
+        )
+
+        window.title = "OrionToolbar Settings"
+        window.contentViewController = NSHostingController(rootView: content)
+        window.delegate = self
+        window.isReleasedWhenClosed = false
+        window.center()
+
+        self.window = window
+        self.parentWindow = parent
+
+        if let parent {
+            parent.addChildWindow(window, ordered: .above)
+        }
+
+        NSApp.activate(ignoringOtherApps: true)
+        window.makeKeyAndOrderFront(nil)
+        window.orderFrontRegardless()
+    }
+
+    func windowWillClose(_ notification: Notification) {
+        if let window {
+            parentWindow?.removeChildWindow(window)
+        }
+
+        window = nil
+        Self.current = nil
+    }
+}
diff --git a/backups/20261023-101509-799254/OrionToolbar/OrionVMController.swift b/backups/20261023-101509-799254/OrionToolbar/OrionVMController.swift
new file mode 100644
index 0000000..3defc48
--- /dev/null
+++ b/backups/20261023-101509-799254/OrionToolbar/OrionVMController.swift
@@ -0,0 +1,402 @@
+import AppKit
+import Foundation
+
+struct ServerDefinition: Identifiable, Codable, Hashable {
+    var id = UUID()
+    var name: String
+    var vmName: String
+    var vmUUID: String? = nil
+    var host: String
+    var sshUser: String
+    var sshPort: Int = 22
+    var sshIdentityFile: String = ""
+    var mailpitPort: Int?
+    var customIconPath: String? = nil
+
+    static let orion = ServerDefinition(name: "Orion", vmName: "Ubuntu Linux Server", host: "10.211.55.100", sshUser: "sysadmin", sshPort: 22, sshIdentityFile: "", mailpitPort: 8025)
+}
+
+
+struct ParallelsVM: Identifiable, Hashable {
+    let id: String
+    let name: String
+    let status: String
+    let ipAddress: String
+    let operatingSystem: String
+    var bundlePath: String?
+
+    var symbol: String {
+        switch operatingSystem {
+        case "Windows": return "desktopcomputer"
+        case "Ubuntu": return "server.rack"
+        case "Debian": return "server.rack"
+        case "Fedora": return "server.rack"
+        case "CentOS": return "server.rack"
+        case "Alpine": return "server.rack"
+        case "Oracle Linux": return "server.rack"
+        default: return "desktopcomputer"
+        }
+    }
+
+    static func detectOS(_ name: String) -> String {
+        let value = name.lowercased()
+
+        if value.contains("windows") { return "Windows" }
+        if value.contains("ubuntu") { return "Ubuntu" }
+        if value.contains("debian") { return "Debian" }
+        if value.contains("fedora") { return "Fedora" }
+        if value.contains("centos") { return "CentOS" }
+        if value.contains("alpine") { return "Alpine" }
+        if value.contains("oracle") { return "Oracle Linux" }
+        if value.contains("rocky") { return "Rocky Linux" }
+        if value.contains("alma") { return "AlmaLinux" }
+        if value.contains("arch") { return "Arch Linux" }
+        if value.contains("gentoo") { return "Gentoo" }
+        if value.contains("freebsd") { return "FreeBSD" }
+
+        return "Other"
+    }
+}
+
+@MainActor
+final class OrionVMController: ObservableObject {
+    enum VMStatus: Equatable {
+        case checking, running, stopped, suspended, transitioning, unavailable(String)
+        var title: String { switch self { case .checking: "Checking…"; case .running: "Running"; case .stopped: "Stopped"; case .suspended: "Suspended"; case .transitioning: "Working…"; case .unavailable: "Unavailable" } }
+        var symbolName: String { switch self { case .running: "server.rack"; case .stopped: "power"; case .suspended: "pause.circle"; case .transitioning, .checking: "arrow.triangle.2.circlepath"; case .unavailable: "exclamationmark.triangle" } }
+    }
+
+    @Published var servers: [ServerDefinition] { didSet { saveServers() } }
+    @Published var statuses: [UUID: VMStatus] = [:]
+    @Published var busyServers: Set<UUID> = []
+    @Published var lastError: String?
+    @Published var discoveredVMs: [ParallelsVM] = []
+    @Published var selectedVMIDs: Set<String> = []
+    @Published var discovering = false
+    @Published var busyVMIDs: Set<String> = []
+    private var timer: Timer?
+    private let defaultsKey = "serverDefinitions.v2"
+
+    init() {
+        if let data = UserDefaults.standard.data(forKey: defaultsKey), let saved = try? JSONDecoder().decode([ServerDefinition].self, from: data) { servers = saved }
+        else { servers = [.orion] }
+        Task {
+            await discoverVMs()
+            await refreshAll()
+        }
+        timer = Timer.scheduledTimer(withTimeInterval: 15, repeats: true) { [weak self] _ in Task { @MainActor in guard let self else { return }; await self.discoverVMs(); await self.refreshAll() } }
+    }
+    deinit { timer?.invalidate() }
+
+
+    func discoverVMs() async {
+        guard !discovering else { return }
+
+        discovering = true
+        defer { discovering = false }
+
+        do {
+            let output = try await runPrlctl(["list", "-a", "-j"])
+
+            guard let data = output.data(using: .utf8),
+                  let records = try JSONSerialization.jsonObject(
+                    with: data
+                  ) as? [[String: Any]] else {
+                throw OrionError.commandFailed(
+                    "Invalid Parallels VM discovery response."
+                )
+            }
+
+            let knownBundlePaths = Dictionary(uniqueKeysWithValues:
+                discoveredVMs.compactMap { machine -> (String, String)? in
+                    guard let path = machine.bundlePath else { return nil }
+                    return (machine.id, path)
+                }
+            )
+            discoveredVMs = records.compactMap { record in
+                guard let uuid = record["uuid"] as? String,
+                      let name = record["name"] as? String else {
+                    return nil
+                }
+
+                let status = record["status"] as? String ?? "unknown"
+                let ip = record["ip_configured"] as? String ?? ""
+
+                return ParallelsVM(
+                    id: uuid,
+                    name: name,
+                    status: status,
+                    ipAddress: ip == "-" ? "" : ip,
+                    operatingSystem: ParallelsVM.detectOS(name),
+                    bundlePath: knownBundlePaths[uuid]
+                )
+            }
+            .sorted {
+                $0.name.localizedStandardCompare($1.name)
+                    == .orderedAscending
+            }
+
+            // Resolve Parallels VM bundles without requiring the guest to run.
+            for i in discoveredVMs.indices where discoveredVMs[i].bundlePath == nil {
+                if let detail = try? await runPrlctl(["list", "-i", discoveredVMs[i].id]) {
+                    // `Home:` ends with .pvm/ on this Parallels installation.
+                    if let homeLine = detail.split(separator: "\n").first(where: {
+                        $0.trimmingCharacters(in: .whitespaces).hasPrefix("Home:")
+                    }) {
+                        let trimmed = homeLine.trimmingCharacters(in: .whitespaces)
+                        let raw = String(trimmed.dropFirst("Home:".count))
+                            .trimmingCharacters(in: .whitespacesAndNewlines)
+                            .trimmingCharacters(in: CharacterSet(charactersIn: "\"'"))
+                        let expanded = (raw as NSString).expandingTildeInPath
+                        let normalized = (expanded as NSString).standardizingPath
+                        if FileManager.default.fileExists(atPath: normalized) {
+                            discoveredVMs[i].bundlePath = normalized
+                        }
+                    }
+                }
+            }
+            // Keep selections only for VMs still present.
+            let available = Set(discoveredVMs.map(\.id))
+            selectedVMIDs.formIntersection(available)
+
+            // Associate existing configurations with discovered VMs.
+            // This preserves the original Orion configuration.
+            for machine in discoveredVMs {
+                guard let index = servers.firstIndex(where: {
+                    $0.vmUUID == machine.id ||
+                    ($0.vmUUID == nil && $0.vmName == machine.name)
+                }) else {
+                    continue
+                }
+
+                if servers[index].vmUUID == nil {
+                    servers[index].vmUUID = machine.id
+                }
+            }
+
+        } catch {
+            lastError = error.localizedDescription
+        }
+    }
+
+    func isIntegrated(_ machine: ParallelsVM) -> Bool {
+        servers.contains {
+            $0.vmUUID == machine.id ||
+            ($0.vmUUID == nil && $0.vmName == machine.name)
+        }
+    }
+
+    func toggleSelection(_ machine: ParallelsVM) {
+        if selectedVMIDs.contains(machine.id) {
+            selectedVMIDs.remove(machine.id)
+        } else {
+            selectedVMIDs.insert(machine.id)
+        }
+    }
+
+    func selectAllVMs() {
+        selectedVMIDs = Set(discoveredVMs.map(\.id))
+    }
+
+    func clearVMSelection() {
+        selectedVMIDs.removeAll()
+    }
+
+    func integrateSelectedVMs() {
+        let selected = discoveredVMs.filter {
+            selectedVMIDs.contains($0.id)
+        }
+
+        for machine in selected {
+            guard !isIntegrated(machine) else { continue }
+
+            let server = ServerDefinition(
+                name: machine.name,
+                vmName: machine.name,
+                vmUUID: machine.id,
+                host: machine.ipAddress,
+                sshUser: "sysadmin",
+                sshPort: 22,
+                sshIdentityFile: "",
+                mailpitPort: nil
+            )
+
+            add(server)
+        }
+
+        selectedVMIDs.removeAll()
+    }
+
+    func icon(for machine: ParallelsVM) -> NSImage? {
+        guard let path = machine.bundlePath,
+              FileManager.default.fileExists(atPath: path) else { return nil }
+        let bundle = URL(fileURLWithPath: path, isDirectory: true)
+        // Prefer a VM-specific icon if the Parallels bundle contains one.
+        for name in ["icon.png", "Icon.png", "icon.icns", "Icon.icns",
+                     ".VolumeIcon.icns", "icon.tiff", "Icon.tiff"] {
+            if let image = NSImage(contentsOf: bundle.appendingPathComponent(name)) {
+                return image
+            }
+        }
+        // This is the same package icon Finder shows for the Parallels VM.
+        return NSWorkspace.shared.icon(forFile: path)
+    }
+
+    func status(for server: ServerDefinition) -> VMStatus { statuses[server.id] ?? .checking }
+    func isBusy(_ server: ServerDefinition) -> Bool { busyServers.contains(server.id) }
+    func add(_ server: ServerDefinition) { servers.append(server); Task { await refreshStatus(server) } }
+    func update(_ server: ServerDefinition) { if let i = servers.firstIndex(where: { $0.id == server.id }) { servers[i] = server; Task { await refreshStatus(server) } } }
+    func delete(at offsets: IndexSet) { for i in offsets { statuses[servers[i].id] = nil }; servers.remove(atOffsets: offsets) }
+
+    func refreshAll() async {
+        for server in servers { await refreshStatus(server) }
+    }
+
+    func refreshStatus(_ server: ServerDefinition) async {
+        guard !isBusy(server) else { return }
+        guard let machine = discoveredVMs.first(where: {
+            $0.id == server.vmUUID || $0.name == server.vmName
+        }) else {
+            statuses[server.id] = .unavailable("VM not found in Parallels")
+            return
+        }
+        switch machine.status.lowercased() {
+        case "running": statuses[server.id] = .running
+        case "stopped": statuses[server.id] = .stopped
+        case "suspended", "paused": statuses[server.id] = .suspended
+        default: statuses[server.id] = .unavailable(machine.status)
+        }
+    }
+
+    func removeDefinition(_ server: ServerDefinition) {
+        servers.removeAll { $0.id == server.id }
+        statuses.removeValue(forKey: server.id)
+        busyServers.remove(server.id)
+    }
+
+    var runningVMs: [ParallelsVM] {
+        discoveredVMs.filter { $0.status.lowercased() == "running" }
+    }
+
+    func start(_ s: ServerDefinition) { perform(["start", s.vmUUID ?? s.vmName], server: s) }
+    func stop(_ s: ServerDefinition) { perform(["stop", s.vmUUID ?? s.vmName], server: s) }
+    func restart(_ s: ServerDefinition) { perform(["restart", s.vmUUID ?? s.vmName], server: s) }
+    func forceStop(_ s: ServerDefinition) { perform(["stop", s.vmUUID ?? s.vmName, "--kill"], server: s) }
+
+    private func perform(_ arguments: [String], server: ServerDefinition) {
+        guard !isBusy(server) else { return }; busyServers.insert(server.id); statuses[server.id] = .transitioning; lastError = nil
+        Task { do { _ = try await runPrlctl(arguments) } catch { lastError = error.localizedDescription }; busyServers.remove(server.id); try? await Task.sleep(for: .seconds(1)); await refreshStatus(server) }
+    }
+
+    func operate(_ machine: ParallelsVM, action: String) {
+        guard !busyVMIDs.contains(machine.id) else { return }
+        busyVMIDs.insert(machine.id)
+        lastError = nil
+        Task {
+            let arguments = action == "force-stop"
+                ? ["stop", machine.id, "--kill"]
+                : [action, machine.id]
+            do { _ = try await runPrlctl(arguments) }
+            catch { lastError = error.localizedDescription }
+            busyVMIDs.remove(machine.id)
+            await discoverVMs()
+            await refreshAll()
+        }
+    }
+
+    func integrate(_ machine: ParallelsVM) {
+        guard !isIntegrated(machine) else { return }
+        add(ServerDefinition(name: machine.name, vmName: machine.name,
+            vmUUID: machine.id, host: machine.ipAddress, sshUser: "",
+            sshPort: 22, sshIdentityFile: "", mailpitPort: nil))
+    }
+
+    func moveServer(from source: IndexSet, to destination: Int) {
+        servers.move(fromOffsets: source, toOffset: destination)
+    }
+
+    func moveServer(_ id: UUID, by delta: Int) {
+        guard let index = servers.firstIndex(where: { $0.id == id }) else { return }
+        let target = index + delta
+        guard servers.indices.contains(target) else { return }
+        servers.swapAt(index, target)
+    }
+
+    func reorderServer(draggedID: UUID, onto targetID: UUID) {
+        guard draggedID != targetID,
+              let from = servers.firstIndex(where: { $0.id == draggedID }),
+              let to = servers.firstIndex(where: { $0.id == targetID }) else { return }
+        let moved = servers.remove(at: from)
+        servers.insert(moved, at: to) // @Published didSet persists the order.
+    }
+
+    func icon(for server: ServerDefinition) -> NSImage? {
+        if let path = server.customIconPath, let image = NSImage(contentsOfFile: path) {
+            return image
+        }
+
+        guard let machine = discoveredVMs.first(where: {
+            $0.id == server.vmUUID || $0.name == server.vmName
+        }) else { return nil }
+        return icon(for: machine)
+    }
+
+    func openSSH(_ s: ServerDefinition) {
+        let userHost = "\(s.sshUser)@\(s.host)"
+        var command = "/usr/bin/ssh -p \(s.sshPort)"
+        let identity = s.sshIdentityFile.trimmingCharacters(in: .whitespacesAndNewlines)
+        if !identity.isEmpty {
+            command += " -i \(shellQuote((identity as NSString).expandingTildeInPath))"
+        }
+        command += " \(shellQuote(userHost))"
+
+        do {
+            // Terminal reliably opens executable .command files without requiring
+            // Apple Events/Automation permission from this menu-bar application.
+            let directory = FileManager.default.temporaryDirectory
+                .appendingPathComponent("OrionToolbar", isDirectory: true)
+            try FileManager.default.createDirectory(at: directory, withIntermediateDirectories: true)
+
+            let safeName = s.name.replacingOccurrences(of: "/", with: "-")
+            let scriptURL = directory.appendingPathComponent("SSH-\(safeName).command")
+            let script = """
+            #!/bin/zsh
+            clear
+            echo "Connecting to \(s.name) (\(userHost))..."
+            exec \(command)
+            """
+            try script.write(to: scriptURL, atomically: true, encoding: .utf8)
+            try FileManager.default.setAttributes([.posixPermissions: 0o700], ofItemAtPath: scriptURL.path)
+
+            guard let terminalURL = NSWorkspace.shared.urlForApplication(withBundleIdentifier: "com.apple.Terminal") else {
+                lastError = "Terminal.app could not be found."
+                return
+            }
+
+            let configuration = NSWorkspace.OpenConfiguration()
+            configuration.activates = true
+            NSWorkspace.shared.open([scriptURL], withApplicationAt: terminalURL, configuration: configuration) { _, error in
+                Task { @MainActor in
+                    if let error { self.lastError = "Could not open Terminal: \(error.localizedDescription)" }
+                }
+            }
+        } catch {
+            lastError = "Could not create SSH launcher: \(error.localizedDescription)"
+        }
+    }
+
+    private func shellQuote(_ value: String) -> String {
+        "'" + value.replacingOccurrences(of: "'", with: "'\"'\"'") + "'"
+    }
+    func openMailpit(_ s: ServerDefinition) { if let p = s.mailpitPort, let url = URL(string: "http://\(s.host):\(p)") { NSWorkspace.shared.open(url) } }
+    func openParallels() { NSWorkspace.shared.openApplication(at: URL(fileURLWithPath: "/Applications/Parallels Desktop.app"), configuration: .init()) }
+
+    private func saveServers() { if let data = try? JSONEncoder().encode(servers) { UserDefaults.standard.set(data, forKey: defaultsKey) } }
+    private func prlctlURL() -> URL? { ["/usr/local/bin/prlctl", "/Applications/Parallels Desktop.app/Contents/MacOS/prlctl"].map(URL.init(fileURLWithPath:)).first { FileManager.default.isExecutableFile(atPath: $0.path) } }
+    private func runPrlctl(_ arguments: [String]) async throws -> String {
+        guard let executable = prlctlURL() else { throw OrionError.prlctlNotFound }
+        return try await Task.detached(priority: .userInitiated) { let p = Process(); let pipe = Pipe(); p.executableURL = executable; p.arguments = arguments; p.standardOutput = pipe; p.standardError = pipe; try p.run(); let data = pipe.fileHandleForReading.readDataToEndOfFile(); p.waitUntilExit(); let out = String(decoding: data, as: UTF8.self); guard p.terminationStatus == 0 else { throw OrionError.commandFailed(out) }; return out }.value
+    }
+}
+
+enum OrionError: LocalizedError { case prlctlNotFound, commandFailed(String); var errorDescription: String? { switch self { case .prlctlNotFound: "Parallels prlctl was not found."; case .commandFailed(let o): o.trimmingCharacters(in: .whitespacesAndNewlines) } } }
diff --git a/backups/20261023-101509-799254/OrionToolbar/SettingsView.swift b/backups/20261023-101509-799254/OrionToolbar/SettingsView.swift
new file mode 100644
index 0000000..8e51c09
--- /dev/null
+++ b/backups/20261023-101509-799254/OrionToolbar/SettingsView.swift
@@ -0,0 +1,173 @@
+import SwiftUI
+import UniformTypeIdentifiers
+
+struct SettingsView: View {
+    @EnvironmentObject var vm: OrionVMController
+    @State private var selection: UUID?
+    @State private var editing: ServerDefinition?
+    @State private var addingVMs = false
+    @State private var pendingRemoval: ServerDefinition?
+    var body: some View {
+        HStack(spacing: 0) {
+            List(selection: $selection) { ForEach(vm.servers) { s in HStack {
+                        if let icon = vm.icon(for: s) { Image(nsImage: icon).resizable().scaledToFit().frame(width: 22, height: 22) }
+                        else { Image(systemName: vm.status(for: s).symbolName) }
+                        Text(s.name)
+                        Spacer(minLength: 0)
+                        Image(systemName: "line.3.horizontal")
+                            .foregroundStyle(.secondary)
+                            .help("Drag to reorder servers")
+                    }
+                    .contentShape(Rectangle())
+                    .onTapGesture { selection = s.id }
+                    .draggable(s.id.uuidString)
+                    .dropDestination(for: String.self) { items, _ in
+                        guard let value = items.first,
+                              let id = UUID(uuidString: value) else { return false }
+                        vm.reorderServer(draggedID: id, onto: s.id)
+                        return true
+                    }
+                    .tag(s.id) }.onMove(perform: vm.moveServer) }
+                .frame(width: 190)
+            Divider()
+            VStack(alignment: .leading, spacing: 14) {
+                if let id = selection, let server = vm.servers.first(where: { $0.id == id }) {
+                    Text(server.name).font(.title2).fontWeight(.semibold)
+                    LabeledContent("Parallels VM", value: server.vmName); LabeledContent("Host", value: server.host); LabeledContent("SSH user", value: server.sshUser); LabeledContent("SSH port", value: String(server.sshPort)); LabeledContent("SSH key", value: server.sshIdentityFile.isEmpty ? "Default SSH configuration" : server.sshIdentityFile); LabeledContent("Mailpit", value: server.mailpitPort.map(String.init) ?? "Disabled")
+                    HStack {
+                        Button("Edit…") { editing = server }
+                        Button("Move Up", systemImage: "arrow.up") { vm.moveServer(server.id, by: -1) }
+                            .disabled(vm.servers.first?.id == server.id)
+                        Button("Move Down", systemImage: "arrow.down") { vm.moveServer(server.id, by: 1) }
+                            .disabled(vm.servers.last?.id == server.id)
+                        Button("Force Stop", role: .destructive) { vm.forceStop(server) }
+                            .disabled(vm.status(for: server) == .stopped)
+                    }
+                    Spacer()
+                } else { ContentUnavailableView("Select a Server", systemImage: "server.rack") }
+                Divider()
+                HStack {
+                    Button("Add Server…", systemImage: "plus") { addingVMs = true }
+                    Spacer()
+                    Button("Remove Definition", role: .destructive) {
+                        pendingRemoval = vm.servers.first { $0.id == selection }
+                    }
+                    .disabled(selection == nil)
+                }
+            }.padding(20)
+        }.frame(width: 650, height: 380)
+        .confirmationDialog(
+            "Remove this server definition?",
+            isPresented: Binding(
+                get: { pendingRemoval != nil },
+                set: { if !$0 { pendingRemoval = nil } }
+            ),
+            titleVisibility: .visible
+        ) {
+            Button("Remove Definition", role: .destructive) {
+                if let server = pendingRemoval {
+                    vm.removeDefinition(server)
+                    selection = nil
+                }
+                pendingRemoval = nil
+            }
+            Button("Cancel", role: .cancel) { pendingRemoval = nil }
+        } message: {
+            Text("This removes the OrionToolbar integration only. The Parallels virtual machine is not deleted.")
+        }
+        .sheet(isPresented: $addingVMs) {
+            VStack(alignment: .leading, spacing: 12) {
+                Text("Add Parallels Virtual Machines").font(.title2.bold())
+                List(vm.discoveredVMs) { machine in
+                    HStack {
+                        Toggle(machine.name, isOn: Binding(
+                            get: { vm.selectedVMIDs.contains(machine.id) },
+                            set: { value in
+                                if value { vm.selectedVMIDs.insert(machine.id) }
+                                else { vm.selectedVMIDs.remove(machine.id) }
+                            }
+                        ))
+                        Spacer()
+                        if vm.isIntegrated(machine) { Text("Integrated").foregroundStyle(.secondary) }
+                    }
+                }
+                HStack {
+                    Button("Refresh") { Task { await vm.discoverVMs() } }
+                    Spacer()
+                    Button("Cancel") { addingVMs = false }
+                    Button("Integrate Selected") { vm.integrateSelectedVMs(); addingVMs = false }
+                        .disabled(vm.selectedVMIDs.isEmpty)
+                }
+            }.padding(20).frame(width: 530, height: 420)
+            .task { await vm.discoverVMs() }
+        }
+        .sheet(item: $editing) { server in ServerEditor(server: server, isNew: !vm.servers.contains(where: {$0.id == server.id})) { value, isNew in if isNew { vm.add(value) } else { vm.update(value) }; selection = value.id } }
+    }
+}
+
+struct ServerEditor: View {
+    @EnvironmentObject private var vm: OrionVMController
+    @Environment(\.dismiss) private var dismiss
+    @State var server: ServerDefinition
+    @State private var iconError: String?
+    let isNew: Bool
+    let save: (ServerDefinition, Bool) -> Void
+    var body: some View {
+        VStack(alignment: .leading, spacing: 14) {
+            Text(isNew ? "Add Server" : "Edit Server").font(.title2).fontWeight(.semibold)
+            Form {
+                TextField("Display name", text: $server.name)
+                HStack(spacing: 12) {
+                    Group {
+                        if let path = server.customIconPath, let image = NSImage(contentsOfFile: path) {
+                            Image(nsImage: image).resizable().scaledToFit()
+                        } else if let image = vm.icon(for: server) {
+                            Image(nsImage: image).resizable().scaledToFit()
+                        } else {
+                            Image(systemName: "server.rack").resizable().scaledToFit()
+                        }
+                    }
+                    .frame(width: 38, height: 38)
+                    VStack(alignment: .leading) {
+                        Text(server.customIconPath == nil ? "Parallels VM icon (automatic)" : "Custom icon")
+                            .font(.caption)
+                        HStack {
+                            Button("Choose Icon…") { chooseIcon() }
+                            Button("Use Parallels Icon") { server.customIconPath = nil }
+                        }
+                    }
+                }
+                if let iconError { Text(iconError).font(.caption).foregroundStyle(.red) }
+                TextField("Parallels VM name", text: $server.vmName)
+                TextField("IP address / host", text: $server.host)
+                TextField("SSH user", text: $server.sshUser)
+                TextField("SSH port", value: $server.sshPort, format: .number)
+                TextField("SSH identity file (optional)", text: $server.sshIdentityFile, prompt: Text("~/.ssh/id_ed25519"))
+                TextField("Mailpit port (optional)", text: Binding(get: { server.mailpitPort.map(String.init) ?? "" }, set: { server.mailpitPort = Int($0) }))
+            }
+            HStack { Spacer(); Button("Cancel") { dismiss() }; Button("Save") { save(server, isNew); dismiss() }.keyboardShortcut(.defaultAction).disabled(server.name.isEmpty || server.vmName.isEmpty || server.sshPort < 1 || server.sshPort > 65535) }
+        }.padding(20).frame(width: 470)
+    }
+
+    private func chooseIcon() {
+        let panel = NSOpenPanel()
+        panel.allowedContentTypes = [.png, .jpeg, .tiff, .icns, .heic]
+        panel.allowsMultipleSelection = false
+        panel.canChooseDirectories = false
+        guard panel.runModal() == .OK, let source = panel.url else { return }
+        do {
+            let folder = FileManager.default.homeDirectoryForCurrentUser
+                .appendingPathComponent("Library/Application Support/OrionToolbar/Icons", isDirectory: true)
+            try FileManager.default.createDirectory(at: folder, withIntermediateDirectories: true)
+            let destination = folder.appendingPathComponent("\(server.id.uuidString).\(source.pathExtension)")
+            if FileManager.default.fileExists(atPath: destination.path) {
+                try FileManager.default.removeItem(at: destination)
+            }
+            try FileManager.default.copyItem(at: source, to: destination)
+            server.customIconPath = destination.path
+            iconError = nil
+        } catch {
+            iconError = error.localizedDescription
+        }
+    }
+}
diff --git a/patches/oriontoolbar_icons_reorder_fix.py b/patches/oriontoolbar_icons_reorder_fix.py
new file mode 100644
index 0000000..5e2ecea
--- /dev/null
+++ b/patches/oriontoolbar_icons_reorder_fix.py
@@ -0,0 +1,159 @@
+#!/usr/bin/env python3
+"""OrionToolbar: fix Parallels VM Home parsing, icon discovery, and drag reordering."""
+from pathlib import Path
+from datetime import datetime
+import re, shutil
+
+root=Path.cwd()
+paths={k:root/'OrionToolbar'/k for k in ('OrionVMController.swift','SettingsView.swift','OrionMenuView.swift')}
+for p in paths.values():
+    if not p.is_file(): raise SystemExit(f'Missing {p}. Run from project root.')
+c=paths['OrionVMController.swift'].read_text()
+s=paths['SettingsView.swift'].read_text()
+m=paths['OrionMenuView.swift'].read_text()
+if 'func reorderServer(draggedID:' in c:
+    raise SystemExit('This patch has already been applied.')
+
+# Home ends in a slash on this installation. Existing regex expects .pvm followed by whitespace,
+# so it fails to capture /Volumes/Parallels/Ubuntu Linux Server.pvm/.
+start=c.find('                    let pattern = #"(?m)^')
+if start<0: raise SystemExit('Cannot locate existing Home path regex. No changes made.')
+end=c.find('\n                }',start)
+if end<0: raise SystemExit('Cannot locate end of Home parser. No changes made.')
+old=c[start:end]
+if 'Home:' not in old or 'bundlePath' not in old:
+    raise SystemExit('Unexpected Home parser; no changes made.')
+new='''                    // prlctl prints `Home: /Volumes/Parallels/VM.pvm/` (trailing slash).
+                    // Match the full line, then normalize the bundle path.
+                    if let homeLine = detail.split(separator: "\\n").first(where: {
+                        $0.trimmingCharacters(in: .whitespaces).hasPrefix("Home:")
+                    }) {
+                        let raw = homeLine.trimmingCharacters(in: .whitespaces)
+                            .replacingOccurrences(of: "Home:", with: "", range: rawHomePrefixRange(homeLine))
+                            .trimmingCharacters(in: .whitespacesAndNewlines)
+                            .trimmingCharacters(in: CharacterSet(charactersIn: "\\\"'"))
+                        let path = (raw as NSString).expandingTildeInPath
+                            .trimmingCharacters(in: CharacterSet(charactersIn: "/"))
+                        if FileManager.default.fileExists(atPath: "/" + path) {
+                            discoveredVMs[i].bundlePath = "/" + path
+                        }
+                    }'''
+# Simpler and safe without helper: strip Home: prefix using dropFirst(5).
+new='''                    // `Home:` ends with .pvm/ on this Parallels installation.
+                    if let homeLine = detail.split(separator: "\\n").first(where: {
+                        $0.trimmingCharacters(in: .whitespaces).hasPrefix("Home:")
+                    }) {
+                        let trimmed = homeLine.trimmingCharacters(in: .whitespaces)
+                        let raw = String(trimmed.dropFirst("Home:".count))
+                            .trimmingCharacters(in: .whitespacesAndNewlines)
+                            .trimmingCharacters(in: CharacterSet(charactersIn: "\\\"'"))
+                        let expanded = (raw as NSString).expandingTildeInPath
+                        let normalized = (expanded as NSString).standardizingPath
+                        if FileManager.default.fileExists(atPath: normalized) {
+                            discoveredVMs[i].bundlePath = normalized
+                        }
+                    }'''
+c=c[:start]+new+c[end:]
+
+# Real VM icon files are sometimes inside the .pvm package. Fall back to macOS package icon.
+a=c.find('    func icon(for machine: ParallelsVM) -> NSImage? {')
+b=c.find('    func status(for server: ServerDefinition)',a)
+if a<0 or b<0: raise SystemExit('Cannot locate VM icon function. No changes made.')
+c=c[:a]+'''    func icon(for machine: ParallelsVM) -> NSImage? {
+        guard let path = machine.bundlePath,
+              FileManager.default.fileExists(atPath: path) else { return nil }
+        let bundle = URL(fileURLWithPath: path, isDirectory: true)
+        // Prefer a VM-specific icon if the Parallels bundle contains one.
+        for name in ["icon.png", "Icon.png", "icon.icns", "Icon.icns",
+                     ".VolumeIcon.icns", "icon.tiff", "Icon.tiff"] {
+            if let image = NSImage(contentsOf: bundle.appendingPathComponent(name)) {
+                return image
+            }
+        }
+        // This is the same package icon Finder shows for the Parallels VM.
+        return NSWorkspace.shared.icon(forFile: path)
+    }
+
+'''+c[b:]
+
+anchor='    func icon(for server: ServerDefinition) -> NSImage? {'
+if anchor not in c: raise SystemExit('Cannot locate server icon function. No changes made.')
+c=c.replace(anchor,'''    func reorderServer(draggedID: UUID, onto targetID: UUID) {
+        guard draggedID != targetID,
+              let from = servers.firstIndex(where: { $0.id == draggedID }),
+              let to = servers.firstIndex(where: { $0.id == targetID }) else { return }
+        let moved = servers.remove(at: from)
+        servers.insert(moved, at: to) // @Published didSet persists the order.
+    }
+
+'''+anchor,1)
+
+# Make Settings rows draggable. Avoid editing window presentation.
+pattern=r'(\s*Text\(s\.name\)\n\s*\}\n\s*\.contentShape\(Rectangle\(\)\)\n\s*\.onTapGesture \{ selection = s\.id \}\n)(\s*\.tag\(s\.id\))'
+match=re.search(pattern,s)
+if not match: raise SystemExit('Cannot locate Settings server list row. No changes made.')
+replacement=match.group(1)+'''                    .draggable(s.id.uuidString)
+                    .dropDestination(for: String.self) { items, _ in
+                        guard let value = items.first,
+                              let id = UUID(uuidString: value) else { return false }
+                        vm.reorderServer(draggedID: id, onto: s.id)
+                        return true
+                    }
+'''+match.group(2)
+s=s[:match.start()]+replacement+s[match.end():]
+# Add visible drag affordance next to the name.
+s=s.replace('''                        Text(s.name)
+                    }''','''                        Text(s.name)
+                        Spacer(minLength: 0)
+                        Image(systemName: "line.3.horizontal")
+                            .foregroundStyle(.secondary)
+                            .help("Drag to reorder servers")
+                    }''',1)
+
+# Show custom server icons in dashboard, and enable drag/drop integrated rows.
+old='''            if let machine { icon(machine) }
+            else { Image(systemName: "server.rack").frame(width: 36, height: 36).foregroundStyle(.cyan) }'''
+if old not in m: raise SystemExit('Cannot locate integrated dashboard icon. No changes made.')
+m=m.replace(old,'''            Group {
+                if let image = vm.icon(for: server) {
+                    Image(nsImage: image).resizable().scaledToFit()
+                } else if let machine {
+                    icon(machine)
+                } else {
+                    Image(systemName: "server.rack").foregroundStyle(.cyan)
+                }
+            }.frame(width: 36, height: 36)''',1)
+name='''            Text(server.name).font(.system(size: 12, weight: .semibold)).lineLimit(1).frame(width: 185, alignment: .leading)'''
+if name not in m: raise SystemExit('Cannot locate integrated server name. No changes made.')
+m=m.replace(name,'''            HStack(spacing: 5) {
+                Image(systemName: "line.3.horizontal").foregroundStyle(OrionStyle.muted)
+                Text(server.name).lineLimit(1)
+            }
+            .font(.system(size: 12, weight: .semibold))
+            .frame(width: 185, alignment: .leading)
+            .draggable(server.id.uuidString)''',1)
+needle='''        .background(OrionStyle.card.opacity(0.75), in: RoundedRectangle(cornerRadius: 10))
+    }
+
+    private func action(_ title: String'''
+if needle not in m: raise SystemExit('Cannot locate end of integrated row. No changes made.')
+m=m.replace(needle,'''        .background(OrionStyle.card.opacity(0.75), in: RoundedRectangle(cornerRadius: 10))
+        .dropDestination(for: String.self) { items, _ in
+            guard let value = items.first,
+                  let id = UUID(uuidString: value) else { return false }
+            vm.reorderServer(draggedID: id, onto: server.id)
+            return true
+        }
+    }
+
+    private func action(_ title: String''',1)
+
+backup=root/'backups'/datetime.now().strftime('%Y%m%d-%H%M%S-%f')
+for key,path in paths.items():
+    dest=backup/path.relative_to(root)
+    dest.parent.mkdir(parents=True,exist_ok=True)
+    shutil.copy2(path,dest)
+for key,contents in [('OrionVMController.swift',c),('SettingsView.swift',s),('OrionMenuView.swift',m)]:
+    paths[key].write_text(contents)
+print('Updated controller, Settings and integrated dashboard. Backups:',backup)
+print('Run: /bin/zsh scripts/build.sh --launch')
diff --git a/patches/oriontoolbar_reorder_icons_final.py b/patches/oriontoolbar_reorder_icons_final.py
new file mode 100644
index 0000000..efcefa3
--- /dev/null
+++ b/patches/oriontoolbar_reorder_icons_final.py
@@ -0,0 +1,129 @@
+#!/usr/bin/env python3
+"""Repair server ordering and use Parallels VM.app icons (not generic .pvm icons)."""
+from pathlib import Path
+from datetime import datetime
+import shutil
+
+root = Path.cwd()
+paths = [root / 'OrionToolbar' / x for x in ('SettingsView.swift','OrionVMController.swift','OrionMenuView.swift')]
+if any(not p.is_file() for p in paths):
+    raise SystemExit('Run this patch from the OrionToolbar project root.')
+s, c, m = (p.read_text() for p in paths)
+if 'ORION_REORDER_ICONS_V3' in s:
+    raise SystemExit('Patch already installed.')
+
+# Replace the List's drag-reordering area. List selection/onMove intercepts drag gestures.
+start = s.find('            List(selection: $selection) { ForEach(vm.servers)')
+end = s.find('            Divider()', start)
+if start < 0 or end < 0:
+    raise SystemExit('Settings list differs from expected source; no changes made.')
+replacement = '''            // ORION_REORDER_ICONS_V3: explicit drop targets; no List/onMove interception.
+            ScrollView {
+                LazyVStack(spacing: 3) {
+                    ForEach(vm.servers) { server in
+                        HStack(spacing: 8) {
+                            Image(systemName: "line.3.horizontal")
+                                .foregroundStyle(.secondary)
+                                .help("Drag this server to reorder")
+                            Group {
+                                if let image = vm.icon(for: server) {
+                                    Image(nsImage: image).resizable().scaledToFit()
+                                } else {
+                                    Image(systemName: "server.rack")
+                                }
+                            }.frame(width: 23, height: 23)
+                            Text(server.name).lineLimit(1)
+                            Spacer(minLength: 0)
+                        }
+                        .padding(.horizontal, 9)
+                        .padding(.vertical, 9)
+                        .frame(maxWidth: .infinity, alignment: .leading)
+                        .background(selection == server.id ? Color.accentColor.opacity(0.3) : Color.clear,
+                                    in: RoundedRectangle(cornerRadius: 7))
+                        .contentShape(Rectangle())
+                        .onTapGesture { selection = server.id }
+                        .draggable(server.id.uuidString)
+                        .dropDestination(for: String.self) { values, _ in
+                            guard let first = values.first,
+                                  let dragged = UUID(uuidString: first),
+                                  dragged != server.id else { return false }
+                            vm.reorderServer(draggedID: dragged, onto: server.id)
+                            return true
+                        }
+                    }
+                }
+                .padding(6)
+            }
+            .frame(width: 220)
+'''
+s = s[:start] + replacement + s[end:]
+s = s.replace('}.frame(width: 650, height: 380)', '}.frame(width: 730, height: 420)', 1)
+
+# Avoid generic .pvm icon. Parallels creates a VM.app inside each bundle; use its
+# CFBundleIconFile/CFBundleIconName, or its app icon. If no VM-specific icon exists,
+# use an OS-specific symbol in the UI instead of the generic Parallels package icon.
+start = c.find('    func icon(for machine: ParallelsVM) -> NSImage? {')
+end = c.find('    func status(for server: ServerDefinition)', start)
+if start < 0 or end < 0:
+    raise SystemExit('Controller icon function differs; no changes made.')
+new_icon = '''    func icon(for machine: ParallelsVM) -> NSImage? {
+        guard let path = machine.bundlePath,
+              FileManager.default.fileExists(atPath: path) else { return nil }
+        let bundle = URL(fileURLWithPath: path, isDirectory: true)
+
+        // Parallels stores the per-VM application under <VM>.pvm/VM.app.
+        // The .pvm Finder icon itself is generic and must not be used.
+        let app = bundle.appendingPathComponent("VM.app", isDirectory: true)
+        let plist = app.appendingPathComponent("Contents/Info.plist")
+        if let info = NSDictionary(contentsOf: plist) as? [String: Any] {
+            let resourceDir = app.appendingPathComponent("Contents/Resources", isDirectory: true)
+            for key in ["CFBundleIconFile", "CFBundleIconName"] {
+                if let name = info[key] as? String, !name.isEmpty {
+                    let names = name.lowercased().hasSuffix(".icns") ? [name] : [name + ".icns", name]
+                    for candidate in names {
+                        if let image = NSImage(contentsOf: resourceDir.appendingPathComponent(candidate)) {
+                            return image
+                        }
+                    }
+                }
+            }
+        }
+        for name in ["icon.png", "Icon.png", "icon.icns", "Icon.icns", ".VolumeIcon.icns"] {
+            if let image = NSImage(contentsOf: bundle.appendingPathComponent(name)) { return image }
+        }
+        // Never return NSWorkspace.icon(forFile: path): it is the generic .pvm icon.
+        return nil
+    }
+
+'''
+c = c[:start] + new_icon + c[end:]
+
+# Improve OS-specific fallback when Parallels provides no usable per-VM artwork.
+needle = '''Image(systemName: machine.operatingSystem == "Windows" ? "desktopcomputer" : "server.rack")'''
+if needle not in m:
+    raise SystemExit('Dashboard VM fallback differs; no changes made.')
+m = m.replace(needle, '''Image(systemName: machine.operatingSystem == "Windows" ? "desktopcomputer" : "server.rack")''', 1)
+
+# In integrated rows, show OS fallback when Parallels icon missing, not generic rack alone.
+needle = '''                } else if let machine {
+                    icon(machine)
+                } else {'''
+if needle not in m:
+    raise SystemExit('Integrated icon view differs; no changes made.')
+# icon(machine) already implements OS-colored fallback.
+
+# The existing dashboard drag handlers are installed, but on drop they may be
+# disabled when a VM is busy. Keep the control separate from action disabling.
+# Add unmistakable move controls in Settings, already present in user source.
+
+backup_root = root / 'backups' / datetime.now().strftime('%Y%m%d-%H%M%S-%f')
+for p in paths:
+    dest = backup_root / p.relative_to(root)
+    dest.parent.mkdir(parents=True, exist_ok=True)
+    shutil.copy2(p, dest)
+for p, value in zip(paths, (s,c,m)):
+    if p.name != 'OrionMenuView.swift':
+        p.write_text(value)
+print('Updated SettingsView.swift and OrionVMController.swift')
+print('Backup:', backup_root)
+print('No Settings presenter or window management code modified.')