bump for 0.249 hotfix

0.259 update, add UI support for Mac PDS slot
version bump
2026-04-24 10:16:45 +00:00 · 2023-10-03 11:23:31 -04:00 · 2023-09-29 18:16:37 -04:00 · 2023-09-01 20:27:52 -04:00 · 2023-08-31 20:04:34 -04:00 · 2023-08-31 18:40:25 -04:00
166 changed files with 118900 additions and 8735 deletions
@@ -1,6 +1,9 @@
 dist
 embedded/mame64
 embedded/SDL2.framework
+embedded/Sparkle.framework
+embedded/Sparkle-*
+embedded/SDL2-*
 build
 embedded/mame-data.tgz
 __pycache__
@@ -64,8 +64,28 @@
 		B6152B5B25F5B57E00605E6E /* Media.m in Sources */ = {isa = PBXBuildFile; fileRef = B6152B5925F5B57E00605E6E /* Media.m */; };
 		B615A99F26640940001FBF99 /* SlotView.xib in Resources */ = {isa = PBXBuildFile; fileRef = B6E9A18125088B36005E7525 /* SlotView.xib */; };
 		B615A9A026640A70001FBF99 /* SlotViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = B6E9A17F25088B1B005E7525 /* SlotViewController.m */; };
+		B618B8C42729F6690045C2D8 /* laser128o.plist in Resources */ = {isa = PBXBuildFile; fileRef = B618B8C32729F6690045C2D8 /* laser128o.plist */; };
+		B618B8C52729F6690045C2D8 /* laser128o.plist in Resources */ = {isa = PBXBuildFile; fileRef = B618B8C32729F6690045C2D8 /* laser128o.plist */; };
+		B622BAD72AA1615700CCB38C /* macqd605.plist in Resources */ = {isa = PBXBuildFile; fileRef = B622BAD62AA1615700CCB38C /* macqd605.plist */; };
+		B622BAD82AA1615700CCB38C /* macqd605.plist in Resources */ = {isa = PBXBuildFile; fileRef = B622BAD62AA1615700CCB38C /* macqd605.plist */; };
+		B622BADA2AA1615D00CCB38C /* macqd630.plist in Resources */ = {isa = PBXBuildFile; fileRef = B622BAD92AA1615D00CCB38C /* macqd630.plist */; };
+		B622BADB2AA1615D00CCB38C /* macqd630.plist in Resources */ = {isa = PBXBuildFile; fileRef = B622BAD92AA1615D00CCB38C /* macqd630.plist */; };
+		B622BADE2AA1618000CCB38C /* maclc580.plist in Resources */ = {isa = PBXBuildFile; fileRef = B622BADC2AA1617F00CCB38C /* maclc580.plist */; };
+		B622BADF2AA1618000CCB38C /* maclc580.plist in Resources */ = {isa = PBXBuildFile; fileRef = B622BADC2AA1617F00CCB38C /* maclc580.plist */; };
+		B622BAE02AA1618000CCB38C /* maclc575.plist in Resources */ = {isa = PBXBuildFile; fileRef = B622BADD2AA1617F00CCB38C /* maclc575.plist */; };
+		B622BAE12AA1618000CCB38C /* maclc575.plist in Resources */ = {isa = PBXBuildFile; fileRef = B622BADD2AA1617F00CCB38C /* maclc575.plist */; };
+		B622BAE32AA1619F00CCB38C /* maclc475.plist in Resources */ = {isa = PBXBuildFile; fileRef = B622BAE22AA1619F00CCB38C /* maclc475.plist */; };
+		B622BAE42AA1619F00CCB38C /* maclc475.plist in Resources */ = {isa = PBXBuildFile; fileRef = B622BAE22AA1619F00CCB38C /* maclc475.plist */; };
 		B63005332666D6940014C381 /* BookmarkManager.m in Sources */ = {isa = PBXBuildFile; fileRef = B63005322666D6940014C381 /* BookmarkManager.m */; };
 		B63005342666D6940014C381 /* BookmarkManager.m in Sources */ = {isa = PBXBuildFile; fileRef = B63005322666D6940014C381 /* BookmarkManager.m */; };
+		B6301BE429107BE800495022 /* maclc520.plist in Resources */ = {isa = PBXBuildFile; fileRef = B6301BE329107BE800495022 /* maclc520.plist */; };
+		B6301BE529107BE800495022 /* maclc520.plist in Resources */ = {isa = PBXBuildFile; fileRef = B6301BE329107BE800495022 /* maclc520.plist */; };
+		B6301BE729107C1E00495022 /* maccclas.plist in Resources */ = {isa = PBXBuildFile; fileRef = B6301BE629107C1E00495022 /* maccclas.plist */; };
+		B6301BE829107C1E00495022 /* maccclas.plist in Resources */ = {isa = PBXBuildFile; fileRef = B6301BE629107C1E00495022 /* maccclas.plist */; };
+		B635C09A26784A1200B23BFD /* Sparkle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B635C09926784A1200B23BFD /* Sparkle.framework */; };
+		B635C09B26784A1200B23BFD /* Sparkle.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = B635C09926784A1200B23BFD /* Sparkle.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
+		B635C09D26784A4800B23BFD /* Sparkle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B635C09C26784A4800B23BFD /* Sparkle.framework */; };
+		B635C09F26784D4700B23BFD /* AmpleLite.m in Sources */ = {isa = PBXBuildFile; fileRef = B635C09E26784D4700B23BFD /* AmpleLite.m */; };
 		B6374AC4260EBBCF0045CA16 /* pty_shell.c in Sources */ = {isa = PBXBuildFile; fileRef = B6374AB6260EBB970045CA16 /* pty_shell.c */; };
 		B6374AC5260EBC5A0045CA16 /* pty_shell in CopyFiles */ = {isa = PBXBuildFile; fileRef = B6374ABD260EBBC90045CA16 /* pty_shell */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
 		B6374AD1260ECB400045CA16 /* macclas2.plist in Resources */ = {isa = PBXBuildFile; fileRef = B6374AC9260ECB3F0045CA16 /* macclas2.plist */; };
@@ -114,6 +134,8 @@
 		B63C1F1025B1447C0016A611 /* CheatSheetWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = B63C1F0E25B1447C0016A611 /* CheatSheetWindowController.m */; };
 		B63C1F1225B147E10016A611 /* CheatSheet.html in Resources */ = {isa = PBXBuildFile; fileRef = B63C1F1125B147E10016A611 /* CheatSheet.html */; };
 		B63C1F1325B147E10016A611 /* CheatSheet.html in Resources */ = {isa = PBXBuildFile; fileRef = B63C1F1125B147E10016A611 /* CheatSheet.html */; };
+		B63E57E22755AF2000F8B5D1 /* ace500.plist in Resources */ = {isa = PBXBuildFile; fileRef = B63E57E12755AF1F00F8B5D1 /* ace500.plist */; };
+		B63E57E32755AF2000F8B5D1 /* ace500.plist in Resources */ = {isa = PBXBuildFile; fileRef = B63E57E12755AF1F00F8B5D1 /* ace500.plist */; };
 		B646D10B263A5DF30014C586 /* ace1000.plist in Resources */ = {isa = PBXBuildFile; fileRef = B646D10A263A5DF20014C586 /* ace1000.plist */; };
 		B646D10C263A5DF30014C586 /* ace1000.plist in Resources */ = {isa = PBXBuildFile; fileRef = B646D10A263A5DF20014C586 /* ace1000.plist */; };
 		B64979C224EF6703008ABD20 /* MediaViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = B64979C124EF6703008ABD20 /* MediaViewController.m */; };
@@ -133,6 +155,10 @@
 		B65085BE25B616AC00354EC9 /* maciici.plist in Resources */ = {isa = PBXBuildFile; fileRef = B65085B825B616AC00354EC9 /* maciici.plist */; };
 		B65D718625E70BD5008C5F87 /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B65D718525E70BD5008C5F87 /* WebKit.framework */; };
 		B65D718725E70BE5008C5F87 /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B65D718525E70BD5008C5F87 /* WebKit.framework */; };
+		B66116852A2535EF0038A3E2 /* st.plist in Resources */ = {isa = PBXBuildFile; fileRef = B66116842A2535EF0038A3E2 /* st.plist */; };
+		B66116862A2535EF0038A3E2 /* st.plist in Resources */ = {isa = PBXBuildFile; fileRef = B66116842A2535EF0038A3E2 /* st.plist */; };
+		B66116882A2535F60038A3E2 /* megast.plist in Resources */ = {isa = PBXBuildFile; fileRef = B66116872A2535F50038A3E2 /* megast.plist */; };
+		B66116892A2535F60038A3E2 /* megast.plist in Resources */ = {isa = PBXBuildFile; fileRef = B66116872A2535F50038A3E2 /* megast.plist */; };
 		B66236A924FD9A34006CABD7 /* PreferencesWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = B66236A824FD9A34006CABD7 /* PreferencesWindowController.m */; };
 		B66236B524FDA527006CABD7 /* SDL2.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = B66236B224FDA522006CABD7 /* SDL2.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		B66236C124FDB7A6006CABD7 /* Credits.rtf in Resources */ = {isa = PBXBuildFile; fileRef = B66236BF24FDB7A6006CABD7 /* Credits.rtf */; };
@@ -145,8 +171,30 @@
 		B6841BD7251EC926006A5C39 /* vmnet_helper.c in Sources */ = {isa = PBXBuildFile; fileRef = B6841BCA251EC88E006A5C39 /* vmnet_helper.c */; };
 		B6841BDA251ECB1C006A5C39 /* mame64 in CopyFiles */ = {isa = PBXBuildFile; fileRef = B66236B824FDA698006CABD7 /* mame64 */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
 		B6841BDE251ECC29006A5C39 /* vmnet.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B6841BDD251ECC29006A5C39 /* vmnet.framework */; };
+		B68A899026BE18E000B2C8C6 /* MidiManager.m in Sources */ = {isa = PBXBuildFile; fileRef = B68A898F26BE18E000B2C8C6 /* MidiManager.m */; };
+		B68A899126BE18E000B2C8C6 /* MidiManager.m in Sources */ = {isa = PBXBuildFile; fileRef = B68A898F26BE18E000B2C8C6 /* MidiManager.m */; };
+		B68A899426BF124B00B2C8C6 /* CoreMIDI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B68A899326BF124B00B2C8C6 /* CoreMIDI.framework */; };
+		B68A899526BF12A600B2C8C6 /* CoreMIDI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B68A899326BF124B00B2C8C6 /* CoreMIDI.framework */; };
+		B6939C1A2A747B790025D891 /* macqd800.plist in Resources */ = {isa = PBXBuildFile; fileRef = B6939C162A747B790025D891 /* macqd800.plist */; };
+		B6939C1B2A747B790025D891 /* macqd800.plist in Resources */ = {isa = PBXBuildFile; fileRef = B6939C162A747B790025D891 /* macqd800.plist */; };
+		B6939C1C2A747B790025D891 /* macqd610.plist in Resources */ = {isa = PBXBuildFile; fileRef = B6939C172A747B790025D891 /* macqd610.plist */; };
+		B6939C1D2A747B790025D891 /* macqd610.plist in Resources */ = {isa = PBXBuildFile; fileRef = B6939C172A747B790025D891 /* macqd610.plist */; };
+		B6939C1E2A747B790025D891 /* macqd700.plist in Resources */ = {isa = PBXBuildFile; fileRef = B6939C182A747B790025D891 /* macqd700.plist */; };
+		B6939C1F2A747B790025D891 /* macqd700.plist in Resources */ = {isa = PBXBuildFile; fileRef = B6939C182A747B790025D891 /* macqd700.plist */; };
+		B6939C202A747B790025D891 /* macqd650.plist in Resources */ = {isa = PBXBuildFile; fileRef = B6939C192A747B790025D891 /* macqd650.plist */; };
+		B6939C212A747B790025D891 /* macqd650.plist in Resources */ = {isa = PBXBuildFile; fileRef = B6939C192A747B790025D891 /* macqd650.plist */; };
+		B6939C232A747B950025D891 /* maclc550.plist in Resources */ = {isa = PBXBuildFile; fileRef = B6939C222A747B950025D891 /* maclc550.plist */; };
+		B6939C242A747B950025D891 /* maclc550.plist in Resources */ = {isa = PBXBuildFile; fileRef = B6939C222A747B950025D891 /* maclc550.plist */; };
+		B6939C262A747BA30025D891 /* maclc3p.plist in Resources */ = {isa = PBXBuildFile; fileRef = B6939C252A747BA30025D891 /* maclc3p.plist */; };
+		B6939C272A747BA30025D891 /* maclc3p.plist in Resources */ = {isa = PBXBuildFile; fileRef = B6939C252A747BA30025D891 /* maclc3p.plist */; };
+		B6939C2A2A747BBF0025D891 /* macct650.plist in Resources */ = {isa = PBXBuildFile; fileRef = B6939C282A747BBE0025D891 /* macct650.plist */; };
+		B6939C2B2A747BBF0025D891 /* macct650.plist in Resources */ = {isa = PBXBuildFile; fileRef = B6939C282A747BBE0025D891 /* macct650.plist */; };
+		B6939C2C2A747BBF0025D891 /* macct610.plist in Resources */ = {isa = PBXBuildFile; fileRef = B6939C292A747BBE0025D891 /* macct610.plist */; };
+		B6939C2D2A747BBF0025D891 /* macct610.plist in Resources */ = {isa = PBXBuildFile; fileRef = B6939C292A747BBE0025D891 /* macct610.plist */; };
 		B6A1A1942528EB1700DB0FD7 /* Menu.m in Sources */ = {isa = PBXBuildFile; fileRef = B6A1A1932528EB1700DB0FD7 /* Menu.m */; };
 		B6A1A1952528EB1700DB0FD7 /* Menu.m in Sources */ = {isa = PBXBuildFile; fileRef = B6A1A1932528EB1700DB0FD7 /* Menu.m */; };
+		B6ABF47C275986EB00DC3D48 /* ace2200.plist in Resources */ = {isa = PBXBuildFile; fileRef = B6ABF47B275986EA00DC3D48 /* ace2200.plist */; };
+		B6ABF47D275986EB00DC3D48 /* ace2200.plist in Resources */ = {isa = PBXBuildFile; fileRef = B6ABF47B275986EA00DC3D48 /* ace2200.plist */; };
 		B6B9EA662506A5550080E70D /* EjectButton.m in Sources */ = {isa = PBXBuildFile; fileRef = B6B9EA642506A5550080E70D /* EjectButton.m */; };
 		B6B9EA672506A5550080E70D /* EjectButton.m in Sources */ = {isa = PBXBuildFile; fileRef = B6B9EA642506A5550080E70D /* EjectButton.m */; };
 		B6BA258024E99BE9005FB8FF /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = B6BA257F24E99BE9005FB8FF /* AppDelegate.m */; };
@@ -259,12 +307,28 @@
 		B6E4B5F024FDE2670094A35C /* apple2jp.plist in Resources */ = {isa = PBXBuildFile; fileRef = B61099F224F5F36F005CB652 /* apple2jp.plist */; };
 		B6E4B5F124FDE2670094A35C /* apple2.plist in Resources */ = {isa = PBXBuildFile; fileRef = B6109A0324F5F371005CB652 /* apple2.plist */; };
 		B6E4B5F224FDE2670094A35C /* prav8m.plist in Resources */ = {isa = PBXBuildFile; fileRef = B6109A0024F5F371005CB652 /* prav8m.plist */; };
+		B6E6DCEB27AEE15F00E0A76E /* Ample.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = B6E6DCE927AEE15F00E0A76E /* Ample.xcdatamodeld */; };
+		B6E6DCEC27AEE15F00E0A76E /* Ample.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = B6E6DCE927AEE15F00E0A76E /* Ample.xcdatamodeld */; };
+		B6E6DCF727B0873200E0A76E /* BookmarkWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = B6E6DCF527B0873100E0A76E /* BookmarkWindow.xib */; };
+		B6E6DCF827B0873200E0A76E /* BookmarkWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = B6E6DCF527B0873100E0A76E /* BookmarkWindow.xib */; };
+		B6E6DCFB27B0A09300E0A76E /* BookmarkWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = B6E6DCFA27B0A09300E0A76E /* BookmarkWindowController.m */; };
+		B6E6DCFC27B0A09300E0A76E /* BookmarkWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = B6E6DCFA27B0A09300E0A76E /* BookmarkWindowController.m */; };
+		B6E6DD0127B0D17C00E0A76E /* Bookmark+CoreDataClass.m in Sources */ = {isa = PBXBuildFile; fileRef = B6E6DCFF27B0D17C00E0A76E /* Bookmark+CoreDataClass.m */; };
+		B6E6DD0227B0D17C00E0A76E /* Bookmark+CoreDataClass.m in Sources */ = {isa = PBXBuildFile; fileRef = B6E6DCFF27B0D17C00E0A76E /* Bookmark+CoreDataClass.m */; };
+		B6E6DD0327B0D17C00E0A76E /* Bookmark+CoreDataProperties.m in Sources */ = {isa = PBXBuildFile; fileRef = B6E6DD0027B0D17C00E0A76E /* Bookmark+CoreDataProperties.m */; };
+		B6E6DD0427B0D17C00E0A76E /* Bookmark+CoreDataProperties.m in Sources */ = {isa = PBXBuildFile; fileRef = B6E6DD0027B0D17C00E0A76E /* Bookmark+CoreDataProperties.m */; };
+		B6E6DD1327B1D71700E0A76E /* DiskImage+CoreDataClass.m in Sources */ = {isa = PBXBuildFile; fileRef = B6E6DD1127B1D71700E0A76E /* DiskImage+CoreDataClass.m */; };
+		B6E6DD1427B1D71700E0A76E /* DiskImage+CoreDataClass.m in Sources */ = {isa = PBXBuildFile; fileRef = B6E6DD1127B1D71700E0A76E /* DiskImage+CoreDataClass.m */; };
+		B6E6DD1527B1D71700E0A76E /* DiskImage+CoreDataProperties.m in Sources */ = {isa = PBXBuildFile; fileRef = B6E6DD1227B1D71700E0A76E /* DiskImage+CoreDataProperties.m */; };
+		B6E6DD1627B1D71700E0A76E /* DiskImage+CoreDataProperties.m in Sources */ = {isa = PBXBuildFile; fileRef = B6E6DD1227B1D71700E0A76E /* DiskImage+CoreDataProperties.m */; };
 		B6E9A18025088B1B005E7525 /* SlotViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = B6E9A17F25088B1B005E7525 /* SlotViewController.m */; };
 		B6E9A18325088B36005E7525 /* SlotView.xib in Resources */ = {isa = PBXBuildFile; fileRef = B6E9A18125088B36005E7525 /* SlotView.xib */; };
 		B6F7B538266FDA5B00624C6B /* MachineView.xib in Resources */ = {isa = PBXBuildFile; fileRef = B6F7B536266FDA5B00624C6B /* MachineView.xib */; };
 		B6F7B539266FDA5B00624C6B /* MachineView.xib in Resources */ = {isa = PBXBuildFile; fileRef = B6F7B536266FDA5B00624C6B /* MachineView.xib */; };
 		B6F7B53C267017A200624C6B /* NewMachineViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = B6F7B53B267017A200624C6B /* NewMachineViewController.m */; };
 		B6F7B53D267017A200624C6B /* NewMachineViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = B6F7B53B267017A200624C6B /* NewMachineViewController.m */; };
+		B6FECAFB28C0093600E143DA /* las3000.plist in Resources */ = {isa = PBXBuildFile; fileRef = B6FECAFA28C0093600E143DA /* las3000.plist */; };
+		B6FECAFC28C0093600E143DA /* las3000.plist in Resources */ = {isa = PBXBuildFile; fileRef = B6FECAFA28C0093600E143DA /* las3000.plist */; };
 /* End PBXBuildFile section */

 /* Begin PBXCopyFilesBuildPhase section */
@@ -284,6 +348,7 @@
 			dstSubfolderSpec = 10;
 			files = (
 				B66236B524FDA527006CABD7 /* SDL2.framework in Embed Frameworks */,
+				B635C09B26784A1200B23BFD /* Sparkle.framework in Embed Frameworks */,
 			);
 			name = "Embed Frameworks";
 			runOnlyForDeploymentPostprocessing = 0;
@@ -375,12 +440,25 @@
 		B6109A1424F5F376005CB652 /* apple2cp.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = apple2cp.plist; sourceTree = "<group>"; };
 		B6109A1524F5F376005CB652 /* apple2p.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = apple2p.plist; sourceTree = "<group>"; };
 		B6109A1624F5F376005CB652 /* agat7.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = agat7.plist; sourceTree = "<group>"; };
+		B611BA392679489F008597B5 /* pty_shell.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = pty_shell.entitlements; sourceTree = "<group>"; };
+		B611BA3A267948B5008597B5 /* vmnet_helper.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = vmnet_helper.entitlements; sourceTree = "<group>"; };
 		B6152B5425F4549F00605E6E /* Slot.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Slot.h; sourceTree = "<group>"; };
 		B6152B5525F4549F00605E6E /* Slot.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = Slot.m; sourceTree = "<group>"; };
 		B6152B5825F5B4F100605E6E /* Media.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Media.h; sourceTree = "<group>"; };
 		B6152B5925F5B57E00605E6E /* Media.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = Media.m; sourceTree = "<group>"; };
+		B618B8C32729F6690045C2D8 /* laser128o.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = laser128o.plist; sourceTree = "<group>"; };
+		B622BAD62AA1615700CCB38C /* macqd605.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = macqd605.plist; sourceTree = "<group>"; };
+		B622BAD92AA1615D00CCB38C /* macqd630.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = macqd630.plist; sourceTree = "<group>"; };
+		B622BADC2AA1617F00CCB38C /* maclc580.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = maclc580.plist; sourceTree = "<group>"; };
+		B622BADD2AA1617F00CCB38C /* maclc575.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = maclc575.plist; sourceTree = "<group>"; };
+		B622BAE22AA1619F00CCB38C /* maclc475.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = maclc475.plist; sourceTree = "<group>"; };
 		B63005312666D6940014C381 /* BookmarkManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BookmarkManager.h; sourceTree = "<group>"; };
 		B63005322666D6940014C381 /* BookmarkManager.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = BookmarkManager.m; sourceTree = "<group>"; };
+		B6301BE329107BE800495022 /* maclc520.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = maclc520.plist; sourceTree = "<group>"; };
+		B6301BE629107C1E00495022 /* maccclas.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = maccclas.plist; sourceTree = "<group>"; };
+		B635C09926784A1200B23BFD /* Sparkle.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Sparkle.framework; path = embedded/Sparkle.framework; sourceTree = "<group>"; };
+		B635C09C26784A4800B23BFD /* Sparkle.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Sparkle.framework; path = embedded/Sparkle.framework; sourceTree = "<group>"; };
+		B635C09E26784D4700B23BFD /* AmpleLite.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AmpleLite.m; sourceTree = "<group>"; };
 		B6374AB6260EBB970045CA16 /* pty_shell.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = pty_shell.c; sourceTree = "<group>"; };
 		B6374ABD260EBBC90045CA16 /* pty_shell */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = pty_shell; sourceTree = BUILT_PRODUCTS_DIR; };
 		B6374AC9260ECB3F0045CA16 /* macclas2.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = macclas2.plist; sourceTree = "<group>"; };
@@ -410,6 +488,7 @@
 		B63C1F0D25B1447C0016A611 /* CheatSheetWindowController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CheatSheetWindowController.h; sourceTree = "<group>"; };
 		B63C1F0E25B1447C0016A611 /* CheatSheetWindowController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CheatSheetWindowController.m; sourceTree = "<group>"; };
 		B63C1F1125B147E10016A611 /* CheatSheet.html */ = {isa = PBXFileReference; lastKnownFileType = text.html; path = CheatSheet.html; sourceTree = "<group>"; };
+		B63E57E12755AF1F00F8B5D1 /* ace500.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = ace500.plist; sourceTree = "<group>"; };
 		B646D10A263A5DF20014C586 /* ace1000.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = ace1000.plist; sourceTree = "<group>"; };
 		B64979C024EF6703008ABD20 /* MediaViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MediaViewController.h; sourceTree = "<group>"; };
 		B64979C124EF6703008ABD20 /* MediaViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MediaViewController.m; sourceTree = "<group>"; };
@@ -426,6 +505,8 @@
 		B65085B725B616AC00354EC9 /* maclc3.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = maclc3.plist; sourceTree = "<group>"; };
 		B65085B825B616AC00354EC9 /* maciici.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = maciici.plist; sourceTree = "<group>"; };
 		B65D718525E70BD5008C5F87 /* WebKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = System/Library/Frameworks/WebKit.framework; sourceTree = SDKROOT; };
+		B66116842A2535EF0038A3E2 /* st.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = st.plist; sourceTree = "<group>"; };
+		B66116872A2535F50038A3E2 /* megast.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = megast.plist; sourceTree = "<group>"; };
 		B66236A724FD9A34006CABD7 /* PreferencesWindowController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PreferencesWindowController.h; sourceTree = "<group>"; };
 		B66236A824FD9A34006CABD7 /* PreferencesWindowController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PreferencesWindowController.m; sourceTree = "<group>"; };
 		B66236B224FDA522006CABD7 /* SDL2.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SDL2.framework; path = embedded/SDL2.framework; sourceTree = "<group>"; };
@@ -439,8 +520,20 @@
 		B6841BCA251EC88E006A5C39 /* vmnet_helper.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = vmnet_helper.c; sourceTree = "<group>"; };
 		B6841BD0251EC913006A5C39 /* vmnet_helper */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = vmnet_helper; sourceTree = BUILT_PRODUCTS_DIR; };
 		B6841BDD251ECC29006A5C39 /* vmnet.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = vmnet.framework; path = System/Library/Frameworks/vmnet.framework; sourceTree = SDKROOT; };
+		B68A898F26BE18E000B2C8C6 /* MidiManager.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MidiManager.m; sourceTree = "<group>"; };
+		B68A899226BE320200B2C8C6 /* MidiManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MidiManager.h; sourceTree = "<group>"; };
+		B68A899326BF124B00B2C8C6 /* CoreMIDI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMIDI.framework; path = System/Library/Frameworks/CoreMIDI.framework; sourceTree = SDKROOT; };
+		B6939C162A747B790025D891 /* macqd800.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = macqd800.plist; sourceTree = "<group>"; };
+		B6939C172A747B790025D891 /* macqd610.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = macqd610.plist; sourceTree = "<group>"; };
+		B6939C182A747B790025D891 /* macqd700.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = macqd700.plist; sourceTree = "<group>"; };
+		B6939C192A747B790025D891 /* macqd650.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = macqd650.plist; sourceTree = "<group>"; };
+		B6939C222A747B950025D891 /* maclc550.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = maclc550.plist; sourceTree = "<group>"; };
+		B6939C252A747BA30025D891 /* maclc3p.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = maclc3p.plist; sourceTree = "<group>"; };
+		B6939C282A747BBE0025D891 /* macct650.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = macct650.plist; sourceTree = "<group>"; };
+		B6939C292A747BBE0025D891 /* macct610.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = macct610.plist; sourceTree = "<group>"; };
 		B6A1A1932528EB1700DB0FD7 /* Menu.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = Menu.m; sourceTree = "<group>"; };
 		B6A1A1962528EB4600DB0FD7 /* Menu.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Menu.h; sourceTree = "<group>"; };
+		B6ABF47B275986EA00DC3D48 /* ace2200.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = ace2200.plist; sourceTree = "<group>"; };
 		B6B9EA642506A5550080E70D /* EjectButton.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EjectButton.m; sourceTree = "<group>"; };
 		B6B9EA652506A5550080E70D /* EjectButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EjectButton.h; sourceTree = "<group>"; };
 		B6BA257B24E99BE9005FB8FF /* Ample.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Ample.app; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -478,12 +571,27 @@
 		B6DE32422605482500418375 /* mac512k.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = mac512k.plist; sourceTree = "<group>"; };
 		B6DE32432605482500418375 /* macse.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = macse.plist; sourceTree = "<group>"; };
 		B6E4B5FA24FDE2670094A35C /* Ample Lite.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Ample Lite.app"; sourceTree = BUILT_PRODUCTS_DIR; };
+		B6E6DCEA27AEE15F00E0A76E /* Ample.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = Ample.xcdatamodel; sourceTree = "<group>"; };
+		B6E6DCF627B0873100E0A76E /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/BookmarkWindow.xib; sourceTree = "<group>"; };
+		B6E6DCF927B0A09300E0A76E /* BookmarkWindowController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BookmarkWindowController.h; sourceTree = "<group>"; };
+		B6E6DCFA27B0A09300E0A76E /* BookmarkWindowController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = BookmarkWindowController.m; sourceTree = "<group>"; };
+		B6E6DCFD27B0D17C00E0A76E /* Bookmark+CoreDataProperties.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Bookmark+CoreDataProperties.h"; sourceTree = "<group>"; };
+		B6E6DCFE27B0D17C00E0A76E /* Bookmark+CoreDataClass.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Bookmark+CoreDataClass.h"; sourceTree = "<group>"; };
+		B6E6DCFF27B0D17C00E0A76E /* Bookmark+CoreDataClass.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "Bookmark+CoreDataClass.m"; sourceTree = "<group>"; };
+		B6E6DD0027B0D17C00E0A76E /* Bookmark+CoreDataProperties.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "Bookmark+CoreDataProperties.m"; sourceTree = "<group>"; };
+		B6E6DD0E27B161C400E0A76E /* Bookmark.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = Bookmark.h; path = Ample/Bookmark.h; sourceTree = SOURCE_ROOT; };
+		B6E6DD0F27B1D71700E0A76E /* DiskImage+CoreDataProperties.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "DiskImage+CoreDataProperties.h"; sourceTree = "<group>"; };
+		B6E6DD1027B1D71700E0A76E /* DiskImage+CoreDataClass.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "DiskImage+CoreDataClass.h"; sourceTree = "<group>"; };
+		B6E6DD1127B1D71700E0A76E /* DiskImage+CoreDataClass.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "DiskImage+CoreDataClass.m"; sourceTree = "<group>"; };
+		B6E6DD1227B1D71700E0A76E /* DiskImage+CoreDataProperties.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "DiskImage+CoreDataProperties.m"; sourceTree = "<group>"; };
+		B6E6DD1727B1DF5F00E0A76E /* DiskImage.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DiskImage.h; sourceTree = "<group>"; };
 		B6E9A17E25088B1B005E7525 /* SlotViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SlotViewController.h; sourceTree = "<group>"; };
 		B6E9A17F25088B1B005E7525 /* SlotViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SlotViewController.m; sourceTree = "<group>"; };
 		B6E9A18225088B36005E7525 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/SlotView.xib; sourceTree = "<group>"; };
 		B6F7B537266FDA5B00624C6B /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/MachineView.xib; sourceTree = "<group>"; };
 		B6F7B53A267017A200624C6B /* NewMachineViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = NewMachineViewController.h; sourceTree = "<group>"; };
 		B6F7B53B267017A200624C6B /* NewMachineViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = NewMachineViewController.m; sourceTree = "<group>"; };
+		B6FECAFA28C0093600E143DA /* las3000.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = las3000.plist; sourceTree = "<group>"; };
 /* End PBXFileReference section */

 /* Begin PBXFrameworksBuildPhase section */
@@ -507,6 +615,9 @@
 			buildActionMask = 2147483647;
 			files = (
 				B65D718625E70BD5008C5F87 /* WebKit.framework in Frameworks */,
+				B635C09D26784A4800B23BFD /* Sparkle.framework in Frameworks */,
+				B68A899426BF124B00B2C8C6 /* CoreMIDI.framework in Frameworks */,
+				B635C09A26784A1200B23BFD /* Sparkle.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -514,6 +625,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				B68A899526BF12A600B2C8C6 /* CoreMIDI.framework in Frameworks */,
 				B65D718725E70BE5008C5F87 /* WebKit.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -524,6 +636,7 @@
 		B6374AB2260EBB970045CA16 /* pty_shell */ = {
 			isa = PBXGroup;
 			children = (
+				B611BA392679489F008597B5 /* pty_shell.entitlements */,
 				B6374AB6260EBB970045CA16 /* pty_shell.c */,
 			);
 			path = pty_shell;
@@ -540,7 +653,9 @@
 			isa = PBXGroup;
 			children = (
 				B6109A0824F5F373005CB652 /* ace100.plist */,
+				B63E57E12755AF1F00F8B5D1 /* ace500.plist */,
 				B646D10A263A5DF20014C586 /* ace1000.plist */,
+				B6ABF47B275986EA00DC3D48 /* ace2200.plist */,
 				B6109A1624F5F376005CB652 /* agat7.plist */,
 				B6109A1224F5F375005CB652 /* agat9.plist */,
 				B6109A1124F5F375005CB652 /* albert.plist */,
@@ -577,9 +692,48 @@
 				B61099EF24F5F36E005CB652 /* ivelultr.plist */,
 				B6109A0A24F5F373005CB652 /* las128e2.plist */,
 				B61099F724F5F36F005CB652 /* las128ex.plist */,
+				B6FECAFA28C0093600E143DA /* las3000.plist */,
 				B61099F824F5F36F005CB652 /* laser2c.plist */,
 				B6109A1024F5F375005CB652 /* laser128.plist */,
+				B618B8C32729F6690045C2D8 /* laser128o.plist */,
+				B6374AE2260ECDDD0045CA16 /* mac2fdhd.plist */,
+				B6DE323D2605482400418375 /* mac128k.plist */,
+				B6DE32422605482500418375 /* mac512k.plist */,
+				B6DE323F2605482400418375 /* mac512ke.plist */,
+				B6301BE629107C1E00495022 /* maccclas.plist */,
+				B6374AC9260ECB3F0045CA16 /* macclas2.plist */,
+				B6DE323E2605482400418375 /* macclasc.plist */,
+				B6939C292A747BBE0025D891 /* macct610.plist */,
+				B6939C282A747BBE0025D891 /* macct650.plist */,
+				B6374ACA260ECB3F0045CA16 /* macii.plist */,
+				B65085B825B616AC00354EC9 /* maciici.plist */,
+				B6374ACD260ECB3F0045CA16 /* maciicx.plist */,
+				B6374AE1260ECDDD0045CA16 /* maciihmu.plist */,
+				B6374ACB260ECB3F0045CA16 /* maciisi.plist */,
+				B6374ACC260ECB3F0045CA16 /* maciivi.plist */,
+				B6374ACF260ECB3F0045CA16 /* maciivx.plist */,
+				B6374ACE260ECB3F0045CA16 /* maciix.plist */,
+				B6DD1FE725B407E6004A3242 /* maclc.plist */,
+				B65085B625B616AC00354EC9 /* maclc2.plist */,
+				B65085B725B616AC00354EC9 /* maclc3.plist */,
+				B6939C252A747BA30025D891 /* maclc3p.plist */,
+				B622BAE22AA1619F00CCB38C /* maclc475.plist */,
+				B6301BE329107BE800495022 /* maclc520.plist */,
+				B6939C222A747B950025D891 /* maclc550.plist */,
+				B622BADD2AA1617F00CCB38C /* maclc575.plist */,
+				B622BADC2AA1617F00CCB38C /* maclc580.plist */,
+				B6DE32412605482500418375 /* macplus.plist */,
+				B622BAD62AA1615700CCB38C /* macqd605.plist */,
+				B6939C172A747B790025D891 /* macqd610.plist */,
+				B622BAD92AA1615D00CCB38C /* macqd630.plist */,
+				B6939C192A747B790025D891 /* macqd650.plist */,
+				B6939C182A747B790025D891 /* macqd700.plist */,
+				B6939C162A747B790025D891 /* macqd800.plist */,
+				B6DE32432605482500418375 /* macse.plist */,
+				B6374AD0260ECB400045CA16 /* macse30.plist */,
+				B6DE32402605482500418375 /* macsefd.plist */,
 				B6109A0B24F5F373005CB652 /* maxxi.plist */,
+				B66116872A2535F50038A3E2 /* megast.plist */,
 				B61099ED24F5F36E005CB652 /* microeng.plist */,
 				B61099F524F5F36F005CB652 /* models.plist */,
 				B61099F924F5F370005CB652 /* mprof3.plist */,
@@ -589,32 +743,12 @@
 				B63C1B8F250088DC00511A71 /* roms.plist */,
 				B61099F024F5F36E005CB652 /* space84.plist */,
 				B61099FF24F5F371005CB652 /* spectred.plist */,
+				B66116842A2535EF0038A3E2 /* st.plist */,
 				B6DE323225FE7BD400418375 /* tk3000.plist */,
 				B61099FA24F5F370005CB652 /* uniap2en.plist */,
 				B61099EE24F5F36E005CB652 /* uniap2pt.plist */,
 				B6109A0224F5F371005CB652 /* uniap2ti.plist */,
 				B63C1BA7250192E600511A71 /* zijini.plist */,
-				B6DE323D2605482400418375 /* mac128k.plist */,
-				B6374AE2260ECDDD0045CA16 /* mac2fdhd.plist */,
-				B6DE32422605482500418375 /* mac512k.plist */,
-				B6DE323F2605482400418375 /* mac512ke.plist */,
-				B6374AC9260ECB3F0045CA16 /* macclas2.plist */,
-				B6DE323E2605482400418375 /* macclasc.plist */,
-				B6374ACA260ECB3F0045CA16 /* macii.plist */,
-				B65085B825B616AC00354EC9 /* maciici.plist */,
-				B6374ACD260ECB3F0045CA16 /* maciicx.plist */,
-				B6374ACB260ECB3F0045CA16 /* maciisi.plist */,
-				B6374ACC260ECB3F0045CA16 /* maciivi.plist */,
-				B6374ACF260ECB3F0045CA16 /* maciivx.plist */,
-				B6374ACE260ECB3F0045CA16 /* maciix.plist */,
-				B6374AE1260ECDDD0045CA16 /* maciihmu.plist */,
-				B6DD1FE725B407E6004A3242 /* maclc.plist */,
-				B65085B625B616AC00354EC9 /* maclc2.plist */,
-				B65085B725B616AC00354EC9 /* maclc3.plist */,
-				B6DE32412605482500418375 /* macplus.plist */,
-				B6DE32432605482500418375 /* macse.plist */,
-				B6374AD0260ECB400045CA16 /* macse30.plist */,
-				B6DE32402605482500418375 /* macsefd.plist */,
 			);
 			path = Resources;
 			sourceTree = "<group>";
@@ -622,6 +756,8 @@
 		B66236B624FDA686006CABD7 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				B68A899326BF124B00B2C8C6 /* CoreMIDI.framework */,
+				B635C09926784A1200B23BFD /* Sparkle.framework */,
 				B65D718525E70BD5008C5F87 /* WebKit.framework */,
 				B6841BDD251ECC29006A5C39 /* vmnet.framework */,
 			);
@@ -633,6 +769,7 @@
 			children = (
 				B63C1B8D25004C6D00511A71 /* mame-data.tgz */,
 				B66236B824FDA698006CABD7 /* mame64 */,
+				B635C09C26784A4800B23BFD /* Sparkle.framework */,
 				B66236B224FDA522006CABD7 /* SDL2.framework */,
 			);
 			name = "Embedded Content";
@@ -641,6 +778,7 @@
 		B6841BD1251EC913006A5C39 /* vmnet_helper */ = {
 			isa = PBXGroup;
 			children = (
+				B611BA3A267948B5008597B5 /* vmnet_helper.entitlements */,
 				B6841BCA251EC88E006A5C39 /* vmnet_helper.c */,
 			);
 			path = vmnet_helper;
@@ -673,12 +811,16 @@
 		B6BA257D24E99BE9005FB8FF /* Ample */ = {
 			isa = PBXGroup;
 			children = (
+				B6E6DD0527B160D400E0A76E /* Core Data */,
 				B6665C12265A0E3E00254939 /* AutocompleteControl.h */,
 				B6665C13265A0E3E00254939 /* AutocompleteControl.m */,
 				B6BA257E24E99BE9005FB8FF /* AppDelegate.h */,
 				B6BA257F24E99BE9005FB8FF /* AppDelegate.m */,
 				B63C1B8924FF4B7100511A71 /* Ample.h */,
+				B635C09E26784D4700B23BFD /* AmpleLite.m */,
 				B63C1B8A24FF4BF700511A71 /* Ample.m */,
+				B6E6DD0E27B161C400E0A76E /* Bookmark.h */,
+				B6E6DD1727B1DF5F00E0A76E /* DiskImage.h */,
 				B64AF1F4250ED5E400A09B9B /* TableCellView.h */,
 				B64AF1F5250ED5E400A09B9B /* TableCellView.m */,
 				B6152B5425F4549F00605E6E /* Slot.h */,
@@ -708,6 +850,8 @@
 				B6B9EA642506A5550080E70D /* EjectButton.m */,
 				B64AF1F8250EF6A500A09B9B /* Transformers.h */,
 				B64AF1F9250EF6A500A09B9B /* Transformers.m */,
+				B68A898F26BE18E000B2C8C6 /* MidiManager.m */,
+				B68A899226BE320200B2C8C6 /* MidiManager.h */,
 				B6BA258124E99BEB005FB8FF /* Assets.xcassets */,
 				B64E15AF24EA365E00E8AD3D /* Resources */,
 				B6BA258624E99BEB005FB8FF /* Info.plist */,
@@ -723,6 +867,8 @@
 		B6BA563A251685DA00B0C47D /* Window Controllers */ = {
 			isa = PBXGroup;
 			children = (
+				B6E6DCF927B0A09300E0A76E /* BookmarkWindowController.h */,
+				B6E6DCFA27B0A09300E0A76E /* BookmarkWindowController.m */,
 				B64AF1F0250ECB2E00A09B9B /* DiskImagesWindowController.h */,
 				B64AF1F1250ECB2E00A09B9B /* DiskImagesWindowController.m */,
 				B63C1B9125008A2700511A71 /* DownloadWindowController.h */,
@@ -743,6 +889,7 @@
 			isa = PBXGroup;
 			children = (
 				B6665C1A265C639900254939 /* Autocomplete.xib */,
+				B6E6DCF527B0873100E0A76E /* BookmarkWindow.xib */,
 				B6E9A18125088B36005E7525 /* SlotView.xib */,
 				B6F7B536266FDA5B00624C6B /* MachineView.xib */,
 				B63C1B9325008A2700511A71 /* DownloadWindow.xib */,
@@ -777,6 +924,22 @@
 			path = images;
 			sourceTree = "<group>";
 		};
+		B6E6DD0527B160D400E0A76E /* Core Data */ = {
+			isa = PBXGroup;
+			children = (
+				B6E6DCE927AEE15F00E0A76E /* Ample.xcdatamodeld */,
+				B6E6DCFE27B0D17C00E0A76E /* Bookmark+CoreDataClass.h */,
+				B6E6DCFF27B0D17C00E0A76E /* Bookmark+CoreDataClass.m */,
+				B6E6DCFD27B0D17C00E0A76E /* Bookmark+CoreDataProperties.h */,
+				B6E6DD0027B0D17C00E0A76E /* Bookmark+CoreDataProperties.m */,
+				B6E6DD1027B1D71700E0A76E /* DiskImage+CoreDataClass.h */,
+				B6E6DD1127B1D71700E0A76E /* DiskImage+CoreDataClass.m */,
+				B6E6DD0F27B1D71700E0A76E /* DiskImage+CoreDataProperties.h */,
+				B6E6DD1227B1D71700E0A76E /* DiskImage+CoreDataProperties.m */,
+			);
+			path = "Core Data";
+			sourceTree = "<group>";
+		};
 /* End PBXGroup section */

 /* Begin PBXNativeTarget section */
@@ -824,6 +987,7 @@
 				B66236B124FDA443006CABD7 /* Embed Frameworks */,
 				B6152B5C25F6F4F800605E6E /* ShellScript */,
 				B66236BB24FDA71D006CABD7 /* CopyFiles */,
+				B611BA3D26796483008597B5 /* ShellScript */,
 			);
 			buildRules = (
 			);
@@ -900,6 +1064,8 @@
 			files = (
 				B6DDECD62505A86E0093587A /* eject-16x16.png in Resources */,
 				B6DDECCC2505A86E0093587A /* eject-16x16@2x.png in Resources */,
+				B6FECAFB28C0093600E143DA /* las3000.plist in Resources */,
+				B622BAE32AA1619F00CCB38C /* maclc475.plist in Resources */,
 				B6DDECCE2505A86E0093587A /* eject-16x16@3x.png in Resources */,
 				B6DDECD02505A86E0093587A /* eject-hover-16x16.png in Resources */,
 				B6DDECD22505A86E0093587A /* eject-hover-16x16@2x.png in Resources */,
@@ -922,18 +1088,25 @@
 				B6D6DE3924FAC8B500661A5F /* Preferences.xib in Resources */,
 				B63C1F0B25B143C50016A611 /* CheatSheet.xib in Resources */,
 				B6109A3324F5F377005CB652 /* apple2eeuk.plist in Resources */,
+				B6E6DCF727B0873200E0A76E /* BookmarkWindow.xib in Resources */,
 				B6374ADB260ECB400045CA16 /* maciix.plist in Resources */,
 				B6109A2424F5F377005CB652 /* las128ex.plist in Resources */,
+				B618B8C42729F6690045C2D8 /* laser128o.plist in Resources */,
 				B646D10B263A5DF30014C586 /* ace1000.plist in Resources */,
 				B63C1BA8250192E600511A71 /* zijini.plist in Resources */,
 				B6109A1D24F5F377005CB652 /* space84.plist in Resources */,
+				B6939C1A2A747B790025D891 /* macqd800.plist in Resources */,
+				B6939C202A747B790025D891 /* macqd650.plist in Resources */,
 				B6374AD9260ECB400045CA16 /* maciicx.plist in Resources */,
 				B6109A3F24F5F377005CB652 /* agat9.plist in Resources */,
 				B63C1B9D250192D800511A71 /* cece.plist in Resources */,
 				B6109A3124F5F377005CB652 /* apple1.plist in Resources */,
+				B6939C1C2A747B790025D891 /* macqd610.plist in Resources */,
 				B6374AD3260ECB400045CA16 /* macii.plist in Resources */,
+				B63E57E22755AF2000F8B5D1 /* ace500.plist in Resources */,
 				B6109A3524F5F377005CB652 /* ace100.plist in Resources */,
 				B65085BB25B616AC00354EC9 /* maclc3.plist in Resources */,
+				B622BAD72AA1615700CCB38C /* macqd605.plist in Resources */,
 				B6109A3424F5F377005CB652 /* am64.plist in Resources */,
 				B6DE32462605482500418375 /* macclasc.plist in Resources */,
 				B6DE32502605482500418375 /* macse.plist in Resources */,
@@ -954,6 +1127,7 @@
 				B6109A2E24F5F377005CB652 /* apple2eefr.plist in Resources */,
 				B6109A2C24F5F377005CB652 /* spectred.plist in Resources */,
 				B6109A4124F5F377005CB652 /* apple2cp.plist in Resources */,
+				B622BADE2AA1618000CCB38C /* maclc580.plist in Resources */,
 				B6109A3A24F5F377005CB652 /* prav82.plist in Resources */,
 				B6DD1FE825B407E7004A3242 /* maclc.plist in Resources */,
 				B6109A2024F5F377005CB652 /* apple2euk.plist in Resources */,
@@ -963,22 +1137,32 @@
 				B6109A1A24F5F377005CB652 /* microeng.plist in Resources */,
 				B6374AD5260ECB400045CA16 /* maciisi.plist in Resources */,
 				B6109A3E24F5F377005CB652 /* albert.plist in Resources */,
+				B6939C2A2A747BBF0025D891 /* macct650.plist in Resources */,
 				B66236C124FDB7A6006CABD7 /* Credits.rtf in Resources */,
 				B6109A4224F5F377005CB652 /* apple2p.plist in Resources */,
+				B622BAE02AA1618000CCB38C /* maclc575.plist in Resources */,
 				B65085B925B616AC00354EC9 /* maclc2.plist in Resources */,
 				B6109A1824F5F377005CB652 /* hkc8800a.plist in Resources */,
 				B6109A2324F5F377005CB652 /* apple2gsr0.plist in Resources */,
 				B63C1BA1250192D800511A71 /* cecg.plist in Resources */,
+				B6939C2C2A747BBF0025D891 /* macct610.plist in Resources */,
+				B6939C262A747BA30025D891 /* maclc3p.plist in Resources */,
 				B63C1BA3250192D800511A71 /* cec2000.plist in Resources */,
 				B6109A2624F5F377005CB652 /* mprof3.plist in Resources */,
 				B63C1B9F250192D800511A71 /* ceci.plist in Resources */,
 				B6109A3224F5F377005CB652 /* basis108.plist in Resources */,
 				B6109A4324F5F377005CB652 /* agat7.plist in Resources */,
+				B622BADA2AA1615D00CCB38C /* macqd630.plist in Resources */,
+				B6ABF47C275986EB00DC3D48 /* ace2200.plist in Resources */,
 				B6DE324E2605482500418375 /* mac512k.plist in Resources */,
+				B6939C232A747B950025D891 /* maclc550.plist in Resources */,
 				B6109A2B24F5F377005CB652 /* elppa.plist in Resources */,
 				B63C1B8E25004C6D00511A71 /* mame-data.tgz in Resources */,
 				B6109A3B24F5F377005CB652 /* apple2gsr1.plist in Resources */,
 				B65085BD25B616AC00354EC9 /* maciici.plist in Resources */,
+				B6301BE429107BE800495022 /* maclc520.plist in Resources */,
+				B66116882A2535F60038A3E2 /* megast.plist in Resources */,
+				B6939C1E2A747B790025D891 /* macqd700.plist in Resources */,
 				B6374AE3260ECDDD0045CA16 /* maciihmu.plist in Resources */,
 				B6374ADF260ECB400045CA16 /* macse30.plist in Resources */,
 				B63C1F1225B147E10016A611 /* CheatSheet.html in Resources */,
@@ -988,6 +1172,7 @@
 				B6109A1B24F5F377005CB652 /* uniap2pt.plist in Resources */,
 				B6109A3724F5F377005CB652 /* las128e2.plist in Resources */,
 				B6374AE5260ECDDD0045CA16 /* mac2fdhd.plist in Resources */,
+				B66116852A2535EF0038A3E2 /* st.plist in Resources */,
 				B63C1B90250088DD00511A71 /* roms.plist in Resources */,
 				B6109A2724F5F377005CB652 /* uniap2en.plist in Resources */,
 				B6109A2A24F5F377005CB652 /* apple3.plist in Resources */,
@@ -999,6 +1184,7 @@
 				B6374AD7260ECB400045CA16 /* maciivi.plist in Resources */,
 				B6374AD1260ECB400045CA16 /* macclas2.plist in Resources */,
 				B6DE324A2605482500418375 /* macsefd.plist in Resources */,
+				B6301BE729107C1E00495022 /* maccclas.plist in Resources */,
 				B6109A3024F5F377005CB652 /* apple2.plist in Resources */,
 				B6109A2D24F5F377005CB652 /* prav8m.plist in Resources */,
 			);
@@ -1016,6 +1202,7 @@
 				B6DDECD52505A86E0093587A /* eject-hover-16x16@3x.png in Resources */,
 				B6DE323926044C1100418375 /* caution.png in Resources */,
 				B6DE323726044C1100418375 /* caution@2x.png in Resources */,
+				B622BAE42AA1619F00CCB38C /* maclc475.plist in Resources */,
 				B6DE323C26044DB800418375 /* caution@3x.png in Resources */,
 				B6DDECC125057A550093587A /* drag-handle-4x10.png in Resources */,
 				B6DDECC325057A550093587A /* drag-handle-4x10@2x.png in Resources */,
@@ -1033,17 +1220,23 @@
 				B6665C1D265C639A00254939 /* Autocomplete.xib in Resources */,
 				B6E4B5C124FDE2670094A35C /* apple1.plist in Resources */,
 				B6E4B5C224FDE2670094A35C /* ace100.plist in Resources */,
+				B6E6DCF827B0873200E0A76E /* BookmarkWindow.xib in Resources */,
 				B6374AD6260ECB400045CA16 /* maciisi.plist in Resources */,
 				B6DE32472605482500418375 /* macclasc.plist in Resources */,
+				B6939C2D2A747BBF0025D891 /* macct610.plist in Resources */,
+				B6939C1B2A747B790025D891 /* macqd800.plist in Resources */,
 				B6E4B5C324FDE2670094A35C /* am64.plist in Resources */,
+				B66116892A2535F60038A3E2 /* megast.plist in Resources */,
 				B6E4B5C424FDE2670094A35C /* LogWindow.xib in Resources */,
 				B6E4B5C524FDE2670094A35C /* Assets.xcassets in Resources */,
 				B6374AD4260ECB400045CA16 /* macii.plist in Resources */,
 				B6E4B5C624FDE2670094A35C /* apple2e.plist in Resources */,
+				B66116862A2535EF0038A3E2 /* st.plist in Resources */,
 				B64AF1EF250EC35B00A09B9B /* DiskImages.xib in Resources */,
 				B63C1BA2250192D800511A71 /* cecg.plist in Resources */,
 				B6E4B5C724FDE2670094A35C /* am100.plist in Resources */,
 				B6E4B5C824FDE2670094A35C /* laser2c.plist in Resources */,
+				B6939C242A747B950025D891 /* maclc550.plist in Resources */,
 				B6374ADA260ECB400045CA16 /* maciicx.plist in Resources */,
 				B615A99F26640940001FBF99 /* SlotView.xib in Resources */,
 				B63C1F0C25B143C50016A611 /* CheatSheet.xib in Resources */,
@@ -1058,10 +1251,13 @@
 				B6DE324B2605482500418375 /* macsefd.plist in Resources */,
 				B6E4B5CF24FDE2670094A35C /* apple2eefr.plist in Resources */,
 				B6374AD8260ECB400045CA16 /* maciivi.plist in Resources */,
+				B63E57E32755AF2000F8B5D1 /* ace500.plist in Resources */,
 				B6E4B5D124FDE2670094A35C /* spectred.plist in Resources */,
 				B63C1B9725008A2700511A71 /* DownloadWindow.xib in Resources */,
 				B6E4B5D224FDE2670094A35C /* apple2cp.plist in Resources */,
+				B618B8C52729F6690045C2D8 /* laser128o.plist in Resources */,
 				B6E4B5D324FDE2670094A35C /* MainMenu.xib in Resources */,
+				B622BAE12AA1618000CCB38C /* maclc575.plist in Resources */,
 				B6E4B5D424FDE2670094A35C /* prav82.plist in Resources */,
 				B6E4B5D524FDE2670094A35C /* apple2euk.plist in Resources */,
 				B6E4B5D624FDE2670094A35C /* uniap2ti.plist in Resources */,
@@ -1076,21 +1272,29 @@
 				B65085BC25B616AC00354EC9 /* maclc3.plist in Resources */,
 				B6DE32492605482500418375 /* mac512ke.plist in Resources */,
 				B6DE32452605482500418375 /* mac128k.plist in Resources */,
+				B6939C2B2A747BBF0025D891 /* macct650.plist in Resources */,
 				B63C1BA4250192D800511A71 /* cec2000.plist in Resources */,
 				B6E4B5DC24FDE2670094A35C /* hkc8800a.plist in Resources */,
 				B6374AE4260ECDDD0045CA16 /* maciihmu.plist in Resources */,
 				B6E4B5DD24FDE2670094A35C /* apple2gsr0.plist in Resources */,
+				B622BAD82AA1615700CCB38C /* macqd605.plist in Resources */,
 				B6E4B5DE24FDE2670094A35C /* mprof3.plist in Resources */,
 				B6E4B5DF24FDE2670094A35C /* basis108.plist in Resources */,
 				B6DD1FE925B407E7004A3242 /* maclc.plist in Resources */,
+				B622BADF2AA1618000CCB38C /* maclc580.plist in Resources */,
 				B6E4B5E024FDE2670094A35C /* agat7.plist in Resources */,
+				B6939C272A747BA30025D891 /* maclc3p.plist in Resources */,
 				B6E4B5E124FDE2670094A35C /* elppa.plist in Resources */,
 				B6E4B5E224FDE2670094A35C /* apple2gsr1.plist in Resources */,
+				B6301BE529107BE800495022 /* maclc520.plist in Resources */,
 				B6E4B5E324FDE2670094A35C /* Defaults.plist in Resources */,
 				B6E4B5E424FDE2670094A35C /* models.plist in Resources */,
 				B6F7B539266FDA5B00624C6B /* MachineView.xib in Resources */,
+				B622BADB2AA1615D00CCB38C /* macqd630.plist in Resources */,
 				B63C1BA9250192E600511A71 /* zijini.plist in Resources */,
 				B6E4B5E524FDE2670094A35C /* craft2p.plist in Resources */,
+				B6ABF47D275986EB00DC3D48 /* ace2200.plist in Resources */,
+				B6939C212A747B790025D891 /* macqd650.plist in Resources */,
 				B6E4B5E624FDE2670094A35C /* uniap2pt.plist in Resources */,
 				B6E4B5E724FDE2670094A35C /* las128e2.plist in Resources */,
 				B63C1B9E250192D800511A71 /* cece.plist in Resources */,
@@ -1098,13 +1302,17 @@
 				B6E4B5E924FDE2670094A35C /* uniap2en.plist in Resources */,
 				B6374AD2260ECB400045CA16 /* macclas2.plist in Resources */,
 				B6E4B5EA24FDE2670094A35C /* apple3.plist in Resources */,
+				B6301BE829107C1E00495022 /* maccclas.plist in Resources */,
 				B6E4B5EB24FDE2670094A35C /* apple2ee.plist in Resources */,
+				B6939C1D2A747B790025D891 /* macqd610.plist in Resources */,
+				B6939C1F2A747B790025D891 /* macqd700.plist in Resources */,
 				B6E4B5EC24FDE2670094A35C /* dodo.plist in Resources */,
 				B63C1F1325B147E10016A611 /* CheatSheet.html in Resources */,
 				B6DE324D2605482500418375 /* macplus.plist in Resources */,
 				B6E4B5ED24FDE2670094A35C /* Preferences.xib in Resources */,
 				B6374ADE260ECB400045CA16 /* maciivx.plist in Resources */,
 				B6E4B5EF24FDE2670094A35C /* apple2gs.plist in Resources */,
+				B6FECAFC28C0093600E143DA /* las3000.plist in Resources */,
 				B6E4B5F024FDE2670094A35C /* apple2jp.plist in Resources */,
 				B6E4B5F124FDE2670094A35C /* apple2.plist in Resources */,
 				B6E4B5F224FDE2670094A35C /* prav8m.plist in Resources */,
@@ -1114,6 +1322,26 @@
 /* End PBXResourcesBuildPhase section */

 /* Begin PBXShellScriptBuildPhase section */
+		B611BA3D26796483008597B5 /* ShellScript */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+			);
+			inputPaths = (
+				"$(TARGET_BUILD_DIR)/$(EXECUTABLE_FOLDER_PATH)/mame64",
+			);
+			outputFileListPaths = (
+			);
+			outputPaths = (
+				"$(TARGET_BUILD_DIR)/$(EXECUTABLE_FOLDER_PATH)/mame-link",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "# Type a script or drag a script file from your workspace to insert its path.\n#cd \"$TARGET_BUILD_DIR/$EXECUTABLE_FOLDER_PATH\"\n#if [ ! -e mame-link] ; then ln -s mame64 mame-link ; fi\n";
+			showEnvVarsInLog = 0;
+		};
 		B6152B5C25F6F4F800605E6E /* ShellScript */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
@@ -1129,7 +1357,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "# Type a script or drag a script file from your workspace to insert its path.\n\ncd \"embedded\"\necho perl install_name_tool.pl --verbose mame64 \"@executable_path/../Frameworks\"\nperl install_name_tool.pl --verbose mame64 \"@executable_path/../Frameworks\"\n";
+			shellScript = "# set the mame rpath and entitlements.\n\ncd \"embedded\"\necho perl install_name_tool.pl --verbose mame64 \"@executable_path/../Frameworks\"\nperl install_name_tool.pl --verbose mame64 \"@executable_path/../Frameworks\"\n\necho /usr/bin/codesign --sign - --deep --force --options=runtime --entitlements mame64.entitlements --timestamp mame64\n/usr/bin/codesign --sign - --deep --force --options=runtime --entitlements mame64.entitlements --timestamp mame64\n\n";
 			showEnvVarsInLog = 0;
 		};
 /* End PBXShellScriptBuildPhase section */
@@ -1157,9 +1385,13 @@
 			files = (
 				B608E17F2502FE0C00D53465 /* TransparentScroller.m in Sources */,
 				B6E9A18025088B1B005E7525 /* SlotViewController.m in Sources */,
+				B6E6DD1527B1D71700E0A76E /* DiskImage+CoreDataProperties.m in Sources */,
 				B6A1A1942528EB1700DB0FD7 /* Menu.m in Sources */,
+				B6E6DD1327B1D71700E0A76E /* DiskImage+CoreDataClass.m in Sources */,
+				B6E6DD0127B0D17C00E0A76E /* Bookmark+CoreDataClass.m in Sources */,
 				B6BA258824E99BEB005FB8FF /* main.m in Sources */,
 				B63C1B8B24FF4BF700511A71 /* Ample.m in Sources */,
+				B6E6DCFB27B0A09300E0A76E /* BookmarkWindowController.m in Sources */,
 				B6B9EA662506A5550080E70D /* EjectButton.m in Sources */,
 				B6152B5A25F5B57E00605E6E /* Media.m in Sources */,
 				B6152B5625F4549F00605E6E /* Slot.m in Sources */,
@@ -1167,8 +1399,10 @@
 				B6665C14265A0E3E00254939 /* AutocompleteControl.m in Sources */,
 				B64979C224EF6703008ABD20 /* MediaViewController.m in Sources */,
 				B60A6E1424EE0AE2004B7EEF /* FlippedView.m in Sources */,
+				B68A899026BE18E000B2C8C6 /* MidiManager.m in Sources */,
 				B6BA258024E99BE9005FB8FF /* AppDelegate.m in Sources */,
 				B6004DF024FB05D600D38596 /* LogWindowController.m in Sources */,
+				B6E6DD0327B0D17C00E0A76E /* Bookmark+CoreDataProperties.m in Sources */,
 				B63005332666D6940014C381 /* BookmarkManager.m in Sources */,
 				B66236A924FD9A34006CABD7 /* PreferencesWindowController.m in Sources */,
 				B63C1F0F25B1447C0016A611 /* CheatSheetWindowController.m in Sources */,
@@ -1176,6 +1410,7 @@
 				B6F7B53C267017A200624C6B /* NewMachineViewController.m in Sources */,
 				B64AF1F6250ED5E400A09B9B /* TableCellView.m in Sources */,
 				B66D0FE72611386C000902F1 /* SoftwareList.m in Sources */,
+				B6E6DCEB27AEE15F00E0A76E /* Ample.xcdatamodeld in Sources */,
 				B63C1B9425008A2700511A71 /* DownloadWindowController.m in Sources */,
 				B64AF1FA250EF6A500A09B9B /* Transformers.m in Sources */,
 			);
@@ -1185,25 +1420,33 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				B68A899126BE18E000B2C8C6 /* MidiManager.m in Sources */,
 				B608E1802502FE0C00D53465 /* TransparentScroller.m in Sources */,
 				B64AF1FB250EF6A500A09B9B /* Transformers.m in Sources */,
 				B6E4B5B024FDE2670094A35C /* main.m in Sources */,
 				B63C1F1025B1447C0016A611 /* CheatSheetWindowController.m in Sources */,
+				B6E6DD1427B1D71700E0A76E /* DiskImage+CoreDataClass.m in Sources */,
 				B63C1B8C24FF4BF700511A71 /* Ample.m in Sources */,
 				B64AF1F3250ECB2E00A09B9B /* DiskImagesWindowController.m in Sources */,
+				B6E6DCEC27AEE15F00E0A76E /* Ample.xcdatamodeld in Sources */,
 				B6B9EA672506A5550080E70D /* EjectButton.m in Sources */,
 				B6A1A1952528EB1700DB0FD7 /* Menu.m in Sources */,
 				B6152B5B25F5B57E00605E6E /* Media.m in Sources */,
 				B6E4B5B124FDE2670094A35C /* LaunchWindowController.m in Sources */,
 				B6152B5725F4549F00605E6E /* Slot.m in Sources */,
 				B6E4B5B324FDE2670094A35C /* MediaViewController.m in Sources */,
+				B6E6DCFC27B0A09300E0A76E /* BookmarkWindowController.m in Sources */,
+				B6E6DD1627B1D71700E0A76E /* DiskImage+CoreDataProperties.m in Sources */,
 				B64AF1F7250ED5E400A09B9B /* TableCellView.m in Sources */,
 				B6E4B5B424FDE2670094A35C /* FlippedView.m in Sources */,
+				B6E6DD0227B0D17C00E0A76E /* Bookmark+CoreDataClass.m in Sources */,
+				B6E6DD0427B0D17C00E0A76E /* Bookmark+CoreDataProperties.m in Sources */,
 				B63005342666D6940014C381 /* BookmarkManager.m in Sources */,
 				B615A9A026640A70001FBF99 /* SlotViewController.m in Sources */,
 				B6665C15265A0E3E00254939 /* AutocompleteControl.m in Sources */,
 				B6E4B5B524FDE2670094A35C /* AppDelegate.m in Sources */,
 				B6F7B53D267017A200624C6B /* NewMachineViewController.m in Sources */,
+				B635C09F26784D4700B23BFD /* AmpleLite.m in Sources */,
 				B66D0FE82611386C000902F1 /* SoftwareList.m in Sources */,
 				B6E4B5B624FDE2670094A35C /* LogWindowController.m in Sources */,
 				B6E4B5B724FDE2670094A35C /* PreferencesWindowController.m in Sources */,
@@ -1278,6 +1521,14 @@
 			name = LaunchWindow.xib;
 			sourceTree = "<group>";
 		};
+		B6E6DCF527B0873100E0A76E /* BookmarkWindow.xib */ = {
+			isa = PBXVariantGroup;
+			children = (
+				B6E6DCF627B0873100E0A76E /* Base */,
+			);
+			name = BookmarkWindow.xib;
+			sourceTree = "<group>";
+		};
 		B6E9A18125088B36005E7525 /* SlotView.xib */ = {
 			isa = PBXVariantGroup;
 			children = (
@@ -1301,8 +1552,11 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				CLANG_ENABLE_MODULES = NO;
+				CODE_SIGN_ENTITLEMENTS = pty_shell/pty_shell.entitlements;
 				CODE_SIGN_STYLE = Automatic;
+				ENABLE_HARDENED_RUNTIME = YES;
 				INSTALL_PATH = "";
+				MACOSX_DEPLOYMENT_TARGET = 10.13;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
 			name = Debug;
@@ -1311,8 +1565,11 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				CLANG_ENABLE_MODULES = NO;
+				CODE_SIGN_ENTITLEMENTS = pty_shell/pty_shell.entitlements;
 				CODE_SIGN_STYLE = Automatic;
+				ENABLE_HARDENED_RUNTIME = YES;
 				INSTALL_PATH = "";
+				MACOSX_DEPLOYMENT_TARGET = 10.13;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
 			name = Release;
@@ -1320,8 +1577,11 @@
 		B6841BD5251EC913006A5C39 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				CODE_SIGN_ENTITLEMENTS = vmnet_helper/vmnet_helper.entitlements;
 				CODE_SIGN_STYLE = Automatic;
+				ENABLE_HARDENED_RUNTIME = YES;
 				INSTALL_PATH = "";
+				MACOSX_DEPLOYMENT_TARGET = 10.13;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
 			name = Debug;
@@ -1329,8 +1589,11 @@
 		B6841BD6251EC913006A5C39 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				CODE_SIGN_ENTITLEMENTS = vmnet_helper/vmnet_helper.entitlements;
 				CODE_SIGN_STYLE = Automatic;
+				ENABLE_HARDENED_RUNTIME = YES;
 				INSTALL_PATH = "";
+				MACOSX_DEPLOYMENT_TARGET = 10.13;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
 			name = Release;
@@ -1451,14 +1714,19 @@
 				CODE_SIGN_ENTITLEMENTS = Ample/Ample.entitlements;
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 14;
-				FRAMEWORK_SEARCH_PATHS = "$(inherited)";
+				CURRENT_PROJECT_VERSION = 50;
+				ENABLE_HARDENED_RUNTIME = YES;
+				FRAMEWORK_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(PROJECT_DIR)/embedded",
+				);
 				INFOPLIST_FILE = Ample/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				MARKETING_VERSION = 0.232;
+				MACOSX_DEPLOYMENT_TARGET = 10.13;
+				MARKETING_VERSION = "0.259-u2-1";
 				PRODUCT_BUNDLE_IDENTIFIER = com.ksherlock.ample;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
@@ -1471,14 +1739,19 @@
 				CODE_SIGN_ENTITLEMENTS = Ample/Ample.entitlements;
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 14;
-				FRAMEWORK_SEARCH_PATHS = "$(inherited)";
+				CURRENT_PROJECT_VERSION = 50;
+				ENABLE_HARDENED_RUNTIME = YES;
+				FRAMEWORK_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(PROJECT_DIR)/embedded",
+				);
 				INFOPLIST_FILE = Ample/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				MARKETING_VERSION = 0.232;
+				MACOSX_DEPLOYMENT_TARGET = 10.13;
+				MARKETING_VERSION = "0.259-u2-1";
 				PRODUCT_BUNDLE_IDENTIFIER = com.ksherlock.ample;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
@@ -1491,12 +1764,15 @@
 				CODE_SIGN_ENTITLEMENTS = Ample/Ample.entitlements;
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
+				CURRENT_PROJECT_VERSION = 49;
 				FRAMEWORK_SEARCH_PATHS = "$(inherited)";
 				INFOPLIST_FILE = Ample/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
+				MACOSX_DEPLOYMENT_TARGET = 10.13;
+				MARKETING_VERSION = "0.258-u2";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.ksherlock.ample-lite";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
@@ -1509,12 +1785,15 @@
 				CODE_SIGN_ENTITLEMENTS = Ample/Ample.entitlements;
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
+				CURRENT_PROJECT_VERSION = 49;
 				FRAMEWORK_SEARCH_PATHS = "$(inherited)";
 				INFOPLIST_FILE = Ample/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
+				MACOSX_DEPLOYMENT_TARGET = 10.13;
+				MARKETING_VERSION = "0.258-u2";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.ksherlock.ample-lite";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
@@ -1569,6 +1848,19 @@
 			defaultConfigurationName = Release;
 		};
 /* End XCConfigurationList section */
+
+/* Begin XCVersionGroup section */
+		B6E6DCE927AEE15F00E0A76E /* Ample.xcdatamodeld */ = {
+			isa = XCVersionGroup;
+			children = (
+				B6E6DCEA27AEE15F00E0A76E /* Ample.xcdatamodel */,
+			);
+			currentVersion = B6E6DCEA27AEE15F00E0A76E /* Ample.xcdatamodel */;
+			path = Ample.xcdatamodeld;
+			sourceTree = "<group>";
+			versionGroupType = wrapper.xcdatamodel;
+		};
+/* End XCVersionGroup section */
 	};
 	rootObject = B6BA257324E99BE9005FB8FF /* Project object */;
 }
@@ -4,6 +4,8 @@
 <dict>
 	<key>com.apple.security.app-sandbox</key>
 	<false/>
+	<key>com.apple.security.cs.disable-library-validation</key>
+	<true/>
 	<key>com.apple.security.files.user-selected.read-only</key>
 	<true/>
 </dict>
@@ -40,6 +40,9 @@ extern NSString *kDownloadExtension;
 extern NSString *kDefaultDownloadURL;
 extern NSString *kDefaultDownloadExtension;

+extern NSString *kNotificationDiskImageAdded;
+extern NSString *kNotificationDiskImageMagicRoute;
+extern NSString *kNotificationBookmarkMagicRoute;

@protocol Bookmark <NSObject>
 -(BOOL)loadBookmark: (NSDictionary *)bookmark;
@@ -42,7 +42,7 @@ NSURL *MameURL(void) {
        
    if ([defaults boolForKey: kUseCustomMame]) {
        NSString *path = [defaults stringForKey: kMamePath];
-        if (![path length]) return [NSURL fileURLWithPath: path];
+        if ([path length]) return [NSURL fileURLWithPath: path];
    }
    
    return [bundle URLForAuxiliaryExecutable: @"mame64"];
@@ -135,3 +135,7 @@ NSString *kDefaultDownloadExtension = @"DefaultDownloadExtension";

 NSString *kDownloadURL = @"DownloadURL";
 NSString *kDownloadExtension = @"DownloadExtension";
+
+NSString *kNotificationDiskImageAdded = @"Disk Image Added";
+NSString *kNotificationDiskImageMagicRoute = @"Disk Image Magic Route";
+NSString *kNotificationBookmarkMagicRoute = @"Bookmark Magic Route";
@@ -0,0 +1,26 @@
+//
+//  AmpleLite.m
+//  Ample Lite
+//
+//  Created by Kelvin Sherlock on 6/14/2021.
+//  Copyright © 2021 Kelvin Sherlock. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+@class NSMenuItem;
+
+@interface SUUpdater : NSObject
+@end
+
+@implementation  SUUpdater
+
+- (IBAction)checkForUpdates:(id)sender {
+}
+
+
+- (BOOL)validateMenuItem:(NSMenuItem *)menuItem {
+    return NO;
+}
+
+@end
@@ -11,6 +11,6 @@
@interface AppDelegate : NSObject <NSApplicationDelegate>

 - (IBAction)displayPreferences:(id)sender;
-
+- (IBAction)manageBookmarks: (id)sender;
@end

@@ -12,6 +12,8 @@
 #import "DownloadWindowController.h"
 #import "DiskImagesWindowController.h"
 #import "CheatSheetWindowController.h"
+#import "BookmarkWindowController.h"
+
 #import "Transformers.h"
 #import "BookmarkManager.h"

@@ -28,6 +30,8 @@
    NSWindowController *_downloader;
    NSWindowController *_diskImages;
    NSWindowController *_cheatSheet;
+    NSWindowController *_bookmarks;
+
 }


@@ -41,9 +45,7 @@
    
    RegisterTransformers();
    
-    BookmarkManager *bm = [BookmarkManager sharedManager];
-    [bm loadBookmarks];
-    [bm updateMenu];
+    //BookmarkManager *bm = [BookmarkManager sharedManager];
    
    path = [bundle pathForResource: @"Defaults" ofType: @"plist"];
    dict = [NSDictionary dictionaryWithContentsOfFile: path];
@@ -53,17 +55,17 @@
        [[NSUserDefaults standardUserDefaults] registerDefaults: dict];
    }
    
-
-
    _diskImages = [DiskImagesWindowController sharedInstance]; //[DiskImagesWindowController new];

    if ([self installMameComponents]) {

        [self displayLaunchWindow];
    }
-
 }

+
+
+
 -(void)displayLaunchWindow {

    if (!_launcher) {
@@ -113,11 +115,11 @@
    
    dispatch_time_t when = dispatch_time(DISPATCH_TIME_NOW, (int64_t)(2 * NSEC_PER_SEC));
    [task setTerminationHandler: ^(NSTask *task){
-       
+
+        int st = [task terminationStatus];
+        // delay so the install window is visible, I think
        dispatch_after(when, dispatch_get_main_queue(), ^{
  
-            int st = [task terminationStatus];
-
            if (st) {
                NSAlert *alert = [NSAlert new];
                [alert setMessageText: @"An error occurred extracting MAME components"];
@@ -146,6 +148,7 @@

 - (void)applicationWillTerminate:(NSNotification *)aNotification {
    // Insert code here to tear down your application
+
 }

 - (BOOL)applicationShouldTerminateAfterLastWindowClosed:(NSApplication *)sender {
@@ -226,6 +229,79 @@
 }


+- (IBAction)manageBookmarks: (id)sender {
+    
+    if (!_bookmarks) {
+        _bookmarks = [BookmarkWindowController new];
+    }
+    [_bookmarks showWindow: sender];
+}


+-(IBAction)installMameComponents:(id)sender {
+
+      
+      /* install the mame data components. */
+      NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
+      NSBundle *bundle = [NSBundle mainBundle];
+      NSURL *sd = SupportDirectory();
+
+      NSURL *ample_url = [sd URLByAppendingPathComponent: @"Ample.plist"];
+      NSMutableDictionary *d = [NSMutableDictionary dictionaryWithContentsOfURL: ample_url];
+      
+      //NSDate *oldDate = [d objectForKey: kMameComponentsDate];
+      NSDate *newDate = [defaults objectForKey: kMameComponentsDate];
+      if (![newDate isKindOfClass: [NSDate class]])
+          newDate = nil;
+      
+      NSString *path = [bundle pathForResource: @"mame-data" ofType: @"tgz"];
+      if (!path) return; // Ample Lite?
+
+      
+      NSWindow *win = _installWindow;
+      [win makeKeyAndOrderFront: nil];
+      NSTask *task = [NSTask new];
+      NSArray *argv = @[
+          @"xfz",
+          path
+      ];
+      if (@available(macOS 10.13, *)) {
+          [task setExecutableURL: [NSURL fileURLWithPath: @"/usr/bin/tar"]];
+          [task setCurrentDirectoryURL: sd];
+      } else {
+          [task setLaunchPath:  @"/usr/bin/tar"];
+          [task setCurrentDirectoryPath: SupportDirectoryPath()];
+      }
+      [task setArguments: argv];
+
+      
+      //dispatch_time_t when = dispatch_time(DISPATCH_TIME_NOW, (int64_t)(2 * NSEC_PER_SEC));
+      [task setTerminationHandler: ^(NSTask *task){
+
+          int st = [task terminationStatus];
+          dispatch_async(dispatch_get_main_queue(), ^{
+    
+              if (st) {
+                  NSAlert *alert = [NSAlert new];
+                  [alert setMessageText: @"An error occurred extracting MAME components"];
+                  [alert runModal];
+                  [win close];
+                  return;
+              }
+              
+              if (d) {
+                  [d setObject: newDate forKey: kMameComponentsDate];
+                  [d writeToURL: ample_url atomically: YES];
+              } else {
+                  [@{ kMameComponentsDate: newDate } writeToURL: ample_url atomically: YES];
+              }
+              [win close];
+              // need to reload the software list data.
+          });
+          
+      }];
+      [task launch];
+    
+}
+
@end
@@ -11,7 +11,7 @@


 /*
- 
+
 Todo --
 - when there is a value, can filter the list by only including header items and the selected value
 - draw inactive menu items
@@ -21,7 +21,7 @@ Todo --
 - 1. it's not moved someplace more appropriate when the size shrinks
 - 2. it should display to the left or right in that case.
 - need to know parent's frame.
- 
+
 - fuzzy search - minimum distance between letters?
 */

@@ -0,0 +1,223 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="19529" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+    <dependencies>
+        <deployment identifier="macosx"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="19529"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <customObject id="-2" userLabel="File's Owner" customClass="BookmarkWindowController">
+            <connections>
+                <outlet property="arrayController" destination="7gA-MI-adT" id="XJ0-qj-ho5"/>
+                <outlet property="bookmarkManager" destination="Ryd-Nr-sPf" id="LM4-IP-ehb"/>
+                <outlet property="tableView" destination="mkQ-pQ-kXu" id="jqC-GF-vrE"/>
+                <outlet property="window" destination="QvC-M9-y7g" id="ovK-qY-XrZ"/>
+            </connections>
+        </customObject>
+        <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
+        <customObject id="-3" userLabel="Application" customClass="NSObject"/>
+        <window title="Bookmarks" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" animationBehavior="default" id="QvC-M9-y7g">
+            <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES"/>
+            <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
+            <rect key="contentRect" x="196" y="240" width="400" height="450"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="1920" height="1055"/>
+            <view key="contentView" wantsLayer="YES" id="EiT-Mj-1SZ">
+                <rect key="frame" x="0.0" y="0.0" width="400" height="450"/>
+                <autoresizingMask key="autoresizingMask"/>
+                <subviews>
+                    <scrollView fixedFrame="YES" autohidesScrollers="YES" horizontalLineScroll="19" horizontalPageScroll="10" verticalLineScroll="19" verticalPageScroll="10" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="cgh-jG-i97">
+                        <rect key="frame" x="-1" y="-1" width="402" height="452"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <clipView key="contentView" id="xDr-v4-sVR">
+                            <rect key="frame" x="1" y="1" width="400" height="450"/>
+                            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                            <subviews>
+                                <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="firstColumnOnly" columnReordering="NO" columnSelection="YES" columnResizing="NO" multipleSelection="NO" autosaveColumns="NO" rowSizeStyle="automatic" headerView="hmS-CB-Huq" viewBased="YES" id="mkQ-pQ-kXu">
+                                    <rect key="frame" x="0.0" y="0.0" width="400" height="425"/>
+                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                                    <size key="intercellSpacing" width="3" height="2"/>
+                                    <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                    <color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
+                                    <tableColumns>
+                                        <tableColumn width="232" minWidth="40" maxWidth="1000" id="U9x-dw-Kd3">
+                                            <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" title="Name">
+                                                <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
+                                                <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
+                                            </tableHeaderCell>
+                                            <textFieldCell key="dataCell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" title="Text Cell" id="jIY-mU-1gw">
+                                                <font key="font" metaFont="system"/>
+                                                <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+                                                <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                            </textFieldCell>
+                                            <sortDescriptor key="sortDescriptorPrototype" selector="caseInsensitiveCompare:" sortKey="name"/>
+                                            <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
+                                            <prototypeCellViews>
+                                                <tableCellView id="R8h-Wj-cHA">
+                                                    <rect key="frame" x="1" y="1" width="237" height="17"/>
+                                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                                                    <subviews>
+                                                        <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="cIh-ya-lB0">
+                                                            <rect key="frame" x="0.0" y="0.0" width="237" height="17"/>
+                                                            <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
+                                                            <textFieldCell key="cell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" title="Table View Cell" id="a7b-vf-Kzd">
+                                                                <font key="font" metaFont="system"/>
+                                                                <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+                                                                <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+                                                            </textFieldCell>
+                                                            <connections>
+                                                                <binding destination="R8h-Wj-cHA" name="value" keyPath="objectValue.name" id="UWc-85-Ghw">
+                                                                    <dictionary key="options">
+                                                                        <bool key="NSValidatesImmediately" value="YES"/>
+                                                                    </dictionary>
+                                                                </binding>
+                                                            </connections>
+                                                        </textField>
+                                                    </subviews>
+                                                    <connections>
+                                                        <outlet property="textField" destination="cIh-ya-lB0" id="DMK-Kc-RpK"/>
+                                                    </connections>
+                                                </tableCellView>
+                                            </prototypeCellViews>
+                                        </tableColumn>
+                                        <tableColumn editable="NO" width="100" minWidth="100" maxWidth="100" id="fvh-YG-X9R">
+                                            <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Machine">
+                                                <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
+                                                <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                            </tableHeaderCell>
+                                            <textFieldCell key="dataCell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" alignment="left" title="Text Cell" id="waa-dh-M0V">
+                                                <font key="font" metaFont="system"/>
+                                                <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+                                                <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                            </textFieldCell>
+                                            <sortDescriptor key="sortDescriptorPrototype" selector="compare:" sortKey="machine"/>
+                                            <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
+                                            <prototypeCellViews>
+                                                <tableCellView id="LUd-BZ-Kpw">
+                                                    <rect key="frame" x="241" y="1" width="100" height="17"/>
+                                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                                                    <subviews>
+                                                        <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="4Qd-Zj-XZi">
+                                                            <rect key="frame" x="0.0" y="0.0" width="100" height="17"/>
+                                                            <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
+                                                            <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Table View Cell" id="ztJ-V1-N1t">
+                                                                <font key="font" metaFont="system"/>
+                                                                <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+                                                                <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+                                                            </textFieldCell>
+                                                            <connections>
+                                                                <binding destination="LUd-BZ-Kpw" name="value" keyPath="objectValue.machine" id="IYK-LP-fHo"/>
+                                                            </connections>
+                                                        </textField>
+                                                    </subviews>
+                                                    <connections>
+                                                        <outlet property="textField" destination="4Qd-Zj-XZi" id="u3u-3q-Vc2"/>
+                                                    </connections>
+                                                </tableCellView>
+                                            </prototypeCellViews>
+                                        </tableColumn>
+                                        <tableColumn editable="NO" width="50" minWidth="50" maxWidth="50" id="rmr-1r-2Cb">
+                                            <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Default">
+                                                <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
+                                                <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                            </tableHeaderCell>
+                                            <textFieldCell key="dataCell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" alignment="left" title="Text Cell" id="zuw-8H-5ck">
+                                                <font key="font" metaFont="system"/>
+                                                <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+                                                <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                            </textFieldCell>
+                                            <sortDescriptor key="sortDescriptorPrototype" selector="compare:" sortKey="automatic"/>
+                                            <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
+                                            <prototypeCellViews>
+                                                <tableCellView id="f3C-qX-bVY">
+                                                    <rect key="frame" x="344" y="1" width="54" height="17"/>
+                                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                                                    <subviews>
+                                                        <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="LzD-ps-EdD">
+                                                            <rect key="frame" x="19" y="1" width="16" height="16"/>
+                                                            <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
+                                                            <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="NSStatusAvailable" id="kH7-IH-D1y"/>
+                                                            <connections>
+                                                                <binding destination="f3C-qX-bVY" name="hidden" keyPath="objectValue.automatic" id="izX-1f-EU8">
+                                                                    <dictionary key="options">
+                                                                        <string key="NSValueTransformerName">NSNegateBoolean</string>
+                                                                    </dictionary>
+                                                                </binding>
+                                                            </connections>
+                                                        </imageView>
+                                                    </subviews>
+                                                    <connections>
+                                                        <outlet property="imageView" destination="LzD-ps-EdD" id="hef-CI-Ly8"/>
+                                                    </connections>
+                                                </tableCellView>
+                                            </prototypeCellViews>
+                                        </tableColumn>
+                                    </tableColumns>
+                                    <connections>
+                                        <action trigger="doubleAction" selector="doubleClick:" target="-2" id="VaT-3X-cCf"/>
+                                        <binding destination="7gA-MI-adT" name="content" keyPath="arrangedObjects" id="5So-FR-r94"/>
+                                        <outlet property="dataSource" destination="-2" id="kso-yU-XdI"/>
+                                        <outlet property="delegate" destination="-2" id="Lyf-Wr-8w0"/>
+                                        <outlet property="menu" destination="cH2-L7-ScC" id="3MS-Tc-P04"/>
+                                    </connections>
+                                </tableView>
+                            </subviews>
+                        </clipView>
+                        <scroller key="horizontalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="YES" id="O1o-6N-F5z">
+                            <rect key="frame" x="-100" y="-100" width="223" height="15"/>
+                            <autoresizingMask key="autoresizingMask"/>
+                        </scroller>
+                        <scroller key="verticalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="NO" id="3n8-lN-RGL">
+                            <rect key="frame" x="224" y="17" width="15" height="102"/>
+                            <autoresizingMask key="autoresizingMask"/>
+                        </scroller>
+                        <tableHeaderView key="headerView" wantsLayer="YES" id="hmS-CB-Huq">
+                            <rect key="frame" x="0.0" y="0.0" width="400" height="25"/>
+                            <autoresizingMask key="autoresizingMask"/>
+                        </tableHeaderView>
+                    </scrollView>
+                </subviews>
+            </view>
+            <connections>
+                <outlet property="delegate" destination="-2" id="4OM-KB-CAh"/>
+            </connections>
+            <point key="canvasLocation" x="-72" y="91"/>
+        </window>
+        <arrayController mode="entity" entityName="Bookmark" automaticallyPreparesContent="YES" preservesSelection="NO" selectsInsertedObjects="NO" avoidsEmptySelection="NO" clearsFilterPredicateOnInsertion="NO" id="7gA-MI-adT">
+            <connections>
+                <binding destination="Ryd-Nr-sPf" name="managedObjectContext" keyPath="managedObjectContext" id="hMi-JG-LQC"/>
+                <binding destination="-2" name="selectionIndexes" keyPath="tableView.selectedRowIndexes" id="dyb-Wv-Duo"/>
+                <binding destination="-2" name="sortDescriptors" keyPath="tableView.sortDescriptors" previousBinding="dyb-Wv-Duo" id="fkc-Yv-ZLN"/>
+            </connections>
+        </arrayController>
+        <customObject id="Ryd-Nr-sPf" customClass="BookmarkManagerProxy"/>
+        <menu id="cH2-L7-ScC">
+            <items>
+                <menuItem title="Set Default" id="JGR-HC-oCO">
+                    <modifierMask key="keyEquivalentModifierMask"/>
+                    <connections>
+                        <action selector="setDefault:" target="-2" id="QQK-aI-l2p"/>
+                    </connections>
+                </menuItem>
+                <menuItem title="Clear Default" id="ulz-3z-Pgl">
+                    <modifierMask key="keyEquivalentModifierMask"/>
+                    <connections>
+                        <action selector="clearDefault:" target="-2" id="mIc-UM-kj0"/>
+                    </connections>
+                </menuItem>
+                <menuItem title="Delete" id="B7V-fY-Cbe">
+                    <modifierMask key="keyEquivalentModifierMask"/>
+                    <connections>
+                        <action selector="deleteBookmark:" target="-2" id="zQl-vg-Eg4"/>
+                    </connections>
+                </menuItem>
+            </items>
+            <connections>
+                <outlet property="delegate" destination="-2" id="raV-YO-2UW"/>
+            </connections>
+            <point key="canvasLocation" x="355" y="-28"/>
+        </menu>
+    </objects>
+    <resources>
+        <image name="NSStatusAvailable" width="16" height="16"/>
+    </resources>
+</document>
@@ -33,6 +33,15 @@ Please note that MAME is a registered trademark of Gregory Ember, and permission
 \cf0 \cb1 \kerning1\expnd0\expndtw0 SDL 2.0 is distributed under the {\field{\*\fldinst{HYPERLINK "https://libsdl.org/license.php"}}{\fldrslt zlib license}}. This license allows you to use SDL freely in any software.\
 \
 \pard\pardeftab720\qc\partightenfactor0
+{\field{\*\fldinst{HYPERLINK "https://sparkle-project.org/"}}{\fldrslt 
+\f0\b\fs36 \cf0 \cb3 \expnd0\expndtw0\kerning0
+Sparkle}}\
+\pard\pardeftab720\partightenfactor0
+\cf0 \
+Sparkle is open source software available under the permissive MIT license, and is developed on GitHub by the Sparkle Project with the help of dozens of valued contributors.\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\partightenfactor0
+\cf0 \
+\pard\pardeftab720\qc\partightenfactor0
 {\field{\*\fldinst{HYPERLINK "https://usdawatercolors.nal.usda.gov/pom/catalog.xhtml?id=POM00001916"}}{\fldrslt 
 \f0\b\fs36 \cf0 \cb3 \expnd0\expndtw0\kerning0
 Icon}}
@@ -42,6 +51,6 @@ Icon}}

 \f1\b0\fs28 \cf0 \
 \pard\pardeftab720\qj\partightenfactor0
-\cf4 \cb3 R.C. Steadman, 6-1-\'9221.\
+\cf4 R.C. Steadman, 1921-06-01.\
 \
 U.S. Department of Agriculture Pomological Watercolor Collection. Rare and Special Collections, National Agricultural Library, Beltsville, MD 20705}
@@ -1,138 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="15705" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="19529" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
    <dependencies>
        <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="15705"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="19529"/>
        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
    </dependencies>
    <objects>
        <customObject id="-2" userLabel="File's Owner" customClass="DiskImagesWindowController">
            <connections>
-                <outlet property="arrayController" destination="vmp-9h-Z5R" id="WYF-Xq-BnN"/>
-                <outlet property="tableView" destination="J5l-1d-030" id="3hU-ho-1ag"/>
-                <outlet property="window" destination="R7r-B9-Bw0" id="hDE-Qa-m4g"/>
+                <outlet property="arrayController" destination="YmL-8S-msS" id="Pva-sz-XFI"/>
+                <outlet property="tableView" destination="cqO-ig-A9t" id="hbI-ho-WYj"/>
+                <outlet property="window" destination="AtY-lA-KIp" id="aaq-cR-kq8"/>
            </connections>
        </customObject>
        <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
        <customObject id="-3" userLabel="Application" customClass="NSObject"/>
-        <window title="Recent Disk Images" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" frameAutosaveName="RecentDiskImagesWindow" animationBehavior="default" titlebarAppearsTransparent="YES" id="R7r-B9-Bw0" customClass="NSPanel">
-            <windowStyleMask key="styleMask" titled="YES" closable="YES"/>
-            <windowPositionMask key="initialPositionMask" rightStrut="YES"/>
-            <rect key="contentRect" x="200" y="172" width="300" height="400"/>
-            <rect key="screenRect" x="0.0" y="0.0" width="2560" height="1417"/>
-            <view key="contentView" focusRingType="none" id="Kkg-Tp-4m1">
-                <rect key="frame" x="0.0" y="0.0" width="300" height="400"/>
-                <autoresizingMask key="autoresizingMask"/>
-                <subviews>
-                    <scrollView focusRingType="none" fixedFrame="YES" borderType="none" autohidesScrollers="YES" horizontalLineScroll="24" horizontalPageScroll="10" verticalLineScroll="24" verticalPageScroll="10" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" findBarPosition="belowContent" translatesAutoresizingMaskIntoConstraints="NO" id="ivr-XT-BPS">
-                        <rect key="frame" x="-1" y="-1" width="302" height="402"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <clipView key="contentView" ambiguous="YES" drawsBackground="NO" copiesOnScroll="NO" id="1jn-uc-06s">
-                            <rect key="frame" x="0.0" y="0.0" width="302" height="402"/>
-                            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                            <subviews>
-                                <tableView focusRingType="none" verticalHuggingPriority="750" ambiguous="YES" allowsExpansionToolTips="YES" columnAutoresizingStyle="none" columnReordering="NO" columnResizing="NO" multipleSelection="NO" emptySelection="NO" autosaveColumns="NO" typeSelect="NO" rowHeight="22" rowSizeStyle="automatic" viewBased="YES" id="J5l-1d-030">
-                                    <rect key="frame" x="0.0" y="0.0" width="302" height="402"/>
-                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                                    <size key="intercellSpacing" width="3" height="2"/>
-                                    <color key="backgroundColor" white="1" alpha="0.0" colorSpace="custom" customColorSpace="calibratedWhite"/>
-                                    <color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
-                                    <tableColumns>
-                                        <tableColumn width="282" minWidth="40" maxWidth="1000" id="1rF-M3-pYV">
-                                            <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border">
-                                                <font key="font" metaFont="smallSystem"/>
-                                                <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
-                                                <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
-                                            </tableHeaderCell>
-                                            <textFieldCell key="dataCell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" title="Text Cell" id="erY-fh-OHK">
-                                                <font key="font" metaFont="system"/>
-                                                <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
-                                                <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
-                                            </textFieldCell>
-                                            <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
-                                            <prototypeCellViews>
-                                                <tableCellView id="AJH-gH-E8G">
-                                                    <rect key="frame" x="1" y="1" width="282" height="22"/>
-                                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                                                    <subviews>
-                                                        <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" textCompletion="NO" translatesAutoresizingMaskIntoConstraints="NO" id="esO-OR-AcY">
-                                                            <rect key="frame" x="6" y="5" width="196" height="17"/>
-                                                            <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
-                                                            <textFieldCell key="cell" lineBreakMode="truncatingMiddle" sendsActionOnEndEditing="YES" title="Image Name.2mg" id="xgc-u7-sFX">
-                                                                <font key="font" metaFont="system"/>
-                                                                <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
-                                                                <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
-                                                            </textFieldCell>
-                                                            <connections>
-                                                                <binding destination="AJH-gH-E8G" name="value" keyPath="objectValue.path" id="S0h-hl-OPM">
-                                                                    <dictionary key="options">
-                                                                        <string key="NSValueTransformerName">FilePathTransformer</string>
-                                                                    </dictionary>
-                                                                </binding>
-                                                                <binding destination="AJH-gH-E8G" name="toolTip" keyPath="objectValue.path" id="gXq-2p-MpM"/>
-                                                            </connections>
-                                                        </textField>
-                                                        <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" textCompletion="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Wzl-mV-Pmp">
-                                                            <rect key="frame" x="206" y="3" width="75" height="17"/>
-                                                            <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMinY="YES"/>
-                                                            <textFieldCell key="cell" lineBreakMode="truncatingMiddle" sendsActionOnEndEditing="YES" alignment="right" title="32MB" id="QYB-us-igD">
-                                                                <font key="font" metaFont="smallSystem"/>
-                                                                <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
-                                                                <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
-                                                            </textFieldCell>
-                                                            <connections>
-                                                                <binding destination="AJH-gH-E8G" name="value" keyPath="objectValue.size" id="omG-8X-flx">
-                                                                    <dictionary key="options">
-                                                                        <string key="NSValueTransformerName">FileSizeTransformer</string>
-                                                                    </dictionary>
-                                                                </binding>
-                                                            </connections>
-                                                        </textField>
-                                                    </subviews>
-                                                    <connections>
-                                                        <outlet property="textField" destination="esO-OR-AcY" id="9mX-Yt-vpg"/>
-                                                    </connections>
-                                                </tableCellView>
-                                            </prototypeCellViews>
-                                            <connections>
-                                                <binding destination="vmp-9h-Z5R" name="value" keyPath="arrangedObjects.selection" id="32X-Ez-K7S"/>
-                                            </connections>
-                                        </tableColumn>
-                                    </tableColumns>
-                                    <connections>
-                                        <binding destination="vmp-9h-Z5R" name="content" keyPath="arrangedObjects" id="GHn-tz-ash"/>
-                                        <outlet property="dataSource" destination="-2" id="PRV-Rt-UuC"/>
-                                        <outlet property="delegate" destination="-2" id="WuV-c9-o5I"/>
-                                        <outlet property="menu" destination="bCS-1z-UOZ" id="UCb-2v-WrM"/>
-                                    </connections>
-                                </tableView>
-                            </subviews>
-                            <color key="backgroundColor" name="windowBackgroundColor" catalog="System" colorSpace="catalog"/>
-                        </clipView>
-                        <scroller key="horizontalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="YES" id="ynD-Kb-eb3">
-                            <rect key="frame" x="-100" y="-100" width="223" height="15"/>
-                            <autoresizingMask key="autoresizingMask"/>
-                        </scroller>
-                        <scroller key="verticalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="NO" id="Dbq-yF-MKx" customClass="TransparentScroller">
-                            <rect key="frame" x="224" y="17" width="15" height="102"/>
-                            <autoresizingMask key="autoresizingMask"/>
-                            <userDefinedRuntimeAttributes>
-                                <userDefinedRuntimeAttribute type="color" keyPath="backgroundColor">
-                                    <color key="value" name="windowBackgroundColor" catalog="System" colorSpace="catalog"/>
-                                </userDefinedRuntimeAttribute>
-                            </userDefinedRuntimeAttributes>
-                        </scroller>
-                    </scrollView>
-                </subviews>
-            </view>
+        <customObject id="stE-9g-lJ2" customClass="BookmarkManagerProxy"/>
+        <arrayController mode="entity" entityName="DiskImage" automaticallyPreparesContent="YES" avoidsEmptySelection="NO" automaticallyRearrangesObjects="YES" id="YmL-8S-msS">
            <connections>
-                <outlet property="delegate" destination="-2" id="1Hn-2t-Vzj"/>
-            </connections>
-            <point key="canvasLocation" x="-188" y="143"/>
-        </window>
-        <arrayController id="vmp-9h-Z5R">
-            <connections>
-                <binding destination="-2" name="contentArray" keyPath="self.content" id="UTv-za-ry7"/>
+                <binding destination="stE-9g-lJ2" name="managedObjectContext" keyPath="managedObjectContext" id="GyD-kH-DBa"/>
            </connections>
        </arrayController>
        <menu id="bCS-1z-UOZ">
@@ -155,5 +41,159 @@
            </connections>
            <point key="canvasLocation" x="-667" y="170"/>
        </menu>
+        <window title="Recent Disk Images" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" frameAutosaveName="RecentDiskImagesWindow" animationBehavior="default" id="AtY-lA-KIp">
+            <windowStyleMask key="styleMask" titled="YES" closable="YES"/>
+            <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
+            <rect key="contentRect" x="283" y="305" width="408" height="270"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="1920" height="1055"/>
+            <view key="contentView" id="zHI-2R-bOe">
+                <rect key="frame" x="0.0" y="0.0" width="408" height="270"/>
+                <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                <subviews>
+                    <scrollView fixedFrame="YES" autohidesScrollers="YES" horizontalLineScroll="19" horizontalPageScroll="10" verticalLineScroll="19" verticalPageScroll="10" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="a3G-Wf-K8I">
+                        <rect key="frame" x="-1" y="-1" width="410" height="272"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <clipView key="contentView" id="SFr-s6-6di">
+                            <rect key="frame" x="1" y="1" width="408" height="270"/>
+                            <autoresizingMask key="autoresizingMask"/>
+                            <subviews>
+                                <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" columnSelection="YES" multipleSelection="NO" autosaveColumns="NO" rowSizeStyle="automatic" headerView="iwP-JL-O3g" viewBased="YES" id="cqO-ig-A9t">
+                                    <rect key="frame" x="0.0" y="0.0" width="408" height="245"/>
+                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                                    <size key="intercellSpacing" width="3" height="2"/>
+                                    <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                    <color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
+                                    <tableColumns>
+                                        <tableColumn width="300" minWidth="40" maxWidth="1000" id="k9E-Si-iTY">
+                                            <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" title="Name">
+                                                <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
+                                                <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
+                                            </tableHeaderCell>
+                                            <textFieldCell key="dataCell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" title="Text Cell" id="trJ-af-d0b">
+                                                <font key="font" metaFont="system"/>
+                                                <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+                                                <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                            </textFieldCell>
+                                            <sortDescriptor key="sortDescriptorPrototype" selector="caseInsensitiveCompare:" sortKey="name"/>
+                                            <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
+                                            <prototypeCellViews>
+                                                <tableCellView id="2Ic-UI-Je3">
+                                                    <rect key="frame" x="1" y="1" width="305" height="17"/>
+                                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                                                    <subviews>
+                                                        <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="gkM-KB-x76">
+                                                            <rect key="frame" x="0.0" y="0.0" width="305" height="17"/>
+                                                            <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
+                                                            <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="PitchDark.2mg" id="Wcg-zo-CeN">
+                                                                <font key="font" metaFont="system"/>
+                                                                <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+                                                                <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+                                                            </textFieldCell>
+                                                            <connections>
+                                                                <binding destination="2Ic-UI-Je3" name="value" keyPath="objectValue.name" id="FAu-HR-0jF"/>
+                                                                <binding destination="2Ic-UI-Je3" name="toolTip" keyPath="objectValue.path" id="0MM-sv-mET"/>
+                                                            </connections>
+                                                        </textField>
+                                                    </subviews>
+                                                    <connections>
+                                                        <outlet property="textField" destination="gkM-KB-x76" id="tpG-TS-sXI"/>
+                                                    </connections>
+                                                </tableCellView>
+                                            </prototypeCellViews>
+                                        </tableColumn>
+                                        <tableColumn width="93" minWidth="40" maxWidth="1000" id="0aJ-xJ-YSS">
+                                            <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" title="Size">
+                                                <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
+                                                <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
+                                            </tableHeaderCell>
+                                            <textFieldCell key="dataCell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" title="Text Cell" id="jRd-9Y-U6W">
+                                                <font key="font" metaFont="system"/>
+                                                <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+                                                <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                            </textFieldCell>
+                                            <sortDescriptor key="sortDescriptorPrototype" selector="compare:" sortKey="size"/>
+                                            <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
+                                            <prototypeCellViews>
+                                                <tableCellView id="UW9-AF-U9F">
+                                                    <rect key="frame" x="309" y="1" width="97" height="17"/>
+                                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                                                    <subviews>
+                                                        <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="6Ry-Zn-euh">
+                                                            <rect key="frame" x="0.0" y="0.0" width="97" height="17"/>
+                                                            <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
+                                                            <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="32 MB" id="fXp-OZ-Qcu">
+                                                                <font key="font" metaFont="system"/>
+                                                                <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+                                                                <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+                                                            </textFieldCell>
+                                                            <connections>
+                                                                <binding destination="UW9-AF-U9F" name="value" keyPath="objectValue.size" id="Hca-7L-QN7">
+                                                                    <dictionary key="options">
+                                                                        <string key="NSValueTransformerName">FileSizeTransformer</string>
+                                                                    </dictionary>
+                                                                </binding>
+                                                            </connections>
+                                                        </textField>
+                                                    </subviews>
+                                                    <connections>
+                                                        <outlet property="textField" destination="6Ry-Zn-euh" id="vUm-0h-5qV"/>
+                                                    </connections>
+                                                </tableCellView>
+                                            </prototypeCellViews>
+                                        </tableColumn>
+                                    </tableColumns>
+                                    <connections>
+                                        <action trigger="doubleAction" selector="doubleClick:" target="-2" id="wdp-Ek-Olo"/>
+                                        <binding destination="YmL-8S-msS" name="content" keyPath="arrangedObjects" id="v56-YR-Qve"/>
+                                        <binding destination="YmL-8S-msS" name="sortDescriptors" keyPath="sortDescriptors" previousBinding="v56-YR-Qve" id="BGa-9c-RdD"/>
+                                        <outlet property="dataSource" destination="-2" id="gCn-sa-fuX"/>
+                                        <outlet property="delegate" destination="-2" id="VHT-aS-4iS"/>
+                                        <outlet property="menu" destination="bCS-1z-UOZ" id="a2u-hd-hPS"/>
+                                    </connections>
+                                </tableView>
+                            </subviews>
+                        </clipView>
+                        <scroller key="horizontalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="YES" id="Z7O-AK-X5q">
+                            <rect key="frame" x="1" y="119" width="223" height="15"/>
+                            <autoresizingMask key="autoresizingMask"/>
+                        </scroller>
+                        <scroller key="verticalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" doubleValue="1" horizontal="NO" id="OLa-ra-vIN">
+                            <rect key="frame" x="224" y="17" width="15" height="102"/>
+                            <autoresizingMask key="autoresizingMask"/>
+                        </scroller>
+                        <tableHeaderView key="headerView" id="iwP-JL-O3g">
+                            <rect key="frame" x="0.0" y="0.0" width="408" height="25"/>
+                            <autoresizingMask key="autoresizingMask"/>
+                        </tableHeaderView>
+                    </scrollView>
+                </subviews>
+            </view>
+            <toolbar key="toolbar" implicitIdentifier="D9701924-6955-47B8-A2FF-DBD466AAEB92" autosavesConfiguration="NO" allowsUserCustomization="NO" displayMode="iconOnly" sizeMode="regular" id="Gp6-Kl-lr2">
+                <allowedToolbarItems>
+                    <toolbarItem implicitItemIdentifier="NSToolbarFlexibleSpaceItem" id="lBE-ee-rCy"/>
+                    <toolbarItem implicitItemIdentifier="C346E56F-4480-4D8A-8485-33A3A51D7B78" label="" paletteLabel="Filter" sizingBehavior="auto" id="DsU-uu-UmZ">
+                        <nil key="toolTip"/>
+                        <searchField key="view" wantsLayer="YES" verticalHuggingPriority="750" textCompletion="NO" id="qHV-IA-ysc">
+                            <rect key="frame" x="0.0" y="14" width="96" height="22"/>
+                            <autoresizingMask key="autoresizingMask"/>
+                            <searchFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" continuous="YES" borderStyle="bezel" placeholderString="Filter" usesSingleLineMode="YES" bezelStyle="round" id="BWo-eC-ahz">
+                                <font key="font" metaFont="system"/>
+                                <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+                                <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                            </searchFieldCell>
+                            <connections>
+                                <action selector="filter:" target="-2" id="KhW-DS-b8s"/>
+                            </connections>
+                        </searchField>
+                    </toolbarItem>
+                </allowedToolbarItems>
+                <defaultToolbarItems>
+                    <toolbarItem reference="lBE-ee-rCy"/>
+                    <toolbarItem reference="lBE-ee-rCy"/>
+                    <toolbarItem reference="DsU-uu-UmZ"/>
+                </defaultToolbarItems>
+            </toolbar>
+            <point key="canvasLocation" x="-196" y="513"/>
+        </window>
    </objects>
 </document>
@@ -61,7 +61,7 @@
                                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                    <subviews>
                                                        <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="A44-us-TEl">
-                                                            <rect key="frame" x="25" y="28" width="425" height="17"/>
+                                                            <rect key="frame" x="41" y="28" width="409" height="17"/>
                                                            <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
                                                            <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Table View Cell" id="NSU-6I-nsG">
                                                                <font key="font" metaFont="system"/>
@@ -78,21 +78,11 @@
                                                                    </dictionary>
                                                                </binding>
                                                                <binding destination="onK-6l-2iV" name="textColor" keyPath="objectValue.titleColor" id="0Qx-rz-DEZ"/>
+                                                                <binding destination="onK-6l-2iV" name="toolTip" keyPath="objectValue.value" id="rUb-Jb-KbT"/>
                                                            </connections>
                                                        </textField>
-                                                        <progressIndicator wantsLayer="YES" fixedFrame="YES" maxValue="100" displayedWhenStopped="NO" indeterminate="YES" controlSize="small" style="spinning" translatesAutoresizingMaskIntoConstraints="NO" id="jBN-UJ-tWi">
-                                                            <rect key="frame" x="3" y="29" width="16" height="16"/>
-                                                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                                                            <connections>
-                                                                <binding destination="onK-6l-2iV" name="animate" keyPath="objectValue.task" id="d22-JL-3Z7">
-                                                                    <dictionary key="options">
-                                                                        <string key="NSValueTransformerName">NSIsNotNil</string>
-                                                                    </dictionary>
-                                                                </binding>
-                                                            </connections>
-                                                        </progressIndicator>
                                                        <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="hfu-hP-QAH">
-                                                            <rect key="frame" x="25" y="3" width="425" height="17"/>
+                                                            <rect key="frame" x="41" y="3" width="409" height="17"/>
                                                            <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
                                                            <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Table View Cell" id="1cQ-Zh-q0o">
                                                                <font key="font" metaFont="system" size="10"/>
@@ -104,6 +94,17 @@
                                                                <binding destination="onK-6l-2iV" name="value" keyPath="objectValue.statusDescription" id="yV1-5r-YDh"/>
                                                            </connections>
                                                        </textField>
+                                                        <progressIndicator wantsLayer="YES" fixedFrame="YES" maxValue="100" displayedWhenStopped="NO" indeterminate="YES" style="spinning" translatesAutoresizingMaskIntoConstraints="NO" id="jBN-UJ-tWi">
+                                                            <rect key="frame" x="3" y="9" width="32" height="32"/>
+                                                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
+                                                            <connections>
+                                                                <binding destination="onK-6l-2iV" name="animate" keyPath="objectValue.task" id="d22-JL-3Z7">
+                                                                    <dictionary key="options">
+                                                                        <string key="NSValueTransformerName">NSIsNotNil</string>
+                                                                    </dictionary>
+                                                                </binding>
+                                                            </connections>
+                                                        </progressIndicator>
                                                    </subviews>
                                                    <connections>
                                                        <outlet property="textField" destination="A44-us-TEl" id="ude-er-Gm4"/>
@@ -297,6 +298,12 @@
                        <action selector="showInFinder:" target="-2" id="ltL-yL-7EP"/>
                    </connections>
                </menuItem>
+                <menuItem title="Move to Trash" id="x1Q-OF-5hM">
+                    <modifierMask key="keyEquivalentModifierMask"/>
+                    <connections>
+                        <action selector="moveToTrash:" target="-2" id="swr-yf-hA2"/>
+                    </connections>
+                </menuItem>
                <menuItem title="Download" tag="2" id="ree-Zg-jYB">
                    <modifierMask key="keyEquivalentModifierMask"/>
                    <connections>
@@ -9,6 +9,7 @@
        <customObject id="-2" userLabel="File's Owner" customClass="LaunchWindowController">
            <connections>
                <outlet property="addBookmarkWindow" destination="yIt-hP-HBq" id="Qhx-WV-cg4"/>
+                <outlet property="bookmarkErrorField" destination="RiJ-Xw-sgW" id="6y5-Fo-AnM"/>
                <outlet property="bookmarkTextField" destination="fAl-Vn-x1w" id="GNr-j6-BiQ"/>
                <outlet property="machineView" destination="oVt-eD-aaj" id="Q9V-Kr-6GN"/>
                <outlet property="machineViewController" destination="FSD-3v-Wni" id="tXv-zJ-QO3"/>
@@ -31,7 +32,7 @@
                <autoresizingMask key="autoresizingMask"/>
                <subviews>
                    <customView id="P9d-sS-qEb" customClass="FlippedView">
-                        <rect key="frame" x="302" y="105" width="316" height="363"/>
+                        <rect key="frame" x="302" y="105" width="326" height="363"/>
                        <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
                    </customView>
                    <tabView initialItem="zUN-Qs-haG" id="l8R-bg-6Zm">
@@ -118,6 +119,9 @@
                                                        <menuItem title="LCD Grid" tag="5" id="A6k-ku-z2M">
                                                            <modifierMask key="keyEquivalentModifierMask"/>
                                                        </menuItem>
+                                                        <menuItem title="Fighters" id="1aA-ge-f8R">
+                                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                                        </menuItem>
                                                    </items>
                                                </menu>
                                            </popUpButtonCell>
@@ -237,6 +241,17 @@
                                                <binding destination="-2" name="selectedTag" keyPath="self.mameSpeed" id="nFG-yA-KC1"/>
                                            </connections>
                                        </popUpButton>
+                                        <button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="knB-Rn-1Cm">
+                                            <rect key="frame" x="15" y="40" width="67" height="18"/>
+                                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                                            <buttonCell key="cell" type="check" title="Rewind" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="Y7b-jN-HCc">
+                                                <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+                                                <font key="font" metaFont="system"/>
+                                            </buttonCell>
+                                            <connections>
+                                                <binding destination="-2" name="value" keyPath="self.mameRewind" id="Hw5-n7-O27"/>
+                                            </connections>
+                                        </button>
                                    </subviews>
                                </view>
                            </tabViewItem>
@@ -386,7 +401,7 @@
                        </connections>
                    </tabView>
                    <customView fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="J9O-xI-P5J" customClass="FlippedView">
-                        <rect key="frame" x="664" y="107" width="316" height="331"/>
+                        <rect key="frame" x="654" y="107" width="326" height="331"/>
                        <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
                    </customView>
                    <scrollView borderType="none" autohidesScrollers="YES" horizontalLineScroll="10" horizontalPageScroll="10" verticalLineScroll="10" verticalPageScroll="10" hasHorizontalScroller="NO" horizontalScrollElasticity="none" id="2ue-XT-byh">
@@ -424,7 +439,7 @@
                        </scroller>
                    </scrollView>
                    <searchField wantsLayer="YES" verticalHuggingPriority="750" textCompletion="NO" id="pNl-g4-ZLh" customClass="AutocompleteControl">
-                        <rect key="frame" x="664" y="446" width="316" height="22"/>
+                        <rect key="frame" x="654" y="446" width="326" height="22"/>
                        <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
                        <searchFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" borderStyle="bezel" placeholderString="Software List" usesSingleLineMode="YES" bezelStyle="round" id="sMi-a3-XEn">
                            <font key="font" metaFont="system"/>
@@ -433,11 +448,6 @@
                        </searchFieldCell>
                        <connections>
                            <action selector="softwareChanged:" target="-2" id="879-da-UEc"/>
-                            <binding destination="-2" name="hidden" keyPath="machine" id="RdE-9k-oFd">
-                                <dictionary key="options">
-                                    <string key="NSValueTransformerName">NSIsNil</string>
-                                </dictionary>
-                            </binding>
                        </connections>
                    </searchField>
                    <customView id="oVt-eD-aaj" customClass="FlippedView">
@@ -559,9 +569,29 @@ Gw
                            </binding>
                        </connections>
                    </textField>
+                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="RiJ-Xw-sgW">
+                        <rect key="frame" x="20" y="20" width="248" height="16"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
+                        <textFieldCell key="cell" lineBreakMode="clipping" title="Label" id="Ehz-4Z-Tjq">
+                            <font key="font" metaFont="system"/>
+                            <color key="textColor" name="systemRedColor" catalog="System" colorSpace="catalog"/>
+                            <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                        </textFieldCell>
+                    </textField>
+                    <button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="EFq-dZ-y90">
+                        <rect key="frame" x="378" y="79" width="66" height="18"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
+                        <buttonCell key="cell" type="check" title="Default" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="cOs-WH-9Dr">
+                            <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+                            <font key="font" metaFont="system"/>
+                        </buttonCell>
+                        <connections>
+                            <binding destination="-2" name="value" keyPath="bookmarkDefault" id="Oiv-hR-5fn"/>
+                        </connections>
+                    </button>
                </subviews>
            </view>
-            <point key="canvasLocation" x="130" y="70"/>
+            <point key="canvasLocation" x="-62" y="95"/>
        </window>
        <viewController nibName="MachineView" id="FSD-3v-Wni" customClass="NewMachineViewController"/>
        <menu id="Aa5-Sk-gZX">
@@ -573,6 +603,29 @@ Gw
                    </connections>
                </menuItem>
                <menuItem isSeparatorItem="YES" id="Iti-F9-p35"/>
+                <menuItem title="List Media…" id="M5h-4W-0nV">
+                    <modifierMask key="keyEquivalentModifierMask"/>
+                    <connections>
+                        <action selector="listMedia:" target="-2" id="IO7-MG-zud"/>
+                        <binding destination="-2" name="hidden" keyPath="optionKey" id="LhL-2l-iss">
+                            <dictionary key="options">
+                                <string key="NSValueTransformerName">NSNegateBoolean</string>
+                            </dictionary>
+                        </binding>
+                    </connections>
+                </menuItem>
+                <menuItem title="List Slots…" id="cNj-Sb-KkE">
+                    <modifierMask key="keyEquivalentModifierMask"/>
+                    <connections>
+                        <action selector="listSlots:" target="-2" id="3nb-mV-eUK"/>
+                        <binding destination="-2" name="hidden" keyPath="optionKey" id="dwp-Kn-LfC">
+                            <dictionary key="options">
+                                <string key="NSValueTransformerName">NSNegateBoolean</string>
+                            </dictionary>
+                        </binding>
+                    </connections>
+                </menuItem>
+                <menuItem isSeparatorItem="YES" id="yZx-W2-lZg"/>
                <menuItem title="Reset All" id="PQ0-yO-SKz">
                    <modifierMask key="keyEquivalentModifierMask"/>
                    <connections>
@@ -598,11 +651,13 @@ Gw
                    </connections>
                </menuItem>
            </items>
+            <connections>
+                <outlet property="delegate" destination="-2" id="wqC-IG-63F"/>
+            </connections>
            <point key="canvasLocation" x="-121" y="-2"/>
        </menu>
    </objects>
    <resources>
        <image name="NSAppleMenuImage" width="11" height="14"/>
-        <image name="NSAppleMenuImage" width="128" height="128"/>
    </resources>
 </document>
@@ -13,17 +13,19 @@
        </customObject>
        <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
        <customObject id="-3" userLabel="Application" customClass="NSObject"/>
+        <customObject id="rSq-qV-SGy" customClass="BookmarkManager">
+            <connections>
+                <outlet property="menu" destination="ha0-nx-PIl" id="Ozd-ID-egK"/>
+                <outlet property="updateMenuItem" destination="30b-vT-HIa" id="AgZ-LE-no6"/>
+            </connections>
+        </customObject>
        <customObject id="Voe-Tx-rLC" customClass="AppDelegate">
            <connections>
                <outlet property="installWindow" destination="jWX-pY-Zpb" id="xAj-Vj-Vxn"/>
            </connections>
        </customObject>
        <customObject id="YLy-65-1bz" customClass="NSFontManager"/>
-        <customObject id="sJn-ug-xF3" customClass="BookmarkManager">
-            <connections>
-                <outlet property="menu" destination="ha0-nx-PIl" id="vTa-TU-DS1"/>
-            </connections>
-        </customObject>
+        <customObject id="3aq-Tx-mno" customClass="SUUpdater"/>
        <menu title="Main Menu" systemMenu="main" id="AYu-sK-qS6">
            <items>
                <menuItem title="Ample" id="1Xt-HY-uBw">
@@ -36,7 +38,16 @@
                                    <action selector="orderFrontStandardAboutPanel:" target="-1" id="Exp-CZ-Vem"/>
                                </connections>
                            </menuItem>
+                            <menuItem title="Check for Updates…" id="CPy-r4-rzr">
+                                <modifierMask key="keyEquivalentModifierMask"/>
+                                <connections>
+                                    <action selector="checkForUpdates:" target="3aq-Tx-mno" id="qJG-Nv-0Lu"/>
+                                </connections>
+                            </menuItem>
                            <menuItem isSeparatorItem="YES" id="VOq-y0-SEH"/>
+                            <menuItem title="Reinstall MAME components" hidden="YES" id="c3P-WT-eUP">
+                                <modifierMask key="keyEquivalentModifierMask"/>
+                            </menuItem>
                            <menuItem title="Preferences…" keyEquivalent="," id="BOF-NM-1cW">
                                <connections>
                                    <action selector="displayPreferences:" target="Voe-Tx-rLC" id="Hsm-pX-sUc"/>
@@ -398,28 +409,39 @@
                    <modifierMask key="keyEquivalentModifierMask"/>
                    <menu key="submenu" title="Bookmarks" id="ha0-nx-PIl">
                        <items>
+                            <menuItem title="Manage Bookmarks…" keyEquivalent="b" id="isI-q6-b1V">
+                                <modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
+                                <connections>
+                                    <action selector="manageBookmarks:" target="-1" id="vOm-90-AoO"/>
+                                </connections>
+                            </menuItem>
                            <menuItem title="Add Bookmark…" keyEquivalent="d" id="1JF-xV-zmG">
                                <connections>
                                    <action selector="addBookmark:" target="-1" id="cqp-ko-BfQ"/>
                                </connections>
                            </menuItem>
-                            <menuItem title="Manage Bookmarks…" id="isI-q6-b1V">
-                                <modifierMask key="keyEquivalentModifierMask"/>
+                            <menuItem title="Update Bookmark" keyEquivalent="D" id="30b-vT-HIa">
+                                <connections>
+                                    <action selector="updateBookmark:" target="-1" id="Au0-Sp-cUD"/>
+                                </connections>
                            </menuItem>
-                            <menuItem title="Set Default" id="vbR-vS-lqO">
+                            <menuItem title="Set Default" hidden="YES" id="vbR-vS-lqO">
                                <modifierMask key="keyEquivalentModifierMask"/>
                                <connections>
                                    <action selector="defaultSave:" target="-1" id="FP9-EX-OKP"/>
                                </connections>
                            </menuItem>
                            <menuItem isSeparatorItem="YES" id="gWR-Yl-mg6"/>
-                            <menuItem title="Default" id="mXC-Lp-gem">
+                            <menuItem title="Default" hidden="YES" id="mXC-Lp-gem">
                                <modifierMask key="keyEquivalentModifierMask"/>
                                <connections>
                                    <action selector="defaultLoad:" target="-1" id="ErS-k6-azP"/>
                                </connections>
                            </menuItem>
                        </items>
+                        <connections>
+                            <outlet property="delegate" destination="rSq-qV-SGy" id="Z7N-CG-hU1"/>
+                        </connections>
                    </menu>
                </menuItem>
                <menuItem title="Window" id="aUF-d1-5bR">
@@ -525,5 +547,6 @@
            </view>
            <point key="canvasLocation" x="13" y="-182"/>
        </window>
+        <userDefaultsController representsSharedInstance="YES" id="uGS-pc-Wsn"/>
    </objects>
 </document>
@@ -61,7 +61,7 @@
                                            <outlet property="textField" destination="Pep-mX-LHY" id="hUe-cf-6vq"/>
                                        </connections>
                                    </tableCellView>
-                                    <tableCellView identifier="ItemView" translatesAutoresizingMaskIntoConstraints="NO" id="yGq-lc-RCM" customClass="TablePathView">
+                                    <tableCellView identifier="ItemView" translatesAutoresizingMaskIntoConstraints="NO" id="yGq-lc-RCM" customClass="PathTableCellView">
                                        <rect key="frame" x="1" y="21" width="296" height="22"/>
                                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                        <subviews>
@@ -73,8 +73,8 @@
                                                </pathCell>
                                                <connections>
                                                    <action selector="pathAction:" target="-2" id="4oX-bW-ANp"/>
-                                                    <binding destination="yGq-lc-RCM" name="enabled" keyPath="objectValue.valid" id="f8P-gt-vmK"/>
                                                    <binding destination="yGq-lc-RCM" name="value" keyPath="objectValue.url" id="Ony-ph-VVo"/>
+                                                    <binding destination="yGq-lc-RCM" name="enabled" keyPath="objectValue.valid" id="f8P-gt-vmK"/>
                                                </connections>
                                            </pathControl>
                                            <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" id="6g1-NT-J1w">
@@ -101,7 +101,7 @@
                                            <outlet property="pathControl" destination="f7R-TO-fmF" id="oH7-N3-JC7"/>
                                        </connections>
                                    </tableCellView>
-                                    <tableCellView identifier="BBItemView" id="2Nq-Xz-tkV" customClass="TablePathView">
+                                    <tableCellView identifier="BBItemView" id="2Nq-Xz-tkV" customClass="PathTableCellView">
                                        <rect key="frame" x="1" y="46" width="296" height="22"/>
                                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                        <subviews>
@@ -132,12 +132,12 @@
                                                </textFieldCell>
                                                <connections>
                                                    <action selector="textAction:" target="-2" id="lmX-t8-mEc"/>
-                                                    <binding destination="2Nq-Xz-tkV" name="enabled" keyPath="objectValue.valid" id="ZTM-E3-Y9P"/>
                                                    <binding destination="2Nq-Xz-tkV" name="value" keyPath="objectValue.string" id="2dZ-JJ-asM">
                                                        <dictionary key="options">
                                                            <string key="NSNullPlaceholder">socket.address:port or /path/to/file</string>
                                                        </dictionary>
                                                    </binding>
+                                                    <binding destination="2Nq-Xz-tkV" name="enabled" keyPath="objectValue.valid" id="ZTM-E3-Y9P"/>
                                                </connections>
                                            </textField>
                                        </subviews>
@@ -146,6 +146,102 @@
                                            <outlet property="ejectButton" destination="zxn-1E-o34" id="eC6-Mf-tN6"/>
                                        </connections>
                                    </tableCellView>
+                                    <tableCellView identifier="OutputItemView" id="jQd-Ar-5uf" customClass="PathTableCellView">
+                                        <rect key="frame" x="1" y="71" width="296" height="22"/>
+                                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                                        <subviews>
+                                            <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" id="Jg1-Wh-HDk">
+                                                <rect key="frame" x="0.0" y="1" width="20" height="20"/>
+                                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                                                <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageAlignment="left" image="drag-handle-4x10" id="SjY-iM-xSZ"/>
+                                            </imageView>
+                                            <button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="vG4-PP-efF" customClass="EjectButton">
+                                                <rect key="frame" x="277" y="3" width="16" height="16"/>
+                                                <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
+                                                <buttonCell key="cell" type="bevel" bezelStyle="regularSquare" image="eject-16x16" imagePosition="only" alignment="center" alternateImage="eject-hover-16x16" imageScaling="proportionallyDown" inset="2" id="VX6-hb-mCU">
+                                                    <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                                                    <font key="font" metaFont="system"/>
+                                                </buttonCell>
+                                                <connections>
+                                                    <action selector="ejectAction:" target="-2" id="LNr-rK-kpx"/>
+                                                    <binding destination="jQd-Ar-5uf" name="enabled" keyPath="objectValue.occupied" id="p4S-6q-dCG"/>
+                                                </connections>
+                                            </button>
+                                            <textField verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Tm9-Zq-fag">
+                                                <rect key="frame" x="20" y="0.0" width="244" height="21"/>
+                                                <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
+                                                <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" placeholderString="/path/to/file" drawsBackground="YES" id="RUQ-s4-75A">
+                                                    <font key="font" metaFont="system"/>
+                                                    <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+                                                    <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                                </textFieldCell>
+                                                <connections>
+                                                    <action selector="textAction:" target="-2" id="N7h-6y-D8W"/>
+                                                    <binding destination="jQd-Ar-5uf" name="value" keyPath="objectValue.string" id="kXU-qJ-HKa">
+                                                        <dictionary key="options">
+                                                            <string key="NSNullPlaceholder">/path/to/file</string>
+                                                        </dictionary>
+                                                    </binding>
+                                                    <binding destination="jQd-Ar-5uf" name="enabled" keyPath="objectValue.valid" id="1wE-NY-Vb2"/>
+                                                </connections>
+                                            </textField>
+                                        </subviews>
+                                        <connections>
+                                            <outlet property="dragHandle" destination="Jg1-Wh-HDk" id="o14-ay-0Ou"/>
+                                            <outlet property="ejectButton" destination="vG4-PP-efF" id="X2I-2N-t5r"/>
+                                        </connections>
+                                    </tableCellView>
+                                    <tableCellView identifier="MidiItemView" id="HDi-YM-iKn" customClass="MidiTableCellView">
+                                        <rect key="frame" x="1" y="96" width="296" height="22"/>
+                                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                                        <subviews>
+                                            <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" id="XcO-0S-W4c">
+                                                <rect key="frame" x="0.0" y="1" width="20" height="20"/>
+                                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                                                <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageAlignment="left" image="drag-handle-4x10" id="4a2-So-rxD"/>
+                                            </imageView>
+                                            <button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="F3v-8Z-LaF" customClass="EjectButton">
+                                                <rect key="frame" x="277" y="3" width="16" height="16"/>
+                                                <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
+                                                <buttonCell key="cell" type="bevel" bezelStyle="regularSquare" image="eject-16x16" imagePosition="only" alignment="center" alternateImage="eject-hover-16x16" imageScaling="proportionallyDown" inset="2" id="b3t-Zp-2si">
+                                                    <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                                                    <font key="font" metaFont="system"/>
+                                                </buttonCell>
+                                                <connections>
+                                                    <action selector="ejectAction:" target="-2" id="AvU-Sz-QKJ"/>
+                                                    <binding destination="HDi-YM-iKn" name="enabled" keyPath="objectValue.occupied" id="ERy-Iz-T9Q"/>
+                                                </connections>
+                                            </button>
+                                            <popUpButton verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="L2F-mj-lkr">
+                                                <rect key="frame" x="20" y="-3" width="244" height="25"/>
+                                                <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
+                                                <popUpButtonCell key="cell" type="push" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" selectedItem="CaJ-NG-vbR" id="Rac-za-bEQ">
+                                                    <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
+                                                    <font key="font" metaFont="system"/>
+                                                    <menu key="menu" id="I55-5S-oM2">
+                                                        <items>
+                                                            <menuItem state="on" id="CaJ-NG-vbR">
+                                                                <modifierMask key="keyEquivalentModifierMask"/>
+                                                            </menuItem>
+                                                        </items>
+                                                    </menu>
+                                                </popUpButtonCell>
+                                                <connections>
+                                                    <action selector="midiAction:" target="-2" id="LDL-4h-xUR"/>
+                                                    <binding destination="HDi-YM-iKn" name="selectedValue" keyPath="objectValue.string" id="xjL-hx-VG3">
+                                                        <dictionary key="options">
+                                                            <string key="NSValueTransformerName">EmptyStringTransformer</string>
+                                                        </dictionary>
+                                                    </binding>
+                                                </connections>
+                                            </popUpButton>
+                                        </subviews>
+                                        <connections>
+                                            <outlet property="dragHandle" destination="XcO-0S-W4c" id="oKY-UF-LkW"/>
+                                            <outlet property="ejectButton" destination="F3v-8Z-LaF" id="ql8-4u-qCA"/>
+                                            <outlet property="popUpButton" destination="L2F-mj-lkr" id="Ktx-Yc-DIp"/>
+                                        </connections>
+                                    </tableCellView>
                                </prototypeCellViews>
                            </tableColumn>
                        </tableColumns>
@@ -0,0 +1,14 @@
+//
+//  Bookmark.h
+//  Ample
+//
+//  Created by Kelvin Sherlock on 2/7/2022.
+//  Copyright © 2022 Kelvin Sherlock. All rights reserved.
+//
+
+#ifndef Bookmark_h
+#define Bookmark_h
+
+#import "Bookmark+CoreDataClass.h"
+
+#endif /* Bookmark_h */
@@ -7,28 +7,39 @@
 //

 #import <Foundation/Foundation.h>
+#import <CoreData/CoreData.h>

@class NSMenu;
+@class NSMenuItem;
+@class Bookmark;
+@class DiskImage;

 NS_ASSUME_NONNULL_BEGIN

@interface BookmarkManager : NSObject

@property (weak) IBOutlet NSMenu *menu;
+@property (weak) IBOutlet NSMenuItem *updateMenuItem;
+@property (readonly) NSManagedObjectContext *managedObjectContext;
+
+@property (nullable) Bookmark *currentBookmark;

 +(instancetype)sharedManager;

-(void)loadBookmarks;
-(void)updateMenu;
+-(NSString *)uniqueBookmarkName: (NSString *)name;

-(BOOL)validateName: (NSString *)name;
+-(NSError *)saveBookmark: (NSDictionary *)bookmark name: (NSString *)name automatic: (BOOL)automatic;

-(BOOL)saveBookmark: (NSDictionary *)bookmark name: (NSString *)name;
-(NSDictionary *)loadBookmarkFromURL: (NSURL *)url;
+//-(NSError *)saveDefault: (NSDictionary *)bookmark;

-(BOOL)saveDefault: (NSDictionary *)bookmark;
+-(Bookmark *)defaultBookmark;
 -(NSDictionary *)loadDefault;

+-(NSError *)setAutomatic: (Bookmark *)bookmark;
+
+-(BOOL)addDiskImage: (NSObject *)pathOrURL;
+
+//-(void)convertLegacyBookmarks;
@end

 NS_ASSUME_NONNULL_END
@@ -9,19 +9,43 @@
 #import "BookmarkManager.h"
 #import "Ample.h"

+#import "Bookmark.h"
+#import "DiskImage.h"
+#import "Menu.h"
+
+
@interface BookmarkManager () {
-    NSArray<NSURL *> *_urls;
+
+    NSPersistentStoreCoordinator *_psc;
+    NSManagedObjectContext *_moc;
+    NSManagedObjectModel *_mom;
+    NSPersistentStore *_store;
+    
+    NSFetchRequest *_defaultRequest;
+    
+    
    NSURL *_bookmarkDirectory;
+    NSArrayController *_items;
+    NSUInteger _newMenuGeneration;
+    NSUInteger _currentMenuGeneration;
+    
+    Bookmark *_currentBookmark;
 }

@end

+@interface BookmarkManager (MenuDelegate) <NSMenuDelegate>
+@end
+
@implementation BookmarkManager

 static BookmarkManager *singleton = nil;

 -(void)awakeFromNib {
-    if (!singleton) singleton = self;
+    if (!singleton) {
+        singleton = self;
+        if (!_items) [self initMenus];
+    }
 }

 +(instancetype)sharedManager {
@@ -31,7 +55,171 @@ static BookmarkManager *singleton = nil;

 -(instancetype)init {
    if (singleton) return singleton;
-    return [super init];
+
+
+    if ((self = [super init])) {
+        [self initCoreData];
+
+        NSNotificationCenter *nc = [NSNotificationCenter defaultCenter];
+        
+        [nc addObserver: self selector: @selector(willTerminate:) name: NSApplicationWillTerminateNotification object: nil];
+        [nc addObserver: self selector: @selector(diskImageAdded:) name: kNotificationDiskImageAdded object: nil];
+
+
+        _newMenuGeneration = 1;
+        _currentMenuGeneration = 0;
+    }
+
+    
+    //singleton = self;
+    return self;
+}
+
+-(NSManagedObjectContext *)managedObjectContext {
+    return _moc;
+}
+
+-(void)initCoreData {
+    
+    NSError *error;
+    BOOL new = NO;
+
+    NSBundle *bundle = [NSBundle mainBundle];
+    NSURL *url = [bundle URLForResource: @"Ample" withExtension: @"momd"];
+    _mom = [[NSManagedObjectModel alloc] initWithContentsOfURL: url];
+    
+    _psc = [[NSPersistentStoreCoordinator alloc] initWithManagedObjectModel: _mom];
+    
+    _moc = [[NSManagedObjectContext alloc] initWithConcurrencyType: NSMainQueueConcurrencyType];
+    [_moc setPersistentStoreCoordinator: _psc];
+    
+    //[_moc setMergePolicy: [NSMergePolicy rollbackMergePolicy]];
+    
+    url = SupportDirectory();
+#if 0
+    url = [url URLByAppendingPathComponent: @"Ample.db"];
+
+    if (![url checkResourceIsReachableAndReturnError: &error])
+        new = YES;
+
+    
+    _store = [_psc addPersistentStoreWithType: NSSQLiteStoreType
+                              configuration: nil
+                                        URL: url
+                                    options: nil
+                                      error: &error];
+#else
+
+    url = [url URLByAppendingPathComponent: @"Ample.xml"];
+
+    if (![url checkResourceIsReachableAndReturnError: &error])
+        new = YES;
+
+    
+    _store = [_psc addPersistentStoreWithType: NSXMLStoreType
+                              configuration: nil
+                                        URL: url
+                                    options: nil
+                                      error: &error];
+
+    
+#endif
+    _defaultRequest = [Bookmark fetchRequest];
+    [_defaultRequest setPredicate: [NSPredicate predicateWithFormat: @"automatic == TRUE"]];
+    
+    if (new) {
+        [self convertLegacyBookmarks];
+        [self convertLegacyDiskImages];
+    }
+    
+}
+
+-(void)willTerminate: (NSNotification *)notification {
+
+    NSError *error;
+    
+    if (![_moc save: &error]) {
+        NSLog(@"%@", error);
+    }
+}
+
+
+-(void)convertLegacyBookmarks {
+    
+    //NSEntityDescription *e;
+
+    //e = [NSEntityDescription entityForName: @"Bookmark" inManagedObjectContext: moc];
+
+    NSURL *url = [self bookmarkDirectory];
+    NSFileManager *fm = [NSFileManager defaultManager];
+    NSError *error = nil;
+
+    NSArray *files = [fm contentsOfDirectoryAtURL: url
+                       includingPropertiesForKeys: nil
+                                          options: NSDirectoryEnumerationSkipsHiddenFiles
+                                            error: &error];
+    
+    NSDate *now = [NSDate date];
+    for (NSURL *url in files) {
+
+
+        NSDictionary *dict = [NSDictionary dictionaryWithContentsOfURL: url];
+        //NSData *data = [NSPropertyListSerialization dataWithPropertyList: dict format: NSPropertyListBinaryFormat_v1_0 options: 0 error: &error];
+
+        Bookmark *b = (Bookmark *)[NSEntityDescription insertNewObjectForEntityForName: @"Bookmark" inManagedObjectContext: _moc];
+
+        [b setName: [url lastPathComponent]];
+        [b setDictionary: dict];
+        //[b setData: data];
+        [b setMachine: [dict objectForKey: @"machine"]];
+        [b setCreated: now];
+    }
+
+    // default...
+
+    url = [url URLByAppendingPathComponent: @".Default"];
+    NSDictionary *dict = [NSDictionary dictionaryWithContentsOfURL: url];
+    if (dict) {
+        //NSData *data = [NSPropertyListSerialization dataWithPropertyList: dict format: NSPropertyListBinaryFormat_v1_0 options: 0 error: &error];
+
+        NSString *name = [self uniqueBookmarkName: @"Default"];
+        Bookmark *b = (Bookmark *)[NSEntityDescription insertNewObjectForEntityForName: @"Bookmark" inManagedObjectContext: _moc];
+
+        [b setName: name];
+        [b setAutomatic: YES];
+        [b setDictionary: dict];
+        //[b setData: data];
+        [b setMachine: [dict objectForKey: @"machine"]];
+        [b setCreated: now];
+        
+    }
+
+    if (![_moc save: &error]) {
+        NSLog(@"%@", error);
+    }
+}
+
+-(void)convertLegacyDiskImages {
+
+    NSError *error;
+    NSURL *sd = SupportDirectory();
+    NSURL *url = [sd URLByAppendingPathComponent: @"RecentDiskImages.plist"];
+    
+    NSArray *array = [NSArray arrayWithContentsOfURL: url];
+    if (!array) return;
+
+    for (NSDictionary *d in array) {
+        
+        NSManagedObject *o = [NSEntityDescription insertNewObjectForEntityForName: @"DiskImage" inManagedObjectContext: _moc];
+        [o setValue: [d objectForKey: @"date"] forKey: @"added"];
+        [o setValue: [d objectForKey: @"date"] forKey: @"accessed"];
+        [o setValue: [d objectForKey: @"path"] forKey: @"path"];
+        [o setValue: [d objectForKey: @"size"] forKey: @"size"];
+    }
+
+    if (![_moc save: &error]) {
+        NSLog(@"%@", error);
+    }
 }

 -(NSURL *)bookmarkDirectory {
@@ -48,45 +236,61 @@ static BookmarkManager *singleton = nil;
    return url;
 }

-/* disallow leading .
- * disallow : or / characters.
- */
-(BOOL)validateName: (NSString *)name {
-    
-    enum { kMaxLength = 128 };
-    unichar buffer[kMaxLength];
-    NSUInteger length = [name length];
-    if (length == 0 || length > kMaxLength) return NO;
-    [name getCharacters: buffer range: NSMakeRange(0, length)];
-    if (buffer[0] == '.') return NO;
-    for (unsigned i = 0; i < length; ++i) {
-        unichar c = buffer[i];
-        if (c == ':' || c == '/') return NO;
-    }
-    return YES;
+
+-(Bookmark *)defaultBookmark {
+
+    NSFetchRequest *req;
+    NSError *error;
+    NSArray *array;
+
+    req = [Bookmark fetchRequest];
+    [req setPredicate: [NSPredicate predicateWithFormat: @"automatic == TRUE"]];
+    array = [_moc executeFetchRequest: req error: &error];
+
+    return [array firstObject];
 }

-
 -(NSDictionary *)loadDefault {
-    NSURL *url = [self bookmarkDirectory];
-    url = [url URLByAppendingPathComponent: @".Default"];
-    
-    NSDictionary *d;
-    
-    if (@available(macOS 10.13, *)) {
-        NSError *error = nil;
-        d = [NSDictionary dictionaryWithContentsOfURL: url error: &error];
-        if (!d) NSLog(@"Error loading %@: %@", url, error);
-    } else {
-        d = [NSDictionary dictionaryWithContentsOfURL: url];
-        if (!d) NSLog(@"Error loading %@", url);
-    }
-    return d;
+    Bookmark *b = [self defaultBookmark];
+    return [b dictionary];
 }

 /* save as .Default */
-(BOOL)saveDefault: (NSDictionary *)bookmark {
+-(NSError *)saveDefault: (NSDictionary *)bookmark {

+    return nil;
+
+#if 0
+    /* check if it already exists */
+
+    NSFetchRequest *req;
+    NSError *error;
+    NSArray *array;
+    Bookmark *b;
+    NSDate *now = [NSDate date];
+    BOOL ok;
+
+    req = [[NSFetchRequest alloc] initWithEntityName: @"Default"];
+    array = [_moc executeFetchRequest: req error: &error];
+
+
+    b = [array firstObject];
+    if (b) {
+        [b setModified: now];
+    } else {
+        b = (Bookmark *)[NSEntityDescription insertNewObjectForEntityForName: @"Default" inManagedObjectContext: _moc];
+
+        [b setName: @"Default"];
+        [b setCreated: now];
+    }
+    [b setDictionary: bookmark];
+    [b setMachine: [bookmark objectForKey: @"machine"]];
+
+    ok = [_moc save: &error];
+    if (!ok) NSLog(@"%@", error);
+    return error;
+
+#if 0
    NSURL *url = [self bookmarkDirectory];
    url = [url URLByAppendingPathComponent: @".Default"];

@@ -99,116 +303,349 @@ static BookmarkManager *singleton = nil;
        ok = [bookmark writeToURL: url atomically: YES];
    }
    return ok;
+#endif
+#endif
 }

-(BOOL)saveBookmark: (NSDictionary *)bookmark name: (NSString *)name {
+
+-(NSError *)setAutomatic: (Bookmark *)bookmark {
    
+    NSError *error = nil;
+    NSFetchRequest *req = [Bookmark fetchRequest];
+    [req setPredicate: [NSPredicate predicateWithFormat: @"automatic == TRUE"]];
+    
+    NSArray *array = [_moc executeFetchRequest: req error: &error];
+    for (Bookmark *b in array) {
+        if (b != bookmark) [b setAutomatic: NO];
+    }
+    [bookmark setAutomatic: YES];
+    if (error) return error;
+    [_moc save: &error];
+    return error;
+}
+
+-(NSError *)saveBookmark: (NSDictionary *)bookmark name: (NSString *)name automatic: (BOOL)automatic {
+
+    NSDate *now = [NSDate date];
    NSError *error;
-    NSData *data = [NSPropertyListSerialization dataWithPropertyList: bookmark
-                                                              format: NSPropertyListXMLFormat_v1_0
-                                                             options: 0
-                                                               error: &error];
-    
-    
-    
-    NSURL *base = [self bookmarkDirectory];
-    
-    NSURL *url = [base URLByAppendingPathComponent: name];
-    
-    BOOL ok = [data writeToURL: url options: NSDataWritingWithoutOverwriting error: &error];
+    BOOL ok;

+    Bookmark *b = (Bookmark *)[NSEntityDescription insertNewObjectForEntityForName: @"Bookmark" inManagedObjectContext: _moc];
+    
+    [b setName: name];
+    [b setDictionary: bookmark];
+    [b setMachine: [bookmark objectForKey: @"machine"]];
+    [b setCreated: now];
+    [b setAutomatic: automatic];
+    
+    ok = [b validateForInsert: &error];
    if (!ok) {
-        for (unsigned i = 1 ; i < 100; ++i) {
-            NSString *tmp = [name stringByAppendingFormat: @"(%d)", i];
-            [base URLByAppendingPathComponent: tmp];
-
-            ok = [data writeToURL: url options: NSDataWritingWithoutOverwriting error: &error];
-            if (ok) {
-                name = tmp;
-                break;
-            }
-        }
+        // will be useful, eg "name is too long"
+        // keys: NSValidationErrorObject, NSLocalizedDescription, NSValidationErrorKey, NSValidationErrorValue
+        //NSLog(@"%@", error);
+        [_moc deleteObject: b];
+        return error;
    }
-    if (!ok) return NO;
    
-    if (!_menu) return YES; // ?
    
-    NSUInteger ix = [_urls indexOfObjectPassingTest: ^BOOL(NSURL *object, NSUInteger index, BOOL *stop){
-        NSString *path = [object lastPathComponent];
-        return [name caseInsensitiveCompare: path] == NSOrderedAscending;
-    }];
-
-    NSMenuItem *item = [[NSMenuItem alloc] initWithTitle: name action: @selector(bookmarkMenu:) keyEquivalent: @""];
-    [item setRepresentedObject: url];
-    
-    if (ix == NSNotFound) {
-        _urls = [_urls arrayByAddingObject: url];
-        [_menu addItem: item];
-    } else {
-        
-        NSInteger n = [_menu numberOfItems];
-        [_menu insertItem: item atIndex: n - [_urls count] + ix];
-        NSMutableArray *tmp = [_urls mutableCopy];
-
-        [tmp insertObject: url atIndex: ix];
+    ok = [_moc save: &error];
+    if (!ok) {
+        //NSLog(@"%@", error);
+        [_moc deleteObject: b];
+        error = [NSError errorWithDomain: @"Ample" code: 0 userInfo: @{ NSLocalizedDescriptionKey: @"Duplicate name" }];
+        return error;
    }

-    return YES;
+    if (automatic) {
+        [self setAutomatic: b];
+    }
+
+
+    return nil;
 }

-(NSDictionary *)loadBookmarkFromURL: (NSURL *)url {
-    
-    NSDictionary *d;
-    
-    if (@available(macOS 10.13, *)) {
-        NSError *error = nil;
-        d = [NSDictionary dictionaryWithContentsOfURL: url error: &error];
-        if (!d) NSLog(@"Error loading %@: %@", url, error);
-    } else {
-        d = [NSDictionary dictionaryWithContentsOfURL: url];
-        if (!d) NSLog(@"Error loading %@", url);
-    }
-    return d;
-}
-
-
 -(void)loadBookmarks {
    
-    NSURL *url = [self bookmarkDirectory];
-    
-    NSFileManager *fm = [NSFileManager defaultManager];
-    
-    NSError *error = nil;
+    NSSortDescriptor *s = [NSSortDescriptor sortDescriptorWithKey: @"name" ascending: YES selector: @selector(caseInsensitiveCompare:)];

-    NSArray *files = [fm contentsOfDirectoryAtURL: url
-                       includingPropertiesForKeys: nil
-                                          options: NSDirectoryEnumerationSkipsHiddenFiles
-                                            error: &error];
    
-    // bleh, has to create 2 new NSStrings for every comparison
-    files = [files sortedArrayUsingComparator: ^(NSURL *a, NSURL *b){
-        NSString *aa = [a lastPathComponent];
-        NSString *bb = [b lastPathComponent];
-        return [aa caseInsensitiveCompare: bb];
-    }];
-    
-    
-    _urls = files;
+    _items = [NSArrayController new];
+    [_items setManagedObjectContext: _moc];
+    [_items setAvoidsEmptySelection: NO];
+    [_items setAutomaticallyPreparesContent: YES];
+    [_items setAutomaticallyRearrangesObjects: YES];
+    [_items setEntityName: @"Bookmark"];
+    [_items setSortDescriptors: @[ s ]];
+
+    [_items fetch: nil];
 }

-(void)updateMenu {
+
+/* extract the number from a trailing " (%d)" */
+static int extract_number(NSString *s, NSInteger offset) {
    
-    NSArray *menus = [_menu itemArray];
+    unichar buffer[32];
+    NSInteger len = [s length] - offset;
+    unichar c;
+    int i;
+    int n = 0;
+    
+    if (len < 4) return -1; /* " (1)"*/
+    if (len > 8) return -1; /* " (99999)" */
+    
+    NSRange r = NSMakeRange(offset, len);
+    [s getCharacters: buffer range: r];
+    
+    buffer[len] = 0;
+    i = 0;
+    if (buffer[i++] != ' ') return -1;
+    if (buffer[i++] != '(') return -1;
+    
+    c = buffer[i++];
+    if (c < '1' || c > '9') return -1;
+    n = c - '0';
+    
+    for (;;) {
+        c = buffer[i];
+        if (c < '0' || c > '9') break;
+        n = n * 10 + (c - '0');
+        ++i;
+    }
+
+    if (buffer[i++] != ')') return -1;
+    if (buffer[i++] != 0) return -1;
+
+    return n;
+}
+
+
+-(NSString *)uniqueBookmarkName: (NSString *)name {
+    
+    NSInteger length = [name length];
+
+    NSError *error = nil;
+    NSPredicate *p = [NSPredicate predicateWithFormat: @"name BEGINSWITH %@", name];
+    NSFetchRequest *req = [NSFetchRequest fetchRequestWithEntityName: @"Bookmark"];
+    [req setPredicate: p];
+
+    NSArray *array = [_moc executeFetchRequest: req error: &error];
+    if (![array count]) return name;
+
+    uint64_t bits = 1; /* mark 0 as unavailable */
+    NSInteger max = 0;
+    BOOL exact = NO;
+    for (Bookmark *b in array) {
+        NSString *s = [b name];
+        if ([name isEqualToString: s]) {
+            exact = YES;
+            continue;
+        }
+        int n = extract_number(s, length);
+        if (n < 1) continue;
+        if (n > max) max = n;
+        if (n < 64)
+            bits |= (1 << n);
+    }
+    if (!exact) return name;
+    
+    if (bits == (uint64_t)-1) {
+        return [name stringByAppendingFormat: @" (%u)", (int)(max + 1)];
+    }
+    
+#if 1
+    int ix = 0;
+    while (bits & 0x01) {
+        ++ix;
+        bits >>= 1;
+    }
+#else
+    // this doesn't work correctly.
+    int ix = __builtin_ffsll(~bits);
+#endif
+    return [name stringByAppendingFormat: @" (%u)", ix];
+
+
+}
+
+
+-(BOOL)addDiskImage: (NSObject *)pathOrURL {
+    
+    NSError *error;
+    
+    NSString *path = nil;
+    NSURL *url = nil;
+    if ([pathOrURL isKindOfClass: [NSString class]]) {
+        path = (NSString *)pathOrURL;
+    } else if ([pathOrURL isKindOfClass: [NSURL class]]){
+        url = (NSURL *)pathOrURL;
+
+        path = [NSString stringWithCString: [url fileSystemRepresentation] encoding: NSUTF8StringEncoding];
+    }
+    if (!path) return NO;
+
+    NSFileManager *fm = [NSFileManager defaultManager];
+
+
+    NSDictionary *attr = [fm attributesOfItemAtPath: path error: &error];
+    if (error) {
+        NSLog(@"%@ : %@", path, error);
+        return NO;
+    }
+    
+    NSNumber *size = [attr objectForKey: NSFileSize];
+
+    NSDate *now = [NSDate date];
+    
+    NSPredicate *p = [NSPredicate predicateWithFormat: @"path = %@", path];
+    NSFetchRequest *req = [NSFetchRequest fetchRequestWithEntityName: @"DiskImage"];
+    [req setPredicate: p];
+    
+
+    NSArray *array = [_moc executeFetchRequest: req error: &error];
+    BOOL found = 0;
+    for (NSManagedObject *o in array) {
+        found = YES;
+        [o setValue: now forKey: @"accessed"];
+    }
+    if (found) return NO;
+    
+    DiskImage *o = [NSEntityDescription insertNewObjectForEntityForName: @"DiskImage" inManagedObjectContext: _moc];
+    
+    
+    [o setPath: path];
+    [o setAdded: now];
+    [o setAccessed: now];
+    [o setSize: [size longLongValue]];
+    [o updatePath];
+    
+    if (![_moc save: &error]) {
+        NSLog(@"%@", error);
+        [_moc deleteObject: o];
+    }
+    
+    return YES;
+}
+
+-(void)diskImageAdded: (NSNotification *)notification {
+    
+    NSURL *url = [notification object];
+    if (url) [self addDiskImage: url];
+}
+
+static NSString *kMenuContext = @"";
+
+-(void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary<NSKeyValueChangeKey,id> *)change context:(void *)context {
+    if (context == (__bridge void * _Nullable)(kMenuContext)) {
+
+        //NSLog(@"observeValueForKeyPath %@", keyPath);
+        
+        _newMenuGeneration++;
+
+        return;
+    }
+
+    [super observeValueForKeyPath: keyPath ofObject: object change: change context: context];
+}
+
+-(void)initMenus {
+    
+    if (!_items) {
+        [self loadBookmarks];
+        [_items addObserver: self forKeyPath: @"arrangedObjects.name" options: 0 context: (__bridge void * _Nullable)(kMenuContext)];
+        [_items addObserver: self forKeyPath: @"arrangedObjects.automatic" options: 0 context: (__bridge void * _Nullable)(kMenuContext)];
+    }
+
+}
+
+-(IBAction)bookmarkMenu:(id)sender
+{
+}
+
+-(Bookmark *)currentBookmark {
+    return _currentBookmark;
+}
+-(void)setCurrentBookmark:(Bookmark *)currentBookmark {
+    if (currentBookmark == _currentBookmark) return;
+    _currentBookmark = currentBookmark;
+    _newMenuGeneration++;
+}
+
+-(void)menuNeedsUpdate:(NSMenu *)menu {
+    
+    if (_currentMenuGeneration == _newMenuGeneration) return;
+    _currentMenuGeneration = _newMenuGeneration;
+
+    if (_currentBookmark && _updateMenuItem) {
+        NSString *title = [NSString stringWithFormat: @"Update “%@”", [_currentBookmark name]];
+        [_updateMenuItem setHidden: NO];
+        [_updateMenuItem setTitle: title];
+        [_updateMenuItem setRepresentedObject: _currentBookmark];
+    } else {
+        [_updateMenuItem setHidden: YES];
+        [_updateMenuItem setRepresentedObject: nil];
+    }
+    
+    
+
+    NSArray *menus = [menu itemArray];
    for (NSMenuItem *item in [menus reverseObjectEnumerator]) {
        if ([item tag] == 0xdeadbeef) [_menu removeItem: item];
    }
-    for (NSURL *url in _urls) {
-        NSString *title = [url lastPathComponent]; // [[url lastPathComponent] stringByDeletingPathExtension];

-        NSMenuItem *item = [_menu addItemWithTitle: title action: @selector(bookmarkMenu:) keyEquivalent: @""];
-        [item setRepresentedObject: url];
+    NSArray *array = [_items arrangedObjects];
+    for (Bookmark *b in array) {
+
+        NSString *title = [b name];
+        NSMenuItem *item = [menu addItemWithTitle: title action: @selector(bookmarkMenu:) keyEquivalent: @""];
+        [item setRepresentedObject: b];
        [item setTag: 0xdeadbeef];
+        if ([b automatic]) {
+            
+            [item setOnStateImage: [NSImage imageNamed: NSImageNameStatusAvailable]];
+            [item setState: NSOnState];
+        }
+        //if ([b automatic]) [item setAttributedTitle: ItalicMenuString([b name])];
+        //[item setState: [b automatic] ? NSMixedState : NSOffState];
    }
+    
 }

+@end
+
+
+/* MacOS 12.1+ doesn't like class clusters in nibs -
+ 
+ [General] This coder is expecting the replaced object 0x600000938f60 to be returned from
+ NSClassSwapper.initWithCoder instead of <BookmarkManager: 0x600000905da0>
+
+ */
+@interface BookmarkManagerProxy : NSProxy {
+    BookmarkManager *_target;
+}
+@end
+
+@implementation BookmarkManagerProxy
+
+-(id)init {
+    _target = [BookmarkManager sharedManager];
+    return self;
+}
+
+-(NSMethodSignature *)methodSignatureForSelector:(SEL)sel {
+    return [_target methodSignatureForSelector: sel];
+}
+
+(BOOL)respondsToSelector:(SEL)aSelector {
+    return [BookmarkManager respondsToSelector: aSelector];
+}
+-(void)forwardInvocation:(NSInvocation *)invocation {
+    if ([_target respondsToSelector: [invocation selector]]) {
+        [invocation invokeWithTarget: _target];
+    } else {
+        [super forwardInvocation: invocation];
+    }
+}
+
+
+
@end
@@ -0,0 +1,19 @@
+//
+//  BookmarkWindowController.h
+//  Ample
+//
+//  Created by Kelvin Sherlock on 2/6/2022.
+//  Copyright © 2022 Kelvin Sherlock. All rights reserved.
+//
+
+#import <Cocoa/Cocoa.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface BookmarkWindowController : NSWindowController
+
+(instancetype)sharedInstance;
+
+@end
+
+NS_ASSUME_NONNULL_END
@@ -0,0 +1,170 @@
+//
+//  BookmarkWindowController.m
+//  Ample
+//
+//  Created by Kelvin Sherlock on 2/6/2022.
+//  Copyright © 2022 Kelvin Sherlock. All rights reserved.
+//
+
+#import "BookmarkWindowController.h"
+#import "BookmarkManager.h"
+#import "Bookmark.h"
+#import "Ample.h"
+
+
+
+@interface BookmarkWindowController ()
+@property (strong) IBOutlet NSArrayController *arrayController;
+@property (strong) IBOutlet BookmarkManager *bookmarkManager;
+
+@property (weak) IBOutlet NSTableView *tableView;
+
+@end
+
+@implementation BookmarkWindowController
+
+
+(instancetype)sharedInstance {
+    static BookmarkWindowController *me = nil;
+    if (!me) {
+        me = [self new];
+    }
+    return me;
+}
+
+-(NSString *)windowNibName {
+    return @"BookmarkWindow";
+}
+
+
+- (void)windowDidLoad {
+    [super windowDidLoad];
+
+    NSSortDescriptor *s = [NSSortDescriptor sortDescriptorWithKey: @"name" ascending: YES selector: @selector(caseInsensitiveCompare:)];
+
+    [_arrayController setSortDescriptors: @[s]];
+
+}
+
+-(BOOL)windowShouldClose: (NSWindow *)sender {
+
+    NSManagedObjectContext *moc = [_arrayController managedObjectContext];
+    NSError *error;
+    
+    if (![_arrayController commitEditing]) return NO;
+
+    if ([moc save: &error]) return YES;
+    NSLog(@"%@", error);
+   
+#if 0
+    NSDictionary *dict = [error userInfo];
+    NSArray *array = [dict objectForKey: @"conflictList"];
+    for (NSConstraintConflict *c in array) {
+        
+        NSArray * arr = [c conflictingObjects];
+        for (NSManagedObject *o in arr) {
+ 
+        }
+    }
+#endif
+    return YES;
+
+    //[self presentError: error];
+    //return NO;
+}
+
+-(void)keyDown:(NSEvent *)event {
+    /* Carbon/Events.h */
+    enum {
+        kVK_Delete                    = 0x33,
+        kVK_ForwardDelete             = 0x75,
+
+    };
+    unsigned short keyCode = [event keyCode];
+
+    if (keyCode == kVK_Delete || keyCode == kVK_ForwardDelete) {
+        
+        // arraycontroller selected object / selected index doesn't work right.
+        
+        NSInteger row = [_tableView selectedRow];
+        if (row >= 0)
+            [_arrayController removeObjectAtArrangedObjectIndex: row];
+        
+    }
+}
+
+-(Bookmark *)clickedItem {
+
+    NSArray *array = [_arrayController arrangedObjects];
+    NSInteger row = [_tableView clickedRow];
+    if (row < 0 || row >= [array count]) return nil;
+    return [array objectAtIndex: row];
+}
+
+-(IBAction)doubleClick:(id)sender {
+    
+    Bookmark *b = [self clickedItem];
+    if (!b) return;
+    
+    NSNotificationCenter *nc = [NSNotificationCenter defaultCenter];
+    
+    [nc postNotificationName: kNotificationBookmarkMagicRoute object: b];
+}
+
+-(IBAction)toggleDefault:(id)sender {
+    NSLog(@"%@", sender);
+
+
+}
+
+-(IBAction)setDefault:(id)sender {
+
+    Bookmark *b = [self clickedItem];
+    if (!b) return;
+    
+    [_bookmarkManager setAutomatic: b];
+}
+
+-(IBAction)clearDefault:(id)sender {
+    
+    Bookmark *b = [self clickedItem];
+    if (!b) return;
+
+    [b setAutomatic: NO];
+}
+
+
+-(IBAction)deleteBookmark:(id)sender {
+
+    //Bookmark *b = [self clickedItem];
+    //if (!b) return;
+
+    NSInteger row = [_tableView clickedRow];
+    if (row >= 0)
+        [_arrayController removeObjectAtArrangedObjectIndex: row];
+}
+
+@end
+
+@implementation BookmarkWindowController (Menu)
+
+-(BOOL)validateMenuItem:(NSMenuItem *)menuItem {
+    
+    Bookmark *b = [self clickedItem];
+    
+    if (!b) return NO;
+    SEL action = [menuItem action];
+    
+    if (action == @selector(clearDefault:)) {
+        return [b automatic];
+    }
+
+    if (action == @selector(setDefault:)) {
+        return ![b automatic];
+    }
+
+
+    return YES;
+}
+
+@end
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="15702" systemVersion="18G9323" minimumToolsVersion="Automatic" sourceLanguage="Objective-C" userDefinedModelVersionIdentifier="0">
+    <entity name="Bookmark" representedClassName="Bookmark" syncable="YES">
+        <attribute name="automatic" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES"/>
+        <attribute name="comment" optional="YES" attributeType="String"/>
+        <attribute name="created" optional="YES" attributeType="Date" usesScalarValueType="NO"/>
+        <attribute name="data" attributeType="Binary"/>
+        <attribute name="machine" optional="YES" attributeType="String"/>
+        <attribute name="modified" optional="YES" attributeType="Date" usesScalarValueType="NO"/>
+        <attribute name="name" attributeType="String" minValueString="1" maxValueString="32"/>
+        <fetchIndex name="Bookmark_name">
+            <fetchIndexElement property="name" type="Binary" order="ascending"/>
+        </fetchIndex>
+    </entity>
+    <entity name="DiskImage" representedClassName="DiskImage" syncable="YES">
+        <attribute name="accessed" attributeType="Date" usesScalarValueType="NO"/>
+        <attribute name="added" attributeType="Date" usesScalarValueType="NO"/>
+        <attribute name="name" optional="YES" transient="YES" attributeType="String"/>
+        <attribute name="path" attributeType="String"/>
+        <attribute name="size" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="YES"/>
+        <fetchIndex name="DiskImage_path">
+            <fetchIndexElement property="path" type="Binary" order="ascending"/>
+        </fetchIndex>
+    </entity>
+    <elements>
+        <element name="Bookmark" positionX="994.5546875" positionY="-404.046875" width="128" height="148"/>
+        <element name="DiskImage" positionX="1242" positionY="-333" width="128" height="118"/>
+    </elements>
+</model>
@@ -0,0 +1,25 @@
+//
+//  Bookmark+CoreDataClass.h
+//  Ample
+//
+//  Created by Kelvin Sherlock on 2/6/2022.
+//  Copyright © 2022 Kelvin Sherlock. All rights reserved.
+//
+//
+
+#import <Foundation/Foundation.h>
+#import <CoreData/CoreData.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface Bookmark : NSManagedObject
+
+@property NSDictionary *dictionary;
+
+(NSString *)uniqueName: (NSString *)name inContext: (NSManagedObjectContext *)context;
+
+@end
+
+NS_ASSUME_NONNULL_END
+
+#import "Bookmark+CoreDataProperties.h"
@@ -0,0 +1,175 @@
+//
+//  Bookmark+CoreDataClass.m
+//  Ample
+//
+//  Created by Kelvin Sherlock on 2/6/2022.
+//  Copyright © 2022 Kelvin Sherlock. All rights reserved.
+//
+//
+
+#import "Bookmark+CoreDataClass.h"
+
+@implementation Bookmark
+
+/* extract the number from a trailing " (%d)" */
+static int extract_number(NSString *s, NSInteger offset) {
+    
+    unichar buffer[32];
+    NSInteger len = [s length] - offset;
+    unichar c;
+    int i;
+    int n = 0;
+    
+    if (len < 4) return -1; /* " (1)"*/
+    if (len > 6) return -1; /* " (999)" */
+    
+    NSRange r = NSMakeRange(offset, len);
+    [s getCharacters: buffer range: r];
+    
+    buffer[len] = 0;
+    i = 0;
+    if (buffer[i++] != ' ') return -1;
+    if (buffer[i++] != '(') return -1;
+    
+    c = buffer[i++];
+    if (c < '1' || c > '9') return -1;
+    n = c - '0';
+    
+    for (;;) {
+        c = buffer[i];
+        if (c < '0' || c > '9') break;
+        n = n * 10 + (c - '0');
+        ++i;
+    }
+
+    if (buffer[i++] != ')') return -1;
+    if (buffer[i++] != 0) return -1;
+
+    return n;
+}
+
+(NSString *)uniqueName: (NSString *)name inContext: (NSManagedObjectContext *)context {
+    
+    NSInteger length = [name length];
+
+    NSError *error = nil;
+    NSPredicate *p = [NSPredicate predicateWithFormat: @"name BEGINSWITH %@", name];
+    NSFetchRequest *req = [NSFetchRequest fetchRequestWithEntityName: @"Bookmark"];
+    [req setPredicate: p];
+
+    NSArray *array = [context executeFetchRequest: req error: &error];
+    if (![array count]) return name;
+
+    uint64_t bits = 1; /* mark 0 as unavailable */
+    NSInteger max = 0;
+    BOOL exact = NO;
+    for (Bookmark *b in array) {
+        NSString *s = [b name];
+        if ([name isEqualToString: s]) {
+            exact = YES;
+            continue;
+        }
+        int n = extract_number(s, length);
+        if (n < 1) continue;
+        if (n > max) max = n;
+        if (n < 64)
+            bits |= (1 << n);
+    }
+    if (!exact) return name;
+    
+    if (bits == (uint64_t)-1) {
+        if (max == 999) return nil;
+        return [name stringByAppendingFormat: @" (%u)", (int)(max + 1)];
+    }
+    
+#if 1
+    int ix = 0;
+    while (bits) {
+        ++ix;
+        bits >>= 1;
+    }
+#else
+    // this doesn't work correctly.
+    int ix = __builtin_ffsll(~bits);
+#endif
+    return [name stringByAppendingFormat: @" (%u)", ix];
+
+}
+
+-(void)setDictionary:(NSDictionary *)dictionary {
+    
+    NSData *data;
+    NSError *error = nil;
+
+    data = [NSPropertyListSerialization dataWithPropertyList: dictionary
+                                                      format: NSPropertyListBinaryFormat_v1_0
+                                                     options: 0
+                                                       error: &error];
+    
+    [self setData: data];
+}
+
+-(NSDictionary *)dictionary {
+    
+//    NSDictionary *dict;
+    NSData *data = [self data];
+    NSError *error = nil;
+    
+    return [NSPropertyListSerialization propertyListWithData: data
+                                                     options: 0
+                                                      format: nil
+                                                       error: &error];
+}
+
+
+- (NSError *)errorFromOriginalError:(NSError *)originalError error:(NSError*)secondError
+{
+    NSMutableDictionary *userInfo = [NSMutableDictionary dictionary];
+    NSMutableArray *errors = [NSMutableArray arrayWithObject:secondError];
+    if ([originalError code] == NSValidationMultipleErrorsError) {
+        [userInfo addEntriesFromDictionary:[originalError userInfo]];
+        [errors addObjectsFromArray:[userInfo objectForKey:NSDetailedErrorsKey]];
+    } else {
+        [errors addObject:originalError];
+    }
+    [userInfo setObject:errors forKey:NSDetailedErrorsKey];
+    return [NSError errorWithDomain:NSCocoaErrorDomain code:NSValidationMultipleErrorsError userInfo:userInfo];
+}
+
+- (BOOL)validateName:(id*)ioValue error:(NSError**)outError {
+    
+    if (!ioValue || !*ioValue) return YES;
+    NSString *name = *ioValue;
+    
+    NSFetchRequest *frq = [NSFetchRequest fetchRequestWithEntityName: @"Bookmark"];
+    
+    NSPredicate *p = [NSPredicate predicateWithFormat: @"name = %@", name];
+    [frq setPredicate: p];
+    
+    NSArray * arr = [[self managedObjectContext] executeFetchRequest: frq error: nil];
+    BOOL dupe = NO;
+    for (Bookmark *b in arr) {
+        if (b == self) continue;
+        dupe = YES;
+        break;
+    }
+    if (dupe && outError) {
+        NSDictionary *dict = @{ NSLocalizedFailureReasonErrorKey: @"duplicate name",
+                                NSLocalizedDescriptionKey: @"duplicate name",
+                                NSValidationKeyErrorKey: @"name",
+                                NSValidationValueErrorKey: name,
+                                NSValidationObjectErrorKey: self
+        };
+        NSError *e = [NSError errorWithDomain: @"Ample" code: 1 userInfo: dict];
+        
+        if (*outError) {
+            *outError = [self errorFromOriginalError: *outError error: e];
+        } else {
+            *outError = e;
+        }
+    }
+    return !dupe;
+}
+
+
+@end
@@ -0,0 +1,28 @@
+//
+//  Bookmark+CoreDataProperties.h
+//  Ample
+//
+//  Created by Kelvin Sherlock on 2/6/2022.
+//  Copyright © 2022 Kelvin Sherlock. All rights reserved.
+//
+//
+
+#import "Bookmark+CoreDataClass.h"
+
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface Bookmark (CoreDataProperties)
+
+ (NSFetchRequest<Bookmark *> *)fetchRequest;
+
+@property (nullable, nonatomic, copy) NSString *name;
+@property (nullable, nonatomic, copy) NSString *machine;
+@property (nullable, nonatomic, retain) NSData *data;
+@property (nullable, nonatomic, copy) NSDate *created;
+@property (nullable, nonatomic, copy) NSDate *modified;
+@property (nullable, nonatomic, copy) NSString *comment;
+@property (nonatomic) BOOL automatic;
+@end
+
+NS_ASSUME_NONNULL_END
@@ -0,0 +1,26 @@
+//
+//  Bookmark+CoreDataProperties.m
+//  Ample
+//
+//  Created by Kelvin Sherlock on 2/6/2022.
+//  Copyright © 2022 Kelvin Sherlock. All rights reserved.
+//
+//
+
+#import "Bookmark+CoreDataProperties.h"
+
+@implementation Bookmark (CoreDataProperties)
+
+ (NSFetchRequest<Bookmark *> *)fetchRequest {
+	return [NSFetchRequest fetchRequestWithEntityName:@"Bookmark"];
+}
+
+@dynamic name;
+@dynamic machine;
+@dynamic data;
+@dynamic created;
+@dynamic modified;
+@dynamic comment;
+@dynamic automatic;
+
+@end
@@ -0,0 +1,21 @@
+//
+//  DiskImage+CoreDataClass.h
+//  Ample
+//
+//  Created by Kelvin Sherlock on 2/7/2022.
+//  Copyright © 2022 Kelvin Sherlock. All rights reserved.
+//
+//
+
+#import <Foundation/Foundation.h>
+#import <CoreData/CoreData.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface DiskImage : NSManagedObject
+
+@end
+
+NS_ASSUME_NONNULL_END
+
+#import "DiskImage+CoreDataProperties.h"
@@ -0,0 +1,14 @@
+//
+//  DiskImage+CoreDataClass.m
+//  Ample
+//
+//  Created by Kelvin Sherlock on 2/7/2022.
+//  Copyright © 2022 Kelvin Sherlock. All rights reserved.
+//
+//
+
+#import "DiskImage+CoreDataClass.h"
+
+@implementation DiskImage
+
+@end
@@ -0,0 +1,29 @@
+//
+//  DiskImage+CoreDataProperties.h
+//  Ample
+//
+//  Created by Kelvin Sherlock on 2/7/2022.
+//  Copyright © 2022 Kelvin Sherlock. All rights reserved.
+//
+//
+
+#import "DiskImage+CoreDataClass.h"
+
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface DiskImage (CoreDataProperties)
+
+ (NSFetchRequest<DiskImage *> *)fetchRequest;
+
+@property (nullable, nonatomic, copy) NSString *path;
+@property (nullable, nonatomic, copy) NSDate *added;
+@property (nonatomic) int64_t size;
+@property (nullable, nonatomic, copy) NSDate *accessed;
+@property (nullable, nonatomic, copy) NSString *name;
+
+-(void)updatePath;
+
+@end
+
+NS_ASSUME_NONNULL_END
@@ -0,0 +1,52 @@
+//
+//  DiskImage+CoreDataProperties.m
+//  Ample
+//
+//  Created by Kelvin Sherlock on 2/7/2022.
+//  Copyright © 2022 Kelvin Sherlock. All rights reserved.
+//
+//
+
+#import "DiskImage+CoreDataProperties.h"
+
+#if 0
+@interface DiskImage () {
+    NSString *_name;
+}
+@end
+#endif
+
+@implementation DiskImage (CoreDataProperties)
+
+ (NSFetchRequest<DiskImage *> *)fetchRequest {
+	return [NSFetchRequest fetchRequestWithEntityName:@"DiskImage"];
+}
+
+@dynamic path;
+@dynamic added;
+@dynamic size;
+@dynamic accessed;
+@dynamic name;
+
+-(void)updatePath {
+
+    NSString *path = [self primitiveValueForKey: @"path"];
+    [self setName: [path lastPathComponent]];
+}
+
+-(void)awakeFromFetch {
+    [super awakeFromFetch];
+
+    [self updatePath];
+}
+
+#if 0
+-(void)awakeFromInsert {
+    [super awakeFromInsert];
+
+    NSString *path = [self primitiveValueForKey: @"path"];
+    [self setName: [path lastPathComponent]];
+}
+#endif
+
+@end
@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>MameComponentsDate</key>
-	<date>2021-05-27T16:00:00Z</date>
+	<date>2023-09-29T12:00:00Z</date>
 	<key>UseCustomMame</key>
 	<false/>
 	<key>AutoCloseLogWindow</key>
@@ -15,7 +15,7 @@
 	<key>NSQuitAlwaysKeepsWindows</key>
 	<true/>
 	<key>DefaultDownloadURL</key>
-	<string>https://archive.org/download/mame.0229</string>
+	<string>https://archive.org/download/mame-merged/mame-merged</string>
 	<key>DefaultDownloadExtension</key>
 	<string>zip</string>
 </dict>
@@ -0,0 +1,14 @@
+//
+//  DiskImage.h
+//  Ample
+//
+//  Created by Kelvin Sherlock on 2/7/2022.
+//  Copyright © 2022 Kelvin Sherlock. All rights reserved.
+//
+
+#ifndef DiskImage_h
+#define DiskImage_h
+
+#import "DiskImage+CoreDataClass.h"
+
+#endif /* DiskImage_h */
@@ -9,19 +9,18 @@
 #import "DiskImagesWindowController.h"
 #import "TableCellView.h"
 #import "Ample.h"
+#import "DiskImage.h"
+
+#import "BookmarkManager.h"

@interface DiskImagesWindowController ()
@property (weak) IBOutlet NSTableView *tableView;
@property (strong) IBOutlet NSArrayController *arrayController;
-@property (strong) NSMutableArray *content;

@end

@implementation DiskImagesWindowController {
-    BOOL _dirty;
    NSSet *_extensions;
-    NSTimer *_timer;
-    
 }

 +(instancetype)sharedInstance {
@@ -44,10 +43,17 @@
    
    if ((self = [super init])) {
        
-        [self loadRecentDiskImages];
+        //[self loadRecentDiskImages];
        
        _extensions = [NSSet setWithObjects:
-            @"2img", @"2mg", @"chd", @"dc", @"do", @"dsk", @"hd", @"hdv", @"image", @"nib", @"po", @"wav", @"woz", @"iso", @"raw", nil
+            @"2img", @"2mg", @"chd", @"dc", @"do", @"dsk", @"hd", @"hdv", @"image", @"nib", @"po", @"wav", @"woz", @"iso", @"raw",
+            // st, etc.
+            @"mfm",   @"st", @"msa", @"stx", @"ipf",
+            //
+            @"rom", @"bin",
+            // not supported/relevant.
+            // @"mfi", @"dfi", @"hfe",  @"d77"  @"d88", @"1dd", @"cqm", @"cqi", @"td0", @"imd", 
+            nil
        ];
    }
    return self;
@@ -59,9 +65,6 @@

 - (void)windowDidLoad {

-    if (!_content)
-        [self setContent: [NSMutableArray new]];
-    
    [super windowDidLoad];
    NSWindow *window = [self window];
    [window setRestorable: YES];
@@ -75,8 +78,12 @@
    [_tableView setDraggingSourceOperationMask: NSDragOperationCopy forLocal: NO]; // enable drag/drop to othr apps.

    // Implement this method to handle any initialization after your window controller's window has been loaded from its nib file.
+
+    NSSortDescriptor *s = [NSSortDescriptor sortDescriptorWithKey: @"name" ascending: YES selector: @selector(caseInsensitiveCompare:)];
+    [_arrayController setSortDescriptors: @[ s ]];
 }

+#if 0
 -(void)loadRecentDiskImages {
 //    NSError *error;

@@ -93,7 +100,7 @@
    
    NSNotificationCenter *nc = [NSNotificationCenter defaultCenter];
    
-    [nc addObserver: self selector: @selector(diskImageAdded:) name: @"DiskImageAdded" object: nil];
+    [nc addObserver: self selector: @selector(diskImageAdded:) name: kNotificationDiskImageAdded object: nil];
    
    [nc addObserver: self selector: @selector(willTerminate:) name: NSApplicationWillTerminateNotification object: nil];
 }
@@ -102,14 +109,16 @@
    _timer = nil;
    [self saveFile];
 }
+#endif

 -(void)diskImageAdded: (NSNotification *)notification {
    
    NSURL *url = [notification object];
    if (!url) return;
    
-    [self addFile: url];
+    //[self addFile: url];
 }
+#if 0
 -(void)markDirty {
    _dirty = YES;
    if (_timer) [_timer invalidate];
@@ -124,6 +133,7 @@
 #endif
 }

+
 -(void)saveFile {

    [_timer invalidate];
@@ -147,10 +157,11 @@
    [self saveFile];
    
 }
+#endif



-
+#if 0
 -(BOOL)addFile: (NSObject *)pathOrURL {
    
    NSString *path = nil;
@@ -182,7 +193,7 @@
    
    NSFileManager *fm = [NSFileManager defaultManager];
    NSError *error;
- 
+
    NSDictionary *attr = [fm attributesOfItemAtPath: path error: &error];
    if (error) {
        NSLog(@"%@ : %@", path, error);
@@ -198,18 +209,20 @@
                              [NSDate new], @"date",
                              nil];
    
+#if 0
    @synchronized (self) {
        if (_arrayController)
            [_arrayController addObject: d];
        else
            [_content addObject: d];
    }
+#endif
    [self markDirty];
    return YES;
 }

-
-(NSMutableDictionary *)clickedItem {
+#endif
+-(DiskImage *)clickedItem {

    NSArray *array = [_arrayController arrangedObjects];
    NSInteger row = [_tableView clickedRow];
@@ -218,11 +231,21 @@
 }
 #pragma mark - IBActions

+- (IBAction)filter:(id)sender {
+    NSString *text = [sender stringValue];
+    NSPredicate *p = nil;
+    if ([text length]) {
+        p = [NSPredicate predicateWithFormat: @"name CONTAINS[cd] %@",text];
+    }
+
+    [_arrayController setFilterPredicate: p];
+}
+
 - (IBAction)showInFinder:(id)sender {
    
-    NSMutableDictionary *item = [self clickedItem];
+    DiskImage *item = [self clickedItem];
    if (!item) return;
-    NSString *path = [item objectForKey: @"path"];
+    NSString *path = [item path];

    NSURL *url = [NSURL fileURLWithPath: path];
    if (!url) return;
@@ -233,19 +256,19 @@

 - (IBAction)eject:(id)sender {

-    NSMutableDictionary *item = [self clickedItem];
+    DiskImage *item = [self clickedItem];
    if (!item) return;
    
-    @synchronized (self) {
-        
-        if (_arrayController) {
-            [_arrayController removeObject: item];
-        } else {
-            [_content removeObject: item];
-        }
-        [self markDirty];
-    }
+    [_arrayController removeObject: item];
+}

+-(IBAction)doubleClick: (id)sender {
+    DiskImage *d = [self clickedItem];
+    
+    NSNotificationCenter *nc = [NSNotificationCenter defaultCenter];
+    
+    NSDictionary *userInfo = @{ @"path": [d path] };
+    [nc postNotificationName: kNotificationDiskImageMagicRoute object: nil userInfo: userInfo];
 }

@end
@@ -257,9 +280,9 @@
    
    id objects = [_arrayController arrangedObjects];
    
-    NSDictionary *d = [objects objectAtIndex: row];
-  
-    NSString *path = [d objectForKey: @"path"];
+    DiskImage *d = [objects objectAtIndex: row];
+    if (!d) return nil;
+    NSString *path = [d path];
    
    NSURL *url = [NSURL fileURLWithPath: path];
    return url;
@@ -296,6 +319,8 @@

 -(BOOL)tableView:(NSTableView *)tableView acceptDrop:(id<NSDraggingInfo>)info row:(NSInteger)row dropOperation:(NSTableViewDropOperation)dropOperation {

+    BookmarkManager *bm = [BookmarkManager sharedManager];
+    
    if ([info draggingSource] == _tableView) return NO;

    NSPasteboard * pb = [info draggingPasteboard];
@@ -314,7 +339,9 @@
        if (!s) continue;
        NSURL *url = [NSURL URLWithString: s];
        if (!url) continue;
-        ok |= [self addFile: url];
+        
+        ok |= [bm addDiskImage: url];
+        //ok |= [self addFile: url];
    }
    return ok;
 }
@@ -11,6 +11,9 @@
 #import "Menu.h"


+static NSString *Extensions[] = { @"zip", @"7z" };
+
+
 enum {
    kTagZip = 1,
    kTag7z = 2,
@@ -81,6 +84,7 @@ enum {

@interface DownloadItem : NSObject

+@property NSString *value;
@property NSString *name;
@property NSError *error;
@property NSString *pathName;
@@ -89,6 +93,7 @@ enum {

@property NSUInteger status;
@property NSUInteger index;
+@property NSUInteger fileSize;

@property (readonly) NSColor *titleColor;
@property (readonly) NSColor *descriptionColor;
@@ -98,6 +103,8 @@ enum {
 -(void)beginDownloadWithTask:(NSURLSessionDownloadTask *)task;
 -(void)completeWithError: (NSError *)error;
 -(NSString *)statusDescription;
+
+-(void)refresh: (NSURL *)localURL;
@end


@@ -134,7 +141,7 @@ enum {
@end

@implementation DownloadWindowController {
-    
+
    NSArray *_items;
    NSURL *_romFolder;
    NSURL *_defaultDownloadURL;
@@ -143,7 +150,7 @@ enum {
    NSURLSession *_session;
    NSMutableDictionary *_taskIndex;
    NSUserDefaults *_defaults;
-    
+
    NSArray<NSButton *> *_filterButtons;
 }

@@ -167,7 +174,7 @@ enum {

 #if 0
 - (void)encodeWithCoder:(nonnull NSCoder *)coder {
-    
+
 }
 #endif

@@ -177,11 +184,11 @@ enum {

 -(void)windowWillLoad {
    _defaults = [NSUserDefaults standardUserDefaults];
-    
+
    // set here so binding works.
    NSString *s = [_defaults stringForKey: kDownloadExtension];
    if (![s length]) s = [_defaults stringForKey: kDefaultDownloadExtension];
-    
+
    _downloadExtension = s;
 }

@@ -193,12 +200,12 @@ enum {
    [window setRestorable: YES];
    [window setRestorationClass: [self class]];
 #endif
-    
+
    _filterButtons = @[
        _allFilterButton,
        _missingFilterButton
    ];
-    
+

    // Implement this method to handle any initialization after your window controller's window has been loaded from its nib file.

@@ -207,20 +214,20 @@ enum {
    NSFileManager *fm = [NSFileManager defaultManager];

    NSURL *url = [bundle URLForResource: @"roms" withExtension: @"plist"];
-    
-    NSDictionary *d = [NSDictionary dictionaryWithContentsOfURL: url];
-    
+
+    NSArray *roms = [NSArray arrayWithContentsOfURL: url];
+
    NSURL *sd = SupportDirectory();

    _romFolder = [sd URLByAppendingPathComponent: @"roms"];
-    
+
    [fm createDirectoryAtURL: _romFolder withIntermediateDirectories: YES attributes: nil error: &error];

    // so blank URL isn't overwritten.
    NSString *s = [_defaults stringForKey: kDefaultDownloadURL];
    _defaultDownloadURL = [NSURL URLWithString: s];
    [_downloadField setPlaceholderString: s];
-    
+
    s = [_defaults stringForKey: kDownloadURL];
    if ([s length]) {
        [_downloadField setStringValue: s];
@@ -228,23 +235,23 @@ enum {
    } else {
        _downloadURL = _defaultDownloadURL;
    }
-    
-    [self initializeExtensionMenu];
-    

-    NSArray *roms = [d objectForKey: @"roms"];
+    [self initializeExtensionMenu];
+
+
    [self setCurrentROM: @""];
    [self setCurrentCount: 0];
    [self setTotalCount: [roms count]];
    [self setErrorCount: 0];
-    
+

    NSMutableArray *tmp = [NSMutableArray arrayWithCapacity: [roms count]];
    unsigned ix = 0;
-    for (NSString *name in roms) {
-        
+    for (NSDictionary *d in roms) {
+
        DownloadItem *item  = [DownloadItem new];
-        [item setName: name];
+        [item setValue: [d objectForKey: @"value"]];
+        [item setName: [d objectForKey: @"description"]];
        [item setIndex: ix++];

        [tmp addObject: item];
@@ -252,12 +259,12 @@ enum {
    _items = tmp;
    [self refreshROMs: nil];
    [_arrayController setContent: _items];
- 
+
    //[_tableView reloadData];
    NSURLSessionConfiguration *config = [NSURLSessionConfiguration defaultSessionConfiguration];
    _session = [NSURLSession sessionWithConfiguration: config delegate: self delegateQueue: nil];
    _taskIndex = [NSMutableDictionary dictionaryWithCapacity: [_items count]];
-    
+
    //[self download];
 }

@@ -266,13 +273,13 @@ enum {
 #if 0
 -(void)validateURL: (NSString *)url {
    NSURL *v;
-    
+
    if (![url length]) {
        _effectiveURL = [NSURL URLWithString: _downloadURL];
        [_downloadField setTextColor: nil];
        return;
    }
-    
+
    v = [NSURL URLWithString: url];
    if (v) {
        _effectiveURL = v;
@@ -290,36 +297,36 @@ enum {
        NSURLSessionConfiguration *config = [NSURLSessionConfiguration defaultSessionConfiguration];
        _session = [NSURLSession sessionWithConfiguration: config delegate: self delegateQueue: nil];
    }
-    
+
    NSURLSessionDownloadTask *task;
-    NSString *s = [item name];
+    NSString *s = [item value];
    NSString *path = [s stringByAppendingPathExtension: _downloadExtension];
    NSURL *url = [_downloadURL URLByAppendingPathComponent: path];
-    
+
    task = [_session downloadTaskWithURL: url];
-    
+
    [item beginDownloadWithTask: task];
    [_taskIndex setObject: item forKey: task];

    [task resume];
-    
+
 }

 -(void)download {
-    
+
    // run in thread?
    //unsigned count = 0;

    for (DownloadItem *item in _items) {
-            
+
        NSURLSessionDownloadTask *task;
-        NSString *s = [item name];
+        NSString *s = [item value];
        NSString *path = [s stringByAppendingPathExtension: _downloadExtension];
        NSURL *url = [_downloadURL URLByAppendingPathComponent: path];
-        
+
        task = [_session downloadTaskWithURL: url];
        [_taskIndex setObject: item forKey: task];
-        
+
        [item setTask: task];

        [task resume];
@@ -328,7 +335,7 @@ enum {
        //if (count >= 2) break;
    }
    [self setActive: YES];
-    
+
 }

 -(DownloadItem *)clickedItem {
@@ -339,24 +346,24 @@ enum {
 }
 #if 0
 -(void)redrawRow: (NSUInteger)row {
-    
+
    //NSRect r = [_tableView rectOfRow: row];
    //[_tableView setNeedsDisplayInRect: r];
-    
+
    NSIndexSet *rIx = [NSIndexSet indexSetWithIndex: row];
    NSIndexSet *cIx = [NSIndexSet indexSetWithIndex: 0];
-    
+
    [_tableView reloadDataForRowIndexes: rIx columnIndexes: cIx];
 }
 #endif

 -(void)initializeExtensionMenu {
-    
+
    unsigned tag;
    // mark default download extension.
    NSString *defaultExt = [_defaults stringForKey: kDefaultDownloadExtension];
    tag = [DownloadExtensionTransformer stringToNumber: defaultExt];
-    
+
    NSMenuItem *item = [[_formatButton menu] itemWithTag: tag];
    if (item) {
        [item setAttributedTitle: ItalicMenuString([item title])];
@@ -373,6 +380,10 @@ enum {
 #endif
 }

+-(void) defocus {
+    [[self window] makeFirstResponder: nil];
+}
+
 #pragma mark - IBActions

 -(IBAction)cancelAll:(id)sender {
@@ -386,13 +397,11 @@ enum {
    [_taskIndex removeAllObjects];
    [self setCurrentCount: 0];
    [self setActive: NO];
-
-    //[_tableView reloadData];
-    //[_tableView setNeedsDisplay: YES]; // doesn't work...
 }

 - (IBAction)downloadMissing:(id)sender {

+    [self defocus];
    BOOL delta = NO;
    for (DownloadItem *item in _items) {
        NSURL *url = [item localURL];
@@ -402,10 +411,9 @@ enum {
            delta = YES;
        }
    }
-    
+
    if (delta) {
        [self setActive: YES];
-        //[_tableView reloadData];
    }
 }
 - (IBAction)showRomFolder:(id)sender {
@@ -415,30 +423,31 @@ enum {
 }

 -(IBAction)refreshROMs: (id)sender {
-    
+
    NSString *romdir = [SupportDirectoryPath() stringByAppendingPathComponent: @"roms"];
    NSFileManager *fm = [NSFileManager defaultManager];

    for (DownloadItem *item in _items) {
-        NSString *name = [item name];
-        NSString *s = [romdir stringByAppendingPathComponent: name];
+        NSDictionary *attr = nil;
+        NSString *value = [item value];
+        NSString *s = [romdir stringByAppendingPathComponent: value];
        NSString *path;
-        path = [s stringByAppendingPathExtension: @"zip"];
-        if ([fm fileExistsAtPath: path]) {
-            [item setStatus: ItemFound];
-            [item setLocalURL: [NSURL fileURLWithPath: path]];
-            continue;
+
+        for (unsigned i = 0; i < 2; ++i) {
+            path = [s stringByAppendingPathExtension: Extensions[i]];
+            attr = [fm attributesOfItemAtPath: path error: nil];
+            if (attr) break;
        }

-        path = [s stringByAppendingPathExtension: @"7z"];
-        if ([fm fileExistsAtPath: path]) {
+        if (attr) {
            [item setStatus: ItemFound];
            [item setLocalURL: [NSURL fileURLWithPath: path]];
-            continue;
+            [item setFileSize: [attr fileSize]];
+        } else {
+            [item setStatus: ItemMissing];
+            [item setLocalURL: nil];
+            [item setFileSize: 0];
        }
-        
-        [item setStatus: ItemMissing];
-        [item setLocalURL: nil];
    }
 }

@@ -452,20 +461,37 @@ enum {
    [ws activateFileViewerSelectingURLs: @[url]];
 }

+- (IBAction)moveToTrash:(id)sender {
+    NSError *error = nil;
+
+    DownloadItem *item = [self clickedItem];
+    if (!item) return;
+    NSURL *url = [item localURL];
+    if (!url) return;
+
+    NSFileManager *fm = [NSFileManager defaultManager];
+    if ([fm trashItemAtURL: url resultingItemURL: NULL error: &error]) {
+        [item refresh: nil];
+    } else {
+        [self presentError: error];
+    }
+
+}
+
 - (IBAction)download:(id)sender {
    DownloadItem *item = [self clickedItem];
    if (!item) return;

+    [self defocus];
+
    [self downloadItem: item];
    [self setActive: YES];
-    //[self redrawRow: [item index]];
 }
 - (IBAction)cancel:(id)sender {
    DownloadItem *item = [self clickedItem];
    if (!item) return;

    [item cancelDownload];
-    //[self redrawRow: [item index]];
 }

 // binding screws up with placeholder.
@@ -493,7 +519,6 @@ enum {
    [sender setState: NSControlStateValueOn];


-
    for (NSButton *b in _filterButtons) {
        if (b != sender) [b setState: NSControlStateValueOff];
    }
@@ -541,7 +566,7 @@ static NSInteger TaskStatusCode(NSURLSessionTask *task) {
        error = [NSError errorWithDomain: NSURLErrorDomain code: NSURLErrorFileDoesNotExist userInfo: info];
    }

-    
+
    // not sure if strictly necessary but this happens in a background thread
    // and these are used in KVO binding.  Also, main thread only
    // means no race conditions.
@@ -558,25 +583,22 @@ static NSInteger TaskStatusCode(NSURLSessionTask *task) {
        if ([taskIndex count] == 0) {
            [self setActive: NO];
        }
-        
+
        if (item) {
            [item completeWithError: error];
-            //NSUInteger row = [item index];
-            
-            //[self redrawRow: row];
        }
    });
-    
+
 }

 - (void)URLSession:(NSURLSession *)session downloadTask:(nonnull NSURLSessionDownloadTask *)task didFinishDownloadingToURL:(nonnull NSURL *)location {

-    
+
 //    NSLog(@"%@", task);
 //    NSLog(@"%@", [task response]);
-    
+
    if (TaskStatusCode(task) != 200) return;
-    
+

    // need to move to the destination directory...
    // file deleted after this function returns, so can't move asynchronously.
@@ -584,22 +606,89 @@ static NSInteger TaskStatusCode(NSURLSessionTask *task) {
    NSURL *src = [[task originalRequest] URL];
    NSURL *dest = [_romFolder URLByAppendingPathComponent: [src lastPathComponent]];
    NSError *error = nil;
-    
+
    [fm moveItemAtURL: location toURL: dest error: &error];

-    DownloadItem *item = [_taskIndex objectForKey: task];
-    [item setLocalURL: dest];
-
-    /*
    dispatch_async(dispatch_get_main_queue(), ^(void){
+        NSMutableDictionary *taskIndex = self->_taskIndex;
+        DownloadItem *item = [taskIndex objectForKey: task];

+        [item refresh: dest];
+    });

-        [item setLocalURL: dest];
-    }
-    */
    NSLog(@"%@", src);
 }

+
+
+-(NSURLCredential *)credentialForChallenge: (NSURLAuthenticationChallenge *)challenge {
+
+
+    //if ([challenge previousFailureCount]) return nil;
+
+    NSURLCredential *credential = nil;
+    NSURLProtectionSpace *space = [challenge protectionSpace];
+
+
+    OSStatus status;
+    NSDictionary *query;
+    CFTypeRef item = nil;
+
+
+    query = @{
+        (id)kSecClass: (id)kSecClassInternetPassword,
+        (id)kSecReturnData: (id)kCFBooleanTrue,
+        (id)kSecReturnAttributes: (id)kCFBooleanTrue,
+        (id)kSecAttrServer: [space host],
+        //(id)kSecAttrProtocol: [space protocol],
+        (id)kSecMatchLimit: (id)kSecMatchLimitOne,
+    };
+
+    status = SecItemCopyMatching((CFDictionaryRef)query, &item);
+    //NSLog(@"%@", query);
+    if (status != 0) return nil;
+
+    NSDictionary *d = (__bridge NSDictionary *)item;
+    //NSLog(@"%@", d);
+
+    NSString *account = [d objectForKey: (id)kSecAttrAccount];
+    NSData *passwordData = [d objectForKey: (id)kSecValueData];
+    NSString *password = [[NSString alloc] initWithData: passwordData encoding: NSUTF8StringEncoding];
+
+
+    credential = [NSURLCredential credentialWithUser: account password: password persistence: NSURLCredentialPersistenceForSession];
+
+    return credential;
+
+}
+
+- (void)URLSession:(NSURLSession *)session task:(NSURLSessionTask *)task didReceiveChallenge:(NSURLAuthenticationChallenge *)challenge completionHandler:(void (^)(NSURLSessionAuthChallengeDisposition disposition, NSURLCredential *credential))completionHandler {
+
+    NSLog(@"challenge: %@", challenge);
+
+    if ([challenge previousFailureCount]) {
+        completionHandler(NSURLSessionAuthChallengeCancelAuthenticationChallenge, nil);
+        return;
+    }
+
+    NSURLProtectionSpace *space = [challenge protectionSpace];
+    NSString *method = [space authenticationMethod];
+
+    if ([NSURLAuthenticationMethodHTTPBasic isEqualToString: method] ||
+        [NSURLAuthenticationMethodNTLM isEqualToString: method] ||
+        [NSURLAuthenticationMethodHTTPDigest isEqualToString: method]) {
+
+        NSURLCredential *credential = [self credentialForChallenge: challenge];
+
+        if (credential) {
+            completionHandler(NSURLSessionAuthChallengeUseCredential, credential);
+            return;
+        }
+    }
+
+    completionHandler(NSURLSessionAuthChallengePerformDefaultHandling, nil);
+}
+
@end


@@ -633,15 +722,45 @@ static NSInteger TaskStatusCode(NSURLSessionTask *task) {
    }
 }

-#if 0
-// in practice, error and status set concurrently.
-+(NSSet *)keyPathsForValuesAffectingStatus {
-    static NSSet *set = nil;
-    if (!set) set = [NSSet setWithObjects: @"error", nil];
-    return set;
-}
-#endif

+-(void)refresh: (NSURL *)localURL {
+    NSDictionary *attr = nil;
+    NSError * error = nil;
+    NSFileManager *fm = [NSFileManager defaultManager];
+
+    if (localURL) {
+        attr = [fm attributesOfItemAtPath: [localURL path] error: &error];
+    } else {
+        NSString *romdir = [SupportDirectoryPath() stringByAppendingPathComponent: @"roms"];
+        NSString *s = [romdir stringByAppendingPathComponent: _value];
+
+        NSString *path = nil;
+        for (unsigned i = 0; i < 2; ++i) {
+            path = [s stringByAppendingPathExtension: Extensions[i]];
+            attr = [fm attributesOfItemAtPath: path error: nil];
+            if (attr) {
+                localURL = [NSURL fileURLWithPath: path];
+                break;
+            }
+        }
+    }
+
+    if (attr && localURL) {
+        [self setLocalURL: localURL];
+        [self setFileSize: [attr fileSize]];
+        [self setStatus: ItemFound];
+    } else {
+        [self setLocalURL: nil];
+        [self setFileSize: 0];
+        if (_status == ItemFound || _status == ItemDownloaded)
+            [self setStatus: ItemMissing];
+    }
+
+}
+
+(NSSet *)keyPathsForValuesAffectingStatusDescription {
+    return [NSSet setWithObjects: @"error", @"status", nil];
+}
 -(NSString *)statusDescription {

    static NSString *Names[] = {
@@ -684,27 +803,34 @@ enum {
 };

 - (BOOL)validateMenuItem:(NSMenuItem *)menuItem {
-    
-    if ([menuItem action] == @selector(downloadExtensionChanged:)) return YES;

+    SEL action = [menuItem action];
+    if (action == @selector(downloadExtensionChanged:)) return YES;
+
+    DownloadItem *item = [self clickedItem];
+    if (!item) return NO;
+#if 0
    NSInteger row = [_tableView clickedRow];
    if (row < 0) return NO;
    DownloadItem *item = [[_arrayController arrangedObjects] objectAtIndex: row]; //[_items objectAtIndex: row];
-    
+#endif
+
    NSUInteger status = [item status];
-    switch([menuItem tag]) {
-        case kOpenInFinder:
-            return status == ItemFound || status == ItemDownloaded;
-            break;
-        case kDownload:
-            return YES;
-            //return status == ItemMissing || status == ItemError || status == ItemCanceled;
-            break;
-        case kCancel:
-            return status == ItemDownloading;
-            break;
-            
+
+    if (action == @selector(moveToTrash:)) {
+        return [item localURL] != nil;
    }
+    if (action == @selector(showInFinder:)) {
+        return [item localURL] != nil;
+    }
+    if (action == @selector(download:)) {
+        return YES;
+    }
+    if (action == @selector(cancel:)) {
+        return status == ItemDownloading;
+    }
+
+
    return NO;
 }

@@ -47,10 +47,12 @@
 	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
+	<key>LSApplicationCategoryType</key>
+	<string>public.app-category.utilities</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
 	<key>NSHumanReadableCopyright</key>
-	<string>Copyright © 2020-2021 Kelvin Sherlock. All rights reserved.</string>
+	<string>Copyright © 2020-2023 Kelvin Sherlock. All rights reserved.</string>
 	<key>NSMainNibFile</key>
 	<string>MainMenu</string>
 	<key>NSPrincipalClass</key>
@@ -58,6 +60,10 @@
 	<key>NSSupportsAutomaticTermination</key>
 	<true/>
 	<key>NSSupportsSuddenTermination</key>
-	<true/>
+	<false/>
+	<key>SUFeedURL</key>
+	<string>https://ample.ksherlock.com/updates/appcast.xml</string>
+	<key>SUPublicEDKey</key>
+	<string>MgYKY5J1nIJ9+C3IabG24ri2M0CuoMqP78fva2GI5BY=</string>
 </dict>
 </plist>
@@ -10,7 +10,7 @@

 NS_ASSUME_NONNULL_BEGIN

-@interface LaunchWindowController : NSWindowController <NSBrowserDelegate>
+@interface LaunchWindowController : NSWindowController <NSBrowserDelegate, NSMenuDelegate>

@end

@@ -16,6 +16,7 @@
 #import "AutocompleteControl.h"
 #import "SoftwareList.h"
 #import "BookmarkManager.h"
+#import "Bookmark.h"

 #include <sys/stat.h>
 #include <wctype.h>
@@ -28,6 +29,7 @@ static NSString *kContextMachine = @"kContextMachine";
    BOOL _loadingBookmark;
    NSString *_machine;
    NSDictionary *_machineDescription;
+    BookmarkManager *_manager;
 }
@property (strong) IBOutlet MediaViewController *mediaController;
@property (strong) IBOutlet SlotViewController *slotController;
@@ -49,6 +51,7 @@ static NSString *kContextMachine = @"kContextMachine";
@property BOOL mameMouse;
@property BOOL mameSamples;
@property BOOL mameBGFX;
+@property BOOL mameRewind;

@property BOOL mameAVI;
@property BOOL mameWAV;
@@ -78,7 +81,13 @@ static NSString *kContextMachine = @"kContextMachine";

@property (strong) IBOutlet NSWindow *addBookmarkWindow;
@property (strong) NSString *bookmarkName;
+@property BOOL bookmarkDefault;
@property (weak) IBOutlet NSTextField *bookmarkTextField;
+@property (weak) IBOutlet NSTextField *bookmarkErrorField;
+
+@property BOOL optionKey;
+
+
@end

@interface LaunchWindowController (SoftwareList)
@@ -94,6 +103,8 @@ static NSString *kContextMachine = @"kContextMachine";

 -(IBAction)defaultLoad:(id)sender;

+-(void)bookmarkNotification: (NSNotification *)notification;
+
@end

 #define SIZEOF(x) (sizeof(x) / sizeof(x[0]))
@@ -110,6 +121,7 @@ static NSString *EffectsStrings[] = {
    @"crt-geom",
    @"crt-geom-deluxe",
    @"lcd-grid",
+    @"Fighters",
 };


@@ -146,7 +158,8 @@ static int EffectsIndex(NSString *str) {
    [self setMameSamples: NO];
    [self setMameSquarePixels: NO];
    [self setMameDebug: NO];
-    [self setMameWindowMode: 0];
+    [self setMameRewind: NO];
+    [self setMameWindowMode: 1]; // default = 1x window.

    [self setMameBackend: 0];
    [self setMameEffects: 0];
@@ -178,6 +191,8 @@ static int EffectsIndex(NSString *str) {

 -(void)windowWillLoad {

+    _manager = [BookmarkManager sharedManager];
+    
    // if this calls [self window], it will recurse.  that is bad.
    //[self defaultLoad: nil];
    [self reset];
@@ -202,16 +217,16 @@ static void AddSubview(NSView *parent, NSView *child) {
    AddSubview(_mediaView, [_mediaController view]);
    AddSubview(_machineView, [_machineViewController view]);

- 
-    // can't be done until above views are set up.
-    [self defaultLoad: nil];
+    
+    [_softwareListControl setMinWidth: 250];
+    [_softwareListControl setHidden: YES];


    NSArray *keys = @[
        //@"mameMachine", // - handled
        @"mameSquarePixels", @"mameWindowMode",
        @"mameMouse", @"mameSamples",
-        @"mameDebug",
+        @"mameDebug", @"mameRewind",
        @"mameSpeed",
        @"mameAVI", @"mameAVIPath",
        @"mameWAV", @"mameWAVPath",
@@ -235,10 +250,17 @@ static void AddSubview(NSView *parent, NSView *child) {
    [_machineViewController addObserver: self forKeyPath: @"machine" options: 0 context: (__bridge void * _Nullable)kContextMachine];

    
-    [_softwareListControl setMinWidth: 250];
-    [_softwareListControl setHidden: YES];
+    
+    
+    // can't be done until above views are set up.
+    [self defaultLoad: nil];
+
    
    [self buildCommandLine];
+    
+    NSNotificationCenter *nc = [NSNotificationCenter defaultCenter];
+    
+    [nc addObserver: self selector: @selector(bookmarkNotification:) name: kNotificationBookmarkMagicRoute object: nil];
 }


@@ -441,11 +463,6 @@ static NSString *ShellQuote(NSString *s) {
    //[argv addObject: @"mame"];
    [argv addObject: _machine];
    
-    if (_software) {
-        NSString *name = [_softwareSet nameForSoftware: _software];
-        if (name) [argv addObject: name];
-    }
-
    // -confirm_quit?
    [argv addObject: @"-skip_gameinfo"];

@@ -457,7 +474,7 @@ static NSString *ShellQuote(NSString *s) {
        [argv addObject: @"-nosamples"];
    
    if (_mameDebug) [argv addObject: @"-debug"];
-
+    if (_mameRewind) [argv addObject: @"-rewind"];

    
    /*
@@ -505,6 +522,9 @@ static NSString *ShellQuote(NSString *s) {


    if (_mameBGFX) {
+        [argv addObject: @"-video"];
+        [argv addObject: @"bgfx"];
+
        if (_mameBackend) {
            [argv addObject: @"-bgfx_backend"];
            [argv addObject: BackendStrings[_mameBackend]];
@@ -534,6 +554,12 @@ static NSString *ShellQuote(NSString *s) {
        [argv addObjectsFromArray: tmp];
    }

+    // software *AFTER* slots so, eg, apple2ee has access to the superdrive.
+    if (_software) {
+        NSString *name = [_softwareSet nameForSoftware: _software];
+        if (name) [argv addObject: name];
+    }
+    
    if (_mameSpeed < 0) {
        [argv addObject: @"-nothrottle"];
    } else if (_mameSpeed > 1) {
@@ -542,7 +568,7 @@ static NSString *ShellQuote(NSString *s) {
    }
    
    // audio video.
- 
+
    if (_mameAVI && [_mameAVIPath length]) {
        [argv addObject: @"-aviwrite"];
        [argv addObject: _mameAVIPath];
@@ -589,17 +615,77 @@ static NSString *ShellQuote(NSString *s) {
    //return [super validateMenuItem: menuItem]; // not implemented?
 }

+-(void)defocus {
+    [[self window] makeFirstResponder: nil]; // in case text is being edited...
+}
+
 # pragma mark - IBActions

 - (IBAction)launchAction:(id)sender {

-    [[self window] makeFirstResponder: nil]; // in case text is being edited...
+    [self defocus];
    if (![_args count]) return;

    [LogWindowController controllerForArgs: _args];

 }

+
+- (IBAction)listMedia:(id)sender {
+
+    [self defocus];
+    if (!_machine) return;
+    
+    NSMutableArray *argv = [NSMutableArray new];
+
+    [argv addObject: _machine];
+    [argv addObject: @"-listmedia"];
+
+    
+    NSArray *tmp;
+    tmp = [_slotController args];
+    if ([tmp count]) {
+        [argv addObjectsFromArray: tmp];
+    }
+
+#if 0
+    tmp = [_mediaController args];
+    if ([tmp count]) {
+        [argv addObjectsFromArray: tmp];
+    }
+#endif
+
+    [LogWindowController controllerForArgs: argv close: NO];
+}
+
+- (IBAction)listSlots:(id)sender {
+
+    [self defocus];
+    if (!_machine) return;
+    
+    NSMutableArray *argv = [NSMutableArray new];
+
+    [argv addObject: _machine];
+    [argv addObject: @"-listslots"];
+
+    
+    NSArray *tmp;
+    tmp = [_slotController args];
+    if ([tmp count]) {
+        [argv addObjectsFromArray: tmp];
+    }
+
+#if 0
+    tmp = [_mediaController args];
+    if ([tmp count]) {
+        [argv addObjectsFromArray: tmp];
+    }
+#endif
+
+    [LogWindowController controllerForArgs: argv close: NO];
+}
+
+
 -(IBAction)exportShellScript: (id)sender {
    
    NSSavePanel *p = [NSSavePanel savePanel];
@@ -652,6 +738,7 @@ static NSString *ShellQuote(NSString *s) {

 -(IBAction)resetAll:(id)sender {

+    [_manager setCurrentBookmark: nil];
    [self reset];
    [self resetSoftware];
    [_slotController resetSlots: sender];
@@ -700,32 +787,40 @@ static NSString *ShellQuote(NSString *s) {

 -(IBAction)defaultSave:(id)sender {

-    BookmarkManager *bm = [BookmarkManager sharedManager];
-
+#if 0
    NSDictionary *d = [self makeBookmark];

-    [bm saveDefault: d];
+    [_manager saveDefault: d];
+#endif
 }

 -(IBAction)defaultLoad:(id)sender {

-    BookmarkManager *bm = [BookmarkManager sharedManager];
+    Bookmark *b = [_manager defaultBookmark];

-    NSDictionary *d = [bm loadDefault];
-    if (!d) {
+    if (!b) {
        [self resetAll: sender];
        [self setMachine: nil];
        [_machineViewController reset];
        [_slotController setMachine: nil];
        return;
    }
-    [self loadBookmark: d];
+    [self loadBookmark: b];
+}
+
+-(IBAction)updateBookmark: (id)sender {
+    
+    Bookmark *b = [sender representedObject];
+    if (!b) return;
+    
+    NSDictionary *d = [self makeBookmark];
+    [b setDictionary: d];
 }

 -(IBAction)addBookmark:(id)sender {
    
    if (!_machine) return;
-    
+
    NSString *name = nil;
    if (_machineDescription) name = [_machineDescription objectForKey:@"description"];
    if (!name) name = _machine;
@@ -734,8 +829,14 @@ static NSString *ShellQuote(NSString *s) {
    if (_software) {
        name = [name stringByAppendingFormat: @" - %@", [_software title]];
    }
+    
+    name = [_manager uniqueBookmarkName: name];
+    
    [self setBookmarkName: name];
+    [self setBookmarkDefault: NO];
    [_bookmarkTextField selectText: nil];
+    [_bookmarkErrorField setStringValue: @""];
+
    [[self window] beginSheet: _addBookmarkWindow completionHandler:  nil];
 }

@@ -745,19 +846,26 @@ static NSString *ShellQuote(NSString *s) {
 }

 -(IBAction)bookmarkSave:(id)sender {
-    
-    
-    BookmarkManager *bm = [BookmarkManager sharedManager];
+        

-    if (![bm validateName: _bookmarkName]) {
+#if 0
+    if (![_manager validateName: _bookmarkName]) {
        [_bookmarkTextField selectText: nil];
        NSBeep();
        return;
    }
+#endif

    NSDictionary *d = [self makeBookmark];
+    NSError *e;
    
-    [bm saveBookmark: d name: _bookmarkName];
+    if (( e = [_manager saveBookmark: d name: _bookmarkName automatic: _bookmarkDefault])) {
+        // probably a duplicate name...
+        [_bookmarkTextField selectText: nil];
+        [_bookmarkErrorField setStringValue: [e localizedDescription]];
+        NSBeep();
+        return;
+    }
    
    [[self window] endSheet: _addBookmarkWindow];
    [_addBookmarkWindow orderOut: nil];
@@ -765,22 +873,27 @@ static NSString *ShellQuote(NSString *s) {
 }


+-(void)bookmarkNotification: (NSNotification *)notification {
+    
+    Bookmark *b = [notification object];
+    [self loadBookmark: b];
+}
+
 -(IBAction)bookmarkMenu:(id)sender {
-    
-    NSURL *url = [sender representedObject];
-    if (!url) return;
-    
-    NSDictionary *d = [NSDictionary dictionaryWithContentsOfURL: url];
-    if (!d) return; // oops...
-    
-    [self loadBookmark: d];
+
+    // represented object is a Bookmark.
+    Bookmark *b = [sender representedObject];
+    [self loadBookmark: b];
 }


-(void)loadBookmark: (NSDictionary *)d {
+-(void)loadBookmark: (Bookmark *)b {
    Class StringClass = [NSString class];
    Class NumberClass = [NSNumber class];
-    
+
+    NSDictionary *d = [b dictionary];
+
+    [_manager setCurrentBookmark: b];
    
    NSString *machine = [d objectForKey: @"machine"];
    if (!machine) return;
@@ -791,6 +904,7 @@ static NSString *ShellQuote(NSString *s) {
    [_mediaController willLoadBookmark: d];

    [self reset];
+    [self resetSoftware];
    
    [self setMachine: machine];
    [self updateSoftwareList];
@@ -814,6 +928,7 @@ static NSString *ShellQuote(NSString *s) {
 #define _(a,b) n = [d objectForKey: a]; if ([n isKindOfClass: NumberClass]) [self b : [n boolValue]]
  
    _(@"debug", setMameDebug);
+    _(@"rewind", setMameRewind);
    _(@"squarePixels", setMameSquarePixels);
    _(@"mouse", setMameMouse);
    _(@"samples", setMameSamples);
@@ -872,7 +987,7 @@ static NSString *ShellQuote(NSString *s) {

 -(NSDictionary *)makeBookmark {
    
-    [[self window] makeFirstResponder: nil];
+    [self defocus];

    NSMutableDictionary *dict = [NSMutableDictionary new];
    
@@ -888,6 +1003,7 @@ static NSString *ShellQuote(NSString *s) {
 #define _(v,k) [dict setObject: v ? (NSObject *)kCFBooleanTrue : (NSObject *)kCFBooleanFalse forKey: k]

    _(_mameDebug, @"debug");
+    _(_mameRewind, @"rewind");
    _(_mameSquarePixels, @"squarePixels");
    _(_mameMouse, @"mouse");
    _(_mameSamples, @"samples");
@@ -924,4 +1040,24 @@ static NSString *ShellQuote(NSString *s) {
 }


+#pragma mark - NSMenuDelegate
+
+#if 1
+-(void)menuNeedsUpdate:(NSMenu *)menu {
+    NSEventModifierFlags modifiers = [NSEvent modifierFlags];
+    
+    [self setOptionKey: modifiers & NSEventModifierFlagOption ? YES : NO];
+}
+
+#else
+/* doesn't trigger when menu is the first responder. */
+-(void)flagsChanged:(NSEvent *)event {
+    NSEventModifierFlags modifiers = [event modifierFlags];
+
+    [self setOptionKey: modifiers & NSEventModifierFlagOption ? YES : NO];
+
+    [super flagsChanged: event];
+}
+#endif
+
@end
@@ -12,8 +12,13 @@ NS_ASSUME_NONNULL_BEGIN

@interface LogWindowController : NSWindowController <NSWindowDelegate>

+#if 0
 +(id)controllerForTask: (NSTask *)task;
+(id)controllerForTask: (NSTask *)task close: (BOOL)close;
+#endif
+
 +(id)controllerForArgs: (NSArray *)args;
+(id)controllerForArgs: (NSArray *)args close: (BOOL)close;
@end

 NS_ASSUME_NONNULL_END
@@ -19,6 +19,10 @@ static NSMutableSet *LogWindows;
@implementation LogWindowController {
    NSTask *_task;
    NSFileHandle *_handle;
+    NSFont *_font;
+
+    BOOL _close;
+    BOOL _eof;
 }

 +(void)initialize {
@@ -30,17 +34,14 @@ static NSMutableSet *LogWindows;
 }


-+(id)controllerForTask: (NSTask *)task {
+(id)controllerForTask: (NSTask *)task close: (BOOL)close{
    LogWindowController *controller = [[LogWindowController alloc] initWithWindowNibName: @"LogWindow"];
-    [controller runTask: task];
+    [controller runTask: task close: close];
    return controller;
 }


-
-+(id)controllerForArgs: (NSArray *)args {
-    
-//    NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
+(id)controllerForArgs: (NSArray *)args close: (BOOL)close {

    NSURL *url = MameURL();

@@ -64,15 +65,24 @@ static NSMutableSet *LogWindows;
    
    [task setArguments: args];
    
-    return [LogWindowController controllerForTask: task];
+    return [LogWindowController controllerForTask: task close: close];
+
+}
+
+(id)controllerForArgs: (NSArray *)args {
+
+    NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
+    BOOL close = [defaults boolForKey: kAutoCloseLogWindow];
+    return [self controllerForArgs: args close: close];
 }

 - (void)windowDidLoad {
    [super windowDidLoad];
    
    [LogWindows addObject: self];
+
+    _font = [NSFont userFixedPitchFontOfSize: 0];
    
-    // Implement this method to handle any initialization after your window controller's window has been loaded from its nib file.
 }

 -(void)appendString: (NSString *)string
@@ -80,7 +90,10 @@ static NSMutableSet *LogWindows;
    if ([string length])
    {
        // needs explicit color attribute for proper dark mode support.
-        NSDictionary *attr = @{ NSForegroundColorAttributeName: [NSColor textColor] };
+        NSDictionary *attr = @{
+            NSForegroundColorAttributeName: [NSColor textColor],
+            NSFontAttributeName: _font,
+        };
        NSAttributedString *astr = [[NSAttributedString alloc] initWithString: string attributes: attr];
        [[_textView textStorage] appendAttributedString: astr];
    }
@@ -93,10 +106,12 @@ static NSMutableSet *LogWindows;
    }
 }

-(NSError *)runTask: (NSTask *)task {
+-(NSError *)runTask: (NSTask *)task close: (BOOL)close {
    
    
    if (_task) return nil;
+    _close = close;
+    _eof = NO;

    NSPipe *pipe = [NSPipe pipe];
    
@@ -130,16 +145,6 @@ static NSMutableSet *LogWindows;
        }
    }

-#if 0
-    if (error) {
-//        NSURL *url = [task executableURL];
-//        NSString *path = [NSString stringWithCString: [url fileSystemRepresentation] encoding: NSUTF8StringEncoding];
-        NSLog(@"NSTask error. Path = %s error = %@", path, error);
-//        [self appendString: path];
-//        [self appendString: [error description]];
-        return error;
-    }
-#endif
    _task = task;
    NSString *title = [NSString stringWithFormat: @"Ample Log - %u", [task processIdentifier]];
    [[self window] setTitle: title];
@@ -150,6 +155,7 @@ static NSMutableSet *LogWindows;
    
    NSNotificationCenter *nc = [NSNotificationCenter defaultCenter];

+
    [nc addObserver: self
           selector: @selector(taskComplete:)
               name: NSTaskDidTerminateNotification
@@ -160,6 +166,7 @@ static NSMutableSet *LogWindows;
             object: _handle];
    
    [_handle readInBackgroundAndNotify];
+
    [[self window] setDocumentEdited: YES];
    return nil;
 }
@@ -172,21 +179,33 @@ static NSMutableSet *LogWindows;
    // read complete, queue up another.
    NSDictionary *dict = [notification userInfo];
    NSData *data = [dict objectForKey: NSFileHandleNotificationDataItem];
-    
+
    if ([data length])
    {
-        
        NSString *string = [[NSString alloc] initWithData: data encoding: NSUTF8StringEncoding];
        
        [self appendString: string];
        
        [_handle readInBackgroundAndNotify];
+    } else {
+        [self appendString: @"\n"]; // -listmedia sometimes causes display issues.
+        _eof = YES;
+        //[_textView setNeedsDisplay: YES]; // -listmedia sometimes weird.
    }
-    
 }

+-(void)taskCompleteHack {
+
+}
+
+/* hask! task complete may occur while output still being processed. add a delay to compensate. */
 -(void)taskComplete: (NSNotification *)notification
 {
+    if (!_eof) {
+        [self performSelector: @selector(taskComplete:) withObject: notification afterDelay: 0.5];
+        return;
+    }
+
    BOOL ok = NO;
    NSTaskTerminationReason reason;
    int status;
@@ -200,7 +219,7 @@ static NSMutableSet *LogWindows;
        
        if (status == 0)
        {
-            string = @"\n\n[Success]\n\n";
+            //string = @"\n\n[Success]\n\n";
            ok = YES;
        }
        else string = @"\n\n[An error occurred]\n\n";
@@ -209,18 +228,22 @@ static NSMutableSet *LogWindows;
    {
        string = [NSString stringWithFormat: @"\n\n[Caught signal %d (%s)]\n\n", status, strsignal(status)];
    }
-    
-    [self appendString: string];
-    
+    if (string) {
+        NSDictionary *attr = @{
+            NSForegroundColorAttributeName: [NSColor systemRedColor],
+            NSFontAttributeName: _font,
+        };
+        NSAttributedString *astr = [[NSAttributedString alloc] initWithString: string attributes: attr];
+        [self appendAttributedString: astr];
+    }
+
    _handle = nil;
    _task = nil;
    
    [[self window] setDocumentEdited: NO];
    
-    if (ok && [[NSUserDefaults standardUserDefaults] boolForKey: kAutoCloseLogWindow]) {
-        
+    if (ok && _close) {
        [[self window] close];
-        //[LogWindows removeObject: self]; // close sends WindowWillClose notification.
    }
 }

@@ -18,8 +18,27 @@ typedef struct Media {
    unsigned floppy_3_5;
    unsigned pseudo_disk;
    unsigned bitbanger;
+    unsigned midiin;
+    unsigned midiout;
+    unsigned picture;
+    unsigned rom;
+    uint64_t floppy_mask;
 } Media;

+
+typedef enum {
+    MediaTypeError = -1,
+    MediaTypeUnknown = 0,
+    MediaType_5_25,
+    MediaType_3_5,
+    MediaType_HardDisk,
+    MediaType_CDROM,
+    MediaType_Cassette,
+    MediaType_Picture,
+    MediaType_MIDI,
+    MediaType_ROM,
+} MediaType;
+
 struct Media MediaFromDictionary(NSDictionary *);

 void MediaAdd(Media *dest, const Media *src);
@@ -28,4 +47,6 @@ BOOL MediaEqual(const Media *lhs, const Media *rhs);

 extern const Media EmptyMedia;

+MediaType ClassifyMediaFile(id file);
+
 #endif /* Media_h */
@@ -23,6 +23,10 @@ struct Media MediaFromDictionary(NSDictionary *dict) {
    _(floppy_5_25);
    _(pseudo_disk);
    _(bitbanger);
+    _(midiin);
+    _(midiout);
+    _(picture);
+    _(rom);

    return m;
 #undef _
@@ -32,6 +36,12 @@ void MediaAdd(Media *dest, const Media *src) {

    if (!src || !dest) return;

+    // could merge from src media but not currently set there.
+    
+    unsigned count;
+    unsigned flops = dest->floppy_5_25 + dest->floppy_3_5;
+
+    
 #define _(name) dest->name += src->name;
    _(cass);
    _(cdrom);
@@ -40,7 +50,21 @@ void MediaAdd(Media *dest, const Media *src) {
    _(floppy_5_25);
    _(pseudo_disk);
    _(bitbanger);
+    _(midiin);
+    _(midiout);
+    _(picture);
+    _(rom);
 #undef _
+
+    
+    if ((count = src->floppy_5_25)) {
+        uint64_t bits = (1 << count) - 1;
+        //dest->floppy_mask <<= count;
+        bits <<= flops;
+        dest->floppy_mask |= bits;
+    }
+
+
 }

 BOOL MediaEqual(const Media *lhs, const Media *rhs) {
@@ -56,6 +80,286 @@ BOOL MediaEqual(const Media *lhs, const Media *rhs) {
    _(floppy_5_25);
    _(pseudo_disk);
    _(bitbanger);
+    _(midiin);
+    _(midiout);
+    _(picture);
+    _(rom);
+
+    _(floppy_mask);
+
    return YES;
 #undef _
 }
+
+
+#include <unistd.h>
+#include <sys/stat.h>
+
+
+
+#define _x2(a,b) (a | (b << 8))
+#define _x3(a,b,c) (a | (b << 8) | (c << 16))
+#define _x4(a,b,c, d) (a | (b << 8) | (c << 16) | (d << 24))
+static unsigned hash(const char *cp) {
+    unsigned rv = 0;
+    int i, shift;
+    if (!cp) return 0;
+    for (i = 0, shift = 0; i < 4; ++i, shift += 8) {
+        unsigned c = cp[i];
+        if (!c) break;
+        c = tolower(c);
+        rv |= (c << shift);
+    }
+    //if (i > 4) return 0; // .image is 5....
+    return rv;
+}
+
+const char *extname(const char *path) {
+    
+    const char *rv = NULL;
+    if (!path) return path;
+    for(unsigned i = 0; ; ++i) {
+        unsigned c = path[i];
+        if (c == 0) break;
+        if (c == '/') rv = NULL;
+        if (c == '.') rv = path + i + 1;
+    }
+    if (rv && !*rv) rv = NULL;
+    return rv;
+}
+
+/*
+ * MAME cares deeply about file extensions. LIST NOT EXHAUSTIVE
+ *
+ * Hard Disk: .chd  .hd   .hdv  .2mg  .hdi
+ * CD-ROM: .chd  .cue  .toc  .nrg  .gdi  .iso  .cdr
+ * 5.25: .dsk .do .po  .edd  .woz  .nib .mfi  .dfi  .rti
+ * 3.5: .dc42 .woz .2mg .mfi  .dfi  .hfe  .mfm  .td0  .imd
+        .d77  .d88  .1dd  .cqm .cqi  .dsk  .ima  .img  .ufi
+        .360  .ipf [also .po and .hdv]
+ * Midi in: .mid
+ * Midi out: .mid
+ * Picture: .png
+ * Cassette: .wav
+ */
+
+static bool is_raw_525(size_t disk_size) {
+    if (disk_size & 255) return NO;
+    size_t blocks = disk_size >> 8;
+    
+    return blocks == 560 || blocks == 640;
+}
+
+static BOOL is_raw_35(size_t disk_size) {
+    if (disk_size & 511) return NO;
+    size_t blocks = disk_size >> 9;
+
+    // atari st has 360 (single sided) and 720 (double-sided) disks..
+    return blocks == 800 || blocks == 1600 || blocks == 1440 || blocks == 2880 || blocks == 720 || blocks == 360;
+}
+
+static MediaType is_woz(const uint8_t *buffer, size_t file_size) {
+
+    /* woz 1/2 ? */
+    if (!memcmp(buffer, "WOZ1\xff\x0a\x0d\x0a", 8) || !memcmp(buffer, "WOZ2\xff\x0a\x0d\x0a", 8)) {
+
+        if (!memcmp(buffer + 12, "INFO", 4)) {
+            unsigned type = buffer[21]; // 1 = 5.25, 2 = 3.5
+            if (type == 1) return MediaType_5_25;
+            if (type == 2) return MediaType_3_5;
+        }
+        return MediaTypeUnknown;
+    }
+    return MediaTypeError;
+}
+
+static MediaType is_dc42(const uint8_t *buffer, size_t file_size) {
+
+    if (buffer[0x52] == 0x01 && buffer[0x53] == 0x00 && buffer[0] >= 1 && buffer[0] <= 0x3f) {
+        int dsize = OSReadBigInt32(buffer, 0x40);
+        int tsize = OSReadBigInt32(buffer, 0x44);
+        if (dsize + tsize + 0x54 == file_size) {
+            if (is_raw_35(dsize)) return MediaType_3_5;
+            return MediaType_HardDisk;
+        }
+    }
+
+    return MediaTypeError;
+}
+
+static MediaType is_2img(const uint8_t *buffer, size_t file_size) {
+
+    if (!memcmp(buffer, "2IMG", 4)) {
+        int format = OSReadLittleInt32(buffer, 0x0c); // 0 - dos order, 1 = prodos order, 2 = nib data
+        int blocks = OSReadLittleInt32(buffer, 0x14); // prodos only.
+        //int bytes = OSReadLittleInt32(buffer, 0x1c);
+        
+        if (format == 2 || format == 0) return MediaType_5_25; // nib and dos order
+        if (is_raw_525(blocks * 512))  return MediaType_5_25;
+        if (is_raw_35(blocks * 512)) return MediaType_3_5;
+        return MediaType_HardDisk; //
+        //return MediaTypeUnknown;
+    }
+
+    return MediaTypeError;
+}
+
+static MediaType is_chd(const uint8_t *buffer, size_t file_size) {
+    if (!memcmp(buffer, "MComprHD", 8)) {
+        static int offsets[] = { 0, 0, 0, 28, 28, 32}; // offset for logival bytes.
+        int version = OSReadBigInt32(buffer, 12);
+
+        if (version >= 3 && version <= 5) {
+            long bytes = OSReadBigInt64(buffer, offsets[version]);
+            if (is_raw_525(bytes)) return MediaType_5_25;
+            if (is_raw_35(bytes)) return MediaType_3_5;
+            return MediaType_HardDisk; // iso?
+        }
+        return MediaTypeUnknown;
+    }
+    return MediaTypeError;
+}
+
+static MediaType is_ipf(const uint8_t *buffer, size_t file_size) {
+    // http://justsolve.archiveteam.org/wiki/IPF
+    if (!memcmp(buffer, "CAPS\x00\x00\x00", 7)) return MediaType_3_5;
+    return MediaTypeUnknown;
+}
+
+static MediaType is_hxcf(const uint8_t *buffer, size_t file_size) {
+    // HxCFloppyEmulator
+    if (!memcmp(buffer, "HXCMFM", 6)) return MediaType_3_5;
+    return MediaTypeUnknown;
+}
+
+static MediaType is_msa(const uint8_t *buffer, size_t file_size) {
+    // Atari MSA
+    if (!memcmp(buffer, "\x0x\x0f", 2)) return MediaType_3_5;
+    return MediaTypeUnknown;
+}
+
+static MediaType is_pasti(const uint8_t *buffer, size_t file_size) {
+    // Atari STX/Pasti
+    if (!memcmp(buffer, "RSY\x00\x03\x00", 6)) return MediaType_3_5;
+    return MediaTypeUnknown;
+}
+
+MediaType ClassifyMediaFile(id file) {
+    
+    struct stat st;
+    ssize_t size;
+    unsigned char buffer[128];
+    int fd;
+    const char *path = [file fileSystemRepresentation]; // or URL
+    const char *ext = extname(path);
+    unsigned ext_hash = hash(ext);
+
+    memset(&st, 0, sizeof(st));
+    memset(buffer, 0, sizeof(buffer));
+
+    fd = open(path, O_RDONLY);
+    if (fd < 0) return MediaTypeError;
+    fstat(fd, &st);
+    
+    size = read(fd, buffer, sizeof(buffer));
+    close(fd);
+    if (size <= 0) return MediaTypeError;
+
+    // 13 sector support ? not on an event 512 block boundary.
+    // = 116480 bytes.
+    
+    switch(ext_hash) {
+        case _x3('w', 'o', 'z'):
+            return is_woz(buffer, st.st_size);
+
+        case _x3('2', 'm', 'g'):
+        case _x4('2', 'i', 'm', 'g'):
+            return is_2img(buffer, st.st_size);
+
+        case _x3('c', 'h', 'd'):
+            return is_chd(buffer, st.st_size);
+
+        // dc42 - dc,dc42,dsk,img,image
+        case _x2('d', 'c'): // n.b. as of .233, allowed for mac, not for apple2
+        case _x4('d', 'c', '4', '2'):
+            return is_dc42(buffer, st.st_size);
+
+            // dsk, image, img may also be raw or disk copy.
+        case _x3('d', 's', 'k'):
+        case _x3('i', 'm', 'g'):
+        case _x4('i', 'm', 'a', 'g'):
+
+            if (is_raw_525(st.st_size)) return MediaType_5_25;
+            if (is_raw_35(st.st_size)) return MediaType_3_5;
+            return is_dc42(buffer, st.st_size);
+
+        case _x2('d', 'o'):
+        case _x2('p', 'o'):
+            if (is_raw_525(st.st_size)) return MediaType_5_25;
+            if (is_raw_35(st.st_size)) return MediaType_3_5;
+            return MediaTypeUnknown;
+
+        // hdv - 3.5 or hard drive.
+        case _x3('h', 'd', 'v'):
+        case _x3('r', 'a', 'w'):
+            if (is_raw_35(st.st_size)) return MediaType_3_5;
+            if ((st.st_size & 511) == 0) return MediaType_HardDisk;
+            return MediaTypeUnknown;
+            
+        case _x3('n', 'i', 'b'):
+            return MediaType_5_25;
+
+        case _x3('w', 'a', 'v'):
+            return MediaType_Cassette;
+
+        // cd-rom
+        case _x3('i', 's', 'o'):
+        case _x3('c', 'u', 'e'):
+        case _x3('c', 'd', 'r'):
+            return MediaType_CDROM;
+
+        case _x3('p', 'n', 'g'):
+            return MediaType_Picture;
+
+        case _x3('m', 'i', 'd'):
+            return MediaType_MIDI;
+
+            
+        // atari st, etc, 3.5 disk?
+        // http://justsolve.archiveteam.org/wiki/Disk_Image_Formats
+            
+        case _x3('i', 'p', 'f'):
+            return is_ipf(buffer, st.st_size);
+
+        case _x3('m', 'f', 'm'):
+            return is_hxcf(buffer, st.st_size);
+
+        case _x3('m', 's', 'a'):
+            return is_msa(buffer, st.st_size);
+
+        case _x2('s', 't'):
+            if (is_raw_35(st.st_size)) return MediaType_3_5;
+            return MediaTypeUnknown;
+
+        case _x3('s', 't', 'x'): // pasti
+            return is_pasti(buffer, st.st_size);
+            
+        //case _x3('m', 'f', 'i'): // mame/mess floppy image [???]
+        //case _x3('d', 'f', 'i'): // disc ferret image
+        //case _x3('h', 'f', 'e'): // ???
+        //case _x3('t', 'd', '0'): // teledisk - may be split across multiple files (.td1, .td2, ...)
+        //case _x3('i', 'm', 'd'): // imagedisk
+        //case _x3('d', '7', '7'): //pc-88, may have multiple disk images
+        //case _x3('d', '8', '8'): //fm-77, may have multiple disk images.
+        //case _x3('1', 'd', 'd'): // related?
+        //case _x3('c', 'q', 'm'): // copyQM
+        //case _x3('c', 'q', 'i'): // copyQM
+
+        case _x3('r', 'o', 'm'):
+        case _x3('b', 'i', 'n'):
+            return MediaType_ROM;
+    }
+
+    return MediaTypeUnknown;
+    
+}
@@ -23,6 +23,9 @@ NS_ASSUME_NONNULL_BEGIN

 -(IBAction)resetMedia:(id)sender;

+-(BOOL)smartRouteURL: (NSURL *)url;
+-(BOOL)smartRouteFile: (NSString *)file;
+
@end

@interface MediaViewController (Bookmark) <Bookmark>
@@ -9,17 +9,6 @@
 #import "MediaViewController.h"
 #import "TableCellView.h"

-enum {
-    kIndexFloppy525 = 0,
-    kIndexFloppy35,
-    kIndexHardDrive,
-    kIndexCDROM,
-    kIndexCassette,
-    kIndexDiskImage,
-    kIndexBitBanger,
-};
-
-#define CATEGORY_COUNT 7
 #define SIZEOF(x) (sizeof(x) / sizeof(x[0]))


@@ -43,6 +32,7 @@ enum {
@property NSString *title;
@property NSInteger index;
@property NSInteger category;
+@property (weak)NSOutlineView *view;

 -(NSInteger)count;
 -(id)objectAtIndex:(NSInteger)index;
@@ -141,7 +131,36 @@ enum {
    return YES;
 }

-(BOOL)pruneChildrenWithOutlineView: (NSOutlineView *)view {
+-(BOOL)addURL: (NSURL *)url {
+
+    for (MediaItem *item in _children) {
+        if (![item occupied]) {
+            [item setUrl: url];
+            return NO;
+        }
+    }
+    // add an extra item...
+
+    if (!_children) _children = [NSMutableArray new];
+    NSUInteger ix = [_children count];
+
+    MediaItem *item = [MediaItem new];
+    [item setIndex: ix];
+    [item setCategory: _category];
+    [item setUrl: url];
+    [item setValid: ix < _validCount];
+    [_children addObject: item];
+    if (_view) {
+        NSIndexSet *set = [NSIndexSet indexSetWithIndex: ix];
+        [_view insertItemsAtIndexes: set
+                          inParent: self
+                     withAnimation: NSTableViewAnimationEffectFade];
+    }
+
+    return YES;
+}
+
+-(BOOL)pruneChildren {
    NSUInteger count = [_children count];
    BOOL delta = NO;
    if (_validCount == count) return NO;
@@ -158,15 +177,15 @@ enum {
    }
    if (delta) {

-        if (view)
-            [view removeItemsAtIndexes: set inParent: self withAnimation: NSTableViewAnimationEffectFade];
+        if (_view)
+            [_view removeItemsAtIndexes: set inParent: self withAnimation: NSTableViewAnimationEffectFade];

        return YES;
    }
    return NO;
 }

-(BOOL)moveItemFrom: (NSInteger)oldIndex to: (NSInteger)newIndex outlineView: (NSOutlineView *)view {
+-(BOOL)moveItemFrom: (NSInteger)oldIndex to: (NSInteger)newIndex {
    if (newIndex == oldIndex) return NO;
    NSUInteger count = [_children count];
    if (oldIndex >= count) return NO;
@@ -179,7 +198,7 @@ enum {
    } else {
        [_children insertObject: item atIndex: newIndex];
    }
-    if (view) [view moveItemAtIndex: oldIndex inParent: self toIndex: newIndex inParent: self];
+    if (_view) [_view moveItemAtIndex: oldIndex inParent: self toIndex: newIndex inParent: self];

    // re-index and re-validate.
    unsigned ix = 0;
@@ -191,7 +210,7 @@ enum {
        
        ++ix;
    }
-    [self pruneChildrenWithOutlineView: view];
+    [self pruneChildren];
    //[view reloadItem: self reloadChildren: YES];
    return YES;
 }
@@ -248,11 +267,23 @@ enum {

 -(NSString *)viewIdentifier {
    if (_category == kIndexBitBanger) return @"BBItemView";
+    if (_category == kIndexMidiOut) return @"MidiItemView";
+    if (_category == kIndexMidiIn) return @"MidiItemView";
    return @"ItemView";
 }

-(void)prepareView: (TablePathView *)view {
+-(void)prepareView: (MediaTableCellView *)view {
+    /* set the path tag = category. */
+
+    [view prepareView: _category];
+#if 0
+    if (_category == kIndexMidiIn || _category == kIndexMidiOut || _category == kIndexBitBanger) {
+        return;
+    }
    
+    NSPathControl *pc = [view pathControl];
+    [pc setTag: _category + 1]; // to differentiate 0 / no path control.
+#endif
 }

 -(CGFloat)height {
@@ -271,7 +302,7 @@ enum {
@interface MediaViewController () {

    MediaCategory *_data[CATEGORY_COUNT];
-    NSArray *_root;
+    NSMutableArray *_root;
    Media _media;
    
    BOOL _loadingBookmark;
@@ -298,11 +329,17 @@ enum {
    _data[kIndexDiskImage] = [MediaCategory categoryWithTitle: @"Hard Disk Images"]; // Mac Nubus psuedo image device
    _data[kIndexBitBanger] = [MediaCategory categoryWithTitle: @"Serial Bit Banger"]; // null_modem

-    for (unsigned i = 0; i < CATEGORY_COUNT; ++i)
-        [_data[i] setCategory: i];
-    
-    _root = @[];
+    _data[kIndexMidiIn] = [MediaCategory categoryWithTitle: @"MIDI (In)"];
+    _data[kIndexMidiOut] = [MediaCategory categoryWithTitle: @"MIDI (Out)"];
+    _data[kIndexPicture] = [MediaCategory categoryWithTitle: @"Picture"];
+    _data[kIndexROM] = [MediaCategory categoryWithTitle: @"ROM"];

+    for (unsigned i = 0; i < CATEGORY_COUNT; ++i) {
+        [_data[i] setCategory: i];
+        [_data[i] setIndex: -1];
+    }
+    
+    _root = [NSMutableArray new];
 }


@@ -310,35 +347,55 @@ enum {
 -(void)rebuildArgs {
    
    static char* prefix[] = {
-        "flop", "flop", "hard", "cdrm", "cass", "disk", "bitb",
+        "flop", "flop", "hard", "cdrm", "cass", "disk", "bitb", "min", "mout", "pic", "rom",
    };
    static_assert(SIZEOF(prefix) == CATEGORY_COUNT, "Missing item");
    NSMutableArray *args = [NSMutableArray new];
    
-    unsigned counts[CATEGORY_COUNT] = { 0 };
-    
+    //unsigned counts[CATEGORY_COUNT] = { 0 };
+
    for (unsigned j = 0; j < CATEGORY_COUNT; ++j) {
    
+        uint64_t floppy_mask = _media.floppy_mask;
+        unsigned index = 0;
+
        MediaCategory *cat = _data[j];
        NSInteger valid = [cat validCount];
        for (NSInteger i = 0; i < valid; ++i) {
-            counts[j]++;

            MediaItem *item = [cat objectAtIndex: i];
            NSString *arg = [item argument];

-            if (arg) {
-                [args addObject: [NSString stringWithFormat: @"-%s%u", prefix[j], counts[j]]];
-                [args addObject: arg];
+
+            if (j == kIndexFloppy525) {
+                // assumes < 64 floppies....
+                // infinite loop if no floppy device...
+                if (floppy_mask == 0) break;
+                while ((floppy_mask & 0x01) == 0) {
+                    floppy_mask >>= 1;
+                    ++index;
+                }
+            } else if (j == kIndexFloppy35) {
+                while ((floppy_mask & 0x01)) {
+                    floppy_mask >>= 1;
+                    ++index;
+                }
            }
+
+            ++index;
+            floppy_mask >>= 1;
+            if (!arg) continue;
+            
+            [args addObject: [NSString stringWithFormat: @"-%s%u", prefix[j], index]];
+            [args addObject: arg];
        }
-        if (j == 0) counts[1] = counts[0]; // 3.5/5.25
    }
    
    [self setArgs: args];
 }

 -(void)rebuildRoot {
+
    NSMutableArray *tmp = [NSMutableArray new];
    int ix = 0;
    for (unsigned j = 0 ; j < CATEGORY_COUNT; ++j) {
@@ -362,6 +419,8 @@ enum {

 -(void)setMedia: (Media)media {
    
+    // todo -- fancy diff algorithm to animate changes.
+    
    MediaCategory *cat;
    BOOL delta = NO;
    unsigned x;
@@ -369,6 +428,8 @@ enum {
    if (MediaEqual(&_media, &media)) return;
    _media = media;
    
+    [_outlineView beginUpdates];
+
    
 #undef _
 #define _(name, index) \
@@ -380,12 +441,17 @@ x = media.name; cat = _data[index]; delta |= [cat setItemCount: x]
    _(floppy_5_25, kIndexFloppy525);
    _(pseudo_disk, kIndexDiskImage);
    _(bitbanger, kIndexBitBanger);
-
+    _(midiin, kIndexMidiIn);
+    _(midiout, kIndexMidiOut);
+    _(picture, kIndexPicture);
+    _(rom, kIndexROM);

    if (delta) {
        [self rebuildRoot];
        if (!_loadingBookmark) [self rebuildArgs];
    }
+
+    [_outlineView endUpdates];
 }

 -(void)resetDiskImages {
@@ -403,7 +469,7 @@ x = media.name; cat = _data[index]; delta |= [cat setItemCount: x]
            [item setString: nil];
            delta = YES;
        }
-        if ([cat pruneChildrenWithOutlineView: _outlineView]) delta = YES;
+        if ([cat pruneChildren]) delta = YES;
    }
    if (delta) {
        [self rebuildRoot];
@@ -413,7 +479,9 @@ x = media.name; cat = _data[index]; delta |= [cat setItemCount: x]

 static NSString *kDragType = @"private.ample.media";
 - (void)viewDidLoad {
-    
+
+    NSNotificationCenter *nc = [NSNotificationCenter defaultCenter];
+
    [super viewDidLoad];
    
    //NSOutlineView *view = [self view];
@@ -424,6 +492,21 @@ static NSString *kDragType = @"private.ample.media";
    [_outlineView expandItem: nil expandChildren: YES];
    
    [_outlineView registerForDraggedTypes: @[kDragType]];
+
+    for (unsigned i = 0; i < CATEGORY_COUNT; ++i)
+        [_data[i] setView: _outlineView];
+
+
+    [nc addObserver: self selector: @selector(magicRouteNotification:) name: kNotificationDiskImageMagicRoute object: nil];
+
+}
+
+-(void)viewWillDisappear {
+    NSNotificationCenter *nc = [NSNotificationCenter defaultCenter];
+    [nc removeObserver: self];
+    
+    for (unsigned i = 0; i < CATEGORY_COUNT; ++i)
+        [_data[i] setView: nil];
 }

 #pragma mark - NSOutlineViewDelegate
@@ -586,7 +669,7 @@ static NSString *kDragType = @"private.ample.media";
 }

 - (BOOL)outlineView:(NSOutlineView *)outlineView acceptDrop:(id<NSDraggingInfo>)info item:(id)item childIndex:(NSInteger)index {
- 
+
    if (index < 0) return NO;

    
@@ -620,7 +703,7 @@ static NSString *kDragType = @"private.ample.media";
    NSInteger oldIndex = indexes[1];

    [_outlineView beginUpdates];
-    [cat moveItemFrom: oldIndex to: index outlineView: _outlineView];
+    [cat moveItemFrom: oldIndex to: index];
    [_outlineView endUpdates];
    [self rebuildArgs];

@@ -646,24 +729,54 @@ static NSString *kDragType = @"private.ample.media";
    if (![item valid]) {
        MediaCategory *cat = [_outlineView parentForItem: item];
        [_outlineView beginUpdates];
-        [cat pruneChildrenWithOutlineView: _outlineView];
+        [cat pruneChildren];
+        
+        // remove the entire category??
+        if (![cat validCount] && ![cat count]) {
+            NSUInteger ix = [_root indexOfObject: cat];
+            if (ix != NSNotFound) {
+                NSIndexSet *set = [NSIndexSet indexSetWithIndex: ix];
+                [_outlineView removeItemsAtIndexes: set
+                                          inParent: nil
+                                     withAnimation: NSTableViewAnimationEffectFade];
+
+                [_root removeObjectAtIndex: ix];
+                [cat setIndex: -1];
+            }
+        }
+        
        [_outlineView endUpdates];
    }
    
-    // todo -- if this eliminates a category completely, it will still be included
-    // since we're now using animaations instead of reloading.
-    
    [self rebuildArgs];
 }

 - (IBAction)pathAction:(id)sender {
    
    NSURL *url = [(NSPathControl *)sender URL];
-    NSInteger tag = [sender tag];
-    // TODO - don't add to recent disks if this is a bitbanger / midi / printer device.
-    if (url && tag == 0) {
-        NSNotificationCenter *nc = [NSNotificationCenter defaultCenter];
-        [nc postNotificationName: @"DiskImageAdded" object: url];
+    NSInteger tag = [sender tag] - 1;
+    
+    switch(tag) {
+
+        case kIndexFloppy525:
+        case kIndexFloppy35:
+        case kIndexHardDrive:
+        case kIndexCDROM:
+        case kIndexCassette:
+        case kIndexDiskImage:
+            if (url) {
+                NSNotificationCenter *nc = [NSNotificationCenter defaultCenter];
+                [nc postNotificationName: kNotificationDiskImageAdded object: url];
+            }
+            break;
+
+            // not disk images or don't use a path control.
+        case kIndexPicture:
+        case kIndexMidiIn:
+        case kIndexMidiOut:
+        case kIndexBitBanger:
+        case kIndexROM:
+        default: break;
    }
    
    [self rebuildArgs];
@@ -672,11 +785,72 @@ static NSString *kDragType = @"private.ample.media";
 -(IBAction)textAction: (id)sender {
    [self rebuildArgs];
 }
+- (IBAction)midiAction:(id)sender {
+    [self rebuildArgs];
+}

 -(IBAction)resetMedia:(id)sender {
    [self resetDiskImages];
 }

+
+
+-(void)magicRouteNotification: (NSNotification *)notification {
+    NSDictionary *userInfo = [notification userInfo];
+    id path = [userInfo objectForKey: @"path"];
+    
+    if ([path isKindOfClass: [NSURL class]]) {
+        [self smartRouteURL: path];
+        return;
+    }
+
+    if ([path isKindOfClass: [NSString class]]) {
+        NSURL *url = [NSURL fileURLWithPath: path];
+        [self smartRouteURL: url];
+        return;
+    }
+}
+/*
+ * given a file, add it to the media list.
+ * TODO - how to handle if full or media type missing?
+ */
+-(BOOL)smartRouteURL: (NSURL *)url {
+    
+    if (!url) return NO;
+
+    MediaType mt = ClassifyMediaFile(url);
+    if (mt < 1) return NO; // unknown / error.
+    
+    unsigned ix = 0;
+    switch(mt) {
+        case MediaType_3_5: ix = kIndexFloppy35; break;
+        case MediaType_5_25: ix = kIndexFloppy525; break;
+        case MediaType_Cassette: ix = kIndexCassette; break;
+        case MediaType_HardDisk: ix = kIndexHardDrive; break;
+        case MediaType_CDROM: ix = kIndexCDROM; break;
+
+        case MediaType_Picture: ix = kIndexPicture; break;
+        case MediaType_ROM: ix = kIndexROM; break;
+        case MediaType_MIDI: // ix = kIndexMidiIn; break;
+        case MediaTypeError:
+        case MediaTypeUnknown:
+            return NO;
+    }
+
+    [_outlineView beginUpdates];
+    // todo -- check root, insert if necessary?
+    MediaCategory *cat = _data[ix];
+    [cat addURL: url];
+    [_outlineView endUpdates];
+
+    [self rebuildArgs];
+    return YES;
+}
+
+-(BOOL)smartRouteFile: (NSString *)file {
+    return NO;
+}
+
@end

@implementation MediaViewController (Bookmark)
@@ -694,7 +868,7 @@ static NSString *kDragType = @"private.ample.media";
 }

 static NSString * BookmarkStrings[] = {
-    @"flop_525", @"flop_35", @"hard", @"cdrm", @"cass", @"disk", @"bitb",
+    @"flop_525", @"flop_35", @"hard", @"cdrm", @"cass", @"disk", @"bitb", @"midiin", @"midiout", @"pic", @"rom",
 };
 static_assert(SIZEOF(BookmarkStrings) == CATEGORY_COUNT, "Missing item");

@@ -730,7 +904,7 @@ static int BookmarkIndex(NSString *str) {
                MediaItem *item = [cat objectAtIndex: i++];
                if (![path length]) continue;

-                if (ix == kIndexBitBanger) {
+                if (ix == kIndexBitBanger || ix == kIndexMidiOut || ix == kIndexMidiIn) {
                    [item setString: path];
                } else {
                    NSURL *url = [NSURL fileURLWithPath: path];
@@ -762,7 +936,7 @@ static int BookmarkIndex(NSString *str) {
                MediaItem *item = [cat objectAtIndex: i++];
                if (![path length]) continue;

-                if (ix == kIndexBitBanger) {
+                if (ix == kIndexBitBanger || ix == kIndexMidiOut || ix == kIndexMidiIn) {
                    [item setString: path];
                } else {
                    NSURL *url = [NSURL fileURLWithPath: path];
@@ -817,5 +991,4 @@ static void CompressArray(NSMutableArray *array) {
    return YES;
 }

-
@end
@@ -0,0 +1,25 @@
+//
+//  MidiManager.h
+//  Ample
+//
+//  Created by Kelvin Sherlock on 8/6/2021.
+//  Copyright © 2021 Kelvin Sherlock. All rights reserved.
+//
+
+#ifndef MidiManager_h
+#define MidiManager_h
+
+
+extern NSString *kMidiSourcesChangedNotification;
+extern NSString *kMidiDestinationsChangedNotification;
+
+@interface MidiManager : NSObject
+
+@property NSArray *sources;
+@property NSArray *destinations;
+
+(instancetype)sharedManager;
+
+@end
+
+#endif /* MidiManager_h */
@@ -0,0 +1,153 @@
+//
+//  Midi.m
+//  Ample
+//
+//  Created by Kelvin Sherlock on 8/6/2021.
+//  Copyright © 2021 Kelvin Sherlock. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import <CoreMIDI/CoreMIDI.h>
+
+#import "MidiManager.h"
+
+static NSArray *MidiSources(void) {
+    
+    ItemCount count = MIDIGetNumberOfSources();
+    if (count <= 0) return @[];
+    
+    NSMutableArray *rv = [NSMutableArray arrayWithCapacity: count + 1];
+    
+    MIDIEndpointRef ep;
+    for(int i = 0; i < count; ++i) {
+        ep = MIDIGetSource(i);
+        if (!ep) continue;
+
+        // https://developer.apple.com/library/archive/qa/qa1374/_index.html
+        CFStringRef str = NULL;
+        MIDIObjectGetStringProperty(ep, kMIDIPropertyDisplayName, &str);
+
+        if (str) {
+            [rv addObject: (__bridge id _Nonnull)(str)];
+            CFRelease(str);
+        }
+    }
+    return rv;
+}
+
+
+static NSArray *MidiDestinations(void) {
+    
+    ItemCount count = MIDIGetNumberOfDestinations();
+    if (count <= 0) return @[];
+    
+    NSMutableArray *rv = [NSMutableArray arrayWithCapacity: count + 1];
+    
+    MIDIEndpointRef ep;
+    for(int i = 0; i < count; ++i) {
+        ep = MIDIGetDestination(i);
+        if (!ep) continue;
+
+        // https://developer.apple.com/library/archive/qa/qa1374/_index.html
+        CFStringRef str = NULL;
+        MIDIObjectGetStringProperty(ep, kMIDIPropertyDisplayName, &str);
+
+        if (str) {
+            [rv addObject: (__bridge id _Nonnull)(str)];
+            CFRelease(str);
+        }
+    }
+    return rv;
+}
+
+NSString *kMidiSourcesChangedNotification = @"Midi Sources Changed";
+NSString *kMidiDestinationsChangedNotification = @"Midi Destinations Changed";
+
+
+@interface MidiManager () {
+    MIDIClientRef _client;
+}
+
+-(void)objectAddRemove: (const MIDIObjectAddRemoveNotification *)message;
+-(void)objectPropertyChanged: (const MIDIObjectPropertyChangeNotification *)message;
+@end
+
+
+static MidiManager *singleton = nil;
+@implementation MidiManager
+
+-(void)awakeFromNib {
+    if (!singleton) singleton = self;
+}
+
+(instancetype)sharedManager {
+    if (!singleton) singleton = [MidiManager new];
+    return singleton;
+}
+
+-(instancetype)init {
+    
+    if (singleton) return singleton;
+
+    OSStatus status;
+    
+
+    status = MIDIClientCreateWithBlock(
+        CFSTR("serial_midi"),
+        &_client,
+        ^(const MIDINotification *message){
+        switch(message->messageID) {
+            case kMIDIMsgObjectAdded:
+            case kMIDIMsgObjectRemoved:
+                [self objectAddRemove: (const MIDIObjectAddRemoveNotification *)message];
+                break;
+            case kMIDIMsgPropertyChanged:
+                [self objectPropertyChanged: (const MIDIObjectPropertyChangeNotification *)message];
+            default:
+                break;
+        }
+    });
+   
+    _sources = MidiSources();
+    _destinations = MidiDestinations();
+    return self;
+}
+
+-(void)objectAddRemove: (const MIDIObjectAddRemoveNotification *)message {
+
+    const MIDIObjectAddRemoveNotification *m = (const MIDIObjectAddRemoveNotification *)message;
+    
+    NSNotificationCenter *nc = [NSNotificationCenter defaultCenter];
+
+    if (m->childType == kMIDIObjectType_Source) {
+        [self setSources: MidiSources()];
+        [nc postNotificationName: kMidiSourcesChangedNotification object: self];
+    }
+    
+    if (m->childType == kMIDIObjectType_Destination) {
+        [self setDestinations: MidiDestinations()];
+        [nc postNotificationName: kMidiDestinationsChangedNotification object: self];
+    }
+   
+}
+-(void)objectPropertyChanged: (const MIDIObjectPropertyChangeNotification *)message {
+
+    const MIDIObjectPropertyChangeNotification *m = (const MIDIObjectPropertyChangeNotification *)message;
+    if (m->propertyName == kMIDIPropertyDisplayName) {
+        [self setSources: MidiSources()];
+        [self setDestinations: MidiDestinations()];
+
+        NSNotificationCenter *nc = [NSNotificationCenter defaultCenter];
+        [nc postNotificationName: kMidiSourcesChangedNotification object: self];
+        [nc postNotificationName: kMidiDestinationsChangedNotification object: self];
+    }
+}
+
+
+-(void)dealloc {
+    
+    if (_client)
+        MIDIClientDispose(_client);
+}
+@end
+
@@ -51,7 +51,7 @@
                  border: solid 1px black;
                  text-shadow: 0px 1px 0px black;
                  box-shadow: 1px 1px 2px 0px rgba(0,0,0,0.75);
-                  background-color: rgb(101, 101, 101);                  
+                  background-color: rgb(101, 101, 101);
                }
            }
        </style>
@@ -104,14 +104,17 @@
                    <td>Toggle full screen mode</td>
                </tr>
                <tr>
-                    <td><kbd>F12</kbd></td>
+                    <td>
+                      <span data-macbook=false><kbd>F12</kbd></span>
+                      <span data-macbook=true><kbd>Fn</kbd>+<kbd>F12</kbd></span>
+                    </td>
                    <td>Reset Key</td>
                </tr>
            </tbody>
        </table>

        <h1>Partial UI Mode</h1>
-   
+
        <table>
            <colgroup>
              <col style="width: 14em;" />
@@ -0,0 +1,543 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+  <dict>
+    <key>value</key>
+    <string>ace500</string>
+    <key>description</key>
+    <string>Franklin ACE 500</string>
+    <key>media</key>
+    <dict>
+    </dict>
+    <key>resolution</key>
+    <array>
+      <integer>560</integer>
+      <integer>384</integer>
+    </array>
+    <key>slots</key>
+    <array>
+      <dict>
+        <key>name</key>
+        <string>ramsize</string>
+        <key>description</key>
+        <string>RAM</string>
+        <key>options</key>
+        <array>
+          <dict>
+            <key>intValue</key>
+            <integer>131072</integer>
+            <key>description</key>
+            <string>128K</string>
+            <key>value</key>
+            <string>128K</string>
+            <key>default</key>
+            <true/>
+          </dict>
+        </array>
+      </dict>
+      <dict>
+        <key>name</key>
+        <string>smartport</string>
+        <key>description</key>
+        <string>Disk Drives</string>
+        <key>options</key>
+        <array>
+          <dict>
+            <key>value</key>
+            <string></string>
+            <key>description</key>
+            <string></string>
+            <key>devname</key>
+            <string>smartport</string>
+            <key>default</key>
+            <true/>
+          </dict>
+        </array>
+      </dict>
+      <dict>
+        <key>name</key>
+        <string>gameio</string>
+        <key>description</key>
+        <string>Game I/O</string>
+        <key>options</key>
+        <array>
+          <dict>
+            <key>value</key>
+            <string></string>
+            <key>description</key>
+            <string>—None—</string>
+            <key>default</key>
+            <true/>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>joy</string>
+            <key>description</key>
+            <string>Apple II analog joysticks</string>
+            <key>devname</key>
+            <string>a2joy</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>paddles</string>
+            <key>description</key>
+            <string>Apple II paddles</string>
+            <key>devname</key>
+            <string>a2pdls</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>compeyes</string>
+            <key>description</key>
+            <string>Digital Vision ComputerEyes</string>
+            <key>devname</key>
+            <string>a2ceyes</string>
+            <key>media</key>
+            <dict>
+              <key>picture</key>
+              <integer>1</integer>
+            </dict>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>gizmo</string>
+            <key>description</key>
+            <string>HAL Labs Gizmo</string>
+            <key>devname</key>
+            <string>a2gizmo</string>
+          </dict>
+        </array>
+      </dict>
+      <dict>
+        <key>name</key>
+        <string>modem</string>
+        <key>description</key>
+        <string>Modem</string>
+        <key>options</key>
+        <array>
+          <dict>
+            <key>value</key>
+            <string></string>
+            <key>description</key>
+            <string>—None—</string>
+            <key>default</key>
+            <true/>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>ie15</string>
+            <key>description</key>
+            <string>IE15 Terminal</string>
+            <key>devname</key>
+            <string>ie15_terminal</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>pty</string>
+            <key>description</key>
+            <string>Pseudo terminal</string>
+            <key>devname</key>
+            <string>pseudo_terminal</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>rs_printer</string>
+            <key>description</key>
+            <string>Radio Shack Serial Printer</string>
+            <key>devname</key>
+            <string>rs_serial_printer</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>patch</string>
+            <key>description</key>
+            <string>RS-232 Patch Box</string>
+            <key>devname</key>
+            <string>rs232_patch_box</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>loopback</string>
+            <key>description</key>
+            <string>RS232 Loopback</string>
+            <key>devname</key>
+            <string>rs232_loopback</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>dec_loopback</string>
+            <key>description</key>
+            <string>RS232 Loopback (DEC 12-15336-00)</string>
+            <key>devname</key>
+            <string>dec_rs232_loopback</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>null_modem</string>
+            <key>description</key>
+            <string>RS232 Null Modem</string>
+            <key>devname</key>
+            <string>null_modem</string>
+            <key>media</key>
+            <dict>
+              <key>bitbanger</key>
+              <integer>1</integer>
+            </dict>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>rs232_sync_io</string>
+            <key>description</key>
+            <string>RS232 Synchronous I/O</string>
+            <key>devname</key>
+            <string>rs232_sync_io</string>
+            <key>media</key>
+            <dict>
+              <key>bitbanger</key>
+              <integer>1</integer>
+            </dict>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>keyboard</string>
+            <key>description</key>
+            <string>Serial Keyboard</string>
+            <key>devname</key>
+            <string>serial_keyboard</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>printer</string>
+            <key>description</key>
+            <string>Serial Printer</string>
+            <key>devname</key>
+            <string>serial_printer</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>terminal</string>
+            <key>description</key>
+            <string>Serial Terminal</string>
+            <key>devname</key>
+            <string>serial_terminal</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>sunkbd</string>
+            <key>description</key>
+            <string>Sun Keyboard Adaptor</string>
+            <key>devname</key>
+            <string>sunkbd_adaptor</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>mockingboard</string>
+            <key>description</key>
+            <string>Sweet Micro Systems Mockingboard D</string>
+            <key>devname</key>
+            <string>mockingboardd</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>swtpc8212</string>
+            <key>description</key>
+            <string>SWTPC8212 Terminal</string>
+            <key>devname</key>
+            <string>swtpc8212_terminal</string>
+          </dict>
+        </array>
+      </dict>
+    </array>
+    <key>devices</key>
+    <array>
+      <dict>
+        <key>name</key>
+        <string>smartport</string>
+        <key>slots</key>
+        <array>
+          <dict>
+            <key>name</key>
+            <string>sl6:0</string>
+            <key>options</key>
+            <array>
+              <dict>
+                <key>value</key>
+                <string></string>
+                <key>description</key>
+                <string>—None—</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>525</string>
+                <key>description</key>
+                <string>5.25"</string>
+                <key>default</key>
+                <true/>
+                <key>media</key>
+                <dict>
+                  <key>floppy_5_25</key>
+                  <integer>1</integer>
+                </dict>
+              </dict>
+            </array>
+          </dict>
+          <dict>
+            <key>name</key>
+            <string>sl6:1</string>
+            <key>options</key>
+            <array>
+              <dict>
+                <key>value</key>
+                <string></string>
+                <key>description</key>
+                <string>—None—</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>525</string>
+                <key>description</key>
+                <string>5.25"</string>
+                <key>default</key>
+                <true/>
+                <key>media</key>
+                <dict>
+                  <key>floppy_5_25</key>
+                  <integer>1</integer>
+                </dict>
+              </dict>
+            </array>
+          </dict>
+        </array>
+      </dict>
+      <dict>
+        <key>name</key>
+        <string>rs232_patch_box</string>
+        <key>slots</key>
+        <array>
+          <dict>
+            <key>name</key>
+            <string>:dce</string>
+            <key>options</key>
+            <array>
+              <dict>
+                <key>value</key>
+                <string></string>
+                <key>description</key>
+                <string>—None—</string>
+                <key>default</key>
+                <true/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>ie15</string>
+                <key>description</key>
+                <string>IE15 Terminal</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>pty</string>
+                <key>description</key>
+                <string>Pseudo terminal</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>rs_printer</string>
+                <key>description</key>
+                <string>Radio Shack Serial Printer</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>patch</string>
+                <key>description</key>
+                <string>RS-232 Patch Box</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>loopback</string>
+                <key>description</key>
+                <string>RS232 Loopback</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>dec_loopback</string>
+                <key>description</key>
+                <string>RS232 Loopback (DEC 12-15336-00)</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>null_modem</string>
+                <key>description</key>
+                <string>RS232 Null Modem</string>
+                <key>default</key>
+                <false/>
+                <key>media</key>
+                <dict>
+                  <key>bitbanger</key>
+                  <integer>1</integer>
+                </dict>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>rs232_sync_io</string>
+                <key>description</key>
+                <string>RS232 Synchronous I/O</string>
+                <key>default</key>
+                <false/>
+                <key>media</key>
+                <dict>
+                  <key>bitbanger</key>
+                  <integer>1</integer>
+                </dict>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>keyboard</string>
+                <key>description</key>
+                <string>Serial Keyboard</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>printer</string>
+                <key>description</key>
+                <string>Serial Printer</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>terminal</string>
+                <key>description</key>
+                <string>Serial Terminal</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>sunkbd</string>
+                <key>description</key>
+                <string>Sun Keyboard Adaptor</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>mockingboard</string>
+                <key>description</key>
+                <string>Sweet Micro Systems Mockingboard D</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>swtpc8212</string>
+                <key>description</key>
+                <string>SWTPC8212 Terminal</string>
+                <key>default</key>
+                <false/>
+              </dict>
+            </array>
+          </dict>
+        </array>
+      </dict>
+      <dict>
+        <key>name</key>
+        <string>sunkbd_adaptor</string>
+        <key>slots</key>
+        <array>
+          <dict>
+            <key>name</key>
+            <string>:keyboard</string>
+            <key>options</key>
+            <array>
+              <dict>
+                <key>value</key>
+                <string></string>
+                <key>description</key>
+                <string>—None—</string>
+                <key>default</key>
+                <true/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>type3hle</string>
+                <key>description</key>
+                <string>Sun Type 3 Keyboard (HLE)</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>type4hle</string>
+                <key>description</key>
+                <string>Sun Type 4 Keyboard (HLE)</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>type5gbhle</string>
+                <key>description</key>
+                <string>Sun Type 5 Keyboard (Great Britain - HLE)</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>type5jphle</string>
+                <key>description</key>
+                <string>Sun Type 5 Keyboard (Japan - HLE)</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>type5sehle</string>
+                <key>description</key>
+                <string>Sun Type 5 Keyboard (Sweden - HLE)</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>type5hle</string>
+                <key>description</key>
+                <string>Sun Type 5 Keyboard (U.S.A. - HLE)</string>
+                <key>default</key>
+                <false/>
+              </dict>
+            </array>
+          </dict>
+        </array>
+      </dict>
+    </array>
+    <key>software</key>
+    <array>
+      <string>apple2_flop_clcracked.xml</string>
+      <dict>
+        <key>name</key>
+        <string>apple2_flop_orig.xml</string>
+        <key>filter</key>
+        <string>A2C</string>
+      </dict>
+      <string>apple2_flop_misc.xml</string>
+    </array>
+  </dict>
+</plist>
@@ -37,6 +37,41 @@
          </dict>
        </array>
      </dict>
+      <dict>
+        <key>name</key>
+        <string>bios</string>
+        <key>description</key>
+        <string>ROM</string>
+        <key>options</key>
+        <array>
+          <dict>
+            <key>value</key>
+            <string></string>
+            <key>description</key>
+            <string>—Default—</string>
+            <key>default</key>
+            <true/>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>v1</string>
+            <key>description</key>
+            <string>Version 1</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>v2</string>
+            <key>description</key>
+            <string>Version 2</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>debug</string>
+            <key>description</key>
+            <string>Debug</string>
+          </dict>
+        </array>
+      </dict>
      <dict>
        <key>name</key>
        <string>sl2</string>
@@ -75,11 +110,6 @@
            <string>Agat-7 140K floppy card</string>
            <key>devname</key>
            <string>agat7_flop</string>
-            <key>media</key>
-            <dict>
-              <key>floppy_5_25</key>
-              <integer>2</integer>
-            </dict>
          </dict>
          <dict>
            <key>value</key>
@@ -149,11 +179,6 @@
            <true/>
            <key>devname</key>
            <string>agat7_flop</string>
-            <key>media</key>
-            <dict>
-              <key>floppy_5_25</key>
-              <integer>2</integer>
-            </dict>
          </dict>
          <dict>
            <key>value</key>
@@ -219,11 +244,6 @@
            <string>Agat-7 140K floppy card</string>
            <key>devname</key>
            <string>agat7_flop</string>
-            <key>media</key>
-            <dict>
-              <key>floppy_5_25</key>
-              <integer>2</integer>
-            </dict>
          </dict>
          <dict>
            <key>value</key>
@@ -291,11 +311,6 @@
            <string>Agat-7 140K floppy card</string>
            <key>devname</key>
            <string>agat7_flop</string>
-            <key>media</key>
-            <dict>
-              <key>floppy_5_25</key>
-              <integer>2</integer>
-            </dict>
          </dict>
          <dict>
            <key>value</key>
@@ -361,11 +376,6 @@
            <string>Agat-7 140K floppy card</string>
            <key>devname</key>
            <string>agat7_flop</string>
-            <key>media</key>
-            <dict>
-              <key>floppy_5_25</key>
-              <integer>2</integer>
-            </dict>
          </dict>
          <dict>
            <key>value</key>
@@ -448,6 +458,14 @@
                <key>default</key>
                <false/>
              </dict>
+              <dict>
+                <key>value</key>
+                <string>digiblst</string>
+                <key>description</key>
+                <string>Digiblaster (DIY)</string>
+                <key>default</key>
+                <false/>
+              </dict>
              <dict>
                <key>value</key>
                <string>ap2000</string>
@@ -476,7 +494,7 @@
                <key>value</key>
                <string>lx810l</string>
                <key>description</key>
-                <string>Espon LX-810L</string>
+                <string>Epson LX-810L</string>
                <key>default</key>
                <false/>
              </dict>
@@ -496,6 +514,14 @@
                <key>default</key>
                <false/>
              </dict>
+              <dict>
+                <key>value</key>
+                <string>nlq401</string>
+                <key>description</key>
+                <string>Schneider NLQ 401 Matrix Printer</string>
+                <key>default</key>
+                <false/>
+              </dict>
              <dict>
                <key>value</key>
                <string>chessmec</string>
@@ -516,6 +542,69 @@
          </dict>
        </array>
      </dict>
+      <dict>
+        <key>name</key>
+        <string>agat7_flop</string>
+        <key>slots</key>
+        <array>
+          <dict>
+            <key>name</key>
+            <string>:0</string>
+            <key>options</key>
+            <array>
+              <dict>
+                <key>value</key>
+                <string></string>
+                <key>description</key>
+                <string>—None—</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>525</string>
+                <key>description</key>
+                <string>5.25"</string>
+                <key>default</key>
+                <true/>
+                <key>media</key>
+                <dict>
+                  <key>floppy_5_25</key>
+                  <integer>1</integer>
+                </dict>
+              </dict>
+            </array>
+          </dict>
+          <dict>
+            <key>name</key>
+            <string>:1</string>
+            <key>options</key>
+            <array>
+              <dict>
+                <key>value</key>
+                <string></string>
+                <key>description</key>
+                <string>—None—</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>525</string>
+                <key>description</key>
+                <string>5.25"</string>
+                <key>default</key>
+                <true/>
+                <key>media</key>
+                <dict>
+                  <key>floppy_5_25</key>
+                  <integer>1</integer>
+                </dict>
+              </dict>
+            </array>
+          </dict>
+        </array>
+      </dict>
      <dict>
        <key>name</key>
        <string>agat_fdc</string>
@@ -37,6 +37,35 @@
          </dict>
        </array>
      </dict>
+      <dict>
+        <key>name</key>
+        <string>bios</string>
+        <key>description</key>
+        <string>ROM</string>
+        <key>options</key>
+        <array>
+          <dict>
+            <key>value</key>
+            <string></string>
+            <key>description</key>
+            <string>—Default—</string>
+            <key>default</key>
+            <true/>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>v1</string>
+            <key>description</key>
+            <string>Version 1</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>v2</string>
+            <key>description</key>
+            <string>Version 2</string>
+          </dict>
+        </array>
+      </dict>
      <dict>
        <key>name</key>
        <string>sl1</string>
@@ -83,24 +112,14 @@
            <string>Agat-9 140K floppy card</string>
            <key>devname</key>
            <string>agat9_flop</string>
-            <key>media</key>
-            <dict>
-              <key>floppy_5_25</key>
-              <integer>2</integer>
-            </dict>
          </dict>
          <dict>
            <key>value</key>
-            <string>diskii</string>
+            <string>diskiing</string>
            <key>description</key>
-            <string>Apple Disk II controller</string>
+            <string>Apple Disk II NG controller (16-sector)</string>
            <key>devname</key>
-            <string>a2diskii</string>
-            <key>media</key>
-            <dict>
-              <key>floppy_5_25</key>
-              <integer>2</integer>
-            </dict>
+            <string>a2diskiing</string>
          </dict>
          <dict>
            <key>value</key>
@@ -158,24 +177,14 @@
            <string>Agat-9 140K floppy card</string>
            <key>devname</key>
            <string>agat9_flop</string>
-            <key>media</key>
-            <dict>
-              <key>floppy_5_25</key>
-              <integer>2</integer>
-            </dict>
          </dict>
          <dict>
            <key>value</key>
-            <string>diskii</string>
+            <string>diskiing</string>
            <key>description</key>
-            <string>Apple Disk II controller</string>
+            <string>Apple Disk II NG controller (16-sector)</string>
            <key>devname</key>
-            <string>a2diskii</string>
-            <key>media</key>
-            <dict>
-              <key>floppy_5_25</key>
-              <integer>2</integer>
-            </dict>
+            <string>a2diskiing</string>
          </dict>
          <dict>
            <key>value</key>
@@ -233,24 +242,14 @@
            <string>Agat-9 140K floppy card</string>
            <key>devname</key>
            <string>agat9_flop</string>
-            <key>media</key>
-            <dict>
-              <key>floppy_5_25</key>
-              <integer>2</integer>
-            </dict>
          </dict>
          <dict>
            <key>value</key>
-            <string>diskii</string>
+            <string>diskiing</string>
            <key>description</key>
-            <string>Apple Disk II controller</string>
+            <string>Apple Disk II NG controller (16-sector)</string>
            <key>devname</key>
-            <string>a2diskii</string>
-            <key>media</key>
-            <dict>
-              <key>floppy_5_25</key>
-              <integer>2</integer>
-            </dict>
+            <string>a2diskiing</string>
          </dict>
          <dict>
            <key>value</key>
@@ -308,24 +307,14 @@
            <string>Agat-9 140K floppy card</string>
            <key>devname</key>
            <string>agat9_flop</string>
-            <key>media</key>
-            <dict>
-              <key>floppy_5_25</key>
-              <integer>2</integer>
-            </dict>
          </dict>
          <dict>
            <key>value</key>
-            <string>diskii</string>
+            <string>diskiing</string>
            <key>description</key>
-            <string>Apple Disk II controller</string>
+            <string>Apple Disk II NG controller (16-sector)</string>
            <key>devname</key>
-            <string>a2diskii</string>
-            <key>media</key>
-            <dict>
-              <key>floppy_5_25</key>
-              <integer>2</integer>
-            </dict>
+            <string>a2diskiing</string>
          </dict>
          <dict>
            <key>value</key>
@@ -385,24 +374,14 @@
            <string>Agat-9 140K floppy card</string>
            <key>devname</key>
            <string>agat9_flop</string>
-            <key>media</key>
-            <dict>
-              <key>floppy_5_25</key>
-              <integer>2</integer>
-            </dict>
          </dict>
          <dict>
            <key>value</key>
-            <string>diskii</string>
+            <string>diskiing</string>
            <key>description</key>
-            <string>Apple Disk II controller</string>
+            <string>Apple Disk II NG controller (16-sector)</string>
            <key>devname</key>
-            <string>a2diskii</string>
-            <key>media</key>
-            <dict>
-              <key>floppy_5_25</key>
-              <integer>2</integer>
-            </dict>
+            <string>a2diskiing</string>
          </dict>
          <dict>
            <key>value</key>
@@ -462,24 +441,14 @@
            <true/>
            <key>devname</key>
            <string>agat9_flop</string>
-            <key>media</key>
-            <dict>
-              <key>floppy_5_25</key>
-              <integer>2</integer>
-            </dict>
          </dict>
          <dict>
            <key>value</key>
-            <string>diskii</string>
+            <string>diskiing</string>
            <key>description</key>
-            <string>Apple Disk II controller</string>
+            <string>Apple Disk II NG controller (16-sector)</string>
            <key>devname</key>
-            <string>a2diskii</string>
-            <key>media</key>
-            <dict>
-              <key>floppy_5_25</key>
-              <integer>2</integer>
-            </dict>
+            <string>a2diskiing</string>
          </dict>
          <dict>
            <key>value</key>
@@ -494,6 +463,69 @@
    </array>
    <key>devices</key>
    <array>
+      <dict>
+        <key>name</key>
+        <string>a2diskiing</string>
+        <key>slots</key>
+        <array>
+          <dict>
+            <key>name</key>
+            <string>:0</string>
+            <key>options</key>
+            <array>
+              <dict>
+                <key>value</key>
+                <string></string>
+                <key>description</key>
+                <string>—None—</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>525</string>
+                <key>description</key>
+                <string>5.25"</string>
+                <key>default</key>
+                <true/>
+                <key>media</key>
+                <dict>
+                  <key>floppy_5_25</key>
+                  <integer>1</integer>
+                </dict>
+              </dict>
+            </array>
+          </dict>
+          <dict>
+            <key>name</key>
+            <string>:1</string>
+            <key>options</key>
+            <array>
+              <dict>
+                <key>value</key>
+                <string></string>
+                <key>description</key>
+                <string>—None—</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>525</string>
+                <key>description</key>
+                <string>5.25"</string>
+                <key>default</key>
+                <true/>
+                <key>media</key>
+                <dict>
+                  <key>floppy_5_25</key>
+                  <integer>1</integer>
+                </dict>
+              </dict>
+            </array>
+          </dict>
+        </array>
+      </dict>
      <dict>
        <key>name</key>
        <string>a7ports</string>
@@ -544,6 +576,14 @@
                <key>default</key>
                <false/>
              </dict>
+              <dict>
+                <key>value</key>
+                <string>digiblst</string>
+                <key>description</key>
+                <string>Digiblaster (DIY)</string>
+                <key>default</key>
+                <false/>
+              </dict>
              <dict>
                <key>value</key>
                <string>ap2000</string>
@@ -572,7 +612,7 @@
                <key>value</key>
                <string>lx810l</string>
                <key>description</key>
-                <string>Espon LX-810L</string>
+                <string>Epson LX-810L</string>
                <key>default</key>
                <false/>
              </dict>
@@ -592,6 +632,14 @@
                <key>default</key>
                <false/>
              </dict>
+              <dict>
+                <key>value</key>
+                <string>nlq401</string>
+                <key>description</key>
+                <string>Schneider NLQ 401 Matrix Printer</string>
+                <key>default</key>
+                <false/>
+              </dict>
              <dict>
                <key>value</key>
                <string>chessmec</string>
@@ -612,6 +660,69 @@
          </dict>
        </array>
      </dict>
+      <dict>
+        <key>name</key>
+        <string>agat9_flop</string>
+        <key>slots</key>
+        <array>
+          <dict>
+            <key>name</key>
+            <string>:0</string>
+            <key>options</key>
+            <array>
+              <dict>
+                <key>value</key>
+                <string></string>
+                <key>description</key>
+                <string>—None—</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>525</string>
+                <key>description</key>
+                <string>5.25"</string>
+                <key>default</key>
+                <true/>
+                <key>media</key>
+                <dict>
+                  <key>floppy_5_25</key>
+                  <integer>1</integer>
+                </dict>
+              </dict>
+            </array>
+          </dict>
+          <dict>
+            <key>name</key>
+            <string>:1</string>
+            <key>options</key>
+            <array>
+              <dict>
+                <key>value</key>
+                <string></string>
+                <key>description</key>
+                <string>—None—</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>525</string>
+                <key>description</key>
+                <string>5.25"</string>
+                <key>default</key>
+                <true/>
+                <key>media</key>
+                <dict>
+                  <key>floppy_5_25</key>
+                  <integer>1</integer>
+                </dict>
+              </dict>
+            </array>
+          </dict>
+        </array>
+      </dict>
      <dict>
        <key>name</key>
        <string>agat_fdc</string>
@@ -232,6 +232,14 @@
                  <integer>1</integer>
                </dict>
              </dict>
+              <dict>
+                <key>value</key>
+                <string>zip100</string>
+                <key>description</key>
+                <string>Iomega Zip 100MB IDE Drive</string>
+                <key>default</key>
+                <false/>
+              </dict>
            </array>
          </dict>
          <dict>
@@ -273,6 +281,14 @@
                  <integer>1</integer>
                </dict>
              </dict>
+              <dict>
+                <key>value</key>
+                <string>zip100</string>
+                <key>description</key>
+                <string>Iomega Zip 100MB IDE Drive</string>
+                <key>default</key>
+                <false/>
+              </dict>
            </array>
          </dict>
        </array>
@@ -92,6 +92,11 @@
            <string>Digital Vision ComputerEyes</string>
            <key>devname</key>
            <string>a2ceyes</string>
+            <key>media</key>
+            <dict>
+              <key>picture</key>
+              <integer>1</integer>
+            </dict>
          </dict>
          <dict>
            <key>value</key>
@@ -142,6 +147,14 @@
            <key>devname</key>
            <string>rs_serial_printer</string>
          </dict>
+          <dict>
+            <key>value</key>
+            <string>patch</string>
+            <key>description</key>
+            <string>RS-232 Patch Box</string>
+            <key>devname</key>
+            <string>rs232_patch_box</string>
+          </dict>
          <dict>
            <key>value</key>
            <string>loopback</string>
@@ -273,6 +286,14 @@
            <key>devname</key>
            <string>rs_serial_printer</string>
          </dict>
+          <dict>
+            <key>value</key>
+            <string>patch</string>
+            <key>description</key>
+            <string>RS-232 Patch Box</string>
+            <key>devname</key>
+            <string>rs232_patch_box</string>
+          </dict>
          <dict>
            <key>value</key>
            <string>loopback</string>
@@ -431,6 +452,150 @@
          </dict>
        </array>
      </dict>
+      <dict>
+        <key>name</key>
+        <string>rs232_patch_box</string>
+        <key>slots</key>
+        <array>
+          <dict>
+            <key>name</key>
+            <string>:dce</string>
+            <key>options</key>
+            <array>
+              <dict>
+                <key>value</key>
+                <string></string>
+                <key>description</key>
+                <string>—None—</string>
+                <key>default</key>
+                <true/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>ie15</string>
+                <key>description</key>
+                <string>IE15 Terminal</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>pty</string>
+                <key>description</key>
+                <string>Pseudo terminal</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>rs_printer</string>
+                <key>description</key>
+                <string>Radio Shack Serial Printer</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>patch</string>
+                <key>description</key>
+                <string>RS-232 Patch Box</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>loopback</string>
+                <key>description</key>
+                <string>RS232 Loopback</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>dec_loopback</string>
+                <key>description</key>
+                <string>RS232 Loopback (DEC 12-15336-00)</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>null_modem</string>
+                <key>description</key>
+                <string>RS232 Null Modem</string>
+                <key>default</key>
+                <false/>
+                <key>media</key>
+                <dict>
+                  <key>bitbanger</key>
+                  <integer>1</integer>
+                </dict>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>rs232_sync_io</string>
+                <key>description</key>
+                <string>RS232 Synchronous I/O</string>
+                <key>default</key>
+                <false/>
+                <key>media</key>
+                <dict>
+                  <key>bitbanger</key>
+                  <integer>1</integer>
+                </dict>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>keyboard</string>
+                <key>description</key>
+                <string>Serial Keyboard</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>printer</string>
+                <key>description</key>
+                <string>Serial Printer</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>terminal</string>
+                <key>description</key>
+                <string>Serial Terminal</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>sunkbd</string>
+                <key>description</key>
+                <string>Sun Keyboard Adaptor</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>mockingboard</string>
+                <key>description</key>
+                <string>Sweet Micro Systems Mockingboard D</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>swtpc8212</string>
+                <key>description</key>
+                <string>SWTPC8212 Terminal</string>
+                <key>default</key>
+                <false/>
+              </dict>
+            </array>
+          </dict>
+        </array>
+      </dict>
      <dict>
        <key>name</key>
        <string>sunkbd_adaptor</string>
@@ -8,10 +8,6 @@
    <string>Apple //c Plus</string>
    <key>media</key>
    <dict>
-      <key>floppy_5_25</key>
-      <integer>2</integer>
-      <key>floppy_3_5</key>
-      <integer>2</integer>
    </dict>
    <key>resolution</key>
    <array>
@@ -79,6 +75,25 @@
          </dict>
        </array>
      </dict>
+      <dict>
+        <key>name</key>
+        <string>smartport</string>
+        <key>description</key>
+        <string>Disk Drives</string>
+        <key>options</key>
+        <array>
+          <dict>
+            <key>value</key>
+            <string></string>
+            <key>description</key>
+            <string></string>
+            <key>devname</key>
+            <string>smartport</string>
+            <key>default</key>
+            <true/>
+          </dict>
+        </array>
+      </dict>
      <dict>
        <key>name</key>
        <string>gameio</string>
@@ -117,6 +132,11 @@
            <string>Digital Vision ComputerEyes</string>
            <key>devname</key>
            <string>a2ceyes</string>
+            <key>media</key>
+            <dict>
+              <key>picture</key>
+              <integer>1</integer>
+            </dict>
          </dict>
          <dict>
            <key>value</key>
@@ -167,6 +187,14 @@
            <key>devname</key>
            <string>rs_serial_printer</string>
          </dict>
+          <dict>
+            <key>value</key>
+            <string>patch</string>
+            <key>description</key>
+            <string>RS-232 Patch Box</string>
+            <key>devname</key>
+            <string>rs232_patch_box</string>
+          </dict>
          <dict>
            <key>value</key>
            <string>loopback</string>
@@ -298,6 +326,14 @@
            <key>devname</key>
            <string>rs_serial_printer</string>
          </dict>
+          <dict>
+            <key>value</key>
+            <string>patch</string>
+            <key>description</key>
+            <string>RS-232 Patch Box</string>
+            <key>devname</key>
+            <string>rs232_patch_box</string>
+          </dict>
          <dict>
            <key>value</key>
            <string>loopback</string>
@@ -393,6 +429,321 @@
    </array>
    <key>devices</key>
    <array>
+      <dict>
+        <key>name</key>
+        <string>smartport</string>
+        <key>slots</key>
+        <array>
+          <dict>
+            <key>name</key>
+            <string>fdc:0</string>
+            <key>options</key>
+            <array>
+              <dict>
+                <key>value</key>
+                <string></string>
+                <key>description</key>
+                <string>—None—</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>525</string>
+                <key>description</key>
+                <string>5.25"</string>
+                <key>default</key>
+                <true/>
+                <key>media</key>
+                <dict>
+                  <key>floppy_5_25</key>
+                  <integer>1</integer>
+                </dict>
+              </dict>
+            </array>
+          </dict>
+          <dict>
+            <key>name</key>
+            <string>fdc:1</string>
+            <key>options</key>
+            <array>
+              <dict>
+                <key>value</key>
+                <string></string>
+                <key>description</key>
+                <string>—None—</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>525</string>
+                <key>description</key>
+                <string>5.25"</string>
+                <key>default</key>
+                <true/>
+                <key>media</key>
+                <dict>
+                  <key>floppy_5_25</key>
+                  <integer>1</integer>
+                </dict>
+              </dict>
+            </array>
+          </dict>
+          <dict>
+            <key>name</key>
+            <string>fdc:2</string>
+            <key>options</key>
+            <array>
+              <dict>
+                <key>value</key>
+                <string></string>
+                <key>description</key>
+                <string>—None—</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>35dd</string>
+                <key>description</key>
+                <string>3.5" DD</string>
+                <key>default</key>
+                <true/>
+                <key>media</key>
+                <dict>
+                  <key>floppy_3_5</key>
+                  <integer>1</integer>
+                </dict>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>35hd</string>
+                <key>description</key>
+                <string>3.5" HD</string>
+                <key>default</key>
+                <false/>
+                <key>media</key>
+                <dict>
+                  <key>floppy_3_5</key>
+                  <integer>1</integer>
+                </dict>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>35sd</string>
+                <key>description</key>
+                <string>3.5" SD</string>
+                <key>default</key>
+                <false/>
+                <key>media</key>
+                <dict>
+                  <key>floppy_3_5</key>
+                  <integer>1</integer>
+                </dict>
+              </dict>
+            </array>
+          </dict>
+          <dict>
+            <key>name</key>
+            <string>fdc:3</string>
+            <key>options</key>
+            <array>
+              <dict>
+                <key>value</key>
+                <string></string>
+                <key>description</key>
+                <string>—None—</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>35dd</string>
+                <key>description</key>
+                <string>3.5" DD</string>
+                <key>default</key>
+                <true/>
+                <key>media</key>
+                <dict>
+                  <key>floppy_3_5</key>
+                  <integer>1</integer>
+                </dict>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>35hd</string>
+                <key>description</key>
+                <string>3.5" HD</string>
+                <key>default</key>
+                <false/>
+                <key>media</key>
+                <dict>
+                  <key>floppy_3_5</key>
+                  <integer>1</integer>
+                </dict>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>35sd</string>
+                <key>description</key>
+                <string>3.5" SD</string>
+                <key>default</key>
+                <false/>
+                <key>media</key>
+                <dict>
+                  <key>floppy_3_5</key>
+                  <integer>1</integer>
+                </dict>
+              </dict>
+            </array>
+          </dict>
+        </array>
+      </dict>
+      <dict>
+        <key>name</key>
+        <string>rs232_patch_box</string>
+        <key>slots</key>
+        <array>
+          <dict>
+            <key>name</key>
+            <string>:dce</string>
+            <key>options</key>
+            <array>
+              <dict>
+                <key>value</key>
+                <string></string>
+                <key>description</key>
+                <string>—None—</string>
+                <key>default</key>
+                <true/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>ie15</string>
+                <key>description</key>
+                <string>IE15 Terminal</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>pty</string>
+                <key>description</key>
+                <string>Pseudo terminal</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>rs_printer</string>
+                <key>description</key>
+                <string>Radio Shack Serial Printer</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>patch</string>
+                <key>description</key>
+                <string>RS-232 Patch Box</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>loopback</string>
+                <key>description</key>
+                <string>RS232 Loopback</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>dec_loopback</string>
+                <key>description</key>
+                <string>RS232 Loopback (DEC 12-15336-00)</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>null_modem</string>
+                <key>description</key>
+                <string>RS232 Null Modem</string>
+                <key>default</key>
+                <false/>
+                <key>media</key>
+                <dict>
+                  <key>bitbanger</key>
+                  <integer>1</integer>
+                </dict>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>rs232_sync_io</string>
+                <key>description</key>
+                <string>RS232 Synchronous I/O</string>
+                <key>default</key>
+                <false/>
+                <key>media</key>
+                <dict>
+                  <key>bitbanger</key>
+                  <integer>1</integer>
+                </dict>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>keyboard</string>
+                <key>description</key>
+                <string>Serial Keyboard</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>printer</string>
+                <key>description</key>
+                <string>Serial Printer</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>terminal</string>
+                <key>description</key>
+                <string>Serial Terminal</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>sunkbd</string>
+                <key>description</key>
+                <string>Sun Keyboard Adaptor</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>mockingboard</string>
+                <key>description</key>
+                <string>Sweet Micro Systems Mockingboard D</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>swtpc8212</string>
+                <key>description</key>
+                <string>SWTPC8212 Terminal</string>
+                <key>default</key>
+                <false/>
+              </dict>
+            </array>
+          </dict>
+        </array>
+      </dict>
      <dict>
        <key>name</key>
        <string>sunkbd_adaptor</string>
@@ -55,6 +55,35 @@
          </dict>
        </array>
      </dict>
+      <dict>
+        <key>name</key>
+        <string>bios</string>
+        <key>description</key>
+        <string>ROM</string>
+        <key>options</key>
+        <array>
+          <dict>
+            <key>value</key>
+            <string></string>
+            <key>description</key>
+            <string>—Default—</string>
+            <key>default</key>
+            <true/>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>original</string>
+            <key>description</key>
+            <string>Apple /// boot ROM</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>soshd</string>
+            <key>description</key>
+            <string>Rob Justice SOSHDBOOT</string>
+          </dict>
+        </array>
+      </dict>
      <dict>
        <key>name</key>
        <string>smartport</string>
@@ -101,7 +130,7 @@
            <key>value</key>
            <string>cffa2</string>
            <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
            <key>devname</key>
            <string>a2cffa02</string>
          </dict>
@@ -113,6 +142,22 @@
            <key>disabled</key>
            <true/>
          </dict>
+          <dict>
+            <key>value</key>
+            <string>grafex</string>
+            <key>description</key>
+            <string>Grafex-32</string>
+            <key>devname</key>
+            <string>a2grafex</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>softcard3</string>
+            <key>description</key>
+            <string>Microsoft SoftCard ///</string>
+            <key>devname</key>
+            <string>softcard3</string>
+          </dict>
          <dict>
            <key>value</key>
            <string>focusdrive</string>
@@ -129,6 +174,14 @@
            <key>devname</key>
            <string>a2aplcrd</string>
          </dict>
+          <dict>
+            <key>value</key>
+            <string>mockingboard</string>
+            <key>description</key>
+            <string>Sweet Micro Systems Mockingboard Sound/Speech I</string>
+            <key>devname</key>
+            <string>a2mockbd</string>
+          </dict>
          <dict>
            <key>value</key>
            <string>thclock</string>
@@ -137,6 +190,14 @@
            <key>devname</key>
            <string>a2thunpl</string>
          </dict>
+          <dict>
+            <key>value</key>
+            <string>titan3plus2</string>
+            <key>description</key>
+            <string>Titan /// Plus //</string>
+            <key>devname</key>
+            <string>titan3p2</string>
+          </dict>
        </array>
      </dict>
      <dict>
@@ -166,7 +227,7 @@
            <key>value</key>
            <string>cffa2</string>
            <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
            <key>devname</key>
            <string>a2cffa02</string>
          </dict>
@@ -178,6 +239,22 @@
            <key>disabled</key>
            <true/>
          </dict>
+          <dict>
+            <key>value</key>
+            <string>grafex</string>
+            <key>description</key>
+            <string>Grafex-32</string>
+            <key>devname</key>
+            <string>a2grafex</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>softcard3</string>
+            <key>description</key>
+            <string>Microsoft SoftCard ///</string>
+            <key>devname</key>
+            <string>softcard3</string>
+          </dict>
          <dict>
            <key>value</key>
            <string>focusdrive</string>
@@ -194,6 +271,14 @@
            <key>devname</key>
            <string>a2aplcrd</string>
          </dict>
+          <dict>
+            <key>value</key>
+            <string>mockingboard</string>
+            <key>description</key>
+            <string>Sweet Micro Systems Mockingboard Sound/Speech I</string>
+            <key>devname</key>
+            <string>a2mockbd</string>
+          </dict>
          <dict>
            <key>value</key>
            <string>thclock</string>
@@ -202,6 +287,14 @@
            <key>devname</key>
            <string>a2thunpl</string>
          </dict>
+          <dict>
+            <key>value</key>
+            <string>titan3plus2</string>
+            <key>description</key>
+            <string>Titan /// Plus //</string>
+            <key>devname</key>
+            <string>titan3p2</string>
+          </dict>
        </array>
      </dict>
      <dict>
@@ -231,7 +324,7 @@
            <key>value</key>
            <string>cffa2</string>
            <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
            <key>devname</key>
            <string>a2cffa02</string>
          </dict>
@@ -243,6 +336,22 @@
            <key>disabled</key>
            <true/>
          </dict>
+          <dict>
+            <key>value</key>
+            <string>grafex</string>
+            <key>description</key>
+            <string>Grafex-32</string>
+            <key>devname</key>
+            <string>a2grafex</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>softcard3</string>
+            <key>description</key>
+            <string>Microsoft SoftCard ///</string>
+            <key>devname</key>
+            <string>softcard3</string>
+          </dict>
          <dict>
            <key>value</key>
            <string>focusdrive</string>
@@ -259,6 +368,14 @@
            <key>devname</key>
            <string>a2aplcrd</string>
          </dict>
+          <dict>
+            <key>value</key>
+            <string>mockingboard</string>
+            <key>description</key>
+            <string>Sweet Micro Systems Mockingboard Sound/Speech I</string>
+            <key>devname</key>
+            <string>a2mockbd</string>
+          </dict>
          <dict>
            <key>value</key>
            <string>thclock</string>
@@ -267,6 +384,14 @@
            <key>devname</key>
            <string>a2thunpl</string>
          </dict>
+          <dict>
+            <key>value</key>
+            <string>titan3plus2</string>
+            <key>description</key>
+            <string>Titan /// Plus //</string>
+            <key>devname</key>
+            <string>titan3p2</string>
+          </dict>
        </array>
      </dict>
      <dict>
@@ -296,7 +421,7 @@
            <key>value</key>
            <string>cffa2</string>
            <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
            <key>devname</key>
            <string>a2cffa02</string>
          </dict>
@@ -308,6 +433,22 @@
            <key>disabled</key>
            <true/>
          </dict>
+          <dict>
+            <key>value</key>
+            <string>grafex</string>
+            <key>description</key>
+            <string>Grafex-32</string>
+            <key>devname</key>
+            <string>a2grafex</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>softcard3</string>
+            <key>description</key>
+            <string>Microsoft SoftCard ///</string>
+            <key>devname</key>
+            <string>softcard3</string>
+          </dict>
          <dict>
            <key>value</key>
            <string>focusdrive</string>
@@ -324,6 +465,14 @@
            <key>devname</key>
            <string>a2aplcrd</string>
          </dict>
+          <dict>
+            <key>value</key>
+            <string>mockingboard</string>
+            <key>description</key>
+            <string>Sweet Micro Systems Mockingboard Sound/Speech I</string>
+            <key>devname</key>
+            <string>a2mockbd</string>
+          </dict>
          <dict>
            <key>value</key>
            <string>thclock</string>
@@ -332,13 +481,21 @@
            <key>devname</key>
            <string>a2thunpl</string>
          </dict>
+          <dict>
+            <key>value</key>
+            <string>titan3plus2</string>
+            <key>description</key>
+            <string>Titan /// Plus //</string>
+            <key>devname</key>
+            <string>titan3p2</string>
+          </dict>
        </array>
      </dict>
      <dict>
        <key>name</key>
        <string>rs232</string>
        <key>description</key>
-        <string>RS232</string>
+        <string>Modem</string>
        <key>options</key>
        <array>
          <dict>
@@ -373,6 +530,14 @@
            <key>devname</key>
            <string>rs_serial_printer</string>
          </dict>
+          <dict>
+            <key>value</key>
+            <string>patch</string>
+            <key>description</key>
+            <string>RS-232 Patch Box</string>
+            <key>devname</key>
+            <string>rs232_patch_box</string>
+          </dict>
          <dict>
            <key>value</key>
            <string>loopback</string>
@@ -631,6 +796,14 @@
                  <integer>1</integer>
                </dict>
              </dict>
+              <dict>
+                <key>value</key>
+                <string>zip100</string>
+                <key>description</key>
+                <string>Iomega Zip 100MB IDE Drive</string>
+                <key>default</key>
+                <false/>
+              </dict>
            </array>
          </dict>
          <dict>
@@ -672,6 +845,14 @@
                  <integer>1</integer>
                </dict>
              </dict>
+              <dict>
+                <key>value</key>
+                <string>zip100</string>
+                <key>description</key>
+                <string>Iomega Zip 100MB IDE Drive</string>
+                <key>default</key>
+                <false/>
+              </dict>
            </array>
          </dict>
        </array>
@@ -720,6 +901,14 @@
                  <integer>1</integer>
                </dict>
              </dict>
+              <dict>
+                <key>value</key>
+                <string>zip100</string>
+                <key>description</key>
+                <string>Iomega Zip 100MB IDE Drive</string>
+                <key>default</key>
+                <false/>
+              </dict>
            </array>
          </dict>
          <dict>
@@ -761,6 +950,14 @@
                  <integer>1</integer>
                </dict>
              </dict>
+              <dict>
+                <key>value</key>
+                <string>zip100</string>
+                <key>description</key>
+                <string>Iomega Zip 100MB IDE Drive</string>
+                <key>default</key>
+                <false/>
+              </dict>
            </array>
          </dict>
        </array>
@@ -783,6 +980,19 @@
                <key>default</key>
                <true/>
              </dict>
+              <dict>
+                <key>value</key>
+                <string>aplcdsc</string>
+                <key>description</key>
+                <string>Apple SCSI CD-ROM</string>
+                <key>default</key>
+                <false/>
+                <key>media</key>
+                <dict>
+                  <key>cdrom</key>
+                  <integer>1</integer>
+                </dict>
+              </dict>
              <dict>
                <key>value</key>
                <string>cdrom</string>
@@ -809,6 +1019,14 @@
                  <integer>1</integer>
                </dict>
              </dict>
+              <dict>
+                <key>value</key>
+                <string>tape</string>
+                <key>description</key>
+                <string>SCSI tape</string>
+                <key>default</key>
+                <false/>
+              </dict>
            </array>
          </dict>
          <dict>
@@ -824,6 +1042,19 @@
                <key>default</key>
                <true/>
              </dict>
+              <dict>
+                <key>value</key>
+                <string>aplcdsc</string>
+                <key>description</key>
+                <string>Apple SCSI CD-ROM</string>
+                <key>default</key>
+                <false/>
+                <key>media</key>
+                <dict>
+                  <key>cdrom</key>
+                  <integer>1</integer>
+                </dict>
+              </dict>
              <dict>
                <key>value</key>
                <string>cdrom</string>
@@ -850,6 +1081,14 @@
                  <integer>1</integer>
                </dict>
              </dict>
+              <dict>
+                <key>value</key>
+                <string>tape</string>
+                <key>description</key>
+                <string>SCSI tape</string>
+                <key>default</key>
+                <false/>
+              </dict>
            </array>
          </dict>
          <dict>
@@ -865,6 +1104,19 @@
                <key>default</key>
                <true/>
              </dict>
+              <dict>
+                <key>value</key>
+                <string>aplcdsc</string>
+                <key>description</key>
+                <string>Apple SCSI CD-ROM</string>
+                <key>default</key>
+                <false/>
+                <key>media</key>
+                <dict>
+                  <key>cdrom</key>
+                  <integer>1</integer>
+                </dict>
+              </dict>
              <dict>
                <key>value</key>
                <string>cdrom</string>
@@ -891,6 +1143,14 @@
                  <integer>1</integer>
                </dict>
              </dict>
+              <dict>
+                <key>value</key>
+                <string>tape</string>
+                <key>description</key>
+                <string>SCSI tape</string>
+                <key>default</key>
+                <false/>
+              </dict>
            </array>
          </dict>
          <dict>
@@ -906,6 +1166,19 @@
                <key>default</key>
                <true/>
              </dict>
+              <dict>
+                <key>value</key>
+                <string>aplcdsc</string>
+                <key>description</key>
+                <string>Apple SCSI CD-ROM</string>
+                <key>default</key>
+                <false/>
+                <key>media</key>
+                <dict>
+                  <key>cdrom</key>
+                  <integer>1</integer>
+                </dict>
+              </dict>
              <dict>
                <key>value</key>
                <string>cdrom</string>
@@ -932,6 +1205,14 @@
                  <integer>1</integer>
                </dict>
              </dict>
+              <dict>
+                <key>value</key>
+                <string>tape</string>
+                <key>description</key>
+                <string>SCSI tape</string>
+                <key>default</key>
+                <false/>
+              </dict>
            </array>
          </dict>
          <dict>
@@ -947,6 +1228,19 @@
                <key>default</key>
                <true/>
              </dict>
+              <dict>
+                <key>value</key>
+                <string>aplcdsc</string>
+                <key>description</key>
+                <string>Apple SCSI CD-ROM</string>
+                <key>default</key>
+                <false/>
+                <key>media</key>
+                <dict>
+                  <key>cdrom</key>
+                  <integer>1</integer>
+                </dict>
+              </dict>
              <dict>
                <key>value</key>
                <string>cdrom</string>
@@ -973,6 +1267,14 @@
                  <integer>1</integer>
                </dict>
              </dict>
+              <dict>
+                <key>value</key>
+                <string>tape</string>
+                <key>description</key>
+                <string>SCSI tape</string>
+                <key>default</key>
+                <false/>
+              </dict>
            </array>
          </dict>
          <dict>
@@ -988,6 +1290,19 @@
                <key>default</key>
                <true/>
              </dict>
+              <dict>
+                <key>value</key>
+                <string>aplcdsc</string>
+                <key>description</key>
+                <string>Apple SCSI CD-ROM</string>
+                <key>default</key>
+                <false/>
+                <key>media</key>
+                <dict>
+                  <key>cdrom</key>
+                  <integer>1</integer>
+                </dict>
+              </dict>
              <dict>
                <key>value</key>
                <string>cdrom</string>
@@ -1014,6 +1329,14 @@
                  <integer>1</integer>
                </dict>
              </dict>
+              <dict>
+                <key>value</key>
+                <string>tape</string>
+                <key>description</key>
+                <string>SCSI tape</string>
+                <key>default</key>
+                <false/>
+              </dict>
            </array>
          </dict>
          <dict>
@@ -1029,6 +1352,19 @@
                <key>default</key>
                <false/>
              </dict>
+              <dict>
+                <key>value</key>
+                <string>aplcdsc</string>
+                <key>description</key>
+                <string>Apple SCSI CD-ROM</string>
+                <key>default</key>
+                <false/>
+                <key>media</key>
+                <dict>
+                  <key>cdrom</key>
+                  <integer>1</integer>
+                </dict>
+              </dict>
              <dict>
                <key>value</key>
                <string>cdrom</string>
@@ -1055,6 +1391,158 @@
                  <integer>1</integer>
                </dict>
              </dict>
+              <dict>
+                <key>value</key>
+                <string>tape</string>
+                <key>description</key>
+                <string>SCSI tape</string>
+                <key>default</key>
+                <false/>
+              </dict>
+            </array>
+          </dict>
+        </array>
+      </dict>
+      <dict>
+        <key>name</key>
+        <string>rs232_patch_box</string>
+        <key>slots</key>
+        <array>
+          <dict>
+            <key>name</key>
+            <string>:dce</string>
+            <key>options</key>
+            <array>
+              <dict>
+                <key>value</key>
+                <string></string>
+                <key>description</key>
+                <string>—None—</string>
+                <key>default</key>
+                <true/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>ie15</string>
+                <key>description</key>
+                <string>IE15 Terminal</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>pty</string>
+                <key>description</key>
+                <string>Pseudo terminal</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>rs_printer</string>
+                <key>description</key>
+                <string>Radio Shack Serial Printer</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>patch</string>
+                <key>description</key>
+                <string>RS-232 Patch Box</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>loopback</string>
+                <key>description</key>
+                <string>RS232 Loopback</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>dec_loopback</string>
+                <key>description</key>
+                <string>RS232 Loopback (DEC 12-15336-00)</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>null_modem</string>
+                <key>description</key>
+                <string>RS232 Null Modem</string>
+                <key>default</key>
+                <false/>
+                <key>media</key>
+                <dict>
+                  <key>bitbanger</key>
+                  <integer>1</integer>
+                </dict>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>rs232_sync_io</string>
+                <key>description</key>
+                <string>RS232 Synchronous I/O</string>
+                <key>default</key>
+                <false/>
+                <key>media</key>
+                <dict>
+                  <key>bitbanger</key>
+                  <integer>1</integer>
+                </dict>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>keyboard</string>
+                <key>description</key>
+                <string>Serial Keyboard</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>printer</string>
+                <key>description</key>
+                <string>Serial Printer</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>terminal</string>
+                <key>description</key>
+                <string>Serial Terminal</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>sunkbd</string>
+                <key>description</key>
+                <string>Sun Keyboard Adaptor</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>mockingboard</string>
+                <key>description</key>
+                <string>Sweet Micro Systems Mockingboard D</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>swtpc8212</string>
+                <key>description</key>
+                <string>SWTPC8212 Terminal</string>
+                <key>default</key>
+                <false/>
+              </dict>
            </array>
          </dict>
        </array>
@@ -1129,6 +1617,65 @@
          </dict>
        </array>
      </dict>
+      <dict>
+        <key>name</key>
+        <string>titan3p2</string>
+        <key>slots</key>
+        <array>
+          <dict>
+            <key>name</key>
+            <string>:gameio</string>
+            <key>options</key>
+            <array>
+              <dict>
+                <key>value</key>
+                <string></string>
+                <key>description</key>
+                <string>—None—</string>
+                <key>default</key>
+                <true/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>joy</string>
+                <key>description</key>
+                <string>Apple II analog joysticks</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>paddles</string>
+                <key>description</key>
+                <string>Apple II paddles</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>compeyes</string>
+                <key>description</key>
+                <string>Digital Vision ComputerEyes</string>
+                <key>default</key>
+                <false/>
+                <key>media</key>
+                <dict>
+                  <key>picture</key>
+                  <integer>1</integer>
+                </dict>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>gizmo</string>
+                <key>description</key>
+                <string>HAL Labs Gizmo</string>
+                <key>default</key>
+                <false/>
+              </dict>
+            </array>
+          </dict>
+        </array>
+      </dict>
    </array>
    <key>software</key>
    <array>
@@ -8,8 +8,6 @@
    <string>Laser 128ex2 (version 6.1)</string>
    <key>media</key>
    <dict>
-      <key>floppy_5_25</key>
-      <integer>2</integer>
    </dict>
    <key>resolution</key>
    <array>
@@ -77,6 +75,25 @@
          </dict>
        </array>
      </dict>
+      <dict>
+        <key>name</key>
+        <string>smartport</string>
+        <key>description</key>
+        <string>Disk Drives</string>
+        <key>options</key>
+        <array>
+          <dict>
+            <key>value</key>
+            <string></string>
+            <key>description</key>
+            <string></string>
+            <key>devname</key>
+            <string>smartport</string>
+            <key>default</key>
+            <true/>
+          </dict>
+        </array>
+      </dict>
      <dict>
        <key>name</key>
        <string>gameio</string>
@@ -115,6 +132,11 @@
            <string>Digital Vision ComputerEyes</string>
            <key>devname</key>
            <string>a2ceyes</string>
+            <key>media</key>
+            <dict>
+              <key>picture</key>
+              <integer>1</integer>
+            </dict>
          </dict>
          <dict>
            <key>value</key>
@@ -165,6 +187,14 @@
            <key>devname</key>
            <string>rs_serial_printer</string>
          </dict>
+          <dict>
+            <key>value</key>
+            <string>patch</string>
+            <key>description</key>
+            <string>RS-232 Patch Box</string>
+            <key>devname</key>
+            <string>rs232_patch_box</string>
+          </dict>
          <dict>
            <key>value</key>
            <string>loopback</string>
@@ -296,6 +326,14 @@
            <key>devname</key>
            <string>rs_serial_printer</string>
          </dict>
+          <dict>
+            <key>value</key>
+            <string>patch</string>
+            <key>description</key>
+            <string>RS-232 Patch Box</string>
+            <key>devname</key>
+            <string>rs232_patch_box</string>
+          </dict>
          <dict>
            <key>value</key>
            <string>loopback</string>
@@ -391,6 +429,213 @@
    </array>
    <key>devices</key>
    <array>
+      <dict>
+        <key>name</key>
+        <string>smartport</string>
+        <key>slots</key>
+        <array>
+          <dict>
+            <key>name</key>
+            <string>fdc:0</string>
+            <key>options</key>
+            <array>
+              <dict>
+                <key>value</key>
+                <string></string>
+                <key>description</key>
+                <string>—None—</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>525</string>
+                <key>description</key>
+                <string>5.25"</string>
+                <key>default</key>
+                <true/>
+                <key>media</key>
+                <dict>
+                  <key>floppy_5_25</key>
+                  <integer>1</integer>
+                </dict>
+              </dict>
+            </array>
+          </dict>
+          <dict>
+            <key>name</key>
+            <string>fdc:1</string>
+            <key>options</key>
+            <array>
+              <dict>
+                <key>value</key>
+                <string></string>
+                <key>description</key>
+                <string>—None—</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>525</string>
+                <key>description</key>
+                <string>5.25"</string>
+                <key>default</key>
+                <true/>
+                <key>media</key>
+                <dict>
+                  <key>floppy_5_25</key>
+                  <integer>1</integer>
+                </dict>
+              </dict>
+            </array>
+          </dict>
+        </array>
+      </dict>
+      <dict>
+        <key>name</key>
+        <string>rs232_patch_box</string>
+        <key>slots</key>
+        <array>
+          <dict>
+            <key>name</key>
+            <string>:dce</string>
+            <key>options</key>
+            <array>
+              <dict>
+                <key>value</key>
+                <string></string>
+                <key>description</key>
+                <string>—None—</string>
+                <key>default</key>
+                <true/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>ie15</string>
+                <key>description</key>
+                <string>IE15 Terminal</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>pty</string>
+                <key>description</key>
+                <string>Pseudo terminal</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>rs_printer</string>
+                <key>description</key>
+                <string>Radio Shack Serial Printer</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>patch</string>
+                <key>description</key>
+                <string>RS-232 Patch Box</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>loopback</string>
+                <key>description</key>
+                <string>RS232 Loopback</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>dec_loopback</string>
+                <key>description</key>
+                <string>RS232 Loopback (DEC 12-15336-00)</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>null_modem</string>
+                <key>description</key>
+                <string>RS232 Null Modem</string>
+                <key>default</key>
+                <false/>
+                <key>media</key>
+                <dict>
+                  <key>bitbanger</key>
+                  <integer>1</integer>
+                </dict>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>rs232_sync_io</string>
+                <key>description</key>
+                <string>RS232 Synchronous I/O</string>
+                <key>default</key>
+                <false/>
+                <key>media</key>
+                <dict>
+                  <key>bitbanger</key>
+                  <integer>1</integer>
+                </dict>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>keyboard</string>
+                <key>description</key>
+                <string>Serial Keyboard</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>printer</string>
+                <key>description</key>
+                <string>Serial Printer</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>terminal</string>
+                <key>description</key>
+                <string>Serial Terminal</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>sunkbd</string>
+                <key>description</key>
+                <string>Sun Keyboard Adaptor</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>mockingboard</string>
+                <key>description</key>
+                <string>Sweet Micro Systems Mockingboard D</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>swtpc8212</string>
+                <key>description</key>
+                <string>SWTPC8212 Terminal</string>
+                <key>default</key>
+                <false/>
+              </dict>
+            </array>
+          </dict>
+        </array>
+      </dict>
      <dict>
        <key>name</key>
        <string>sunkbd_adaptor</string>
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+  <dict>
+    <key>value</key>
+    <string>las3000</string>
+    <key>description</key>
+    <string>Laser 3000</string>
+    <key>media</key>
+    <dict>
+      <key>cass</key>
+      <integer>1</integer>
+    </dict>
+    <key>resolution</key>
+    <array>
+      <integer>560</integer>
+      <integer>384</integer>
+    </array>
+    <key>slots</key>
+    <array>
+      <dict>
+        <key>name</key>
+        <string>ramsize</string>
+        <key>description</key>
+        <string>RAM</string>
+        <key>options</key>
+        <array>
+          <dict>
+            <key>intValue</key>
+            <integer>192</integer>
+            <key>description</key>
+            <string>192K</string>
+            <key>value</key>
+            <string>192K</string>
+            <key>default</key>
+            <true/>
+          </dict>
+        </array>
+      </dict>
+    </array>
+    <key>devices</key>
+    <array>
+    </array>
+    <key>software</key>
+    <array>
+    </array>
+  </dict>
+</plist>
@@ -54,6 +54,36 @@
          </dict>
        </array>
      </dict>
+      <dict>
+        <key>name</key>
+        <string>pds</string>
+        <key>description</key>
+        <string>PDS</string>
+        <key>options</key>
+        <array>
+          <dict>
+            <key>value</key>
+            <string></string>
+            <key>description</key>
+            <string>—None—</string>
+            <key>default</key>
+            <true/>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>hyperdrive</string>
+            <key>description</key>
+            <string>GCC HyperDrive</string>
+            <key>devname</key>
+            <string>pds_hyper</string>
+            <key>media</key>
+            <dict>
+              <key>hard</key>
+              <integer>1</integer>
+            </dict>
+          </dict>
+        </array>
+      </dict>
    </array>
    <key>devices</key>
    <array>
@@ -363,8 +393,9 @@
    </array>
    <key>software</key>
    <array>
+      <string>mac_flop_orig.xml</string>
+      <string>mac_flop_clcracked.xml</string>
      <string>mac_flop.xml</string>
-      <string>mac_hdd.xml</string>
    </array>
  </dict>
 </plist>
@@ -54,6 +54,36 @@
          </dict>
        </array>
      </dict>
+      <dict>
+        <key>name</key>
+        <string>pds</string>
+        <key>description</key>
+        <string>PDS</string>
+        <key>options</key>
+        <array>
+          <dict>
+            <key>value</key>
+            <string></string>
+            <key>description</key>
+            <string>—None—</string>
+            <key>default</key>
+            <true/>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>hyperdrive</string>
+            <key>description</key>
+            <string>GCC HyperDrive</string>
+            <key>devname</key>
+            <string>pds_hyper</string>
+            <key>media</key>
+            <dict>
+              <key>hard</key>
+              <integer>1</integer>
+            </dict>
+          </dict>
+        </array>
+      </dict>
    </array>
    <key>devices</key>
    <array>
@@ -363,8 +393,9 @@
    </array>
    <key>software</key>
    <array>
+      <string>mac_flop_orig.xml</string>
+      <string>mac_flop_clcracked.xml</string>
      <string>mac_flop.xml</string>
-      <string>mac_hdd.xml</string>
    </array>
  </dict>
 </plist>
@@ -35,6 +35,41 @@
          </dict>
        </array>
      </dict>
+      <dict>
+        <key>name</key>
+        <string>bios</string>
+        <key>description</key>
+        <string>ROM</string>
+        <key>options</key>
+        <array>
+          <dict>
+            <key>value</key>
+            <string></string>
+            <key>description</key>
+            <string>—Default—</string>
+            <key>default</key>
+            <true/>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>v3</string>
+            <key>description</key>
+            <string>Loud Harmonicas</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>v2</string>
+            <key>description</key>
+            <string>Lonely Heifers</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>v1</string>
+            <key>description</key>
+            <string>Lonely Hearts</string>
+          </dict>
+        </array>
+      </dict>
      <dict>
        <key>name</key>
        <string>smartport</string>
@@ -54,6 +89,36 @@
          </dict>
        </array>
      </dict>
+      <dict>
+        <key>name</key>
+        <string>pds</string>
+        <key>description</key>
+        <string>PDS</string>
+        <key>options</key>
+        <array>
+          <dict>
+            <key>value</key>
+            <string></string>
+            <key>description</key>
+            <string>—None—</string>
+            <key>default</key>
+            <true/>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>hyperdrive</string>
+            <key>description</key>
+            <string>GCC HyperDrive</string>
+            <key>devname</key>
+            <string>pds_hyper</string>
+            <key>media</key>
+            <dict>
+              <key>hard</key>
+              <integer>1</integer>
+            </dict>
+          </dict>
+        </array>
+      </dict>
    </array>
    <key>devices</key>
    <array>
@@ -363,8 +428,9 @@
    </array>
    <key>software</key>
    <array>
+      <string>mac_flop_orig.xml</string>
+      <string>mac_flop_clcracked.xml</string>
      <string>mac_flop.xml</string>
-      <string>mac_hdd.xml</string>
    </array>
  </dict>
 </plist>
@@ -0,0 +1,976 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+  <dict>
+    <key>value</key>
+    <string>maccclas</string>
+    <key>description</key>
+    <string>Macintosh Color Classic</string>
+    <key>media</key>
+    <dict>
+      <key>cdrom</key>
+      <integer>1</integer>
+    </dict>
+    <key>resolution</key>
+    <array>
+      <integer>512</integer>
+      <integer>384</integer>
+    </array>
+    <key>slots</key>
+    <array>
+      <dict>
+        <key>name</key>
+        <string>ramsize</string>
+        <key>description</key>
+        <string>RAM</string>
+        <key>options</key>
+        <array>
+          <dict>
+            <key>intValue</key>
+            <integer>4194304</integer>
+            <key>description</key>
+            <string>4M</string>
+            <key>value</key>
+            <string>4M</string>
+            <key>default</key>
+            <true/>
+          </dict>
+          <dict>
+            <key>intValue</key>
+            <integer>6291456</integer>
+            <key>description</key>
+            <string>6M</string>
+            <key>value</key>
+            <string>6M</string>
+            <key>default</key>
+            <false/>
+          </dict>
+          <dict>
+            <key>intValue</key>
+            <integer>8388608</integer>
+            <key>description</key>
+            <string>8M</string>
+            <key>value</key>
+            <string>8M</string>
+            <key>default</key>
+            <false/>
+          </dict>
+          <dict>
+            <key>intValue</key>
+            <integer>10485760</integer>
+            <key>description</key>
+            <string>10M</string>
+            <key>value</key>
+            <string>10M</string>
+            <key>default</key>
+            <false/>
+          </dict>
+        </array>
+      </dict>
+      <dict>
+        <key>name</key>
+        <string>smartport</string>
+        <key>description</key>
+        <string>Disk Drives</string>
+        <key>options</key>
+        <array>
+          <dict>
+            <key>value</key>
+            <string></string>
+            <key>description</key>
+            <string></string>
+            <key>devname</key>
+            <string>smartport</string>
+            <key>default</key>
+            <true/>
+          </dict>
+        </array>
+      </dict>
+      <dict>
+        <key>name</key>
+        <string>printer</string>
+        <key>description</key>
+        <string>Printer</string>
+        <key>options</key>
+        <array>
+          <dict>
+            <key>value</key>
+            <string></string>
+            <key>description</key>
+            <string>—None—</string>
+            <key>default</key>
+            <true/>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>ie15</string>
+            <key>description</key>
+            <string>IE15 Terminal</string>
+            <key>devname</key>
+            <string>ie15_terminal</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>pty</string>
+            <key>description</key>
+            <string>Pseudo terminal</string>
+            <key>devname</key>
+            <string>pseudo_terminal</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>rs_printer</string>
+            <key>description</key>
+            <string>Radio Shack Serial Printer</string>
+            <key>devname</key>
+            <string>rs_serial_printer</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>patch</string>
+            <key>description</key>
+            <string>RS-232 Patch Box</string>
+            <key>devname</key>
+            <string>rs232_patch_box</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>loopback</string>
+            <key>description</key>
+            <string>RS232 Loopback</string>
+            <key>devname</key>
+            <string>rs232_loopback</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>dec_loopback</string>
+            <key>description</key>
+            <string>RS232 Loopback (DEC 12-15336-00)</string>
+            <key>devname</key>
+            <string>dec_rs232_loopback</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>null_modem</string>
+            <key>description</key>
+            <string>RS232 Null Modem</string>
+            <key>devname</key>
+            <string>null_modem</string>
+            <key>media</key>
+            <dict>
+              <key>bitbanger</key>
+              <integer>1</integer>
+            </dict>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>rs232_sync_io</string>
+            <key>description</key>
+            <string>RS232 Synchronous I/O</string>
+            <key>devname</key>
+            <string>rs232_sync_io</string>
+            <key>media</key>
+            <dict>
+              <key>bitbanger</key>
+              <integer>1</integer>
+            </dict>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>keyboard</string>
+            <key>description</key>
+            <string>Serial Keyboard</string>
+            <key>devname</key>
+            <string>serial_keyboard</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>printer</string>
+            <key>description</key>
+            <string>Serial Printer</string>
+            <key>devname</key>
+            <string>serial_printer</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>terminal</string>
+            <key>description</key>
+            <string>Serial Terminal</string>
+            <key>devname</key>
+            <string>serial_terminal</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>sunkbd</string>
+            <key>description</key>
+            <string>Sun Keyboard Adaptor</string>
+            <key>devname</key>
+            <string>sunkbd_adaptor</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>mockingboard</string>
+            <key>description</key>
+            <string>Sweet Micro Systems Mockingboard D</string>
+            <key>devname</key>
+            <string>mockingboardd</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>swtpc8212</string>
+            <key>description</key>
+            <string>SWTPC8212 Terminal</string>
+            <key>devname</key>
+            <string>swtpc8212_terminal</string>
+          </dict>
+        </array>
+      </dict>
+      <dict>
+        <key>name</key>
+        <string>modem</string>
+        <key>description</key>
+        <string>Modem</string>
+        <key>options</key>
+        <array>
+          <dict>
+            <key>value</key>
+            <string></string>
+            <key>description</key>
+            <string>—None—</string>
+            <key>default</key>
+            <true/>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>ie15</string>
+            <key>description</key>
+            <string>IE15 Terminal</string>
+            <key>devname</key>
+            <string>ie15_terminal</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>pty</string>
+            <key>description</key>
+            <string>Pseudo terminal</string>
+            <key>devname</key>
+            <string>pseudo_terminal</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>rs_printer</string>
+            <key>description</key>
+            <string>Radio Shack Serial Printer</string>
+            <key>devname</key>
+            <string>rs_serial_printer</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>patch</string>
+            <key>description</key>
+            <string>RS-232 Patch Box</string>
+            <key>devname</key>
+            <string>rs232_patch_box</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>loopback</string>
+            <key>description</key>
+            <string>RS232 Loopback</string>
+            <key>devname</key>
+            <string>rs232_loopback</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>dec_loopback</string>
+            <key>description</key>
+            <string>RS232 Loopback (DEC 12-15336-00)</string>
+            <key>devname</key>
+            <string>dec_rs232_loopback</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>null_modem</string>
+            <key>description</key>
+            <string>RS232 Null Modem</string>
+            <key>devname</key>
+            <string>null_modem</string>
+            <key>media</key>
+            <dict>
+              <key>bitbanger</key>
+              <integer>1</integer>
+            </dict>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>rs232_sync_io</string>
+            <key>description</key>
+            <string>RS232 Synchronous I/O</string>
+            <key>devname</key>
+            <string>rs232_sync_io</string>
+            <key>media</key>
+            <dict>
+              <key>bitbanger</key>
+              <integer>1</integer>
+            </dict>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>keyboard</string>
+            <key>description</key>
+            <string>Serial Keyboard</string>
+            <key>devname</key>
+            <string>serial_keyboard</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>printer</string>
+            <key>description</key>
+            <string>Serial Printer</string>
+            <key>devname</key>
+            <string>serial_printer</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>terminal</string>
+            <key>description</key>
+            <string>Serial Terminal</string>
+            <key>devname</key>
+            <string>serial_terminal</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>sunkbd</string>
+            <key>description</key>
+            <string>Sun Keyboard Adaptor</string>
+            <key>devname</key>
+            <string>sunkbd_adaptor</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>mockingboard</string>
+            <key>description</key>
+            <string>Sweet Micro Systems Mockingboard D</string>
+            <key>devname</key>
+            <string>mockingboardd</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>swtpc8212</string>
+            <key>description</key>
+            <string>SWTPC8212 Terminal</string>
+            <key>devname</key>
+            <string>swtpc8212_terminal</string>
+          </dict>
+        </array>
+      </dict>
+    </array>
+    <key>devices</key>
+    <array>
+      <dict>
+        <key>name</key>
+        <string>smartport</string>
+        <key>slots</key>
+        <array>
+          <dict>
+            <key>name</key>
+            <string>scsi:0</string>
+            <key>options</key>
+            <array>
+              <dict>
+                <key>value</key>
+                <string></string>
+                <key>description</key>
+                <string>—None—</string>
+                <key>default</key>
+                <true/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>aplcdsc</string>
+                <key>description</key>
+                <string>Apple SCSI CD-ROM</string>
+                <key>default</key>
+                <false/>
+                <key>media</key>
+                <dict>
+                  <key>cdrom</key>
+                  <integer>1</integer>
+                </dict>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>cdrom</string>
+                <key>description</key>
+                <string>CD-ROM</string>
+                <key>default</key>
+                <false/>
+                <key>media</key>
+                <dict>
+                  <key>cdrom</key>
+                  <integer>1</integer>
+                </dict>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>harddisk</string>
+                <key>description</key>
+                <string>Hard Disk</string>
+                <key>default</key>
+                <false/>
+                <key>media</key>
+                <dict>
+                  <key>hard</key>
+                  <integer>1</integer>
+                </dict>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>tape</string>
+                <key>description</key>
+                <string>SCSI tape</string>
+                <key>default</key>
+                <false/>
+              </dict>
+            </array>
+          </dict>
+          <dict>
+            <key>name</key>
+            <string>scsi:1</string>
+            <key>options</key>
+            <array>
+              <dict>
+                <key>value</key>
+                <string></string>
+                <key>description</key>
+                <string>—None—</string>
+                <key>default</key>
+                <true/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>aplcdsc</string>
+                <key>description</key>
+                <string>Apple SCSI CD-ROM</string>
+                <key>default</key>
+                <false/>
+                <key>media</key>
+                <dict>
+                  <key>cdrom</key>
+                  <integer>1</integer>
+                </dict>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>cdrom</string>
+                <key>description</key>
+                <string>CD-ROM</string>
+                <key>default</key>
+                <false/>
+                <key>media</key>
+                <dict>
+                  <key>cdrom</key>
+                  <integer>1</integer>
+                </dict>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>harddisk</string>
+                <key>description</key>
+                <string>Hard Disk</string>
+                <key>default</key>
+                <false/>
+                <key>media</key>
+                <dict>
+                  <key>hard</key>
+                  <integer>1</integer>
+                </dict>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>tape</string>
+                <key>description</key>
+                <string>SCSI tape</string>
+                <key>default</key>
+                <false/>
+              </dict>
+            </array>
+          </dict>
+          <dict>
+            <key>name</key>
+            <string>scsi:2</string>
+            <key>options</key>
+            <array>
+              <dict>
+                <key>value</key>
+                <string></string>
+                <key>description</key>
+                <string>—None—</string>
+                <key>default</key>
+                <true/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>aplcdsc</string>
+                <key>description</key>
+                <string>Apple SCSI CD-ROM</string>
+                <key>default</key>
+                <false/>
+                <key>media</key>
+                <dict>
+                  <key>cdrom</key>
+                  <integer>1</integer>
+                </dict>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>cdrom</string>
+                <key>description</key>
+                <string>CD-ROM</string>
+                <key>default</key>
+                <false/>
+                <key>media</key>
+                <dict>
+                  <key>cdrom</key>
+                  <integer>1</integer>
+                </dict>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>harddisk</string>
+                <key>description</key>
+                <string>Hard Disk</string>
+                <key>default</key>
+                <false/>
+                <key>media</key>
+                <dict>
+                  <key>hard</key>
+                  <integer>1</integer>
+                </dict>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>tape</string>
+                <key>description</key>
+                <string>SCSI tape</string>
+                <key>default</key>
+                <false/>
+              </dict>
+            </array>
+          </dict>
+          <dict>
+            <key>name</key>
+            <string>scsi:4</string>
+            <key>options</key>
+            <array>
+              <dict>
+                <key>value</key>
+                <string></string>
+                <key>description</key>
+                <string>—None—</string>
+                <key>default</key>
+                <true/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>aplcdsc</string>
+                <key>description</key>
+                <string>Apple SCSI CD-ROM</string>
+                <key>default</key>
+                <false/>
+                <key>media</key>
+                <dict>
+                  <key>cdrom</key>
+                  <integer>1</integer>
+                </dict>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>cdrom</string>
+                <key>description</key>
+                <string>CD-ROM</string>
+                <key>default</key>
+                <false/>
+                <key>media</key>
+                <dict>
+                  <key>cdrom</key>
+                  <integer>1</integer>
+                </dict>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>harddisk</string>
+                <key>description</key>
+                <string>Hard Disk</string>
+                <key>default</key>
+                <false/>
+                <key>media</key>
+                <dict>
+                  <key>hard</key>
+                  <integer>1</integer>
+                </dict>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>tape</string>
+                <key>description</key>
+                <string>SCSI tape</string>
+                <key>default</key>
+                <false/>
+              </dict>
+            </array>
+          </dict>
+          <dict>
+            <key>name</key>
+            <string>scsi:5</string>
+            <key>options</key>
+            <array>
+              <dict>
+                <key>value</key>
+                <string></string>
+                <key>description</key>
+                <string>—None—</string>
+                <key>default</key>
+                <true/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>aplcdsc</string>
+                <key>description</key>
+                <string>Apple SCSI CD-ROM</string>
+                <key>default</key>
+                <false/>
+                <key>media</key>
+                <dict>
+                  <key>cdrom</key>
+                  <integer>1</integer>
+                </dict>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>cdrom</string>
+                <key>description</key>
+                <string>CD-ROM</string>
+                <key>default</key>
+                <false/>
+                <key>media</key>
+                <dict>
+                  <key>cdrom</key>
+                  <integer>1</integer>
+                </dict>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>harddisk</string>
+                <key>description</key>
+                <string>Hard Disk</string>
+                <key>default</key>
+                <false/>
+                <key>media</key>
+                <dict>
+                  <key>hard</key>
+                  <integer>1</integer>
+                </dict>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>tape</string>
+                <key>description</key>
+                <string>SCSI tape</string>
+                <key>default</key>
+                <false/>
+              </dict>
+            </array>
+          </dict>
+          <dict>
+            <key>name</key>
+            <string>scsi:6</string>
+            <key>options</key>
+            <array>
+              <dict>
+                <key>value</key>
+                <string></string>
+                <key>description</key>
+                <string>—None—</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>aplcdsc</string>
+                <key>description</key>
+                <string>Apple SCSI CD-ROM</string>
+                <key>default</key>
+                <false/>
+                <key>media</key>
+                <dict>
+                  <key>cdrom</key>
+                  <integer>1</integer>
+                </dict>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>cdrom</string>
+                <key>description</key>
+                <string>CD-ROM</string>
+                <key>default</key>
+                <false/>
+                <key>media</key>
+                <dict>
+                  <key>cdrom</key>
+                  <integer>1</integer>
+                </dict>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>harddisk</string>
+                <key>description</key>
+                <string>Hard Disk</string>
+                <key>default</key>
+                <true/>
+                <key>media</key>
+                <dict>
+                  <key>hard</key>
+                  <integer>1</integer>
+                </dict>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>tape</string>
+                <key>description</key>
+                <string>SCSI tape</string>
+                <key>default</key>
+                <false/>
+              </dict>
+            </array>
+          </dict>
+        </array>
+      </dict>
+      <dict>
+        <key>name</key>
+        <string>rs232_patch_box</string>
+        <key>slots</key>
+        <array>
+          <dict>
+            <key>name</key>
+            <string>:dce</string>
+            <key>options</key>
+            <array>
+              <dict>
+                <key>value</key>
+                <string></string>
+                <key>description</key>
+                <string>—None—</string>
+                <key>default</key>
+                <true/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>ie15</string>
+                <key>description</key>
+                <string>IE15 Terminal</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>pty</string>
+                <key>description</key>
+                <string>Pseudo terminal</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>rs_printer</string>
+                <key>description</key>
+                <string>Radio Shack Serial Printer</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>patch</string>
+                <key>description</key>
+                <string>RS-232 Patch Box</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>loopback</string>
+                <key>description</key>
+                <string>RS232 Loopback</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>dec_loopback</string>
+                <key>description</key>
+                <string>RS232 Loopback (DEC 12-15336-00)</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>null_modem</string>
+                <key>description</key>
+                <string>RS232 Null Modem</string>
+                <key>default</key>
+                <false/>
+                <key>media</key>
+                <dict>
+                  <key>bitbanger</key>
+                  <integer>1</integer>
+                </dict>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>rs232_sync_io</string>
+                <key>description</key>
+                <string>RS232 Synchronous I/O</string>
+                <key>default</key>
+                <false/>
+                <key>media</key>
+                <dict>
+                  <key>bitbanger</key>
+                  <integer>1</integer>
+                </dict>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>keyboard</string>
+                <key>description</key>
+                <string>Serial Keyboard</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>printer</string>
+                <key>description</key>
+                <string>Serial Printer</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>terminal</string>
+                <key>description</key>
+                <string>Serial Terminal</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>sunkbd</string>
+                <key>description</key>
+                <string>Sun Keyboard Adaptor</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>mockingboard</string>
+                <key>description</key>
+                <string>Sweet Micro Systems Mockingboard D</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>swtpc8212</string>
+                <key>description</key>
+                <string>SWTPC8212 Terminal</string>
+                <key>default</key>
+                <false/>
+              </dict>
+            </array>
+          </dict>
+        </array>
+      </dict>
+      <dict>
+        <key>name</key>
+        <string>sunkbd_adaptor</string>
+        <key>slots</key>
+        <array>
+          <dict>
+            <key>name</key>
+            <string>:keyboard</string>
+            <key>options</key>
+            <array>
+              <dict>
+                <key>value</key>
+                <string></string>
+                <key>description</key>
+                <string>—None—</string>
+                <key>default</key>
+                <true/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>type3hle</string>
+                <key>description</key>
+                <string>Sun Type 3 Keyboard (HLE)</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>type4hle</string>
+                <key>description</key>
+                <string>Sun Type 4 Keyboard (HLE)</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>type5gbhle</string>
+                <key>description</key>
+                <string>Sun Type 5 Keyboard (Great Britain - HLE)</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>type5jphle</string>
+                <key>description</key>
+                <string>Sun Type 5 Keyboard (Japan - HLE)</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>type5sehle</string>
+                <key>description</key>
+                <string>Sun Type 5 Keyboard (Sweden - HLE)</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>type5hle</string>
+                <key>description</key>
+                <string>Sun Type 5 Keyboard (U.S.A. - HLE)</string>
+                <key>default</key>
+                <false/>
+              </dict>
+            </array>
+          </dict>
+        </array>
+      </dict>
+    </array>
+    <key>software</key>
+    <array>
+      <string>mac_hdd.xml</string>
+      <dict>
+        <key>name</key>
+        <string>mac_cdrom.xml</string>
+        <key>filter</key>
+        <string>MC68030</string>
+      </dict>
+      <string>mac_hdflop.xml</string>
+    </array>
+  </dict>
+</plist>
@@ -8,6 +8,8 @@
    <string>Macintosh Classic II</string>
    <key>media</key>
    <dict>
+      <key>cdrom</key>
+      <integer>1</integer>
    </dict>
    <key>resolution</key>
    <array>
@@ -23,16 +25,6 @@
        <string>RAM</string>
        <key>options</key>
        <array>
-          <dict>
-            <key>intValue</key>
-            <integer>2097152</integer>
-            <key>description</key>
-            <string>2M</string>
-            <key>value</key>
-            <string>2M</string>
-            <key>default</key>
-            <false/>
-          </dict>
          <dict>
            <key>intValue</key>
            <integer>4194304</integer>
@@ -41,7 +33,7 @@
            <key>value</key>
            <string>4M</string>
            <key>default</key>
-            <false/>
+            <true/>
          </dict>
          <dict>
            <key>intValue</key>
@@ -71,7 +63,7 @@
            <key>value</key>
            <string>10M</string>
            <key>default</key>
-            <true/>
+            <false/>
          </dict>
        </array>
      </dict>
@@ -94,6 +86,284 @@
          </dict>
        </array>
      </dict>
+      <dict>
+        <key>name</key>
+        <string>printer</string>
+        <key>description</key>
+        <string>Printer</string>
+        <key>options</key>
+        <array>
+          <dict>
+            <key>value</key>
+            <string></string>
+            <key>description</key>
+            <string>—None—</string>
+            <key>default</key>
+            <true/>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>ie15</string>
+            <key>description</key>
+            <string>IE15 Terminal</string>
+            <key>devname</key>
+            <string>ie15_terminal</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>pty</string>
+            <key>description</key>
+            <string>Pseudo terminal</string>
+            <key>devname</key>
+            <string>pseudo_terminal</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>rs_printer</string>
+            <key>description</key>
+            <string>Radio Shack Serial Printer</string>
+            <key>devname</key>
+            <string>rs_serial_printer</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>patch</string>
+            <key>description</key>
+            <string>RS-232 Patch Box</string>
+            <key>devname</key>
+            <string>rs232_patch_box</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>loopback</string>
+            <key>description</key>
+            <string>RS232 Loopback</string>
+            <key>devname</key>
+            <string>rs232_loopback</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>dec_loopback</string>
+            <key>description</key>
+            <string>RS232 Loopback (DEC 12-15336-00)</string>
+            <key>devname</key>
+            <string>dec_rs232_loopback</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>null_modem</string>
+            <key>description</key>
+            <string>RS232 Null Modem</string>
+            <key>devname</key>
+            <string>null_modem</string>
+            <key>media</key>
+            <dict>
+              <key>bitbanger</key>
+              <integer>1</integer>
+            </dict>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>rs232_sync_io</string>
+            <key>description</key>
+            <string>RS232 Synchronous I/O</string>
+            <key>devname</key>
+            <string>rs232_sync_io</string>
+            <key>media</key>
+            <dict>
+              <key>bitbanger</key>
+              <integer>1</integer>
+            </dict>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>keyboard</string>
+            <key>description</key>
+            <string>Serial Keyboard</string>
+            <key>devname</key>
+            <string>serial_keyboard</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>printer</string>
+            <key>description</key>
+            <string>Serial Printer</string>
+            <key>devname</key>
+            <string>serial_printer</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>terminal</string>
+            <key>description</key>
+            <string>Serial Terminal</string>
+            <key>devname</key>
+            <string>serial_terminal</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>sunkbd</string>
+            <key>description</key>
+            <string>Sun Keyboard Adaptor</string>
+            <key>devname</key>
+            <string>sunkbd_adaptor</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>mockingboard</string>
+            <key>description</key>
+            <string>Sweet Micro Systems Mockingboard D</string>
+            <key>devname</key>
+            <string>mockingboardd</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>swtpc8212</string>
+            <key>description</key>
+            <string>SWTPC8212 Terminal</string>
+            <key>devname</key>
+            <string>swtpc8212_terminal</string>
+          </dict>
+        </array>
+      </dict>
+      <dict>
+        <key>name</key>
+        <string>modem</string>
+        <key>description</key>
+        <string>Modem</string>
+        <key>options</key>
+        <array>
+          <dict>
+            <key>value</key>
+            <string></string>
+            <key>description</key>
+            <string>—None—</string>
+            <key>default</key>
+            <true/>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>ie15</string>
+            <key>description</key>
+            <string>IE15 Terminal</string>
+            <key>devname</key>
+            <string>ie15_terminal</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>pty</string>
+            <key>description</key>
+            <string>Pseudo terminal</string>
+            <key>devname</key>
+            <string>pseudo_terminal</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>rs_printer</string>
+            <key>description</key>
+            <string>Radio Shack Serial Printer</string>
+            <key>devname</key>
+            <string>rs_serial_printer</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>patch</string>
+            <key>description</key>
+            <string>RS-232 Patch Box</string>
+            <key>devname</key>
+            <string>rs232_patch_box</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>loopback</string>
+            <key>description</key>
+            <string>RS232 Loopback</string>
+            <key>devname</key>
+            <string>rs232_loopback</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>dec_loopback</string>
+            <key>description</key>
+            <string>RS232 Loopback (DEC 12-15336-00)</string>
+            <key>devname</key>
+            <string>dec_rs232_loopback</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>null_modem</string>
+            <key>description</key>
+            <string>RS232 Null Modem</string>
+            <key>devname</key>
+            <string>null_modem</string>
+            <key>media</key>
+            <dict>
+              <key>bitbanger</key>
+              <integer>1</integer>
+            </dict>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>rs232_sync_io</string>
+            <key>description</key>
+            <string>RS232 Synchronous I/O</string>
+            <key>devname</key>
+            <string>rs232_sync_io</string>
+            <key>media</key>
+            <dict>
+              <key>bitbanger</key>
+              <integer>1</integer>
+            </dict>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>keyboard</string>
+            <key>description</key>
+            <string>Serial Keyboard</string>
+            <key>devname</key>
+            <string>serial_keyboard</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>printer</string>
+            <key>description</key>
+            <string>Serial Printer</string>
+            <key>devname</key>
+            <string>serial_printer</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>terminal</string>
+            <key>description</key>
+            <string>Serial Terminal</string>
+            <key>devname</key>
+            <string>serial_terminal</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>sunkbd</string>
+            <key>description</key>
+            <string>Sun Keyboard Adaptor</string>
+            <key>devname</key>
+            <string>sunkbd_adaptor</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>mockingboard</string>
+            <key>description</key>
+            <string>Sweet Micro Systems Mockingboard D</string>
+            <key>devname</key>
+            <string>mockingboardd</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>swtpc8212</string>
+            <key>description</key>
+            <string>SWTPC8212 Terminal</string>
+            <key>devname</key>
+            <string>swtpc8212_terminal</string>
+          </dict>
+        </array>
+      </dict>
    </array>
    <key>devices</key>
    <array>
@@ -223,6 +493,19 @@
                <key>default</key>
                <true/>
              </dict>
+              <dict>
+                <key>value</key>
+                <string>aplcdsc</string>
+                <key>description</key>
+                <string>Apple SCSI CD-ROM</string>
+                <key>default</key>
+                <false/>
+                <key>media</key>
+                <dict>
+                  <key>cdrom</key>
+                  <integer>1</integer>
+                </dict>
+              </dict>
              <dict>
                <key>value</key>
                <string>cdrom</string>
@@ -249,6 +532,14 @@
                  <integer>1</integer>
                </dict>
              </dict>
+              <dict>
+                <key>value</key>
+                <string>tape</string>
+                <key>description</key>
+                <string>SCSI tape</string>
+                <key>default</key>
+                <false/>
+              </dict>
            </array>
          </dict>
          <dict>
@@ -264,6 +555,19 @@
                <key>default</key>
                <true/>
              </dict>
+              <dict>
+                <key>value</key>
+                <string>aplcdsc</string>
+                <key>description</key>
+                <string>Apple SCSI CD-ROM</string>
+                <key>default</key>
+                <false/>
+                <key>media</key>
+                <dict>
+                  <key>cdrom</key>
+                  <integer>1</integer>
+                </dict>
+              </dict>
              <dict>
                <key>value</key>
                <string>cdrom</string>
@@ -290,6 +594,14 @@
                  <integer>1</integer>
                </dict>
              </dict>
+              <dict>
+                <key>value</key>
+                <string>tape</string>
+                <key>description</key>
+                <string>SCSI tape</string>
+                <key>default</key>
+                <false/>
+              </dict>
            </array>
          </dict>
          <dict>
@@ -307,9 +619,9 @@
              </dict>
              <dict>
                <key>value</key>
-                <string>cdrom</string>
+                <string>aplcdsc</string>
                <key>description</key>
-                <string>CD-ROM</string>
+                <string>Apple SCSI CD-ROM</string>
                <key>default</key>
                <false/>
                <key>media</key>
@@ -318,34 +630,6 @@
                  <integer>1</integer>
                </dict>
              </dict>
-              <dict>
-                <key>value</key>
-                <string>harddisk</string>
-                <key>description</key>
-                <string>Hard Disk</string>
-                <key>default</key>
-                <false/>
-                <key>media</key>
-                <dict>
-                  <key>hard</key>
-                  <integer>1</integer>
-                </dict>
-              </dict>
-            </array>
-          </dict>
-          <dict>
-            <key>name</key>
-            <string>scsi:3</string>
-            <key>options</key>
-            <array>
-              <dict>
-                <key>value</key>
-                <string></string>
-                <key>description</key>
-                <string>—None—</string>
-                <key>default</key>
-                <true/>
-              </dict>
              <dict>
                <key>value</key>
                <string>cdrom</string>
@@ -372,6 +656,14 @@
                  <integer>1</integer>
                </dict>
              </dict>
+              <dict>
+                <key>value</key>
+                <string>tape</string>
+                <key>description</key>
+                <string>SCSI tape</string>
+                <key>default</key>
+                <false/>
+              </dict>
            </array>
          </dict>
          <dict>
@@ -385,7 +677,20 @@
                <key>description</key>
                <string>—None—</string>
                <key>default</key>
+                <true/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>aplcdsc</string>
+                <key>description</key>
+                <string>Apple SCSI CD-ROM</string>
+                <key>default</key>
                <false/>
+                <key>media</key>
+                <dict>
+                  <key>cdrom</key>
+                  <integer>1</integer>
+                </dict>
              </dict>
              <dict>
                <key>value</key>
@@ -393,7 +698,7 @@
                <key>description</key>
                <string>CD-ROM</string>
                <key>default</key>
-                <true/>
+                <false/>
                <key>media</key>
                <dict>
                  <key>cdrom</key>
@@ -413,6 +718,14 @@
                  <integer>1</integer>
                </dict>
              </dict>
+              <dict>
+                <key>value</key>
+                <string>tape</string>
+                <key>description</key>
+                <string>SCSI tape</string>
+                <key>default</key>
+                <false/>
+              </dict>
            </array>
          </dict>
          <dict>
@@ -428,6 +741,19 @@
                <key>default</key>
                <true/>
              </dict>
+              <dict>
+                <key>value</key>
+                <string>aplcdsc</string>
+                <key>description</key>
+                <string>Apple SCSI CD-ROM</string>
+                <key>default</key>
+                <false/>
+                <key>media</key>
+                <dict>
+                  <key>cdrom</key>
+                  <integer>1</integer>
+                </dict>
+              </dict>
              <dict>
                <key>value</key>
                <string>cdrom</string>
@@ -454,6 +780,14 @@
                  <integer>1</integer>
                </dict>
              </dict>
+              <dict>
+                <key>value</key>
+                <string>tape</string>
+                <key>description</key>
+                <string>SCSI tape</string>
+                <key>default</key>
+                <false/>
+              </dict>
            </array>
          </dict>
          <dict>
@@ -469,6 +803,19 @@
                <key>default</key>
                <false/>
              </dict>
+              <dict>
+                <key>value</key>
+                <string>aplcdsc</string>
+                <key>description</key>
+                <string>Apple SCSI CD-ROM</string>
+                <key>default</key>
+                <false/>
+                <key>media</key>
+                <dict>
+                  <key>cdrom</key>
+                  <integer>1</integer>
+                </dict>
+              </dict>
              <dict>
                <key>value</key>
                <string>cdrom</string>
@@ -495,6 +842,228 @@
                  <integer>1</integer>
                </dict>
              </dict>
+              <dict>
+                <key>value</key>
+                <string>tape</string>
+                <key>description</key>
+                <string>SCSI tape</string>
+                <key>default</key>
+                <false/>
+              </dict>
+            </array>
+          </dict>
+        </array>
+      </dict>
+      <dict>
+        <key>name</key>
+        <string>rs232_patch_box</string>
+        <key>slots</key>
+        <array>
+          <dict>
+            <key>name</key>
+            <string>:dce</string>
+            <key>options</key>
+            <array>
+              <dict>
+                <key>value</key>
+                <string></string>
+                <key>description</key>
+                <string>—None—</string>
+                <key>default</key>
+                <true/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>ie15</string>
+                <key>description</key>
+                <string>IE15 Terminal</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>pty</string>
+                <key>description</key>
+                <string>Pseudo terminal</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>rs_printer</string>
+                <key>description</key>
+                <string>Radio Shack Serial Printer</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>patch</string>
+                <key>description</key>
+                <string>RS-232 Patch Box</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>loopback</string>
+                <key>description</key>
+                <string>RS232 Loopback</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>dec_loopback</string>
+                <key>description</key>
+                <string>RS232 Loopback (DEC 12-15336-00)</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>null_modem</string>
+                <key>description</key>
+                <string>RS232 Null Modem</string>
+                <key>default</key>
+                <false/>
+                <key>media</key>
+                <dict>
+                  <key>bitbanger</key>
+                  <integer>1</integer>
+                </dict>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>rs232_sync_io</string>
+                <key>description</key>
+                <string>RS232 Synchronous I/O</string>
+                <key>default</key>
+                <false/>
+                <key>media</key>
+                <dict>
+                  <key>bitbanger</key>
+                  <integer>1</integer>
+                </dict>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>keyboard</string>
+                <key>description</key>
+                <string>Serial Keyboard</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>printer</string>
+                <key>description</key>
+                <string>Serial Printer</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>terminal</string>
+                <key>description</key>
+                <string>Serial Terminal</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>sunkbd</string>
+                <key>description</key>
+                <string>Sun Keyboard Adaptor</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>mockingboard</string>
+                <key>description</key>
+                <string>Sweet Micro Systems Mockingboard D</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>swtpc8212</string>
+                <key>description</key>
+                <string>SWTPC8212 Terminal</string>
+                <key>default</key>
+                <false/>
+              </dict>
+            </array>
+          </dict>
+        </array>
+      </dict>
+      <dict>
+        <key>name</key>
+        <string>sunkbd_adaptor</string>
+        <key>slots</key>
+        <array>
+          <dict>
+            <key>name</key>
+            <string>:keyboard</string>
+            <key>options</key>
+            <array>
+              <dict>
+                <key>value</key>
+                <string></string>
+                <key>description</key>
+                <string>—None—</string>
+                <key>default</key>
+                <true/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>type3hle</string>
+                <key>description</key>
+                <string>Sun Type 3 Keyboard (HLE)</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>type4hle</string>
+                <key>description</key>
+                <string>Sun Type 4 Keyboard (HLE)</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>type5gbhle</string>
+                <key>description</key>
+                <string>Sun Type 5 Keyboard (Great Britain - HLE)</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>type5jphle</string>
+                <key>description</key>
+                <string>Sun Type 5 Keyboard (Japan - HLE)</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>type5sehle</string>
+                <key>description</key>
+                <string>Sun Type 5 Keyboard (Sweden - HLE)</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>type5hle</string>
+                <key>description</key>
+                <string>Sun Type 5 Keyboard (U.S.A. - HLE)</string>
+                <key>default</key>
+                <false/>
+              </dict>
            </array>
          </dict>
        </array>
@@ -503,7 +1072,13 @@
    <key>software</key>
    <array>
      <string>mac_hdd.xml</string>
-      <string>mac_flop.xml</string>
+      <dict>
+        <key>name</key>
+        <string>mac_cdrom.xml</string>
+        <key>filter</key>
+        <string>MC68030</string>
+      </dict>
+      <string>mac_hdflop.xml</string>
    </array>
  </dict>
 </plist>
@@ -8,6 +8,8 @@
    <string>Macintosh Classic</string>
    <key>media</key>
    <dict>
+      <key>cdrom</key>
+      <integer>1</integer>
    </dict>
    <key>resolution</key>
    <array>
@@ -203,6 +205,19 @@
                <key>default</key>
                <true/>
              </dict>
+              <dict>
+                <key>value</key>
+                <string>aplcdsc</string>
+                <key>description</key>
+                <string>Apple SCSI CD-ROM</string>
+                <key>default</key>
+                <false/>
+                <key>media</key>
+                <dict>
+                  <key>cdrom</key>
+                  <integer>1</integer>
+                </dict>
+              </dict>
              <dict>
                <key>value</key>
                <string>cdrom</string>
@@ -229,6 +244,14 @@
                  <integer>1</integer>
                </dict>
              </dict>
+              <dict>
+                <key>value</key>
+                <string>tape</string>
+                <key>description</key>
+                <string>SCSI tape</string>
+                <key>default</key>
+                <false/>
+              </dict>
            </array>
          </dict>
          <dict>
@@ -244,6 +267,19 @@
                <key>default</key>
                <true/>
              </dict>
+              <dict>
+                <key>value</key>
+                <string>aplcdsc</string>
+                <key>description</key>
+                <string>Apple SCSI CD-ROM</string>
+                <key>default</key>
+                <false/>
+                <key>media</key>
+                <dict>
+                  <key>cdrom</key>
+                  <integer>1</integer>
+                </dict>
+              </dict>
              <dict>
                <key>value</key>
                <string>cdrom</string>
@@ -270,6 +306,14 @@
                  <integer>1</integer>
                </dict>
              </dict>
+              <dict>
+                <key>value</key>
+                <string>tape</string>
+                <key>description</key>
+                <string>SCSI tape</string>
+                <key>default</key>
+                <false/>
+              </dict>
            </array>
          </dict>
          <dict>
@@ -287,9 +331,9 @@
              </dict>
              <dict>
                <key>value</key>
-                <string>cdrom</string>
+                <string>aplcdsc</string>
                <key>description</key>
-                <string>CD-ROM</string>
+                <string>Apple SCSI CD-ROM</string>
                <key>default</key>
                <false/>
                <key>media</key>
@@ -298,34 +342,6 @@
                  <integer>1</integer>
                </dict>
              </dict>
-              <dict>
-                <key>value</key>
-                <string>harddisk</string>
-                <key>description</key>
-                <string>Hard Disk</string>
-                <key>default</key>
-                <false/>
-                <key>media</key>
-                <dict>
-                  <key>hard</key>
-                  <integer>1</integer>
-                </dict>
-              </dict>
-            </array>
-          </dict>
-          <dict>
-            <key>name</key>
-            <string>scsibus:3</string>
-            <key>options</key>
-            <array>
-              <dict>
-                <key>value</key>
-                <string></string>
-                <key>description</key>
-                <string>—None—</string>
-                <key>default</key>
-                <true/>
-              </dict>
              <dict>
                <key>value</key>
                <string>cdrom</string>
@@ -352,6 +368,14 @@
                  <integer>1</integer>
                </dict>
              </dict>
+              <dict>
+                <key>value</key>
+                <string>tape</string>
+                <key>description</key>
+                <string>SCSI tape</string>
+                <key>default</key>
+                <false/>
+              </dict>
            </array>
          </dict>
          <dict>
@@ -367,6 +391,19 @@
                <key>default</key>
                <true/>
              </dict>
+              <dict>
+                <key>value</key>
+                <string>aplcdsc</string>
+                <key>description</key>
+                <string>Apple SCSI CD-ROM</string>
+                <key>default</key>
+                <false/>
+                <key>media</key>
+                <dict>
+                  <key>cdrom</key>
+                  <integer>1</integer>
+                </dict>
+              </dict>
              <dict>
                <key>value</key>
                <string>cdrom</string>
@@ -393,6 +430,14 @@
                  <integer>1</integer>
                </dict>
              </dict>
+              <dict>
+                <key>value</key>
+                <string>tape</string>
+                <key>description</key>
+                <string>SCSI tape</string>
+                <key>default</key>
+                <false/>
+              </dict>
            </array>
          </dict>
          <dict>
@@ -408,6 +453,19 @@
                <key>default</key>
                <true/>
              </dict>
+              <dict>
+                <key>value</key>
+                <string>aplcdsc</string>
+                <key>description</key>
+                <string>Apple SCSI CD-ROM</string>
+                <key>default</key>
+                <false/>
+                <key>media</key>
+                <dict>
+                  <key>cdrom</key>
+                  <integer>1</integer>
+                </dict>
+              </dict>
              <dict>
                <key>value</key>
                <string>cdrom</string>
@@ -434,6 +492,14 @@
                  <integer>1</integer>
                </dict>
              </dict>
+              <dict>
+                <key>value</key>
+                <string>tape</string>
+                <key>description</key>
+                <string>SCSI tape</string>
+                <key>default</key>
+                <false/>
+              </dict>
            </array>
          </dict>
          <dict>
@@ -449,6 +515,19 @@
                <key>default</key>
                <false/>
              </dict>
+              <dict>
+                <key>value</key>
+                <string>aplcdsc</string>
+                <key>description</key>
+                <string>Apple SCSI CD-ROM</string>
+                <key>default</key>
+                <false/>
+                <key>media</key>
+                <dict>
+                  <key>cdrom</key>
+                  <integer>1</integer>
+                </dict>
+              </dict>
              <dict>
                <key>value</key>
                <string>cdrom</string>
@@ -475,6 +554,14 @@
                  <integer>1</integer>
                </dict>
              </dict>
+              <dict>
+                <key>value</key>
+                <string>tape</string>
+                <key>description</key>
+                <string>SCSI tape</string>
+                <key>default</key>
+                <false/>
+              </dict>
            </array>
          </dict>
        </array>
@@ -482,8 +569,17 @@
    </array>
    <key>software</key>
    <array>
+      <string>mac_flop_orig.xml</string>
+      <string>mac_flop_clcracked.xml</string>
      <string>mac_flop.xml</string>
      <string>mac_hdd.xml</string>
+      <dict>
+        <key>name</key>
+        <string>mac_cdrom.xml</string>
+        <key>filter</key>
+        <string>MC68000</string>
+      </dict>
+      <string>mac_hdflop.xml</string>
    </array>
  </dict>
 </plist>
@@ -8,6 +8,8 @@
    <string>Macintosh IIci</string>
    <key>media</key>
    <dict>
+      <key>cdrom</key>
+      <integer>1</integer>
    </dict>
    <key>resolution</key>
    <array>
@@ -124,6 +126,284 @@
          </dict>
        </array>
      </dict>
+      <dict>
+        <key>name</key>
+        <string>printer</string>
+        <key>description</key>
+        <string>Printer</string>
+        <key>options</key>
+        <array>
+          <dict>
+            <key>value</key>
+            <string></string>
+            <key>description</key>
+            <string>—None—</string>
+            <key>default</key>
+            <true/>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>ie15</string>
+            <key>description</key>
+            <string>IE15 Terminal</string>
+            <key>devname</key>
+            <string>ie15_terminal</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>pty</string>
+            <key>description</key>
+            <string>Pseudo terminal</string>
+            <key>devname</key>
+            <string>pseudo_terminal</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>rs_printer</string>
+            <key>description</key>
+            <string>Radio Shack Serial Printer</string>
+            <key>devname</key>
+            <string>rs_serial_printer</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>patch</string>
+            <key>description</key>
+            <string>RS-232 Patch Box</string>
+            <key>devname</key>
+            <string>rs232_patch_box</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>loopback</string>
+            <key>description</key>
+            <string>RS232 Loopback</string>
+            <key>devname</key>
+            <string>rs232_loopback</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>dec_loopback</string>
+            <key>description</key>
+            <string>RS232 Loopback (DEC 12-15336-00)</string>
+            <key>devname</key>
+            <string>dec_rs232_loopback</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>null_modem</string>
+            <key>description</key>
+            <string>RS232 Null Modem</string>
+            <key>devname</key>
+            <string>null_modem</string>
+            <key>media</key>
+            <dict>
+              <key>bitbanger</key>
+              <integer>1</integer>
+            </dict>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>rs232_sync_io</string>
+            <key>description</key>
+            <string>RS232 Synchronous I/O</string>
+            <key>devname</key>
+            <string>rs232_sync_io</string>
+            <key>media</key>
+            <dict>
+              <key>bitbanger</key>
+              <integer>1</integer>
+            </dict>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>keyboard</string>
+            <key>description</key>
+            <string>Serial Keyboard</string>
+            <key>devname</key>
+            <string>serial_keyboard</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>printer</string>
+            <key>description</key>
+            <string>Serial Printer</string>
+            <key>devname</key>
+            <string>serial_printer</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>terminal</string>
+            <key>description</key>
+            <string>Serial Terminal</string>
+            <key>devname</key>
+            <string>serial_terminal</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>sunkbd</string>
+            <key>description</key>
+            <string>Sun Keyboard Adaptor</string>
+            <key>devname</key>
+            <string>sunkbd_adaptor</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>mockingboard</string>
+            <key>description</key>
+            <string>Sweet Micro Systems Mockingboard D</string>
+            <key>devname</key>
+            <string>mockingboardd</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>swtpc8212</string>
+            <key>description</key>
+            <string>SWTPC8212 Terminal</string>
+            <key>devname</key>
+            <string>swtpc8212_terminal</string>
+          </dict>
+        </array>
+      </dict>
+      <dict>
+        <key>name</key>
+        <string>modem</string>
+        <key>description</key>
+        <string>Modem</string>
+        <key>options</key>
+        <array>
+          <dict>
+            <key>value</key>
+            <string></string>
+            <key>description</key>
+            <string>—None—</string>
+            <key>default</key>
+            <true/>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>ie15</string>
+            <key>description</key>
+            <string>IE15 Terminal</string>
+            <key>devname</key>
+            <string>ie15_terminal</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>pty</string>
+            <key>description</key>
+            <string>Pseudo terminal</string>
+            <key>devname</key>
+            <string>pseudo_terminal</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>rs_printer</string>
+            <key>description</key>
+            <string>Radio Shack Serial Printer</string>
+            <key>devname</key>
+            <string>rs_serial_printer</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>patch</string>
+            <key>description</key>
+            <string>RS-232 Patch Box</string>
+            <key>devname</key>
+            <string>rs232_patch_box</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>loopback</string>
+            <key>description</key>
+            <string>RS232 Loopback</string>
+            <key>devname</key>
+            <string>rs232_loopback</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>dec_loopback</string>
+            <key>description</key>
+            <string>RS232 Loopback (DEC 12-15336-00)</string>
+            <key>devname</key>
+            <string>dec_rs232_loopback</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>null_modem</string>
+            <key>description</key>
+            <string>RS232 Null Modem</string>
+            <key>devname</key>
+            <string>null_modem</string>
+            <key>media</key>
+            <dict>
+              <key>bitbanger</key>
+              <integer>1</integer>
+            </dict>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>rs232_sync_io</string>
+            <key>description</key>
+            <string>RS232 Synchronous I/O</string>
+            <key>devname</key>
+            <string>rs232_sync_io</string>
+            <key>media</key>
+            <dict>
+              <key>bitbanger</key>
+              <integer>1</integer>
+            </dict>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>keyboard</string>
+            <key>description</key>
+            <string>Serial Keyboard</string>
+            <key>devname</key>
+            <string>serial_keyboard</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>printer</string>
+            <key>description</key>
+            <string>Serial Printer</string>
+            <key>devname</key>
+            <string>serial_printer</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>terminal</string>
+            <key>description</key>
+            <string>Serial Terminal</string>
+            <key>devname</key>
+            <string>serial_terminal</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>sunkbd</string>
+            <key>description</key>
+            <string>Sun Keyboard Adaptor</string>
+            <key>devname</key>
+            <string>sunkbd_adaptor</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>mockingboard</string>
+            <key>description</key>
+            <string>Sweet Micro Systems Mockingboard D</string>
+            <key>devname</key>
+            <string>mockingboardd</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>swtpc8212</string>
+            <key>description</key>
+            <string>SWTPC8212 Terminal</string>
+            <key>devname</key>
+            <string>swtpc8212_terminal</string>
+          </dict>
+        </array>
+      </dict>
      <dict>
        <key>name</key>
        <string>nbc</string>
@@ -141,19 +421,35 @@
          </dict>
          <dict>
            <key>value</key>
-            <string>48gc</string>
+            <string>mdc48</string>
            <key>description</key>
-            <string>Apple 4*8 video card</string>
+            <string>Apple Macintosh Display Card 4/8 (MDC 1.0.1)</string>
            <key>devname</key>
-            <string>nb_48gc</string>
+            <string>nb_mdc48</string>
          </dict>
          <dict>
            <key>value</key>
-            <string>824gc</string>
+            <string>mdc824</string>
            <key>description</key>
-            <string>Apple 8*24 video card</string>
+            <string>Apple Macintosh Display Card 8/24 (MDC 1.2)</string>
            <key>devname</key>
-            <string>nb_824gc</string>
+            <string>nb_mdc824</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>m2hires</string>
+            <key>description</key>
+            <string>Apple Macintosh II High Resolution Video Card</string>
+            <key>devname</key>
+            <string>nb_m2hr</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>m2video</string>
+            <key>description</key>
+            <string>Apple Macintosh II Video Card</string>
+            <key>devname</key>
+            <string>nb_m2vc</string>
          </dict>
          <dict>
            <key>value</key>
@@ -187,14 +483,6 @@
            <key>devname</key>
            <string>nb_btbug</string>
          </dict>
-          <dict>
-            <key>value</key>
-            <string>m2hires</string>
-            <key>description</key>
-            <string>Macintosh II Hi-Resolution video card</string>
-            <key>devname</key>
-            <string>nb_m2hr</string>
-          </dict>
          <dict>
            <key>value</key>
            <string>portrait</string>
@@ -203,14 +491,6 @@
            <key>devname</key>
            <string>nb_wspt</string>
          </dict>
-          <dict>
-            <key>value</key>
-            <string>m2video</string>
-            <key>description</key>
-            <string>Macintosh II Video Card</string>
-            <key>devname</key>
-            <string>nb_m2vc</string>
-          </dict>
          <dict>
            <key>value</key>
            <string>vikbw</string>
@@ -291,19 +571,35 @@
          </dict>
          <dict>
            <key>value</key>
-            <string>48gc</string>
+            <string>mdc48</string>
            <key>description</key>
-            <string>Apple 4*8 video card</string>
+            <string>Apple Macintosh Display Card 4/8 (MDC 1.0.1)</string>
            <key>devname</key>
-            <string>nb_48gc</string>
+            <string>nb_mdc48</string>
          </dict>
          <dict>
            <key>value</key>
-            <string>824gc</string>
+            <string>mdc824</string>
            <key>description</key>
-            <string>Apple 8*24 video card</string>
+            <string>Apple Macintosh Display Card 8/24 (MDC 1.2)</string>
            <key>devname</key>
-            <string>nb_824gc</string>
+            <string>nb_mdc824</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>m2hires</string>
+            <key>description</key>
+            <string>Apple Macintosh II High Resolution Video Card</string>
+            <key>devname</key>
+            <string>nb_m2hr</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>m2video</string>
+            <key>description</key>
+            <string>Apple Macintosh II Video Card</string>
+            <key>devname</key>
+            <string>nb_m2vc</string>
          </dict>
          <dict>
            <key>value</key>
@@ -337,14 +633,6 @@
            <key>devname</key>
            <string>nb_btbug</string>
          </dict>
-          <dict>
-            <key>value</key>
-            <string>m2hires</string>
-            <key>description</key>
-            <string>Macintosh II Hi-Resolution video card</string>
-            <key>devname</key>
-            <string>nb_m2hr</string>
-          </dict>
          <dict>
            <key>value</key>
            <string>portrait</string>
@@ -353,14 +641,6 @@
            <key>devname</key>
            <string>nb_wspt</string>
          </dict>
-          <dict>
-            <key>value</key>
-            <string>m2video</string>
-            <key>description</key>
-            <string>Macintosh II Video Card</string>
-            <key>devname</key>
-            <string>nb_m2vc</string>
-          </dict>
          <dict>
            <key>value</key>
            <string>vikbw</string>
@@ -441,19 +721,35 @@
          </dict>
          <dict>
            <key>value</key>
-            <string>48gc</string>
+            <string>mdc48</string>
            <key>description</key>
-            <string>Apple 4*8 video card</string>
+            <string>Apple Macintosh Display Card 4/8 (MDC 1.0.1)</string>
            <key>devname</key>
-            <string>nb_48gc</string>
+            <string>nb_mdc48</string>
          </dict>
          <dict>
            <key>value</key>
-            <string>824gc</string>
+            <string>mdc824</string>
            <key>description</key>
-            <string>Apple 8*24 video card</string>
+            <string>Apple Macintosh Display Card 8/24 (MDC 1.2)</string>
            <key>devname</key>
-            <string>nb_824gc</string>
+            <string>nb_mdc824</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>m2hires</string>
+            <key>description</key>
+            <string>Apple Macintosh II High Resolution Video Card</string>
+            <key>devname</key>
+            <string>nb_m2hr</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>m2video</string>
+            <key>description</key>
+            <string>Apple Macintosh II Video Card</string>
+            <key>devname</key>
+            <string>nb_m2vc</string>
          </dict>
          <dict>
            <key>value</key>
@@ -487,14 +783,6 @@
            <key>devname</key>
            <string>nb_btbug</string>
          </dict>
-          <dict>
-            <key>value</key>
-            <string>m2hires</string>
-            <key>description</key>
-            <string>Macintosh II Hi-Resolution video card</string>
-            <key>devname</key>
-            <string>nb_m2hr</string>
-          </dict>
          <dict>
            <key>value</key>
            <string>portrait</string>
@@ -503,14 +791,6 @@
            <key>devname</key>
            <string>nb_wspt</string>
          </dict>
-          <dict>
-            <key>value</key>
-            <string>m2video</string>
-            <key>description</key>
-            <string>Macintosh II Video Card</string>
-            <key>devname</key>
-            <string>nb_m2vc</string>
-          </dict>
          <dict>
            <key>value</key>
            <string>vikbw</string>
@@ -703,6 +983,19 @@
                <key>default</key>
                <true/>
              </dict>
+              <dict>
+                <key>value</key>
+                <string>aplcdsc</string>
+                <key>description</key>
+                <string>Apple SCSI CD-ROM</string>
+                <key>default</key>
+                <false/>
+                <key>media</key>
+                <dict>
+                  <key>cdrom</key>
+                  <integer>1</integer>
+                </dict>
+              </dict>
              <dict>
                <key>value</key>
                <string>cdrom</string>
@@ -729,6 +1022,14 @@
                  <integer>1</integer>
                </dict>
              </dict>
+              <dict>
+                <key>value</key>
+                <string>tape</string>
+                <key>description</key>
+                <string>SCSI tape</string>
+                <key>default</key>
+                <false/>
+              </dict>
            </array>
          </dict>
          <dict>
@@ -744,6 +1045,19 @@
                <key>default</key>
                <true/>
              </dict>
+              <dict>
+                <key>value</key>
+                <string>aplcdsc</string>
+                <key>description</key>
+                <string>Apple SCSI CD-ROM</string>
+                <key>default</key>
+                <false/>
+                <key>media</key>
+                <dict>
+                  <key>cdrom</key>
+                  <integer>1</integer>
+                </dict>
+              </dict>
              <dict>
                <key>value</key>
                <string>cdrom</string>
@@ -770,6 +1084,14 @@
                  <integer>1</integer>
                </dict>
              </dict>
+              <dict>
+                <key>value</key>
+                <string>tape</string>
+                <key>description</key>
+                <string>SCSI tape</string>
+                <key>default</key>
+                <false/>
+              </dict>
            </array>
          </dict>
          <dict>
@@ -787,9 +1109,9 @@
              </dict>
              <dict>
                <key>value</key>
-                <string>cdrom</string>
+                <string>aplcdsc</string>
                <key>description</key>
-                <string>CD-ROM</string>
+                <string>Apple SCSI CD-ROM</string>
                <key>default</key>
                <false/>
                <key>media</key>
@@ -798,34 +1120,6 @@
                  <integer>1</integer>
                </dict>
              </dict>
-              <dict>
-                <key>value</key>
-                <string>harddisk</string>
-                <key>description</key>
-                <string>Hard Disk</string>
-                <key>default</key>
-                <false/>
-                <key>media</key>
-                <dict>
-                  <key>hard</key>
-                  <integer>1</integer>
-                </dict>
-              </dict>
-            </array>
-          </dict>
-          <dict>
-            <key>name</key>
-            <string>scsi:3</string>
-            <key>options</key>
-            <array>
-              <dict>
-                <key>value</key>
-                <string></string>
-                <key>description</key>
-                <string>—None—</string>
-                <key>default</key>
-                <true/>
-              </dict>
              <dict>
                <key>value</key>
                <string>cdrom</string>
@@ -852,6 +1146,14 @@
                  <integer>1</integer>
                </dict>
              </dict>
+              <dict>
+                <key>value</key>
+                <string>tape</string>
+                <key>description</key>
+                <string>SCSI tape</string>
+                <key>default</key>
+                <false/>
+              </dict>
            </array>
          </dict>
          <dict>
@@ -865,7 +1167,20 @@
                <key>description</key>
                <string>—None—</string>
                <key>default</key>
+                <true/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>aplcdsc</string>
+                <key>description</key>
+                <string>Apple SCSI CD-ROM</string>
+                <key>default</key>
                <false/>
+                <key>media</key>
+                <dict>
+                  <key>cdrom</key>
+                  <integer>1</integer>
+                </dict>
              </dict>
              <dict>
                <key>value</key>
@@ -873,7 +1188,7 @@
                <key>description</key>
                <string>CD-ROM</string>
                <key>default</key>
-                <true/>
+                <false/>
                <key>media</key>
                <dict>
                  <key>cdrom</key>
@@ -893,6 +1208,14 @@
                  <integer>1</integer>
                </dict>
              </dict>
+              <dict>
+                <key>value</key>
+                <string>tape</string>
+                <key>description</key>
+                <string>SCSI tape</string>
+                <key>default</key>
+                <false/>
+              </dict>
            </array>
          </dict>
          <dict>
@@ -908,6 +1231,19 @@
                <key>default</key>
                <true/>
              </dict>
+              <dict>
+                <key>value</key>
+                <string>aplcdsc</string>
+                <key>description</key>
+                <string>Apple SCSI CD-ROM</string>
+                <key>default</key>
+                <false/>
+                <key>media</key>
+                <dict>
+                  <key>cdrom</key>
+                  <integer>1</integer>
+                </dict>
+              </dict>
              <dict>
                <key>value</key>
                <string>cdrom</string>
@@ -934,6 +1270,14 @@
                  <integer>1</integer>
                </dict>
              </dict>
+              <dict>
+                <key>value</key>
+                <string>tape</string>
+                <key>description</key>
+                <string>SCSI tape</string>
+                <key>default</key>
+                <false/>
+              </dict>
            </array>
          </dict>
          <dict>
@@ -949,6 +1293,19 @@
                <key>default</key>
                <false/>
              </dict>
+              <dict>
+                <key>value</key>
+                <string>aplcdsc</string>
+                <key>description</key>
+                <string>Apple SCSI CD-ROM</string>
+                <key>default</key>
+                <false/>
+                <key>media</key>
+                <dict>
+                  <key>cdrom</key>
+                  <integer>1</integer>
+                </dict>
+              </dict>
              <dict>
                <key>value</key>
                <string>cdrom</string>
@@ -975,6 +1332,14 @@
                  <integer>1</integer>
                </dict>
              </dict>
+              <dict>
+                <key>value</key>
+                <string>tape</string>
+                <key>description</key>
+                <string>SCSI tape</string>
+                <key>default</key>
+                <false/>
+              </dict>
            </array>
          </dict>
        </array>
@@ -1173,10 +1538,233 @@
          </dict>
        </array>
      </dict>
+      <dict>
+        <key>name</key>
+        <string>rs232_patch_box</string>
+        <key>slots</key>
+        <array>
+          <dict>
+            <key>name</key>
+            <string>:dce</string>
+            <key>options</key>
+            <array>
+              <dict>
+                <key>value</key>
+                <string></string>
+                <key>description</key>
+                <string>—None—</string>
+                <key>default</key>
+                <true/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>ie15</string>
+                <key>description</key>
+                <string>IE15 Terminal</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>pty</string>
+                <key>description</key>
+                <string>Pseudo terminal</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>rs_printer</string>
+                <key>description</key>
+                <string>Radio Shack Serial Printer</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>patch</string>
+                <key>description</key>
+                <string>RS-232 Patch Box</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>loopback</string>
+                <key>description</key>
+                <string>RS232 Loopback</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>dec_loopback</string>
+                <key>description</key>
+                <string>RS232 Loopback (DEC 12-15336-00)</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>null_modem</string>
+                <key>description</key>
+                <string>RS232 Null Modem</string>
+                <key>default</key>
+                <false/>
+                <key>media</key>
+                <dict>
+                  <key>bitbanger</key>
+                  <integer>1</integer>
+                </dict>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>rs232_sync_io</string>
+                <key>description</key>
+                <string>RS232 Synchronous I/O</string>
+                <key>default</key>
+                <false/>
+                <key>media</key>
+                <dict>
+                  <key>bitbanger</key>
+                  <integer>1</integer>
+                </dict>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>keyboard</string>
+                <key>description</key>
+                <string>Serial Keyboard</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>printer</string>
+                <key>description</key>
+                <string>Serial Printer</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>terminal</string>
+                <key>description</key>
+                <string>Serial Terminal</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>sunkbd</string>
+                <key>description</key>
+                <string>Sun Keyboard Adaptor</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>mockingboard</string>
+                <key>description</key>
+                <string>Sweet Micro Systems Mockingboard D</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>swtpc8212</string>
+                <key>description</key>
+                <string>SWTPC8212 Terminal</string>
+                <key>default</key>
+                <false/>
+              </dict>
+            </array>
+          </dict>
+        </array>
+      </dict>
+      <dict>
+        <key>name</key>
+        <string>sunkbd_adaptor</string>
+        <key>slots</key>
+        <array>
+          <dict>
+            <key>name</key>
+            <string>:keyboard</string>
+            <key>options</key>
+            <array>
+              <dict>
+                <key>value</key>
+                <string></string>
+                <key>description</key>
+                <string>—None—</string>
+                <key>default</key>
+                <true/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>type3hle</string>
+                <key>description</key>
+                <string>Sun Type 3 Keyboard (HLE)</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>type4hle</string>
+                <key>description</key>
+                <string>Sun Type 4 Keyboard (HLE)</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>type5gbhle</string>
+                <key>description</key>
+                <string>Sun Type 5 Keyboard (Great Britain - HLE)</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>type5jphle</string>
+                <key>description</key>
+                <string>Sun Type 5 Keyboard (Japan - HLE)</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>type5sehle</string>
+                <key>description</key>
+                <string>Sun Type 5 Keyboard (Sweden - HLE)</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>type5hle</string>
+                <key>description</key>
+                <string>Sun Type 5 Keyboard (U.S.A. - HLE)</string>
+                <key>default</key>
+                <false/>
+              </dict>
+            </array>
+          </dict>
+        </array>
+      </dict>
    </array>
    <key>software</key>
    <array>
+      <string>mac_hdflop.xml</string>
      <string>mac_hdd.xml</string>
+      <dict>
+        <key>name</key>
+        <string>mac_cdrom.xml</string>
+        <key>filter</key>
+        <string>MC68030,MC68030_32</string>
+      </dict>
+      <string>mac_flop_orig.xml</string>
+      <string>mac_flop_clcracked.xml</string>
      <string>mac_flop.xml</string>
    </array>
  </dict>
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Kelvin Sherlock	63a60ed8b7	bump for 0.249 hotfix	2023-10-03 11:23:31 -04:00
Kelvin Sherlock	9005cfe0ec	0.259 update, add UI support for Mac PDS slot	2023-09-29 18:16:37 -04:00
Kelvin Sherlock	2e62b33fb1	version bump	2023-09-01 20:27:52 -04:00
Kelvin Sherlock	e04d441cc5	add new resources to the xcode project	2023-08-31 20:04:34 -04:00
Kelvin Sherlock	f116c9ff1f	mame 0.258 updates	2023-08-31 18:40:25 -04:00
Kelvin Sherlock	92cf747d65	version bump	2023-07-30 19:39:32 -04:00
Kelvin Sherlock	743fa57a44	add mac quadra to xcode, re-organize the models.	2023-07-28 19:02:59 -04:00
Kelvin Sherlock	970cbd6cdc	mame 257 update	2023-07-28 18:38:29 -04:00
Kelvin Sherlock	3ce9df6650	version bump	2023-06-28 16:06:32 -04:00
Kelvin Sherlock	d84c5d7be3	Update for MAME 0.256, add Apple II ROM custom rom support.	2023-06-28 14:59:15 -04:00
Kelvin Sherlock	79617329e8	version bump	2023-05-31 18:06:12 -04:00
Kelvin Sherlock	dc67db2ce6	fix Atari rom names	2023-05-31 17:23:04 -04:00
Kelvin Sherlock	9031b481ce	support for atari disk images/extensions.	2023-05-30 18:44:33 -04:00
Kelvin Sherlock	f38ab3288d	Apple3 - RS232 -> Modem	2023-05-29 17:58:12 -04:00
Kelvin Sherlock	0aea4006cc	Atari ST support.	2023-05-29 17:57:52 -04:00
Kelvin Sherlock	06233137a9	Add Atari ST support.	2023-05-29 17:57:07 -04:00
Kelvin Sherlock	8bc7e26279	version bump (44/0.254)	2023-04-27 19:09:09 -04:00
Kelvin Sherlock	aea14d8dd4	bug - CDATA notes in the software list weren't handled correctly (not used for apple family)	2023-04-27 17:58:38 -04:00
Kelvin Sherlock	23946962ad	bug - bookmarks didn't restore built-in floppy disk settings (such as disabling the 5.25" drives on a iigs)	2023-04-27 17:58:29 -04:00
Kelvin Sherlock	d0987932a8	version bump	2023-03-31 00:02:47 -04:00
Kelvin Sherlock	c03f888032	update slots for MAME 0.253	2023-03-30 21:31:13 -04:00
Kelvin Sherlock	2b127ac5a8	version bump	2023-03-01 18:01:45 -05:00
Kelvin Sherlock	c6edfe91f2	fix bgfx; as of 0.252, -video bgfx is required. also, add Fighters effect	2023-03-01 10:56:45 -05:00
Kelvin Sherlock	11ba25588b	version bump	2023-02-28 17:30:45 -05:00
Kelvin Sherlock	695ed00552	bump sdl version	2023-02-28 15:41:03 -05:00
Kelvin Sherlock	c8e3c95240	version bump for -wip mame. 10.13 now required	2023-01-14 10:20:28 -05:00
Kelvin Sherlock	4acd3d51a7	bump version	2022-12-31 13:44:22 -05:00
Kelvin Sherlock	93cb6c5276	bump version	2022-11-30 10:01:25 -05:00
Kelvin Sherlock	52e9f00b92	mame 250 device updates	2022-11-29 18:26:45 -05:00
Kelvin Sherlock	453e2bd497	version bump	2022-10-31 23:58:37 -04:00
Kelvin Sherlock	c722b28ef3	add mac color classic, lc520 to ample project.	2022-10-31 17:57:27 -04:00
Kelvin Sherlock	7a077e5ec8	add mac color classic and lc 520 (mame 249)	2022-10-31 17:47:10 -04:00
Kelvin Sherlock	436694a0b6	version bump	2022-09-28 18:52:20 -04:00
Kelvin Sherlock	01e36939aa	use sparkle 2.2.0	2022-09-28 18:41:17 -04:00
Kelvin Sherlock	20c767021c	mame 248 update - apple iic+ disk drive change	2022-09-28 14:12:00 -04:00
Kelvin Sherlock	b64ca73346	version bump	2022-09-01 19:12:05 -04:00
Kelvin Sherlock	62767971ee	don't crash if a slot is empty (laser3000, which has no slots and no disk drives)	2022-09-01 18:35:33 -04:00
Kelvin Sherlock	6b2c4c408a	remove software list is hidden binding (it's set explicitly in the controller)	2022-09-01 18:31:12 -04:00
Kelvin Sherlock	bbcc41cc10	laser 3000 does not have ram options. quick fix until fixed.	2022-09-01 18:24:33 -04:00
Kelvin Sherlock	f651ca6b26	project update	2022-09-01 17:45:20 -04:00
Kelvin Sherlock	16036d9df0	add laser 3000	2022-09-01 17:45:20 -04:00
Kelvin Sherlock	41653fcae1	MAME .247 update	2022-09-01 17:45:20 -04:00
Kelvin Sherlock	87b4cc9494	version bump (u2 #2 )	2022-09-01 17:45:20 -04:00
Kelvin Sherlock	9b349e699f	version bump	2022-09-01 17:45:13 -04:00
Kelvin Sherlock	03c8306718	.246 - add uthernet, block ATA compact flash	2022-07-31 20:58:28 -04:00
Kelvin Sherlock	41ad1f0d7a	version bump	2022-06-30 22:18:32 -04:00
Kelvin Sherlock	d5ed5f74a2	update plists for MAME 0.245	2022-06-30 18:23:10 -04:00
Kelvin Sherlock	2409ad55a1	version bump	2022-05-25 21:33:52 -04:00
Kelvin Sherlock	601e56ccaa	bump components date	2022-04-30 15:08:12 -04:00
Kelvin Sherlock	d5d90ba6be	version bump.	2022-04-30 10:19:44 -04:00
Kelvin Sherlock	4a0caa2e78	Incomplete - started adding support for "Reinstall MAME components" menu item. The main holdup is that the software list is loaded from those installed MAME components and reinstalling them would invalidate and require a reload.	2022-04-30 10:17:57 -04:00
Kelvin Sherlock	23a05d5414	support for bios in the slot controller.	2022-04-30 10:16:05 -04:00
Kelvin Sherlock	4ffd8d1f44	move bios settings to be handled as a slot option.	2022-04-30 10:14:37 -04:00
Kelvin Sherlock	f52470eb2e	build 27 was 241-1, bump to 28	2022-04-01 11:45:14 -04:00
Kelvin Sherlock	65aedba94b	242 version bump	2022-04-01 09:06:45 -04:00
Kelvin Sherlock	8707b4a246	add move to trash menu option keep file size (will display later)	2022-03-29 11:57:19 -04:00
Kelvin Sherlock	5a0fdd5a7e	add bios options to the machine plist (no gui yet), clean up CFFA name slightly.	2022-03-25 17:20:22 -04:00
Kelvin Sherlock	4e05ff7e8c	shift-command-D will update the current bookmark.	2022-03-18 15:23:56 -04:00
Kelvin Sherlock	781d8ada60	midi - representedObject can be reset in some circumstances. (reloading from nib?) use title which seems more permanent.	2022-02-28 10:33:17 -05:00
Kelvin Sherlock	d258fd2a48	midi selection - need to save the current object before destroying the menu.	2022-02-28 09:34:05 -05:00
Kelvin Sherlock	2b2f3a2fd8	software search improvements 1. handle diacritics 2. strip leading "the " from titles and search string since it's often inconsistent	2022-02-26 21:21:27 -05:00
Kelvin Sherlock	9bb0cc468a	bump sparkle 2.1.0	2022-02-26 18:45:17 -05:00
Kelvin Sherlock	79c3eba93e	software list items need to be after slot configuration so they have access to the 3.5" disk controller card, for example.	2022-02-26 15:52:13 -05:00
Kelvin Sherlock	e09a151c91	revert accidental changes to the preference window	2022-02-26 11:35:47 -05:00
Kelvin Sherlock	ce35015218	macos 12 doesn't like singletons in nibs	2022-02-23 22:32:33 -05:00
Kelvin Sherlock	1dd3664a2b	version bump - 241	2022-02-23 21:14:30 -05:00
Kelvin Sherlock	0616991a1b	- Move bookmarks and disk images to core data - bookmark edit window - rom window now shows machine description, tooltip is name - fix split floppy logic to work with a2superdrive - fix software list loading from default - mame 241 machine updates	2022-02-23 20:59:05 -05:00
Kelvin Sherlock	7633887391	bump copyright year.	2022-01-30 12:30:49 -05:00
Kelvin Sherlock	c49c4df9bf	WIP version bump	2022-01-15 10:54:34 -05:00
Kelvin Sherlock	eda219faa2	Tested and excluded extra CD ROM devices. They were previously excluded from the machine descriptions but they now need to be excluded from the ROM file as well.	2022-01-15 10:54:18 -05:00
Kelvin Sherlock	5382447dc9	rom/machine updates for 240 (wip)	2022-01-15 10:13:07 -05:00
Kelvin Sherlock	8f989c0d3f	sparkle 2.0	2022-01-02 21:59:47 -05:00
Kelvin Sherlock	1141e3da0d	version bump (0.239)	2021-12-28 21:50:00 -05:00
Kelvin Sherlock	c5eeec9b6d	MAME 239 update	2021-12-28 21:06:03 -05:00
Kelvin Sherlock	2122f0707b	Add Franklin ACE 2200 machine definition.	2021-12-02 18:12:24 -05:00
Kelvin Sherlock	809e344a2d	add ace 500, move franklin to it's own group, updated machine descriptions	2021-11-29 20:00:46 -05:00
Kelvin Sherlock	405e802176	version bump	2021-11-24 13:04:36 -05:00
Kelvin Sherlock	d352e7c45d	Download manager - support for password protected web sites (basic authorization). Since there's no UI for the username/password, these need to be managed within keychain. Add a new keychain item with the porotocol + server (ie, https://romz.example.com) as the keychain item name, account name, and password.	2021-11-20 09:43:22 -05:00
Kelvin Sherlock	5af5e2e300	move first responder resignation code to a function.	2021-11-16 22:44:38 -05:00
Kelvin Sherlock	afc3ac608a	Downloader: resign first responder before downloading so the URL will update (if it's being edited).	2021-11-16 20:44:11 -05:00
Kelvin Sherlock	c200672650	sparkle update.	2021-11-16 19:15:17 -05:00
Kelvin Sherlock	345d4f3d74	laser128.o rom	2021-10-27 17:15:58 -04:00
Kelvin Sherlock	b795d60995	version bump	2021-10-27 17:12:25 -04:00
Kelvin Sherlock	09b4972084	bump components date	2021-10-27 17:11:00 -04:00
Kelvin Sherlock	49c191bf5f	Add laser 128 (original version)	2021-10-27 17:10:43 -04:00
Kelvin Sherlock	7f5efc1479	updated machine descriptions for 0.237	2021-10-27 16:57:56 -04:00
Kelvin Sherlock	c7fa95c918	software list - support for the notes field.	2021-10-06 21:05:58 -04:00
Kelvin Sherlock	7178118ea9	236 version bump	2021-09-29 21:03:55 -04:00
Kelvin Sherlock	e9654f01c0	mame 0.236 updates	2021-09-29 19:50:41 -04:00
Kelvin Sherlock	098b8cb7da	update component date	2021-08-26 23:25:05 -04:00
Kelvin Sherlock	35b60b1358	0.235 version bump	2021-08-26 22:06:20 -04:00
Kelvin Sherlock	0c56be79f3	tweak rom build script	2021-08-26 22:06:03 -04:00
Kelvin Sherlock	e66502ea42	update roms and cards for 0235	2021-08-26 22:01:52 -04:00
Kelvin Sherlock	70f4738264	add midi input/output menu.	2021-08-07 15:12:45 -04:00
Kelvin Sherlock	026a9e7704	fix missing key	2021-08-06 21:25:27 -04:00
Kelvin Sherlock	7a482191ab	update embedded timestamp / archive url	2021-07-28 16:41:07 -04:00
Kelvin Sherlock	3827cce320	version bump	2021-07-27 23:50:00 -04:00
Kelvin Sherlock	82fbe43795	remove some roms that don't exist (included in other sets)	2021-07-27 23:48:42 -04:00
Kelvin Sherlock	acfc37675b	version bump for kfest release.	2021-07-23 21:37:51 -04:00
Kelvin Sherlock	fa64005345	disable the midi in / midi out for now since it's more complicated than I expected.	2021-07-23 21:30:16 -04:00
Kelvin Sherlock	f79fb60883	SoftCard ///	2021-07-23 21:29:13 -04:00
Kelvin Sherlock	d92145f6b4	wrong logic was causing custom mame to be ignored when launching (but not for shell script).	2021-07-18 21:48:19 -04:00
Kelvin Sherlock	139ab22f2a	add -rewind support, increase size of media and slots rewind saves the state before each step.	2021-07-14 22:38:15 -04:00
Kelvin Sherlock	b58a859398	set the category index to -1 when category not in use.	2021-07-14 19:40:40 -04:00
Kelvin Sherlock	a278f679b0	whitespace	2021-07-14 19:38:52 -04:00
Kelvin Sherlock	0c55214085	midi/picture support.	2021-07-10 23:37:10 -04:00
Kelvin Sherlock	7c704e577d	whitespace	2021-07-10 23:35:56 -04:00
Kelvin Sherlock	d52c2cd9d1	updated machine definitions with midi, picture, and lance	2021-07-10 23:35:48 -04:00
Kelvin Sherlock	5aa8990ac6	whitespace	2021-07-10 23:34:00 -04:00
Kelvin Sherlock	82a73ef79c	midiin, midiout, and picture support.	2021-07-10 23:33:20 -04:00
Kelvin Sherlock	0d4a08113b	media view - store the category in the path control to better identify if it's a disk image.	2021-07-10 12:07:01 -04:00
Kelvin Sherlock	fc3bae79c3	disable all mouse tracking code (which was unused)	2021-07-10 12:05:22 -04:00
Kelvin Sherlock	053b9d84db	remove logging, add begin/end updates	2021-07-10 11:25:25 -04:00
Kelvin Sherlock	c7d0a2aecb	animate out out the entire category when it's completely invalidated.	2021-07-10 01:45:03 -04:00
Kelvin Sherlock	5a098b9d00	double-clicking a recent disk image will try to put it in an appropriate location. if the media class doesn't exist (eg, hard drive with no hard drive controller) it's added but not displayed.	2021-07-10 01:15:34 -04:00
Kelvin Sherlock	abf4e027ee	improve disk image/etc sniffing.	2021-07-08 22:09:33 -04:00
Kelvin Sherlock	ec020cf028	bookmark duplicate name logic didn't work...	2021-07-07 07:15:28 -04:00
Kelvin Sherlock	9ab4b8373d	statusDescription depends on status (and error)	2021-07-02 17:38:36 -04:00
Kelvin Sherlock	796b1f2fc8	reset the software list when loading a bookmark.	2021-07-02 17:16:05 -04:00
Kelvin Sherlock	d7b3c763dd	update readme	2021-07-01 21:31:08 -04:00
Kelvin Sherlock	32aad8cb61	updated screenshots	2021-07-01 21:26:24 -04:00
Kelvin Sherlock	1eb3811611	adjust download spinner size and location.	2021-07-01 19:21:51 -04:00
Kelvin Sherlock	ac459adb57	commentary.	2021-07-01 19:21:51 -04:00
Kelvin Sherlock	d058aa6588	233 version bump	2021-07-01 19:10:38 -04:00
Kelvin Sherlock	3889b42c14	add secret listmedia/listslots options in the right-click menu when option key pressed. also adjust log window to use monospace font, show error/signal in red, and don't mention a successful exit. tweaks to file handling/task complete so task complete logic is delayed until file handle is drained.	2021-06-18 21:57:46 -04:00
Kelvin Sherlock	34fcc3b3ed	more useful scripts.	2021-06-17 23:44:15 -04:00
Kelvin Sherlock	c10f2153ff	unused code to guess what sort of media a disk image is. The general idea would be drag-n-drop a file (or double-click from the disk image window, etc) and auto-place it in the right place.	2021-06-17 23:43:31 -04:00
Kelvin Sherlock	23afbd8952	move url update to main thread to prevent core animation mutation errors (???)	2021-06-17 13:25:39 -04:00
Kelvin Sherlock	5fbc00e375	print a descriptive error message when vmnet_helper fails.	2021-06-16 23:47:16 -04:00
Kelvin Sherlock	5dd04cd3b7	Apple III titan card (mame 2.33)	2021-06-16 23:46:47 -04:00
Kelvin Sherlock	27bfc1cd8b	default to window mode since it's less surprising	2021-06-16 23:46:26 -04:00
Kelvin Sherlock	800087096d	r15 updates	2021-06-16 00:39:10 -04:00
Kelvin Sherlock	669e9a16f4	update floppy lists	2021-06-15 23:57:47 -04:00
Kelvin Sherlock	7c766ba76e	codesign mame w/ entitlements also test code to soft-link mame under a new name.	2021-06-15 19:16:23 -04:00
Kelvin Sherlock	c307ab0403	hardened_runtime/entitlements	2021-06-15 17:09:40 -04:00
Kelvin Sherlock	7d1e1bf6bd	update appcast URL.	2021-06-15 16:42:58 -04:00
Kelvin Sherlock	9da9f6bd63	add sparkle framework and check for updates menu item.	2021-06-14 23:11:25 -04:00