add gui option to completely disable the log window.

The main holdup is that the software list is loaded from those installed MAME components and reinstalling them would invalidate and require a reload.

.github/workflows/xcodebuild.yml

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

.gitignore

@@ -1,6 +1,9 @@
 dist
 embedded/mame64
 embedded/SDL2.framework
+embedded/Sparkle.framework
+embedded/Sparkle-*
+embedded/SDL2-*
 build
 embedded/mame-data.tgz
 __pycache__

Ample/Ample.entitlements

@@ -4,6 +4,8 @@
 <dict>
 	<key>com.apple.security.app-sandbox</key>
 	<false/>
+	<key>com.apple.security.cs.disable-library-validation</key>
+	<true/>
 	<key>com.apple.security.files.user-selected.read-only</key>
 	<true/>
 </dict>

Ample/Ample.h

@@ -33,6 +33,7 @@ extern NSString *kMamePath;
 extern NSString *kMameWorkingDirectory;
 extern NSString *kAutoCloseLogWindow;
 extern NSString *kMameComponentsDate;
+extern NSString *kUseLogWindow;
 
 extern NSString *kDownloadURL;
 extern NSString *kDownloadExtension;
@@ -40,6 +41,9 @@ extern NSString *kDownloadExtension;
 extern NSString *kDefaultDownloadURL;
 extern NSString *kDefaultDownloadExtension;
 
+extern NSString *kNotificationDiskImageAdded;
+extern NSString *kNotificationDiskImageMagicRoute;
+extern NSString *kNotificationBookmarkMagicRoute;
 
 @protocol Bookmark <NSObject>
 -(BOOL)loadBookmark: (NSDictionary *)bookmark;

Ample/Ample.m

@@ -42,7 +42,7 @@ NSURL *MameURL(void) {
         
     if ([defaults boolForKey: kUseCustomMame]) {
         NSString *path = [defaults stringForKey: kMamePath];
-        if (![path length]) return [NSURL fileURLWithPath: path];
+        if ([path length]) return [NSURL fileURLWithPath: path];
     }
     
     return [bundle URLForAuxiliaryExecutable: @"mame64"];
@@ -129,9 +129,14 @@ NSString *kUseCustomMame = @"UseCustomMame";
 NSString *kMamePath = @"MamePath";
 NSString *kMameWorkingDirectory = @"MameWorkingDirectory";
 NSString *kAutoCloseLogWindow = @"AutoCloseLogWindow";
+NSString *kUseLogWindow = @"UseLogWindow";
 NSString *kMameComponentsDate = @"MameComponentsDate";
 NSString *kDefaultDownloadURL = @"DefaultDownloadURL";
 NSString *kDefaultDownloadExtension = @"DefaultDownloadExtension";
 
 NSString *kDownloadURL = @"DownloadURL";
 NSString *kDownloadExtension = @"DownloadExtension";
+
+NSString *kNotificationDiskImageAdded = @"Disk Image Added";
+NSString *kNotificationDiskImageMagicRoute = @"Disk Image Magic Route";
+NSString *kNotificationBookmarkMagicRoute = @"Bookmark Magic Route";

Ample/AmpleLite.m

@@ -0,0 +1,26 @@
+//
+//  AmpleLite.m
+//  Ample Lite
+//
+//  Created by Kelvin Sherlock on 6/14/2021.
+//  Copyright © 2021 Kelvin Sherlock. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+@class NSMenuItem;
+
+@interface SUUpdater : NSObject
+@end
+
+@implementation  SUUpdater
+
+- (IBAction)checkForUpdates:(id)sender {
+}
+
+
+- (BOOL)validateMenuItem:(NSMenuItem *)menuItem {
+    return NO;
+}
+
+@end

Ample/AppDelegate.h

@@ -11,6 +11,6 @@
 @interface AppDelegate : NSObject <NSApplicationDelegate>
 
 - (IBAction)displayPreferences:(id)sender;
-
+- (IBAction)manageBookmarks: (id)sender;
 @end
 

Ample/AppDelegate.m

@@ -12,6 +12,8 @@
 #import "DownloadWindowController.h"
 #import "DiskImagesWindowController.h"
 #import "CheatSheetWindowController.h"
+#import "BookmarkWindowController.h"
+
 #import "Transformers.h"
 #import "BookmarkManager.h"
 
@@ -28,6 +30,8 @@
     NSWindowController *_downloader;
     NSWindowController *_diskImages;
     NSWindowController *_cheatSheet;
+    NSWindowController *_bookmarks;
+
 }
 
 
@@ -41,9 +45,7 @@
     
     RegisterTransformers();
     
-    BookmarkManager *bm = [BookmarkManager sharedManager];
-    [bm loadBookmarks];
-    [bm updateMenu];
+    //BookmarkManager *bm = [BookmarkManager sharedManager];
     
     path = [bundle pathForResource: @"Defaults" ofType: @"plist"];
     dict = [NSDictionary dictionaryWithContentsOfFile: path];
@@ -53,17 +55,17 @@
         [[NSUserDefaults standardUserDefaults] registerDefaults: dict];
     }
     
-
-
     _diskImages = [DiskImagesWindowController sharedInstance]; //[DiskImagesWindowController new];
 
     if ([self installMameComponents]) {
 
         [self displayLaunchWindow];
     }
-
 }
 
+
+
+
 -(void)displayLaunchWindow {
 
     if (!_launcher) {
@@ -86,12 +88,21 @@
     NSDate *newDate = [defaults objectForKey: kMameComponentsDate];
     if (![newDate isKindOfClass: [NSDate class]])
         newDate = nil;
-    
+  
+
+
     if (!newDate) return YES; //????
     if (oldDate && [oldDate compare: newDate] >= 0) return YES;
 
+#if 0
     NSString *path = [bundle pathForResource: @"mame-data" ofType: @"tgz"];
     if (!path) return YES; // Ample Lite?
+#endif
+
+    NSString *ssp = [bundle sharedSupportPath];
+    NSString *path = [ssp stringByAppendingPathComponent: @"mame-data.tgz"];
+    if (![[NSFileManager defaultManager] fileExistsAtPath: path])
+        return YES; // Ample Lite?
 
     
     NSWindow *win = _installWindow;
@@ -113,11 +124,11 @@
     
     dispatch_time_t when = dispatch_time(DISPATCH_TIME_NOW, (int64_t)(2 * NSEC_PER_SEC));
     [task setTerminationHandler: ^(NSTask *task){
-       
+
+        int st = [task terminationStatus];
+        // delay so the install window is visible, I think
         dispatch_after(when, dispatch_get_main_queue(), ^{
   
-            int st = [task terminationStatus];
-
             if (st) {
                 NSAlert *alert = [NSAlert new];
                 [alert setMessageText: @"An error occurred extracting MAME components"];
@@ -146,6 +157,7 @@
 
 - (void)applicationWillTerminate:(NSNotification *)aNotification {
     // Insert code here to tear down your application
+
 }
 
 - (BOOL)applicationShouldTerminateAfterLastWindowClosed:(NSApplication *)sender {
@@ -226,6 +238,79 @@
 }
 
 
+- (IBAction)manageBookmarks: (id)sender {
+    
+    if (!_bookmarks) {
+        _bookmarks = [BookmarkWindowController new];
+    }
+    [_bookmarks showWindow: sender];
+}
 
 
+-(IBAction)installMameComponents:(id)sender {
+
+      
+      /* install the mame data components. */
+      NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
+      NSBundle *bundle = [NSBundle mainBundle];
+      NSURL *sd = SupportDirectory();
+
+      NSURL *ample_url = [sd URLByAppendingPathComponent: @"Ample.plist"];
+      NSMutableDictionary *d = [NSMutableDictionary dictionaryWithContentsOfURL: ample_url];
+      
+      //NSDate *oldDate = [d objectForKey: kMameComponentsDate];
+      NSDate *newDate = [defaults objectForKey: kMameComponentsDate];
+      if (![newDate isKindOfClass: [NSDate class]])
+          newDate = nil;
+      
+      NSString *path = [bundle pathForResource: @"mame-data" ofType: @"tgz"];
+      if (!path) return; // Ample Lite?
+
+      
+      NSWindow *win = _installWindow;
+      [win makeKeyAndOrderFront: nil];
+      NSTask *task = [NSTask new];
+      NSArray *argv = @[
+          @"xfz",
+          path
+      ];
+      if (@available(macOS 10.13, *)) {
+          [task setExecutableURL: [NSURL fileURLWithPath: @"/usr/bin/tar"]];
+          [task setCurrentDirectoryURL: sd];
+      } else {
+          [task setLaunchPath:  @"/usr/bin/tar"];
+          [task setCurrentDirectoryPath: SupportDirectoryPath()];
+      }
+      [task setArguments: argv];
+
+      
+      //dispatch_time_t when = dispatch_time(DISPATCH_TIME_NOW, (int64_t)(2 * NSEC_PER_SEC));
+      [task setTerminationHandler: ^(NSTask *task){
+
+          int st = [task terminationStatus];
+          dispatch_async(dispatch_get_main_queue(), ^{
+    
+              if (st) {
+                  NSAlert *alert = [NSAlert new];
+                  [alert setMessageText: @"An error occurred extracting MAME components"];
+                  [alert runModal];
+                  [win close];
+                  return;
+              }
+              
+              if (d) {
+                  [d setObject: newDate forKey: kMameComponentsDate];
+                  [d writeToURL: ample_url atomically: YES];
+              } else {
+                  [@{ kMameComponentsDate: newDate } writeToURL: ample_url atomically: YES];
+              }
+              [win close];
+              // need to reload the software list data.
+          });
+          
+      }];
+      [task launch];
+    
+}
+
 @end

Ample/AutocompleteControl.m

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

Ample/Base.lproj/BookmarkWindow.xib

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

Ample/Base.lproj/Credits.rtf

@@ -33,6 +33,15 @@ Please note that MAME is a registered trademark of Gregory Ember, and permission
 \cf0 \cb1 \kerning1\expnd0\expndtw0 SDL 2.0 is distributed under the {\field{\*\fldinst{HYPERLINK "https://libsdl.org/license.php"}}{\fldrslt zlib license}}. This license allows you to use SDL freely in any software.\
 \
 \pard\pardeftab720\qc\partightenfactor0
+{\field{\*\fldinst{HYPERLINK "https://sparkle-project.org/"}}{\fldrslt 
+\f0\b\fs36 \cf0 \cb3 \expnd0\expndtw0\kerning0
+Sparkle}}\
+\pard\pardeftab720\partightenfactor0
+\cf0 \
+Sparkle is open source software available under the permissive MIT license, and is developed on GitHub by the Sparkle Project with the help of dozens of valued contributors.\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\partightenfactor0
+\cf0 \
+\pard\pardeftab720\qc\partightenfactor0
 {\field{\*\fldinst{HYPERLINK "https://usdawatercolors.nal.usda.gov/pom/catalog.xhtml?id=POM00001916"}}{\fldrslt 
 \f0\b\fs36 \cf0 \cb3 \expnd0\expndtw0\kerning0
 Icon}}
@@ -42,6 +51,6 @@ Icon}}
 
 \f1\b0\fs28 \cf0 \
 \pard\pardeftab720\qj\partightenfactor0
-\cf4 \cb3 R.C. Steadman, 6-1-\'9221.\
+\cf4 R.C. Steadman, 1921-06-01.\
 \
 U.S. Department of Agriculture Pomological Watercolor Collection. Rare and Special Collections, National Agricultural Library, Beltsville, MD 20705}

Ample/Base.lproj/DiskImages.xib

@@ -1,138 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="15705" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="19529" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="15705"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="19529"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="DiskImagesWindowController">
             <connections>
-                <outlet property="arrayController" destination="vmp-9h-Z5R" id="WYF-Xq-BnN"/>
-                <outlet property="tableView" destination="J5l-1d-030" id="3hU-ho-1ag"/>
-                <outlet property="window" destination="R7r-B9-Bw0" id="hDE-Qa-m4g"/>
+                <outlet property="arrayController" destination="YmL-8S-msS" id="Pva-sz-XFI"/>
+                <outlet property="tableView" destination="cqO-ig-A9t" id="hbI-ho-WYj"/>
+                <outlet property="window" destination="AtY-lA-KIp" id="aaq-cR-kq8"/>
             </connections>
         </customObject>
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
         <customObject id="-3" userLabel="Application" customClass="NSObject"/>
-        <window title="Recent Disk Images" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" frameAutosaveName="RecentDiskImagesWindow" animationBehavior="default" titlebarAppearsTransparent="YES" id="R7r-B9-Bw0" customClass="NSPanel">
-            <windowStyleMask key="styleMask" titled="YES" closable="YES"/>
-            <windowPositionMask key="initialPositionMask" rightStrut="YES"/>
-            <rect key="contentRect" x="200" y="172" width="300" height="400"/>
-            <rect key="screenRect" x="0.0" y="0.0" width="2560" height="1417"/>
-            <view key="contentView" focusRingType="none" id="Kkg-Tp-4m1">
-                <rect key="frame" x="0.0" y="0.0" width="300" height="400"/>
-                <autoresizingMask key="autoresizingMask"/>
-                <subviews>
-                    <scrollView focusRingType="none" fixedFrame="YES" borderType="none" autohidesScrollers="YES" horizontalLineScroll="24" horizontalPageScroll="10" verticalLineScroll="24" verticalPageScroll="10" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" findBarPosition="belowContent" translatesAutoresizingMaskIntoConstraints="NO" id="ivr-XT-BPS">
-                        <rect key="frame" x="-1" y="-1" width="302" height="402"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <clipView key="contentView" ambiguous="YES" drawsBackground="NO" copiesOnScroll="NO" id="1jn-uc-06s">
-                            <rect key="frame" x="0.0" y="0.0" width="302" height="402"/>
-                            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                            <subviews>
-                                <tableView focusRingType="none" verticalHuggingPriority="750" ambiguous="YES" allowsExpansionToolTips="YES" columnAutoresizingStyle="none" columnReordering="NO" columnResizing="NO" multipleSelection="NO" emptySelection="NO" autosaveColumns="NO" typeSelect="NO" rowHeight="22" rowSizeStyle="automatic" viewBased="YES" id="J5l-1d-030">
-                                    <rect key="frame" x="0.0" y="0.0" width="302" height="402"/>
-                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                                    <size key="intercellSpacing" width="3" height="2"/>
-                                    <color key="backgroundColor" white="1" alpha="0.0" colorSpace="custom" customColorSpace="calibratedWhite"/>
-                                    <color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
-                                    <tableColumns>
-                                        <tableColumn width="282" minWidth="40" maxWidth="1000" id="1rF-M3-pYV">
-                                            <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border">
-                                                <font key="font" metaFont="smallSystem"/>
-                                                <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
-                                                <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
-                                            </tableHeaderCell>
-                                            <textFieldCell key="dataCell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" title="Text Cell" id="erY-fh-OHK">
-                                                <font key="font" metaFont="system"/>
-                                                <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
-                                                <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
-                                            </textFieldCell>
-                                            <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
-                                            <prototypeCellViews>
-                                                <tableCellView id="AJH-gH-E8G">
-                                                    <rect key="frame" x="1" y="1" width="282" height="22"/>
-                                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                                                    <subviews>
-                                                        <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" textCompletion="NO" translatesAutoresizingMaskIntoConstraints="NO" id="esO-OR-AcY">
-                                                            <rect key="frame" x="6" y="5" width="196" height="17"/>
-                                                            <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
-                                                            <textFieldCell key="cell" lineBreakMode="truncatingMiddle" sendsActionOnEndEditing="YES" title="Image Name.2mg" id="xgc-u7-sFX">
-                                                                <font key="font" metaFont="system"/>
-                                                                <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
-                                                                <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
-                                                            </textFieldCell>
-                                                            <connections>
-                                                                <binding destination="AJH-gH-E8G" name="value" keyPath="objectValue.path" id="S0h-hl-OPM">
-                                                                    <dictionary key="options">
-                                                                        <string key="NSValueTransformerName">FilePathTransformer</string>
-                                                                    </dictionary>
-                                                                </binding>
-                                                                <binding destination="AJH-gH-E8G" name="toolTip" keyPath="objectValue.path" id="gXq-2p-MpM"/>
-                                                            </connections>
-                                                        </textField>
-                                                        <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" textCompletion="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Wzl-mV-Pmp">
-                                                            <rect key="frame" x="206" y="3" width="75" height="17"/>
-                                                            <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMinY="YES"/>
-                                                            <textFieldCell key="cell" lineBreakMode="truncatingMiddle" sendsActionOnEndEditing="YES" alignment="right" title="32MB" id="QYB-us-igD">
-                                                                <font key="font" metaFont="smallSystem"/>
-                                                                <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
-                                                                <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
-                                                            </textFieldCell>
-                                                            <connections>
-                                                                <binding destination="AJH-gH-E8G" name="value" keyPath="objectValue.size" id="omG-8X-flx">
-                                                                    <dictionary key="options">
-                                                                        <string key="NSValueTransformerName">FileSizeTransformer</string>
-                                                                    </dictionary>
-                                                                </binding>
-                                                            </connections>
-                                                        </textField>
-                                                    </subviews>
-                                                    <connections>
-                                                        <outlet property="textField" destination="esO-OR-AcY" id="9mX-Yt-vpg"/>
-                                                    </connections>
-                                                </tableCellView>
-                                            </prototypeCellViews>
-                                            <connections>
-                                                <binding destination="vmp-9h-Z5R" name="value" keyPath="arrangedObjects.selection" id="32X-Ez-K7S"/>
-                                            </connections>
-                                        </tableColumn>
-                                    </tableColumns>
-                                    <connections>
-                                        <binding destination="vmp-9h-Z5R" name="content" keyPath="arrangedObjects" id="GHn-tz-ash"/>
-                                        <outlet property="dataSource" destination="-2" id="PRV-Rt-UuC"/>
-                                        <outlet property="delegate" destination="-2" id="WuV-c9-o5I"/>
-                                        <outlet property="menu" destination="bCS-1z-UOZ" id="UCb-2v-WrM"/>
-                                    </connections>
-                                </tableView>
-                            </subviews>
-                            <color key="backgroundColor" name="windowBackgroundColor" catalog="System" colorSpace="catalog"/>
-                        </clipView>
-                        <scroller key="horizontalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="YES" id="ynD-Kb-eb3">
-                            <rect key="frame" x="-100" y="-100" width="223" height="15"/>
-                            <autoresizingMask key="autoresizingMask"/>
-                        </scroller>
-                        <scroller key="verticalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="NO" id="Dbq-yF-MKx" customClass="TransparentScroller">
-                            <rect key="frame" x="224" y="17" width="15" height="102"/>
-                            <autoresizingMask key="autoresizingMask"/>
-                            <userDefinedRuntimeAttributes>
-                                <userDefinedRuntimeAttribute type="color" keyPath="backgroundColor">
-                                    <color key="value" name="windowBackgroundColor" catalog="System" colorSpace="catalog"/>
-                                </userDefinedRuntimeAttribute>
-                            </userDefinedRuntimeAttributes>
-                        </scroller>
-                    </scrollView>
-                </subviews>
-            </view>
+        <customObject id="stE-9g-lJ2" customClass="BookmarkManagerProxy"/>
+        <arrayController mode="entity" entityName="DiskImage" automaticallyPreparesContent="YES" avoidsEmptySelection="NO" automaticallyRearrangesObjects="YES" id="YmL-8S-msS">
             <connections>
-                <outlet property="delegate" destination="-2" id="1Hn-2t-Vzj"/>
-            </connections>
-            <point key="canvasLocation" x="-188" y="143"/>
-        </window>
-        <arrayController id="vmp-9h-Z5R">
-            <connections>
-                <binding destination="-2" name="contentArray" keyPath="self.content" id="UTv-za-ry7"/>
+                <binding destination="stE-9g-lJ2" name="managedObjectContext" keyPath="managedObjectContext" id="GyD-kH-DBa"/>
             </connections>
         </arrayController>
         <menu id="bCS-1z-UOZ">
@@ -155,5 +41,159 @@
             </connections>
             <point key="canvasLocation" x="-667" y="170"/>
         </menu>
+        <window title="Recent Disk Images" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" frameAutosaveName="RecentDiskImagesWindow" animationBehavior="default" id="AtY-lA-KIp">
+            <windowStyleMask key="styleMask" titled="YES" closable="YES"/>
+            <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
+            <rect key="contentRect" x="283" y="305" width="408" height="270"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="1920" height="1055"/>
+            <view key="contentView" id="zHI-2R-bOe">
+                <rect key="frame" x="0.0" y="0.0" width="408" height="270"/>
+                <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                <subviews>
+                    <scrollView fixedFrame="YES" autohidesScrollers="YES" horizontalLineScroll="19" horizontalPageScroll="10" verticalLineScroll="19" verticalPageScroll="10" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="a3G-Wf-K8I">
+                        <rect key="frame" x="-1" y="-1" width="410" height="272"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <clipView key="contentView" id="SFr-s6-6di">
+                            <rect key="frame" x="1" y="1" width="408" height="270"/>
+                            <autoresizingMask key="autoresizingMask"/>
+                            <subviews>
+                                <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" columnSelection="YES" multipleSelection="NO" autosaveColumns="NO" rowSizeStyle="automatic" headerView="iwP-JL-O3g" viewBased="YES" id="cqO-ig-A9t">
+                                    <rect key="frame" x="0.0" y="0.0" width="408" height="245"/>
+                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                                    <size key="intercellSpacing" width="3" height="2"/>
+                                    <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                    <color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
+                                    <tableColumns>
+                                        <tableColumn width="300" minWidth="40" maxWidth="1000" id="k9E-Si-iTY">
+                                            <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" title="Name">
+                                                <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
+                                                <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
+                                            </tableHeaderCell>
+                                            <textFieldCell key="dataCell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" title="Text Cell" id="trJ-af-d0b">
+                                                <font key="font" metaFont="system"/>
+                                                <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+                                                <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                            </textFieldCell>
+                                            <sortDescriptor key="sortDescriptorPrototype" selector="caseInsensitiveCompare:" sortKey="name"/>
+                                            <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
+                                            <prototypeCellViews>
+                                                <tableCellView id="2Ic-UI-Je3">
+                                                    <rect key="frame" x="1" y="1" width="305" height="17"/>
+                                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                                                    <subviews>
+                                                        <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="gkM-KB-x76">
+                                                            <rect key="frame" x="0.0" y="0.0" width="305" height="17"/>
+                                                            <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
+                                                            <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="PitchDark.2mg" id="Wcg-zo-CeN">
+                                                                <font key="font" metaFont="system"/>
+                                                                <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+                                                                <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+                                                            </textFieldCell>
+                                                            <connections>
+                                                                <binding destination="2Ic-UI-Je3" name="value" keyPath="objectValue.name" id="FAu-HR-0jF"/>
+                                                                <binding destination="2Ic-UI-Je3" name="toolTip" keyPath="objectValue.path" id="0MM-sv-mET"/>
+                                                            </connections>
+                                                        </textField>
+                                                    </subviews>
+                                                    <connections>
+                                                        <outlet property="textField" destination="gkM-KB-x76" id="tpG-TS-sXI"/>
+                                                    </connections>
+                                                </tableCellView>
+                                            </prototypeCellViews>
+                                        </tableColumn>
+                                        <tableColumn width="93" minWidth="40" maxWidth="1000" id="0aJ-xJ-YSS">
+                                            <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" title="Size">
+                                                <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
+                                                <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
+                                            </tableHeaderCell>
+                                            <textFieldCell key="dataCell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" title="Text Cell" id="jRd-9Y-U6W">
+                                                <font key="font" metaFont="system"/>
+                                                <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+                                                <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                            </textFieldCell>
+                                            <sortDescriptor key="sortDescriptorPrototype" selector="compare:" sortKey="size"/>
+                                            <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
+                                            <prototypeCellViews>
+                                                <tableCellView id="UW9-AF-U9F">
+                                                    <rect key="frame" x="309" y="1" width="97" height="17"/>
+                                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                                                    <subviews>
+                                                        <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="6Ry-Zn-euh">
+                                                            <rect key="frame" x="0.0" y="0.0" width="97" height="17"/>
+                                                            <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
+                                                            <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="32 MB" id="fXp-OZ-Qcu">
+                                                                <font key="font" metaFont="system"/>
+                                                                <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+                                                                <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+                                                            </textFieldCell>
+                                                            <connections>
+                                                                <binding destination="UW9-AF-U9F" name="value" keyPath="objectValue.size" id="Hca-7L-QN7">
+                                                                    <dictionary key="options">
+                                                                        <string key="NSValueTransformerName">FileSizeTransformer</string>
+                                                                    </dictionary>
+                                                                </binding>
+                                                            </connections>
+                                                        </textField>
+                                                    </subviews>
+                                                    <connections>
+                                                        <outlet property="textField" destination="6Ry-Zn-euh" id="vUm-0h-5qV"/>
+                                                    </connections>
+                                                </tableCellView>
+                                            </prototypeCellViews>
+                                        </tableColumn>
+                                    </tableColumns>
+                                    <connections>
+                                        <action trigger="doubleAction" selector="doubleClick:" target="-2" id="wdp-Ek-Olo"/>
+                                        <binding destination="YmL-8S-msS" name="content" keyPath="arrangedObjects" id="v56-YR-Qve"/>
+                                        <binding destination="YmL-8S-msS" name="sortDescriptors" keyPath="sortDescriptors" previousBinding="v56-YR-Qve" id="BGa-9c-RdD"/>
+                                        <outlet property="dataSource" destination="-2" id="gCn-sa-fuX"/>
+                                        <outlet property="delegate" destination="-2" id="VHT-aS-4iS"/>
+                                        <outlet property="menu" destination="bCS-1z-UOZ" id="a2u-hd-hPS"/>
+                                    </connections>
+                                </tableView>
+                            </subviews>
+                        </clipView>
+                        <scroller key="horizontalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="YES" id="Z7O-AK-X5q">
+                            <rect key="frame" x="1" y="119" width="223" height="15"/>
+                            <autoresizingMask key="autoresizingMask"/>
+                        </scroller>
+                        <scroller key="verticalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" doubleValue="1" horizontal="NO" id="OLa-ra-vIN">
+                            <rect key="frame" x="224" y="17" width="15" height="102"/>
+                            <autoresizingMask key="autoresizingMask"/>
+                        </scroller>
+                        <tableHeaderView key="headerView" id="iwP-JL-O3g">
+                            <rect key="frame" x="0.0" y="0.0" width="408" height="25"/>
+                            <autoresizingMask key="autoresizingMask"/>
+                        </tableHeaderView>
+                    </scrollView>
+                </subviews>
+            </view>
+            <toolbar key="toolbar" implicitIdentifier="D9701924-6955-47B8-A2FF-DBD466AAEB92" autosavesConfiguration="NO" allowsUserCustomization="NO" displayMode="iconOnly" sizeMode="regular" id="Gp6-Kl-lr2">
+                <allowedToolbarItems>
+                    <toolbarItem implicitItemIdentifier="NSToolbarFlexibleSpaceItem" id="lBE-ee-rCy"/>
+                    <toolbarItem implicitItemIdentifier="C346E56F-4480-4D8A-8485-33A3A51D7B78" label="" paletteLabel="Filter" sizingBehavior="auto" id="DsU-uu-UmZ">
+                        <nil key="toolTip"/>
+                        <searchField key="view" wantsLayer="YES" verticalHuggingPriority="750" textCompletion="NO" id="qHV-IA-ysc">
+                            <rect key="frame" x="0.0" y="14" width="96" height="22"/>
+                            <autoresizingMask key="autoresizingMask"/>
+                            <searchFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" continuous="YES" borderStyle="bezel" placeholderString="Filter" usesSingleLineMode="YES" bezelStyle="round" id="BWo-eC-ahz">
+                                <font key="font" metaFont="system"/>
+                                <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+                                <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                            </searchFieldCell>
+                            <connections>
+                                <action selector="filter:" target="-2" id="KhW-DS-b8s"/>
+                            </connections>
+                        </searchField>
+                    </toolbarItem>
+                </allowedToolbarItems>
+                <defaultToolbarItems>
+                    <toolbarItem reference="lBE-ee-rCy"/>
+                    <toolbarItem reference="lBE-ee-rCy"/>
+                    <toolbarItem reference="DsU-uu-UmZ"/>
+                </defaultToolbarItems>
+            </toolbar>
+            <point key="canvasLocation" x="-196" y="513"/>
+        </window>
     </objects>
 </document>

Ample/Base.lproj/DownloadWindow.xib

@@ -61,7 +61,7 @@
                                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                     <subviews>
                                                         <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="A44-us-TEl">
-                                                            <rect key="frame" x="25" y="28" width="425" height="17"/>
+                                                            <rect key="frame" x="41" y="28" width="409" height="17"/>
                                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
                                                             <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Table View Cell" id="NSU-6I-nsG">
                                                                 <font key="font" metaFont="system"/>
@@ -78,21 +78,11 @@
                                                                     </dictionary>
                                                                 </binding>
                                                                 <binding destination="onK-6l-2iV" name="textColor" keyPath="objectValue.titleColor" id="0Qx-rz-DEZ"/>
+                                                                <binding destination="onK-6l-2iV" name="toolTip" keyPath="objectValue.value" id="rUb-Jb-KbT"/>
                                                             </connections>
                                                         </textField>
-                                                        <progressIndicator wantsLayer="YES" fixedFrame="YES" maxValue="100" displayedWhenStopped="NO" indeterminate="YES" controlSize="small" style="spinning" translatesAutoresizingMaskIntoConstraints="NO" id="jBN-UJ-tWi">
-                                                            <rect key="frame" x="3" y="29" width="16" height="16"/>
-                                                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                                                            <connections>
-                                                                <binding destination="onK-6l-2iV" name="animate" keyPath="objectValue.task" id="d22-JL-3Z7">
-                                                                    <dictionary key="options">
-                                                                        <string key="NSValueTransformerName">NSIsNotNil</string>
-                                                                    </dictionary>
-                                                                </binding>
-                                                            </connections>
-                                                        </progressIndicator>
                                                         <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="hfu-hP-QAH">
-                                                            <rect key="frame" x="25" y="3" width="425" height="17"/>
+                                                            <rect key="frame" x="41" y="3" width="409" height="17"/>
                                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
                                                             <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Table View Cell" id="1cQ-Zh-q0o">
                                                                 <font key="font" metaFont="system" size="10"/>
@@ -104,6 +94,17 @@
                                                                 <binding destination="onK-6l-2iV" name="value" keyPath="objectValue.statusDescription" id="yV1-5r-YDh"/>
                                                             </connections>
                                                         </textField>
+                                                        <progressIndicator wantsLayer="YES" fixedFrame="YES" maxValue="100" displayedWhenStopped="NO" indeterminate="YES" style="spinning" translatesAutoresizingMaskIntoConstraints="NO" id="jBN-UJ-tWi">
+                                                            <rect key="frame" x="3" y="9" width="32" height="32"/>
+                                                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
+                                                            <connections>
+                                                                <binding destination="onK-6l-2iV" name="animate" keyPath="objectValue.task" id="d22-JL-3Z7">
+                                                                    <dictionary key="options">
+                                                                        <string key="NSValueTransformerName">NSIsNotNil</string>
+                                                                    </dictionary>
+                                                                </binding>
+                                                            </connections>
+                                                        </progressIndicator>
                                                     </subviews>
                                                     <connections>
                                                         <outlet property="textField" destination="A44-us-TEl" id="ude-er-Gm4"/>
@@ -116,6 +117,7 @@
                                         </tableColumn>
                                     </tableColumns>
                                     <connections>
+                                        <action trigger="doubleAction" selector="doubleClick:" target="-2" id="y2y-h7-cfD"/>
                                         <binding destination="jhO-4z-Qwt" name="content" keyPath="arrangedObjects" id="2av-gV-V4K"/>
                                         <outlet property="menu" destination="RJM-21-hjO" id="xpL-0n-1jm"/>
                                     </connections>
@@ -297,6 +299,12 @@
                         <action selector="showInFinder:" target="-2" id="ltL-yL-7EP"/>
                     </connections>
                 </menuItem>
+                <menuItem title="Move to Trash" id="x1Q-OF-5hM">
+                    <modifierMask key="keyEquivalentModifierMask"/>
+                    <connections>
+                        <action selector="moveToTrash:" target="-2" id="swr-yf-hA2"/>
+                    </connections>
+                </menuItem>
                 <menuItem title="Download" tag="2" id="ree-Zg-jYB">
                     <modifierMask key="keyEquivalentModifierMask"/>
                     <connections>

Ample/Base.lproj/LaunchWindow.xib

@@ -9,6 +9,7 @@
         <customObject id="-2" userLabel="File's Owner" customClass="LaunchWindowController">
             <connections>
                 <outlet property="addBookmarkWindow" destination="yIt-hP-HBq" id="Qhx-WV-cg4"/>
+                <outlet property="bookmarkErrorField" destination="RiJ-Xw-sgW" id="6y5-Fo-AnM"/>
                 <outlet property="bookmarkTextField" destination="fAl-Vn-x1w" id="GNr-j6-BiQ"/>
                 <outlet property="machineView" destination="oVt-eD-aaj" id="Q9V-Kr-6GN"/>
                 <outlet property="machineViewController" destination="FSD-3v-Wni" id="tXv-zJ-QO3"/>
@@ -31,7 +32,7 @@
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <customView id="P9d-sS-qEb" customClass="FlippedView">
-                        <rect key="frame" x="302" y="105" width="316" height="363"/>
+                        <rect key="frame" x="302" y="105" width="326" height="363"/>
                         <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
                     </customView>
                     <tabView initialItem="zUN-Qs-haG" id="l8R-bg-6Zm">
@@ -118,6 +119,9 @@
                                                         <menuItem title="LCD Grid" tag="5" id="A6k-ku-z2M">
                                                             <modifierMask key="keyEquivalentModifierMask"/>
                                                         </menuItem>
+                                                        <menuItem title="Fighters" id="1aA-ge-f8R">
+                                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                                        </menuItem>
                                                     </items>
                                                 </menu>
                                             </popUpButtonCell>
@@ -155,10 +159,21 @@
                                                 <font key="font" metaFont="menu"/>
                                                 <menu key="menu" id="m4N-Qw-mem">
                                                     <items>
-                                                        <menuItem title="Full Screen" state="on" id="0zZ-Ib-Fne"/>
-                                                        <menuItem title="Window 1x" id="3bZ-rq-fCt"/>
-                                                        <menuItem title="Window 2x" id="KA4-Rs-yyK"/>
-                                                        <menuItem title="Window 3x" id="Dbh-Js-pMx" userLabel="Window 3x"/>
+                                                        <menuItem title="Full Screen" state="on" id="0zZ-Ib-Fne">
+                                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                                        </menuItem>
+                                                        <menuItem title="Window 1x" id="3bZ-rq-fCt">
+                                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                                        </menuItem>
+                                                        <menuItem title="Window 2x" id="KA4-Rs-yyK">
+                                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                                        </menuItem>
+                                                        <menuItem title="Window 3x" id="Dbh-Js-pMx" userLabel="Window 3x">
+                                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                                        </menuItem>
+                                                        <menuItem title="Window 4x" id="GCs-En-3Jv">
+                                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                                        </menuItem>
                                                     </items>
                                                 </menu>
                                             </popUpButtonCell>
@@ -237,6 +252,17 @@
                                                 <binding destination="-2" name="selectedTag" keyPath="self.mameSpeed" id="nFG-yA-KC1"/>
                                             </connections>
                                         </popUpButton>
+                                        <button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="knB-Rn-1Cm">
+                                            <rect key="frame" x="15" y="40" width="67" height="18"/>
+                                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                                            <buttonCell key="cell" type="check" title="Rewind" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="Y7b-jN-HCc">
+                                                <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+                                                <font key="font" metaFont="system"/>
+                                            </buttonCell>
+                                            <connections>
+                                                <binding destination="-2" name="value" keyPath="self.mameRewind" id="Hw5-n7-O27"/>
+                                            </connections>
+                                        </button>
                                     </subviews>
                                 </view>
                             </tabViewItem>
@@ -386,7 +412,7 @@
                         </connections>
                     </tabView>
                     <customView fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="J9O-xI-P5J" customClass="FlippedView">
-                        <rect key="frame" x="664" y="107" width="316" height="331"/>
+                        <rect key="frame" x="654" y="107" width="326" height="331"/>
                         <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
                     </customView>
                     <scrollView borderType="none" autohidesScrollers="YES" horizontalLineScroll="10" horizontalPageScroll="10" verticalLineScroll="10" verticalPageScroll="10" hasHorizontalScroller="NO" horizontalScrollElasticity="none" id="2ue-XT-byh">
@@ -424,7 +450,7 @@
                         </scroller>
                     </scrollView>
                     <searchField wantsLayer="YES" verticalHuggingPriority="750" textCompletion="NO" id="pNl-g4-ZLh" customClass="AutocompleteControl">
-                        <rect key="frame" x="664" y="446" width="316" height="22"/>
+                        <rect key="frame" x="654" y="446" width="326" height="22"/>
                         <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
                         <searchFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" borderStyle="bezel" placeholderString="Software List" usesSingleLineMode="YES" bezelStyle="round" id="sMi-a3-XEn">
                             <font key="font" metaFont="system"/>
@@ -433,11 +459,6 @@
                         </searchFieldCell>
                         <connections>
                             <action selector="softwareChanged:" target="-2" id="879-da-UEc"/>
-                            <binding destination="-2" name="hidden" keyPath="machine" id="RdE-9k-oFd">
-                                <dictionary key="options">
-                                    <string key="NSValueTransformerName">NSIsNil</string>
-                                </dictionary>
-                            </binding>
                         </connections>
                     </searchField>
                     <customView id="oVt-eD-aaj" customClass="FlippedView">
@@ -559,9 +580,29 @@ Gw
                             </binding>
                         </connections>
                     </textField>
+                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="RiJ-Xw-sgW">
+                        <rect key="frame" x="20" y="20" width="248" height="16"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
+                        <textFieldCell key="cell" lineBreakMode="clipping" title="Label" id="Ehz-4Z-Tjq">
+                            <font key="font" metaFont="system"/>
+                            <color key="textColor" name="systemRedColor" catalog="System" colorSpace="catalog"/>
+                            <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                        </textFieldCell>
+                    </textField>
+                    <button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="EFq-dZ-y90">
+                        <rect key="frame" x="378" y="79" width="66" height="18"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
+                        <buttonCell key="cell" type="check" title="Default" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="cOs-WH-9Dr">
+                            <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+                            <font key="font" metaFont="system"/>
+                        </buttonCell>
+                        <connections>
+                            <binding destination="-2" name="value" keyPath="bookmarkDefault" id="Oiv-hR-5fn"/>
+                        </connections>
+                    </button>
                 </subviews>
             </view>
-            <point key="canvasLocation" x="130" y="70"/>
+            <point key="canvasLocation" x="-62" y="95"/>
         </window>
         <viewController nibName="MachineView" id="FSD-3v-Wni" customClass="NewMachineViewController"/>
         <menu id="Aa5-Sk-gZX">
@@ -573,6 +614,29 @@ Gw
                     </connections>
                 </menuItem>
                 <menuItem isSeparatorItem="YES" id="Iti-F9-p35"/>
+                <menuItem title="List Media…" id="M5h-4W-0nV">
+                    <modifierMask key="keyEquivalentModifierMask"/>
+                    <connections>
+                        <action selector="listMedia:" target="-2" id="IO7-MG-zud"/>
+                        <binding destination="-2" name="hidden" keyPath="optionKey" id="LhL-2l-iss">
+                            <dictionary key="options">
+                                <string key="NSValueTransformerName">NSNegateBoolean</string>
+                            </dictionary>
+                        </binding>
+                    </connections>
+                </menuItem>
+                <menuItem title="List Slots…" id="cNj-Sb-KkE">
+                    <modifierMask key="keyEquivalentModifierMask"/>
+                    <connections>
+                        <action selector="listSlots:" target="-2" id="3nb-mV-eUK"/>
+                        <binding destination="-2" name="hidden" keyPath="optionKey" id="dwp-Kn-LfC">
+                            <dictionary key="options">
+                                <string key="NSValueTransformerName">NSNegateBoolean</string>
+                            </dictionary>
+                        </binding>
+                    </connections>
+                </menuItem>
+                <menuItem isSeparatorItem="YES" id="yZx-W2-lZg"/>
                 <menuItem title="Reset All" id="PQ0-yO-SKz">
                     <modifierMask key="keyEquivalentModifierMask"/>
                     <connections>
@@ -598,11 +662,13 @@ Gw
                     </connections>
                 </menuItem>
             </items>
+            <connections>
+                <outlet property="delegate" destination="-2" id="wqC-IG-63F"/>
+            </connections>
             <point key="canvasLocation" x="-121" y="-2"/>
         </menu>
     </objects>
     <resources>
         <image name="NSAppleMenuImage" width="11" height="14"/>
-        <image name="NSAppleMenuImage" width="128" height="128"/>
     </resources>
 </document>

Ample/Base.lproj/MainMenu.xib

@@ -13,17 +13,19 @@
         </customObject>
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
         <customObject id="-3" userLabel="Application" customClass="NSObject"/>
+        <customObject id="rSq-qV-SGy" customClass="BookmarkManager">
+            <connections>
+                <outlet property="menu" destination="ha0-nx-PIl" id="Ozd-ID-egK"/>
+                <outlet property="updateMenuItem" destination="30b-vT-HIa" id="AgZ-LE-no6"/>
+            </connections>
+        </customObject>
         <customObject id="Voe-Tx-rLC" customClass="AppDelegate">
             <connections>
                 <outlet property="installWindow" destination="jWX-pY-Zpb" id="xAj-Vj-Vxn"/>
             </connections>
         </customObject>
         <customObject id="YLy-65-1bz" customClass="NSFontManager"/>
-        <customObject id="sJn-ug-xF3" customClass="BookmarkManager">
-            <connections>
-                <outlet property="menu" destination="ha0-nx-PIl" id="vTa-TU-DS1"/>
-            </connections>
-        </customObject>
+        <customObject id="3aq-Tx-mno" customClass="SUUpdater"/>
         <menu title="Main Menu" systemMenu="main" id="AYu-sK-qS6">
             <items>
                 <menuItem title="Ample" id="1Xt-HY-uBw">
@@ -36,7 +38,16 @@
                                     <action selector="orderFrontStandardAboutPanel:" target="-1" id="Exp-CZ-Vem"/>
                                 </connections>
                             </menuItem>
+                            <menuItem title="Check for Updates…" id="CPy-r4-rzr">
+                                <modifierMask key="keyEquivalentModifierMask"/>
+                                <connections>
+                                    <action selector="checkForUpdates:" target="3aq-Tx-mno" id="qJG-Nv-0Lu"/>
+                                </connections>
+                            </menuItem>
                             <menuItem isSeparatorItem="YES" id="VOq-y0-SEH"/>
+                            <menuItem title="Reinstall MAME components" hidden="YES" id="c3P-WT-eUP">
+                                <modifierMask key="keyEquivalentModifierMask"/>
+                            </menuItem>
                             <menuItem title="Preferences…" keyEquivalent="," id="BOF-NM-1cW">
                                 <connections>
                                     <action selector="displayPreferences:" target="Voe-Tx-rLC" id="Hsm-pX-sUc"/>
@@ -398,28 +409,39 @@
                     <modifierMask key="keyEquivalentModifierMask"/>
                     <menu key="submenu" title="Bookmarks" id="ha0-nx-PIl">
                         <items>
+                            <menuItem title="Manage Bookmarks…" keyEquivalent="b" id="isI-q6-b1V">
+                                <modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
+                                <connections>
+                                    <action selector="manageBookmarks:" target="-1" id="vOm-90-AoO"/>
+                                </connections>
+                            </menuItem>
                             <menuItem title="Add Bookmark…" keyEquivalent="d" id="1JF-xV-zmG">
                                 <connections>
                                     <action selector="addBookmark:" target="-1" id="cqp-ko-BfQ"/>
                                 </connections>
                             </menuItem>
-                            <menuItem title="Manage Bookmarks…" id="isI-q6-b1V">
-                                <modifierMask key="keyEquivalentModifierMask"/>
+                            <menuItem title="Update Bookmark" keyEquivalent="D" id="30b-vT-HIa">
+                                <connections>
+                                    <action selector="updateBookmark:" target="-1" id="Au0-Sp-cUD"/>
+                                </connections>
                             </menuItem>
-                            <menuItem title="Set Default" id="vbR-vS-lqO">
+                            <menuItem title="Set Default" hidden="YES" id="vbR-vS-lqO">
                                 <modifierMask key="keyEquivalentModifierMask"/>
                                 <connections>
                                     <action selector="defaultSave:" target="-1" id="FP9-EX-OKP"/>
                                 </connections>
                             </menuItem>
                             <menuItem isSeparatorItem="YES" id="gWR-Yl-mg6"/>
-                            <menuItem title="Default" id="mXC-Lp-gem">
+                            <menuItem title="Default" hidden="YES" id="mXC-Lp-gem">
                                 <modifierMask key="keyEquivalentModifierMask"/>
                                 <connections>
                                     <action selector="defaultLoad:" target="-1" id="ErS-k6-azP"/>
                                 </connections>
                             </menuItem>
                         </items>
+                        <connections>
+                            <outlet property="delegate" destination="rSq-qV-SGy" id="Z7N-CG-hU1"/>
+                        </connections>
                     </menu>
                 </menuItem>
                 <menuItem title="Window" id="aUF-d1-5bR">
@@ -525,5 +547,6 @@
             </view>
             <point key="canvasLocation" x="13" y="-182"/>
         </window>
+        <userDefaultsController representsSharedInstance="YES" id="uGS-pc-Wsn"/>
     </objects>
 </document>

Ample/Base.lproj/MediaView.xib

@@ -61,7 +61,7 @@
                                             <outlet property="textField" destination="Pep-mX-LHY" id="hUe-cf-6vq"/>
                                         </connections>
                                     </tableCellView>
-                                    <tableCellView identifier="ItemView" translatesAutoresizingMaskIntoConstraints="NO" id="yGq-lc-RCM" customClass="TablePathView">
+                                    <tableCellView identifier="ItemView" translatesAutoresizingMaskIntoConstraints="NO" id="yGq-lc-RCM" customClass="PathTableCellView">
                                         <rect key="frame" x="1" y="21" width="296" height="22"/>
                                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                         <subviews>
@@ -73,8 +73,8 @@
                                                 </pathCell>
                                                 <connections>
                                                     <action selector="pathAction:" target="-2" id="4oX-bW-ANp"/>
-                                                    <binding destination="yGq-lc-RCM" name="enabled" keyPath="objectValue.valid" id="f8P-gt-vmK"/>
                                                     <binding destination="yGq-lc-RCM" name="value" keyPath="objectValue.url" id="Ony-ph-VVo"/>
+                                                    <binding destination="yGq-lc-RCM" name="enabled" keyPath="objectValue.valid" id="f8P-gt-vmK"/>
                                                 </connections>
                                             </pathControl>
                                             <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" id="6g1-NT-J1w">
@@ -101,7 +101,7 @@
                                             <outlet property="pathControl" destination="f7R-TO-fmF" id="oH7-N3-JC7"/>
                                         </connections>
                                     </tableCellView>
-                                    <tableCellView identifier="BBItemView" id="2Nq-Xz-tkV" customClass="TablePathView">
+                                    <tableCellView identifier="BBItemView" id="2Nq-Xz-tkV" customClass="PathTableCellView">
                                         <rect key="frame" x="1" y="46" width="296" height="22"/>
                                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                         <subviews>
@@ -132,12 +132,12 @@
                                                 </textFieldCell>
                                                 <connections>
                                                     <action selector="textAction:" target="-2" id="lmX-t8-mEc"/>
-                                                    <binding destination="2Nq-Xz-tkV" name="enabled" keyPath="objectValue.valid" id="ZTM-E3-Y9P"/>
                                                     <binding destination="2Nq-Xz-tkV" name="value" keyPath="objectValue.string" id="2dZ-JJ-asM">
                                                         <dictionary key="options">
                                                             <string key="NSNullPlaceholder">socket.address:port or /path/to/file</string>
                                                         </dictionary>
                                                     </binding>
+                                                    <binding destination="2Nq-Xz-tkV" name="enabled" keyPath="objectValue.valid" id="ZTM-E3-Y9P"/>
                                                 </connections>
                                             </textField>
                                         </subviews>
@@ -146,6 +146,102 @@
                                             <outlet property="ejectButton" destination="zxn-1E-o34" id="eC6-Mf-tN6"/>
                                         </connections>
                                     </tableCellView>
+                                    <tableCellView identifier="OutputItemView" id="jQd-Ar-5uf" customClass="PathTableCellView">
+                                        <rect key="frame" x="1" y="71" width="296" height="22"/>
+                                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                                        <subviews>
+                                            <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" id="Jg1-Wh-HDk">
+                                                <rect key="frame" x="0.0" y="1" width="20" height="20"/>
+                                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                                                <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageAlignment="left" image="drag-handle-4x10" id="SjY-iM-xSZ"/>
+                                            </imageView>
+                                            <button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="vG4-PP-efF" customClass="EjectButton">
+                                                <rect key="frame" x="277" y="3" width="16" height="16"/>
+                                                <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
+                                                <buttonCell key="cell" type="bevel" bezelStyle="regularSquare" image="eject-16x16" imagePosition="only" alignment="center" alternateImage="eject-hover-16x16" imageScaling="proportionallyDown" inset="2" id="VX6-hb-mCU">
+                                                    <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                                                    <font key="font" metaFont="system"/>
+                                                </buttonCell>
+                                                <connections>
+                                                    <action selector="ejectAction:" target="-2" id="LNr-rK-kpx"/>
+                                                    <binding destination="jQd-Ar-5uf" name="enabled" keyPath="objectValue.occupied" id="p4S-6q-dCG"/>
+                                                </connections>
+                                            </button>
+                                            <textField verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Tm9-Zq-fag">
+                                                <rect key="frame" x="20" y="0.0" width="244" height="21"/>
+                                                <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
+                                                <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" placeholderString="/path/to/file" drawsBackground="YES" id="RUQ-s4-75A">
+                                                    <font key="font" metaFont="system"/>
+                                                    <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+                                                    <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                                </textFieldCell>
+                                                <connections>
+                                                    <action selector="textAction:" target="-2" id="N7h-6y-D8W"/>
+                                                    <binding destination="jQd-Ar-5uf" name="value" keyPath="objectValue.string" id="kXU-qJ-HKa">
+                                                        <dictionary key="options">
+                                                            <string key="NSNullPlaceholder">/path/to/file</string>
+                                                        </dictionary>
+                                                    </binding>
+                                                    <binding destination="jQd-Ar-5uf" name="enabled" keyPath="objectValue.valid" id="1wE-NY-Vb2"/>
+                                                </connections>
+                                            </textField>
+                                        </subviews>
+                                        <connections>
+                                            <outlet property="dragHandle" destination="Jg1-Wh-HDk" id="o14-ay-0Ou"/>
+                                            <outlet property="ejectButton" destination="vG4-PP-efF" id="X2I-2N-t5r"/>
+                                        </connections>
+                                    </tableCellView>
+                                    <tableCellView identifier="MidiItemView" id="HDi-YM-iKn" customClass="MidiTableCellView">
+                                        <rect key="frame" x="1" y="96" width="296" height="22"/>
+                                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                                        <subviews>
+                                            <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" id="XcO-0S-W4c">
+                                                <rect key="frame" x="0.0" y="1" width="20" height="20"/>
+                                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                                                <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageAlignment="left" image="drag-handle-4x10" id="4a2-So-rxD"/>
+                                            </imageView>
+                                            <button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="F3v-8Z-LaF" customClass="EjectButton">
+                                                <rect key="frame" x="277" y="3" width="16" height="16"/>
+                                                <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
+                                                <buttonCell key="cell" type="bevel" bezelStyle="regularSquare" image="eject-16x16" imagePosition="only" alignment="center" alternateImage="eject-hover-16x16" imageScaling="proportionallyDown" inset="2" id="b3t-Zp-2si">
+                                                    <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                                                    <font key="font" metaFont="system"/>
+                                                </buttonCell>
+                                                <connections>
+                                                    <action selector="ejectAction:" target="-2" id="AvU-Sz-QKJ"/>
+                                                    <binding destination="HDi-YM-iKn" name="enabled" keyPath="objectValue.occupied" id="ERy-Iz-T9Q"/>
+                                                </connections>
+                                            </button>
+                                            <popUpButton verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="L2F-mj-lkr">
+                                                <rect key="frame" x="20" y="-3" width="244" height="25"/>
+                                                <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
+                                                <popUpButtonCell key="cell" type="push" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" selectedItem="CaJ-NG-vbR" id="Rac-za-bEQ">
+                                                    <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
+                                                    <font key="font" metaFont="system"/>
+                                                    <menu key="menu" id="I55-5S-oM2">
+                                                        <items>
+                                                            <menuItem state="on" id="CaJ-NG-vbR">
+                                                                <modifierMask key="keyEquivalentModifierMask"/>
+                                                            </menuItem>
+                                                        </items>
+                                                    </menu>
+                                                </popUpButtonCell>
+                                                <connections>
+                                                    <action selector="midiAction:" target="-2" id="LDL-4h-xUR"/>
+                                                    <binding destination="HDi-YM-iKn" name="selectedValue" keyPath="objectValue.string" id="xjL-hx-VG3">
+                                                        <dictionary key="options">
+                                                            <string key="NSValueTransformerName">EmptyStringTransformer</string>
+                                                        </dictionary>
+                                                    </binding>
+                                                </connections>
+                                            </popUpButton>
+                                        </subviews>
+                                        <connections>
+                                            <outlet property="dragHandle" destination="XcO-0S-W4c" id="oKY-UF-LkW"/>
+                                            <outlet property="ejectButton" destination="F3v-8Z-LaF" id="ql8-4u-qCA"/>
+                                            <outlet property="popUpButton" destination="L2F-mj-lkr" id="Ktx-Yc-DIp"/>
+                                        </connections>
+                                    </tableCellView>
                                 </prototypeCellViews>
                             </tableColumn>
                         </tableColumns>

Ample/Base.lproj/Preferences.xib

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

Ample/Bookmark.h

@@ -0,0 +1,14 @@
+//
+//  Bookmark.h
+//  Ample
+//
+//  Created by Kelvin Sherlock on 2/7/2022.
+//  Copyright © 2022 Kelvin Sherlock. All rights reserved.
+//
+
+#ifndef Bookmark_h
+#define Bookmark_h
+
+#import "Bookmark+CoreDataClass.h"
+
+#endif /* Bookmark_h */

Ample/BookmarkManager.h

@@ -7,28 +7,39 @@
 //
 
 #import <Foundation/Foundation.h>
+#import <CoreData/CoreData.h>
 
 @class NSMenu;
+@class NSMenuItem;
+@class Bookmark;
+@class DiskImage;
 
 NS_ASSUME_NONNULL_BEGIN
 
 @interface BookmarkManager : NSObject
 
 @property (weak) IBOutlet NSMenu *menu;
+@property (weak) IBOutlet NSMenuItem *updateMenuItem;
+@property (readonly) NSManagedObjectContext *managedObjectContext;
+
+@property (nullable) Bookmark *currentBookmark;
 
 +(instancetype)sharedManager;
 
--(void)loadBookmarks;
--(void)updateMenu;
+-(NSString *)uniqueBookmarkName: (NSString *)name;
 
--(BOOL)validateName: (NSString *)name;
+-(NSError *)saveBookmark: (NSDictionary *)bookmark name: (NSString *)name automatic: (BOOL)automatic;
 
--(BOOL)saveBookmark: (NSDictionary *)bookmark name: (NSString *)name;
--(NSDictionary *)loadBookmarkFromURL: (NSURL *)url;
+//-(NSError *)saveDefault: (NSDictionary *)bookmark;
 
--(BOOL)saveDefault: (NSDictionary *)bookmark;
+-(Bookmark *)defaultBookmark;
 -(NSDictionary *)loadDefault;
 
+-(NSError *)setAutomatic: (Bookmark *)bookmark;
+
+-(BOOL)addDiskImage: (NSObject *)pathOrURL;
+
+//-(void)convertLegacyBookmarks;
 @end
 
 NS_ASSUME_NONNULL_END

Ample/BookmarkManager.m

@@ -9,19 +9,43 @@
 #import "BookmarkManager.h"
 #import "Ample.h"
 
+#import "Bookmark.h"
+#import "DiskImage.h"
+#import "Menu.h"
+
+
 @interface BookmarkManager () {
-    NSArray<NSURL *> *_urls;
+
+    NSPersistentStoreCoordinator *_psc;
+    NSManagedObjectContext *_moc;
+    NSManagedObjectModel *_mom;
+    NSPersistentStore *_store;
+    
+    NSFetchRequest *_defaultRequest;
+    
+    
     NSURL *_bookmarkDirectory;
+    NSArrayController *_items;
+    NSUInteger _newMenuGeneration;
+    NSUInteger _currentMenuGeneration;
+    
+    Bookmark *_currentBookmark;
 }
 
 @end
 
+@interface BookmarkManager (MenuDelegate) <NSMenuDelegate>
+@end
+
 @implementation BookmarkManager
 
 static BookmarkManager *singleton = nil;
 
 -(void)awakeFromNib {
-    if (!singleton) singleton = self;
+    if (!singleton) {
+        singleton = self;
+        if (!_items) [self initMenus];
+    }
 }
 
 +(instancetype)sharedManager {
@@ -31,7 +55,171 @@ static BookmarkManager *singleton = nil;
 
 -(instancetype)init {
     if (singleton) return singleton;
-    return [super init];
+
+
+    if ((self = [super init])) {
+        [self initCoreData];
+
+        NSNotificationCenter *nc = [NSNotificationCenter defaultCenter];
+        
+        [nc addObserver: self selector: @selector(willTerminate:) name: NSApplicationWillTerminateNotification object: nil];
+        [nc addObserver: self selector: @selector(diskImageAdded:) name: kNotificationDiskImageAdded object: nil];
+
+
+        _newMenuGeneration = 1;
+        _currentMenuGeneration = 0;
+    }
+
+    
+    //singleton = self;
+    return self;
+}
+
+-(NSManagedObjectContext *)managedObjectContext {
+    return _moc;
+}
+
+-(void)initCoreData {
+    
+    NSError *error;
+    BOOL new = NO;
+
+    NSBundle *bundle = [NSBundle mainBundle];
+    NSURL *url = [bundle URLForResource: @"Ample" withExtension: @"momd"];
+    _mom = [[NSManagedObjectModel alloc] initWithContentsOfURL: url];
+    
+    _psc = [[NSPersistentStoreCoordinator alloc] initWithManagedObjectModel: _mom];
+    
+    _moc = [[NSManagedObjectContext alloc] initWithConcurrencyType: NSMainQueueConcurrencyType];
+    [_moc setPersistentStoreCoordinator: _psc];
+    
+    //[_moc setMergePolicy: [NSMergePolicy rollbackMergePolicy]];
+    
+    url = SupportDirectory();
+#if 0
+    url = [url URLByAppendingPathComponent: @"Ample.db"];
+
+    if (![url checkResourceIsReachableAndReturnError: &error])
+        new = YES;
+
+    
+    _store = [_psc addPersistentStoreWithType: NSSQLiteStoreType
+                              configuration: nil
+                                        URL: url
+                                    options: nil
+                                      error: &error];
+#else
+
+    url = [url URLByAppendingPathComponent: @"Ample.xml"];
+
+    if (![url checkResourceIsReachableAndReturnError: &error])
+        new = YES;
+
+    
+    _store = [_psc addPersistentStoreWithType: NSXMLStoreType
+                              configuration: nil
+                                        URL: url
+                                    options: nil
+                                      error: &error];
+
+    
+#endif
+    _defaultRequest = [Bookmark fetchRequest];
+    [_defaultRequest setPredicate: [NSPredicate predicateWithFormat: @"automatic == TRUE"]];
+    
+    if (new) {
+        [self convertLegacyBookmarks];
+        [self convertLegacyDiskImages];
+    }
+    
+}
+
+-(void)willTerminate: (NSNotification *)notification {
+
+    NSError *error;
+    
+    if (![_moc save: &error]) {
+        NSLog(@"%@", error);
+    }
+}
+
+
+-(void)convertLegacyBookmarks {
+    
+    //NSEntityDescription *e;
+
+    //e = [NSEntityDescription entityForName: @"Bookmark" inManagedObjectContext: moc];
+
+    NSURL *url = [self bookmarkDirectory];
+    NSFileManager *fm = [NSFileManager defaultManager];
+    NSError *error = nil;
+
+    NSArray *files = [fm contentsOfDirectoryAtURL: url
+                       includingPropertiesForKeys: nil
+                                          options: NSDirectoryEnumerationSkipsHiddenFiles
+                                            error: &error];
+    
+    NSDate *now = [NSDate date];
+    for (NSURL *url in files) {
+
+
+        NSDictionary *dict = [NSDictionary dictionaryWithContentsOfURL: url];
+        //NSData *data = [NSPropertyListSerialization dataWithPropertyList: dict format: NSPropertyListBinaryFormat_v1_0 options: 0 error: &error];
+
+        Bookmark *b = (Bookmark *)[NSEntityDescription insertNewObjectForEntityForName: @"Bookmark" inManagedObjectContext: _moc];
+
+        [b setName: [url lastPathComponent]];
+        [b setDictionary: dict];
+        //[b setData: data];
+        [b setMachine: [dict objectForKey: @"machine"]];
+        [b setCreated: now];
+    }
+
+    // default...
+
+    url = [url URLByAppendingPathComponent: @".Default"];
+    NSDictionary *dict = [NSDictionary dictionaryWithContentsOfURL: url];
+    if (dict) {
+        //NSData *data = [NSPropertyListSerialization dataWithPropertyList: dict format: NSPropertyListBinaryFormat_v1_0 options: 0 error: &error];
+
+        NSString *name = [self uniqueBookmarkName: @"Default"];
+        Bookmark *b = (Bookmark *)[NSEntityDescription insertNewObjectForEntityForName: @"Bookmark" inManagedObjectContext: _moc];
+
+        [b setName: name];
+        [b setAutomatic: YES];
+        [b setDictionary: dict];
+        //[b setData: data];
+        [b setMachine: [dict objectForKey: @"machine"]];
+        [b setCreated: now];
+        
+    }
+
+    if (![_moc save: &error]) {
+        NSLog(@"%@", error);
+    }
+}
+
+-(void)convertLegacyDiskImages {
+
+    NSError *error;
+    NSURL *sd = SupportDirectory();
+    NSURL *url = [sd URLByAppendingPathComponent: @"RecentDiskImages.plist"];
+    
+    NSArray *array = [NSArray arrayWithContentsOfURL: url];
+    if (!array) return;
+
+    for (NSDictionary *d in array) {
+        
+        NSManagedObject *o = [NSEntityDescription insertNewObjectForEntityForName: @"DiskImage" inManagedObjectContext: _moc];
+        [o setValue: [d objectForKey: @"date"] forKey: @"added"];
+        [o setValue: [d objectForKey: @"date"] forKey: @"accessed"];
+        [o setValue: [d objectForKey: @"path"] forKey: @"path"];
+        [o setValue: [d objectForKey: @"size"] forKey: @"size"];
+    }
+
+    if (![_moc save: &error]) {
+        NSLog(@"%@", error);
+    }
 }
 
 -(NSURL *)bookmarkDirectory {
@@ -48,45 +236,61 @@ static BookmarkManager *singleton = nil;
     return url;
 }
 
-/* disallow leading .
- * disallow : or / characters.
- */
--(BOOL)validateName: (NSString *)name {
-    
-    enum { kMaxLength = 128 };
-    unichar buffer[kMaxLength];
-    NSUInteger length = [name length];
-    if (length == 0 || length > kMaxLength) return NO;
-    [name getCharacters: buffer range: NSMakeRange(0, length)];
-    if (buffer[0] == '.') return NO;
-    for (unsigned i = 0; i < length; ++i) {
-        unichar c = buffer[i];
-        if (c == ':' || c == '/') return NO;
-    }
-    return YES;
+
+-(Bookmark *)defaultBookmark {
+
+    NSFetchRequest *req;
+    NSError *error;
+    NSArray *array;
+
+    req = [Bookmark fetchRequest];
+    [req setPredicate: [NSPredicate predicateWithFormat: @"automatic == TRUE"]];
+    array = [_moc executeFetchRequest: req error: &error];
+
+    return [array firstObject];
 }
 
-
 -(NSDictionary *)loadDefault {
-    NSURL *url = [self bookmarkDirectory];
-    url = [url URLByAppendingPathComponent: @".Default"];
-    
-    NSDictionary *d;
-    
-    if (@available(macOS 10.13, *)) {
-        NSError *error = nil;
-        d = [NSDictionary dictionaryWithContentsOfURL: url error: &error];
-        if (!d) NSLog(@"Error loading %@: %@", url, error);
-    } else {
-        d = [NSDictionary dictionaryWithContentsOfURL: url];
-        if (!d) NSLog(@"Error loading %@", url);
-    }
-    return d;
+    Bookmark *b = [self defaultBookmark];
+    return [b dictionary];
 }
 
 /* save as .Default */
--(BOOL)saveDefault: (NSDictionary *)bookmark {
+-(NSError *)saveDefault: (NSDictionary *)bookmark {
 
+    return nil;
+
+#if 0
+    /* check if it already exists */
+
+    NSFetchRequest *req;
+    NSError *error;
+    NSArray *array;
+    Bookmark *b;
+    NSDate *now = [NSDate date];
+    BOOL ok;
+
+    req = [[NSFetchRequest alloc] initWithEntityName: @"Default"];
+    array = [_moc executeFetchRequest: req error: &error];
+
+
+    b = [array firstObject];
+    if (b) {
+        [b setModified: now];
+    } else {
+        b = (Bookmark *)[NSEntityDescription insertNewObjectForEntityForName: @"Default" inManagedObjectContext: _moc];
+
+        [b setName: @"Default"];
+        [b setCreated: now];
+    }
+    [b setDictionary: bookmark];
+    [b setMachine: [bookmark objectForKey: @"machine"]];
+
+    ok = [_moc save: &error];
+    if (!ok) NSLog(@"%@", error);
+    return error;
+
+#if 0
     NSURL *url = [self bookmarkDirectory];
     url = [url URLByAppendingPathComponent: @".Default"];
 
@@ -99,116 +303,349 @@ static BookmarkManager *singleton = nil;
         ok = [bookmark writeToURL: url atomically: YES];
     }
     return ok;
+#endif
+#endif
 }
 
--(BOOL)saveBookmark: (NSDictionary *)bookmark name: (NSString *)name {
+
+-(NSError *)setAutomatic: (Bookmark *)bookmark {
     
+    NSError *error = nil;
+    NSFetchRequest *req = [Bookmark fetchRequest];
+    [req setPredicate: [NSPredicate predicateWithFormat: @"automatic == TRUE"]];
+    
+    NSArray *array = [_moc executeFetchRequest: req error: &error];
+    for (Bookmark *b in array) {
+        if (b != bookmark) [b setAutomatic: NO];
+    }
+    [bookmark setAutomatic: YES];
+    if (error) return error;
+    [_moc save: &error];
+    return error;
+}
+
+-(NSError *)saveBookmark: (NSDictionary *)bookmark name: (NSString *)name automatic: (BOOL)automatic {
+
+    NSDate *now = [NSDate date];
     NSError *error;
-    NSData *data = [NSPropertyListSerialization dataWithPropertyList: bookmark
-                                                              format: NSPropertyListXMLFormat_v1_0
-                                                             options: 0
-                                                               error: &error];
-    
-    
-    
-    NSURL *base = [self bookmarkDirectory];
-    
-    NSURL *url = [base URLByAppendingPathComponent: name];
-    
-    BOOL ok = [data writeToURL: url options: NSDataWritingWithoutOverwriting error: &error];
+    BOOL ok;
 
+    Bookmark *b = (Bookmark *)[NSEntityDescription insertNewObjectForEntityForName: @"Bookmark" inManagedObjectContext: _moc];
+    
+    [b setName: name];
+    [b setDictionary: bookmark];
+    [b setMachine: [bookmark objectForKey: @"machine"]];
+    [b setCreated: now];
+    [b setAutomatic: automatic];
+    
+    ok = [b validateForInsert: &error];
     if (!ok) {
-        for (unsigned i = 1 ; i < 100; ++i) {
-            NSString *tmp = [name stringByAppendingFormat: @"(%d)", i];
-            [base URLByAppendingPathComponent: tmp];
-
-            ok = [data writeToURL: url options: NSDataWritingWithoutOverwriting error: &error];
-            if (ok) {
-                name = tmp;
-                break;
-            }
-        }
+        // will be useful, eg "name is too long"
+        // keys: NSValidationErrorObject, NSLocalizedDescription, NSValidationErrorKey, NSValidationErrorValue
+        //NSLog(@"%@", error);
+        [_moc deleteObject: b];
+        return error;
     }
-    if (!ok) return NO;
     
-    if (!_menu) return YES; // ?
     
-    NSUInteger ix = [_urls indexOfObjectPassingTest: ^BOOL(NSURL *object, NSUInteger index, BOOL *stop){
-        NSString *path = [object lastPathComponent];
-        return [name caseInsensitiveCompare: path] == NSOrderedAscending;
-    }];
-
-    NSMenuItem *item = [[NSMenuItem alloc] initWithTitle: name action: @selector(bookmarkMenu:) keyEquivalent: @""];
-    [item setRepresentedObject: url];
-    
-    if (ix == NSNotFound) {
-        _urls = [_urls arrayByAddingObject: url];
-        [_menu addItem: item];
-    } else {
-        
-        NSInteger n = [_menu numberOfItems];
-        [_menu insertItem: item atIndex: n - [_urls count] + ix];
-        NSMutableArray *tmp = [_urls mutableCopy];
-
-        [tmp insertObject: url atIndex: ix];
+    ok = [_moc save: &error];
+    if (!ok) {
+        //NSLog(@"%@", error);
+        [_moc deleteObject: b];
+        error = [NSError errorWithDomain: @"Ample" code: 0 userInfo: @{ NSLocalizedDescriptionKey: @"Duplicate name" }];
+        return error;
     }
 
-    return YES;
+    if (automatic) {
+        [self setAutomatic: b];
+    }
+
+
+    return nil;
 }
 
--(NSDictionary *)loadBookmarkFromURL: (NSURL *)url {
-    
-    NSDictionary *d;
-    
-    if (@available(macOS 10.13, *)) {
-        NSError *error = nil;
-        d = [NSDictionary dictionaryWithContentsOfURL: url error: &error];
-        if (!d) NSLog(@"Error loading %@: %@", url, error);
-    } else {
-        d = [NSDictionary dictionaryWithContentsOfURL: url];
-        if (!d) NSLog(@"Error loading %@", url);
-    }
-    return d;
-}
-
-
 -(void)loadBookmarks {
     
-    NSURL *url = [self bookmarkDirectory];
-    
-    NSFileManager *fm = [NSFileManager defaultManager];
-    
-    NSError *error = nil;
+    NSSortDescriptor *s = [NSSortDescriptor sortDescriptorWithKey: @"name" ascending: YES selector: @selector(caseInsensitiveCompare:)];
 
-    NSArray *files = [fm contentsOfDirectoryAtURL: url
-                       includingPropertiesForKeys: nil
-                                          options: NSDirectoryEnumerationSkipsHiddenFiles
-                                            error: &error];
     
-    // bleh, has to create 2 new NSStrings for every comparison
-    files = [files sortedArrayUsingComparator: ^(NSURL *a, NSURL *b){
-        NSString *aa = [a lastPathComponent];
-        NSString *bb = [b lastPathComponent];
-        return [aa caseInsensitiveCompare: bb];
-    }];
-    
-    
-    _urls = files;
+    _items = [NSArrayController new];
+    [_items setManagedObjectContext: _moc];
+    [_items setAvoidsEmptySelection: NO];
+    [_items setAutomaticallyPreparesContent: YES];
+    [_items setAutomaticallyRearrangesObjects: YES];
+    [_items setEntityName: @"Bookmark"];
+    [_items setSortDescriptors: @[ s ]];
+
+    [_items fetch: nil];
 }
 
--(void)updateMenu {
+
+/* extract the number from a trailing " (%d)" */
+static int extract_number(NSString *s, NSInteger offset) {
     
-    NSArray *menus = [_menu itemArray];
+    unichar buffer[32];
+    NSInteger len = [s length] - offset;
+    unichar c;
+    int i;
+    int n = 0;
+    
+    if (len < 4) return -1; /* " (1)"*/
+    if (len > 8) return -1; /* " (99999)" */
+    
+    NSRange r = NSMakeRange(offset, len);
+    [s getCharacters: buffer range: r];
+    
+    buffer[len] = 0;
+    i = 0;
+    if (buffer[i++] != ' ') return -1;
+    if (buffer[i++] != '(') return -1;
+    
+    c = buffer[i++];
+    if (c < '1' || c > '9') return -1;
+    n = c - '0';
+    
+    for (;;) {
+        c = buffer[i];
+        if (c < '0' || c > '9') break;
+        n = n * 10 + (c - '0');
+        ++i;
+    }
+
+    if (buffer[i++] != ')') return -1;
+    if (buffer[i++] != 0) return -1;
+
+    return n;
+}
+
+
+-(NSString *)uniqueBookmarkName: (NSString *)name {
+    
+    NSInteger length = [name length];
+
+    NSError *error = nil;
+    NSPredicate *p = [NSPredicate predicateWithFormat: @"name BEGINSWITH %@", name];
+    NSFetchRequest *req = [NSFetchRequest fetchRequestWithEntityName: @"Bookmark"];
+    [req setPredicate: p];
+
+    NSArray *array = [_moc executeFetchRequest: req error: &error];
+    if (![array count]) return name;
+
+    uint64_t bits = 1; /* mark 0 as unavailable */
+    NSInteger max = 0;
+    BOOL exact = NO;
+    for (Bookmark *b in array) {
+        NSString *s = [b name];
+        if ([name isEqualToString: s]) {
+            exact = YES;
+            continue;
+        }
+        int n = extract_number(s, length);
+        if (n < 1) continue;
+        if (n > max) max = n;
+        if (n < 64)
+            bits |= (1 << n);
+    }
+    if (!exact) return name;
+    
+    if (bits == (uint64_t)-1) {
+        return [name stringByAppendingFormat: @" (%u)", (int)(max + 1)];
+    }
+    
+#if 1
+    int ix = 0;
+    while (bits & 0x01) {
+        ++ix;
+        bits >>= 1;
+    }
+#else
+    // this doesn't work correctly.
+    int ix = __builtin_ffsll(~bits);
+#endif
+    return [name stringByAppendingFormat: @" (%u)", ix];
+
+
+}
+
+
+-(BOOL)addDiskImage: (NSObject *)pathOrURL {
+    
+    NSError *error;
+    
+    NSString *path = nil;
+    NSURL *url = nil;
+    if ([pathOrURL isKindOfClass: [NSString class]]) {
+        path = (NSString *)pathOrURL;
+    } else if ([pathOrURL isKindOfClass: [NSURL class]]){
+        url = (NSURL *)pathOrURL;
+
+        path = [NSString stringWithCString: [url fileSystemRepresentation] encoding: NSUTF8StringEncoding];
+    }
+    if (!path) return NO;
+
+    NSFileManager *fm = [NSFileManager defaultManager];
+
+
+    NSDictionary *attr = [fm attributesOfItemAtPath: path error: &error];
+    if (error) {
+        NSLog(@"%@ : %@", path, error);
+        return NO;
+    }
+    
+    NSNumber *size = [attr objectForKey: NSFileSize];
+
+    NSDate *now = [NSDate date];
+    
+    NSPredicate *p = [NSPredicate predicateWithFormat: @"path = %@", path];
+    NSFetchRequest *req = [NSFetchRequest fetchRequestWithEntityName: @"DiskImage"];
+    [req setPredicate: p];
+    
+
+    NSArray *array = [_moc executeFetchRequest: req error: &error];
+    BOOL found = 0;
+    for (NSManagedObject *o in array) {
+        found = YES;
+        [o setValue: now forKey: @"accessed"];
+    }
+    if (found) return NO;
+    
+    DiskImage *o = [NSEntityDescription insertNewObjectForEntityForName: @"DiskImage" inManagedObjectContext: _moc];
+    
+    
+    [o setPath: path];
+    [o setAdded: now];
+    [o setAccessed: now];
+    [o setSize: [size longLongValue]];
+    [o updatePath];
+    
+    if (![_moc save: &error]) {
+        NSLog(@"%@", error);
+        [_moc deleteObject: o];
+    }
+    
+    return YES;
+}
+
+-(void)diskImageAdded: (NSNotification *)notification {
+    
+    NSURL *url = [notification object];
+    if (url) [self addDiskImage: url];
+}
+
+static NSString *kMenuContext = @"";
+
+-(void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary<NSKeyValueChangeKey,id> *)change context:(void *)context {
+    if (context == (__bridge void * _Nullable)(kMenuContext)) {
+
+        //NSLog(@"observeValueForKeyPath %@", keyPath);
+        
+        _newMenuGeneration++;
+
+        return;
+    }
+
+    [super observeValueForKeyPath: keyPath ofObject: object change: change context: context];
+}
+
+-(void)initMenus {
+    
+    if (!_items) {
+        [self loadBookmarks];
+        [_items addObserver: self forKeyPath: @"arrangedObjects.name" options: 0 context: (__bridge void * _Nullable)(kMenuContext)];
+        [_items addObserver: self forKeyPath: @"arrangedObjects.automatic" options: 0 context: (__bridge void * _Nullable)(kMenuContext)];
+    }
+
+}
+
+-(IBAction)bookmarkMenu:(id)sender
+{
+}
+
+-(Bookmark *)currentBookmark {
+    return _currentBookmark;
+}
+-(void)setCurrentBookmark:(Bookmark *)currentBookmark {
+    if (currentBookmark == _currentBookmark) return;
+    _currentBookmark = currentBookmark;
+    _newMenuGeneration++;
+}
+
+-(void)menuNeedsUpdate:(NSMenu *)menu {
+    
+    if (_currentMenuGeneration == _newMenuGeneration) return;
+    _currentMenuGeneration = _newMenuGeneration;
+
+    if (_currentBookmark && _updateMenuItem) {
+        NSString *title = [NSString stringWithFormat: @"Update “%@”", [_currentBookmark name]];
+        [_updateMenuItem setHidden: NO];
+        [_updateMenuItem setTitle: title];
+        [_updateMenuItem setRepresentedObject: _currentBookmark];
+    } else {
+        [_updateMenuItem setHidden: YES];
+        [_updateMenuItem setRepresentedObject: nil];
+    }
+    
+    
+
+    NSArray *menus = [menu itemArray];
     for (NSMenuItem *item in [menus reverseObjectEnumerator]) {
         if ([item tag] == 0xdeadbeef) [_menu removeItem: item];
     }
-    for (NSURL *url in _urls) {
-        NSString *title = [url lastPathComponent]; // [[url lastPathComponent] stringByDeletingPathExtension];
 
-        NSMenuItem *item = [_menu addItemWithTitle: title action: @selector(bookmarkMenu:) keyEquivalent: @""];
-        [item setRepresentedObject: url];
+    NSArray *array = [_items arrangedObjects];
+    for (Bookmark *b in array) {
+
+        NSString *title = [b name];
+        NSMenuItem *item = [menu addItemWithTitle: title action: @selector(bookmarkMenu:) keyEquivalent: @""];
+        [item setRepresentedObject: b];
         [item setTag: 0xdeadbeef];
+        if ([b automatic]) {
+            
+            [item setOnStateImage: [NSImage imageNamed: NSImageNameStatusAvailable]];
+            [item setState: NSOnState];
+        }
+        //if ([b automatic]) [item setAttributedTitle: ItalicMenuString([b name])];
+        //[item setState: [b automatic] ? NSMixedState : NSOffState];
     }
+    
 }
 
+@end
+
+
+/* MacOS 12.1+ doesn't like class clusters in nibs -
+ 
+ [General] This coder is expecting the replaced object 0x600000938f60 to be returned from
+ NSClassSwapper.initWithCoder instead of <BookmarkManager: 0x600000905da0>
+
+ */
+@interface BookmarkManagerProxy : NSProxy {
+    BookmarkManager *_target;
+}
+@end
+
+@implementation BookmarkManagerProxy
+
+-(id)init {
+    _target = [BookmarkManager sharedManager];
+    return self;
+}
+
+-(NSMethodSignature *)methodSignatureForSelector:(SEL)sel {
+    return [_target methodSignatureForSelector: sel];
+}
+
++(BOOL)respondsToSelector:(SEL)aSelector {
+    return [BookmarkManager respondsToSelector: aSelector];
+}
+-(void)forwardInvocation:(NSInvocation *)invocation {
+    if ([_target respondsToSelector: [invocation selector]]) {
+        [invocation invokeWithTarget: _target];
+    } else {
+        [super forwardInvocation: invocation];
+    }
+}
+
+
+
 @end

Ample/BookmarkWindowController.h

@@ -0,0 +1,19 @@
+//
+//  BookmarkWindowController.h
+//  Ample
+//
+//  Created by Kelvin Sherlock on 2/6/2022.
+//  Copyright © 2022 Kelvin Sherlock. All rights reserved.
+//
+
+#import <Cocoa/Cocoa.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface BookmarkWindowController : NSWindowController
+
++(instancetype)sharedInstance;
+
+@end
+
+NS_ASSUME_NONNULL_END

Ample/BookmarkWindowController.m

@@ -0,0 +1,170 @@
+//
+//  BookmarkWindowController.m
+//  Ample
+//
+//  Created by Kelvin Sherlock on 2/6/2022.
+//  Copyright © 2022 Kelvin Sherlock. All rights reserved.
+//
+
+#import "BookmarkWindowController.h"
+#import "BookmarkManager.h"
+#import "Bookmark.h"
+#import "Ample.h"
+
+
+
+@interface BookmarkWindowController ()
+@property (strong) IBOutlet NSArrayController *arrayController;
+@property (strong) IBOutlet BookmarkManager *bookmarkManager;
+
+@property (weak) IBOutlet NSTableView *tableView;
+
+@end
+
+@implementation BookmarkWindowController
+
+
++(instancetype)sharedInstance {
+    static BookmarkWindowController *me = nil;
+    if (!me) {
+        me = [self new];
+    }
+    return me;
+}
+
+-(NSString *)windowNibName {
+    return @"BookmarkWindow";
+}
+
+
+- (void)windowDidLoad {
+    [super windowDidLoad];
+
+    NSSortDescriptor *s = [NSSortDescriptor sortDescriptorWithKey: @"name" ascending: YES selector: @selector(caseInsensitiveCompare:)];
+
+    [_arrayController setSortDescriptors: @[s]];
+
+}
+
+-(BOOL)windowShouldClose: (NSWindow *)sender {
+
+    NSManagedObjectContext *moc = [_arrayController managedObjectContext];
+    NSError *error;
+    
+    if (![_arrayController commitEditing]) return NO;
+
+    if ([moc save: &error]) return YES;
+    NSLog(@"%@", error);
+   
+#if 0
+    NSDictionary *dict = [error userInfo];
+    NSArray *array = [dict objectForKey: @"conflictList"];
+    for (NSConstraintConflict *c in array) {
+        
+        NSArray * arr = [c conflictingObjects];
+        for (NSManagedObject *o in arr) {
+ 
+        }
+    }
+#endif
+    return YES;
+
+    //[self presentError: error];
+    //return NO;
+}
+
+-(void)keyDown:(NSEvent *)event {
+    /* Carbon/Events.h */
+    enum {
+        kVK_Delete                    = 0x33,
+        kVK_ForwardDelete             = 0x75,
+
+    };
+    unsigned short keyCode = [event keyCode];
+
+    if (keyCode == kVK_Delete || keyCode == kVK_ForwardDelete) {
+        
+        // arraycontroller selected object / selected index doesn't work right.
+        
+        NSInteger row = [_tableView selectedRow];
+        if (row >= 0)
+            [_arrayController removeObjectAtArrangedObjectIndex: row];
+        
+    }
+}
+
+-(Bookmark *)clickedItem {
+
+    NSArray *array = [_arrayController arrangedObjects];
+    NSInteger row = [_tableView clickedRow];
+    if (row < 0 || row >= [array count]) return nil;
+    return [array objectAtIndex: row];
+}
+
+-(IBAction)doubleClick:(id)sender {
+    
+    Bookmark *b = [self clickedItem];
+    if (!b) return;
+    
+    NSNotificationCenter *nc = [NSNotificationCenter defaultCenter];
+    
+    [nc postNotificationName: kNotificationBookmarkMagicRoute object: b];
+}
+
+-(IBAction)toggleDefault:(id)sender {
+    NSLog(@"%@", sender);
+
+
+}
+
+-(IBAction)setDefault:(id)sender {
+
+    Bookmark *b = [self clickedItem];
+    if (!b) return;
+    
+    [_bookmarkManager setAutomatic: b];
+}
+
+-(IBAction)clearDefault:(id)sender {
+    
+    Bookmark *b = [self clickedItem];
+    if (!b) return;
+
+    [b setAutomatic: NO];
+}
+
+
+-(IBAction)deleteBookmark:(id)sender {
+
+    //Bookmark *b = [self clickedItem];
+    //if (!b) return;
+
+    NSInteger row = [_tableView clickedRow];
+    if (row >= 0)
+        [_arrayController removeObjectAtArrangedObjectIndex: row];
+}
+
+@end
+
+@implementation BookmarkWindowController (Menu)
+
+-(BOOL)validateMenuItem:(NSMenuItem *)menuItem {
+    
+    Bookmark *b = [self clickedItem];
+    
+    if (!b) return NO;
+    SEL action = [menuItem action];
+    
+    if (action == @selector(clearDefault:)) {
+        return [b automatic];
+    }
+
+    if (action == @selector(setDefault:)) {
+        return ![b automatic];
+    }
+
+
+    return YES;
+}
+
+@end

Ample/Core Data/Ample.xcdatamodeld/Ample.xcdatamodel/contents

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="15702" systemVersion="18G9323" minimumToolsVersion="Automatic" sourceLanguage="Objective-C" userDefinedModelVersionIdentifier="0">
+    <entity name="Bookmark" representedClassName="Bookmark" syncable="YES">
+        <attribute name="automatic" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES"/>
+        <attribute name="comment" optional="YES" attributeType="String"/>
+        <attribute name="created" optional="YES" attributeType="Date" usesScalarValueType="NO"/>
+        <attribute name="data" attributeType="Binary"/>
+        <attribute name="machine" optional="YES" attributeType="String"/>
+        <attribute name="modified" optional="YES" attributeType="Date" usesScalarValueType="NO"/>
+        <attribute name="name" attributeType="String" minValueString="1" maxValueString="32"/>
+        <fetchIndex name="Bookmark_name">
+            <fetchIndexElement property="name" type="Binary" order="ascending"/>
+        </fetchIndex>
+    </entity>
+    <entity name="DiskImage" representedClassName="DiskImage" syncable="YES">
+        <attribute name="accessed" attributeType="Date" usesScalarValueType="NO"/>
+        <attribute name="added" attributeType="Date" usesScalarValueType="NO"/>
+        <attribute name="name" optional="YES" transient="YES" attributeType="String"/>
+        <attribute name="path" attributeType="String"/>
+        <attribute name="size" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="YES"/>
+        <fetchIndex name="DiskImage_path">
+            <fetchIndexElement property="path" type="Binary" order="ascending"/>
+        </fetchIndex>
+    </entity>
+    <elements>
+        <element name="Bookmark" positionX="994.5546875" positionY="-404.046875" width="128" height="148"/>
+        <element name="DiskImage" positionX="1242" positionY="-333" width="128" height="118"/>
+    </elements>
+</model>

Ample/Core Data/Bookmark+CoreDataClass.h

@@ -0,0 +1,25 @@
+//
+//  Bookmark+CoreDataClass.h
+//  Ample
+//
+//  Created by Kelvin Sherlock on 2/6/2022.
+//  Copyright © 2022 Kelvin Sherlock. All rights reserved.
+//
+//
+
+#import <Foundation/Foundation.h>
+#import <CoreData/CoreData.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface Bookmark : NSManagedObject
+
+@property NSDictionary *dictionary;
+
++(NSString *)uniqueName: (NSString *)name inContext: (NSManagedObjectContext *)context;
+
+@end
+
+NS_ASSUME_NONNULL_END
+
+#import "Bookmark+CoreDataProperties.h"

Ample/Core Data/Bookmark+CoreDataClass.m

@@ -0,0 +1,175 @@
+//
+//  Bookmark+CoreDataClass.m
+//  Ample
+//
+//  Created by Kelvin Sherlock on 2/6/2022.
+//  Copyright © 2022 Kelvin Sherlock. All rights reserved.
+//
+//
+
+#import "Bookmark+CoreDataClass.h"
+
+@implementation Bookmark
+
+/* extract the number from a trailing " (%d)" */
+static int extract_number(NSString *s, NSInteger offset) {
+    
+    unichar buffer[32];
+    NSInteger len = [s length] - offset;
+    unichar c;
+    int i;
+    int n = 0;
+    
+    if (len < 4) return -1; /* " (1)"*/
+    if (len > 6) return -1; /* " (999)" */
+    
+    NSRange r = NSMakeRange(offset, len);
+    [s getCharacters: buffer range: r];
+    
+    buffer[len] = 0;
+    i = 0;
+    if (buffer[i++] != ' ') return -1;
+    if (buffer[i++] != '(') return -1;
+    
+    c = buffer[i++];
+    if (c < '1' || c > '9') return -1;
+    n = c - '0';
+    
+    for (;;) {
+        c = buffer[i];
+        if (c < '0' || c > '9') break;
+        n = n * 10 + (c - '0');
+        ++i;
+    }
+
+    if (buffer[i++] != ')') return -1;
+    if (buffer[i++] != 0) return -1;
+
+    return n;
+}
+
++(NSString *)uniqueName: (NSString *)name inContext: (NSManagedObjectContext *)context {
+    
+    NSInteger length = [name length];
+
+    NSError *error = nil;
+    NSPredicate *p = [NSPredicate predicateWithFormat: @"name BEGINSWITH %@", name];
+    NSFetchRequest *req = [NSFetchRequest fetchRequestWithEntityName: @"Bookmark"];
+    [req setPredicate: p];
+
+    NSArray *array = [context executeFetchRequest: req error: &error];
+    if (![array count]) return name;
+
+    uint64_t bits = 1; /* mark 0 as unavailable */
+    NSInteger max = 0;
+    BOOL exact = NO;
+    for (Bookmark *b in array) {
+        NSString *s = [b name];
+        if ([name isEqualToString: s]) {
+            exact = YES;
+            continue;
+        }
+        int n = extract_number(s, length);
+        if (n < 1) continue;
+        if (n > max) max = n;
+        if (n < 64)
+            bits |= (1 << n);
+    }
+    if (!exact) return name;
+    
+    if (bits == (uint64_t)-1) {
+        if (max == 999) return nil;
+        return [name stringByAppendingFormat: @" (%u)", (int)(max + 1)];
+    }
+    
+#if 1
+    int ix = 0;
+    while (bits) {
+        ++ix;
+        bits >>= 1;
+    }
+#else
+    // this doesn't work correctly.
+    int ix = __builtin_ffsll(~bits);
+#endif
+    return [name stringByAppendingFormat: @" (%u)", ix];
+
+}
+
+-(void)setDictionary:(NSDictionary *)dictionary {
+    
+    NSData *data;
+    NSError *error = nil;
+
+    data = [NSPropertyListSerialization dataWithPropertyList: dictionary
+                                                      format: NSPropertyListBinaryFormat_v1_0
+                                                     options: 0
+                                                       error: &error];
+    
+    [self setData: data];
+}
+
+-(NSDictionary *)dictionary {
+    
+//    NSDictionary *dict;
+    NSData *data = [self data];
+    NSError *error = nil;
+    
+    return [NSPropertyListSerialization propertyListWithData: data
+                                                     options: 0
+                                                      format: nil
+                                                       error: &error];
+}
+
+
+- (NSError *)errorFromOriginalError:(NSError *)originalError error:(NSError*)secondError
+{
+    NSMutableDictionary *userInfo = [NSMutableDictionary dictionary];
+    NSMutableArray *errors = [NSMutableArray arrayWithObject:secondError];
+    if ([originalError code] == NSValidationMultipleErrorsError) {
+        [userInfo addEntriesFromDictionary:[originalError userInfo]];
+        [errors addObjectsFromArray:[userInfo objectForKey:NSDetailedErrorsKey]];
+    } else {
+        [errors addObject:originalError];
+    }
+    [userInfo setObject:errors forKey:NSDetailedErrorsKey];
+    return [NSError errorWithDomain:NSCocoaErrorDomain code:NSValidationMultipleErrorsError userInfo:userInfo];
+}
+
+- (BOOL)validateName:(id*)ioValue error:(NSError**)outError {
+    
+    if (!ioValue || !*ioValue) return YES;
+    NSString *name = *ioValue;
+    
+    NSFetchRequest *frq = [NSFetchRequest fetchRequestWithEntityName: @"Bookmark"];
+    
+    NSPredicate *p = [NSPredicate predicateWithFormat: @"name = %@", name];
+    [frq setPredicate: p];
+    
+    NSArray * arr = [[self managedObjectContext] executeFetchRequest: frq error: nil];
+    BOOL dupe = NO;
+    for (Bookmark *b in arr) {
+        if (b == self) continue;
+        dupe = YES;
+        break;
+    }
+    if (dupe && outError) {
+        NSDictionary *dict = @{ NSLocalizedFailureReasonErrorKey: @"duplicate name",
+                                NSLocalizedDescriptionKey: @"duplicate name",
+                                NSValidationKeyErrorKey: @"name",
+                                NSValidationValueErrorKey: name,
+                                NSValidationObjectErrorKey: self
+        };
+        NSError *e = [NSError errorWithDomain: @"Ample" code: 1 userInfo: dict];
+        
+        if (*outError) {
+            *outError = [self errorFromOriginalError: *outError error: e];
+        } else {
+            *outError = e;
+        }
+    }
+    return !dupe;
+}
+
+
+@end

Ample/Core Data/Bookmark+CoreDataProperties.h

@@ -0,0 +1,28 @@
+//
+//  Bookmark+CoreDataProperties.h
+//  Ample
+//
+//  Created by Kelvin Sherlock on 2/6/2022.
+//  Copyright © 2022 Kelvin Sherlock. All rights reserved.
+//
+//
+
+#import "Bookmark+CoreDataClass.h"
+
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface Bookmark (CoreDataProperties)
+
++ (NSFetchRequest<Bookmark *> *)fetchRequest;
+
+@property (nullable, nonatomic, copy) NSString *name;
+@property (nullable, nonatomic, copy) NSString *machine;
+@property (nullable, nonatomic, retain) NSData *data;
+@property (nullable, nonatomic, copy) NSDate *created;
+@property (nullable, nonatomic, copy) NSDate *modified;
+@property (nullable, nonatomic, copy) NSString *comment;
+@property (nonatomic) BOOL automatic;
+@end
+
+NS_ASSUME_NONNULL_END

Ample/Core Data/Bookmark+CoreDataProperties.m

@@ -0,0 +1,26 @@
+//
+//  Bookmark+CoreDataProperties.m
+//  Ample
+//
+//  Created by Kelvin Sherlock on 2/6/2022.
+//  Copyright © 2022 Kelvin Sherlock. All rights reserved.
+//
+//
+
+#import "Bookmark+CoreDataProperties.h"
+
+@implementation Bookmark (CoreDataProperties)
+
++ (NSFetchRequest<Bookmark *> *)fetchRequest {
+	return [NSFetchRequest fetchRequestWithEntityName:@"Bookmark"];
+}
+
+@dynamic name;
+@dynamic machine;
+@dynamic data;
+@dynamic created;
+@dynamic modified;
+@dynamic comment;
+@dynamic automatic;
+
+@end

Ample/Core Data/DiskImage+CoreDataClass.h

@@ -0,0 +1,21 @@
+//
+//  DiskImage+CoreDataClass.h
+//  Ample
+//
+//  Created by Kelvin Sherlock on 2/7/2022.
+//  Copyright © 2022 Kelvin Sherlock. All rights reserved.
+//
+//
+
+#import <Foundation/Foundation.h>
+#import <CoreData/CoreData.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface DiskImage : NSManagedObject
+
+@end
+
+NS_ASSUME_NONNULL_END
+
+#import "DiskImage+CoreDataProperties.h"

Ample/Core Data/DiskImage+CoreDataClass.m

@@ -0,0 +1,14 @@
+//
+//  DiskImage+CoreDataClass.m
+//  Ample
+//
+//  Created by Kelvin Sherlock on 2/7/2022.
+//  Copyright © 2022 Kelvin Sherlock. All rights reserved.
+//
+//
+
+#import "DiskImage+CoreDataClass.h"
+
+@implementation DiskImage
+
+@end

Ample/Core Data/DiskImage+CoreDataProperties.h

@@ -0,0 +1,29 @@
+//
+//  DiskImage+CoreDataProperties.h
+//  Ample
+//
+//  Created by Kelvin Sherlock on 2/7/2022.
+//  Copyright © 2022 Kelvin Sherlock. All rights reserved.
+//
+//
+
+#import "DiskImage+CoreDataClass.h"
+
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface DiskImage (CoreDataProperties)
+
++ (NSFetchRequest<DiskImage *> *)fetchRequest;
+
+@property (nullable, nonatomic, copy) NSString *path;
+@property (nullable, nonatomic, copy) NSDate *added;
+@property (nonatomic) int64_t size;
+@property (nullable, nonatomic, copy) NSDate *accessed;
+@property (nullable, nonatomic, copy) NSString *name;
+
+-(void)updatePath;
+
+@end
+
+NS_ASSUME_NONNULL_END

Ample/Core Data/DiskImage+CoreDataProperties.m

@@ -0,0 +1,52 @@
+//
+//  DiskImage+CoreDataProperties.m
+//  Ample
+//
+//  Created by Kelvin Sherlock on 2/7/2022.
+//  Copyright © 2022 Kelvin Sherlock. All rights reserved.
+//
+//
+
+#import "DiskImage+CoreDataProperties.h"
+
+#if 0
+@interface DiskImage () {
+    NSString *_name;
+}
+@end
+#endif
+
+@implementation DiskImage (CoreDataProperties)
+
++ (NSFetchRequest<DiskImage *> *)fetchRequest {
+	return [NSFetchRequest fetchRequestWithEntityName:@"DiskImage"];
+}
+
+@dynamic path;
+@dynamic added;
+@dynamic size;
+@dynamic accessed;
+@dynamic name;
+
+-(void)updatePath {
+
+    NSString *path = [self primitiveValueForKey: @"path"];
+    [self setName: [path lastPathComponent]];
+}
+
+-(void)awakeFromFetch {
+    [super awakeFromFetch];
+
+    [self updatePath];
+}
+
+#if 0
+-(void)awakeFromInsert {
+    [super awakeFromInsert];
+
+    NSString *path = [self primitiveValueForKey: @"path"];
+    [self setName: [path lastPathComponent]];
+}
+#endif
+
+@end

Ample/Defaults.plist

@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>MameComponentsDate</key>
-	<date>2021-05-27T16:00:00Z</date>
+	<date>2024-04-25T12:00:00Z</date>
 	<key>UseCustomMame</key>
 	<false/>
 	<key>AutoCloseLogWindow</key>
@@ -15,7 +15,9 @@
 	<key>NSQuitAlwaysKeepsWindows</key>
 	<true/>
 	<key>DefaultDownloadURL</key>
-	<string>https://archive.org/download/mame.0229</string>
+	<string>https://archive.org/download/mame-merged/mame-merged</string>
+	<key>UseLogWindow</key>
+	<true/>
 	<key>DefaultDownloadExtension</key>
 	<string>zip</string>
 </dict>

Ample/DiskImage.h

@@ -0,0 +1,14 @@
+//
+//  DiskImage.h
+//  Ample
+//
+//  Created by Kelvin Sherlock on 2/7/2022.
+//  Copyright © 2022 Kelvin Sherlock. All rights reserved.
+//
+
+#ifndef DiskImage_h
+#define DiskImage_h
+
+#import "DiskImage+CoreDataClass.h"
+
+#endif /* DiskImage_h */

Ample/DiskImagesWindowController.m

@@ -9,19 +9,18 @@
 #import "DiskImagesWindowController.h"
 #import "TableCellView.h"
 #import "Ample.h"
+#import "DiskImage.h"
+
+#import "BookmarkManager.h"
 
 @interface DiskImagesWindowController ()
 @property (weak) IBOutlet NSTableView *tableView;
 @property (strong) IBOutlet NSArrayController *arrayController;
-@property (strong) NSMutableArray *content;
 
 @end
 
 @implementation DiskImagesWindowController {
-    BOOL _dirty;
     NSSet *_extensions;
-    NSTimer *_timer;
-    
 }
 
 +(instancetype)sharedInstance {
@@ -44,10 +43,17 @@
     
     if ((self = [super init])) {
         
-        [self loadRecentDiskImages];
+        //[self loadRecentDiskImages];
         
         _extensions = [NSSet setWithObjects:
-            @"2img", @"2mg", @"chd", @"dc", @"do", @"dsk", @"hd", @"hdv", @"image", @"nib", @"po", @"wav", @"woz", @"iso", @"raw", nil
+            @"2img", @"2mg", @"chd", @"dc", @"do", @"dsk", @"hd", @"hdv", @"image", @"nib", @"po", @"wav", @"woz", @"iso", @"raw",
+            // st, etc.
+            @"mfm",   @"st", @"msa", @"stx", @"ipf",
+            //
+            @"rom", @"bin",
+            // not supported/relevant.
+            // @"mfi", @"dfi", @"hfe",  @"d77"  @"d88", @"1dd", @"cqm", @"cqi", @"td0", @"imd", 
+            nil
         ];
     }
     return self;
@@ -59,9 +65,6 @@
 
 - (void)windowDidLoad {
 
-    if (!_content)
-        [self setContent: [NSMutableArray new]];
-    
     [super windowDidLoad];
     NSWindow *window = [self window];
     [window setRestorable: YES];
@@ -75,8 +78,12 @@
     [_tableView setDraggingSourceOperationMask: NSDragOperationCopy forLocal: NO]; // enable drag/drop to othr apps.
 
     // Implement this method to handle any initialization after your window controller's window has been loaded from its nib file.
+
+    NSSortDescriptor *s = [NSSortDescriptor sortDescriptorWithKey: @"name" ascending: YES selector: @selector(caseInsensitiveCompare:)];
+    [_arrayController setSortDescriptors: @[ s ]];
 }
 
+#if 0
 -(void)loadRecentDiskImages {
 //    NSError *error;
 
@@ -93,7 +100,7 @@
     
     NSNotificationCenter *nc = [NSNotificationCenter defaultCenter];
     
-    [nc addObserver: self selector: @selector(diskImageAdded:) name: @"DiskImageAdded" object: nil];
+    [nc addObserver: self selector: @selector(diskImageAdded:) name: kNotificationDiskImageAdded object: nil];
     
     [nc addObserver: self selector: @selector(willTerminate:) name: NSApplicationWillTerminateNotification object: nil];
 }
@@ -102,14 +109,16 @@
     _timer = nil;
     [self saveFile];
 }
+#endif
 
 -(void)diskImageAdded: (NSNotification *)notification {
     
     NSURL *url = [notification object];
     if (!url) return;
     
-    [self addFile: url];
+    //[self addFile: url];
 }
+#if 0
 -(void)markDirty {
     _dirty = YES;
     if (_timer) [_timer invalidate];
@@ -124,6 +133,7 @@
 #endif
 }
 
+
 -(void)saveFile {
 
     [_timer invalidate];
@@ -147,10 +157,11 @@
     [self saveFile];
     
 }
+#endif
 
 
 
-
+#if 0
 -(BOOL)addFile: (NSObject *)pathOrURL {
     
     NSString *path = nil;
@@ -182,7 +193,7 @@
     
     NSFileManager *fm = [NSFileManager defaultManager];
     NSError *error;
- 
+
     NSDictionary *attr = [fm attributesOfItemAtPath: path error: &error];
     if (error) {
         NSLog(@"%@ : %@", path, error);
@@ -198,18 +209,20 @@
                               [NSDate new], @"date",
                               nil];
     
+#if 0
     @synchronized (self) {
         if (_arrayController)
             [_arrayController addObject: d];
         else
             [_content addObject: d];
     }
+#endif
     [self markDirty];
     return YES;
 }
 
-
--(NSMutableDictionary *)clickedItem {
+#endif
+-(DiskImage *)clickedItem {
 
     NSArray *array = [_arrayController arrangedObjects];
     NSInteger row = [_tableView clickedRow];
@@ -218,11 +231,21 @@
 }
 #pragma mark - IBActions
 
+- (IBAction)filter:(id)sender {
+    NSString *text = [sender stringValue];
+    NSPredicate *p = nil;
+    if ([text length]) {
+        p = [NSPredicate predicateWithFormat: @"name CONTAINS[cd] %@",text];
+    }
+
+    [_arrayController setFilterPredicate: p];
+}
+
 - (IBAction)showInFinder:(id)sender {
     
-    NSMutableDictionary *item = [self clickedItem];
+    DiskImage *item = [self clickedItem];
     if (!item) return;
-    NSString *path = [item objectForKey: @"path"];
+    NSString *path = [item path];
 
     NSURL *url = [NSURL fileURLWithPath: path];
     if (!url) return;
@@ -233,19 +256,19 @@
 
 - (IBAction)eject:(id)sender {
 
-    NSMutableDictionary *item = [self clickedItem];
+    DiskImage *item = [self clickedItem];
     if (!item) return;
     
-    @synchronized (self) {
-        
-        if (_arrayController) {
-            [_arrayController removeObject: item];
-        } else {
-            [_content removeObject: item];
-        }
-        [self markDirty];
-    }
+    [_arrayController removeObject: item];
+}
 
+-(IBAction)doubleClick: (id)sender {
+    DiskImage *d = [self clickedItem];
+    
+    NSNotificationCenter *nc = [NSNotificationCenter defaultCenter];
+    
+    NSDictionary *userInfo = @{ @"path": [d path] };
+    [nc postNotificationName: kNotificationDiskImageMagicRoute object: nil userInfo: userInfo];
 }
 
 @end
@@ -257,9 +280,9 @@
     
     id objects = [_arrayController arrangedObjects];
     
-    NSDictionary *d = [objects objectAtIndex: row];
-  
-    NSString *path = [d objectForKey: @"path"];
+    DiskImage *d = [objects objectAtIndex: row];
+    if (!d) return nil;
+    NSString *path = [d path];
     
     NSURL *url = [NSURL fileURLWithPath: path];
     return url;
@@ -296,6 +319,8 @@
 
 -(BOOL)tableView:(NSTableView *)tableView acceptDrop:(id<NSDraggingInfo>)info row:(NSInteger)row dropOperation:(NSTableViewDropOperation)dropOperation {
 
+    BookmarkManager *bm = [BookmarkManager sharedManager];
+    
     if ([info draggingSource] == _tableView) return NO;
 
     NSPasteboard * pb = [info draggingPasteboard];
@@ -314,7 +339,9 @@
         if (!s) continue;
         NSURL *url = [NSURL URLWithString: s];
         if (!url) continue;
-        ok |= [self addFile: url];
+        
+        ok |= [bm addDiskImage: url];
+        //ok |= [self addFile: url];
     }
     return ok;
 }

Ample/DownloadWindowController.m

@@ -11,6 +11,9 @@
 #import "Menu.h"
 
 
+static NSString *Extensions[] = { @"zip", @"7z" };
+
+
 enum {
     kTagZip = 1,
     kTag7z = 2,
@@ -81,6 +84,7 @@ enum {
 
 @interface DownloadItem : NSObject
 
+@property NSString *value;
 @property NSString *name;
 @property NSError *error;
 @property NSString *pathName;
@@ -89,6 +93,7 @@ enum {
 
 @property NSUInteger status;
 @property NSUInteger index;
+@property NSUInteger fileSize;
 
 @property (readonly) NSColor *titleColor;
 @property (readonly) NSColor *descriptionColor;
@@ -98,6 +103,8 @@ enum {
 -(void)beginDownloadWithTask:(NSURLSessionDownloadTask *)task;
 -(void)completeWithError: (NSError *)error;
 -(NSString *)statusDescription;
+
+-(void)refresh: (NSURL *)localURL;
 @end
 
 
@@ -134,7 +141,7 @@ enum {
 @end
 
 @implementation DownloadWindowController {
-    
+
     NSArray *_items;
     NSURL *_romFolder;
     NSURL *_defaultDownloadURL;
@@ -143,7 +150,7 @@ enum {
     NSURLSession *_session;
     NSMutableDictionary *_taskIndex;
     NSUserDefaults *_defaults;
-    
+
     NSArray<NSButton *> *_filterButtons;
 }
 
@@ -167,7 +174,7 @@ enum {
 
 #if 0
 - (void)encodeWithCoder:(nonnull NSCoder *)coder {
-    
+
 }
 #endif
 
@@ -177,11 +184,11 @@ enum {
 
 -(void)windowWillLoad {
     _defaults = [NSUserDefaults standardUserDefaults];
-    
+
     // set here so binding works.
     NSString *s = [_defaults stringForKey: kDownloadExtension];
     if (![s length]) s = [_defaults stringForKey: kDefaultDownloadExtension];
-    
+
     _downloadExtension = s;
 }
 
@@ -193,12 +200,12 @@ enum {
     [window setRestorable: YES];
     [window setRestorationClass: [self class]];
 #endif
-    
+
     _filterButtons = @[
         _allFilterButton,
         _missingFilterButton
     ];
-    
+
 
     // Implement this method to handle any initialization after your window controller's window has been loaded from its nib file.
 
@@ -206,21 +213,24 @@ enum {
     NSBundle *bundle = [NSBundle mainBundle];
     NSFileManager *fm = [NSFileManager defaultManager];
 
+#ifdef AMPLE_LITE
+    NSURL *url = [bundle URLForResource: @"roms~extra" withExtension: @"plist"];
+#else
     NSURL *url = [bundle URLForResource: @"roms" withExtension: @"plist"];
-    
-    NSDictionary *d = [NSDictionary dictionaryWithContentsOfURL: url];
-    
+#endif
+    NSArray *roms = [NSArray arrayWithContentsOfURL: url];
+
     NSURL *sd = SupportDirectory();
 
     _romFolder = [sd URLByAppendingPathComponent: @"roms"];
-    
+
     [fm createDirectoryAtURL: _romFolder withIntermediateDirectories: YES attributes: nil error: &error];
 
     // so blank URL isn't overwritten.
     NSString *s = [_defaults stringForKey: kDefaultDownloadURL];
     _defaultDownloadURL = [NSURL URLWithString: s];
     [_downloadField setPlaceholderString: s];
-    
+
     s = [_defaults stringForKey: kDownloadURL];
     if ([s length]) {
         [_downloadField setStringValue: s];
@@ -228,23 +238,23 @@ enum {
     } else {
         _downloadURL = _defaultDownloadURL;
     }
-    
-    [self initializeExtensionMenu];
-    
 
-    NSArray *roms = [d objectForKey: @"roms"];
+    [self initializeExtensionMenu];
+
+
     [self setCurrentROM: @""];
     [self setCurrentCount: 0];
     [self setTotalCount: [roms count]];
     [self setErrorCount: 0];
-    
+
 
     NSMutableArray *tmp = [NSMutableArray arrayWithCapacity: [roms count]];
     unsigned ix = 0;
-    for (NSString *name in roms) {
-        
+    for (NSDictionary *d in roms) {
+
         DownloadItem *item  = [DownloadItem new];
-        [item setName: name];
+        [item setValue: [d objectForKey: @"value"]];
+        [item setName: [d objectForKey: @"description"]];
         [item setIndex: ix++];
 
         [tmp addObject: item];
@@ -252,12 +262,12 @@ enum {
     _items = tmp;
     [self refreshROMs: nil];
     [_arrayController setContent: _items];
- 
+
     //[_tableView reloadData];
     NSURLSessionConfiguration *config = [NSURLSessionConfiguration defaultSessionConfiguration];
     _session = [NSURLSession sessionWithConfiguration: config delegate: self delegateQueue: nil];
     _taskIndex = [NSMutableDictionary dictionaryWithCapacity: [_items count]];
-    
+
     //[self download];
 }
 
@@ -266,13 +276,13 @@ enum {
 #if 0
 -(void)validateURL: (NSString *)url {
     NSURL *v;
-    
+
     if (![url length]) {
         _effectiveURL = [NSURL URLWithString: _downloadURL];
         [_downloadField setTextColor: nil];
         return;
     }
-    
+
     v = [NSURL URLWithString: url];
     if (v) {
         _effectiveURL = v;
@@ -290,36 +300,36 @@ enum {
         NSURLSessionConfiguration *config = [NSURLSessionConfiguration defaultSessionConfiguration];
         _session = [NSURLSession sessionWithConfiguration: config delegate: self delegateQueue: nil];
     }
-    
+
     NSURLSessionDownloadTask *task;
-    NSString *s = [item name];
+    NSString *s = [item value];
     NSString *path = [s stringByAppendingPathExtension: _downloadExtension];
     NSURL *url = [_downloadURL URLByAppendingPathComponent: path];
-    
+
     task = [_session downloadTaskWithURL: url];
-    
+
     [item beginDownloadWithTask: task];
     [_taskIndex setObject: item forKey: task];
 
     [task resume];
-    
+
 }
 
 -(void)download {
-    
+
     // run in thread?
     //unsigned count = 0;
 
     for (DownloadItem *item in _items) {
-            
+
         NSURLSessionDownloadTask *task;
-        NSString *s = [item name];
+        NSString *s = [item value];
         NSString *path = [s stringByAppendingPathExtension: _downloadExtension];
         NSURL *url = [_downloadURL URLByAppendingPathComponent: path];
-        
+
         task = [_session downloadTaskWithURL: url];
         [_taskIndex setObject: item forKey: task];
-        
+
         [item setTask: task];
 
         [task resume];
@@ -328,7 +338,7 @@ enum {
         //if (count >= 2) break;
     }
     [self setActive: YES];
-    
+
 }
 
 -(DownloadItem *)clickedItem {
@@ -339,24 +349,24 @@ enum {
 }
 #if 0
 -(void)redrawRow: (NSUInteger)row {
-    
+
     //NSRect r = [_tableView rectOfRow: row];
     //[_tableView setNeedsDisplayInRect: r];
-    
+
     NSIndexSet *rIx = [NSIndexSet indexSetWithIndex: row];
     NSIndexSet *cIx = [NSIndexSet indexSetWithIndex: 0];
-    
+
     [_tableView reloadDataForRowIndexes: rIx columnIndexes: cIx];
 }
 #endif
 
 -(void)initializeExtensionMenu {
-    
+
     unsigned tag;
     // mark default download extension.
     NSString *defaultExt = [_defaults stringForKey: kDefaultDownloadExtension];
     tag = [DownloadExtensionTransformer stringToNumber: defaultExt];
-    
+
     NSMenuItem *item = [[_formatButton menu] itemWithTag: tag];
     if (item) {
         [item setAttributedTitle: ItalicMenuString([item title])];
@@ -373,6 +383,10 @@ enum {
 #endif
 }
 
+-(void) defocus {
+    [[self window] makeFirstResponder: nil];
+}
+
 #pragma mark - IBActions
 
 -(IBAction)cancelAll:(id)sender {
@@ -386,13 +400,11 @@ enum {
     [_taskIndex removeAllObjects];
     [self setCurrentCount: 0];
     [self setActive: NO];
-
-    //[_tableView reloadData];
-    //[_tableView setNeedsDisplay: YES]; // doesn't work...
 }
 
 - (IBAction)downloadMissing:(id)sender {
 
+    [self defocus];
     BOOL delta = NO;
     for (DownloadItem *item in _items) {
         NSURL *url = [item localURL];
@@ -402,10 +414,9 @@ enum {
             delta = YES;
         }
     }
-    
+
     if (delta) {
         [self setActive: YES];
-        //[_tableView reloadData];
     }
 }
 - (IBAction)showRomFolder:(id)sender {
@@ -415,30 +426,31 @@ enum {
 }
 
 -(IBAction)refreshROMs: (id)sender {
-    
+
     NSString *romdir = [SupportDirectoryPath() stringByAppendingPathComponent: @"roms"];
     NSFileManager *fm = [NSFileManager defaultManager];
 
     for (DownloadItem *item in _items) {
-        NSString *name = [item name];
-        NSString *s = [romdir stringByAppendingPathComponent: name];
+        NSDictionary *attr = nil;
+        NSString *value = [item value];
+        NSString *s = [romdir stringByAppendingPathComponent: value];
         NSString *path;
-        path = [s stringByAppendingPathExtension: @"zip"];
-        if ([fm fileExistsAtPath: path]) {
-            [item setStatus: ItemFound];
-            [item setLocalURL: [NSURL fileURLWithPath: path]];
-            continue;
+
+        for (unsigned i = 0; i < 2; ++i) {
+            path = [s stringByAppendingPathExtension: Extensions[i]];
+            attr = [fm attributesOfItemAtPath: path error: nil];
+            if (attr) break;
         }
 
-        path = [s stringByAppendingPathExtension: @"7z"];
-        if ([fm fileExistsAtPath: path]) {
+        if (attr) {
             [item setStatus: ItemFound];
             [item setLocalURL: [NSURL fileURLWithPath: path]];
-            continue;
+            [item setFileSize: [attr fileSize]];
+        } else {
+            [item setStatus: ItemMissing];
+            [item setLocalURL: nil];
+            [item setFileSize: 0];
         }
-        
-        [item setStatus: ItemMissing];
-        [item setLocalURL: nil];
     }
 }
 
@@ -452,20 +464,41 @@ enum {
     [ws activateFileViewerSelectingURLs: @[url]];
 }
 
+- (IBAction)moveToTrash:(id)sender {
+    NSError *error = nil;
+
+    DownloadItem *item = [self clickedItem];
+    if (!item) return;
+    NSURL *url = [item localURL];
+    if (!url) return;
+
+    NSFileManager *fm = [NSFileManager defaultManager];
+    if ([fm trashItemAtURL: url resultingItemURL: NULL error: &error]) {
+        [item refresh: nil];
+    } else {
+        [self presentError: error];
+    }
+
+}
+
+-(IBAction)doubleClick:(id)sender {
+    [self download: sender];
+}
+
 - (IBAction)download:(id)sender {
     DownloadItem *item = [self clickedItem];
     if (!item) return;
 
+    [self defocus];
+
     [self downloadItem: item];
     [self setActive: YES];
-    //[self redrawRow: [item index]];
 }
 - (IBAction)cancel:(id)sender {
     DownloadItem *item = [self clickedItem];
     if (!item) return;
 
     [item cancelDownload];
-    //[self redrawRow: [item index]];
 }
 
 // binding screws up with placeholder.
@@ -493,7 +526,6 @@ enum {
     [sender setState: NSControlStateValueOn];
 
 
-
     for (NSButton *b in _filterButtons) {
         if (b != sender) [b setState: NSControlStateValueOff];
     }
@@ -541,7 +573,7 @@ static NSInteger TaskStatusCode(NSURLSessionTask *task) {
         error = [NSError errorWithDomain: NSURLErrorDomain code: NSURLErrorFileDoesNotExist userInfo: info];
     }
 
-    
+
     // not sure if strictly necessary but this happens in a background thread
     // and these are used in KVO binding.  Also, main thread only
     // means no race conditions.
@@ -558,25 +590,22 @@ static NSInteger TaskStatusCode(NSURLSessionTask *task) {
         if ([taskIndex count] == 0) {
             [self setActive: NO];
         }
-        
+
         if (item) {
             [item completeWithError: error];
-            //NSUInteger row = [item index];
-            
-            //[self redrawRow: row];
         }
     });
-    
+
 }
 
 - (void)URLSession:(NSURLSession *)session downloadTask:(nonnull NSURLSessionDownloadTask *)task didFinishDownloadingToURL:(nonnull NSURL *)location {
 
-    
+
 //    NSLog(@"%@", task);
 //    NSLog(@"%@", [task response]);
-    
+
     if (TaskStatusCode(task) != 200) return;
-    
+
 
     // need to move to the destination directory...
     // file deleted after this function returns, so can't move asynchronously.
@@ -584,22 +613,92 @@ static NSInteger TaskStatusCode(NSURLSessionTask *task) {
     NSURL *src = [[task originalRequest] URL];
     NSURL *dest = [_romFolder URLByAppendingPathComponent: [src lastPathComponent]];
     NSError *error = nil;
-    
+
+    /* just in case ... */
+    [fm removeItemAtURL: dest error: NULL];
     [fm moveItemAtURL: location toURL: dest error: &error];
 
-    DownloadItem *item = [_taskIndex objectForKey: task];
-    [item setLocalURL: dest];
-
-    /*
     dispatch_async(dispatch_get_main_queue(), ^(void){
+        NSMutableDictionary *taskIndex = self->_taskIndex;
+        DownloadItem *item = [taskIndex objectForKey: task];
 
+        if (error) [item completeWithError: error];
+        else [item refresh: dest];
+    });
 
-        [item setLocalURL: dest];
-    }
-    */
     NSLog(@"%@", src);
 }
 
+
+
+-(NSURLCredential *)credentialForChallenge: (NSURLAuthenticationChallenge *)challenge {
+
+
+    //if ([challenge previousFailureCount]) return nil;
+
+    NSURLCredential *credential = nil;
+    NSURLProtectionSpace *space = [challenge protectionSpace];
+
+
+    OSStatus status;
+    NSDictionary *query;
+    CFTypeRef item = nil;
+
+
+    query = @{
+        (id)kSecClass: (id)kSecClassInternetPassword,
+        (id)kSecReturnData: (id)kCFBooleanTrue,
+        (id)kSecReturnAttributes: (id)kCFBooleanTrue,
+        (id)kSecAttrServer: [space host],
+        //(id)kSecAttrProtocol: [space protocol],
+        (id)kSecMatchLimit: (id)kSecMatchLimitOne,
+    };
+
+    status = SecItemCopyMatching((CFDictionaryRef)query, &item);
+    //NSLog(@"%@", query);
+    if (status != 0) return nil;
+
+    NSDictionary *d = (__bridge NSDictionary *)item;
+    //NSLog(@"%@", d);
+
+    NSString *account = [d objectForKey: (id)kSecAttrAccount];
+    NSData *passwordData = [d objectForKey: (id)kSecValueData];
+    NSString *password = [[NSString alloc] initWithData: passwordData encoding: NSUTF8StringEncoding];
+
+
+    credential = [NSURLCredential credentialWithUser: account password: password persistence: NSURLCredentialPersistenceForSession];
+
+    return credential;
+
+}
+
+- (void)URLSession:(NSURLSession *)session task:(NSURLSessionTask *)task didReceiveChallenge:(NSURLAuthenticationChallenge *)challenge completionHandler:(void (^)(NSURLSessionAuthChallengeDisposition disposition, NSURLCredential *credential))completionHandler {
+
+    NSLog(@"challenge: %@", challenge);
+
+    if ([challenge previousFailureCount]) {
+        completionHandler(NSURLSessionAuthChallengeCancelAuthenticationChallenge, nil);
+        return;
+    }
+
+    NSURLProtectionSpace *space = [challenge protectionSpace];
+    NSString *method = [space authenticationMethod];
+
+    if ([NSURLAuthenticationMethodHTTPBasic isEqualToString: method] ||
+        [NSURLAuthenticationMethodNTLM isEqualToString: method] ||
+        [NSURLAuthenticationMethodHTTPDigest isEqualToString: method]) {
+
+        NSURLCredential *credential = [self credentialForChallenge: challenge];
+
+        if (credential) {
+            completionHandler(NSURLSessionAuthChallengeUseCredential, credential);
+            return;
+        }
+    }
+
+    completionHandler(NSURLSessionAuthChallengePerformDefaultHandling, nil);
+}
+
 @end
 
 
@@ -633,15 +732,45 @@ static NSInteger TaskStatusCode(NSURLSessionTask *task) {
     }
 }
 
-#if 0
-// in practice, error and status set concurrently.
-+(NSSet *)keyPathsForValuesAffectingStatus {
-    static NSSet *set = nil;
-    if (!set) set = [NSSet setWithObjects: @"error", nil];
-    return set;
-}
-#endif
 
+-(void)refresh: (NSURL *)localURL {
+    NSDictionary *attr = nil;
+    NSError * error = nil;
+    NSFileManager *fm = [NSFileManager defaultManager];
+
+    if (localURL) {
+        attr = [fm attributesOfItemAtPath: [localURL path] error: &error];
+    } else {
+        NSString *romdir = [SupportDirectoryPath() stringByAppendingPathComponent: @"roms"];
+        NSString *s = [romdir stringByAppendingPathComponent: _value];
+
+        NSString *path = nil;
+        for (unsigned i = 0; i < 2; ++i) {
+            path = [s stringByAppendingPathExtension: Extensions[i]];
+            attr = [fm attributesOfItemAtPath: path error: nil];
+            if (attr) {
+                localURL = [NSURL fileURLWithPath: path];
+                break;
+            }
+        }
+    }
+
+    if (attr && localURL) {
+        [self setLocalURL: localURL];
+        [self setFileSize: [attr fileSize]];
+        [self setStatus: ItemFound];
+    } else {
+        [self setLocalURL: nil];
+        [self setFileSize: 0];
+        if (_status == ItemFound || _status == ItemDownloaded)
+            [self setStatus: ItemMissing];
+    }
+
+}
+
++(NSSet *)keyPathsForValuesAffectingStatusDescription {
+    return [NSSet setWithObjects: @"error", @"status", nil];
+}
 -(NSString *)statusDescription {
 
     static NSString *Names[] = {
@@ -684,27 +813,34 @@ enum {
 };
 
 - (BOOL)validateMenuItem:(NSMenuItem *)menuItem {
-    
-    if ([menuItem action] == @selector(downloadExtensionChanged:)) return YES;
 
+    SEL action = [menuItem action];
+    if (action == @selector(downloadExtensionChanged:)) return YES;
+
+    DownloadItem *item = [self clickedItem];
+    if (!item) return NO;
+#if 0
     NSInteger row = [_tableView clickedRow];
     if (row < 0) return NO;
     DownloadItem *item = [[_arrayController arrangedObjects] objectAtIndex: row]; //[_items objectAtIndex: row];
-    
+#endif
+
     NSUInteger status = [item status];
-    switch([menuItem tag]) {
-        case kOpenInFinder:
-            return status == ItemFound || status == ItemDownloaded;
-            break;
-        case kDownload:
-            return YES;
-            //return status == ItemMissing || status == ItemError || status == ItemCanceled;
-            break;
-        case kCancel:
-            return status == ItemDownloading;
-            break;
-            
+
+    if (action == @selector(moveToTrash:)) {
+        return [item localURL] != nil;
     }
+    if (action == @selector(showInFinder:)) {
+        return [item localURL] != nil;
+    }
+    if (action == @selector(download:)) {
+        return YES;
+    }
+    if (action == @selector(cancel:)) {
+        return status == ItemDownloading;
+    }
+
+
     return NO;
 }
 

Ample/Info.plist

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

Ample/LaunchWindowController.h

@@ -10,7 +10,7 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-@interface LaunchWindowController : NSWindowController <NSBrowserDelegate>
+@interface LaunchWindowController : NSWindowController <NSBrowserDelegate, NSMenuDelegate>
 
 @end
 

Ample/LaunchWindowController.m

@@ -16,6 +16,7 @@
 #import "AutocompleteControl.h"
 #import "SoftwareList.h"
 #import "BookmarkManager.h"
+#import "Bookmark.h"
 
 #include <sys/stat.h>
 #include <wctype.h>
@@ -24,10 +25,25 @@ static NSString *kMyContext = @"kMyContext";
 static NSString *kContextMachine = @"kContextMachine";
 
 
+static NSString *NeedsAspectRatio(NSString *machine) {
+    static NSDictionary *dict = nil;
+    
+    if (!dict) {
+        dict = @{
+            @"oric1": @"2:1",
+            @"orica": @"2:1",
+            @"prav8d": @"2:1",
+            @"telstrat": @"2:1",
+        };
+    }
+    return [dict objectForKey: machine];
+}
+
 @interface LaunchWindowController () {
     BOOL _loadingBookmark;
     NSString *_machine;
     NSDictionary *_machineDescription;
+    BookmarkManager *_manager;
 }
 @property (strong) IBOutlet MediaViewController *mediaController;
 @property (strong) IBOutlet SlotViewController *slotController;
@@ -49,6 +65,7 @@ static NSString *kContextMachine = @"kContextMachine";
 @property BOOL mameMouse;
 @property BOOL mameSamples;
 @property BOOL mameBGFX;
+@property BOOL mameRewind;
 
 @property BOOL mameAVI;
 @property BOOL mameWAV;
@@ -78,7 +95,13 @@ static NSString *kContextMachine = @"kContextMachine";
 
 @property (strong) IBOutlet NSWindow *addBookmarkWindow;
 @property (strong) NSString *bookmarkName;
+@property BOOL bookmarkDefault;
 @property (weak) IBOutlet NSTextField *bookmarkTextField;
+@property (weak) IBOutlet NSTextField *bookmarkErrorField;
+
+@property BOOL optionKey;
+
+
 @end
 
 @interface LaunchWindowController (SoftwareList)
@@ -94,6 +117,8 @@ static NSString *kContextMachine = @"kContextMachine";
 
 -(IBAction)defaultLoad:(id)sender;
 
+-(void)bookmarkNotification: (NSNotification *)notification;
+
 @end
 
 #define SIZEOF(x) (sizeof(x) / sizeof(x[0]))
@@ -110,6 +135,7 @@ static NSString *EffectsStrings[] = {
     @"crt-geom",
     @"crt-geom-deluxe",
     @"lcd-grid",
+    @"Fighters",
 };
 
 
@@ -146,7 +172,8 @@ static int EffectsIndex(NSString *str) {
     [self setMameSamples: NO];
     [self setMameSquarePixels: NO];
     [self setMameDebug: NO];
-    [self setMameWindowMode: 0];
+    [self setMameRewind: NO];
+    [self setMameWindowMode: 1]; // default = 1x window.
 
     [self setMameBackend: 0];
     [self setMameEffects: 0];
@@ -178,6 +205,8 @@ static int EffectsIndex(NSString *str) {
 
 -(void)windowWillLoad {
 
+    _manager = [BookmarkManager sharedManager];
+    
     // if this calls [self window], it will recurse.  that is bad.
     //[self defaultLoad: nil];
     [self reset];
@@ -202,16 +231,16 @@ static void AddSubview(NSView *parent, NSView *child) {
     AddSubview(_mediaView, [_mediaController view]);
     AddSubview(_machineView, [_machineViewController view]);
 
- 
-    // can't be done until above views are set up.
-    [self defaultLoad: nil];
+    
+    [_softwareListControl setMinWidth: 250];
+    [_softwareListControl setHidden: YES];
 
 
     NSArray *keys = @[
         //@"mameMachine", // - handled
         @"mameSquarePixels", @"mameWindowMode",
         @"mameMouse", @"mameSamples",
-        @"mameDebug",
+        @"mameDebug", @"mameRewind",
         @"mameSpeed",
         @"mameAVI", @"mameAVIPath",
         @"mameWAV", @"mameWAVPath",
@@ -235,10 +264,17 @@ static void AddSubview(NSView *parent, NSView *child) {
     [_machineViewController addObserver: self forKeyPath: @"machine" options: 0 context: (__bridge void * _Nullable)kContextMachine];
 
     
-    [_softwareListControl setMinWidth: 250];
-    [_softwareListControl setHidden: YES];
+    
+    
+    // can't be done until above views are set up.
+    [self defaultLoad: nil];
+
     
     [self buildCommandLine];
+    
+    NSNotificationCenter *nc = [NSNotificationCenter defaultCenter];
+    
+    [nc addObserver: self selector: @selector(bookmarkNotification:) name: kNotificationBookmarkMagicRoute object: nil];
 }
 
 
@@ -298,7 +334,7 @@ static NSString * JoinArguments(NSArray *argv, NSString *argv0) {
 
     if (!safe) {
         NSString *str =
-            @"%+-./:=_"
+            @"%+-./:=_,"
             @"0123456789"
             @"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
         ;
@@ -373,7 +409,7 @@ static NSString *ShellQuote(NSString *s) {
 
     if (!safe) {
         NSString *str =
-            @"%+-./:=_"
+            @"%+-./:=_,"
             @"0123456789"
             @"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
         ;
@@ -441,11 +477,6 @@ static NSString *ShellQuote(NSString *s) {
     //[argv addObject: @"mame"];
     [argv addObject: _machine];
     
-    if (_software) {
-        NSString *name = [_softwareSet nameForSoftware: _software];
-        if (name) [argv addObject: name];
-    }
-
     // -confirm_quit?
     [argv addObject: @"-skip_gameinfo"];
 
@@ -457,7 +488,7 @@ static NSString *ShellQuote(NSString *s) {
         [argv addObject: @"-nosamples"];
     
     if (_mameDebug) [argv addObject: @"-debug"];
-
+    if (_mameRewind) [argv addObject: @"-rewind"];
 
     
     /*
@@ -465,6 +496,8 @@ 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;
@@ -481,12 +514,18 @@ static NSString *ShellQuote(NSString *s) {
             // drop through.
         case 2: // 2x
         case 3: // 3x
-
+        case 4: // 4x
+            
             if (_mameSquarePixels) {
                 //              NSString *aspect = [NSString stringWithFormat: @"%u:%u", (unsigned)screen.width, (unsigned)screen.height];
                 //              [argv addObject: @"-aspect"];
                 //              [argv addObject: aspect];
-                [argv addObject: @"-nounevenstretch"];
+
+                float hscale = round((screen.width * 3 / 4) / screen.height);
+                if (hscale < 1) hscale = 1;
+                screen.height *= hscale;
+
+
             } else {
                 screen.height = round(screen.width * 3 / 4);
             }
@@ -499,12 +538,26 @@ 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"];
+
         if (_mameBackend) {
             [argv addObject: @"-bgfx_backend"];
             [argv addObject: BackendStrings[_mameBackend]];
@@ -534,6 +587,12 @@ static NSString *ShellQuote(NSString *s) {
         [argv addObjectsFromArray: tmp];
     }
 
+    // software *AFTER* slots so, eg, apple2ee has access to the superdrive.
+    if (_software) {
+        NSString *name = [_softwareSet nameForSoftware: _software];
+        if (name) [argv addObject: name];
+    }
+    
     if (_mameSpeed < 0) {
         [argv addObject: @"-nothrottle"];
     } else if (_mameSpeed > 1) {
@@ -542,7 +601,7 @@ static NSString *ShellQuote(NSString *s) {
     }
     
     // audio video.
- 
+
     if (_mameAVI && [_mameAVIPath length]) {
         [argv addObject: @"-aviwrite"];
         [argv addObject: _mameAVIPath];
@@ -589,17 +648,77 @@ static NSString *ShellQuote(NSString *s) {
     //return [super validateMenuItem: menuItem]; // not implemented?
 }
 
+-(void)defocus {
+    [[self window] makeFirstResponder: nil]; // in case text is being edited...
+}
+
 # pragma mark - IBActions
 
 - (IBAction)launchAction:(id)sender {
 
-    [[self window] makeFirstResponder: nil]; // in case text is being edited...
+    [self defocus];
     if (![_args count]) return;
 
     [LogWindowController controllerForArgs: _args];
 
 }
 
+
+- (IBAction)listMedia:(id)sender {
+
+    [self defocus];
+    if (!_machine) return;
+    
+    NSMutableArray *argv = [NSMutableArray new];
+
+    [argv addObject: _machine];
+    [argv addObject: @"-listmedia"];
+
+    
+    NSArray *tmp;
+    tmp = [_slotController args];
+    if ([tmp count]) {
+        [argv addObjectsFromArray: tmp];
+    }
+
+#if 0
+    tmp = [_mediaController args];
+    if ([tmp count]) {
+        [argv addObjectsFromArray: tmp];
+    }
+#endif
+
+    [LogWindowController controllerForArgs: argv close: NO];
+}
+
+- (IBAction)listSlots:(id)sender {
+
+    [self defocus];
+    if (!_machine) return;
+    
+    NSMutableArray *argv = [NSMutableArray new];
+
+    [argv addObject: _machine];
+    [argv addObject: @"-listslots"];
+
+    
+    NSArray *tmp;
+    tmp = [_slotController args];
+    if ([tmp count]) {
+        [argv addObjectsFromArray: tmp];
+    }
+
+#if 0
+    tmp = [_mediaController args];
+    if ([tmp count]) {
+        [argv addObjectsFromArray: tmp];
+    }
+#endif
+
+    [LogWindowController controllerForArgs: argv close: NO];
+}
+
+
 -(IBAction)exportShellScript: (id)sender {
     
     NSSavePanel *p = [NSSavePanel savePanel];
@@ -652,6 +771,7 @@ static NSString *ShellQuote(NSString *s) {
 
 -(IBAction)resetAll:(id)sender {
 
+    [_manager setCurrentBookmark: nil];
     [self reset];
     [self resetSoftware];
     [_slotController resetSlots: sender];
@@ -700,32 +820,40 @@ static NSString *ShellQuote(NSString *s) {
 
 -(IBAction)defaultSave:(id)sender {
 
-    BookmarkManager *bm = [BookmarkManager sharedManager];
-
+#if 0
     NSDictionary *d = [self makeBookmark];
 
-    [bm saveDefault: d];
+    [_manager saveDefault: d];
+#endif
 }
 
 -(IBAction)defaultLoad:(id)sender {
 
-    BookmarkManager *bm = [BookmarkManager sharedManager];
+    Bookmark *b = [_manager defaultBookmark];
 
-    NSDictionary *d = [bm loadDefault];
-    if (!d) {
+    if (!b) {
         [self resetAll: sender];
         [self setMachine: nil];
         [_machineViewController reset];
         [_slotController setMachine: nil];
         return;
     }
-    [self loadBookmark: d];
+    [self loadBookmark: b];
+}
+
+-(IBAction)updateBookmark: (id)sender {
+    
+    Bookmark *b = [sender representedObject];
+    if (!b) return;
+    
+    NSDictionary *d = [self makeBookmark];
+    [b setDictionary: d];
 }
 
 -(IBAction)addBookmark:(id)sender {
     
     if (!_machine) return;
-    
+
     NSString *name = nil;
     if (_machineDescription) name = [_machineDescription objectForKey:@"description"];
     if (!name) name = _machine;
@@ -734,8 +862,14 @@ static NSString *ShellQuote(NSString *s) {
     if (_software) {
         name = [name stringByAppendingFormat: @" - %@", [_software title]];
     }
+    
+    name = [_manager uniqueBookmarkName: name];
+    
     [self setBookmarkName: name];
+    [self setBookmarkDefault: NO];
     [_bookmarkTextField selectText: nil];
+    [_bookmarkErrorField setStringValue: @""];
+
     [[self window] beginSheet: _addBookmarkWindow completionHandler:  nil];
 }
 
@@ -745,19 +879,26 @@ static NSString *ShellQuote(NSString *s) {
 }
 
 -(IBAction)bookmarkSave:(id)sender {
-    
-    
-    BookmarkManager *bm = [BookmarkManager sharedManager];
+        
 
-    if (![bm validateName: _bookmarkName]) {
+#if 0
+    if (![_manager validateName: _bookmarkName]) {
         [_bookmarkTextField selectText: nil];
         NSBeep();
         return;
     }
+#endif
 
     NSDictionary *d = [self makeBookmark];
+    NSError *e;
     
-    [bm saveBookmark: d name: _bookmarkName];
+    if (( e = [_manager saveBookmark: d name: _bookmarkName automatic: _bookmarkDefault])) {
+        // probably a duplicate name...
+        [_bookmarkTextField selectText: nil];
+        [_bookmarkErrorField setStringValue: [e localizedDescription]];
+        NSBeep();
+        return;
+    }
     
     [[self window] endSheet: _addBookmarkWindow];
     [_addBookmarkWindow orderOut: nil];
@@ -765,22 +906,27 @@ static NSString *ShellQuote(NSString *s) {
 }
 
 
+-(void)bookmarkNotification: (NSNotification *)notification {
+    
+    Bookmark *b = [notification object];
+    [self loadBookmark: b];
+}
+
 -(IBAction)bookmarkMenu:(id)sender {
-    
-    NSURL *url = [sender representedObject];
-    if (!url) return;
-    
-    NSDictionary *d = [NSDictionary dictionaryWithContentsOfURL: url];
-    if (!d) return; // oops...
-    
-    [self loadBookmark: d];
+
+    // represented object is a Bookmark.
+    Bookmark *b = [sender representedObject];
+    [self loadBookmark: b];
 }
 
 
--(void)loadBookmark: (NSDictionary *)d {
+-(void)loadBookmark: (Bookmark *)b {
     Class StringClass = [NSString class];
     Class NumberClass = [NSNumber class];
-    
+
+    NSDictionary *d = [b dictionary];
+
+    [_manager setCurrentBookmark: b];
     
     NSString *machine = [d objectForKey: @"machine"];
     if (!machine) return;
@@ -791,6 +937,7 @@ static NSString *ShellQuote(NSString *s) {
     [_mediaController willLoadBookmark: d];
 
     [self reset];
+    [self resetSoftware];
     
     [self setMachine: machine];
     [self updateSoftwareList];
@@ -814,6 +961,7 @@ static NSString *ShellQuote(NSString *s) {
 #define _(a,b) n = [d objectForKey: a]; if ([n isKindOfClass: NumberClass]) [self b : [n boolValue]]
   
     _(@"debug", setMameDebug);
+    _(@"rewind", setMameRewind);
     _(@"squarePixels", setMameSquarePixels);
     _(@"mouse", setMameMouse);
     _(@"samples", setMameSamples);
@@ -872,7 +1020,7 @@ static NSString *ShellQuote(NSString *s) {
 
 -(NSDictionary *)makeBookmark {
     
-    [[self window] makeFirstResponder: nil];
+    [self defocus];
 
     NSMutableDictionary *dict = [NSMutableDictionary new];
     
@@ -888,6 +1036,7 @@ static NSString *ShellQuote(NSString *s) {
 #define _(v,k) [dict setObject: v ? (NSObject *)kCFBooleanTrue : (NSObject *)kCFBooleanFalse forKey: k]
 
     _(_mameDebug, @"debug");
+    _(_mameRewind, @"rewind");
     _(_mameSquarePixels, @"squarePixels");
     _(_mameMouse, @"mouse");
     _(_mameSamples, @"samples");
@@ -924,4 +1073,24 @@ static NSString *ShellQuote(NSString *s) {
 }
 
 
+#pragma mark - NSMenuDelegate
+
+#if 1
+-(void)menuNeedsUpdate:(NSMenu *)menu {
+    NSEventModifierFlags modifiers = [NSEvent modifierFlags];
+    
+    [self setOptionKey: modifiers & NSEventModifierFlagOption ? YES : NO];
+}
+
+#else
+/* doesn't trigger when menu is the first responder. */
+-(void)flagsChanged:(NSEvent *)event {
+    NSEventModifierFlags modifiers = [event modifierFlags];
+
+    [self setOptionKey: modifiers & NSEventModifierFlagOption ? YES : NO];
+
+    [super flagsChanged: event];
+}
+#endif
+
 @end

Ample/LogWindowController.h

@@ -12,8 +12,13 @@ NS_ASSUME_NONNULL_BEGIN
 
 @interface LogWindowController : NSWindowController <NSWindowDelegate>
 
+#if 0
 +(id)controllerForTask: (NSTask *)task;
++(id)controllerForTask: (NSTask *)task close: (BOOL)close;
+#endif
+
 +(id)controllerForArgs: (NSArray *)args;
++(id)controllerForArgs: (NSArray *)args close: (BOOL)close;
 @end
 
 NS_ASSUME_NONNULL_END

Ample/LogWindowController.m

@@ -19,6 +19,10 @@ static NSMutableSet *LogWindows;
 @implementation LogWindowController {
     NSTask *_task;
     NSFileHandle *_handle;
+    NSFont *_font;
+
+    BOOL _close;
+    BOOL _eof;
 }
 
 +(void)initialize {
@@ -30,18 +34,17 @@ static NSMutableSet *LogWindows;
 }
 
 
-+(id)controllerForTask: (NSTask *)task {
++(id)controllerForTask: (NSTask *)task close: (BOOL)close {
     LogWindowController *controller = [[LogWindowController alloc] initWithWindowNibName: @"LogWindow"];
-    [controller runTask: task];
+    [controller runTask: task close: close];
     return controller;
 }
 
 
++(id)controllerForArgs: (NSArray *)args close: (BOOL)close {
 
-+(id)controllerForArgs: (NSArray *)args {
+    NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
     
-//    NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
-
     NSURL *url = MameURL();
 
     if (!url) {
@@ -64,15 +67,48 @@ static NSMutableSet *LogWindows;
     
     [task setArguments: args];
     
-    return [LogWindowController controllerForTask: task];
+    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];
+
+}
+
++(id)controllerForArgs: (NSArray *)args {
+
+    NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
+    BOOL close = [defaults boolForKey: kAutoCloseLogWindow];
+    return [self controllerForArgs: args close: close];
 }
 
 - (void)windowDidLoad {
     [super windowDidLoad];
     
     [LogWindows addObject: self];
+
+    _font = [NSFont userFixedPitchFontOfSize: 0];
     
-    // Implement this method to handle any initialization after your window controller's window has been loaded from its nib file.
 }
 
 -(void)appendString: (NSString *)string
@@ -80,7 +116,10 @@ static NSMutableSet *LogWindows;
     if ([string length])
     {
         // needs explicit color attribute for proper dark mode support.
-        NSDictionary *attr = @{ NSForegroundColorAttributeName: [NSColor textColor] };
+        NSDictionary *attr = @{
+            NSForegroundColorAttributeName: [NSColor textColor],
+            NSFontAttributeName: _font,
+        };
         NSAttributedString *astr = [[NSAttributedString alloc] initWithString: string attributes: attr];
         [[_textView textStorage] appendAttributedString: astr];
     }
@@ -93,10 +132,12 @@ static NSMutableSet *LogWindows;
     }
 }
 
--(NSError *)runTask: (NSTask *)task {
+-(NSError *)runTask: (NSTask *)task close: (BOOL)close {
     
     
     if (_task) return nil;
+    _close = close;
+    _eof = NO;
 
     NSPipe *pipe = [NSPipe pipe];
     
@@ -130,16 +171,6 @@ static NSMutableSet *LogWindows;
         }
     }
 
-#if 0
-    if (error) {
-//        NSURL *url = [task executableURL];
-//        NSString *path = [NSString stringWithCString: [url fileSystemRepresentation] encoding: NSUTF8StringEncoding];
-        NSLog(@"NSTask error. Path = %s error = %@", path, error);
-//        [self appendString: path];
-//        [self appendString: [error description]];
-        return error;
-    }
-#endif
     _task = task;
     NSString *title = [NSString stringWithFormat: @"Ample Log - %u", [task processIdentifier]];
     [[self window] setTitle: title];
@@ -150,6 +181,7 @@ static NSMutableSet *LogWindows;
     
     NSNotificationCenter *nc = [NSNotificationCenter defaultCenter];
 
+
     [nc addObserver: self
            selector: @selector(taskComplete:)
                name: NSTaskDidTerminateNotification
@@ -160,6 +192,7 @@ static NSMutableSet *LogWindows;
              object: _handle];
     
     [_handle readInBackgroundAndNotify];
+
     [[self window] setDocumentEdited: YES];
     return nil;
 }
@@ -172,21 +205,33 @@ static NSMutableSet *LogWindows;
     // read complete, queue up another.
     NSDictionary *dict = [notification userInfo];
     NSData *data = [dict objectForKey: NSFileHandleNotificationDataItem];
-    
+
     if ([data length])
     {
-        
         NSString *string = [[NSString alloc] initWithData: data encoding: NSUTF8StringEncoding];
         
         [self appendString: string];
         
         [_handle readInBackgroundAndNotify];
+    } else {
+        [self appendString: @"\n"]; // -listmedia sometimes causes display issues.
+        _eof = YES;
+        //[_textView setNeedsDisplay: YES]; // -listmedia sometimes weird.
     }
-    
 }
 
+-(void)taskCompleteHack {
+
+}
+
+/* hask! task complete may occur while output still being processed. add a delay to compensate. */
 -(void)taskComplete: (NSNotification *)notification
 {
+    if (!_eof) {
+        [self performSelector: @selector(taskComplete:) withObject: notification afterDelay: 0.5];
+        return;
+    }
+
     BOOL ok = NO;
     NSTaskTerminationReason reason;
     int status;
@@ -200,7 +245,7 @@ static NSMutableSet *LogWindows;
         
         if (status == 0)
         {
-            string = @"\n\n[Success]\n\n";
+            //string = @"\n\n[Success]\n\n";
             ok = YES;
         }
         else string = @"\n\n[An error occurred]\n\n";
@@ -209,18 +254,22 @@ static NSMutableSet *LogWindows;
     {
         string = [NSString stringWithFormat: @"\n\n[Caught signal %d (%s)]\n\n", status, strsignal(status)];
     }
-    
-    [self appendString: string];
-    
+    if (string) {
+        NSDictionary *attr = @{
+            NSForegroundColorAttributeName: [NSColor systemRedColor],
+            NSFontAttributeName: _font,
+        };
+        NSAttributedString *astr = [[NSAttributedString alloc] initWithString: string attributes: attr];
+        [self appendAttributedString: astr];
+    }
+
     _handle = nil;
     _task = nil;
     
     [[self window] setDocumentEdited: NO];
     
-    if (ok && [[NSUserDefaults standardUserDefaults] boolForKey: kAutoCloseLogWindow]) {
-        
+    if (ok && _close) {
         [[self window] close];
-        //[LogWindows removeObject: self]; // close sends WindowWillClose notification.
     }
 }
 

Ample/MachineViewController.m

@@ -20,7 +20,11 @@
 -(void)awakeFromNib {
 
     NSBundle *bundle = [NSBundle mainBundle];
+#ifdef AMPLE_LITE
+    NSString *path = [bundle pathForResource: @"models~extra" ofType: @"plist"];
+#else
     NSString *path = [bundle pathForResource: @"models" ofType: @"plist"];
+#endif
     _data = [NSArray arrayWithContentsOfFile: path];
 
     

Ample/Media.h

@@ -14,12 +14,35 @@ typedef struct Media {
     unsigned cass;
     unsigned cdrom;
     unsigned hard;
+    unsigned floppy_8;
     unsigned floppy_5_25;
     unsigned floppy_3_5;
     unsigned pseudo_disk;
     unsigned bitbanger;
+    unsigned midiin;
+    unsigned midiout;
+    unsigned picture;
+    unsigned rom;
+    uint64_t floppy_mask_8;
+    uint64_t floppy_mask_5_25;
+    uint64_t floppy_mask_3_5;
 } Media;
 
+
+typedef enum {
+    MediaTypeError = -1,
+    MediaTypeUnknown = 0,
+    MediaType_8,
+    MediaType_5_25,
+    MediaType_3_5,
+    MediaType_HardDisk,
+    MediaType_CDROM,
+    MediaType_Cassette,
+    MediaType_Picture,
+    MediaType_MIDI,
+    MediaType_ROM,
+} MediaType;
+
 struct Media MediaFromDictionary(NSDictionary *);
 
 void MediaAdd(Media *dest, const Media *src);
@@ -28,4 +51,6 @@ BOOL MediaEqual(const Media *lhs, const Media *rhs);
 
 extern const Media EmptyMedia;
 
+MediaType ClassifyMediaFile(id file);
+
 #endif /* Media_h */

Ample/Media.m

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

Ample/MediaViewController.h

@@ -23,6 +23,9 @@ NS_ASSUME_NONNULL_BEGIN
 
 -(IBAction)resetMedia:(id)sender;
 
+-(BOOL)smartRouteURL: (NSURL *)url;
+-(BOOL)smartRouteFile: (NSString *)file;
+
 @end
 
 @interface MediaViewController (Bookmark) <Bookmark>

Ample/MediaViewController.m

@@ -9,17 +9,6 @@
 #import "MediaViewController.h"
 #import "TableCellView.h"
 
-enum {
-    kIndexFloppy525 = 0,
-    kIndexFloppy35,
-    kIndexHardDrive,
-    kIndexCDROM,
-    kIndexCassette,
-    kIndexDiskImage,
-    kIndexBitBanger,
-};
-
-#define CATEGORY_COUNT 7
 #define SIZEOF(x) (sizeof(x) / sizeof(x[0]))
 
 
@@ -43,6 +32,7 @@ enum {
 @property NSString *title;
 @property NSInteger index;
 @property NSInteger category;
+@property (weak)NSOutlineView *view;
 
 -(NSInteger)count;
 -(id)objectAtIndex:(NSInteger)index;
@@ -141,7 +131,36 @@ enum {
     return YES;
 }
 
--(BOOL)pruneChildrenWithOutlineView: (NSOutlineView *)view {
+-(BOOL)addURL: (NSURL *)url {
+
+    for (MediaItem *item in _children) {
+        if (![item occupied]) {
+            [item setUrl: url];
+            return NO;
+        }
+    }
+    // add an extra item...
+
+    if (!_children) _children = [NSMutableArray new];
+    NSUInteger ix = [_children count];
+
+    MediaItem *item = [MediaItem new];
+    [item setIndex: ix];
+    [item setCategory: _category];
+    [item setUrl: url];
+    [item setValid: ix < _validCount];
+    [_children addObject: item];
+    if (_view) {
+        NSIndexSet *set = [NSIndexSet indexSetWithIndex: ix];
+        [_view insertItemsAtIndexes: set
+                          inParent: self
+                     withAnimation: NSTableViewAnimationEffectFade];
+    }
+
+    return YES;
+}
+
+-(BOOL)pruneChildren {
     NSUInteger count = [_children count];
     BOOL delta = NO;
     if (_validCount == count) return NO;
@@ -158,15 +177,15 @@ enum {
     }
     if (delta) {
 
-        if (view)
-            [view removeItemsAtIndexes: set inParent: self withAnimation: NSTableViewAnimationEffectFade];
+        if (_view)
+            [_view removeItemsAtIndexes: set inParent: self withAnimation: NSTableViewAnimationEffectFade];
 
         return YES;
     }
     return NO;
 }
 
--(BOOL)moveItemFrom: (NSInteger)oldIndex to: (NSInteger)newIndex outlineView: (NSOutlineView *)view {
+-(BOOL)moveItemFrom: (NSInteger)oldIndex to: (NSInteger)newIndex {
     if (newIndex == oldIndex) return NO;
     NSUInteger count = [_children count];
     if (oldIndex >= count) return NO;
@@ -179,7 +198,7 @@ enum {
     } else {
         [_children insertObject: item atIndex: newIndex];
     }
-    if (view) [view moveItemAtIndex: oldIndex inParent: self toIndex: newIndex inParent: self];
+    if (_view) [_view moveItemAtIndex: oldIndex inParent: self toIndex: newIndex inParent: self];
 
     // re-index and re-validate.
     unsigned ix = 0;
@@ -191,7 +210,7 @@ enum {
         
         ++ix;
     }
-    [self pruneChildrenWithOutlineView: view];
+    [self pruneChildren];
     //[view reloadItem: self reloadChildren: YES];
     return YES;
 }
@@ -248,11 +267,23 @@ enum {
 
 -(NSString *)viewIdentifier {
     if (_category == kIndexBitBanger) return @"BBItemView";
+    if (_category == kIndexMidiOut) return @"MidiItemView";
+    if (_category == kIndexMidiIn) return @"MidiItemView";
     return @"ItemView";
 }
 
--(void)prepareView: (TablePathView *)view {
+-(void)prepareView: (MediaTableCellView *)view {
+    /* set the path tag = category. */
+
+    [view prepareView: _category];
+#if 0
+    if (_category == kIndexMidiIn || _category == kIndexMidiOut || _category == kIndexBitBanger) {
+        return;
+    }
     
+    NSPathControl *pc = [view pathControl];
+    [pc setTag: _category + 1]; // to differentiate 0 / no path control.
+#endif
 }
 
 -(CGFloat)height {
@@ -271,7 +302,7 @@ enum {
 @interface MediaViewController () {
 
     MediaCategory *_data[CATEGORY_COUNT];
-    NSArray *_root;
+    NSMutableArray *_root;
     Media _media;
     
     BOOL _loadingBookmark;
@@ -290,6 +321,7 @@ enum {
     if (first) return;
     first++;
 
+    _data[kIndexFloppy8] = [MediaCategory categoryWithTitle: @"8\" Floppies"];
     _data[kIndexFloppy525] = [MediaCategory categoryWithTitle: @"5.25\" Floppies"];
     _data[kIndexFloppy35] = [MediaCategory categoryWithTitle: @"3.5\" Floppies"];
     _data[kIndexHardDrive] = [MediaCategory categoryWithTitle: @"Hard Drives"];
@@ -298,11 +330,17 @@ enum {
     _data[kIndexDiskImage] = [MediaCategory categoryWithTitle: @"Hard Disk Images"]; // Mac Nubus psuedo image device
     _data[kIndexBitBanger] = [MediaCategory categoryWithTitle: @"Serial Bit Banger"]; // null_modem
 
-    for (unsigned i = 0; i < CATEGORY_COUNT; ++i)
-        [_data[i] setCategory: i];
-    
-    _root = @[];
+    _data[kIndexMidiIn] = [MediaCategory categoryWithTitle: @"MIDI (In)"];
+    _data[kIndexMidiOut] = [MediaCategory categoryWithTitle: @"MIDI (Out)"];
+    _data[kIndexPicture] = [MediaCategory categoryWithTitle: @"Picture"];
+    _data[kIndexROM] = [MediaCategory categoryWithTitle: @"ROM"];
 
+    for (unsigned i = 0; i < CATEGORY_COUNT; ++i) {
+        [_data[i] setCategory: i];
+        [_data[i] setIndex: -1];
+    }
+    
+    _root = [NSMutableArray new];
 }
 
 
@@ -310,35 +348,59 @@ enum {
 -(void)rebuildArgs {
     
     static char* prefix[] = {
-        "flop", "flop", "hard", "cdrm", "cass", "disk", "bitb",
+        "flop", "flop", "flop", "hard", "cdrm", "cass", "disk", "bitb", "min", "mout", "pic", "rom",
     };
     static_assert(SIZEOF(prefix) == CATEGORY_COUNT, "Missing item");
     NSMutableArray *args = [NSMutableArray new];
     
-    unsigned counts[CATEGORY_COUNT] = { 0 };
-    
+    //unsigned counts[CATEGORY_COUNT] = { 0 };
+
+    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;
+        unsigned index = 0;
+
         MediaCategory *cat = _data[j];
         NSInteger valid = [cat validCount];
+
         for (NSInteger i = 0; i < valid; ++i) {
-            counts[j]++;
 
             MediaItem *item = [cat objectAtIndex: i];
             NSString *arg = [item argument];
 
-            if (arg) {
-                [args addObject: [NSString stringWithFormat: @"-%s%u", prefix[j], counts[j]]];
-                [args addObject: arg];
+            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;
             }
+            if (!arg) continue;
+            if (!index) continue;
+
+            [args addObject: [NSString stringWithFormat: @"-%s%u", prefix[j], index]];
+            [args addObject: arg];
         }
-        if (j == 0) counts[1] = counts[0]; // 3.5/5.25
     }
     
     [self setArgs: args];
 }
 
 -(void)rebuildRoot {
+
     NSMutableArray *tmp = [NSMutableArray new];
     int ix = 0;
     for (unsigned j = 0 ; j < CATEGORY_COUNT; ++j) {
@@ -362,6 +424,8 @@ enum {
 
 -(void)setMedia: (Media)media {
     
+    // todo -- fancy diff algorithm to animate changes.
+    
     MediaCategory *cat;
     BOOL delta = NO;
     unsigned x;
@@ -369,6 +433,8 @@ enum {
     if (MediaEqual(&_media, &media)) return;
     _media = media;
     
+    [_outlineView beginUpdates];
+
     
 #undef _
 #define _(name, index) \
@@ -378,14 +444,20 @@ x = media.name; cat = _data[index]; delta |= [cat setItemCount: x]
     _(hard, kIndexHardDrive);
     _(floppy_3_5, kIndexFloppy35);
     _(floppy_5_25, kIndexFloppy525);
+    _(floppy_8, kIndexFloppy8);
     _(pseudo_disk, kIndexDiskImage);
     _(bitbanger, kIndexBitBanger);
-
+    _(midiin, kIndexMidiIn);
+    _(midiout, kIndexMidiOut);
+    _(picture, kIndexPicture);
+    _(rom, kIndexROM);
 
     if (delta) {
         [self rebuildRoot];
         if (!_loadingBookmark) [self rebuildArgs];
     }
+
+    [_outlineView endUpdates];
 }
 
 -(void)resetDiskImages {
@@ -403,7 +475,7 @@ x = media.name; cat = _data[index]; delta |= [cat setItemCount: x]
             [item setString: nil];
             delta = YES;
         }
-        if ([cat pruneChildrenWithOutlineView: _outlineView]) delta = YES;
+        if ([cat pruneChildren]) delta = YES;
     }
     if (delta) {
         [self rebuildRoot];
@@ -413,7 +485,9 @@ x = media.name; cat = _data[index]; delta |= [cat setItemCount: x]
 
 static NSString *kDragType = @"private.ample.media";
 - (void)viewDidLoad {
-    
+
+    NSNotificationCenter *nc = [NSNotificationCenter defaultCenter];
+
     [super viewDidLoad];
     
     //NSOutlineView *view = [self view];
@@ -424,6 +498,21 @@ static NSString *kDragType = @"private.ample.media";
     [_outlineView expandItem: nil expandChildren: YES];
     
     [_outlineView registerForDraggedTypes: @[kDragType]];
+
+    for (unsigned i = 0; i < CATEGORY_COUNT; ++i)
+        [_data[i] setView: _outlineView];
+
+
+    [nc addObserver: self selector: @selector(magicRouteNotification:) name: kNotificationDiskImageMagicRoute object: nil];
+
+}
+
+-(void)viewWillDisappear {
+    NSNotificationCenter *nc = [NSNotificationCenter defaultCenter];
+    [nc removeObserver: self];
+    
+    for (unsigned i = 0; i < CATEGORY_COUNT; ++i)
+        [_data[i] setView: nil];
 }
 
 #pragma mark - NSOutlineViewDelegate
@@ -586,7 +675,7 @@ static NSString *kDragType = @"private.ample.media";
 }
 
 - (BOOL)outlineView:(NSOutlineView *)outlineView acceptDrop:(id<NSDraggingInfo>)info item:(id)item childIndex:(NSInteger)index {
- 
+
     if (index < 0) return NO;
 
     
@@ -620,7 +709,7 @@ static NSString *kDragType = @"private.ample.media";
     NSInteger oldIndex = indexes[1];
 
     [_outlineView beginUpdates];
-    [cat moveItemFrom: oldIndex to: index outlineView: _outlineView];
+    [cat moveItemFrom: oldIndex to: index];
     [_outlineView endUpdates];
     [self rebuildArgs];
 
@@ -646,24 +735,55 @@ static NSString *kDragType = @"private.ample.media";
     if (![item valid]) {
         MediaCategory *cat = [_outlineView parentForItem: item];
         [_outlineView beginUpdates];
-        [cat pruneChildrenWithOutlineView: _outlineView];
+        [cat pruneChildren];
+        
+        // remove the entire category??
+        if (![cat validCount] && ![cat count]) {
+            NSUInteger ix = [_root indexOfObject: cat];
+            if (ix != NSNotFound) {
+                NSIndexSet *set = [NSIndexSet indexSetWithIndex: ix];
+                [_outlineView removeItemsAtIndexes: set
+                                          inParent: nil
+                                     withAnimation: NSTableViewAnimationEffectFade];
+
+                [_root removeObjectAtIndex: ix];
+                [cat setIndex: -1];
+            }
+        }
+        
         [_outlineView endUpdates];
     }
     
-    // todo -- if this eliminates a category completely, it will still be included
-    // since we're now using animaations instead of reloading.
-    
     [self rebuildArgs];
 }
 
 - (IBAction)pathAction:(id)sender {
     
     NSURL *url = [(NSPathControl *)sender URL];
-    NSInteger tag = [sender tag];
-    // TODO - don't add to recent disks if this is a bitbanger / midi / printer device.
-    if (url && tag == 0) {
-        NSNotificationCenter *nc = [NSNotificationCenter defaultCenter];
-        [nc postNotificationName: @"DiskImageAdded" object: url];
+    NSInteger tag = [sender tag] - 1;
+    
+    switch(tag) {
+
+        case kIndexFloppy8:
+        case kIndexFloppy525:
+        case kIndexFloppy35:
+        case kIndexHardDrive:
+        case kIndexCDROM:
+        case kIndexCassette:
+        case kIndexDiskImage:
+            if (url) {
+                NSNotificationCenter *nc = [NSNotificationCenter defaultCenter];
+                [nc postNotificationName: kNotificationDiskImageAdded object: url];
+            }
+            break;
+
+            // not disk images or don't use a path control.
+        case kIndexPicture:
+        case kIndexMidiIn:
+        case kIndexMidiOut:
+        case kIndexBitBanger:
+        case kIndexROM:
+        default: break;
     }
     
     [self rebuildArgs];
@@ -672,11 +792,73 @@ static NSString *kDragType = @"private.ample.media";
 -(IBAction)textAction: (id)sender {
     [self rebuildArgs];
 }
+- (IBAction)midiAction:(id)sender {
+    [self rebuildArgs];
+}
 
 -(IBAction)resetMedia:(id)sender {
     [self resetDiskImages];
 }
 
+
+
+-(void)magicRouteNotification: (NSNotification *)notification {
+    NSDictionary *userInfo = [notification userInfo];
+    id path = [userInfo objectForKey: @"path"];
+    
+    if ([path isKindOfClass: [NSURL class]]) {
+        [self smartRouteURL: path];
+        return;
+    }
+
+    if ([path isKindOfClass: [NSString class]]) {
+        NSURL *url = [NSURL fileURLWithPath: path];
+        [self smartRouteURL: url];
+        return;
+    }
+}
+/*
+ * given a file, add it to the media list.
+ * TODO - how to handle if full or media type missing?
+ */
+-(BOOL)smartRouteURL: (NSURL *)url {
+    
+    if (!url) return NO;
+
+    MediaType mt = ClassifyMediaFile(url);
+    if (mt < 1) return NO; // unknown / error.
+    
+    unsigned ix = 0;
+    switch(mt) {
+        case MediaType_3_5: ix = kIndexFloppy35; break;
+        case MediaType_5_25: ix = kIndexFloppy525; break;
+        case MediaType_8: ix = kIndexFloppy8; break;
+        case MediaType_Cassette: ix = kIndexCassette; break;
+        case MediaType_HardDisk: ix = kIndexHardDrive; break;
+        case MediaType_CDROM: ix = kIndexCDROM; break;
+
+        case MediaType_Picture: ix = kIndexPicture; break;
+        case MediaType_ROM: ix = kIndexROM; break;
+        case MediaType_MIDI: // ix = kIndexMidiIn; break;
+        case MediaTypeError:
+        case MediaTypeUnknown:
+            return NO;
+    }
+
+    [_outlineView beginUpdates];
+    // todo -- check root, insert if necessary?
+    MediaCategory *cat = _data[ix];
+    [cat addURL: url];
+    [_outlineView endUpdates];
+
+    [self rebuildArgs];
+    return YES;
+}
+
+-(BOOL)smartRouteFile: (NSString *)file {
+    return NO;
+}
+
 @end
 
 @implementation MediaViewController (Bookmark)
@@ -694,7 +876,7 @@ static NSString *kDragType = @"private.ample.media";
 }
 
 static NSString * BookmarkStrings[] = {
-    @"flop_525", @"flop_35", @"hard", @"cdrm", @"cass", @"disk", @"bitb",
+    @"flop_8", @"flop_525", @"flop_35", @"hard", @"cdrm", @"cass", @"disk", @"bitb", @"midiin", @"midiout", @"pic", @"rom",
 };
 static_assert(SIZEOF(BookmarkStrings) == CATEGORY_COUNT, "Missing item");
 
@@ -730,7 +912,7 @@ static int BookmarkIndex(NSString *str) {
                 MediaItem *item = [cat objectAtIndex: i++];
                 if (![path length]) continue;
 
-                if (ix == kIndexBitBanger) {
+                if (ix == kIndexBitBanger || ix == kIndexMidiOut || ix == kIndexMidiIn) {
                     [item setString: path];
                 } else {
                     NSURL *url = [NSURL fileURLWithPath: path];
@@ -762,7 +944,7 @@ static int BookmarkIndex(NSString *str) {
                 MediaItem *item = [cat objectAtIndex: i++];
                 if (![path length]) continue;
 
-                if (ix == kIndexBitBanger) {
+                if (ix == kIndexBitBanger || ix == kIndexMidiOut || ix == kIndexMidiIn) {
                     [item setString: path];
                 } else {
                     NSURL *url = [NSURL fileURLWithPath: path];
@@ -817,5 +999,4 @@ static void CompressArray(NSMutableArray *array) {
     return YES;
 }
 
-
 @end

Ample/MidiManager.h

@@ -0,0 +1,25 @@
+//
+//  MidiManager.h
+//  Ample
+//
+//  Created by Kelvin Sherlock on 8/6/2021.
+//  Copyright © 2021 Kelvin Sherlock. All rights reserved.
+//
+
+#ifndef MidiManager_h
+#define MidiManager_h
+
+
+extern NSString *kMidiSourcesChangedNotification;
+extern NSString *kMidiDestinationsChangedNotification;
+
+@interface MidiManager : NSObject
+
+@property NSArray *sources;
+@property NSArray *destinations;
+
++(instancetype)sharedManager;
+
+@end
+
+#endif /* MidiManager_h */

Ample/MidiManager.m

@@ -0,0 +1,153 @@
+//
+//  Midi.m
+//  Ample
+//
+//  Created by Kelvin Sherlock on 8/6/2021.
+//  Copyright © 2021 Kelvin Sherlock. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import <CoreMIDI/CoreMIDI.h>
+
+#import "MidiManager.h"
+
+static NSArray *MidiSources(void) {
+    
+    ItemCount count = MIDIGetNumberOfSources();
+    if (count <= 0) return @[];
+    
+    NSMutableArray *rv = [NSMutableArray arrayWithCapacity: count + 1];
+    
+    MIDIEndpointRef ep;
+    for(int i = 0; i < count; ++i) {
+        ep = MIDIGetSource(i);
+        if (!ep) continue;
+
+        // https://developer.apple.com/library/archive/qa/qa1374/_index.html
+        CFStringRef str = NULL;
+        MIDIObjectGetStringProperty(ep, kMIDIPropertyDisplayName, &str);
+
+        if (str) {
+            [rv addObject: (__bridge id _Nonnull)(str)];
+            CFRelease(str);
+        }
+    }
+    return rv;
+}
+
+
+static NSArray *MidiDestinations(void) {
+    
+    ItemCount count = MIDIGetNumberOfDestinations();
+    if (count <= 0) return @[];
+    
+    NSMutableArray *rv = [NSMutableArray arrayWithCapacity: count + 1];
+    
+    MIDIEndpointRef ep;
+    for(int i = 0; i < count; ++i) {
+        ep = MIDIGetDestination(i);
+        if (!ep) continue;
+
+        // https://developer.apple.com/library/archive/qa/qa1374/_index.html
+        CFStringRef str = NULL;
+        MIDIObjectGetStringProperty(ep, kMIDIPropertyDisplayName, &str);
+
+        if (str) {
+            [rv addObject: (__bridge id _Nonnull)(str)];
+            CFRelease(str);
+        }
+    }
+    return rv;
+}
+
+NSString *kMidiSourcesChangedNotification = @"Midi Sources Changed";
+NSString *kMidiDestinationsChangedNotification = @"Midi Destinations Changed";
+
+
+@interface MidiManager () {
+    MIDIClientRef _client;
+}
+
+-(void)objectAddRemove: (const MIDIObjectAddRemoveNotification *)message;
+-(void)objectPropertyChanged: (const MIDIObjectPropertyChangeNotification *)message;
+@end
+
+
+static MidiManager *singleton = nil;
+@implementation MidiManager
+
+-(void)awakeFromNib {
+    if (!singleton) singleton = self;
+}
+
++(instancetype)sharedManager {
+    if (!singleton) singleton = [MidiManager new];
+    return singleton;
+}
+
+-(instancetype)init {
+    
+    if (singleton) return singleton;
+
+    OSStatus status;
+    
+
+    status = MIDIClientCreateWithBlock(
+        CFSTR("serial_midi"),
+        &_client,
+        ^(const MIDINotification *message){
+        switch(message->messageID) {
+            case kMIDIMsgObjectAdded:
+            case kMIDIMsgObjectRemoved:
+                [self objectAddRemove: (const MIDIObjectAddRemoveNotification *)message];
+                break;
+            case kMIDIMsgPropertyChanged:
+                [self objectPropertyChanged: (const MIDIObjectPropertyChangeNotification *)message];
+            default:
+                break;
+        }
+    });
+   
+    _sources = MidiSources();
+    _destinations = MidiDestinations();
+    return self;
+}
+
+-(void)objectAddRemove: (const MIDIObjectAddRemoveNotification *)message {
+
+    const MIDIObjectAddRemoveNotification *m = (const MIDIObjectAddRemoveNotification *)message;
+    
+    NSNotificationCenter *nc = [NSNotificationCenter defaultCenter];
+
+    if (m->childType == kMIDIObjectType_Source) {
+        [self setSources: MidiSources()];
+        [nc postNotificationName: kMidiSourcesChangedNotification object: self];
+    }
+    
+    if (m->childType == kMIDIObjectType_Destination) {
+        [self setDestinations: MidiDestinations()];
+        [nc postNotificationName: kMidiDestinationsChangedNotification object: self];
+    }
+   
+}
+-(void)objectPropertyChanged: (const MIDIObjectPropertyChangeNotification *)message {
+
+    const MIDIObjectPropertyChangeNotification *m = (const MIDIObjectPropertyChangeNotification *)message;
+    if (m->propertyName == kMIDIPropertyDisplayName) {
+        [self setSources: MidiSources()];
+        [self setDestinations: MidiDestinations()];
+
+        NSNotificationCenter *nc = [NSNotificationCenter defaultCenter];
+        [nc postNotificationName: kMidiSourcesChangedNotification object: self];
+        [nc postNotificationName: kMidiDestinationsChangedNotification object: self];
+    }
+}
+
+
+-(void)dealloc {
+    
+    if (_client)
+        MIDIClientDispose(_client);
+}
+@end
+

Ample/NewMachineViewController.m

@@ -27,7 +27,11 @@
     first++;
 
     NSBundle *bundle = [NSBundle mainBundle];
+#ifdef AMPLE_LITE
+    NSString *path = [bundle pathForResource: @"models~extra" ofType: @"plist"];
+#else
     NSString *path = [bundle pathForResource: @"models" ofType: @"plist"];
+#endif
     _data = [NSArray arrayWithContentsOfFile: path];
 
 }

Ample/Resources/CheatSheet.html

@@ -51,7 +51,7 @@
                   border: solid 1px black;
                   text-shadow: 0px 1px 0px black;
                   box-shadow: 1px 1px 2px 0px rgba(0,0,0,0.75);
-                  background-color: rgb(101, 101, 101);                  
+                  background-color: rgb(101, 101, 101);
                 }
             }
         </style>
@@ -104,14 +104,17 @@
                     <td>Toggle full screen mode</td>
                 </tr>
                 <tr>
-                    <td><kbd>F12</kbd></td>
+                    <td>
+                      <span data-macbook=false><kbd>F12</kbd></span>
+                      <span data-macbook=true><kbd>Fn</kbd>+<kbd>F12</kbd></span>
+                    </td>
                     <td>Reset Key</td>
                 </tr>
             </tbody>
         </table>
 
         <h1>Partial UI Mode</h1>
-   
+
         <table>
             <colgroup>
               <col style="width: 14em;" />
@@ -138,7 +141,7 @@
                     <td>Quit</td>
                 </tr>
                 <tr>
-                    <td><kbd>P</kbd></td>
+                    <td><kbd>F5</kbd></td>
                     <td>Pause</td>
                 </tr>
 
@@ -163,8 +166,7 @@
                     <td><kbd>Shift</kbd>+<kbd>F3</kbd></td>
                     <td>Hard reset</td>
                 </tr>
-
-
+<!--
                 <tr>
                     <td><kbd>F5</kbd></td>
                     <td>Toggle debugger</td>
@@ -173,15 +175,17 @@
                     <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 state</td>
-                </tr>
-                <tr>
-                    <td><kbd>Shift</kbd>+<kbd>F7</kbd></td>
-                    <td>Save state</td>
+                    <td>Load save state</td>
                 </tr>
+ 
 
                 <tr>
                     <td><kbd>F10</kbd></td>

Ample/Resources/a1000.plist

@@ -0,0 +1,875 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+  <dict>
+    <key>value</key>
+    <string>a1000</string>
+    <key>description</key>
+    <string>Amiga 1000 (PAL)</string>
+    <key>media</key>
+    <dict>
+    </dict>
+    <key>resolution</key>
+    <array>
+      <integer>724</integer>
+      <integer>567</integer>
+    </array>
+    <key>slots</key>
+    <array>
+      <dict>
+        <key>name</key>
+        <string>smartport</string>
+        <key>description</key>
+        <string>Disk Drives</string>
+        <key>options</key>
+        <array>
+          <dict>
+            <key>value</key>
+            <string></string>
+            <key>description</key>
+            <string></string>
+            <key>devname</key>
+            <string>smartport</string>
+            <key>default</key>
+            <true/>
+          </dict>
+        </array>
+      </dict>
+      <dict>
+        <key>name</key>
+        <string>rs232</string>
+        <key>description</key>
+        <string>Serial</string>
+        <key>options</key>
+        <array>
+          <dict>
+            <key>value</key>
+            <string></string>
+            <key>description</key>
+            <string>—None—</string>
+            <key>default</key>
+            <true/>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>ie15</string>
+            <key>description</key>
+            <string>IE15 Terminal</string>
+            <key>devname</key>
+            <string>ie15_terminal</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>scorpion</string>
+            <key>description</key>
+            <string>Micro-Robotics Scorpion Intelligent Controller</string>
+            <key>devname</key>
+            <string>scorpion_ic</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>pty</string>
+            <key>description</key>
+            <string>Pseudo Terminal</string>
+            <key>devname</key>
+            <string>pseudo_terminal</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>rs_printer</string>
+            <key>description</key>
+            <string>Radio Shack Serial Printer</string>
+            <key>devname</key>
+            <string>rs_serial_printer</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>loopback</string>
+            <key>description</key>
+            <string>RS-232 Loopback</string>
+            <key>devname</key>
+            <string>rs232_loopback</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>dec_loopback</string>
+            <key>description</key>
+            <string>RS-232 Loopback (DEC 12-15336-00)</string>
+            <key>devname</key>
+            <string>dec_rs232_loopback</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>null_modem</string>
+            <key>description</key>
+            <string>RS-232 Null Modem</string>
+            <key>devname</key>
+            <string>null_modem</string>
+            <key>media</key>
+            <dict>
+              <key>bitbanger</key>
+              <integer>1</integer>
+            </dict>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>patch</string>
+            <key>description</key>
+            <string>RS-232 Patch Box</string>
+            <key>devname</key>
+            <string>rs232_patch_box</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>rs232_sync_io</string>
+            <key>description</key>
+            <string>RS-232 Synchronous I/O</string>
+            <key>devname</key>
+            <string>rs232_sync_io</string>
+            <key>media</key>
+            <dict>
+              <key>bitbanger</key>
+              <integer>1</integer>
+            </dict>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>keyboard</string>
+            <key>description</key>
+            <string>Serial Keyboard</string>
+            <key>devname</key>
+            <string>serial_keyboard</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>printer</string>
+            <key>description</key>
+            <string>Serial Printer</string>
+            <key>devname</key>
+            <string>serial_printer</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>terminal</string>
+            <key>description</key>
+            <string>Serial Terminal</string>
+            <key>devname</key>
+            <string>serial_terminal</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>sunkbd</string>
+            <key>description</key>
+            <string>Sun Keyboard Adaptor</string>
+            <key>devname</key>
+            <string>sunkbd_adaptor</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>mockingboard</string>
+            <key>description</key>
+            <string>Sweet Micro Systems Mockingboard D</string>
+            <key>devname</key>
+            <string>mockingboardd</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>swtpc8212</string>
+            <key>description</key>
+            <string>SWTPC8212 Terminal</string>
+            <key>devname</key>
+            <string>swtpc8212_terminal</string>
+          </dict>
+        </array>
+      </dict>
+      <dict>
+        <key>name</key>
+        <string>centronics</string>
+        <key>description</key>
+        <string>Printer</string>
+        <key>options</key>
+        <array>
+          <dict>
+            <key>value</key>
+            <string></string>
+            <key>description</key>
+            <string>—None—</string>
+            <key>default</key>
+            <false/>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>printer</string>
+            <key>description</key>
+            <string>Centronics Printer</string>
+            <key>default</key>
+            <true/>
+            <key>devname</key>
+            <string>centronics_printer</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>pl80</string>
+            <key>description</key>
+            <string>COMX PL-80</string>
+            <key>devname</key>
+            <string>comx_pl80</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>covox_stereo</string>
+            <key>description</key>
+            <string>Covox (Stereo-in-1)</string>
+            <key>devname</key>
+            <string>covox_stereo</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>covox</string>
+            <key>description</key>
+            <string>Covox Speech Thing</string>
+            <key>devname</key>
+            <string>covox</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>digiblst</string>
+            <key>description</key>
+            <string>Digiblaster (DIY)</string>
+            <key>devname</key>
+            <string>cpcdigiblst</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>ap2000</string>
+            <key>description</key>
+            <string>Epson ActionPrinter 2000</string>
+            <key>devname</key>
+            <string>ap2000</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>ex800</string>
+            <key>description</key>
+            <string>Epson EX-800</string>
+            <key>devname</key>
+            <string>ex800</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>lx800</string>
+            <key>description</key>
+            <string>Epson LX-800</string>
+            <key>devname</key>
+            <string>lx800</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>lx810l</string>
+            <key>description</key>
+            <string>Epson LX-810L</string>
+            <key>devname</key>
+            <string>lx810l</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>p72</string>
+            <key>description</key>
+            <string>NEC PinWriter P72</string>
+            <key>devname</key>
+            <string>p72</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>samdac</string>
+            <key>description</key>
+            <string>SAMDAC</string>
+            <key>devname</key>
+            <string>centronics_samdac</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>nlq401</string>
+            <key>description</key>
+            <string>Schneider NLQ 401 Matrix Printer</string>
+            <key>devname</key>
+            <string>nlq401</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>chessmec</string>
+            <key>description</key>
+            <string>Tasc ChessMachine EC Interface</string>
+            <key>devname</key>
+            <string>centronics_chessmec</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>smartboard</string>
+            <key>description</key>
+            <string>Tasc SmartBoard SB30 Interface</string>
+            <key>devname</key>
+            <string>centronics_smartboard</string>
+          </dict>
+        </array>
+      </dict>
+      <dict>
+        <key>name</key>
+        <string>kbd</string>
+        <key>description</key>
+        <string>Keyboard</string>
+        <key>options</key>
+        <array>
+          <dict>
+            <key>value</key>
+            <string></string>
+            <key>description</key>
+            <string>—None—</string>
+            <key>default</key>
+            <false/>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>a1000_dk</string>
+            <key>description</key>
+            <string>Amiga 1000 Keyboard (Denmark)</string>
+            <key>devname</key>
+            <string>a1000kbd_dk</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>a1000_fr</string>
+            <key>description</key>
+            <string>Amiga 1000 Keyboard (France/Belgium)</string>
+            <key>devname</key>
+            <string>a1000kbd_fr</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>a1000_de</string>
+            <key>description</key>
+            <string>Amiga 1000 Keyboard (Germany/Austria)</string>
+            <key>devname</key>
+            <string>a1000kbd_de</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>a1000_it</string>
+            <key>description</key>
+            <string>Amiga 1000 Keyboard (Italy)</string>
+            <key>devname</key>
+            <string>a1000kbd_it</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>a1000_se</string>
+            <key>description</key>
+            <string>Amiga 1000 Keyboard (Sweden/Finland)</string>
+            <key>devname</key>
+            <string>a1000kbd_se</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>a1000_us</string>
+            <key>description</key>
+            <string>Amiga 1000 Keyboard (U.S./Canada)</string>
+            <key>default</key>
+            <true/>
+            <key>devname</key>
+            <string>a1000kbd_us</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>a1000_gb</string>
+            <key>description</key>
+            <string>Amiga 1000 Keyboard (UK)</string>
+            <key>devname</key>
+            <string>a1000kbd_gb</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>a1200_us</string>
+            <key>description</key>
+            <string>Amiga 1200 Keyboard Rev B</string>
+            <key>devname</key>
+            <string>a1200kbd_rb</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>a2000_g80_dk</string>
+            <key>description</key>
+            <string>Amiga 2000 Keyboard (Cherry - Denmark)</string>
+            <key>devname</key>
+            <string>a2000kbd_g80_dk</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>a2000_g80_de</string>
+            <key>description</key>
+            <string>Amiga 2000 Keyboard (Cherry - Germany/Austria)</string>
+            <key>devname</key>
+            <string>a2000kbd_g80_de</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>a2000_g80_se</string>
+            <key>description</key>
+            <string>Amiga 2000 Keyboard (Cherry - Sweden/Finland)</string>
+            <key>devname</key>
+            <string>a2000kbd_g80_se</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>a2000_g80_us</string>
+            <key>description</key>
+            <string>Amiga 2000 Keyboard (Cherry - U.S./Canada)</string>
+            <key>devname</key>
+            <string>a2000kbd_g80_us</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>a2000_g80_gb</string>
+            <key>description</key>
+            <string>Amiga 2000 Keyboard (Cherry - UK)</string>
+            <key>devname</key>
+            <string>a2000kbd_g80_gb</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>a2000_dk</string>
+            <key>description</key>
+            <string>Amiga 2000/3000/4000 Keyboard (Denmark)</string>
+            <key>devname</key>
+            <string>a2000kbd_dk</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>a2000_fr</string>
+            <key>description</key>
+            <string>Amiga 2000/3000/4000 Keyboard (France/Belgium)</string>
+            <key>devname</key>
+            <string>a2000kbd_fr</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>a2000_de</string>
+            <key>description</key>
+            <string>Amiga 2000/3000/4000 Keyboard (Germany/Austria)</string>
+            <key>devname</key>
+            <string>a2000kbd_de</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>a2000_it</string>
+            <key>description</key>
+            <string>Amiga 2000/3000/4000 Keyboard (Italy)</string>
+            <key>devname</key>
+            <string>a2000kbd_it</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>a2000_no</string>
+            <key>description</key>
+            <string>Amiga 2000/3000/4000 Keyboard (Norway)</string>
+            <key>devname</key>
+            <string>a2000kbd_no</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>a2000_es</string>
+            <key>description</key>
+            <string>Amiga 2000/3000/4000 Keyboard (Spain)</string>
+            <key>devname</key>
+            <string>a2000kbd_es</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>a2000_se</string>
+            <key>description</key>
+            <string>Amiga 2000/3000/4000 Keyboard (Sweden/Finland)</string>
+            <key>devname</key>
+            <string>a2000kbd_se</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>a2000_ch</string>
+            <key>description</key>
+            <string>Amiga 2000/3000/4000 Keyboard (Switzerland)</string>
+            <key>devname</key>
+            <string>a2000kbd_ch</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>a2000_us</string>
+            <key>description</key>
+            <string>Amiga 2000/3000/4000 Keyboard (U.S./Canada)</string>
+            <key>devname</key>
+            <string>a2000kbd_us</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>a2000_gb</string>
+            <key>description</key>
+            <string>Amiga 2000/3000/4000 Keyboard (UK)</string>
+            <key>devname</key>
+            <string>a2000kbd_gb</string>
+          </dict>
+        </array>
+      </dict>
+    </array>
+    <key>devices</key>
+    <array>
+      <dict>
+        <key>name</key>
+        <string>smartport</string>
+        <key>slots</key>
+        <array>
+          <dict>
+            <key>name</key>
+            <string>fdc:0</string>
+            <key>options</key>
+            <array>
+              <dict>
+                <key>value</key>
+                <string></string>
+                <key>description</key>
+                <string>—None—</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>35dd</string>
+                <key>description</key>
+                <string>3.5" DD</string>
+                <key>default</key>
+                <true/>
+                <key>media</key>
+                <dict>
+                  <key>floppy_3_5</key>
+                  <integer>1</integer>
+                </dict>
+              </dict>
+            </array>
+          </dict>
+          <dict>
+            <key>name</key>
+            <string>fdc:1</string>
+            <key>options</key>
+            <array>
+              <dict>
+                <key>value</key>
+                <string></string>
+                <key>description</key>
+                <string>—None—</string>
+                <key>default</key>
+                <true/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>35dd</string>
+                <key>description</key>
+                <string>3.5" DD</string>
+                <key>default</key>
+                <false/>
+                <key>media</key>
+                <dict>
+                  <key>floppy_3_5</key>
+                  <integer>1</integer>
+                </dict>
+              </dict>
+            </array>
+          </dict>
+          <dict>
+            <key>name</key>
+            <string>fdc:2</string>
+            <key>options</key>
+            <array>
+              <dict>
+                <key>value</key>
+                <string></string>
+                <key>description</key>
+                <string>—None—</string>
+                <key>default</key>
+                <true/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>35dd</string>
+                <key>description</key>
+                <string>3.5" DD</string>
+                <key>default</key>
+                <false/>
+                <key>media</key>
+                <dict>
+                  <key>floppy_3_5</key>
+                  <integer>1</integer>
+                </dict>
+              </dict>
+            </array>
+          </dict>
+          <dict>
+            <key>name</key>
+            <string>fdc:3</string>
+            <key>options</key>
+            <array>
+              <dict>
+                <key>value</key>
+                <string></string>
+                <key>description</key>
+                <string>—None—</string>
+                <key>default</key>
+                <true/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>35dd</string>
+                <key>description</key>
+                <string>3.5" DD</string>
+                <key>default</key>
+                <false/>
+                <key>media</key>
+                <dict>
+                  <key>floppy_3_5</key>
+                  <integer>1</integer>
+                </dict>
+              </dict>
+            </array>
+          </dict>
+        </array>
+      </dict>
+      <dict>
+        <key>name</key>
+        <string>rs232_patch_box</string>
+        <key>slots</key>
+        <array>
+          <dict>
+            <key>name</key>
+            <string>:dce</string>
+            <key>options</key>
+            <array>
+              <dict>
+                <key>value</key>
+                <string></string>
+                <key>description</key>
+                <string>—None—</string>
+                <key>default</key>
+                <true/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>ie15</string>
+                <key>description</key>
+                <string>IE15 Terminal</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>scorpion</string>
+                <key>description</key>
+                <string>Micro-Robotics Scorpion Intelligent Controller</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>pty</string>
+                <key>description</key>
+                <string>Pseudo Terminal</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>rs_printer</string>
+                <key>description</key>
+                <string>Radio Shack Serial Printer</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>loopback</string>
+                <key>description</key>
+                <string>RS-232 Loopback</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>dec_loopback</string>
+                <key>description</key>
+                <string>RS-232 Loopback (DEC 12-15336-00)</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>null_modem</string>
+                <key>description</key>
+                <string>RS-232 Null Modem</string>
+                <key>default</key>
+                <false/>
+                <key>media</key>
+                <dict>
+                  <key>bitbanger</key>
+                  <integer>1</integer>
+                </dict>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>patch</string>
+                <key>description</key>
+                <string>RS-232 Patch Box</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>rs232_sync_io</string>
+                <key>description</key>
+                <string>RS-232 Synchronous I/O</string>
+                <key>default</key>
+                <false/>
+                <key>media</key>
+                <dict>
+                  <key>bitbanger</key>
+                  <integer>1</integer>
+                </dict>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>keyboard</string>
+                <key>description</key>
+                <string>Serial Keyboard</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>printer</string>
+                <key>description</key>
+                <string>Serial Printer</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>terminal</string>
+                <key>description</key>
+                <string>Serial Terminal</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>sunkbd</string>
+                <key>description</key>
+                <string>Sun Keyboard Adaptor</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>mockingboard</string>
+                <key>description</key>
+                <string>Sweet Micro Systems Mockingboard D</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>swtpc8212</string>
+                <key>description</key>
+                <string>SWTPC8212 Terminal</string>
+                <key>default</key>
+                <false/>
+              </dict>
+            </array>
+          </dict>
+        </array>
+      </dict>
+      <dict>
+        <key>name</key>
+        <string>sunkbd_adaptor</string>
+        <key>slots</key>
+        <array>
+          <dict>
+            <key>name</key>
+            <string>:keyboard</string>
+            <key>options</key>
+            <array>
+              <dict>
+                <key>value</key>
+                <string></string>
+                <key>description</key>
+                <string>—None—</string>
+                <key>default</key>
+                <true/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>type3hle</string>
+                <key>description</key>
+                <string>Sun Type 3 Keyboard (HLE)</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>type4hle</string>
+                <key>description</key>
+                <string>Sun Type 4 Keyboard (HLE)</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>type5gbhle</string>
+                <key>description</key>
+                <string>Sun Type 5 Keyboard (Great Britain - HLE)</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>type5jphle</string>
+                <key>description</key>
+                <string>Sun Type 5 Keyboard (Japan - HLE)</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>type5sehle</string>
+                <key>description</key>
+                <string>Sun Type 5 Keyboard (Sweden - HLE)</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>type5hle</string>
+                <key>description</key>
+                <string>Sun Type 5 Keyboard (U.S.A. - HLE)</string>
+                <key>default</key>
+                <false/>
+              </dict>
+            </array>
+          </dict>
+        </array>
+      </dict>
+    </array>
+    <key>software</key>
+    <array>
+      <string>amiga_workbench.xml</string>
+      <string>amiga_hardware.xml</string>
+      <string>amiga_apps.xml</string>
+      <string>amiga_flop.xml</string>
+      <string>amigaocs_flop.xml</string>
+      <string>amiga_demos.xml</string>
+      <string>amiga_a1000.xml</string>
+    </array>
+  </dict>
+</plist>

Ample/Resources/a1000n.plist

@@ -0,0 +1,875 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+  <dict>
+    <key>value</key>
+    <string>a1000n</string>
+    <key>description</key>
+    <string>Amiga 1000 (NTSC)</string>
+    <key>media</key>
+    <dict>
+    </dict>
+    <key>resolution</key>
+    <array>
+      <integer>724</integer>
+      <integer>483</integer>
+    </array>
+    <key>slots</key>
+    <array>
+      <dict>
+        <key>name</key>
+        <string>smartport</string>
+        <key>description</key>
+        <string>Disk Drives</string>
+        <key>options</key>
+        <array>
+          <dict>
+            <key>value</key>
+            <string></string>
+            <key>description</key>
+            <string></string>
+            <key>devname</key>
+            <string>smartport</string>
+            <key>default</key>
+            <true/>
+          </dict>
+        </array>
+      </dict>
+      <dict>
+        <key>name</key>
+        <string>rs232</string>
+        <key>description</key>
+        <string>Serial</string>
+        <key>options</key>
+        <array>
+          <dict>
+            <key>value</key>
+            <string></string>
+            <key>description</key>
+            <string>—None—</string>
+            <key>default</key>
+            <true/>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>ie15</string>
+            <key>description</key>
+            <string>IE15 Terminal</string>
+            <key>devname</key>
+            <string>ie15_terminal</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>scorpion</string>
+            <key>description</key>
+            <string>Micro-Robotics Scorpion Intelligent Controller</string>
+            <key>devname</key>
+            <string>scorpion_ic</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>pty</string>
+            <key>description</key>
+            <string>Pseudo Terminal</string>
+            <key>devname</key>
+            <string>pseudo_terminal</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>rs_printer</string>
+            <key>description</key>
+            <string>Radio Shack Serial Printer</string>
+            <key>devname</key>
+            <string>rs_serial_printer</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>loopback</string>
+            <key>description</key>
+            <string>RS-232 Loopback</string>
+            <key>devname</key>
+            <string>rs232_loopback</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>dec_loopback</string>
+            <key>description</key>
+            <string>RS-232 Loopback (DEC 12-15336-00)</string>
+            <key>devname</key>
+            <string>dec_rs232_loopback</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>null_modem</string>
+            <key>description</key>
+            <string>RS-232 Null Modem</string>
+            <key>devname</key>
+            <string>null_modem</string>
+            <key>media</key>
+            <dict>
+              <key>bitbanger</key>
+              <integer>1</integer>
+            </dict>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>patch</string>
+            <key>description</key>
+            <string>RS-232 Patch Box</string>
+            <key>devname</key>
+            <string>rs232_patch_box</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>rs232_sync_io</string>
+            <key>description</key>
+            <string>RS-232 Synchronous I/O</string>
+            <key>devname</key>
+            <string>rs232_sync_io</string>
+            <key>media</key>
+            <dict>
+              <key>bitbanger</key>
+              <integer>1</integer>
+            </dict>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>keyboard</string>
+            <key>description</key>
+            <string>Serial Keyboard</string>
+            <key>devname</key>
+            <string>serial_keyboard</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>printer</string>
+            <key>description</key>
+            <string>Serial Printer</string>
+            <key>devname</key>
+            <string>serial_printer</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>terminal</string>
+            <key>description</key>
+            <string>Serial Terminal</string>
+            <key>devname</key>
+            <string>serial_terminal</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>sunkbd</string>
+            <key>description</key>
+            <string>Sun Keyboard Adaptor</string>
+            <key>devname</key>
+            <string>sunkbd_adaptor</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>mockingboard</string>
+            <key>description</key>
+            <string>Sweet Micro Systems Mockingboard D</string>
+            <key>devname</key>
+            <string>mockingboardd</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>swtpc8212</string>
+            <key>description</key>
+            <string>SWTPC8212 Terminal</string>
+            <key>devname</key>
+            <string>swtpc8212_terminal</string>
+          </dict>
+        </array>
+      </dict>
+      <dict>
+        <key>name</key>
+        <string>centronics</string>
+        <key>description</key>
+        <string>Printer</string>
+        <key>options</key>
+        <array>
+          <dict>
+            <key>value</key>
+            <string></string>
+            <key>description</key>
+            <string>—None—</string>
+            <key>default</key>
+            <false/>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>printer</string>
+            <key>description</key>
+            <string>Centronics Printer</string>
+            <key>default</key>
+            <true/>
+            <key>devname</key>
+            <string>centronics_printer</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>pl80</string>
+            <key>description</key>
+            <string>COMX PL-80</string>
+            <key>devname</key>
+            <string>comx_pl80</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>covox_stereo</string>
+            <key>description</key>
+            <string>Covox (Stereo-in-1)</string>
+            <key>devname</key>
+            <string>covox_stereo</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>covox</string>
+            <key>description</key>
+            <string>Covox Speech Thing</string>
+            <key>devname</key>
+            <string>covox</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>digiblst</string>
+            <key>description</key>
+            <string>Digiblaster (DIY)</string>
+            <key>devname</key>
+            <string>cpcdigiblst</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>ap2000</string>
+            <key>description</key>
+            <string>Epson ActionPrinter 2000</string>
+            <key>devname</key>
+            <string>ap2000</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>ex800</string>
+            <key>description</key>
+            <string>Epson EX-800</string>
+            <key>devname</key>
+            <string>ex800</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>lx800</string>
+            <key>description</key>
+            <string>Epson LX-800</string>
+            <key>devname</key>
+            <string>lx800</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>lx810l</string>
+            <key>description</key>
+            <string>Epson LX-810L</string>
+            <key>devname</key>
+            <string>lx810l</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>p72</string>
+            <key>description</key>
+            <string>NEC PinWriter P72</string>
+            <key>devname</key>
+            <string>p72</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>samdac</string>
+            <key>description</key>
+            <string>SAMDAC</string>
+            <key>devname</key>
+            <string>centronics_samdac</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>nlq401</string>
+            <key>description</key>
+            <string>Schneider NLQ 401 Matrix Printer</string>
+            <key>devname</key>
+            <string>nlq401</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>chessmec</string>
+            <key>description</key>
+            <string>Tasc ChessMachine EC Interface</string>
+            <key>devname</key>
+            <string>centronics_chessmec</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>smartboard</string>
+            <key>description</key>
+            <string>Tasc SmartBoard SB30 Interface</string>
+            <key>devname</key>
+            <string>centronics_smartboard</string>
+          </dict>
+        </array>
+      </dict>
+      <dict>
+        <key>name</key>
+        <string>kbd</string>
+        <key>description</key>
+        <string>Keyboard</string>
+        <key>options</key>
+        <array>
+          <dict>
+            <key>value</key>
+            <string></string>
+            <key>description</key>
+            <string>—None—</string>
+            <key>default</key>
+            <false/>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>a1000_dk</string>
+            <key>description</key>
+            <string>Amiga 1000 Keyboard (Denmark)</string>
+            <key>devname</key>
+            <string>a1000kbd_dk</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>a1000_fr</string>
+            <key>description</key>
+            <string>Amiga 1000 Keyboard (France/Belgium)</string>
+            <key>devname</key>
+            <string>a1000kbd_fr</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>a1000_de</string>
+            <key>description</key>
+            <string>Amiga 1000 Keyboard (Germany/Austria)</string>
+            <key>devname</key>
+            <string>a1000kbd_de</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>a1000_it</string>
+            <key>description</key>
+            <string>Amiga 1000 Keyboard (Italy)</string>
+            <key>devname</key>
+            <string>a1000kbd_it</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>a1000_se</string>
+            <key>description</key>
+            <string>Amiga 1000 Keyboard (Sweden/Finland)</string>
+            <key>devname</key>
+            <string>a1000kbd_se</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>a1000_us</string>
+            <key>description</key>
+            <string>Amiga 1000 Keyboard (U.S./Canada)</string>
+            <key>default</key>
+            <true/>
+            <key>devname</key>
+            <string>a1000kbd_us</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>a1000_gb</string>
+            <key>description</key>
+            <string>Amiga 1000 Keyboard (UK)</string>
+            <key>devname</key>
+            <string>a1000kbd_gb</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>a1200_us</string>
+            <key>description</key>
+            <string>Amiga 1200 Keyboard Rev B</string>
+            <key>devname</key>
+            <string>a1200kbd_rb</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>a2000_g80_dk</string>
+            <key>description</key>
+            <string>Amiga 2000 Keyboard (Cherry - Denmark)</string>
+            <key>devname</key>
+            <string>a2000kbd_g80_dk</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>a2000_g80_de</string>
+            <key>description</key>
+            <string>Amiga 2000 Keyboard (Cherry - Germany/Austria)</string>
+            <key>devname</key>
+            <string>a2000kbd_g80_de</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>a2000_g80_se</string>
+            <key>description</key>
+            <string>Amiga 2000 Keyboard (Cherry - Sweden/Finland)</string>
+            <key>devname</key>
+            <string>a2000kbd_g80_se</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>a2000_g80_us</string>
+            <key>description</key>
+            <string>Amiga 2000 Keyboard (Cherry - U.S./Canada)</string>
+            <key>devname</key>
+            <string>a2000kbd_g80_us</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>a2000_g80_gb</string>
+            <key>description</key>
+            <string>Amiga 2000 Keyboard (Cherry - UK)</string>
+            <key>devname</key>
+            <string>a2000kbd_g80_gb</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>a2000_dk</string>
+            <key>description</key>
+            <string>Amiga 2000/3000/4000 Keyboard (Denmark)</string>
+            <key>devname</key>
+            <string>a2000kbd_dk</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>a2000_fr</string>
+            <key>description</key>
+            <string>Amiga 2000/3000/4000 Keyboard (France/Belgium)</string>
+            <key>devname</key>
+            <string>a2000kbd_fr</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>a2000_de</string>
+            <key>description</key>
+            <string>Amiga 2000/3000/4000 Keyboard (Germany/Austria)</string>
+            <key>devname</key>
+            <string>a2000kbd_de</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>a2000_it</string>
+            <key>description</key>
+            <string>Amiga 2000/3000/4000 Keyboard (Italy)</string>
+            <key>devname</key>
+            <string>a2000kbd_it</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>a2000_no</string>
+            <key>description</key>
+            <string>Amiga 2000/3000/4000 Keyboard (Norway)</string>
+            <key>devname</key>
+            <string>a2000kbd_no</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>a2000_es</string>
+            <key>description</key>
+            <string>Amiga 2000/3000/4000 Keyboard (Spain)</string>
+            <key>devname</key>
+            <string>a2000kbd_es</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>a2000_se</string>
+            <key>description</key>
+            <string>Amiga 2000/3000/4000 Keyboard (Sweden/Finland)</string>
+            <key>devname</key>
+            <string>a2000kbd_se</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>a2000_ch</string>
+            <key>description</key>
+            <string>Amiga 2000/3000/4000 Keyboard (Switzerland)</string>
+            <key>devname</key>
+            <string>a2000kbd_ch</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>a2000_us</string>
+            <key>description</key>
+            <string>Amiga 2000/3000/4000 Keyboard (U.S./Canada)</string>
+            <key>devname</key>
+            <string>a2000kbd_us</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>a2000_gb</string>
+            <key>description</key>
+            <string>Amiga 2000/3000/4000 Keyboard (UK)</string>
+            <key>devname</key>
+            <string>a2000kbd_gb</string>
+          </dict>
+        </array>
+      </dict>
+    </array>
+    <key>devices</key>
+    <array>
+      <dict>
+        <key>name</key>
+        <string>smartport</string>
+        <key>slots</key>
+        <array>
+          <dict>
+            <key>name</key>
+            <string>fdc:0</string>
+            <key>options</key>
+            <array>
+              <dict>
+                <key>value</key>
+                <string></string>
+                <key>description</key>
+                <string>—None—</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>35dd</string>
+                <key>description</key>
+                <string>3.5" DD</string>
+                <key>default</key>
+                <true/>
+                <key>media</key>
+                <dict>
+                  <key>floppy_3_5</key>
+                  <integer>1</integer>
+                </dict>
+              </dict>
+            </array>
+          </dict>
+          <dict>
+            <key>name</key>
+            <string>fdc:1</string>
+            <key>options</key>
+            <array>
+              <dict>
+                <key>value</key>
+                <string></string>
+                <key>description</key>
+                <string>—None—</string>
+                <key>default</key>
+                <true/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>35dd</string>
+                <key>description</key>
+                <string>3.5" DD</string>
+                <key>default</key>
+                <false/>
+                <key>media</key>
+                <dict>
+                  <key>floppy_3_5</key>
+                  <integer>1</integer>
+                </dict>
+              </dict>
+            </array>
+          </dict>
+          <dict>
+            <key>name</key>
+            <string>fdc:2</string>
+            <key>options</key>
+            <array>
+              <dict>
+                <key>value</key>
+                <string></string>
+                <key>description</key>
+                <string>—None—</string>
+                <key>default</key>
+                <true/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>35dd</string>
+                <key>description</key>
+                <string>3.5" DD</string>
+                <key>default</key>
+                <false/>
+                <key>media</key>
+                <dict>
+                  <key>floppy_3_5</key>
+                  <integer>1</integer>
+                </dict>
+              </dict>
+            </array>
+          </dict>
+          <dict>
+            <key>name</key>
+            <string>fdc:3</string>
+            <key>options</key>
+            <array>
+              <dict>
+                <key>value</key>
+                <string></string>
+                <key>description</key>
+                <string>—None—</string>
+                <key>default</key>
+                <true/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>35dd</string>
+                <key>description</key>
+                <string>3.5" DD</string>
+                <key>default</key>
+                <false/>
+                <key>media</key>
+                <dict>
+                  <key>floppy_3_5</key>
+                  <integer>1</integer>
+                </dict>
+              </dict>
+            </array>
+          </dict>
+        </array>
+      </dict>
+      <dict>
+        <key>name</key>
+        <string>rs232_patch_box</string>
+        <key>slots</key>
+        <array>
+          <dict>
+            <key>name</key>
+            <string>:dce</string>
+            <key>options</key>
+            <array>
+              <dict>
+                <key>value</key>
+                <string></string>
+                <key>description</key>
+                <string>—None—</string>
+                <key>default</key>
+                <true/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>ie15</string>
+                <key>description</key>
+                <string>IE15 Terminal</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>scorpion</string>
+                <key>description</key>
+                <string>Micro-Robotics Scorpion Intelligent Controller</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>pty</string>
+                <key>description</key>
+                <string>Pseudo Terminal</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>rs_printer</string>
+                <key>description</key>
+                <string>Radio Shack Serial Printer</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>loopback</string>
+                <key>description</key>
+                <string>RS-232 Loopback</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>dec_loopback</string>
+                <key>description</key>
+                <string>RS-232 Loopback (DEC 12-15336-00)</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>null_modem</string>
+                <key>description</key>
+                <string>RS-232 Null Modem</string>
+                <key>default</key>
+                <false/>
+                <key>media</key>
+                <dict>
+                  <key>bitbanger</key>
+                  <integer>1</integer>
+                </dict>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>patch</string>
+                <key>description</key>
+                <string>RS-232 Patch Box</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>rs232_sync_io</string>
+                <key>description</key>
+                <string>RS-232 Synchronous I/O</string>
+                <key>default</key>
+                <false/>
+                <key>media</key>
+                <dict>
+                  <key>bitbanger</key>
+                  <integer>1</integer>
+                </dict>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>keyboard</string>
+                <key>description</key>
+                <string>Serial Keyboard</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>printer</string>
+                <key>description</key>
+                <string>Serial Printer</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>terminal</string>
+                <key>description</key>
+                <string>Serial Terminal</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>sunkbd</string>
+                <key>description</key>
+                <string>Sun Keyboard Adaptor</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>mockingboard</string>
+                <key>description</key>
+                <string>Sweet Micro Systems Mockingboard D</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>swtpc8212</string>
+                <key>description</key>
+                <string>SWTPC8212 Terminal</string>
+                <key>default</key>
+                <false/>
+              </dict>
+            </array>
+          </dict>
+        </array>
+      </dict>
+      <dict>
+        <key>name</key>
+        <string>sunkbd_adaptor</string>
+        <key>slots</key>
+        <array>
+          <dict>
+            <key>name</key>
+            <string>:keyboard</string>
+            <key>options</key>
+            <array>
+              <dict>
+                <key>value</key>
+                <string></string>
+                <key>description</key>
+                <string>—None—</string>
+                <key>default</key>
+                <true/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>type3hle</string>
+                <key>description</key>
+                <string>Sun Type 3 Keyboard (HLE)</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>type4hle</string>
+                <key>description</key>
+                <string>Sun Type 4 Keyboard (HLE)</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>type5gbhle</string>
+                <key>description</key>
+                <string>Sun Type 5 Keyboard (Great Britain - HLE)</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>type5jphle</string>
+                <key>description</key>
+                <string>Sun Type 5 Keyboard (Japan - HLE)</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>type5sehle</string>
+                <key>description</key>
+                <string>Sun Type 5 Keyboard (Sweden - HLE)</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>type5hle</string>
+                <key>description</key>
+                <string>Sun Type 5 Keyboard (U.S.A. - HLE)</string>
+                <key>default</key>
+                <false/>
+              </dict>
+            </array>
+          </dict>
+        </array>
+      </dict>
+    </array>
+    <key>software</key>
+    <array>
+      <string>amiga_workbench.xml</string>
+      <string>amiga_hardware.xml</string>
+      <string>amiga_apps.xml</string>
+      <string>amiga_flop.xml</string>
+      <string>amigaocs_flop.xml</string>
+      <string>amiga_demos.xml</string>
+      <string>amiga_a1000.xml</string>
+    </array>
+  </dict>
+</plist>

Ample/Resources/ace500.plist

@@ -0,0 +1,575 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+  <dict>
+    <key>value</key>
+    <string>ace500</string>
+    <key>description</key>
+    <string>Franklin ACE 500</string>
+    <key>media</key>
+    <dict>
+    </dict>
+    <key>resolution</key>
+    <array>
+      <integer>560</integer>
+      <integer>192</integer>
+    </array>
+    <key>slots</key>
+    <array>
+      <dict>
+        <key>name</key>
+        <string>ramsize</string>
+        <key>description</key>
+        <string>RAM</string>
+        <key>options</key>
+        <array>
+          <dict>
+            <key>intValue</key>
+            <integer>131072</integer>
+            <key>description</key>
+            <string>128K</string>
+            <key>value</key>
+            <string>128K</string>
+            <key>default</key>
+            <true/>
+          </dict>
+        </array>
+      </dict>
+      <dict>
+        <key>name</key>
+        <string>smartport</string>
+        <key>description</key>
+        <string>Disk Drives</string>
+        <key>options</key>
+        <array>
+          <dict>
+            <key>value</key>
+            <string></string>
+            <key>description</key>
+            <string></string>
+            <key>devname</key>
+            <string>smartport</string>
+            <key>default</key>
+            <true/>
+          </dict>
+        </array>
+      </dict>
+      <dict>
+        <key>name</key>
+        <string>gameio</string>
+        <key>description</key>
+        <string>Game I/O</string>
+        <key>options</key>
+        <array>
+          <dict>
+            <key>value</key>
+            <string></string>
+            <key>description</key>
+            <string>—None—</string>
+            <key>default</key>
+            <true/>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>joy</string>
+            <key>description</key>
+            <string>Apple II Analog Joysticks</string>
+            <key>devname</key>
+            <string>a2joy</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>paddles</string>
+            <key>description</key>
+            <string>Apple II Paddles</string>
+            <key>devname</key>
+            <string>a2pdls</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>compeyes</string>
+            <key>description</key>
+            <string>Digital Vision ComputerEyes</string>
+            <key>devname</key>
+            <string>a2ceyes</string>
+            <key>media</key>
+            <dict>
+              <key>picture</key>
+              <integer>1</integer>
+            </dict>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>gizmo</string>
+            <key>description</key>
+            <string>HAL Labs Gizmo</string>
+            <key>devname</key>
+            <string>a2gizmo</string>
+          </dict>
+        </array>
+      </dict>
+      <dict>
+        <key>name</key>
+        <string>modem</string>
+        <key>description</key>
+        <string>Modem</string>
+        <key>options</key>
+        <array>
+          <dict>
+            <key>value</key>
+            <string></string>
+            <key>description</key>
+            <string>—None—</string>
+            <key>default</key>
+            <true/>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>ie15</string>
+            <key>description</key>
+            <string>IE15 Terminal</string>
+            <key>devname</key>
+            <string>ie15_terminal</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>scorpion</string>
+            <key>description</key>
+            <string>Micro-Robotics Scorpion Intelligent Controller</string>
+            <key>devname</key>
+            <string>scorpion_ic</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>nss_tvi</string>
+            <key>description</key>
+            <string>Novag Super System TV Interface</string>
+            <key>devname</key>
+            <string>nss_tvinterface</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>pty</string>
+            <key>description</key>
+            <string>Pseudo Terminal</string>
+            <key>devname</key>
+            <string>pseudo_terminal</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>rs_printer</string>
+            <key>description</key>
+            <string>Radio Shack Serial Printer</string>
+            <key>devname</key>
+            <string>rs_serial_printer</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>loopback</string>
+            <key>description</key>
+            <string>RS-232 Loopback</string>
+            <key>devname</key>
+            <string>rs232_loopback</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>dec_loopback</string>
+            <key>description</key>
+            <string>RS-232 Loopback (DEC 12-15336-00)</string>
+            <key>devname</key>
+            <string>dec_rs232_loopback</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>null_modem</string>
+            <key>description</key>
+            <string>RS-232 Null Modem</string>
+            <key>devname</key>
+            <string>null_modem</string>
+            <key>media</key>
+            <dict>
+              <key>bitbanger</key>
+              <integer>1</integer>
+            </dict>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>patch</string>
+            <key>description</key>
+            <string>RS-232 Patch Box</string>
+            <key>devname</key>
+            <string>rs232_patch_box</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>rs232_sync_io</string>
+            <key>description</key>
+            <string>RS-232 Synchronous I/O</string>
+            <key>devname</key>
+            <string>rs232_sync_io</string>
+            <key>media</key>
+            <dict>
+              <key>bitbanger</key>
+              <integer>1</integer>
+            </dict>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>keyboard</string>
+            <key>description</key>
+            <string>Serial Keyboard</string>
+            <key>devname</key>
+            <string>serial_keyboard</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>printer</string>
+            <key>description</key>
+            <string>Serial Printer</string>
+            <key>devname</key>
+            <string>serial_printer</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>terminal</string>
+            <key>description</key>
+            <string>Serial Terminal</string>
+            <key>devname</key>
+            <string>serial_terminal</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>sunkbd</string>
+            <key>description</key>
+            <string>Sun Keyboard Adaptor</string>
+            <key>devname</key>
+            <string>sunkbd_adaptor</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>mockingboard</string>
+            <key>description</key>
+            <string>Sweet Micro Systems Mockingboard D</string>
+            <key>devname</key>
+            <string>mockingboardd</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>swtpc8212</string>
+            <key>description</key>
+            <string>SWTPC8212 Terminal</string>
+            <key>devname</key>
+            <string>swtpc8212_terminal</string>
+          </dict>
+        </array>
+      </dict>
+    </array>
+    <key>devices</key>
+    <array>
+      <dict>
+        <key>name</key>
+        <string>smartport</string>
+        <key>slots</key>
+        <array>
+          <dict>
+            <key>name</key>
+            <string>sl6:0</string>
+            <key>options</key>
+            <array>
+              <dict>
+                <key>value</key>
+                <string></string>
+                <key>description</key>
+                <string>—None—</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>525</string>
+                <key>description</key>
+                <string>5.25"</string>
+                <key>default</key>
+                <true/>
+                <key>media</key>
+                <dict>
+                  <key>floppy_5_25</key>
+                  <integer>1</integer>
+                </dict>
+              </dict>
+            </array>
+          </dict>
+          <dict>
+            <key>name</key>
+            <string>sl6:1</string>
+            <key>options</key>
+            <array>
+              <dict>
+                <key>value</key>
+                <string></string>
+                <key>description</key>
+                <string>—None—</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>525</string>
+                <key>description</key>
+                <string>5.25"</string>
+                <key>default</key>
+                <true/>
+                <key>media</key>
+                <dict>
+                  <key>floppy_5_25</key>
+                  <integer>1</integer>
+                </dict>
+              </dict>
+            </array>
+          </dict>
+        </array>
+      </dict>
+      <dict>
+        <key>name</key>
+        <string>rs232_patch_box</string>
+        <key>slots</key>
+        <array>
+          <dict>
+            <key>name</key>
+            <string>:dce</string>
+            <key>options</key>
+            <array>
+              <dict>
+                <key>value</key>
+                <string></string>
+                <key>description</key>
+                <string>—None—</string>
+                <key>default</key>
+                <true/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>ie15</string>
+                <key>description</key>
+                <string>IE15 Terminal</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>scorpion</string>
+                <key>description</key>
+                <string>Micro-Robotics Scorpion Intelligent Controller</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>nss_tvi</string>
+                <key>description</key>
+                <string>Novag Super System TV Interface</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>pty</string>
+                <key>description</key>
+                <string>Pseudo Terminal</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>rs_printer</string>
+                <key>description</key>
+                <string>Radio Shack Serial Printer</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>loopback</string>
+                <key>description</key>
+                <string>RS-232 Loopback</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>dec_loopback</string>
+                <key>description</key>
+                <string>RS-232 Loopback (DEC 12-15336-00)</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>null_modem</string>
+                <key>description</key>
+                <string>RS-232 Null Modem</string>
+                <key>default</key>
+                <false/>
+                <key>media</key>
+                <dict>
+                  <key>bitbanger</key>
+                  <integer>1</integer>
+                </dict>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>patch</string>
+                <key>description</key>
+                <string>RS-232 Patch Box</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>rs232_sync_io</string>
+                <key>description</key>
+                <string>RS-232 Synchronous I/O</string>
+                <key>default</key>
+                <false/>
+                <key>media</key>
+                <dict>
+                  <key>bitbanger</key>
+                  <integer>1</integer>
+                </dict>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>keyboard</string>
+                <key>description</key>
+                <string>Serial Keyboard</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>printer</string>
+                <key>description</key>
+                <string>Serial Printer</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>terminal</string>
+                <key>description</key>
+                <string>Serial Terminal</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>sunkbd</string>
+                <key>description</key>
+                <string>Sun Keyboard Adaptor</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>mockingboard</string>
+                <key>description</key>
+                <string>Sweet Micro Systems Mockingboard D</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>swtpc8212</string>
+                <key>description</key>
+                <string>SWTPC8212 Terminal</string>
+                <key>default</key>
+                <false/>
+              </dict>
+            </array>
+          </dict>
+        </array>
+      </dict>
+      <dict>
+        <key>name</key>
+        <string>sunkbd_adaptor</string>
+        <key>slots</key>
+        <array>
+          <dict>
+            <key>name</key>
+            <string>:keyboard</string>
+            <key>options</key>
+            <array>
+              <dict>
+                <key>value</key>
+                <string></string>
+                <key>description</key>
+                <string>—None—</string>
+                <key>default</key>
+                <true/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>type3hle</string>
+                <key>description</key>
+                <string>Sun Type 3 Keyboard (HLE)</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>type4hle</string>
+                <key>description</key>
+                <string>Sun Type 4 Keyboard (HLE)</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>type5gbhle</string>
+                <key>description</key>
+                <string>Sun Type 5 Keyboard (Great Britain - HLE)</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>type5jphle</string>
+                <key>description</key>
+                <string>Sun Type 5 Keyboard (Japan - HLE)</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>type5sehle</string>
+                <key>description</key>
+                <string>Sun Type 5 Keyboard (Sweden - HLE)</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>type5hle</string>
+                <key>description</key>
+                <string>Sun Type 5 Keyboard (U.S.A. - HLE)</string>
+                <key>default</key>
+                <false/>
+              </dict>
+            </array>
+          </dict>
+        </array>
+      </dict>
+    </array>
+    <key>software</key>
+    <array>
+      <string>apple2_flop_clcracked.xml</string>
+      <dict>
+        <key>name</key>
+        <string>apple2_flop_orig.xml</string>
+        <key>filter</key>
+        <string>A2C</string>
+      </dict>
+      <string>apple2_flop_misc.xml</string>
+    </array>
+  </dict>
+</plist>

Ample/Resources/agat7.plist

@@ -14,7 +14,7 @@
     <key>resolution</key>
     <array>
       <integer>512</integer>
-      <integer>512</integer>
+      <integer>256</integer>
     </array>
     <key>slots</key>
     <array>
@@ -37,6 +37,41 @@
           </dict>
         </array>
       </dict>
+      <dict>
+        <key>name</key>
+        <string>bios</string>
+        <key>description</key>
+        <string>ROM</string>
+        <key>options</key>
+        <array>
+          <dict>
+            <key>value</key>
+            <string></string>
+            <key>description</key>
+            <string>—Default—</string>
+            <key>default</key>
+            <true/>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>v1</string>
+            <key>description</key>
+            <string>Version 1</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>v2</string>
+            <key>description</key>
+            <string>Version 2</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>debug</string>
+            <key>description</key>
+            <string>Debug</string>
+          </dict>
+        </array>
+      </dict>
       <dict>
         <key>name</key>
         <string>sl2</string>
@@ -56,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>
@@ -64,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>
@@ -72,14 +107,9 @@
             <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>
-            <key>media</key>
-            <dict>
-              <key>floppy_5_25</key>
-              <integer>2</integer>
-            </dict>
           </dict>
           <dict>
             <key>value</key>
@@ -128,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>
@@ -136,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>
@@ -144,16 +174,11 @@
             <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>
             <string>agat7_flop</string>
-            <key>media</key>
-            <dict>
-              <key>floppy_5_25</key>
-              <integer>2</integer>
-            </dict>
           </dict>
           <dict>
             <key>value</key>
@@ -200,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>
@@ -208,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>
@@ -216,14 +241,9 @@
             <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>
-            <key>media</key>
-            <dict>
-              <key>floppy_5_25</key>
-              <integer>2</integer>
-            </dict>
           </dict>
           <dict>
             <key>value</key>
@@ -272,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>
@@ -280,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>
@@ -288,14 +308,9 @@
             <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>
-            <key>media</key>
-            <dict>
-              <key>floppy_5_25</key>
-              <integer>2</integer>
-            </dict>
           </dict>
           <dict>
             <key>value</key>
@@ -342,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>
@@ -350,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>
@@ -358,14 +373,9 @@
             <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>
-            <key>media</key>
-            <dict>
-              <key>floppy_5_25</key>
-              <integer>2</integer>
-            </dict>
           </dict>
           <dict>
             <key>value</key>
@@ -448,6 +458,14 @@
                 <key>default</key>
                 <false/>
               </dict>
+              <dict>
+                <key>value</key>
+                <string>digiblst</string>
+                <key>description</key>
+                <string>Digiblaster (DIY)</string>
+                <key>default</key>
+                <false/>
+              </dict>
               <dict>
                 <key>value</key>
                 <string>ap2000</string>
@@ -476,7 +494,7 @@
                 <key>value</key>
                 <string>lx810l</string>
                 <key>description</key>
-                <string>Espon LX-810L</string>
+                <string>Epson LX-810L</string>
                 <key>default</key>
                 <false/>
               </dict>
@@ -496,6 +514,14 @@
                 <key>default</key>
                 <false/>
               </dict>
+              <dict>
+                <key>value</key>
+                <string>nlq401</string>
+                <key>description</key>
+                <string>Schneider NLQ 401 Matrix Printer</string>
+                <key>default</key>
+                <false/>
+              </dict>
               <dict>
                 <key>value</key>
                 <string>chessmec</string>
@@ -516,6 +542,69 @@
           </dict>
         </array>
       </dict>
+      <dict>
+        <key>name</key>
+        <string>agat7_flop</string>
+        <key>slots</key>
+        <array>
+          <dict>
+            <key>name</key>
+            <string>:0</string>
+            <key>options</key>
+            <array>
+              <dict>
+                <key>value</key>
+                <string></string>
+                <key>description</key>
+                <string>—None—</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>525</string>
+                <key>description</key>
+                <string>5.25"</string>
+                <key>default</key>
+                <true/>
+                <key>media</key>
+                <dict>
+                  <key>floppy_5_25</key>
+                  <integer>1</integer>
+                </dict>
+              </dict>
+            </array>
+          </dict>
+          <dict>
+            <key>name</key>
+            <string>:1</string>
+            <key>options</key>
+            <array>
+              <dict>
+                <key>value</key>
+                <string></string>
+                <key>description</key>
+                <string>—None—</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>525</string>
+                <key>description</key>
+                <string>5.25"</string>
+                <key>default</key>
+                <true/>
+                <key>media</key>
+                <dict>
+                  <key>floppy_5_25</key>
+                  <integer>1</integer>
+                </dict>
+              </dict>
+            </array>
+          </dict>
+        </array>
+      </dict>
       <dict>
         <key>name</key>
         <string>agat_fdc</string>

Ample/Resources/agat9.plist

@@ -14,7 +14,7 @@
     <key>resolution</key>
     <array>
       <integer>512</integer>
-      <integer>512</integer>
+      <integer>256</integer>
     </array>
     <key>slots</key>
     <array>
@@ -37,6 +37,35 @@
           </dict>
         </array>
       </dict>
+      <dict>
+        <key>name</key>
+        <string>bios</string>
+        <key>description</key>
+        <string>ROM</string>
+        <key>options</key>
+        <array>
+          <dict>
+            <key>value</key>
+            <string></string>
+            <key>description</key>
+            <string>—Default—</string>
+            <key>default</key>
+            <true/>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>v1</string>
+            <key>description</key>
+            <string>Version 1</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>v2</string>
+            <key>description</key>
+            <string>Version 2</string>
+          </dict>
+        </array>
+      </dict>
       <dict>
         <key>name</key>
         <string>sl1</string>
@@ -56,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>
@@ -64,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>
@@ -80,27 +109,17 @@
             <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>
-            <key>media</key>
-            <dict>
-              <key>floppy_5_25</key>
-              <integer>2</integer>
-            </dict>
           </dict>
           <dict>
             <key>value</key>
-            <string>diskii</string>
+            <string>diskiing</string>
             <key>description</key>
-            <string>Apple Disk II controller</string>
+            <string>Apple Disk II NG Controller (16-sector)</string>
             <key>devname</key>
-            <string>a2diskii</string>
-            <key>media</key>
-            <dict>
-              <key>floppy_5_25</key>
-              <integer>2</integer>
-            </dict>
+            <string>a2diskiing</string>
           </dict>
           <dict>
             <key>value</key>
@@ -131,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>
@@ -139,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>
@@ -155,27 +174,17 @@
             <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>
-            <key>media</key>
-            <dict>
-              <key>floppy_5_25</key>
-              <integer>2</integer>
-            </dict>
           </dict>
           <dict>
             <key>value</key>
-            <string>diskii</string>
+            <string>diskiing</string>
             <key>description</key>
-            <string>Apple Disk II controller</string>
+            <string>Apple Disk II NG Controller (16-sector)</string>
             <key>devname</key>
-            <string>a2diskii</string>
-            <key>media</key>
-            <dict>
-              <key>floppy_5_25</key>
-              <integer>2</integer>
-            </dict>
+            <string>a2diskiing</string>
           </dict>
           <dict>
             <key>value</key>
@@ -206,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>
@@ -214,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>
@@ -230,27 +239,17 @@
             <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>
-            <key>media</key>
-            <dict>
-              <key>floppy_5_25</key>
-              <integer>2</integer>
-            </dict>
           </dict>
           <dict>
             <key>value</key>
-            <string>diskii</string>
+            <string>diskiing</string>
             <key>description</key>
-            <string>Apple Disk II controller</string>
+            <string>Apple Disk II NG Controller (16-sector)</string>
             <key>devname</key>
-            <string>a2diskii</string>
-            <key>media</key>
-            <dict>
-              <key>floppy_5_25</key>
-              <integer>2</integer>
-            </dict>
+            <string>a2diskiing</string>
           </dict>
           <dict>
             <key>value</key>
@@ -281,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>
@@ -289,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>
@@ -305,27 +304,17 @@
             <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>
-            <key>media</key>
-            <dict>
-              <key>floppy_5_25</key>
-              <integer>2</integer>
-            </dict>
           </dict>
           <dict>
             <key>value</key>
-            <string>diskii</string>
+            <string>diskiing</string>
             <key>description</key>
-            <string>Apple Disk II controller</string>
+            <string>Apple Disk II NG Controller (16-sector)</string>
             <key>devname</key>
-            <string>a2diskii</string>
-            <key>media</key>
-            <dict>
-              <key>floppy_5_25</key>
-              <integer>2</integer>
-            </dict>
+            <string>a2diskiing</string>
           </dict>
           <dict>
             <key>value</key>
@@ -356,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>
@@ -364,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>
@@ -382,27 +371,17 @@
             <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>
-            <key>media</key>
-            <dict>
-              <key>floppy_5_25</key>
-              <integer>2</integer>
-            </dict>
           </dict>
           <dict>
             <key>value</key>
-            <string>diskii</string>
+            <string>diskiing</string>
             <key>description</key>
-            <string>Apple Disk II controller</string>
+            <string>Apple Disk II NG Controller (16-sector)</string>
             <key>devname</key>
-            <string>a2diskii</string>
-            <key>media</key>
-            <dict>
-              <key>floppy_5_25</key>
-              <integer>2</integer>
-            </dict>
+            <string>a2diskiing</string>
           </dict>
           <dict>
             <key>value</key>
@@ -433,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>
@@ -441,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>
@@ -457,29 +436,19 @@
             <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>
             <string>agat9_flop</string>
-            <key>media</key>
-            <dict>
-              <key>floppy_5_25</key>
-              <integer>2</integer>
-            </dict>
           </dict>
           <dict>
             <key>value</key>
-            <string>diskii</string>
+            <string>diskiing</string>
             <key>description</key>
-            <string>Apple Disk II controller</string>
+            <string>Apple Disk II NG Controller (16-sector)</string>
             <key>devname</key>
-            <string>a2diskii</string>
-            <key>media</key>
-            <dict>
-              <key>floppy_5_25</key>
-              <integer>2</integer>
-            </dict>
+            <string>a2diskiing</string>
           </dict>
           <dict>
             <key>value</key>
@@ -494,6 +463,69 @@
     </array>
     <key>devices</key>
     <array>
+      <dict>
+        <key>name</key>
+        <string>a2diskiing</string>
+        <key>slots</key>
+        <array>
+          <dict>
+            <key>name</key>
+            <string>:0</string>
+            <key>options</key>
+            <array>
+              <dict>
+                <key>value</key>
+                <string></string>
+                <key>description</key>
+                <string>—None—</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>525</string>
+                <key>description</key>
+                <string>5.25"</string>
+                <key>default</key>
+                <true/>
+                <key>media</key>
+                <dict>
+                  <key>floppy_5_25</key>
+                  <integer>1</integer>
+                </dict>
+              </dict>
+            </array>
+          </dict>
+          <dict>
+            <key>name</key>
+            <string>:1</string>
+            <key>options</key>
+            <array>
+              <dict>
+                <key>value</key>
+                <string></string>
+                <key>description</key>
+                <string>—None—</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>525</string>
+                <key>description</key>
+                <string>5.25"</string>
+                <key>default</key>
+                <true/>
+                <key>media</key>
+                <dict>
+                  <key>floppy_5_25</key>
+                  <integer>1</integer>
+                </dict>
+              </dict>
+            </array>
+          </dict>
+        </array>
+      </dict>
       <dict>
         <key>name</key>
         <string>a7ports</string>
@@ -544,6 +576,14 @@
                 <key>default</key>
                 <false/>
               </dict>
+              <dict>
+                <key>value</key>
+                <string>digiblst</string>
+                <key>description</key>
+                <string>Digiblaster (DIY)</string>
+                <key>default</key>
+                <false/>
+              </dict>
               <dict>
                 <key>value</key>
                 <string>ap2000</string>
@@ -572,7 +612,7 @@
                 <key>value</key>
                 <string>lx810l</string>
                 <key>description</key>
-                <string>Espon LX-810L</string>
+                <string>Epson LX-810L</string>
                 <key>default</key>
                 <false/>
               </dict>
@@ -592,6 +632,14 @@
                 <key>default</key>
                 <false/>
               </dict>
+              <dict>
+                <key>value</key>
+                <string>nlq401</string>
+                <key>description</key>
+                <string>Schneider NLQ 401 Matrix Printer</string>
+                <key>default</key>
+                <false/>
+              </dict>
               <dict>
                 <key>value</key>
                 <string>chessmec</string>
@@ -612,6 +660,69 @@
           </dict>
         </array>
       </dict>
+      <dict>
+        <key>name</key>
+        <string>agat9_flop</string>
+        <key>slots</key>
+        <array>
+          <dict>
+            <key>name</key>
+            <string>:0</string>
+            <key>options</key>
+            <array>
+              <dict>
+                <key>value</key>
+                <string></string>
+                <key>description</key>
+                <string>—None—</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>525</string>
+                <key>description</key>
+                <string>5.25"</string>
+                <key>default</key>
+                <true/>
+                <key>media</key>
+                <dict>
+                  <key>floppy_5_25</key>
+                  <integer>1</integer>
+                </dict>
+              </dict>
+            </array>
+          </dict>
+          <dict>
+            <key>name</key>
+            <string>:1</string>
+            <key>options</key>
+            <array>
+              <dict>
+                <key>value</key>
+                <string></string>
+                <key>description</key>
+                <string>—None—</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>525</string>
+                <key>description</key>
+                <string>5.25"</string>
+                <key>default</key>
+                <true/>
+                <key>media</key>
+                <dict>
+                  <key>floppy_5_25</key>
+                  <integer>1</integer>
+                </dict>
+              </dict>
+            </array>
+          </dict>
+        </array>
+      </dict>
       <dict>
         <key>name</key>
         <string>agat_fdc</string>

Ample/Resources/apple1.plist

@@ -12,7 +12,7 @@
     <key>resolution</key>
     <array>
       <integer>560</integer>
-      <integer>384</integer>
+      <integer>192</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>
@@ -232,6 +232,30 @@
                   <integer>1</integer>
                 </dict>
               </dict>
+              <dict>
+                <key>value</key>
+                <string>zip100</string>
+                <key>description</key>
+                <string>Iomega Zip 100MB IDE Drive</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <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>
@@ -273,6 +297,30 @@
                   <integer>1</integer>
                 </dict>
               </dict>
+              <dict>
+                <key>value</key>
+                <string>zip100</string>
+                <key>description</key>
+                <string>Iomega Zip 100MB IDE Drive</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>cr589</string>
+                <key>description</key>
+                <string>Matsushita CR589 CD-ROM Drive</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>xm3301</string>
+                <key>description</key>
+                <string>Toshiba XM-3301 CD-ROM Drive</string>
+                <key>default</key>
+                <false/>
+              </dict>
             </array>
           </dict>
         </array>

Ample/Resources/apple2c.plist

@@ -12,7 +12,7 @@
     <key>resolution</key>
     <array>
       <integer>560</integer>
-      <integer>384</integer>
+      <integer>192</integer>
     </array>
     <key>slots</key>
     <array>
@@ -73,7 +73,7 @@
             <key>value</key>
             <string>joy</string>
             <key>description</key>
-            <string>Apple II analog joysticks</string>
+            <string>Apple II Analog Joysticks</string>
             <key>devname</key>
             <string>a2joy</string>
           </dict>
@@ -81,7 +81,7 @@
             <key>value</key>
             <string>paddles</string>
             <key>description</key>
-            <string>Apple II paddles</string>
+            <string>Apple II Paddles</string>
             <key>devname</key>
             <string>a2pdls</string>
           </dict>
@@ -92,6 +92,11 @@
             <string>Digital Vision ComputerEyes</string>
             <key>devname</key>
             <string>a2ceyes</string>
+            <key>media</key>
+            <dict>
+              <key>picture</key>
+              <integer>1</integer>
+            </dict>
           </dict>
           <dict>
             <key>value</key>
@@ -126,11 +131,27 @@
             <key>devname</key>
             <string>ie15_terminal</string>
           </dict>
+          <dict>
+            <key>value</key>
+            <string>scorpion</string>
+            <key>description</key>
+            <string>Micro-Robotics Scorpion Intelligent Controller</string>
+            <key>devname</key>
+            <string>scorpion_ic</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>nss_tvi</string>
+            <key>description</key>
+            <string>Novag Super System TV Interface</string>
+            <key>devname</key>
+            <string>nss_tvinterface</string>
+          </dict>
           <dict>
             <key>value</key>
             <string>pty</string>
             <key>description</key>
-            <string>Pseudo terminal</string>
+            <string>Pseudo Terminal</string>
             <key>devname</key>
             <string>pseudo_terminal</string>
           </dict>
@@ -146,7 +167,7 @@
             <key>value</key>
             <string>loopback</string>
             <key>description</key>
-            <string>RS232 Loopback</string>
+            <string>RS-232 Loopback</string>
             <key>devname</key>
             <string>rs232_loopback</string>
           </dict>
@@ -154,7 +175,7 @@
             <key>value</key>
             <string>dec_loopback</string>
             <key>description</key>
-            <string>RS232 Loopback (DEC 12-15336-00)</string>
+            <string>RS-232 Loopback (DEC 12-15336-00)</string>
             <key>devname</key>
             <string>dec_rs232_loopback</string>
           </dict>
@@ -162,7 +183,7 @@
             <key>value</key>
             <string>null_modem</string>
             <key>description</key>
-            <string>RS232 Null Modem</string>
+            <string>RS-232 Null Modem</string>
             <key>devname</key>
             <string>null_modem</string>
             <key>media</key>
@@ -171,11 +192,19 @@
               <integer>1</integer>
             </dict>
           </dict>
+          <dict>
+            <key>value</key>
+            <string>patch</string>
+            <key>description</key>
+            <string>RS-232 Patch Box</string>
+            <key>devname</key>
+            <string>rs232_patch_box</string>
+          </dict>
           <dict>
             <key>value</key>
             <string>rs232_sync_io</string>
             <key>description</key>
-            <string>RS232 Synchronous I/O</string>
+            <string>RS-232 Synchronous I/O</string>
             <key>devname</key>
             <string>rs232_sync_io</string>
             <key>media</key>
@@ -257,11 +286,27 @@
             <key>devname</key>
             <string>ie15_terminal</string>
           </dict>
+          <dict>
+            <key>value</key>
+            <string>scorpion</string>
+            <key>description</key>
+            <string>Micro-Robotics Scorpion Intelligent Controller</string>
+            <key>devname</key>
+            <string>scorpion_ic</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>nss_tvi</string>
+            <key>description</key>
+            <string>Novag Super System TV Interface</string>
+            <key>devname</key>
+            <string>nss_tvinterface</string>
+          </dict>
           <dict>
             <key>value</key>
             <string>pty</string>
             <key>description</key>
-            <string>Pseudo terminal</string>
+            <string>Pseudo Terminal</string>
             <key>devname</key>
             <string>pseudo_terminal</string>
           </dict>
@@ -277,7 +322,7 @@
             <key>value</key>
             <string>loopback</string>
             <key>description</key>
-            <string>RS232 Loopback</string>
+            <string>RS-232 Loopback</string>
             <key>devname</key>
             <string>rs232_loopback</string>
           </dict>
@@ -285,7 +330,7 @@
             <key>value</key>
             <string>dec_loopback</string>
             <key>description</key>
-            <string>RS232 Loopback (DEC 12-15336-00)</string>
+            <string>RS-232 Loopback (DEC 12-15336-00)</string>
             <key>devname</key>
             <string>dec_rs232_loopback</string>
           </dict>
@@ -293,7 +338,7 @@
             <key>value</key>
             <string>null_modem</string>
             <key>description</key>
-            <string>RS232 Null Modem</string>
+            <string>RS-232 Null Modem</string>
             <key>devname</key>
             <string>null_modem</string>
             <key>media</key>
@@ -302,11 +347,19 @@
               <integer>1</integer>
             </dict>
           </dict>
+          <dict>
+            <key>value</key>
+            <string>patch</string>
+            <key>description</key>
+            <string>RS-232 Patch Box</string>
+            <key>devname</key>
+            <string>rs232_patch_box</string>
+          </dict>
           <dict>
             <key>value</key>
             <string>rs232_sync_io</string>
             <key>description</key>
-            <string>RS232 Synchronous I/O</string>
+            <string>RS-232 Synchronous I/O</string>
             <key>devname</key>
             <string>rs232_sync_io</string>
             <key>media</key>
@@ -431,6 +484,166 @@
           </dict>
         </array>
       </dict>
+      <dict>
+        <key>name</key>
+        <string>rs232_patch_box</string>
+        <key>slots</key>
+        <array>
+          <dict>
+            <key>name</key>
+            <string>:dce</string>
+            <key>options</key>
+            <array>
+              <dict>
+                <key>value</key>
+                <string></string>
+                <key>description</key>
+                <string>—None—</string>
+                <key>default</key>
+                <true/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>ie15</string>
+                <key>description</key>
+                <string>IE15 Terminal</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>scorpion</string>
+                <key>description</key>
+                <string>Micro-Robotics Scorpion Intelligent Controller</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>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>sunkbd</string>
+                <key>description</key>
+                <string>Sun Keyboard Adaptor</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>mockingboard</string>
+                <key>description</key>
+                <string>Sweet Micro Systems Mockingboard D</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>swtpc8212</string>
+                <key>description</key>
+                <string>SWTPC8212 Terminal</string>
+                <key>default</key>
+                <false/>
+              </dict>
+            </array>
+          </dict>
+        </array>
+      </dict>
       <dict>
         <key>name</key>
         <string>sunkbd_adaptor</string>

Ample/Resources/apple2cp.plist

@@ -8,15 +8,11 @@
     <string>Apple //c Plus</string>
     <key>media</key>
     <dict>
-      <key>floppy_5_25</key>
-      <integer>2</integer>
-      <key>floppy_3_5</key>
-      <integer>2</integer>
     </dict>
     <key>resolution</key>
     <array>
       <integer>560</integer>
-      <integer>384</integer>
+      <integer>192</integer>
     </array>
     <key>slots</key>
     <array>
@@ -79,6 +75,25 @@
           </dict>
         </array>
       </dict>
+      <dict>
+        <key>name</key>
+        <string>smartport</string>
+        <key>description</key>
+        <string>Disk Drives</string>
+        <key>options</key>
+        <array>
+          <dict>
+            <key>value</key>
+            <string></string>
+            <key>description</key>
+            <string></string>
+            <key>devname</key>
+            <string>smartport</string>
+            <key>default</key>
+            <true/>
+          </dict>
+        </array>
+      </dict>
       <dict>
         <key>name</key>
         <string>gameio</string>
@@ -98,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>
@@ -106,7 +121,7 @@
             <key>value</key>
             <string>paddles</string>
             <key>description</key>
-            <string>Apple II paddles</string>
+            <string>Apple II Paddles</string>
             <key>devname</key>
             <string>a2pdls</string>
           </dict>
@@ -117,6 +132,11 @@
             <string>Digital Vision ComputerEyes</string>
             <key>devname</key>
             <string>a2ceyes</string>
+            <key>media</key>
+            <dict>
+              <key>picture</key>
+              <integer>1</integer>
+            </dict>
           </dict>
           <dict>
             <key>value</key>
@@ -151,11 +171,27 @@
             <key>devname</key>
             <string>ie15_terminal</string>
           </dict>
+          <dict>
+            <key>value</key>
+            <string>scorpion</string>
+            <key>description</key>
+            <string>Micro-Robotics Scorpion Intelligent Controller</string>
+            <key>devname</key>
+            <string>scorpion_ic</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>nss_tvi</string>
+            <key>description</key>
+            <string>Novag Super System TV Interface</string>
+            <key>devname</key>
+            <string>nss_tvinterface</string>
+          </dict>
           <dict>
             <key>value</key>
             <string>pty</string>
             <key>description</key>
-            <string>Pseudo terminal</string>
+            <string>Pseudo Terminal</string>
             <key>devname</key>
             <string>pseudo_terminal</string>
           </dict>
@@ -171,7 +207,7 @@
             <key>value</key>
             <string>loopback</string>
             <key>description</key>
-            <string>RS232 Loopback</string>
+            <string>RS-232 Loopback</string>
             <key>devname</key>
             <string>rs232_loopback</string>
           </dict>
@@ -179,7 +215,7 @@
             <key>value</key>
             <string>dec_loopback</string>
             <key>description</key>
-            <string>RS232 Loopback (DEC 12-15336-00)</string>
+            <string>RS-232 Loopback (DEC 12-15336-00)</string>
             <key>devname</key>
             <string>dec_rs232_loopback</string>
           </dict>
@@ -187,7 +223,7 @@
             <key>value</key>
             <string>null_modem</string>
             <key>description</key>
-            <string>RS232 Null Modem</string>
+            <string>RS-232 Null Modem</string>
             <key>devname</key>
             <string>null_modem</string>
             <key>media</key>
@@ -196,11 +232,19 @@
               <integer>1</integer>
             </dict>
           </dict>
+          <dict>
+            <key>value</key>
+            <string>patch</string>
+            <key>description</key>
+            <string>RS-232 Patch Box</string>
+            <key>devname</key>
+            <string>rs232_patch_box</string>
+          </dict>
           <dict>
             <key>value</key>
             <string>rs232_sync_io</string>
             <key>description</key>
-            <string>RS232 Synchronous I/O</string>
+            <string>RS-232 Synchronous I/O</string>
             <key>devname</key>
             <string>rs232_sync_io</string>
             <key>media</key>
@@ -282,11 +326,27 @@
             <key>devname</key>
             <string>ie15_terminal</string>
           </dict>
+          <dict>
+            <key>value</key>
+            <string>scorpion</string>
+            <key>description</key>
+            <string>Micro-Robotics Scorpion Intelligent Controller</string>
+            <key>devname</key>
+            <string>scorpion_ic</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>nss_tvi</string>
+            <key>description</key>
+            <string>Novag Super System TV Interface</string>
+            <key>devname</key>
+            <string>nss_tvinterface</string>
+          </dict>
           <dict>
             <key>value</key>
             <string>pty</string>
             <key>description</key>
-            <string>Pseudo terminal</string>
+            <string>Pseudo Terminal</string>
             <key>devname</key>
             <string>pseudo_terminal</string>
           </dict>
@@ -302,7 +362,7 @@
             <key>value</key>
             <string>loopback</string>
             <key>description</key>
-            <string>RS232 Loopback</string>
+            <string>RS-232 Loopback</string>
             <key>devname</key>
             <string>rs232_loopback</string>
           </dict>
@@ -310,7 +370,7 @@
             <key>value</key>
             <string>dec_loopback</string>
             <key>description</key>
-            <string>RS232 Loopback (DEC 12-15336-00)</string>
+            <string>RS-232 Loopback (DEC 12-15336-00)</string>
             <key>devname</key>
             <string>dec_rs232_loopback</string>
           </dict>
@@ -318,7 +378,7 @@
             <key>value</key>
             <string>null_modem</string>
             <key>description</key>
-            <string>RS232 Null Modem</string>
+            <string>RS-232 Null Modem</string>
             <key>devname</key>
             <string>null_modem</string>
             <key>media</key>
@@ -327,11 +387,19 @@
               <integer>1</integer>
             </dict>
           </dict>
+          <dict>
+            <key>value</key>
+            <string>patch</string>
+            <key>description</key>
+            <string>RS-232 Patch Box</string>
+            <key>devname</key>
+            <string>rs232_patch_box</string>
+          </dict>
           <dict>
             <key>value</key>
             <string>rs232_sync_io</string>
             <key>description</key>
-            <string>RS232 Synchronous I/O</string>
+            <string>RS-232 Synchronous I/O</string>
             <key>devname</key>
             <string>rs232_sync_io</string>
             <key>media</key>
@@ -393,6 +461,337 @@
     </array>
     <key>devices</key>
     <array>
+      <dict>
+        <key>name</key>
+        <string>smartport</string>
+        <key>slots</key>
+        <array>
+          <dict>
+            <key>name</key>
+            <string>fdc:0</string>
+            <key>options</key>
+            <array>
+              <dict>
+                <key>value</key>
+                <string></string>
+                <key>description</key>
+                <string>—None—</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>525</string>
+                <key>description</key>
+                <string>5.25"</string>
+                <key>default</key>
+                <true/>
+                <key>media</key>
+                <dict>
+                  <key>floppy_5_25</key>
+                  <integer>1</integer>
+                </dict>
+              </dict>
+            </array>
+          </dict>
+          <dict>
+            <key>name</key>
+            <string>fdc:1</string>
+            <key>options</key>
+            <array>
+              <dict>
+                <key>value</key>
+                <string></string>
+                <key>description</key>
+                <string>—None—</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>525</string>
+                <key>description</key>
+                <string>5.25"</string>
+                <key>default</key>
+                <true/>
+                <key>media</key>
+                <dict>
+                  <key>floppy_5_25</key>
+                  <integer>1</integer>
+                </dict>
+              </dict>
+            </array>
+          </dict>
+          <dict>
+            <key>name</key>
+            <string>fdc:2</string>
+            <key>options</key>
+            <array>
+              <dict>
+                <key>value</key>
+                <string></string>
+                <key>description</key>
+                <string>—None—</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>35dd</string>
+                <key>description</key>
+                <string>3.5" DD</string>
+                <key>default</key>
+                <true/>
+                <key>media</key>
+                <dict>
+                  <key>floppy_3_5</key>
+                  <integer>1</integer>
+                </dict>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>35hd</string>
+                <key>description</key>
+                <string>3.5" HD</string>
+                <key>default</key>
+                <false/>
+                <key>media</key>
+                <dict>
+                  <key>floppy_3_5</key>
+                  <integer>1</integer>
+                </dict>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>35sd</string>
+                <key>description</key>
+                <string>3.5" SD</string>
+                <key>default</key>
+                <false/>
+                <key>media</key>
+                <dict>
+                  <key>floppy_3_5</key>
+                  <integer>1</integer>
+                </dict>
+              </dict>
+            </array>
+          </dict>
+          <dict>
+            <key>name</key>
+            <string>fdc:3</string>
+            <key>options</key>
+            <array>
+              <dict>
+                <key>value</key>
+                <string></string>
+                <key>description</key>
+                <string>—None—</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>35dd</string>
+                <key>description</key>
+                <string>3.5" DD</string>
+                <key>default</key>
+                <true/>
+                <key>media</key>
+                <dict>
+                  <key>floppy_3_5</key>
+                  <integer>1</integer>
+                </dict>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>35hd</string>
+                <key>description</key>
+                <string>3.5" HD</string>
+                <key>default</key>
+                <false/>
+                <key>media</key>
+                <dict>
+                  <key>floppy_3_5</key>
+                  <integer>1</integer>
+                </dict>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>35sd</string>
+                <key>description</key>
+                <string>3.5" SD</string>
+                <key>default</key>
+                <false/>
+                <key>media</key>
+                <dict>
+                  <key>floppy_3_5</key>
+                  <integer>1</integer>
+                </dict>
+              </dict>
+            </array>
+          </dict>
+        </array>
+      </dict>
+      <dict>
+        <key>name</key>
+        <string>rs232_patch_box</string>
+        <key>slots</key>
+        <array>
+          <dict>
+            <key>name</key>
+            <string>:dce</string>
+            <key>options</key>
+            <array>
+              <dict>
+                <key>value</key>
+                <string></string>
+                <key>description</key>
+                <string>—None—</string>
+                <key>default</key>
+                <true/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>ie15</string>
+                <key>description</key>
+                <string>IE15 Terminal</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>scorpion</string>
+                <key>description</key>
+                <string>Micro-Robotics Scorpion Intelligent Controller</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>nss_tvi</string>
+                <key>description</key>
+                <string>Novag Super System TV Interface</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>pty</string>
+                <key>description</key>
+                <string>Pseudo Terminal</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>rs_printer</string>
+                <key>description</key>
+                <string>Radio Shack Serial Printer</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>loopback</string>
+                <key>description</key>
+                <string>RS-232 Loopback</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>dec_loopback</string>
+                <key>description</key>
+                <string>RS-232 Loopback (DEC 12-15336-00)</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>null_modem</string>
+                <key>description</key>
+                <string>RS-232 Null Modem</string>
+                <key>default</key>
+                <false/>
+                <key>media</key>
+                <dict>
+                  <key>bitbanger</key>
+                  <integer>1</integer>
+                </dict>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>patch</string>
+                <key>description</key>
+                <string>RS-232 Patch Box</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>rs232_sync_io</string>
+                <key>description</key>
+                <string>RS-232 Synchronous I/O</string>
+                <key>default</key>
+                <false/>
+                <key>media</key>
+                <dict>
+                  <key>bitbanger</key>
+                  <integer>1</integer>
+                </dict>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>keyboard</string>
+                <key>description</key>
+                <string>Serial Keyboard</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>printer</string>
+                <key>description</key>
+                <string>Serial Printer</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>terminal</string>
+                <key>description</key>
+                <string>Serial Terminal</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>sunkbd</string>
+                <key>description</key>
+                <string>Sun Keyboard Adaptor</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>mockingboard</string>
+                <key>description</key>
+                <string>Sweet Micro Systems Mockingboard D</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>swtpc8212</string>
+                <key>description</key>
+                <string>SWTPC8212 Terminal</string>
+                <key>default</key>
+                <false/>
+              </dict>
+            </array>
+          </dict>
+        </array>
+      </dict>
       <dict>
         <key>name</key>
         <string>sunkbd_adaptor</string>

Ample/Resources/apple3.plist

@@ -12,7 +12,7 @@
     <key>resolution</key>
     <array>
       <integer>560</integer>
-      <integer>384</integer>
+      <integer>192</integer>
     </array>
     <key>slots</key>
     <array>
@@ -55,6 +55,35 @@
           </dict>
         </array>
       </dict>
+      <dict>
+        <key>name</key>
+        <string>bios</string>
+        <key>description</key>
+        <string>ROM</string>
+        <key>options</key>
+        <array>
+          <dict>
+            <key>value</key>
+            <string></string>
+            <key>description</key>
+            <string>—Default—</string>
+            <key>default</key>
+            <true/>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>original</string>
+            <key>description</key>
+            <string>Apple /// boot ROM</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>soshd</string>
+            <key>description</key>
+            <string>Rob Justice SOSHDBOOT</string>
+          </dict>
+        </array>
+      </dict>
       <dict>
         <key>name</key>
         <string>smartport</string>
@@ -101,7 +130,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 Firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -113,6 +142,22 @@
             <key>disabled</key>
             <true/>
           </dict>
+          <dict>
+            <key>value</key>
+            <string>grafex</string>
+            <key>description</key>
+            <string>Grafex-32</string>
+            <key>devname</key>
+            <string>a2grafex</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>softcard3</string>
+            <key>description</key>
+            <string>Microsoft SoftCard ///</string>
+            <key>devname</key>
+            <string>softcard3</string>
+          </dict>
           <dict>
             <key>value</key>
             <string>focusdrive</string>
@@ -129,6 +174,14 @@
             <key>devname</key>
             <string>a2aplcrd</string>
           </dict>
+          <dict>
+            <key>value</key>
+            <string>mockingboard</string>
+            <key>description</key>
+            <string>Sweet Micro Systems Mockingboard Sound/Speech I</string>
+            <key>devname</key>
+            <string>a2mockbd</string>
+          </dict>
           <dict>
             <key>value</key>
             <string>thclock</string>
@@ -137,6 +190,14 @@
             <key>devname</key>
             <string>a2thunpl</string>
           </dict>
+          <dict>
+            <key>value</key>
+            <string>titan3plus2</string>
+            <key>description</key>
+            <string>Titan /// Plus //</string>
+            <key>devname</key>
+            <string>titan3p2</string>
+          </dict>
         </array>
       </dict>
       <dict>
@@ -166,7 +227,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 Firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -178,6 +239,22 @@
             <key>disabled</key>
             <true/>
           </dict>
+          <dict>
+            <key>value</key>
+            <string>grafex</string>
+            <key>description</key>
+            <string>Grafex-32</string>
+            <key>devname</key>
+            <string>a2grafex</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>softcard3</string>
+            <key>description</key>
+            <string>Microsoft SoftCard ///</string>
+            <key>devname</key>
+            <string>softcard3</string>
+          </dict>
           <dict>
             <key>value</key>
             <string>focusdrive</string>
@@ -194,6 +271,14 @@
             <key>devname</key>
             <string>a2aplcrd</string>
           </dict>
+          <dict>
+            <key>value</key>
+            <string>mockingboard</string>
+            <key>description</key>
+            <string>Sweet Micro Systems Mockingboard Sound/Speech I</string>
+            <key>devname</key>
+            <string>a2mockbd</string>
+          </dict>
           <dict>
             <key>value</key>
             <string>thclock</string>
@@ -202,6 +287,14 @@
             <key>devname</key>
             <string>a2thunpl</string>
           </dict>
+          <dict>
+            <key>value</key>
+            <string>titan3plus2</string>
+            <key>description</key>
+            <string>Titan /// Plus //</string>
+            <key>devname</key>
+            <string>titan3p2</string>
+          </dict>
         </array>
       </dict>
       <dict>
@@ -231,7 +324,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 Firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -243,6 +336,22 @@
             <key>disabled</key>
             <true/>
           </dict>
+          <dict>
+            <key>value</key>
+            <string>grafex</string>
+            <key>description</key>
+            <string>Grafex-32</string>
+            <key>devname</key>
+            <string>a2grafex</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>softcard3</string>
+            <key>description</key>
+            <string>Microsoft SoftCard ///</string>
+            <key>devname</key>
+            <string>softcard3</string>
+          </dict>
           <dict>
             <key>value</key>
             <string>focusdrive</string>
@@ -259,6 +368,14 @@
             <key>devname</key>
             <string>a2aplcrd</string>
           </dict>
+          <dict>
+            <key>value</key>
+            <string>mockingboard</string>
+            <key>description</key>
+            <string>Sweet Micro Systems Mockingboard Sound/Speech I</string>
+            <key>devname</key>
+            <string>a2mockbd</string>
+          </dict>
           <dict>
             <key>value</key>
             <string>thclock</string>
@@ -267,6 +384,14 @@
             <key>devname</key>
             <string>a2thunpl</string>
           </dict>
+          <dict>
+            <key>value</key>
+            <string>titan3plus2</string>
+            <key>description</key>
+            <string>Titan /// Plus //</string>
+            <key>devname</key>
+            <string>titan3p2</string>
+          </dict>
         </array>
       </dict>
       <dict>
@@ -296,7 +421,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 Firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -308,6 +433,22 @@
             <key>disabled</key>
             <true/>
           </dict>
+          <dict>
+            <key>value</key>
+            <string>grafex</string>
+            <key>description</key>
+            <string>Grafex-32</string>
+            <key>devname</key>
+            <string>a2grafex</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>softcard3</string>
+            <key>description</key>
+            <string>Microsoft SoftCard ///</string>
+            <key>devname</key>
+            <string>softcard3</string>
+          </dict>
           <dict>
             <key>value</key>
             <string>focusdrive</string>
@@ -324,6 +465,14 @@
             <key>devname</key>
             <string>a2aplcrd</string>
           </dict>
+          <dict>
+            <key>value</key>
+            <string>mockingboard</string>
+            <key>description</key>
+            <string>Sweet Micro Systems Mockingboard Sound/Speech I</string>
+            <key>devname</key>
+            <string>a2mockbd</string>
+          </dict>
           <dict>
             <key>value</key>
             <string>thclock</string>
@@ -332,13 +481,21 @@
             <key>devname</key>
             <string>a2thunpl</string>
           </dict>
+          <dict>
+            <key>value</key>
+            <string>titan3plus2</string>
+            <key>description</key>
+            <string>Titan /// Plus //</string>
+            <key>devname</key>
+            <string>titan3p2</string>
+          </dict>
         </array>
       </dict>
       <dict>
         <key>name</key>
         <string>rs232</string>
         <key>description</key>
-        <string>RS232</string>
+        <string>Serial</string>
         <key>options</key>
         <array>
           <dict>
@@ -357,11 +514,27 @@
             <key>devname</key>
             <string>ie15_terminal</string>
           </dict>
+          <dict>
+            <key>value</key>
+            <string>scorpion</string>
+            <key>description</key>
+            <string>Micro-Robotics Scorpion Intelligent Controller</string>
+            <key>devname</key>
+            <string>scorpion_ic</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>nss_tvi</string>
+            <key>description</key>
+            <string>Novag Super System TV Interface</string>
+            <key>devname</key>
+            <string>nss_tvinterface</string>
+          </dict>
           <dict>
             <key>value</key>
             <string>pty</string>
             <key>description</key>
-            <string>Pseudo terminal</string>
+            <string>Pseudo Terminal</string>
             <key>devname</key>
             <string>pseudo_terminal</string>
           </dict>
@@ -377,7 +550,7 @@
             <key>value</key>
             <string>loopback</string>
             <key>description</key>
-            <string>RS232 Loopback</string>
+            <string>RS-232 Loopback</string>
             <key>devname</key>
             <string>rs232_loopback</string>
           </dict>
@@ -385,7 +558,7 @@
             <key>value</key>
             <string>dec_loopback</string>
             <key>description</key>
-            <string>RS232 Loopback (DEC 12-15336-00)</string>
+            <string>RS-232 Loopback (DEC 12-15336-00)</string>
             <key>devname</key>
             <string>dec_rs232_loopback</string>
           </dict>
@@ -393,7 +566,7 @@
             <key>value</key>
             <string>null_modem</string>
             <key>description</key>
-            <string>RS232 Null Modem</string>
+            <string>RS-232 Null Modem</string>
             <key>devname</key>
             <string>null_modem</string>
             <key>media</key>
@@ -402,11 +575,19 @@
               <integer>1</integer>
             </dict>
           </dict>
+          <dict>
+            <key>value</key>
+            <string>patch</string>
+            <key>description</key>
+            <string>RS-232 Patch Box</string>
+            <key>devname</key>
+            <string>rs232_patch_box</string>
+          </dict>
           <dict>
             <key>value</key>
             <string>rs232_sync_io</string>
             <key>description</key>
-            <string>RS232 Synchronous I/O</string>
+            <string>RS-232 Synchronous I/O</string>
             <key>devname</key>
             <string>rs232_sync_io</string>
             <key>media</key>
@@ -631,6 +812,30 @@
                   <integer>1</integer>
                 </dict>
               </dict>
+              <dict>
+                <key>value</key>
+                <string>zip100</string>
+                <key>description</key>
+                <string>Iomega Zip 100MB IDE Drive</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <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>
@@ -672,6 +877,30 @@
                   <integer>1</integer>
                 </dict>
               </dict>
+              <dict>
+                <key>value</key>
+                <string>zip100</string>
+                <key>description</key>
+                <string>Iomega Zip 100MB IDE Drive</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <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>
@@ -720,6 +949,30 @@
                   <integer>1</integer>
                 </dict>
               </dict>
+              <dict>
+                <key>value</key>
+                <string>zip100</string>
+                <key>description</key>
+                <string>Iomega Zip 100MB IDE Drive</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <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>
@@ -761,6 +1014,30 @@
                   <integer>1</integer>
                 </dict>
               </dict>
+              <dict>
+                <key>value</key>
+                <string>zip100</string>
+                <key>description</key>
+                <string>Iomega Zip 100MB IDE Drive</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <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>
@@ -770,6 +1047,35 @@
         <string>cmsscsi</string>
         <key>slots</key>
         <array>
+          <dict>
+            <key>name</key>
+            <string>bios</string>
+            <key>description</key>
+            <string>ROM</string>
+            <key>options</key>
+            <array>
+              <dict>
+                <key>value</key>
+                <string></string>
+                <key>description</key>
+                <string>—Default—</string>
+                <key>default</key>
+                <true/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>cms3190</string>
+                <key>description</key>
+                <string>CMS SCSI BIOS dated 3-1-90</string>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>cms871109</string>
+                <key>description</key>
+                <string>CMS SCSI BIOS dated 1987-11-09</string>
+              </dict>
+            </array>
+          </dict>
           <dict>
             <key>name</key>
             <string>:scsibus:0</string>
@@ -783,6 +1089,19 @@
                 <key>default</key>
                 <true/>
               </dict>
+              <dict>
+                <key>value</key>
+                <string>aplcdsc</string>
+                <key>description</key>
+                <string>Apple SCSI CD-ROM</string>
+                <key>default</key>
+                <false/>
+                <key>media</key>
+                <dict>
+                  <key>cdrom</key>
+                  <integer>1</integer>
+                </dict>
+              </dict>
               <dict>
                 <key>value</key>
                 <string>cdrom</string>
@@ -809,6 +1128,14 @@
                   <integer>1</integer>
                 </dict>
               </dict>
+              <dict>
+                <key>value</key>
+                <string>tape</string>
+                <key>description</key>
+                <string>SCSI tape</string>
+                <key>default</key>
+                <false/>
+              </dict>
             </array>
           </dict>
           <dict>
@@ -824,6 +1151,19 @@
                 <key>default</key>
                 <true/>
               </dict>
+              <dict>
+                <key>value</key>
+                <string>aplcdsc</string>
+                <key>description</key>
+                <string>Apple SCSI CD-ROM</string>
+                <key>default</key>
+                <false/>
+                <key>media</key>
+                <dict>
+                  <key>cdrom</key>
+                  <integer>1</integer>
+                </dict>
+              </dict>
               <dict>
                 <key>value</key>
                 <string>cdrom</string>
@@ -850,6 +1190,14 @@
                   <integer>1</integer>
                 </dict>
               </dict>
+              <dict>
+                <key>value</key>
+                <string>tape</string>
+                <key>description</key>
+                <string>SCSI tape</string>
+                <key>default</key>
+                <false/>
+              </dict>
             </array>
           </dict>
           <dict>
@@ -865,6 +1213,19 @@
                 <key>default</key>
                 <true/>
               </dict>
+              <dict>
+                <key>value</key>
+                <string>aplcdsc</string>
+                <key>description</key>
+                <string>Apple SCSI CD-ROM</string>
+                <key>default</key>
+                <false/>
+                <key>media</key>
+                <dict>
+                  <key>cdrom</key>
+                  <integer>1</integer>
+                </dict>
+              </dict>
               <dict>
                 <key>value</key>
                 <string>cdrom</string>
@@ -891,6 +1252,14 @@
                   <integer>1</integer>
                 </dict>
               </dict>
+              <dict>
+                <key>value</key>
+                <string>tape</string>
+                <key>description</key>
+                <string>SCSI tape</string>
+                <key>default</key>
+                <false/>
+              </dict>
             </array>
           </dict>
           <dict>
@@ -906,6 +1275,19 @@
                 <key>default</key>
                 <true/>
               </dict>
+              <dict>
+                <key>value</key>
+                <string>aplcdsc</string>
+                <key>description</key>
+                <string>Apple SCSI CD-ROM</string>
+                <key>default</key>
+                <false/>
+                <key>media</key>
+                <dict>
+                  <key>cdrom</key>
+                  <integer>1</integer>
+                </dict>
+              </dict>
               <dict>
                 <key>value</key>
                 <string>cdrom</string>
@@ -932,6 +1314,14 @@
                   <integer>1</integer>
                 </dict>
               </dict>
+              <dict>
+                <key>value</key>
+                <string>tape</string>
+                <key>description</key>
+                <string>SCSI tape</string>
+                <key>default</key>
+                <false/>
+              </dict>
             </array>
           </dict>
           <dict>
@@ -947,6 +1337,19 @@
                 <key>default</key>
                 <true/>
               </dict>
+              <dict>
+                <key>value</key>
+                <string>aplcdsc</string>
+                <key>description</key>
+                <string>Apple SCSI CD-ROM</string>
+                <key>default</key>
+                <false/>
+                <key>media</key>
+                <dict>
+                  <key>cdrom</key>
+                  <integer>1</integer>
+                </dict>
+              </dict>
               <dict>
                 <key>value</key>
                 <string>cdrom</string>
@@ -973,6 +1376,14 @@
                   <integer>1</integer>
                 </dict>
               </dict>
+              <dict>
+                <key>value</key>
+                <string>tape</string>
+                <key>description</key>
+                <string>SCSI tape</string>
+                <key>default</key>
+                <false/>
+              </dict>
             </array>
           </dict>
           <dict>
@@ -988,6 +1399,19 @@
                 <key>default</key>
                 <true/>
               </dict>
+              <dict>
+                <key>value</key>
+                <string>aplcdsc</string>
+                <key>description</key>
+                <string>Apple SCSI CD-ROM</string>
+                <key>default</key>
+                <false/>
+                <key>media</key>
+                <dict>
+                  <key>cdrom</key>
+                  <integer>1</integer>
+                </dict>
+              </dict>
               <dict>
                 <key>value</key>
                 <string>cdrom</string>
@@ -1014,6 +1438,14 @@
                   <integer>1</integer>
                 </dict>
               </dict>
+              <dict>
+                <key>value</key>
+                <string>tape</string>
+                <key>description</key>
+                <string>SCSI tape</string>
+                <key>default</key>
+                <false/>
+              </dict>
             </array>
           </dict>
           <dict>
@@ -1029,6 +1461,19 @@
                 <key>default</key>
                 <false/>
               </dict>
+              <dict>
+                <key>value</key>
+                <string>aplcdsc</string>
+                <key>description</key>
+                <string>Apple SCSI CD-ROM</string>
+                <key>default</key>
+                <false/>
+                <key>media</key>
+                <dict>
+                  <key>cdrom</key>
+                  <integer>1</integer>
+                </dict>
+              </dict>
               <dict>
                 <key>value</key>
                 <string>cdrom</string>
@@ -1055,6 +1500,174 @@
                   <integer>1</integer>
                 </dict>
               </dict>
+              <dict>
+                <key>value</key>
+                <string>tape</string>
+                <key>description</key>
+                <string>SCSI tape</string>
+                <key>default</key>
+                <false/>
+              </dict>
+            </array>
+          </dict>
+        </array>
+      </dict>
+      <dict>
+        <key>name</key>
+        <string>rs232_patch_box</string>
+        <key>slots</key>
+        <array>
+          <dict>
+            <key>name</key>
+            <string>:dce</string>
+            <key>options</key>
+            <array>
+              <dict>
+                <key>value</key>
+                <string></string>
+                <key>description</key>
+                <string>—None—</string>
+                <key>default</key>
+                <true/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>ie15</string>
+                <key>description</key>
+                <string>IE15 Terminal</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>scorpion</string>
+                <key>description</key>
+                <string>Micro-Robotics Scorpion Intelligent Controller</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>nss_tvi</string>
+                <key>description</key>
+                <string>Novag Super System TV Interface</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>pty</string>
+                <key>description</key>
+                <string>Pseudo Terminal</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>rs_printer</string>
+                <key>description</key>
+                <string>Radio Shack Serial Printer</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>loopback</string>
+                <key>description</key>
+                <string>RS-232 Loopback</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>dec_loopback</string>
+                <key>description</key>
+                <string>RS-232 Loopback (DEC 12-15336-00)</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>null_modem</string>
+                <key>description</key>
+                <string>RS-232 Null Modem</string>
+                <key>default</key>
+                <false/>
+                <key>media</key>
+                <dict>
+                  <key>bitbanger</key>
+                  <integer>1</integer>
+                </dict>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>patch</string>
+                <key>description</key>
+                <string>RS-232 Patch Box</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>rs232_sync_io</string>
+                <key>description</key>
+                <string>RS-232 Synchronous I/O</string>
+                <key>default</key>
+                <false/>
+                <key>media</key>
+                <dict>
+                  <key>bitbanger</key>
+                  <integer>1</integer>
+                </dict>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>keyboard</string>
+                <key>description</key>
+                <string>Serial Keyboard</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>printer</string>
+                <key>description</key>
+                <string>Serial Printer</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>terminal</string>
+                <key>description</key>
+                <string>Serial Terminal</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>sunkbd</string>
+                <key>description</key>
+                <string>Sun Keyboard Adaptor</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>mockingboard</string>
+                <key>description</key>
+                <string>Sweet Micro Systems Mockingboard D</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>swtpc8212</string>
+                <key>description</key>
+                <string>SWTPC8212 Terminal</string>
+                <key>default</key>
+                <false/>
+              </dict>
             </array>
           </dict>
         </array>
@@ -1129,6 +1742,65 @@
           </dict>
         </array>
       </dict>
+      <dict>
+        <key>name</key>
+        <string>titan3p2</string>
+        <key>slots</key>
+        <array>
+          <dict>
+            <key>name</key>
+            <string>:gameio</string>
+            <key>options</key>
+            <array>
+              <dict>
+                <key>value</key>
+                <string></string>
+                <key>description</key>
+                <string>—None—</string>
+                <key>default</key>
+                <true/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>joy</string>
+                <key>description</key>
+                <string>Apple II analog joysticks</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>paddles</string>
+                <key>description</key>
+                <string>Apple II paddles</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>compeyes</string>
+                <key>description</key>
+                <string>Digital Vision ComputerEyes</string>
+                <key>default</key>
+                <false/>
+                <key>media</key>
+                <dict>
+                  <key>picture</key>
+                  <integer>1</integer>
+                </dict>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>gizmo</string>
+                <key>description</key>
+                <string>HAL Labs Gizmo</string>
+                <key>default</key>
+                <false/>
+              </dict>
+            </array>
+          </dict>
+        </array>
+      </dict>
     </array>
     <key>software</key>
     <array>

Ample/Resources/bbca.plist

@@ -0,0 +1,482 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+  <dict>
+    <key>value</key>
+    <string>bbca</string>
+    <key>description</key>
+    <string>BBC Micro Model A</string>
+    <key>media</key>
+    <dict>
+      <key>cass</key>
+      <integer>1</integer>
+      <key>rom</key>
+      <integer>4</integer>
+    </dict>
+    <key>resolution</key>
+    <array>
+      <integer>640</integer>
+      <integer>256</integer>
+    </array>
+    <key>slots</key>
+    <array>
+      <dict>
+        <key>name</key>
+        <string>ramsize</string>
+        <key>description</key>
+        <string>RAM</string>
+        <key>options</key>
+        <array>
+          <dict>
+            <key>intValue</key>
+            <integer>16384</integer>
+            <key>description</key>
+            <string>16K</string>
+            <key>value</key>
+            <string>16K</string>
+            <key>default</key>
+            <true/>
+          </dict>
+          <dict>
+            <key>intValue</key>
+            <integer>32768</integer>
+            <key>description</key>
+            <string>32K</string>
+            <key>value</key>
+            <string>32K</string>
+            <key>default</key>
+            <false/>
+          </dict>
+        </array>
+      </dict>
+      <dict>
+        <key>name</key>
+        <string>bios</string>
+        <key>description</key>
+        <string>ROM</string>
+        <key>options</key>
+        <array>
+          <dict>
+            <key>value</key>
+            <string></string>
+            <key>description</key>
+            <string>—Default—</string>
+            <key>default</key>
+            <true/>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>os12</string>
+            <key>description</key>
+            <string>OS 1.20</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>os10</string>
+            <key>description</key>
+            <string>OS 1.00</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>os09</string>
+            <key>description</key>
+            <string>OS 0.92</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>os01</string>
+            <key>description</key>
+            <string>OS 0.10</string>
+          </dict>
+        </array>
+      </dict>
+      <dict>
+        <key>name</key>
+        <string>rs423</string>
+        <key>description</key>
+        <string>Serial</string>
+        <key>options</key>
+        <array>
+          <dict>
+            <key>value</key>
+            <string></string>
+            <key>description</key>
+            <string>—None—</string>
+            <key>default</key>
+            <true/>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>ie15</string>
+            <key>description</key>
+            <string>IE15 Terminal</string>
+            <key>devname</key>
+            <string>ie15_terminal</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>scorpion</string>
+            <key>description</key>
+            <string>Micro-Robotics Scorpion Intelligent Controller</string>
+            <key>devname</key>
+            <string>scorpion_ic</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>pty</string>
+            <key>description</key>
+            <string>Pseudo Terminal</string>
+            <key>devname</key>
+            <string>pseudo_terminal</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>rs_printer</string>
+            <key>description</key>
+            <string>Radio Shack Serial Printer</string>
+            <key>devname</key>
+            <string>rs_serial_printer</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>loopback</string>
+            <key>description</key>
+            <string>RS-232 Loopback</string>
+            <key>devname</key>
+            <string>rs232_loopback</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>dec_loopback</string>
+            <key>description</key>
+            <string>RS-232 Loopback (DEC 12-15336-00)</string>
+            <key>devname</key>
+            <string>dec_rs232_loopback</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>null_modem</string>
+            <key>description</key>
+            <string>RS-232 Null Modem</string>
+            <key>devname</key>
+            <string>null_modem</string>
+            <key>media</key>
+            <dict>
+              <key>bitbanger</key>
+              <integer>1</integer>
+            </dict>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>patch</string>
+            <key>description</key>
+            <string>RS-232 Patch Box</string>
+            <key>devname</key>
+            <string>rs232_patch_box</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>rs232_sync_io</string>
+            <key>description</key>
+            <string>RS-232 Synchronous I/O</string>
+            <key>devname</key>
+            <string>rs232_sync_io</string>
+            <key>media</key>
+            <dict>
+              <key>bitbanger</key>
+              <integer>1</integer>
+            </dict>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>keyboard</string>
+            <key>description</key>
+            <string>Serial Keyboard</string>
+            <key>devname</key>
+            <string>serial_keyboard</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>printer</string>
+            <key>description</key>
+            <string>Serial Printer</string>
+            <key>devname</key>
+            <string>serial_printer</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>terminal</string>
+            <key>description</key>
+            <string>Serial Terminal</string>
+            <key>devname</key>
+            <string>serial_terminal</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>sunkbd</string>
+            <key>description</key>
+            <string>Sun Keyboard Adaptor</string>
+            <key>devname</key>
+            <string>sunkbd_adaptor</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>mockingboard</string>
+            <key>description</key>
+            <string>Sweet Micro Systems Mockingboard D</string>
+            <key>devname</key>
+            <string>mockingboardd</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>swtpc8212</string>
+            <key>description</key>
+            <string>SWTPC8212 Terminal</string>
+            <key>devname</key>
+            <string>swtpc8212_terminal</string>
+          </dict>
+        </array>
+      </dict>
+    </array>
+    <key>devices</key>
+    <array>
+      <dict>
+        <key>name</key>
+        <string>rs232_patch_box</string>
+        <key>slots</key>
+        <array>
+          <dict>
+            <key>name</key>
+            <string>:dce</string>
+            <key>options</key>
+            <array>
+              <dict>
+                <key>value</key>
+                <string></string>
+                <key>description</key>
+                <string>—None—</string>
+                <key>default</key>
+                <true/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>ie15</string>
+                <key>description</key>
+                <string>IE15 Terminal</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>scorpion</string>
+                <key>description</key>
+                <string>Micro-Robotics Scorpion Intelligent Controller</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>pty</string>
+                <key>description</key>
+                <string>Pseudo Terminal</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>rs_printer</string>
+                <key>description</key>
+                <string>Radio Shack Serial Printer</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>loopback</string>
+                <key>description</key>
+                <string>RS-232 Loopback</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>dec_loopback</string>
+                <key>description</key>
+                <string>RS-232 Loopback (DEC 12-15336-00)</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>null_modem</string>
+                <key>description</key>
+                <string>RS-232 Null Modem</string>
+                <key>default</key>
+                <false/>
+                <key>media</key>
+                <dict>
+                  <key>bitbanger</key>
+                  <integer>1</integer>
+                </dict>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>patch</string>
+                <key>description</key>
+                <string>RS-232 Patch Box</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>rs232_sync_io</string>
+                <key>description</key>
+                <string>RS-232 Synchronous I/O</string>
+                <key>default</key>
+                <false/>
+                <key>media</key>
+                <dict>
+                  <key>bitbanger</key>
+                  <integer>1</integer>
+                </dict>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>keyboard</string>
+                <key>description</key>
+                <string>Serial Keyboard</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>printer</string>
+                <key>description</key>
+                <string>Serial Printer</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>terminal</string>
+                <key>description</key>
+                <string>Serial Terminal</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>sunkbd</string>
+                <key>description</key>
+                <string>Sun Keyboard Adaptor</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>mockingboard</string>
+                <key>description</key>
+                <string>Sweet Micro Systems Mockingboard D</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>swtpc8212</string>
+                <key>description</key>
+                <string>SWTPC8212 Terminal</string>
+                <key>default</key>
+                <false/>
+              </dict>
+            </array>
+          </dict>
+        </array>
+      </dict>
+      <dict>
+        <key>name</key>
+        <string>sunkbd_adaptor</string>
+        <key>slots</key>
+        <array>
+          <dict>
+            <key>name</key>
+            <string>:keyboard</string>
+            <key>options</key>
+            <array>
+              <dict>
+                <key>value</key>
+                <string></string>
+                <key>description</key>
+                <string>—None—</string>
+                <key>default</key>
+                <true/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>type3hle</string>
+                <key>description</key>
+                <string>Sun Type 3 Keyboard (HLE)</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>type4hle</string>
+                <key>description</key>
+                <string>Sun Type 4 Keyboard (HLE)</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>type5gbhle</string>
+                <key>description</key>
+                <string>Sun Type 5 Keyboard (Great Britain - HLE)</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>type5jphle</string>
+                <key>description</key>
+                <string>Sun Type 5 Keyboard (Japan - HLE)</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>type5sehle</string>
+                <key>description</key>
+                <string>Sun Type 5 Keyboard (Sweden - HLE)</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>type5hle</string>
+                <key>description</key>
+                <string>Sun Type 5 Keyboard (U.S.A. - HLE)</string>
+                <key>default</key>
+                <false/>
+              </dict>
+            </array>
+          </dict>
+        </array>
+      </dict>
+    </array>
+    <key>software</key>
+    <array>
+      <dict>
+        <key>name</key>
+        <string>bbc_cass.xml</string>
+        <key>filter</key>
+        <string>A</string>
+      </dict>
+      <dict>
+        <key>name</key>
+        <string>bbc_rom.xml</string>
+        <key>filter</key>
+        <string>B</string>
+      </dict>
+    </array>
+  </dict>
+</plist>