improved resolution algorithm.

uses rounds to nearest integer of 4:3 aspect ratio.

.github/workflows/xcodebuild.yml

@@ -8,12 +8,8 @@ jobs:
     runs-on: macos-latest
 
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v2
 
     - name: build
       run: xcodebuild -project "Ample.xcodeproj" -target "Ample Lite" | xcpretty
 
-    - uses: actions/upload-artifact@v3
-      with:
-        name: Ample Lite
-        path: build/Release/

Ample.xcodeproj/project.pbxproj

@@ -25,21 +25,11 @@
 		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 */; };
-		B636F5C72B1168C00063F9D8 /* bbcbp128.plist in Resources */ = {isa = PBXBuildFile; fileRef = B636F5BC2B1168BF0063F9D8 /* bbcbp128.plist */; };
-		B636F5C82B1168C00063F9D8 /* bbcmc.plist in Resources */ = {isa = PBXBuildFile; fileRef = B636F5BD2B1168BF0063F9D8 /* bbcmc.plist */; };
-		B636F5C92B1168C00063F9D8 /* bbcb_us.plist in Resources */ = {isa = PBXBuildFile; fileRef = B636F5BE2B1168BF0063F9D8 /* bbcb_us.plist */; };
-		B636F5CA2B1168C00063F9D8 /* bbcb.plist in Resources */ = {isa = PBXBuildFile; fileRef = B636F5BF2B1168BF0063F9D8 /* bbcb.plist */; };
-		B636F5CB2B1168C00063F9D8 /* bbcmt.plist in Resources */ = {isa = PBXBuildFile; fileRef = B636F5C02B1168BF0063F9D8 /* bbcmt.plist */; };
-		B636F5CC2B1168C00063F9D8 /* bbcbp.plist in Resources */ = {isa = PBXBuildFile; fileRef = B636F5C12B1168C00063F9D8 /* bbcbp.plist */; };
-		B636F5CD2B1168C00063F9D8 /* bbcb_no.plist in Resources */ = {isa = PBXBuildFile; fileRef = B636F5C22B1168C00063F9D8 /* bbcb_no.plist */; };
-		B636F5CE2B1168C00063F9D8 /* bbcb_de.plist in Resources */ = {isa = PBXBuildFile; fileRef = B636F5C32B1168C00063F9D8 /* bbcb_de.plist */; };
-		B636F5CF2B1168C00063F9D8 /* bbcm.plist in Resources */ = {isa = PBXBuildFile; fileRef = B636F5C42B1168C00063F9D8 /* bbcm.plist */; };
-		B636F5D02B1168C00063F9D8 /* bbca.plist in Resources */ = {isa = PBXBuildFile; fileRef = B636F5C52B1168C00063F9D8 /* bbca.plist */; };
-		B636F5D12B1168C00063F9D8 /* electron.plist in Resources */ = {isa = PBXBuildFile; fileRef = B636F5C62B1168C00063F9D8 /* electron.plist */; };
 		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, ); }; };
 		B63C1B8B24FF4BF700511A71 /* Ample.m in Sources */ = {isa = PBXBuildFile; fileRef = B63C1B8A24FF4BF700511A71 /* Ample.m */; };
 		B63C1B8C24FF4BF700511A71 /* Ample.m in Sources */ = {isa = PBXBuildFile; fileRef = B63C1B8A24FF4BF700511A71 /* Ample.m */; };
+		B63C1B8E25004C6D00511A71 /* mame-data.tgz in Resources */ = {isa = PBXBuildFile; fileRef = B63C1B8D25004C6D00511A71 /* mame-data.tgz */; };
 		B63C1B9425008A2700511A71 /* DownloadWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = B63C1B9225008A2700511A71 /* DownloadWindowController.m */; };
 		B63C1B9525008A2700511A71 /* DownloadWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = B63C1B9225008A2700511A71 /* DownloadWindowController.m */; };
 		B63C1B9625008A2700511A71 /* DownloadWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = B63C1B9325008A2700511A71 /* DownloadWindow.xib */; };
@@ -57,16 +47,6 @@
 		B64AF1F7250ED5E400A09B9B /* TableCellView.m in Sources */ = {isa = PBXBuildFile; fileRef = B64AF1F5250ED5E400A09B9B /* TableCellView.m */; };
 		B64AF1FA250EF6A500A09B9B /* Transformers.m in Sources */ = {isa = PBXBuildFile; fileRef = B64AF1F9250EF6A500A09B9B /* Transformers.m */; };
 		B64AF1FB250EF6A500A09B9B /* Transformers.m in Sources */ = {isa = PBXBuildFile; fileRef = B64AF1F9250EF6A500A09B9B /* Transformers.m */; };
-		B65C0A772B9E77DC00CB24C9 /* mactv.plist in Resources */ = {isa = PBXBuildFile; fileRef = B65C0A762B9E77DC00CB24C9 /* mactv.plist */; };
-		B65C0A782B9E77DC00CB24C9 /* mactv.plist in Resources */ = {isa = PBXBuildFile; fileRef = B65C0A762B9E77DC00CB24C9 /* mactv.plist */; };
-		B65D1B942BB7B1AC00C15287 /* cocoh.plist in Resources */ = {isa = PBXBuildFile; fileRef = B65D1B902BB7B1AB00C15287 /* cocoh.plist */; };
-		B65D1B952BB7B1AC00C15287 /* cocoh.plist in Resources */ = {isa = PBXBuildFile; fileRef = B65D1B902BB7B1AB00C15287 /* cocoh.plist */; };
-		B65D1B962BB7B1AC00C15287 /* mc10.plist in Resources */ = {isa = PBXBuildFile; fileRef = B65D1B912BB7B1AB00C15287 /* mc10.plist */; };
-		B65D1B972BB7B1AC00C15287 /* mc10.plist in Resources */ = {isa = PBXBuildFile; fileRef = B65D1B912BB7B1AB00C15287 /* mc10.plist */; };
-		B65D1B982BB7B1AC00C15287 /* coco2bh.plist in Resources */ = {isa = PBXBuildFile; fileRef = B65D1B922BB7B1AB00C15287 /* coco2bh.plist */; };
-		B65D1B992BB7B1AC00C15287 /* coco2bh.plist in Resources */ = {isa = PBXBuildFile; fileRef = B65D1B922BB7B1AB00C15287 /* coco2bh.plist */; };
-		B65D1B9A2BB7B1AC00C15287 /* coco3h.plist in Resources */ = {isa = PBXBuildFile; fileRef = B65D1B932BB7B1AC00C15287 /* coco3h.plist */; };
-		B65D1B9B2BB7B1AC00C15287 /* coco3h.plist in Resources */ = {isa = PBXBuildFile; fileRef = B65D1B932BB7B1AC00C15287 /* coco3h.plist */; };
 		B65D718625E70BD5008C5F87 /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B65D718525E70BD5008C5F87 /* WebKit.framework */; };
 		B65D718725E70BE5008C5F87 /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B65D718525E70BD5008C5F87 /* WebKit.framework */; };
 		B66236A924FD9A34006CABD7 /* PreferencesWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = B66236A824FD9A34006CABD7 /* PreferencesWindowController.m */; };
@@ -417,12 +397,6 @@
 		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 */; };
-		B6852EC92B0EAA7500BBFFC7 /* a500n.plist in Resources */ = {isa = PBXBuildFile; fileRef = B6852EC32B0EAA7400BBFFC7 /* a500n.plist */; };
-		B6852ECA2B0EAA7500BBFFC7 /* a1000.plist in Resources */ = {isa = PBXBuildFile; fileRef = B6852EC42B0EAA7400BBFFC7 /* a1000.plist */; };
-		B6852ECB2B0EAA7500BBFFC7 /* a1000n.plist in Resources */ = {isa = PBXBuildFile; fileRef = B6852EC52B0EAA7400BBFFC7 /* a1000n.plist */; };
-		B6852ECC2B0EAA7500BBFFC7 /* a2000.plist in Resources */ = {isa = PBXBuildFile; fileRef = B6852EC62B0EAA7400BBFFC7 /* a2000.plist */; };
-		B6852ECD2B0EAA7500BBFFC7 /* a2000n.plist in Resources */ = {isa = PBXBuildFile; fileRef = B6852EC72B0EAA7400BBFFC7 /* a2000n.plist */; };
-		B6852ECE2B0EAA7500BBFFC7 /* a500.plist in Resources */ = {isa = PBXBuildFile; fileRef = B6852EC82B0EAA7500BBFFC7 /* a500.plist */; };
 		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 */; };
@@ -439,8 +413,6 @@
 		B6D6DE3B24FACF4F00661A5F /* Defaults.plist in Resources */ = {isa = PBXBuildFile; fileRef = B6D6DE3A24FACF4F00661A5F /* Defaults.plist */; };
 		B6D6DE3E24FADF8B00661A5F /* LaunchWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = B6D6DE3C24FADF8B00661A5F /* LaunchWindow.xib */; };
 		B6D6DE4124FADFAC00661A5F /* LaunchWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = B6D6DE4024FADFAC00661A5F /* LaunchWindowController.m */; };
-		B6DD93972BB4F5DC00921359 /* Host.FST.po in CopyFiles */ = {isa = PBXBuildFile; fileRef = B6DD93942BB4F0FC00921359 /* Host.FST.po */; };
-		B6DD93982BB4F65200921359 /* mame-data.tgz in CopyFiles */ = {isa = PBXBuildFile; fileRef = B63C1B8D25004C6D00511A71 /* mame-data.tgz */; };
 		B6DDECC025057A550093587A /* drag-handle-4x10.png in Resources */ = {isa = PBXBuildFile; fileRef = B6DDECBD25057A550093587A /* drag-handle-4x10.png */; };
 		B6DDECC125057A550093587A /* drag-handle-4x10.png in Resources */ = {isa = PBXBuildFile; fileRef = B6DDECBD25057A550093587A /* drag-handle-4x10.png */; };
 		B6DDECC225057A550093587A /* drag-handle-4x10@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = B6DDECBE25057A550093587A /* drag-handle-4x10@2x.png */; };
@@ -497,44 +469,10 @@
 		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 */; };
-		B6EEFAB42B9ABCAE0068B47C /* tanodr64.plist in Resources */ = {isa = PBXBuildFile; fileRef = B6EEFAA72B9ABCAD0068B47C /* tanodr64.plist */; };
-		B6EEFAB52B9ABCAE0068B47C /* tanodr64.plist in Resources */ = {isa = PBXBuildFile; fileRef = B6EEFAA72B9ABCAD0068B47C /* tanodr64.plist */; };
-		B6EEFAB62B9ABCAE0068B47C /* dragon64.plist in Resources */ = {isa = PBXBuildFile; fileRef = B6EEFAA82B9ABCAD0068B47C /* dragon64.plist */; };
-		B6EEFAB72B9ABCAE0068B47C /* dragon64.plist in Resources */ = {isa = PBXBuildFile; fileRef = B6EEFAA82B9ABCAD0068B47C /* dragon64.plist */; };
-		B6EEFAB82B9ABCAE0068B47C /* coco3.plist in Resources */ = {isa = PBXBuildFile; fileRef = B6EEFAA92B9ABCAD0068B47C /* coco3.plist */; };
-		B6EEFAB92B9ABCAE0068B47C /* coco3.plist in Resources */ = {isa = PBXBuildFile; fileRef = B6EEFAA92B9ABCAD0068B47C /* coco3.plist */; };
-		B6EEFABA2B9ABCAE0068B47C /* trs80.plist in Resources */ = {isa = PBXBuildFile; fileRef = B6EEFAAA2B9ABCAD0068B47C /* trs80.plist */; };
-		B6EEFABB2B9ABCAE0068B47C /* trs80.plist in Resources */ = {isa = PBXBuildFile; fileRef = B6EEFAAA2B9ABCAD0068B47C /* trs80.plist */; };
-		B6EEFABC2B9ABCAE0068B47C /* trs80l2.plist in Resources */ = {isa = PBXBuildFile; fileRef = B6EEFAAB2B9ABCAD0068B47C /* trs80l2.plist */; };
-		B6EEFABD2B9ABCAE0068B47C /* trs80l2.plist in Resources */ = {isa = PBXBuildFile; fileRef = B6EEFAAB2B9ABCAD0068B47C /* trs80l2.plist */; };
-		B6EEFABE2B9ABCAE0068B47C /* coco2b.plist in Resources */ = {isa = PBXBuildFile; fileRef = B6EEFAAC2B9ABCAD0068B47C /* coco2b.plist */; };
-		B6EEFABF2B9ABCAE0068B47C /* coco2b.plist in Resources */ = {isa = PBXBuildFile; fileRef = B6EEFAAC2B9ABCAD0068B47C /* coco2b.plist */; };
-		B6EEFAC02B9ABCAE0068B47C /* coco.plist in Resources */ = {isa = PBXBuildFile; fileRef = B6EEFAAD2B9ABCAD0068B47C /* coco.plist */; };
-		B6EEFAC12B9ABCAE0068B47C /* coco.plist in Resources */ = {isa = PBXBuildFile; fileRef = B6EEFAAD2B9ABCAD0068B47C /* coco.plist */; };
-		B6EEFAC22B9ABCAE0068B47C /* dragon200e.plist in Resources */ = {isa = PBXBuildFile; fileRef = B6EEFAAE2B9ABCAD0068B47C /* dragon200e.plist */; };
-		B6EEFAC32B9ABCAE0068B47C /* dragon200e.plist in Resources */ = {isa = PBXBuildFile; fileRef = B6EEFAAE2B9ABCAD0068B47C /* dragon200e.plist */; };
-		B6EEFAC42B9ABCAE0068B47C /* dragon32.plist in Resources */ = {isa = PBXBuildFile; fileRef = B6EEFAAF2B9ABCAD0068B47C /* dragon32.plist */; };
-		B6EEFAC52B9ABCAE0068B47C /* dragon32.plist in Resources */ = {isa = PBXBuildFile; fileRef = B6EEFAAF2B9ABCAD0068B47C /* dragon32.plist */; };
-		B6EEFAC62B9ABCAE0068B47C /* d64plus.plist in Resources */ = {isa = PBXBuildFile; fileRef = B6EEFAB02B9ABCAE0068B47C /* d64plus.plist */; };
-		B6EEFAC72B9ABCAE0068B47C /* d64plus.plist in Resources */ = {isa = PBXBuildFile; fileRef = B6EEFAB02B9ABCAE0068B47C /* d64plus.plist */; };
-		B6EEFAC82B9ABCAE0068B47C /* models.plist in Resources */ = {isa = PBXBuildFile; fileRef = B6EEFAB12B9ABCAE0068B47C /* models.plist */; };
-		B6EEFAC92B9ABCAE0068B47C /* models.plist in Resources */ = {isa = PBXBuildFile; fileRef = B6EEFAB12B9ABCAE0068B47C /* models.plist */; };
-		B6EEFACA2B9ABCAE0068B47C /* coco3p.plist in Resources */ = {isa = PBXBuildFile; fileRef = B6EEFAB22B9ABCAE0068B47C /* coco3p.plist */; };
-		B6EEFACB2B9ABCAE0068B47C /* coco3p.plist in Resources */ = {isa = PBXBuildFile; fileRef = B6EEFAB22B9ABCAE0068B47C /* coco3p.plist */; };
-		B6EEFACC2B9ABCAE0068B47C /* dragon200.plist in Resources */ = {isa = PBXBuildFile; fileRef = B6EEFAB32B9ABCAE0068B47C /* dragon200.plist */; };
-		B6EEFACD2B9ABCAE0068B47C /* dragon200.plist in Resources */ = {isa = PBXBuildFile; fileRef = B6EEFAB32B9ABCAE0068B47C /* dragon200.plist */; };
 		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 */; };
-		B6FECDD02BA8AA080025B402 /* prav8d.plist in Resources */ = {isa = PBXBuildFile; fileRef = B6FECDCC2BA8AA080025B402 /* prav8d.plist */; };
-		B6FECDD12BA8AA080025B402 /* prav8d.plist in Resources */ = {isa = PBXBuildFile; fileRef = B6FECDCC2BA8AA080025B402 /* prav8d.plist */; };
-		B6FECDD22BA8AA080025B402 /* telstrat.plist in Resources */ = {isa = PBXBuildFile; fileRef = B6FECDCD2BA8AA080025B402 /* telstrat.plist */; };
-		B6FECDD32BA8AA080025B402 /* telstrat.plist in Resources */ = {isa = PBXBuildFile; fileRef = B6FECDCD2BA8AA080025B402 /* telstrat.plist */; };
-		B6FECDD42BA8AA080025B402 /* orica.plist in Resources */ = {isa = PBXBuildFile; fileRef = B6FECDCE2BA8AA080025B402 /* orica.plist */; };
-		B6FECDD52BA8AA080025B402 /* orica.plist in Resources */ = {isa = PBXBuildFile; fileRef = B6FECDCE2BA8AA080025B402 /* orica.plist */; };
-		B6FECDD62BA8AA080025B402 /* oric1.plist in Resources */ = {isa = PBXBuildFile; fileRef = B6FECDCF2BA8AA080025B402 /* oric1.plist */; };
-		B6FECDD72BA8AA080025B402 /* oric1.plist in Resources */ = {isa = PBXBuildFile; fileRef = B6FECDCF2BA8AA080025B402 /* oric1.plist */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXCopyFilesBuildPhase section */
@@ -580,17 +518,6 @@
 			);
 			runOnlyForDeploymentPostprocessing = 1;
 		};
-		B6DD93962BB4F5B700921359 /* CopyFiles */ = {
-			isa = PBXCopyFilesBuildPhase;
-			buildActionMask = 2147483647;
-			dstPath = "";
-			dstSubfolderSpec = 12;
-			files = (
-				B6DD93982BB4F65200921359 /* mame-data.tgz in CopyFiles */,
-				B6DD93972BB4F5DC00921359 /* Host.FST.po in CopyFiles */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 		B6E4B5F324FDE2670094A35C /* Embed Frameworks */ = {
 			isa = PBXCopyFilesBuildPhase;
 			buildActionMask = 2147483647;
@@ -676,17 +603,6 @@
 		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>"; };
-		B636F5BC2B1168BF0063F9D8 /* bbcbp128.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = bbcbp128.plist; sourceTree = "<group>"; };
-		B636F5BD2B1168BF0063F9D8 /* bbcmc.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = bbcmc.plist; sourceTree = "<group>"; };
-		B636F5BE2B1168BF0063F9D8 /* bbcb_us.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = bbcb_us.plist; sourceTree = "<group>"; };
-		B636F5BF2B1168BF0063F9D8 /* bbcb.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = bbcb.plist; sourceTree = "<group>"; };
-		B636F5C02B1168BF0063F9D8 /* bbcmt.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = bbcmt.plist; sourceTree = "<group>"; };
-		B636F5C12B1168C00063F9D8 /* bbcbp.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = bbcbp.plist; sourceTree = "<group>"; };
-		B636F5C22B1168C00063F9D8 /* bbcb_no.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = bbcb_no.plist; sourceTree = "<group>"; };
-		B636F5C32B1168C00063F9D8 /* bbcb_de.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = bbcb_de.plist; sourceTree = "<group>"; };
-		B636F5C42B1168C00063F9D8 /* bbcm.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = bbcm.plist; sourceTree = "<group>"; };
-		B636F5C52B1168C00063F9D8 /* bbca.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = bbca.plist; sourceTree = "<group>"; };
-		B636F5C62B1168C00063F9D8 /* electron.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = electron.plist; 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>"; };
@@ -732,11 +648,6 @@
 		B65085B625B616AC00354EC9 /* maclc2.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = maclc2.plist; sourceTree = "<group>"; };
 		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>"; };
-		B65C0A762B9E77DC00CB24C9 /* mactv.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = mactv.plist; sourceTree = "<group>"; };
-		B65D1B902BB7B1AB00C15287 /* cocoh.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = cocoh.plist; sourceTree = "<group>"; };
-		B65D1B912BB7B1AB00C15287 /* mc10.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = mc10.plist; sourceTree = "<group>"; };
-		B65D1B922BB7B1AB00C15287 /* coco2bh.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = coco2bh.plist; sourceTree = "<group>"; };
-		B65D1B932BB7B1AC00C15287 /* coco3h.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = coco3h.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>"; };
@@ -770,12 +681,6 @@
 		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; };
-		B6852EC32B0EAA7400BBFFC7 /* a500n.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = a500n.plist; sourceTree = "<group>"; };
-		B6852EC42B0EAA7400BBFFC7 /* a1000.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = a1000.plist; sourceTree = "<group>"; };
-		B6852EC52B0EAA7400BBFFC7 /* a1000n.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = a1000n.plist; sourceTree = "<group>"; };
-		B6852EC62B0EAA7400BBFFC7 /* a2000.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = a2000.plist; sourceTree = "<group>"; };
-		B6852EC72B0EAA7400BBFFC7 /* a2000n.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = a2000n.plist; sourceTree = "<group>"; };
-		B6852EC82B0EAA7500BBFFC7 /* a500.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = a500.plist; sourceTree = "<group>"; };
 		B6896D9D2B016CC700251FA4 /* ip6400.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = ip6400.plist; sourceTree = "<group>"; };
 		B6896D9E2B016CC800251FA4 /* ceci.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = ceci.plist; sourceTree = "<group>"; };
 		B6896DA02B016CC800251FA4 /* roms~extra.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "roms~extra.plist"; sourceTree = "<group>"; };
@@ -909,7 +814,6 @@
 		B6D6DE3F24FADFAC00661A5F /* LaunchWindowController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = LaunchWindowController.h; sourceTree = "<group>"; };
 		B6D6DE4024FADFAC00661A5F /* LaunchWindowController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = LaunchWindowController.m; sourceTree = "<group>"; };
 		B6DD1FE725B407E6004A3242 /* maclc.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = maclc.plist; sourceTree = "<group>"; };
-		B6DD93942BB4F0FC00921359 /* Host.FST.po */ = {isa = PBXFileReference; lastKnownFileType = file; name = Host.FST.po; path = embedded/Host.FST.po; sourceTree = "<group>"; };
 		B6DDECBD25057A550093587A /* drag-handle-4x10.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "drag-handle-4x10.png"; sourceTree = "<group>"; };
 		B6DDECBE25057A550093587A /* drag-handle-4x10@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "drag-handle-4x10@2x.png"; sourceTree = "<group>"; };
 		B6DDECBF25057A550093587A /* drag-handle-4x10@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "drag-handle-4x10@3x.png"; sourceTree = "<group>"; };
@@ -948,27 +852,10 @@
 		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>"; };
-		B6EEFAA72B9ABCAD0068B47C /* tanodr64.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = tanodr64.plist; sourceTree = "<group>"; };
-		B6EEFAA82B9ABCAD0068B47C /* dragon64.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = dragon64.plist; sourceTree = "<group>"; };
-		B6EEFAA92B9ABCAD0068B47C /* coco3.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = coco3.plist; sourceTree = "<group>"; };
-		B6EEFAAA2B9ABCAD0068B47C /* trs80.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = trs80.plist; sourceTree = "<group>"; };
-		B6EEFAAB2B9ABCAD0068B47C /* trs80l2.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = trs80l2.plist; sourceTree = "<group>"; };
-		B6EEFAAC2B9ABCAD0068B47C /* coco2b.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = coco2b.plist; sourceTree = "<group>"; };
-		B6EEFAAD2B9ABCAD0068B47C /* coco.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = coco.plist; sourceTree = "<group>"; };
-		B6EEFAAE2B9ABCAD0068B47C /* dragon200e.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = dragon200e.plist; sourceTree = "<group>"; };
-		B6EEFAAF2B9ABCAD0068B47C /* dragon32.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = dragon32.plist; sourceTree = "<group>"; };
-		B6EEFAB02B9ABCAE0068B47C /* d64plus.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = d64plus.plist; sourceTree = "<group>"; };
-		B6EEFAB12B9ABCAE0068B47C /* models.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = models.plist; sourceTree = "<group>"; };
-		B6EEFAB22B9ABCAE0068B47C /* coco3p.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = coco3p.plist; sourceTree = "<group>"; };
-		B6EEFAB32B9ABCAE0068B47C /* dragon200.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = dragon200.plist; 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>"; };
-		B6FECDCC2BA8AA080025B402 /* prav8d.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = prav8d.plist; sourceTree = "<group>"; };
-		B6FECDCD2BA8AA080025B402 /* telstrat.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = telstrat.plist; sourceTree = "<group>"; };
-		B6FECDCE2BA8AA080025B402 /* orica.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = orica.plist; sourceTree = "<group>"; };
-		B6FECDCF2BA8AA080025B402 /* oric1.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = oric1.plist; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -1029,23 +916,6 @@
 		B64E15AF24EA365E00E8AD3D /* Resources */ = {
 			isa = PBXGroup;
 			children = (
-				B636F5C52B1168C00063F9D8 /* bbca.plist */,
-				B636F5C32B1168C00063F9D8 /* bbcb_de.plist */,
-				B636F5C22B1168C00063F9D8 /* bbcb_no.plist */,
-				B636F5BE2B1168BF0063F9D8 /* bbcb_us.plist */,
-				B636F5BF2B1168BF0063F9D8 /* bbcb.plist */,
-				B636F5C12B1168C00063F9D8 /* bbcbp.plist */,
-				B636F5BC2B1168BF0063F9D8 /* bbcbp128.plist */,
-				B636F5C42B1168C00063F9D8 /* bbcm.plist */,
-				B636F5BD2B1168BF0063F9D8 /* bbcmc.plist */,
-				B636F5C02B1168BF0063F9D8 /* bbcmt.plist */,
-				B636F5C62B1168C00063F9D8 /* electron.plist */,
-				B6852EC82B0EAA7500BBFFC7 /* a500.plist */,
-				B6852EC32B0EAA7400BBFFC7 /* a500n.plist */,
-				B6852EC42B0EAA7400BBFFC7 /* a1000.plist */,
-				B6852EC52B0EAA7400BBFFC7 /* a1000n.plist */,
-				B6852EC62B0EAA7400BBFFC7 /* a2000.plist */,
-				B6852EC72B0EAA7400BBFFC7 /* a2000n.plist */,
 				B67879072B0195D800CFACF2 /* sun1.plist */,
 				B67879082B0195D800CFACF2 /* sun2_50.plist */,
 				B67879142B0195DB00CFACF2 /* sun2_120.plist */,
@@ -1132,7 +1002,6 @@
 				B6896DF92B016CDC00251FA4 /* macqd650.plist */,
 				B6896E0E2B016CE100251FA4 /* macqd800.plist */,
 				B6896E1A2B016CE400251FA4 /* macse30.plist */,
-				B65C0A762B9E77DC00CB24C9 /* mactv.plist */,
 				B6896E042B016CDF00251FA4 /* maxxi.plist */,
 				B6896DCB2B016CD100251FA4 /* microeng.plist */,
 				B6896DDA2B016CD400251FA4 /* models~extra.plist */,
@@ -1167,27 +1036,6 @@
 				B6896E082B016CE000251FA4 /* vt102.plist */,
 				B6896DEA2B016CD800251FA4 /* vt240.plist */,
 				B6896DCD2B016CD100251FA4 /* zijini.plist */,
-				B65D1B922BB7B1AB00C15287 /* coco2bh.plist */,
-				B65D1B932BB7B1AC00C15287 /* coco3h.plist */,
-				B65D1B902BB7B1AB00C15287 /* cocoh.plist */,
-				B65D1B912BB7B1AB00C15287 /* mc10.plist */,
-				B6FECDCF2BA8AA080025B402 /* oric1.plist */,
-				B6FECDCE2BA8AA080025B402 /* orica.plist */,
-				B6FECDCC2BA8AA080025B402 /* prav8d.plist */,
-				B6FECDCD2BA8AA080025B402 /* telstrat.plist */,
-				B6EEFAAD2B9ABCAD0068B47C /* coco.plist */,
-				B6EEFAAC2B9ABCAD0068B47C /* coco2b.plist */,
-				B6EEFAA92B9ABCAD0068B47C /* coco3.plist */,
-				B6EEFAB22B9ABCAE0068B47C /* coco3p.plist */,
-				B6EEFAB02B9ABCAE0068B47C /* d64plus.plist */,
-				B6EEFAAF2B9ABCAD0068B47C /* dragon32.plist */,
-				B6EEFAA82B9ABCAD0068B47C /* dragon64.plist */,
-				B6EEFAB32B9ABCAE0068B47C /* dragon200.plist */,
-				B6EEFAAE2B9ABCAD0068B47C /* dragon200e.plist */,
-				B6EEFAB12B9ABCAE0068B47C /* models.plist */,
-				B6EEFAA72B9ABCAD0068B47C /* tanodr64.plist */,
-				B6EEFAAA2B9ABCAD0068B47C /* trs80.plist */,
-				B6EEFAAB2B9ABCAD0068B47C /* trs80l2.plist */,
 				B6109A0824F5F373005CB652 /* ace100.plist */,
 				B63E57E12755AF1F00F8B5D1 /* ace500.plist */,
 				B646D10A263A5DF20014C586 /* ace1000.plist */,
@@ -1303,7 +1151,6 @@
 		B66236BD24FDA7EA006CABD7 /* Embedded Content */ = {
 			isa = PBXGroup;
 			children = (
-				B6DD93942BB4F0FC00921359 /* Host.FST.po */,
 				B63C1B8D25004C6D00511A71 /* mame-data.tgz */,
 				B66236B824FDA698006CABD7 /* mame64 */,
 				B635C09C26784A4800B23BFD /* Sparkle.framework */,
@@ -1525,7 +1372,6 @@
 				B6152B5C25F6F4F800605E6E /* ShellScript */,
 				B66236BB24FDA71D006CABD7 /* CopyFiles */,
 				B611BA3D26796483008597B5 /* ShellScript */,
-				B6DD93962BB4F5B700921359 /* CopyFiles */,
 			);
 			buildRules = (
 			);
@@ -1610,17 +1456,14 @@
 				B67878982B01732700CFACF2 /* ip6800.plist in Resources */,
 				B67878892B01732700CFACF2 /* indigo_r4000.plist in Resources */,
 				B67878B92B01732700CFACF2 /* pi4d30.plist in Resources */,
-				B65C0A772B9E77DC00CB24C9 /* mactv.plist in Resources */,
 				B67878822B01732700CFACF2 /* hp9k330.plist in Resources */,
 				B67878C82B01732700CFACF2 /* tk3000.plist in Resources */,
 				B678787E2B01732700CFACF2 /* ds3100.plist in Resources */,
 				B67878BA2B01732700CFACF2 /* pi4d35.plist in Resources */,
-				B6FECDD42BA8AA080025B402 /* orica.plist in Resources */,
 				B67878C42B01732700CFACF2 /* rtpc020.plist in Resources */,
 				B6DDECD62505A86E0093587A /* eject-16x16.png in Resources */,
 				B678788C2B01732700CFACF2 /* indigo2_4415.plist in Resources */,
 				B6DDECCC2505A86E0093587A /* eject-16x16@2x.png in Resources */,
-				B6EEFAC82B9ABCAE0068B47C /* models.plist in Resources */,
 				B67878722B01732700CFACF2 /* apple2ep.plist in Resources */,
 				B67878AF2B01732700CFACF2 /* microeng.plist in Resources */,
 				B67878712B01732700CFACF2 /* apple2ees.plist in Resources */,
@@ -1631,13 +1474,10 @@
 				B67878862B01732700CFACF2 /* hp9k370.plist in Resources */,
 				B67878F32B01732700CFACF2 /* macqd605.plist in Resources */,
 				B67878E72B01732700CFACF2 /* mac512ke.plist in Resources */,
-				B65D1B982BB7B1AC00C15287 /* coco2bh.plist in Resources */,
 				B6DDECCE2505A86E0093587A /* eject-16x16@3x.png in Resources */,
 				B678789A2B01732700CFACF2 /* las3000.plist in Resources */,
-				B65D1B9A2BB7B1AC00C15287 /* coco3h.plist in Resources */,
 				B67878C52B01732700CFACF2 /* rtpc025.plist in Resources */,
 				B678786A2B01732700CFACF2 /* ace1000.plist in Resources */,
-				B6EEFACC2B9ABCAE0068B47C /* dragon200.plist in Resources */,
 				B67878FB2B01732700CFACF2 /* prav82.plist in Resources */,
 				B67878D92B01732700CFACF2 /* apple2euk.plist in Resources */,
 				B67878F72B01732700CFACF2 /* macsefd.plist in Resources */,
@@ -1682,7 +1522,6 @@
 				B678788F2B01732700CFACF2 /* indy_5015.plist in Resources */,
 				B67878E32B01732700CFACF2 /* las128ex.plist in Resources */,
 				B678786B2B01732700CFACF2 /* agat7.plist in Resources */,
-				B6EEFAB42B9ABCAE0068B47C /* tanodr64.plist in Resources */,
 				B678788D2B01732700CFACF2 /* indy_4610.plist in Resources */,
 				B678788B2B01732700CFACF2 /* indigo.plist in Resources */,
 				B6DDECC025057A550093587A /* drag-handle-4x10.png in Resources */,
@@ -1714,17 +1553,13 @@
 				B67878E52B01732700CFACF2 /* laser128o.plist in Resources */,
 				B6BA258524E99BEB005FB8FF /* MainMenu.xib in Resources */,
 				B67878CB2B01732700CFACF2 /* vt100.plist in Resources */,
-				B6EEFAC22B9ABCAE0068B47C /* dragon200e.plist in Resources */,
 				B67878C02B01732700CFACF2 /* rs2030.plist in Resources */,
 				B67878C22B01732700CFACF2 /* rtpc010.plist in Resources */,
 				B67878BE2B01732700CFACF2 /* roms.plist in Resources */,
-				B6FECDD02BA8AA080025B402 /* prav8d.plist in Resources */,
 				B678786D2B01732700CFACF2 /* am100.plist in Resources */,
-				B6EEFAC02B9ABCAE0068B47C /* coco.plist in Resources */,
 				B67878E02B01732700CFACF2 /* craft2p.plist in Resources */,
 				B6665C1C265C639A00254939 /* Autocomplete.xib in Resources */,
 				B67878BC2B01732700CFACF2 /* rc2030.plist in Resources */,
-				B65D1B962BB7B1AC00C15287 /* mc10.plist in Resources */,
 				B67879312B0195DB00CFACF2 /* sun2_120.plist in Resources */,
 				B67878FE2B01732700CFACF2 /* uniap2en.plist in Resources */,
 				B67879192B0195DB00CFACF2 /* sun2_50.plist in Resources */,
@@ -1753,25 +1588,18 @@
 				B67878782B01732700CFACF2 /* ceci.plist in Resources */,
 				B67878B72B01732700CFACF2 /* pi4d20.plist in Resources */,
 				B67878752B01732700CFACF2 /* apple2p.plist in Resources */,
-				B6EEFAB62B9ABCAE0068B47C /* dragon64.plist in Resources */,
 				B67878EE2B01732700CFACF2 /* maclc.plist in Resources */,
-				B6EEFAC62B9ABCAE0068B47C /* d64plus.plist in Resources */,
 				B67878802B01732700CFACF2 /* hp9k310.plist in Resources */,
 				B67878842B01732700CFACF2 /* hp9k340.plist in Resources */,
 				B678789B2B01732700CFACF2 /* laser128.plist in Resources */,
-				B6EEFABE2B9ABCAE0068B47C /* coco2b.plist in Resources */,
 				B678787D2B01732700CFACF2 /* ds2100.plist in Resources */,
 				B67878AC2B01732700CFACF2 /* macqd800.plist in Resources */,
-				B6EEFABA2B9ABCAE0068B47C /* trs80.plist in Resources */,
 				B6D6DE3924FAC8B500661A5F /* Preferences.xib in Resources */,
-				B6EEFACA2B9ABCAE0068B47C /* coco3p.plist in Resources */,
 				B63C1F0B25B143C50016A611 /* CheatSheet.xib in Resources */,
 				B67878B12B01732700CFACF2 /* mprof3.plist in Resources */,
 				B67878CC2B01732700CFACF2 /* vt101.plist in Resources */,
 				B67878CE2B01732700CFACF2 /* vt240.plist in Resources */,
 				B67878C12B01732700CFACF2 /* rs3230.plist in Resources */,
-				B65D1B942BB7B1AC00C15287 /* cocoh.plist in Resources */,
-				B6EEFAC42B9ABCAE0068B47C /* dragon32.plist in Resources */,
 				B67879172B0195DB00CFACF2 /* sun1.plist in Resources */,
 				B67878962B01732700CFACF2 /* ip6400.plist in Resources */,
 				B67878EA2B01732700CFACF2 /* macii.plist in Resources */,
@@ -1793,20 +1621,18 @@
 				B6F7B538266FDA5B00624C6B /* MachineView.xib in Resources */,
 				B67878852B01732700CFACF2 /* hp9k360.plist in Resources */,
 				B67878942B01732700CFACF2 /* ip2800.plist in Resources */,
-				B6EEFAB82B9ABCAE0068B47C /* coco3.plist in Resources */,
 				B67878F82B01732700CFACF2 /* megast.plist in Resources */,
 				B67878F62B01732700CFACF2 /* macse.plist in Resources */,
 				B678792F2B0195DB00CFACF2 /* sun4_40.plist in Resources */,
 				B67878A82B01732700CFACF2 /* maclc575.plist in Resources */,
 				B67878FF2B01732700CFACF2 /* uniap2ti.plist in Resources */,
 				B67878CF2B01732700CFACF2 /* zijini.plist in Resources */,
-				B6FECDD22BA8AA080025B402 /* telstrat.plist in Resources */,
 				B67878A92B01732700CFACF2 /* macplus.plist in Resources */,
-				B6EEFABC2B9ABCAE0068B47C /* trs80l2.plist in Resources */,
 				B67878912B01732700CFACF2 /* ip2400.plist in Resources */,
 				B67878AD2B01732700CFACF2 /* macse30.plist in Resources */,
 				B67878E12B01732700CFACF2 /* elppa.plist in Resources */,
 				B66236C124FDB7A6006CABD7 /* Credits.rtf in Resources */,
+				B63C1B8E25004C6D00511A71 /* mame-data.tgz in Resources */,
 				B67878832B01732700CFACF2 /* hp9k332.plist in Resources */,
 				B678786E2B01732700CFACF2 /* apple2.plist in Resources */,
 				B67879232B0195DB00CFACF2 /* sun4_50.plist in Resources */,
@@ -1814,7 +1640,6 @@
 				B6D6DE3B24FACF4F00661A5F /* Defaults.plist in Resources */,
 				B67878F92B01732700CFACF2 /* models.plist in Resources */,
 				B67878952B01732700CFACF2 /* ip6000.plist in Resources */,
-				B6FECDD62BA8AA080025B402 /* oric1.plist in Resources */,
 				B67878A62B01732700CFACF2 /* maclc3p.plist in Resources */,
 				B67878A22B01732700CFACF2 /* maciihmu.plist in Resources */,
 			);
@@ -1827,12 +1652,8 @@
 				B67878232B01732600CFACF2 /* pi4d35.plist in Resources */,
 				B67878502B01732600CFACF2 /* mac512ke.plist in Resources */,
 				B67878632B01732600CFACF2 /* prav8c.plist in Resources */,
-				B636F5CA2B1168C00063F9D8 /* bbcb.plist in Resources */,
 				B67877F72B01732600CFACF2 /* indy_4613.plist in Resources */,
-				B6EEFAC72B9ABCAE0068B47C /* d64plus.plist in Resources */,
 				B67877D32B01732600CFACF2 /* ace1000.plist in Resources */,
-				B6EEFAB92B9ABCAE0068B47C /* coco3.plist in Resources */,
-				B6852ECE2B0EAA7500BBFFC7 /* a500.plist in Resources */,
 				B67878222B01732600CFACF2 /* pi4d30.plist in Resources */,
 				B67878022B01732600CFACF2 /* las128e2.plist in Resources */,
 				B67877F92B01732600CFACF2 /* ip2000.plist in Resources */,
@@ -1850,11 +1671,9 @@
 				B67877D82B01732600CFACF2 /* apple2cp.plist in Resources */,
 				B67879052B0195C200CFACF2 /* nws5000x.plist in Resources */,
 				B67878242B01732600CFACF2 /* prav8m.plist in Resources */,
-				B636F5C92B1168C00063F9D8 /* bbcb_us.plist in Resources */,
 				B67877D92B01732600CFACF2 /* apple2ee.plist in Resources */,
 				B678785F2B01732600CFACF2 /* macse.plist in Resources */,
 				B6DDECD72505A86E0093587A /* eject-16x16.png in Resources */,
-				B636F5CF2B1168C00063F9D8 /* bbcm.plist in Resources */,
 				B67878352B01732600CFACF2 /* vt101.plist in Resources */,
 				B6DDECCD2505A86E0093587A /* eject-16x16@2x.png in Resources */,
 				B67878312B01732600CFACF2 /* tk3000.plist in Resources */,
@@ -1871,25 +1690,19 @@
 				B678791A2B0195DB00CFACF2 /* sun2_50.plist in Resources */,
 				B67877FF2B01732600CFACF2 /* ip6400.plist in Resources */,
 				B67877DA2B01732600CFACF2 /* apple2ees.plist in Resources */,
-				B6EEFABD2B9ABCAE0068B47C /* trs80l2.plist in Resources */,
 				B678783D2B01732600CFACF2 /* apple1.plist in Resources */,
 				B67878622B01732600CFACF2 /* models.plist in Resources */,
 				B67877D62B01732600CFACF2 /* am100.plist in Resources */,
 				B678783E2B01732600CFACF2 /* apple2c.plist in Resources */,
-				B65C0A782B9E77DC00CB24C9 /* mactv.plist in Resources */,
 				B67878012B01732600CFACF2 /* ip6800.plist in Resources */,
 				B678782B2B01732600CFACF2 /* rtpc010.plist in Resources */,
-				B6852ECD2B0EAA7500BBFFC7 /* a2000n.plist in Resources */,
 				B6DDECCF2505A86E0093587A /* eject-16x16@3x.png in Resources */,
 				B67877FA2B01732600CFACF2 /* ip2400.plist in Resources */,
-				B6852EC92B0EAA7500BBFFC7 /* a500n.plist in Resources */,
 				B67878042B01732600CFACF2 /* laser128.plist in Resources */,
 				B6DDECD12505A86E0093587A /* eject-hover-16x16.png in Resources */,
-				B636F5D02B1168C00063F9D8 /* bbca.plist in Resources */,
 				B67878442B01732600CFACF2 /* apple2jp.plist in Resources */,
 				B67877DE2B01732600CFACF2 /* apple2p.plist in Resources */,
 				B678782A2B01732600CFACF2 /* rs3230.plist in Resources */,
-				B6852ECA2B0EAA7500BBFFC7 /* a1000.plist in Resources */,
 				B67878332B01732600CFACF2 /* vt52.plist in Resources */,
 				B678780A2B01732600CFACF2 /* maciici.plist in Resources */,
 				B67878172B01732600CFACF2 /* maxxi.plist in Resources */,
@@ -1900,11 +1713,9 @@
 				B67878252B01732600CFACF2 /* rc2030.plist in Resources */,
 				B67878452B01732600CFACF2 /* apple3.plist in Resources */,
 				B67878392B01732600CFACF2 /* ace500.plist in Resources */,
-				B65D1B952BB7B1AC00C15287 /* cocoh.plist in Resources */,
 				B67878192B01732600CFACF2 /* models~extra.plist in Resources */,
 				B67877D72B01732600CFACF2 /* apple2.plist in Resources */,
 				B67878072B01732600CFACF2 /* maccclas.plist in Resources */,
-				B6FECDD12BA8AA080025B402 /* prav8d.plist in Resources */,
 				B678783F2B01732600CFACF2 /* apple2e.plist in Resources */,
 				B67877DD2B01732600CFACF2 /* apple2gsr1.plist in Resources */,
 				B678781E2B01732600CFACF2 /* pdp11ub.plist in Resources */,
@@ -1913,15 +1724,12 @@
 				B67879282B0195DB00CFACF2 /* sun3_150.plist in Resources */,
 				B67877FC2B01732600CFACF2 /* ip2700.plist in Resources */,
 				B67879322B0195DB00CFACF2 /* sun2_120.plist in Resources */,
-				B6EEFAC92B9ABCAE0068B47C /* models.plist in Resources */,
 				B67878492B01732600CFACF2 /* craft2p.plist in Resources */,
 				B678780F2B01732600CFACF2 /* maclc3p.plist in Resources */,
 				B67877D22B01732600CFACF2 /* ace100.plist in Resources */,
 				B678785D2B01732600CFACF2 /* macqd630.plist in Resources */,
-				B6EEFAC12B9ABCAE0068B47C /* coco.plist in Resources */,
 				B67878652B01732600CFACF2 /* space84.plist in Resources */,
 				B67877ED2B01732600CFACF2 /* hp9k340.plist in Resources */,
-				B6EEFAC32B9ABCAE0068B47C /* dragon200e.plist in Resources */,
 				B67878532B01732600CFACF2 /* macii.plist in Resources */,
 				B678780B2B01732600CFACF2 /* maciihmu.plist in Resources */,
 				B678792E2B0195DB00CFACF2 /* sun3_260.plist in Resources */,
@@ -1935,14 +1743,10 @@
 				B67877E02B01732600CFACF2 /* cece.plist in Resources */,
 				B678785C2B01732600CFACF2 /* macqd605.plist in Resources */,
 				B67878122B01732600CFACF2 /* macplus.plist in Resources */,
-				B6EEFABF2B9ABCAE0068B47C /* coco2b.plist in Resources */,
-				B6EEFACB2B9ABCAE0068B47C /* coco3p.plist in Resources */,
 				B67878592B01732600CFACF2 /* maclc475.plist in Resources */,
 				B678784F2B01732600CFACF2 /* mac128k.plist in Resources */,
 				B678782E2B01732600CFACF2 /* rtpc025.plist in Resources */,
 				B6DDECD52505A86E0093587A /* eject-hover-16x16@3x.png in Resources */,
-				B65D1B972BB7B1AC00C15287 /* mc10.plist in Resources */,
-				B6EEFACD2B9ABCAE0068B47C /* dragon200.plist in Resources */,
 				B678784C2B01732600CFACF2 /* las128ex.plist in Resources */,
 				B67878262B01732600CFACF2 /* rc3230.plist in Resources */,
 				B67877E72B01732600CFACF2 /* ds3100.plist in Resources */,
@@ -1951,7 +1755,6 @@
 				B67879162B0195DB00CFACF2 /* sun3_50.plist in Resources */,
 				B67878322B01732600CFACF2 /* uniap2pt.plist in Resources */,
 				B6DE323926044C1100418375 /* caution.png in Resources */,
-				B6FECDD72BA8AA080025B402 /* oric1.plist in Resources */,
 				B678783A2B01732600CFACF2 /* ace2200.plist in Resources */,
 				B6DE323726044C1100418375 /* caution@2x.png in Resources */,
 				B67877F42B01732600CFACF2 /* indigo.plist in Resources */,
@@ -1959,13 +1762,10 @@
 				B6DDECC125057A550093587A /* drag-handle-4x10.png in Resources */,
 				B6DDECC325057A550093587A /* drag-handle-4x10@2x.png in Resources */,
 				B6DDECC525057A550093587A /* drag-handle-4x10@3x.png in Resources */,
-				B6EEFAC52B9ABCAE0068B47C /* dragon32.plist in Resources */,
 				B67878212B01732600CFACF2 /* pi4d25.plist in Resources */,
 				B67878582B01732600CFACF2 /* maclc3.plist in Resources */,
-				B6FECDD32BA8AA080025B402 /* telstrat.plist in Resources */,
 				B67878202B01732600CFACF2 /* pi4d20.plist in Resources */,
 				B67878112B01732600CFACF2 /* maclc575.plist in Resources */,
-				B6EEFABB2B9ABCAE0068B47C /* trs80.plist in Resources */,
 				B6E4B5C024FDE2670094A35C /* LaunchWindow.xib in Resources */,
 				B678785E2B01732600CFACF2 /* macqd700.plist in Resources */,
 				B6665C1D265C639A00254939 /* Autocomplete.xib in Resources */,
@@ -1999,47 +1799,35 @@
 				B67879302B0195DB00CFACF2 /* sun4_40.plist in Resources */,
 				B67877D42B01732600CFACF2 /* agat7.plist in Resources */,
 				B67877FD2B01732600CFACF2 /* ip2800.plist in Resources */,
-				B636F5CD2B1168C00063F9D8 /* bbcb_no.plist in Resources */,
 				B67878562B01732600CFACF2 /* maciivx.plist in Resources */,
 				B678782C2B01732600CFACF2 /* rtpc015.plist in Resources */,
 				B67878362B01732600CFACF2 /* vt102.plist in Resources */,
 				B63C1F0C25B143C50016A611 /* CheatSheet.xib in Resources */,
-				B636F5C82B1168C00063F9D8 /* bbcmc.plist in Resources */,
 				B67878682B01732600CFACF2 /* uniap2ti.plist in Resources */,
 				B67877DF2B01732600CFACF2 /* basis108.plist in Resources */,
 				B67878132B01732600CFACF2 /* macqd610.plist in Resources */,
 				B67878542B01732600CFACF2 /* maciicx.plist in Resources */,
-				B6FECDD52BA8AA080025B402 /* orica.plist in Resources */,
-				B636F5D12B1168C00063F9D8 /* electron.plist in Resources */,
 				B63C1B9725008A2700511A71 /* DownloadWindow.xib in Resources */,
 				B6E4B5D324FDE2670094A35C /* MainMenu.xib in Resources */,
-				B636F5CE2B1168C00063F9D8 /* bbcb_de.plist in Resources */,
 				B67877EB2B01732600CFACF2 /* hp9k330.plist in Resources */,
-				B6852ECC2B0EAA7500BBFFC7 /* a2000.plist in Resources */,
 				B678780E2B01732600CFACF2 /* maclc2.plist in Resources */,
 				B67878642B01732600CFACF2 /* prav82.plist in Resources */,
 				B67879262B0195DB00CFACF2 /* sun4_65.plist in Resources */,
 				B67877EA2B01732600CFACF2 /* hp9k320.plist in Resources */,
 				B67878142B01732600CFACF2 /* macqd650.plist in Resources */,
-				B6EEFAB52B9ABCAE0068B47C /* tanodr64.plist in Resources */,
 				B6E4B5DA24FDE2670094A35C /* Credits.rtf in Resources */,
-				B636F5CC2B1168C00063F9D8 /* bbcbp.plist in Resources */,
 				B67878422B01732600CFACF2 /* apple2euk.plist in Resources */,
-				B6852ECB2B0EAA7500BBFFC7 /* a1000n.plist in Resources */,
 				B678781B2B01732600CFACF2 /* nws3260.plist in Resources */,
-				B6EEFAB72B9ABCAE0068B47C /* dragon64.plist in Resources */,
 				B67878182B01732600CFACF2 /* microeng.plist in Resources */,
 				B678784E2B01732600CFACF2 /* laser128o.plist in Resources */,
 				B67878092B01732600CFACF2 /* macct650.plist in Resources */,
 				B67878662B01732600CFACF2 /* st.plist in Resources */,
 				B67878552B01732600CFACF2 /* maciisi.plist in Resources */,
-				B65D1B992BB7B1AC00C15287 /* coco2bh.plist in Resources */,
 				B67878052B01732600CFACF2 /* mac2fdhd.plist in Resources */,
 				B678784B2B01732600CFACF2 /* ivelultr.plist in Resources */,
 				B67878162B01732600CFACF2 /* macse30.plist in Resources */,
 				B678785A2B01732600CFACF2 /* maclc550.plist in Resources */,
 				B678784A2B01732600CFACF2 /* elppa.plist in Resources */,
-				B65D1B9B2BB7B1AC00C15287 /* coco3h.plist in Resources */,
 				B6E4B5E324FDE2670094A35C /* Defaults.plist in Resources */,
 				B6F7B539266FDA5B00624C6B /* MachineView.xib in Resources */,
 				B678783B2B01732600CFACF2 /* agat9.plist in Resources */,
@@ -2053,11 +1841,9 @@
 				B6E4B5ED24FDE2670094A35C /* Preferences.xib in Resources */,
 				B67877F12B01732600CFACF2 /* hp9k382.plist in Resources */,
 				B67878152B01732600CFACF2 /* macqd800.plist in Resources */,
-				B636F5C72B1168C00063F9D8 /* bbcbp128.plist in Resources */,
 				B67878372B01732600CFACF2 /* vt240.plist in Resources */,
 				B67878302B01732600CFACF2 /* spectred.plist in Resources */,
 				B67877E82B01732600CFACF2 /* hkc8800a.plist in Resources */,
-				B636F5CB2B1168C00063F9D8 /* bbcmt.plist in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -2296,7 +2082,6 @@
 				CLANG_ENABLE_MODULES = NO;
 				CODE_SIGN_ENTITLEMENTS = pty_shell/pty_shell.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				DEVELOPMENT_TEAM = 583V9CR5RE;
 				ENABLE_HARDENED_RUNTIME = YES;
 				INSTALL_PATH = "";
 				MACOSX_DEPLOYMENT_TARGET = 10.13;
@@ -2310,7 +2095,6 @@
 				CLANG_ENABLE_MODULES = NO;
 				CODE_SIGN_ENTITLEMENTS = pty_shell/pty_shell.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				DEVELOPMENT_TEAM = 583V9CR5RE;
 				ENABLE_HARDENED_RUNTIME = YES;
 				INSTALL_PATH = "";
 				MACOSX_DEPLOYMENT_TARGET = 10.13;
@@ -2323,7 +2107,6 @@
 			buildSettings = {
 				CODE_SIGN_ENTITLEMENTS = vmnet_helper/vmnet_helper.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				DEVELOPMENT_TEAM = 583V9CR5RE;
 				ENABLE_HARDENED_RUNTIME = YES;
 				INSTALL_PATH = "";
 				MACOSX_DEPLOYMENT_TARGET = 10.13;
@@ -2336,7 +2119,6 @@
 			buildSettings = {
 				CODE_SIGN_ENTITLEMENTS = vmnet_helper/vmnet_helper.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				DEVELOPMENT_TEAM = 583V9CR5RE;
 				ENABLE_HARDENED_RUNTIME = YES;
 				INSTALL_PATH = "";
 				MACOSX_DEPLOYMENT_TARGET = 10.13;
@@ -2460,8 +2242,7 @@
 				CODE_SIGN_ENTITLEMENTS = Ample/Ample.entitlements;
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 58;
+				CURRENT_PROJECT_VERSION = 52;
-				DEVELOPMENT_TEAM = 583V9CR5RE;
 				ENABLE_HARDENED_RUNTIME = YES;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -2473,7 +2254,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.13;
-				MARKETING_VERSION = "0.266-u2";
+				MARKETING_VERSION = "0.260-u2";
 				PRODUCT_BUNDLE_IDENTIFIER = com.ksherlock.ample;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
@@ -2486,8 +2267,7 @@
 				CODE_SIGN_ENTITLEMENTS = Ample/Ample.entitlements;
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 58;
+				CURRENT_PROJECT_VERSION = 52;
-				DEVELOPMENT_TEAM = 583V9CR5RE;
 				ENABLE_HARDENED_RUNTIME = YES;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -2499,7 +2279,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.13;
-				MARKETING_VERSION = "0.266-u2";
+				MARKETING_VERSION = "0.260-u2";
 				PRODUCT_BUNDLE_IDENTIFIER = com.ksherlock.ample;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
@@ -2512,7 +2292,7 @@
 				CODE_SIGN_ENTITLEMENTS = Ample/Ample.entitlements;
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 58;
+				CURRENT_PROJECT_VERSION = 52;
 				FRAMEWORK_SEARCH_PATHS = "$(inherited)";
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"DEBUG=1",
@@ -2525,7 +2305,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.13;
-				MARKETING_VERSION = 0.266;
+				MARKETING_VERSION = 0.260;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.ksherlock.ample-lite";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
@@ -2538,7 +2318,7 @@
 				CODE_SIGN_ENTITLEMENTS = Ample/Ample.entitlements;
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 58;
+				CURRENT_PROJECT_VERSION = 52;
 				FRAMEWORK_SEARCH_PATHS = "$(inherited)";
 				GCC_PREPROCESSOR_DEFINITIONS = "AMPLE_LITE=1";
 				INFOPLIST_FILE = Ample/Info.plist;
@@ -2547,7 +2327,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.13;
-				MARKETING_VERSION = 0.266;
+				MARKETING_VERSION = 0.260;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.ksherlock.ample-lite";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};

Ample/Ample.h

@@ -33,7 +33,6 @@ extern NSString *kMamePath;
 extern NSString *kMameWorkingDirectory;
 extern NSString *kAutoCloseLogWindow;
 extern NSString *kMameComponentsDate;
-extern NSString *kUseLogWindow;
 
 extern NSString *kDownloadURL;
 extern NSString *kDownloadExtension;

Ample/Ample.m

@@ -129,7 +129,6 @@ NSString *kUseCustomMame = @"UseCustomMame";
 NSString *kMamePath = @"MamePath";
 NSString *kMameWorkingDirectory = @"MameWorkingDirectory";
 NSString *kAutoCloseLogWindow = @"AutoCloseLogWindow";
-NSString *kUseLogWindow = @"UseLogWindow";
 NSString *kMameComponentsDate = @"MameComponentsDate";
 NSString *kDefaultDownloadURL = @"DefaultDownloadURL";
 NSString *kDefaultDownloadExtension = @"DefaultDownloadExtension";

Ample/AppDelegate.m

@@ -88,21 +88,12 @@
     NSDate *newDate = [defaults objectForKey: kMameComponentsDate];
     if (![newDate isKindOfClass: [NSDate class]])
         newDate = nil;
-  
+    
-
-
     if (!newDate) return YES; //????
     if (oldDate && [oldDate compare: newDate] >= 0) return YES;
 
-#if 0
     NSString *path = [bundle pathForResource: @"mame-data" ofType: @"tgz"];
     if (!path) return YES; // Ample Lite?
-#endif
-
-    NSString *ssp = [bundle sharedSupportPath];
-    NSString *path = [ssp stringByAppendingPathComponent: @"mame-data.tgz"];
-    if (![[NSFileManager defaultManager] fileExistsAtPath: path])
-        return YES; // Ample Lite?
 
     
     NSWindow *win = _installWindow;

Ample/Base.lproj/DownloadWindow.xib

@@ -117,7 +117,6 @@
                                         </tableColumn>
                                     </tableColumns>
                                     <connections>
-                                        <action trigger="doubleAction" selector="doubleClick:" target="-2" id="y2y-h7-cfD"/>
                                         <binding destination="jhO-4z-Qwt" name="content" keyPath="arrangedObjects" id="2av-gV-V4K"/>
                                         <outlet property="menu" destination="RJM-21-hjO" id="xpL-0n-1jm"/>
                                     </connections>

Ample/Base.lproj/LaunchWindow.xib

@@ -159,21 +159,10 @@
                                                 <font key="font" metaFont="menu"/>
                                                 <menu key="menu" id="m4N-Qw-mem">
                                                     <items>
-                                                        <menuItem title="Full Screen" state="on" id="0zZ-Ib-Fne">
+                                                        <menuItem title="Full Screen" state="on" id="0zZ-Ib-Fne"/>
-                                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                                        <menuItem title="Window 1x" id="3bZ-rq-fCt"/>
-                                                        </menuItem>
+                                                        <menuItem title="Window 2x" id="KA4-Rs-yyK"/>
-                                                        <menuItem title="Window 1x" id="3bZ-rq-fCt">
+                                                        <menuItem title="Window 3x" id="Dbh-Js-pMx" userLabel="Window 3x"/>
-                                                            <modifierMask key="keyEquivalentModifierMask"/>
-                                                        </menuItem>
-                                                        <menuItem title="Window 2x" id="KA4-Rs-yyK">
-                                                            <modifierMask key="keyEquivalentModifierMask"/>
-                                                        </menuItem>
-                                                        <menuItem title="Window 3x" id="Dbh-Js-pMx" userLabel="Window 3x">
-                                                            <modifierMask key="keyEquivalentModifierMask"/>
-                                                        </menuItem>
-                                                        <menuItem title="Window 4x" id="GCs-En-3Jv">
-                                                            <modifierMask key="keyEquivalentModifierMask"/>
-                                                        </menuItem>
                                                     </items>
                                                 </menu>
                                             </popUpButtonCell>

Ample/Base.lproj/Preferences.xib

@@ -26,7 +26,7 @@
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <textField verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Oz5-Xb-btk">
-                        <rect key="frame" x="138" y="159" width="322" height="21"/>
+                        <rect key="frame" x="138" y="181" width="322" height="21"/>
                         <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMinY="YES"/>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" drawsBackground="YES" id="vDR-2V-qxd">
                             <font key="font" usesAppearanceFont="YES"/>
@@ -40,7 +40,7 @@
                         </connections>
                     </textField>
                     <textField verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="l8V-pC-gml">
-                        <rect key="frame" x="138" y="128" width="322" height="21"/>
+                        <rect key="frame" x="138" y="150" width="322" height="21"/>
                         <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMinY="YES"/>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" drawsBackground="YES" id="wfj-GY-Qu2">
                             <font key="font" usesAppearanceFont="YES"/>
@@ -49,12 +49,12 @@
                         </textFieldCell>
                         <connections>
                             <action selector="wdChanged:" target="-2" id="g1P-8l-ZXi"/>
-                            <binding destination="yvB-HG-64y" name="value" keyPath="values.MameWorkingDirectory" id="Kc9-Pc-XGU"/>
                             <binding destination="yvB-HG-64y" name="enabled" keyPath="values.UseCustomMame" id="DeG-OW-Gd2"/>
+                            <binding destination="yvB-HG-64y" name="value" keyPath="values.MameWorkingDirectory" id="Kc9-Pc-XGU"/>
                         </connections>
                     </textField>
                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="vTJ-Ez-c1R">
-                        <rect key="frame" x="18" y="131" width="114" height="16"/>
+                        <rect key="frame" x="18" y="153" width="114" height="16"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <textFieldCell key="cell" lineBreakMode="clipping" title="Working Directory" id="UHt-0s-zxA">
                             <font key="font" metaFont="system"/>
@@ -63,7 +63,7 @@
                         </textFieldCell>
                     </textField>
                     <button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="KAN-P2-ydI">
-                        <rect key="frame" x="136" y="212" width="217" height="18"/>
+                        <rect key="frame" x="136" y="234" width="217" height="18"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <buttonCell key="cell" type="check" title="Close log window on normal exit" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="QMz-O0-06U">
                             <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
@@ -74,7 +74,7 @@
                         </connections>
                     </button>
                     <button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="j7D-jC-17Q">
-                        <rect key="frame" x="136" y="186" width="139" height="18"/>
+                        <rect key="frame" x="136" y="208" width="139" height="18"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <buttonCell key="cell" type="check" title="Use Custom MAME" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="V61-mz-QFo">
                             <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
@@ -96,7 +96,7 @@
                         </connections>
                     </button>
                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Qmb-Ag-Xyr">
-                        <rect key="frame" x="58" y="162" width="74" height="16"/>
+                        <rect key="frame" x="58" y="184" width="74" height="16"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <textFieldCell key="cell" lineBreakMode="clipping" title="MAME Path" id="Xcq-4g-Wlw">
                             <font key="font" metaFont="system"/>
@@ -104,20 +104,9 @@
                             <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                         </textFieldCell>
                     </textField>
-                    <button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="qT7-cc-Phc">
-                        <rect key="frame" x="136" y="234" width="118" height="18"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                        <buttonCell key="cell" type="check" title="Use log window" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="Adv-KH-abG">
-                            <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
-                            <font key="font" metaFont="system"/>
-                        </buttonCell>
-                        <connections>
-                            <binding destination="yvB-HG-64y" name="value" keyPath="values.UseLogWindow" id="meK-Jb-s8b"/>
-                        </connections>
-                    </button>
                 </subviews>
             </view>
-            <point key="canvasLocation" x="80" y="144"/>
+            <point key="canvasLocation" x="140" y="147"/>
         </window>
         <userDefaultsController id="KVS-Ag-1un"/>
         <userDefaultsController representsSharedInstance="YES" id="yvB-HG-64y"/>

Ample/Defaults.plist

@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>MameComponentsDate</key>
-	<date>2024-05-31T12:00:00Z</date>
+	<date>2023-11-04T12:00:00Z</date>
 	<key>UseCustomMame</key>
 	<false/>
 	<key>AutoCloseLogWindow</key>
@@ -16,8 +16,6 @@
 	<true/>
 	<key>DefaultDownloadURL</key>
 	<string>https://archive.org/download/mame-merged/mame-merged</string>
-	<key>UseLogWindow</key>
-	<true/>
 	<key>DefaultDownloadExtension</key>
 	<string>zip</string>
 </dict>

Ample/DownloadWindowController.m

@@ -481,10 +481,6 @@ enum {
 
 }
 
--(IBAction)doubleClick:(id)sender {
-    [self download: sender];
-}
-
 - (IBAction)download:(id)sender {
     DownloadItem *item = [self clickedItem];
     if (!item) return;
@@ -614,16 +610,13 @@ static NSInteger TaskStatusCode(NSURLSessionTask *task) {
     NSURL *dest = [_romFolder URLByAppendingPathComponent: [src lastPathComponent]];
     NSError *error = nil;
 
-    /* just in case ... */
-    [fm removeItemAtURL: dest error: NULL];
     [fm moveItemAtURL: location toURL: dest error: &error];
 
     dispatch_async(dispatch_get_main_queue(), ^(void){
         NSMutableDictionary *taskIndex = self->_taskIndex;
         DownloadItem *item = [taskIndex objectForKey: task];
 
-        if (error) [item completeWithError: error];
+        [item refresh: dest];
-        else [item refresh: dest];
     });
 
     NSLog(@"%@", src);

Ample/LaunchWindowController.m

@@ -25,20 +25,6 @@ static NSString *kMyContext = @"kMyContext";
 static NSString *kContextMachine = @"kContextMachine";
 
 
-static NSString *NeedsAspectRatio(NSString *machine) {
-    static NSDictionary *dict = nil;
-    
-    if (!dict) {
-        dict = @{
-            @"oric1": @"2:1",
-            @"orica": @"2:1",
-            @"prav8d": @"2:1",
-            @"telstrat": @"2:1",
-        };
-    }
-    return [dict objectForKey: machine];
-}
-
 @interface LaunchWindowController () {
     BOOL _loadingBookmark;
     NSString *_machine;
@@ -334,7 +320,7 @@ static NSString * JoinArguments(NSArray *argv, NSString *argv0) {
 
     if (!safe) {
         NSString *str =
-            @"%+-./:=_,"
+            @"%+-./:=_"
             @"0123456789"
             @"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
         ;
@@ -409,7 +395,7 @@ static NSString *ShellQuote(NSString *s) {
 
     if (!safe) {
         NSString *str =
-            @"%+-./:=_,"
+            @"%+-./:=_"
             @"0123456789"
             @"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
         ;
@@ -496,8 +482,6 @@ static NSString *ShellQuote(NSString *s) {
      * for square pixels, should pass the true size and true aspect ratio.
      */
 
-
-    
     NSSize screen = [_slotController resolution];
     switch(_mameWindowMode) {
         case 0: // full screen;
@@ -514,18 +498,12 @@ static NSString *ShellQuote(NSString *s) {
             // drop through.
         case 2: // 2x
         case 3: // 3x
-        case 4: // 4x
+
-            
             if (_mameSquarePixels) {
                 //              NSString *aspect = [NSString stringWithFormat: @"%u:%u", (unsigned)screen.width, (unsigned)screen.height];
                 //              [argv addObject: @"-aspect"];
                 //              [argv addObject: aspect];
-
+                [argv addObject: @"-nounevenstretch"];
-                float hscale = round((screen.width * 3 / 4) / screen.height);
-                if (hscale < 1) hscale = 1;
-                screen.height *= hscale;
-
-
             } else {
                 screen.height = round(screen.width * 3 / 4);
             }
@@ -538,22 +516,11 @@ static NSString *ShellQuote(NSString *s) {
 
             [argv addObject: @"-resolution"];
             [argv addObject: res];
-            if (_mameSquarePixels) {
-                [argv addObject: @"-nounevenstretch"];
-
-                NSString *aspect = NeedsAspectRatio(_machine);
-                if (aspect) {
-                    [argv addObject: @"-aspect"];
-                    [argv addObject: aspect];
-                }
-
-            }
             break;
     }
 
 
 
-
     if (_mameBGFX) {
         [argv addObject: @"-video"];
         [argv addObject: @"bgfx"];

Ample/LogWindowController.m

@@ -34,7 +34,7 @@ static NSMutableSet *LogWindows;
 }
 
 
-+(id)controllerForTask: (NSTask *)task close: (BOOL)close {
++(id)controllerForTask: (NSTask *)task close: (BOOL)close{
     LogWindowController *controller = [[LogWindowController alloc] initWithWindowNibName: @"LogWindow"];
     [controller runTask: task close: close];
     return controller;
@@ -43,8 +43,6 @@ static NSMutableSet *LogWindows;
 
 +(id)controllerForArgs: (NSArray *)args close: (BOOL)close {
 
-    NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
-    
     NSURL *url = MameURL();
 
     if (!url) {
@@ -67,30 +65,6 @@ static NSMutableSet *LogWindows;
     
     [task setArguments: args];
     
-    if ([defaults boolForKey: kUseLogWindow] == NO) {
-
-        NSAlert *alert = nil;
-        if (@available(macOS 10.13, *)) {
-            NSError *error = nil;
-
-            [task launchAndReturnError: &error];
-            if (error) {
-                alert = [NSAlert alertWithError: error];
-            }
-        } else {
-            @try {
-                [task launch];
-            } @catch (NSException *exception) {
-
-                alert = [NSAlert new];
-                [alert setMessageText: [exception reason]];
-            }
-        }
-        if (alert) [alert runModal];
-        return nil;
-    }
-    
-    
     return [LogWindowController controllerForTask: task close: close];
 
 }

Ample/Media.h

@@ -23,9 +23,7 @@ typedef struct Media {
     unsigned midiout;
     unsigned picture;
     unsigned rom;
-    uint64_t floppy_mask_8;
+    //uint64_t floppy_mask;
-    uint64_t floppy_mask_5_25;
-    uint64_t floppy_mask_3_5;
 } Media;
 
 

Ample/Media.m

@@ -40,8 +40,7 @@ void MediaAdd(Media *dest, const Media *src) {
     // could merge from src media but not currently set there.
     
     //unsigned count;
-    unsigned dest_flops = dest->floppy_8 + dest->floppy_5_25 + dest->floppy_3_5;
+    //unsigned flops = dest->floppy_8 + dest->floppy_5_25 + dest->floppy_3_5;
-    unsigned src_flops = src->floppy_8 || src->floppy_5_25 || src->floppy_3_5;
 
     
 #define _(name) dest->name += src->name;
@@ -59,25 +58,15 @@ void MediaAdd(Media *dest, const Media *src) {
     _(rom);
 #undef _
 
-    
+#if 0
-    // this assumes any device that supports more than 1 floppy size
+    // TODO - FLOPPY_8
-    // the order is 8" < 5.25" < 3.5"
+    if ((count = src->floppy_5_25)) {
-
+        uint64_t bits = (1 << count) - 1;
-    if (src_flops) {
+        //dest->floppy_mask <<= count;
-        uint64_t bits = 1 << dest_flops;
+        bits <<= flops;
-        for (unsigned i = 0; i < src->floppy_8; ++i) {
+        dest->floppy_mask |= bits;
-            dest->floppy_mask_8 |= bits;
-            bits <<= 1;
-        }
-        for (unsigned i = 0; i < src->floppy_5_25; ++i) {
-            dest->floppy_mask_5_25 |= bits;
-            bits <<= 1;
-        }
-        for (unsigned i = 0; i < src->floppy_3_5; ++i) {
-            dest->floppy_mask_3_5 |= bits;
-            bits <<= 1;
-        }
     }
+#endif
 
 }
 
@@ -100,9 +89,7 @@ BOOL MediaEqual(const Media *lhs, const Media *rhs) {
     _(picture);
     _(rom);
 
-    _(floppy_mask_8);
+    //_(floppy_mask);
-    _(floppy_mask_5_25);
-    _(floppy_mask_3_5);
 
     return YES;
 #undef _

Ample/MediaViewController.m

@@ -355,10 +355,6 @@
     
     //unsigned counts[CATEGORY_COUNT] = { 0 };
 
-    uint64_t floppy_mask_8 = _media.floppy_mask_8;
-    uint64_t floppy_mask_5_25 = _media.floppy_mask_5_25;
-    uint64_t floppy_mask_3_5 = _media.floppy_mask_3_5;
-
     for (unsigned j = 0; j < CATEGORY_COUNT; ++j) {
     
         //uint64_t floppy_mask = _media.floppy_mask;
@@ -366,31 +362,49 @@
 
         MediaCategory *cat = _data[j];
         NSInteger valid = [cat validCount];
-
+        
+        // assumes floppy order is 8", 5.25", 3.5".
+        switch(j) {
+            case kIndexFloppy8:
+                index = 0;
+                break;
+            case kIndexFloppy525:
+                index = _media.floppy_8;
+                break;
+            case kIndexFloppy35:
+                index = _media.floppy_8 + _media.floppy_5_25;
+                break;
+        }
+        
         for (NSInteger i = 0; i < valid; ++i) {
 
             MediaItem *item = [cat objectAtIndex: i];
             NSString *arg = [item argument];
 
-            switch(j) {
+            ++index;
-                case kIndexFloppy8:
-                    index = ffsll(floppy_mask_8);
-                    floppy_mask_8 &= ~(1 << (index-1));
-                    break;
-                case kIndexFloppy525:
-                    index = ffsll(floppy_mask_5_25);
-                    floppy_mask_5_25 &= ~(1 << (index-1));
-                    break;
-                case kIndexFloppy35:
-                    index = ffsll(floppy_mask_3_5);
-                    floppy_mask_3_5 &= ~(1 << (index-1));
-                    break;
-                default:
-                    ++index;
-            }
             if (!arg) continue;
-            if (!index) continue;
+#if 0
+            // TODO -- FLOPPY_8 support.
 
+            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;
+#endif
             [args addObject: [NSString stringWithFormat: @"-%s%u", prefix[j], index]];
             [args addObject: arg];
         }

Ample/Resources/CheatSheet.html

@@ -141,7 +141,7 @@
                     <td>Quit</td>
                 </tr>
                 <tr>
-                    <td><kbd>F5</kbd></td>
+                    <td><kbd>P</kbd></td>
                     <td>Pause</td>
                 </tr>
 
@@ -166,7 +166,8 @@
                     <td><kbd>Shift</kbd>+<kbd>F3</kbd></td>
                     <td>Hard reset</td>
                 </tr>
-<!--
+
+
                 <tr>
                     <td><kbd>F5</kbd></td>
                     <td>Toggle debugger</td>
@@ -175,17 +176,15 @@
                     <td><kbd>Shift</kbd>+<kbd>F5</kbd></td>
                     <td>Toggle graphic filters</td>
                 </tr>
--->
-                <tr>
-                    <td><kbd>Shift</kbd>+<kbd>F6</kbd></td>
-                    <td>Create save state</td>
-                </tr>
 
                 <tr>
                     <td><kbd>F7</kbd></td>
-                    <td>Load save state</td>
+                    <td>Load state</td>
+                </tr>
+                <tr>
+                    <td><kbd>Shift</kbd>+<kbd>F7</kbd></td>
+                    <td>Save state</td>
                 </tr>
- 
 
                 <tr>
                     <td><kbd>F10</kbd></td>

Ample/Resources/a1000.plist

@@ -1,875 +0,0 @@
-<?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>a1000</string>
-    <key>description</key>
-    <string>Amiga 1000 (PAL)</string>
-    <key>media</key>
-    <dict>
-    </dict>
-    <key>resolution</key>
-    <array>
-      <integer>724</integer>
-      <integer>567</integer>
-    </array>
-    <key>slots</key>
-    <array>
-      <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>rs232</string>
-        <key>description</key>
-        <string>Serial</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>scorpion</string>
-            <key>description</key>
-            <string>Micro-Robotics Scorpion Intelligent Controller</string>
-            <key>devname</key>
-            <string>scorpion_ic</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>loopback</string>
-            <key>description</key>
-            <string>RS-232 Loopback</string>
-            <key>devname</key>
-            <string>rs232_loopback</string>
-          </dict>
-          <dict>
-            <key>value</key>
-            <string>dec_loopback</string>
-            <key>description</key>
-            <string>RS-232 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>RS-232 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>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>rs232_sync_io</string>
-            <key>description</key>
-            <string>RS-232 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>centronics</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>
-            <false/>
-          </dict>
-          <dict>
-            <key>value</key>
-            <string>printer</string>
-            <key>description</key>
-            <string>Centronics Printer</string>
-            <key>default</key>
-            <true/>
-            <key>devname</key>
-            <string>centronics_printer</string>
-          </dict>
-          <dict>
-            <key>value</key>
-            <string>pl80</string>
-            <key>description</key>
-            <string>COMX PL-80</string>
-            <key>devname</key>
-            <string>comx_pl80</string>
-          </dict>
-          <dict>
-            <key>value</key>
-            <string>covox_stereo</string>
-            <key>description</key>
-            <string>Covox (Stereo-in-1)</string>
-            <key>devname</key>
-            <string>covox_stereo</string>
-          </dict>
-          <dict>
-            <key>value</key>
-            <string>covox</string>
-            <key>description</key>
-            <string>Covox Speech Thing</string>
-            <key>devname</key>
-            <string>covox</string>
-          </dict>
-          <dict>
-            <key>value</key>
-            <string>digiblst</string>
-            <key>description</key>
-            <string>Digiblaster (DIY)</string>
-            <key>devname</key>
-            <string>cpcdigiblst</string>
-          </dict>
-          <dict>
-            <key>value</key>
-            <string>ap2000</string>
-            <key>description</key>
-            <string>Epson ActionPrinter 2000</string>
-            <key>devname</key>
-            <string>ap2000</string>
-          </dict>
-          <dict>
-            <key>value</key>
-            <string>ex800</string>
-            <key>description</key>
-            <string>Epson EX-800</string>
-            <key>devname</key>
-            <string>ex800</string>
-          </dict>
-          <dict>
-            <key>value</key>
-            <string>lx800</string>
-            <key>description</key>
-            <string>Epson LX-800</string>
-            <key>devname</key>
-            <string>lx800</string>
-          </dict>
-          <dict>
-            <key>value</key>
-            <string>lx810l</string>
-            <key>description</key>
-            <string>Epson LX-810L</string>
-            <key>devname</key>
-            <string>lx810l</string>
-          </dict>
-          <dict>
-            <key>value</key>
-            <string>p72</string>
-            <key>description</key>
-            <string>NEC PinWriter P72</string>
-            <key>devname</key>
-            <string>p72</string>
-          </dict>
-          <dict>
-            <key>value</key>
-            <string>samdac</string>
-            <key>description</key>
-            <string>SAMDAC</string>
-            <key>devname</key>
-            <string>centronics_samdac</string>
-          </dict>
-          <dict>
-            <key>value</key>
-            <string>nlq401</string>
-            <key>description</key>
-            <string>Schneider NLQ 401 Matrix Printer</string>
-            <key>devname</key>
-            <string>nlq401</string>
-          </dict>
-          <dict>
-            <key>value</key>
-            <string>chessmec</string>
-            <key>description</key>
-            <string>Tasc ChessMachine EC Interface</string>
-            <key>devname</key>
-            <string>centronics_chessmec</string>
-          </dict>
-          <dict>
-            <key>value</key>
-            <string>smartboard</string>
-            <key>description</key>
-            <string>Tasc SmartBoard SB30 Interface</string>
-            <key>devname</key>
-            <string>centronics_smartboard</string>
-          </dict>
-        </array>
-      </dict>
-      <dict>
-        <key>name</key>
-        <string>kbd</string>
-        <key>description</key>
-        <string>Keyboard</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>a1000_dk</string>
-            <key>description</key>
-            <string>Amiga 1000 Keyboard (Denmark)</string>
-            <key>devname</key>
-            <string>a1000kbd_dk</string>
-          </dict>
-          <dict>
-            <key>value</key>
-            <string>a1000_fr</string>
-            <key>description</key>
-            <string>Amiga 1000 Keyboard (France/Belgium)</string>
-            <key>devname</key>
-            <string>a1000kbd_fr</string>
-          </dict>
-          <dict>
-            <key>value</key>
-            <string>a1000_de</string>
-            <key>description</key>
-            <string>Amiga 1000 Keyboard (Germany/Austria)</string>
-            <key>devname</key>
-            <string>a1000kbd_de</string>
-          </dict>
-          <dict>
-            <key>value</key>
-            <string>a1000_it</string>
-            <key>description</key>
-            <string>Amiga 1000 Keyboard (Italy)</string>
-            <key>devname</key>
-            <string>a1000kbd_it</string>
-          </dict>
-          <dict>
-            <key>value</key>
-            <string>a1000_se</string>
-            <key>description</key>
-            <string>Amiga 1000 Keyboard (Sweden/Finland)</string>
-            <key>devname</key>
-            <string>a1000kbd_se</string>
-          </dict>
-          <dict>
-            <key>value</key>
-            <string>a1000_us</string>
-            <key>description</key>
-            <string>Amiga 1000 Keyboard (U.S./Canada)</string>
-            <key>default</key>
-            <true/>
-            <key>devname</key>
-            <string>a1000kbd_us</string>
-          </dict>
-          <dict>
-            <key>value</key>
-            <string>a1000_gb</string>
-            <key>description</key>
-            <string>Amiga 1000 Keyboard (UK)</string>
-            <key>devname</key>
-            <string>a1000kbd_gb</string>
-          </dict>
-          <dict>
-            <key>value</key>
-            <string>a1200_us</string>
-            <key>description</key>
-            <string>Amiga 1200 Keyboard Rev B</string>
-            <key>devname</key>
-            <string>a1200kbd_rb</string>
-          </dict>
-          <dict>
-            <key>value</key>
-            <string>a2000_g80_dk</string>
-            <key>description</key>
-            <string>Amiga 2000 Keyboard (Cherry - Denmark)</string>
-            <key>devname</key>
-            <string>a2000kbd_g80_dk</string>
-          </dict>
-          <dict>
-            <key>value</key>
-            <string>a2000_g80_de</string>
-            <key>description</key>
-            <string>Amiga 2000 Keyboard (Cherry - Germany/Austria)</string>
-            <key>devname</key>
-            <string>a2000kbd_g80_de</string>
-          </dict>
-          <dict>
-            <key>value</key>
-            <string>a2000_g80_se</string>
-            <key>description</key>
-            <string>Amiga 2000 Keyboard (Cherry - Sweden/Finland)</string>
-            <key>devname</key>
-            <string>a2000kbd_g80_se</string>
-          </dict>
-          <dict>
-            <key>value</key>
-            <string>a2000_g80_us</string>
-            <key>description</key>
-            <string>Amiga 2000 Keyboard (Cherry - U.S./Canada)</string>
-            <key>devname</key>
-            <string>a2000kbd_g80_us</string>
-          </dict>
-          <dict>
-            <key>value</key>
-            <string>a2000_g80_gb</string>
-            <key>description</key>
-            <string>Amiga 2000 Keyboard (Cherry - UK)</string>
-            <key>devname</key>
-            <string>a2000kbd_g80_gb</string>
-          </dict>
-          <dict>
-            <key>value</key>
-            <string>a2000_dk</string>
-            <key>description</key>
-            <string>Amiga 2000/3000/4000 Keyboard (Denmark)</string>
-            <key>devname</key>
-            <string>a2000kbd_dk</string>
-          </dict>
-          <dict>
-            <key>value</key>
-            <string>a2000_fr</string>
-            <key>description</key>
-            <string>Amiga 2000/3000/4000 Keyboard (France/Belgium)</string>
-            <key>devname</key>
-            <string>a2000kbd_fr</string>
-          </dict>
-          <dict>
-            <key>value</key>
-            <string>a2000_de</string>
-            <key>description</key>
-            <string>Amiga 2000/3000/4000 Keyboard (Germany/Austria)</string>
-            <key>devname</key>
-            <string>a2000kbd_de</string>
-          </dict>
-          <dict>
-            <key>value</key>
-            <string>a2000_it</string>
-            <key>description</key>
-            <string>Amiga 2000/3000/4000 Keyboard (Italy)</string>
-            <key>devname</key>
-            <string>a2000kbd_it</string>
-          </dict>
-          <dict>
-            <key>value</key>
-            <string>a2000_no</string>
-            <key>description</key>
-            <string>Amiga 2000/3000/4000 Keyboard (Norway)</string>
-            <key>devname</key>
-            <string>a2000kbd_no</string>
-          </dict>
-          <dict>
-            <key>value</key>
-            <string>a2000_es</string>
-            <key>description</key>
-            <string>Amiga 2000/3000/4000 Keyboard (Spain)</string>
-            <key>devname</key>
-            <string>a2000kbd_es</string>
-          </dict>
-          <dict>
-            <key>value</key>
-            <string>a2000_se</string>
-            <key>description</key>
-            <string>Amiga 2000/3000/4000 Keyboard (Sweden/Finland)</string>
-            <key>devname</key>
-            <string>a2000kbd_se</string>
-          </dict>
-          <dict>
-            <key>value</key>
-            <string>a2000_ch</string>
-            <key>description</key>
-            <string>Amiga 2000/3000/4000 Keyboard (Switzerland)</string>
-            <key>devname</key>
-            <string>a2000kbd_ch</string>
-          </dict>
-          <dict>
-            <key>value</key>
-            <string>a2000_us</string>
-            <key>description</key>
-            <string>Amiga 2000/3000/4000 Keyboard (U.S./Canada)</string>
-            <key>devname</key>
-            <string>a2000kbd_us</string>
-          </dict>
-          <dict>
-            <key>value</key>
-            <string>a2000_gb</string>
-            <key>description</key>
-            <string>Amiga 2000/3000/4000 Keyboard (UK)</string>
-            <key>devname</key>
-            <string>a2000kbd_gb</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>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>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>
-            </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>
-                <true/>
-              </dict>
-              <dict>
-                <key>value</key>
-                <string>35dd</string>
-                <key>description</key>
-                <string>3.5" DD</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: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>35dd</string>
-                <key>description</key>
-                <string>3.5" DD</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>
-                <true/>
-              </dict>
-              <dict>
-                <key>value</key>
-                <string>35dd</string>
-                <key>description</key>
-                <string>3.5" DD</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>scorpion</string>
-                <key>description</key>
-                <string>Micro-Robotics Scorpion Intelligent Controller</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>loopback</string>
-                <key>description</key>
-                <string>RS-232 Loopback</string>
-                <key>default</key>
-                <false/>
-              </dict>
-              <dict>
-                <key>value</key>
-                <string>dec_loopback</string>
-                <key>description</key>
-                <string>RS-232 Loopback (DEC 12-15336-00)</string>
-                <key>default</key>
-                <false/>
-              </dict>
-              <dict>
-                <key>value</key>
-                <string>null_modem</string>
-                <key>description</key>
-                <string>RS-232 Null Modem</string>
-                <key>default</key>
-                <false/>
-                <key>media</key>
-                <dict>
-                  <key>bitbanger</key>
-                  <integer>1</integer>
-                </dict>
-              </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>rs232_sync_io</string>
-                <key>description</key>
-                <string>RS-232 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>amiga_workbench.xml</string>
-      <string>amiga_hardware.xml</string>
-      <string>amiga_apps.xml</string>
-      <string>amiga_flop.xml</string>
-      <string>amigaocs_flop.xml</string>
-      <string>amiga_demos.xml</string>
-      <string>amiga_a1000.xml</string>
-    </array>
-  </dict>
-</plist>

Ample/Resources/a1000n.plist

@@ -1,875 +0,0 @@
-<?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>a1000n</string>
-    <key>description</key>
-    <string>Amiga 1000 (NTSC)</string>
-    <key>media</key>
-    <dict>
-    </dict>
-    <key>resolution</key>
-    <array>
-      <integer>724</integer>
-      <integer>483</integer>
-    </array>
-    <key>slots</key>
-    <array>
-      <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>rs232</string>
-        <key>description</key>
-        <string>Serial</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>scorpion</string>
-            <key>description</key>
-            <string>Micro-Robotics Scorpion Intelligent Controller</string>
-            <key>devname</key>
-            <string>scorpion_ic</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>loopback</string>
-            <key>description</key>
-            <string>RS-232 Loopback</string>
-            <key>devname</key>
-            <string>rs232_loopback</string>
-          </dict>
-          <dict>
-            <key>value</key>
-            <string>dec_loopback</string>
-            <key>description</key>
-            <string>RS-232 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>RS-232 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>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>rs232_sync_io</string>
-            <key>description</key>
-            <string>RS-232 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>centronics</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>
-            <false/>
-          </dict>
-          <dict>
-            <key>value</key>
-            <string>printer</string>
-            <key>description</key>
-            <string>Centronics Printer</string>
-            <key>default</key>
-            <true/>
-            <key>devname</key>
-            <string>centronics_printer</string>
-          </dict>
-          <dict>
-            <key>value</key>
-            <string>pl80</string>
-            <key>description</key>
-            <string>COMX PL-80</string>
-            <key>devname</key>
-            <string>comx_pl80</string>
-          </dict>
-          <dict>
-            <key>value</key>
-            <string>covox_stereo</string>
-            <key>description</key>
-            <string>Covox (Stereo-in-1)</string>
-            <key>devname</key>
-            <string>covox_stereo</string>
-          </dict>
-          <dict>
-            <key>value</key>
-            <string>covox</string>
-            <key>description</key>
-            <string>Covox Speech Thing</string>
-            <key>devname</key>
-            <string>covox</string>
-          </dict>
-          <dict>
-            <key>value</key>
-            <string>digiblst</string>
-            <key>description</key>
-            <string>Digiblaster (DIY)</string>
-            <key>devname</key>
-            <string>cpcdigiblst</string>
-          </dict>
-          <dict>
-            <key>value</key>
-            <string>ap2000</string>
-            <key>description</key>
-            <string>Epson ActionPrinter 2000</string>
-            <key>devname</key>
-            <string>ap2000</string>
-          </dict>
-          <dict>
-            <key>value</key>
-            <string>ex800</string>
-            <key>description</key>
-            <string>Epson EX-800</string>
-            <key>devname</key>
-            <string>ex800</string>
-          </dict>
-          <dict>
-            <key>value</key>
-            <string>lx800</string>
-            <key>description</key>
-            <string>Epson LX-800</string>
-            <key>devname</key>
-            <string>lx800</string>
-          </dict>
-          <dict>
-            <key>value</key>
-            <string>lx810l</string>
-            <key>description</key>
-            <string>Epson LX-810L</string>
-            <key>devname</key>
-            <string>lx810l</string>
-          </dict>
-          <dict>
-            <key>value</key>
-            <string>p72</string>
-            <key>description</key>
-            <string>NEC PinWriter P72</string>
-            <key>devname</key>
-            <string>p72</string>
-          </dict>
-          <dict>
-            <key>value</key>
-            <string>samdac</string>
-            <key>description</key>
-            <string>SAMDAC</string>
-            <key>devname</key>
-            <string>centronics_samdac</string>
-          </dict>
-          <dict>
-            <key>value</key>
-            <string>nlq401</string>
-            <key>description</key>
-            <string>Schneider NLQ 401 Matrix Printer</string>
-            <key>devname</key>
-            <string>nlq401</string>
-          </dict>
-          <dict>
-            <key>value</key>
-            <string>chessmec</string>
-            <key>description</key>
-            <string>Tasc ChessMachine EC Interface</string>
-            <key>devname</key>
-            <string>centronics_chessmec</string>
-          </dict>
-          <dict>
-            <key>value</key>
-            <string>smartboard</string>
-            <key>description</key>
-            <string>Tasc SmartBoard SB30 Interface</string>
-            <key>devname</key>
-            <string>centronics_smartboard</string>
-          </dict>
-        </array>
-      </dict>
-      <dict>
-        <key>name</key>
-        <string>kbd</string>
-        <key>description</key>
-        <string>Keyboard</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>a1000_dk</string>
-            <key>description</key>
-            <string>Amiga 1000 Keyboard (Denmark)</string>
-            <key>devname</key>
-            <string>a1000kbd_dk</string>
-          </dict>
-          <dict>
-            <key>value</key>
-            <string>a1000_fr</string>
-            <key>description</key>
-            <string>Amiga 1000 Keyboard (France/Belgium)</string>
-            <key>devname</key>
-            <string>a1000kbd_fr</string>
-          </dict>
-          <dict>
-            <key>value</key>
-            <string>a1000_de</string>
-            <key>description</key>
-            <string>Amiga 1000 Keyboard (Germany/Austria)</string>
-            <key>devname</key>
-            <string>a1000kbd_de</string>
-          </dict>
-          <dict>
-            <key>value</key>
-            <string>a1000_it</string>
-            <key>description</key>
-            <string>Amiga 1000 Keyboard (Italy)</string>
-            <key>devname</key>
-            <string>a1000kbd_it</string>
-          </dict>
-          <dict>
-            <key>value</key>
-            <string>a1000_se</string>
-            <key>description</key>
-            <string>Amiga 1000 Keyboard (Sweden/Finland)</string>
-            <key>devname</key>
-            <string>a1000kbd_se</string>
-          </dict>
-          <dict>
-            <key>value</key>
-            <string>a1000_us</string>
-            <key>description</key>
-            <string>Amiga 1000 Keyboard (U.S./Canada)</string>
-            <key>default</key>
-            <true/>
-            <key>devname</key>
-            <string>a1000kbd_us</string>
-          </dict>
-          <dict>
-            <key>value</key>
-            <string>a1000_gb</string>
-            <key>description</key>
-            <string>Amiga 1000 Keyboard (UK)</string>
-            <key>devname</key>
-            <string>a1000kbd_gb</string>
-          </dict>
-          <dict>
-            <key>value</key>
-            <string>a1200_us</string>
-            <key>description</key>
-            <string>Amiga 1200 Keyboard Rev B</string>
-            <key>devname</key>
-            <string>a1200kbd_rb</string>
-          </dict>
-          <dict>
-            <key>value</key>
-            <string>a2000_g80_dk</string>
-            <key>description</key>
-            <string>Amiga 2000 Keyboard (Cherry - Denmark)</string>
-            <key>devname</key>
-            <string>a2000kbd_g80_dk</string>
-          </dict>
-          <dict>
-            <key>value</key>
-            <string>a2000_g80_de</string>
-            <key>description</key>
-            <string>Amiga 2000 Keyboard (Cherry - Germany/Austria)</string>
-            <key>devname</key>
-            <string>a2000kbd_g80_de</string>
-          </dict>
-          <dict>
-            <key>value</key>
-            <string>a2000_g80_se</string>
-            <key>description</key>
-            <string>Amiga 2000 Keyboard (Cherry - Sweden/Finland)</string>
-            <key>devname</key>
-            <string>a2000kbd_g80_se</string>
-          </dict>
-          <dict>
-            <key>value</key>
-            <string>a2000_g80_us</string>
-            <key>description</key>
-            <string>Amiga 2000 Keyboard (Cherry - U.S./Canada)</string>
-            <key>devname</key>
-            <string>a2000kbd_g80_us</string>
-          </dict>
-          <dict>
-            <key>value</key>
-            <string>a2000_g80_gb</string>
-            <key>description</key>
-            <string>Amiga 2000 Keyboard (Cherry - UK)</string>
-            <key>devname</key>
-            <string>a2000kbd_g80_gb</string>
-          </dict>
-          <dict>
-            <key>value</key>
-            <string>a2000_dk</string>
-            <key>description</key>
-            <string>Amiga 2000/3000/4000 Keyboard (Denmark)</string>
-            <key>devname</key>
-            <string>a2000kbd_dk</string>
-          </dict>
-          <dict>
-            <key>value</key>
-            <string>a2000_fr</string>
-            <key>description</key>
-            <string>Amiga 2000/3000/4000 Keyboard (France/Belgium)</string>
-            <key>devname</key>
-            <string>a2000kbd_fr</string>
-          </dict>
-          <dict>
-            <key>value</key>
-            <string>a2000_de</string>
-            <key>description</key>
-            <string>Amiga 2000/3000/4000 Keyboard (Germany/Austria)</string>
-            <key>devname</key>
-            <string>a2000kbd_de</string>
-          </dict>
-          <dict>
-            <key>value</key>
-            <string>a2000_it</string>
-            <key>description</key>
-            <string>Amiga 2000/3000/4000 Keyboard (Italy)</string>
-            <key>devname</key>
-            <string>a2000kbd_it</string>
-          </dict>
-          <dict>
-            <key>value</key>
-            <string>a2000_no</string>
-            <key>description</key>
-            <string>Amiga 2000/3000/4000 Keyboard (Norway)</string>
-            <key>devname</key>
-            <string>a2000kbd_no</string>
-          </dict>
-          <dict>
-            <key>value</key>
-            <string>a2000_es</string>
-            <key>description</key>
-            <string>Amiga 2000/3000/4000 Keyboard (Spain)</string>
-            <key>devname</key>
-            <string>a2000kbd_es</string>
-          </dict>
-          <dict>
-            <key>value</key>
-            <string>a2000_se</string>
-            <key>description</key>
-            <string>Amiga 2000/3000/4000 Keyboard (Sweden/Finland)</string>
-            <key>devname</key>
-            <string>a2000kbd_se</string>
-          </dict>
-          <dict>
-            <key>value</key>
-            <string>a2000_ch</string>
-            <key>description</key>
-            <string>Amiga 2000/3000/4000 Keyboard (Switzerland)</string>
-            <key>devname</key>
-            <string>a2000kbd_ch</string>
-          </dict>
-          <dict>
-            <key>value</key>
-            <string>a2000_us</string>
-            <key>description</key>
-            <string>Amiga 2000/3000/4000 Keyboard (U.S./Canada)</string>
-            <key>devname</key>
-            <string>a2000kbd_us</string>
-          </dict>
-          <dict>
-            <key>value</key>
-            <string>a2000_gb</string>
-            <key>description</key>
-            <string>Amiga 2000/3000/4000 Keyboard (UK)</string>
-            <key>devname</key>
-            <string>a2000kbd_gb</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>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>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>
-            </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>
-                <true/>
-              </dict>
-              <dict>
-                <key>value</key>
-                <string>35dd</string>
-                <key>description</key>
-                <string>3.5" DD</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: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>35dd</string>
-                <key>description</key>
-                <string>3.5" DD</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>
-                <true/>
-              </dict>
-              <dict>
-                <key>value</key>
-                <string>35dd</string>
-                <key>description</key>
-                <string>3.5" DD</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>scorpion</string>
-                <key>description</key>
-                <string>Micro-Robotics Scorpion Intelligent Controller</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>loopback</string>
-                <key>description</key>
-                <string>RS-232 Loopback</string>
-                <key>default</key>
-                <false/>
-              </dict>
-              <dict>
-                <key>value</key>
-                <string>dec_loopback</string>
-                <key>description</key>
-                <string>RS-232 Loopback (DEC 12-15336-00)</string>
-                <key>default</key>
-                <false/>
-              </dict>
-              <dict>
-                <key>value</key>
-                <string>null_modem</string>
-                <key>description</key>
-                <string>RS-232 Null Modem</string>
-                <key>default</key>
-                <false/>
-                <key>media</key>
-                <dict>
-                  <key>bitbanger</key>
-                  <integer>1</integer>
-                </dict>
-              </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>rs232_sync_io</string>
-                <key>description</key>
-                <string>RS-232 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>amiga_workbench.xml</string>
-      <string>amiga_hardware.xml</string>
-      <string>amiga_apps.xml</string>
-      <string>amiga_flop.xml</string>
-      <string>amigaocs_flop.xml</string>
-      <string>amiga_demos.xml</string>
-      <string>amiga_a1000.xml</string>
-    </array>
-  </dict>
-</plist>

Ample/Resources/ace500.plist

@@ -12,7 +12,7 @@
     <key>resolution</key>
     <array>
       <integer>560</integer>
-      <integer>192</integer>
+      <integer>384</integer>
     </array>
     <key>slots</key>
     <array>
@@ -73,7 +73,7 @@
             <key>value</key>
             <string>joy</string>
             <key>description</key>
-            <string>Apple II Analog Joysticks</string>
+            <string>Apple II analog joysticks</string>
             <key>devname</key>
             <string>a2joy</string>
           </dict>
@@ -81,7 +81,7 @@
             <key>value</key>
             <string>paddles</string>
             <key>description</key>
-            <string>Apple II Paddles</string>
+            <string>Apple II paddles</string>
             <key>devname</key>
             <string>a2pdls</string>
           </dict>
@@ -131,27 +131,11 @@
             <key>devname</key>
             <string>ie15_terminal</string>
           </dict>
-          <dict>
-            <key>value</key>
-            <string>scorpion</string>
-            <key>description</key>
-            <string>Micro-Robotics Scorpion Intelligent Controller</string>
-            <key>devname</key>
-            <string>scorpion_ic</string>
-          </dict>
-          <dict>
-            <key>value</key>
-            <string>nss_tvi</string>
-            <key>description</key>
-            <string>Novag Super System TV Interface</string>
-            <key>devname</key>
-            <string>nss_tvinterface</string>
-          </dict>
           <dict>
             <key>value</key>
             <string>pty</string>
             <key>description</key>
-            <string>Pseudo Terminal</string>
+            <string>Pseudo terminal</string>
             <key>devname</key>
             <string>pseudo_terminal</string>
           </dict>
@@ -163,11 +147,19 @@
             <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>RS-232 Loopback</string>
+            <string>RS232 Loopback</string>
             <key>devname</key>
             <string>rs232_loopback</string>
           </dict>
@@ -175,7 +167,7 @@
             <key>value</key>
             <string>dec_loopback</string>
             <key>description</key>
-            <string>RS-232 Loopback (DEC 12-15336-00)</string>
+            <string>RS232 Loopback (DEC 12-15336-00)</string>
             <key>devname</key>
             <string>dec_rs232_loopback</string>
           </dict>
@@ -183,7 +175,7 @@
             <key>value</key>
             <string>null_modem</string>
             <key>description</key>
-            <string>RS-232 Null Modem</string>
+            <string>RS232 Null Modem</string>
             <key>devname</key>
             <string>null_modem</string>
             <key>media</key>
@@ -192,19 +184,11 @@
               <integer>1</integer>
             </dict>
           </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>rs232_sync_io</string>
             <key>description</key>
-            <string>RS-232 Synchronous I/O</string>
+            <string>RS232 Synchronous I/O</string>
             <key>devname</key>
             <string>rs232_sync_io</string>
             <key>media</key>
@@ -355,27 +339,11 @@
                 <key>default</key>
                 <false/>
               </dict>
-              <dict>
-                <key>value</key>
-                <string>scorpion</string>
-                <key>description</key>
-                <string>Micro-Robotics Scorpion Intelligent Controller</string>
-                <key>default</key>
-                <false/>
-              </dict>
-              <dict>
-                <key>value</key>
-                <string>nss_tvi</string>
-                <key>description</key>
-                <string>Novag Super System TV Interface</string>
-                <key>default</key>
-                <false/>
-              </dict>
               <dict>
                 <key>value</key>
                 <string>pty</string>
                 <key>description</key>
-                <string>Pseudo Terminal</string>
+                <string>Pseudo terminal</string>
                 <key>default</key>
                 <false/>
               </dict>
@@ -387,11 +355,19 @@
                 <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>RS-232 Loopback</string>
+                <string>RS232 Loopback</string>
                 <key>default</key>
                 <false/>
               </dict>
@@ -399,7 +375,7 @@
                 <key>value</key>
                 <string>dec_loopback</string>
                 <key>description</key>
-                <string>RS-232 Loopback (DEC 12-15336-00)</string>
+                <string>RS232 Loopback (DEC 12-15336-00)</string>
                 <key>default</key>
                 <false/>
               </dict>
@@ -407,7 +383,7 @@
                 <key>value</key>
                 <string>null_modem</string>
                 <key>description</key>
-                <string>RS-232 Null Modem</string>
+                <string>RS232 Null Modem</string>
                 <key>default</key>
                 <false/>
                 <key>media</key>
@@ -416,19 +392,11 @@
                   <integer>1</integer>
                 </dict>
               </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>rs232_sync_io</string>
                 <key>description</key>
-                <string>RS-232 Synchronous I/O</string>
+                <string>RS232 Synchronous I/O</string>
                 <key>default</key>
                 <false/>
                 <key>media</key>

Ample/Resources/agat7.plist

@@ -14,7 +14,7 @@
     <key>resolution</key>
     <array>
       <integer>512</integer>
-      <integer>256</integer>
+      <integer>512</integer>
     </array>
     <key>slots</key>
     <array>
@@ -91,7 +91,7 @@
             <key>value</key>
             <string>a9fdchle</string>
             <key>description</key>
-            <string>Agat 840K Floppy Card</string>
+            <string>Agat 840K floppy card</string>
             <key>devname</key>
             <string>agat840k_hle</string>
           </dict>
@@ -99,7 +99,7 @@
             <key>value</key>
             <string>a9fdc</string>
             <key>description</key>
-            <string>Agat 840K Floppy Controller Card</string>
+            <string>Agat 840K floppy controller card</string>
             <key>devname</key>
             <string>agat_fdc</string>
           </dict>
@@ -107,7 +107,7 @@
             <key>value</key>
             <string>a7fdc</string>
             <key>description</key>
-            <string>Agat-7 140K Floppy Card</string>
+            <string>Agat-7 140K floppy card</string>
             <key>devname</key>
             <string>agat7_flop</string>
           </dict>
@@ -158,7 +158,7 @@
             <key>value</key>
             <string>a9fdchle</string>
             <key>description</key>
-            <string>Agat 840K Floppy Card</string>
+            <string>Agat 840K floppy card</string>
             <key>devname</key>
             <string>agat840k_hle</string>
           </dict>
@@ -166,7 +166,7 @@
             <key>value</key>
             <string>a9fdc</string>
             <key>description</key>
-            <string>Agat 840K Floppy Controller Card</string>
+            <string>Agat 840K floppy controller card</string>
             <key>devname</key>
             <string>agat_fdc</string>
           </dict>
@@ -174,7 +174,7 @@
             <key>value</key>
             <string>a7fdc</string>
             <key>description</key>
-            <string>Agat-7 140K Floppy Card</string>
+            <string>Agat-7 140K floppy card</string>
             <key>default</key>
             <true/>
             <key>devname</key>
@@ -225,7 +225,7 @@
             <key>value</key>
             <string>a9fdchle</string>
             <key>description</key>
-            <string>Agat 840K Floppy Card</string>
+            <string>Agat 840K floppy card</string>
             <key>devname</key>
             <string>agat840k_hle</string>
           </dict>
@@ -233,7 +233,7 @@
             <key>value</key>
             <string>a9fdc</string>
             <key>description</key>
-            <string>Agat 840K Floppy Controller Card</string>
+            <string>Agat 840K floppy controller card</string>
             <key>devname</key>
             <string>agat_fdc</string>
           </dict>
@@ -241,7 +241,7 @@
             <key>value</key>
             <string>a7fdc</string>
             <key>description</key>
-            <string>Agat-7 140K Floppy Card</string>
+            <string>Agat-7 140K floppy card</string>
             <key>devname</key>
             <string>agat7_flop</string>
           </dict>
@@ -292,7 +292,7 @@
             <key>value</key>
             <string>a9fdchle</string>
             <key>description</key>
-            <string>Agat 840K Floppy Card</string>
+            <string>Agat 840K floppy card</string>
             <key>devname</key>
             <string>agat840k_hle</string>
           </dict>
@@ -300,7 +300,7 @@
             <key>value</key>
             <string>a9fdc</string>
             <key>description</key>
-            <string>Agat 840K Floppy Controller Card</string>
+            <string>Agat 840K floppy controller card</string>
             <key>devname</key>
             <string>agat_fdc</string>
           </dict>
@@ -308,7 +308,7 @@
             <key>value</key>
             <string>a7fdc</string>
             <key>description</key>
-            <string>Agat-7 140K Floppy Card</string>
+            <string>Agat-7 140K floppy card</string>
             <key>devname</key>
             <string>agat7_flop</string>
           </dict>
@@ -357,7 +357,7 @@
             <key>value</key>
             <string>a9fdchle</string>
             <key>description</key>
-            <string>Agat 840K Floppy Card</string>
+            <string>Agat 840K floppy card</string>
             <key>devname</key>
             <string>agat840k_hle</string>
           </dict>
@@ -365,7 +365,7 @@
             <key>value</key>
             <string>a9fdc</string>
             <key>description</key>
-            <string>Agat 840K Floppy Controller Card</string>
+            <string>Agat 840K floppy controller card</string>
             <key>devname</key>
             <string>agat_fdc</string>
           </dict>
@@ -373,7 +373,7 @@
             <key>value</key>
             <string>a7fdc</string>
             <key>description</key>
-            <string>Agat-7 140K Floppy Card</string>
+            <string>Agat-7 140K floppy card</string>
             <key>devname</key>
             <string>agat7_flop</string>
           </dict>

Ample/Resources/agat9.plist

@@ -14,7 +14,7 @@
     <key>resolution</key>
     <array>
       <integer>512</integer>
-      <integer>256</integer>
+      <integer>512</integer>
     </array>
     <key>slots</key>
     <array>
@@ -85,7 +85,7 @@
             <key>value</key>
             <string>a9fdchle</string>
             <key>description</key>
-            <string>Agat 840K Floppy Card</string>
+            <string>Agat 840K floppy card</string>
             <key>devname</key>
             <string>agat840k_hle</string>
           </dict>
@@ -93,7 +93,7 @@
             <key>value</key>
             <string>a9fdc</string>
             <key>description</key>
-            <string>Agat 840K Floppy Controller Card</string>
+            <string>Agat 840K floppy controller card</string>
             <key>devname</key>
             <string>agat_fdc</string>
           </dict>
@@ -109,7 +109,7 @@
             <key>value</key>
             <string>a9fdc140</string>
             <key>description</key>
-            <string>Agat-9 140K Floppy Card</string>
+            <string>Agat-9 140K floppy card</string>
             <key>devname</key>
             <string>agat9_flop</string>
           </dict>
@@ -117,7 +117,7 @@
             <key>value</key>
             <string>diskiing</string>
             <key>description</key>
-            <string>Apple Disk II NG Controller (16-sector)</string>
+            <string>Apple Disk II NG controller (16-sector)</string>
             <key>devname</key>
             <string>a2diskiing</string>
           </dict>
@@ -150,7 +150,7 @@
             <key>value</key>
             <string>a9fdchle</string>
             <key>description</key>
-            <string>Agat 840K Floppy Card</string>
+            <string>Agat 840K floppy card</string>
             <key>devname</key>
             <string>agat840k_hle</string>
           </dict>
@@ -158,7 +158,7 @@
             <key>value</key>
             <string>a9fdc</string>
             <key>description</key>
-            <string>Agat 840K Floppy Controller Card</string>
+            <string>Agat 840K floppy controller card</string>
             <key>devname</key>
             <string>agat_fdc</string>
           </dict>
@@ -174,7 +174,7 @@
             <key>value</key>
             <string>a9fdc140</string>
             <key>description</key>
-            <string>Agat-9 140K Floppy Card</string>
+            <string>Agat-9 140K floppy card</string>
             <key>devname</key>
             <string>agat9_flop</string>
           </dict>
@@ -182,7 +182,7 @@
             <key>value</key>
             <string>diskiing</string>
             <key>description</key>
-            <string>Apple Disk II NG Controller (16-sector)</string>
+            <string>Apple Disk II NG controller (16-sector)</string>
             <key>devname</key>
             <string>a2diskiing</string>
           </dict>
@@ -215,7 +215,7 @@
             <key>value</key>
             <string>a9fdchle</string>
             <key>description</key>
-            <string>Agat 840K Floppy Card</string>
+            <string>Agat 840K floppy card</string>
             <key>devname</key>
             <string>agat840k_hle</string>
           </dict>
@@ -223,7 +223,7 @@
             <key>value</key>
             <string>a9fdc</string>
             <key>description</key>
-            <string>Agat 840K Floppy Controller Card</string>
+            <string>Agat 840K floppy controller card</string>
             <key>devname</key>
             <string>agat_fdc</string>
           </dict>
@@ -239,7 +239,7 @@
             <key>value</key>
             <string>a9fdc140</string>
             <key>description</key>
-            <string>Agat-9 140K Floppy Card</string>
+            <string>Agat-9 140K floppy card</string>
             <key>devname</key>
             <string>agat9_flop</string>
           </dict>
@@ -247,7 +247,7 @@
             <key>value</key>
             <string>diskiing</string>
             <key>description</key>
-            <string>Apple Disk II NG Controller (16-sector)</string>
+            <string>Apple Disk II NG controller (16-sector)</string>
             <key>devname</key>
             <string>a2diskiing</string>
           </dict>
@@ -280,7 +280,7 @@
             <key>value</key>
             <string>a9fdchle</string>
             <key>description</key>
-            <string>Agat 840K Floppy Card</string>
+            <string>Agat 840K floppy card</string>
             <key>devname</key>
             <string>agat840k_hle</string>
           </dict>
@@ -288,7 +288,7 @@
             <key>value</key>
             <string>a9fdc</string>
             <key>description</key>
-            <string>Agat 840K Floppy Controller Card</string>
+            <string>Agat 840K floppy controller card</string>
             <key>devname</key>
             <string>agat_fdc</string>
           </dict>
@@ -304,7 +304,7 @@
             <key>value</key>
             <string>a9fdc140</string>
             <key>description</key>
-            <string>Agat-9 140K Floppy Card</string>
+            <string>Agat-9 140K floppy card</string>
             <key>devname</key>
             <string>agat9_flop</string>
           </dict>
@@ -312,7 +312,7 @@
             <key>value</key>
             <string>diskiing</string>
             <key>description</key>
-            <string>Apple Disk II NG Controller (16-sector)</string>
+            <string>Apple Disk II NG controller (16-sector)</string>
             <key>devname</key>
             <string>a2diskiing</string>
           </dict>
@@ -345,7 +345,7 @@
             <key>value</key>
             <string>a9fdchle</string>
             <key>description</key>
-            <string>Agat 840K Floppy Card</string>
+            <string>Agat 840K floppy card</string>
             <key>devname</key>
             <string>agat840k_hle</string>
           </dict>
@@ -353,7 +353,7 @@
             <key>value</key>
             <string>a9fdc</string>
             <key>description</key>
-            <string>Agat 840K Floppy Controller Card</string>
+            <string>Agat 840K floppy controller card</string>
             <key>default</key>
             <true/>
             <key>devname</key>
@@ -371,7 +371,7 @@
             <key>value</key>
             <string>a9fdc140</string>
             <key>description</key>
-            <string>Agat-9 140K Floppy Card</string>
+            <string>Agat-9 140K floppy card</string>
             <key>devname</key>
             <string>agat9_flop</string>
           </dict>
@@ -379,7 +379,7 @@
             <key>value</key>
             <string>diskiing</string>
             <key>description</key>
-            <string>Apple Disk II NG Controller (16-sector)</string>
+            <string>Apple Disk II NG controller (16-sector)</string>
             <key>devname</key>
             <string>a2diskiing</string>
           </dict>
@@ -412,7 +412,7 @@
             <key>value</key>
             <string>a9fdchle</string>
             <key>description</key>
-            <string>Agat 840K Floppy Card</string>
+            <string>Agat 840K floppy card</string>
             <key>devname</key>
             <string>agat840k_hle</string>
           </dict>
@@ -420,7 +420,7 @@
             <key>value</key>
             <string>a9fdc</string>
             <key>description</key>
-            <string>Agat 840K Floppy Controller Card</string>
+            <string>Agat 840K floppy controller card</string>
             <key>devname</key>
             <string>agat_fdc</string>
           </dict>
@@ -436,7 +436,7 @@
             <key>value</key>
             <string>a9fdc140</string>
             <key>description</key>
-            <string>Agat-9 140K Floppy Card</string>
+            <string>Agat-9 140K floppy card</string>
             <key>default</key>
             <true/>
             <key>devname</key>
@@ -446,7 +446,7 @@
             <key>value</key>
             <string>diskiing</string>
             <key>description</key>
-            <string>Apple Disk II NG Controller (16-sector)</string>
+            <string>Apple Disk II NG controller (16-sector)</string>
             <key>devname</key>
             <string>a2diskiing</string>
           </dict>

Ample/Resources/apple1.plist

@@ -12,7 +12,7 @@
     <key>resolution</key>
     <array>
       <integer>560</integer>
-      <integer>192</integer>
+      <integer>384</integer>
     </array>
     <key>slots</key>
     <array>
@@ -164,7 +164,7 @@
             <key>value</key>
             <string>cassette</string>
             <key>description</key>
-            <string>Apple I Cassette Board</string>
+            <string>Apple I cassette board</string>
             <key>default</key>
             <true/>
             <key>devname</key>
@@ -179,7 +179,7 @@
             <key>value</key>
             <string>cffa</string>
             <key>description</key>
-            <string>CFFA Compact Flash For Apple I</string>
+            <string>CFFA Compact Flash for Apple I</string>
             <key>devname</key>
             <string>cffa1</string>
           </dict>
@@ -240,22 +240,6 @@
                 <key>default</key>
                 <false/>
               </dict>
-              <dict>
-                <key>value</key>
-                <string>cr589</string>
-                <key>description</key>
-                <string>Matsushita CR589 CD-ROM Drive</string>
-                <key>default</key>
-                <false/>
-              </dict>
-              <dict>
-                <key>value</key>
-                <string>xm3301</string>
-                <key>description</key>
-                <string>Toshiba XM-3301 CD-ROM Drive</string>
-                <key>default</key>
-                <false/>
-              </dict>
             </array>
           </dict>
           <dict>
@@ -305,22 +289,6 @@
                 <key>default</key>
                 <false/>
               </dict>
-              <dict>
-                <key>value</key>
-                <string>cr589</string>
-                <key>description</key>
-                <string>Matsushita CR589 CD-ROM Drive</string>
-                <key>default</key>
-                <false/>
-              </dict>
-              <dict>
-                <key>value</key>
-                <string>xm3301</string>
-                <key>description</key>
-                <string>Toshiba XM-3301 CD-ROM Drive</string>
-                <key>default</key>
-                <false/>
-              </dict>
             </array>
           </dict>
         </array>

Ample/Resources/apple2c.plist

@@ -12,7 +12,7 @@
     <key>resolution</key>
     <array>
       <integer>560</integer>
-      <integer>192</integer>
+      <integer>384</integer>
     </array>
     <key>slots</key>
     <array>
@@ -73,7 +73,7 @@
             <key>value</key>
             <string>joy</string>
             <key>description</key>
-            <string>Apple II Analog Joysticks</string>
+            <string>Apple II analog joysticks</string>
             <key>devname</key>
             <string>a2joy</string>
           </dict>
@@ -81,7 +81,7 @@
             <key>value</key>
             <string>paddles</string>
             <key>description</key>
-            <string>Apple II Paddles</string>
+            <string>Apple II paddles</string>
             <key>devname</key>
             <string>a2pdls</string>
           </dict>
@@ -131,27 +131,11 @@
             <key>devname</key>
             <string>ie15_terminal</string>
           </dict>
-          <dict>
-            <key>value</key>
-            <string>scorpion</string>
-            <key>description</key>
-            <string>Micro-Robotics Scorpion Intelligent Controller</string>
-            <key>devname</key>
-            <string>scorpion_ic</string>
-          </dict>
-          <dict>
-            <key>value</key>
-            <string>nss_tvi</string>
-            <key>description</key>
-            <string>Novag Super System TV Interface</string>
-            <key>devname</key>
-            <string>nss_tvinterface</string>
-          </dict>
           <dict>
             <key>value</key>
             <string>pty</string>
             <key>description</key>
-            <string>Pseudo Terminal</string>
+            <string>Pseudo terminal</string>
             <key>devname</key>
             <string>pseudo_terminal</string>
           </dict>
@@ -163,11 +147,19 @@
             <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>RS-232 Loopback</string>
+            <string>RS232 Loopback</string>
             <key>devname</key>
             <string>rs232_loopback</string>
           </dict>
@@ -175,7 +167,7 @@
             <key>value</key>
             <string>dec_loopback</string>
             <key>description</key>
-            <string>RS-232 Loopback (DEC 12-15336-00)</string>
+            <string>RS232 Loopback (DEC 12-15336-00)</string>
             <key>devname</key>
             <string>dec_rs232_loopback</string>
           </dict>
@@ -183,7 +175,7 @@
             <key>value</key>
             <string>null_modem</string>
             <key>description</key>
-            <string>RS-232 Null Modem</string>
+            <string>RS232 Null Modem</string>
             <key>devname</key>
             <string>null_modem</string>
             <key>media</key>
@@ -192,19 +184,11 @@
               <integer>1</integer>
             </dict>
           </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>rs232_sync_io</string>
             <key>description</key>
-            <string>RS-232 Synchronous I/O</string>
+            <string>RS232 Synchronous I/O</string>
             <key>devname</key>
             <string>rs232_sync_io</string>
             <key>media</key>
@@ -286,27 +270,11 @@
             <key>devname</key>
             <string>ie15_terminal</string>
           </dict>
-          <dict>
-            <key>value</key>
-            <string>scorpion</string>
-            <key>description</key>
-            <string>Micro-Robotics Scorpion Intelligent Controller</string>
-            <key>devname</key>
-            <string>scorpion_ic</string>
-          </dict>
-          <dict>
-            <key>value</key>
-            <string>nss_tvi</string>
-            <key>description</key>
-            <string>Novag Super System TV Interface</string>
-            <key>devname</key>
-            <string>nss_tvinterface</string>
-          </dict>
           <dict>
             <key>value</key>
             <string>pty</string>
             <key>description</key>
-            <string>Pseudo Terminal</string>
+            <string>Pseudo terminal</string>
             <key>devname</key>
             <string>pseudo_terminal</string>
           </dict>
@@ -318,11 +286,19 @@
             <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>RS-232 Loopback</string>
+            <string>RS232 Loopback</string>
             <key>devname</key>
             <string>rs232_loopback</string>
           </dict>
@@ -330,7 +306,7 @@
             <key>value</key>
             <string>dec_loopback</string>
             <key>description</key>
-            <string>RS-232 Loopback (DEC 12-15336-00)</string>
+            <string>RS232 Loopback (DEC 12-15336-00)</string>
             <key>devname</key>
             <string>dec_rs232_loopback</string>
           </dict>
@@ -338,7 +314,7 @@
             <key>value</key>
             <string>null_modem</string>
             <key>description</key>
-            <string>RS-232 Null Modem</string>
+            <string>RS232 Null Modem</string>
             <key>devname</key>
             <string>null_modem</string>
             <key>media</key>
@@ -347,19 +323,11 @@
               <integer>1</integer>
             </dict>
           </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>rs232_sync_io</string>
             <key>description</key>
-            <string>RS-232 Synchronous I/O</string>
+            <string>RS232 Synchronous I/O</string>
             <key>devname</key>
             <string>rs232_sync_io</string>
             <key>media</key>
@@ -510,27 +478,11 @@
                 <key>default</key>
                 <false/>
               </dict>
-              <dict>
-                <key>value</key>
-                <string>scorpion</string>
-                <key>description</key>
-                <string>Micro-Robotics Scorpion Intelligent Controller</string>
-                <key>default</key>
-                <false/>
-              </dict>
-              <dict>
-                <key>value</key>
-                <string>nss_tvi</string>
-                <key>description</key>
-                <string>Novag Super System TV Interface</string>
-                <key>default</key>
-                <false/>
-              </dict>
               <dict>
                 <key>value</key>
                 <string>pty</string>
                 <key>description</key>
-                <string>Pseudo Terminal</string>
+                <string>Pseudo terminal</string>
                 <key>default</key>
                 <false/>
               </dict>
@@ -542,11 +494,19 @@
                 <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>RS-232 Loopback</string>
+                <string>RS232 Loopback</string>
                 <key>default</key>
                 <false/>
               </dict>
@@ -554,7 +514,7 @@
                 <key>value</key>
                 <string>dec_loopback</string>
                 <key>description</key>
-                <string>RS-232 Loopback (DEC 12-15336-00)</string>
+                <string>RS232 Loopback (DEC 12-15336-00)</string>
                 <key>default</key>
                 <false/>
               </dict>
@@ -562,7 +522,7 @@
                 <key>value</key>
                 <string>null_modem</string>
                 <key>description</key>
-                <string>RS-232 Null Modem</string>
+                <string>RS232 Null Modem</string>
                 <key>default</key>
                 <false/>
                 <key>media</key>
@@ -571,19 +531,11 @@
                   <integer>1</integer>
                 </dict>
               </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>rs232_sync_io</string>
                 <key>description</key>
-                <string>RS-232 Synchronous I/O</string>
+                <string>RS232 Synchronous I/O</string>
                 <key>default</key>
                 <false/>
                 <key>media</key>

Ample/Resources/apple2cp.plist

@@ -12,7 +12,7 @@
     <key>resolution</key>
     <array>
       <integer>560</integer>
-      <integer>192</integer>
+      <integer>384</integer>
     </array>
     <key>slots</key>
     <array>
@@ -113,7 +113,7 @@
             <key>value</key>
             <string>joy</string>
             <key>description</key>
-            <string>Apple II Analog Joysticks</string>
+            <string>Apple II analog joysticks</string>
             <key>devname</key>
             <string>a2joy</string>
           </dict>
@@ -121,7 +121,7 @@
             <key>value</key>
             <string>paddles</string>
             <key>description</key>
-            <string>Apple II Paddles</string>
+            <string>Apple II paddles</string>
             <key>devname</key>
             <string>a2pdls</string>
           </dict>
@@ -171,27 +171,11 @@
             <key>devname</key>
             <string>ie15_terminal</string>
           </dict>
-          <dict>
-            <key>value</key>
-            <string>scorpion</string>
-            <key>description</key>
-            <string>Micro-Robotics Scorpion Intelligent Controller</string>
-            <key>devname</key>
-            <string>scorpion_ic</string>
-          </dict>
-          <dict>
-            <key>value</key>
-            <string>nss_tvi</string>
-            <key>description</key>
-            <string>Novag Super System TV Interface</string>
-            <key>devname</key>
-            <string>nss_tvinterface</string>
-          </dict>
           <dict>
             <key>value</key>
             <string>pty</string>
             <key>description</key>
-            <string>Pseudo Terminal</string>
+            <string>Pseudo terminal</string>
             <key>devname</key>
             <string>pseudo_terminal</string>
           </dict>
@@ -203,11 +187,19 @@
             <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>RS-232 Loopback</string>
+            <string>RS232 Loopback</string>
             <key>devname</key>
             <string>rs232_loopback</string>
           </dict>
@@ -215,7 +207,7 @@
             <key>value</key>
             <string>dec_loopback</string>
             <key>description</key>
-            <string>RS-232 Loopback (DEC 12-15336-00)</string>
+            <string>RS232 Loopback (DEC 12-15336-00)</string>
             <key>devname</key>
             <string>dec_rs232_loopback</string>
           </dict>
@@ -223,7 +215,7 @@
             <key>value</key>
             <string>null_modem</string>
             <key>description</key>
-            <string>RS-232 Null Modem</string>
+            <string>RS232 Null Modem</string>
             <key>devname</key>
             <string>null_modem</string>
             <key>media</key>
@@ -232,19 +224,11 @@
               <integer>1</integer>
             </dict>
           </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>rs232_sync_io</string>
             <key>description</key>
-            <string>RS-232 Synchronous I/O</string>
+            <string>RS232 Synchronous I/O</string>
             <key>devname</key>
             <string>rs232_sync_io</string>
             <key>media</key>
@@ -326,27 +310,11 @@
             <key>devname</key>
             <string>ie15_terminal</string>
           </dict>
-          <dict>
-            <key>value</key>
-            <string>scorpion</string>
-            <key>description</key>
-            <string>Micro-Robotics Scorpion Intelligent Controller</string>
-            <key>devname</key>
-            <string>scorpion_ic</string>
-          </dict>
-          <dict>
-            <key>value</key>
-            <string>nss_tvi</string>
-            <key>description</key>
-            <string>Novag Super System TV Interface</string>
-            <key>devname</key>
-            <string>nss_tvinterface</string>
-          </dict>
           <dict>
             <key>value</key>
             <string>pty</string>
             <key>description</key>
-            <string>Pseudo Terminal</string>
+            <string>Pseudo terminal</string>
             <key>devname</key>
             <string>pseudo_terminal</string>
           </dict>
@@ -358,11 +326,19 @@
             <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>RS-232 Loopback</string>
+            <string>RS232 Loopback</string>
             <key>devname</key>
             <string>rs232_loopback</string>
           </dict>
@@ -370,7 +346,7 @@
             <key>value</key>
             <string>dec_loopback</string>
             <key>description</key>
-            <string>RS-232 Loopback (DEC 12-15336-00)</string>
+            <string>RS232 Loopback (DEC 12-15336-00)</string>
             <key>devname</key>
             <string>dec_rs232_loopback</string>
           </dict>
@@ -378,7 +354,7 @@
             <key>value</key>
             <string>null_modem</string>
             <key>description</key>
-            <string>RS-232 Null Modem</string>
+            <string>RS232 Null Modem</string>
             <key>devname</key>
             <string>null_modem</string>
             <key>media</key>
@@ -387,19 +363,11 @@
               <integer>1</integer>
             </dict>
           </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>rs232_sync_io</string>
             <key>description</key>
-            <string>RS-232 Synchronous I/O</string>
+            <string>RS232 Synchronous I/O</string>
             <key>devname</key>
             <string>rs232_sync_io</string>
             <key>media</key>
@@ -658,27 +626,11 @@
                 <key>default</key>
                 <false/>
               </dict>
-              <dict>
-                <key>value</key>
-                <string>scorpion</string>
-                <key>description</key>
-                <string>Micro-Robotics Scorpion Intelligent Controller</string>
-                <key>default</key>
-                <false/>
-              </dict>
-              <dict>
-                <key>value</key>
-                <string>nss_tvi</string>
-                <key>description</key>
-                <string>Novag Super System TV Interface</string>
-                <key>default</key>
-                <false/>
-              </dict>
               <dict>
                 <key>value</key>
                 <string>pty</string>
                 <key>description</key>
-                <string>Pseudo Terminal</string>
+                <string>Pseudo terminal</string>
                 <key>default</key>
                 <false/>
               </dict>
@@ -690,11 +642,19 @@
                 <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>RS-232 Loopback</string>
+                <string>RS232 Loopback</string>
                 <key>default</key>
                 <false/>
               </dict>
@@ -702,7 +662,7 @@
                 <key>value</key>
                 <string>dec_loopback</string>
                 <key>description</key>
-                <string>RS-232 Loopback (DEC 12-15336-00)</string>
+                <string>RS232 Loopback (DEC 12-15336-00)</string>
                 <key>default</key>
                 <false/>
               </dict>
@@ -710,7 +670,7 @@
                 <key>value</key>
                 <string>null_modem</string>
                 <key>description</key>
-                <string>RS-232 Null Modem</string>
+                <string>RS232 Null Modem</string>
                 <key>default</key>
                 <false/>
                 <key>media</key>
@@ -719,19 +679,11 @@
                   <integer>1</integer>
                 </dict>
               </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>rs232_sync_io</string>
                 <key>description</key>
-                <string>RS-232 Synchronous I/O</string>
+                <string>RS232 Synchronous I/O</string>
                 <key>default</key>
                 <false/>
                 <key>media</key>

Ample/Resources/apple3.plist

@@ -12,7 +12,7 @@
     <key>resolution</key>
     <array>
       <integer>560</integer>
-      <integer>192</integer>
+      <integer>384</integer>
     </array>
     <key>slots</key>
     <array>
@@ -130,7 +130,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 Firmware)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -227,7 +227,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 Firmware)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -324,7 +324,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 Firmware)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -421,7 +421,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 Firmware)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -514,27 +514,11 @@
             <key>devname</key>
             <string>ie15_terminal</string>
           </dict>
-          <dict>
-            <key>value</key>
-            <string>scorpion</string>
-            <key>description</key>
-            <string>Micro-Robotics Scorpion Intelligent Controller</string>
-            <key>devname</key>
-            <string>scorpion_ic</string>
-          </dict>
-          <dict>
-            <key>value</key>
-            <string>nss_tvi</string>
-            <key>description</key>
-            <string>Novag Super System TV Interface</string>
-            <key>devname</key>
-            <string>nss_tvinterface</string>
-          </dict>
           <dict>
             <key>value</key>
             <string>pty</string>
             <key>description</key>
-            <string>Pseudo Terminal</string>
+            <string>Pseudo terminal</string>
             <key>devname</key>
             <string>pseudo_terminal</string>
           </dict>
@@ -546,11 +530,19 @@
             <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>RS-232 Loopback</string>
+            <string>RS232 Loopback</string>
             <key>devname</key>
             <string>rs232_loopback</string>
           </dict>
@@ -558,7 +550,7 @@
             <key>value</key>
             <string>dec_loopback</string>
             <key>description</key>
-            <string>RS-232 Loopback (DEC 12-15336-00)</string>
+            <string>RS232 Loopback (DEC 12-15336-00)</string>
             <key>devname</key>
             <string>dec_rs232_loopback</string>
           </dict>
@@ -566,7 +558,7 @@
             <key>value</key>
             <string>null_modem</string>
             <key>description</key>
-            <string>RS-232 Null Modem</string>
+            <string>RS232 Null Modem</string>
             <key>devname</key>
             <string>null_modem</string>
             <key>media</key>
@@ -575,19 +567,11 @@
               <integer>1</integer>
             </dict>
           </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>rs232_sync_io</string>
             <key>description</key>
-            <string>RS-232 Synchronous I/O</string>
+            <string>RS232 Synchronous I/O</string>
             <key>devname</key>
             <string>rs232_sync_io</string>
             <key>media</key>
@@ -820,22 +804,6 @@
                 <key>default</key>
                 <false/>
               </dict>
-              <dict>
-                <key>value</key>
-                <string>cr589</string>
-                <key>description</key>
-                <string>Matsushita CR589 CD-ROM Drive</string>
-                <key>default</key>
-                <false/>
-              </dict>
-              <dict>
-                <key>value</key>
-                <string>xm3301</string>
-                <key>description</key>
-                <string>Toshiba XM-3301 CD-ROM Drive</string>
-                <key>default</key>
-                <false/>
-              </dict>
             </array>
           </dict>
           <dict>
@@ -885,22 +853,6 @@
                 <key>default</key>
                 <false/>
               </dict>
-              <dict>
-                <key>value</key>
-                <string>cr589</string>
-                <key>description</key>
-                <string>Matsushita CR589 CD-ROM Drive</string>
-                <key>default</key>
-                <false/>
-              </dict>
-              <dict>
-                <key>value</key>
-                <string>xm3301</string>
-                <key>description</key>
-                <string>Toshiba XM-3301 CD-ROM Drive</string>
-                <key>default</key>
-                <false/>
-              </dict>
             </array>
           </dict>
         </array>
@@ -957,22 +909,6 @@
                 <key>default</key>
                 <false/>
               </dict>
-              <dict>
-                <key>value</key>
-                <string>cr589</string>
-                <key>description</key>
-                <string>Matsushita CR589 CD-ROM Drive</string>
-                <key>default</key>
-                <false/>
-              </dict>
-              <dict>
-                <key>value</key>
-                <string>xm3301</string>
-                <key>description</key>
-                <string>Toshiba XM-3301 CD-ROM Drive</string>
-                <key>default</key>
-                <false/>
-              </dict>
             </array>
           </dict>
           <dict>
@@ -1022,22 +958,6 @@
                 <key>default</key>
                 <false/>
               </dict>
-              <dict>
-                <key>value</key>
-                <string>cr589</string>
-                <key>description</key>
-                <string>Matsushita CR589 CD-ROM Drive</string>
-                <key>default</key>
-                <false/>
-              </dict>
-              <dict>
-                <key>value</key>
-                <string>xm3301</string>
-                <key>description</key>
-                <string>Toshiba XM-3301 CD-ROM Drive</string>
-                <key>default</key>
-                <false/>
-              </dict>
             </array>
           </dict>
         </array>
@@ -1047,35 +967,6 @@
         <string>cmsscsi</string>
         <key>slots</key>
         <array>
-          <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>cms3190</string>
-                <key>description</key>
-                <string>CMS SCSI BIOS dated 3-1-90</string>
-              </dict>
-              <dict>
-                <key>value</key>
-                <string>cms871109</string>
-                <key>description</key>
-                <string>CMS SCSI BIOS dated 1987-11-09</string>
-              </dict>
-            </array>
-          </dict>
           <dict>
             <key>name</key>
             <string>:scsibus:0</string>
@@ -1538,27 +1429,11 @@
                 <key>default</key>
                 <false/>
               </dict>
-              <dict>
-                <key>value</key>
-                <string>scorpion</string>
-                <key>description</key>
-                <string>Micro-Robotics Scorpion Intelligent Controller</string>
-                <key>default</key>
-                <false/>
-              </dict>
-              <dict>
-                <key>value</key>
-                <string>nss_tvi</string>
-                <key>description</key>
-                <string>Novag Super System TV Interface</string>
-                <key>default</key>
-                <false/>
-              </dict>
               <dict>
                 <key>value</key>
                 <string>pty</string>
                 <key>description</key>
-                <string>Pseudo Terminal</string>
+                <string>Pseudo terminal</string>
                 <key>default</key>
                 <false/>
               </dict>
@@ -1570,11 +1445,19 @@
                 <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>RS-232 Loopback</string>
+                <string>RS232 Loopback</string>
                 <key>default</key>
                 <false/>
               </dict>
@@ -1582,7 +1465,7 @@
                 <key>value</key>
                 <string>dec_loopback</string>
                 <key>description</key>
-                <string>RS-232 Loopback (DEC 12-15336-00)</string>
+                <string>RS232 Loopback (DEC 12-15336-00)</string>
                 <key>default</key>
                 <false/>
               </dict>
@@ -1590,7 +1473,7 @@
                 <key>value</key>
                 <string>null_modem</string>
                 <key>description</key>
-                <string>RS-232 Null Modem</string>
+                <string>RS232 Null Modem</string>
                 <key>default</key>
                 <false/>
                 <key>media</key>
@@ -1599,19 +1482,11 @@
                   <integer>1</integer>
                 </dict>
               </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>rs232_sync_io</string>
                 <key>description</key>
-                <string>RS-232 Synchronous I/O</string>
+                <string>RS232 Synchronous I/O</string>
                 <key>default</key>
                 <false/>
                 <key>media</key>

Ample/Resources/bbca.plist

@@ -1,482 +0,0 @@
-<?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>bbca</string>
-    <key>description</key>
-    <string>BBC Micro Model A</string>
-    <key>media</key>
-    <dict>
-      <key>cass</key>
-      <integer>1</integer>
-      <key>rom</key>
-      <integer>4</integer>
-    </dict>
-    <key>resolution</key>
-    <array>
-      <integer>640</integer>
-      <integer>256</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>16384</integer>
-            <key>description</key>
-            <string>16K</string>
-            <key>value</key>
-            <string>16K</string>
-            <key>default</key>
-            <true/>
-          </dict>
-          <dict>
-            <key>intValue</key>
-            <integer>32768</integer>
-            <key>description</key>
-            <string>32K</string>
-            <key>value</key>
-            <string>32K</string>
-            <key>default</key>
-            <false/>
-          </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>os12</string>
-            <key>description</key>
-            <string>OS 1.20</string>
-          </dict>
-          <dict>
-            <key>value</key>
-            <string>os10</string>
-            <key>description</key>
-            <string>OS 1.00</string>
-          </dict>
-          <dict>
-            <key>value</key>
-            <string>os09</string>
-            <key>description</key>
-            <string>OS 0.92</string>
-          </dict>
-          <dict>
-            <key>value</key>
-            <string>os01</string>
-            <key>description</key>
-            <string>OS 0.10</string>
-          </dict>
-        </array>
-      </dict>
-      <dict>
-        <key>name</key>
-        <string>rs423</string>
-        <key>description</key>
-        <string>Serial</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>scorpion</string>
-            <key>description</key>
-            <string>Micro-Robotics Scorpion Intelligent Controller</string>
-            <key>devname</key>
-            <string>scorpion_ic</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>loopback</string>
-            <key>description</key>
-            <string>RS-232 Loopback</string>
-            <key>devname</key>
-            <string>rs232_loopback</string>
-          </dict>
-          <dict>
-            <key>value</key>
-            <string>dec_loopback</string>
-            <key>description</key>
-            <string>RS-232 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>RS-232 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>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>rs232_sync_io</string>
-            <key>description</key>
-            <string>RS-232 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>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>scorpion</string>
-                <key>description</key>
-                <string>Micro-Robotics Scorpion Intelligent Controller</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>loopback</string>
-                <key>description</key>
-                <string>RS-232 Loopback</string>
-                <key>default</key>
-                <false/>
-              </dict>
-              <dict>
-                <key>value</key>
-                <string>dec_loopback</string>
-                <key>description</key>
-                <string>RS-232 Loopback (DEC 12-15336-00)</string>
-                <key>default</key>
-                <false/>
-              </dict>
-              <dict>
-                <key>value</key>
-                <string>null_modem</string>
-                <key>description</key>
-                <string>RS-232 Null Modem</string>
-                <key>default</key>
-                <false/>
-                <key>media</key>
-                <dict>
-                  <key>bitbanger</key>
-                  <integer>1</integer>
-                </dict>
-              </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>rs232_sync_io</string>
-                <key>description</key>
-                <string>RS-232 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>
-      <dict>
-        <key>name</key>
-        <string>bbc_cass.xml</string>
-        <key>filter</key>
-        <string>A</string>
-      </dict>
-      <dict>
-        <key>name</key>
-        <string>bbc_rom.xml</string>
-        <key>filter</key>
-        <string>B</string>
-      </dict>
-    </array>
-  </dict>
-</plist>

Ample/Resources/ds2100.plist

@@ -58,19 +58,11 @@
             <key>devname</key>
             <string>ie15_terminal</string>
           </dict>
-          <dict>
-            <key>value</key>
-            <string>scorpion</string>
-            <key>description</key>
-            <string>Micro-Robotics Scorpion Intelligent Controller</string>
-            <key>devname</key>
-            <string>scorpion_ic</string>
-          </dict>
           <dict>
             <key>value</key>
             <string>pty</string>
             <key>description</key>
-            <string>Pseudo Terminal</string>
+            <string>Pseudo terminal</string>
             <key>devname</key>
             <string>pseudo_terminal</string>
           </dict>
@@ -82,11 +74,19 @@
             <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>RS-232 Loopback</string>
+            <string>RS232 Loopback</string>
             <key>devname</key>
             <string>rs232_loopback</string>
           </dict>
@@ -94,7 +94,7 @@
             <key>value</key>
             <string>dec_loopback</string>
             <key>description</key>
-            <string>RS-232 Loopback (DEC 12-15336-00)</string>
+            <string>RS232 Loopback (DEC 12-15336-00)</string>
             <key>devname</key>
             <string>dec_rs232_loopback</string>
           </dict>
@@ -102,7 +102,7 @@
             <key>value</key>
             <string>null_modem</string>
             <key>description</key>
-            <string>RS-232 Null Modem</string>
+            <string>RS232 Null Modem</string>
             <key>devname</key>
             <string>null_modem</string>
             <key>media</key>
@@ -111,19 +111,11 @@
               <integer>1</integer>
             </dict>
           </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>rs232_sync_io</string>
             <key>description</key>
-            <string>RS-232 Synchronous I/O</string>
+            <string>RS232 Synchronous I/O</string>
             <key>devname</key>
             <string>rs232_sync_io</string>
             <key>media</key>
@@ -205,19 +197,11 @@
             <key>devname</key>
             <string>ie15_terminal</string>
           </dict>
-          <dict>
-            <key>value</key>
-            <string>scorpion</string>
-            <key>description</key>
-            <string>Micro-Robotics Scorpion Intelligent Controller</string>
-            <key>devname</key>
-            <string>scorpion_ic</string>
-          </dict>
           <dict>
             <key>value</key>
             <string>pty</string>
             <key>description</key>
-            <string>Pseudo Terminal</string>
+            <string>Pseudo terminal</string>
             <key>devname</key>
             <string>pseudo_terminal</string>
           </dict>
@@ -229,11 +213,19 @@
             <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>RS-232 Loopback</string>
+            <string>RS232 Loopback</string>
             <key>devname</key>
             <string>rs232_loopback</string>
           </dict>
@@ -241,7 +233,7 @@
             <key>value</key>
             <string>dec_loopback</string>
             <key>description</key>
-            <string>RS-232 Loopback (DEC 12-15336-00)</string>
+            <string>RS232 Loopback (DEC 12-15336-00)</string>
             <key>devname</key>
             <string>dec_rs232_loopback</string>
           </dict>
@@ -249,7 +241,7 @@
             <key>value</key>
             <string>null_modem</string>
             <key>description</key>
-            <string>RS-232 Null Modem</string>
+            <string>RS232 Null Modem</string>
             <key>devname</key>
             <string>null_modem</string>
             <key>media</key>
@@ -258,19 +250,11 @@
               <integer>1</integer>
             </dict>
           </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>rs232_sync_io</string>
             <key>description</key>
-            <string>RS-232 Synchronous I/O</string>
+            <string>RS232 Synchronous I/O</string>
             <key>devname</key>
             <string>rs232_sync_io</string>
             <key>media</key>
@@ -611,19 +595,11 @@
                 <key>default</key>
                 <false/>
               </dict>
-              <dict>
-                <key>value</key>
-                <string>scorpion</string>
-                <key>description</key>
-                <string>Micro-Robotics Scorpion Intelligent Controller</string>
-                <key>default</key>
-                <false/>
-              </dict>
               <dict>
                 <key>value</key>
                 <string>pty</string>
                 <key>description</key>
-                <string>Pseudo Terminal</string>
+                <string>Pseudo terminal</string>
                 <key>default</key>
                 <false/>
               </dict>
@@ -635,11 +611,19 @@
                 <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>RS-232 Loopback</string>
+                <string>RS232 Loopback</string>
                 <key>default</key>
                 <false/>
               </dict>
@@ -647,7 +631,7 @@
                 <key>value</key>
                 <string>dec_loopback</string>
                 <key>description</key>
-                <string>RS-232 Loopback (DEC 12-15336-00)</string>
+                <string>RS232 Loopback (DEC 12-15336-00)</string>
                 <key>default</key>
                 <false/>
               </dict>
@@ -655,7 +639,7 @@
                 <key>value</key>
                 <string>null_modem</string>
                 <key>description</key>
-                <string>RS-232 Null Modem</string>
+                <string>RS232 Null Modem</string>
                 <key>default</key>
                 <false/>
                 <key>media</key>
@@ -664,19 +648,11 @@
                   <integer>1</integer>
                 </dict>
               </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>rs232_sync_io</string>
                 <key>description</key>
-                <string>RS-232 Synchronous I/O</string>
+                <string>RS232 Synchronous I/O</string>
                 <key>default</key>
                 <false/>
                 <key>media</key>

Ample/Resources/ds3100.plist

@@ -58,19 +58,11 @@
             <key>devname</key>
             <string>ie15_terminal</string>
           </dict>
-          <dict>
-            <key>value</key>
-            <string>scorpion</string>
-            <key>description</key>
-            <string>Micro-Robotics Scorpion Intelligent Controller</string>
-            <key>devname</key>
-            <string>scorpion_ic</string>
-          </dict>
           <dict>
             <key>value</key>
             <string>pty</string>
             <key>description</key>
-            <string>Pseudo Terminal</string>
+            <string>Pseudo terminal</string>
             <key>devname</key>
             <string>pseudo_terminal</string>
           </dict>
@@ -82,11 +74,19 @@
             <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>RS-232 Loopback</string>
+            <string>RS232 Loopback</string>
             <key>devname</key>
             <string>rs232_loopback</string>
           </dict>
@@ -94,7 +94,7 @@
             <key>value</key>
             <string>dec_loopback</string>
             <key>description</key>
-            <string>RS-232 Loopback (DEC 12-15336-00)</string>
+            <string>RS232 Loopback (DEC 12-15336-00)</string>
             <key>devname</key>
             <string>dec_rs232_loopback</string>
           </dict>
@@ -102,7 +102,7 @@
             <key>value</key>
             <string>null_modem</string>
             <key>description</key>
-            <string>RS-232 Null Modem</string>
+            <string>RS232 Null Modem</string>
             <key>devname</key>
             <string>null_modem</string>
             <key>media</key>
@@ -111,19 +111,11 @@
               <integer>1</integer>
             </dict>
           </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>rs232_sync_io</string>
             <key>description</key>
-            <string>RS-232 Synchronous I/O</string>
+            <string>RS232 Synchronous I/O</string>
             <key>devname</key>
             <string>rs232_sync_io</string>
             <key>media</key>
@@ -205,19 +197,11 @@
             <key>devname</key>
             <string>ie15_terminal</string>
           </dict>
-          <dict>
-            <key>value</key>
-            <string>scorpion</string>
-            <key>description</key>
-            <string>Micro-Robotics Scorpion Intelligent Controller</string>
-            <key>devname</key>
-            <string>scorpion_ic</string>
-          </dict>
           <dict>
             <key>value</key>
             <string>pty</string>
             <key>description</key>
-            <string>Pseudo Terminal</string>
+            <string>Pseudo terminal</string>
             <key>devname</key>
             <string>pseudo_terminal</string>
           </dict>
@@ -229,11 +213,19 @@
             <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>RS-232 Loopback</string>
+            <string>RS232 Loopback</string>
             <key>devname</key>
             <string>rs232_loopback</string>
           </dict>
@@ -241,7 +233,7 @@
             <key>value</key>
             <string>dec_loopback</string>
             <key>description</key>
-            <string>RS-232 Loopback (DEC 12-15336-00)</string>
+            <string>RS232 Loopback (DEC 12-15336-00)</string>
             <key>devname</key>
             <string>dec_rs232_loopback</string>
           </dict>
@@ -249,7 +241,7 @@
             <key>value</key>
             <string>null_modem</string>
             <key>description</key>
-            <string>RS-232 Null Modem</string>
+            <string>RS232 Null Modem</string>
             <key>devname</key>
             <string>null_modem</string>
             <key>media</key>
@@ -258,19 +250,11 @@
               <integer>1</integer>
             </dict>
           </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>rs232_sync_io</string>
             <key>description</key>
-            <string>RS-232 Synchronous I/O</string>
+            <string>RS232 Synchronous I/O</string>
             <key>devname</key>
             <string>rs232_sync_io</string>
             <key>media</key>
@@ -611,19 +595,11 @@
                 <key>default</key>
                 <false/>
               </dict>
-              <dict>
-                <key>value</key>
-                <string>scorpion</string>
-                <key>description</key>
-                <string>Micro-Robotics Scorpion Intelligent Controller</string>
-                <key>default</key>
-                <false/>
-              </dict>
               <dict>
                 <key>value</key>
                 <string>pty</string>
                 <key>description</key>
-                <string>Pseudo Terminal</string>
+                <string>Pseudo terminal</string>
                 <key>default</key>
                 <false/>
               </dict>
@@ -635,11 +611,19 @@
                 <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>RS-232 Loopback</string>
+                <string>RS232 Loopback</string>
                 <key>default</key>
                 <false/>
               </dict>
@@ -647,7 +631,7 @@
                 <key>value</key>
                 <string>dec_loopback</string>
                 <key>description</key>
-                <string>RS-232 Loopback (DEC 12-15336-00)</string>
+                <string>RS232 Loopback (DEC 12-15336-00)</string>
                 <key>default</key>
                 <false/>
               </dict>
@@ -655,7 +639,7 @@
                 <key>value</key>
                 <string>null_modem</string>
                 <key>description</key>
-                <string>RS-232 Null Modem</string>
+                <string>RS232 Null Modem</string>
                 <key>default</key>
                 <false/>
                 <key>media</key>
@@ -664,19 +648,11 @@
                   <integer>1</integer>
                 </dict>
               </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>rs232_sync_io</string>
                 <key>description</key>
-                <string>RS-232 Synchronous I/O</string>
+                <string>RS232 Synchronous I/O</string>
                 <key>default</key>
                 <false/>
                 <key>media</key>

Ample/Resources/ds5k133.plist

@@ -58,19 +58,11 @@
             <key>devname</key>
             <string>ie15_terminal</string>
           </dict>
-          <dict>
-            <key>value</key>
-            <string>scorpion</string>
-            <key>description</key>
-            <string>Micro-Robotics Scorpion Intelligent Controller</string>
-            <key>devname</key>
-            <string>scorpion_ic</string>
-          </dict>
           <dict>
             <key>value</key>
             <string>pty</string>
             <key>description</key>
-            <string>Pseudo Terminal</string>
+            <string>Pseudo terminal</string>
             <key>devname</key>
             <string>pseudo_terminal</string>
           </dict>
@@ -82,11 +74,19 @@
             <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>RS-232 Loopback</string>
+            <string>RS232 Loopback</string>
             <key>devname</key>
             <string>rs232_loopback</string>
           </dict>
@@ -94,7 +94,7 @@
             <key>value</key>
             <string>dec_loopback</string>
             <key>description</key>
-            <string>RS-232 Loopback (DEC 12-15336-00)</string>
+            <string>RS232 Loopback (DEC 12-15336-00)</string>
             <key>devname</key>
             <string>dec_rs232_loopback</string>
           </dict>
@@ -102,7 +102,7 @@
             <key>value</key>
             <string>null_modem</string>
             <key>description</key>
-            <string>RS-232 Null Modem</string>
+            <string>RS232 Null Modem</string>
             <key>devname</key>
             <string>null_modem</string>
             <key>media</key>
@@ -111,19 +111,11 @@
               <integer>1</integer>
             </dict>
           </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>rs232_sync_io</string>
             <key>description</key>
-            <string>RS-232 Synchronous I/O</string>
+            <string>RS232 Synchronous I/O</string>
             <key>devname</key>
             <string>rs232_sync_io</string>
             <key>media</key>
@@ -205,19 +197,11 @@
             <key>devname</key>
             <string>ie15_terminal</string>
           </dict>
-          <dict>
-            <key>value</key>
-            <string>scorpion</string>
-            <key>description</key>
-            <string>Micro-Robotics Scorpion Intelligent Controller</string>
-            <key>devname</key>
-            <string>scorpion_ic</string>
-          </dict>
           <dict>
             <key>value</key>
             <string>pty</string>
             <key>description</key>
-            <string>Pseudo Terminal</string>
+            <string>Pseudo terminal</string>
             <key>devname</key>
             <string>pseudo_terminal</string>
           </dict>
@@ -229,11 +213,19 @@
             <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>RS-232 Loopback</string>
+            <string>RS232 Loopback</string>
             <key>devname</key>
             <string>rs232_loopback</string>
           </dict>
@@ -241,7 +233,7 @@
             <key>value</key>
             <string>dec_loopback</string>
             <key>description</key>
-            <string>RS-232 Loopback (DEC 12-15336-00)</string>
+            <string>RS232 Loopback (DEC 12-15336-00)</string>
             <key>devname</key>
             <string>dec_rs232_loopback</string>
           </dict>
@@ -249,7 +241,7 @@
             <key>value</key>
             <string>null_modem</string>
             <key>description</key>
-            <string>RS-232 Null Modem</string>
+            <string>RS232 Null Modem</string>
             <key>devname</key>
             <string>null_modem</string>
             <key>media</key>
@@ -258,19 +250,11 @@
               <integer>1</integer>
             </dict>
           </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>rs232_sync_io</string>
             <key>description</key>
-            <string>RS-232 Synchronous I/O</string>
+            <string>RS232 Synchronous I/O</string>
             <key>devname</key>
             <string>rs232_sync_io</string>
             <key>media</key>
@@ -652,19 +636,11 @@
                 <key>default</key>
                 <false/>
               </dict>
-              <dict>
-                <key>value</key>
-                <string>scorpion</string>
-                <key>description</key>
-                <string>Micro-Robotics Scorpion Intelligent Controller</string>
-                <key>default</key>
-                <false/>
-              </dict>
               <dict>
                 <key>value</key>
                 <string>pty</string>
                 <key>description</key>
-                <string>Pseudo Terminal</string>
+                <string>Pseudo terminal</string>
                 <key>default</key>
                 <false/>
               </dict>
@@ -676,11 +652,19 @@
                 <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>RS-232 Loopback</string>
+                <string>RS232 Loopback</string>
                 <key>default</key>
                 <false/>
               </dict>
@@ -688,7 +672,7 @@
                 <key>value</key>
                 <string>dec_loopback</string>
                 <key>description</key>
-                <string>RS-232 Loopback (DEC 12-15336-00)</string>
+                <string>RS232 Loopback (DEC 12-15336-00)</string>
                 <key>default</key>
                 <false/>
               </dict>
@@ -696,7 +680,7 @@
                 <key>value</key>
                 <string>null_modem</string>
                 <key>description</key>
-                <string>RS-232 Null Modem</string>
+                <string>RS232 Null Modem</string>
                 <key>default</key>
                 <false/>
                 <key>media</key>
@@ -705,19 +689,11 @@
                   <integer>1</integer>
                 </dict>
               </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>rs232_sync_io</string>
                 <key>description</key>
-                <string>RS-232 Synchronous I/O</string>
+                <string>RS232 Synchronous I/O</string>
                 <key>default</key>
                 <false/>
                 <key>media</key>

Ample/Resources/hp9k310.plist

@@ -35,7 +35,7 @@
             <key>value</key>
             <string>human_interface</string>
             <key>description</key>
-            <string>HP Human Interface Card</string>
+            <string>HP human interface card</string>
             <key>devname</key>
             <string>human_interface</string>
           </dict>
@@ -43,7 +43,7 @@
             <key>value</key>
             <string>98543</string>
             <key>description</key>
-            <string>HP98543 Medium-res Color DIO Video Card</string>
+            <string>HP98543 medium-res color DIO video card</string>
             <key>devname</key>
             <string>dio98543</string>
           </dict>
@@ -51,7 +51,7 @@
             <key>value</key>
             <string>98544</string>
             <key>description</key>
-            <string>HP98544 High-res Monochrome DIO Video Card</string>
+            <string>HP98544 high-res monochrome DIO video card</string>
             <key>default</key>
             <true/>
             <key>devname</key>
@@ -61,7 +61,7 @@
             <key>value</key>
             <string>98603b</string>
             <key>description</key>
-            <string>HP98603 BASIC ROM Card</string>
+            <string>HP98603 BASIC ROM card</string>
             <key>devname</key>
             <string>dio98603b</string>
           </dict>
@@ -69,7 +69,7 @@
             <key>value</key>
             <string>98603a</string>
             <key>description</key>
-            <string>HP98603A BASIC 4.0 ROM Card</string>
+            <string>HP98603A BASIC 4.0 ROM card</string>
             <key>devname</key>
             <string>dio98603a</string>
           </dict>
@@ -77,7 +77,7 @@
             <key>value</key>
             <string>98643</string>
             <key>description</key>
-            <string>HP98643A LANIC Ethernet Card</string>
+            <string>HP98643A LANIC Ethernet card</string>
             <key>devname</key>
             <string>dio98643</string>
           </dict>
@@ -110,7 +110,7 @@
             <key>value</key>
             <string>human_interface</string>
             <key>description</key>
-            <string>HP Human Interface Card</string>
+            <string>HP human interface card</string>
             <key>devname</key>
             <string>human_interface</string>
           </dict>
@@ -118,7 +118,7 @@
             <key>value</key>
             <string>98543</string>
             <key>description</key>
-            <string>HP98543 Medium-res Color DIO Video Card</string>
+            <string>HP98543 medium-res color DIO video card</string>
             <key>devname</key>
             <string>dio98543</string>
           </dict>
@@ -126,7 +126,7 @@
             <key>value</key>
             <string>98544</string>
             <key>description</key>
-            <string>HP98544 High-res Monochrome DIO Video Card</string>
+            <string>HP98544 high-res monochrome DIO video card</string>
             <key>devname</key>
             <string>dio98544</string>
           </dict>
@@ -134,7 +134,7 @@
             <key>value</key>
             <string>98603b</string>
             <key>description</key>
-            <string>HP98603 BASIC ROM Card</string>
+            <string>HP98603 BASIC ROM card</string>
             <key>default</key>
             <true/>
             <key>devname</key>
@@ -144,7 +144,7 @@
             <key>value</key>
             <string>98603a</string>
             <key>description</key>
-            <string>HP98603A BASIC 4.0 ROM Card</string>
+            <string>HP98603A BASIC 4.0 ROM card</string>
             <key>devname</key>
             <string>dio98603a</string>
           </dict>
@@ -152,7 +152,7 @@
             <key>value</key>
             <string>98643</string>
             <key>description</key>
-            <string>HP98643A LANIC Ethernet Card</string>
+            <string>HP98643A LANIC Ethernet card</string>
             <key>devname</key>
             <string>dio98643</string>
           </dict>
@@ -185,7 +185,7 @@
             <key>value</key>
             <string>human_interface</string>
             <key>description</key>
-            <string>HP Human Interface Card</string>
+            <string>HP human interface card</string>
             <key>devname</key>
             <string>human_interface</string>
           </dict>
@@ -201,7 +201,7 @@
             <key>value</key>
             <string>98543</string>
             <key>description</key>
-            <string>HP98543 Medium-res Color DIO Video Card</string>
+            <string>HP98543 medium-res color DIO video card</string>
             <key>devname</key>
             <string>dio98543</string>
           </dict>
@@ -209,7 +209,7 @@
             <key>value</key>
             <string>98544</string>
             <key>description</key>
-            <string>HP98544 High-res Monochrome DIO Video Card</string>
+            <string>HP98544 high-res monochrome DIO video card</string>
             <key>devname</key>
             <string>dio98544</string>
           </dict>
@@ -217,7 +217,7 @@
             <key>value</key>
             <string>98550</string>
             <key>description</key>
-            <string>HP98550A High-res Color DIO Video Card</string>
+            <string>HP98550A high-res color DIO video card</string>
             <key>devname</key>
             <string>dio98550</string>
           </dict>
@@ -225,7 +225,7 @@
             <key>value</key>
             <string>98603b</string>
             <key>description</key>
-            <string>HP98603 BASIC ROM Card</string>
+            <string>HP98603 BASIC ROM card</string>
             <key>devname</key>
             <string>dio98603b</string>
           </dict>
@@ -233,7 +233,7 @@
             <key>value</key>
             <string>98603a</string>
             <key>description</key>
-            <string>HP98603A BASIC 4.0 ROM Card</string>
+            <string>HP98603A BASIC 4.0 ROM card</string>
             <key>devname</key>
             <string>dio98603a</string>
           </dict>
@@ -249,7 +249,7 @@
             <key>value</key>
             <string>98643</string>
             <key>description</key>
-            <string>HP98643A LANIC Ethernet Card</string>
+            <string>HP98643A LANIC Ethernet card</string>
             <key>default</key>
             <true/>
             <key>devname</key>
@@ -284,7 +284,7 @@
             <key>value</key>
             <string>human_interface</string>
             <key>description</key>
-            <string>HP Human Interface Card</string>
+            <string>HP human interface card</string>
             <key>devname</key>
             <string>human_interface</string>
           </dict>
@@ -292,7 +292,7 @@
             <key>value</key>
             <string>98543</string>
             <key>description</key>
-            <string>HP98543 Medium-res Color DIO Video Card</string>
+            <string>HP98543 medium-res color DIO video card</string>
             <key>devname</key>
             <string>dio98543</string>
           </dict>
@@ -300,7 +300,7 @@
             <key>value</key>
             <string>98544</string>
             <key>description</key>
-            <string>HP98544 High-res Monochrome DIO Video Card</string>
+            <string>HP98544 high-res monochrome DIO video card</string>
             <key>devname</key>
             <string>dio98544</string>
           </dict>
@@ -308,7 +308,7 @@
             <key>value</key>
             <string>98603b</string>
             <key>description</key>
-            <string>HP98603 BASIC ROM Card</string>
+            <string>HP98603 BASIC ROM card</string>
             <key>devname</key>
             <string>dio98603b</string>
           </dict>
@@ -316,7 +316,7 @@
             <key>value</key>
             <string>98603a</string>
             <key>description</key>
-            <string>HP98603A BASIC 4.0 ROM Card</string>
+            <string>HP98603A BASIC 4.0 ROM card</string>
             <key>devname</key>
             <string>dio98603a</string>
           </dict>
@@ -324,7 +324,7 @@
             <key>value</key>
             <string>98643</string>
             <key>description</key>
-            <string>HP98643A LANIC Ethernet Card</string>
+            <string>HP98643A LANIC Ethernet card</string>
             <key>devname</key>
             <string>dio98643</string>
           </dict>
@@ -359,7 +359,7 @@
             <key>value</key>
             <string>human_interface</string>
             <key>description</key>
-            <string>HP Human Interface Card</string>
+            <string>HP human interface card</string>
             <key>devname</key>
             <string>human_interface</string>
           </dict>
@@ -367,7 +367,7 @@
             <key>value</key>
             <string>98543</string>
             <key>description</key>
-            <string>HP98543 Medium-res Color DIO Video Card</string>
+            <string>HP98543 medium-res color DIO video card</string>
             <key>devname</key>
             <string>dio98543</string>
           </dict>
@@ -375,7 +375,7 @@
             <key>value</key>
             <string>98544</string>
             <key>description</key>
-            <string>HP98544 High-res Monochrome DIO Video Card</string>
+            <string>HP98544 high-res monochrome DIO video card</string>
             <key>devname</key>
             <string>dio98544</string>
           </dict>
@@ -383,7 +383,7 @@
             <key>value</key>
             <string>98603b</string>
             <key>description</key>
-            <string>HP98603 BASIC ROM Card</string>
+            <string>HP98603 BASIC ROM card</string>
             <key>devname</key>
             <string>dio98603b</string>
           </dict>
@@ -391,7 +391,7 @@
             <key>value</key>
             <string>98603a</string>
             <key>description</key>
-            <string>HP98603A BASIC 4.0 ROM Card</string>
+            <string>HP98603A BASIC 4.0 ROM card</string>
             <key>devname</key>
             <string>dio98603a</string>
           </dict>
@@ -399,7 +399,7 @@
             <key>value</key>
             <string>98643</string>
             <key>description</key>
-            <string>HP98643A LANIC Ethernet Card</string>
+            <string>HP98643A LANIC Ethernet card</string>
             <key>devname</key>
             <string>dio98643</string>
           </dict>
@@ -442,19 +442,11 @@
                 <key>default</key>
                 <false/>
               </dict>
-              <dict>
-                <key>value</key>
-                <string>scorpion</string>
-                <key>description</key>
-                <string>Micro-Robotics Scorpion Intelligent Controller</string>
-                <key>default</key>
-                <false/>
-              </dict>
               <dict>
                 <key>value</key>
                 <string>pty</string>
                 <key>description</key>
-                <string>Pseudo Terminal</string>
+                <string>Pseudo terminal</string>
                 <key>default</key>
                 <false/>
               </dict>
@@ -466,11 +458,19 @@
                 <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>RS-232 Loopback</string>
+                <string>RS232 Loopback</string>
                 <key>default</key>
                 <false/>
               </dict>
@@ -478,7 +478,7 @@
                 <key>value</key>
                 <string>dec_loopback</string>
                 <key>description</key>
-                <string>RS-232 Loopback (DEC 12-15336-00)</string>
+                <string>RS232 Loopback (DEC 12-15336-00)</string>
                 <key>default</key>
                 <false/>
               </dict>
@@ -486,7 +486,7 @@
                 <key>value</key>
                 <string>null_modem</string>
                 <key>description</key>
-                <string>RS-232 Null Modem</string>
+                <string>RS232 Null Modem</string>
                 <key>default</key>
                 <false/>
                 <key>media</key>
@@ -495,19 +495,11 @@
                   <integer>1</integer>
                 </dict>
               </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>rs232_sync_io</string>
                 <key>description</key>
-                <string>RS-232 Synchronous I/O</string>
+                <string>RS232 Synchronous I/O</string>
                 <key>default</key>
                 <false/>
                 <key>media</key>
@@ -1151,19 +1143,11 @@
                 <key>default</key>
                 <false/>
               </dict>
-              <dict>
-                <key>value</key>
-                <string>scorpion</string>
-                <key>description</key>
-                <string>Micro-Robotics Scorpion Intelligent Controller</string>
-                <key>default</key>
-                <false/>
-              </dict>
               <dict>
                 <key>value</key>
                 <string>pty</string>
                 <key>description</key>
-                <string>Pseudo Terminal</string>
+                <string>Pseudo terminal</string>
                 <key>default</key>
                 <false/>
               </dict>
@@ -1175,11 +1159,19 @@
                 <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>RS-232 Loopback</string>
+                <string>RS232 Loopback</string>
                 <key>default</key>
                 <false/>
               </dict>
@@ -1187,7 +1179,7 @@
                 <key>value</key>
                 <string>dec_loopback</string>
                 <key>description</key>
-                <string>RS-232 Loopback (DEC 12-15336-00)</string>
+                <string>RS232 Loopback (DEC 12-15336-00)</string>
                 <key>default</key>
                 <false/>
               </dict>
@@ -1195,7 +1187,7 @@
                 <key>value</key>
                 <string>null_modem</string>
                 <key>description</key>
-                <string>RS-232 Null Modem</string>
+                <string>RS232 Null Modem</string>
                 <key>default</key>
                 <false/>
                 <key>media</key>
@@ -1204,19 +1196,11 @@
                   <integer>1</integer>
                 </dict>
               </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>rs232_sync_io</string>
                 <key>description</key>
-                <string>RS-232 Synchronous I/O</string>
+                <string>RS232 Synchronous I/O</string>
                 <key>default</key>
                 <false/>
                 <key>media</key>

Ample/Resources/hp9k320.plist

@@ -12,7 +12,7 @@
     <key>resolution</key>
     <array>
       <integer>1024</integer>
-      <integer>400</integer>
+      <integer>800</integer>
     </array>
     <key>slots</key>
     <array>
@@ -35,7 +35,7 @@
             <key>value</key>
             <string>human_interface</string>
             <key>description</key>
-            <string>HP Human Interface Card</string>
+            <string>HP human interface card</string>
             <key>devname</key>
             <string>human_interface</string>
           </dict>
@@ -51,7 +51,7 @@
             <key>value</key>
             <string>98543</string>
             <key>description</key>
-            <string>HP98543 Medium-res Color DIO Video Card</string>
+            <string>HP98543 medium-res color DIO video card</string>
             <key>default</key>
             <true/>
             <key>devname</key>
@@ -61,7 +61,7 @@
             <key>value</key>
             <string>98544</string>
             <key>description</key>
-            <string>HP98544 High-res Monochrome DIO Video Card</string>
+            <string>HP98544 high-res monochrome DIO video card</string>
             <key>devname</key>
             <string>dio98544</string>
           </dict>
@@ -69,7 +69,7 @@
             <key>value</key>
             <string>98550</string>
             <key>description</key>
-            <string>HP98550A High-res Color DIO Video Card</string>
+            <string>HP98550A high-res color DIO video card</string>
             <key>devname</key>
             <string>dio98550</string>
           </dict>
@@ -77,7 +77,7 @@
             <key>value</key>
             <string>98603b</string>
             <key>description</key>
-            <string>HP98603 BASIC ROM Card</string>
+            <string>HP98603 BASIC ROM card</string>
             <key>devname</key>
             <string>dio98603b</string>
           </dict>
@@ -85,7 +85,7 @@
             <key>value</key>
             <string>98603a</string>
             <key>description</key>
-            <string>HP98603A BASIC 4.0 ROM Card</string>
+            <string>HP98603A BASIC 4.0 ROM card</string>
             <key>devname</key>
             <string>dio98603a</string>
           </dict>
@@ -101,7 +101,7 @@
             <key>value</key>
             <string>98643</string>
             <key>description</key>
-            <string>HP98643A LANIC Ethernet Card</string>
+            <string>HP98643A LANIC Ethernet card</string>
             <key>devname</key>
             <string>dio98643</string>
           </dict>
@@ -134,7 +134,7 @@
             <key>value</key>
             <string>human_interface</string>
             <key>description</key>
-            <string>HP Human Interface Card</string>
+            <string>HP human interface card</string>
             <key>devname</key>
             <string>human_interface</string>
           </dict>
@@ -150,7 +150,7 @@
             <key>value</key>
             <string>98543</string>
             <key>description</key>
-            <string>HP98543 Medium-res Color DIO Video Card</string>
+            <string>HP98543 medium-res color DIO video card</string>
             <key>devname</key>
             <string>dio98543</string>
           </dict>
@@ -158,7 +158,7 @@
             <key>value</key>
             <string>98544</string>
             <key>description</key>
-            <string>HP98544 High-res Monochrome DIO Video Card</string>
+            <string>HP98544 high-res monochrome DIO video card</string>
             <key>devname</key>
             <string>dio98544</string>
           </dict>
@@ -166,7 +166,7 @@
             <key>value</key>
             <string>98550</string>
             <key>description</key>
-            <string>HP98550A High-res Color DIO Video Card</string>
+            <string>HP98550A high-res color DIO video card</string>
             <key>devname</key>
             <string>dio98550</string>
           </dict>
@@ -174,7 +174,7 @@
             <key>value</key>
             <string>98603b</string>
             <key>description</key>
-            <string>HP98603 BASIC ROM Card</string>
+            <string>HP98603 BASIC ROM card</string>
             <key>default</key>
             <true/>
             <key>devname</key>
@@ -184,7 +184,7 @@
             <key>value</key>
             <string>98603a</string>
             <key>description</key>
-            <string>HP98603A BASIC 4.0 ROM Card</string>
+            <string>HP98603A BASIC 4.0 ROM card</string>
             <key>devname</key>
             <string>dio98603a</string>
           </dict>
@@ -200,7 +200,7 @@
             <key>value</key>
             <string>98643</string>
             <key>description</key>
-            <string>HP98643A LANIC Ethernet Card</string>
+            <string>HP98643A LANIC Ethernet card</string>
             <key>devname</key>
             <string>dio98643</string>
           </dict>
@@ -233,7 +233,7 @@
             <key>value</key>
             <string>human_interface</string>
             <key>description</key>
-            <string>HP Human Interface Card</string>
+            <string>HP human interface card</string>
             <key>devname</key>
             <string>human_interface</string>
           </dict>
@@ -249,7 +249,7 @@
             <key>value</key>
             <string>98543</string>
             <key>description</key>
-            <string>HP98543 Medium-res Color DIO Video Card</string>
+            <string>HP98543 medium-res color DIO video card</string>
             <key>devname</key>
             <string>dio98543</string>
           </dict>
@@ -257,7 +257,7 @@
             <key>value</key>
             <string>98544</string>
             <key>description</key>
-            <string>HP98544 High-res Monochrome DIO Video Card</string>
+            <string>HP98544 high-res monochrome DIO video card</string>
             <key>devname</key>
             <string>dio98544</string>
           </dict>
@@ -265,7 +265,7 @@
             <key>value</key>
             <string>98550</string>
             <key>description</key>
-            <string>HP98550A High-res Color DIO Video Card</string>
+            <string>HP98550A high-res color DIO video card</string>
             <key>devname</key>
             <string>dio98550</string>
           </dict>
@@ -273,7 +273,7 @@
             <key>value</key>
             <string>98603b</string>
             <key>description</key>
-            <string>HP98603 BASIC ROM Card</string>
+            <string>HP98603 BASIC ROM card</string>
             <key>devname</key>
             <string>dio98603b</string>
           </dict>
@@ -281,7 +281,7 @@
             <key>value</key>
             <string>98603a</string>
             <key>description</key>
-            <string>HP98603A BASIC 4.0 ROM Card</string>
+            <string>HP98603A BASIC 4.0 ROM card</string>
             <key>devname</key>
             <string>dio98603a</string>
           </dict>
@@ -297,7 +297,7 @@
             <key>value</key>
             <string>98643</string>
             <key>description</key>
-            <string>HP98643A LANIC Ethernet Card</string>
+            <string>HP98643A LANIC Ethernet card</string>
             <key>devname</key>
             <string>dio98643</string>
           </dict>
@@ -332,7 +332,7 @@
             <key>value</key>
             <string>human_interface</string>
             <key>description</key>
-            <string>HP Human Interface Card</string>
+            <string>HP human interface card</string>
             <key>devname</key>
             <string>human_interface</string>
           </dict>
@@ -348,7 +348,7 @@
             <key>value</key>
             <string>98543</string>
             <key>description</key>
-            <string>HP98543 Medium-res Color DIO Video Card</string>
+            <string>HP98543 medium-res color DIO video card</string>
             <key>devname</key>
             <string>dio98543</string>
           </dict>
@@ -356,7 +356,7 @@
             <key>value</key>
             <string>98544</string>
             <key>description</key>
-            <string>HP98544 High-res Monochrome DIO Video Card</string>
+            <string>HP98544 high-res monochrome DIO video card</string>
             <key>devname</key>
             <string>dio98544</string>
           </dict>
@@ -364,7 +364,7 @@
             <key>value</key>
             <string>98550</string>
             <key>description</key>
-            <string>HP98550A High-res Color DIO Video Card</string>
+            <string>HP98550A high-res color DIO video card</string>
             <key>devname</key>
             <string>dio98550</string>
           </dict>
@@ -372,7 +372,7 @@
             <key>value</key>
             <string>98603b</string>
             <key>description</key>
-            <string>HP98603 BASIC ROM Card</string>
+            <string>HP98603 BASIC ROM card</string>
             <key>devname</key>
             <string>dio98603b</string>
           </dict>
@@ -380,7 +380,7 @@
             <key>value</key>
             <string>98603a</string>
             <key>description</key>
-            <string>HP98603A BASIC 4.0 ROM Card</string>
+            <string>HP98603A BASIC 4.0 ROM card</string>
             <key>devname</key>
             <string>dio98603a</string>
           </dict>
@@ -398,7 +398,7 @@
             <key>value</key>
             <string>98643</string>
             <key>description</key>
-            <string>HP98643A LANIC Ethernet Card</string>
+            <string>HP98643A LANIC Ethernet card</string>
             <key>devname</key>
             <string>dio98643</string>
           </dict>
@@ -431,7 +431,7 @@
             <key>value</key>
             <string>human_interface</string>
             <key>description</key>
-            <string>HP Human Interface Card</string>
+            <string>HP human interface card</string>
             <key>devname</key>
             <string>human_interface</string>
           </dict>
@@ -449,7 +449,7 @@
             <key>value</key>
             <string>98543</string>
             <key>description</key>
-            <string>HP98543 Medium-res Color DIO Video Card</string>
+            <string>HP98543 medium-res color DIO video card</string>
             <key>devname</key>
             <string>dio98543</string>
           </dict>
@@ -457,7 +457,7 @@
             <key>value</key>
             <string>98544</string>
             <key>description</key>
-            <string>HP98544 High-res Monochrome DIO Video Card</string>
+            <string>HP98544 high-res monochrome DIO video card</string>
             <key>devname</key>
             <string>dio98544</string>
           </dict>
@@ -465,7 +465,7 @@
             <key>value</key>
             <string>98550</string>
             <key>description</key>
-            <string>HP98550A High-res Color DIO Video Card</string>
+            <string>HP98550A high-res color DIO video card</string>
             <key>devname</key>
             <string>dio98550</string>
           </dict>
@@ -473,7 +473,7 @@
             <key>value</key>
             <string>98603b</string>
             <key>description</key>
-            <string>HP98603 BASIC ROM Card</string>
+            <string>HP98603 BASIC ROM card</string>
             <key>devname</key>
             <string>dio98603b</string>
           </dict>
@@ -481,7 +481,7 @@
             <key>value</key>
             <string>98603a</string>
             <key>description</key>
-            <string>HP98603A BASIC 4.0 ROM Card</string>
+            <string>HP98603A BASIC 4.0 ROM card</string>
             <key>devname</key>
             <string>dio98603a</string>
           </dict>
@@ -497,7 +497,7 @@
             <key>value</key>
             <string>98643</string>
             <key>description</key>
-            <string>HP98643A LANIC Ethernet Card</string>
+            <string>HP98643A LANIC Ethernet card</string>
             <key>devname</key>
             <string>dio98643</string>
           </dict>
@@ -530,7 +530,7 @@
             <key>value</key>
             <string>human_interface</string>
             <key>description</key>
-            <string>HP Human Interface Card</string>
+            <string>HP human interface card</string>
             <key>devname</key>
             <string>human_interface</string>
           </dict>
@@ -546,7 +546,7 @@
             <key>value</key>
             <string>98543</string>
             <key>description</key>
-            <string>HP98543 Medium-res Color DIO Video Card</string>
+            <string>HP98543 medium-res color DIO video card</string>
             <key>devname</key>
             <string>dio98543</string>
           </dict>
@@ -554,7 +554,7 @@
             <key>value</key>
             <string>98544</string>
             <key>description</key>
-            <string>HP98544 High-res Monochrome DIO Video Card</string>
+            <string>HP98544 high-res monochrome DIO video card</string>
             <key>devname</key>
             <string>dio98544</string>
           </dict>
@@ -562,7 +562,7 @@
             <key>value</key>
             <string>98550</string>
             <key>description</key>
-            <string>HP98550A High-res Color DIO Video Card</string>
+            <string>HP98550A high-res color DIO video card</string>
             <key>devname</key>
             <string>dio98550</string>
           </dict>
@@ -570,7 +570,7 @@
             <key>value</key>
             <string>98603b</string>
             <key>description</key>
-            <string>HP98603 BASIC ROM Card</string>
+            <string>HP98603 BASIC ROM card</string>
             <key>devname</key>
             <string>dio98603b</string>
           </dict>
@@ -578,7 +578,7 @@
             <key>value</key>
             <string>98603a</string>
             <key>description</key>
-            <string>HP98603A BASIC 4.0 ROM Card</string>
+            <string>HP98603A BASIC 4.0 ROM card</string>
             <key>devname</key>
             <string>dio98603a</string>
           </dict>
@@ -594,7 +594,7 @@
             <key>value</key>
             <string>98643</string>
             <key>description</key>
-            <string>HP98643A LANIC Ethernet Card</string>
+            <string>HP98643A LANIC Ethernet card</string>
             <key>devname</key>
             <string>dio98643</string>
           </dict>
@@ -637,19 +637,11 @@
                 <key>default</key>
                 <false/>
               </dict>
-              <dict>
-                <key>value</key>
-                <string>scorpion</string>
-                <key>description</key>
-                <string>Micro-Robotics Scorpion Intelligent Controller</string>
-                <key>default</key>
-                <false/>
-              </dict>
               <dict>
                 <key>value</key>
                 <string>pty</string>
                 <key>description</key>
-                <string>Pseudo Terminal</string>
+                <string>Pseudo terminal</string>
                 <key>default</key>
                 <false/>
               </dict>
@@ -661,11 +653,19 @@
                 <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>RS-232 Loopback</string>
+                <string>RS232 Loopback</string>
                 <key>default</key>
                 <false/>
               </dict>
@@ -673,7 +673,7 @@
                 <key>value</key>
                 <string>dec_loopback</string>
                 <key>description</key>
-                <string>RS-232 Loopback (DEC 12-15336-00)</string>
+                <string>RS232 Loopback (DEC 12-15336-00)</string>
                 <key>default</key>
                 <false/>
               </dict>
@@ -681,7 +681,7 @@
                 <key>value</key>
                 <string>null_modem</string>
                 <key>description</key>
-                <string>RS-232 Null Modem</string>
+                <string>RS232 Null Modem</string>
                 <key>default</key>
                 <false/>
                 <key>media</key>
@@ -690,19 +690,11 @@
                   <integer>1</integer>
                 </dict>
               </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>rs232_sync_io</string>
                 <key>description</key>
-                <string>RS-232 Synchronous I/O</string>
+                <string>RS232 Synchronous I/O</string>
                 <key>default</key>
                 <false/>
                 <key>media</key>
@@ -1346,19 +1338,11 @@
                 <key>default</key>
                 <false/>
               </dict>
-              <dict>
-                <key>value</key>
-                <string>scorpion</string>
-                <key>description</key>
-                <string>Micro-Robotics Scorpion Intelligent Controller</string>
-                <key>default</key>
-                <false/>
-              </dict>
               <dict>
                 <key>value</key>
                 <string>pty</string>
                 <key>description</key>
-                <string>Pseudo Terminal</string>
+                <string>Pseudo terminal</string>
                 <key>default</key>
                 <false/>
               </dict>
@@ -1370,11 +1354,19 @@
                 <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>RS-232 Loopback</string>
+                <string>RS232 Loopback</string>
                 <key>default</key>
                 <false/>
               </dict>
@@ -1382,7 +1374,7 @@
                 <key>value</key>
                 <string>dec_loopback</string>
                 <key>description</key>
-                <string>RS-232 Loopback (DEC 12-15336-00)</string>
+                <string>RS232 Loopback (DEC 12-15336-00)</string>
                 <key>default</key>
                 <false/>
               </dict>
@@ -1390,7 +1382,7 @@
                 <key>value</key>
                 <string>null_modem</string>
                 <key>description</key>
-                <string>RS-232 Null Modem</string>
+                <string>RS232 Null Modem</string>
                 <key>default</key>
                 <false/>
                 <key>media</key>
@@ -1399,19 +1391,11 @@
                   <integer>1</integer>
                 </dict>
               </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>rs232_sync_io</string>
                 <key>description</key>
-                <string>RS-232 Synchronous I/O</string>
+                <string>RS232 Synchronous I/O</string>
                 <key>default</key>
                 <false/>
                 <key>media</key>

Ample/Resources/hp9k330.plist

@@ -35,7 +35,7 @@
             <key>value</key>
             <string>human_interface</string>
             <key>description</key>
-            <string>HP Human Interface Card</string>
+            <string>HP human interface card</string>
             <key>devname</key>
             <string>human_interface</string>
           </dict>
@@ -43,7 +43,7 @@
             <key>value</key>
             <string>98543</string>
             <key>description</key>
-            <string>HP98543 Medium-res Color DIO Video Card</string>
+            <string>HP98543 medium-res color DIO video card</string>
             <key>devname</key>
             <string>dio98543</string>
           </dict>
@@ -51,7 +51,7 @@
             <key>value</key>
             <string>98544</string>
             <key>description</key>
-            <string>HP98544 High-res Monochrome DIO Video Card</string>
+            <string>HP98544 high-res monochrome DIO video card</string>
             <key>default</key>
             <true/>
             <key>devname</key>
@@ -61,7 +61,7 @@
             <key>value</key>
             <string>98603b</string>
             <key>description</key>
-            <string>HP98603 BASIC ROM Card</string>
+            <string>HP98603 BASIC ROM card</string>
             <key>devname</key>
             <string>dio98603b</string>
           </dict>
@@ -69,7 +69,7 @@
             <key>value</key>
             <string>98603a</string>
             <key>description</key>
-            <string>HP98603A BASIC 4.0 ROM Card</string>
+            <string>HP98603A BASIC 4.0 ROM card</string>
             <key>devname</key>
             <string>dio98603a</string>
           </dict>
@@ -77,7 +77,7 @@
             <key>value</key>
             <string>98643</string>
             <key>description</key>
-            <string>HP98643A LANIC Ethernet Card</string>
+            <string>HP98643A LANIC Ethernet card</string>
             <key>devname</key>
             <string>dio98643</string>
           </dict>
@@ -110,7 +110,7 @@
             <key>value</key>
             <string>human_interface</string>
             <key>description</key>
-            <string>HP Human Interface Card</string>
+            <string>HP human interface card</string>
             <key>devname</key>
             <string>human_interface</string>
           </dict>
@@ -118,7 +118,7 @@
             <key>value</key>
             <string>98543</string>
             <key>description</key>
-            <string>HP98543 Medium-res Color DIO Video Card</string>
+            <string>HP98543 medium-res color DIO video card</string>
             <key>devname</key>
             <string>dio98543</string>
           </dict>
@@ -126,7 +126,7 @@
             <key>value</key>
             <string>98544</string>
             <key>description</key>
-            <string>HP98544 High-res Monochrome DIO Video Card</string>
+            <string>HP98544 high-res monochrome DIO video card</string>
             <key>devname</key>
             <string>dio98544</string>
           </dict>
@@ -134,7 +134,7 @@
             <key>value</key>
             <string>98603b</string>
             <key>description</key>
-            <string>HP98603 BASIC ROM Card</string>
+            <string>HP98603 BASIC ROM card</string>
             <key>default</key>
             <true/>
             <key>devname</key>
@@ -144,7 +144,7 @@
             <key>value</key>
             <string>98603a</string>
             <key>description</key>
-            <string>HP98603A BASIC 4.0 ROM Card</string>
+            <string>HP98603A BASIC 4.0 ROM card</string>
             <key>devname</key>
             <string>dio98603a</string>
           </dict>
@@ -152,7 +152,7 @@
             <key>value</key>
             <string>98643</string>
             <key>description</key>
-            <string>HP98643A LANIC Ethernet Card</string>
+            <string>HP98643A LANIC Ethernet card</string>
             <key>devname</key>
             <string>dio98643</string>
           </dict>
@@ -185,7 +185,7 @@
             <key>value</key>
             <string>human_interface</string>
             <key>description</key>
-            <string>HP Human Interface Card</string>
+            <string>HP human interface card</string>
             <key>devname</key>
             <string>human_interface</string>
           </dict>
@@ -193,7 +193,7 @@
             <key>value</key>
             <string>98543</string>
             <key>description</key>
-            <string>HP98543 Medium-res Color DIO Video Card</string>
+            <string>HP98543 medium-res color DIO video card</string>
             <key>devname</key>
             <string>dio98543</string>
           </dict>
@@ -201,7 +201,7 @@
             <key>value</key>
             <string>98544</string>
             <key>description</key>
-            <string>HP98544 High-res Monochrome DIO Video Card</string>
+            <string>HP98544 high-res monochrome DIO video card</string>
             <key>devname</key>
             <string>dio98544</string>
           </dict>
@@ -209,7 +209,7 @@
             <key>value</key>
             <string>98603b</string>
             <key>description</key>
-            <string>HP98603 BASIC ROM Card</string>
+            <string>HP98603 BASIC ROM card</string>
             <key>devname</key>
             <string>dio98603b</string>
           </dict>
@@ -217,7 +217,7 @@
             <key>value</key>
             <string>98603a</string>
             <key>description</key>
-            <string>HP98603A BASIC 4.0 ROM Card</string>
+            <string>HP98603A BASIC 4.0 ROM card</string>
             <key>devname</key>
             <string>dio98603a</string>
           </dict>
@@ -225,7 +225,7 @@
             <key>value</key>
             <string>98643</string>
             <key>description</key>
-            <string>HP98643A LANIC Ethernet Card</string>
+            <string>HP98643A LANIC Ethernet card</string>
             <key>devname</key>
             <string>dio98643</string>
           </dict>
@@ -260,7 +260,7 @@
             <key>value</key>
             <string>human_interface</string>
             <key>description</key>
-            <string>HP Human Interface Card</string>
+            <string>HP human interface card</string>
             <key>devname</key>
             <string>human_interface</string>
           </dict>
@@ -268,7 +268,7 @@
             <key>value</key>
             <string>98543</string>
             <key>description</key>
-            <string>HP98543 Medium-res Color DIO Video Card</string>
+            <string>HP98543 medium-res color DIO video card</string>
             <key>devname</key>
             <string>dio98543</string>
           </dict>
@@ -276,7 +276,7 @@
             <key>value</key>
             <string>98544</string>
             <key>description</key>
-            <string>HP98544 High-res Monochrome DIO Video Card</string>
+            <string>HP98544 high-res monochrome DIO video card</string>
             <key>devname</key>
             <string>dio98544</string>
           </dict>
@@ -284,7 +284,7 @@
             <key>value</key>
             <string>98603b</string>
             <key>description</key>
-            <string>HP98603 BASIC ROM Card</string>
+            <string>HP98603 BASIC ROM card</string>
             <key>devname</key>
             <string>dio98603b</string>
           </dict>
@@ -292,7 +292,7 @@
             <key>value</key>
             <string>98603a</string>
             <key>description</key>
-            <string>HP98603A BASIC 4.0 ROM Card</string>
+            <string>HP98603A BASIC 4.0 ROM card</string>
             <key>devname</key>
             <string>dio98603a</string>
           </dict>
@@ -300,7 +300,7 @@
             <key>value</key>
             <string>98643</string>
             <key>description</key>
-            <string>HP98643A LANIC Ethernet Card</string>
+            <string>HP98643A LANIC Ethernet card</string>
             <key>devname</key>
             <string>dio98643</string>
           </dict>
@@ -343,19 +343,11 @@
                 <key>default</key>
                 <false/>
               </dict>
-              <dict>
-                <key>value</key>
-                <string>scorpion</string>
-                <key>description</key>
-                <string>Micro-Robotics Scorpion Intelligent Controller</string>
-                <key>default</key>
-                <false/>
-              </dict>
               <dict>
                 <key>value</key>
                 <string>pty</string>
                 <key>description</key>
-                <string>Pseudo Terminal</string>
+                <string>Pseudo terminal</string>
                 <key>default</key>
                 <false/>
               </dict>
@@ -367,11 +359,19 @@
                 <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>RS-232 Loopback</string>
+                <string>RS232 Loopback</string>
                 <key>default</key>
                 <false/>
               </dict>
@@ -379,7 +379,7 @@
                 <key>value</key>
                 <string>dec_loopback</string>
                 <key>description</key>
-                <string>RS-232 Loopback (DEC 12-15336-00)</string>
+                <string>RS232 Loopback (DEC 12-15336-00)</string>
                 <key>default</key>
                 <false/>
               </dict>
@@ -387,7 +387,7 @@
                 <key>value</key>
                 <string>null_modem</string>
                 <key>description</key>
-                <string>RS-232 Null Modem</string>
+                <string>RS232 Null Modem</string>
                 <key>default</key>
                 <false/>
                 <key>media</key>
@@ -396,19 +396,11 @@
                   <integer>1</integer>
                 </dict>
               </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>rs232_sync_io</string>
                 <key>description</key>
-                <string>RS-232 Synchronous I/O</string>
+                <string>RS232 Synchronous I/O</string>
                 <key>default</key>
                 <false/>
                 <key>media</key>
@@ -611,19 +603,11 @@
                 <key>default</key>
                 <false/>
               </dict>
-              <dict>
-                <key>value</key>
-                <string>scorpion</string>
-                <key>description</key>
-                <string>Micro-Robotics Scorpion Intelligent Controller</string>
-                <key>default</key>
-                <false/>
-              </dict>
               <dict>
                 <key>value</key>
                 <string>pty</string>
                 <key>description</key>
-                <string>Pseudo Terminal</string>
+                <string>Pseudo terminal</string>
                 <key>default</key>
                 <false/>
               </dict>
@@ -635,11 +619,19 @@
                 <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>RS-232 Loopback</string>
+                <string>RS232 Loopback</string>
                 <key>default</key>
                 <false/>
               </dict>
@@ -647,7 +639,7 @@
                 <key>value</key>
                 <string>dec_loopback</string>
                 <key>description</key>
-                <string>RS-232 Loopback (DEC 12-15336-00)</string>
+                <string>RS232 Loopback (DEC 12-15336-00)</string>
                 <key>default</key>
                 <false/>
               </dict>
@@ -655,7 +647,7 @@
                 <key>value</key>
                 <string>null_modem</string>
                 <key>description</key>
-                <string>RS-232 Null Modem</string>
+                <string>RS232 Null Modem</string>
                 <key>default</key>
                 <false/>
                 <key>media</key>
@@ -664,19 +656,11 @@
                   <integer>1</integer>
                 </dict>
               </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>rs232_sync_io</string>
                 <key>description</key>
-                <string>RS-232 Synchronous I/O</string>
+                <string>RS232 Synchronous I/O</string>
                 <key>default</key>
                 <false/>
                 <key>media</key>

Ample/Resources/hp9k332.plist

@@ -12,7 +12,7 @@
     <key>resolution</key>
     <array>
       <integer>1024</integer>
-      <integer>400</integer>
+      <integer>800</integer>
     </array>
     <key>slots</key>
     <array>
@@ -35,7 +35,7 @@
             <key>value</key>
             <string>human_interface</string>
             <key>description</key>
-            <string>HP Human Interface Card</string>
+            <string>HP human interface card</string>
             <key>devname</key>
             <string>human_interface</string>
           </dict>
@@ -43,7 +43,7 @@
             <key>value</key>
             <string>98543</string>
             <key>description</key>
-            <string>HP98543 Medium-res Color DIO Video Card</string>
+            <string>HP98543 medium-res color DIO video card</string>
             <key>devname</key>
             <string>dio98543</string>
           </dict>
@@ -51,7 +51,7 @@
             <key>value</key>
             <string>98544</string>
             <key>description</key>
-            <string>HP98544 High-res Monochrome DIO Video Card</string>
+            <string>HP98544 high-res monochrome DIO video card</string>
             <key>devname</key>
             <string>dio98544</string>
           </dict>
@@ -59,7 +59,7 @@
             <key>value</key>
             <string>98603b</string>
             <key>description</key>
-            <string>HP98603 BASIC ROM Card</string>
+            <string>HP98603 BASIC ROM card</string>
             <key>default</key>
             <true/>
             <key>devname</key>
@@ -69,7 +69,7 @@
             <key>value</key>
             <string>98603a</string>
             <key>description</key>
-            <string>HP98603A BASIC 4.0 ROM Card</string>
+            <string>HP98603A BASIC 4.0 ROM card</string>
             <key>devname</key>
             <string>dio98603a</string>
           </dict>
@@ -77,7 +77,7 @@
             <key>value</key>
             <string>98643</string>
             <key>description</key>
-            <string>HP98643A LANIC Ethernet Card</string>
+            <string>HP98643A LANIC Ethernet card</string>
             <key>devname</key>
             <string>dio98643</string>
           </dict>
@@ -110,7 +110,7 @@
             <key>value</key>
             <string>human_interface</string>
             <key>description</key>
-            <string>HP Human Interface Card</string>
+            <string>HP human interface card</string>
             <key>devname</key>
             <string>human_interface</string>
           </dict>
@@ -118,7 +118,7 @@
             <key>value</key>
             <string>98543</string>
             <key>description</key>
-            <string>HP98543 Medium-res Color DIO Video Card</string>
+            <string>HP98543 medium-res color DIO video card</string>
             <key>devname</key>
             <string>dio98543</string>
           </dict>
@@ -126,7 +126,7 @@
             <key>value</key>
             <string>98544</string>
             <key>description</key>
-            <string>HP98544 High-res Monochrome DIO Video Card</string>
+            <string>HP98544 high-res monochrome DIO video card</string>
             <key>devname</key>
             <string>dio98544</string>
           </dict>
@@ -134,7 +134,7 @@
             <key>value</key>
             <string>98603b</string>
             <key>description</key>
-            <string>HP98603 BASIC ROM Card</string>
+            <string>HP98603 BASIC ROM card</string>
             <key>devname</key>
             <string>dio98603b</string>
           </dict>
@@ -142,7 +142,7 @@
             <key>value</key>
             <string>98603a</string>
             <key>description</key>
-            <string>HP98603A BASIC 4.0 ROM Card</string>
+            <string>HP98603A BASIC 4.0 ROM card</string>
             <key>devname</key>
             <string>dio98603a</string>
           </dict>
@@ -150,7 +150,7 @@
             <key>value</key>
             <string>98643</string>
             <key>description</key>
-            <string>HP98643A LANIC Ethernet Card</string>
+            <string>HP98643A LANIC Ethernet card</string>
             <key>devname</key>
             <string>dio98643</string>
           </dict>
@@ -185,7 +185,7 @@
             <key>value</key>
             <string>human_interface</string>
             <key>description</key>
-            <string>HP Human Interface Card</string>
+            <string>HP human interface card</string>
             <key>devname</key>
             <string>human_interface</string>
           </dict>
@@ -193,7 +193,7 @@
             <key>value</key>
             <string>98543</string>
             <key>description</key>
-            <string>HP98543 Medium-res Color DIO Video Card</string>
+            <string>HP98543 medium-res color DIO video card</string>
             <key>default</key>
             <true/>
             <key>devname</key>
@@ -203,7 +203,7 @@
             <key>value</key>
             <string>98544</string>
             <key>description</key>
-            <string>HP98544 High-res Monochrome DIO Video Card</string>
+            <string>HP98544 high-res monochrome DIO video card</string>
             <key>devname</key>
             <string>dio98544</string>
           </dict>
@@ -211,7 +211,7 @@
             <key>value</key>
             <string>98603b</string>
             <key>description</key>
-            <string>HP98603 BASIC ROM Card</string>
+            <string>HP98603 BASIC ROM card</string>
             <key>devname</key>
             <string>dio98603b</string>
           </dict>
@@ -219,7 +219,7 @@
             <key>value</key>
             <string>98603a</string>
             <key>description</key>
-            <string>HP98603A BASIC 4.0 ROM Card</string>
+            <string>HP98603A BASIC 4.0 ROM card</string>
             <key>devname</key>
             <string>dio98603a</string>
           </dict>
@@ -227,7 +227,7 @@
             <key>value</key>
             <string>98643</string>
             <key>description</key>
-            <string>HP98643A LANIC Ethernet Card</string>
+            <string>HP98643A LANIC Ethernet card</string>
             <key>devname</key>
             <string>dio98643</string>
           </dict>
@@ -260,7 +260,7 @@
             <key>value</key>
             <string>human_interface</string>
             <key>description</key>
-            <string>HP Human Interface Card</string>
+            <string>HP human interface card</string>
             <key>devname</key>
             <string>human_interface</string>
           </dict>
@@ -268,7 +268,7 @@
             <key>value</key>
             <string>98543</string>
             <key>description</key>
-            <string>HP98543 Medium-res Color DIO Video Card</string>
+            <string>HP98543 medium-res color DIO video card</string>
             <key>devname</key>
             <string>dio98543</string>
           </dict>
@@ -276,7 +276,7 @@
             <key>value</key>
             <string>98544</string>
             <key>description</key>
-            <string>HP98544 High-res Monochrome DIO Video Card</string>
+            <string>HP98544 high-res monochrome DIO video card</string>
             <key>devname</key>
             <string>dio98544</string>
           </dict>
@@ -284,7 +284,7 @@
             <key>value</key>
             <string>98603b</string>
             <key>description</key>
-            <string>HP98603 BASIC ROM Card</string>
+            <string>HP98603 BASIC ROM card</string>
             <key>devname</key>
             <string>dio98603b</string>
           </dict>
@@ -292,7 +292,7 @@
             <key>value</key>
             <string>98603a</string>
             <key>description</key>
-            <string>HP98603A BASIC 4.0 ROM Card</string>
+            <string>HP98603A BASIC 4.0 ROM card</string>
             <key>devname</key>
             <string>dio98603a</string>
           </dict>
@@ -300,7 +300,7 @@
             <key>value</key>
             <string>98643</string>
             <key>description</key>
-            <string>HP98643A LANIC Ethernet Card</string>
+            <string>HP98643A LANIC Ethernet card</string>
             <key>devname</key>
             <string>dio98643</string>
           </dict>
@@ -343,19 +343,11 @@
                 <key>default</key>
                 <false/>
               </dict>
-              <dict>
-                <key>value</key>
-                <string>scorpion</string>
-                <key>description</key>
-                <string>Micro-Robotics Scorpion Intelligent Controller</string>
-                <key>default</key>
-                <false/>
-              </dict>
               <dict>
                 <key>value</key>
                 <string>pty</string>
                 <key>description</key>
-                <string>Pseudo Terminal</string>
+                <string>Pseudo terminal</string>
                 <key>default</key>
                 <false/>
               </dict>
@@ -367,11 +359,19 @@
                 <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>RS-232 Loopback</string>
+                <string>RS232 Loopback</string>
                 <key>default</key>
                 <false/>
               </dict>
@@ -379,7 +379,7 @@
                 <key>value</key>
                 <string>dec_loopback</string>
                 <key>description</key>
-                <string>RS-232 Loopback (DEC 12-15336-00)</string>
+                <string>RS232 Loopback (DEC 12-15336-00)</string>
                 <key>default</key>
                 <false/>
               </dict>
@@ -387,7 +387,7 @@
                 <key>value</key>
                 <string>null_modem</string>
                 <key>description</key>
-                <string>RS-232 Null Modem</string>
+                <string>RS232 Null Modem</string>
                 <key>default</key>
                 <false/>
                 <key>media</key>
@@ -396,19 +396,11 @@
                   <integer>1</integer>
                 </dict>
               </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>rs232_sync_io</string>
                 <key>description</key>
-                <string>RS-232 Synchronous I/O</string>
+                <string>RS232 Synchronous I/O</string>
                 <key>default</key>
                 <false/>
                 <key>media</key>
@@ -611,19 +603,11 @@
                 <key>default</key>
                 <false/>
               </dict>
-              <dict>
-                <key>value</key>
-                <string>scorpion</string>
-                <key>description</key>
-                <string>Micro-Robotics Scorpion Intelligent Controller</string>
-                <key>default</key>
-                <false/>
-              </dict>
               <dict>
                 <key>value</key>
                 <string>pty</string>
                 <key>description</key>
-                <string>Pseudo Terminal</string>
+                <string>Pseudo terminal</string>
                 <key>default</key>
                 <false/>
               </dict>
@@ -635,11 +619,19 @@
                 <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>RS-232 Loopback</string>
+                <string>RS232 Loopback</string>
                 <key>default</key>
                 <false/>
               </dict>
@@ -647,7 +639,7 @@
                 <key>value</key>
                 <string>dec_loopback</string>
                 <key>description</key>
-                <string>RS-232 Loopback (DEC 12-15336-00)</string>
+                <string>RS232 Loopback (DEC 12-15336-00)</string>
                 <key>default</key>
                 <false/>
               </dict>
@@ -655,7 +647,7 @@
                 <key>value</key>
                 <string>null_modem</string>
                 <key>description</key>
-                <string>RS-232 Null Modem</string>
+                <string>RS232 Null Modem</string>
                 <key>default</key>
                 <false/>
                 <key>media</key>
@@ -664,19 +656,11 @@
                   <integer>1</integer>
                 </dict>
               </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>rs232_sync_io</string>
                 <key>description</key>
-                <string>RS-232 Synchronous I/O</string>
+                <string>RS232 Synchronous I/O</string>
                 <key>default</key>
                 <false/>
                 <key>media</key>

Ample/Resources/hp9k340.plist

@@ -12,7 +12,7 @@
     <key>resolution</key>
     <array>
       <integer>1024</integer>
-      <integer>400</integer>
+      <integer>800</integer>
     </array>
     <key>slots</key>
     <array>
@@ -35,7 +35,7 @@
             <key>value</key>
             <string>human_interface</string>
             <key>description</key>
-            <string>HP Human Interface Card</string>
+            <string>HP human interface card</string>
             <key>devname</key>
             <string>human_interface</string>
           </dict>
@@ -51,7 +51,7 @@
             <key>value</key>
             <string>98543</string>
             <key>description</key>
-            <string>HP98543 Medium-res Color DIO Video Card</string>
+            <string>HP98543 medium-res color DIO video card</string>
             <key>default</key>
             <true/>
             <key>devname</key>
@@ -61,7 +61,7 @@
             <key>value</key>
             <string>98544</string>
             <key>description</key>
-            <string>HP98544 High-res Monochrome DIO Video Card</string>
+            <string>HP98544 high-res monochrome DIO video card</string>
             <key>devname</key>
             <string>dio98544</string>
           </dict>
@@ -69,7 +69,7 @@
             <key>value</key>
             <string>98550</string>
             <key>description</key>
-            <string>HP98550A High-res Color DIO Video Card</string>
+            <string>HP98550A high-res color DIO video card</string>
             <key>devname</key>
             <string>dio98550</string>
           </dict>
@@ -77,7 +77,7 @@
             <key>value</key>
             <string>98603b</string>
             <key>description</key>
-            <string>HP98603 BASIC ROM Card</string>
+            <string>HP98603 BASIC ROM card</string>
             <key>devname</key>
             <string>dio98603b</string>
           </dict>
@@ -85,7 +85,7 @@
             <key>value</key>
             <string>98603a</string>
             <key>description</key>
-            <string>HP98603A BASIC 4.0 ROM Card</string>
+            <string>HP98603A BASIC 4.0 ROM card</string>
             <key>devname</key>
             <string>dio98603a</string>
           </dict>
@@ -101,7 +101,7 @@
             <key>value</key>
             <string>98643</string>
             <key>description</key>
-            <string>HP98643A LANIC Ethernet Card</string>
+            <string>HP98643A LANIC Ethernet card</string>
             <key>devname</key>
             <string>dio98643</string>
           </dict>
@@ -134,7 +134,7 @@
             <key>value</key>
             <string>human_interface</string>
             <key>description</key>
-            <string>HP Human Interface Card</string>
+            <string>HP human interface card</string>
             <key>devname</key>
             <string>human_interface</string>
           </dict>
@@ -150,7 +150,7 @@
             <key>value</key>
             <string>98543</string>
             <key>description</key>
-            <string>HP98543 Medium-res Color DIO Video Card</string>
+            <string>HP98543 medium-res color DIO video card</string>
             <key>devname</key>
             <string>dio98543</string>
           </dict>
@@ -158,7 +158,7 @@
             <key>value</key>
             <string>98544</string>
             <key>description</key>
-            <string>HP98544 High-res Monochrome DIO Video Card</string>
+            <string>HP98544 high-res monochrome DIO video card</string>
             <key>devname</key>
             <string>dio98544</string>
           </dict>
@@ -166,7 +166,7 @@
             <key>value</key>
             <string>98550</string>
             <key>description</key>
-            <string>HP98550A High-res Color DIO Video Card</string>
+            <string>HP98550A high-res color DIO video card</string>
             <key>devname</key>
             <string>dio98550</string>
           </dict>
@@ -174,7 +174,7 @@
             <key>value</key>
             <string>98603b</string>
             <key>description</key>
-            <string>HP98603 BASIC ROM Card</string>
+            <string>HP98603 BASIC ROM card</string>
             <key>default</key>
             <true/>
             <key>devname</key>
@@ -184,7 +184,7 @@
             <key>value</key>
             <string>98603a</string>
             <key>description</key>
-            <string>HP98603A BASIC 4.0 ROM Card</string>
+            <string>HP98603A BASIC 4.0 ROM card</string>
             <key>devname</key>
             <string>dio98603a</string>
           </dict>
@@ -200,7 +200,7 @@
             <key>value</key>
             <string>98643</string>
             <key>description</key>
-            <string>HP98643A LANIC Ethernet Card</string>
+            <string>HP98643A LANIC Ethernet card</string>
             <key>devname</key>
             <string>dio98643</string>
           </dict>
@@ -233,7 +233,7 @@
             <key>value</key>
             <string>human_interface</string>
             <key>description</key>
-            <string>HP Human Interface Card</string>
+            <string>HP human interface card</string>
             <key>devname</key>
             <string>human_interface</string>
           </dict>
@@ -249,7 +249,7 @@
             <key>value</key>
             <string>98543</string>
             <key>description</key>
-            <string>HP98543 Medium-res Color DIO Video Card</string>
+            <string>HP98543 medium-res color DIO video card</string>
             <key>devname</key>
             <string>dio98543</string>
           </dict>
@@ -257,7 +257,7 @@
             <key>value</key>
             <string>98544</string>
             <key>description</key>
-            <string>HP98544 High-res Monochrome DIO Video Card</string>
+            <string>HP98544 high-res monochrome DIO video card</string>
             <key>devname</key>
             <string>dio98544</string>
           </dict>
@@ -265,7 +265,7 @@
             <key>value</key>
             <string>98550</string>
             <key>description</key>
-            <string>HP98550A High-res Color DIO Video Card</string>
+            <string>HP98550A high-res color DIO video card</string>
             <key>devname</key>
             <string>dio98550</string>
           </dict>
@@ -273,7 +273,7 @@
             <key>value</key>
             <string>98603b</string>
             <key>description</key>
-            <string>HP98603 BASIC ROM Card</string>
+            <string>HP98603 BASIC ROM card</string>
             <key>devname</key>
             <string>dio98603b</string>
           </dict>
@@ -281,7 +281,7 @@
             <key>value</key>
             <string>98603a</string>
             <key>description</key>
-            <string>HP98603A BASIC 4.0 ROM Card</string>
+            <string>HP98603A BASIC 4.0 ROM card</string>
             <key>devname</key>
             <string>dio98603a</string>
           </dict>
@@ -297,7 +297,7 @@
             <key>value</key>
             <string>98643</string>
             <key>description</key>
-            <string>HP98643A LANIC Ethernet Card</string>
+            <string>HP98643A LANIC Ethernet card</string>
             <key>devname</key>
             <string>dio98643</string>
           </dict>
@@ -332,7 +332,7 @@
             <key>value</key>
             <string>human_interface</string>
             <key>description</key>
-            <string>HP Human Interface Card</string>
+            <string>HP human interface card</string>
             <key>devname</key>
             <string>human_interface</string>
           </dict>
@@ -348,7 +348,7 @@
             <key>value</key>
             <string>98543</string>
             <key>description</key>
-            <string>HP98543 Medium-res Color DIO Video Card</string>
+            <string>HP98543 medium-res color DIO video card</string>
             <key>devname</key>
             <string>dio98543</string>
           </dict>
@@ -356,7 +356,7 @@
             <key>value</key>
             <string>98544</string>
             <key>description</key>
-            <string>HP98544 High-res Monochrome DIO Video Card</string>
+            <string>HP98544 high-res monochrome DIO video card</string>
             <key>devname</key>
             <string>dio98544</string>
           </dict>
@@ -364,7 +364,7 @@
             <key>value</key>
             <string>98550</string>
             <key>description</key>
-            <string>HP98550A High-res Color DIO Video Card</string>
+            <string>HP98550A high-res color DIO video card</string>
             <key>devname</key>
             <string>dio98550</string>
           </dict>
@@ -372,7 +372,7 @@
             <key>value</key>
             <string>98603b</string>
             <key>description</key>
-            <string>HP98603 BASIC ROM Card</string>
+            <string>HP98603 BASIC ROM card</string>
             <key>devname</key>
             <string>dio98603b</string>
           </dict>
@@ -380,7 +380,7 @@
             <key>value</key>
             <string>98603a</string>
             <key>description</key>
-            <string>HP98603A BASIC 4.0 ROM Card</string>
+            <string>HP98603A BASIC 4.0 ROM card</string>
             <key>devname</key>
             <string>dio98603a</string>
           </dict>
@@ -398,7 +398,7 @@
             <key>value</key>
             <string>98643</string>
             <key>description</key>
-            <string>HP98643A LANIC Ethernet Card</string>
+            <string>HP98643A LANIC Ethernet card</string>
             <key>devname</key>
             <string>dio98643</string>
           </dict>
@@ -431,7 +431,7 @@
             <key>value</key>
             <string>human_interface</string>
             <key>description</key>
-            <string>HP Human Interface Card</string>
+            <string>HP human interface card</string>
             <key>devname</key>
             <string>human_interface</string>
           </dict>
@@ -449,7 +449,7 @@
             <key>value</key>
             <string>98543</string>
             <key>description</key>
-            <string>HP98543 Medium-res Color DIO Video Card</string>
+            <string>HP98543 medium-res color DIO video card</string>
             <key>devname</key>
             <string>dio98543</string>
           </dict>
@@ -457,7 +457,7 @@
             <key>value</key>
             <string>98544</string>
             <key>description</key>
-            <string>HP98544 High-res Monochrome DIO Video Card</string>
+            <string>HP98544 high-res monochrome DIO video card</string>
             <key>devname</key>
             <string>dio98544</string>
           </dict>
@@ -465,7 +465,7 @@
             <key>value</key>
             <string>98550</string>
             <key>description</key>
-            <string>HP98550A High-res Color DIO Video Card</string>
+            <string>HP98550A high-res color DIO video card</string>
             <key>devname</key>
             <string>dio98550</string>
           </dict>
@@ -473,7 +473,7 @@
             <key>value</key>
             <string>98603b</string>
             <key>description</key>
-            <string>HP98603 BASIC ROM Card</string>
+            <string>HP98603 BASIC ROM card</string>
             <key>devname</key>
             <string>dio98603b</string>
           </dict>
@@ -481,7 +481,7 @@
             <key>value</key>
             <string>98603a</string>
             <key>description</key>
-            <string>HP98603A BASIC 4.0 ROM Card</string>
+            <string>HP98603A BASIC 4.0 ROM card</string>
             <key>devname</key>
             <string>dio98603a</string>
           </dict>
@@ -497,7 +497,7 @@
             <key>value</key>
             <string>98643</string>
             <key>description</key>
-            <string>HP98643A LANIC Ethernet Card</string>
+            <string>HP98643A LANIC Ethernet card</string>
             <key>devname</key>
             <string>dio98643</string>
           </dict>
@@ -530,7 +530,7 @@
             <key>value</key>
             <string>human_interface</string>
             <key>description</key>
-            <string>HP Human Interface Card</string>
+            <string>HP human interface card</string>
             <key>devname</key>
             <string>human_interface</string>
           </dict>
@@ -546,7 +546,7 @@
             <key>value</key>
             <string>98543</string>
             <key>description</key>
-            <string>HP98543 Medium-res Color DIO Video Card</string>
+            <string>HP98543 medium-res color DIO video card</string>
             <key>devname</key>
             <string>dio98543</string>
           </dict>
@@ -554,7 +554,7 @@
             <key>value</key>
             <string>98544</string>
             <key>description</key>
-            <string>HP98544 High-res Monochrome DIO Video Card</string>
+            <string>HP98544 high-res monochrome DIO video card</string>
             <key>devname</key>
             <string>dio98544</string>
           </dict>
@@ -562,7 +562,7 @@
             <key>value</key>
             <string>98550</string>
             <key>description</key>
-            <string>HP98550A High-res Color DIO Video Card</string>
+            <string>HP98550A high-res color DIO video card</string>
             <key>devname</key>
             <string>dio98550</string>
           </dict>
@@ -570,7 +570,7 @@
             <key>value</key>
             <string>98603b</string>
             <key>description</key>
-            <string>HP98603 BASIC ROM Card</string>
+            <string>HP98603 BASIC ROM card</string>
             <key>devname</key>
             <string>dio98603b</string>
           </dict>
@@ -578,7 +578,7 @@
             <key>value</key>
             <string>98603a</string>
             <key>description</key>
-            <string>HP98603A BASIC 4.0 ROM Card</string>
+            <string>HP98603A BASIC 4.0 ROM card</string>
             <key>devname</key>
             <string>dio98603a</string>
           </dict>
@@ -594,7 +594,7 @@
             <key>value</key>
             <string>98643</string>
             <key>description</key>
-            <string>HP98643A LANIC Ethernet Card</string>
+            <string>HP98643A LANIC Ethernet card</string>
             <key>devname</key>
             <string>dio98643</string>
           </dict>
@@ -637,19 +637,11 @@
                 <key>default</key>
                 <false/>
               </dict>
-              <dict>
-                <key>value</key>
-                <string>scorpion</string>
-                <key>description</key>
-                <string>Micro-Robotics Scorpion Intelligent Controller</string>
-                <key>default</key>
-                <false/>
-              </dict>
               <dict>
                 <key>value</key>
                 <string>pty</string>
                 <key>description</key>
-                <string>Pseudo Terminal</string>
+                <string>Pseudo terminal</string>
                 <key>default</key>
                 <false/>
               </dict>
@@ -661,11 +653,19 @@
                 <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>RS-232 Loopback</string>
+                <string>RS232 Loopback</string>
                 <key>default</key>
                 <false/>
               </dict>
@@ -673,7 +673,7 @@
                 <key>value</key>
                 <string>dec_loopback</string>
                 <key>description</key>
-                <string>RS-232 Loopback (DEC 12-15336-00)</string>
+                <string>RS232 Loopback (DEC 12-15336-00)</string>
                 <key>default</key>
                 <false/>
               </dict>
@@ -681,7 +681,7 @@
                 <key>value</key>
                 <string>null_modem</string>
                 <key>description</key>
-                <string>RS-232 Null Modem</string>
+                <string>RS232 Null Modem</string>
                 <key>default</key>
                 <false/>
                 <key>media</key>
@@ -690,19 +690,11 @@
                   <integer>1</integer>
                 </dict>
               </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>rs232_sync_io</string>
                 <key>description</key>
-                <string>RS-232 Synchronous I/O</string>
+                <string>RS232 Synchronous I/O</string>
                 <key>default</key>
                 <false/>
                 <key>media</key>
@@ -1346,19 +1338,11 @@
                 <key>default</key>
                 <false/>
               </dict>
-              <dict>
-                <key>value</key>
-                <string>scorpion</string>
-                <key>description</key>
-                <string>Micro-Robotics Scorpion Intelligent Controller</string>
-                <key>default</key>
-                <false/>
-              </dict>
               <dict>
                 <key>value</key>
                 <string>pty</string>
                 <key>description</key>
-                <string>Pseudo Terminal</string>
+                <string>Pseudo terminal</string>
                 <key>default</key>
                 <false/>
               </dict>
@@ -1370,11 +1354,19 @@
                 <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>RS-232 Loopback</string>
+                <string>RS232 Loopback</string>
                 <key>default</key>
                 <false/>
               </dict>
@@ -1382,7 +1374,7 @@
                 <key>value</key>
                 <string>dec_loopback</string>
                 <key>description</key>
-                <string>RS-232 Loopback (DEC 12-15336-00)</string>
+                <string>RS232 Loopback (DEC 12-15336-00)</string>
                 <key>default</key>
                 <false/>
               </dict>
@@ -1390,7 +1382,7 @@
                 <key>value</key>
                 <string>null_modem</string>
                 <key>description</key>
-                <string>RS-232 Null Modem</string>
+                <string>RS232 Null Modem</string>
                 <key>default</key>
                 <false/>
                 <key>media</key>
@@ -1399,19 +1391,11 @@
                   <integer>1</integer>
                 </dict>
               </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>rs232_sync_io</string>
                 <key>description</key>
-                <string>RS-232 Synchronous I/O</string>
+                <string>RS232 Synchronous I/O</string>
                 <key>default</key>
                 <false/>
                 <key>media</key>

Ample/Resources/hp9k360.plist

@@ -35,7 +35,7 @@
             <key>value</key>
             <string>human_interface</string>
             <key>description</key>
-            <string>HP Human Interface Card</string>
+            <string>HP human interface card</string>
             <key>devname</key>
             <string>human_interface</string>
           </dict>
@@ -51,7 +51,7 @@
             <key>value</key>
             <string>98543</string>
             <key>description</key>
-            <string>HP98543 Medium-res Color DIO Video Card</string>
+            <string>HP98543 medium-res color DIO video card</string>
             <key>devname</key>
             <string>dio98543</string>
           </dict>
@@ -59,7 +59,7 @@
             <key>value</key>
             <string>98544</string>
             <key>description</key>
-            <string>HP98544 High-res Monochrome DIO Video Card</string>
+            <string>HP98544 high-res monochrome DIO video card</string>
             <key>devname</key>
             <string>dio98544</string>
           </dict>
@@ -67,7 +67,7 @@
             <key>value</key>
             <string>98550</string>
             <key>description</key>
-            <string>HP98550A High-res Color DIO Video Card</string>
+            <string>HP98550A high-res color DIO video card</string>
             <key>default</key>
             <true/>
             <key>devname</key>
@@ -77,7 +77,7 @@
             <key>value</key>
             <string>98603b</string>
             <key>description</key>
-            <string>HP98603 BASIC ROM Card</string>
+            <string>HP98603 BASIC ROM card</string>
             <key>devname</key>
             <string>dio98603b</string>
           </dict>
@@ -85,7 +85,7 @@
             <key>value</key>
             <string>98603a</string>
             <key>description</key>
-            <string>HP98603A BASIC 4.0 ROM Card</string>
+            <string>HP98603A BASIC 4.0 ROM card</string>
             <key>devname</key>
             <string>dio98603a</string>
           </dict>
@@ -101,7 +101,7 @@
             <key>value</key>
             <string>98643</string>
             <key>description</key>
-            <string>HP98643A LANIC Ethernet Card</string>
+            <string>HP98643A LANIC Ethernet card</string>
             <key>devname</key>
             <string>dio98643</string>
           </dict>
@@ -134,7 +134,7 @@
             <key>value</key>
             <string>human_interface</string>
             <key>description</key>
-            <string>HP Human Interface Card</string>
+            <string>HP human interface card</string>
             <key>devname</key>
             <string>human_interface</string>
           </dict>
@@ -150,7 +150,7 @@
             <key>value</key>
             <string>98543</string>
             <key>description</key>
-            <string>HP98543 Medium-res Color DIO Video Card</string>
+            <string>HP98543 medium-res color DIO video card</string>
             <key>devname</key>
             <string>dio98543</string>
           </dict>
@@ -158,7 +158,7 @@
             <key>value</key>
             <string>98544</string>
             <key>description</key>
-            <string>HP98544 High-res Monochrome DIO Video Card</string>
+            <string>HP98544 high-res monochrome DIO video card</string>
             <key>devname</key>
             <string>dio98544</string>
           </dict>
@@ -166,7 +166,7 @@
             <key>value</key>
             <string>98550</string>
             <key>description</key>
-            <string>HP98550A High-res Color DIO Video Card</string>
+            <string>HP98550A high-res color DIO video card</string>
             <key>devname</key>
             <string>dio98550</string>
           </dict>
@@ -174,7 +174,7 @@
             <key>value</key>
             <string>98603b</string>
             <key>description</key>
-            <string>HP98603 BASIC ROM Card</string>
+            <string>HP98603 BASIC ROM card</string>
             <key>devname</key>
             <string>dio98603b</string>
           </dict>
@@ -182,7 +182,7 @@
             <key>value</key>
             <string>98603a</string>
             <key>description</key>
-            <string>HP98603A BASIC 4.0 ROM Card</string>
+            <string>HP98603A BASIC 4.0 ROM card</string>
             <key>devname</key>
             <string>dio98603a</string>
           </dict>
@@ -198,7 +198,7 @@
             <key>value</key>
             <string>98643</string>
             <key>description</key>
-            <string>HP98643A LANIC Ethernet Card</string>
+            <string>HP98643A LANIC Ethernet card</string>
             <key>devname</key>
             <string>dio98643</string>
           </dict>
@@ -233,7 +233,7 @@
             <key>value</key>
             <string>human_interface</string>
             <key>description</key>
-            <string>HP Human Interface Card</string>
+            <string>HP human interface card</string>
             <key>devname</key>
             <string>human_interface</string>
           </dict>
@@ -249,7 +249,7 @@
             <key>value</key>
             <string>98543</string>
             <key>description</key>
-            <string>HP98543 Medium-res Color DIO Video Card</string>
+            <string>HP98543 medium-res color DIO video card</string>
             <key>devname</key>
             <string>dio98543</string>
           </dict>
@@ -257,7 +257,7 @@
             <key>value</key>
             <string>98544</string>
             <key>description</key>
-            <string>HP98544 High-res Monochrome DIO Video Card</string>
+            <string>HP98544 high-res monochrome DIO video card</string>
             <key>devname</key>
             <string>dio98544</string>
           </dict>
@@ -265,7 +265,7 @@
             <key>value</key>
             <string>98550</string>
             <key>description</key>
-            <string>HP98550A High-res Color DIO Video Card</string>
+            <string>HP98550A high-res color DIO video card</string>
             <key>devname</key>
             <string>dio98550</string>
           </dict>
@@ -273,7 +273,7 @@
             <key>value</key>
             <string>98603b</string>
             <key>description</key>
-            <string>HP98603 BASIC ROM Card</string>
+            <string>HP98603 BASIC ROM card</string>
             <key>devname</key>
             <string>dio98603b</string>
           </dict>
@@ -281,7 +281,7 @@
             <key>value</key>
             <string>98603a</string>
             <key>description</key>
-            <string>HP98603A BASIC 4.0 ROM Card</string>
+            <string>HP98603A BASIC 4.0 ROM card</string>
             <key>devname</key>
             <string>dio98603a</string>
           </dict>
@@ -299,7 +299,7 @@
             <key>value</key>
             <string>98643</string>
             <key>description</key>
-            <string>HP98643A LANIC Ethernet Card</string>
+            <string>HP98643A LANIC Ethernet card</string>
             <key>devname</key>
             <string>dio98643</string>
           </dict>
@@ -332,7 +332,7 @@
             <key>value</key>
             <string>human_interface</string>
             <key>description</key>
-            <string>HP Human Interface Card</string>
+            <string>HP human interface card</string>
             <key>devname</key>
             <string>human_interface</string>
           </dict>
@@ -350,7 +350,7 @@
             <key>value</key>
             <string>98543</string>
             <key>description</key>
-            <string>HP98543 Medium-res Color DIO Video Card</string>
+            <string>HP98543 medium-res color DIO video card</string>
             <key>devname</key>
             <string>dio98543</string>
           </dict>
@@ -358,7 +358,7 @@
             <key>value</key>
             <string>98544</string>
             <key>description</key>
-            <string>HP98544 High-res Monochrome DIO Video Card</string>
+            <string>HP98544 high-res monochrome DIO video card</string>
             <key>devname</key>
             <string>dio98544</string>
           </dict>
@@ -366,7 +366,7 @@
             <key>value</key>
             <string>98550</string>
             <key>description</key>
-            <string>HP98550A High-res Color DIO Video Card</string>
+            <string>HP98550A high-res color DIO video card</string>
             <key>devname</key>
             <string>dio98550</string>
           </dict>
@@ -374,7 +374,7 @@
             <key>value</key>
             <string>98603b</string>
             <key>description</key>
-            <string>HP98603 BASIC ROM Card</string>
+            <string>HP98603 BASIC ROM card</string>
             <key>devname</key>
             <string>dio98603b</string>
           </dict>
@@ -382,7 +382,7 @@
             <key>value</key>
             <string>98603a</string>
             <key>description</key>
-            <string>HP98603A BASIC 4.0 ROM Card</string>
+            <string>HP98603A BASIC 4.0 ROM card</string>
             <key>devname</key>
             <string>dio98603a</string>
           </dict>
@@ -398,7 +398,7 @@
             <key>value</key>
             <string>98643</string>
             <key>description</key>
-            <string>HP98643A LANIC Ethernet Card</string>
+            <string>HP98643A LANIC Ethernet card</string>
             <key>devname</key>
             <string>dio98643</string>
           </dict>
@@ -431,7 +431,7 @@
             <key>value</key>
             <string>human_interface</string>
             <key>description</key>
-            <string>HP Human Interface Card</string>
+            <string>HP human interface card</string>
             <key>devname</key>
             <string>human_interface</string>
           </dict>
@@ -447,7 +447,7 @@
             <key>value</key>
             <string>98543</string>
             <key>description</key>
-            <string>HP98543 Medium-res Color DIO Video Card</string>
+            <string>HP98543 medium-res color DIO video card</string>
             <key>devname</key>
             <string>dio98543</string>
           </dict>
@@ -455,7 +455,7 @@
             <key>value</key>
             <string>98544</string>
             <key>description</key>
-            <string>HP98544 High-res Monochrome DIO Video Card</string>
+            <string>HP98544 high-res monochrome DIO video card</string>
             <key>devname</key>
             <string>dio98544</string>
           </dict>
@@ -463,7 +463,7 @@
             <key>value</key>
             <string>98550</string>
             <key>description</key>
-            <string>HP98550A High-res Color DIO Video Card</string>
+            <string>HP98550A high-res color DIO video card</string>
             <key>devname</key>
             <string>dio98550</string>
           </dict>
@@ -471,7 +471,7 @@
             <key>value</key>
             <string>98603b</string>
             <key>description</key>
-            <string>HP98603 BASIC ROM Card</string>
+            <string>HP98603 BASIC ROM card</string>
             <key>devname</key>
             <string>dio98603b</string>
           </dict>
@@ -479,7 +479,7 @@
             <key>value</key>
             <string>98603a</string>
             <key>description</key>
-            <string>HP98603A BASIC 4.0 ROM Card</string>
+            <string>HP98603A BASIC 4.0 ROM card</string>
             <key>devname</key>
             <string>dio98603a</string>
           </dict>
@@ -495,7 +495,7 @@
             <key>value</key>
             <string>98643</string>
             <key>description</key>
-            <string>HP98643A LANIC Ethernet Card</string>
+            <string>HP98643A LANIC Ethernet card</string>
             <key>devname</key>
             <string>dio98643</string>
           </dict>
@@ -538,19 +538,11 @@
                 <key>default</key>
                 <false/>
               </dict>
-              <dict>
-                <key>value</key>
-                <string>scorpion</string>
-                <key>description</key>
-                <string>Micro-Robotics Scorpion Intelligent Controller</string>
-                <key>default</key>
-                <false/>
-              </dict>
               <dict>
                 <key>value</key>
                 <string>pty</string>
                 <key>description</key>
-                <string>Pseudo Terminal</string>
+                <string>Pseudo terminal</string>
                 <key>default</key>
                 <false/>
               </dict>
@@ -562,11 +554,19 @@
                 <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>RS-232 Loopback</string>
+                <string>RS232 Loopback</string>
                 <key>default</key>
                 <false/>
               </dict>
@@ -574,7 +574,7 @@
                 <key>value</key>
                 <string>dec_loopback</string>
                 <key>description</key>
-                <string>RS-232 Loopback (DEC 12-15336-00)</string>
+                <string>RS232 Loopback (DEC 12-15336-00)</string>
                 <key>default</key>
                 <false/>
               </dict>
@@ -582,7 +582,7 @@
                 <key>value</key>
                 <string>null_modem</string>
                 <key>description</key>
-                <string>RS-232 Null Modem</string>
+                <string>RS232 Null Modem</string>
                 <key>default</key>
                 <false/>
                 <key>media</key>
@@ -591,19 +591,11 @@
                   <integer>1</integer>
                 </dict>
               </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>rs232_sync_io</string>
                 <key>description</key>
-                <string>RS-232 Synchronous I/O</string>
+                <string>RS232 Synchronous I/O</string>
                 <key>default</key>
                 <false/>
                 <key>media</key>
@@ -1247,19 +1239,11 @@
                 <key>default</key>
                 <false/>
               </dict>
-              <dict>
-                <key>value</key>
-                <string>scorpion</string>
-                <key>description</key>
-                <string>Micro-Robotics Scorpion Intelligent Controller</string>
-                <key>default</key>
-                <false/>
-              </dict>
               <dict>
                 <key>value</key>
                 <string>pty</string>
                 <key>description</key>
-                <string>Pseudo Terminal</string>
+                <string>Pseudo terminal</string>
                 <key>default</key>
                 <false/>
               </dict>
@@ -1271,11 +1255,19 @@
                 <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>RS-232 Loopback</string>
+                <string>RS232 Loopback</string>
                 <key>default</key>
                 <false/>
               </dict>
@@ -1283,7 +1275,7 @@
                 <key>value</key>
                 <string>dec_loopback</string>
                 <key>description</key>
-                <string>RS-232 Loopback (DEC 12-15336-00)</string>
+                <string>RS232 Loopback (DEC 12-15336-00)</string>
                 <key>default</key>
                 <false/>
               </dict>
@@ -1291,7 +1283,7 @@
                 <key>value</key>
                 <string>null_modem</string>
                 <key>description</key>
-                <string>RS-232 Null Modem</string>
+                <string>RS232 Null Modem</string>
                 <key>default</key>
                 <false/>
                 <key>media</key>
@@ -1300,19 +1292,11 @@
                   <integer>1</integer>
                 </dict>
               </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>rs232_sync_io</string>
                 <key>description</key>
-                <string>RS-232 Synchronous I/O</string>
+                <string>RS232 Synchronous I/O</string>
                 <key>default</key>
                 <false/>
                 <key>media</key>

Ample/Resources/hp9k370.plist

@@ -35,7 +35,7 @@
             <key>value</key>
             <string>human_interface</string>
             <key>description</key>
-            <string>HP Human Interface Card</string>
+            <string>HP human interface card</string>
             <key>devname</key>
             <string>human_interface</string>
           </dict>
@@ -51,7 +51,7 @@
             <key>value</key>
             <string>98543</string>
             <key>description</key>
-            <string>HP98543 Medium-res Color DIO Video Card</string>
+            <string>HP98543 medium-res color DIO video card</string>
             <key>devname</key>
             <string>dio98543</string>
           </dict>
@@ -59,7 +59,7 @@
             <key>value</key>
             <string>98544</string>
             <key>description</key>
-            <string>HP98544 High-res Monochrome DIO Video Card</string>
+            <string>HP98544 high-res monochrome DIO video card</string>
             <key>devname</key>
             <string>dio98544</string>
           </dict>
@@ -67,7 +67,7 @@
             <key>value</key>
             <string>98550</string>
             <key>description</key>
-            <string>HP98550A High-res Color DIO Video Card</string>
+            <string>HP98550A high-res color DIO video card</string>
             <key>default</key>
             <true/>
             <key>devname</key>
@@ -77,7 +77,7 @@
             <key>value</key>
             <string>98603b</string>
             <key>description</key>
-            <string>HP98603 BASIC ROM Card</string>
+            <string>HP98603 BASIC ROM card</string>
             <key>devname</key>
             <string>dio98603b</string>
           </dict>
@@ -85,7 +85,7 @@
             <key>value</key>
             <string>98603a</string>
             <key>description</key>
-            <string>HP98603A BASIC 4.0 ROM Card</string>
+            <string>HP98603A BASIC 4.0 ROM card</string>
             <key>devname</key>
             <string>dio98603a</string>
           </dict>
@@ -101,7 +101,7 @@
             <key>value</key>
             <string>98643</string>
             <key>description</key>
-            <string>HP98643A LANIC Ethernet Card</string>
+            <string>HP98643A LANIC Ethernet card</string>
             <key>devname</key>
             <string>dio98643</string>
           </dict>
@@ -134,7 +134,7 @@
             <key>value</key>
             <string>human_interface</string>
             <key>description</key>
-            <string>HP Human Interface Card</string>
+            <string>HP human interface card</string>
             <key>devname</key>
             <string>human_interface</string>
           </dict>
@@ -150,7 +150,7 @@
             <key>value</key>
             <string>98543</string>
             <key>description</key>
-            <string>HP98543 Medium-res Color DIO Video Card</string>
+            <string>HP98543 medium-res color DIO video card</string>
             <key>devname</key>
             <string>dio98543</string>
           </dict>
@@ -158,7 +158,7 @@
             <key>value</key>
             <string>98544</string>
             <key>description</key>
-            <string>HP98544 High-res Monochrome DIO Video Card</string>
+            <string>HP98544 high-res monochrome DIO video card</string>
             <key>devname</key>
             <string>dio98544</string>
           </dict>
@@ -166,7 +166,7 @@
             <key>value</key>
             <string>98550</string>
             <key>description</key>
-            <string>HP98550A High-res Color DIO Video Card</string>
+            <string>HP98550A high-res color DIO video card</string>
             <key>devname</key>
             <string>dio98550</string>
           </dict>
@@ -174,7 +174,7 @@
             <key>value</key>
             <string>98603b</string>
             <key>description</key>
-            <string>HP98603 BASIC ROM Card</string>
+            <string>HP98603 BASIC ROM card</string>
             <key>devname</key>
             <string>dio98603b</string>
           </dict>
@@ -182,7 +182,7 @@
             <key>value</key>
             <string>98603a</string>
             <key>description</key>
-            <string>HP98603A BASIC 4.0 ROM Card</string>
+            <string>HP98603A BASIC 4.0 ROM card</string>
             <key>devname</key>
             <string>dio98603a</string>
           </dict>
@@ -198,7 +198,7 @@
             <key>value</key>
             <string>98643</string>
             <key>description</key>
-            <string>HP98643A LANIC Ethernet Card</string>
+            <string>HP98643A LANIC Ethernet card</string>
             <key>devname</key>
             <string>dio98643</string>
           </dict>
@@ -233,7 +233,7 @@
             <key>value</key>
             <string>human_interface</string>
             <key>description</key>
-            <string>HP Human Interface Card</string>
+            <string>HP human interface card</string>
             <key>devname</key>
             <string>human_interface</string>
           </dict>
@@ -249,7 +249,7 @@
             <key>value</key>
             <string>98543</string>
             <key>description</key>
-            <string>HP98543 Medium-res Color DIO Video Card</string>
+            <string>HP98543 medium-res color DIO video card</string>
             <key>devname</key>
             <string>dio98543</string>
           </dict>
@@ -257,7 +257,7 @@
             <key>value</key>
             <string>98544</string>
             <key>description</key>
-            <string>HP98544 High-res Monochrome DIO Video Card</string>
+            <string>HP98544 high-res monochrome DIO video card</string>
             <key>devname</key>
             <string>dio98544</string>
           </dict>
@@ -265,7 +265,7 @@
             <key>value</key>
             <string>98550</string>
             <key>description</key>
-            <string>HP98550A High-res Color DIO Video Card</string>
+            <string>HP98550A high-res color DIO video card</string>
             <key>devname</key>
             <string>dio98550</string>
           </dict>
@@ -273,7 +273,7 @@
             <key>value</key>
             <string>98603b</string>
             <key>description</key>
-            <string>HP98603 BASIC ROM Card</string>
+            <string>HP98603 BASIC ROM card</string>
             <key>devname</key>
             <string>dio98603b</string>
           </dict>
@@ -281,7 +281,7 @@
             <key>value</key>
             <string>98603a</string>
             <key>description</key>
-            <string>HP98603A BASIC 4.0 ROM Card</string>
+            <string>HP98603A BASIC 4.0 ROM card</string>
             <key>devname</key>
             <string>dio98603a</string>
           </dict>
@@ -299,7 +299,7 @@
             <key>value</key>
             <string>98643</string>
             <key>description</key>
-            <string>HP98643A LANIC Ethernet Card</string>
+            <string>HP98643A LANIC Ethernet card</string>
             <key>devname</key>
             <string>dio98643</string>
           </dict>
@@ -332,7 +332,7 @@
             <key>value</key>
             <string>human_interface</string>
             <key>description</key>
-            <string>HP Human Interface Card</string>
+            <string>HP human interface card</string>
             <key>devname</key>
             <string>human_interface</string>
           </dict>
@@ -350,7 +350,7 @@
             <key>value</key>
             <string>98543</string>
             <key>description</key>
-            <string>HP98543 Medium-res Color DIO Video Card</string>
+            <string>HP98543 medium-res color DIO video card</string>
             <key>devname</key>
             <string>dio98543</string>
           </dict>
@@ -358,7 +358,7 @@
             <key>value</key>
             <string>98544</string>
             <key>description</key>
-            <string>HP98544 High-res Monochrome DIO Video Card</string>
+            <string>HP98544 high-res monochrome DIO video card</string>
             <key>devname</key>
             <string>dio98544</string>
           </dict>
@@ -366,7 +366,7 @@
             <key>value</key>
             <string>98550</string>
             <key>description</key>
-            <string>HP98550A High-res Color DIO Video Card</string>
+            <string>HP98550A high-res color DIO video card</string>
             <key>devname</key>
             <string>dio98550</string>
           </dict>
@@ -374,7 +374,7 @@
             <key>value</key>
             <string>98603b</string>
             <key>description</key>
-            <string>HP98603 BASIC ROM Card</string>
+            <string>HP98603 BASIC ROM card</string>
             <key>devname</key>
             <string>dio98603b</string>
           </dict>
@@ -382,7 +382,7 @@
             <key>value</key>
             <string>98603a</string>
             <key>description</key>
-            <string>HP98603A BASIC 4.0 ROM Card</string>
+            <string>HP98603A BASIC 4.0 ROM card</string>
             <key>devname</key>
             <string>dio98603a</string>
           </dict>
@@ -398,7 +398,7 @@
             <key>value</key>
             <string>98643</string>
             <key>description</key>
-            <string>HP98643A LANIC Ethernet Card</string>
+            <string>HP98643A LANIC Ethernet card</string>
             <key>devname</key>
             <string>dio98643</string>
           </dict>
@@ -431,7 +431,7 @@
             <key>value</key>
             <string>human_interface</string>
             <key>description</key>
-            <string>HP Human Interface Card</string>
+            <string>HP human interface card</string>
             <key>devname</key>
             <string>human_interface</string>
           </dict>
@@ -447,7 +447,7 @@
             <key>value</key>
             <string>98543</string>
             <key>description</key>
-            <string>HP98543 Medium-res Color DIO Video Card</string>
+            <string>HP98543 medium-res color DIO video card</string>
             <key>devname</key>
             <string>dio98543</string>
           </dict>
@@ -455,7 +455,7 @@
             <key>value</key>
             <string>98544</string>
             <key>description</key>
-            <string>HP98544 High-res Monochrome DIO Video Card</string>
+            <string>HP98544 high-res monochrome DIO video card</string>
             <key>devname</key>
             <string>dio98544</string>
           </dict>
@@ -463,7 +463,7 @@
             <key>value</key>
             <string>98550</string>
             <key>description</key>
-            <string>HP98550A High-res Color DIO Video Card</string>
+            <string>HP98550A high-res color DIO video card</string>
             <key>devname</key>
             <string>dio98550</string>
           </dict>
@@ -471,7 +471,7 @@
             <key>value</key>
             <string>98603b</string>
             <key>description</key>
-            <string>HP98603 BASIC ROM Card</string>
+            <string>HP98603 BASIC ROM card</string>
             <key>devname</key>
             <string>dio98603b</string>
           </dict>
@@ -479,7 +479,7 @@
             <key>value</key>
             <string>98603a</string>
             <key>description</key>
-            <string>HP98603A BASIC 4.0 ROM Card</string>
+            <string>HP98603A BASIC 4.0 ROM card</string>
             <key>devname</key>
             <string>dio98603a</string>
           </dict>
@@ -495,7 +495,7 @@
             <key>value</key>
             <string>98643</string>
             <key>description</key>
-            <string>HP98643A LANIC Ethernet Card</string>
+            <string>HP98643A LANIC Ethernet card</string>
             <key>devname</key>
             <string>dio98643</string>
           </dict>
@@ -538,19 +538,11 @@
                 <key>default</key>
                 <false/>
               </dict>
-              <dict>
-                <key>value</key>
-                <string>scorpion</string>
-                <key>description</key>
-                <string>Micro-Robotics Scorpion Intelligent Controller</string>
-                <key>default</key>
-                <false/>
-              </dict>
               <dict>
                 <key>value</key>
                 <string>pty</string>
                 <key>description</key>
-                <string>Pseudo Terminal</string>
+                <string>Pseudo terminal</string>
                 <key>default</key>
                 <false/>
               </dict>
@@ -562,11 +554,19 @@
                 <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>RS-232 Loopback</string>
+                <string>RS232 Loopback</string>
                 <key>default</key>
                 <false/>
               </dict>
@@ -574,7 +574,7 @@
                 <key>value</key>
                 <string>dec_loopback</string>
                 <key>description</key>
-                <string>RS-232 Loopback (DEC 12-15336-00)</string>
+                <string>RS232 Loopback (DEC 12-15336-00)</string>
                 <key>default</key>
                 <false/>
               </dict>
@@ -582,7 +582,7 @@
                 <key>value</key>
                 <string>null_modem</string>
                 <key>description</key>
-                <string>RS-232 Null Modem</string>
+                <string>RS232 Null Modem</string>
                 <key>default</key>
                 <false/>
                 <key>media</key>
@@ -591,19 +591,11 @@
                   <integer>1</integer>
                 </dict>
               </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>rs232_sync_io</string>
                 <key>description</key>
-                <string>RS-232 Synchronous I/O</string>
+                <string>RS232 Synchronous I/O</string>
                 <key>default</key>
                 <false/>
                 <key>media</key>
@@ -1247,19 +1239,11 @@
                 <key>default</key>
                 <false/>
               </dict>
-              <dict>
-                <key>value</key>
-                <string>scorpion</string>
-                <key>description</key>
-                <string>Micro-Robotics Scorpion Intelligent Controller</string>
-                <key>default</key>
-                <false/>
-              </dict>
               <dict>
                 <key>value</key>
                 <string>pty</string>
                 <key>description</key>
-                <string>Pseudo Terminal</string>
+                <string>Pseudo terminal</string>
                 <key>default</key>
                 <false/>
               </dict>
@@ -1271,11 +1255,19 @@
                 <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>RS-232 Loopback</string>
+                <string>RS232 Loopback</string>
                 <key>default</key>
                 <false/>
               </dict>
@@ -1283,7 +1275,7 @@
                 <key>value</key>
                 <string>dec_loopback</string>
                 <key>description</key>
-                <string>RS-232 Loopback (DEC 12-15336-00)</string>
+                <string>RS232 Loopback (DEC 12-15336-00)</string>
                 <key>default</key>
                 <false/>
               </dict>
@@ -1291,7 +1283,7 @@
                 <key>value</key>
                 <string>null_modem</string>
                 <key>description</key>
-                <string>RS-232 Null Modem</string>
+                <string>RS232 Null Modem</string>
                 <key>default</key>
                 <false/>
                 <key>media</key>
@@ -1300,19 +1292,11 @@
                   <integer>1</integer>
                 </dict>
               </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>rs232_sync_io</string>
                 <key>description</key>
-                <string>RS-232 Synchronous I/O</string>
+                <string>RS232 Synchronous I/O</string>
                 <key>default</key>
                 <false/>
                 <key>media</key>

Ample/Resources/hp9k380.plist

@@ -35,7 +35,7 @@
             <key>value</key>
             <string>human_interface</string>
             <key>description</key>
-            <string>HP Human Interface Card</string>
+            <string>HP human interface card</string>
             <key>devname</key>
             <string>human_interface</string>
           </dict>
@@ -51,7 +51,7 @@
             <key>value</key>
             <string>98543</string>
             <key>description</key>
-            <string>HP98543 Medium-res Color DIO Video Card</string>
+            <string>HP98543 medium-res color DIO video card</string>
             <key>devname</key>
             <string>dio98543</string>
           </dict>
@@ -59,7 +59,7 @@
             <key>value</key>
             <string>98544</string>
             <key>description</key>
-            <string>HP98544 High-res Monochrome DIO Video Card</string>
+            <string>HP98544 high-res monochrome DIO video card</string>
             <key>devname</key>
             <string>dio98544</string>
           </dict>
@@ -67,7 +67,7 @@
             <key>value</key>
             <string>98550</string>
             <key>description</key>
-            <string>HP98550A High-res Color DIO Video Card</string>
+            <string>HP98550A high-res color DIO video card</string>
             <key>default</key>
             <true/>
             <key>devname</key>
@@ -77,7 +77,7 @@
             <key>value</key>
             <string>98603b</string>
             <key>description</key>
-            <string>HP98603 BASIC ROM Card</string>
+            <string>HP98603 BASIC ROM card</string>
             <key>devname</key>
             <string>dio98603b</string>
           </dict>
@@ -85,7 +85,7 @@
             <key>value</key>
             <string>98603a</string>
             <key>description</key>
-            <string>HP98603A BASIC 4.0 ROM Card</string>
+            <string>HP98603A BASIC 4.0 ROM card</string>
             <key>devname</key>
             <string>dio98603a</string>
           </dict>
@@ -101,7 +101,7 @@
             <key>value</key>
             <string>98643</string>
             <key>description</key>
-            <string>HP98643A LANIC Ethernet Card</string>
+            <string>HP98643A LANIC Ethernet card</string>
             <key>devname</key>
             <string>dio98643</string>
           </dict>
@@ -134,7 +134,7 @@
             <key>value</key>
             <string>human_interface</string>
             <key>description</key>
-            <string>HP Human Interface Card</string>
+            <string>HP human interface card</string>
             <key>devname</key>
             <string>human_interface</string>
           </dict>
@@ -150,7 +150,7 @@
             <key>value</key>
             <string>98543</string>
             <key>description</key>
-            <string>HP98543 Medium-res Color DIO Video Card</string>
+            <string>HP98543 medium-res color DIO video card</string>
             <key>devname</key>
             <string>dio98543</string>
           </dict>
@@ -158,7 +158,7 @@
             <key>value</key>
             <string>98544</string>
             <key>description</key>
-            <string>HP98544 High-res Monochrome DIO Video Card</string>
+            <string>HP98544 high-res monochrome DIO video card</string>
             <key>devname</key>
             <string>dio98544</string>
           </dict>
@@ -166,7 +166,7 @@
             <key>value</key>
             <string>98550</string>
             <key>description</key>
-            <string>HP98550A High-res Color DIO Video Card</string>
+            <string>HP98550A high-res color DIO video card</string>
             <key>devname</key>
             <string>dio98550</string>
           </dict>
@@ -174,7 +174,7 @@
             <key>value</key>
             <string>98603b</string>
             <key>description</key>
-            <string>HP98603 BASIC ROM Card</string>
+            <string>HP98603 BASIC ROM card</string>
             <key>devname</key>
             <string>dio98603b</string>
           </dict>
@@ -182,7 +182,7 @@
             <key>value</key>
             <string>98603a</string>
             <key>description</key>
-            <string>HP98603A BASIC 4.0 ROM Card</string>
+            <string>HP98603A BASIC 4.0 ROM card</string>
             <key>devname</key>
             <string>dio98603a</string>
           </dict>
@@ -198,7 +198,7 @@
             <key>value</key>
             <string>98643</string>
             <key>description</key>
-            <string>HP98643A LANIC Ethernet Card</string>
+            <string>HP98643A LANIC Ethernet card</string>
             <key>devname</key>
             <string>dio98643</string>
           </dict>
@@ -233,7 +233,7 @@
             <key>value</key>
             <string>human_interface</string>
             <key>description</key>
-            <string>HP Human Interface Card</string>
+            <string>HP human interface card</string>
             <key>devname</key>
             <string>human_interface</string>
           </dict>
@@ -249,7 +249,7 @@
             <key>value</key>
             <string>98543</string>
             <key>description</key>
-            <string>HP98543 Medium-res Color DIO Video Card</string>
+            <string>HP98543 medium-res color DIO video card</string>
             <key>devname</key>
             <string>dio98543</string>
           </dict>
@@ -257,7 +257,7 @@
             <key>value</key>
             <string>98544</string>
             <key>description</key>
-            <string>HP98544 High-res Monochrome DIO Video Card</string>
+            <string>HP98544 high-res monochrome DIO video card</string>
             <key>devname</key>
             <string>dio98544</string>
           </dict>
@@ -265,7 +265,7 @@
             <key>value</key>
             <string>98550</string>
             <key>description</key>
-            <string>HP98550A High-res Color DIO Video Card</string>
+            <string>HP98550A high-res color DIO video card</string>
             <key>devname</key>
             <string>dio98550</string>
           </dict>
@@ -273,7 +273,7 @@
             <key>value</key>
             <string>98603b</string>
             <key>description</key>
-            <string>HP98603 BASIC ROM Card</string>
+            <string>HP98603 BASIC ROM card</string>
             <key>devname</key>
             <string>dio98603b</string>
           </dict>
@@ -281,7 +281,7 @@
             <key>value</key>
             <string>98603a</string>
             <key>description</key>
-            <string>HP98603A BASIC 4.0 ROM Card</string>
+            <string>HP98603A BASIC 4.0 ROM card</string>
             <key>devname</key>
             <string>dio98603a</string>
           </dict>
@@ -299,7 +299,7 @@
             <key>value</key>
             <string>98643</string>
             <key>description</key>
-            <string>HP98643A LANIC Ethernet Card</string>
+            <string>HP98643A LANIC Ethernet card</string>
             <key>devname</key>
             <string>dio98643</string>
           </dict>
@@ -332,7 +332,7 @@
             <key>value</key>
             <string>human_interface</string>
             <key>description</key>
-            <string>HP Human Interface Card</string>
+            <string>HP human interface card</string>
             <key>devname</key>
             <string>human_interface</string>
           </dict>
@@ -350,7 +350,7 @@
             <key>value</key>
             <string>98543</string>
             <key>description</key>
-            <string>HP98543 Medium-res Color DIO Video Card</string>
+            <string>HP98543 medium-res color DIO video card</string>
             <key>devname</key>
             <string>dio98543</string>
           </dict>
@@ -358,7 +358,7 @@
             <key>value</key>
             <string>98544</string>
             <key>description</key>
-            <string>HP98544 High-res Monochrome DIO Video Card</string>
+            <string>HP98544 high-res monochrome DIO video card</string>
             <key>devname</key>
             <string>dio98544</string>
           </dict>
@@ -366,7 +366,7 @@
             <key>value</key>
             <string>98550</string>
             <key>description</key>
-            <string>HP98550A High-res Color DIO Video Card</string>
+            <string>HP98550A high-res color DIO video card</string>
             <key>devname</key>
             <string>dio98550</string>
           </dict>
@@ -374,7 +374,7 @@
             <key>value</key>
             <string>98603b</string>
             <key>description</key>
-            <string>HP98603 BASIC ROM Card</string>
+            <string>HP98603 BASIC ROM card</string>
             <key>devname</key>
             <string>dio98603b</string>
           </dict>
@@ -382,7 +382,7 @@
             <key>value</key>
             <string>98603a</string>
             <key>description</key>
-            <string>HP98603A BASIC 4.0 ROM Card</string>
+            <string>HP98603A BASIC 4.0 ROM card</string>
             <key>devname</key>
             <string>dio98603a</string>
           </dict>
@@ -398,7 +398,7 @@
             <key>value</key>
             <string>98643</string>
             <key>description</key>
-            <string>HP98643A LANIC Ethernet Card</string>
+            <string>HP98643A LANIC Ethernet card</string>
             <key>devname</key>
             <string>dio98643</string>
           </dict>
@@ -431,7 +431,7 @@
             <key>value</key>
             <string>human_interface</string>
             <key>description</key>
-            <string>HP Human Interface Card</string>
+            <string>HP human interface card</string>
             <key>devname</key>
             <string>human_interface</string>
           </dict>
@@ -447,7 +447,7 @@
             <key>value</key>
             <string>98543</string>
             <key>description</key>
-            <string>HP98543 Medium-res Color DIO Video Card</string>
+            <string>HP98543 medium-res color DIO video card</string>
             <key>devname</key>
             <string>dio98543</string>
           </dict>
@@ -455,7 +455,7 @@
             <key>value</key>
             <string>98544</string>
             <key>description</key>
-            <string>HP98544 High-res Monochrome DIO Video Card</string>
+            <string>HP98544 high-res monochrome DIO video card</string>
             <key>devname</key>
             <string>dio98544</string>
           </dict>
@@ -463,7 +463,7 @@
             <key>value</key>
             <string>98550</string>
             <key>description</key>
-            <string>HP98550A High-res Color DIO Video Card</string>
+            <string>HP98550A high-res color DIO video card</string>
             <key>devname</key>
             <string>dio98550</string>
           </dict>
@@ -471,7 +471,7 @@
             <key>value</key>
             <string>98603b</string>
             <key>description</key>
-            <string>HP98603 BASIC ROM Card</string>
+            <string>HP98603 BASIC ROM card</string>
             <key>devname</key>
             <string>dio98603b</string>
           </dict>
@@ -479,7 +479,7 @@
             <key>value</key>
             <string>98603a</string>
             <key>description</key>
-            <string>HP98603A BASIC 4.0 ROM Card</string>
+            <string>HP98603A BASIC 4.0 ROM card</string>
             <key>devname</key>
             <string>dio98603a</string>
           </dict>
@@ -495,7 +495,7 @@
             <key>value</key>
             <string>98643</string>
             <key>description</key>
-            <string>HP98643A LANIC Ethernet Card</string>
+            <string>HP98643A LANIC Ethernet card</string>
             <key>devname</key>
             <string>dio98643</string>
           </dict>
@@ -538,19 +538,11 @@
                 <key>default</key>
                 <false/>
               </dict>
-              <dict>
-                <key>value</key>
-                <string>scorpion</string>
-                <key>description</key>
-                <string>Micro-Robotics Scorpion Intelligent Controller</string>
-                <key>default</key>
-                <false/>
-              </dict>
               <dict>
                 <key>value</key>
                 <string>pty</string>
                 <key>description</key>
-                <string>Pseudo Terminal</string>
+                <string>Pseudo terminal</string>
                 <key>default</key>
                 <false/>
               </dict>
@@ -562,11 +554,19 @@
                 <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>RS-232 Loopback</string>
+                <string>RS232 Loopback</string>
                 <key>default</key>
                 <false/>
               </dict>
@@ -574,7 +574,7 @@
                 <key>value</key>
                 <string>dec_loopback</string>
                 <key>description</key>
-                <string>RS-232 Loopback (DEC 12-15336-00)</string>
+                <string>RS232 Loopback (DEC 12-15336-00)</string>
                 <key>default</key>
                 <false/>
               </dict>
@@ -582,7 +582,7 @@
                 <key>value</key>
                 <string>null_modem</string>
                 <key>description</key>
-                <string>RS-232 Null Modem</string>
+                <string>RS232 Null Modem</string>
                 <key>default</key>
                 <false/>
                 <key>media</key>
@@ -591,19 +591,11 @@
                   <integer>1</integer>
                 </dict>
               </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>rs232_sync_io</string>
                 <key>description</key>
-                <string>RS-232 Synchronous I/O</string>
+                <string>RS232 Synchronous I/O</string>
                 <key>default</key>
                 <false/>
                 <key>media</key>
@@ -1247,19 +1239,11 @@
                 <key>default</key>
                 <false/>
               </dict>
-              <dict>
-                <key>value</key>
-                <string>scorpion</string>
-                <key>description</key>
-                <string>Micro-Robotics Scorpion Intelligent Controller</string>
-                <key>default</key>
-                <false/>
-              </dict>
               <dict>
                 <key>value</key>
                 <string>pty</string>
                 <key>description</key>
-                <string>Pseudo Terminal</string>
+                <string>Pseudo terminal</string>
                 <key>default</key>
                 <false/>
               </dict>
@@ -1271,11 +1255,19 @@
                 <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>RS-232 Loopback</string>
+                <string>RS232 Loopback</string>
                 <key>default</key>
                 <false/>
               </dict>
@@ -1283,7 +1275,7 @@
                 <key>value</key>
                 <string>dec_loopback</string>
                 <key>description</key>
-                <string>RS-232 Loopback (DEC 12-15336-00)</string>
+                <string>RS232 Loopback (DEC 12-15336-00)</string>
                 <key>default</key>
                 <false/>
               </dict>
@@ -1291,7 +1283,7 @@
                 <key>value</key>
                 <string>null_modem</string>
                 <key>description</key>
-                <string>RS-232 Null Modem</string>
+                <string>RS232 Null Modem</string>
                 <key>default</key>
                 <false/>
                 <key>media</key>
@@ -1300,19 +1292,11 @@
                   <integer>1</integer>
                 </dict>
               </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>rs232_sync_io</string>
                 <key>description</key>
-                <string>RS-232 Synchronous I/O</string>
+                <string>RS232 Synchronous I/O</string>
                 <key>default</key>
                 <false/>
                 <key>media</key>

Ample/Resources/hp9k382.plist

@@ -35,7 +35,7 @@
             <key>value</key>
             <string>human_interface</string>
             <key>description</key>
-            <string>HP Human Interface Card</string>
+            <string>HP human interface card</string>
             <key>devname</key>
             <string>human_interface</string>
           </dict>
@@ -51,7 +51,7 @@
             <key>value</key>
             <string>98543</string>
             <key>description</key>
-            <string>HP98543 Medium-res Color DIO Video Card</string>
+            <string>HP98543 medium-res color DIO video card</string>
             <key>devname</key>
             <string>dio98543</string>
           </dict>
@@ -59,7 +59,7 @@
             <key>value</key>
             <string>98544</string>
             <key>description</key>
-            <string>HP98544 High-res Monochrome DIO Video Card</string>
+            <string>HP98544 high-res monochrome DIO video card</string>
             <key>devname</key>
             <string>dio98544</string>
           </dict>
@@ -67,7 +67,7 @@
             <key>value</key>
             <string>98550</string>
             <key>description</key>
-            <string>HP98550A High-res Color DIO Video Card</string>
+            <string>HP98550A high-res color DIO video card</string>
             <key>default</key>
             <true/>
             <key>devname</key>
@@ -77,7 +77,7 @@
             <key>value</key>
             <string>98603b</string>
             <key>description</key>
-            <string>HP98603 BASIC ROM Card</string>
+            <string>HP98603 BASIC ROM card</string>
             <key>devname</key>
             <string>dio98603b</string>
           </dict>
@@ -85,7 +85,7 @@
             <key>value</key>
             <string>98603a</string>
             <key>description</key>
-            <string>HP98603A BASIC 4.0 ROM Card</string>
+            <string>HP98603A BASIC 4.0 ROM card</string>
             <key>devname</key>
             <string>dio98603a</string>
           </dict>
@@ -101,7 +101,7 @@
             <key>value</key>
             <string>98643</string>
             <key>description</key>
-            <string>HP98643A LANIC Ethernet Card</string>
+            <string>HP98643A LANIC Ethernet card</string>
             <key>devname</key>
             <string>dio98643</string>
           </dict>
@@ -134,7 +134,7 @@
             <key>value</key>
             <string>human_interface</string>
             <key>description</key>
-            <string>HP Human Interface Card</string>
+            <string>HP human interface card</string>
             <key>devname</key>
             <string>human_interface</string>
           </dict>
@@ -150,7 +150,7 @@
             <key>value</key>
             <string>98543</string>
             <key>description</key>
-            <string>HP98543 Medium-res Color DIO Video Card</string>
+            <string>HP98543 medium-res color DIO video card</string>
             <key>devname</key>
             <string>dio98543</string>
           </dict>
@@ -158,7 +158,7 @@
             <key>value</key>
             <string>98544</string>
             <key>description</key>
-            <string>HP98544 High-res Monochrome DIO Video Card</string>
+            <string>HP98544 high-res monochrome DIO video card</string>
             <key>devname</key>
             <string>dio98544</string>
           </dict>
@@ -166,7 +166,7 @@
             <key>value</key>
             <string>98550</string>
             <key>description</key>
-            <string>HP98550A High-res Color DIO Video Card</string>
+            <string>HP98550A high-res color DIO video card</string>
             <key>devname</key>
             <string>dio98550</string>
           </dict>
@@ -174,7 +174,7 @@
             <key>value</key>
             <string>98603b</string>
             <key>description</key>
-            <string>HP98603 BASIC ROM Card</string>
+            <string>HP98603 BASIC ROM card</string>
             <key>devname</key>
             <string>dio98603b</string>
           </dict>
@@ -182,7 +182,7 @@
             <key>value</key>
             <string>98603a</string>
             <key>description</key>
-            <string>HP98603A BASIC 4.0 ROM Card</string>
+            <string>HP98603A BASIC 4.0 ROM card</string>
             <key>devname</key>
             <string>dio98603a</string>
           </dict>
@@ -198,7 +198,7 @@
             <key>value</key>
             <string>98643</string>
             <key>description</key>
-            <string>HP98643A LANIC Ethernet Card</string>
+            <string>HP98643A LANIC Ethernet card</string>
             <key>devname</key>
             <string>dio98643</string>
           </dict>
@@ -233,7 +233,7 @@
             <key>value</key>
             <string>human_interface</string>
             <key>description</key>
-            <string>HP Human Interface Card</string>
+            <string>HP human interface card</string>
             <key>devname</key>
             <string>human_interface</string>
           </dict>
@@ -249,7 +249,7 @@
             <key>value</key>
             <string>98543</string>
             <key>description</key>
-            <string>HP98543 Medium-res Color DIO Video Card</string>
+            <string>HP98543 medium-res color DIO video card</string>
             <key>devname</key>
             <string>dio98543</string>
           </dict>
@@ -257,7 +257,7 @@
             <key>value</key>
             <string>98544</string>
             <key>description</key>
-            <string>HP98544 High-res Monochrome DIO Video Card</string>
+            <string>HP98544 high-res monochrome DIO video card</string>
             <key>devname</key>
             <string>dio98544</string>
           </dict>
@@ -265,7 +265,7 @@
             <key>value</key>
             <string>98550</string>
             <key>description</key>
-            <string>HP98550A High-res Color DIO Video Card</string>
+            <string>HP98550A high-res color DIO video card</string>
             <key>devname</key>
             <string>dio98550</string>
           </dict>
@@ -273,7 +273,7 @@
             <key>value</key>
             <string>98603b</string>
             <key>description</key>
-            <string>HP98603 BASIC ROM Card</string>
+            <string>HP98603 BASIC ROM card</string>
             <key>devname</key>
             <string>dio98603b</string>
           </dict>
@@ -281,7 +281,7 @@
             <key>value</key>
             <string>98603a</string>
             <key>description</key>
-            <string>HP98603A BASIC 4.0 ROM Card</string>
+            <string>HP98603A BASIC 4.0 ROM card</string>
             <key>devname</key>
             <string>dio98603a</string>
           </dict>
@@ -299,7 +299,7 @@
             <key>value</key>
             <string>98643</string>
             <key>description</key>
-            <string>HP98643A LANIC Ethernet Card</string>
+            <string>HP98643A LANIC Ethernet card</string>
             <key>devname</key>
             <string>dio98643</string>
           </dict>
@@ -332,7 +332,7 @@
             <key>value</key>
             <string>human_interface</string>
             <key>description</key>
-            <string>HP Human Interface Card</string>
+            <string>HP human interface card</string>
             <key>devname</key>
             <string>human_interface</string>
           </dict>
@@ -350,7 +350,7 @@
             <key>value</key>
             <string>98543</string>
             <key>description</key>
-            <string>HP98543 Medium-res Color DIO Video Card</string>
+            <string>HP98543 medium-res color DIO video card</string>
             <key>devname</key>
             <string>dio98543</string>
           </dict>
@@ -358,7 +358,7 @@
             <key>value</key>
             <string>98544</string>
             <key>description</key>
-            <string>HP98544 High-res Monochrome DIO Video Card</string>
+            <string>HP98544 high-res monochrome DIO video card</string>
             <key>devname</key>
             <string>dio98544</string>
           </dict>
@@ -366,7 +366,7 @@
             <key>value</key>
             <string>98550</string>
             <key>description</key>
-            <string>HP98550A High-res Color DIO Video Card</string>
+            <string>HP98550A high-res color DIO video card</string>
             <key>devname</key>
             <string>dio98550</string>
           </dict>
@@ -374,7 +374,7 @@
             <key>value</key>
             <string>98603b</string>
             <key>description</key>
-            <string>HP98603 BASIC ROM Card</string>
+            <string>HP98603 BASIC ROM card</string>
             <key>devname</key>
             <string>dio98603b</string>
           </dict>
@@ -382,7 +382,7 @@
             <key>value</key>
             <string>98603a</string>
             <key>description</key>
-            <string>HP98603A BASIC 4.0 ROM Card</string>
+            <string>HP98603A BASIC 4.0 ROM card</string>
             <key>devname</key>
             <string>dio98603a</string>
           </dict>
@@ -398,7 +398,7 @@
             <key>value</key>
             <string>98643</string>
             <key>description</key>
-            <string>HP98643A LANIC Ethernet Card</string>
+            <string>HP98643A LANIC Ethernet card</string>
             <key>devname</key>
             <string>dio98643</string>
           </dict>
@@ -431,7 +431,7 @@
             <key>value</key>
             <string>human_interface</string>
             <key>description</key>
-            <string>HP Human Interface Card</string>
+            <string>HP human interface card</string>
             <key>devname</key>
             <string>human_interface</string>
           </dict>
@@ -447,7 +447,7 @@
             <key>value</key>
             <string>98543</string>
             <key>description</key>
-            <string>HP98543 Medium-res Color DIO Video Card</string>
+            <string>HP98543 medium-res color DIO video card</string>
             <key>devname</key>
             <string>dio98543</string>
           </dict>
@@ -455,7 +455,7 @@
             <key>value</key>
             <string>98544</string>
             <key>description</key>
-            <string>HP98544 High-res Monochrome DIO Video Card</string>
+            <string>HP98544 high-res monochrome DIO video card</string>
             <key>devname</key>
             <string>dio98544</string>
           </dict>
@@ -463,7 +463,7 @@
             <key>value</key>
             <string>98550</string>
             <key>description</key>
-            <string>HP98550A High-res Color DIO Video Card</string>
+            <string>HP98550A high-res color DIO video card</string>
             <key>devname</key>
             <string>dio98550</string>
           </dict>
@@ -471,7 +471,7 @@
             <key>value</key>
             <string>98603b</string>
             <key>description</key>
-            <string>HP98603 BASIC ROM Card</string>
+            <string>HP98603 BASIC ROM card</string>
             <key>devname</key>
             <string>dio98603b</string>
           </dict>
@@ -479,7 +479,7 @@
             <key>value</key>
             <string>98603a</string>
             <key>description</key>
-            <string>HP98603A BASIC 4.0 ROM Card</string>
+            <string>HP98603A BASIC 4.0 ROM card</string>
             <key>devname</key>
             <string>dio98603a</string>
           </dict>
@@ -495,7 +495,7 @@
             <key>value</key>
             <string>98643</string>
             <key>description</key>
-            <string>HP98643A LANIC Ethernet Card</string>
+            <string>HP98643A LANIC Ethernet card</string>
             <key>devname</key>
             <string>dio98643</string>
           </dict>
@@ -538,19 +538,11 @@
                 <key>default</key>
                 <false/>
               </dict>
-              <dict>
-                <key>value</key>
-                <string>scorpion</string>
-                <key>description</key>
-                <string>Micro-Robotics Scorpion Intelligent Controller</string>
-                <key>default</key>
-                <false/>
-              </dict>
               <dict>
                 <key>value</key>
                 <string>pty</string>
                 <key>description</key>
-                <string>Pseudo Terminal</string>
+                <string>Pseudo terminal</string>
                 <key>default</key>
                 <false/>
               </dict>
@@ -562,11 +554,19 @@
                 <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>RS-232 Loopback</string>
+                <string>RS232 Loopback</string>
                 <key>default</key>
                 <false/>
               </dict>
@@ -574,7 +574,7 @@
                 <key>value</key>
                 <string>dec_loopback</string>
                 <key>description</key>
-                <string>RS-232 Loopback (DEC 12-15336-00)</string>
+                <string>RS232 Loopback (DEC 12-15336-00)</string>
                 <key>default</key>
                 <false/>
               </dict>
@@ -582,7 +582,7 @@
                 <key>value</key>
                 <string>null_modem</string>
                 <key>description</key>
-                <string>RS-232 Null Modem</string>
+                <string>RS232 Null Modem</string>
                 <key>default</key>
                 <false/>
                 <key>media</key>
@@ -591,19 +591,11 @@
                   <integer>1</integer>
                 </dict>
               </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>rs232_sync_io</string>
                 <key>description</key>
-                <string>RS-232 Synchronous I/O</string>
+                <string>RS232 Synchronous I/O</string>
                 <key>default</key>
                 <false/>
                 <key>media</key>
@@ -1247,19 +1239,11 @@
                 <key>default</key>
                 <false/>
               </dict>
-              <dict>
-                <key>value</key>
-                <string>scorpion</string>
-                <key>description</key>
-                <string>Micro-Robotics Scorpion Intelligent Controller</string>
-                <key>default</key>
-                <false/>
-              </dict>
               <dict>
                 <key>value</key>
                 <string>pty</string>
                 <key>description</key>
-                <string>Pseudo Terminal</string>
+                <string>Pseudo terminal</string>
                 <key>default</key>
                 <false/>
               </dict>
@@ -1271,11 +1255,19 @@
                 <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>RS-232 Loopback</string>
+                <string>RS232 Loopback</string>
                 <key>default</key>
                 <false/>
               </dict>
@@ -1283,7 +1275,7 @@
                 <key>value</key>
                 <string>dec_loopback</string>
                 <key>description</key>
-                <string>RS-232 Loopback (DEC 12-15336-00)</string>
+                <string>RS232 Loopback (DEC 12-15336-00)</string>
                 <key>default</key>
                 <false/>
               </dict>
@@ -1291,7 +1283,7 @@
                 <key>value</key>
                 <string>null_modem</string>
                 <key>description</key>
-                <string>RS-232 Null Modem</string>
+                <string>RS232 Null Modem</string>
                 <key>default</key>
                 <false/>
                 <key>media</key>
@@ -1300,19 +1292,11 @@
                   <integer>1</integer>
                 </dict>
               </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>rs232_sync_io</string>
                 <key>description</key>
-                <string>RS-232 Synchronous I/O</string>
+                <string>RS232 Synchronous I/O</string>
                 <key>default</key>
                 <false/>
                 <key>media</key>

Ample/Resources/indigo.plist

@@ -93,19 +93,11 @@
             <key>devname</key>
             <string>ie15_terminal</string>
           </dict>
-          <dict>
-            <key>value</key>
-            <string>scorpion</string>
-            <key>description</key>
-            <string>Micro-Robotics Scorpion Intelligent Controller</string>
-            <key>devname</key>
-            <string>scorpion_ic</string>
-          </dict>
           <dict>
             <key>value</key>
             <string>pty</string>
             <key>description</key>
-            <string>Pseudo Terminal</string>
+            <string>Pseudo terminal</string>
             <key>devname</key>
             <string>pseudo_terminal</string>
           </dict>
@@ -117,11 +109,19 @@
             <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>RS-232 Loopback</string>
+            <string>RS232 Loopback</string>
             <key>devname</key>
             <string>rs232_loopback</string>
           </dict>
@@ -129,7 +129,7 @@
             <key>value</key>
             <string>dec_loopback</string>
             <key>description</key>
-            <string>RS-232 Loopback (DEC 12-15336-00)</string>
+            <string>RS232 Loopback (DEC 12-15336-00)</string>
             <key>devname</key>
             <string>dec_rs232_loopback</string>
           </dict>
@@ -137,7 +137,7 @@
             <key>value</key>
             <string>null_modem</string>
             <key>description</key>
-            <string>RS-232 Null Modem</string>
+            <string>RS232 Null Modem</string>
             <key>devname</key>
             <string>null_modem</string>
             <key>media</key>
@@ -146,19 +146,11 @@
               <integer>1</integer>
             </dict>
           </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>rs232_sync_io</string>
             <key>description</key>
-            <string>RS-232 Synchronous I/O</string>
+            <string>RS232 Synchronous I/O</string>
             <key>devname</key>
             <string>rs232_sync_io</string>
             <key>media</key>
@@ -240,19 +232,11 @@
             <key>devname</key>
             <string>ie15_terminal</string>
           </dict>
-          <dict>
-            <key>value</key>
-            <string>scorpion</string>
-            <key>description</key>
-            <string>Micro-Robotics Scorpion Intelligent Controller</string>
-            <key>devname</key>
-            <string>scorpion_ic</string>
-          </dict>
           <dict>
             <key>value</key>
             <string>pty</string>
             <key>description</key>
-            <string>Pseudo Terminal</string>
+            <string>Pseudo terminal</string>
             <key>devname</key>
             <string>pseudo_terminal</string>
           </dict>
@@ -264,11 +248,19 @@
             <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>RS-232 Loopback</string>
+            <string>RS232 Loopback</string>
             <key>devname</key>
             <string>rs232_loopback</string>
           </dict>
@@ -276,7 +268,7 @@
             <key>value</key>
             <string>dec_loopback</string>
             <key>description</key>
-            <string>RS-232 Loopback (DEC 12-15336-00)</string>
+            <string>RS232 Loopback (DEC 12-15336-00)</string>
             <key>devname</key>
             <string>dec_rs232_loopback</string>
           </dict>
@@ -284,7 +276,7 @@
             <key>value</key>
             <string>null_modem</string>
             <key>description</key>
-            <string>RS-232 Null Modem</string>
+            <string>RS232 Null Modem</string>
             <key>devname</key>
             <string>null_modem</string>
             <key>media</key>
@@ -293,19 +285,11 @@
               <integer>1</integer>
             </dict>
           </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>rs232_sync_io</string>
             <key>description</key>
-            <string>RS-232 Synchronous I/O</string>
+            <string>RS232 Synchronous I/O</string>
             <key>devname</key>
             <string>rs232_sync_io</string>
             <key>media</key>
@@ -646,19 +630,11 @@
                 <key>default</key>
                 <false/>
               </dict>
-              <dict>
-                <key>value</key>
-                <string>scorpion</string>
-                <key>description</key>
-                <string>Micro-Robotics Scorpion Intelligent Controller</string>
-                <key>default</key>
-                <false/>
-              </dict>
               <dict>
                 <key>value</key>
                 <string>pty</string>
                 <key>description</key>
-                <string>Pseudo Terminal</string>
+                <string>Pseudo terminal</string>
                 <key>default</key>
                 <false/>
               </dict>
@@ -670,11 +646,19 @@
                 <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>RS-232 Loopback</string>
+                <string>RS232 Loopback</string>
                 <key>default</key>
                 <false/>
               </dict>
@@ -682,7 +666,7 @@
                 <key>value</key>
                 <string>dec_loopback</string>
                 <key>description</key>
-                <string>RS-232 Loopback (DEC 12-15336-00)</string>
+                <string>RS232 Loopback (DEC 12-15336-00)</string>
                 <key>default</key>
                 <false/>
               </dict>
@@ -690,7 +674,7 @@
                 <key>value</key>
                 <string>null_modem</string>
                 <key>description</key>
-                <string>RS-232 Null Modem</string>
+                <string>RS232 Null Modem</string>
                 <key>default</key>
                 <false/>
                 <key>media</key>
@@ -699,19 +683,11 @@
                   <integer>1</integer>
                 </dict>
               </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>rs232_sync_io</string>
                 <key>description</key>
-                <string>RS-232 Synchronous I/O</string>
+                <string>RS232 Synchronous I/O</string>
                 <key>default</key>
                 <false/>
                 <key>media</key>

Ample/Resources/indigo2_4415.plist

@@ -346,19 +346,11 @@
                 <key>default</key>
                 <false/>
               </dict>
-              <dict>
-                <key>value</key>
-                <string>scorpion</string>
-                <key>description</key>
-                <string>Micro-Robotics Scorpion Intelligent Controller</string>
-                <key>default</key>
-                <false/>
-              </dict>
               <dict>
                 <key>value</key>
                 <string>pty</string>
                 <key>description</key>
-                <string>Pseudo Terminal</string>
+                <string>Pseudo terminal</string>
                 <key>default</key>
                 <false/>
               </dict>
@@ -370,11 +362,19 @@
                 <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>RS-232 Loopback</string>
+                <string>RS232 Loopback</string>
                 <key>default</key>
                 <false/>
               </dict>
@@ -382,7 +382,7 @@
                 <key>value</key>
                 <string>dec_loopback</string>
                 <key>description</key>
-                <string>RS-232 Loopback (DEC 12-15336-00)</string>
+                <string>RS232 Loopback (DEC 12-15336-00)</string>
                 <key>default</key>
                 <false/>
               </dict>
@@ -390,7 +390,7 @@
                 <key>value</key>
                 <string>null_modem</string>
                 <key>description</key>
-                <string>RS-232 Null Modem</string>
+                <string>RS232 Null Modem</string>
                 <key>default</key>
                 <false/>
                 <key>media</key>
@@ -399,19 +399,11 @@
                   <integer>1</integer>
                 </dict>
               </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>rs232_sync_io</string>
                 <key>description</key>
-                <string>RS-232 Synchronous I/O</string>
+                <string>RS232 Synchronous I/O</string>
                 <key>default</key>
                 <false/>
                 <key>media</key>

Ample/Resources/indigo_r4000.plist

@@ -58,19 +58,11 @@
             <key>devname</key>
             <string>ie15_terminal</string>
           </dict>
-          <dict>
-            <key>value</key>
-            <string>scorpion</string>
-            <key>description</key>
-            <string>Micro-Robotics Scorpion Intelligent Controller</string>
-            <key>devname</key>
-            <string>scorpion_ic</string>
-          </dict>
           <dict>
             <key>value</key>
             <string>pty</string>
             <key>description</key>
-            <string>Pseudo Terminal</string>
+            <string>Pseudo terminal</string>
             <key>devname</key>
             <string>pseudo_terminal</string>
           </dict>
@@ -82,11 +74,19 @@
             <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>RS-232 Loopback</string>
+            <string>RS232 Loopback</string>
             <key>devname</key>
             <string>rs232_loopback</string>
           </dict>
@@ -94,7 +94,7 @@
             <key>value</key>
             <string>dec_loopback</string>
             <key>description</key>
-            <string>RS-232 Loopback (DEC 12-15336-00)</string>
+            <string>RS232 Loopback (DEC 12-15336-00)</string>
             <key>devname</key>
             <string>dec_rs232_loopback</string>
           </dict>
@@ -102,7 +102,7 @@
             <key>value</key>
             <string>null_modem</string>
             <key>description</key>
-            <string>RS-232 Null Modem</string>
+            <string>RS232 Null Modem</string>
             <key>devname</key>
             <string>null_modem</string>
             <key>media</key>
@@ -111,19 +111,11 @@
               <integer>1</integer>
             </dict>
           </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>rs232_sync_io</string>
             <key>description</key>
-            <string>RS-232 Synchronous I/O</string>
+            <string>RS232 Synchronous I/O</string>
             <key>devname</key>
             <string>rs232_sync_io</string>
             <key>media</key>
@@ -205,19 +197,11 @@
             <key>devname</key>
             <string>ie15_terminal</string>
           </dict>
-          <dict>
-            <key>value</key>
-            <string>scorpion</string>
-            <key>description</key>
-            <string>Micro-Robotics Scorpion Intelligent Controller</string>
-            <key>devname</key>
-            <string>scorpion_ic</string>
-          </dict>
           <dict>
             <key>value</key>
             <string>pty</string>
             <key>description</key>
-            <string>Pseudo Terminal</string>
+            <string>Pseudo terminal</string>
             <key>devname</key>
             <string>pseudo_terminal</string>
           </dict>
@@ -229,11 +213,19 @@
             <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>RS-232 Loopback</string>
+            <string>RS232 Loopback</string>
             <key>devname</key>
             <string>rs232_loopback</string>
           </dict>
@@ -241,7 +233,7 @@
             <key>value</key>
             <string>dec_loopback</string>
             <key>description</key>
-            <string>RS-232 Loopback (DEC 12-15336-00)</string>
+            <string>RS232 Loopback (DEC 12-15336-00)</string>
             <key>devname</key>
             <string>dec_rs232_loopback</string>
           </dict>
@@ -249,7 +241,7 @@
             <key>value</key>
             <string>null_modem</string>
             <key>description</key>
-            <string>RS-232 Null Modem</string>
+            <string>RS232 Null Modem</string>
             <key>devname</key>
             <string>null_modem</string>
             <key>media</key>
@@ -258,19 +250,11 @@
               <integer>1</integer>
             </dict>
           </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>rs232_sync_io</string>
             <key>description</key>
-            <string>RS-232 Synchronous I/O</string>
+            <string>RS232 Synchronous I/O</string>
             <key>devname</key>
             <string>rs232_sync_io</string>
             <key>media</key>
@@ -611,19 +595,11 @@
                 <key>default</key>
                 <false/>
               </dict>
-              <dict>
-                <key>value</key>
-                <string>scorpion</string>
-                <key>description</key>
-                <string>Micro-Robotics Scorpion Intelligent Controller</string>
-                <key>default</key>
-                <false/>
-              </dict>
               <dict>
                 <key>value</key>
                 <string>pty</string>
                 <key>description</key>
-                <string>Pseudo Terminal</string>
+                <string>Pseudo terminal</string>
                 <key>default</key>
                 <false/>
               </dict>
@@ -635,11 +611,19 @@
                 <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>RS-232 Loopback</string>
+                <string>RS232 Loopback</string>
                 <key>default</key>
                 <false/>
               </dict>
@@ -647,7 +631,7 @@
                 <key>value</key>
                 <string>dec_loopback</string>
                 <key>description</key>
-                <string>RS-232 Loopback (DEC 12-15336-00)</string>
+                <string>RS232 Loopback (DEC 12-15336-00)</string>
                 <key>default</key>
                 <false/>
               </dict>
@@ -655,7 +639,7 @@
                 <key>value</key>
                 <string>null_modem</string>
                 <key>description</key>
-                <string>RS-232 Null Modem</string>
+                <string>RS232 Null Modem</string>
                 <key>default</key>
                 <false/>
                 <key>media</key>
@@ -664,19 +648,11 @@
                   <integer>1</integer>
                 </dict>
               </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>rs232_sync_io</string>
                 <key>description</key>
-                <string>RS-232 Synchronous I/O</string>
+                <string>RS232 Synchronous I/O</string>
                 <key>default</key>
                 <false/>
                 <key>media</key>

Ample/Resources/indigo_r4400.plist

@@ -58,19 +58,11 @@
             <key>devname</key>
             <string>ie15_terminal</string>
           </dict>
-          <dict>
-            <key>value</key>
-            <string>scorpion</string>
-            <key>description</key>
-            <string>Micro-Robotics Scorpion Intelligent Controller</string>
-            <key>devname</key>
-            <string>scorpion_ic</string>
-          </dict>
           <dict>
             <key>value</key>
             <string>pty</string>
             <key>description</key>
-            <string>Pseudo Terminal</string>
+            <string>Pseudo terminal</string>
             <key>devname</key>
             <string>pseudo_terminal</string>
           </dict>
@@ -82,11 +74,19 @@
             <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>RS-232 Loopback</string>
+            <string>RS232 Loopback</string>
             <key>devname</key>
             <string>rs232_loopback</string>
           </dict>
@@ -94,7 +94,7 @@
             <key>value</key>
             <string>dec_loopback</string>
             <key>description</key>
-            <string>RS-232 Loopback (DEC 12-15336-00)</string>
+            <string>RS232 Loopback (DEC 12-15336-00)</string>
             <key>devname</key>
             <string>dec_rs232_loopback</string>
           </dict>
@@ -102,7 +102,7 @@
             <key>value</key>
             <string>null_modem</string>
             <key>description</key>
-            <string>RS-232 Null Modem</string>
+            <string>RS232 Null Modem</string>
             <key>devname</key>
             <string>null_modem</string>
             <key>media</key>
@@ -111,19 +111,11 @@
               <integer>1</integer>
             </dict>
           </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>rs232_sync_io</string>
             <key>description</key>
-            <string>RS-232 Synchronous I/O</string>
+            <string>RS232 Synchronous I/O</string>
             <key>devname</key>
             <string>rs232_sync_io</string>
             <key>media</key>
@@ -205,19 +197,11 @@
             <key>devname</key>
             <string>ie15_terminal</string>
           </dict>
-          <dict>
-            <key>value</key>
-            <string>scorpion</string>
-            <key>description</key>
-            <string>Micro-Robotics Scorpion Intelligent Controller</string>
-            <key>devname</key>
-            <string>scorpion_ic</string>
-          </dict>
           <dict>
             <key>value</key>
             <string>pty</string>
             <key>description</key>
-            <string>Pseudo Terminal</string>
+            <string>Pseudo terminal</string>
             <key>devname</key>
             <string>pseudo_terminal</string>
           </dict>
@@ -229,11 +213,19 @@
             <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>RS-232 Loopback</string>
+            <string>RS232 Loopback</string>
             <key>devname</key>
             <string>rs232_loopback</string>
           </dict>
@@ -241,7 +233,7 @@
             <key>value</key>
             <string>dec_loopback</string>
             <key>description</key>
-            <string>RS-232 Loopback (DEC 12-15336-00)</string>
+            <string>RS232 Loopback (DEC 12-15336-00)</string>
             <key>devname</key>
             <string>dec_rs232_loopback</string>
           </dict>
@@ -249,7 +241,7 @@
             <key>value</key>
             <string>null_modem</string>
             <key>description</key>
-            <string>RS-232 Null Modem</string>
+            <string>RS232 Null Modem</string>
             <key>devname</key>
             <string>null_modem</string>
             <key>media</key>
@@ -258,19 +250,11 @@
               <integer>1</integer>
             </dict>
           </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>rs232_sync_io</string>
             <key>description</key>
-            <string>RS-232 Synchronous I/O</string>
+            <string>RS232 Synchronous I/O</string>
             <key>devname</key>
             <string>rs232_sync_io</string>
             <key>media</key>
@@ -611,19 +595,11 @@
                 <key>default</key>
                 <false/>
               </dict>
-              <dict>
-                <key>value</key>
-                <string>scorpion</string>
-                <key>description</key>
-                <string>Micro-Robotics Scorpion Intelligent Controller</string>
-                <key>default</key>
-                <false/>
-              </dict>
               <dict>
                 <key>value</key>
                 <string>pty</string>
                 <key>description</key>
-                <string>Pseudo Terminal</string>
+                <string>Pseudo terminal</string>
                 <key>default</key>
                 <false/>
               </dict>
@@ -635,11 +611,19 @@
                 <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>RS-232 Loopback</string>
+                <string>RS232 Loopback</string>
                 <key>default</key>
                 <false/>
               </dict>
@@ -647,7 +631,7 @@
                 <key>value</key>
                 <string>dec_loopback</string>
                 <key>description</key>
-                <string>RS-232 Loopback (DEC 12-15336-00)</string>
+                <string>RS232 Loopback (DEC 12-15336-00)</string>
                 <key>default</key>
                 <false/>
               </dict>
@@ -655,7 +639,7 @@
                 <key>value</key>
                 <string>null_modem</string>
                 <key>description</key>
-                <string>RS-232 Null Modem</string>
+                <string>RS232 Null Modem</string>
                 <key>default</key>
                 <false/>
                 <key>media</key>
@@ -664,19 +648,11 @@
                   <integer>1</integer>
                 </dict>
               </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>rs232_sync_io</string>
                 <key>description</key>
-                <string>RS-232 Synchronous I/O</string>
+                <string>RS232 Synchronous I/O</string>
                 <key>default</key>
                 <false/>
                 <key>media</key>

Ample/Resources/indy_4610.plist

@@ -358,19 +358,11 @@
                 <key>default</key>
                 <false/>
               </dict>
-              <dict>
-                <key>value</key>
-                <string>scorpion</string>
-                <key>description</key>
-                <string>Micro-Robotics Scorpion Intelligent Controller</string>
-                <key>default</key>
-                <false/>
-              </dict>
               <dict>
                 <key>value</key>
                 <string>pty</string>
                 <key>description</key>
-                <string>Pseudo Terminal</string>
+                <string>Pseudo terminal</string>
                 <key>default</key>
                 <false/>
               </dict>
@@ -382,11 +374,19 @@
                 <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>RS-232 Loopback</string>
+                <string>RS232 Loopback</string>
                 <key>default</key>
                 <false/>
               </dict>
@@ -394,7 +394,7 @@
                 <key>value</key>
                 <string>dec_loopback</string>
                 <key>description</key>
-                <string>RS-232 Loopback (DEC 12-15336-00)</string>
+                <string>RS232 Loopback (DEC 12-15336-00)</string>
                 <key>default</key>
                 <false/>
               </dict>
@@ -402,7 +402,7 @@
                 <key>value</key>
                 <string>null_modem</string>
                 <key>description</key>
-                <string>RS-232 Null Modem</string>
+                <string>RS232 Null Modem</string>
                 <key>default</key>
                 <false/>
                 <key>media</key>
@@ -411,19 +411,11 @@
                   <integer>1</integer>
                 </dict>
               </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>rs232_sync_io</string>
                 <key>description</key>
-                <string>RS-232 Synchronous I/O</string>
+                <string>RS232 Synchronous I/O</string>
                 <key>default</key>
                 <false/>
                 <key>media</key>

Ample/Resources/indy_4613.plist

@@ -358,19 +358,11 @@
                 <key>default</key>
                 <false/>
               </dict>
-              <dict>
-                <key>value</key>
-                <string>scorpion</string>
-                <key>description</key>
-                <string>Micro-Robotics Scorpion Intelligent Controller</string>
-                <key>default</key>
-                <false/>
-              </dict>
               <dict>
                 <key>value</key>
                 <string>pty</string>
                 <key>description</key>
-                <string>Pseudo Terminal</string>
+                <string>Pseudo terminal</string>
                 <key>default</key>
                 <false/>
               </dict>
@@ -382,11 +374,19 @@
                 <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>RS-232 Loopback</string>
+                <string>RS232 Loopback</string>
                 <key>default</key>
                 <false/>
               </dict>
@@ -394,7 +394,7 @@
                 <key>value</key>
                 <string>dec_loopback</string>
                 <key>description</key>
-                <string>RS-232 Loopback (DEC 12-15336-00)</string>
+                <string>RS232 Loopback (DEC 12-15336-00)</string>
                 <key>default</key>
                 <false/>
               </dict>
@@ -402,7 +402,7 @@
                 <key>value</key>
                 <string>null_modem</string>
                 <key>description</key>
-                <string>RS-232 Null Modem</string>
+                <string>RS232 Null Modem</string>
                 <key>default</key>
                 <false/>
                 <key>media</key>
@@ -411,19 +411,11 @@
                   <integer>1</integer>
                 </dict>
               </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>rs232_sync_io</string>
                 <key>description</key>
-                <string>RS-232 Synchronous I/O</string>
+                <string>RS232 Synchronous I/O</string>
                 <key>default</key>
                 <false/>
                 <key>media</key>

Ample/Resources/indy_5015.plist

@@ -340,19 +340,11 @@
                 <key>default</key>
                 <false/>
               </dict>
-              <dict>
-                <key>value</key>
-                <string>scorpion</string>
-                <key>description</key>
-                <string>Micro-Robotics Scorpion Intelligent Controller</string>
-                <key>default</key>
-                <false/>
-              </dict>
               <dict>
                 <key>value</key>
                 <string>pty</string>
                 <key>description</key>
-                <string>Pseudo Terminal</string>
+                <string>Pseudo terminal</string>
                 <key>default</key>
                 <false/>
               </dict>
@@ -364,11 +356,19 @@
                 <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>RS-232 Loopback</string>
+                <string>RS232 Loopback</string>
                 <key>default</key>
                 <false/>
               </dict>
@@ -376,7 +376,7 @@
                 <key>value</key>
                 <string>dec_loopback</string>
                 <key>description</key>
-                <string>RS-232 Loopback (DEC 12-15336-00)</string>
+                <string>RS232 Loopback (DEC 12-15336-00)</string>
                 <key>default</key>
                 <false/>
               </dict>
@@ -384,7 +384,7 @@
                 <key>value</key>
                 <string>null_modem</string>
                 <key>description</key>
-                <string>RS-232 Null Modem</string>
+                <string>RS232 Null Modem</string>
                 <key>default</key>
                 <false/>
                 <key>media</key>
@@ -393,19 +393,11 @@
                   <integer>1</integer>
                 </dict>
               </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>rs232_sync_io</string>
                 <key>description</key>
-                <string>RS-232 Synchronous I/O</string>
+                <string>RS232 Synchronous I/O</string>
                 <key>default</key>
                 <false/>
                 <key>media</key>