improved resolution algorithm.

uses rounds to nearest integer of 4:3 aspect ratio.
8" floppy support (PDP 11, etc)
2026-10-25 13:02:57 +00:00 · 2023-11-13 22:29:22 -05:00 · 2023-11-13 16:11:51 -05:00 · 2023-11-13 16:11:13 -05:00 · 2023-11-13 10:52:27 -05:00 · 2023-11-12 21:22:34 -05:00
311 changed files with 26053 additions and 839161 deletions
@@ -8,12 +8,8 @@ jobs:
    runs-on: macos-latest

    steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v2

    - name: build
      run: xcodebuild -project "Ample.xcodeproj" -target "Ample Lite" | xcpretty

-    - uses: actions/upload-artifact@v4
-      with:
-        name: Ample Lite
-        path: build/Release/
@@ -1,35 +1,9 @@
 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
-
@@ -33,7 +33,6 @@ extern NSString *kMamePath;
 extern NSString *kMameWorkingDirectory;
 extern NSString *kAutoCloseLogWindow;
 extern NSString *kMameComponentsDate;
-extern NSString *kUseLogWindow;

 extern NSString *kDownloadURL;
 extern NSString *kDownloadExtension;
@@ -129,7 +129,6 @@ NSString *kUseCustomMame = @"UseCustomMame";
 NSString *kMamePath = @"MamePath";
 NSString *kMameWorkingDirectory = @"MameWorkingDirectory";
 NSString *kAutoCloseLogWindow = @"AutoCloseLogWindow";
-NSString *kUseLogWindow = @"UseLogWindow";
 NSString *kMameComponentsDate = @"MameComponentsDate";
 NSString *kDefaultDownloadURL = @"DefaultDownloadURL";
 NSString *kDefaultDownloadExtension = @"DefaultDownloadExtension";
@@ -88,25 +88,12 @@
    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;
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="24506" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="19529" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
    <dependencies>
        <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="24506"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="19529"/>
        <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="Disk Images" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" frameAutosaveName="RecentDiskImagesWindow" animationBehavior="default" toolbarStyle="unified" id="AtY-lA-KIp">
+        <window title="Recent Disk Images" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" frameAutosaveName="RecentDiskImagesWindow" animationBehavior="default" id="AtY-lA-KIp">
            <windowStyleMask key="styleMask" titled="YES" closable="YES"/>
            <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
            <rect key="contentRect" x="283" y="305" width="408" height="270"/>
            <rect key="screenRect" x="0.0" y="0.0" width="1920" height="1055"/>
-            <view key="contentView" misplaced="YES" id="zHI-2R-bOe">
+            <view key="contentView" id="zHI-2R-bOe">
                <rect key="frame" x="0.0" y="0.0" width="408" height="270"/>
                <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                <subviews>
@@ -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" widthSizable="YES" heightSizable="YES"/>
+                            <autoresizingMask key="autoresizingMask"/>
                            <subviews>
                                <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" columnSelection="YES" multipleSelection="NO" autosaveColumns="NO" rowSizeStyle="automatic" headerView="iwP-JL-O3g" viewBased="YES" id="cqO-ig-A9t">
                                    <rect key="frame" x="0.0" y="0.0" width="408" height="245"/>
@@ -81,7 +81,7 @@
                                                    <rect key="frame" x="1" y="1" width="305" height="17"/>
                                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                    <subviews>
-                                                        <textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="gkM-KB-x76">
+                                                        <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="gkM-KB-x76">
                                                            <rect key="frame" x="0.0" y="0.0" width="305" height="17"/>
                                                            <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
                                                            <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="PitchDark.2mg" id="Wcg-zo-CeN">
@@ -101,7 +101,7 @@
                                                </tableCellView>
                                            </prototypeCellViews>
                                        </tableColumn>
-                                        <tableColumn width="64" minWidth="40" maxWidth="1000" id="0aJ-xJ-YSS">
+                                        <tableColumn width="93" minWidth="40" maxWidth="1000" id="0aJ-xJ-YSS">
                                            <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" title="Size">
                                                <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                                <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
@@ -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="68" height="17"/>
+                                                    <rect key="frame" x="309" y="1" width="97" height="17"/>
                                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                    <subviews>
-                                                        <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"/>
+                                                        <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="6Ry-Zn-euh">
+                                                            <rect key="frame" x="0.0" y="0.0" width="97" height="17"/>
                                                            <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
                                                            <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="32 MB" id="fXp-OZ-Qcu">
                                                                <font key="font" metaFont="system"/>
@@ -161,21 +161,19 @@
                            <rect key="frame" x="224" y="17" width="15" height="102"/>
                            <autoresizingMask key="autoresizingMask"/>
                        </scroller>
-                        <tableHeaderView key="headerView" wantsLayer="YES" id="iwP-JL-O3g">
+                        <tableHeaderView key="headerView" id="iwP-JL-O3g">
                            <rect key="frame" x="0.0" y="0.0" width="408" height="25"/>
                            <autoresizingMask key="autoresizingMask"/>
                        </tableHeaderView>
                    </scrollView>
                </subviews>
            </view>
-            <toolbar key="toolbar" implicitIdentifier="D9701924-6955-47B8-A2FF-DBD466AAEB92" autosavesConfiguration="NO" allowsUserCustomization="NO" showsBaselineSeparator="NO" displayMode="iconOnly" sizeMode="regular" id="Gp6-Kl-lr2">
+            <toolbar key="toolbar" implicitIdentifier="D9701924-6955-47B8-A2FF-DBD466AAEB92" autosavesConfiguration="NO" allowsUserCustomization="NO" displayMode="iconOnly" sizeMode="regular" id="Gp6-Kl-lr2">
                <allowedToolbarItems>
                    <toolbarItem implicitItemIdentifier="NSToolbarFlexibleSpaceItem" id="lBE-ee-rCy"/>
-                    <toolbarItem implicitItemIdentifier="C346E56F-4480-4D8A-8485-33A3A51D7B78" label="" paletteLabel="Filter" id="DsU-uu-UmZ">
+                    <toolbarItem implicitItemIdentifier="C346E56F-4480-4D8A-8485-33A3A51D7B78" label="" paletteLabel="Filter" sizingBehavior="auto" id="DsU-uu-UmZ">
                        <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" textCompletion="NO" id="qHV-IA-ysc">
+                        <searchField key="view" wantsLayer="YES" verticalHuggingPriority="750" textCompletion="NO" id="qHV-IA-ysc">
                            <rect key="frame" x="0.0" y="14" width="96" height="22"/>
                            <autoresizingMask key="autoresizingMask"/>
                            <searchFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" continuous="YES" borderStyle="bezel" placeholderString="Filter" usesSingleLineMode="YES" bezelStyle="round" id="BWo-eC-ahz">
@@ -190,6 +188,7 @@
                    </toolbarItem>
                </allowedToolbarItems>
                <defaultToolbarItems>
+                    <toolbarItem reference="lBE-ee-rCy"/>
                    <toolbarItem reference="lBE-ee-rCy"/>
                    <toolbarItem reference="DsU-uu-UmZ"/>
                </defaultToolbarItems>
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="24506" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="15705" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
    <dependencies>
        <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="24506"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="15705"/>
        <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" toolbarStyle="expanded" id="F0z-JX-Cv5">
+        <window title="ROMs" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" frameAutosaveName="DownloadManagerWindow" animationBehavior="default" 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="1920" height="1055"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="2560" height="1417"/>
            <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="551"/>
+                <rect key="frame" x="0.0" y="0.0" width="454" height="575"/>
                <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="422"/>
+                        <rect key="frame" x="0.0" y="130" width="456" height="446"/>
                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <clipView key="contentView" drawsBackground="NO" id="Igp-aH-flp">
-                            <rect key="frame" x="1" y="1" width="454" height="420"/>
+                        <clipView key="contentView" ambiguous="YES" drawsBackground="NO" id="Igp-aH-flp">
+                            <rect key="frame" x="1" y="1" width="454" height="444"/>
                            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                            <subviews>
-                                <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"/>
+                                <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"/>
                                    <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="442" minWidth="40" maxWidth="1000" id="5jP-bY-fhI">
+                                        <tableColumn width="451" 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 focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="A44-us-TEl">
+                                                        <textField 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 focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="hfu-hP-QAH">
+                                                        <textField 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,7 +117,6 @@
                                        </tableColumn>
                                    </tableColumns>
                                    <connections>
-                                        <action trigger="doubleAction" selector="doubleClick:" target="-2" id="y2y-h7-cfD"/>
                                        <binding destination="jhO-4z-Qwt" name="content" keyPath="arrangedObjects" id="2av-gV-V4K"/>
                                        <outlet property="menu" destination="RJM-21-hjO" id="xpL-0n-1jm"/>
                                    </connections>
@@ -134,7 +133,7 @@
                            <autoresizingMask key="autoresizingMask"/>
                        </scroller>
                    </scrollView>
-                    <textField focusRingType="none" verticalHuggingPriority="750" fixedFrame="YES" textCompletion="NO" translatesAutoresizingMaskIntoConstraints="NO" id="sJz-So-jbA">
+                    <textField 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">
@@ -162,7 +161,7 @@
                            </binding>
                        </connections>
                    </button>
-                    <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="d2z-4T-Wh1">
+                    <textField 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">
@@ -171,7 +170,7 @@
                            <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                        </textFieldCell>
                    </textField>
-                    <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="ZXO-bJ-btp">
+                    <textField 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">
@@ -184,7 +183,7 @@
                        <rect key="frame" x="12" y="52" width="422" height="5"/>
                        <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
                    </box>
-                    <button imageHugsTitle="YES" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="dpY-qZ-2Nk">
+                    <button verticalHuggingPriority="750" fixedFrame="YES" imageHugsTitle="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">
@@ -213,7 +212,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="message"/>
+                            <font key="font" metaFont="menu"/>
                            <menu key="menu" autoenablesItems="NO" id="kcg-aZ-mD9">
                                <items>
                                    <menuItem title="zip" state="on" tag="1" id="7Cq-Lh-dgg"/>
@@ -248,14 +247,15 @@
                    </button>
                </subviews>
            </view>
-            <toolbar key="toolbar" implicitIdentifier="B60021E6-BFBC-44E6-97DC-120AA9FD3269" autosavesConfiguration="NO" allowsUserCustomization="NO" showsBaselineSeparator="NO" displayMode="iconOnly" sizeMode="regular" id="kpz-W4-xgh">
+            <toolbar key="toolbar" implicitIdentifier="B60021E6-BFBC-44E6-97DC-120AA9FD3269" autosavesConfiguration="NO" allowsUserCustomization="NO" displayMode="iconOnly" sizeMode="regular" id="kpz-W4-xgh">
                <allowedToolbarItems>
                    <toolbarItem implicitItemIdentifier="NSToolbarSpaceItem" id="tbY-ts-Irb"/>
-                    <toolbarItem implicitItemIdentifier="BD743A15-0B61-48FF-9EED-FD8D57EF8459" label="All" paletteLabel="All" tag="1" title="All" sizingBehavior="auto" id="Jj0-n8-I5a">
+                    <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">
                        <nil key="toolTip"/>
-                        <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"/>
+                        <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"/>
                            <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" title="Missing" sizingBehavior="auto" id="GV4-aX-5Ox">
+                    <toolbarItem implicitItemIdentifier="5B013840-E582-4568-8448-DDD7EE1E5AE2" label="Missing" paletteLabel="Missing" tag="2" sizingBehavior="auto" id="GV4-aX-5Ox">
                        <nil key="toolTip"/>
-                        <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"/>
+                        <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"/>
                            <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,30 +279,10 @@
                            </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>
@@ -342,9 +322,7 @@
            </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">
-            <classReference key="objectClass" className="DownloadItem"/>
-        </arrayController>
+        <arrayController objectClassName="DownloadItem" editable="NO" preservesSelection="NO" selectsInsertedObjects="NO" avoidsEmptySelection="NO" clearsFilterPredicateOnInsertion="NO" automaticallyRearrangesObjects="YES" id="jhO-4z-Qwt" customClass="DownloadItemArrayController"/>
        <userDefaultsController representsSharedInstance="YES" id="721-9N-Bma"/>
    </objects>
    <resources>
@@ -159,21 +159,10 @@
                                                <font key="font" metaFont="menu"/>
                                                <menu key="menu" id="m4N-Qw-mem">
                                                    <items>
-                                                        <menuItem title="Full Screen" state="on" id="0zZ-Ib-Fne">
-                                                            <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>
+                                                        <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"/>
                                                    </items>
                                                </menu>
                                            </popUpButtonCell>
@@ -26,7 +26,7 @@
                <autoresizingMask key="autoresizingMask"/>
                <subviews>
                    <textField verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Oz5-Xb-btk">
-                        <rect key="frame" x="138" y="159" width="322" height="21"/>
+                        <rect key="frame" x="138" y="181" width="322" height="21"/>
                        <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMinY="YES"/>
                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" drawsBackground="YES" id="vDR-2V-qxd">
                            <font key="font" usesAppearanceFont="YES"/>
@@ -40,7 +40,7 @@
                        </connections>
                    </textField>
                    <textField verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="l8V-pC-gml">
-                        <rect key="frame" x="138" y="128" width="322" height="21"/>
+                        <rect key="frame" x="138" y="150" width="322" height="21"/>
                        <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMinY="YES"/>
                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" drawsBackground="YES" id="wfj-GY-Qu2">
                            <font key="font" usesAppearanceFont="YES"/>
@@ -49,12 +49,12 @@
                        </textFieldCell>
                        <connections>
                            <action selector="wdChanged:" target="-2" id="g1P-8l-ZXi"/>
-                            <binding destination="yvB-HG-64y" name="value" keyPath="values.MameWorkingDirectory" id="Kc9-Pc-XGU"/>
                            <binding destination="yvB-HG-64y" name="enabled" keyPath="values.UseCustomMame" id="DeG-OW-Gd2"/>
+                            <binding destination="yvB-HG-64y" name="value" keyPath="values.MameWorkingDirectory" id="Kc9-Pc-XGU"/>
                        </connections>
                    </textField>
                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="vTJ-Ez-c1R">
-                        <rect key="frame" x="18" y="131" width="114" height="16"/>
+                        <rect key="frame" x="18" y="153" width="114" height="16"/>
                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                        <textFieldCell key="cell" lineBreakMode="clipping" title="Working Directory" id="UHt-0s-zxA">
                            <font key="font" metaFont="system"/>
@@ -63,7 +63,7 @@
                        </textFieldCell>
                    </textField>
                    <button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="KAN-P2-ydI">
-                        <rect key="frame" x="136" y="212" width="217" height="18"/>
+                        <rect key="frame" x="136" y="234" width="217" height="18"/>
                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                        <buttonCell key="cell" type="check" title="Close log window on normal exit" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="QMz-O0-06U">
                            <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
@@ -74,7 +74,7 @@
                        </connections>
                    </button>
                    <button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="j7D-jC-17Q">
-                        <rect key="frame" x="136" y="186" width="139" height="18"/>
+                        <rect key="frame" x="136" y="208" width="139" height="18"/>
                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                        <buttonCell key="cell" type="check" title="Use Custom MAME" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="V61-mz-QFo">
                            <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
@@ -96,7 +96,7 @@
                        </connections>
                    </button>
                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Qmb-Ag-Xyr">
-                        <rect key="frame" x="58" y="162" width="74" height="16"/>
+                        <rect key="frame" x="58" y="184" width="74" height="16"/>
                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                        <textFieldCell key="cell" lineBreakMode="clipping" title="MAME Path" id="Xcq-4g-Wlw">
                            <font key="font" metaFont="system"/>
@@ -104,20 +104,9 @@
                            <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                        </textFieldCell>
                    </textField>
-                    <button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="qT7-cc-Phc">
-                        <rect key="frame" x="136" y="234" width="118" height="18"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                        <buttonCell key="cell" type="check" title="Use log window" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="Adv-KH-abG">
-                            <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
-                            <font key="font" metaFont="system"/>
-                        </buttonCell>
-                        <connections>
-                            <binding destination="yvB-HG-64y" name="value" keyPath="values.UseLogWindow" id="meK-Jb-s8b"/>
-                        </connections>
-                    </button>
                </subviews>
            </view>
-            <point key="canvasLocation" x="80" y="144"/>
+            <point key="canvasLocation" x="140" y="147"/>
        </window>
        <userDefaultsController id="KVS-Ag-1un"/>
        <userDefaultsController representsSharedInstance="YES" id="yvB-HG-64y"/>
@@ -602,7 +602,7 @@ static NSString *kMenuContext = @"";
        if ([b automatic]) {
            
            [item setOnStateImage: [NSImage imageNamed: NSImageNameStatusAvailable]];
-            [item setState: NSControlStateValueOn];
+            [item setState: NSOnState];
        }
        //if ([b automatic]) [item setAttributedTitle: ItalicMenuString([b name])];
        //[item setState: [b automatic] ? NSMixedState : NSOffState];
@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>MameComponentsDate</key>
-	<date>2026-07-31T12:00:00Z</date>
+	<date>2023-11-04T12:00:00Z</date>
 	<key>UseCustomMame</key>
 	<false/>
 	<key>AutoCloseLogWindow</key>
@@ -15,9 +15,7 @@
 	<key>NSQuitAlwaysKeepsWindows</key>
 	<true/>
 	<key>DefaultDownloadURL</key>
-	<string>https://www.callapple.org/roms/</string>
-	<key>UseLogWindow</key>
-	<true/>
+	<string>https://archive.org/download/mame-merged/mame-merged</string>
 	<key>DefaultDownloadExtension</key>
 	<string>zip</string>
 </dict>
@@ -133,7 +133,6 @@ enum {
 /* filter buttons */
@property (weak) IBOutlet NSButton *allFilterButton;
@property (weak) IBOutlet NSButton *missingFilterButton;
-@property (weak) IBOutlet NSSearchField *searchFilter;

@property (strong) IBOutlet NSArrayController *arrayController;

@@ -153,11 +152,6 @@ enum {
    NSUserDefaults *_defaults;

    NSArray<NSButton *> *_filterButtons;
-
-    NSPredicate *_missingPredicate;
-    NSPredicate *_searchPredicate;
-
-
 }

 +(instancetype)sharedInstance {
@@ -487,10 +481,6 @@ enum {

 }

-(IBAction)doubleClick:(id)sender {
-    [self download: sender];
-}
-
 - (IBAction)download:(id)sender {
    DownloadItem *item = [self clickedItem];
    if (!item) return;
@@ -525,65 +515,30 @@ 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:
-            _missingPredicate = nil;
+            [_arrayController setFilterPredicate: nil];
            break;
        case 2: // missing.
-            _missingPredicate = [NSPredicate predicateWithBlock: ^BOOL(DownloadItem *item, NSDictionary *bindings){
+            p = [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];
 }


@@ -655,16 +610,13 @@ static NSInteger TaskStatusCode(NSURLSessionTask *task) {
    NSURL *dest = [_romFolder URLByAppendingPathComponent: [src lastPathComponent]];
    NSError *error = nil;

-    /* just in case ... */
-    [fm removeItemAtURL: dest error: NULL];
    [fm moveItemAtURL: location toURL: dest error: &error];

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

-        if (error) [item completeWithError: error];
-        else [item refresh: dest];
+        [item refresh: dest];
    });

    NSLog(@"%@", src);
@@ -52,7 +52,7 @@
 	<key>LSMinimumSystemVersion</key>
 	<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
 	<key>NSHumanReadableCopyright</key>
-	<string>Copyright © 2020-2026 Kelvin Sherlock. All rights reserved.</string>
+	<string>Copyright © 2020-2023 Kelvin Sherlock. All rights reserved.</string>
 	<key>NSMainNibFile</key>
 	<string>MainMenu</string>
 	<key>NSPrincipalClass</key>
@@ -25,53 +25,6 @@ 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;
@@ -367,7 +320,7 @@ static NSString * JoinArguments(NSArray *argv, NSString *argv0) {

    if (!safe) {
        NSString *str =
-            @"%+-./:=_,"
+            @"%+-./:=_"
            @"0123456789"
            @"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
        ;
@@ -442,7 +395,7 @@ static NSString *ShellQuote(NSString *s) {

    if (!safe) {
        NSString *str =
-            @"%+-./:=_,"
+            @"%+-./:=_"
            @"0123456789"
            @"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
        ;
@@ -513,9 +466,6 @@ 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.
@@ -532,8 +482,6 @@ static NSString *ShellQuote(NSString *s) {
     * for square pixels, should pass the true size and true aspect ratio.
     */

-
-    
    NSSize screen = [_slotController resolution];
    switch(_mameWindowMode) {
        case 0: // full screen;
@@ -550,26 +498,16 @@ static NSString *ShellQuote(NSString *s) {
            // drop through.
        case 2: // 2x
        case 3: // 3x
-        case 4: // 4x
-            
+
            if (_mameSquarePixels) {
                //              NSString *aspect = [NSString stringWithFormat: @"%u:%u", (unsigned)screen.width, (unsigned)screen.height];
                //              [argv addObject: @"-aspect"];
                //              [argv addObject: aspect];
-
-                float hscale = round((screen.width * 3 / 4) / screen.height);
-                if (hscale < 1) hscale = 1;
-                screen.height *= hscale;
-
-
+                [argv addObject: @"-nounevenstretch"];
            } 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),
@@ -578,22 +516,11 @@ static NSString *ShellQuote(NSString *s) {

            [argv addObject: @"-resolution"];
            [argv addObject: res];
-            if (_mameSquarePixels) {
-                [argv addObject: @"-nounevenstretch"];
-
-                NSString *aspect = NeedsAspectRatio(_machine);
-                if (aspect) {
-                    [argv addObject: @"-aspect"];
-                    [argv addObject: aspect];
-                }
-
-            }
            break;
    }



-
    if (_mameBGFX) {
        [argv addObject: @"-video"];
        [argv addObject: @"bgfx"];
@@ -34,7 +34,7 @@ static NSMutableSet *LogWindows;
 }


-+(id)controllerForTask: (NSTask *)task close: (BOOL)close {
+(id)controllerForTask: (NSTask *)task close: (BOOL)close{
    LogWindowController *controller = [[LogWindowController alloc] initWithWindowNibName: @"LogWindow"];
    [controller runTask: task close: close];
    return controller;
@@ -43,8 +43,6 @@ static NSMutableSet *LogWindows;

 +(id)controllerForArgs: (NSArray *)args close: (BOOL)close {

-    NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
-    
    NSURL *url = MameURL();

    if (!url) {
@@ -67,30 +65,6 @@ static NSMutableSet *LogWindows;
    
    [task setArguments: args];
    
-    if ([defaults boolForKey: kUseLogWindow] == NO) {
-
-        NSAlert *alert = nil;
-        if (@available(macOS 10.13, *)) {
-            NSError *error = nil;
-
-            [task launchAndReturnError: &error];
-            if (error) {
-                alert = [NSAlert alertWithError: error];
-            }
-        } else {
-            @try {
-                [task launch];
-            } @catch (NSException *exception) {
-
-                alert = [NSAlert new];
-                [alert setMessageText: [exception reason]];
-            }
-        }
-        if (alert) [alert runModal];
-        return nil;
-    }
-    
-    
    return [LogWindowController controllerForTask: task close: close];

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


@@ -40,8 +40,7 @@ void MediaAdd(Media *dest, const Media *src) {
    // could merge from src media but not currently set there.
    
    //unsigned count;
-    unsigned dest_flops = dest->floppy_8 + dest->floppy_5_25 + dest->floppy_3_5;
-    unsigned src_flops = src->floppy_8 || src->floppy_5_25 || src->floppy_3_5;
+    //unsigned flops = dest->floppy_8 + dest->floppy_5_25 + dest->floppy_3_5;

    
 #define _(name) dest->name += src->name;
@@ -59,25 +58,15 @@ void MediaAdd(Media *dest, const Media *src) {
    _(rom);
 #undef _

-    
-    // this assumes any device that supports more than 1 floppy size
-    // the order is 8" < 5.25" < 3.5"
-
-    if (src_flops) {
-        uint64_t bits = 1 << dest_flops;
-        for (unsigned i = 0; i < src->floppy_8; ++i) {
-            dest->floppy_mask_8 |= bits;
-            bits <<= 1;
-        }
-        for (unsigned i = 0; i < src->floppy_5_25; ++i) {
-            dest->floppy_mask_5_25 |= bits;
-            bits <<= 1;
-        }
-        for (unsigned i = 0; i < src->floppy_3_5; ++i) {
-            dest->floppy_mask_3_5 |= bits;
-            bits <<= 1;
-        }
+#if 0
+    // TODO - FLOPPY_8
+    if ((count = src->floppy_5_25)) {
+        uint64_t bits = (1 << count) - 1;
+        //dest->floppy_mask <<= count;
+        bits <<= flops;
+        dest->floppy_mask |= bits;
    }
+#endif

 }

@@ -100,9 +89,7 @@ BOOL MediaEqual(const Media *lhs, const Media *rhs) {
    _(picture);
    _(rom);

-    _(floppy_mask_8);
-    _(floppy_mask_5_25);
-    _(floppy_mask_3_5);
+    //_(floppy_mask);

    return YES;
 #undef _
@@ -355,10 +355,6 @@
    
    //unsigned counts[CATEGORY_COUNT] = { 0 };

-    uint64_t floppy_mask_8 = _media.floppy_mask_8;
-    uint64_t floppy_mask_5_25 = _media.floppy_mask_5_25;
-    uint64_t floppy_mask_3_5 = _media.floppy_mask_3_5;
-
    for (unsigned j = 0; j < CATEGORY_COUNT; ++j) {
    
        //uint64_t floppy_mask = _media.floppy_mask;
@@ -366,31 +362,49 @@

        MediaCategory *cat = _data[j];
        NSInteger valid = [cat validCount];
-
+        
+        // assumes floppy order is 8", 5.25", 3.5".
+        switch(j) {
+            case kIndexFloppy8:
+                index = 0;
+                break;
+            case kIndexFloppy525:
+                index = _media.floppy_8;
+                break;
+            case kIndexFloppy35:
+                index = _media.floppy_8 + _media.floppy_5_25;
+                break;
+        }
+        
        for (NSInteger i = 0; i < valid; ++i) {

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

-            switch(j) {
-                case kIndexFloppy8:
-                    index = ffsll(floppy_mask_8);
-                    floppy_mask_8 &= ~(1 << (index-1));
-                    break;
-                case kIndexFloppy525:
-                    index = ffsll(floppy_mask_5_25);
-                    floppy_mask_5_25 &= ~(1 << (index-1));
-                    break;
-                case kIndexFloppy35:
-                    index = ffsll(floppy_mask_3_5);
-                    floppy_mask_3_5 &= ~(1 << (index-1));
-                    break;
-                default:
-                    ++index;
-            }
+            ++index;
            if (!arg) continue;
-            if (!index) continue;
+#if 0
+            // TODO -- FLOPPY_8 support.

+            if (j == kIndexFloppy525) {
+                // assumes < 64 floppies....
+                // infinite loop if no floppy device...
+                if (floppy_mask == 0) break;
+                while ((floppy_mask & 0x01) == 0) {
+                    floppy_mask >>= 1;
+                    ++index;
+                }
+            } else if (j == kIndexFloppy35) {
+                while ((floppy_mask & 0x01)) {
+                    floppy_mask >>= 1;
+                    ++index;
+                }
+            }
+
+            ++index;
+            floppy_mask >>= 1;
+            if (!arg) continue;
+#endif
            [args addObject: [NSString stringWithFormat: @"-%s%u", prefix[j], index]];
            [args addObject: arg];
        }
@@ -141,7 +141,7 @@
                    <td>Quit</td>
                </tr>
                <tr>
-                    <td><kbd>F5</kbd></td>
+                    <td><kbd>P</kbd></td>
                    <td>Pause</td>
                </tr>

@@ -166,7 +166,8 @@
                    <td><kbd>Shift</kbd>+<kbd>F3</kbd></td>
                    <td>Hard reset</td>
                </tr>
-<!--
+
+
                <tr>
                    <td><kbd>F5</kbd></td>
                    <td>Toggle debugger</td>
@@ -175,17 +176,15 @@
                    <td><kbd>Shift</kbd>+<kbd>F5</kbd></td>
                    <td>Toggle graphic filters</td>
                </tr>
-->
-                <tr>
-                    <td><kbd>Shift</kbd>+<kbd>F6</kbd></td>
-                    <td>Create save state</td>
-                </tr>

                <tr>
                    <td><kbd>F7</kbd></td>
-                    <td>Load save state</td>
+                    <td>Load state</td>
+                </tr>
+                <tr>
+                    <td><kbd>Shift</kbd>+<kbd>F7</kbd></td>
+                    <td>Save state</td>
                </tr>
- 

                <tr>
                    <td><kbd>F10</kbd></td>
@@ -12,7 +12,7 @@
    <key>resolution</key>
    <array>
      <integer>560</integer>
-      <integer>192</integer>
+      <integer>384</integer>
    </array>
    <key>slots</key>
    <array>
@@ -73,7 +73,7 @@
            <key>value</key>
            <string>joy</string>
            <key>description</key>
-            <string>Apple II Analog Joysticks</string>
+            <string>Apple II analog joysticks</string>
            <key>devname</key>
            <string>a2joy</string>
          </dict>
@@ -81,10 +81,31 @@
            <key>value</key>
            <string>paddles</string>
            <key>description</key>
-            <string>Apple II Paddles</string>
+            <string>Apple II paddles</string>
            <key>devname</key>
            <string>a2pdls</string>
          </dict>
+          <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>
@@ -102,22 +123,6 @@
            <key>default</key>
            <true/>
          </dict>
-          <dict>
-            <key>value</key>
-            <string>auto3a</string>
-            <key>description</key>
-            <string>Auto-baud ADM-3A Terminal</string>
-            <key>devname</key>
-            <string>auto3a_terminal</string>
-          </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>
@@ -126,35 +131,11 @@
            <key>devname</key>
            <string>ie15_terminal</string>
          </dict>
-          <dict>
-            <key>value</key>
-            <string>scorpion</string>
-            <key>description</key>
-            <string>Micro-Robotics Scorpion Intelligent Controller</string>
-            <key>devname</key>
-            <string>scorpion_ic</string>
-          </dict>
-          <dict>
-            <key>value</key>
-            <string>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>
@@ -166,11 +147,19 @@
            <key>devname</key>
            <string>rs_serial_printer</string>
          </dict>
+          <dict>
+            <key>value</key>
+            <string>patch</string>
+            <key>description</key>
+            <string>RS-232 Patch Box</string>
+            <key>devname</key>
+            <string>rs232_patch_box</string>
+          </dict>
          <dict>
            <key>value</key>
            <string>loopback</string>
            <key>description</key>
-            <string>RS-232 Loopback</string>
+            <string>RS232 Loopback</string>
            <key>devname</key>
            <string>rs232_loopback</string>
          </dict>
@@ -178,7 +167,7 @@
            <key>value</key>
            <string>dec_loopback</string>
            <key>description</key>
-            <string>RS-232 Loopback (DEC 12-15336-00)</string>
+            <string>RS232 Loopback (DEC 12-15336-00)</string>
            <key>devname</key>
            <string>dec_rs232_loopback</string>
          </dict>
@@ -186,7 +175,7 @@
            <key>value</key>
            <string>null_modem</string>
            <key>description</key>
-            <string>RS-232 Null Modem</string>
+            <string>RS232 Null Modem</string>
            <key>devname</key>
            <string>null_modem</string>
            <key>media</key>
@@ -195,19 +184,11 @@
              <integer>1</integer>
            </dict>
          </dict>
-          <dict>
-            <key>value</key>
-            <string>patch</string>
-            <key>description</key>
-            <string>RS-232 Patch Box</string>
-            <key>devname</key>
-            <string>rs232_patch_box</string>
-          </dict>
          <dict>
            <key>value</key>
            <string>rs232_sync_io</string>
            <key>description</key>
-            <string>RS-232 Synchronous I/O</string>
+            <string>RS232 Synchronous I/O</string>
            <key>devname</key>
            <string>rs232_sync_io</string>
            <key>media</key>
@@ -240,14 +221,6 @@
            <key>devname</key>
            <string>serial_terminal</string>
          </dict>
-          <dict>
-            <key>value</key>
-            <string>s97801</string>
-            <key>description</key>
-            <string>Siemens 97801 Terminal (RS-232)</string>
-            <key>devname</key>
-            <string>s97801_terminal</string>
-          </dict>
          <dict>
            <key>value</key>
            <string>sunkbd</string>
@@ -272,14 +245,6 @@
            <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>
@@ -348,295 +313,6 @@
          </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>
@@ -655,22 +331,6 @@
                <key>default</key>
                <true/>
              </dict>
-              <dict>
-                <key>value</key>
-                <string>auto3a</string>
-                <key>description</key>
-                <string>Auto-baud ADM-3A Terminal</string>
-                <key>default</key>
-                <false/>
-              </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>
@@ -679,35 +339,11 @@
                <key>default</key>
                <false/>
              </dict>
-              <dict>
-                <key>value</key>
-                <string>scorpion</string>
-                <key>description</key>
-                <string>Micro-Robotics Scorpion Intelligent Controller</string>
-                <key>default</key>
-                <false/>
-              </dict>
-              <dict>
-                <key>value</key>
-                <string>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>
@@ -719,11 +355,19 @@
                <key>default</key>
                <false/>
              </dict>
+              <dict>
+                <key>value</key>
+                <string>patch</string>
+                <key>description</key>
+                <string>RS-232 Patch Box</string>
+                <key>default</key>
+                <false/>
+              </dict>
              <dict>
                <key>value</key>
                <string>loopback</string>
                <key>description</key>
-                <string>RS-232 Loopback</string>
+                <string>RS232 Loopback</string>
                <key>default</key>
                <false/>
              </dict>
@@ -731,7 +375,7 @@
                <key>value</key>
                <string>dec_loopback</string>
                <key>description</key>
-                <string>RS-232 Loopback (DEC 12-15336-00)</string>
+                <string>RS232 Loopback (DEC 12-15336-00)</string>
                <key>default</key>
                <false/>
              </dict>
@@ -739,7 +383,7 @@
                <key>value</key>
                <string>null_modem</string>
                <key>description</key>
-                <string>RS-232 Null Modem</string>
+                <string>RS232 Null Modem</string>
                <key>default</key>
                <false/>
                <key>media</key>
@@ -748,19 +392,11 @@
                  <integer>1</integer>
                </dict>
              </dict>
-              <dict>
-                <key>value</key>
-                <string>patch</string>
-                <key>description</key>
-                <string>RS-232 Patch Box</string>
-                <key>default</key>
-                <false/>
-              </dict>
              <dict>
                <key>value</key>
                <string>rs232_sync_io</string>
                <key>description</key>
-                <string>RS-232 Synchronous I/O</string>
+                <string>RS232 Synchronous I/O</string>
                <key>default</key>
                <false/>
                <key>media</key>
@@ -793,14 +429,6 @@
                <key>default</key>
                <false/>
              </dict>
-              <dict>
-                <key>value</key>
-                <string>s97801</string>
-                <key>description</key>
-                <string>Siemens 97801 Terminal (RS-232)</string>
-                <key>default</key>
-                <false/>
-              </dict>
              <dict>
                <key>value</key>
                <string>sunkbd</string>
@@ -825,122 +453,6 @@
                <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>
@@ -963,14 +475,6 @@
                <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>
@@ -14,7 +14,7 @@
    <key>resolution</key>
    <array>
      <integer>512</integer>
-      <integer>256</integer>
+      <integer>512</integer>
    </array>
    <key>slots</key>
    <array>
@@ -91,7 +91,7 @@
            <key>value</key>
            <string>a9fdchle</string>
            <key>description</key>
-            <string>Agat 840K Floppy Card</string>
+            <string>Agat 840K floppy card</string>
            <key>devname</key>
            <string>agat840k_hle</string>
          </dict>
@@ -99,7 +99,7 @@
            <key>value</key>
            <string>a9fdc</string>
            <key>description</key>
-            <string>Agat 840K Floppy Controller Card</string>
+            <string>Agat 840K floppy controller card</string>
            <key>devname</key>
            <string>agat_fdc</string>
          </dict>
@@ -107,7 +107,7 @@
            <key>value</key>
            <string>a7fdc</string>
            <key>description</key>
-            <string>Agat-7 140K Floppy Card</string>
+            <string>Agat-7 140K floppy card</string>
            <key>devname</key>
            <string>agat7_flop</string>
          </dict>
@@ -158,7 +158,7 @@
            <key>value</key>
            <string>a9fdchle</string>
            <key>description</key>
-            <string>Agat 840K Floppy Card</string>
+            <string>Agat 840K floppy card</string>
            <key>devname</key>
            <string>agat840k_hle</string>
          </dict>
@@ -166,7 +166,7 @@
            <key>value</key>
            <string>a9fdc</string>
            <key>description</key>
-            <string>Agat 840K Floppy Controller Card</string>
+            <string>Agat 840K floppy controller card</string>
            <key>devname</key>
            <string>agat_fdc</string>
          </dict>
@@ -174,7 +174,7 @@
            <key>value</key>
            <string>a7fdc</string>
            <key>description</key>
-            <string>Agat-7 140K Floppy Card</string>
+            <string>Agat-7 140K floppy card</string>
            <key>default</key>
            <true/>
            <key>devname</key>
@@ -225,7 +225,7 @@
            <key>value</key>
            <string>a9fdchle</string>
            <key>description</key>
-            <string>Agat 840K Floppy Card</string>
+            <string>Agat 840K floppy card</string>
            <key>devname</key>
            <string>agat840k_hle</string>
          </dict>
@@ -233,7 +233,7 @@
            <key>value</key>
            <string>a9fdc</string>
            <key>description</key>
-            <string>Agat 840K Floppy Controller Card</string>
+            <string>Agat 840K floppy controller card</string>
            <key>devname</key>
            <string>agat_fdc</string>
          </dict>
@@ -241,7 +241,7 @@
            <key>value</key>
            <string>a7fdc</string>
            <key>description</key>
-            <string>Agat-7 140K Floppy Card</string>
+            <string>Agat-7 140K floppy card</string>
            <key>devname</key>
            <string>agat7_flop</string>
          </dict>
@@ -292,7 +292,7 @@
            <key>value</key>
            <string>a9fdchle</string>
            <key>description</key>
-            <string>Agat 840K Floppy Card</string>
+            <string>Agat 840K floppy card</string>
            <key>devname</key>
            <string>agat840k_hle</string>
          </dict>
@@ -300,7 +300,7 @@
            <key>value</key>
            <string>a9fdc</string>
            <key>description</key>
-            <string>Agat 840K Floppy Controller Card</string>
+            <string>Agat 840K floppy controller card</string>
            <key>devname</key>
            <string>agat_fdc</string>
          </dict>
@@ -308,7 +308,7 @@
            <key>value</key>
            <string>a7fdc</string>
            <key>description</key>
-            <string>Agat-7 140K Floppy Card</string>
+            <string>Agat-7 140K floppy card</string>
            <key>devname</key>
            <string>agat7_flop</string>
          </dict>
@@ -357,7 +357,7 @@
            <key>value</key>
            <string>a9fdchle</string>
            <key>description</key>
-            <string>Agat 840K Floppy Card</string>
+            <string>Agat 840K floppy card</string>
            <key>devname</key>
            <string>agat840k_hle</string>
          </dict>
@@ -365,7 +365,7 @@
            <key>value</key>
            <string>a9fdc</string>
            <key>description</key>
-            <string>Agat 840K Floppy Controller Card</string>
+            <string>Agat 840K floppy controller card</string>
            <key>devname</key>
            <string>agat_fdc</string>
          </dict>
@@ -373,7 +373,7 @@
            <key>value</key>
            <string>a7fdc</string>
            <key>description</key>
-            <string>Agat-7 140K Floppy Card</string>
+            <string>Agat-7 140K floppy card</string>
            <key>devname</key>
            <string>agat7_flop</string>
          </dict>
@@ -405,39 +405,6 @@
          </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>
@@ -515,22 +482,6 @@
                <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>
@@ -547,22 +498,6 @@
                <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>
@@ -571,14 +506,6 @@
                <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>
@@ -611,195 +538,6 @@
                <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>
@@ -14,7 +14,7 @@
    <key>resolution</key>
    <array>
      <integer>512</integer>
-      <integer>256</integer>
+      <integer>512</integer>
    </array>
    <key>slots</key>
    <array>
@@ -85,7 +85,7 @@
            <key>value</key>
            <string>a9fdchle</string>
            <key>description</key>
-            <string>Agat 840K Floppy Card</string>
+            <string>Agat 840K floppy card</string>
            <key>devname</key>
            <string>agat840k_hle</string>
          </dict>
@@ -93,7 +93,7 @@
            <key>value</key>
            <string>a9fdc</string>
            <key>description</key>
-            <string>Agat 840K Floppy Controller Card</string>
+            <string>Agat 840K floppy controller card</string>
            <key>devname</key>
            <string>agat_fdc</string>
          </dict>
@@ -109,7 +109,7 @@
            <key>value</key>
            <string>a9fdc140</string>
            <key>description</key>
-            <string>Agat-9 140K Floppy Card</string>
+            <string>Agat-9 140K floppy card</string>
            <key>devname</key>
            <string>agat9_flop</string>
          </dict>
@@ -117,7 +117,7 @@
            <key>value</key>
            <string>diskiing</string>
            <key>description</key>
-            <string>Apple Disk II NG Controller (16-sector)</string>
+            <string>Apple Disk II NG controller (16-sector)</string>
            <key>devname</key>
            <string>a2diskiing</string>
          </dict>
@@ -150,7 +150,7 @@
            <key>value</key>
            <string>a9fdchle</string>
            <key>description</key>
-            <string>Agat 840K Floppy Card</string>
+            <string>Agat 840K floppy card</string>
            <key>devname</key>
            <string>agat840k_hle</string>
          </dict>
@@ -158,7 +158,7 @@
            <key>value</key>
            <string>a9fdc</string>
            <key>description</key>
-            <string>Agat 840K Floppy Controller Card</string>
+            <string>Agat 840K floppy controller card</string>
            <key>devname</key>
            <string>agat_fdc</string>
          </dict>
@@ -174,7 +174,7 @@
            <key>value</key>
            <string>a9fdc140</string>
            <key>description</key>
-            <string>Agat-9 140K Floppy Card</string>
+            <string>Agat-9 140K floppy card</string>
            <key>devname</key>
            <string>agat9_flop</string>
          </dict>
@@ -182,7 +182,7 @@
            <key>value</key>
            <string>diskiing</string>
            <key>description</key>
-            <string>Apple Disk II NG Controller (16-sector)</string>
+            <string>Apple Disk II NG controller (16-sector)</string>
            <key>devname</key>
            <string>a2diskiing</string>
          </dict>
@@ -215,7 +215,7 @@
            <key>value</key>
            <string>a9fdchle</string>
            <key>description</key>
-            <string>Agat 840K Floppy Card</string>
+            <string>Agat 840K floppy card</string>
            <key>devname</key>
            <string>agat840k_hle</string>
          </dict>
@@ -223,7 +223,7 @@
            <key>value</key>
            <string>a9fdc</string>
            <key>description</key>
-            <string>Agat 840K Floppy Controller Card</string>
+            <string>Agat 840K floppy controller card</string>
            <key>devname</key>
            <string>agat_fdc</string>
          </dict>
@@ -239,7 +239,7 @@
            <key>value</key>
            <string>a9fdc140</string>
            <key>description</key>
-            <string>Agat-9 140K Floppy Card</string>
+            <string>Agat-9 140K floppy card</string>
            <key>devname</key>
            <string>agat9_flop</string>
          </dict>
@@ -247,7 +247,7 @@
            <key>value</key>
            <string>diskiing</string>
            <key>description</key>
-            <string>Apple Disk II NG Controller (16-sector)</string>
+            <string>Apple Disk II NG controller (16-sector)</string>
            <key>devname</key>
            <string>a2diskiing</string>
          </dict>
@@ -280,7 +280,7 @@
            <key>value</key>
            <string>a9fdchle</string>
            <key>description</key>
-            <string>Agat 840K Floppy Card</string>
+            <string>Agat 840K floppy card</string>
            <key>devname</key>
            <string>agat840k_hle</string>
          </dict>
@@ -288,7 +288,7 @@
            <key>value</key>
            <string>a9fdc</string>
            <key>description</key>
-            <string>Agat 840K Floppy Controller Card</string>
+            <string>Agat 840K floppy controller card</string>
            <key>devname</key>
            <string>agat_fdc</string>
          </dict>
@@ -304,7 +304,7 @@
            <key>value</key>
            <string>a9fdc140</string>
            <key>description</key>
-            <string>Agat-9 140K Floppy Card</string>
+            <string>Agat-9 140K floppy card</string>
            <key>devname</key>
            <string>agat9_flop</string>
          </dict>
@@ -312,7 +312,7 @@
            <key>value</key>
            <string>diskiing</string>
            <key>description</key>
-            <string>Apple Disk II NG Controller (16-sector)</string>
+            <string>Apple Disk II NG controller (16-sector)</string>
            <key>devname</key>
            <string>a2diskiing</string>
          </dict>
@@ -345,7 +345,7 @@
            <key>value</key>
            <string>a9fdchle</string>
            <key>description</key>
-            <string>Agat 840K Floppy Card</string>
+            <string>Agat 840K floppy card</string>
            <key>devname</key>
            <string>agat840k_hle</string>
          </dict>
@@ -353,7 +353,7 @@
            <key>value</key>
            <string>a9fdc</string>
            <key>description</key>
-            <string>Agat 840K Floppy Controller Card</string>
+            <string>Agat 840K floppy controller card</string>
            <key>default</key>
            <true/>
            <key>devname</key>
@@ -371,7 +371,7 @@
            <key>value</key>
            <string>a9fdc140</string>
            <key>description</key>
-            <string>Agat-9 140K Floppy Card</string>
+            <string>Agat-9 140K floppy card</string>
            <key>devname</key>
            <string>agat9_flop</string>
          </dict>
@@ -379,7 +379,7 @@
            <key>value</key>
            <string>diskiing</string>
            <key>description</key>
-            <string>Apple Disk II NG Controller (16-sector)</string>
+            <string>Apple Disk II NG controller (16-sector)</string>
            <key>devname</key>
            <string>a2diskiing</string>
          </dict>
@@ -412,7 +412,7 @@
            <key>value</key>
            <string>a9fdchle</string>
            <key>description</key>
-            <string>Agat 840K Floppy Card</string>
+            <string>Agat 840K floppy card</string>
            <key>devname</key>
            <string>agat840k_hle</string>
          </dict>
@@ -420,7 +420,7 @@
            <key>value</key>
            <string>a9fdc</string>
            <key>description</key>
-            <string>Agat 840K Floppy Controller Card</string>
+            <string>Agat 840K floppy controller card</string>
            <key>devname</key>
            <string>agat_fdc</string>
          </dict>
@@ -436,7 +436,7 @@
            <key>value</key>
            <string>a9fdc140</string>
            <key>description</key>
-            <string>Agat-9 140K Floppy Card</string>
+            <string>Agat-9 140K floppy card</string>
            <key>default</key>
            <true/>
            <key>devname</key>
@@ -446,7 +446,7 @@
            <key>value</key>
            <string>diskiing</string>
            <key>description</key>
-            <string>Apple Disk II NG Controller (16-sector)</string>
+            <string>Apple Disk II NG controller (16-sector)</string>
            <key>devname</key>
            <string>a2diskiing</string>
          </dict>
@@ -460,39 +460,6 @@
          </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>
@@ -633,22 +600,6 @@
                <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>
@@ -665,22 +616,6 @@
                <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>
@@ -689,14 +624,6 @@
                <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>
@@ -729,195 +656,6 @@
                <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>
@@ -12,7 +12,7 @@
    <key>resolution</key>
    <array>
      <integer>560</integer>
-      <integer>192</integer>
+      <integer>384</integer>
    </array>
    <key>slots</key>
    <array>
@@ -164,7 +164,7 @@
            <key>value</key>
            <string>cassette</string>
            <key>description</key>
-            <string>Apple I Cassette Board</string>
+            <string>Apple I cassette board</string>
            <key>default</key>
            <true/>
            <key>devname</key>
@@ -179,7 +179,7 @@
            <key>value</key>
            <string>cffa</string>
            <key>description</key>
-            <string>CFFA Compact Flash For Apple I</string>
+            <string>CFFA Compact Flash for Apple I</string>
            <key>devname</key>
            <string>cffa1</string>
          </dict>
@@ -240,22 +240,6 @@
                <key>default</key>
                <false/>
              </dict>
-              <dict>
-                <key>value</key>
-                <string>cr589</string>
-                <key>description</key>
-                <string>Matsushita CR589 CD-ROM Drive</string>
-                <key>default</key>
-                <false/>
-              </dict>
-              <dict>
-                <key>value</key>
-                <string>xm3301</string>
-                <key>description</key>
-                <string>Toshiba XM-3301 CD-ROM Drive</string>
-                <key>default</key>
-                <false/>
-              </dict>
            </array>
          </dict>
          <dict>
@@ -305,76 +289,6 @@
                <key>default</key>
                <false/>
              </dict>
-              <dict>
-                <key>value</key>
-                <string>cr589</string>
-                <key>description</key>
-                <string>Matsushita CR589 CD-ROM Drive</string>
-                <key>default</key>
-                <false/>
-              </dict>
-              <dict>
-                <key>value</key>
-                <string>xm3301</string>
-                <key>description</key>
-                <string>Toshiba XM-3301 CD-ROM Drive</string>
-                <key>default</key>
-                <false/>
-              </dict>
-            </array>
-          </dict>
-        </array>
-      </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>
@@ -12,7 +12,7 @@
    <key>resolution</key>
    <array>
      <integer>560</integer>
-      <integer>192</integer>
+      <integer>384</integer>
    </array>
    <key>slots</key>
    <array>
@@ -73,7 +73,7 @@
            <key>value</key>
            <string>joy</string>
            <key>description</key>
-            <string>Apple II Analog Joysticks</string>
+            <string>Apple II analog joysticks</string>
            <key>devname</key>
            <string>a2joy</string>
          </dict>
@@ -81,10 +81,31 @@
            <key>value</key>
            <string>paddles</string>
            <key>description</key>
-            <string>Apple II Paddles</string>
+            <string>Apple II paddles</string>
            <key>devname</key>
            <string>a2pdls</string>
          </dict>
+          <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>
@@ -102,22 +123,6 @@
            <key>default</key>
            <true/>
          </dict>
-          <dict>
-            <key>value</key>
-            <string>auto3a</string>
-            <key>description</key>
-            <string>Auto-baud ADM-3A Terminal</string>
-            <key>devname</key>
-            <string>auto3a_terminal</string>
-          </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>
@@ -126,35 +131,11 @@
            <key>devname</key>
            <string>ie15_terminal</string>
          </dict>
-          <dict>
-            <key>value</key>
-            <string>scorpion</string>
-            <key>description</key>
-            <string>Micro-Robotics Scorpion Intelligent Controller</string>
-            <key>devname</key>
-            <string>scorpion_ic</string>
-          </dict>
-          <dict>
-            <key>value</key>
-            <string>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>
@@ -166,11 +147,19 @@
            <key>devname</key>
            <string>rs_serial_printer</string>
          </dict>
+          <dict>
+            <key>value</key>
+            <string>patch</string>
+            <key>description</key>
+            <string>RS-232 Patch Box</string>
+            <key>devname</key>
+            <string>rs232_patch_box</string>
+          </dict>
          <dict>
            <key>value</key>
            <string>loopback</string>
            <key>description</key>
-            <string>RS-232 Loopback</string>
+            <string>RS232 Loopback</string>
            <key>devname</key>
            <string>rs232_loopback</string>
          </dict>
@@ -178,7 +167,7 @@
            <key>value</key>
            <string>dec_loopback</string>
            <key>description</key>
-            <string>RS-232 Loopback (DEC 12-15336-00)</string>
+            <string>RS232 Loopback (DEC 12-15336-00)</string>
            <key>devname</key>
            <string>dec_rs232_loopback</string>
          </dict>
@@ -186,7 +175,7 @@
            <key>value</key>
            <string>null_modem</string>
            <key>description</key>
-            <string>RS-232 Null Modem</string>
+            <string>RS232 Null Modem</string>
            <key>devname</key>
            <string>null_modem</string>
            <key>media</key>
@@ -195,19 +184,11 @@
              <integer>1</integer>
            </dict>
          </dict>
-          <dict>
-            <key>value</key>
-            <string>patch</string>
-            <key>description</key>
-            <string>RS-232 Patch Box</string>
-            <key>devname</key>
-            <string>rs232_patch_box</string>
-          </dict>
          <dict>
            <key>value</key>
            <string>rs232_sync_io</string>
            <key>description</key>
-            <string>RS-232 Synchronous I/O</string>
+            <string>RS232 Synchronous I/O</string>
            <key>devname</key>
            <string>rs232_sync_io</string>
            <key>media</key>
@@ -240,14 +221,6 @@
            <key>devname</key>
            <string>serial_terminal</string>
          </dict>
-          <dict>
-            <key>value</key>
-            <string>s97801</string>
-            <key>description</key>
-            <string>Siemens 97801 Terminal (RS-232)</string>
-            <key>devname</key>
-            <string>s97801_terminal</string>
-          </dict>
          <dict>
            <key>value</key>
            <string>sunkbd</string>
@@ -272,14 +245,6 @@
            <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>
@@ -297,22 +262,6 @@
            <key>default</key>
            <true/>
          </dict>
-          <dict>
-            <key>value</key>
-            <string>auto3a</string>
-            <key>description</key>
-            <string>Auto-baud ADM-3A Terminal</string>
-            <key>devname</key>
-            <string>auto3a_terminal</string>
-          </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>
@@ -321,35 +270,11 @@
            <key>devname</key>
            <string>ie15_terminal</string>
          </dict>
-          <dict>
-            <key>value</key>
-            <string>scorpion</string>
-            <key>description</key>
-            <string>Micro-Robotics Scorpion Intelligent Controller</string>
-            <key>devname</key>
-            <string>scorpion_ic</string>
-          </dict>
-          <dict>
-            <key>value</key>
-            <string>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>
@@ -361,11 +286,19 @@
            <key>devname</key>
            <string>rs_serial_printer</string>
          </dict>
+          <dict>
+            <key>value</key>
+            <string>patch</string>
+            <key>description</key>
+            <string>RS-232 Patch Box</string>
+            <key>devname</key>
+            <string>rs232_patch_box</string>
+          </dict>
          <dict>
            <key>value</key>
            <string>loopback</string>
            <key>description</key>
-            <string>RS-232 Loopback</string>
+            <string>RS232 Loopback</string>
            <key>devname</key>
            <string>rs232_loopback</string>
          </dict>
@@ -373,7 +306,7 @@
            <key>value</key>
            <string>dec_loopback</string>
            <key>description</key>
-            <string>RS-232 Loopback (DEC 12-15336-00)</string>
+            <string>RS232 Loopback (DEC 12-15336-00)</string>
            <key>devname</key>
            <string>dec_rs232_loopback</string>
          </dict>
@@ -381,7 +314,7 @@
            <key>value</key>
            <string>null_modem</string>
            <key>description</key>
-            <string>RS-232 Null Modem</string>
+            <string>RS232 Null Modem</string>
            <key>devname</key>
            <string>null_modem</string>
            <key>media</key>
@@ -390,19 +323,11 @@
              <integer>1</integer>
            </dict>
          </dict>
-          <dict>
-            <key>value</key>
-            <string>patch</string>
-            <key>description</key>
-            <string>RS-232 Patch Box</string>
-            <key>devname</key>
-            <string>rs232_patch_box</string>
-          </dict>
          <dict>
            <key>value</key>
            <string>rs232_sync_io</string>
            <key>description</key>
-            <string>RS-232 Synchronous I/O</string>
+            <string>RS232 Synchronous I/O</string>
            <key>devname</key>
            <string>rs232_sync_io</string>
            <key>media</key>
@@ -435,14 +360,6 @@
            <key>devname</key>
            <string>serial_terminal</string>
          </dict>
-          <dict>
-            <key>value</key>
-            <string>s97801</string>
-            <key>description</key>
-            <string>Siemens 97801 Terminal (RS-232)</string>
-            <key>devname</key>
-            <string>s97801_terminal</string>
-          </dict>
          <dict>
            <key>value</key>
            <string>sunkbd</string>
@@ -467,14 +384,6 @@
            <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>
@@ -543,114 +452,6 @@
          </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>
@@ -669,22 +470,6 @@
                <key>default</key>
                <true/>
              </dict>
-              <dict>
-                <key>value</key>
-                <string>auto3a</string>
-                <key>description</key>
-                <string>Auto-baud ADM-3A Terminal</string>
-                <key>default</key>
-                <false/>
-              </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>
@@ -693,35 +478,11 @@
                <key>default</key>
                <false/>
              </dict>
-              <dict>
-                <key>value</key>
-                <string>scorpion</string>
-                <key>description</key>
-                <string>Micro-Robotics Scorpion Intelligent Controller</string>
-                <key>default</key>
-                <false/>
-              </dict>
-              <dict>
-                <key>value</key>
-                <string>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>
@@ -733,11 +494,19 @@
                <key>default</key>
                <false/>
              </dict>
+              <dict>
+                <key>value</key>
+                <string>patch</string>
+                <key>description</key>
+                <string>RS-232 Patch Box</string>
+                <key>default</key>
+                <false/>
+              </dict>
              <dict>
                <key>value</key>
                <string>loopback</string>
                <key>description</key>
-                <string>RS-232 Loopback</string>
+                <string>RS232 Loopback</string>
                <key>default</key>
                <false/>
              </dict>
@@ -745,7 +514,7 @@
                <key>value</key>
                <string>dec_loopback</string>
                <key>description</key>
-                <string>RS-232 Loopback (DEC 12-15336-00)</string>
+                <string>RS232 Loopback (DEC 12-15336-00)</string>
                <key>default</key>
                <false/>
              </dict>
@@ -753,7 +522,7 @@
                <key>value</key>
                <string>null_modem</string>
                <key>description</key>
-                <string>RS-232 Null Modem</string>
+                <string>RS232 Null Modem</string>
                <key>default</key>
                <false/>
                <key>media</key>
@@ -762,19 +531,11 @@
                  <integer>1</integer>
                </dict>
              </dict>
-              <dict>
-                <key>value</key>
-                <string>patch</string>
-                <key>description</key>
-                <string>RS-232 Patch Box</string>
-                <key>default</key>
-                <false/>
-              </dict>
              <dict>
                <key>value</key>
                <string>rs232_sync_io</string>
                <key>description</key>
-                <string>RS-232 Synchronous I/O</string>
+                <string>RS232 Synchronous I/O</string>
                <key>default</key>
                <false/>
                <key>media</key>
@@ -807,14 +568,6 @@
                <key>default</key>
                <false/>
              </dict>
-              <dict>
-                <key>value</key>
-                <string>s97801</string>
-                <key>description</key>
-                <string>Siemens 97801 Terminal (RS-232)</string>
-                <key>default</key>
-                <false/>
-              </dict>
              <dict>
                <key>value</key>
                <string>sunkbd</string>
@@ -839,122 +592,6 @@
                <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>
@@ -977,14 +614,6 @@
                <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>
@@ -12,7 +12,7 @@
    <key>resolution</key>
    <array>
      <integer>560</integer>
-      <integer>192</integer>
+      <integer>384</integer>
    </array>
    <key>slots</key>
    <array>
@@ -113,7 +113,7 @@
            <key>value</key>
            <string>joy</string>
            <key>description</key>
-            <string>Apple II Analog Joysticks</string>
+            <string>Apple II analog joysticks</string>
            <key>devname</key>
            <string>a2joy</string>
          </dict>
@@ -121,10 +121,31 @@
            <key>value</key>
            <string>paddles</string>
            <key>description</key>
-            <string>Apple II Paddles</string>
+            <string>Apple II paddles</string>
            <key>devname</key>
            <string>a2pdls</string>
          </dict>
+          <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>
@@ -142,22 +163,6 @@
            <key>default</key>
            <true/>
          </dict>
-          <dict>
-            <key>value</key>
-            <string>auto3a</string>
-            <key>description</key>
-            <string>Auto-baud ADM-3A Terminal</string>
-            <key>devname</key>
-            <string>auto3a_terminal</string>
-          </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>
@@ -166,35 +171,11 @@
            <key>devname</key>
            <string>ie15_terminal</string>
          </dict>
-          <dict>
-            <key>value</key>
-            <string>scorpion</string>
-            <key>description</key>
-            <string>Micro-Robotics Scorpion Intelligent Controller</string>
-            <key>devname</key>
-            <string>scorpion_ic</string>
-          </dict>
-          <dict>
-            <key>value</key>
-            <string>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>
@@ -206,11 +187,19 @@
            <key>devname</key>
            <string>rs_serial_printer</string>
          </dict>
+          <dict>
+            <key>value</key>
+            <string>patch</string>
+            <key>description</key>
+            <string>RS-232 Patch Box</string>
+            <key>devname</key>
+            <string>rs232_patch_box</string>
+          </dict>
          <dict>
            <key>value</key>
            <string>loopback</string>
            <key>description</key>
-            <string>RS-232 Loopback</string>
+            <string>RS232 Loopback</string>
            <key>devname</key>
            <string>rs232_loopback</string>
          </dict>
@@ -218,7 +207,7 @@
            <key>value</key>
            <string>dec_loopback</string>
            <key>description</key>
-            <string>RS-232 Loopback (DEC 12-15336-00)</string>
+            <string>RS232 Loopback (DEC 12-15336-00)</string>
            <key>devname</key>
            <string>dec_rs232_loopback</string>
          </dict>
@@ -226,7 +215,7 @@
            <key>value</key>
            <string>null_modem</string>
            <key>description</key>
-            <string>RS-232 Null Modem</string>
+            <string>RS232 Null Modem</string>
            <key>devname</key>
            <string>null_modem</string>
            <key>media</key>
@@ -235,19 +224,11 @@
              <integer>1</integer>
            </dict>
          </dict>
-          <dict>
-            <key>value</key>
-            <string>patch</string>
-            <key>description</key>
-            <string>RS-232 Patch Box</string>
-            <key>devname</key>
-            <string>rs232_patch_box</string>
-          </dict>
          <dict>
            <key>value</key>
            <string>rs232_sync_io</string>
            <key>description</key>
-            <string>RS-232 Synchronous I/O</string>
+            <string>RS232 Synchronous I/O</string>
            <key>devname</key>
            <string>rs232_sync_io</string>
            <key>media</key>
@@ -280,14 +261,6 @@
            <key>devname</key>
            <string>serial_terminal</string>
          </dict>
-          <dict>
-            <key>value</key>
-            <string>s97801</string>
-            <key>description</key>
-            <string>Siemens 97801 Terminal (RS-232)</string>
-            <key>devname</key>
-            <string>s97801_terminal</string>
-          </dict>
          <dict>
            <key>value</key>
            <string>sunkbd</string>
@@ -312,14 +285,6 @@
            <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>
@@ -337,22 +302,6 @@
            <key>default</key>
            <true/>
          </dict>
-          <dict>
-            <key>value</key>
-            <string>auto3a</string>
-            <key>description</key>
-            <string>Auto-baud ADM-3A Terminal</string>
-            <key>devname</key>
-            <string>auto3a_terminal</string>
-          </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>
@@ -361,35 +310,11 @@
            <key>devname</key>
            <string>ie15_terminal</string>
          </dict>
-          <dict>
-            <key>value</key>
-            <string>scorpion</string>
-            <key>description</key>
-            <string>Micro-Robotics Scorpion Intelligent Controller</string>
-            <key>devname</key>
-            <string>scorpion_ic</string>
-          </dict>
-          <dict>
-            <key>value</key>
-            <string>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>
@@ -401,11 +326,19 @@
            <key>devname</key>
            <string>rs_serial_printer</string>
          </dict>
+          <dict>
+            <key>value</key>
+            <string>patch</string>
+            <key>description</key>
+            <string>RS-232 Patch Box</string>
+            <key>devname</key>
+            <string>rs232_patch_box</string>
+          </dict>
          <dict>
            <key>value</key>
            <string>loopback</string>
            <key>description</key>
-            <string>RS-232 Loopback</string>
+            <string>RS232 Loopback</string>
            <key>devname</key>
            <string>rs232_loopback</string>
          </dict>
@@ -413,7 +346,7 @@
            <key>value</key>
            <string>dec_loopback</string>
            <key>description</key>
-            <string>RS-232 Loopback (DEC 12-15336-00)</string>
+            <string>RS232 Loopback (DEC 12-15336-00)</string>
            <key>devname</key>
            <string>dec_rs232_loopback</string>
          </dict>
@@ -421,7 +354,7 @@
            <key>value</key>
            <string>null_modem</string>
            <key>description</key>
-            <string>RS-232 Null Modem</string>
+            <string>RS232 Null Modem</string>
            <key>devname</key>
            <string>null_modem</string>
            <key>media</key>
@@ -430,19 +363,11 @@
              <integer>1</integer>
            </dict>
          </dict>
-          <dict>
-            <key>value</key>
-            <string>patch</string>
-            <key>description</key>
-            <string>RS-232 Patch Box</string>
-            <key>devname</key>
-            <string>rs232_patch_box</string>
-          </dict>
          <dict>
            <key>value</key>
            <string>rs232_sync_io</string>
            <key>description</key>
-            <string>RS-232 Synchronous I/O</string>
+            <string>RS232 Synchronous I/O</string>
            <key>devname</key>
            <string>rs232_sync_io</string>
            <key>media</key>
@@ -475,14 +400,6 @@
            <key>devname</key>
            <string>serial_terminal</string>
          </dict>
-          <dict>
-            <key>value</key>
-            <string>s97801</string>
-            <key>description</key>
-            <string>Siemens 97801 Terminal (RS-232)</string>
-            <key>devname</key>
-            <string>s97801_terminal</string>
-          </dict>
          <dict>
            <key>value</key>
            <string>sunkbd</string>
@@ -507,14 +424,6 @@
            <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>
@@ -691,114 +600,6 @@
          </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>
@@ -817,22 +618,6 @@
                <key>default</key>
                <true/>
              </dict>
-              <dict>
-                <key>value</key>
-                <string>auto3a</string>
-                <key>description</key>
-                <string>Auto-baud ADM-3A Terminal</string>
-                <key>default</key>
-                <false/>
-              </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>
@@ -841,35 +626,11 @@
                <key>default</key>
                <false/>
              </dict>
-              <dict>
-                <key>value</key>
-                <string>scorpion</string>
-                <key>description</key>
-                <string>Micro-Robotics Scorpion Intelligent Controller</string>
-                <key>default</key>
-                <false/>
-              </dict>
-              <dict>
-                <key>value</key>
-                <string>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>
@@ -881,11 +642,19 @@
                <key>default</key>
                <false/>
              </dict>
+              <dict>
+                <key>value</key>
+                <string>patch</string>
+                <key>description</key>
+                <string>RS-232 Patch Box</string>
+                <key>default</key>
+                <false/>
+              </dict>
              <dict>
                <key>value</key>
                <string>loopback</string>
                <key>description</key>
-                <string>RS-232 Loopback</string>
+                <string>RS232 Loopback</string>
                <key>default</key>
                <false/>
              </dict>
@@ -893,7 +662,7 @@
                <key>value</key>
                <string>dec_loopback</string>
                <key>description</key>
-                <string>RS-232 Loopback (DEC 12-15336-00)</string>
+                <string>RS232 Loopback (DEC 12-15336-00)</string>
                <key>default</key>
                <false/>
              </dict>
@@ -901,7 +670,7 @@
                <key>value</key>
                <string>null_modem</string>
                <key>description</key>
-                <string>RS-232 Null Modem</string>
+                <string>RS232 Null Modem</string>
                <key>default</key>
                <false/>
                <key>media</key>
@@ -910,19 +679,11 @@
                  <integer>1</integer>
                </dict>
              </dict>
-              <dict>
-                <key>value</key>
-                <string>patch</string>
-                <key>description</key>
-                <string>RS-232 Patch Box</string>
-                <key>default</key>
-                <false/>
-              </dict>
              <dict>
                <key>value</key>
                <string>rs232_sync_io</string>
                <key>description</key>
-                <string>RS-232 Synchronous I/O</string>
+                <string>RS232 Synchronous I/O</string>
                <key>default</key>
                <false/>
                <key>media</key>
@@ -955,14 +716,6 @@
                <key>default</key>
                <false/>
              </dict>
-              <dict>
-                <key>value</key>
-                <string>s97801</string>
-                <key>description</key>
-                <string>Siemens 97801 Terminal (RS-232)</string>
-                <key>default</key>
-                <false/>
-              </dict>
              <dict>
                <key>value</key>
                <string>sunkbd</string>
@@ -987,122 +740,6 @@
                <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>
@@ -1125,14 +762,6 @@
                <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>
@@ -1,802 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-  <dict>
-    <key>value</key>
-    <string>bbca</string>
-    <key>description</key>
-    <string>BBC Micro Model A</string>
-    <key>media</key>
-    <dict>
-      <key>cass</key>
-      <integer>1</integer>
-      <key>rom</key>
-      <integer>4</integer>
-    </dict>
-    <key>resolution</key>
-    <array>
-      <integer>640</integer>
-      <integer>256</integer>
-    </array>
-    <key>slots</key>
-    <array>
-      <dict>
-        <key>name</key>
-        <string>ramsize</string>
-        <key>description</key>
-        <string>RAM</string>
-        <key>options</key>
-        <array>
-          <dict>
-            <key>intValue</key>
-            <integer>16384</integer>
-            <key>description</key>
-            <string>16K</string>
-            <key>value</key>
-            <string>16K</string>
-            <key>default</key>
-            <true/>
-          </dict>
-          <dict>
-            <key>intValue</key>
-            <integer>32768</integer>
-            <key>description</key>
-            <string>32K</string>
-            <key>value</key>
-            <string>32K</string>
-            <key>default</key>
-            <false/>
-          </dict>
-        </array>
-      </dict>
-      <dict>
-        <key>name</key>
-        <string>bios</string>
-        <key>description</key>
-        <string>ROM</string>
-        <key>options</key>
-        <array>
-          <dict>
-            <key>value</key>
-            <string></string>
-            <key>description</key>
-            <string>—Default—</string>
-            <key>default</key>
-            <true/>
-          </dict>
-          <dict>
-            <key>value</key>
-            <string>120</string>
-            <key>description</key>
-            <string>OS 1.20</string>
-          </dict>
-          <dict>
-            <key>value</key>
-            <string>100</string>
-            <key>description</key>
-            <string>OS 1.00</string>
-          </dict>
-          <dict>
-            <key>value</key>
-            <string>092</string>
-            <key>description</key>
-            <string>OS 0.92</string>
-          </dict>
-          <dict>
-            <key>value</key>
-            <string>010</string>
-            <key>description</key>
-            <string>OS 0.10</string>
-          </dict>
-        </array>
-      </dict>
-      <dict>
-        <key>name</key>
-        <string>rs423</string>
-        <key>description</key>
-        <string>Serial</string>
-        <key>options</key>
-        <array>
-          <dict>
-            <key>value</key>
-            <string></string>
-            <key>description</key>
-            <string>—None—</string>
-            <key>default</key>
-            <true/>
-          </dict>
-          <dict>
-            <key>value</key>
-            <string>auto3a</string>
-            <key>description</key>
-            <string>Auto-baud ADM-3A Terminal</string>
-            <key>devname</key>
-            <string>auto3a_terminal</string>
-          </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>
-            <key>description</key>
-            <string>IE15 Terminal</string>
-            <key>devname</key>
-            <string>ie15_terminal</string>
-          </dict>
-          <dict>
-            <key>value</key>
-            <string>scorpion</string>
-            <key>description</key>
-            <string>Micro-Robotics Scorpion Intelligent Controller</string>
-            <key>devname</key>
-            <string>scorpion_ic</string>
-          </dict>
-          <dict>
-            <key>value</key>
-            <string>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>
-            <key>devname</key>
-            <string>pseudo_terminal</string>
-          </dict>
-          <dict>
-            <key>value</key>
-            <string>rs_printer</string>
-            <key>description</key>
-            <string>Radio Shack Serial Printer</string>
-            <key>devname</key>
-            <string>rs_serial_printer</string>
-          </dict>
-          <dict>
-            <key>value</key>
-            <string>loopback</string>
-            <key>description</key>
-            <string>RS-232 Loopback</string>
-            <key>devname</key>
-            <string>rs232_loopback</string>
-          </dict>
-          <dict>
-            <key>value</key>
-            <string>dec_loopback</string>
-            <key>description</key>
-            <string>RS-232 Loopback (DEC 12-15336-00)</string>
-            <key>devname</key>
-            <string>dec_rs232_loopback</string>
-          </dict>
-          <dict>
-            <key>value</key>
-            <string>null_modem</string>
-            <key>description</key>
-            <string>RS-232 Null Modem</string>
-            <key>devname</key>
-            <string>null_modem</string>
-            <key>media</key>
-            <dict>
-              <key>bitbanger</key>
-              <integer>1</integer>
-            </dict>
-          </dict>
-          <dict>
-            <key>value</key>
-            <string>patch</string>
-            <key>description</key>
-            <string>RS-232 Patch Box</string>
-            <key>devname</key>
-            <string>rs232_patch_box</string>
-          </dict>
-          <dict>
-            <key>value</key>
-            <string>rs232_sync_io</string>
-            <key>description</key>
-            <string>RS-232 Synchronous I/O</string>
-            <key>devname</key>
-            <string>rs232_sync_io</string>
-            <key>media</key>
-            <dict>
-              <key>bitbanger</key>
-              <integer>1</integer>
-            </dict>
-          </dict>
-          <dict>
-            <key>value</key>
-            <string>keyboard</string>
-            <key>description</key>
-            <string>Serial Keyboard</string>
-            <key>devname</key>
-            <string>serial_keyboard</string>
-          </dict>
-          <dict>
-            <key>value</key>
-            <string>printer</string>
-            <key>description</key>
-            <string>Serial Printer</string>
-            <key>devname</key>
-            <string>serial_printer</string>
-          </dict>
-          <dict>
-            <key>value</key>
-            <string>terminal</string>
-            <key>description</key>
-            <string>Serial Terminal</string>
-            <key>devname</key>
-            <string>serial_terminal</string>
-          </dict>
-          <dict>
-            <key>value</key>
-            <string>s97801</string>
-            <key>description</key>
-            <string>Siemens 97801 Terminal (RS-232)</string>
-            <key>devname</key>
-            <string>s97801_terminal</string>
-          </dict>
-          <dict>
-            <key>value</key>
-            <string>sunkbd</string>
-            <key>description</key>
-            <string>Sun Keyboard Adaptor</string>
-            <key>devname</key>
-            <string>sunkbd_adaptor</string>
-          </dict>
-          <dict>
-            <key>value</key>
-            <string>mockingboard</string>
-            <key>description</key>
-            <string>Sweet Micro Systems Mockingboard D</string>
-            <key>devname</key>
-            <string>mockingboardd</string>
-          </dict>
-          <dict>
-            <key>value</key>
-            <string>swtpc8212</string>
-            <key>description</key>
-            <string>SWTPC8212 Terminal</string>
-            <key>devname</key>
-            <string>swtpc8212_terminal</string>
-          </dict>
-          <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>
-        <key>slots</key>
-        <array>
-          <dict>
-            <key>name</key>
-            <string>:dce</string>
-            <key>options</key>
-            <array>
-              <dict>
-                <key>value</key>
-                <string></string>
-                <key>description</key>
-                <string>—None—</string>
-                <key>default</key>
-                <true/>
-              </dict>
-              <dict>
-                <key>value</key>
-                <string>auto3a</string>
-                <key>description</key>
-                <string>Auto-baud ADM-3A Terminal</string>
-                <key>default</key>
-                <false/>
-              </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>
-                <key>description</key>
-                <string>IE15 Terminal</string>
-                <key>default</key>
-                <false/>
-              </dict>
-              <dict>
-                <key>value</key>
-                <string>scorpion</string>
-                <key>description</key>
-                <string>Micro-Robotics Scorpion Intelligent Controller</string>
-                <key>default</key>
-                <false/>
-              </dict>
-              <dict>
-                <key>value</key>
-                <string>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>
-                <key>default</key>
-                <false/>
-              </dict>
-              <dict>
-                <key>value</key>
-                <string>rs_printer</string>
-                <key>description</key>
-                <string>Radio Shack Serial Printer</string>
-                <key>default</key>
-                <false/>
-              </dict>
-              <dict>
-                <key>value</key>
-                <string>loopback</string>
-                <key>description</key>
-                <string>RS-232 Loopback</string>
-                <key>default</key>
-                <false/>
-              </dict>
-              <dict>
-                <key>value</key>
-                <string>dec_loopback</string>
-                <key>description</key>
-                <string>RS-232 Loopback (DEC 12-15336-00)</string>
-                <key>default</key>
-                <false/>
-              </dict>
-              <dict>
-                <key>value</key>
-                <string>null_modem</string>
-                <key>description</key>
-                <string>RS-232 Null Modem</string>
-                <key>default</key>
-                <false/>
-                <key>media</key>
-                <dict>
-                  <key>bitbanger</key>
-                  <integer>1</integer>
-                </dict>
-              </dict>
-              <dict>
-                <key>value</key>
-                <string>patch</string>
-                <key>description</key>
-                <string>RS-232 Patch Box</string>
-                <key>default</key>
-                <false/>
-              </dict>
-              <dict>
-                <key>value</key>
-                <string>rs232_sync_io</string>
-                <key>description</key>
-                <string>RS-232 Synchronous I/O</string>
-                <key>default</key>
-                <false/>
-                <key>media</key>
-                <dict>
-                  <key>bitbanger</key>
-                  <integer>1</integer>
-                </dict>
-              </dict>
-              <dict>
-                <key>value</key>
-                <string>keyboard</string>
-                <key>description</key>
-                <string>Serial Keyboard</string>
-                <key>default</key>
-                <false/>
-              </dict>
-              <dict>
-                <key>value</key>
-                <string>printer</string>
-                <key>description</key>
-                <string>Serial Printer</string>
-                <key>default</key>
-                <false/>
-              </dict>
-              <dict>
-                <key>value</key>
-                <string>terminal</string>
-                <key>description</key>
-                <string>Serial Terminal</string>
-                <key>default</key>
-                <false/>
-              </dict>
-              <dict>
-                <key>value</key>
-                <string>s97801</string>
-                <key>description</key>
-                <string>Siemens 97801 Terminal (RS-232)</string>
-                <key>default</key>
-                <false/>
-              </dict>
-              <dict>
-                <key>value</key>
-                <string>sunkbd</string>
-                <key>description</key>
-                <string>Sun Keyboard Adaptor</string>
-                <key>default</key>
-                <false/>
-              </dict>
-              <dict>
-                <key>value</key>
-                <string>mockingboard</string>
-                <key>description</key>
-                <string>Sweet Micro Systems Mockingboard D</string>
-                <key>default</key>
-                <false/>
-              </dict>
-              <dict>
-                <key>value</key>
-                <string>swtpc8212</string>
-                <key>description</key>
-                <string>SWTPC8212 Terminal</string>
-                <key>default</key>
-                <false/>
-              </dict>
-              <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>
-      </dict>
-      <dict>
-        <key>name</key>
-        <string>sunkbd_adaptor</string>
-        <key>slots</key>
-        <array>
-          <dict>
-            <key>name</key>
-            <string>:keyboard</string>
-            <key>options</key>
-            <array>
-              <dict>
-                <key>value</key>
-                <string></string>
-                <key>description</key>
-                <string>—None—</string>
-                <key>default</key>
-                <true/>
-              </dict>
-              <dict>
-                <key>value</key>
-                <string>type2hle</string>
-                <key>description</key>
-                <string>Sun Type 2 Keyboard (HLE)</string>
-                <key>default</key>
-                <false/>
-              </dict>
-              <dict>
-                <key>value</key>
-                <string>type3hle</string>
-                <key>description</key>
-                <string>Sun Type 3 Keyboard (HLE)</string>
-                <key>default</key>
-                <false/>
-              </dict>
-              <dict>
-                <key>value</key>
-                <string>type4hle</string>
-                <key>description</key>
-                <string>Sun Type 4 Keyboard (HLE)</string>
-                <key>default</key>
-                <false/>
-              </dict>
-              <dict>
-                <key>value</key>
-                <string>type5gbhle</string>
-                <key>description</key>
-                <string>Sun Type 5 Keyboard (Great Britain - HLE)</string>
-                <key>default</key>
-                <false/>
-              </dict>
-              <dict>
-                <key>value</key>
-                <string>type5jphle</string>
-                <key>description</key>
-                <string>Sun Type 5 Keyboard (Japan - HLE)</string>
-                <key>default</key>
-                <false/>
-              </dict>
-              <dict>
-                <key>value</key>
-                <string>type5sehle</string>
-                <key>description</key>
-                <string>Sun Type 5 Keyboard (Sweden - HLE)</string>
-                <key>default</key>
-                <false/>
-              </dict>
-              <dict>
-                <key>value</key>
-                <string>type5hle</string>
-                <key>description</key>
-                <string>Sun Type 5 Keyboard (U.S.A. - HLE)</string>
-                <key>default</key>
-                <false/>
-              </dict>
-            </array>
-          </dict>
-        </array>
-      </dict>
-    </array>
-    <key>software</key>
-    <array>
-      <dict>
-        <key>name</key>
-        <string>bbc_cass.xml</string>
-        <key>filter</key>
-        <string>A</string>
-      </dict>
-      <dict>
-        <key>name</key>
-        <string>bbc_rom.xml</string>
-        <key>filter</key>
-        <string>B</string>
-      </dict>
-    </array>
-  </dict>
-</plist>
@@ -50,22 +50,6 @@
            <key>default</key>
            <true/>
          </dict>
-          <dict>
-            <key>value</key>
-            <string>auto3a</string>
-            <key>description</key>
-            <string>Auto-baud ADM-3A Terminal</string>
-            <key>devname</key>
-            <string>auto3a_terminal</string>
-          </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>
@@ -74,35 +58,11 @@
            <key>devname</key>
            <string>ie15_terminal</string>
          </dict>
-          <dict>
-            <key>value</key>
-            <string>scorpion</string>
-            <key>description</key>
-            <string>Micro-Robotics Scorpion Intelligent Controller</string>
-            <key>devname</key>
-            <string>scorpion_ic</string>
-          </dict>
-          <dict>
-            <key>value</key>
-            <string>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>
@@ -114,11 +74,19 @@
            <key>devname</key>
            <string>rs_serial_printer</string>
          </dict>
+          <dict>
+            <key>value</key>
+            <string>patch</string>
+            <key>description</key>
+            <string>RS-232 Patch Box</string>
+            <key>devname</key>
+            <string>rs232_patch_box</string>
+          </dict>
          <dict>
            <key>value</key>
            <string>loopback</string>
            <key>description</key>
-            <string>RS-232 Loopback</string>
+            <string>RS232 Loopback</string>
            <key>devname</key>
            <string>rs232_loopback</string>
          </dict>
@@ -126,7 +94,7 @@
            <key>value</key>
            <string>dec_loopback</string>
            <key>description</key>
-            <string>RS-232 Loopback (DEC 12-15336-00)</string>
+            <string>RS232 Loopback (DEC 12-15336-00)</string>
            <key>devname</key>
            <string>dec_rs232_loopback</string>
          </dict>
@@ -134,7 +102,7 @@
            <key>value</key>
            <string>null_modem</string>
            <key>description</key>
-            <string>RS-232 Null Modem</string>
+            <string>RS232 Null Modem</string>
            <key>devname</key>
            <string>null_modem</string>
            <key>media</key>
@@ -143,19 +111,11 @@
              <integer>1</integer>
            </dict>
          </dict>
-          <dict>
-            <key>value</key>
-            <string>patch</string>
-            <key>description</key>
-            <string>RS-232 Patch Box</string>
-            <key>devname</key>
-            <string>rs232_patch_box</string>
-          </dict>
          <dict>
            <key>value</key>
            <string>rs232_sync_io</string>
            <key>description</key>
-            <string>RS-232 Synchronous I/O</string>
+            <string>RS232 Synchronous I/O</string>
            <key>devname</key>
            <string>rs232_sync_io</string>
            <key>media</key>
@@ -188,14 +148,6 @@
            <key>devname</key>
            <string>serial_terminal</string>
          </dict>
-          <dict>
-            <key>value</key>
-            <string>s97801</string>
-            <key>description</key>
-            <string>Siemens 97801 Terminal (RS-232)</string>
-            <key>devname</key>
-            <string>s97801_terminal</string>
-          </dict>
          <dict>
            <key>value</key>
            <string>sunkbd</string>
@@ -220,14 +172,6 @@
            <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>
@@ -245,22 +189,6 @@
            <key>default</key>
            <true/>
          </dict>
-          <dict>
-            <key>value</key>
-            <string>auto3a</string>
-            <key>description</key>
-            <string>Auto-baud ADM-3A Terminal</string>
-            <key>devname</key>
-            <string>auto3a_terminal</string>
-          </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>
@@ -269,35 +197,11 @@
            <key>devname</key>
            <string>ie15_terminal</string>
          </dict>
-          <dict>
-            <key>value</key>
-            <string>scorpion</string>
-            <key>description</key>
-            <string>Micro-Robotics Scorpion Intelligent Controller</string>
-            <key>devname</key>
-            <string>scorpion_ic</string>
-          </dict>
-          <dict>
-            <key>value</key>
-            <string>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>
@@ -309,11 +213,19 @@
            <key>devname</key>
            <string>rs_serial_printer</string>
          </dict>
+          <dict>
+            <key>value</key>
+            <string>patch</string>
+            <key>description</key>
+            <string>RS-232 Patch Box</string>
+            <key>devname</key>
+            <string>rs232_patch_box</string>
+          </dict>
          <dict>
            <key>value</key>
            <string>loopback</string>
            <key>description</key>
-            <string>RS-232 Loopback</string>
+            <string>RS232 Loopback</string>
            <key>devname</key>
            <string>rs232_loopback</string>
          </dict>
@@ -321,7 +233,7 @@
            <key>value</key>
            <string>dec_loopback</string>
            <key>description</key>
-            <string>RS-232 Loopback (DEC 12-15336-00)</string>
+            <string>RS232 Loopback (DEC 12-15336-00)</string>
            <key>devname</key>
            <string>dec_rs232_loopback</string>
          </dict>
@@ -329,7 +241,7 @@
            <key>value</key>
            <string>null_modem</string>
            <key>description</key>
-            <string>RS-232 Null Modem</string>
+            <string>RS232 Null Modem</string>
            <key>devname</key>
            <string>null_modem</string>
            <key>media</key>
@@ -338,19 +250,11 @@
              <integer>1</integer>
            </dict>
          </dict>
-          <dict>
-            <key>value</key>
-            <string>patch</string>
-            <key>description</key>
-            <string>RS-232 Patch Box</string>
-            <key>devname</key>
-            <string>rs232_patch_box</string>
-          </dict>
          <dict>
            <key>value</key>
            <string>rs232_sync_io</string>
            <key>description</key>
-            <string>RS-232 Synchronous I/O</string>
+            <string>RS232 Synchronous I/O</string>
            <key>devname</key>
            <string>rs232_sync_io</string>
            <key>media</key>
@@ -383,14 +287,6 @@
            <key>devname</key>
            <string>serial_terminal</string>
          </dict>
-          <dict>
-            <key>value</key>
-            <string>s97801</string>
-            <key>description</key>
-            <string>Siemens 97801 Terminal (RS-232)</string>
-            <key>devname</key>
-            <string>s97801_terminal</string>
-          </dict>
          <dict>
            <key>value</key>
            <string>sunkbd</string>
@@ -415,14 +311,6 @@
            <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>
@@ -681,114 +569,6 @@
          </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>
@@ -807,22 +587,6 @@
                <key>default</key>
                <true/>
              </dict>
-              <dict>
-                <key>value</key>
-                <string>auto3a</string>
-                <key>description</key>
-                <string>Auto-baud ADM-3A Terminal</string>
-                <key>default</key>
-                <false/>
-              </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>
@@ -831,35 +595,11 @@
                <key>default</key>
                <false/>
              </dict>
-              <dict>
-                <key>value</key>
-                <string>scorpion</string>
-                <key>description</key>
-                <string>Micro-Robotics Scorpion Intelligent Controller</string>
-                <key>default</key>
-                <false/>
-              </dict>
-              <dict>
-                <key>value</key>
-                <string>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>
@@ -871,11 +611,19 @@
                <key>default</key>
                <false/>
              </dict>
+              <dict>
+                <key>value</key>
+                <string>patch</string>
+                <key>description</key>
+                <string>RS-232 Patch Box</string>
+                <key>default</key>
+                <false/>
+              </dict>
              <dict>
                <key>value</key>
                <string>loopback</string>
                <key>description</key>
-                <string>RS-232 Loopback</string>
+                <string>RS232 Loopback</string>
                <key>default</key>
                <false/>
              </dict>
@@ -883,7 +631,7 @@
                <key>value</key>
                <string>dec_loopback</string>
                <key>description</key>
-                <string>RS-232 Loopback (DEC 12-15336-00)</string>
+                <string>RS232 Loopback (DEC 12-15336-00)</string>
                <key>default</key>
                <false/>
              </dict>
@@ -891,7 +639,7 @@
                <key>value</key>
                <string>null_modem</string>
                <key>description</key>
-                <string>RS-232 Null Modem</string>
+                <string>RS232 Null Modem</string>
                <key>default</key>
                <false/>
                <key>media</key>
@@ -900,19 +648,11 @@
                  <integer>1</integer>
                </dict>
              </dict>
-              <dict>
-                <key>value</key>
-                <string>patch</string>
-                <key>description</key>
-                <string>RS-232 Patch Box</string>
-                <key>default</key>
-                <false/>
-              </dict>
              <dict>
                <key>value</key>
                <string>rs232_sync_io</string>
                <key>description</key>
-                <string>RS-232 Synchronous I/O</string>
+                <string>RS232 Synchronous I/O</string>
                <key>default</key>
                <false/>
                <key>media</key>
@@ -945,14 +685,6 @@
                <key>default</key>
                <false/>
              </dict>
-              <dict>
-                <key>value</key>
-                <string>s97801</string>
-                <key>description</key>
-                <string>Siemens 97801 Terminal (RS-232)</string>
-                <key>default</key>
-                <false/>
-              </dict>
              <dict>
                <key>value</key>
                <string>sunkbd</string>
@@ -977,122 +709,6 @@
                <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>
@@ -1115,14 +731,6 @@
                <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>
Author	SHA1	Message	Date
Kelvin Sherlock	cbf3fd5a34	improved resolution algorithm. uses rounds to nearest integer of 4:3 aspect ratio.	2023-11-13 22:29:22 -05:00
Kelvin Sherlock	3f05793466	8" floppy support (PDP 11, etc)	2023-11-13 16:11:51 -05:00
Kelvin Sherlock	bff5617e3c	fix com_port	2023-11-13 16:11:13 -05:00
Kelvin Sherlock	ba7cd6e813	8" floppy support.	2023-11-13 10:52:27 -05:00
Kelvin Sherlock	a50d621308	more slots	2023-11-12 21:22:34 -05:00
Kelvin Sherlock	62750c0aa9	update plists	2023-11-12 21:21:39 -05:00
Kelvin Sherlock	37920884e0	fix cdrom miscount, add some more slots	2023-11-12 20:22:24 -05:00
Kelvin Sherlock	09ced05403	update plist to fix cdrom errors.	2023-11-12 20:21:48 -05:00
Kelvin Sherlock	28b49a549c	Ample lite - use ~full files.	2023-11-12 18:24:23 -05:00
Kelvin Sherlock	a1f6db6bb4	add extra machines.	2023-11-12 18:24:01 -05:00
Kelvin Sherlock	6b331240c9	updated python for more machines (--extra)	2023-11-12 18:19:47 -05:00