Slot Configuration Persistence Fix for AmpleWin/Linux (#52)

* Fix slot persistence logic (AmpleWin/Linux) for upstream PR preparation. Implements robust None-aware slot initialization.

* Fix: Explicitly pass empty string arguments for disabled slots (None) to prevent MAME using defaults

* feat(core): update MAME to 0.288, fix compatibility bugs, add PowerBook fallbacks, and optimize download servers

.github/workflows/xcodebuild.yml

@@ -13,7 +13,7 @@ jobs:
     - name: build
       run: xcodebuild -project "Ample.xcodeproj" -target "Ample Lite" | xcpretty
 
-    - uses: actions/upload-artifact@v3
+    - uses: actions/upload-artifact@v4
       with:
         name: Ample Lite
         path: build/Release/

.gitignore

@@ -1,9 +1,35 @@
 dist
 embedded/mame64
 embedded/SDL2.framework
+embedded/SDL3.framework
 embedded/Sparkle.framework
 embedded/Sparkle-*
 embedded/SDL2-*
+embedded/SDL3-*
 build
 embedded/mame-data.tgz
 __pycache__
+
+# Windows Port
+AmpleWin/mame/
+AmpleWin/dist/
+AmpleWin/build/
+AmpleWin/*.spec
+
+nvram/
+cfg/
+diff/
+inp/
+comments/
+sta/
+*.ini
+*.ico
+
+# Linux Port
+AmpleLinux/.venv
+AmpleLinux/.build_venv
+AmpleLinux/icons/
+AmpleLinux/Ample.spec
+AmpleLinux/mame/
+!AmpleLinux/mame/.gitkeep
+

Ample/Ample.h

@@ -33,6 +33,7 @@ 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,6 +129,7 @@ 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,12 +88,25 @@
     NSDate *newDate = [defaults objectForKey: kMameComponentsDate];
     if (![newDate isKindOfClass: [NSDate class]])
         newDate = nil;
-    
+  
+    /* oops, I accidentally called 2024-12-07 2025-12-07.  So let's ignore future dates... */
+    NSDate *now = [NSDate dateWithTimeIntervalSinceNow: 0];
+    if (oldDate && [oldDate compare: now] >= 0)
+        oldDate = 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/DiskImages.xib

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="19529" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="24506" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="19529"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="24506"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -41,12 +41,12 @@
             </connections>
             <point key="canvasLocation" x="-667" y="170"/>
         </menu>
-        <window title="Recent Disk Images" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" frameAutosaveName="RecentDiskImagesWindow" animationBehavior="default" id="AtY-lA-KIp">
+        <window title="Disk Images" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" frameAutosaveName="RecentDiskImagesWindow" animationBehavior="default" toolbarStyle="unified" id="AtY-lA-KIp">
             <windowStyleMask key="styleMask" titled="YES" closable="YES"/>
             <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
             <rect key="contentRect" x="283" y="305" width="408" height="270"/>
             <rect key="screenRect" x="0.0" y="0.0" width="1920" height="1055"/>
-            <view key="contentView" id="zHI-2R-bOe">
+            <view key="contentView" misplaced="YES" id="zHI-2R-bOe">
                 <rect key="frame" x="0.0" y="0.0" width="408" height="270"/>
                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                 <subviews>
@@ -55,7 +55,7 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <clipView key="contentView" id="SFr-s6-6di">
                             <rect key="frame" x="1" y="1" width="408" height="270"/>
-                            <autoresizingMask key="autoresizingMask"/>
+                            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                             <subviews>
                                 <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" columnSelection="YES" multipleSelection="NO" autosaveColumns="NO" rowSizeStyle="automatic" headerView="iwP-JL-O3g" viewBased="YES" id="cqO-ig-A9t">
                                     <rect key="frame" x="0.0" y="0.0" width="408" height="245"/>
@@ -81,7 +81,7 @@
                                                     <rect key="frame" x="1" y="1" width="305" height="17"/>
                                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                     <subviews>
-                                                        <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="gkM-KB-x76">
+                                                        <textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="gkM-KB-x76">
                                                             <rect key="frame" x="0.0" y="0.0" width="305" height="17"/>
                                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
                                                             <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="PitchDark.2mg" id="Wcg-zo-CeN">
@@ -101,7 +101,7 @@
                                                 </tableCellView>
                                             </prototypeCellViews>
                                         </tableColumn>
-                                        <tableColumn width="93" minWidth="40" maxWidth="1000" id="0aJ-xJ-YSS">
+                                        <tableColumn width="64" minWidth="40" maxWidth="1000" id="0aJ-xJ-YSS">
                                             <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" title="Size">
                                                 <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                                 <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
@@ -115,11 +115,11 @@
                                             <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
                                             <prototypeCellViews>
                                                 <tableCellView id="UW9-AF-U9F">
-                                                    <rect key="frame" x="309" y="1" width="97" height="17"/>
+                                                    <rect key="frame" x="309" y="1" width="68" height="17"/>
                                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                     <subviews>
-                                                        <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="6Ry-Zn-euh">
-                                                            <rect key="frame" x="0.0" y="0.0" width="97" height="17"/>
+                                                        <textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="6Ry-Zn-euh">
+                                                            <rect key="frame" x="0.0" y="0.0" width="68" height="17"/>
                                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
                                                             <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="32 MB" id="fXp-OZ-Qcu">
                                                                 <font key="font" metaFont="system"/>
@@ -161,19 +161,21 @@
                             <rect key="frame" x="224" y="17" width="15" height="102"/>
                             <autoresizingMask key="autoresizingMask"/>
                         </scroller>
-                        <tableHeaderView key="headerView" id="iwP-JL-O3g">
+                        <tableHeaderView key="headerView" wantsLayer="YES" id="iwP-JL-O3g">
                             <rect key="frame" x="0.0" y="0.0" width="408" height="25"/>
                             <autoresizingMask key="autoresizingMask"/>
                         </tableHeaderView>
                     </scrollView>
                 </subviews>
             </view>
-            <toolbar key="toolbar" implicitIdentifier="D9701924-6955-47B8-A2FF-DBD466AAEB92" autosavesConfiguration="NO" allowsUserCustomization="NO" displayMode="iconOnly" sizeMode="regular" id="Gp6-Kl-lr2">
+            <toolbar key="toolbar" implicitIdentifier="D9701924-6955-47B8-A2FF-DBD466AAEB92" autosavesConfiguration="NO" allowsUserCustomization="NO" showsBaselineSeparator="NO" displayMode="iconOnly" sizeMode="regular" id="Gp6-Kl-lr2">
                 <allowedToolbarItems>
                     <toolbarItem implicitItemIdentifier="NSToolbarFlexibleSpaceItem" id="lBE-ee-rCy"/>
-                    <toolbarItem implicitItemIdentifier="C346E56F-4480-4D8A-8485-33A3A51D7B78" label="" paletteLabel="Filter" sizingBehavior="auto" id="DsU-uu-UmZ">
+                    <toolbarItem implicitItemIdentifier="C346E56F-4480-4D8A-8485-33A3A51D7B78" label="" paletteLabel="Filter" id="DsU-uu-UmZ">
                         <nil key="toolTip"/>
-                        <searchField key="view" wantsLayer="YES" verticalHuggingPriority="750" textCompletion="NO" id="qHV-IA-ysc">
+                        <size key="minSize" width="96" height="22"/>
+                        <size key="maxSize" width="200" height="22"/>
+                        <searchField key="view" wantsLayer="YES" focusRingType="none" verticalHuggingPriority="750" textCompletion="NO" id="qHV-IA-ysc">
                             <rect key="frame" x="0.0" y="14" width="96" height="22"/>
                             <autoresizingMask key="autoresizingMask"/>
                             <searchFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" continuous="YES" borderStyle="bezel" placeholderString="Filter" usesSingleLineMode="YES" bezelStyle="round" id="BWo-eC-ahz">
@@ -188,7 +190,6 @@
                     </toolbarItem>
                 </allowedToolbarItems>
                 <defaultToolbarItems>
-                    <toolbarItem reference="lBE-ee-rCy"/>
                     <toolbarItem reference="lBE-ee-rCy"/>
                     <toolbarItem reference="DsU-uu-UmZ"/>
                 </defaultToolbarItems>

Ample/Base.lproj/DownloadWindow.xib

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="15705" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="24506" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="15705"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="24506"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -13,39 +13,39 @@
                 <outlet property="downloadField" destination="sJz-So-jbA" id="WjK-48-FcE"/>
                 <outlet property="formatButton" destination="2Rg-eX-DUq" id="oYo-MG-Sc6"/>
                 <outlet property="missingFilterButton" destination="6c7-tU-3F3" id="89Y-wQ-9pB"/>
+                <outlet property="searchFilter" destination="EuH-NO-RLR" id="ZtY-CC-pgz"/>
                 <outlet property="tableView" destination="FLX-Wt-y53" id="a4O-pk-EAt"/>
                 <outlet property="window" destination="F0z-JX-Cv5" id="gIp-Ho-8D9"/>
             </connections>
         </customObject>
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
         <customObject id="-3" userLabel="Application" customClass="NSObject"/>
-        <window title="ROMs" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" frameAutosaveName="DownloadManagerWindow" animationBehavior="default" id="F0z-JX-Cv5">
+        <window title="ROMs" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" frameAutosaveName="DownloadManagerWindow" animationBehavior="default" toolbarStyle="expanded" id="F0z-JX-Cv5">
             <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES"/>
             <rect key="contentRect" x="196" y="240" width="454" height="575"/>
-            <rect key="screenRect" x="0.0" y="0.0" width="2560" height="1417"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="1920" height="1055"/>
             <value key="minSize" type="size" width="454" height="300"/>
             <view key="contentView" id="se5-gp-TjO">
-                <rect key="frame" x="0.0" y="0.0" width="454" height="575"/>
+                <rect key="frame" x="0.0" y="0.0" width="454" height="551"/>
                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                 <subviews>
                     <scrollView fixedFrame="YES" autohidesScrollers="YES" horizontalLineScroll="51" horizontalPageScroll="10" verticalLineScroll="51" verticalPageScroll="10" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="CMD-nT-mEa">
-                        <rect key="frame" x="0.0" y="130" width="456" height="446"/>
+                        <rect key="frame" x="0.0" y="130" width="456" height="422"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <clipView key="contentView" ambiguous="YES" drawsBackground="NO" id="Igp-aH-flp">
-                            <rect key="frame" x="1" y="1" width="454" height="444"/>
+                        <clipView key="contentView" drawsBackground="NO" id="Igp-aH-flp">
+                            <rect key="frame" x="1" y="1" width="454" height="420"/>
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                             <subviews>
-                                <tableView verticalHuggingPriority="750" ambiguous="YES" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" alternatingRowBackgroundColors="YES" columnReordering="NO" columnResizing="NO" multipleSelection="NO" autosaveColumns="NO" rowHeight="49" rowSizeStyle="automatic" viewBased="YES" id="FLX-Wt-y53">
-                                    <rect key="frame" x="0.0" y="0.0" width="454" height="444"/>
+                                <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" alternatingRowBackgroundColors="YES" columnReordering="NO" columnResizing="NO" multipleSelection="NO" autosaveColumns="NO" rowHeight="49" rowSizeStyle="automatic" viewBased="YES" id="FLX-Wt-y53">
+                                    <rect key="frame" x="0.0" y="0.0" width="454" height="420"/>
                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                     <size key="intercellSpacing" width="3" height="2"/>
                                     <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
                                     <tableViewGridLines key="gridStyleMask" dashed="YES"/>
                                     <color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
                                     <tableColumns>
-                                        <tableColumn width="451" minWidth="40" maxWidth="1000" id="5jP-bY-fhI">
+                                        <tableColumn width="442" minWidth="40" maxWidth="1000" id="5jP-bY-fhI">
                                             <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border">
-                                                <font key="font" metaFont="smallSystem"/>
                                                 <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                                 <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
                                             </tableHeaderCell>
@@ -60,7 +60,7 @@
                                                     <rect key="frame" x="1" y="1" width="451" height="49"/>
                                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                     <subviews>
-                                                        <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="A44-us-TEl">
+                                                        <textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="A44-us-TEl">
                                                             <rect key="frame" x="41" y="28" width="409" height="17"/>
                                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
                                                             <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Table View Cell" id="NSU-6I-nsG">
@@ -81,7 +81,7 @@
                                                                 <binding destination="onK-6l-2iV" name="toolTip" keyPath="objectValue.value" id="rUb-Jb-KbT"/>
                                                             </connections>
                                                         </textField>
-                                                        <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="hfu-hP-QAH">
+                                                        <textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="hfu-hP-QAH">
                                                             <rect key="frame" x="41" y="3" width="409" height="17"/>
                                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
                                                             <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Table View Cell" id="1cQ-Zh-q0o">
@@ -117,6 +117,7 @@
                                         </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>
@@ -133,7 +134,7 @@
                             <autoresizingMask key="autoresizingMask"/>
                         </scroller>
                     </scrollView>
-                    <textField verticalHuggingPriority="750" fixedFrame="YES" textCompletion="NO" translatesAutoresizingMaskIntoConstraints="NO" id="sJz-So-jbA">
+                    <textField focusRingType="none" verticalHuggingPriority="750" fixedFrame="YES" textCompletion="NO" translatesAutoresizingMaskIntoConstraints="NO" id="sJz-So-jbA">
                         <rect key="frame" x="51" y="101" width="383" height="21"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" drawsBackground="YES" id="HKe-di-YSs">
@@ -161,7 +162,7 @@
                             </binding>
                         </connections>
                     </button>
-                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="d2z-4T-Wh1">
+                    <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="d2z-4T-Wh1">
                         <rect key="frame" x="10" y="104" width="30" height="16"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                         <textFieldCell key="cell" lineBreakMode="clipping" title="URL" id="lcZ-R4-WsS">
@@ -170,7 +171,7 @@
                             <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                         </textFieldCell>
                     </textField>
-                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="ZXO-bJ-btp">
+                    <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="ZXO-bJ-btp">
                         <rect key="frame" x="10" y="66" width="34" height="16"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                         <textFieldCell key="cell" lineBreakMode="clipping" title="Type" id="KGI-t9-OMF">
@@ -183,7 +184,7 @@
                         <rect key="frame" x="12" y="52" width="422" height="5"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
                     </box>
-                    <button verticalHuggingPriority="750" fixedFrame="YES" imageHugsTitle="YES" translatesAutoresizingMaskIntoConstraints="NO" id="dpY-qZ-2Nk">
+                    <button imageHugsTitle="YES" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="dpY-qZ-2Nk">
                         <rect key="frame" x="93" y="13" width="115" height="32"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                         <buttonCell key="cell" type="push" title="ROMs" bezelStyle="rounded" image="NSFolder" imagePosition="left" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="E0t-sX-rgE">
@@ -212,7 +213,7 @@
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                         <popUpButtonCell key="cell" type="push" title="zip" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" tag="1" imageScaling="proportionallyDown" inset="2" autoenablesItems="NO" selectedItem="7Cq-Lh-dgg" id="uum-dC-XD0">
                             <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
-                            <font key="font" metaFont="menu"/>
+                            <font key="font" metaFont="message"/>
                             <menu key="menu" autoenablesItems="NO" id="kcg-aZ-mD9">
                                 <items>
                                     <menuItem title="zip" state="on" tag="1" id="7Cq-Lh-dgg"/>
@@ -247,15 +248,14 @@
                     </button>
                 </subviews>
             </view>
-            <toolbar key="toolbar" implicitIdentifier="B60021E6-BFBC-44E6-97DC-120AA9FD3269" autosavesConfiguration="NO" allowsUserCustomization="NO" displayMode="iconOnly" sizeMode="regular" id="kpz-W4-xgh">
+            <toolbar key="toolbar" implicitIdentifier="B60021E6-BFBC-44E6-97DC-120AA9FD3269" autosavesConfiguration="NO" allowsUserCustomization="NO" showsBaselineSeparator="NO" displayMode="iconOnly" sizeMode="regular" id="kpz-W4-xgh">
                 <allowedToolbarItems>
                     <toolbarItem implicitItemIdentifier="NSToolbarSpaceItem" id="tbY-ts-Irb"/>
-                    <toolbarItem implicitItemIdentifier="NSToolbarFlexibleSpaceItem" id="3Kc-zG-IdN"/>
-                    <toolbarItem implicitItemIdentifier="BD743A15-0B61-48FF-9EED-FD8D57EF8459" label="All" paletteLabel="All" tag="1" sizingBehavior="auto" id="Jj0-n8-I5a">
+                    <toolbarItem implicitItemIdentifier="BD743A15-0B61-48FF-9EED-FD8D57EF8459" label="All" paletteLabel="All" tag="1" title="All" sizingBehavior="auto" id="Jj0-n8-I5a">
                         <nil key="toolTip"/>
-                        <button key="view" verticalHuggingPriority="750" tag="1" id="Kgj-LP-FsF">
-                            <rect key="frame" x="0.0" y="14" width="74" height="20"/>
-                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                        <button key="view" tag="1" verticalHuggingPriority="750" id="Kgj-LP-FsF">
+                            <rect key="frame" x="0.0" y="14" width="30" height="19"/>
+                            <autoresizingMask key="autoresizingMask"/>
                             <buttonCell key="cell" type="recessed" title="All" bezelStyle="recessed" alignment="center" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="9s7-S1-hW1">
                                 <behavior key="behavior" lightByBackground="YES" lightByGray="YES" changeBackground="YES" changeGray="YES"/>
                                 <font key="font" metaFont="systemBold" size="12"/>
@@ -265,11 +265,11 @@
                             </connections>
                         </button>
                     </toolbarItem>
-                    <toolbarItem implicitItemIdentifier="5B013840-E582-4568-8448-DDD7EE1E5AE2" label="Missing" paletteLabel="Missing" tag="2" sizingBehavior="auto" id="GV4-aX-5Ox">
+                    <toolbarItem implicitItemIdentifier="5B013840-E582-4568-8448-DDD7EE1E5AE2" label="Missing" paletteLabel="Missing" tag="2" title="Missing" sizingBehavior="auto" id="GV4-aX-5Ox">
                         <nil key="toolTip"/>
-                        <button key="view" verticalHuggingPriority="750" tag="2" id="6c7-tU-3F3">
-                            <rect key="frame" x="0.0" y="14" width="74" height="20"/>
-                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                        <button key="view" tag="2" verticalHuggingPriority="750" id="6c7-tU-3F3">
+                            <rect key="frame" x="0.0" y="14" width="61" height="19"/>
+                            <autoresizingMask key="autoresizingMask"/>
                             <buttonCell key="cell" type="recessed" title="Missing" bezelStyle="recessed" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="ui2-dz-IZj">
                                 <behavior key="behavior" lightByBackground="YES" lightByGray="YES" changeBackground="YES" changeGray="YES"/>
                                 <font key="font" metaFont="systemBold" size="12"/>
@@ -279,10 +279,30 @@
                             </connections>
                         </button>
                     </toolbarItem>
+                    <toolbarItem implicitItemIdentifier="NSToolbarFlexibleSpaceItem" id="3Kc-zG-IdN"/>
+                    <toolbarItem implicitItemIdentifier="5FAD9453-A303-4057-A122-37BF870A4D81" label="Search" paletteLabel="Search" tag="3" id="kT0-k4-f7d">
+                        <nil key="toolTip"/>
+                        <size key="minSize" width="96" height="22"/>
+                        <size key="maxSize" width="200" height="22"/>
+                        <searchField key="view" wantsLayer="YES" focusRingType="none" verticalHuggingPriority="750" tag="3" textCompletion="NO" id="EuH-NO-RLR">
+                            <rect key="frame" x="0.0" y="14" width="96" height="22"/>
+                            <autoresizingMask key="autoresizingMask"/>
+                            <searchFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" borderStyle="bezel" usesSingleLineMode="YES" bezelStyle="round" id="6vV-pw-9Ej">
+                                <font key="font" metaFont="system"/>
+                                <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+                                <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                            </searchFieldCell>
+                            <connections>
+                                <action selector="search:" target="-2" id="JsE-wh-qQV"/>
+                            </connections>
+                        </searchField>
+                    </toolbarItem>
                 </allowedToolbarItems>
                 <defaultToolbarItems>
                     <toolbarItem reference="Jj0-n8-I5a"/>
                     <toolbarItem reference="GV4-aX-5Ox"/>
+                    <toolbarItem reference="3Kc-zG-IdN"/>
+                    <toolbarItem reference="kT0-k4-f7d"/>
                 </defaultToolbarItems>
             </toolbar>
             <connections>
@@ -322,7 +342,9 @@
             </connections>
             <point key="canvasLocation" x="-348" y="164"/>
         </menu>
-        <arrayController objectClassName="DownloadItem" editable="NO" preservesSelection="NO" selectsInsertedObjects="NO" avoidsEmptySelection="NO" clearsFilterPredicateOnInsertion="NO" automaticallyRearrangesObjects="YES" id="jhO-4z-Qwt" customClass="DownloadItemArrayController"/>
+        <arrayController objectClassName="DownloadItem" editable="NO" preservesSelection="NO" selectsInsertedObjects="NO" avoidsEmptySelection="NO" clearsFilterPredicateOnInsertion="NO" automaticallyRearrangesObjects="YES" id="jhO-4z-Qwt" customClass="DownloadItemArrayController">
+            <classReference key="objectClass" className="DownloadItem"/>
+        </arrayController>
         <userDefaultsController representsSharedInstance="YES" id="721-9N-Bma"/>
     </objects>
     <resources>

Ample/Base.lproj/LaunchWindow.xib

@@ -159,10 +159,21 @@
                                                 <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="Window 1x" id="3bZ-rq-fCt"/>
-                                                        <menuItem title="Window 2x" id="KA4-Rs-yyK"/>
-                                                        <menuItem title="Window 3x" id="Dbh-Js-pMx" userLabel="Window 3x"/>
+                                                        <menuItem title="Full Screen" state="on" id="0zZ-Ib-Fne">
+                                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                                        </menuItem>
+                                                        <menuItem title="Window 1x" id="3bZ-rq-fCt">
+                                                            <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="181" width="322" height="21"/>
+                        <rect key="frame" x="138" y="159" 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="150" width="322" height="21"/>
+                        <rect key="frame" x="138" y="128" 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="enabled" keyPath="values.UseCustomMame" id="DeG-OW-Gd2"/>
                             <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"/>
                         </connections>
                     </textField>
                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="vTJ-Ez-c1R">
-                        <rect key="frame" x="18" y="153" width="114" height="16"/>
+                        <rect key="frame" x="18" y="131" 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="234" width="217" height="18"/>
+                        <rect key="frame" x="136" y="212" 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="208" width="139" height="18"/>
+                        <rect key="frame" x="136" y="186" 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="184" width="74" height="16"/>
+                        <rect key="frame" x="58" y="162" 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,9 +104,20 @@
                             <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="140" y="147"/>
+            <point key="canvasLocation" x="80" y="144"/>
         </window>
         <userDefaultsController id="KVS-Ag-1un"/>
         <userDefaultsController representsSharedInstance="YES" id="yvB-HG-64y"/>

Ample/BookmarkManager.m

@@ -602,7 +602,7 @@ static NSString *kMenuContext = @"";
         if ([b automatic]) {
             
             [item setOnStateImage: [NSImage imageNamed: NSImageNameStatusAvailable]];
-            [item setState: NSOnState];
+            [item setState: NSControlStateValueOn];
         }
         //if ([b automatic]) [item setAttributedTitle: ItalicMenuString([b name])];
         //[item setState: [b automatic] ? NSMixedState : NSOffState];

Ample/Defaults.plist

@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>MameComponentsDate</key>
-	<date>2024-02-29T12:00:00Z</date>
+	<date>2026-06-01T12:00:00Z</date>
 	<key>UseCustomMame</key>
 	<false/>
 	<key>AutoCloseLogWindow</key>
@@ -15,7 +15,9 @@
 	<key>NSQuitAlwaysKeepsWindows</key>
 	<true/>
 	<key>DefaultDownloadURL</key>
-	<string>https://archive.org/download/mame-merged/mame-merged</string>
+	<string>https://www.callapple.org/roms/</string>
+	<key>UseLogWindow</key>
+	<true/>
 	<key>DefaultDownloadExtension</key>
 	<string>zip</string>
 </dict>

Ample/DownloadWindowController.m

@@ -133,6 +133,7 @@ enum {
 /* filter buttons */
 @property (weak) IBOutlet NSButton *allFilterButton;
 @property (weak) IBOutlet NSButton *missingFilterButton;
+@property (weak) IBOutlet NSSearchField *searchFilter;
 
 @property (strong) IBOutlet NSArrayController *arrayController;
 
@@ -152,6 +153,11 @@ enum {
     NSUserDefaults *_defaults;
 
     NSArray<NSButton *> *_filterButtons;
+
+    NSPredicate *_missingPredicate;
+    NSPredicate *_searchPredicate;
+
+
 }
 
 +(instancetype)sharedInstance {
@@ -481,6 +487,10 @@ enum {
 
 }
 
+-(IBAction)doubleClick:(id)sender {
+    [self download: sender];
+}
+
 - (IBAction)download:(id)sender {
     DownloadItem *item = [self clickedItem];
     if (!item) return;
@@ -515,30 +525,65 @@ enum {
 }
 
 
+-(void)updatePredicate {
+    if (!_missingPredicate && !_searchPredicate) {
+        [_arrayController setFilterPredicate: nil];
+        return;
+    }
+    if (_missingPredicate && !_searchPredicate) {
+        [_arrayController setFilterPredicate: _missingPredicate];
+        return;
+    }
+    if (_searchPredicate && !_missingPredicate) {
+        [_arrayController setFilterPredicate: _searchPredicate];
+        return;
+    }
+    NSCompoundPredicate *p = [NSCompoundPredicate andPredicateWithSubpredicates: @[ _missingPredicate, _searchPredicate]];
+    [_arrayController setFilterPredicate: p];
+}
+
 - (IBAction)filterButton:(id)sender {
 
-    NSPredicate *p = nil;
     NSUInteger tag = [sender tag];
     [sender setState: NSControlStateValueOn];
 
-
     for (NSButton *b in _filterButtons) {
         if (b != sender) [b setState: NSControlStateValueOff];
     }
     switch (tag) {
         case 1: // all
         default:
-            [_arrayController setFilterPredicate: nil];
+            _missingPredicate = nil;
             break;
         case 2: // missing.
-            p = [NSPredicate predicateWithBlock: ^BOOL(DownloadItem *item, NSDictionary *bindings){
+            _missingPredicate = [NSPredicate predicateWithBlock: ^BOOL(DownloadItem *item, NSDictionary *bindings){
                 NSURL *localURL = [item localURL];
                 return localURL == nil;
             }];
 
-            [_arrayController setFilterPredicate: p];
-            break;
     }
+
+    [self updatePredicate];
+}
+- (IBAction)search:(id)sender {
+    NSString *text = [sender stringValue];
+    if (![text length]) {
+        _searchPredicate = nil;
+    } else {
+        
+        text = [text lowercaseString];
+        NSPredicate *p = [NSPredicate predicateWithBlock: ^(DownloadItem *item, NSDictionary *bindings){
+            
+            NSString *value = [[item value] lowercaseString];
+            NSString *name = [[item name] lowercaseString];
+            
+            BOOL ok = [name containsString: text] || [value containsString: text];
+            return ok;
+        }];
+        _searchPredicate = p;
+        
+    }
+    [self updatePredicate];
 }
 
 
@@ -610,13 +655,16 @@ 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];
 
-        [item refresh: dest];
+        if (error) [item completeWithError: error];
+        else [item refresh: dest];
     });
 
     NSLog(@"%@", src);

Ample/Info.plist

@@ -52,7 +52,7 @@
 	<key>LSMinimumSystemVersion</key>
 	<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
 	<key>NSHumanReadableCopyright</key>
-	<string>Copyright © 2020-2023 Kelvin Sherlock. All rights reserved.</string>
+	<string>Copyright © 2020-2026 Kelvin Sherlock. All rights reserved.</string>
 	<key>NSMainNibFile</key>
 	<string>MainMenu</string>
 	<key>NSPrincipalClass</key>

Ample/LaunchWindowController.m

@@ -25,6 +25,53 @@ static NSString *kMyContext = @"kMyContext";
 static NSString *kContextMachine = @"kContextMachine";
 
 
+static NSString *NeedsAspectRatio(NSString *machine) {
+    static NSDictionary *dict = nil;
+    
+    /* these are all non-60hz? */
+    if (!dict) {
+        dict = @{
+            @"c64": @"3:2",
+            @"c64c": @"3:2",
+            @"oric1": @"2:1",
+            @"orica": @"2:1",
+            @"prav8d": @"2:1",
+            @"telstrat": @"2:1",
+        };
+    }
+    return [dict objectForKey: machine];
+}
+
+static BOOL NeedsNatural(NSString *machine) {
+
+    static NSSet *set = nil;
+    
+    /* these all have really strange keyboards */
+    if (!set) {
+        NSArray *machines = @[
+            @"bbcb", @"bbca", @"bbcb_de", @"bbcb_us", @"bbcb_no", @"bbcbp", @"bbcbp128", @"bbcm", @"bbcmt", @"bbcmc", @"electron",
+            @"c64", @"c64c", @"c128"
+        ];
+        set = [NSSet setWithArray: machines];
+    }
+    return [set containsObject: machine];
+}
+
+static BOOL HasLayout(NSString *machine) {
+
+    static NSSet *set = nil;
+    
+    /* these have a layout which adds 10% to the height. */
+    if (!set) {
+        NSArray *machines = @[
+            @"bbcb", @"bbca", @"bbcb_de", @"bbcb_us", @"bbcb_no", @"bbcbp", @"bbcbp128", @"bbcm", @"bbcmt", @"bbcmc", @"electron",
+            @"vt100", @"vt101", @"vt102", @"vt105", @"vt131", @"vt180"
+        ];
+        set = [NSSet setWithArray: machines];
+    }
+    return [set containsObject: machine];
+}
+
 @interface LaunchWindowController () {
     BOOL _loadingBookmark;
     NSString *_machine;
@@ -320,7 +367,7 @@ static NSString * JoinArguments(NSArray *argv, NSString *argv0) {
 
     if (!safe) {
         NSString *str =
-            @"%+-./:=_"
+            @"%+-./:=_,"
             @"0123456789"
             @"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
         ;
@@ -395,7 +442,7 @@ static NSString *ShellQuote(NSString *s) {
 
     if (!safe) {
         NSString *str =
-            @"%+-./:=_"
+            @"%+-./:=_,"
             @"0123456789"
             @"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
         ;
@@ -466,6 +513,9 @@ static NSString *ShellQuote(NSString *s) {
     // -confirm_quit?
     [argv addObject: @"-skip_gameinfo"];
 
+    // natural keyboard on by default.
+    if (NeedsNatural(_machine))
+        [argv addObject: @"-natural"];
     
     if (_mameMouse)
         [argv addObject: @"-mouse"]; // capture the mouse cursor when over the window.
@@ -500,6 +550,7 @@ 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];
@@ -509,10 +560,16 @@ static NSString *ShellQuote(NSString *s) {
                 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);
             }
             
+            if (HasLayout(_machine)) {
+                screen.height = round(screen.height * 1.1);
+            }
+            
             [argv addObject: @"-window"];
             NSString *res = [NSString stringWithFormat: @"%ux%u",
                    (unsigned)(_mameWindowMode * screen.width),
@@ -523,12 +580,20 @@ static NSString *ShellQuote(NSString *s) {
             [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,6 +43,8 @@ static NSMutableSet *LogWindows;
 
 +(id)controllerForArgs: (NSArray *)args close: (BOOL)close {
 
+    NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
+    
     NSURL *url = MameURL();
 
     if (!url) {
@@ -65,6 +67,30 @@ 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.m

@@ -41,7 +41,7 @@ void MediaAdd(Media *dest, const Media *src) {
     
     //unsigned count;
     unsigned dest_flops = dest->floppy_8 + dest->floppy_5_25 + dest->floppy_3_5;
-    unsigned src_flops = src->floppy_8 || src->floppy_5_25 || src->floppy_8;
+    unsigned src_flops = src->floppy_8 || src->floppy_5_25 || src->floppy_3_5;
 
     
 #define _(name) dest->name += src->name;

Ample/Resources/a1000.plist

@@ -50,6 +50,14 @@
             <key>default</key>
             <true/>
           </dict>
+          <dict>
+            <key>value</key>
+            <string>h19</string>
+            <key>description</key>
+            <string>Heath H19 Terminal (Serial Port)</string>
+            <key>devname</key>
+            <string>serial_heath_h19</string>
+          </dict>
           <dict>
             <key>value</key>
             <string>ie15</string>
@@ -58,11 +66,35 @@
             <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>msystems_mouse</string>
+            <key>description</key>
+            <string>Mouse Systems Non-rotatable Mouse (HLE)</string>
+            <key>devname</key>
+            <string>rs232_mouse_hle_msystems</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>
@@ -74,19 +106,11 @@
             <key>devname</key>
             <string>rs_serial_printer</string>
           </dict>
-          <dict>
-            <key>value</key>
-            <string>patch</string>
-            <key>description</key>
-            <string>RS-232 Patch Box</string>
-            <key>devname</key>
-            <string>rs232_patch_box</string>
-          </dict>
           <dict>
             <key>value</key>
             <string>loopback</string>
             <key>description</key>
-            <string>RS232 Loopback</string>
+            <string>RS-232 Loopback</string>
             <key>devname</key>
             <string>rs232_loopback</string>
           </dict>
@@ -94,7 +118,7 @@
             <key>value</key>
             <string>dec_loopback</string>
             <key>description</key>
-            <string>RS232 Loopback (DEC 12-15336-00)</string>
+            <string>RS-232 Loopback (DEC 12-15336-00)</string>
             <key>devname</key>
             <string>dec_rs232_loopback</string>
           </dict>
@@ -102,7 +126,7 @@
             <key>value</key>
             <string>null_modem</string>
             <key>description</key>
-            <string>RS232 Null Modem</string>
+            <string>RS-232 Null Modem</string>
             <key>devname</key>
             <string>null_modem</string>
             <key>media</key>
@@ -111,11 +135,19 @@
               <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>RS232 Synchronous I/O</string>
+            <string>RS-232 Synchronous I/O</string>
             <key>devname</key>
             <string>rs232_sync_io</string>
             <key>media</key>
@@ -172,6 +204,14 @@
             <key>devname</key>
             <string>swtpc8212_terminal</string>
           </dict>
+          <dict>
+            <key>value</key>
+            <string>votraxtnt</string>
+            <key>description</key>
+            <string>Votrax Type 'N Talk (Serial Port)</string>
+            <key>devname</key>
+            <string>serial_votraxtnt</string>
+          </dict>
         </array>
       </dict>
       <dict>
@@ -247,6 +287,22 @@
             <key>devname</key>
             <string>ex800</string>
           </dict>
+          <dict>
+            <key>value</key>
+            <string>fx80</string>
+            <key>description</key>
+            <string>Epson FX-80</string>
+            <key>devname</key>
+            <string>epson_fx80</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>jx80</string>
+            <key>description</key>
+            <string>Epson JX-80</string>
+            <key>devname</key>
+            <string>epson_jx80</string>
+          </dict>
           <dict>
             <key>value</key>
             <string>lx800</string>
@@ -263,6 +319,14 @@
             <key>devname</key>
             <string>lx810l</string>
           </dict>
+          <dict>
+            <key>value</key>
+            <string>rx80</string>
+            <key>description</key>
+            <string>Epson RX-80</string>
+            <key>devname</key>
+            <string>epson_rx80</string>
+          </dict>
           <dict>
             <key>value</key>
             <string>p72</string>
@@ -303,6 +367,14 @@
             <key>devname</key>
             <string>centronics_smartboard</string>
           </dict>
+          <dict>
+            <key>value</key>
+            <string>adaptator</string>
+            <key>description</key>
+            <string>The Adaptator 2x DE-9 Multitap</string>
+            <key>devname</key>
+            <string>adaptator_multitap</string>
+          </dict>
         </array>
       </dict>
       <dict>
@@ -630,6 +702,223 @@
           </dict>
         </array>
       </dict>
+      <dict>
+        <key>name</key>
+        <string>adaptator_multitap</string>
+        <key>slots</key>
+        <array>
+          <dict>
+            <key>name</key>
+            <string>:joy_p1</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>joy</string>
+                <key>description</key>
+                <string>Atari / CBM Digital joystick</string>
+                <key>default</key>
+                <true/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>wheel</string>
+                <key>description</key>
+                <string>Atari / CBM Driving Wheel</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>pad</string>
+                <key>description</key>
+                <string>Atari / CBM Dual paddles</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>keypad</string>
+                <key>description</key>
+                <string>Atari / CBM Keypad</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>lp</string>
+                <key>description</key>
+                <string>Atari / CBM Light Pen</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>mouse</string>
+                <key>description</key>
+                <string>Atari / CBM Mouse</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>trakball</string>
+                <key>description</key>
+                <string>Atari CX22/CX80 Trak-Ball</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>cx85</string>
+                <key>description</key>
+                <string>Atari CX85 Numeric Keypad</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>joybstr</string>
+                <key>description</key>
+                <string>CBS Electronics Booster-Grip Joystick Adaptor</string>
+                <key>default</key>
+                <false/>
+              </dict>
+            </array>
+          </dict>
+          <dict>
+            <key>name</key>
+            <string>:joy_p2</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>joy</string>
+                <key>description</key>
+                <string>Atari / CBM Digital joystick</string>
+                <key>default</key>
+                <true/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>wheel</string>
+                <key>description</key>
+                <string>Atari / CBM Driving Wheel</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>pad</string>
+                <key>description</key>
+                <string>Atari / CBM Dual paddles</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>keypad</string>
+                <key>description</key>
+                <string>Atari / CBM Keypad</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>lp</string>
+                <key>description</key>
+                <string>Atari / CBM Light Pen</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>mouse</string>
+                <key>description</key>
+                <string>Atari / CBM Mouse</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>trakball</string>
+                <key>description</key>
+                <string>Atari CX22/CX80 Trak-Ball</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>cx85</string>
+                <key>description</key>
+                <string>Atari CX85 Numeric Keypad</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>joybstr</string>
+                <key>description</key>
+                <string>CBS Electronics Booster-Grip Joystick Adaptor</string>
+                <key>default</key>
+                <false/>
+              </dict>
+            </array>
+          </dict>
+        </array>
+      </dict>
+      <dict>
+        <key>name</key>
+        <string>heath_watz_tlb</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>watzman</string>
+                <key>description</key>
+                <string>Watzman</string>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>watzman-a</string>
+                <key>description</key>
+                <string>Watzman w/clock persists after reset</string>
+              </dict>
+            </array>
+          </dict>
+        </array>
+      </dict>
       <dict>
         <key>name</key>
         <string>rs232_patch_box</string>
@@ -648,6 +937,14 @@
                 <key>default</key>
                 <true/>
               </dict>
+              <dict>
+                <key>value</key>
+                <string>h19</string>
+                <key>description</key>
+                <string>Heath H19 Terminal (Serial Port)</string>
+                <key>default</key>
+                <false/>
+              </dict>
               <dict>
                 <key>value</key>
                 <string>ie15</string>
@@ -656,11 +953,35 @@
                 <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>msystems_mouse</string>
+                <key>description</key>
+                <string>Mouse Systems Non-rotatable Mouse (HLE)</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>
@@ -672,19 +993,11 @@
                 <key>default</key>
                 <false/>
               </dict>
-              <dict>
-                <key>value</key>
-                <string>patch</string>
-                <key>description</key>
-                <string>RS-232 Patch Box</string>
-                <key>default</key>
-                <false/>
-              </dict>
               <dict>
                 <key>value</key>
                 <string>loopback</string>
                 <key>description</key>
-                <string>RS232 Loopback</string>
+                <string>RS-232 Loopback</string>
                 <key>default</key>
                 <false/>
               </dict>
@@ -692,7 +1005,7 @@
                 <key>value</key>
                 <string>dec_loopback</string>
                 <key>description</key>
-                <string>RS232 Loopback (DEC 12-15336-00)</string>
+                <string>RS-232 Loopback (DEC 12-15336-00)</string>
                 <key>default</key>
                 <false/>
               </dict>
@@ -700,7 +1013,7 @@
                 <key>value</key>
                 <string>null_modem</string>
                 <key>description</key>
-                <string>RS232 Null Modem</string>
+                <string>RS-232 Null Modem</string>
                 <key>default</key>
                 <false/>
                 <key>media</key>
@@ -709,11 +1022,19 @@
                   <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>RS232 Synchronous I/O</string>
+                <string>RS-232 Synchronous I/O</string>
                 <key>default</key>
                 <false/>
                 <key>media</key>
@@ -770,6 +1091,122 @@
                 <key>default</key>
                 <false/>
               </dict>
+              <dict>
+                <key>value</key>
+                <string>votraxtnt</string>
+                <key>description</key>
+                <string>Votrax Type 'N Talk (Serial Port)</string>
+                <key>default</key>
+                <false/>
+              </dict>
+            </array>
+          </dict>
+        </array>
+      </dict>
+      <dict>
+        <key>name</key>
+        <string>scorpion_ic</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>61203</string>
+                <key>description</key>
+                <string>Version 61203 (3rd Dec 1986)</string>
+              </dict>
+            </array>
+          </dict>
+        </array>
+      </dict>
+      <dict>
+        <key>name</key>
+        <string>serial_heath_h19</string>
+        <key>slots</key>
+        <array>
+          <dict>
+            <key>name</key>
+            <string>:tlbc</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>heath</string>
+                <key>description</key>
+                <string>Heath Terminal Logic Board</string>
+                <key>default</key>
+                <true/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>imaginator</string>
+                <key>description</key>
+                <string>Heath Terminal Logic Board plus Cleveland Codonics Imaginator I-100</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>gp19</string>
+                <key>description</key>
+                <string>Heath Terminal Logic Board plus Northwest Digital Systems GP-19</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>super19</string>
+                <key>description</key>
+                <string>Heath Terminal Logic Board w/Super19 ROM</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>superset</string>
+                <key>description</key>
+                <string>Heath Terminal Logic Board w/Superset ROM</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>ultrarom</string>
+                <key>description</key>
+                <string>Heath Terminal Logic Board w/Ultra ROM</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>watzman</string>
+                <key>description</key>
+                <string>Heath Terminal Logic Board w/Watzman ROM</string>
+                <key>default</key>
+                <false/>
+              </dict>
             </array>
           </dict>
         </array>
@@ -853,7 +1290,8 @@
       <string>amiga_flop.xml</string>
       <string>amigaocs_flop.xml</string>
       <string>amiga_demos.xml</string>
-      <string>amiga_a1000.xml</string>
+      <string>amiga_cd.xml</string>
+      <string>photo_cd.xml</string>
     </array>
   </dict>
 </plist>

Ample/Resources/a1000n.plist

@@ -50,6 +50,14 @@
             <key>default</key>
             <true/>
           </dict>
+          <dict>
+            <key>value</key>
+            <string>h19</string>
+            <key>description</key>
+            <string>Heath H19 Terminal (Serial Port)</string>
+            <key>devname</key>
+            <string>serial_heath_h19</string>
+          </dict>
           <dict>
             <key>value</key>
             <string>ie15</string>
@@ -58,11 +66,35 @@
             <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>msystems_mouse</string>
+            <key>description</key>
+            <string>Mouse Systems Non-rotatable Mouse (HLE)</string>
+            <key>devname</key>
+            <string>rs232_mouse_hle_msystems</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>
@@ -74,19 +106,11 @@
             <key>devname</key>
             <string>rs_serial_printer</string>
           </dict>
-          <dict>
-            <key>value</key>
-            <string>patch</string>
-            <key>description</key>
-            <string>RS-232 Patch Box</string>
-            <key>devname</key>
-            <string>rs232_patch_box</string>
-          </dict>
           <dict>
             <key>value</key>
             <string>loopback</string>
             <key>description</key>
-            <string>RS232 Loopback</string>
+            <string>RS-232 Loopback</string>
             <key>devname</key>
             <string>rs232_loopback</string>
           </dict>
@@ -94,7 +118,7 @@
             <key>value</key>
             <string>dec_loopback</string>
             <key>description</key>
-            <string>RS232 Loopback (DEC 12-15336-00)</string>
+            <string>RS-232 Loopback (DEC 12-15336-00)</string>
             <key>devname</key>
             <string>dec_rs232_loopback</string>
           </dict>
@@ -102,7 +126,7 @@
             <key>value</key>
             <string>null_modem</string>
             <key>description</key>
-            <string>RS232 Null Modem</string>
+            <string>RS-232 Null Modem</string>
             <key>devname</key>
             <string>null_modem</string>
             <key>media</key>
@@ -111,11 +135,19 @@
               <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>RS232 Synchronous I/O</string>
+            <string>RS-232 Synchronous I/O</string>
             <key>devname</key>
             <string>rs232_sync_io</string>
             <key>media</key>
@@ -172,6 +204,14 @@
             <key>devname</key>
             <string>swtpc8212_terminal</string>
           </dict>
+          <dict>
+            <key>value</key>
+            <string>votraxtnt</string>
+            <key>description</key>
+            <string>Votrax Type 'N Talk (Serial Port)</string>
+            <key>devname</key>
+            <string>serial_votraxtnt</string>
+          </dict>
         </array>
       </dict>
       <dict>
@@ -247,6 +287,22 @@
             <key>devname</key>
             <string>ex800</string>
           </dict>
+          <dict>
+            <key>value</key>
+            <string>fx80</string>
+            <key>description</key>
+            <string>Epson FX-80</string>
+            <key>devname</key>
+            <string>epson_fx80</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>jx80</string>
+            <key>description</key>
+            <string>Epson JX-80</string>
+            <key>devname</key>
+            <string>epson_jx80</string>
+          </dict>
           <dict>
             <key>value</key>
             <string>lx800</string>
@@ -263,6 +319,14 @@
             <key>devname</key>
             <string>lx810l</string>
           </dict>
+          <dict>
+            <key>value</key>
+            <string>rx80</string>
+            <key>description</key>
+            <string>Epson RX-80</string>
+            <key>devname</key>
+            <string>epson_rx80</string>
+          </dict>
           <dict>
             <key>value</key>
             <string>p72</string>
@@ -303,6 +367,14 @@
             <key>devname</key>
             <string>centronics_smartboard</string>
           </dict>
+          <dict>
+            <key>value</key>
+            <string>adaptator</string>
+            <key>description</key>
+            <string>The Adaptator 2x DE-9 Multitap</string>
+            <key>devname</key>
+            <string>adaptator_multitap</string>
+          </dict>
         </array>
       </dict>
       <dict>
@@ -630,6 +702,223 @@
           </dict>
         </array>
       </dict>
+      <dict>
+        <key>name</key>
+        <string>adaptator_multitap</string>
+        <key>slots</key>
+        <array>
+          <dict>
+            <key>name</key>
+            <string>:joy_p1</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>joy</string>
+                <key>description</key>
+                <string>Atari / CBM Digital joystick</string>
+                <key>default</key>
+                <true/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>wheel</string>
+                <key>description</key>
+                <string>Atari / CBM Driving Wheel</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>pad</string>
+                <key>description</key>
+                <string>Atari / CBM Dual paddles</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>keypad</string>
+                <key>description</key>
+                <string>Atari / CBM Keypad</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>lp</string>
+                <key>description</key>
+                <string>Atari / CBM Light Pen</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>mouse</string>
+                <key>description</key>
+                <string>Atari / CBM Mouse</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>trakball</string>
+                <key>description</key>
+                <string>Atari CX22/CX80 Trak-Ball</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>cx85</string>
+                <key>description</key>
+                <string>Atari CX85 Numeric Keypad</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>joybstr</string>
+                <key>description</key>
+                <string>CBS Electronics Booster-Grip Joystick Adaptor</string>
+                <key>default</key>
+                <false/>
+              </dict>
+            </array>
+          </dict>
+          <dict>
+            <key>name</key>
+            <string>:joy_p2</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>joy</string>
+                <key>description</key>
+                <string>Atari / CBM Digital joystick</string>
+                <key>default</key>
+                <true/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>wheel</string>
+                <key>description</key>
+                <string>Atari / CBM Driving Wheel</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>pad</string>
+                <key>description</key>
+                <string>Atari / CBM Dual paddles</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>keypad</string>
+                <key>description</key>
+                <string>Atari / CBM Keypad</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>lp</string>
+                <key>description</key>
+                <string>Atari / CBM Light Pen</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>mouse</string>
+                <key>description</key>
+                <string>Atari / CBM Mouse</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>trakball</string>
+                <key>description</key>
+                <string>Atari CX22/CX80 Trak-Ball</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>cx85</string>
+                <key>description</key>
+                <string>Atari CX85 Numeric Keypad</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>joybstr</string>
+                <key>description</key>
+                <string>CBS Electronics Booster-Grip Joystick Adaptor</string>
+                <key>default</key>
+                <false/>
+              </dict>
+            </array>
+          </dict>
+        </array>
+      </dict>
+      <dict>
+        <key>name</key>
+        <string>heath_watz_tlb</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>watzman</string>
+                <key>description</key>
+                <string>Watzman</string>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>watzman-a</string>
+                <key>description</key>
+                <string>Watzman w/clock persists after reset</string>
+              </dict>
+            </array>
+          </dict>
+        </array>
+      </dict>
       <dict>
         <key>name</key>
         <string>rs232_patch_box</string>
@@ -648,6 +937,14 @@
                 <key>default</key>
                 <true/>
               </dict>
+              <dict>
+                <key>value</key>
+                <string>h19</string>
+                <key>description</key>
+                <string>Heath H19 Terminal (Serial Port)</string>
+                <key>default</key>
+                <false/>
+              </dict>
               <dict>
                 <key>value</key>
                 <string>ie15</string>
@@ -656,11 +953,35 @@
                 <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>msystems_mouse</string>
+                <key>description</key>
+                <string>Mouse Systems Non-rotatable Mouse (HLE)</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>
@@ -672,19 +993,11 @@
                 <key>default</key>
                 <false/>
               </dict>
-              <dict>
-                <key>value</key>
-                <string>patch</string>
-                <key>description</key>
-                <string>RS-232 Patch Box</string>
-                <key>default</key>
-                <false/>
-              </dict>
               <dict>
                 <key>value</key>
                 <string>loopback</string>
                 <key>description</key>
-                <string>RS232 Loopback</string>
+                <string>RS-232 Loopback</string>
                 <key>default</key>
                 <false/>
               </dict>
@@ -692,7 +1005,7 @@
                 <key>value</key>
                 <string>dec_loopback</string>
                 <key>description</key>
-                <string>RS232 Loopback (DEC 12-15336-00)</string>
+                <string>RS-232 Loopback (DEC 12-15336-00)</string>
                 <key>default</key>
                 <false/>
               </dict>
@@ -700,7 +1013,7 @@
                 <key>value</key>
                 <string>null_modem</string>
                 <key>description</key>
-                <string>RS232 Null Modem</string>
+                <string>RS-232 Null Modem</string>
                 <key>default</key>
                 <false/>
                 <key>media</key>
@@ -709,11 +1022,19 @@
                   <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>RS232 Synchronous I/O</string>
+                <string>RS-232 Synchronous I/O</string>
                 <key>default</key>
                 <false/>
                 <key>media</key>
@@ -770,6 +1091,122 @@
                 <key>default</key>
                 <false/>
               </dict>
+              <dict>
+                <key>value</key>
+                <string>votraxtnt</string>
+                <key>description</key>
+                <string>Votrax Type 'N Talk (Serial Port)</string>
+                <key>default</key>
+                <false/>
+              </dict>
+            </array>
+          </dict>
+        </array>
+      </dict>
+      <dict>
+        <key>name</key>
+        <string>scorpion_ic</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>61203</string>
+                <key>description</key>
+                <string>Version 61203 (3rd Dec 1986)</string>
+              </dict>
+            </array>
+          </dict>
+        </array>
+      </dict>
+      <dict>
+        <key>name</key>
+        <string>serial_heath_h19</string>
+        <key>slots</key>
+        <array>
+          <dict>
+            <key>name</key>
+            <string>:tlbc</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>heath</string>
+                <key>description</key>
+                <string>Heath Terminal Logic Board</string>
+                <key>default</key>
+                <true/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>imaginator</string>
+                <key>description</key>
+                <string>Heath Terminal Logic Board plus Cleveland Codonics Imaginator I-100</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>gp19</string>
+                <key>description</key>
+                <string>Heath Terminal Logic Board plus Northwest Digital Systems GP-19</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>super19</string>
+                <key>description</key>
+                <string>Heath Terminal Logic Board w/Super19 ROM</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>superset</string>
+                <key>description</key>
+                <string>Heath Terminal Logic Board w/Superset ROM</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>ultrarom</string>
+                <key>description</key>
+                <string>Heath Terminal Logic Board w/Ultra ROM</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>watzman</string>
+                <key>description</key>
+                <string>Heath Terminal Logic Board w/Watzman ROM</string>
+                <key>default</key>
+                <false/>
+              </dict>
             </array>
           </dict>
         </array>
@@ -853,7 +1290,8 @@
       <string>amiga_flop.xml</string>
       <string>amigaocs_flop.xml</string>
       <string>amiga_demos.xml</string>
-      <string>amiga_a1000.xml</string>
+      <string>amiga_cd.xml</string>
+      <string>photo_cd.xml</string>
     </array>
   </dict>
 </plist>

Ample/Resources/ace500.plist

@@ -123,6 +123,14 @@
             <key>default</key>
             <true/>
           </dict>
+          <dict>
+            <key>value</key>
+            <string>h19</string>
+            <key>description</key>
+            <string>Heath H19 Terminal (Serial Port)</string>
+            <key>devname</key>
+            <string>serial_heath_h19</string>
+          </dict>
           <dict>
             <key>value</key>
             <string>ie15</string>
@@ -139,6 +147,22 @@
             <key>devname</key>
             <string>scorpion_ic</string>
           </dict>
+          <dict>
+            <key>value</key>
+            <string>msystems_mouse</string>
+            <key>description</key>
+            <string>Mouse Systems Non-rotatable Mouse (HLE)</string>
+            <key>devname</key>
+            <string>rs232_mouse_hle_msystems</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>
@@ -155,19 +179,11 @@
             <key>devname</key>
             <string>rs_serial_printer</string>
           </dict>
-          <dict>
-            <key>value</key>
-            <string>patch</string>
-            <key>description</key>
-            <string>RS-232 Patch Box</string>
-            <key>devname</key>
-            <string>rs232_patch_box</string>
-          </dict>
           <dict>
             <key>value</key>
             <string>loopback</string>
             <key>description</key>
-            <string>RS232 Loopback</string>
+            <string>RS-232 Loopback</string>
             <key>devname</key>
             <string>rs232_loopback</string>
           </dict>
@@ -175,7 +191,7 @@
             <key>value</key>
             <string>dec_loopback</string>
             <key>description</key>
-            <string>RS232 Loopback (DEC 12-15336-00)</string>
+            <string>RS-232 Loopback (DEC 12-15336-00)</string>
             <key>devname</key>
             <string>dec_rs232_loopback</string>
           </dict>
@@ -183,7 +199,7 @@
             <key>value</key>
             <string>null_modem</string>
             <key>description</key>
-            <string>RS232 Null Modem</string>
+            <string>RS-232 Null Modem</string>
             <key>devname</key>
             <string>null_modem</string>
             <key>media</key>
@@ -192,11 +208,19 @@
               <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>RS232 Synchronous I/O</string>
+            <string>RS-232 Synchronous I/O</string>
             <key>devname</key>
             <string>rs232_sync_io</string>
             <key>media</key>
@@ -253,6 +277,14 @@
             <key>devname</key>
             <string>swtpc8212_terminal</string>
           </dict>
+          <dict>
+            <key>value</key>
+            <string>votraxtnt</string>
+            <key>description</key>
+            <string>Votrax Type 'N Talk (Serial Port)</string>
+            <key>devname</key>
+            <string>serial_votraxtnt</string>
+          </dict>
         </array>
       </dict>
     </array>
@@ -321,6 +353,295 @@
           </dict>
         </array>
       </dict>
+      <dict>
+        <key>name</key>
+        <string>adaptator_multitap</string>
+        <key>slots</key>
+        <array>
+          <dict>
+            <key>name</key>
+            <string>:joy_p1</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>joy</string>
+                <key>description</key>
+                <string>Atari / CBM Digital joystick</string>
+                <key>default</key>
+                <true/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>wheel</string>
+                <key>description</key>
+                <string>Atari / CBM Driving Wheel</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>pad</string>
+                <key>description</key>
+                <string>Atari / CBM Dual paddles</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>keypad</string>
+                <key>description</key>
+                <string>Atari / CBM Keypad</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>lp</string>
+                <key>description</key>
+                <string>Atari / CBM Light Pen</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>mouse</string>
+                <key>description</key>
+                <string>Atari / CBM Mouse</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>trakball</string>
+                <key>description</key>
+                <string>Atari CX22/CX80 Trak-Ball</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>cx85</string>
+                <key>description</key>
+                <string>Atari CX85 Numeric Keypad</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>joybstr</string>
+                <key>description</key>
+                <string>CBS Electronics Booster-Grip Joystick Adaptor</string>
+                <key>default</key>
+                <false/>
+              </dict>
+            </array>
+          </dict>
+          <dict>
+            <key>name</key>
+            <string>:joy_p2</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>joy</string>
+                <key>description</key>
+                <string>Atari / CBM Digital joystick</string>
+                <key>default</key>
+                <true/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>wheel</string>
+                <key>description</key>
+                <string>Atari / CBM Driving Wheel</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>pad</string>
+                <key>description</key>
+                <string>Atari / CBM Dual paddles</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>keypad</string>
+                <key>description</key>
+                <string>Atari / CBM Keypad</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>lp</string>
+                <key>description</key>
+                <string>Atari / CBM Light Pen</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>mouse</string>
+                <key>description</key>
+                <string>Atari / CBM Mouse</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>trakball</string>
+                <key>description</key>
+                <string>Atari CX22/CX80 Trak-Ball</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>cx85</string>
+                <key>description</key>
+                <string>Atari CX85 Numeric Keypad</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>joybstr</string>
+                <key>description</key>
+                <string>CBS Electronics Booster-Grip Joystick Adaptor</string>
+                <key>default</key>
+                <false/>
+              </dict>
+            </array>
+          </dict>
+        </array>
+      </dict>
+      <dict>
+        <key>name</key>
+        <string>heath_imaginator_tlb</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>rev12</string>
+                <key>description</key>
+                <string>GPC Rev. 1.2 P/N 9000-0002</string>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>unknown</string>
+                <key>description</key>
+                <string>GPC Unknown revision</string>
+              </dict>
+            </array>
+          </dict>
+        </array>
+      </dict>
+      <dict>
+        <key>name</key>
+        <string>heath_watz_tlb</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>watzman</string>
+                <key>description</key>
+                <string>Watzman</string>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>watzman-a</string>
+                <key>description</key>
+                <string>Watzman w/clock persists after reset</string>
+              </dict>
+            </array>
+          </dict>
+        </array>
+      </dict>
+      <dict>
+        <key>name</key>
+        <string>nss_tvinterface</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>de</string>
+                <key>description</key>
+                <string>German</string>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>fr</string>
+                <key>description</key>
+                <string>French</string>
+              </dict>
+            </array>
+          </dict>
+        </array>
+      </dict>
       <dict>
         <key>name</key>
         <string>rs232_patch_box</string>
@@ -339,6 +660,14 @@
                 <key>default</key>
                 <true/>
               </dict>
+              <dict>
+                <key>value</key>
+                <string>h19</string>
+                <key>description</key>
+                <string>Heath H19 Terminal (Serial Port)</string>
+                <key>default</key>
+                <false/>
+              </dict>
               <dict>
                 <key>value</key>
                 <string>ie15</string>
@@ -355,11 +684,27 @@
                 <key>default</key>
                 <false/>
               </dict>
+              <dict>
+                <key>value</key>
+                <string>msystems_mouse</string>
+                <key>description</key>
+                <string>Mouse Systems Non-rotatable Mouse (HLE)</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>
@@ -371,19 +716,11 @@
                 <key>default</key>
                 <false/>
               </dict>
-              <dict>
-                <key>value</key>
-                <string>patch</string>
-                <key>description</key>
-                <string>RS-232 Patch Box</string>
-                <key>default</key>
-                <false/>
-              </dict>
               <dict>
                 <key>value</key>
                 <string>loopback</string>
                 <key>description</key>
-                <string>RS232 Loopback</string>
+                <string>RS-232 Loopback</string>
                 <key>default</key>
                 <false/>
               </dict>
@@ -391,7 +728,7 @@
                 <key>value</key>
                 <string>dec_loopback</string>
                 <key>description</key>
-                <string>RS232 Loopback (DEC 12-15336-00)</string>
+                <string>RS-232 Loopback (DEC 12-15336-00)</string>
                 <key>default</key>
                 <false/>
               </dict>
@@ -399,7 +736,7 @@
                 <key>value</key>
                 <string>null_modem</string>
                 <key>description</key>
-                <string>RS232 Null Modem</string>
+                <string>RS-232 Null Modem</string>
                 <key>default</key>
                 <false/>
                 <key>media</key>
@@ -408,11 +745,19 @@
                   <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>RS232 Synchronous I/O</string>
+                <string>RS-232 Synchronous I/O</string>
                 <key>default</key>
                 <false/>
                 <key>media</key>
@@ -469,6 +814,122 @@
                 <key>default</key>
                 <false/>
               </dict>
+              <dict>
+                <key>value</key>
+                <string>votraxtnt</string>
+                <key>description</key>
+                <string>Votrax Type 'N Talk (Serial Port)</string>
+                <key>default</key>
+                <false/>
+              </dict>
+            </array>
+          </dict>
+        </array>
+      </dict>
+      <dict>
+        <key>name</key>
+        <string>scorpion_ic</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>61203</string>
+                <key>description</key>
+                <string>Version 61203 (3rd Dec 1986)</string>
+              </dict>
+            </array>
+          </dict>
+        </array>
+      </dict>
+      <dict>
+        <key>name</key>
+        <string>serial_heath_h19</string>
+        <key>slots</key>
+        <array>
+          <dict>
+            <key>name</key>
+            <string>:tlbc</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>heath</string>
+                <key>description</key>
+                <string>Heath Terminal Logic Board</string>
+                <key>default</key>
+                <true/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>imaginator</string>
+                <key>description</key>
+                <string>Heath Terminal Logic Board plus Cleveland Codonics Imaginator I-100</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>gp19</string>
+                <key>description</key>
+                <string>Heath Terminal Logic Board plus Northwest Digital Systems GP-19</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>super19</string>
+                <key>description</key>
+                <string>Heath Terminal Logic Board w/Super19 ROM</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>superset</string>
+                <key>description</key>
+                <string>Heath Terminal Logic Board w/Superset ROM</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>ultrarom</string>
+                <key>description</key>
+                <string>Heath Terminal Logic Board w/Ultra ROM</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>watzman</string>
+                <key>description</key>
+                <string>Heath Terminal Logic Board w/Watzman ROM</string>
+                <key>default</key>
+                <false/>
+              </dict>
             </array>
           </dict>
         </array>
@@ -491,6 +952,14 @@
                 <key>default</key>
                 <true/>
               </dict>
+              <dict>
+                <key>value</key>
+                <string>type2hle</string>
+                <key>description</key>
+                <string>Sun Type 2 Keyboard (HLE)</string>
+                <key>default</key>
+                <false/>
+              </dict>
               <dict>
                 <key>value</key>
                 <string>type3hle</string>

Ample/Resources/agat7.plist

@@ -405,6 +405,39 @@
           </dict>
         </array>
       </dict>
+      <dict>
+        <key>name</key>
+        <string>gameio</string>
+        <key>description</key>
+        <string>Game I/O</string>
+        <key>options</key>
+        <array>
+          <dict>
+            <key>value</key>
+            <string></string>
+            <key>description</key>
+            <string>—None—</string>
+            <key>default</key>
+            <true/>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>joy</string>
+            <key>description</key>
+            <string>Apple II Analog Joysticks</string>
+            <key>devname</key>
+            <string>a2joy</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>paddles</string>
+            <key>description</key>
+            <string>Apple II Paddles</string>
+            <key>devname</key>
+            <string>a2pdls</string>
+          </dict>
+        </array>
+      </dict>
     </array>
     <key>devices</key>
     <array>
@@ -482,6 +515,22 @@
                 <key>default</key>
                 <false/>
               </dict>
+              <dict>
+                <key>value</key>
+                <string>fx80</string>
+                <key>description</key>
+                <string>Epson FX-80</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>jx80</string>
+                <key>description</key>
+                <string>Epson JX-80</string>
+                <key>default</key>
+                <false/>
+              </dict>
               <dict>
                 <key>value</key>
                 <string>lx800</string>
@@ -498,6 +547,22 @@
                 <key>default</key>
                 <false/>
               </dict>
+              <dict>
+                <key>value</key>
+                <string>rx80</string>
+                <key>description</key>
+                <string>Epson RX-80</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>pc6022</string>
+                <key>description</key>
+                <string>NEC PC-6022 Color Plotter Printer</string>
+                <key>default</key>
+                <false/>
+              </dict>
               <dict>
                 <key>value</key>
                 <string>p72</string>
@@ -506,6 +571,14 @@
                 <key>default</key>
                 <false/>
               </dict>
+              <dict>
+                <key>value</key>
+                <string>neomania</string>
+                <key>description</key>
+                <string>Neo Mania Adapter JAMMA board</string>
+                <key>default</key>
+                <false/>
+              </dict>
               <dict>
                 <key>value</key>
                 <string>samdac</string>
@@ -538,6 +611,195 @@
                 <key>default</key>
                 <false/>
               </dict>
+              <dict>
+                <key>value</key>
+                <string>adaptator</string>
+                <key>description</key>
+                <string>The Adaptator 2x DE-9 Multitap</string>
+                <key>default</key>
+                <false/>
+              </dict>
+            </array>
+          </dict>
+        </array>
+      </dict>
+      <dict>
+        <key>name</key>
+        <string>adaptator_multitap</string>
+        <key>slots</key>
+        <array>
+          <dict>
+            <key>name</key>
+            <string>:joy_p1</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>joy</string>
+                <key>description</key>
+                <string>Atari / CBM Digital joystick</string>
+                <key>default</key>
+                <true/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>wheel</string>
+                <key>description</key>
+                <string>Atari / CBM Driving Wheel</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>pad</string>
+                <key>description</key>
+                <string>Atari / CBM Dual paddles</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>keypad</string>
+                <key>description</key>
+                <string>Atari / CBM Keypad</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>lp</string>
+                <key>description</key>
+                <string>Atari / CBM Light Pen</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>mouse</string>
+                <key>description</key>
+                <string>Atari / CBM Mouse</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>trakball</string>
+                <key>description</key>
+                <string>Atari CX22/CX80 Trak-Ball</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>cx85</string>
+                <key>description</key>
+                <string>Atari CX85 Numeric Keypad</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>joybstr</string>
+                <key>description</key>
+                <string>CBS Electronics Booster-Grip Joystick Adaptor</string>
+                <key>default</key>
+                <false/>
+              </dict>
+            </array>
+          </dict>
+          <dict>
+            <key>name</key>
+            <string>:joy_p2</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>joy</string>
+                <key>description</key>
+                <string>Atari / CBM Digital joystick</string>
+                <key>default</key>
+                <true/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>wheel</string>
+                <key>description</key>
+                <string>Atari / CBM Driving Wheel</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>pad</string>
+                <key>description</key>
+                <string>Atari / CBM Dual paddles</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>keypad</string>
+                <key>description</key>
+                <string>Atari / CBM Keypad</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>lp</string>
+                <key>description</key>
+                <string>Atari / CBM Light Pen</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>mouse</string>
+                <key>description</key>
+                <string>Atari / CBM Mouse</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>trakball</string>
+                <key>description</key>
+                <string>Atari CX22/CX80 Trak-Ball</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>cx85</string>
+                <key>description</key>
+                <string>Atari CX85 Numeric Keypad</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>joybstr</string>
+                <key>description</key>
+                <string>CBS Electronics Booster-Grip Joystick Adaptor</string>
+                <key>default</key>
+                <false/>
+              </dict>
             </array>
           </dict>
         </array>

Ample/Resources/agat9.plist

@@ -460,6 +460,39 @@
           </dict>
         </array>
       </dict>
+      <dict>
+        <key>name</key>
+        <string>gameio</string>
+        <key>description</key>
+        <string>Game I/O</string>
+        <key>options</key>
+        <array>
+          <dict>
+            <key>value</key>
+            <string></string>
+            <key>description</key>
+            <string>—None—</string>
+            <key>default</key>
+            <true/>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>joy</string>
+            <key>description</key>
+            <string>Apple II Analog Joysticks</string>
+            <key>devname</key>
+            <string>a2joy</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>paddles</string>
+            <key>description</key>
+            <string>Apple II Paddles</string>
+            <key>devname</key>
+            <string>a2pdls</string>
+          </dict>
+        </array>
+      </dict>
     </array>
     <key>devices</key>
     <array>
@@ -600,6 +633,22 @@
                 <key>default</key>
                 <false/>
               </dict>
+              <dict>
+                <key>value</key>
+                <string>fx80</string>
+                <key>description</key>
+                <string>Epson FX-80</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>jx80</string>
+                <key>description</key>
+                <string>Epson JX-80</string>
+                <key>default</key>
+                <false/>
+              </dict>
               <dict>
                 <key>value</key>
                 <string>lx800</string>
@@ -616,6 +665,22 @@
                 <key>default</key>
                 <false/>
               </dict>
+              <dict>
+                <key>value</key>
+                <string>rx80</string>
+                <key>description</key>
+                <string>Epson RX-80</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>pc6022</string>
+                <key>description</key>
+                <string>NEC PC-6022 Color Plotter Printer</string>
+                <key>default</key>
+                <false/>
+              </dict>
               <dict>
                 <key>value</key>
                 <string>p72</string>
@@ -624,6 +689,14 @@
                 <key>default</key>
                 <false/>
               </dict>
+              <dict>
+                <key>value</key>
+                <string>neomania</string>
+                <key>description</key>
+                <string>Neo Mania Adapter JAMMA board</string>
+                <key>default</key>
+                <false/>
+              </dict>
               <dict>
                 <key>value</key>
                 <string>samdac</string>
@@ -656,6 +729,195 @@
                 <key>default</key>
                 <false/>
               </dict>
+              <dict>
+                <key>value</key>
+                <string>adaptator</string>
+                <key>description</key>
+                <string>The Adaptator 2x DE-9 Multitap</string>
+                <key>default</key>
+                <false/>
+              </dict>
+            </array>
+          </dict>
+        </array>
+      </dict>
+      <dict>
+        <key>name</key>
+        <string>adaptator_multitap</string>
+        <key>slots</key>
+        <array>
+          <dict>
+            <key>name</key>
+            <string>:joy_p1</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>joy</string>
+                <key>description</key>
+                <string>Atari / CBM Digital joystick</string>
+                <key>default</key>
+                <true/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>wheel</string>
+                <key>description</key>
+                <string>Atari / CBM Driving Wheel</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>pad</string>
+                <key>description</key>
+                <string>Atari / CBM Dual paddles</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>keypad</string>
+                <key>description</key>
+                <string>Atari / CBM Keypad</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>lp</string>
+                <key>description</key>
+                <string>Atari / CBM Light Pen</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>mouse</string>
+                <key>description</key>
+                <string>Atari / CBM Mouse</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>trakball</string>
+                <key>description</key>
+                <string>Atari CX22/CX80 Trak-Ball</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>cx85</string>
+                <key>description</key>
+                <string>Atari CX85 Numeric Keypad</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>joybstr</string>
+                <key>description</key>
+                <string>CBS Electronics Booster-Grip Joystick Adaptor</string>
+                <key>default</key>
+                <false/>
+              </dict>
+            </array>
+          </dict>
+          <dict>
+            <key>name</key>
+            <string>:joy_p2</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>joy</string>
+                <key>description</key>
+                <string>Atari / CBM Digital joystick</string>
+                <key>default</key>
+                <true/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>wheel</string>
+                <key>description</key>
+                <string>Atari / CBM Driving Wheel</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>pad</string>
+                <key>description</key>
+                <string>Atari / CBM Dual paddles</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>keypad</string>
+                <key>description</key>
+                <string>Atari / CBM Keypad</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>lp</string>
+                <key>description</key>
+                <string>Atari / CBM Light Pen</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>mouse</string>
+                <key>description</key>
+                <string>Atari / CBM Mouse</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>trakball</string>
+                <key>description</key>
+                <string>Atari CX22/CX80 Trak-Ball</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>cx85</string>
+                <key>description</key>
+                <string>Atari CX85 Numeric Keypad</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>joybstr</string>
+                <key>description</key>
+                <string>CBS Electronics Booster-Grip Joystick Adaptor</string>
+                <key>default</key>
+                <false/>
+              </dict>
             </array>
           </dict>
         </array>

Ample/Resources/apple1.plist

@@ -325,6 +325,60 @@
           </dict>
         </array>
       </dict>
+      <dict>
+        <key>name</key>
+        <string>px320a</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>v106</string>
+                <key>description</key>
+                <string>Firmware v1.06</string>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>v105</string>
+                <key>description</key>
+                <string>Firmware v1.05</string>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>v104</string>
+                <key>description</key>
+                <string>Firmware v1.04a</string>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>v103</string>
+                <key>description</key>
+                <string>Firmware v1.03</string>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>v102</string>
+                <key>description</key>
+                <string>Firmware v1.02</string>
+              </dict>
+            </array>
+          </dict>
+        </array>
+      </dict>
     </array>
     <key>software</key>
     <array>

Ample/Resources/apple2c.plist

@@ -85,27 +85,6 @@
             <key>devname</key>
             <string>a2pdls</string>
           </dict>
-          <dict>
-            <key>value</key>
-            <string>compeyes</string>
-            <key>description</key>
-            <string>Digital Vision ComputerEyes</string>
-            <key>devname</key>
-            <string>a2ceyes</string>
-            <key>media</key>
-            <dict>
-              <key>picture</key>
-              <integer>1</integer>
-            </dict>
-          </dict>
-          <dict>
-            <key>value</key>
-            <string>gizmo</string>
-            <key>description</key>
-            <string>HAL Labs Gizmo</string>
-            <key>devname</key>
-            <string>a2gizmo</string>
-          </dict>
         </array>
       </dict>
       <dict>
@@ -123,6 +102,14 @@
             <key>default</key>
             <true/>
           </dict>
+          <dict>
+            <key>value</key>
+            <string>h19</string>
+            <key>description</key>
+            <string>Heath H19 Terminal (Serial Port)</string>
+            <key>devname</key>
+            <string>serial_heath_h19</string>
+          </dict>
           <dict>
             <key>value</key>
             <string>ie15</string>
@@ -139,6 +126,22 @@
             <key>devname</key>
             <string>scorpion_ic</string>
           </dict>
+          <dict>
+            <key>value</key>
+            <string>msystems_mouse</string>
+            <key>description</key>
+            <string>Mouse Systems Non-rotatable Mouse (HLE)</string>
+            <key>devname</key>
+            <string>rs232_mouse_hle_msystems</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>
@@ -155,19 +158,11 @@
             <key>devname</key>
             <string>rs_serial_printer</string>
           </dict>
-          <dict>
-            <key>value</key>
-            <string>patch</string>
-            <key>description</key>
-            <string>RS-232 Patch Box</string>
-            <key>devname</key>
-            <string>rs232_patch_box</string>
-          </dict>
           <dict>
             <key>value</key>
             <string>loopback</string>
             <key>description</key>
-            <string>RS232 Loopback</string>
+            <string>RS-232 Loopback</string>
             <key>devname</key>
             <string>rs232_loopback</string>
           </dict>
@@ -175,7 +170,7 @@
             <key>value</key>
             <string>dec_loopback</string>
             <key>description</key>
-            <string>RS232 Loopback (DEC 12-15336-00)</string>
+            <string>RS-232 Loopback (DEC 12-15336-00)</string>
             <key>devname</key>
             <string>dec_rs232_loopback</string>
           </dict>
@@ -183,7 +178,7 @@
             <key>value</key>
             <string>null_modem</string>
             <key>description</key>
-            <string>RS232 Null Modem</string>
+            <string>RS-232 Null Modem</string>
             <key>devname</key>
             <string>null_modem</string>
             <key>media</key>
@@ -192,11 +187,19 @@
               <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>RS232 Synchronous I/O</string>
+            <string>RS-232 Synchronous I/O</string>
             <key>devname</key>
             <string>rs232_sync_io</string>
             <key>media</key>
@@ -253,6 +256,14 @@
             <key>devname</key>
             <string>swtpc8212_terminal</string>
           </dict>
+          <dict>
+            <key>value</key>
+            <string>votraxtnt</string>
+            <key>description</key>
+            <string>Votrax Type 'N Talk (Serial Port)</string>
+            <key>devname</key>
+            <string>serial_votraxtnt</string>
+          </dict>
         </array>
       </dict>
       <dict>
@@ -270,6 +281,14 @@
             <key>default</key>
             <true/>
           </dict>
+          <dict>
+            <key>value</key>
+            <string>h19</string>
+            <key>description</key>
+            <string>Heath H19 Terminal (Serial Port)</string>
+            <key>devname</key>
+            <string>serial_heath_h19</string>
+          </dict>
           <dict>
             <key>value</key>
             <string>ie15</string>
@@ -286,6 +305,22 @@
             <key>devname</key>
             <string>scorpion_ic</string>
           </dict>
+          <dict>
+            <key>value</key>
+            <string>msystems_mouse</string>
+            <key>description</key>
+            <string>Mouse Systems Non-rotatable Mouse (HLE)</string>
+            <key>devname</key>
+            <string>rs232_mouse_hle_msystems</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>
@@ -302,19 +337,11 @@
             <key>devname</key>
             <string>rs_serial_printer</string>
           </dict>
-          <dict>
-            <key>value</key>
-            <string>patch</string>
-            <key>description</key>
-            <string>RS-232 Patch Box</string>
-            <key>devname</key>
-            <string>rs232_patch_box</string>
-          </dict>
           <dict>
             <key>value</key>
             <string>loopback</string>
             <key>description</key>
-            <string>RS232 Loopback</string>
+            <string>RS-232 Loopback</string>
             <key>devname</key>
             <string>rs232_loopback</string>
           </dict>
@@ -322,7 +349,7 @@
             <key>value</key>
             <string>dec_loopback</string>
             <key>description</key>
-            <string>RS232 Loopback (DEC 12-15336-00)</string>
+            <string>RS-232 Loopback (DEC 12-15336-00)</string>
             <key>devname</key>
             <string>dec_rs232_loopback</string>
           </dict>
@@ -330,7 +357,7 @@
             <key>value</key>
             <string>null_modem</string>
             <key>description</key>
-            <string>RS232 Null Modem</string>
+            <string>RS-232 Null Modem</string>
             <key>devname</key>
             <string>null_modem</string>
             <key>media</key>
@@ -339,11 +366,19 @@
               <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>RS232 Synchronous I/O</string>
+            <string>RS-232 Synchronous I/O</string>
             <key>devname</key>
             <string>rs232_sync_io</string>
             <key>media</key>
@@ -400,6 +435,14 @@
             <key>devname</key>
             <string>swtpc8212_terminal</string>
           </dict>
+          <dict>
+            <key>value</key>
+            <string>votraxtnt</string>
+            <key>description</key>
+            <string>Votrax Type 'N Talk (Serial Port)</string>
+            <key>devname</key>
+            <string>serial_votraxtnt</string>
+          </dict>
         </array>
       </dict>
     </array>
@@ -468,6 +511,114 @@
           </dict>
         </array>
       </dict>
+      <dict>
+        <key>name</key>
+        <string>heath_imaginator_tlb</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>rev12</string>
+                <key>description</key>
+                <string>GPC Rev. 1.2 P/N 9000-0002</string>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>unknown</string>
+                <key>description</key>
+                <string>GPC Unknown revision</string>
+              </dict>
+            </array>
+          </dict>
+        </array>
+      </dict>
+      <dict>
+        <key>name</key>
+        <string>heath_watz_tlb</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>watzman</string>
+                <key>description</key>
+                <string>Watzman</string>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>watzman-a</string>
+                <key>description</key>
+                <string>Watzman w/clock persists after reset</string>
+              </dict>
+            </array>
+          </dict>
+        </array>
+      </dict>
+      <dict>
+        <key>name</key>
+        <string>nss_tvinterface</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>de</string>
+                <key>description</key>
+                <string>German</string>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>fr</string>
+                <key>description</key>
+                <string>French</string>
+              </dict>
+            </array>
+          </dict>
+        </array>
+      </dict>
       <dict>
         <key>name</key>
         <string>rs232_patch_box</string>
@@ -486,6 +637,14 @@
                 <key>default</key>
                 <true/>
               </dict>
+              <dict>
+                <key>value</key>
+                <string>h19</string>
+                <key>description</key>
+                <string>Heath H19 Terminal (Serial Port)</string>
+                <key>default</key>
+                <false/>
+              </dict>
               <dict>
                 <key>value</key>
                 <string>ie15</string>
@@ -502,11 +661,27 @@
                 <key>default</key>
                 <false/>
               </dict>
+              <dict>
+                <key>value</key>
+                <string>msystems_mouse</string>
+                <key>description</key>
+                <string>Mouse Systems Non-rotatable Mouse (HLE)</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>
@@ -518,19 +693,11 @@
                 <key>default</key>
                 <false/>
               </dict>
-              <dict>
-                <key>value</key>
-                <string>patch</string>
-                <key>description</key>
-                <string>RS-232 Patch Box</string>
-                <key>default</key>
-                <false/>
-              </dict>
               <dict>
                 <key>value</key>
                 <string>loopback</string>
                 <key>description</key>
-                <string>RS232 Loopback</string>
+                <string>RS-232 Loopback</string>
                 <key>default</key>
                 <false/>
               </dict>
@@ -538,7 +705,7 @@
                 <key>value</key>
                 <string>dec_loopback</string>
                 <key>description</key>
-                <string>RS232 Loopback (DEC 12-15336-00)</string>
+                <string>RS-232 Loopback (DEC 12-15336-00)</string>
                 <key>default</key>
                 <false/>
               </dict>
@@ -546,7 +713,7 @@
                 <key>value</key>
                 <string>null_modem</string>
                 <key>description</key>
-                <string>RS232 Null Modem</string>
+                <string>RS-232 Null Modem</string>
                 <key>default</key>
                 <false/>
                 <key>media</key>
@@ -555,11 +722,19 @@
                   <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>RS232 Synchronous I/O</string>
+                <string>RS-232 Synchronous I/O</string>
                 <key>default</key>
                 <false/>
                 <key>media</key>
@@ -616,6 +791,122 @@
                 <key>default</key>
                 <false/>
               </dict>
+              <dict>
+                <key>value</key>
+                <string>votraxtnt</string>
+                <key>description</key>
+                <string>Votrax Type 'N Talk (Serial Port)</string>
+                <key>default</key>
+                <false/>
+              </dict>
+            </array>
+          </dict>
+        </array>
+      </dict>
+      <dict>
+        <key>name</key>
+        <string>scorpion_ic</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>61203</string>
+                <key>description</key>
+                <string>Version 61203 (3rd Dec 1986)</string>
+              </dict>
+            </array>
+          </dict>
+        </array>
+      </dict>
+      <dict>
+        <key>name</key>
+        <string>serial_heath_h19</string>
+        <key>slots</key>
+        <array>
+          <dict>
+            <key>name</key>
+            <string>:tlbc</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>heath</string>
+                <key>description</key>
+                <string>Heath Terminal Logic Board</string>
+                <key>default</key>
+                <true/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>imaginator</string>
+                <key>description</key>
+                <string>Heath Terminal Logic Board plus Cleveland Codonics Imaginator I-100</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>gp19</string>
+                <key>description</key>
+                <string>Heath Terminal Logic Board plus Northwest Digital Systems GP-19</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>super19</string>
+                <key>description</key>
+                <string>Heath Terminal Logic Board w/Super19 ROM</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>superset</string>
+                <key>description</key>
+                <string>Heath Terminal Logic Board w/Superset ROM</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>ultrarom</string>
+                <key>description</key>
+                <string>Heath Terminal Logic Board w/Ultra ROM</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>watzman</string>
+                <key>description</key>
+                <string>Heath Terminal Logic Board w/Watzman ROM</string>
+                <key>default</key>
+                <false/>
+              </dict>
             </array>
           </dict>
         </array>
@@ -638,6 +929,14 @@
                 <key>default</key>
                 <true/>
               </dict>
+              <dict>
+                <key>value</key>
+                <string>type2hle</string>
+                <key>description</key>
+                <string>Sun Type 2 Keyboard (HLE)</string>
+                <key>default</key>
+                <false/>
+              </dict>
               <dict>
                 <key>value</key>
                 <string>type3hle</string>

Ample/Resources/apple2cp.plist

@@ -125,27 +125,6 @@
             <key>devname</key>
             <string>a2pdls</string>
           </dict>
-          <dict>
-            <key>value</key>
-            <string>compeyes</string>
-            <key>description</key>
-            <string>Digital Vision ComputerEyes</string>
-            <key>devname</key>
-            <string>a2ceyes</string>
-            <key>media</key>
-            <dict>
-              <key>picture</key>
-              <integer>1</integer>
-            </dict>
-          </dict>
-          <dict>
-            <key>value</key>
-            <string>gizmo</string>
-            <key>description</key>
-            <string>HAL Labs Gizmo</string>
-            <key>devname</key>
-            <string>a2gizmo</string>
-          </dict>
         </array>
       </dict>
       <dict>
@@ -163,6 +142,14 @@
             <key>default</key>
             <true/>
           </dict>
+          <dict>
+            <key>value</key>
+            <string>h19</string>
+            <key>description</key>
+            <string>Heath H19 Terminal (Serial Port)</string>
+            <key>devname</key>
+            <string>serial_heath_h19</string>
+          </dict>
           <dict>
             <key>value</key>
             <string>ie15</string>
@@ -179,6 +166,22 @@
             <key>devname</key>
             <string>scorpion_ic</string>
           </dict>
+          <dict>
+            <key>value</key>
+            <string>msystems_mouse</string>
+            <key>description</key>
+            <string>Mouse Systems Non-rotatable Mouse (HLE)</string>
+            <key>devname</key>
+            <string>rs232_mouse_hle_msystems</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>
@@ -195,19 +198,11 @@
             <key>devname</key>
             <string>rs_serial_printer</string>
           </dict>
-          <dict>
-            <key>value</key>
-            <string>patch</string>
-            <key>description</key>
-            <string>RS-232 Patch Box</string>
-            <key>devname</key>
-            <string>rs232_patch_box</string>
-          </dict>
           <dict>
             <key>value</key>
             <string>loopback</string>
             <key>description</key>
-            <string>RS232 Loopback</string>
+            <string>RS-232 Loopback</string>
             <key>devname</key>
             <string>rs232_loopback</string>
           </dict>
@@ -215,7 +210,7 @@
             <key>value</key>
             <string>dec_loopback</string>
             <key>description</key>
-            <string>RS232 Loopback (DEC 12-15336-00)</string>
+            <string>RS-232 Loopback (DEC 12-15336-00)</string>
             <key>devname</key>
             <string>dec_rs232_loopback</string>
           </dict>
@@ -223,7 +218,7 @@
             <key>value</key>
             <string>null_modem</string>
             <key>description</key>
-            <string>RS232 Null Modem</string>
+            <string>RS-232 Null Modem</string>
             <key>devname</key>
             <string>null_modem</string>
             <key>media</key>
@@ -232,11 +227,19 @@
               <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>RS232 Synchronous I/O</string>
+            <string>RS-232 Synchronous I/O</string>
             <key>devname</key>
             <string>rs232_sync_io</string>
             <key>media</key>
@@ -293,6 +296,14 @@
             <key>devname</key>
             <string>swtpc8212_terminal</string>
           </dict>
+          <dict>
+            <key>value</key>
+            <string>votraxtnt</string>
+            <key>description</key>
+            <string>Votrax Type 'N Talk (Serial Port)</string>
+            <key>devname</key>
+            <string>serial_votraxtnt</string>
+          </dict>
         </array>
       </dict>
       <dict>
@@ -310,6 +321,14 @@
             <key>default</key>
             <true/>
           </dict>
+          <dict>
+            <key>value</key>
+            <string>h19</string>
+            <key>description</key>
+            <string>Heath H19 Terminal (Serial Port)</string>
+            <key>devname</key>
+            <string>serial_heath_h19</string>
+          </dict>
           <dict>
             <key>value</key>
             <string>ie15</string>
@@ -326,6 +345,22 @@
             <key>devname</key>
             <string>scorpion_ic</string>
           </dict>
+          <dict>
+            <key>value</key>
+            <string>msystems_mouse</string>
+            <key>description</key>
+            <string>Mouse Systems Non-rotatable Mouse (HLE)</string>
+            <key>devname</key>
+            <string>rs232_mouse_hle_msystems</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>
@@ -342,19 +377,11 @@
             <key>devname</key>
             <string>rs_serial_printer</string>
           </dict>
-          <dict>
-            <key>value</key>
-            <string>patch</string>
-            <key>description</key>
-            <string>RS-232 Patch Box</string>
-            <key>devname</key>
-            <string>rs232_patch_box</string>
-          </dict>
           <dict>
             <key>value</key>
             <string>loopback</string>
             <key>description</key>
-            <string>RS232 Loopback</string>
+            <string>RS-232 Loopback</string>
             <key>devname</key>
             <string>rs232_loopback</string>
           </dict>
@@ -362,7 +389,7 @@
             <key>value</key>
             <string>dec_loopback</string>
             <key>description</key>
-            <string>RS232 Loopback (DEC 12-15336-00)</string>
+            <string>RS-232 Loopback (DEC 12-15336-00)</string>
             <key>devname</key>
             <string>dec_rs232_loopback</string>
           </dict>
@@ -370,7 +397,7 @@
             <key>value</key>
             <string>null_modem</string>
             <key>description</key>
-            <string>RS232 Null Modem</string>
+            <string>RS-232 Null Modem</string>
             <key>devname</key>
             <string>null_modem</string>
             <key>media</key>
@@ -379,11 +406,19 @@
               <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>RS232 Synchronous I/O</string>
+            <string>RS-232 Synchronous I/O</string>
             <key>devname</key>
             <string>rs232_sync_io</string>
             <key>media</key>
@@ -440,6 +475,14 @@
             <key>devname</key>
             <string>swtpc8212_terminal</string>
           </dict>
+          <dict>
+            <key>value</key>
+            <string>votraxtnt</string>
+            <key>description</key>
+            <string>Votrax Type 'N Talk (Serial Port)</string>
+            <key>devname</key>
+            <string>serial_votraxtnt</string>
+          </dict>
         </array>
       </dict>
     </array>
@@ -616,6 +659,114 @@
           </dict>
         </array>
       </dict>
+      <dict>
+        <key>name</key>
+        <string>heath_imaginator_tlb</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>rev12</string>
+                <key>description</key>
+                <string>GPC Rev. 1.2 P/N 9000-0002</string>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>unknown</string>
+                <key>description</key>
+                <string>GPC Unknown revision</string>
+              </dict>
+            </array>
+          </dict>
+        </array>
+      </dict>
+      <dict>
+        <key>name</key>
+        <string>heath_watz_tlb</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>watzman</string>
+                <key>description</key>
+                <string>Watzman</string>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>watzman-a</string>
+                <key>description</key>
+                <string>Watzman w/clock persists after reset</string>
+              </dict>
+            </array>
+          </dict>
+        </array>
+      </dict>
+      <dict>
+        <key>name</key>
+        <string>nss_tvinterface</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>de</string>
+                <key>description</key>
+                <string>German</string>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>fr</string>
+                <key>description</key>
+                <string>French</string>
+              </dict>
+            </array>
+          </dict>
+        </array>
+      </dict>
       <dict>
         <key>name</key>
         <string>rs232_patch_box</string>
@@ -634,6 +785,14 @@
                 <key>default</key>
                 <true/>
               </dict>
+              <dict>
+                <key>value</key>
+                <string>h19</string>
+                <key>description</key>
+                <string>Heath H19 Terminal (Serial Port)</string>
+                <key>default</key>
+                <false/>
+              </dict>
               <dict>
                 <key>value</key>
                 <string>ie15</string>
@@ -650,11 +809,27 @@
                 <key>default</key>
                 <false/>
               </dict>
+              <dict>
+                <key>value</key>
+                <string>msystems_mouse</string>
+                <key>description</key>
+                <string>Mouse Systems Non-rotatable Mouse (HLE)</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>
@@ -666,19 +841,11 @@
                 <key>default</key>
                 <false/>
               </dict>
-              <dict>
-                <key>value</key>
-                <string>patch</string>
-                <key>description</key>
-                <string>RS-232 Patch Box</string>
-                <key>default</key>
-                <false/>
-              </dict>
               <dict>
                 <key>value</key>
                 <string>loopback</string>
                 <key>description</key>
-                <string>RS232 Loopback</string>
+                <string>RS-232 Loopback</string>
                 <key>default</key>
                 <false/>
               </dict>
@@ -686,7 +853,7 @@
                 <key>value</key>
                 <string>dec_loopback</string>
                 <key>description</key>
-                <string>RS232 Loopback (DEC 12-15336-00)</string>
+                <string>RS-232 Loopback (DEC 12-15336-00)</string>
                 <key>default</key>
                 <false/>
               </dict>
@@ -694,7 +861,7 @@
                 <key>value</key>
                 <string>null_modem</string>
                 <key>description</key>
-                <string>RS232 Null Modem</string>
+                <string>RS-232 Null Modem</string>
                 <key>default</key>
                 <false/>
                 <key>media</key>
@@ -703,11 +870,19 @@
                   <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>RS232 Synchronous I/O</string>
+                <string>RS-232 Synchronous I/O</string>
                 <key>default</key>
                 <false/>
                 <key>media</key>
@@ -764,6 +939,122 @@
                 <key>default</key>
                 <false/>
               </dict>
+              <dict>
+                <key>value</key>
+                <string>votraxtnt</string>
+                <key>description</key>
+                <string>Votrax Type 'N Talk (Serial Port)</string>
+                <key>default</key>
+                <false/>
+              </dict>
+            </array>
+          </dict>
+        </array>
+      </dict>
+      <dict>
+        <key>name</key>
+        <string>scorpion_ic</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>61203</string>
+                <key>description</key>
+                <string>Version 61203 (3rd Dec 1986)</string>
+              </dict>
+            </array>
+          </dict>
+        </array>
+      </dict>
+      <dict>
+        <key>name</key>
+        <string>serial_heath_h19</string>
+        <key>slots</key>
+        <array>
+          <dict>
+            <key>name</key>
+            <string>:tlbc</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>heath</string>
+                <key>description</key>
+                <string>Heath Terminal Logic Board</string>
+                <key>default</key>
+                <true/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>imaginator</string>
+                <key>description</key>
+                <string>Heath Terminal Logic Board plus Cleveland Codonics Imaginator I-100</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>gp19</string>
+                <key>description</key>
+                <string>Heath Terminal Logic Board plus Northwest Digital Systems GP-19</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>super19</string>
+                <key>description</key>
+                <string>Heath Terminal Logic Board w/Super19 ROM</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>superset</string>
+                <key>description</key>
+                <string>Heath Terminal Logic Board w/Superset ROM</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>ultrarom</string>
+                <key>description</key>
+                <string>Heath Terminal Logic Board w/Ultra ROM</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>watzman</string>
+                <key>description</key>
+                <string>Heath Terminal Logic Board w/Watzman ROM</string>
+                <key>default</key>
+                <false/>
+              </dict>
             </array>
           </dict>
         </array>
@@ -786,6 +1077,14 @@
                 <key>default</key>
                 <true/>
               </dict>
+              <dict>
+                <key>value</key>
+                <string>type2hle</string>
+                <key>description</key>
+                <string>Sun Type 2 Keyboard (HLE)</string>
+                <key>default</key>
+                <false/>
+              </dict>
               <dict>
                 <key>value</key>
                 <string>type3hle</string>

Ample/Resources/bbca.plist

@@ -66,25 +66,25 @@
           </dict>
           <dict>
             <key>value</key>
-            <string>os12</string>
+            <string>120</string>
             <key>description</key>
             <string>OS 1.20</string>
           </dict>
           <dict>
             <key>value</key>
-            <string>os10</string>
+            <string>100</string>
             <key>description</key>
             <string>OS 1.00</string>
           </dict>
           <dict>
             <key>value</key>
-            <string>os09</string>
+            <string>092</string>
             <key>description</key>
             <string>OS 0.92</string>
           </dict>
           <dict>
             <key>value</key>
-            <string>os01</string>
+            <string>010</string>
             <key>description</key>
             <string>OS 0.10</string>
           </dict>
@@ -105,6 +105,14 @@
             <key>default</key>
             <true/>
           </dict>
+          <dict>
+            <key>value</key>
+            <string>h19</string>
+            <key>description</key>
+            <string>Heath H19 Terminal (Serial Port)</string>
+            <key>devname</key>
+            <string>serial_heath_h19</string>
+          </dict>
           <dict>
             <key>value</key>
             <string>ie15</string>
@@ -113,11 +121,35 @@
             <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>msystems_mouse</string>
+            <key>description</key>
+            <string>Mouse Systems Non-rotatable Mouse (HLE)</string>
+            <key>devname</key>
+            <string>rs232_mouse_hle_msystems</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>
@@ -129,19 +161,11 @@
             <key>devname</key>
             <string>rs_serial_printer</string>
           </dict>
-          <dict>
-            <key>value</key>
-            <string>patch</string>
-            <key>description</key>
-            <string>RS-232 Patch Box</string>
-            <key>devname</key>
-            <string>rs232_patch_box</string>
-          </dict>
           <dict>
             <key>value</key>
             <string>loopback</string>
             <key>description</key>
-            <string>RS232 Loopback</string>
+            <string>RS-232 Loopback</string>
             <key>devname</key>
             <string>rs232_loopback</string>
           </dict>
@@ -149,7 +173,7 @@
             <key>value</key>
             <string>dec_loopback</string>
             <key>description</key>
-            <string>RS232 Loopback (DEC 12-15336-00)</string>
+            <string>RS-232 Loopback (DEC 12-15336-00)</string>
             <key>devname</key>
             <string>dec_rs232_loopback</string>
           </dict>
@@ -157,7 +181,7 @@
             <key>value</key>
             <string>null_modem</string>
             <key>description</key>
-            <string>RS232 Null Modem</string>
+            <string>RS-232 Null Modem</string>
             <key>devname</key>
             <string>null_modem</string>
             <key>media</key>
@@ -166,11 +190,19 @@
               <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>RS232 Synchronous I/O</string>
+            <string>RS-232 Synchronous I/O</string>
             <key>devname</key>
             <string>rs232_sync_io</string>
             <key>media</key>
@@ -227,11 +259,127 @@
             <key>devname</key>
             <string>swtpc8212_terminal</string>
           </dict>
+          <dict>
+            <key>value</key>
+            <string>votraxtnt</string>
+            <key>description</key>
+            <string>Votrax Type 'N Talk (Serial Port)</string>
+            <key>devname</key>
+            <string>serial_votraxtnt</string>
+          </dict>
         </array>
       </dict>
     </array>
     <key>devices</key>
     <array>
+      <dict>
+        <key>name</key>
+        <string>heath_imaginator_tlb</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>rev12</string>
+                <key>description</key>
+                <string>GPC Rev. 1.2 P/N 9000-0002</string>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>unknown</string>
+                <key>description</key>
+                <string>GPC Unknown revision</string>
+              </dict>
+            </array>
+          </dict>
+        </array>
+      </dict>
+      <dict>
+        <key>name</key>
+        <string>heath_watz_tlb</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>watzman</string>
+                <key>description</key>
+                <string>Watzman</string>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>watzman-a</string>
+                <key>description</key>
+                <string>Watzman w/clock persists after reset</string>
+              </dict>
+            </array>
+          </dict>
+        </array>
+      </dict>
+      <dict>
+        <key>name</key>
+        <string>nss_tvinterface</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>de</string>
+                <key>description</key>
+                <string>German</string>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>fr</string>
+                <key>description</key>
+                <string>French</string>
+              </dict>
+            </array>
+          </dict>
+        </array>
+      </dict>
       <dict>
         <key>name</key>
         <string>rs232_patch_box</string>
@@ -250,6 +398,14 @@
                 <key>default</key>
                 <true/>
               </dict>
+              <dict>
+                <key>value</key>
+                <string>h19</string>
+                <key>description</key>
+                <string>Heath H19 Terminal (Serial Port)</string>
+                <key>default</key>
+                <false/>
+              </dict>
               <dict>
                 <key>value</key>
                 <string>ie15</string>
@@ -258,11 +414,35 @@
                 <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>msystems_mouse</string>
+                <key>description</key>
+                <string>Mouse Systems Non-rotatable Mouse (HLE)</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>
@@ -274,19 +454,11 @@
                 <key>default</key>
                 <false/>
               </dict>
-              <dict>
-                <key>value</key>
-                <string>patch</string>
-                <key>description</key>
-                <string>RS-232 Patch Box</string>
-                <key>default</key>
-                <false/>
-              </dict>
               <dict>
                 <key>value</key>
                 <string>loopback</string>
                 <key>description</key>
-                <string>RS232 Loopback</string>
+                <string>RS-232 Loopback</string>
                 <key>default</key>
                 <false/>
               </dict>
@@ -294,7 +466,7 @@
                 <key>value</key>
                 <string>dec_loopback</string>
                 <key>description</key>
-                <string>RS232 Loopback (DEC 12-15336-00)</string>
+                <string>RS-232 Loopback (DEC 12-15336-00)</string>
                 <key>default</key>
                 <false/>
               </dict>
@@ -302,7 +474,7 @@
                 <key>value</key>
                 <string>null_modem</string>
                 <key>description</key>
-                <string>RS232 Null Modem</string>
+                <string>RS-232 Null Modem</string>
                 <key>default</key>
                 <false/>
                 <key>media</key>
@@ -311,11 +483,19 @@
                   <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>RS232 Synchronous I/O</string>
+                <string>RS-232 Synchronous I/O</string>
                 <key>default</key>
                 <false/>
                 <key>media</key>
@@ -372,6 +552,122 @@
                 <key>default</key>
                 <false/>
               </dict>
+              <dict>
+                <key>value</key>
+                <string>votraxtnt</string>
+                <key>description</key>
+                <string>Votrax Type 'N Talk (Serial Port)</string>
+                <key>default</key>
+                <false/>
+              </dict>
+            </array>
+          </dict>
+        </array>
+      </dict>
+      <dict>
+        <key>name</key>
+        <string>scorpion_ic</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>61203</string>
+                <key>description</key>
+                <string>Version 61203 (3rd Dec 1986)</string>
+              </dict>
+            </array>
+          </dict>
+        </array>
+      </dict>
+      <dict>
+        <key>name</key>
+        <string>serial_heath_h19</string>
+        <key>slots</key>
+        <array>
+          <dict>
+            <key>name</key>
+            <string>:tlbc</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>heath</string>
+                <key>description</key>
+                <string>Heath Terminal Logic Board</string>
+                <key>default</key>
+                <true/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>imaginator</string>
+                <key>description</key>
+                <string>Heath Terminal Logic Board plus Cleveland Codonics Imaginator I-100</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>gp19</string>
+                <key>description</key>
+                <string>Heath Terminal Logic Board plus Northwest Digital Systems GP-19</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>super19</string>
+                <key>description</key>
+                <string>Heath Terminal Logic Board w/Super19 ROM</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>superset</string>
+                <key>description</key>
+                <string>Heath Terminal Logic Board w/Superset ROM</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>ultrarom</string>
+                <key>description</key>
+                <string>Heath Terminal Logic Board w/Ultra ROM</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>watzman</string>
+                <key>description</key>
+                <string>Heath Terminal Logic Board w/Watzman ROM</string>
+                <key>default</key>
+                <false/>
+              </dict>
             </array>
           </dict>
         </array>
@@ -394,6 +690,14 @@
                 <key>default</key>
                 <true/>
               </dict>
+              <dict>
+                <key>value</key>
+                <string>type2hle</string>
+                <key>description</key>
+                <string>Sun Type 2 Keyboard (HLE)</string>
+                <key>default</key>
+                <false/>
+              </dict>
               <dict>
                 <key>value</key>
                 <string>type3hle</string>

Ample/Resources/ds2100.plist

@@ -50,6 +50,14 @@
             <key>default</key>
             <true/>
           </dict>
+          <dict>
+            <key>value</key>
+            <string>h19</string>
+            <key>description</key>
+            <string>Heath H19 Terminal (Serial Port)</string>
+            <key>devname</key>
+            <string>serial_heath_h19</string>
+          </dict>
           <dict>
             <key>value</key>
             <string>ie15</string>
@@ -58,11 +66,35 @@
             <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>msystems_mouse</string>
+            <key>description</key>
+            <string>Mouse Systems Non-rotatable Mouse (HLE)</string>
+            <key>devname</key>
+            <string>rs232_mouse_hle_msystems</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>
@@ -74,19 +106,11 @@
             <key>devname</key>
             <string>rs_serial_printer</string>
           </dict>
-          <dict>
-            <key>value</key>
-            <string>patch</string>
-            <key>description</key>
-            <string>RS-232 Patch Box</string>
-            <key>devname</key>
-            <string>rs232_patch_box</string>
-          </dict>
           <dict>
             <key>value</key>
             <string>loopback</string>
             <key>description</key>
-            <string>RS232 Loopback</string>
+            <string>RS-232 Loopback</string>
             <key>devname</key>
             <string>rs232_loopback</string>
           </dict>
@@ -94,7 +118,7 @@
             <key>value</key>
             <string>dec_loopback</string>
             <key>description</key>
-            <string>RS232 Loopback (DEC 12-15336-00)</string>
+            <string>RS-232 Loopback (DEC 12-15336-00)</string>
             <key>devname</key>
             <string>dec_rs232_loopback</string>
           </dict>
@@ -102,7 +126,7 @@
             <key>value</key>
             <string>null_modem</string>
             <key>description</key>
-            <string>RS232 Null Modem</string>
+            <string>RS-232 Null Modem</string>
             <key>devname</key>
             <string>null_modem</string>
             <key>media</key>
@@ -111,11 +135,19 @@
               <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>RS232 Synchronous I/O</string>
+            <string>RS-232 Synchronous I/O</string>
             <key>devname</key>
             <string>rs232_sync_io</string>
             <key>media</key>
@@ -172,6 +204,14 @@
             <key>devname</key>
             <string>swtpc8212_terminal</string>
           </dict>
+          <dict>
+            <key>value</key>
+            <string>votraxtnt</string>
+            <key>description</key>
+            <string>Votrax Type 'N Talk (Serial Port)</string>
+            <key>devname</key>
+            <string>serial_votraxtnt</string>
+          </dict>
         </array>
       </dict>
       <dict>
@@ -189,6 +229,14 @@
             <key>default</key>
             <true/>
           </dict>
+          <dict>
+            <key>value</key>
+            <string>h19</string>
+            <key>description</key>
+            <string>Heath H19 Terminal (Serial Port)</string>
+            <key>devname</key>
+            <string>serial_heath_h19</string>
+          </dict>
           <dict>
             <key>value</key>
             <string>ie15</string>
@@ -197,11 +245,35 @@
             <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>msystems_mouse</string>
+            <key>description</key>
+            <string>Mouse Systems Non-rotatable Mouse (HLE)</string>
+            <key>devname</key>
+            <string>rs232_mouse_hle_msystems</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>
@@ -213,19 +285,11 @@
             <key>devname</key>
             <string>rs_serial_printer</string>
           </dict>
-          <dict>
-            <key>value</key>
-            <string>patch</string>
-            <key>description</key>
-            <string>RS-232 Patch Box</string>
-            <key>devname</key>
-            <string>rs232_patch_box</string>
-          </dict>
           <dict>
             <key>value</key>
             <string>loopback</string>
             <key>description</key>
-            <string>RS232 Loopback</string>
+            <string>RS-232 Loopback</string>
             <key>devname</key>
             <string>rs232_loopback</string>
           </dict>
@@ -233,7 +297,7 @@
             <key>value</key>
             <string>dec_loopback</string>
             <key>description</key>
-            <string>RS232 Loopback (DEC 12-15336-00)</string>
+            <string>RS-232 Loopback (DEC 12-15336-00)</string>
             <key>devname</key>
             <string>dec_rs232_loopback</string>
           </dict>
@@ -241,7 +305,7 @@
             <key>value</key>
             <string>null_modem</string>
             <key>description</key>
-            <string>RS232 Null Modem</string>
+            <string>RS-232 Null Modem</string>
             <key>devname</key>
             <string>null_modem</string>
             <key>media</key>
@@ -250,11 +314,19 @@
               <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>RS232 Synchronous I/O</string>
+            <string>RS-232 Synchronous I/O</string>
             <key>devname</key>
             <string>rs232_sync_io</string>
             <key>media</key>
@@ -311,6 +383,14 @@
             <key>devname</key>
             <string>swtpc8212_terminal</string>
           </dict>
+          <dict>
+            <key>value</key>
+            <string>votraxtnt</string>
+            <key>description</key>
+            <string>Votrax Type 'N Talk (Serial Port)</string>
+            <key>devname</key>
+            <string>serial_votraxtnt</string>
+          </dict>
         </array>
       </dict>
     </array>
@@ -569,6 +649,42 @@
           </dict>
         </array>
       </dict>
+      <dict>
+        <key>name</key>
+        <string>heath_watz_tlb</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>watzman</string>
+                <key>description</key>
+                <string>Watzman</string>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>watzman-a</string>
+                <key>description</key>
+                <string>Watzman w/clock persists after reset</string>
+              </dict>
+            </array>
+          </dict>
+        </array>
+      </dict>
       <dict>
         <key>name</key>
         <string>rs232_patch_box</string>
@@ -587,6 +703,14 @@
                 <key>default</key>
                 <true/>
               </dict>
+              <dict>
+                <key>value</key>
+                <string>h19</string>
+                <key>description</key>
+                <string>Heath H19 Terminal (Serial Port)</string>
+                <key>default</key>
+                <false/>
+              </dict>
               <dict>
                 <key>value</key>
                 <string>ie15</string>
@@ -595,11 +719,35 @@
                 <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>msystems_mouse</string>
+                <key>description</key>
+                <string>Mouse Systems Non-rotatable Mouse (HLE)</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>
@@ -611,19 +759,11 @@
                 <key>default</key>
                 <false/>
               </dict>
-              <dict>
-                <key>value</key>
-                <string>patch</string>
-                <key>description</key>
-                <string>RS-232 Patch Box</string>
-                <key>default</key>
-                <false/>
-              </dict>
               <dict>
                 <key>value</key>
                 <string>loopback</string>
                 <key>description</key>
-                <string>RS232 Loopback</string>
+                <string>RS-232 Loopback</string>
                 <key>default</key>
                 <false/>
               </dict>
@@ -631,7 +771,7 @@
                 <key>value</key>
                 <string>dec_loopback</string>
                 <key>description</key>
-                <string>RS232 Loopback (DEC 12-15336-00)</string>
+                <string>RS-232 Loopback (DEC 12-15336-00)</string>
                 <key>default</key>
                 <false/>
               </dict>
@@ -639,7 +779,7 @@
                 <key>value</key>
                 <string>null_modem</string>
                 <key>description</key>
-                <string>RS232 Null Modem</string>
+                <string>RS-232 Null Modem</string>
                 <key>default</key>
                 <false/>
                 <key>media</key>
@@ -648,11 +788,19 @@
                   <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>RS232 Synchronous I/O</string>
+                <string>RS-232 Synchronous I/O</string>
                 <key>default</key>
                 <false/>
                 <key>media</key>
@@ -709,6 +857,122 @@
                 <key>default</key>
                 <false/>
               </dict>
+              <dict>
+                <key>value</key>
+                <string>votraxtnt</string>
+                <key>description</key>
+                <string>Votrax Type 'N Talk (Serial Port)</string>
+                <key>default</key>
+                <false/>
+              </dict>
+            </array>
+          </dict>
+        </array>
+      </dict>
+      <dict>
+        <key>name</key>
+        <string>scorpion_ic</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>61203</string>
+                <key>description</key>
+                <string>Version 61203 (3rd Dec 1986)</string>
+              </dict>
+            </array>
+          </dict>
+        </array>
+      </dict>
+      <dict>
+        <key>name</key>
+        <string>serial_heath_h19</string>
+        <key>slots</key>
+        <array>
+          <dict>
+            <key>name</key>
+            <string>:tlbc</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>heath</string>
+                <key>description</key>
+                <string>Heath Terminal Logic Board</string>
+                <key>default</key>
+                <true/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>imaginator</string>
+                <key>description</key>
+                <string>Heath Terminal Logic Board plus Cleveland Codonics Imaginator I-100</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>gp19</string>
+                <key>description</key>
+                <string>Heath Terminal Logic Board plus Northwest Digital Systems GP-19</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>super19</string>
+                <key>description</key>
+                <string>Heath Terminal Logic Board w/Super19 ROM</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>superset</string>
+                <key>description</key>
+                <string>Heath Terminal Logic Board w/Superset ROM</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>ultrarom</string>
+                <key>description</key>
+                <string>Heath Terminal Logic Board w/Ultra ROM</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>watzman</string>
+                <key>description</key>
+                <string>Heath Terminal Logic Board w/Watzman ROM</string>
+                <key>default</key>
+                <false/>
+              </dict>
             </array>
           </dict>
         </array>

Ample/Resources/ds3100.plist

@@ -50,6 +50,14 @@
             <key>default</key>
             <true/>
           </dict>
+          <dict>
+            <key>value</key>
+            <string>h19</string>
+            <key>description</key>
+            <string>Heath H19 Terminal (Serial Port)</string>
+            <key>devname</key>
+            <string>serial_heath_h19</string>
+          </dict>
           <dict>
             <key>value</key>
             <string>ie15</string>
@@ -58,11 +66,35 @@
             <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>msystems_mouse</string>
+            <key>description</key>
+            <string>Mouse Systems Non-rotatable Mouse (HLE)</string>
+            <key>devname</key>
+            <string>rs232_mouse_hle_msystems</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>
@@ -74,19 +106,11 @@
             <key>devname</key>
             <string>rs_serial_printer</string>
           </dict>
-          <dict>
-            <key>value</key>
-            <string>patch</string>
-            <key>description</key>
-            <string>RS-232 Patch Box</string>
-            <key>devname</key>
-            <string>rs232_patch_box</string>
-          </dict>
           <dict>
             <key>value</key>
             <string>loopback</string>
             <key>description</key>
-            <string>RS232 Loopback</string>
+            <string>RS-232 Loopback</string>
             <key>devname</key>
             <string>rs232_loopback</string>
           </dict>
@@ -94,7 +118,7 @@
             <key>value</key>
             <string>dec_loopback</string>
             <key>description</key>
-            <string>RS232 Loopback (DEC 12-15336-00)</string>
+            <string>RS-232 Loopback (DEC 12-15336-00)</string>
             <key>devname</key>
             <string>dec_rs232_loopback</string>
           </dict>
@@ -102,7 +126,7 @@
             <key>value</key>
             <string>null_modem</string>
             <key>description</key>
-            <string>RS232 Null Modem</string>
+            <string>RS-232 Null Modem</string>
             <key>devname</key>
             <string>null_modem</string>
             <key>media</key>
@@ -111,11 +135,19 @@
               <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>RS232 Synchronous I/O</string>
+            <string>RS-232 Synchronous I/O</string>
             <key>devname</key>
             <string>rs232_sync_io</string>
             <key>media</key>
@@ -172,6 +204,14 @@
             <key>devname</key>
             <string>swtpc8212_terminal</string>
           </dict>
+          <dict>
+            <key>value</key>
+            <string>votraxtnt</string>
+            <key>description</key>
+            <string>Votrax Type 'N Talk (Serial Port)</string>
+            <key>devname</key>
+            <string>serial_votraxtnt</string>
+          </dict>
         </array>
       </dict>
       <dict>
@@ -189,6 +229,14 @@
             <key>default</key>
             <true/>
           </dict>
+          <dict>
+            <key>value</key>
+            <string>h19</string>
+            <key>description</key>
+            <string>Heath H19 Terminal (Serial Port)</string>
+            <key>devname</key>
+            <string>serial_heath_h19</string>
+          </dict>
           <dict>
             <key>value</key>
             <string>ie15</string>
@@ -197,11 +245,35 @@
             <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>msystems_mouse</string>
+            <key>description</key>
+            <string>Mouse Systems Non-rotatable Mouse (HLE)</string>
+            <key>devname</key>
+            <string>rs232_mouse_hle_msystems</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>
@@ -213,19 +285,11 @@
             <key>devname</key>
             <string>rs_serial_printer</string>
           </dict>
-          <dict>
-            <key>value</key>
-            <string>patch</string>
-            <key>description</key>
-            <string>RS-232 Patch Box</string>
-            <key>devname</key>
-            <string>rs232_patch_box</string>
-          </dict>
           <dict>
             <key>value</key>
             <string>loopback</string>
             <key>description</key>
-            <string>RS232 Loopback</string>
+            <string>RS-232 Loopback</string>
             <key>devname</key>
             <string>rs232_loopback</string>
           </dict>
@@ -233,7 +297,7 @@
             <key>value</key>
             <string>dec_loopback</string>
             <key>description</key>
-            <string>RS232 Loopback (DEC 12-15336-00)</string>
+            <string>RS-232 Loopback (DEC 12-15336-00)</string>
             <key>devname</key>
             <string>dec_rs232_loopback</string>
           </dict>
@@ -241,7 +305,7 @@
             <key>value</key>
             <string>null_modem</string>
             <key>description</key>
-            <string>RS232 Null Modem</string>
+            <string>RS-232 Null Modem</string>
             <key>devname</key>
             <string>null_modem</string>
             <key>media</key>
@@ -250,11 +314,19 @@
               <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>RS232 Synchronous I/O</string>
+            <string>RS-232 Synchronous I/O</string>
             <key>devname</key>
             <string>rs232_sync_io</string>
             <key>media</key>
@@ -311,6 +383,14 @@
             <key>devname</key>
             <string>swtpc8212_terminal</string>
           </dict>
+          <dict>
+            <key>value</key>
+            <string>votraxtnt</string>
+            <key>description</key>
+            <string>Votrax Type 'N Talk (Serial Port)</string>
+            <key>devname</key>
+            <string>serial_votraxtnt</string>
+          </dict>
         </array>
       </dict>
     </array>
@@ -569,6 +649,42 @@
           </dict>
         </array>
       </dict>
+      <dict>
+        <key>name</key>
+        <string>heath_watz_tlb</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>watzman</string>
+                <key>description</key>
+                <string>Watzman</string>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>watzman-a</string>
+                <key>description</key>
+                <string>Watzman w/clock persists after reset</string>
+              </dict>
+            </array>
+          </dict>
+        </array>
+      </dict>
       <dict>
         <key>name</key>
         <string>rs232_patch_box</string>
@@ -587,6 +703,14 @@
                 <key>default</key>
                 <true/>
               </dict>
+              <dict>
+                <key>value</key>
+                <string>h19</string>
+                <key>description</key>
+                <string>Heath H19 Terminal (Serial Port)</string>
+                <key>default</key>
+                <false/>
+              </dict>
               <dict>
                 <key>value</key>
                 <string>ie15</string>
@@ -595,11 +719,35 @@
                 <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>msystems_mouse</string>
+                <key>description</key>
+                <string>Mouse Systems Non-rotatable Mouse (HLE)</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>
@@ -611,19 +759,11 @@
                 <key>default</key>
                 <false/>
               </dict>
-              <dict>
-                <key>value</key>
-                <string>patch</string>
-                <key>description</key>
-                <string>RS-232 Patch Box</string>
-                <key>default</key>
-                <false/>
-              </dict>
               <dict>
                 <key>value</key>
                 <string>loopback</string>
                 <key>description</key>
-                <string>RS232 Loopback</string>
+                <string>RS-232 Loopback</string>
                 <key>default</key>
                 <false/>
               </dict>
@@ -631,7 +771,7 @@
                 <key>value</key>
                 <string>dec_loopback</string>
                 <key>description</key>
-                <string>RS232 Loopback (DEC 12-15336-00)</string>
+                <string>RS-232 Loopback (DEC 12-15336-00)</string>
                 <key>default</key>
                 <false/>
               </dict>
@@ -639,7 +779,7 @@
                 <key>value</key>
                 <string>null_modem</string>
                 <key>description</key>
-                <string>RS232 Null Modem</string>
+                <string>RS-232 Null Modem</string>
                 <key>default</key>
                 <false/>
                 <key>media</key>
@@ -648,11 +788,19 @@
                   <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>RS232 Synchronous I/O</string>
+                <string>RS-232 Synchronous I/O</string>
                 <key>default</key>
                 <false/>
                 <key>media</key>
@@ -709,6 +857,122 @@
                 <key>default</key>
                 <false/>
               </dict>
+              <dict>
+                <key>value</key>
+                <string>votraxtnt</string>
+                <key>description</key>
+                <string>Votrax Type 'N Talk (Serial Port)</string>
+                <key>default</key>
+                <false/>
+              </dict>
+            </array>
+          </dict>
+        </array>
+      </dict>
+      <dict>
+        <key>name</key>
+        <string>scorpion_ic</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>61203</string>
+                <key>description</key>
+                <string>Version 61203 (3rd Dec 1986)</string>
+              </dict>
+            </array>
+          </dict>
+        </array>
+      </dict>
+      <dict>
+        <key>name</key>
+        <string>serial_heath_h19</string>
+        <key>slots</key>
+        <array>
+          <dict>
+            <key>name</key>
+            <string>:tlbc</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>heath</string>
+                <key>description</key>
+                <string>Heath Terminal Logic Board</string>
+                <key>default</key>
+                <true/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>imaginator</string>
+                <key>description</key>
+                <string>Heath Terminal Logic Board plus Cleveland Codonics Imaginator I-100</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>gp19</string>
+                <key>description</key>
+                <string>Heath Terminal Logic Board plus Northwest Digital Systems GP-19</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>super19</string>
+                <key>description</key>
+                <string>Heath Terminal Logic Board w/Super19 ROM</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>superset</string>
+                <key>description</key>
+                <string>Heath Terminal Logic Board w/Superset ROM</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>ultrarom</string>
+                <key>description</key>
+                <string>Heath Terminal Logic Board w/Ultra ROM</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>watzman</string>
+                <key>description</key>
+                <string>Heath Terminal Logic Board w/Watzman ROM</string>
+                <key>default</key>
+                <false/>
+              </dict>
             </array>
           </dict>
         </array>

Ample/Resources/ds5k133.plist

@@ -50,6 +50,14 @@
             <key>default</key>
             <true/>
           </dict>
+          <dict>
+            <key>value</key>
+            <string>h19</string>
+            <key>description</key>
+            <string>Heath H19 Terminal (Serial Port)</string>
+            <key>devname</key>
+            <string>serial_heath_h19</string>
+          </dict>
           <dict>
             <key>value</key>
             <string>ie15</string>
@@ -58,11 +66,35 @@
             <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>msystems_mouse</string>
+            <key>description</key>
+            <string>Mouse Systems Non-rotatable Mouse (HLE)</string>
+            <key>devname</key>
+            <string>rs232_mouse_hle_msystems</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>
@@ -74,19 +106,11 @@
             <key>devname</key>
             <string>rs_serial_printer</string>
           </dict>
-          <dict>
-            <key>value</key>
-            <string>patch</string>
-            <key>description</key>
-            <string>RS-232 Patch Box</string>
-            <key>devname</key>
-            <string>rs232_patch_box</string>
-          </dict>
           <dict>
             <key>value</key>
             <string>loopback</string>
             <key>description</key>
-            <string>RS232 Loopback</string>
+            <string>RS-232 Loopback</string>
             <key>devname</key>
             <string>rs232_loopback</string>
           </dict>
@@ -94,7 +118,7 @@
             <key>value</key>
             <string>dec_loopback</string>
             <key>description</key>
-            <string>RS232 Loopback (DEC 12-15336-00)</string>
+            <string>RS-232 Loopback (DEC 12-15336-00)</string>
             <key>devname</key>
             <string>dec_rs232_loopback</string>
           </dict>
@@ -102,7 +126,7 @@
             <key>value</key>
             <string>null_modem</string>
             <key>description</key>
-            <string>RS232 Null Modem</string>
+            <string>RS-232 Null Modem</string>
             <key>devname</key>
             <string>null_modem</string>
             <key>media</key>
@@ -111,11 +135,19 @@
               <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>RS232 Synchronous I/O</string>
+            <string>RS-232 Synchronous I/O</string>
             <key>devname</key>
             <string>rs232_sync_io</string>
             <key>media</key>
@@ -172,6 +204,14 @@
             <key>devname</key>
             <string>swtpc8212_terminal</string>
           </dict>
+          <dict>
+            <key>value</key>
+            <string>votraxtnt</string>
+            <key>description</key>
+            <string>Votrax Type 'N Talk (Serial Port)</string>
+            <key>devname</key>
+            <string>serial_votraxtnt</string>
+          </dict>
         </array>
       </dict>
       <dict>
@@ -189,6 +229,14 @@
             <key>default</key>
             <true/>
           </dict>
+          <dict>
+            <key>value</key>
+            <string>h19</string>
+            <key>description</key>
+            <string>Heath H19 Terminal (Serial Port)</string>
+            <key>devname</key>
+            <string>serial_heath_h19</string>
+          </dict>
           <dict>
             <key>value</key>
             <string>ie15</string>
@@ -197,11 +245,35 @@
             <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>msystems_mouse</string>
+            <key>description</key>
+            <string>Mouse Systems Non-rotatable Mouse (HLE)</string>
+            <key>devname</key>
+            <string>rs232_mouse_hle_msystems</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>
@@ -213,19 +285,11 @@
             <key>devname</key>
             <string>rs_serial_printer</string>
           </dict>
-          <dict>
-            <key>value</key>
-            <string>patch</string>
-            <key>description</key>
-            <string>RS-232 Patch Box</string>
-            <key>devname</key>
-            <string>rs232_patch_box</string>
-          </dict>
           <dict>
             <key>value</key>
             <string>loopback</string>
             <key>description</key>
-            <string>RS232 Loopback</string>
+            <string>RS-232 Loopback</string>
             <key>devname</key>
             <string>rs232_loopback</string>
           </dict>
@@ -233,7 +297,7 @@
             <key>value</key>
             <string>dec_loopback</string>
             <key>description</key>
-            <string>RS232 Loopback (DEC 12-15336-00)</string>
+            <string>RS-232 Loopback (DEC 12-15336-00)</string>
             <key>devname</key>
             <string>dec_rs232_loopback</string>
           </dict>
@@ -241,7 +305,7 @@
             <key>value</key>
             <string>null_modem</string>
             <key>description</key>
-            <string>RS232 Null Modem</string>
+            <string>RS-232 Null Modem</string>
             <key>devname</key>
             <string>null_modem</string>
             <key>media</key>
@@ -250,11 +314,19 @@
               <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>RS232 Synchronous I/O</string>
+            <string>RS-232 Synchronous I/O</string>
             <key>devname</key>
             <string>rs232_sync_io</string>
             <key>media</key>
@@ -311,6 +383,14 @@
             <key>devname</key>
             <string>swtpc8212_terminal</string>
           </dict>
+          <dict>
+            <key>value</key>
+            <string>votraxtnt</string>
+            <key>description</key>
+            <string>Votrax Type 'N Talk (Serial Port)</string>
+            <key>devname</key>
+            <string>serial_votraxtnt</string>
+          </dict>
         </array>
       </dict>
     </array>
@@ -610,6 +690,42 @@
           </dict>
         </array>
       </dict>
+      <dict>
+        <key>name</key>
+        <string>heath_watz_tlb</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>watzman</string>
+                <key>description</key>
+                <string>Watzman</string>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>watzman-a</string>
+                <key>description</key>
+                <string>Watzman w/clock persists after reset</string>
+              </dict>
+            </array>
+          </dict>
+        </array>
+      </dict>
       <dict>
         <key>name</key>
         <string>rs232_patch_box</string>
@@ -628,6 +744,14 @@
                 <key>default</key>
                 <true/>
               </dict>
+              <dict>
+                <key>value</key>
+                <string>h19</string>
+                <key>description</key>
+                <string>Heath H19 Terminal (Serial Port)</string>
+                <key>default</key>
+                <false/>
+              </dict>
               <dict>
                 <key>value</key>
                 <string>ie15</string>
@@ -636,11 +760,35 @@
                 <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>msystems_mouse</string>
+                <key>description</key>
+                <string>Mouse Systems Non-rotatable Mouse (HLE)</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>
@@ -652,19 +800,11 @@
                 <key>default</key>
                 <false/>
               </dict>
-              <dict>
-                <key>value</key>
-                <string>patch</string>
-                <key>description</key>
-                <string>RS-232 Patch Box</string>
-                <key>default</key>
-                <false/>
-              </dict>
               <dict>
                 <key>value</key>
                 <string>loopback</string>
                 <key>description</key>
-                <string>RS232 Loopback</string>
+                <string>RS-232 Loopback</string>
                 <key>default</key>
                 <false/>
               </dict>
@@ -672,7 +812,7 @@
                 <key>value</key>
                 <string>dec_loopback</string>
                 <key>description</key>
-                <string>RS232 Loopback (DEC 12-15336-00)</string>
+                <string>RS-232 Loopback (DEC 12-15336-00)</string>
                 <key>default</key>
                 <false/>
               </dict>
@@ -680,7 +820,7 @@
                 <key>value</key>
                 <string>null_modem</string>
                 <key>description</key>
-                <string>RS232 Null Modem</string>
+                <string>RS-232 Null Modem</string>
                 <key>default</key>
                 <false/>
                 <key>media</key>
@@ -689,11 +829,19 @@
                   <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>RS232 Synchronous I/O</string>
+                <string>RS-232 Synchronous I/O</string>
                 <key>default</key>
                 <false/>
                 <key>media</key>
@@ -750,6 +898,122 @@
                 <key>default</key>
                 <false/>
               </dict>
+              <dict>
+                <key>value</key>
+                <string>votraxtnt</string>
+                <key>description</key>
+                <string>Votrax Type 'N Talk (Serial Port)</string>
+                <key>default</key>
+                <false/>
+              </dict>
+            </array>
+          </dict>
+        </array>
+      </dict>
+      <dict>
+        <key>name</key>
+        <string>scorpion_ic</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>61203</string>
+                <key>description</key>
+                <string>Version 61203 (3rd Dec 1986)</string>
+              </dict>
+            </array>
+          </dict>
+        </array>
+      </dict>
+      <dict>
+        <key>name</key>
+        <string>serial_heath_h19</string>
+        <key>slots</key>
+        <array>
+          <dict>
+            <key>name</key>
+            <string>:tlbc</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>heath</string>
+                <key>description</key>
+                <string>Heath Terminal Logic Board</string>
+                <key>default</key>
+                <true/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>imaginator</string>
+                <key>description</key>
+                <string>Heath Terminal Logic Board plus Cleveland Codonics Imaginator I-100</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>gp19</string>
+                <key>description</key>
+                <string>Heath Terminal Logic Board plus Northwest Digital Systems GP-19</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>super19</string>
+                <key>description</key>
+                <string>Heath Terminal Logic Board w/Super19 ROM</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>superset</string>
+                <key>description</key>
+                <string>Heath Terminal Logic Board w/Superset ROM</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>ultrarom</string>
+                <key>description</key>
+                <string>Heath Terminal Logic Board w/Ultra ROM</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>watzman</string>
+                <key>description</key>
+                <string>Heath Terminal Logic Board w/Watzman ROM</string>
+                <key>default</key>
+                <false/>
+              </dict>
             </array>
           </dict>
         </array>