r15 updates

also test code to soft-link mame under a new name.

.github/workflows/xcodebuild.yml

@@ -0,0 +1,15 @@
+name: xcodebuild
+
+on: [push, pull_request]
+
+jobs:
+  build:
+
+    runs-on: macos-latest
+
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: build
+      run: xcodebuild -project "Ample.xcodeproj" -target "Ample Lite" | xcpretty
+

.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.xcodeproj/xcuserdata/kelvin.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -6,6 +6,8 @@
 	<dict>
 		<key>Ample Lite.xcscheme_^#shared#^_</key>
 		<dict>
+			<key>isShown</key>
+			<true/>
 			<key>orderHint</key>
 			<integer>1</integer>
 		</dict>
@@ -24,6 +26,36 @@
 			<key>orderHint</key>
 			<integer>0</integer>
 		</dict>
+		<key>pty_shell.xcscheme_^#shared#^_</key>
+		<dict>
+			<key>orderHint</key>
+			<integer>3</integer>
+		</dict>
+		<key>vmnet_helper.xcscheme_^#shared#^_</key>
+		<dict>
+			<key>isShown</key>
+			<true/>
+			<key>orderHint</key>
+			<integer>2</integer>
+		</dict>
+	</dict>
+	<key>SuppressBuildableAutocreation</key>
+	<dict>
+		<key>B6841BCF251EC913006A5C39</key>
+		<dict>
+			<key>primary</key>
+			<true/>
+		</dict>
+		<key>B6BA257A24E99BE9005FB8FF</key>
+		<dict>
+			<key>primary</key>
+			<true/>
+		</dict>
+		<key>B6E4B5AE24FDE2670094A35C</key>
+		<dict>
+			<key>primary</key>
+			<true/>
+		</dict>
 	</dict>
 </dict>
 </plist>

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

@@ -11,13 +11,42 @@
 
 #import <Cocoa/Cocoa.h>
 
+/* ~/Library/ApplicationSupport/Ample/ */
 NSURL *SupportDirectory(void);
 NSString *SupportDirectoryPath(void);
 
+/* mame executable URL */
+NSURL *MameURL(void);
+NSString *MamePath(void);
+
+/* mame working directory */
+NSURL *MameWorkingDirectory(void);
+NSString *MameWorkingDirectoryPath(void);
+
+NSString *InternString(NSString *key);
+
+NSDictionary *MameMachine(NSString *machine);
+
 /* NSUserDefaults keys */
 extern NSString *kUseCustomMame;
 extern NSString *kMamePath;
+extern NSString *kMameWorkingDirectory;
 extern NSString *kAutoCloseLogWindow;
 extern NSString *kMameComponentsDate;
 
+extern NSString *kDownloadURL;
+extern NSString *kDownloadExtension;
+
+extern NSString *kDefaultDownloadURL;
+extern NSString *kDefaultDownloadExtension;
+
+
+@protocol Bookmark <NSObject>
+-(BOOL)loadBookmark: (NSDictionary *)bookmark;
+-(BOOL)saveBookmark: (NSMutableDictionary *)bookmark;
+
+-(void)willLoadBookmark: (NSDictionary *)bookmark;
+-(void)didLoadBookmark: (NSDictionary *)bookmark;
+@end
+
 #endif /* Ample_h */

Ample/Ample.m

@@ -35,7 +35,103 @@ NSString *SupportDirectoryPath(void) {
 }
 
 
+NSURL *MameURL(void) {
+
+    NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
+    NSBundle *bundle = [NSBundle mainBundle];
+        
+    if ([defaults boolForKey: kUseCustomMame]) {
+        NSString *path = [defaults stringForKey: kMamePath];
+        if (![path length]) return [NSURL fileURLWithPath: path];
+    }
+    
+    return [bundle URLForAuxiliaryExecutable: @"mame64"];
+}
+
+NSString *MamePath(void) {
+
+    NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
+    NSBundle *bundle = [NSBundle mainBundle];
+
+    NSString *path;
+    
+    if ([defaults boolForKey: kUseCustomMame]) {
+        path = [defaults stringForKey: kMamePath];
+        if ([path length]) return path;
+    }
+    path = [bundle pathForAuxiliaryExecutable: @"mame64"];
+    if ([path length]) return path;
+    return nil;
+}
+
+
+NSURL *MameWorkingDirectory(void) {
+
+    NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
+        
+    if ([defaults boolForKey: kUseCustomMame]) {
+        NSString *path = [defaults stringForKey: kMameWorkingDirectory];
+        if (![path length]) return [NSURL fileURLWithPath: path];
+    }
+    
+    return SupportDirectory();
+}
+
+NSString *MameWorkingDirectoryPath(void) {
+
+    NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
+        
+    if ([defaults boolForKey: kUseCustomMame]) {
+        NSString *path = [defaults stringForKey: kMameWorkingDirectory];
+        if (![path length]) return path;
+    }
+    
+    return SupportDirectoryPath();
+}
+
+
+NSDictionary *MameMachine(NSString *machine) {
+    static NSMutableDictionary *cache;
+    
+    if (!cache) cache = [NSMutableDictionary new];
+    NSDictionary *d;
+    
+    if (!machine) return nil;
+    d = [cache objectForKey: machine];
+    if (d) return d;
+
+    NSBundle *bundle = [NSBundle mainBundle];
+    NSURL *url= [bundle URLForResource: machine withExtension: @"plist"];
+    
+    d = [NSDictionary dictionaryWithContentsOfURL: url];
+    if (d) [cache setObject: d forKey: machine];
+    return d;
+}
+
+/* NSCache doesn't retain it's key. This essentially interns it. */
+/* could just abuse NSSelectorFromString() */
+NSString *InternString(NSString *key) {
+    static NSMutableSet *storage = nil;
+    
+    if (!storage) {
+        storage = [NSMutableSet new];
+    }
+    NSString *copy = [storage member: key];
+    if (!copy) {
+        copy = [key copy];
+        [storage addObject: copy];
+    }
+    return copy;
+}
+
+
 NSString *kUseCustomMame = @"UseCustomMame";
 NSString *kMamePath = @"MamePath";
+NSString *kMameWorkingDirectory = @"MameWorkingDirectory";
 NSString *kAutoCloseLogWindow = @"AutoCloseLogWindow";
 NSString *kMameComponentsDate = @"MameComponentsDate";
+NSString *kDefaultDownloadURL = @"DefaultDownloadURL";
+NSString *kDefaultDownloadExtension = @"DefaultDownloadExtension";
+
+NSString *kDownloadURL = @"DownloadURL";
+NSString *kDownloadExtension = @"DownloadExtension";

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.m

@@ -10,6 +10,12 @@
 #import "LaunchWindowController.h"
 #import "PreferencesWindowController.h"
 #import "DownloadWindowController.h"
+#import "DiskImagesWindowController.h"
+#import "CheatSheetWindowController.h"
+#import "Transformers.h"
+#import "BookmarkManager.h"
+
+#import "LogWindowController.h"
 
 @interface AppDelegate ()
 @property (weak) IBOutlet NSWindow *installWindow;
@@ -20,6 +26,8 @@
     NSWindowController *_prefs;
     NSWindowController *_launcher;
     NSWindowController *_downloader;
+    NSWindowController *_diskImages;
+    NSWindowController *_cheatSheet;
 }
 
 
@@ -31,6 +39,12 @@
     NSDictionary *dict;
     
     
+    RegisterTransformers();
+    
+    BookmarkManager *bm = [BookmarkManager sharedManager];
+    [bm loadBookmarks];
+    [bm updateMenu];
+    
     path = [bundle pathForResource: @"Defaults" ofType: @"plist"];
     dict = [NSDictionary dictionaryWithContentsOfFile: path];
     
@@ -41,7 +55,10 @@
     
 
 
+    _diskImages = [DiskImagesWindowController sharedInstance]; //[DiskImagesWindowController new];
+
     if ([self installMameComponents]) {
+
         [self displayLaunchWindow];
     }
 
@@ -84,10 +101,15 @@
         @"xfz",
         path
     ];
-    [task setExecutableURL: [NSURL fileURLWithPath: @"/usr/bin/tar"]];
+    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];
-    [task setCurrentDirectoryURL: sd];
-    
+
     
     dispatch_time_t when = dispatch_time(DISPATCH_TIME_NOW, (int64_t)(2 * NSEC_PER_SEC));
     [task setTerminationHandler: ^(NSTask *task){
@@ -112,6 +134,7 @@
             }
             [win close];
             [self displayLaunchWindow];
+            [self displayROMS: nil];
         });
         
     }];
@@ -130,6 +153,18 @@
 }
 
 
+-(BOOL)application:(NSApplication *)sender openFile:(NSString *)filename {
+    
+    NSString *ext = [[filename pathExtension] lowercaseString];
+    
+    if ([ext isEqualToString: @"vgm"] || [ext isEqualToString: @"vgz"]) {
+        // run mame...
+        NSArray *args = @[ @"vgmplay", @"-window", @"-nomax", @"-skip_gameinfo", @"-quik", filename ];
+        
+        [LogWindowController controllerForArgs: args];
+    }
+    return NO;
+}
 
 
 #pragma mark - IBActions
@@ -143,12 +178,54 @@
 }
 
 
-- (IBAction)downloadROMS:(id)sender {
-    
+- (IBAction)displayROMS:(id)sender {
     if (!_downloader) {
-        _downloader = [DownloadWindowController new];
+        _downloader = [DownloadWindowController sharedInstance];
     }
     [_downloader showWindow: sender];
 }
 
+- (IBAction)displayRecentDiskImages:(id)sender {
+    if (!_diskImages) {
+        _diskImages = [DiskImagesWindowController sharedInstance];
+    }
+    [_diskImages showWindow: sender];
+}
+
+- (IBAction)displayCheatSheet:(id)sender {
+    if (!_cheatSheet) {
+        _cheatSheet = [CheatSheetWindowController new];
+    }
+    [_cheatSheet showWindow: sender];
+}
+
+- (IBAction)displaySupportDirectory:(id)sender {
+    NSURL *url = SupportDirectory();
+    NSWorkspace *ws = [NSWorkspace sharedWorkspace];
+    [ws openURL: url];
+}
+- (IBAction)mameDocumentation:(id)sender {
+    NSWorkspace *ws = [NSWorkspace sharedWorkspace];
+    
+    NSURL *url = [NSURL URLWithString: @"https://docs.mamedev.org"];
+    [ws openURL: url];
+}
+
+- (IBAction)mameAppleWiki:(id)sender {
+    NSWorkspace *ws = [NSWorkspace sharedWorkspace];
+    
+    NSURL *url = [NSURL URLWithString: @"https://wiki.mamedev.org/index.php/Driver:Apple_II"];
+    [ws openURL: url];
+}
+
+- (IBAction)mameMac68kWiki:(id)sender {
+    NSWorkspace *ws = [NSWorkspace sharedWorkspace];
+    
+    NSURL *url = [NSURL URLWithString: @"https://wiki.mamedev.org/index.php/Driver:Mac_68K"];
+    [ws openURL: url];
+}
+
+
+
+
 @end

Ample/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -1,53 +1,63 @@
 {
   "images" : [
     {
-      "idiom" : "mac",
       "size" : "16x16",
+      "idiom" : "mac",
+      "filename" : "icon-16.png",
       "scale" : "1x"
     },
     {
-      "idiom" : "mac",
       "size" : "16x16",
+      "idiom" : "mac",
+      "filename" : "icon-32.png",
       "scale" : "2x"
     },
     {
-      "idiom" : "mac",
       "size" : "32x32",
+      "idiom" : "mac",
+      "filename" : "icon-32.png",
       "scale" : "1x"
     },
     {
-      "idiom" : "mac",
       "size" : "32x32",
+      "idiom" : "mac",
+      "filename" : "icon-64.png",
       "scale" : "2x"
     },
     {
-      "idiom" : "mac",
       "size" : "128x128",
+      "idiom" : "mac",
+      "filename" : "icon-128.png",
       "scale" : "1x"
     },
     {
-      "idiom" : "mac",
       "size" : "128x128",
+      "idiom" : "mac",
+      "filename" : "icon-256.png",
       "scale" : "2x"
     },
     {
-      "idiom" : "mac",
       "size" : "256x256",
+      "idiom" : "mac",
+      "filename" : "icon-256.png",
       "scale" : "1x"
     },
     {
-      "idiom" : "mac",
       "size" : "256x256",
+      "idiom" : "mac",
+      "filename" : "icon-512.png",
       "scale" : "2x"
     },
     {
-      "idiom" : "mac",
       "size" : "512x512",
+      "idiom" : "mac",
+      "filename" : "icon-512.png",
       "scale" : "1x"
     },
     {
-      "idiom" : "mac",
       "size" : "512x512",
+      "idiom" : "mac",
+      "filename" : "icon-1024.png",
       "scale" : "2x"
     }
   ],

Ample/AutocompleteControl.h

@@ -0,0 +1,42 @@
+//
+//  AutocompleteControl.h
+//  Autocomplete
+//
+//  Created by Kelvin Sherlock on 2/20/2021.
+//  Copyright © 2021 Kelvin Sherlock. All rights reserved.
+//
+
+#import <Cocoa/Cocoa.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@class AutocompleteControl;
+
+@protocol AutocompleteItem
+-(NSString *)menuTitle;
+-(NSAttributedString *)menuAttributedTitle; //?? can it still handle color?
+-(BOOL)menuEnabled;
+-(BOOL)menuIsHeader;
+@end
+
+
+@protocol AutoCompleteDelegate
+
+-(NSArray<id<AutocompleteItem>> *)autocomplete: (AutocompleteControl *)control completionsForString: (NSString *)string;
+-(NSArray<id<AutocompleteItem>> *)autocomplete: (AutocompleteControl *)control completionsForItem: (id<AutocompleteItem>)item;
+
+@end
+
+@interface AutocompleteControl : NSSearchField
+
+@property NSInteger minWidth;
+@property NSInteger maxDisplayItems;
+@property (nullable, weak) id<AutoCompleteDelegate> autocompleteDelegate;
+
+-(void)invalidate;
+
+
+@end
+
+
+NS_ASSUME_NONNULL_END

Ample/AutocompleteControl.m

@@ -0,0 +1,885 @@
+//
+//  AutocompleteControl.m
+//  Autocomplete
+//
+//  Created by Kelvin Sherlock on 2/20/2021.
+//  Copyright © 2021 Kelvin Sherlock. All rights reserved.
+//
+
+#import "AutocompleteControl.h"
+#include <wctype.h>
+
+
+/*
+ 
+Todo --
+- when there is a value, can filter the list by only including header items and the selected value
+- draw inactive menu items
+- when menu is hidden then text is manually deleted (not esc canceled), then down/up arrow the list needs to update.
+- eliminate nib and do it manually.
+- when menus is too tall, macos moves it to the top of the screen.
+ - 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?
+ */
+
+
+@interface ACMenuView : NSView
+@property (nonatomic) NSArray<id<AutocompleteItem>> *items;
+
+@property (weak) AutocompleteControl *parent;
+
+-(void)reset;
+-(void)reset: (id<AutocompleteItem>)value;
+-(void)setItems:(NSArray<id<AutocompleteItem>> *)items;
+-(void)setItems:(NSArray<id<AutocompleteItem>> *)items value: (id<AutocompleteItem>)value;
+
+@end
+
+
+@interface AutocompleteControl ()
+{
+    IBOutlet NSPanel *_panel;
+    __weak IBOutlet ACMenuView *_menuView;
+    __weak IBOutlet NSScrollView *_scrollView;
+    
+    id<AutocompleteItem> _value;
+    BOOL _editing;
+    BOOL _dirty;
+}
+
+@end
+
+@interface AutocompleteControl (SearchField) <NSSearchFieldDelegate>
+-(void)fixTextColor: (BOOL)editing;
+@end
+
+@implementation AutocompleteControl
+
+-(void)_init {
+    
+    [self setDelegate: self];
+    [self setPlaceholderString: @""];
+    [(NSSearchFieldCell *)[self cell] setSearchButtonCell: nil];
+    
+    NSBundle *bundle = [NSBundle mainBundle];
+    NSNib *nib = [[NSNib alloc] initWithNibNamed: @"Autocomplete" bundle: bundle];
+    
+    NSArray *topLevel = nil;
+    [nib instantiateWithOwner: self topLevelObjects: &topLevel];
+    
+    [_panel setMovable: NO];
+    [_panel setBecomesKeyOnlyIfNeeded: YES];
+    [_menuView setParent: self];
+}
+
+-(id)initWithFrame:(NSRect)frameRect {
+    if ((self = [super initWithFrame: frameRect])) {
+        [self _init];
+    }
+    return self;
+}
+
+-(id)initWithCoder:(NSCoder *)coder {
+    if ((self = [super initWithCoder: coder])) {
+        [self _init];
+    }
+    return self;
+}
+
+#if 0
+-(NSString *)stringValue {
+    return [super stringValue];
+}
+#endif
+
+-(id)objectValue {
+    return _value;
+}
+
+-(void)setStringValue:(NSString *)stringValue {
+    [super setStringValue: stringValue ? stringValue : @""];
+    if (_value && [[_value menuTitle] isEqualToString: stringValue] == NO) {
+        // post change notification?
+        _value = nil;
+        [_menuView reset];
+    }
+    
+    [self fixTextColor: _editing];
+    // todo -- search for a matching item, update text color.
+}
+
+// todo -- _menuView has second copy of value, need to update that.
+-(void)setObjectValue:(id)objectValue {
+    if (_value == objectValue) return;
+    if (![objectValue conformsToProtocol: @protocol(AutocompleteItem)]) {
+        _value = nil;
+        [_menuView reset];
+        [super setStringValue: @""];
+        [self fixTextColor: _editing];
+        return;
+    }
+    _value = objectValue;
+    if (!_value) [super setStringValue: @""]; //
+    else {
+        [super setStringValue: [_value menuTitle]];
+        [_menuView reset: _value];
+        // TODO -- menu view currently uses text search.
+        //NSArray *array = [_autocompleteDelegate autocomplete: self completionsForItem: _value];
+        //[_menuView setItems: array value: _value];
+    }
+    [self fixTextColor: NO];
+}
+
+-(BOOL)valid {
+    return _value != nil;
+}
+
+
+-(void)hideSuggestions: (id)sender {
+    
+    if (![_panel isVisible]) return;
+
+    NSWindow *window = [self window];
+
+    [window removeChildWindow: _panel];
+    [_panel orderOut: sender];
+    
+}
+
+-(void)showSuggestions: (id)sender {
+    
+    if ([_panel isVisible]) return;
+    NSWindow *window = [self window];
+    
+    NSRect wFrame = [_panel frame];
+    NSRect vFrame = [self frame];
+    
+    NSRect rect = { .origin = vFrame.origin, .size = wFrame.size };
+    rect = [window convertRectToScreen:rect];
+
+    rect.origin.y -= wFrame.size.height + 4;
+    rect.size.width = MAX(vFrame.size.width, _minWidth);
+    // todo - min width option.
+    [_panel setFrame: rect display: YES];
+    
+    //[_panel setFrameOrigin: rect.origin];
+    [window addChildWindow: _panel ordered: NSWindowAbove];
+}
+
+-(void)updateSuggestions {
+
+    if (!_autocompleteDelegate) return;
+    NSString *needle = [self stringValue];
+
+    NSArray *items = [_autocompleteDelegate autocomplete: self completionsForString: needle];
+    
+    [_menuView setItems: items];
+    if ([items count]) {
+        [self showSuggestions: nil];
+    } else {
+        [self hideSuggestions: nil];
+    }
+}
+
+-(void)invalidate {
+    
+    if (!_autocompleteDelegate) return;
+
+    NSArray *items = nil;
+
+    /* if there is an object value, try to retain it. */
+    if (_value) {
+        
+        [_menuView reset];
+        items = [_autocompleteDelegate autocomplete: self completionsForItem: _value];
+        if (items) {
+            [_menuView setItems: items];
+            return;
+        }
+        _value = nil;
+        [self invoke];
+    }
+    NSString *needle = [self stringValue];
+
+    if ([needle length]) {
+        _dirty = YES;
+    }
+    // if only 1 match, auto-set value?
+    items = [_autocompleteDelegate autocomplete: self completionsForString: needle];
+    [self fixTextColor: _editing];
+    [_menuView setItems: items];
+}
+
+
+// prevent action messages from the search field/cell.
+-(BOOL)sendAction:(SEL)action to:(id)target {
+    if (action == [self action] && target == [self target]) return NO;
+    return [super sendAction: action to: target];
+
+}
+
+-(void)invoke {
+    _dirty = NO;
+    [super sendAction: [self action] to: [self target]];
+}
+
+@end
+
+
+@implementation AutocompleteControl (SearchField)
+
+-(void)fixTextColor: (BOOL)editing {
+    NSColor *color = editing || _value ? [NSColor controlTextColor] : [NSColor systemRedColor];
+    [self setTextColor: color];
+}
+
+- (void)controlTextDidChange:(NSNotification *)notification {
+    //NSLog(@"controlTextDidChange");
+
+    if (_value) {
+        _dirty = YES;
+        _value = nil;
+    }
+    
+    NSString *s = [self stringValue];
+    if ([s length]) {
+        [self updateSuggestions];
+    } else {
+        _dirty = YES;
+        _value = nil;
+        [_menuView reset];
+        [_menuView setItems: nil];
+        [self hideSuggestions: nil];
+        [self invoke];
+    }
+}
+- (void)controlTextDidBeginEditing:(NSNotification *)obj {
+    //NSLog(@"controlTextDidBeginEditing");
+
+    _editing = YES;
+    _dirty = NO;
+    [self fixTextColor: YES];
+}
+
+
+
+- (void)controlTextDidEndEditing:(NSNotification *)obj {
+    //NSLog(@"controlTextDidEndEditing");
+
+    _editing = NO;
+
+    [self hideSuggestions: nil];
+
+    if (_dirty) {
+        _value = nil;
+        [self invoke];
+    }
+    [self fixTextColor: NO];
+}
+
+
+-(BOOL)control:(NSControl *)control textShouldBeginEditing:(NSText *)fieldEditor {
+    return YES;
+}
+
+-(BOOL)control:(NSControl *)control textShouldEndEditing:(NSText *)fieldEditor {
+    return YES;
+}
+
+-(void)selectItem:(id<AutocompleteItem>)item withSelector:(SEL)selector {
+    
+    // for newline/mousedown, will still retain focus after updating
+    // so we need to invalidate the value if it's edited further.
+    if (selector == @selector(insertNewline:) || selector == @selector(mouseDown:) || selector == @selector(insertTab:)) {
+
+        _value = item;
+        NSString *str = [item menuTitle];
+
+        [super setStringValue: str];
+        
+        [self hideSuggestions: nil];
+        
+        NSText *fieldEditor = [self currentEditor];
+        //[fieldEditor setSelectedRange: NSMakeRange([str length], 0)];
+        [fieldEditor setSelectedRange: NSMakeRange(0, [str length])];
+
+        [self invoke];
+        
+        // need to invalidate the menu so it reloads
+        
+
+#if 0
+        NSArray *array = [_autocompleteDelegate autocomplete: self completionsForItem: _value];
+        [_menuView setItems: array];
+#else
+        [_menuView setItems: nil];
+#endif
+        
+        //NSLog(@"selectItem:withSelector:");
+    }
+}
+
+
+- (BOOL)control:(NSControl *)control textView:(NSTextView *)textView doCommandBySelector:(SEL)commandSelector {
+
+    if (commandSelector == @selector(moveUp:)) {
+        //[self showSuggestions: nil];
+        if ([_panel isVisible]) {
+            [_menuView moveUp: textView];
+        } else {
+            [self updateSuggestions];
+        }
+        return YES;
+    }
+    
+    if (commandSelector == @selector(moveDown:)) {
+        //[self showSuggestions: nil];
+        if ([_panel isVisible]) {
+            [_menuView moveDown: textView];
+        } else {
+            [self updateSuggestions];
+        }
+        return YES;
+    }
+
+    if (commandSelector == @selector(insertNewline:)) {
+        if ([_panel isVisible])
+            [_menuView insertNewline: textView];
+        return YES;
+    }
+
+    if (commandSelector == @selector(insertTab:)) {
+        if ([_panel isVisible])
+            [_menuView insertTab: textView];
+        return NO;
+    }
+    
+    if (commandSelector == @selector(complete:)) {
+        if ([_panel isVisible]) {
+            [self hideSuggestions: nil];
+        } else {
+            [self updateSuggestions];
+        }
+        return YES;
+    }
+
+    
+    // esc ?
+    // if panel open, hide
+    // if panel closed, delete.
+    if (commandSelector == @selector(cancelOperation:)) {
+        
+        if ([_panel isVisible]) {
+            [self hideSuggestions: nil];
+        } else {
+            _value = nil;
+            [super setStringValue: @""];
+
+            [self hideSuggestions: nil];
+            [_menuView reset];
+            //[_menuView setItems: _completions];
+            // sigh...
+    #if 0
+            NSArray *items =[_autocompleteDelegate autocomplete: self completionsForString: @""];
+            [_menuView setItems: items];
+    #endif
+            [self invoke];
+        }
+        return YES;
+    }
+    
+    if (commandSelector == @selector(scrollPageDown:)) {
+        if ([_panel isVisible]) {
+            [_menuView scrollPageDown: textView];
+        } else {
+            [self updateSuggestions];
+        }
+        return YES;
+    }
+    if (commandSelector == @selector(scrollPageUp:)) {
+        if ([_panel isVisible]) {
+            [_menuView scrollPageUp: textView];
+        } else {
+            [self updateSuggestions];
+        }
+        return YES;
+    }
+    
+    //NSLog(@"%@", NSStringFromSelector(commandSelector));
+    return NO;
+}
+
+
+@end
+
+
+@interface ACMenuView () {
+    id<AutocompleteItem> _value;
+    NSInteger _index;
+    NSInteger _count;
+    NSArray<id<AutocompleteItem>> *_items;
+    NSTrackingArea *_trackingArea;
+    NSColor *_backgroundColor;
+    NSColor *_selectedColor;
+    BOOL _tracking;
+    BOOL _clipped;
+}
+@end
+
+@implementation ACMenuView
+
+#define MENU_FONT_SIZE 11
+#define MENU_HEIGHT 14
+#define MARGIN_TOP 0 //6
+#define MARGIN_BOTTOM 0 //6
+#define INDENT 7
+#define HEADER_INDENT 7
+#define MAX_DISPLAY_ITEMS 16
+
+
+-(void)_init {
+    _backgroundColor = [NSColor windowBackgroundColor];
+    if (@available(macOS 10.14, *)) {
+        _selectedColor = [NSColor selectedContentBackgroundColor];
+    } else {
+        _selectedColor = [NSColor selectedTextBackgroundColor];
+    }
+    NSTrackingAreaOptions options = NSTrackingMouseMoved | NSTrackingMouseEnteredAndExited | NSTrackingInVisibleRect | NSTrackingActiveInActiveApp;
+    _trackingArea = [[NSTrackingArea alloc] initWithRect: NSZeroRect
+                                                 options: options
+                                                   owner: self
+                                                userInfo: nil];
+
+    [self addTrackingArea: _trackingArea];
+}
+
+-(id)initWithCoder:(NSCoder *)coder {
+    if ((self = [super initWithCoder: coder])) {
+        [self _init];
+    }
+    return self;
+    
+}
+
+-(BOOL)isFlipped {
+    return YES;
+}
+
+-(BOOL)acceptsFirstMouse:(NSEvent *)event {
+    return YES;
+}
+
+static CGFloat HeightForItems(NSUInteger count) {
+    return count * MENU_HEIGHT;
+}
+
+-(NSSize)intrinsicContentSize {
+    return NSMakeSize(NSViewNoIntrinsicMetric, _count * MENU_HEIGHT + MARGIN_TOP + MARGIN_BOTTOM);
+}
+
+- (NSSize)sizeThatFits:(NSSize)size {
+    size.height = _count * MENU_HEIGHT + MARGIN_TOP + MARGIN_BOTTOM;
+    return size;
+}
+
+- (void)sizeToFit {
+    NSSize size = [self frame].size;
+    size.height = _count * MENU_HEIGHT + MARGIN_TOP + MARGIN_BOTTOM;
+    [self setFrameSize: size];
+    [self setNeedsDisplay: YES];
+}
+
+-(void)reset {
+    [self invalidateRow: _index];
+    _index = -1;
+    _value = nil;
+    _items = nil;
+}
+
+-(void)reset: (id<AutocompleteItem>)value {
+    [self invalidateRow: _index];
+    _index = -1;
+    _items = nil;
+    _value = value;
+}
+
+-(void)setItems:(NSArray *)items value: (id<AutocompleteItem> )value {
+    if (_items == items && _value == value) return;
+    _items = [items copy];
+    _index = -1;
+    _count = [items count];
+    _value = value;
+    
+    if (!_items) {
+        _value = nil;
+        return;
+    }
+
+    // also check enabled status....
+    if (_value) {
+        _index = [_items indexOfObject: _value];
+        if (_index == NSNotFound) {
+            _index = -1;
+            _value = nil;
+        }
+    }
+
+    // if only 1 entry, auto-select it.
+    if (!_value) {
+        NSInteger count = -1;
+        for (id<AutocompleteItem> item in _items) {
+            ++count;
+            if ([item menuIsHeader]) continue;
+            if (_value) {
+                _value = nil;
+                _index = -1;
+                break;
+            }
+            _value = item;
+            _index = count;
+        }
+    }
+    
+    NSInteger displayCount = MIN(_count,  MAX_DISPLAY_ITEMS);
+    CGFloat newHeight = HeightForItems(displayCount) + 8 ; // 4px top/bottom
+    NSWindow *window = [self window];
+    NSRect wFrame = [window frame];
+    
+    NSRect contentRect = [[[self enclosingScrollView] contentView] frame];
+
+    //NSSize size = [self intrinsicContentSize];
+    //NSInteger minWidth = [_parent minWidth];
+    //size.width = MAX(wFrame.size.width, minWidth);
+    //size.height += 8;
+    
+    CGFloat delta = wFrame.size.height - newHeight;
+    
+    wFrame.origin.y += delta;
+    wFrame.size.height = newHeight;
+    
+    _clipped = (_count > displayCount);
+
+    [self setFrameSize: NSMakeSize(contentRect.size.width /*- 15.0*/, HeightForItems(_count))];
+    [self setNeedsDisplay: YES];
+    [window setFrame: wFrame display: YES];
+
+    if (_value) {
+        [self scrollToRow: _index position: ScrollToCenter force: NO];
+    } else {
+        [self scrollToRow: 0 position: ScrollToTop force: YES];
+    }
+    
+    //[self sizeToFit];
+    //[[self window] setContentSize: [self frame].size];
+    
+    //NSLog(@"%@", NSStringFromRect(wFrame));
+}
+
+-(void)setItems:(NSArray<id<AutocompleteItem>> *)items {
+    
+    if (_items == items) return;
+    [self setItems: items value: _value];
+}
+
+
+
+-(id<AutocompleteItem>)itemAtPoint: (NSPoint)point indexPtr: (NSInteger *)indexPtr {
+
+    NSInteger index = floor(point.y / MENU_HEIGHT);
+    if (index < 0 || index >= _count) return nil;
+    if (indexPtr) *indexPtr = index;
+    return [_items objectAtIndex: index];
+}
+
+enum {
+    ScrollToTop,
+    ScrollToBottom,
+    ScrollToCenter,
+};
+
+-(void)scrollToRow: (NSInteger)row position: (unsigned)position force: (BOOL)force {
+    if (row < 0) return;
+    if (!_clipped) return;
+
+    NSScrollView *scrollView = [self enclosingScrollView];
+    NSClipView *clipView = [scrollView contentView];
+
+    NSRect visibleRect = [self visibleRect];
+    if (!force) {
+        NSRect mRect = NSMakeRect(0, row * MENU_HEIGHT, 1 , MENU_HEIGHT);
+        if (NSContainsRect(visibleRect, mRect)) return;
+    }
+        
+    NSInteger topRow = row;
+    switch (position) {
+        case ScrollToTop:
+            break;
+        case ScrollToBottom:
+            topRow -= MAX_DISPLAY_ITEMS -1;
+            break;
+        case ScrollToCenter:
+            topRow -= MAX_DISPLAY_ITEMS/2 - 1;
+            break;
+    }
+    if (topRow < 0) topRow = 0;
+    if (topRow > _count - MAX_DISPLAY_ITEMS)
+        topRow = _count - MAX_DISPLAY_ITEMS;
+    NSPoint point = NSMakePoint(0, topRow * MENU_HEIGHT);
+    
+    //[self scrollClipView: clipView toPoint: point];
+    [clipView scrollToPoint: point];
+    [scrollView reflectScrolledClipView: clipView];
+
+}
+
+
+-(void)moveUp:(id)sender {
+    if (_count == 0 || _index <= 0) return;
+    
+    NSInteger index = 0;
+    id<AutocompleteItem> value = nil;
+    for (index = _index - 1; index >= 0; --index) {
+        value = [_items objectAtIndex: index];
+        if ([value menuIsHeader]) continue;
+        if (![value menuEnabled]) continue;
+        break;
+    }
+    if (index < 0) return;
+    if (index == _index) return;
+    [self invalidateRow: _index];
+    [self invalidateRow: index];
+
+    _index = index;
+    _value = value;
+    [self scrollToRow: index position: ScrollToTop force: NO];
+    [_parent selectItem: _value withSelector: _cmd];
+}
+
+-(void)moveDown:(id)sender {
+
+    // _index -1 selects first item.
+    if (_count == 0  || _index == _count - 1) return;
+    
+    NSInteger index = 0;
+    id<AutocompleteItem> value = nil;
+    for (index = _index + 1; index < _count ; ++index) {
+        value = [_items objectAtIndex: index];
+        if ([value menuIsHeader]) continue;
+        if (![value menuEnabled]) continue;
+        break;
+    }
+    if (index == _count) return;
+    if (index == _index) return;
+    [self invalidateRow: _index];
+    [self invalidateRow: index];
+
+    _index = index;
+    _value = value;
+
+    [self scrollToRow: index position: ScrollToBottom force: NO];
+    [_parent selectItem: _value withSelector: _cmd];
+}
+
+-(void)scrollPageUp:(id)sender {
+    if (_count == 0 || _index <= 0) return;
+
+    
+}
+
+-(void)scrollPageDown:(id)sender {
+    if (_count == 0  || _index == _count - 1) return;
+
+}
+
+
+-(void)insertNewline:(id)sender {
+    if (_value) {
+        [_parent selectItem: _value withSelector: _cmd];
+    }
+}
+
+-(void)insertTab:(id)sender {
+    // if only one option, autocomplete?
+    if (_value) {
+        [_parent selectItem: _value withSelector: _cmd];
+    }
+}
+
+-(void)mouseMoved:(NSEvent *)event {
+    //NSLog(@"mouse moved");
+
+    if (!_tracking) return;
+
+    NSPoint p = [event locationInWindow];
+    p = [self convertPoint: p fromView: nil];
+    
+    
+    NSInteger index;
+    id<AutocompleteItem> value = [self itemAtPoint: p indexPtr: &index];
+    if (!value) return;
+    if (index == _index) return;
+    if ([value menuIsHeader]) return;
+    if (![value menuEnabled]) return;
+
+    [self invalidateRow: _index];
+    [self invalidateRow: index];
+
+    _index = index;
+    _value = value;
+    [_parent selectItem: _value withSelector: _cmd];
+}
+-(void)mouseDown:(NSEvent *)event {
+    if (!_tracking) return;
+
+    NSPoint p = [event locationInWindow];
+    p = [self convertPoint: p fromView: nil];
+    
+    NSInteger index;
+    id<AutocompleteItem> value = [self itemAtPoint: p indexPtr: &index];
+    if (!value) return;
+    if (index != _index) {
+        if ([value menuIsHeader]) return;
+        if (![value menuEnabled]) return;
+
+        [self invalidateRow: _index];
+        [self invalidateRow: index];
+
+        _index = index;
+        _value = value;
+    }
+    
+    [_parent selectItem: _value withSelector: _cmd];
+}
+
+-(void)mouseEntered:(NSEvent *)event {
+    //NSLog(@"mouse entered");
+    _tracking = YES;
+
+}
+-(void)mouseExited:(NSEvent *)event {
+    //NSLog(@"mouse exited");
+
+    _tracking = NO;
+}
+
+-(void)invalidateRow:(NSInteger)row {
+    if (row < 0 || row >= _count) return;
+    
+    NSRect r = NSZeroRect;
+    NSRect bounds = [self bounds];
+
+    r.size.width = bounds.size.width;
+    r.size.height = MENU_HEIGHT;
+    r.origin.y = MENU_HEIGHT * row + MARGIN_TOP;
+    //NSLog(@"Invalidating %ld - %@", row, NSStringFromRect(r));
+    [self setNeedsDisplayInRect: r];
+}
+
+
+static void DrawString(NSString *str, NSDictionary *attr, CGRect rect) {
+    
+    NSSize size = [str sizeWithAttributes: attr];
+    if (size.width <= rect.size.width) {
+        [str drawInRect: rect withAttributes: attr];
+        return;
+    }
+    NSMutableString *mstr = [str mutableCopy];
+    // binary search is probably the best way to handle it :/
+    NSInteger l = [mstr length];
+    while (l > 2) {
+        [mstr replaceCharactersInRange: NSMakeRange(l-2, 2) withString: @"…"];
+        --l;
+        size = [mstr sizeWithAttributes: attr];
+        if (size.width <= rect.size.width) {
+            [mstr drawInRect: rect withAttributes: attr];
+            return;
+        }
+    }
+}
+
+-(void)drawItem: (id<AutocompleteItem>)item inRect: (NSRect)rect {
+    NSColor *textColor = [NSColor textColor];
+    if (!item) return;
+
+    if (item == _value) {
+        textColor = [NSColor selectedMenuItemTextColor];
+        [_selectedColor setFill];
+        NSRectFill(rect);
+    }
+    NSString *string = [item menuTitle];
+
+    if ([item menuIsHeader]) {
+        textColor = [NSColor secondaryLabelColor];
+        NSDictionary *attr = @{
+            NSForegroundColorAttributeName: textColor,
+            NSFontAttributeName: [NSFont systemFontOfSize: MENU_FONT_SIZE], // [NSFont boldSystemFontOfSize: 13],
+        };
+        NSRect r  = NSInsetRect(rect, HEADER_INDENT, 0);
+        DrawString(string, attr, r);
+    } else {
+
+        NSDictionary *attr = @{
+            NSForegroundColorAttributeName: textColor,
+            NSFontAttributeName: [NSFont systemFontOfSize: MENU_FONT_SIZE],
+        };
+        NSRect r  = NSInsetRect(rect, INDENT, 0);
+        r.origin.x += INDENT;
+        r.size.width -= INDENT;
+        DrawString(string, attr, r);
+    }
+}
+
+- (void)drawRect:(NSRect)dirtyRect {
+    [super drawRect:dirtyRect];
+
+    NSRect r = [self bounds];
+    NSInteger begin = floor((NSMinY(dirtyRect) - MARGIN_TOP) / MENU_HEIGHT);
+    NSInteger end = ceil((NSMaxY(dirtyRect) - MARGIN_TOP) / MENU_HEIGHT);
+    if (begin < 0) begin = 0;
+    if (end > _count) end = _count;
+
+    
+    r.origin.y = MENU_HEIGHT * begin + MARGIN_TOP;
+    r.size.height = MENU_HEIGHT;
+    for (NSInteger index = begin; index < end; ++index) {
+        id<AutocompleteItem> item = [_items objectAtIndex: index];
+        [self drawItem: item inRect: r];
+        r.origin.y += MENU_HEIGHT;
+    }
+}
+
+@end
+
+
+/* custom scroller that doesn't draw a background. */
+@interface ACScroller : NSScroller
+@end
+
+@implementation ACScroller
+
+
+-(void)drawRect:(NSRect)dirtyRect {
+    //[[NSColor windowBackgroundColor] set];
+    [[NSColor clearColor] set];
+    NSRectFill(dirtyRect);
+    [self drawKnob];
+}
+
+@end
+
+
+@interface ACPanel : NSPanel
+@end
+
+@implementation ACPanel
+
+/* needed to prevent the pop-up child window from being moved when offscreen. */
+- (NSRect)constrainFrameRect:(NSRect)frameRect toScreen:(NSScreen *)screen {
+    return frameRect;
+}
+
+
+@end

Ample/Base.lproj/Autocomplete.xib

@@ -0,0 +1,55 @@
+<?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">
+    <dependencies>
+        <deployment identifier="macosx"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="15705"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <customObject id="-2" userLabel="File's Owner" customClass="AutocompleteControl">
+            <connections>
+                <outlet property="_menuView" destination="F2h-9b-Ouu" id="min-gE-sma"/>
+                <outlet property="_panel" destination="OYW-cj-FD5" id="DYJ-rN-6Ep"/>
+                <outlet property="_scrollView" destination="VQ6-PE-hTH" id="iKA-Ps-nkl"/>
+            </connections>
+        </customObject>
+        <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
+        <customObject id="-3" userLabel="Application" customClass="NSObject"/>
+        <window allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" frameAutosaveName="" animationBehavior="default" titlebarAppearsTransparent="YES" titleVisibility="hidden" id="OYW-cj-FD5" customClass="ACPanel">
+            <windowStyleMask key="styleMask" utility="YES" nonactivatingPanel="YES" fullSizeContentView="YES"/>
+            <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
+            <rect key="contentRect" x="272" y="172" width="300" height="400"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="2560" height="1417"/>
+            <view key="contentView" id="3pz-HL-mV1">
+                <rect key="frame" x="0.0" y="0.0" width="300" height="400"/>
+                <autoresizingMask key="autoresizingMask"/>
+                <subviews>
+                    <scrollView borderType="none" autohidesScrollers="YES" horizontalLineScroll="0.0" horizontalPageScroll="0.0" verticalLineScroll="10" verticalPageScroll="10" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" horizontalScrollElasticity="none" id="VQ6-PE-hTH">
+                        <rect key="frame" x="0.0" y="4" width="300" height="392"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <clipView key="contentView" drawsBackground="NO" copiesOnScroll="NO" id="HWy-NN-aOV">
+                            <rect key="frame" x="0.0" y="0.0" width="300" height="392"/>
+                            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                            <subviews>
+                                <view id="F2h-9b-Ouu" customClass="ACMenuView">
+                                    <rect key="frame" x="0.0" y="0.0" width="300" height="392"/>
+                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
+                                </view>
+                            </subviews>
+                            <color key="backgroundColor" name="windowBackgroundColor" catalog="System" colorSpace="catalog"/>
+                        </clipView>
+                        <scroller key="horizontalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="YES" id="Az6-1a-Hei">
+                            <rect key="frame" x="-100" y="-100" width="168" height="15"/>
+                            <autoresizingMask key="autoresizingMask"/>
+                        </scroller>
+                        <scroller key="verticalScroller" hidden="YES" verticalHuggingPriority="750" doubleValue="1" horizontal="NO" id="tng-g2-1LZ" customClass="ACScroller">
+                            <rect key="frame" x="285" y="0.0" width="15" height="392"/>
+                            <autoresizingMask key="autoresizingMask"/>
+                        </scroller>
+                    </scrollView>
+                </subviews>
+            </view>
+            <point key="canvasLocation" x="127" y="73"/>
+        </window>
+    </objects>
+</document>

Ample/Base.lproj/CheatSheet.xib

@@ -0,0 +1,29 @@
+<?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">
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="15705"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <customObject id="-2" userLabel="File's Owner" customClass="CheatSheetWindowController">
+            <connections>
+                <outlet property="window" destination="QvC-M9-y7g" id="U2v-sN-OzH"/>
+            </connections>
+        </customObject>
+        <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
+        <customObject id="-3" userLabel="Application" customClass="NSObject"/>
+        <window title="Keyboard Cheat Sheet" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" animationBehavior="default" id="QvC-M9-y7g">
+            <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES"/>
+            <rect key="contentRect" x="196" y="240" width="640" height="640"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="2560" height="1417"/>
+            <view key="contentView" wantsLayer="YES" id="EiT-Mj-1SZ">
+                <rect key="frame" x="0.0" y="0.0" width="640" height="640"/>
+                <autoresizingMask key="autoresizingMask"/>
+            </view>
+            <connections>
+                <outlet property="delegate" destination="-2" id="u4H-aq-RE2"/>
+            </connections>
+            <point key="canvasLocation" x="42" y="198"/>
+        </window>
+    </objects>
+</document>

Ample/Base.lproj/Credits.rtf

@@ -1,14 +1,15 @@
 {\rtf1\ansi\ansicpg1252\cocoartf1671\cocoasubrtf600
 {\fonttbl\f0\fswiss\fcharset0 Helvetica-Bold;\f1\fswiss\fcharset0 Helvetica;}
-{\colortbl;\red255\green255\blue255;\red0\green0\blue0;\red255\green255\blue255;}
-{\*\expandedcolortbl;;\cssrgb\c0\c0\c0;\cssrgb\c100000\c100000\c100000;}
+{\colortbl;\red255\green255\blue255;\red0\green0\blue0;\red255\green255\blue255;\red38\green38\blue38;
+}
+{\*\expandedcolortbl;;\cssrgb\c0\c0\c0;\cssrgb\c100000\c100000\c100000;\cssrgb\c20000\c20000\c20000;
+}
 \margl1440\margr1440\vieww9000\viewh8400\viewkind0
 \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural\partightenfactor0
 
 \f0\b\fs36 \cf2 Ample\cf0  
 \f1\b0\fs28 would like to thank\'85\
-\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural\partightenfactor0
-\cf0 \
+\
 \pard\pardeftab720\qc\partightenfactor0
 {\field{\*\fldinst{HYPERLINK "https://www.mamedev.org"}}{\fldrslt 
 \f0\b\fs36 \cf0 \cb3 \expnd0\expndtw0\kerning0
@@ -30,4 +31,26 @@ Please note that MAME is a registered trademark of Gregory Ember, and permission
 \cf0 \
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qj\partightenfactor0
 \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}}
+\f0\b\fs36 \cb3 \expnd0\expndtw0\kerning0
+\
+\pard\pardeftab720\qj\partightenfactor0
+
+\f1\b0\fs28 \cf0 \
+\pard\pardeftab720\qj\partightenfactor0
+\cf4 R.C. Steadman, 6-1-\'9221.\
+\
+U.S. Department of Agriculture Pomological Watercolor Collection. Rare and Special Collections, National Agricultural Library, Beltsville, MD 20705}

Ample/Base.lproj/DiskImages.xib

@@ -0,0 +1,159 @@
+<?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">
+    <dependencies>
+        <deployment identifier="macosx"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="15705"/>
+        <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"/>
+            </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>
+            <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"/>
+            </connections>
+        </arrayController>
+        <menu id="bCS-1z-UOZ">
+            <items>
+                <menuItem title="Show in Finder" tag="1" id="roc-SG-geJ">
+                    <modifierMask key="keyEquivalentModifierMask"/>
+                    <connections>
+                        <action selector="showInFinder:" target="-2" id="ViY-7R-MNV"/>
+                    </connections>
+                </menuItem>
+                <menuItem title="Eject" tag="2" id="eJ1-Kd-hnR">
+                    <modifierMask key="keyEquivalentModifierMask"/>
+                    <connections>
+                        <action selector="eject:" target="-2" id="c6U-xB-EnM"/>
+                    </connections>
+                </menuItem>
+            </items>
+            <connections>
+                <outlet property="delegate" destination="-2" id="22a-3e-eaK"/>
+            </connections>
+            <point key="canvasLocation" x="-667" y="170"/>
+        </menu>
+    </objects>
+</document>

Ample/Base.lproj/DownloadWindow.xib

@@ -8,53 +8,42 @@
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="DownloadWindowController">
             <connections>
+                <outlet property="allFilterButton" destination="Kgj-LP-FsF" id="yub-s9-RVW"/>
+                <outlet property="arrayController" destination="jhO-4z-Qwt" id="GHu-xb-4zU"/>
+                <outlet property="downloadField" destination="sJz-So-jbA" id="WjK-48-FcE"/>
+                <outlet property="formatButton" destination="2Rg-eX-DUq" id="oYo-MG-Sc6"/>
+                <outlet property="missingFilterButton" destination="6c7-tU-3F3" id="89Y-wQ-9pB"/>
                 <outlet property="tableView" destination="FLX-Wt-y53" id="a4O-pk-EAt"/>
                 <outlet property="window" destination="F0z-JX-Cv5" id="gIp-Ho-8D9"/>
             </connections>
         </customObject>
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
         <customObject id="-3" userLabel="Application" customClass="NSObject"/>
-        <window title="ROMs" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" animationBehavior="default" id="F0z-JX-Cv5">
+        <window title="ROMs" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" frameAutosaveName="DownloadManagerWindow" animationBehavior="default" id="F0z-JX-Cv5">
             <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES"/>
-            <rect key="contentRect" x="196" y="240" width="400" height="500"/>
+            <rect key="contentRect" x="196" y="240" width="454" height="575"/>
             <rect key="screenRect" x="0.0" y="0.0" width="2560" height="1417"/>
-            <value key="minSize" type="size" width="300" height="300"/>
+            <value key="minSize" type="size" width="454" height="300"/>
             <view key="contentView" id="se5-gp-TjO">
-                <rect key="frame" x="0.0" y="0.0" width="400" height="500"/>
-                <autoresizingMask key="autoresizingMask"/>
+                <rect key="frame" x="0.0" y="0.0" width="454" height="575"/>
+                <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                 <subviews>
-                    <button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="rg5-Qf-4Mw">
-                        <rect key="frame" x="324" y="19" width="56" height="23"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
-                        <buttonCell key="cell" type="roundTextured" title="Cancel" bezelStyle="texturedRounded" alignment="center" lineBreakMode="truncatingTail" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="i6Z-OM-lqE">
-                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                            <font key="font" metaFont="system"/>
-                            <string key="keyEquivalent">.</string>
-                            <modifierMask key="keyEquivalentModifierMask" command="YES"/>
-                            <connections>
-                                <binding destination="-2" name="enabled" keyPath="self.active" id="mBP-8S-yGB"/>
-                            </connections>
-                        </buttonCell>
-                        <connections>
-                            <action selector="cancelAll:" target="-2" id="ycl-eJ-ByB"/>
-                        </connections>
-                    </button>
                     <scrollView fixedFrame="YES" autohidesScrollers="YES" horizontalLineScroll="51" horizontalPageScroll="10" verticalLineScroll="51" verticalPageScroll="10" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="CMD-nT-mEa">
-                        <rect key="frame" x="0.0" y="58" width="402" height="443"/>
+                        <rect key="frame" x="0.0" y="130" width="456" height="446"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <clipView key="contentView" ambiguous="YES" drawsBackground="NO" id="Igp-aH-flp">
-                            <rect key="frame" x="1" y="1" width="400" height="441"/>
+                            <rect key="frame" x="1" y="1" width="454" height="444"/>
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                             <subviews>
-                                <tableView verticalHuggingPriority="750" ambiguous="YES" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" selectionHighlightStyle="none" alternatingRowBackgroundColors="YES" columnReordering="NO" columnResizing="NO" multipleSelection="NO" autosaveColumns="NO" rowHeight="49" rowSizeStyle="automatic" viewBased="YES" id="FLX-Wt-y53">
-                                    <rect key="frame" x="0.0" y="0.0" width="400" height="441"/>
+                                <tableView verticalHuggingPriority="750" ambiguous="YES" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" alternatingRowBackgroundColors="YES" columnReordering="NO" columnResizing="NO" multipleSelection="NO" autosaveColumns="NO" rowHeight="49" rowSizeStyle="automatic" viewBased="YES" id="FLX-Wt-y53">
+                                    <rect key="frame" x="0.0" y="0.0" width="454" height="444"/>
                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                     <size key="intercellSpacing" width="3" height="2"/>
                                     <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
                                     <tableViewGridLines key="gridStyleMask" dashed="YES"/>
                                     <color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
                                     <tableColumns>
-                                        <tableColumn width="397" minWidth="40" maxWidth="1000" id="5jP-bY-fhI">
+                                        <tableColumn width="451" minWidth="40" maxWidth="1000" id="5jP-bY-fhI">
                                             <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border">
                                                 <font key="font" metaFont="smallSystem"/>
                                                 <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
@@ -67,63 +56,67 @@
                                             </textFieldCell>
                                             <tableColumnResizingMask key="resizingMask" resizeWithTable="YES"/>
                                             <prototypeCellViews>
-                                                <tableCellView identifier="Cell" focusRingType="none" id="aBv-F5-XWo">
-                                                    <rect key="frame" x="1" y="1" width="397" height="17"/>
-                                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                                                    <subviews>
-                                                        <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="pWm-hb-BXB">
-                                                            <rect key="frame" x="0.0" y="0.0" width="397" height="17"/>
-                                                            <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
-                                                            <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Table View Cell" id="p71-gJ-vFV">
-                                                                <font key="font" metaFont="system"/>
-                                                                <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
-                                                                <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
-                                                            </textFieldCell>
-                                                        </textField>
-                                                    </subviews>
-                                                    <connections>
-                                                        <outlet property="textField" destination="pWm-hb-BXB" id="NNG-rj-AAQ"/>
-                                                    </connections>
-                                                </tableCellView>
-                                                <tableCellView identifier="DownloadCell" focusRingType="none" id="onK-6l-2iV" customClass="DownloadTableCellView">
-                                                    <rect key="frame" x="1" y="20" width="397" height="49"/>
+                                                <tableCellView focusRingType="none" id="onK-6l-2iV">
+                                                    <rect key="frame" x="1" y="1" width="451" height="49"/>
                                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                     <subviews>
                                                         <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="A44-us-TEl">
-                                                            <rect key="frame" x="25" y="28" width="371" height="17"/>
+                                                            <rect key="frame" x="25" y="28" width="425" 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"/>
                                                                 <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                                                                 <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                                             </textFieldCell>
+                                                            <connections>
+                                                                <binding destination="onK-6l-2iV" name="value" keyPath="objectValue.name" id="t1L-kM-AW6">
+                                                                    <dictionary key="options">
+                                                                        <string key="NSMultipleValuesPlaceholder">multiple</string>
+                                                                        <string key="NSNoSelectionPlaceholder">no selection</string>
+                                                                        <string key="NSNotApplicablePlaceholder">n/a</string>
+                                                                        <string key="NSNullPlaceholder">null</string>
+                                                                    </dictionary>
+                                                                </binding>
+                                                                <binding destination="onK-6l-2iV" name="textColor" keyPath="objectValue.titleColor" id="0Qx-rz-DEZ"/>
+                                                            </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="371" height="17"/>
+                                                            <rect key="frame" x="25" y="3" width="425" 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"/>
                                                                 <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                                                                 <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                                             </textFieldCell>
+                                                            <connections>
+                                                                <binding destination="onK-6l-2iV" name="textColor" keyPath="objectValue.descriptionColor" id="KVi-3N-Swm"/>
+                                                                <binding destination="onK-6l-2iV" name="value" keyPath="objectValue.statusDescription" id="yV1-5r-YDh"/>
+                                                            </connections>
                                                         </textField>
                                                     </subviews>
                                                     <connections>
-                                                        <outlet property="activity" destination="jBN-UJ-tWi" id="ZwD-yU-Vne"/>
-                                                        <outlet property="statusTextField" destination="hfu-hP-QAH" id="8Hv-BB-kYA"/>
-                                                        <outlet property="textField" destination="A44-us-TEl" id="Ta5-nd-ed1"/>
+                                                        <outlet property="textField" destination="A44-us-TEl" id="ude-er-Gm4"/>
                                                     </connections>
                                                 </tableCellView>
                                             </prototypeCellViews>
+                                            <connections>
+                                                <binding destination="jhO-4z-Qwt" name="value" keyPath="arrangedObjects.selection" id="KQP-Xo-Fbf"/>
+                                            </connections>
                                         </tableColumn>
                                     </tableColumns>
                                     <connections>
-                                        <outlet property="dataSource" destination="-2" id="Ghf-k9-bRK"/>
-                                        <outlet property="delegate" destination="-2" id="rpR-0W-4Nu"/>
+                                        <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>
                                 </tableView>
@@ -139,10 +132,22 @@
                             <autoresizingMask key="autoresizingMask"/>
                         </scroller>
                     </scrollView>
+                    <textField verticalHuggingPriority="750" fixedFrame="YES" textCompletion="NO" translatesAutoresizingMaskIntoConstraints="NO" id="sJz-So-jbA">
+                        <rect key="frame" x="51" y="101" width="383" height="21"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
+                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" drawsBackground="YES" id="HKe-di-YSs">
+                            <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="downloadURLChanged:" target="-2" id="ah1-QS-G27"/>
+                        </connections>
+                    </textField>
                     <button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Fhd-vr-Q2G">
-                        <rect key="frame" x="20" y="19" width="124" height="23"/>
+                        <rect key="frame" x="208" y="13" width="150" height="32"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                        <buttonCell key="cell" type="roundTextured" title="Download Missing" bezelStyle="texturedRounded" alignment="center" lineBreakMode="truncatingTail" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="AKx-eg-iLS">
+                        <buttonCell key="cell" type="push" title="Download Missing" bezelStyle="rounded" alignment="center" lineBreakMode="truncatingTail" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="AKx-eg-iLS">
                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                             <font key="font" metaFont="system"/>
                         </buttonCell>
@@ -155,12 +160,134 @@
                             </binding>
                         </connections>
                     </button>
+                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="d2z-4T-Wh1">
+                        <rect key="frame" x="10" y="104" width="30" height="16"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                        <textFieldCell key="cell" lineBreakMode="clipping" title="URL" id="lcZ-R4-WsS">
+                            <font key="font" metaFont="system"/>
+                            <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                            <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                        </textFieldCell>
+                    </textField>
+                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="ZXO-bJ-btp">
+                        <rect key="frame" x="10" y="66" width="34" height="16"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                        <textFieldCell key="cell" lineBreakMode="clipping" title="Type" id="KGI-t9-OMF">
+                            <font key="font" metaFont="system"/>
+                            <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                            <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                        </textFieldCell>
+                    </textField>
+                    <box verticalHuggingPriority="750" fixedFrame="YES" boxType="separator" translatesAutoresizingMaskIntoConstraints="NO" id="AuM-pD-Gul">
+                        <rect key="frame" x="12" y="52" width="422" height="5"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
+                    </box>
+                    <button verticalHuggingPriority="750" fixedFrame="YES" imageHugsTitle="YES" translatesAutoresizingMaskIntoConstraints="NO" id="dpY-qZ-2Nk">
+                        <rect key="frame" x="93" y="13" width="115" height="32"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                        <buttonCell key="cell" type="push" title="ROMs" bezelStyle="rounded" image="NSFolder" imagePosition="left" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="E0t-sX-rgE">
+                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                            <font key="font" metaFont="system"/>
+                        </buttonCell>
+                        <connections>
+                            <action selector="showRomFolder:" target="-2" id="bys-Vs-b4m"/>
+                        </connections>
+                    </button>
+                    <button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Lnv-mh-zAr">
+                        <rect key="frame" x="6" y="13" width="87" height="32"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                        <buttonCell key="cell" type="push" title="Refresh" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="mYS-h7-GUa">
+                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                            <font key="font" metaFont="system"/>
+                            <string key="keyEquivalent">r</string>
+                            <modifierMask key="keyEquivalentModifierMask" command="YES"/>
+                        </buttonCell>
+                        <connections>
+                            <action selector="refreshROMs:" target="-2" id="E7j-Fa-IN1"/>
+                        </connections>
+                    </button>
+                    <popUpButton verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="2Rg-eX-DUq">
+                        <rect key="frame" x="49" y="60" width="98" height="25"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                        <popUpButtonCell key="cell" type="push" title="zip" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" tag="1" imageScaling="proportionallyDown" inset="2" autoenablesItems="NO" selectedItem="7Cq-Lh-dgg" id="uum-dC-XD0">
+                            <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
+                            <font key="font" metaFont="menu"/>
+                            <menu key="menu" autoenablesItems="NO" id="kcg-aZ-mD9">
+                                <items>
+                                    <menuItem title="zip" state="on" tag="1" id="7Cq-Lh-dgg"/>
+                                    <menuItem title="7z" tag="2" id="s5r-gg-Ma9"/>
+                                </items>
+                            </menu>
+                        </popUpButtonCell>
+                        <connections>
+                            <action selector="downloadExtensionChanged:" target="-2" id="tp2-tg-bms"/>
+                            <binding destination="-2" name="selectedTag" keyPath="self.downloadExtension" id="uck-nA-UPg">
+                                <dictionary key="options">
+                                    <string key="NSValueTransformerName">DownloadExtensionTransformer</string>
+                                </dictionary>
+                            </binding>
+                        </connections>
+                    </popUpButton>
+                    <button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="rg5-Qf-4Mw">
+                        <rect key="frame" x="358" y="13" width="82" height="32"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                        <buttonCell key="cell" type="push" title="Cancel" bezelStyle="rounded" alignment="center" lineBreakMode="truncatingTail" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="i6Z-OM-lqE">
+                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                            <font key="font" metaFont="system"/>
+                            <string key="keyEquivalent">.</string>
+                            <modifierMask key="keyEquivalentModifierMask" command="YES"/>
+                            <connections>
+                                <binding destination="-2" name="enabled" keyPath="self.active" id="mBP-8S-yGB"/>
+                            </connections>
+                        </buttonCell>
+                        <connections>
+                            <action selector="cancelAll:" target="-2" id="ycl-eJ-ByB"/>
+                        </connections>
+                    </button>
                 </subviews>
             </view>
+            <toolbar key="toolbar" implicitIdentifier="B60021E6-BFBC-44E6-97DC-120AA9FD3269" autosavesConfiguration="NO" allowsUserCustomization="NO" displayMode="iconOnly" sizeMode="regular" id="kpz-W4-xgh">
+                <allowedToolbarItems>
+                    <toolbarItem implicitItemIdentifier="NSToolbarSpaceItem" id="tbY-ts-Irb"/>
+                    <toolbarItem implicitItemIdentifier="NSToolbarFlexibleSpaceItem" id="3Kc-zG-IdN"/>
+                    <toolbarItem implicitItemIdentifier="BD743A15-0B61-48FF-9EED-FD8D57EF8459" label="All" paletteLabel="All" tag="1" sizingBehavior="auto" id="Jj0-n8-I5a">
+                        <nil key="toolTip"/>
+                        <button key="view" verticalHuggingPriority="750" tag="1" id="Kgj-LP-FsF">
+                            <rect key="frame" x="0.0" y="14" width="74" height="20"/>
+                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                            <buttonCell key="cell" type="recessed" title="All" bezelStyle="recessed" alignment="center" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="9s7-S1-hW1">
+                                <behavior key="behavior" lightByBackground="YES" lightByGray="YES" changeBackground="YES" changeGray="YES"/>
+                                <font key="font" metaFont="systemBold" size="12"/>
+                            </buttonCell>
+                            <connections>
+                                <action selector="filterButton:" target="-2" id="gTc-Ul-FYR"/>
+                            </connections>
+                        </button>
+                    </toolbarItem>
+                    <toolbarItem implicitItemIdentifier="5B013840-E582-4568-8448-DDD7EE1E5AE2" label="Missing" paletteLabel="Missing" tag="2" sizingBehavior="auto" id="GV4-aX-5Ox">
+                        <nil key="toolTip"/>
+                        <button key="view" verticalHuggingPriority="750" tag="2" id="6c7-tU-3F3">
+                            <rect key="frame" x="0.0" y="14" width="74" height="20"/>
+                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                            <buttonCell key="cell" type="recessed" title="Missing" bezelStyle="recessed" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="ui2-dz-IZj">
+                                <behavior key="behavior" lightByBackground="YES" lightByGray="YES" changeBackground="YES" changeGray="YES"/>
+                                <font key="font" metaFont="systemBold" size="12"/>
+                            </buttonCell>
+                            <connections>
+                                <action selector="filterButton:" target="-2" id="R6W-hU-oqL"/>
+                            </connections>
+                        </button>
+                    </toolbarItem>
+                </allowedToolbarItems>
+                <defaultToolbarItems>
+                    <toolbarItem reference="Jj0-n8-I5a"/>
+                    <toolbarItem reference="GV4-aX-5Ox"/>
+                </defaultToolbarItems>
+            </toolbar>
             <connections>
                 <outlet property="delegate" destination="-2" id="0bl-1N-AYu"/>
             </connections>
-            <point key="canvasLocation" x="142" y="179"/>
+            <point key="canvasLocation" x="59" y="119.5"/>
         </window>
         <menu id="RJM-21-hjO">
             <items>
@@ -188,5 +315,10 @@
             </connections>
             <point key="canvasLocation" x="-348" y="164"/>
         </menu>
+        <arrayController objectClassName="DownloadItem" editable="NO" preservesSelection="NO" selectsInsertedObjects="NO" avoidsEmptySelection="NO" clearsFilterPredicateOnInsertion="NO" automaticallyRearrangesObjects="YES" id="jhO-4z-Qwt" customClass="DownloadItemArrayController"/>
+        <userDefaultsController representsSharedInstance="YES" id="721-9N-Bma"/>
     </objects>
+    <resources>
+        <image name="NSFolder" width="32" height="32"/>
+    </resources>
 </document>

Ample/Base.lproj/LaunchWindow.xib

@@ -8,96 +8,196 @@
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="LaunchWindowController">
             <connections>
+                <outlet property="addBookmarkWindow" destination="yIt-hP-HBq" id="Qhx-WV-cg4"/>
+                <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="RgH-d9-xl8" id="DIa-h0-6y2"/>
+                <outlet property="machineViewController" destination="FSD-3v-Wni" id="tXv-zJ-QO3"/>
                 <outlet property="mediaController" destination="t7c-zy-czN" id="a7d-HC-TWx"/>
                 <outlet property="mediaView" destination="J9O-xI-P5J" id="PmZ-VC-4SN"/>
                 <outlet property="slotController" destination="lyS-mc-3Tf" id="LXo-Ii-fDX"/>
                 <outlet property="slotView" destination="P9d-sS-qEb" id="qlH-u0-hzq"/>
+                <outlet property="softwareListControl" destination="pNl-g4-ZLh" id="U0i-R9-GLE"/>
                 <outlet property="window" destination="Vze-YF-m6e" id="JUs-Eb-MW8"/>
             </connections>
         </customObject>
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
         <customObject id="-3" userLabel="Application" customClass="NSObject"/>
-        <window title="Ample" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" animationBehavior="default" id="Vze-YF-m6e">
+        <window title="Ample" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" frameAutosaveName="LaunchWindow" animationBehavior="default" id="Vze-YF-m6e">
             <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES"/>
-            <rect key="contentRect" x="335" y="390" width="718" height="795"/>
+            <rect key="contentRect" x="335" y="390" width="1000" height="640"/>
             <rect key="screenRect" x="0.0" y="0.0" width="2560" height="1417"/>
             <view key="contentView" id="Ssv-Jw-EE0">
-                <rect key="frame" x="0.0" y="0.0" width="718" height="795"/>
+                <rect key="frame" x="0.0" y="0.0" width="1000" height="640"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
-                    <customView fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="oVt-eD-aaj">
-                        <rect key="frame" x="0.0" y="615" width="718" height="180"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
-                    </customView>
-                    <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" textCompletion="NO" translatesAutoresizingMaskIntoConstraints="NO" id="pKK-yY-vnY">
-                        <rect key="frame" x="0.0" y="0.0" width="718" height="52"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
-                        <textFieldCell key="cell" selectable="YES" allowsUndo="NO" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" drawsBackground="YES" id="bk2-0p-jUj">
-                            <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>
-                            <binding destination="-2" name="value" keyPath="self.commandLine" id="9gW-Y2-kvp"/>
-                        </connections>
-                    </textField>
-                    <button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="nKp-px-nHg">
-                        <rect key="frame" x="587" y="58" width="111" height="23"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
-                        <buttonCell key="cell" type="roundTextured" title="Launch" bezelStyle="texturedRounded" image="NSAppleMenuImage" imagePosition="left" alignment="center" borderStyle="border" inset="2" id="Ct1-Rb-7uI">
-                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                            <font key="font" metaFont="system"/>
-                            <string key="keyEquivalent" base64-UTF8="YES">
-DQ
-</string>
-                            <modifierMask key="keyEquivalentModifierMask" command="YES"/>
-                        </buttonCell>
-                        <connections>
-                            <action selector="launchAction:" target="-2" id="a4d-zv-1CU"/>
-                        </connections>
-                    </button>
-                    <button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="nNO-3T-OAy">
-                        <rect key="frame" x="470" y="58" width="109" height="23"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
-                        <buttonCell key="cell" type="roundTextured" title="Reset Slots" bezelStyle="texturedRounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="Uii-5h-2R2">
-                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                            <font key="font" metaFont="system"/>
-                            <string key="keyEquivalent">r</string>
-                            <modifierMask key="keyEquivalentModifierMask" command="YES"/>
-                        </buttonCell>
-                        <connections>
-                            <action selector="resetSlots:" target="lyS-mc-3Tf" id="1qi-N0-Q8B"/>
-                        </connections>
-                    </button>
                     <customView id="P9d-sS-qEb" customClass="FlippedView">
-                        <rect key="frame" x="20" y="92" width="306" height="363"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                        <rect key="frame" x="302" y="105" width="316" height="363"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
                     </customView>
-                    <tabView initialItem="nr5-4o-DyG" id="l8R-bg-6Zm">
-                        <rect key="frame" x="13" y="453" width="692" height="160"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
+                    <tabView initialItem="zUN-Qs-haG" id="l8R-bg-6Zm">
+                        <rect key="frame" x="295" y="466" width="692" height="160"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
                         <font key="font" metaFont="system"/>
                         <tabViewItems>
-                            <tabViewItem label="Options" identifier="" id="nr5-4o-DyG">
-                                <view key="view" id="ElY-YI-LLI">
+                            <tabViewItem label="Video" identifier="" id="zUN-Qs-haG">
+                                <view key="view" id="QQT-HS-xjI">
                                     <rect key="frame" x="10" y="33" width="672" height="114"/>
                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                     <subviews>
-                                        <button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="zVI-uU-muo">
-                                            <rect key="frame" x="15" y="60" width="71" height="18"/>
+                                        <popUpButton verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="pD8-dV-ijg">
+                                            <rect key="frame" x="143" y="87" width="172" height="25"/>
                                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                                            <buttonCell key="cell" type="check" title="Window" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="vx1-I7-8kN">
+                                            <popUpButtonCell key="cell" type="push" title="Default" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" selectedItem="g0W-Ka-7bb" id="ceP-aK-me8">
+                                                <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
+                                                <font key="font" metaFont="menu"/>
+                                                <menu key="menu" id="ajo-1k-sbD">
+                                                    <items>
+                                                        <menuItem title="Default" state="on" id="g0W-Ka-7bb"/>
+                                                        <menuItem title="Metal" tag="1" id="93g-cb-opl"/>
+                                                        <menuItem title="OpenGL" tag="2" id="B1R-9E-dMw"/>
+                                                    </items>
+                                                </menu>
+                                            </popUpButtonCell>
+                                            <connections>
+                                                <binding destination="-2" name="enabled" keyPath="self.mameBGFX" id="ZuQ-OY-TrP"/>
+                                                <binding destination="-2" name="selectedIndex" keyPath="self.mameBackend" id="oE1-Ho-H22"/>
+                                            </connections>
+                                        </popUpButton>
+                                        <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="qGO-Pm-SD1">
+                                            <rect key="frame" x="79" y="92" width="60" height="16"/>
+                                            <autoresizingMask key="autoresizingMask"/>
+                                            <textFieldCell key="cell" lineBreakMode="clipping" title="Backend:" id="WDr-Pl-lV1">
+                                                <font key="font" metaFont="system"/>
+                                                <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                                                <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                            </textFieldCell>
+                                        </textField>
+                                        <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="ctE-fX-twN">
+                                            <rect key="frame" x="318" y="92" width="51" height="16"/>
+                                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                                            <textFieldCell key="cell" lineBreakMode="clipping" title="Effects:" id="Sqk-7k-PxQ">
+                                                <font key="font" metaFont="system"/>
+                                                <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                                                <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                            </textFieldCell>
+                                        </textField>
+                                        <button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="826-p8-in8">
+                                            <rect key="frame" x="15" y="91" width="57" height="18"/>
+                                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                                            <buttonCell key="cell" type="check" title="BGFX" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="Ubs-KZ-mpu">
                                                 <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                                                 <font key="font" metaFont="system"/>
                                             </buttonCell>
                                             <connections>
-                                                <binding destination="-2" name="value" keyPath="self.mameWindow" id="uS7-cg-wqb"/>
+                                                <binding destination="-2" name="value" keyPath="self.mameBGFX" id="9Ua-MZ-qbe"/>
                                             </connections>
                                         </button>
+                                        <popUpButton verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="hM8-FM-Agh">
+                                            <rect key="frame" x="382" y="87" width="174" height="25"/>
+                                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                                            <popUpButtonCell key="cell" type="push" title="Default" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" selectedItem="Dsm-bi-Txy" id="mBS-h4-BWC">
+                                                <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
+                                                <font key="font" metaFont="menu"/>
+                                                <menu key="menu" id="WdF-Hw-YI9">
+                                                    <items>
+                                                        <menuItem title="Default" state="on" id="Dsm-bi-Txy">
+                                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                                        </menuItem>
+                                                        <menuItem title="Unfiltered" tag="1" id="xgz-We-TFg">
+                                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                                        </menuItem>
+                                                        <menuItem title="HLSL" tag="2" id="1UE-ea-V9a">
+                                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                                        </menuItem>
+                                                        <menuItem title="CRT Geometry" tag="3" id="Dsx-wI-m3r">
+                                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                                        </menuItem>
+                                                        <menuItem title="CRT Geometry Deluxe" tag="4" id="Ylw-Of-TM5">
+                                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                                        </menuItem>
+                                                        <menuItem title="LCD Grid" tag="5" id="A6k-ku-z2M">
+                                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                                        </menuItem>
+                                                    </items>
+                                                </menu>
+                                            </popUpButtonCell>
+                                            <connections>
+                                                <binding destination="-2" name="enabled" keyPath="self.mameBGFX" id="DVB-Ex-VYF"/>
+                                                <binding destination="-2" name="selectedIndex" keyPath="self.mameEffects" id="rCg-d6-OR6"/>
+                                            </connections>
+                                        </popUpButton>
+                                        <button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="D5h-dm-fuZ">
+                                            <rect key="frame" x="318" y="60" width="104" height="18"/>
+                                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                                            <buttonCell key="cell" type="check" title="Square Pixels" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="yWK-BP-7Z9">
+                                                <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+                                                <font key="font" metaFont="system"/>
+                                            </buttonCell>
+                                            <connections>
+                                                <binding destination="-2" name="value" keyPath="self.mameSquarePixels" id="BiP-wC-Hpn"/>
+                                                <binding destination="-2" name="enabled" keyPath="self.mameWindowMode" id="X80-2K-kTO"/>
+                                            </connections>
+                                        </button>
+                                        <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="6gd-45-eLr">
+                                            <rect key="frame" x="15" y="60" width="94" height="16"/>
+                                            <autoresizingMask key="autoresizingMask"/>
+                                            <textFieldCell key="cell" lineBreakMode="clipping" title="Window Mode:" id="l8n-CI-o4t">
+                                                <font key="font" metaFont="system"/>
+                                                <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                                                <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                            </textFieldCell>
+                                        </textField>
+                                        <popUpButton verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="sei-LG-VM6">
+                                            <rect key="frame" x="143" y="55" width="172" height="25"/>
+                                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                                            <popUpButtonCell key="cell" type="push" title="Full Screen" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" selectedItem="0zZ-Ib-Fne" id="lsw-Vk-WcZ">
+                                                <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
+                                                <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"/>
+                                                    </items>
+                                                </menu>
+                                            </popUpButtonCell>
+                                            <connections>
+                                                <binding destination="-2" name="selectedIndex" keyPath="self.mameWindowMode" id="B9e-SK-3RY"/>
+                                            </connections>
+                                        </popUpButton>
+                                        <button verticalHuggingPriority="750" id="9Db-wA-FP9">
+                                            <rect key="frame" x="15" y="29" width="115" height="18"/>
+                                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                                            <buttonCell key="cell" type="check" title="Capture Mouse" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="3xh-Q7-WFl">
+                                                <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+                                                <font key="font" metaFont="system"/>
+                                            </buttonCell>
+                                            <connections>
+                                                <binding destination="-2" name="value" keyPath="self.mameMouse" id="vWu-od-2d6"/>
+                                            </connections>
+                                        </button>
+                                        <button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="XNa-8k-X89">
+                                            <rect key="frame" x="143" y="29" width="137" height="18"/>
+                                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                                            <buttonCell key="cell" type="check" title="Disk Sound Effects" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="MBT-Uv-Lev">
+                                                <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+                                                <font key="font" metaFont="system"/>
+                                            </buttonCell>
+                                            <connections>
+                                                <binding destination="-2" name="value" keyPath="self.mameSamples" id="77G-8C-HgT"/>
+                                            </connections>
+                                        </button>
+                                    </subviews>
+                                </view>
+                            </tabViewItem>
+                            <tabViewItem label="CPU" identifier="" id="nr5-4o-DyG">
+                                <view key="view" id="ElY-YI-LLI">
+                                    <rect key="frame" x="10" y="33" width="672" height="114"/>
+                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                                    <subviews>
                                         <button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="ZUp-ni-Rr6">
-                                            <rect key="frame" x="15" y="29" width="62" height="18"/>
+                                            <rect key="frame" x="15" y="60" width="62" height="18"/>
                                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                             <buttonCell key="cell" type="check" title="Debug" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="6is-QN-JEc">
                                                 <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
@@ -107,34 +207,21 @@ DQ
                                                 <binding destination="-2" name="value" keyPath="self.mameDebug" id="vkc-sR-KnB"/>
                                             </connections>
                                         </button>
-                                        <button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="D5h-dm-fuZ">
-                                            <rect key="frame" x="165" y="60" width="104" height="18"/>
+                                        <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="PGK-yK-2ZK">
+                                            <rect key="frame" x="15" y="91" width="43" height="16"/>
                                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                                            <buttonCell key="cell" type="check" title="Square Pixels" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="yWK-BP-7Z9">
-                                                <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+                                            <textFieldCell key="cell" lineBreakMode="clipping" title="Speed" id="D9w-Mz-PXs">
                                                 <font key="font" metaFont="system"/>
-                                            </buttonCell>
-                                            <connections>
-                                                <binding destination="-2" name="value" keyPath="self.mameSquarePixels" id="BiP-wC-Hpn"/>
-                                            </connections>
-                                        </button>
-                                        <button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="zoQ-mU-ARl">
-                                            <rect key="frame" x="315" y="60" width="67" height="18"/>
-                                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                                            <buttonCell key="cell" type="check" title="No Blur" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="r3s-5h-Xv5">
-                                                <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
-                                                <font key="font" metaFont="system"/>
-                                            </buttonCell>
-                                            <connections>
-                                                <binding destination="-2" name="value" keyPath="self.mameNoBlur" id="Pvn-zw-OsQ"/>
-                                            </connections>
-                                        </button>
+                                                <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                                                <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                            </textFieldCell>
+                                        </textField>
                                         <popUpButton verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="FE4-gG-fPb">
-                                            <rect key="frame" x="62" y="87" width="107" height="25"/>
+                                            <rect key="frame" x="62" y="86" width="109" height="25"/>
                                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                             <popUpButtonCell key="cell" type="push" title="100%" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" tag="1" imageScaling="proportionallyDown" inset="2" selectedItem="yoI-Ra-evu" id="M40-f0-awc">
                                                 <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
-                                                <font key="font" metaFont="system"/>
+                                                <font key="font" metaFont="menu"/>
                                                 <menu key="menu" id="8Tv-0j-JhQ">
                                                     <items>
                                                         <menuItem title="100%" state="on" tag="1" id="yoI-Ra-evu"/>
@@ -150,15 +237,6 @@ DQ
                                                 <binding destination="-2" name="selectedTag" keyPath="self.mameSpeed" id="nFG-yA-KC1"/>
                                             </connections>
                                         </popUpButton>
-                                        <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="PGK-yK-2ZK">
-                                            <rect key="frame" x="15" y="93" width="43" height="16"/>
-                                            <autoresizingMask key="autoresizingMask"/>
-                                            <textFieldCell key="cell" lineBreakMode="clipping" title="Speed" id="D9w-Mz-PXs">
-                                                <font key="font" metaFont="system"/>
-                                                <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
-                                                <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
-                                            </textFieldCell>
-                                        </textField>
                                     </subviews>
                                 </view>
                             </tabViewItem>
@@ -192,7 +270,7 @@ DQ
                                         <textField verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="5Yf-ZJ-8kx">
                                             <rect key="frame" x="132" y="59" width="523" 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.wav" drawsBackground="YES" id="Xqc-zw-28b">
+                                            <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" placeholderString="/path/to/file.wav" drawsBackground="YES" usesSingleLineMode="YES" id="Xqc-zw-28b">
                                                 <font key="font" metaFont="system"/>
                                                 <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                                                 <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
@@ -209,7 +287,7 @@ DQ
                                         <textField verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="ne8-5I-D1H">
                                             <rect key="frame" x="132" y="28" width="523" 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.vgm" drawsBackground="YES" id="xGs-Mi-wzj">
+                                            <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" placeholderString="/path/to/file.vgm" drawsBackground="YES" usesSingleLineMode="YES" id="xGs-Mi-wzj">
                                                 <font key="font" metaFont="system"/>
                                                 <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                                                 <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
@@ -234,7 +312,7 @@ DQ
                                         <textField verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Xht-PS-Hw8">
                                             <rect key="frame" x="132" y="90" width="523" 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.avi" drawsBackground="YES" id="iY4-FF-x2e">
+                                            <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" placeholderString="/path/to/file.avi" drawsBackground="YES" usesSingleLineMode="YES" id="iY4-FF-x2e">
                                                 <font key="font" metaFont="system"/>
                                                 <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                                                 <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
@@ -262,21 +340,269 @@ DQ
                                     </subviews>
                                 </view>
                             </tabViewItem>
+                            <tabViewItem label="Paths" identifier="" id="PVN-Iw-nYG">
+                                <view key="view" id="5qP-bQ-Id6">
+                                    <rect key="frame" x="10" y="33" width="672" height="114"/>
+                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                                    <subviews>
+                                        <textField verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="VDW-FX-9az">
+                                            <rect key="frame" x="132" y="90" width="523" 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/directory/" drawsBackground="YES" usesSingleLineMode="YES" id="ykl-aj-n1L">
+                                                <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>
+                                                <binding destination="-2" name="enabled" keyPath="self.mameShareDirectory" id="bPv-hU-XgK"/>
+                                                <binding destination="-2" name="value" keyPath="self.mameShareDirectoryPath" id="ddj-BN-tsY">
+                                                    <dictionary key="options">
+                                                        <string key="NSNullPlaceholder">/path/to/directory/</string>
+                                                    </dictionary>
+                                                </binding>
+                                            </connections>
+                                        </textField>
+                                        <button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="1fA-nr-wns">
+                                            <rect key="frame" x="15" y="91" width="117" height="18"/>
+                                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                                            <buttonCell key="cell" type="check" title="Share Directory" bezelStyle="regularSquare" imagePosition="left" inset="2" id="xmA-1v-wU7">
+                                                <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+                                                <font key="font" metaFont="system"/>
+                                            </buttonCell>
+                                            <connections>
+                                                <binding destination="-2" name="value" keyPath="self.mameShareDirectory" id="x3D-ho-u4v"/>
+                                            </connections>
+                                        </button>
+                                    </subviews>
+                                </view>
+                            </tabViewItem>
                         </tabViewItems>
+                        <connections>
+                            <binding destination="-2" name="hidden" keyPath="machine" id="odt-eJ-VrX">
+                                <dictionary key="options">
+                                    <string key="NSValueTransformerName">NSIsNil</string>
+                                </dictionary>
+                            </binding>
+                        </connections>
                     </tabView>
                     <customView fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="J9O-xI-P5J" customClass="FlippedView">
-                        <rect key="frame" x="392" y="92" width="306" height="363"/>
+                        <rect key="frame" x="664" y="107" width="316" 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">
+                        <rect key="frame" x="0.0" y="0.0" width="1001" height="69"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
+                        <clipView key="contentView" drawsBackground="NO" copiesOnScroll="NO" id="eSY-AU-tvi">
+                            <rect key="frame" x="0.0" y="0.0" width="1001" height="69"/>
+                            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                            <subviews>
+                                <textView focusRingType="none" editable="NO" importsGraphics="NO" richText="NO" verticallyResizable="YES" allowsCharacterPickerTouchBarItem="NO" textCompletion="NO" id="c0R-8x-RL2">
+                                    <rect key="frame" x="0.0" y="0.0" width="1001" height="69"/>
+                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                                    <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
+                                    <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                    <size key="minSize" width="1001" height="69"/>
+                                    <size key="maxSize" width="1001" height="10000000"/>
+                                    <color key="insertionPointColor" name="textColor" catalog="System" colorSpace="catalog"/>
+                                    <connections>
+                                        <binding destination="-2" name="value" keyPath="self.commandLine" id="deQ-gK-fgu">
+                                            <dictionary key="options">
+                                                <bool key="NSConditionallySetsEditable" value="NO"/>
+                                            </dictionary>
+                                        </binding>
+                                    </connections>
+                                </textView>
+                            </subviews>
+                        </clipView>
+                        <scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="YES" id="qto-12-JOq">
+                            <rect key="frame" x="-100" y="-100" width="225" height="15"/>
+                            <autoresizingMask key="autoresizingMask"/>
+                        </scroller>
+                        <scroller key="verticalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="NO" id="FPs-uz-0v2">
+                            <rect key="frame" x="703" y="0.0" width="15" height="51"/>
+                            <autoresizingMask key="autoresizingMask"/>
+                        </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"/>
+                        <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"/>
+                            <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+                            <color key="backgroundColor" name="systemRedColor" catalog="System" colorSpace="catalog"/>
+                        </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">
+                        <rect key="frame" x="0.0" y="69" width="294" height="571"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                    </customView>
+                    <box verticalHuggingPriority="750" fixedFrame="YES" boxType="separator" translatesAutoresizingMaskIntoConstraints="NO" id="UwI-q9-hEm">
+                        <rect key="frame" x="0.0" y="67" width="1000" height="5"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
+                    </box>
+                    <box horizontalHuggingPriority="750" fixedFrame="YES" boxType="separator" translatesAutoresizingMaskIntoConstraints="NO" id="xjH-Gv-MHt">
+                        <rect key="frame" x="291" y="69" width="5" height="571"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" heightSizable="YES"/>
+                    </box>
+                    <button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="nKp-px-nHg">
+                        <rect key="frame" x="869.5" y="76" width="111" height="23"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
+                        <buttonCell key="cell" type="roundTextured" title="Launch" bezelStyle="texturedRounded" image="NSAppleMenuImage" imagePosition="left" alignment="center" borderStyle="border" inset="2" id="Ct1-Rb-7uI">
+                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                            <font key="font" metaFont="system"/>
+                            <string key="keyEquivalent" base64-UTF8="YES">
+DQ
+</string>
+                            <modifierMask key="keyEquivalentModifierMask" command="YES"/>
+                        </buttonCell>
+                        <connections>
+                            <action selector="launchAction:" target="-2" id="a4d-zv-1CU"/>
+                            <binding destination="-2" name="hidden" keyPath="machine" id="8Ks-FY-Tmk">
+                                <dictionary key="options">
+                                    <string key="NSValueTransformerName">NSIsNil</string>
+                                </dictionary>
+                            </binding>
+                        </connections>
+                    </button>
                 </subviews>
             </view>
-            <point key="canvasLocation" x="769" y="120.5"/>
+            <toolbar key="toolbar" implicitIdentifier="ACA8EE70-5505-4CFD-9F78-7A480D93260B" autosavesConfiguration="NO" allowsUserCustomization="NO" prefersToBeShown="NO" displayMode="iconAndLabel" sizeMode="regular" id="b3J-Bx-3nk">
+                <allowedToolbarItems>
+                    <toolbarItem implicitItemIdentifier="NSToolbarShowColorsItem" id="uHd-dY-alN"/>
+                    <toolbarItem implicitItemIdentifier="NSToolbarShowFontsItem" id="WEM-Gw-Utx"/>
+                    <toolbarItem implicitItemIdentifier="NSToolbarPrintItem" id="RCG-fn-6Ue"/>
+                    <toolbarItem implicitItemIdentifier="NSToolbarSpaceItem" id="BRc-Qf-FCk"/>
+                    <toolbarItem implicitItemIdentifier="NSToolbarFlexibleSpaceItem" id="Dtt-KT-5NO"/>
+                </allowedToolbarItems>
+                <defaultToolbarItems/>
+            </toolbar>
+            <connections>
+                <outlet property="menu" destination="Aa5-Sk-gZX" id="Sj0-0o-oZb"/>
+            </connections>
+            <point key="canvasLocation" x="590" y="40"/>
         </window>
         <viewController title="Media View" nibName="MediaView" id="t7c-zy-czN" customClass="MediaViewController"/>
         <viewController title="Slot View" nibName="SlotView" id="lyS-mc-3Tf" customClass="SlotViewController"/>
-        <customObject id="RgH-d9-xl8" customClass="MachineViewController"/>
+        <window title="Add Bookmark" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" restorable="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" animationBehavior="default" id="yIt-hP-HBq">
+            <windowStyleMask key="styleMask" titled="YES"/>
+            <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
+            <rect key="contentRect" x="196" y="240" width="462" height="116"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="2560" height="1417"/>
+            <view key="contentView" wantsLayer="YES" id="WVd-g4-Tbl">
+                <rect key="frame" x="0.0" y="0.0" width="462" height="116"/>
+                <autoresizingMask key="autoresizingMask"/>
+                <subviews>
+                    <button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Gho-Xy-rn4">
+                        <rect key="frame" x="358" y="13" width="90" height="32"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
+                        <buttonCell key="cell" type="push" title="Add" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="Vxo-rD-aMe">
+                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                            <font key="font" metaFont="system"/>
+                            <string key="keyEquivalent" base64-UTF8="YES">
+DQ
+</string>
+                        </buttonCell>
+                        <connections>
+                            <action selector="bookmarkSave:" target="-2" id="wLF-LE-5RO"/>
+                            <binding destination="-2" name="enabled" keyPath="bookmarkName" id="U5R-gU-1bE">
+                                <dictionary key="options">
+                                    <string key="NSValueTransformerName">StringNotEmptyTransformer</string>
+                                </dictionary>
+                            </binding>
+                        </connections>
+                    </button>
+                    <button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="3sv-Kd-Ep5">
+                        <rect key="frame" x="268" y="13" width="90" height="32"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
+                        <buttonCell key="cell" type="push" title="Cancel" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="jaa-RY-PAg">
+                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                            <font key="font" metaFont="system"/>
+                            <string key="keyEquivalent" base64-UTF8="YES">
+Gw
+</string>
+                        </buttonCell>
+                        <connections>
+                            <action selector="bookmarkCancel:" target="-2" id="uWM-vs-hz7"/>
+                        </connections>
+                    </button>
+                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="1fO-x7-Gft">
+                        <rect key="frame" x="18" y="80" width="103" height="16"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                        <textFieldCell key="cell" lineBreakMode="clipping" title="Add Bookmark…" id="AZS-JR-SNt">
+                            <font key="font" metaFont="system"/>
+                            <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                            <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                        </textFieldCell>
+                    </textField>
+                    <textField verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="fAl-Vn-x1w">
+                        <rect key="frame" x="20" y="49" width="422" 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="bookmark name" drawsBackground="YES" id="Enq-2z-cle">
+                            <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>
+                            <binding destination="-2" name="value" keyPath="bookmarkName" id="84v-el-4Uk">
+                                <dictionary key="options">
+                                    <bool key="NSContinuouslyUpdatesValue" value="YES"/>
+                                    <string key="NSNullPlaceholder">bookmark name</string>
+                                </dictionary>
+                            </binding>
+                        </connections>
+                    </textField>
+                </subviews>
+            </view>
+            <point key="canvasLocation" x="130" y="70"/>
+        </window>
+        <viewController nibName="MachineView" id="FSD-3v-Wni" customClass="NewMachineViewController"/>
+        <menu id="Aa5-Sk-gZX">
+            <items>
+                <menuItem title="Launch" image="NSAppleMenuImage" id="OSH-7C-D6z">
+                    <modifierMask key="keyEquivalentModifierMask"/>
+                    <connections>
+                        <action selector="launchAction:" target="-2" id="ZY2-He-VyK"/>
+                    </connections>
+                </menuItem>
+                <menuItem isSeparatorItem="YES" id="Iti-F9-p35"/>
+                <menuItem title="Reset All" id="PQ0-yO-SKz">
+                    <modifierMask key="keyEquivalentModifierMask"/>
+                    <connections>
+                        <action selector="resetAll:" target="-2" id="hF5-fl-bMr"/>
+                    </connections>
+                </menuItem>
+                <menuItem title="Reset Machine" id="1by-3B-LSd">
+                    <modifierMask key="keyEquivalentModifierMask"/>
+                    <connections>
+                        <action selector="resetMachine:" target="-2" id="7au-OM-Q88"/>
+                    </connections>
+                </menuItem>
+                <menuItem title="Reset Slots" id="ccx-xm-qeo">
+                    <modifierMask key="keyEquivalentModifierMask"/>
+                    <connections>
+                        <action selector="resetSlots:" target="lyS-mc-3Tf" id="39K-rS-u9D"/>
+                    </connections>
+                </menuItem>
+                <menuItem title="Reset Media" id="Opr-7k-fO1">
+                    <modifierMask key="keyEquivalentModifierMask"/>
+                    <connections>
+                        <action selector="resetMedia:" target="-2" id="n5j-1R-NJl"/>
+                    </connections>
+                </menuItem>
+            </items>
+            <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/LogWindow.xib

@@ -21,7 +21,7 @@
             <rect key="screenRect" x="0.0" y="0.0" width="2560" height="1417"/>
             <view key="contentView" id="se5-gp-TjO">
                 <rect key="frame" x="0.0" y="0.0" width="800" height="270"/>
-                <autoresizingMask key="autoresizingMask"/>
+                <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                 <subviews>
                     <scrollView fixedFrame="YES" borderType="none" horizontalLineScroll="10" horizontalPageScroll="10" verticalLineScroll="10" verticalPageScroll="10" hasHorizontalScroller="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Hj3-ou-djb">
                         <rect key="frame" x="0.0" y="0.0" width="800" height="270"/>
@@ -52,10 +52,31 @@
                     </scrollView>
                 </subviews>
             </view>
+            <toolbar key="toolbar" implicitIdentifier="54C242E0-0A7F-491A-9B83-7279A9663A36" autosavesConfiguration="NO" allowsUserCustomization="NO" displayMode="iconOnly" sizeMode="small" id="Cik-bA-ZYu">
+                <allowedToolbarItems>
+                    <toolbarItem implicitItemIdentifier="NSToolbarShowColorsItem" id="zxC-EA-a7F"/>
+                    <toolbarItem implicitItemIdentifier="NSToolbarShowFontsItem" id="xZv-cQ-rPS"/>
+                    <toolbarItem implicitItemIdentifier="NSToolbarPrintItem" id="2BZ-oP-sMg"/>
+                    <toolbarItem implicitItemIdentifier="NSToolbarSpaceItem" id="j5G-hW-61a"/>
+                    <toolbarItem implicitItemIdentifier="NSToolbarFlexibleSpaceItem" id="a72-iv-2QT"/>
+                    <toolbarItem implicitItemIdentifier="21A9965C-D1B3-4E82-A344-1688A467E870" label="Clear Log" paletteLabel="Clear Log" tag="-1" image="NSTrashEmpty" id="pn5-MM-9p1">
+                        <connections>
+                            <action selector="clearLog:" target="-2" id="VU3-mv-6WR"/>
+                        </connections>
+                    </toolbarItem>
+                </allowedToolbarItems>
+                <defaultToolbarItems>
+                    <toolbarItem reference="a72-iv-2QT"/>
+                    <toolbarItem reference="pn5-MM-9p1"/>
+                </defaultToolbarItems>
+            </toolbar>
             <connections>
                 <outlet property="delegate" destination="-2" id="0bl-1N-AYu"/>
             </connections>
             <point key="canvasLocation" x="-285" y="-234"/>
         </window>
     </objects>
+    <resources>
+        <image name="NSTrashEmpty" width="32" height="32"/>
+    </resources>
 </document>

Ample/Base.lproj/MachineView.xib

@@ -0,0 +1,109 @@
+<?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">
+    <dependencies>
+        <deployment identifier="macosx"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="15705"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <customObject id="-2" userLabel="File's Owner" customClass="NewMachineViewController">
+            <connections>
+                <outlet property="outlineView" destination="9V6-He-b8A" id="XeC-DJ-oXY"/>
+                <outlet property="view" destination="t3T-qF-D0e" id="Svb-w7-hs9"/>
+            </connections>
+        </customObject>
+        <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
+        <customObject id="-3" userLabel="Application" customClass="NSObject"/>
+        <scrollView borderType="none" autohidesScrollers="YES" horizontalLineScroll="26" horizontalPageScroll="10" verticalLineScroll="26" verticalPageScroll="10" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" horizontalScrollElasticity="none" id="t3T-qF-D0e">
+            <rect key="frame" x="0.0" y="0.0" width="274" height="543"/>
+            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+            <clipView key="contentView" drawsBackground="NO" id="DyG-qq-uBF">
+                <rect key="frame" x="0.0" y="0.0" width="274" height="543"/>
+                <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                <subviews>
+                    <outlineView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" selectionHighlightStyle="sourceList" columnReordering="NO" columnResizing="NO" multipleSelection="NO" autosaveColumns="NO" autosaveName="machine-view" rowHeight="24" rowSizeStyle="automatic" viewBased="YES" indentationPerLevel="16" autosaveExpandedItems="YES" outlineTableColumn="e67-js-boV" id="9V6-He-b8A">
+                        <rect key="frame" x="0.0" y="0.0" width="274" height="543"/>
+                        <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="271" minWidth="16" maxWidth="1000" id="e67-js-boV">
+                                <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="jZU-xV-PI4">
+                                    <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 identifier="HeaderCell" id="2iF-4F-HfC">
+                                        <rect key="frame" x="1" y="1" width="271" height="17"/>
+                                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                                        <subviews>
+                                            <textField verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="9tU-X8-FZn">
+                                                <rect key="frame" x="0.0" y="0.0" width="271" height="17"/>
+                                                <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
+                                                <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="HEADER CELL" id="EUi-TS-vlq">
+                                                    <font key="font" metaFont="systemBold"/>
+                                                    <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+                                                    <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+                                                </textFieldCell>
+                                                <connections>
+                                                    <binding destination="2iF-4F-HfC" name="value" keyPath="objectValue.description" id="He3-9c-g9A"/>
+                                                </connections>
+                                            </textField>
+                                        </subviews>
+                                        <connections>
+                                            <outlet property="textField" destination="9tU-X8-FZn" id="p2B-eV-6bS"/>
+                                        </connections>
+                                    </tableCellView>
+                                    <tableCellView identifier="DataCell" id="7b4-T1-d29">
+                                        <rect key="frame" x="1" y="20" width="271" height="17"/>
+                                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                                        <subviews>
+                                            <textField verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="FkS-zP-pRB">
+                                                <rect key="frame" x="0.0" y="0.0" width="271" height="17"/>
+                                                <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
+                                                <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Table View Cell" id="g6t-E7-0lM">
+                                                    <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="7b4-T1-d29" name="value" keyPath="objectValue.description" id="kp8-ww-1aE"/>
+                                                </connections>
+                                            </textField>
+                                        </subviews>
+                                        <connections>
+                                            <outlet property="textField" destination="FkS-zP-pRB" id="JkE-pr-7px"/>
+                                        </connections>
+                                    </tableCellView>
+                                </prototypeCellViews>
+                            </tableColumn>
+                        </tableColumns>
+                        <connections>
+                            <action selector="clickAction:" target="-2" id="O3p-cV-gwk"/>
+                            <outlet property="dataSource" destination="-2" id="nW2-qs-3w6"/>
+                            <outlet property="delegate" destination="-2" id="4Wc-Pe-v81"/>
+                        </connections>
+                    </outlineView>
+                </subviews>
+                <nil key="backgroundColor"/>
+            </clipView>
+            <scroller key="horizontalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="YES" id="kig-a5-Ay0">
+                <rect key="frame" x="-100" y="-100" width="238" height="15"/>
+                <autoresizingMask key="autoresizingMask"/>
+            </scroller>
+            <scroller key="verticalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="NO" id="lLp-pv-Fbj" customClass="TransparentScroller">
+                <rect key="frame" x="224" y="17" width="15" height="102"/>
+                <autoresizingMask key="autoresizingMask"/>
+            </scroller>
+            <point key="canvasLocation" x="-91" y="132"/>
+        </scrollView>
+    </objects>
+</document>

Ample/Base.lproj/MainMenu.xib

@@ -19,6 +19,12 @@
             </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">
@@ -31,10 +37,10 @@
                                     <action selector="orderFrontStandardAboutPanel:" target="-1" id="Exp-CZ-Vem"/>
                                 </connections>
                             </menuItem>
-                            <menuItem title="Manage ROMs…" id="St3-qR-2Y8">
+                            <menuItem title="Check for Updates…" id="CPy-r4-rzr">
                                 <modifierMask key="keyEquivalentModifierMask"/>
                                 <connections>
-                                    <action selector="downloadROMS:" target="Voe-Tx-rLC" id="jFm-nv-kRC"/>
+                                    <action selector="checkForUpdates:" target="3aq-Tx-mno" id="qJG-Nv-0Lu"/>
                                 </connections>
                             </menuItem>
                             <menuItem isSeparatorItem="YES" id="VOq-y0-SEH"/>
@@ -123,6 +129,12 @@
                                     <action selector="revertDocumentToSaved:" target="-1" id="iJ3-Pv-kwq"/>
                                 </connections>
                             </menuItem>
+                            <menuItem title="Export Shell Script…" id="LmB-h2-UBZ">
+                                <modifierMask key="keyEquivalentModifierMask"/>
+                                <connections>
+                                    <action selector="exportShellScript:" target="-1" id="9eU-do-ffz"/>
+                                </connections>
+                            </menuItem>
                             <menuItem isSeparatorItem="YES" id="aJh-i4-bef"/>
                             <menuItem title="Page Setup…" keyEquivalent="P" id="qIS-W8-SiK">
                                 <modifierMask key="keyEquivalentModifierMask" shift="YES" command="YES"/>
@@ -357,268 +369,6 @@
                         </items>
                     </menu>
                 </menuItem>
-                <menuItem title="Format" id="jxT-CU-nIS">
-                    <modifierMask key="keyEquivalentModifierMask"/>
-                    <menu key="submenu" title="Format" id="GEO-Iw-cKr">
-                        <items>
-                            <menuItem title="Font" id="Gi5-1S-RQB">
-                                <modifierMask key="keyEquivalentModifierMask"/>
-                                <menu key="submenu" title="Font" systemMenu="font" id="aXa-aM-Jaq">
-                                    <items>
-                                        <menuItem title="Show Fonts" keyEquivalent="t" id="Q5e-8K-NDq">
-                                            <connections>
-                                                <action selector="orderFrontFontPanel:" target="YLy-65-1bz" id="WHr-nq-2xA"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem title="Bold" tag="2" keyEquivalent="b" id="GB9-OM-e27">
-                                            <connections>
-                                                <action selector="addFontTrait:" target="YLy-65-1bz" id="hqk-hr-sYV"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem title="Italic" tag="1" keyEquivalent="i" id="Vjx-xi-njq">
-                                            <connections>
-                                                <action selector="addFontTrait:" target="YLy-65-1bz" id="IHV-OB-c03"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem title="Underline" keyEquivalent="u" id="WRG-CD-K1S">
-                                            <connections>
-                                                <action selector="underline:" target="-1" id="FYS-2b-JAY"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem isSeparatorItem="YES" id="5gT-KC-WSO"/>
-                                        <menuItem title="Bigger" tag="3" keyEquivalent="+" id="Ptp-SP-VEL">
-                                            <connections>
-                                                <action selector="modifyFont:" target="YLy-65-1bz" id="Uc7-di-UnL"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem title="Smaller" tag="4" keyEquivalent="-" id="i1d-Er-qST">
-                                            <connections>
-                                                <action selector="modifyFont:" target="YLy-65-1bz" id="HcX-Lf-eNd"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem isSeparatorItem="YES" id="kx3-Dk-x3B"/>
-                                        <menuItem title="Kern" id="jBQ-r6-VK2">
-                                            <modifierMask key="keyEquivalentModifierMask"/>
-                                            <menu key="submenu" title="Kern" id="tlD-Oa-oAM">
-                                                <items>
-                                                    <menuItem title="Use Default" id="GUa-eO-cwY">
-                                                        <modifierMask key="keyEquivalentModifierMask"/>
-                                                        <connections>
-                                                            <action selector="useStandardKerning:" target="-1" id="6dk-9l-Ckg"/>
-                                                        </connections>
-                                                    </menuItem>
-                                                    <menuItem title="Use None" id="cDB-IK-hbR">
-                                                        <modifierMask key="keyEquivalentModifierMask"/>
-                                                        <connections>
-                                                            <action selector="turnOffKerning:" target="-1" id="U8a-gz-Maa"/>
-                                                        </connections>
-                                                    </menuItem>
-                                                    <menuItem title="Tighten" id="46P-cB-AYj">
-                                                        <modifierMask key="keyEquivalentModifierMask"/>
-                                                        <connections>
-                                                            <action selector="tightenKerning:" target="-1" id="hr7-Nz-8ro"/>
-                                                        </connections>
-                                                    </menuItem>
-                                                    <menuItem title="Loosen" id="ogc-rX-tC1">
-                                                        <modifierMask key="keyEquivalentModifierMask"/>
-                                                        <connections>
-                                                            <action selector="loosenKerning:" target="-1" id="8i4-f9-FKE"/>
-                                                        </connections>
-                                                    </menuItem>
-                                                </items>
-                                            </menu>
-                                        </menuItem>
-                                        <menuItem title="Ligatures" id="o6e-r0-MWq">
-                                            <modifierMask key="keyEquivalentModifierMask"/>
-                                            <menu key="submenu" title="Ligatures" id="w0m-vy-SC9">
-                                                <items>
-                                                    <menuItem title="Use Default" id="agt-UL-0e3">
-                                                        <modifierMask key="keyEquivalentModifierMask"/>
-                                                        <connections>
-                                                            <action selector="useStandardLigatures:" target="-1" id="7uR-wd-Dx6"/>
-                                                        </connections>
-                                                    </menuItem>
-                                                    <menuItem title="Use None" id="J7y-lM-qPV">
-                                                        <modifierMask key="keyEquivalentModifierMask"/>
-                                                        <connections>
-                                                            <action selector="turnOffLigatures:" target="-1" id="iX2-gA-Ilz"/>
-                                                        </connections>
-                                                    </menuItem>
-                                                    <menuItem title="Use All" id="xQD-1f-W4t">
-                                                        <modifierMask key="keyEquivalentModifierMask"/>
-                                                        <connections>
-                                                            <action selector="useAllLigatures:" target="-1" id="KcB-kA-TuK"/>
-                                                        </connections>
-                                                    </menuItem>
-                                                </items>
-                                            </menu>
-                                        </menuItem>
-                                        <menuItem title="Baseline" id="OaQ-X3-Vso">
-                                            <modifierMask key="keyEquivalentModifierMask"/>
-                                            <menu key="submenu" title="Baseline" id="ijk-EB-dga">
-                                                <items>
-                                                    <menuItem title="Use Default" id="3Om-Ey-2VK">
-                                                        <modifierMask key="keyEquivalentModifierMask"/>
-                                                        <connections>
-                                                            <action selector="unscript:" target="-1" id="0vZ-95-Ywn"/>
-                                                        </connections>
-                                                    </menuItem>
-                                                    <menuItem title="Superscript" id="Rqc-34-cIF">
-                                                        <modifierMask key="keyEquivalentModifierMask"/>
-                                                        <connections>
-                                                            <action selector="superscript:" target="-1" id="3qV-fo-wpU"/>
-                                                        </connections>
-                                                    </menuItem>
-                                                    <menuItem title="Subscript" id="I0S-gh-46l">
-                                                        <modifierMask key="keyEquivalentModifierMask"/>
-                                                        <connections>
-                                                            <action selector="subscript:" target="-1" id="Q6W-4W-IGz"/>
-                                                        </connections>
-                                                    </menuItem>
-                                                    <menuItem title="Raise" id="2h7-ER-AoG">
-                                                        <modifierMask key="keyEquivalentModifierMask"/>
-                                                        <connections>
-                                                            <action selector="raiseBaseline:" target="-1" id="4sk-31-7Q9"/>
-                                                        </connections>
-                                                    </menuItem>
-                                                    <menuItem title="Lower" id="1tx-W0-xDw">
-                                                        <modifierMask key="keyEquivalentModifierMask"/>
-                                                        <connections>
-                                                            <action selector="lowerBaseline:" target="-1" id="OF1-bc-KW4"/>
-                                                        </connections>
-                                                    </menuItem>
-                                                </items>
-                                            </menu>
-                                        </menuItem>
-                                        <menuItem isSeparatorItem="YES" id="Ndw-q3-faq"/>
-                                        <menuItem title="Show Colors" keyEquivalent="C" id="bgn-CT-cEk">
-                                            <connections>
-                                                <action selector="orderFrontColorPanel:" target="-1" id="mSX-Xz-DV3"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem isSeparatorItem="YES" id="iMs-zA-UFJ"/>
-                                        <menuItem title="Copy Style" keyEquivalent="c" id="5Vv-lz-BsD">
-                                            <modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
-                                            <connections>
-                                                <action selector="copyFont:" target="-1" id="GJO-xA-L4q"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem title="Paste Style" keyEquivalent="v" id="vKC-jM-MkH">
-                                            <modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
-                                            <connections>
-                                                <action selector="pasteFont:" target="-1" id="JfD-CL-leO"/>
-                                            </connections>
-                                        </menuItem>
-                                    </items>
-                                </menu>
-                            </menuItem>
-                            <menuItem title="Text" id="Fal-I4-PZk">
-                                <modifierMask key="keyEquivalentModifierMask"/>
-                                <menu key="submenu" title="Text" id="d9c-me-L2H">
-                                    <items>
-                                        <menuItem title="Align Left" keyEquivalent="{" id="ZM1-6Q-yy1">
-                                            <connections>
-                                                <action selector="alignLeft:" target="-1" id="zUv-R1-uAa"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem title="Center" keyEquivalent="|" id="VIY-Ag-zcb">
-                                            <connections>
-                                                <action selector="alignCenter:" target="-1" id="spX-mk-kcS"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem title="Justify" id="J5U-5w-g23">
-                                            <modifierMask key="keyEquivalentModifierMask"/>
-                                            <connections>
-                                                <action selector="alignJustified:" target="-1" id="ljL-7U-jND"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem title="Align Right" keyEquivalent="}" id="wb2-vD-lq4">
-                                            <connections>
-                                                <action selector="alignRight:" target="-1" id="r48-bG-YeY"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem isSeparatorItem="YES" id="4s2-GY-VfK"/>
-                                        <menuItem title="Writing Direction" id="H1b-Si-o9J">
-                                            <modifierMask key="keyEquivalentModifierMask"/>
-                                            <menu key="submenu" title="Writing Direction" id="8mr-sm-Yjd">
-                                                <items>
-                                                    <menuItem title="Paragraph" enabled="NO" id="ZvO-Gk-QUH">
-                                                        <modifierMask key="keyEquivalentModifierMask"/>
-                                                    </menuItem>
-                                                    <menuItem id="YGs-j5-SAR">
-                                                        <string key="title">	Default</string>
-                                                        <modifierMask key="keyEquivalentModifierMask"/>
-                                                        <connections>
-                                                            <action selector="makeBaseWritingDirectionNatural:" target="-1" id="qtV-5e-UBP"/>
-                                                        </connections>
-                                                    </menuItem>
-                                                    <menuItem id="Lbh-J2-qVU">
-                                                        <string key="title">	Left to Right</string>
-                                                        <modifierMask key="keyEquivalentModifierMask"/>
-                                                        <connections>
-                                                            <action selector="makeBaseWritingDirectionLeftToRight:" target="-1" id="S0X-9S-QSf"/>
-                                                        </connections>
-                                                    </menuItem>
-                                                    <menuItem id="jFq-tB-4Kx">
-                                                        <string key="title">	Right to Left</string>
-                                                        <modifierMask key="keyEquivalentModifierMask"/>
-                                                        <connections>
-                                                            <action selector="makeBaseWritingDirectionRightToLeft:" target="-1" id="5fk-qB-AqJ"/>
-                                                        </connections>
-                                                    </menuItem>
-                                                    <menuItem isSeparatorItem="YES" id="swp-gr-a21"/>
-                                                    <menuItem title="Selection" enabled="NO" id="cqv-fj-IhA">
-                                                        <modifierMask key="keyEquivalentModifierMask"/>
-                                                    </menuItem>
-                                                    <menuItem id="Nop-cj-93Q">
-                                                        <string key="title">	Default</string>
-                                                        <modifierMask key="keyEquivalentModifierMask"/>
-                                                        <connections>
-                                                            <action selector="makeTextWritingDirectionNatural:" target="-1" id="lPI-Se-ZHp"/>
-                                                        </connections>
-                                                    </menuItem>
-                                                    <menuItem id="BgM-ve-c93">
-                                                        <string key="title">	Left to Right</string>
-                                                        <modifierMask key="keyEquivalentModifierMask"/>
-                                                        <connections>
-                                                            <action selector="makeTextWritingDirectionLeftToRight:" target="-1" id="caW-Bv-w94"/>
-                                                        </connections>
-                                                    </menuItem>
-                                                    <menuItem id="RB4-Sm-HuC">
-                                                        <string key="title">	Right to Left</string>
-                                                        <modifierMask key="keyEquivalentModifierMask"/>
-                                                        <connections>
-                                                            <action selector="makeTextWritingDirectionRightToLeft:" target="-1" id="EXD-6r-ZUu"/>
-                                                        </connections>
-                                                    </menuItem>
-                                                </items>
-                                            </menu>
-                                        </menuItem>
-                                        <menuItem isSeparatorItem="YES" id="fKy-g9-1gm"/>
-                                        <menuItem title="Show Ruler" id="vLm-3I-IUL">
-                                            <modifierMask key="keyEquivalentModifierMask"/>
-                                            <connections>
-                                                <action selector="toggleRuler:" target="-1" id="FOx-HJ-KwY"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem title="Copy Ruler" keyEquivalent="c" id="MkV-Pr-PK5">
-                                            <modifierMask key="keyEquivalentModifierMask" control="YES" command="YES"/>
-                                            <connections>
-                                                <action selector="copyRuler:" target="-1" id="71i-fW-3W2"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem title="Paste Ruler" keyEquivalent="v" id="LVM-kO-fVI">
-                                            <modifierMask key="keyEquivalentModifierMask" control="YES" command="YES"/>
-                                            <connections>
-                                                <action selector="pasteRuler:" target="-1" id="cSh-wd-qM2"/>
-                                            </connections>
-                                        </menuItem>
-                                    </items>
-                                </menu>
-                            </menuItem>
-                        </items>
-                    </menu>
-                </menuItem>
                 <menuItem title="View" id="H8h-7b-M4v">
                     <modifierMask key="keyEquivalentModifierMask"/>
                     <menu key="submenu" title="View" id="HyV-fh-RgO">
@@ -651,6 +401,34 @@
                         </items>
                     </menu>
                 </menuItem>
+                <menuItem title="Bookmarks" id="vHO-2e-qJc">
+                    <modifierMask key="keyEquivalentModifierMask"/>
+                    <menu key="submenu" title="Bookmarks" id="ha0-nx-PIl">
+                        <items>
+                            <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>
+                            <menuItem title="Set Default" 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">
+                                <modifierMask key="keyEquivalentModifierMask"/>
+                                <connections>
+                                    <action selector="defaultLoad:" target="-1" id="ErS-k6-azP"/>
+                                </connections>
+                            </menuItem>
+                        </items>
+                    </menu>
+                </menuItem>
                 <menuItem title="Window" id="aUF-d1-5bR">
                     <modifierMask key="keyEquivalentModifierMask"/>
                     <menu key="submenu" title="Window" systemMenu="window" id="Td7-aD-5lo">
@@ -666,6 +444,25 @@
                                     <action selector="performZoom:" target="-1" id="DIl-cC-cCs"/>
                                 </connections>
                             </menuItem>
+                            <menuItem isSeparatorItem="YES" id="kE9-em-OHN"/>
+                            <menuItem title="Ample Support Directory…" id="egj-hU-EtE">
+                                <modifierMask key="keyEquivalentModifierMask"/>
+                                <connections>
+                                    <action selector="displaySupportDirectory:" target="Voe-Tx-rLC" id="XDA-Bv-9BJ"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem title="Manage ROMs…" id="St3-qR-2Y8">
+                                <modifierMask key="keyEquivalentModifierMask"/>
+                                <connections>
+                                    <action selector="displayROMS:" target="Voe-Tx-rLC" id="jFm-nv-kRC"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem title="Recent Disk Images…" id="QY9-lF-kDy">
+                                <modifierMask key="keyEquivalentModifierMask"/>
+                                <connections>
+                                    <action selector="displayRecentDiskImages:" target="Voe-Tx-rLC" id="9W1-nJ-8eJ"/>
+                                </connections>
+                            </menuItem>
                             <menuItem isSeparatorItem="YES" id="eu3-7i-yIM"/>
                             <menuItem title="Bring All to Front" id="LE2-aR-0XJ">
                                 <modifierMask key="keyEquivalentModifierMask"/>
@@ -685,6 +482,30 @@
                                     <action selector="showHelp:" target="-1" id="y7X-2Q-9no"/>
                                 </connections>
                             </menuItem>
+                            <menuItem title="MAME Keyboard Cheat Sheet" id="vcW-Dz-2Nx">
+                                <modifierMask key="keyEquivalentModifierMask"/>
+                                <connections>
+                                    <action selector="displayCheatSheet:" target="Voe-Tx-rLC" id="HvD-mQ-4pe"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem title="MAME Apple II Wiki" id="GLh-Cc-5uU">
+                                <modifierMask key="keyEquivalentModifierMask"/>
+                                <connections>
+                                    <action selector="mameAppleWiki:" target="Voe-Tx-rLC" id="jRe-m6-mP0"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem title="MAME Mac 68K Wiki" id="hDL-K6-iVF">
+                                <modifierMask key="keyEquivalentModifierMask"/>
+                                <connections>
+                                    <action selector="mameMac68kWiki:" target="Voe-Tx-rLC" id="ZzB-54-vXN"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem title="MAME Documentation" id="1IW-V0-UWA">
+                                <modifierMask key="keyEquivalentModifierMask"/>
+                                <connections>
+                                    <action selector="mameDocumentation:" target="Voe-Tx-rLC" id="K8T-nZ-c5J"/>
+                                </connections>
+                            </menuItem>
                         </items>
                     </menu>
                 </menuItem>

Ample/Base.lproj/MediaView.xib

@@ -14,21 +14,20 @@
         </customObject>
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
         <customObject id="-3" userLabel="Application" customClass="NSObject"/>
-        <scrollView borderType="none" autohidesScrollers="YES" horizontalLineScroll="20" horizontalPageScroll="10" verticalLineScroll="20" verticalPageScroll="10" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" horizontalScrollElasticity="none" id="nVT-kT-bWl">
-            <rect key="frame" x="0.0" y="0.0" width="306" height="363"/>
-            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-            <clipView key="contentView" autoresizesSubviews="NO" copiesOnScroll="NO" id="IBD-wb-pch">
-                <rect key="frame" x="0.0" y="0.0" width="306" height="363"/>
+        <scrollView focusRingType="none" borderType="none" autohidesScrollers="YES" horizontalLineScroll="25" horizontalPageScroll="10" verticalLineScroll="25" verticalPageScroll="10" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" horizontalScrollElasticity="none" translatesAutoresizingMaskIntoConstraints="NO" id="nVT-kT-bWl">
+            <rect key="frame" x="0.0" y="0.0" width="316" height="331"/>
+            <clipView key="contentView" autoresizesSubviews="NO" focusRingType="none" ambiguous="YES" drawsBackground="NO" copiesOnScroll="NO" translatesAutoresizingMaskIntoConstraints="NO" id="IBD-wb-pch">
+                <rect key="frame" x="0.0" y="0.0" width="316" height="331"/>
                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                 <subviews>
-                    <outlineView focusRingType="none" verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="none" selectionHighlightStyle="none" columnResizing="NO" multipleSelection="NO" autosaveColumns="NO" typeSelect="NO" rowSizeStyle="automatic" viewBased="YES" outlineTableColumn="pBj-py-R6a" id="sIz-DD-PZQ">
-                        <rect key="frame" x="0.0" y="0.0" width="306" height="363"/>
+                    <outlineView focusRingType="none" verticalHuggingPriority="750" allowsExpansionToolTips="YES" selectionHighlightStyle="none" columnResizing="NO" multipleSelection="NO" autosaveColumns="NO" typeSelect="NO" rowHeight="22" rowSizeStyle="automatic" viewBased="YES" outlineTableColumn="pBj-py-R6a" id="sIz-DD-PZQ">
+                        <rect key="frame" x="0.0" y="0.0" width="316" height="331"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <size key="intercellSpacing" width="2" height="3"/>
                         <color key="backgroundColor" white="1" alpha="0.0" colorSpace="custom" customColorSpace="calibratedWhite"/>
                         <color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
                         <tableColumns>
-                            <tableColumn editable="NO" width="280" minWidth="40" maxWidth="1000" id="pBj-py-R6a">
+                            <tableColumn editable="NO" width="296" minWidth="40" maxWidth="1000" id="pBj-py-R6a">
                                 <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border">
                                     <font key="font" metaFont="smallSystem"/>
                                     <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
@@ -39,79 +38,114 @@
                                     <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                                     <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
                                 </textFieldCell>
+                                <tableColumnResizingMask key="resizingMask" resizeWithTable="YES"/>
                                 <prototypeCellViews>
-                                    <tableCellView id="e4I-r0-vWM">
-                                        <rect key="frame" x="1" y="1" width="280" height="17"/>
-                                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                                        <subviews>
-                                            <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Mig-Wj-m5e">
-                                                <rect key="frame" x="0.0" y="0.0" width="280" height="17"/>
-                                                <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
-                                                <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Table View Cell" id="ZcN-bl-2D8">
-                                                    <font key="font" metaFont="system"/>
-                                                    <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
-                                                    <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
-                                                </textFieldCell>
-                                            </textField>
-                                        </subviews>
-                                        <connections>
-                                            <outlet property="textField" destination="Mig-Wj-m5e" id="FYh-hX-PTU"/>
-                                        </connections>
-                                    </tableCellView>
                                     <tableCellView identifier="CategoryView" focusRingType="none" id="33q-UT-ur5">
-                                        <rect key="frame" x="1" y="21" width="280" height="17"/>
+                                        <rect key="frame" x="1" y="1" width="296" height="17"/>
                                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                         <subviews>
                                             <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Pep-mX-LHY">
-                                                <rect key="frame" x="0.0" y="0.0" width="280" height="17"/>
+                                                <rect key="frame" x="0.0" y="0.0" width="296" height="17"/>
                                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
                                                 <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Table View Cell" id="Rrg-wr-8eL">
-                                                    <font key="font" metaFont="system"/>
+                                                    <font key="font" metaFont="systemBold"/>
                                                     <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                                                     <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                                 </textFieldCell>
+                                                <connections>
+                                                    <binding destination="33q-UT-ur5" name="value" keyPath="objectValue.title" id="JQR-UW-ifh"/>
+                                                </connections>
                                             </textField>
                                         </subviews>
                                         <connections>
                                             <outlet property="textField" destination="Pep-mX-LHY" id="hUe-cf-6vq"/>
                                         </connections>
                                     </tableCellView>
-                                    <tableCellView identifier="ItemView" id="yGq-lc-RCM" customClass="TablePathView">
-                                        <rect key="frame" x="1" y="41" width="280" height="27"/>
+                                    <tableCellView identifier="ItemView" translatesAutoresizingMaskIntoConstraints="NO" id="yGq-lc-RCM" customClass="TablePathView">
+                                        <rect key="frame" x="1" y="21" width="296" height="22"/>
                                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                         <subviews>
                                             <pathControl focusRingType="none" verticalHuggingPriority="750" fixedFrame="YES" allowsExpansionToolTips="YES" translatesAutoresizingMaskIntoConstraints="NO" id="f7R-TO-fmF">
-                                                <rect key="frame" x="41" y="1" width="207" height="22"/>
-                                                <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
+                                                <rect key="frame" x="20" y="0.0" width="244" height="22"/>
+                                                <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
                                                 <pathCell key="cell" controlSize="small" selectable="YES" editable="YES" focusRingType="none" alignment="left" pathStyle="popUp" id="dcz-8y-tKb">
                                                     <font key="font" metaFont="smallSystem"/>
                                                 </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"/>
                                                 </connections>
                                             </pathControl>
-                                            <button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="zNo-ij-mUl">
-                                                <rect key="frame" x="253" y="3" width="23" height="18"/>
-                                                <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
-                                                <buttonCell key="cell" type="bevel" bezelStyle="rounded" image="NSNavEjectButton.normalSelected" imagePosition="overlaps" alignment="center" controlSize="small" imageScaling="proportionallyDown" inset="2" id="IZA-Tu-olu">
+                                            <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" id="6g1-NT-J1w">
+                                                <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="x7F-qD-5y9"/>
+                                            </imageView>
+                                            <button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="zNo-ij-mUl" 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="IZA-Tu-olu">
                                                     <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                                                    <font key="font" metaFont="smallSystem"/>
+                                                    <font key="font" metaFont="system"/>
                                                 </buttonCell>
                                                 <connections>
                                                     <action selector="ejectAction:" target="-2" id="XAl-eQ-nUj"/>
+                                                    <binding destination="yGq-lc-RCM" name="enabled" keyPath="objectValue.occupied" id="4a4-L7-ztC"/>
                                                 </connections>
                                             </button>
-                                            <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" id="6g1-NT-J1w">
-                                                <rect key="frame" x="3" y="3" width="33" height="20"/>
-                                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                                                <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="NSListViewTemplate" id="x7F-qD-5y9"/>
-                                            </imageView>
                                         </subviews>
                                         <connections>
+                                            <outlet property="dragHandle" destination="6g1-NT-J1w" id="odc-Sw-3WS"/>
                                             <outlet property="ejectButton" destination="zNo-ij-mUl" id="uzY-tA-5Wf"/>
                                             <outlet property="pathControl" destination="f7R-TO-fmF" id="oH7-N3-JC7"/>
                                         </connections>
                                     </tableCellView>
+                                    <tableCellView identifier="BBItemView" id="2Nq-Xz-tkV" customClass="TablePathView">
+                                        <rect key="frame" x="1" y="46" width="296" height="22"/>
+                                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                                        <subviews>
+                                            <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" id="47E-Ef-Ott">
+                                                <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="vwE-Ev-NBf"/>
+                                            </imageView>
+                                            <button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="zxn-1E-o34" 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="Os7-NH-tnx">
+                                                    <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                                                    <font key="font" metaFont="system"/>
+                                                </buttonCell>
+                                                <connections>
+                                                    <action selector="ejectAction:" target="-2" id="uy2-92-9La"/>
+                                                    <binding destination="2Nq-Xz-tkV" name="enabled" keyPath="objectValue.occupied" id="SNi-sQ-J2W"/>
+                                                </connections>
+                                            </button>
+                                            <textField verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="pNE-yJ-EK8">
+                                                <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="socket.address:port or /path/to/file" drawsBackground="YES" id="h2U-ig-Cms">
+                                                    <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="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>
+                                                </connections>
+                                            </textField>
+                                        </subviews>
+                                        <connections>
+                                            <outlet property="dragHandle" destination="47E-Ef-Ott" id="bnY-rz-24V"/>
+                                            <outlet property="ejectButton" destination="zxn-1E-o34" id="eC6-Mf-tN6"/>
+                                        </connections>
+                                    </tableCellView>
                                 </prototypeCellViews>
                             </tableColumn>
                         </tableColumns>
@@ -140,7 +174,8 @@
         </scrollView>
     </objects>
     <resources>
-        <image name="NSListViewTemplate" width="14" height="10"/>
-        <image name="NSNavEjectButton.normalSelected" width="16" height="16"/>
+        <image name="drag-handle-4x10" width="4" height="10"/>
+        <image name="eject-16x16" width="8" height="9"/>
+        <image name="eject-hover-16x16" width="16" height="16"/>
     </resources>
 </document>

Ample/Base.lproj/Preferences.xib

@@ -8,7 +8,9 @@
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="PreferencesWindowController">
             <connections>
+                <outlet property="fixButton" destination="kt8-xs-My0" id="GeF-Kj-q2l"/>
                 <outlet property="pathField" destination="Oz5-Xb-btk" id="EnV-kr-0XI"/>
+                <outlet property="wdField" destination="l8V-pC-gml" id="exX-bU-pbh"/>
                 <outlet property="window" destination="QvC-M9-y7g" id="xJa-tx-X62"/>
             </connections>
         </customObject>
@@ -24,7 +26,7 @@
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <textField verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Oz5-Xb-btk">
-                        <rect key="frame" x="98" y="181" width="362" height="21"/>
+                        <rect key="frame" x="138" y="181" width="322" height="21"/>
                         <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMinY="YES"/>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" drawsBackground="YES" id="vDR-2V-qxd">
                             <font key="font" usesAppearanceFont="YES"/>
@@ -33,21 +35,35 @@
                         </textFieldCell>
                         <connections>
                             <action selector="pathChanged:" target="-2" id="RRj-dC-q2y"/>
-                            <binding destination="yvB-HG-64y" name="enabled" keyPath="values.UseCustomMame" id="iex-A9-Db6"/>
                             <binding destination="yvB-HG-64y" name="value" keyPath="values.MamePath" id="H3O-1l-peo"/>
+                            <binding destination="yvB-HG-64y" name="enabled" keyPath="values.UseCustomMame" id="iex-A9-Db6"/>
                         </connections>
                     </textField>
-                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Qmb-Ag-Xyr">
-                        <rect key="frame" x="18" y="184" width="74" height="16"/>
+                    <textField verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="l8V-pC-gml">
+                        <rect key="frame" x="138" y="150" width="322" height="21"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMinY="YES"/>
+                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" drawsBackground="YES" id="wfj-GY-Qu2">
+                            <font key="font" usesAppearanceFont="YES"/>
+                            <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+                            <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                        </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"/>
+                        </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"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                        <textFieldCell key="cell" lineBreakMode="clipping" title="MAME Path" id="Xcq-4g-Wlw">
+                        <textFieldCell key="cell" lineBreakMode="clipping" title="Working Directory" id="UHt-0s-zxA">
                             <font key="font" metaFont="system"/>
                             <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                             <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                         </textFieldCell>
                     </textField>
                     <button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="KAN-P2-ydI">
-                        <rect key="frame" x="96" y="234" width="217" height="18"/>
+                        <rect key="frame" x="136" y="234" width="217" height="18"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <buttonCell key="cell" type="check" title="Close log window on normal exit" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="QMz-O0-06U">
                             <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
@@ -58,7 +74,7 @@
                         </connections>
                     </button>
                     <button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="j7D-jC-17Q">
-                        <rect key="frame" x="96" y="208" width="139" height="18"/>
+                        <rect key="frame" x="136" y="208" width="139" height="18"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <buttonCell key="cell" type="check" title="Use Custom MAME" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="V61-mz-QFo">
                             <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
@@ -68,6 +84,26 @@
                             <binding destination="yvB-HG-64y" name="value" keyPath="values.UseCustomMame" id="lH4-dm-kQC"/>
                         </connections>
                     </button>
+                    <button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="kt8-xs-My0">
+                        <rect key="frame" x="287" y="13" width="179" height="32"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
+                        <buttonCell key="cell" type="push" title="Fix VMNet Permissions" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="ifc-ID-wbu">
+                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                            <font key="font" metaFont="system"/>
+                        </buttonCell>
+                        <connections>
+                            <action selector="fixPerms:" target="-2" id="0e2-yf-UgY"/>
+                        </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"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                        <textFieldCell key="cell" lineBreakMode="clipping" title="MAME Path" id="Xcq-4g-Wlw">
+                            <font key="font" metaFont="system"/>
+                            <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                            <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                        </textFieldCell>
+                    </textField>
                 </subviews>
             </view>
             <point key="canvasLocation" x="140" y="147"/>

Ample/Base.lproj/SlotView.xib

@@ -8,625 +8,229 @@
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="SlotViewController">
             <connections>
-                <outlet property="aux_menu" destination="3kq-qn-7YR" id="wic-Ry-yAf"/>
-                <outlet property="exp_menu" destination="San-wP-1ez" id="X7u-dM-xrI"/>
-                <outlet property="game_menu" destination="K8G-bZ-6mZ" id="IeQ-ZT-5F6"/>
-                <outlet property="modem_menu" destination="KHf-kC-BpZ" id="Qab-mA-anC"/>
-                <outlet property="printer_menu" destination="sTp-en-8Wd" id="zeu-LF-6mV"/>
-                <outlet property="ram_menu" destination="Yks-M5-vi0" id="h5y-Un-jYJ"/>
-                <outlet property="rs232_menu" destination="6ln-U2-0Pi" id="7CT-OE-idV"/>
-                <outlet property="sl0_menu" destination="Jw1-t7-YyU" id="BB5-6y-zyf"/>
-                <outlet property="sl1_menu" destination="bta-RS-JT4" id="cpI-db-kzX"/>
-                <outlet property="sl2_menu" destination="cDU-b1-x5a" id="WtL-Fo-Q1B"/>
-                <outlet property="sl3_menu" destination="aSh-cs-0Nn" id="24o-66-LjH"/>
-                <outlet property="sl4_menu" destination="kU5-cR-hPZ" id="STc-6r-nxH"/>
-                <outlet property="sl5_menu" destination="8z4-8f-kLU" id="cLl-Ee-LUD"/>
-                <outlet property="sl6_menu" destination="GLb-F4-PWe" id="ubk-pt-e1Q"/>
-                <outlet property="sl7_menu" destination="IV2-3M-qfw" id="s5k-4G-w4r"/>
-                <outlet property="view" destination="OM3-7F-wiN" id="yre-ts-aHj"/>
+                <outlet property="_popover" destination="QIT-2T-wdy" id="WUB-OS-kem"/>
+                <outlet property="childOutlineView" destination="uM0-Gk-crn" id="aL5-uC-O28"/>
+                <outlet property="outlineView" destination="Xj3-Qf-yek" id="AWE-Rg-XUM"/>
+                <outlet property="view" destination="D45-lv-6Fv" id="av3-OE-ph2"/>
             </connections>
         </customObject>
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
         <customObject id="-3" userLabel="Application" customClass="NSObject"/>
-        <gridView autoresizesSubviews="NO" misplaced="YES" xPlacement="leading" yPlacement="bottom" rowAlignment="none" translatesAutoresizingMaskIntoConstraints="NO" id="OM3-7F-wiN">
-            <rect key="frame" x="0.0" y="0.0" width="306" height="459"/>
-            <rows>
-                <gridRow yPlacement="center" height="25" id="tHD-ui-hIL">
-                    <connections>
-                        <binding destination="-2" name="hidden" keyPath="machine.ram" id="ze9-jx-lv0">
-                            <dictionary key="options">
-                                <string key="NSValueTransformerName">NSIsNil</string>
-                            </dictionary>
-                        </binding>
-                    </connections>
-                </gridRow>
-                <gridRow yPlacement="center" height="25" id="Ccd-U2-Gx5">
-                    <connections>
-                        <binding destination="-2" name="hidden" keyPath="machine.sl0" id="YsR-kI-yrh">
-                            <dictionary key="options">
-                                <string key="NSValueTransformerName">NSIsNil</string>
-                            </dictionary>
-                        </binding>
-                    </connections>
-                </gridRow>
-                <gridRow yPlacement="center" height="25" id="JGU-aq-3uw">
-                    <connections>
-                        <binding destination="-2" name="hidden" keyPath="machine.sl1" id="1io-aZ-v2G">
-                            <dictionary key="options">
-                                <string key="NSValueTransformerName">NSIsNil</string>
-                            </dictionary>
-                        </binding>
-                    </connections>
-                </gridRow>
-                <gridRow yPlacement="center" height="25" id="gVW-Ya-phU">
-                    <connections>
-                        <binding destination="-2" name="hidden" keyPath="machine.sl2" id="AgS-hm-ePr">
-                            <dictionary key="options">
-                                <string key="NSValueTransformerName">NSIsNil</string>
-                            </dictionary>
-                        </binding>
-                    </connections>
-                </gridRow>
-                <gridRow yPlacement="center" height="25" id="3fP-qp-zmi">
-                    <connections>
-                        <binding destination="-2" name="hidden" keyPath="machine.sl3" id="98U-4P-iRh">
-                            <dictionary key="options">
-                                <string key="NSValueTransformerName">NSIsNil</string>
-                            </dictionary>
-                        </binding>
-                    </connections>
-                </gridRow>
-                <gridRow yPlacement="center" height="25" id="86u-5p-UT6">
-                    <connections>
-                        <binding destination="-2" name="hidden" keyPath="machine.sl4" id="hsy-pm-Qjk">
-                            <dictionary key="options">
-                                <string key="NSValueTransformerName">NSIsNil</string>
-                            </dictionary>
-                        </binding>
-                    </connections>
-                </gridRow>
-                <gridRow yPlacement="center" height="25" id="Wdg-xb-xQx">
-                    <connections>
-                        <binding destination="-2" name="hidden" keyPath="machine.sl5" id="0QC-RB-278">
-                            <dictionary key="options">
-                                <string key="NSValueTransformerName">NSIsNil</string>
-                            </dictionary>
-                        </binding>
-                    </connections>
-                </gridRow>
-                <gridRow yPlacement="center" height="25" id="ein-Fe-vBw">
-                    <connections>
-                        <binding destination="-2" name="hidden" keyPath="machine.sl6" id="731-3P-DUy">
-                            <dictionary key="options">
-                                <string key="NSValueTransformerName">NSIsNil</string>
-                            </dictionary>
-                        </binding>
-                    </connections>
-                </gridRow>
-                <gridRow yPlacement="center" height="25" id="qjB-2w-AWE">
-                    <connections>
-                        <binding destination="-2" name="hidden" keyPath="machine.sl7" id="sew-Ds-4I9">
-                            <dictionary key="options">
-                                <string key="NSValueTransformerName">NSIsNil</string>
-                            </dictionary>
-                        </binding>
-                    </connections>
-                </gridRow>
-                <gridRow yPlacement="center" height="25" id="EEX-dh-jwn">
-                    <connections>
-                        <binding destination="-2" name="hidden" keyPath="machine.exp" id="EOZ-lS-QHF">
-                            <dictionary key="options">
-                                <string key="NSValueTransformerName">NSIsNil</string>
-                            </dictionary>
-                        </binding>
-                    </connections>
-                </gridRow>
-                <gridRow yPlacement="center" height="25" id="OaZ-ZQ-gKK">
-                    <connections>
-                        <binding destination="-2" name="hidden" keyPath="machine.aux" id="OlF-v7-JZx">
-                            <dictionary key="options">
-                                <string key="NSValueTransformerName">NSIsNil</string>
-                            </dictionary>
-                        </binding>
-                    </connections>
-                </gridRow>
-                <gridRow yPlacement="center" height="25" id="wQi-Oz-7Ye">
-                    <connections>
-                        <binding destination="-2" name="hidden" keyPath="machine.rs232" id="AeP-bn-blv">
-                            <dictionary key="options">
-                                <string key="NSValueTransformerName">NSIsNil</string>
-                            </dictionary>
-                        </binding>
-                    </connections>
-                </gridRow>
-                <gridRow yPlacement="center" height="25" id="gr2-eY-995">
-                    <connections>
-                        <binding destination="-2" name="hidden" keyPath="machine.gameio" id="x3I-Bd-9di">
-                            <dictionary key="options">
-                                <string key="NSValueTransformerName">NSIsNil</string>
-                            </dictionary>
-                        </binding>
-                    </connections>
-                </gridRow>
-                <gridRow yPlacement="center" height="25" id="1xN-lm-s4l">
-                    <connections>
-                        <binding destination="-2" name="hidden" keyPath="machine.printer" id="T9a-lH-z5K">
-                            <dictionary key="options">
-                                <string key="NSValueTransformerName">NSIsNil</string>
-                            </dictionary>
-                        </binding>
-                    </connections>
-                </gridRow>
-                <gridRow yPlacement="center" height="25" id="M2s-qn-SIT">
-                    <connections>
-                        <binding destination="-2" name="hidden" keyPath="machine.modem" id="PSe-R3-S3e">
-                            <dictionary key="options">
-                                <string key="NSValueTransformerName">NSIsNil</string>
-                            </dictionary>
-                        </binding>
-                    </connections>
-                </gridRow>
-            </rows>
-            <columns>
-                <gridColumn xPlacement="fill" width="100" id="zpB-Rf-dWg"/>
-                <gridColumn xPlacement="fill" width="200" id="6Vn-yh-FoQ"/>
-            </columns>
-            <gridCells>
-                <gridCell row="tHD-ui-hIL" column="zpB-Rf-dWg" id="deJ-sv-Hb7">
-                    <textField key="contentView" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="nHa-QG-HjJ">
-                        <rect key="frame" x="-2" y="439" width="104" height="16"/>
-                        <textFieldCell key="cell" lineBreakMode="clipping" title="RAM:" id="CvY-8m-Ni9">
-                            <font key="font" usesAppearanceFont="YES"/>
-                            <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
-                            <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
-                        </textFieldCell>
-                    </textField>
-                </gridCell>
-                <gridCell row="tHD-ui-hIL" column="6Vn-yh-FoQ" id="dak-Ha-01u">
-                    <popUpButton key="contentView" verticalHuggingPriority="750" tag="16" translatesAutoresizingMaskIntoConstraints="NO" id="Yks-M5-vi0">
-                        <rect key="frame" x="104" y="433" width="205" height="25"/>
-                        <popUpButtonCell key="cell" type="push" title="Item 1" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" selectedItem="92u-m2-3yN" id="XFo-KF-ueS">
-                            <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
-                            <font key="font" metaFont="menu"/>
-                            <menu key="menu" id="k8O-sG-Qld">
-                                <items>
-                                    <menuItem title="Item 1" state="on" id="92u-m2-3yN">
-                                        <attributedString key="attributedTitle"/>
-                                    </menuItem>
-                                    <menuItem title="Item 2" id="dPG-tR-M4A"/>
-                                    <menuItem title="Item 3" id="q2n-oZ-46s"/>
-                                </items>
-                            </menu>
-                        </popUpButtonCell>
+        <scrollView focusRingType="none" borderType="none" autohidesScrollers="YES" horizontalLineScroll="27" horizontalPageScroll="10" verticalLineScroll="27" verticalPageScroll="10" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" horizontalScrollElasticity="none" id="D45-lv-6Fv">
+            <rect key="frame" x="0.0" y="0.0" width="316" height="386"/>
+            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+            <clipView key="contentView" autoresizesSubviews="NO" focusRingType="none" drawsBackground="NO" copiesOnScroll="NO" id="8x1-xN-a7c">
+                <rect key="frame" x="0.0" y="0.0" width="316" height="386"/>
+                <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                <subviews>
+                    <outlineView focusRingType="none" verticalHuggingPriority="750" allowsExpansionToolTips="YES" selectionHighlightStyle="none" columnReordering="NO" columnResizing="NO" multipleSelection="NO" autosaveColumns="NO" typeSelect="NO" rowHeight="25" rowSizeStyle="automatic" viewBased="YES" indentationPerLevel="2" autoresizesOutlineColumn="YES" outlineTableColumn="u7T-p8-F2Z" id="Xj3-Qf-yek">
+                        <rect key="frame" x="0.0" y="0.0" width="316" height="386"/>
+                        <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 editable="NO" width="296" minWidth="40" maxWidth="1000" id="u7T-p8-F2Z">
+                                <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="FM7-eO-FE4">
+                                    <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"/>
+                                <prototypeCellViews>
+                                    <tableCellView identifier="MenuCell" id="1RI-9K-5qj" customClass="SlotTableCellView">
+                                        <rect key="frame" x="1" y="1" width="296" height="25"/>
+                                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                                        <subviews>
+                                            <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="qIF-d4-kOf">
+                                                <rect key="frame" x="0.0" y="5" width="90" height="17"/>
+                                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                                                <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="RAM:" id="tIz-xZ-ZJH">
+                                                    <font key="font" metaFont="system"/>
+                                                    <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+                                                    <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+                                                </textFieldCell>
+                                            </textField>
+                                            <popUpButton verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="zQ8-o3-yBB">
+                                                <rect key="frame" x="82" y="0.0" width="199" height="25"/>
+                                                <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMinY="YES"/>
+                                                <popUpButtonCell key="cell" type="push" title="Item 1" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" autoenablesItems="NO" selectedItem="tGi-yg-GFr" id="gt4-HK-pd1">
+                                                    <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
+                                                    <font key="font" metaFont="menu"/>
+                                                    <menu key="menu" autoenablesItems="NO" id="KWV-nn-eiB">
+                                                        <items>
+                                                            <menuItem title="Item 1" state="on" id="tGi-yg-GFr"/>
+                                                            <menuItem title="Item 2" id="XJr-Gb-4D4"/>
+                                                            <menuItem title="Item 3" id="JeB-Fb-DeQ"/>
+                                                        </items>
+                                                    </menu>
+                                                </popUpButtonCell>
+                                                <connections>
+                                                    <action selector="menuChanged:" target="-2" id="9MH-mu-u5V"/>
+                                                </connections>
+                                            </popUpButton>
+                                            <button fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="xCe-sY-sGe">
+                                                <rect key="frame" x="282" y="8" width="14" height="10"/>
+                                                <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
+                                                <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="NSListViewTemplate" imagePosition="only" alignment="center" imageScaling="proportionallyUpOrDown" inset="2" id="0qU-ID-kJ8">
+                                                    <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                                                    <font key="font" metaFont="system"/>
+                                                </buttonCell>
+                                                <connections>
+                                                    <action selector="hamburger:" target="-2" id="5Xa-j7-Aod"/>
+                                                    <binding destination="1RI-9K-5qj" name="hidden" keyPath="objectValue.selectedItem.children" id="rY2-0l-0N8">
+                                                        <dictionary key="options">
+                                                            <string key="NSValueTransformerName">NSIsNil</string>
+                                                        </dictionary>
+                                                    </binding>
+                                                </connections>
+                                            </button>
+                                        </subviews>
+                                        <connections>
+                                            <outlet property="hamburgerButton" destination="xCe-sY-sGe" id="5Da-If-Bt4"/>
+                                            <outlet property="menuButton" destination="zQ8-o3-yBB" id="zZf-nm-tCI"/>
+                                            <outlet property="textField" destination="qIF-d4-kOf" id="zIF-4n-v1e"/>
+                                        </connections>
+                                    </tableCellView>
+                                </prototypeCellViews>
+                            </tableColumn>
+                        </tableColumns>
                         <connections>
-                            <action selector="memoryMenuChanged:" target="-2" id="m1Q-Xj-z22"/>
-                            <binding destination="-2" name="content" keyPath="machine.ram" id="UCD-j5-7Bh"/>
+                            <outlet property="dataSource" destination="-2" id="OV9-yE-OFp"/>
+                            <outlet property="delegate" destination="-2" id="kXs-TN-3VL"/>
                         </connections>
-                    </popUpButton>
-                </gridCell>
-                <gridCell row="Ccd-U2-Gx5" column="zpB-Rf-dWg" xPlacement="fill" yPlacement="center" id="QI6-Cz-URX">
-                    <textField key="contentView" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="v8c-Rp-Mnt">
-                        <rect key="frame" x="-2" y="408" width="104" height="16"/>
-                        <textFieldCell key="cell" lineBreakMode="clipping" title="Slot 0:" id="EF7-NX-RMW">
-                            <font key="font" metaFont="system"/>
-                            <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
-                            <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
-                        </textFieldCell>
-                    </textField>
-                </gridCell>
-                <gridCell row="Ccd-U2-Gx5" column="6Vn-yh-FoQ" xPlacement="fill" yPlacement="center" id="0KQ-Qt-8KP">
-                    <popUpButton key="contentView" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Jw1-t7-YyU">
-                        <rect key="frame" x="104" y="402" width="205" height="25"/>
-                        <popUpButtonCell key="cell" type="push" title="Item 1" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" selectedItem="8Iv-mH-mEI" id="47g-IO-4Xt">
-                            <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
-                            <font key="font" metaFont="menu"/>
-                            <menu key="menu" id="nrR-Tr-UaW">
-                                <items>
-                                    <menuItem title="Item 1" state="on" id="8Iv-mH-mEI"/>
-                                    <menuItem title="Item 2" id="Prr-6W-NWp"/>
-                                    <menuItem title="Item 3" id="xz3-bi-5IM"/>
-                                </items>
-                            </menu>
-                        </popUpButtonCell>
-                        <connections>
-                            <action selector="menuChanged:" target="-2" id="wPZ-cY-9Ir"/>
-                            <binding destination="-2" name="content" keyPath="machine.sl0" id="2aW-3q-Mvt"/>
-                        </connections>
-                    </popUpButton>
-                </gridCell>
-                <gridCell row="JGU-aq-3uw" column="zpB-Rf-dWg" xPlacement="fill" yPlacement="center" id="Y1R-Ob-g2b">
-                    <textField key="contentView" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="0gP-wH-DVr">
-                        <rect key="frame" x="-2" y="377" width="104" height="16"/>
-                        <textFieldCell key="cell" lineBreakMode="clipping" title="Slot 1:" id="bfg-tf-E34">
-                            <font key="font" usesAppearanceFont="YES"/>
-                            <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
-                            <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
-                        </textFieldCell>
-                    </textField>
-                </gridCell>
-                <gridCell row="JGU-aq-3uw" column="6Vn-yh-FoQ" xPlacement="fill" yPlacement="center" id="v8q-Rj-E4q">
-                    <popUpButton key="contentView" verticalHuggingPriority="750" tag="1" translatesAutoresizingMaskIntoConstraints="NO" id="bta-RS-JT4">
-                        <rect key="frame" x="104" y="371" width="205" height="25"/>
-                        <popUpButtonCell key="cell" type="push" title="Item 1" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" selectedItem="dXO-at-nGw" id="kNn-6b-ysf">
-                            <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
-                            <font key="font" metaFont="menu"/>
-                            <menu key="menu" id="4ah-BI-RD5">
-                                <items>
-                                    <menuItem title="Item 1" state="on" id="dXO-at-nGw"/>
-                                    <menuItem title="Item 2" id="UZY-8b-qmE"/>
-                                    <menuItem title="Item 3" id="zxA-OM-BIY"/>
-                                </items>
-                            </menu>
-                        </popUpButtonCell>
-                        <connections>
-                            <action selector="menuChanged:" target="-2" id="hl3-N2-89k"/>
-                            <binding destination="-2" name="content" keyPath="machine.sl1" id="wQI-oy-SYz"/>
-                        </connections>
-                    </popUpButton>
-                </gridCell>
-                <gridCell row="gVW-Ya-phU" column="zpB-Rf-dWg" xPlacement="fill" yPlacement="center" id="tpv-Yc-qii">
-                    <textField key="contentView" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="EHZ-ol-QVz">
-                        <rect key="frame" x="-2" y="346" width="104" height="16"/>
-                        <textFieldCell key="cell" lineBreakMode="clipping" title="Slot 2:" id="FlL-pN-rn7">
-                            <font key="font" usesAppearanceFont="YES"/>
-                            <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
-                            <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
-                        </textFieldCell>
-                    </textField>
-                </gridCell>
-                <gridCell row="gVW-Ya-phU" column="6Vn-yh-FoQ" xPlacement="fill" yPlacement="center" id="OzN-rM-Pgi">
-                    <popUpButton key="contentView" verticalHuggingPriority="750" tag="2" translatesAutoresizingMaskIntoConstraints="NO" id="cDU-b1-x5a">
-                        <rect key="frame" x="104" y="340" width="205" height="25"/>
-                        <popUpButtonCell key="cell" type="push" title="Item 1" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" selectedItem="vCY-qF-aB3" id="jvL-SH-nvG">
-                            <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
-                            <font key="font" metaFont="menu"/>
-                            <menu key="menu" id="Hp6-Gt-pVV">
-                                <items>
-                                    <menuItem title="Item 1" state="on" id="vCY-qF-aB3"/>
-                                    <menuItem title="Item 2" id="pbR-nc-itb"/>
-                                    <menuItem title="Item 3" id="L8Z-vH-OCa"/>
-                                </items>
-                            </menu>
-                        </popUpButtonCell>
-                        <connections>
-                            <action selector="menuChanged:" target="-2" id="T5w-C4-Ohq"/>
-                            <binding destination="-2" name="content" keyPath="machine.sl2" id="uXQ-0A-98q"/>
-                        </connections>
-                    </popUpButton>
-                </gridCell>
-                <gridCell row="3fP-qp-zmi" column="zpB-Rf-dWg" xPlacement="fill" yPlacement="center" id="LbW-TT-AQ7">
-                    <textField key="contentView" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="zGs-8d-L0S">
-                        <rect key="frame" x="-2" y="315" width="104" height="16"/>
-                        <textFieldCell key="cell" lineBreakMode="clipping" title="Slot 3:" id="KZK-h8-8cw">
-                            <font key="font" usesAppearanceFont="YES"/>
-                            <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
-                            <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
-                        </textFieldCell>
-                    </textField>
-                </gridCell>
-                <gridCell row="3fP-qp-zmi" column="6Vn-yh-FoQ" xPlacement="fill" yPlacement="center" id="h8H-TB-p2z">
-                    <popUpButton key="contentView" verticalHuggingPriority="750" tag="3" translatesAutoresizingMaskIntoConstraints="NO" id="aSh-cs-0Nn">
-                        <rect key="frame" x="104" y="309" width="205" height="25"/>
-                        <popUpButtonCell key="cell" type="push" title="Item 1" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" selectedItem="2yS-4z-8OR" id="HaE-TD-5Wx">
-                            <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
-                            <font key="font" metaFont="menu"/>
-                            <menu key="menu" id="zka-z5-hPa">
-                                <items>
-                                    <menuItem title="Item 1" state="on" id="2yS-4z-8OR"/>
-                                    <menuItem title="Item 2" id="q4H-Fz-zVr"/>
-                                    <menuItem title="Item 3" id="HtQ-6y-S25"/>
-                                </items>
-                            </menu>
-                        </popUpButtonCell>
-                        <connections>
-                            <action selector="menuChanged:" target="-2" id="5uS-La-5cM"/>
-                            <binding destination="-2" name="content" keyPath="machine.sl3" id="YgU-fX-fPC"/>
-                        </connections>
-                    </popUpButton>
-                </gridCell>
-                <gridCell row="86u-5p-UT6" column="zpB-Rf-dWg" xPlacement="fill" yPlacement="center" id="hJR-nJ-yYi">
-                    <textField key="contentView" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="zsX-jd-6ba">
-                        <rect key="frame" x="-2" y="284" width="104" height="16"/>
-                        <textFieldCell key="cell" lineBreakMode="clipping" title="Slot 4:" id="WXv-RF-e7f">
-                            <font key="font" usesAppearanceFont="YES"/>
-                            <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
-                            <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
-                        </textFieldCell>
-                    </textField>
-                </gridCell>
-                <gridCell row="86u-5p-UT6" column="6Vn-yh-FoQ" xPlacement="fill" yPlacement="center" id="dHu-cL-FyO">
-                    <popUpButton key="contentView" verticalHuggingPriority="750" tag="4" translatesAutoresizingMaskIntoConstraints="NO" id="kU5-cR-hPZ">
-                        <rect key="frame" x="104" y="278" width="205" height="25"/>
-                        <popUpButtonCell key="cell" type="push" title="Item 1" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" selectedItem="NaS-CV-XQm" id="rOP-eY-UKe">
-                            <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
-                            <font key="font" metaFont="menu"/>
-                            <menu key="menu" id="Iwv-z3-oJb">
-                                <items>
-                                    <menuItem title="Item 1" state="on" id="NaS-CV-XQm"/>
-                                    <menuItem title="Item 2" id="ovb-SG-Eg4"/>
-                                    <menuItem title="Item 3" id="GVh-L4-3Cp"/>
-                                </items>
-                            </menu>
-                        </popUpButtonCell>
-                        <connections>
-                            <action selector="menuChanged:" target="-2" id="I35-wl-YdH"/>
-                            <binding destination="-2" name="content" keyPath="machine.sl4" id="yfx-hj-6Ly"/>
-                        </connections>
-                    </popUpButton>
-                </gridCell>
-                <gridCell row="Wdg-xb-xQx" column="zpB-Rf-dWg" xPlacement="fill" yPlacement="center" id="dsM-t5-8ng">
-                    <textField key="contentView" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="ANg-c1-hGf">
-                        <rect key="frame" x="-2" y="253" width="104" height="16"/>
-                        <textFieldCell key="cell" lineBreakMode="clipping" title="Slot 5:" id="EhN-EV-65V">
-                            <font key="font" usesAppearanceFont="YES"/>
-                            <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
-                            <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
-                        </textFieldCell>
-                    </textField>
-                </gridCell>
-                <gridCell row="Wdg-xb-xQx" column="6Vn-yh-FoQ" xPlacement="fill" yPlacement="center" id="ffm-pA-jjo">
-                    <popUpButton key="contentView" verticalHuggingPriority="750" tag="5" translatesAutoresizingMaskIntoConstraints="NO" id="8z4-8f-kLU">
-                        <rect key="frame" x="104" y="247" width="205" height="25"/>
-                        <popUpButtonCell key="cell" type="push" title="Item 1" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" selectedItem="gH7-4J-xsg" id="cmc-Gf-Slp">
-                            <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
-                            <font key="font" metaFont="menu"/>
-                            <menu key="menu" id="Cma-00-qCY">
-                                <items>
-                                    <menuItem title="Item 1" state="on" id="gH7-4J-xsg"/>
-                                    <menuItem title="Item 2" id="meM-WH-GgP"/>
-                                    <menuItem title="Item 3" id="ILg-Ld-9Ri"/>
-                                </items>
-                            </menu>
-                        </popUpButtonCell>
-                        <connections>
-                            <action selector="menuChanged:" target="-2" id="jSe-j9-QUW"/>
-                            <binding destination="-2" name="content" keyPath="machine.sl5" id="Uo1-Rg-wko"/>
-                        </connections>
-                    </popUpButton>
-                </gridCell>
-                <gridCell row="ein-Fe-vBw" column="zpB-Rf-dWg" xPlacement="fill" yPlacement="center" id="PSw-Jx-eS2">
-                    <textField key="contentView" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Cr1-RK-Z7V">
-                        <rect key="frame" x="-2" y="222" width="104" height="16"/>
-                        <textFieldCell key="cell" lineBreakMode="clipping" title="Slot 6:" id="uzy-th-5Yc">
-                            <font key="font" usesAppearanceFont="YES"/>
-                            <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
-                            <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
-                        </textFieldCell>
-                    </textField>
-                </gridCell>
-                <gridCell row="ein-Fe-vBw" column="6Vn-yh-FoQ" xPlacement="fill" yPlacement="center" id="FsV-vO-KAs">
-                    <popUpButton key="contentView" verticalHuggingPriority="750" tag="6" translatesAutoresizingMaskIntoConstraints="NO" id="GLb-F4-PWe">
-                        <rect key="frame" x="104" y="216" width="205" height="25"/>
-                        <popUpButtonCell key="cell" type="push" title="Item 1" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" selectedItem="VaX-M9-Op0" id="CjU-rC-HUT">
-                            <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
-                            <font key="font" metaFont="menu"/>
-                            <menu key="menu" id="3xq-Hn-icN">
-                                <items>
-                                    <menuItem title="Item 1" state="on" id="VaX-M9-Op0"/>
-                                    <menuItem title="Item 2" id="Fhy-5D-e6z"/>
-                                    <menuItem title="Item 3" id="9jw-LA-666"/>
-                                </items>
-                            </menu>
-                        </popUpButtonCell>
-                        <connections>
-                            <action selector="menuChanged:" target="-2" id="yZO-kH-P6Q"/>
-                            <binding destination="-2" name="content" keyPath="machine.sl6" id="0ze-xJ-DNX"/>
-                        </connections>
-                    </popUpButton>
-                </gridCell>
-                <gridCell row="qjB-2w-AWE" column="zpB-Rf-dWg" xPlacement="fill" yPlacement="center" id="1WE-Mm-0O3">
-                    <textField key="contentView" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3Ia-XB-C6D">
-                        <rect key="frame" x="-2" y="191" width="104" height="16"/>
-                        <textFieldCell key="cell" lineBreakMode="clipping" title="Slot 7:" id="32J-6e-nRV">
-                            <font key="font" usesAppearanceFont="YES"/>
-                            <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
-                            <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
-                        </textFieldCell>
-                    </textField>
-                </gridCell>
-                <gridCell row="qjB-2w-AWE" column="6Vn-yh-FoQ" xPlacement="fill" yPlacement="center" id="Yvr-uR-Hr5">
-                    <popUpButton key="contentView" verticalHuggingPriority="750" tag="7" translatesAutoresizingMaskIntoConstraints="NO" id="IV2-3M-qfw">
-                        <rect key="frame" x="104" y="185" width="205" height="25"/>
-                        <popUpButtonCell key="cell" type="push" title="Item 1" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" selectedItem="8nb-Bq-4R4" id="nKb-Ar-bCb">
-                            <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
-                            <font key="font" metaFont="menu"/>
-                            <menu key="menu" id="R2a-Mg-LsY">
-                                <items>
-                                    <menuItem title="Item 1" state="on" id="8nb-Bq-4R4"/>
-                                    <menuItem title="Item 2" id="rFT-bC-KE9"/>
-                                    <menuItem title="Item 3" id="4jB-gp-lYT"/>
-                                </items>
-                            </menu>
-                        </popUpButtonCell>
-                        <connections>
-                            <action selector="menuChanged:" target="-2" id="llh-ab-ayK"/>
-                            <binding destination="-2" name="content" keyPath="machine.sl7" id="hT6-pS-WmL"/>
-                        </connections>
-                    </popUpButton>
-                </gridCell>
-                <gridCell row="EEX-dh-jwn" column="zpB-Rf-dWg" xPlacement="fill" yPlacement="center" id="iRl-IX-FSD">
-                    <textField key="contentView" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Avf-lX-f2Q">
-                        <rect key="frame" x="-2" y="160" width="104" height="16"/>
-                        <textFieldCell key="cell" lineBreakMode="clipping" title="Expansion:" id="PEU-OV-910">
-                            <font key="font" usesAppearanceFont="YES"/>
-                            <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
-                            <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
-                        </textFieldCell>
-                    </textField>
-                </gridCell>
-                <gridCell row="EEX-dh-jwn" column="6Vn-yh-FoQ" xPlacement="fill" yPlacement="center" id="Ehv-aA-Llc">
-                    <popUpButton key="contentView" verticalHuggingPriority="750" tag="8" translatesAutoresizingMaskIntoConstraints="NO" id="San-wP-1ez">
-                        <rect key="frame" x="104" y="154" width="205" height="25"/>
-                        <popUpButtonCell key="cell" type="push" title="Item 1" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" selectedItem="jtv-Qx-oVD" id="42u-b4-3kx">
-                            <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
-                            <font key="font" metaFont="menu"/>
-                            <menu key="menu" id="1hM-MS-UEz">
-                                <items>
-                                    <menuItem title="Item 1" state="on" id="jtv-Qx-oVD"/>
-                                    <menuItem title="Item 2" id="UeB-A1-nyv"/>
-                                    <menuItem title="Item 3" id="GyZ-dv-MS4"/>
-                                </items>
-                            </menu>
-                        </popUpButtonCell>
-                        <connections>
-                            <action selector="menuChanged:" target="-2" id="fi5-WL-lQa"/>
-                            <binding destination="-2" name="content" keyPath="machine.exp" id="C88-Gb-QTE"/>
-                        </connections>
-                    </popUpButton>
-                </gridCell>
-                <gridCell row="OaZ-ZQ-gKK" column="zpB-Rf-dWg" xPlacement="fill" yPlacement="center" id="wRB-Wh-7kG">
-                    <textField key="contentView" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="EMz-7i-H38">
-                        <rect key="frame" x="-2" y="129" width="104" height="16"/>
-                        <textFieldCell key="cell" lineBreakMode="clipping" title="Auxiliary:" id="SoV-Qy-h2g">
-                            <font key="font" usesAppearanceFont="YES"/>
-                            <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
-                            <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
-                        </textFieldCell>
-                    </textField>
-                </gridCell>
-                <gridCell row="OaZ-ZQ-gKK" column="6Vn-yh-FoQ" xPlacement="fill" yPlacement="center" id="bx6-Rc-x2V">
-                    <popUpButton key="contentView" verticalHuggingPriority="750" tag="9" translatesAutoresizingMaskIntoConstraints="NO" id="3kq-qn-7YR">
-                        <rect key="frame" x="104" y="123" width="205" height="25"/>
-                        <popUpButtonCell key="cell" type="push" title="Item 1" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" selectedItem="vWX-Cb-ldP" id="NqP-Uq-Knv">
-                            <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
-                            <font key="font" metaFont="menu"/>
-                            <menu key="menu" id="7Ef-KS-ulj">
-                                <items>
-                                    <menuItem title="Item 1" state="on" id="vWX-Cb-ldP"/>
-                                    <menuItem title="Item 2" id="Yg1-xZ-vXq"/>
-                                    <menuItem title="Item 3" id="BwC-w9-hBy"/>
-                                </items>
-                            </menu>
-                        </popUpButtonCell>
-                        <connections>
-                            <action selector="menuChanged:" target="-2" id="uvt-uD-Adn"/>
-                            <binding destination="-2" name="content" keyPath="machine.aux" id="KA7-7x-qeJ"/>
-                        </connections>
-                    </popUpButton>
-                </gridCell>
-                <gridCell row="wQi-Oz-7Ye" column="zpB-Rf-dWg" xPlacement="fill" yPlacement="center" id="KoQ-xV-fQu">
-                    <textField key="contentView" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="JAG-sJ-u2B">
-                        <rect key="frame" x="-2" y="98" width="104" height="16"/>
-                        <textFieldCell key="cell" lineBreakMode="clipping" title="RS 232:" id="iG2-rY-VDv">
-                            <font key="font" usesAppearanceFont="YES"/>
-                            <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
-                            <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
-                        </textFieldCell>
-                    </textField>
-                </gridCell>
-                <gridCell row="wQi-Oz-7Ye" column="6Vn-yh-FoQ" xPlacement="fill" yPlacement="center" id="zWk-jd-i0V">
-                    <popUpButton key="contentView" verticalHuggingPriority="750" tag="10" translatesAutoresizingMaskIntoConstraints="NO" id="6ln-U2-0Pi">
-                        <rect key="frame" x="104" y="92" width="205" height="25"/>
-                        <popUpButtonCell key="cell" type="push" title="Item 1" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" selectedItem="uu3-rr-iD8" id="daT-eX-4Vu">
-                            <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
-                            <font key="font" metaFont="menu"/>
-                            <menu key="menu" id="fMw-mh-Qfi">
-                                <items>
-                                    <menuItem title="Item 1" state="on" id="uu3-rr-iD8"/>
-                                    <menuItem title="Item 2" id="f1r-MS-itp"/>
-                                    <menuItem title="Item 3" id="WhP-Di-CHP"/>
-                                </items>
-                            </menu>
-                        </popUpButtonCell>
-                        <connections>
-                            <action selector="menuChanged:" target="-2" id="gmZ-pW-35n"/>
-                            <binding destination="-2" name="content" keyPath="machine.rs232" id="LxA-8b-jb4"/>
-                        </connections>
-                    </popUpButton>
-                </gridCell>
-                <gridCell row="gr2-eY-995" column="zpB-Rf-dWg" id="xIE-bJ-mzr">
-                    <textField key="contentView" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Svb-pu-WPf">
-                        <rect key="frame" x="-2" y="67" width="104" height="16"/>
-                        <textFieldCell key="cell" lineBreakMode="clipping" title="Game I/O:" id="2Gc-mV-zCZ">
-                            <font key="font" usesAppearanceFont="YES"/>
-                            <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
-                            <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
-                        </textFieldCell>
-                    </textField>
-                </gridCell>
-                <gridCell row="gr2-eY-995" column="6Vn-yh-FoQ" id="nhy-Gp-GLL">
-                    <popUpButton key="contentView" verticalHuggingPriority="750" tag="11" translatesAutoresizingMaskIntoConstraints="NO" id="K8G-bZ-6mZ">
-                        <rect key="frame" x="104" y="61" width="205" height="25"/>
-                        <popUpButtonCell key="cell" type="push" title="Item 1" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" selectedItem="GOm-Tf-6qc" id="Mig-Nu-gZB">
-                            <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
-                            <font key="font" metaFont="menu"/>
-                            <menu key="menu" id="faU-zS-LgN">
-                                <items>
-                                    <menuItem title="Item 1" state="on" id="GOm-Tf-6qc"/>
-                                    <menuItem title="Item 2" id="XgG-U0-2G7"/>
-                                    <menuItem title="Item 3" id="4Ea-aE-sB1"/>
-                                </items>
-                            </menu>
-                        </popUpButtonCell>
-                        <connections>
-                            <action selector="menuChanged:" target="-2" id="o53-71-xuf"/>
-                            <binding destination="-2" name="content" keyPath="machine.gameio" id="tJw-AS-RUz"/>
-                        </connections>
-                    </popUpButton>
-                </gridCell>
-                <gridCell row="1xN-lm-s4l" column="zpB-Rf-dWg" id="vPV-KN-NNp">
-                    <textField key="contentView" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="31K-iE-RCe">
-                        <rect key="frame" x="-2" y="36" width="104" height="16"/>
-                        <textFieldCell key="cell" lineBreakMode="clipping" title="Printer:" id="QZI-H7-i8m">
-                            <font key="font" usesAppearanceFont="YES"/>
-                            <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
-                            <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
-                        </textFieldCell>
-                    </textField>
-                </gridCell>
-                <gridCell row="1xN-lm-s4l" column="6Vn-yh-FoQ" id="KRc-Z8-drK">
-                    <popUpButton key="contentView" verticalHuggingPriority="750" tag="12" translatesAutoresizingMaskIntoConstraints="NO" id="sTp-en-8Wd">
-                        <rect key="frame" x="104" y="30" width="205" height="25"/>
-                        <popUpButtonCell key="cell" type="push" title="Item 1" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" selectedItem="TU9-ed-ofw" id="1OL-aw-xNL">
-                            <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
-                            <font key="font" metaFont="menu"/>
-                            <menu key="menu" id="MSP-Iu-ix3">
-                                <items>
-                                    <menuItem title="Item 1" state="on" id="TU9-ed-ofw"/>
-                                    <menuItem title="Item 2" id="7wI-Tn-rE0"/>
-                                    <menuItem title="Item 3" id="bQc-pc-ccM"/>
-                                </items>
-                            </menu>
-                        </popUpButtonCell>
-                        <connections>
-                            <action selector="menuChanged:" target="-2" id="Fxc-YB-SF9"/>
-                            <binding destination="-2" name="content" keyPath="machine.printer" id="3l1-Hn-v47"/>
-                        </connections>
-                    </popUpButton>
-                </gridCell>
-                <gridCell row="M2s-qn-SIT" column="zpB-Rf-dWg" id="8R2-aA-mLq">
-                    <textField key="contentView" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="MH0-Nk-5Py">
-                        <rect key="frame" x="-2" y="5" width="104" height="16"/>
-                        <textFieldCell key="cell" lineBreakMode="clipping" title="Modem:" id="HQq-VN-Ju9">
-                            <font key="font" usesAppearanceFont="YES"/>
-                            <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
-                            <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
-                        </textFieldCell>
-                    </textField>
-                </gridCell>
-                <gridCell row="M2s-qn-SIT" column="6Vn-yh-FoQ" id="idI-pW-e7v">
-                    <popUpButton key="contentView" verticalHuggingPriority="750" tag="13" translatesAutoresizingMaskIntoConstraints="NO" id="KHf-kC-BpZ">
-                        <rect key="frame" x="104" y="-1" width="205" height="25"/>
-                        <popUpButtonCell key="cell" type="push" title="Item 1" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" selectedItem="CxO-3g-va1" id="jDr-6p-C7y">
-                            <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
-                            <font key="font" metaFont="menu"/>
-                            <menu key="menu" id="lxi-Z0-ya6">
-                                <items>
-                                    <menuItem title="Item 1" state="on" id="CxO-3g-va1"/>
-                                    <menuItem title="Item 2" id="OpR-vy-iL5"/>
-                                    <menuItem title="Item 3" id="xvH-9B-ge5"/>
-                                </items>
-                            </menu>
-                        </popUpButtonCell>
-                        <connections>
-                            <action selector="menuChanged:" target="-2" id="pHW-GG-2VQ"/>
-                            <binding destination="-2" name="content" keyPath="machine.modem" id="hFa-pj-NnN"/>
-                        </connections>
-                    </popUpButton>
-                </gridCell>
-            </gridCells>
-            <point key="canvasLocation" x="268" y="71"/>
-        </gridView>
-        <userDefaultsController representsSharedInstance="YES" id="ZGN-Cx-9po"/>
+                    </outlineView>
+                </subviews>
+                <color key="backgroundColor" name="windowBackgroundColor" catalog="System" colorSpace="catalog"/>
+            </clipView>
+            <scroller key="horizontalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="YES" id="rYF-ld-adB">
+                <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="4pL-Dn-e75" 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>
+            <point key="canvasLocation" x="-100" y="154"/>
+        </scrollView>
+        <viewController id="ziL-Zf-s1k" userLabel="Popover View Controller">
+            <connections>
+                <outlet property="view" destination="uew-UQ-Q25" id="qjB-ya-gFf"/>
+            </connections>
+        </viewController>
+        <popover behavior="t" id="QIT-2T-wdy">
+            <connections>
+                <outlet property="contentViewController" destination="ziL-Zf-s1k" id="rj8-2U-9t0"/>
+            </connections>
+        </popover>
+        <customView id="uew-UQ-Q25">
+            <rect key="frame" x="0.0" y="0.0" width="250" height="400"/>
+            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+            <subviews>
+                <button id="2jh-iq-DV6">
+                    <rect key="frame" x="232" y="382" width="14" height="14"/>
+                    <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
+                    <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="NSStopProgressFreestandingTemplate" imagePosition="only" alignment="center" imageScaling="proportionallyUpOrDown" inset="2" id="Wp7-Km-kYI">
+                        <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                        <font key="font" metaFont="system"/>
+                        <string key="keyEquivalent" base64-UTF8="YES">
+Gw
+</string>
+                    </buttonCell>
+                    <connections>
+                        <action selector="performClose:" target="QIT-2T-wdy" id="Q04-24-ZOK"/>
+                    </connections>
+                </button>
+                <scrollView focusRingType="none" borderType="none" autohidesScrollers="YES" horizontalLineScroll="27" horizontalPageScroll="10" verticalLineScroll="27" verticalPageScroll="10" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" horizontalScrollElasticity="none" id="5gB-oE-Gza">
+                    <rect key="frame" x="0.0" y="20" width="250" height="360"/>
+                    <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                    <clipView key="contentView" focusRingType="none" drawsBackground="NO" copiesOnScroll="NO" id="X5e-Ka-JLr">
+                        <rect key="frame" x="0.0" y="0.0" width="250" height="360"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <subviews>
+                            <outlineView focusRingType="none" verticalHuggingPriority="750" allowsExpansionToolTips="YES" selectionHighlightStyle="none" columnReordering="NO" columnResizing="NO" multipleSelection="NO" autosaveColumns="NO" typeSelect="NO" rowHeight="25" rowSizeStyle="automatic" viewBased="YES" indentationPerLevel="16" autoresizesOutlineColumn="YES" outlineTableColumn="o1K-z1-KVi" id="uM0-Gk-crn">
+                                <rect key="frame" x="0.0" y="0.0" width="250" height="360"/>
+                                <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="230" minWidth="40" maxWidth="1000" id="o1K-z1-KVi">
+                                        <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="A12-NQ-gW3">
+                                            <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"/>
+                                        <prototypeCellViews>
+                                            <tableCellView identifier="MenuCell" id="Mgb-8H-DmI" customClass="SlotTableCellView">
+                                                <rect key="frame" x="1" y="1" width="230" height="25"/>
+                                                <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                                                <subviews>
+                                                    <popUpButton verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="ThL-Yz-7Kd">
+                                                        <rect key="frame" x="1" y="0.0" width="229" height="25"/>
+                                                        <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
+                                                        <popUpButtonCell key="cell" type="push" title="Item 1" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" autoenablesItems="NO" selectedItem="djR-rV-wzX" id="SkW-fW-gwL">
+                                                            <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
+                                                            <font key="font" metaFont="menu"/>
+                                                            <menu key="menu" autoenablesItems="NO" id="7Ib-TL-f6U">
+                                                                <items>
+                                                                    <menuItem title="Item 1" state="on" id="djR-rV-wzX"/>
+                                                                    <menuItem title="Item 2" id="qbC-4D-6t6"/>
+                                                                    <menuItem title="Item 3" id="qPv-x5-zpj"/>
+                                                                </items>
+                                                            </menu>
+                                                        </popUpButtonCell>
+                                                        <connections>
+                                                            <action selector="menuChanged:" target="-2" id="ytA-nD-fIS"/>
+                                                        </connections>
+                                                    </popUpButton>
+                                                </subviews>
+                                                <connections>
+                                                    <outlet property="menuButton" destination="ThL-Yz-7Kd" id="3Oc-hx-qKl"/>
+                                                </connections>
+                                            </tableCellView>
+                                        </prototypeCellViews>
+                                    </tableColumn>
+                                </tableColumns>
+                                <connections>
+                                    <outlet property="dataSource" destination="-2" id="HXP-pH-3Lc"/>
+                                    <outlet property="delegate" destination="-2" id="nwb-IL-MsP"/>
+                                </connections>
+                            </outlineView>
+                        </subviews>
+                        <color key="backgroundColor" white="1" alpha="0.0" colorSpace="custom" customColorSpace="calibratedWhite"/>
+                    </clipView>
+                    <scroller key="horizontalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="YES" id="Keh-oo-CPO">
+                        <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="wtc-gL-alh" customClass="TransparentScroller">
+                        <rect key="frame" x="224" y="17" width="15" height="102"/>
+                        <autoresizingMask key="autoresizingMask"/>
+                    </scroller>
+                </scrollView>
+            </subviews>
+            <point key="canvasLocation" x="-451" y="61"/>
+        </customView>
     </objects>
+    <resources>
+        <image name="NSListViewTemplate" width="14" height="10"/>
+        <image name="NSStopProgressFreestandingTemplate" width="14" height="14"/>
+    </resources>
 </document>

Ample/BookmarkManager.h

@@ -0,0 +1,34 @@
+//
+//  BookmarkManager.h
+//  Ample
+//
+//  Created by Kelvin Sherlock on 6/1/2021.
+//  Copyright © 2021 Kelvin Sherlock. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+@class NSMenu;
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface BookmarkManager : NSObject
+
+@property (weak) IBOutlet NSMenu *menu;
+
++(instancetype)sharedManager;
+
+-(void)loadBookmarks;
+-(void)updateMenu;
+
+-(BOOL)validateName: (NSString *)name;
+
+-(BOOL)saveBookmark: (NSDictionary *)bookmark name: (NSString *)name;
+-(NSDictionary *)loadBookmarkFromURL: (NSURL *)url;
+
+-(BOOL)saveDefault: (NSDictionary *)bookmark;
+-(NSDictionary *)loadDefault;
+
+@end
+
+NS_ASSUME_NONNULL_END

Ample/BookmarkManager.m

@@ -0,0 +1,214 @@
+//
+//  BookmarkManager.m
+//  Ample
+//
+//  Created by Kelvin Sherlock on 6/1/2021.
+//  Copyright © 2021 Kelvin Sherlock. All rights reserved.
+//
+
+#import "BookmarkManager.h"
+#import "Ample.h"
+
+@interface BookmarkManager () {
+    NSArray<NSURL *> *_urls;
+    NSURL *_bookmarkDirectory;
+}
+
+@end
+
+@implementation BookmarkManager
+
+static BookmarkManager *singleton = nil;
+
+-(void)awakeFromNib {
+    if (!singleton) singleton = self;
+}
+
++(instancetype)sharedManager {
+    if (!singleton) singleton = [BookmarkManager new];
+    return singleton;
+}
+
+-(instancetype)init {
+    if (singleton) return singleton;
+    return [super init];
+}
+
+-(NSURL *)bookmarkDirectory {
+    
+    if (_bookmarkDirectory) return _bookmarkDirectory;
+    NSFileManager *fm = [NSFileManager defaultManager];
+
+    NSURL *url = SupportDirectory();
+    url = [url URLByAppendingPathComponent: @"Bookmarks"];
+    NSError *error = nil;
+    [fm createDirectoryAtURL: url withIntermediateDirectories: YES attributes: nil error: &error];
+    if (error) NSLog(@"%@", error);
+    _bookmarkDirectory = url;
+    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;
+}
+
+
+-(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;
+}
+
+/* save as .Default */
+-(BOOL)saveDefault: (NSDictionary *)bookmark {
+
+    NSURL *url = [self bookmarkDirectory];
+    url = [url URLByAppendingPathComponent: @".Default"];
+
+    NSError *error = nil;
+    BOOL ok = NO;
+    if (@available(macOS 10.13, *)) {
+        ok = [bookmark writeToURL: url error: &error];
+        if (!ok) NSLog(@"%@", error);
+    } else {
+        ok = [bookmark writeToURL: url atomically: YES];
+    }
+    return ok;
+}
+
+-(BOOL)saveBookmark: (NSDictionary *)bookmark name: (NSString *)name {
+    
+    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];
+
+    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;
+            }
+        }
+    }
+    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];
+    }
+
+    return YES;
+}
+
+-(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;
+
+    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;
+}
+
+-(void)updateMenu {
+    
+    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];
+        [item setTag: 0xdeadbeef];
+    }
+}
+
+@end

Ample/CheatSheetWindowController.h

@@ -0,0 +1,17 @@
+//
+//  CheatSheetWindowController.h
+//  Ample
+//
+//  Created by Kelvin Sherlock on 1/14/2021.
+//  Copyright © 2021 Kelvin Sherlock. All rights reserved.
+//
+
+#import <Cocoa/Cocoa.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface CheatSheetWindowController : NSWindowController
+
+@end
+
+NS_ASSUME_NONNULL_END

Ample/CheatSheetWindowController.m

@@ -0,0 +1,61 @@
+//
+//  CheatSheetWindowController.m
+//  Ample
+//
+//  Created by Kelvin Sherlock on 1/14/2021.
+//  Copyright © 2021 Kelvin Sherlock. All rights reserved.
+//
+
+#import "CheatSheetWindowController.h"
+
+#import <WebKit/WebKit.h>
+
+@interface CheatSheetWindowController ()
+@property (weak) IBOutlet WKWebView *webView;
+
+@end
+
+@interface CheatSheetWindowController (NavigationDelegate) <WKNavigationDelegate>
+@end
+
+@implementation CheatSheetWindowController
+
+-(NSString *)windowNibName {
+    return @"CheatSheet";
+}
+
+- (void)windowDidLoad {
+    [super windowDidLoad];
+    
+    if (!_webView) {
+        WKWebView *webView;
+        NSWindow *window = [self window];
+        CGRect frame = [[window contentView] frame];
+
+
+        webView = [WKWebView new];
+        [webView setFrame: frame];
+        [webView setNavigationDelegate: self];
+        [[window contentView]addSubview: webView];
+        _webView = webView;
+    }
+    
+    
+    [_webView setHidden: YES];
+    NSBundle *bundle = [NSBundle mainBundle];
+    NSURL *url = [bundle URLForResource: @"CheatSheet" withExtension: @"html"];
+    //[[[_webView configuration] preferences] setValue: @YES forKey: @"developerExtrasEnabled"];
+    [_webView loadFileURL: url allowingReadAccessToURL: url];
+
+}
+
+-(void)webView:(WKWebView *)webView didFinishNavigation:(WKNavigation *)navigation {
+    // delay to prevent flash in dark mode.
+    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1.0/8 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+            [webView setHidden: NO];
+    });
+
+}
+
+
+@end

Ample/Defaults.plist

@@ -3,12 +3,20 @@
 <plist version="1.0">
 <dict>
 	<key>MameComponentsDate</key>
-	<date>2020-09-02T16:00:00Z</date>
+	<date>2021-06-15T16:00:00Z</date>
 	<key>UseCustomMame</key>
 	<false/>
 	<key>AutoCloseLogWindow</key>
 	<true/>
 	<key>MamePath</key>
 	<string>/usr/local/bin/mame</string>
+	<key>MameWorkingDirectory</key>
+	<string>/usr/local/share/mame/</string>
+	<key>NSQuitAlwaysKeepsWindows</key>
+	<true/>
+	<key>DefaultDownloadURL</key>
+	<string>https://archive.org/download/mame.0229</string>
+	<key>DefaultDownloadExtension</key>
+	<string>zip</string>
 </dict>
 </plist>

Ample/DiskImagesWindowController.h

@@ -0,0 +1,28 @@
+//
+//  DiskImagesWindowController.h
+//  Ample
+//
+//  Created by Kelvin Sherlock on 9/13/2020.
+//  Copyright © 2020 Kelvin Sherlock. All rights reserved.
+//
+
+#import <Cocoa/Cocoa.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface DiskImagesWindowController : NSWindowController <NSWindowRestoration>
+
++(instancetype)sharedInstance;
+
+@end
+
+@interface DiskImagesWindowController (TableView) <NSTableViewDelegate, NSTableViewDataSource>
+
+@end
+
+@interface DiskImagesWindowController (Menu) <NSMenuDelegate>
+
+@end
+
+
+NS_ASSUME_NONNULL_END

Ample/DiskImagesWindowController.m

@@ -0,0 +1,322 @@
+//
+//  DiskImagesWindowController.m
+//  Ample
+//
+//  Created by Kelvin Sherlock on 9/13/2020.
+//  Copyright © 2020 Kelvin Sherlock. All rights reserved.
+//
+
+#import "DiskImagesWindowController.h"
+#import "TableCellView.h"
+#import "Ample.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 {
+    static DiskImagesWindowController *me;
+    if (!me) {
+        me = [self new];
+    }
+    return me;
+}
+
++ (void)restoreWindowWithIdentifier:(NSUserInterfaceItemIdentifier)identifier state:(NSCoder *)state completionHandler:(void (^)(NSWindow *, NSError *))completionHandler {
+    NSLog(@"restore disk images window");
+    NSWindowController *controller = [self sharedInstance];
+    NSWindow *w = [controller window];
+    [w restoreStateWithCoder: state];
+    completionHandler(w, nil);
+}
+
+-(instancetype)init {
+    
+    if ((self = [super init])) {
+        
+        [self loadRecentDiskImages];
+        
+        _extensions = [NSSet setWithObjects:
+            @"2img", @"2mg", @"chd", @"dc", @"do", @"dsk", @"hd", @"hdv", @"image", @"nib", @"po", @"wav", @"woz", @"iso", @"raw", nil
+        ];
+    }
+    return self;
+}
+
+-(NSString *)windowNibName {
+    return @"DiskImages";
+}
+
+- (void)windowDidLoad {
+
+    if (!_content)
+        [self setContent: [NSMutableArray new]];
+    
+    [super windowDidLoad];
+    NSWindow *window = [self window];
+    [window setRestorable: YES];
+    [window setRestorationClass: [self class]];
+
+    if (@available(macOS 10.13, *)) {
+        [_tableView registerForDraggedTypes: @[NSPasteboardTypeFileURL]];
+    } else {
+        [_tableView registerForDraggedTypes: @[ (NSString *)kUTTypeFileURL ]];
+    }
+    [_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.
+}
+
+-(void)loadRecentDiskImages {
+//    NSError *error;
+
+    NSURL *sd = SupportDirectory();
+    NSURL *url = [sd URLByAppendingPathComponent: @"RecentDiskImages.plist"];
+
+    NSData *data = [NSData dataWithContentsOfURL: url];
+    if (data) {
+        _content = [NSPropertyListSerialization propertyListWithData:data options:NSPropertyListMutableContainers format:nil error: nil];
+
+    }
+    if (!_content)
+        _content = [NSMutableArray new];
+    
+    NSNotificationCenter *nc = [NSNotificationCenter defaultCenter];
+    
+    [nc addObserver: self selector: @selector(diskImageAdded:) name: @"DiskImageAdded" object: nil];
+    
+    [nc addObserver: self selector: @selector(willTerminate:) name: NSApplicationWillTerminateNotification object: nil];
+}
+
+-(void)timerCallback: (NSTimer *)timer {
+    _timer = nil;
+    [self saveFile];
+}
+
+-(void)diskImageAdded: (NSNotification *)notification {
+    
+    NSURL *url = [notification object];
+    if (!url) return;
+    
+    [self addFile: url];
+}
+-(void)markDirty {
+    _dirty = YES;
+    if (_timer) [_timer invalidate];
+    _timer = [NSTimer scheduledTimerWithTimeInterval: 5 * 60 target: self selector: @selector(timerCallback:) userInfo: nil repeats: NO];
+#if 0
+    // 10.12+
+    _timer = [NSTimer scheduledTimerWithTimeInterval: 5 * 60 repeats: NO block: ^(NSTimer *t) {
+        
+        self->_timer = nil;
+        [self saveFile];
+    }];
+#endif
+}
+
+-(void)saveFile {
+
+    [_timer invalidate];
+    _timer = nil;
+
+    NSURL *sd = SupportDirectory();
+    NSURL *url = [sd URLByAppendingPathComponent: @"RecentDiskImages.plist"];
+    
+    if (_content && url) {
+        [_content writeToURL: url atomically: YES];
+    }
+    _dirty = NO;
+
+}
+
+-(void)willTerminate: (NSNotification *)notification {
+    // if dirty, write data....
+
+    if (!_dirty) return;
+
+    [self saveFile];
+    
+}
+
+
+
+
+-(BOOL)addFile: (NSObject *)pathOrURL {
+    
+    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;
+
+    // todo -- check if file is in the list already...
+
+    BOOL found = NO;
+    // should really compare the volume id / ino I suppose.
+    for (NSMutableDictionary *d in _content) {
+        NSString *s = [d objectForKey: @"path"];
+        if ([path compare: s] == NSOrderedSame) {
+            found = YES;
+            [d setObject: [NSDate new] forKey: @"date"];
+            [self markDirty];
+            break;
+        }
+    }
+    if (found) return NO;
+    
+    
+    NSFileManager *fm = [NSFileManager defaultManager];
+    NSError *error;
+ 
+    NSDictionary *attr = [fm attributesOfItemAtPath: path error: &error];
+    if (error) {
+        NSLog(@"%@ : %@", path, error);
+        return NO;
+    }
+    
+    
+    NSNumber *size = [attr objectForKey: NSFileSize];
+    
+    NSMutableDictionary *d = [NSMutableDictionary dictionaryWithObjectsAndKeys:
+                              path, @"path",
+                              size, @"size",
+                              [NSDate new], @"date",
+                              nil];
+    
+    @synchronized (self) {
+        if (_arrayController)
+            [_arrayController addObject: d];
+        else
+            [_content addObject: d];
+    }
+    [self markDirty];
+    return YES;
+}
+
+
+-(NSMutableDictionary *)clickedItem {
+
+    NSArray *array = [_arrayController arrangedObjects];
+    NSInteger row = [_tableView clickedRow];
+    if (row < 0 || row >= [array count]) return nil;
+    return [array objectAtIndex: row];
+}
+#pragma mark - IBActions
+
+- (IBAction)showInFinder:(id)sender {
+    
+    NSMutableDictionary *item = [self clickedItem];
+    if (!item) return;
+    NSString *path = [item objectForKey: @"path"];
+
+    NSURL *url = [NSURL fileURLWithPath: path];
+    if (!url) return;
+
+    NSWorkspace *ws = [NSWorkspace sharedWorkspace];
+    [ws activateFileViewerSelectingURLs: @[url]];
+}
+
+- (IBAction)eject:(id)sender {
+
+    NSMutableDictionary *item = [self clickedItem];
+    if (!item) return;
+    
+    @synchronized (self) {
+        
+        if (_arrayController) {
+            [_arrayController removeObject: item];
+        } else {
+            [_content removeObject: item];
+        }
+        [self markDirty];
+    }
+
+}
+
+@end
+
+@implementation DiskImagesWindowController (TableView)
+
+
+-(id<NSPasteboardWriting>)tableView:(NSTableView *)tableView pasteboardWriterForRow:(NSInteger)row {
+    
+    id objects = [_arrayController arrangedObjects];
+    
+    NSDictionary *d = [objects objectAtIndex: row];
+  
+    NSString *path = [d objectForKey: @"path"];
+    
+    NSURL *url = [NSURL fileURLWithPath: path];
+    return url;
+    
+#if 0
+    NSPasteboardItem *item = [NSPasteboardItem new];
+    [item setString: [url absoluteString] forType: NSPasteboardTypeFileURL]; // FileURL
+    [item setString: path forType: NSPasteboardTypeString]; // for Terminal.app
+
+    return item;
+#endif
+}
+
+
+
+-(NSDragOperation)tableView:(NSTableView *)tableView validateDrop:(id<NSDraggingInfo>)info proposedRow:(NSInteger)row proposedDropOperation:(NSTableViewDropOperation)dropOperation {
+
+    if ([info draggingSource] == _tableView) return NSDragOperationNone;
+
+    // option key will ignore all filetype restrictions.
+    if ([NSEvent modifierFlags] & NSEventModifierFlagOption) return NSDragOperationCopy;
+
+    // this only checks the first dragged item...
+    NSPasteboard * pb = [info draggingPasteboard];
+    NSURL *url = [NSURL URLFromPasteboard: pb];
+    
+    NSString *ext = [url pathExtension];
+    ext = [ext lowercaseString];
+    if ([_extensions containsObject: ext])
+        return NSDragOperationCopy;
+    
+    return NSDragOperationNone;
+}
+
+-(BOOL)tableView:(NSTableView *)tableView acceptDrop:(id<NSDraggingInfo>)info row:(NSInteger)row dropOperation:(NSTableViewDropOperation)dropOperation {
+
+    if ([info draggingSource] == _tableView) return NO;
+
+    NSPasteboard * pb = [info draggingPasteboard];
+    
+    BOOL ok = NO;
+    for (NSPasteboardItem *item in [pb pasteboardItems]) {
+        
+        // need to convert from a string to a url back to a file in case it's a file id url?
+        NSString *s;
+        if (@available(macOS 10.13, *)) {
+            s = [item stringForType: NSPasteboardTypeFileURL];
+        } else {
+            // El Capitan still has kUTTypeFileURL aka public.file-url but doesn't have NSPasteboardTypeFileURL
+            s = [item stringForType: (NSString *)kUTTypeFileURL];
+        }
+        if (!s) continue;
+        NSURL *url = [NSURL URLWithString: s];
+        if (!url) continue;
+        ok |= [self addFile: url];
+    }
+    return ok;
+}
+
+@end

Ample/DownloadWindowController.h

@@ -10,7 +10,7 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-@interface DownloadWindowController : NSWindowController
+@interface DownloadWindowController : NSWindowController <NSWindowRestoration>
 
 @property NSString *currentROM;
 @property NSInteger currentCount;
@@ -18,22 +18,17 @@ NS_ASSUME_NONNULL_BEGIN
 @property NSInteger errorCount;
 @property BOOL active;
 
++(instancetype)sharedInstance;
+
+
 @end
 
 @interface DownloadWindowController (URL) <NSURLSessionTaskDelegate, NSURLSessionDownloadDelegate>
 @end
 
-@interface DownloadWindowController (Table) <NSTableViewDelegate, NSTableViewDataSource>
-@end
 
 @interface DownloadWindowController (Menu) <NSMenuDelegate, NSMenuItemValidation>
 
 @end
 
-
-@interface DownloadTableCellView : NSTableCellView
-@property (weak) IBOutlet NSTextField *statusTextField;
-@property (weak) IBOutlet NSProgressIndicator *activity;
-@end
-
 NS_ASSUME_NONNULL_END

Ample/DownloadWindowController.m

@@ -8,6 +8,67 @@
 
 #import "Ample.h"
 #import "DownloadWindowController.h"
+#import "Menu.h"
+
+
+enum {
+    kTagZip = 1,
+    kTag7z = 2,
+};
+
+@interface DownloadExtensionTransformer: NSValueTransformer
+@end
+
+@implementation DownloadExtensionTransformer
+
++(void)load {
+    [NSValueTransformer setValueTransformer: [DownloadExtensionTransformer new] forName: @"FormatTransformer"];
+
+}
+
++ (Class)transformedValueClass {
+    return [NSString class];
+}
+
++ (BOOL)allowsReverseTransformation {
+    return YES;
+}
+
+-(id)transformedValue:(id)value {
+    // string to number.
+    if ([@"zip" isEqualToString: value])
+        return @(kTagZip);
+    if ([@"7z" isEqualToString: value])
+        return @(kTag7z);
+    return @0;
+}
+
+-(id)reverseTransformedValue:(id)value {
+    // number back to string.
+    switch ([value intValue]) {
+        case kTagZip: return @"zip";
+        case kTag7z: return @"7z";
+        default: return @"";
+    }
+}
+
++(unsigned)stringToNumber: (NSString *)string {
+    if ([@"zip" isEqualToString: string])
+        return kTagZip;
+    if ([@"7z" isEqualToString: string])
+        return kTag7z;
+    return 0;
+}
+
++(NSString *)numberToString: (unsigned)number {
+    switch (number) {
+        case kTagZip: return @"zip";
+        case kTag7z: return @"7z";
+        default: return @"";
+    }
+}
+
+@end
 
 enum {
     ItemMissing = 0,
@@ -29,6 +90,9 @@ enum {
 @property NSUInteger status;
 @property NSUInteger index;
 
+@property (readonly) NSColor *titleColor;
+@property (readonly) NSColor *descriptionColor;
+
 
 -(void)cancelDownload;
 -(void)beginDownloadWithTask:(NSURLSessionDownloadTask *)task;
@@ -37,9 +101,35 @@ enum {
 @end
 
 
+@interface DownloadItemArrayController : NSArrayController
+
+@property(readonly, copy) NSArray<NSString *> *automaticRearrangementKeyPaths;
+
+@end
+
+@implementation DownloadItemArrayController
+
+-(NSArray<NSString *> *)automaticRearrangementKeyPaths {
+    return @[@"localURL"]; // , @"error", @"task", @"statusDescription"];
+}
+
+
+@end
+
 
 @interface DownloadWindowController ()
 @property (weak) IBOutlet NSTableView *tableView;
+@property (weak) IBOutlet NSPopUpButton *formatButton;
+@property (weak) IBOutlet NSTextField *downloadField;
+@property NSString *downloadExtension;
+
+/* filter buttons */
+@property (weak) IBOutlet NSButton *allFilterButton;
+@property (weak) IBOutlet NSButton *missingFilterButton;
+
+@property (strong) IBOutlet NSArrayController *arrayController;
+
+
 
 @end
 
@@ -47,18 +137,69 @@ enum {
     
     NSArray *_items;
     NSURL *_romFolder;
-    NSURL *_sourceURL;
+    NSURL *_defaultDownloadURL;
+    NSURL *_downloadURL;
+
     NSURLSession *_session;
     NSMutableDictionary *_taskIndex;
+    NSUserDefaults *_defaults;
+    
+    NSArray<NSButton *> *_filterButtons;
 }
 
++(instancetype)sharedInstance {
+    static DownloadWindowController *me = nil;
+    if (!me) {
+        me = [self new];
+    }
+    return me;
+}
+
++ (void)restoreWindowWithIdentifier:(nonnull NSUserInterfaceItemIdentifier)identifier state:(nonnull NSCoder *)state completionHandler:(nonnull void (^)(NSWindow * _Nullable, NSError * _Nullable))completionHandler {
+    NSLog(@"restore rom manager window");
+
+    NSWindowController *controller = [DownloadWindowController sharedInstance];
+    NSWindow *w = [controller window];
+    [w restoreStateWithCoder: state];
+    completionHandler(w, nil);
+}
+
+
+#if 0
+- (void)encodeWithCoder:(nonnull NSCoder *)coder {
+    
+}
+#endif
+
 -(NSString *)windowNibName {
     return @"DownloadWindow";
 }
 
+-(void)windowWillLoad {
+    _defaults = [NSUserDefaults standardUserDefaults];
+    
+    // set here so binding works.
+    NSString *s = [_defaults stringForKey: kDownloadExtension];
+    if (![s length]) s = [_defaults stringForKey: kDefaultDownloadExtension];
+    
+    _downloadExtension = s;
+}
+
 - (void)windowDidLoad {
     [super windowDidLoad];
+#if 0
+    NSWindow *window = [self window];
+    // disabled for now ... restoration happens before defaults are loaded.
+    [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.
 
     NSError *error = nil;
@@ -70,21 +211,34 @@ enum {
     NSDictionary *d = [NSDictionary dictionaryWithContentsOfURL: url];
     
     NSURL *sd = SupportDirectory();
-    NSString *romdir = [SupportDirectoryPath() stringByAppendingPathComponent: @"roms"];
 
     _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];
+        _downloadURL = [NSURL URLWithString: s];
+    } else {
+        _downloadURL = _defaultDownloadURL;
+    }
+    
+    [self initializeExtensionMenu];
+    
 
     NSArray *roms = [d objectForKey: @"roms"];
     [self setCurrentROM: @""];
     [self setCurrentCount: 0];
     [self setTotalCount: [roms count]];
     [self setErrorCount: 0];
-    _sourceURL = [NSURL URLWithString: @"https://archive.org/download/mame0224_rom"]; // hardcoded....
-    
     
+
     NSMutableArray *tmp = [NSMutableArray arrayWithCapacity: [roms count]];
     unsigned ix = 0;
     for (NSString *name in roms) {
@@ -94,26 +248,12 @@ enum {
         [item setIndex: ix++];
 
         [tmp addObject: item];
-
-        // check if the file exists.
-        NSString *s = [romdir stringByAppendingPathComponent: name];
-        NSString *path;
-
-        path = [s stringByAppendingPathExtension: @"zip"];
-        if ([fm fileExistsAtPath: path]) {
-            [item setStatus: ItemFound];
-            [item setLocalURL: [NSURL fileURLWithPath: path]];
-            continue;
-        }
-        path = [s stringByAppendingPathExtension: @"7z"];
-        if ([fm fileExistsAtPath: path]) {
-            [item setStatus: ItemFound];
-            [item setLocalURL: [NSURL fileURLWithPath: path]];
-            continue;
-        }
     }
     _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]];
@@ -121,6 +261,29 @@ enum {
     //[self download];
 }
 
+
+
+#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;
+        [_downloadField setTextColor: nil];
+    } else {
+        _effectiveURL = [NSURL URLWithString: _downloadURL];
+        [_downloadField setTextColor: [NSColor systemRedColor]];
+    }
+}
+#endif
+
 -(void)downloadItem: (DownloadItem *)item {
 
     if (!_session) {
@@ -130,8 +293,8 @@ enum {
     
     NSURLSessionDownloadTask *task;
     NSString *s = [item name];
-    NSString *path = [s stringByAppendingString: @".7z"]; // hardcoded.
-    NSURL *url = [_sourceURL URLByAppendingPathComponent: path];
+    NSString *path = [s stringByAppendingPathExtension: _downloadExtension];
+    NSURL *url = [_downloadURL URLByAppendingPathComponent: path];
     
     task = [_session downloadTaskWithURL: url];
     
@@ -144,16 +307,15 @@ enum {
 
 -(void)download {
     
-
-
     // run in thread?
     //unsigned count = 0;
+
     for (DownloadItem *item in _items) {
             
         NSURLSessionDownloadTask *task;
         NSString *s = [item name];
-        NSString *path = [s stringByAppendingString: @".7z"]; // hardcoded.
-        NSURL *url = [_sourceURL URLByAppendingPathComponent: path];
+        NSString *path = [s stringByAppendingPathExtension: _downloadExtension];
+        NSURL *url = [_downloadURL URLByAppendingPathComponent: path];
         
         task = [_session downloadTaskWithURL: url];
         [_taskIndex setObject: item forKey: task];
@@ -172,8 +334,10 @@ enum {
 -(DownloadItem *)clickedItem {
     NSInteger row = [_tableView clickedRow];
     if (row < 0 || row >= [_items count]) return nil;
-    return [_items objectAtIndex: row];
+    return [[_arrayController arrangedObjects] objectAtIndex: row];
+    //return [_items objectAtIndex: row];
 }
+#if 0
 -(void)redrawRow: (NSUInteger)row {
     
     //NSRect r = [_tableView rectOfRow: row];
@@ -184,6 +348,31 @@ enum {
     
     [_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])];
+    }
+
+#if 0
+    // handled via binding.
+    NSString *ext = [_defaults stringForKey: kDownloadExtension];
+    if ([ext length]) {
+        ix = [DownloadExtensionTransformer stringToNumber: ext];
+    }
+
+    [_formatButton selectItemWithTag: tag];
+#endif
+}
+
 #pragma mark - IBActions
 
 -(IBAction)cancelAll:(id)sender {
@@ -198,7 +387,7 @@ enum {
     [self setCurrentCount: 0];
     [self setActive: NO];
 
-    [_tableView reloadData];
+    //[_tableView reloadData];
     //[_tableView setNeedsDisplay: YES]; // doesn't work...
 }
 
@@ -216,7 +405,40 @@ enum {
     
     if (delta) {
         [self setActive: YES];
-        [_tableView reloadData];
+        //[_tableView reloadData];
+    }
+}
+- (IBAction)showRomFolder:(id)sender {
+    NSWorkspace *ws = [NSWorkspace sharedWorkspace];
+
+    [ws openURL: _romFolder];
+}
+
+-(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];
+        NSString *path;
+        path = [s stringByAppendingPathExtension: @"zip"];
+        if ([fm fileExistsAtPath: path]) {
+            [item setStatus: ItemFound];
+            [item setLocalURL: [NSURL fileURLWithPath: path]];
+            continue;
+        }
+
+        path = [s stringByAppendingPathExtension: @"7z"];
+        if ([fm fileExistsAtPath: path]) {
+            [item setStatus: ItemFound];
+            [item setLocalURL: [NSURL fileURLWithPath: path]];
+            continue;
+        }
+        
+        [item setStatus: ItemMissing];
+        [item setLocalURL: nil];
     }
 }
 
@@ -236,31 +458,99 @@ enum {
 
     [self downloadItem: item];
     [self setActive: YES];
-    [self redrawRow: [item index]];
+    //[self redrawRow: [item index]];
 }
 - (IBAction)cancel:(id)sender {
     DownloadItem *item = [self clickedItem];
     if (!item) return;
 
     [item cancelDownload];
-    [self redrawRow: [item index]];
+    //[self redrawRow: [item index]];
 }
 
+// binding screws up with placeholder.
+-(IBAction)downloadURLChanged: (NSTextField *)sender {
+    NSString *value;
+    value = [sender stringValue];
+    if (![value length]) {
+        [_defaults removeObjectForKey: kDownloadURL];
+        _downloadURL = _defaultDownloadURL;
+        return;
+    }
+//    [self validateURL: value];
+    [_defaults setValue: value forKey: kDownloadURL];
+    _downloadURL = [NSURL URLWithString: value];
+}
+- (IBAction)downloadExtensionChanged:(id)sender {
+    [_defaults setValue: _downloadExtension forKey: kDownloadExtension];
+}
+
+
+- (IBAction)filterButton:(id)sender {
+
+    NSPredicate *p = nil;
+    NSUInteger tag = [sender tag];
+    [sender setState: NSControlStateValueOn];
+
+
+
+    for (NSButton *b in _filterButtons) {
+        if (b != sender) [b setState: NSControlStateValueOff];
+    }
+    switch (tag) {
+        case 1: // all
+        default:
+            [_arrayController setFilterPredicate: nil];
+            break;
+        case 2: // missing.
+            p = [NSPredicate predicateWithBlock: ^BOOL(DownloadItem *item, NSDictionary *bindings){
+                NSURL *localURL = [item localURL];
+                return localURL == nil;
+            }];
+
+            [_arrayController setFilterPredicate: p];
+            break;
+    }
+}
+
+
 
 #pragma mark - NSURLSessionDelegate
 
+static NSInteger TaskStatusCode(NSURLSessionTask *task) {
+    NSURLResponse *response = [task response];
+    if ([response isKindOfClass: [NSHTTPURLResponse class]]) {
+        return [(NSHTTPURLResponse *)response statusCode];
+    }
+    return -1;
+}
+
+
 -(void)URLSession:(NSURLSession *)session task:(NSURLSessionTask *)task didCompleteWithError:(NSError *)error {
 
 
+    if (error) NSLog(@"Download error: %@", error);
+
+    NSInteger statusCode = TaskStatusCode(task);
+    if (!error && statusCode != 200) {
+        // treat as an error.
+        NSDictionary *info = @{
+            NSURLErrorKey: [[task originalRequest] URL],
+            NSLocalizedDescriptionKey: [NSHTTPURLResponse localizedStringForStatusCode: statusCode],
+        };
+        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.
     dispatch_async(dispatch_get_main_queue(), ^(void){
-        if (error)
+        if (error) {
             [self setErrorCount: self->_errorCount + 1];
-        else
+        } else {
             [self setCurrentCount: self->_currentCount + 1];
-        
+        }
         NSMutableDictionary *taskIndex = self->_taskIndex;
         DownloadItem *item = [taskIndex objectForKey: task];
         [taskIndex removeObjectForKey: task];
@@ -271,9 +561,9 @@ enum {
         
         if (item) {
             [item completeWithError: error];
-            NSUInteger row = [item index];
+            //NSUInteger row = [item index];
             
-            [self redrawRow: row];
+            //[self redrawRow: row];
         }
     });
     
@@ -281,6 +571,12 @@ enum {
 
 - (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.
@@ -303,84 +599,49 @@ enum {
     */
     NSLog(@"%@", src);
 }
-@end
-
-@implementation DownloadWindowController (Table)
-
-- (NSInteger)numberOfRowsInTableView:(NSTableView *)tableView {
-    return [_items count];
-}
-
-- (id)tableView:(NSTableView *)tableView objectValueForTableColumn:(NSTableColumn *)tableColumn row:(NSInteger)row {
-    
-    return [_items objectAtIndex: row];
-}
-
-
-- (NSView *)tableView:(NSTableView *)tableView viewForTableColumn:(NSTableColumn *)tableColumn row:(NSInteger)row {
- 
-    DownloadItem *item = [_items objectAtIndex: row];
-    DownloadTableCellView *v = [tableView makeViewWithIdentifier: @"DownloadCell" owner: self];
-    
-    [[v textField] setObjectValue: [item name]];
-    
-    NSTextField *tf = [v statusTextField];
-
-    [tf setObjectValue: [item statusDescription]];
-    if ([item error]) {
-        [tf setTextColor: [NSColor redColor]];
-    } else {
-        [tf setTextColor: [NSColor blackColor]];
-        //if ([tableView isRowSelected: row]){
-            //[tf setTextColor: [NSColor whiteColor]];
-        //}
-    }
-
-    if ([item task]) {
-        [[v activity] startAnimation: nil];
-    } else {
-        [[v activity] stopAnimation: nil];
-    }
-    
-    
-    return v;
-}
-
 
 @end
 
 
-@implementation DownloadTableCellView
 
-@end
 
 @implementation DownloadItem
 
 -(void)beginDownloadWithTask:(NSURLSessionDownloadTask *)task {
-    _task = task;
-    _error = nil;
-    if (task) _status = ItemDownloading;
+    [self setTask: task];
+    [self setError: nil];
+    if (task) [self setStatus: ItemDownloading];
 }
 
 -(void)cancelDownload {
     if (!_task) return;
+
     [_task cancel];
-    _task = nil;
-    _status = ItemCanceled;
+    [self setTask: nil];
+    [self setStatus: ItemCanceled];
 }
 
 -(void)completeWithError: (NSError *)error {
-    _task = nil;
+    [self setTask: nil];
     if (error) {
-        _error = error;
-        _status = ItemError;
+        [self setError: error];
+        [self setStatus: ItemError];
     } else {
         // what if there was an error moving it?
-        _error = nil;
-        _status = ItemDownloaded;
+        [self setError: nil];
+        [self setStatus: ItemDownloaded];
     }
 }
 
+#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
+
 -(NSString *)statusDescription {
 
     static NSString *Names[] = {
@@ -391,12 +652,25 @@ enum {
         @"Canceled",
         @"Error"
     };
-    if (_error) return [_error description];
+    if (_error) return [_error localizedDescription];
 
     if (_status > sizeof(Names)/sizeof(Names[0])) return @"Unknown";
     return Names[_status];
 }
 
++(NSSet *)keyPathsForValuesAffectingTitleColor {
+    return [NSSet setWithObject: @"localURL"];
+}
+-(NSColor *)titleColor {
+    return _localURL ? nil : [NSColor systemRedColor];
+}
++(NSSet *)keyPathsForValuesAffectingDescriptionColor {
+    return [NSSet setWithObject: @"error"];
+}
+-(NSColor *)descriptionColor {
+    return _error ? [NSColor systemRedColor] : nil;
+}
+
 @end
 
 
@@ -410,9 +684,12 @@ enum {
 };
 
 - (BOOL)validateMenuItem:(NSMenuItem *)menuItem {
+    
+    if ([menuItem action] == @selector(downloadExtensionChanged:)) return YES;
+
     NSInteger row = [_tableView clickedRow];
     if (row < 0) return NO;
-    DownloadItem *item = [_items objectAtIndex: row];
+    DownloadItem *item = [[_arrayController arrangedObjects] objectAtIndex: row]; //[_items objectAtIndex: row];
     
     NSUInteger status = [item status];
     switch([menuItem tag]) {

Ample/EjectButton.h

@@ -0,0 +1,17 @@
+//
+//  EjectButton.h
+//  Ample
+//
+//  Created by Kelvin Sherlock on 9/7/2020.
+//  Copyright © 2020 Kelvin Sherlock. All rights reserved.
+//
+
+#import <Cocoa/Cocoa.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface EjectButton : NSButton
+
+@end
+
+NS_ASSUME_NONNULL_END

Ample/EjectButton.m

@@ -0,0 +1,60 @@
+//
+//  EjectButton.m
+//  Ample
+//
+//  Created by Kelvin Sherlock on 9/7/2020.
+//  Copyright © 2020 Kelvin Sherlock. All rights reserved.
+//
+
+#import "EjectButton.h"
+
+static NSImage *ejectImage = nil;
+static NSImage *ejectHoverImage = nil;
+
+@implementation EjectButton {
+    NSTrackingRectTag _tracking;
+    BOOL _mouse;
+}
+
++(void)initialize {
+    // content tint only works with template images.
+    ejectImage = [NSImage imageNamed: @"eject-16x16"];
+    ejectHoverImage = [NSImage imageNamed: @"eject-hover-16x16"];
+    [ejectImage setTemplate: YES];
+    [ejectHoverImage setTemplate: YES];
+}
+
+-(void)awakeFromNib {
+    [super awakeFromNib];
+    [self setButtonType: NSButtonTypeMomentaryPushIn];
+    [self setImage: ejectImage];
+    [self setAlternateImage: ejectHoverImage];
+//    _tracking = [self addTrackingRect: [self bounds] owner: self userData: nil assumeInside: NO];
+}
+
+-(void)viewDidMoveToWindow {
+    if (!_tracking)
+        _tracking = [self addTrackingRect: [self bounds] owner: self userData: nil assumeInside: NO];
+
+}
+
+-(void)mouseEntered:(NSEvent *)event {
+    _mouse = YES;
+    if ([self isEnabled])
+        [self setImage: ejectHoverImage];
+}
+-(void)mouseExited:(NSEvent *)event {
+    _mouse = NO;
+    if ([self isEnabled])
+        [self setImage: ejectImage];
+}
+
+-(void)setEnabled:(BOOL)enabled {
+    [super setEnabled: enabled];
+    if (_mouse) {
+        [self setImage: enabled ? ejectHoverImage : ejectImage];
+    }
+}
+
+
+@end

Ample/Info.plist

@@ -4,6 +4,33 @@
 <dict>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>$(DEVELOPMENT_LANGUAGE)</string>
+	<key>CFBundleDocumentTypes</key>
+	<array>
+		<dict>
+			<key>CFBundleTypeExtensions</key>
+			<array>
+				<string>vgm</string>
+			</array>
+			<key>CFBundleTypeName</key>
+			<string>Video Game Music</string>
+			<key>CFBundleTypeRole</key>
+			<string>Viewer</string>
+			<key>LSTypeIsPackage</key>
+			<integer>0</integer>
+		</dict>
+		<dict>
+			<key>CFBundleTypeExtensions</key>
+			<array>
+				<string>vgz</string>
+			</array>
+			<key>CFBundleTypeName</key>
+			<string>Video Game Music</string>
+			<key>CFBundleTypeRole</key>
+			<string>Viewer</string>
+			<key>LSTypeIsPackage</key>
+			<integer>0</integer>
+		</dict>
+	</array>
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIconFile</key>
@@ -17,13 +44,13 @@
 	<key>CFBundlePackageType</key>
 	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>release 5</string>
+	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleVersion</key>
-	<string>5</string>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
 	<key>NSHumanReadableCopyright</key>
-	<string>Copyright © 2020 Kelvin Sherlock. All rights reserved.</string>
+	<string>Copyright © 2020-2021 Kelvin Sherlock. All rights reserved.</string>
 	<key>NSMainNibFile</key>
 	<string>MainMenu</string>
 	<key>NSPrincipalClass</key>
@@ -32,5 +59,9 @@
 	<true/>
 	<key>NSSupportsSuddenTermination</key>
 	<true/>
+	<key>SUFeedURL</key>
+	<string>https://ample.ksherlock.com/updates/appcast.xml</string>
+	<key>SUPublicEDKey</key>
+	<string>MgYKY5J1nIJ9+C3IabG24ri2M0CuoMqP78fva2GI5BY=</string>
 </dict>
 </plist>

Ample/LaunchWindowController.m

@@ -10,17 +10,28 @@
 #import "LaunchWindowController.h"
 #import "MediaViewController.h"
 #import "SlotViewController.h"
-#import "MachineViewController.h"
+#import "NewMachineViewController.h"
 #import "LogWindowController.h"
 
+#import "AutocompleteControl.h"
+#import "SoftwareList.h"
+#import "BookmarkManager.h"
+
+#include <sys/stat.h>
+#include <wctype.h>
+
 static NSString *kMyContext = @"kMyContext";
 static NSString *kContextMachine = @"kContextMachine";
 
 
-@interface LaunchWindowController ()
+@interface LaunchWindowController () {
+    BOOL _loadingBookmark;
+    NSString *_machine;
+    NSDictionary *_machineDescription;
+}
 @property (strong) IBOutlet MediaViewController *mediaController;
 @property (strong) IBOutlet SlotViewController *slotController;
-@property (strong) IBOutlet MachineViewController *machineViewController;
+@property (strong) IBOutlet NewMachineViewController *machineViewController;
 
 @property (weak) IBOutlet NSView *machineView;
 @property (weak) IBOutlet NSView *slotView;
@@ -30,25 +41,94 @@ static NSString *kContextMachine = @"kContextMachine";
 @property NSString *commandLine;
 @property NSArray *args;
 
-@property NSString *mameMachine;
-@property BOOL mameWindow;
-@property BOOL mameNoThrottle;
+@property NSString *machine;
+//@property NSString *machineName;
+
 @property BOOL mameDebug;
 @property BOOL mameSquarePixels;
-@property BOOL mameNoBlur;
+@property BOOL mameMouse;
+@property BOOL mameSamples;
+@property BOOL mameBGFX;
 
 @property BOOL mameAVI;
 @property BOOL mameWAV;
 @property BOOL mameVGM;
+@property BOOL mameBitBanger;
+@property BOOL mameShareDirectory;
 
 @property NSString *mameAVIPath;
 @property NSString *mameWAVPath;
 @property NSString *mameVGMPath;
+@property NSString *mameShareDirectoryPath;
+@property NSString *mameBitBangerPath;
 
 @property NSInteger mameSpeed;
 
+@property NSInteger mameBackend;
+@property NSInteger mameEffects;
+
+
+@property NSInteger mameWindowMode;
+
+@property (weak) IBOutlet AutocompleteControl *softwareListControl;
+@property SoftwareSet *softwareSet;
+@property Software *software;
+
+
+
+@property (strong) IBOutlet NSWindow *addBookmarkWindow;
+@property (strong) NSString *bookmarkName;
+@property (weak) IBOutlet NSTextField *bookmarkTextField;
 @end
 
+@interface LaunchWindowController (SoftwareList)
+
+-(void)updateSoftwareList;
+
+@end
+
+
+@interface LaunchWindowController (Bookmark)
+
+-(IBAction)addBookmark:(id)sender;
+
+-(IBAction)defaultLoad:(id)sender;
+
+@end
+
+#define SIZEOF(x) (sizeof(x) / sizeof(x[0]))
+static NSString *BackendStrings[] = {
+    @"",
+    @"metal",
+    @"opengl",
+};
+
+static NSString *EffectsStrings[] = {
+    @"-",
+    @"unfiltered",
+    @"hlsl",
+    @"crt-geom",
+    @"crt-geom-deluxe",
+    @"lcd-grid",
+};
+
+
+static int BackEndIndex(NSString *str) {
+    if (!str) return -1;
+    for (int i = 1; i < SIZEOF(BackendStrings); ++i) {
+        if ([str isEqualToString: BackendStrings[i]]) return i;
+    }
+    return -1;
+}
+
+static int EffectsIndex(NSString *str) {
+    if (!str) return -1;
+    for (int i = 1; i < SIZEOF(EffectsStrings); ++i) {
+        if ([str isEqualToString: EffectsStrings[i]]) return i;
+    }
+    return -1;
+}
+
 
 @implementation LaunchWindowController
 
@@ -56,28 +136,90 @@ static NSString *kContextMachine = @"kContextMachine";
     return @"LaunchWindow";
 }
 
--(void)windowWillLoad {
+-(void)reset {
+    // handled elsewhere.
+    //[self setMachine: nil];
+
     [self setMameSpeed: 1];
+    [self setMameBGFX: YES];
+    [self setMameMouse: NO];
+    [self setMameSamples: NO];
+    [self setMameSquarePixels: NO];
+    [self setMameDebug: NO];
+    [self setMameWindowMode: 0];
+
+    [self setMameBackend: 0];
+    [self setMameEffects: 0];
+
+    [self setMameBitBangerPath: nil];
+    [self setMameShareDirectoryPath: nil];
+    [self setMameAVIPath: nil];
+    [self setMameWAVPath: nil];
+    [self setMameVGMPath: nil];
+
+    [self setMameAVI: NO];
+    [self setMameWAV: NO];
+    [self setMameVGM: NO];
+    [self setMameBitBanger: NO];
+    [self setMameShareDirectory: NO];
+
+#if 0
+    [self setSoftware: nil];
+    //_softwareSet = nil;
+    [_softwareListControl setObjectValue: nil];
+#endif
+}
+
+-(void)resetSoftware {
+    [self setSoftware: nil];
+    //_softwareSet = nil;
+    [_softwareListControl setObjectValue: nil];
+}
+
+-(void)windowWillLoad {
+
+    // if this calls [self window], it will recurse.  that is bad.
+    //[self defaultLoad: nil];
+    [self reset];
+}
+
+
+
+static void AddSubview(NSView *parent, NSView *child) {
+    
+    [child setFrame: [parent bounds]];
+    [parent addSubview: child];
 }
 
 - (void)windowDidLoad {
     [super windowDidLoad];
     
+
+    
     // Implement this method to handle any initialization after your window controller's window has been loaded from its nib file.
 
+    AddSubview(_slotView, [_slotController view]);
+    AddSubview(_mediaView, [_mediaController view]);
+    AddSubview(_machineView, [_machineViewController view]);
+
+ 
+    // can't be done until above views are set up.
+    [self defaultLoad: nil];
 
-    [_slotView addSubview: [_slotController view]];
-    [_mediaView addSubview: [_mediaController view]];
-    [_machineView addSubview: [_machineViewController view]];
-    
 
     NSArray *keys = @[
-        @"mameMachine", @"mameWindow", @"mameSquarePixels", @"mameNoBlur",
+        //@"mameMachine", // - handled
+        @"mameSquarePixels", @"mameWindowMode",
+        @"mameMouse", @"mameSamples",
         @"mameDebug",
-        @"mameSpeed", // @"mameNoThrottle",
+        @"mameSpeed",
         @"mameAVI", @"mameAVIPath",
         @"mameWAV", @"mameWAVPath",
         @"mameVGM", @"mameVGMPath",
+        @"mameShareDirectory", @"mameShareDirectoryPath",
+        @"mameBitBanger", @"mameBitBangerPath",
+        @"mameBGFX", @"mameBackend", @"mameEffects",
+        @"software",
     ];
     
     for (NSString *key in keys) {
@@ -92,6 +234,10 @@ static NSString *kContextMachine = @"kContextMachine";
     
     [_machineViewController addObserver: self forKeyPath: @"machine" options: 0 context: (__bridge void * _Nullable)kContextMachine];
 
+    
+    [_softwareListControl setMinWidth: 250];
+    [_softwareListControl setHidden: YES];
+    
     [self buildCommandLine];
 }
 
@@ -99,11 +245,14 @@ static NSString *kContextMachine = @"kContextMachine";
 -(void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary<NSKeyValueChangeKey,id> *)change context:(void *)context {
 
     if (context == (__bridge void *)kMyContext) {
+        if (_loadingBookmark) return;
         [self buildCommandLine];
     } else if (context == (__bridge void *)kContextMachine) {
+        if (_loadingBookmark) return;
+
         NSString *machine = [_machineViewController machine];
-        [self setMameMachine: machine];
-        [_slotController setModel: machine];
+        [self setMachine: machine];
+        [_slotController setMachine: machine];
         [self buildCommandLine];
     } else {
         [super observeValueForKeyPath: keyPath ofObject: object change: change context: context];
@@ -111,39 +260,38 @@ static NSString *kContextMachine = @"kContextMachine";
 }
 
 
-static NSURL *MameURL(void) {
 
-    NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
-    NSBundle *bundle = [NSBundle mainBundle];
-        
-    if ([defaults boolForKey: kUseCustomMame]) {
-        NSString *path = [defaults stringForKey: kMamePath];
-        if (![path length]) return [NSURL fileURLWithPath: path];
-    }
-    
-    return [bundle URLForAuxiliaryExecutable: @"mame64"];
-
-    return nil;
+-(NSString *)machine {
+    return _machine;
 }
 
-static NSString *MamePath(void) {
+-(void)setMachine:(NSString *)machine {
+    if (_machine == machine) return;
+    _machine = machine;
+    _machineDescription = MameMachine(machine);
 
-    NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
-    NSBundle *bundle = [NSBundle mainBundle];
+#if 0
+    [self setMachineName: [_machineDescription objectForKey: @"description"]];
+#else
+    NSString *title = _machineDescription
+        ? [NSString stringWithFormat: @"Ample – %@", [_machineDescription objectForKey: @"description"]]
+        : @"Ample";
 
-    NSString *path;
+    [[self window] setTitle: title];
+#endif
     
-    if ([defaults boolForKey: kUseCustomMame]) {
-        path = [defaults stringForKey: kMamePath];
-        if ([path length]) return path;
-    }
-    path = [bundle pathForAuxiliaryExecutable: @"mame64"];
-    if ([path length]) return path;
-    return nil;
+    // enable/disable the right-click menu
+    NSWindow *window = [self window];
+    NSView *view = [window contentView];
+    if (_machine) [view setMenu: [window menu]];
+    else [view setMenu: nil];
+    
+    
+    // software list.
+    [self updateSoftwareList];
 }
 
-
-static NSString * JoinArguments(NSArray *argv) {
+static NSString * JoinArguments(NSArray *argv, NSString *argv0) {
 
     static NSCharacterSet *safe = nil;
     static NSCharacterSet *unsafe = nil;
@@ -163,9 +311,13 @@ static NSString * JoinArguments(NSArray *argv) {
     
     //unsigned ix = 0;
     //[rv appendString: @"mame"];
-    NSString *path = MamePath();
-    path = path ? [path lastPathComponent] : @"mame";
-    [rv appendString: path];
+    if (argv0) {
+        [rv appendString: argv0];
+    } else {
+        NSString *path = MamePath();
+        path = path ? [path lastPathComponent] : @"mame";
+        [rv appendString: path];
+    }
     for (NSString *s in argv) {
         [rv appendString: @" "];
         NSUInteger l = [s length];
@@ -214,11 +366,72 @@ static NSString * JoinArguments(NSArray *argv) {
     return rv;
 }
 
+static NSString *ShellQuote(NSString *s) {
+
+    static NSCharacterSet *safe = nil;
+    static NSCharacterSet *unsafe = nil;
+
+    if (!safe) {
+        NSString *str =
+            @"%+-./:=_"
+            @"0123456789"
+            @"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
+        ;
+        safe = [NSCharacterSet characterSetWithCharactersInString: str];
+        unsafe = [safe invertedSet];
+    }
+        
+    NSUInteger l = [s length];
+    
+    if (!l) {
+        return @"''";
+    }
+    
+    if (!CFStringFindCharacterFromSet((CFStringRef)s, (CFCharacterSetRef)unsafe, CFRangeMake(0, l), 0, NULL)) {
+        return s;
+    }
+
+    NSMutableString *rv = [NSMutableString new];
+
+    unichar *buffer = malloc(sizeof(unichar) * l);
+    [s getCharacters: buffer range: NSMakeRange(0, l)];
+
+    [rv appendString: @"'"];
+    for (NSUInteger i = 0; i < l; ++i) {
+        unichar c = buffer[i];
+        switch (c) {
+            case '\'':
+                [rv appendString: @"\\'"];
+                break;
+            case '\\':
+                [rv appendString: @"\\\\"];
+                break;
+            case 0x7f:
+                [rv appendString: @"\\177"];
+                break;
+            default: {
+                NSString *cc;
+                if (c < 0x20) {
+                    cc = [NSString stringWithFormat: @"\\%o", c];
+                } else {
+                    cc = [NSString stringWithCharacters: &c length: 1];
+                }
+                [rv appendString: cc];
+                break;
+            }
+        }
+    }
+    [rv appendString: @"'"];
+    free(buffer);
+    return rv;
+}
+
+
 -(void)buildCommandLine {
 
     NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
 
-    if (!_mameMachine) {
+    if (!_machine) {
         [self setCommandLine: @""];
         return;
     }
@@ -226,35 +439,87 @@ static NSString * JoinArguments(NSArray *argv) {
     NSMutableArray *argv = [NSMutableArray new];
 
     //[argv addObject: @"mame"];
-    [argv addObject: _mameMachine];
+    [argv addObject: _machine];
     
-    if (_mameDebug) [argv addObject: @"-debug"];
-    if (_mameWindow) {
-        [argv addObject: @"-window"];
-        [argv addObject: @"-nomax"];
+    if (_software) {
+        NSString *name = [_softwareSet nameForSoftware: _software];
+        if (name) [argv addObject: name];
     }
 
+    // -confirm_quit?
     [argv addObject: @"-skip_gameinfo"];
 
-    if (_mameWindow && _mameSquarePixels) {
-        NSSize screen = [_slotController resolution];
-        
-        NSString *res = [NSString stringWithFormat: @"%ux%u", (unsigned)screen.width, (unsigned)screen.height];
-        NSString *aspect = [NSString stringWithFormat: @"%u:%u", (unsigned)screen.width, (unsigned)screen.height];
-        
-        [argv addObject: @"-nounevenstretch"];
+    
+    if (_mameMouse)
+        [argv addObject: @"-mouse"]; // capture the mouse cursor when over the window.
 
-        [argv addObject: @"-resolution"];
-        [argv addObject: res];
+    if (!_mameSamples)
+        [argv addObject: @"-nosamples"];
+    
+    if (_mameDebug) [argv addObject: @"-debug"];
 
-        [argv addObject: @"-aspect"];
-        [argv addObject: aspect];
-        
-        if (_mameNoBlur) {
-            [argv addObject: @"-video"];
-            [argv addObject: @"soft"];
-        }
+
+    
+    /*
+     * -window -nomax uses a 4:3 aspect ratio - ie, height = width * 3 / 4 (since height is always the limiting factor)
+     * for square pixels, should pass the true size and true aspect ratio.
+     */
+
+    NSSize screen = [_slotController resolution];
+    switch(_mameWindowMode) {
+        case 0: // full screen;
+            // no uneven stretch doesn't do anything in full-screen mode.
+            break;
+        case 1: // 1x
+            // make the command-line a bit shorter and more pleasant.
+            if (!_mameSquarePixels) {
+                [argv addObject: @"-window"];
+                [argv addObject: @"-nomax"];
+                 break;
+            }
+
+            // drop through.
+        case 2: // 2x
+        case 3: // 3x
+
+            if (_mameSquarePixels) {
+                //              NSString *aspect = [NSString stringWithFormat: @"%u:%u", (unsigned)screen.width, (unsigned)screen.height];
+                //              [argv addObject: @"-aspect"];
+                //              [argv addObject: aspect];
+                [argv addObject: @"-nounevenstretch"];
+            } else {
+                screen.height = round(screen.width * 3 / 4);
+            }
+            
+            [argv addObject: @"-window"];
+            NSString *res = [NSString stringWithFormat: @"%ux%u",
+                   (unsigned)(_mameWindowMode * screen.width),
+                   (unsigned)(_mameWindowMode * screen.height)
+                   ];
+
+            [argv addObject: @"-resolution"];
+            [argv addObject: res];
+            break;
     }
+
+
+
+    if (_mameBGFX) {
+        if (_mameBackend) {
+            [argv addObject: @"-bgfx_backend"];
+            [argv addObject: BackendStrings[_mameBackend]];
+        }
+        if (_mameEffects) {
+            [argv addObject: @"-bgfx_screen_chains"];
+            [argv addObject: EffectsStrings[_mameEffects]];
+        }
+
+    } else {
+        [argv addObject: @"-video"];
+        [argv addObject: @"soft"];
+    }
+
+
     // -speed n
     // -scale n
     
@@ -269,7 +534,6 @@ static NSString * JoinArguments(NSArray *argv) {
         [argv addObjectsFromArray: tmp];
     }
 
-    //if (_mameNoThrottle) [argv addObject: @"-nothrottle"];
     if (_mameSpeed < 0) {
         [argv addObject: @"-nothrottle"];
     } else if (_mameSpeed > 1) {
@@ -297,40 +561,366 @@ static NSString * JoinArguments(NSArray *argv) {
         }
     }
     
-    [self setCommandLine: JoinArguments(argv)];
+    if (_mameShareDirectory && [_mameShareDirectoryPath length]) {
+        [argv addObject: @"-share_directory"];
+        [argv addObject: _mameShareDirectoryPath];
+    }
+    
+    if (_mameBitBanger && [_mameBitBangerPath length]) {
+        [argv addObject: @"-bitbanger"];
+        [argv addObject: _mameBitBangerPath];
+    }
+    
+    [self setCommandLine: JoinArguments(argv, nil)];
     [self setArgs: argv];
 }
 
+
+-(BOOL)validateMenuItem:(NSMenuItem *)menuItem {
+    SEL cmd = [menuItem action];
+    if (cmd == @selector(exportShellScript:)) {
+        return [_args count] ? YES : NO;
+    }
+    if (cmd == @selector(addBookmark:)) {
+        return _machine ? YES : NO;
+    }
+    
+    return YES;
+    //return [super validateMenuItem: menuItem]; // not implemented?
+}
+
 # pragma mark - IBActions
 
-
-
-
 - (IBAction)launchAction:(id)sender {
 
+    [[self window] makeFirstResponder: nil]; // in case text is being edited...
     if (![_args count]) return;
 
-    NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
-    NSURL *url = MameURL();
-    
-    if (!url) {
-        NSAlert *alert = [NSAlert new];
+    [LogWindowController controllerForArgs: _args];
 
-        [alert setMessageText: @"Unable to find MAME executable path"];
-        [alert runModal];
-        return;
-    }
-    
-    NSTask *task = [NSTask new];
-    [task setExecutableURL: url];
-    [task setArguments: _args];
+}
 
-    if (![defaults boolForKey: kUseCustomMame]) {
-        // run in Application Support/Ample.
-        [task setCurrentDirectoryURL: SupportDirectory()];
-    }
+-(IBAction)exportShellScript: (id)sender {
     
-    [LogWindowController controllerForTask: task];
+    NSSavePanel *p = [NSSavePanel savePanel];
+    
+    NSString *defaultName = [_machine stringByAppendingString: @".sh"];
+    
+    [p setTitle: @"Export Shell Script"];
+    [p setExtensionHidden: NO];
+    [p setNameFieldStringValue: defaultName];
+    
+    //[p setDelegate: self];
+    
+    NSWindow *w = [self window];
+    
+    NSMutableString *data = [NSMutableString new];
+    
+    [data appendString: @"#!/bin/sh\n\n"];
+    [data appendFormat: @"MAME=%@\n", ShellQuote(MamePath())];
+    [data appendFormat: @"cd %@\n", ShellQuote(MameWorkingDirectoryPath())];
+    [data appendString: JoinArguments(_args, @"$MAME")];
+    [data appendString: @"\n\n"];
+    
+    [p beginSheetModalForWindow: w completionHandler: ^(NSModalResponse r) {
+        
+        if (r != NSModalResponseOK) return;
+        
+        NSURL *url = [p URL];
+        NSError *error = nil;
+        [data writeToURL: url atomically: YES encoding: NSUTF8StringEncoding error: &error];
+
+        [p orderOut: nil];
+        
+        if (error) {
+            [self presentError: error];
+            return;
+        }
+        
+        // chmod 755...
+        int ok = chmod([url fileSystemRepresentation], 0755);
+        if (ok < 0) {
+            // ...
+        }
+    }];
+}
+
+
+-(IBAction)resetMachine:(id)sender {
+    [self reset];
+}
+
+-(IBAction)resetAll:(id)sender {
+
+    [self reset];
+    [self resetSoftware];
+    [_slotController resetSlots: sender];
+    [_mediaController resetMedia: sender];
+}
+
+-(IBAction)resetMedia:(id)sender {
+    [_mediaController resetMedia: sender];
+    [_softwareListControl setObjectValue: nil];
+    [self setSoftware: nil];
+}
+
+
+@end
+
+
+@implementation LaunchWindowController (SoftwareList)
+
+-(void)updateSoftwareList {
+    
+    _softwareSet = [SoftwareSet softwareSetForMachine: _machine];
+    
+    [_softwareListControl setAutocompleteDelegate: _softwareSet];
+    
+    if (_softwareSet) {
+        [_softwareListControl invalidate];
+        [_softwareListControl setHidden: NO];
+    } else {
+        _software = nil;
+        [_softwareListControl setHidden: YES];
+    }
+}
+
+
+- (IBAction)softwareChanged:(id)sender {
+
+    id o = [(NSControl *)sender objectValue];
+    //NSLog(@"%@", o);
+    [self setSoftware: o];
+}
+
+@end
+
+
+@implementation LaunchWindowController (Bookmark)
+
+-(IBAction)defaultSave:(id)sender {
+
+    BookmarkManager *bm = [BookmarkManager sharedManager];
+
+    NSDictionary *d = [self makeBookmark];
+
+    [bm saveDefault: d];
+}
+
+-(IBAction)defaultLoad:(id)sender {
+
+    BookmarkManager *bm = [BookmarkManager sharedManager];
+
+    NSDictionary *d = [bm loadDefault];
+    if (!d) {
+        [self resetAll: sender];
+        [self setMachine: nil];
+        [_machineViewController reset];
+        [_slotController setMachine: nil];
+        return;
+    }
+    [self loadBookmark: d];
+}
+
+-(IBAction)addBookmark:(id)sender {
+    
+    if (!_machine) return;
+    
+    NSString *name = nil;
+    if (_machineDescription) name = [_machineDescription objectForKey:@"description"];
+    if (!name) name = _machine;
+
+        
+    if (_software) {
+        name = [name stringByAppendingFormat: @" - %@", [_software title]];
+    }
+    [self setBookmarkName: name];
+    [_bookmarkTextField selectText: nil];
+    [[self window] beginSheet: _addBookmarkWindow completionHandler:  nil];
+}
+
+-(IBAction)bookmarkCancel:(id)sender {
+    [[self window] endSheet: _addBookmarkWindow];
+    [_addBookmarkWindow orderOut: nil];
+}
+
+-(IBAction)bookmarkSave:(id)sender {
+    
+    
+    BookmarkManager *bm = [BookmarkManager sharedManager];
+
+    if (![bm validateName: _bookmarkName]) {
+        [_bookmarkTextField selectText: nil];
+        NSBeep();
+        return;
+    }
+
+    NSDictionary *d = [self makeBookmark];
+    
+    [bm saveBookmark: d name: _bookmarkName];
+    
+    [[self window] endSheet: _addBookmarkWindow];
+    [_addBookmarkWindow orderOut: nil];
+    [self setBookmarkName: nil];
+}
+
+
+-(IBAction)bookmarkMenu:(id)sender {
+    
+    NSURL *url = [sender representedObject];
+    if (!url) return;
+    
+    NSDictionary *d = [NSDictionary dictionaryWithContentsOfURL: url];
+    if (!d) return; // oops...
+    
+    [self loadBookmark: d];
+}
+
+
+-(void)loadBookmark: (NSDictionary *)d {
+    Class StringClass = [NSString class];
+    Class NumberClass = [NSNumber class];
+    
+    
+    NSString *machine = [d objectForKey: @"machine"];
+    if (!machine) return;
+
+    _loadingBookmark = YES;
+    [_machineViewController willLoadBookmark: d];
+    [_slotController willLoadBookmark: d];
+    [_mediaController willLoadBookmark: d];
+
+    [self reset];
+    
+    [self setMachine: machine];
+    [self updateSoftwareList];
+    [_softwareListControl setObjectValue: nil]; // will reload the completion list.
+    
+    NSString *str;
+
+    str = [d objectForKey: @"software"];
+    if ([str isKindOfClass: StringClass]) {
+        Software *s = [_softwareSet softwareForName: str];
+        if (s) {
+            [_softwareListControl setObjectValue: s];
+            [self setSoftware: s];
+        }
+        
+    }
+
+    // Boolean values.
+    NSNumber *n;
+#undef _
+#define _(a,b) n = [d objectForKey: a]; if ([n isKindOfClass: NumberClass]) [self b : [n boolValue]]
+  
+    _(@"debug", setMameDebug);
+    _(@"squarePixels", setMameSquarePixels);
+    _(@"mouse", setMameMouse);
+    _(@"samples", setMameSamples);
+    _(@"bgfx", setMameBGFX);
+    
+    // numeric values
+    // check if in range?
+#undef _
+    #define _(a,b) n = [d objectForKey: a]; if ([n isKindOfClass: NumberClass]) [self b : [n intValue]]
+
+    _(@"windowMode", setMameWindowMode);
+    _(@"speed", setMameSpeed);
+    
+
+    // string values
+#undef _
+    #define _(a,b) str = [d objectForKey: a]; if ([str isKindOfClass: StringClass]) [self b : str]
+
+    _(@"shareDirectory", setMameShareDirectoryPath);
+    _(@"bitBanger", setMameBitBangerPath);
+    if ([_mameShareDirectoryPath length]) [self setMameShareDirectory: YES];
+    if ([_mameBitBangerPath length]) [self setMameBitBanger: YES];
+
+    _(@"AVIPath", setMameAVIPath);
+    _(@"WAVPath", setMameWAVPath);
+    _(@"VGMPath", setMameVGMPath);
+    if ([_mameAVIPath length]) [self setMameAVI: YES];
+    if ([_mameVGMPath length]) [self setMameVGM: YES];
+    if ([_mameWAVPath length]) [self setMameWAV: YES];
+
+
+    str = [d objectForKey: @"backend"];
+    if ([str isKindOfClass: [NSString class]]) {
+        int ix = BackEndIndex(str);
+        if (ix >= 0) [self setMameBackend: ix];
+    }
+
+    str = [d objectForKey: @"effects"];
+    if ([str isKindOfClass: [NSString class]]) {
+        int ix = EffectsIndex(str);
+        if (ix >= 0) [self setMameEffects: ix];
+    }
+    
+    [_machineViewController loadBookmark: d];
+    [_slotController loadBookmark: d];
+    [_mediaController loadBookmark: d];
+    
+    [_machineViewController didLoadBookmark: d];
+    [_slotController didLoadBookmark: d];
+    [_mediaController didLoadBookmark: d];
+
+    _loadingBookmark = NO;
+
+    [self buildCommandLine];
+}
+
+-(NSDictionary *)makeBookmark {
+    
+    [[self window] makeFirstResponder: nil];
+
+    NSMutableDictionary *dict = [NSMutableDictionary new];
+    
+    [dict setObject: _machine forKey: @"machine"];
+    [dict setObject: @232 forKey: @"version"];
+    [_machineViewController saveBookmark: dict];
+    [_slotController saveBookmark: dict];
+    [_mediaController saveBookmark: dict];
+
+    
+    // Boolean values
+#undef _
+#define _(v,k) [dict setObject: v ? (NSObject *)kCFBooleanTrue : (NSObject *)kCFBooleanFalse forKey: k]
+
+    _(_mameDebug, @"debug");
+    _(_mameSquarePixels, @"squarePixels");
+    _(_mameMouse, @"mouse");
+    _(_mameSamples, @"samples");
+    _(_mameBGFX, @"bgfx");
+
+    // numeric values
+    #undef _
+    #define _(v,k) [dict setObject: @(v) forKey: k]
+    _(_mameWindowMode, @"windowMode");
+    _(_mameSpeed, @"speed");
+
+    // String values
+#undef _
+#define _(v,k) [dict setObject: v forKey: k]
+
+    if (_mameAVI && [_mameAVIPath length]) _(_mameAVIPath, @"AVIPath");
+    if (_mameWAV && [_mameWAVPath length]) _(_mameWAVPath, @"WAVPath");
+    if (_mameVGM && [_mameVGMPath length]) _(_mameVGMPath, @"VGMPath");
+
+    if (_mameShareDirectory && [_mameShareDirectoryPath length]) _(_mameShareDirectoryPath, @"shareDirectory");
+    if (_mameBitBanger && [_mameBitBangerPath length]) _(_mameBitBangerPath, @"bitBanger");
+
+    
+    if (_software) _([_software fullName], @"software");
+
+    
+    if (_mameBackend) _(BackendStrings[_mameBackend], @"backend");
+    if (_mameEffects) _(EffectsStrings[_mameEffects], @"effects");
+
+    
+    return dict;
+
+#undef _
 }
 
 

Ample/LogWindowController.h

@@ -13,7 +13,7 @@ NS_ASSUME_NONNULL_BEGIN
 @interface LogWindowController : NSWindowController <NSWindowDelegate>
 
 +(id)controllerForTask: (NSTask *)task;
-
++(id)controllerForArgs: (NSArray *)args;
 @end
 
 NS_ASSUME_NONNULL_END

Ample/LogWindowController.m

@@ -36,6 +36,37 @@ static NSMutableSet *LogWindows;
     return controller;
 }
 
+
+
++(id)controllerForArgs: (NSArray *)args {
+    
+//    NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
+
+    NSURL *url = MameURL();
+
+    if (!url) {
+        NSAlert *alert = [NSAlert new];
+
+        [alert setMessageText: @"Unable to find MAME executable path"];
+        [alert runModal];
+        return nil;
+    }
+    
+    NSTask *task = [NSTask new];
+    
+    if (@available(macOS 10.13, *)) {
+        [task setExecutableURL: url];
+        [task setCurrentDirectoryURL: MameWorkingDirectory()];
+    } else {
+        [task setLaunchPath: MamePath()];
+        [task setCurrentDirectoryPath: MameWorkingDirectoryPath()];
+    }
+    
+    [task setArguments: args];
+    
+    return [LogWindowController controllerForTask: task];
+}
+
 - (void)windowDidLoad {
     [super windowDidLoad];
     
@@ -48,7 +79,17 @@ static NSMutableSet *LogWindows;
 {
     if ([string length])
     {
-        [[[_textView textStorage] mutableString] appendString: string];
+        // needs explicit color attribute for proper dark mode support.
+        NSDictionary *attr = @{ NSForegroundColorAttributeName: [NSColor textColor] };
+        NSAttributedString *astr = [[NSAttributedString alloc] initWithString: string attributes: attr];
+        [[_textView textStorage] appendAttributedString: astr];
+    }
+}
+
+-(void)appendAttributedString: (NSAttributedString *)string {
+    
+    if ([string length]) {
+        [[_textView textStorage] appendAttributedString: string];
     }
 }
 
@@ -57,27 +98,55 @@ static NSMutableSet *LogWindows;
     
     if (_task) return nil;
 
-    NSError *error = nil;
     NSPipe *pipe = [NSPipe pipe];
+    
+    // window not yet loaded until [self window] called.
 
+    const char *path = nil;
+    const char *wd = nil;
+    
+    
     [task setStandardError: pipe];
     [task setStandardOutput: pipe];
-    [task launchAndReturnError: &error];
-    
+    if (@available(macOS 10.13, *)) {
+        NSError *error = nil;
+        path = [[task executableURL] fileSystemRepresentation];
+        wd = [[task currentDirectoryURL] fileSystemRepresentation];
 
+        [task launchAndReturnError: &error];
+        if (error) {
+            NSLog(@"NSTask error. Path = %s error = %@", path, error);
+            return error;
+        }
+    } else {
+        path = [[task launchPath] fileSystemRepresentation];
+        wd = [[task currentDirectoryPath] fileSystemRepresentation];
+        @try {
+            [task launch];
+        } @catch (NSException *exception) {
+
+            NSLog(@"NSTask exception.  Path = %s exception = %@", path, exception);
+            return nil; // ?
+        }
+    }
+
+#if 0
     if (error) {
-        NSURL *url = [task executableURL];
-        NSString *path = [NSString stringWithCString: [url fileSystemRepresentation] encoding: NSUTF8StringEncoding];
-        NSLog(@"NSTask error. Path = %@ error = %@", path, error);
-        [self appendString: path];
-        [self appendString: [error description]];
+//        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];
     _handle = [pipe fileHandleForReading];
-    
+
+    if (path) [self appendString: [NSString stringWithFormat: @"MAME path: %s\n", path]];
+    if (wd) [self appendString: [NSString stringWithFormat: @"Working Directory: %s\n", wd]];
     
     NSNotificationCenter *nc = [NSNotificationCenter defaultCenter];
 
@@ -138,8 +207,7 @@ static NSMutableSet *LogWindows;
     }
     else
     {
-        string = @"\n\n[Caught signal]\n\n";
-        
+        string = [NSString stringWithFormat: @"\n\n[Caught signal %d (%s)]\n\n", status, strsignal(status)];
     }
     
     [self appendString: string];
@@ -163,4 +231,12 @@ static NSMutableSet *LogWindows;
     [LogWindows removeObject: self];
 }
 
+#pragma mark - IBActions
+
+- (IBAction)clearLog:(id)sender {
+    NSAttributedString *empty = [NSAttributedString new];
+    [[_textView textStorage] setAttributedString: empty];
+}
+
+
 @end

Ample/MachineViewController.h

@@ -8,6 +8,7 @@
 
 #import <Foundation/Foundation.h>
 #import <Cocoa/Cocoa.h>
+#import "Ample.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -17,4 +18,8 @@ NS_ASSUME_NONNULL_BEGIN
 
 @end
 
+@interface MachineViewController (Bookmark) <Bookmark>
+
+@end
+
 NS_ASSUME_NONNULL_END

Ample/MachineViewController.m

@@ -24,7 +24,7 @@
     _data = [NSArray arrayWithContentsOfFile: path];
 
     
-    /* My Copy of XCode/Interface Builder barfs on NSBrowser. */
+    /* XCode/Interface Builder 11.3 barfs on NSBrowser. */
     
     NSBrowser *browser;
     NSRect frame = NSMakeRect(0, 0, 718, 200);
@@ -110,5 +110,67 @@
     return [data count];
 }
 
+@end
+
+@implementation MachineViewController (Bookmark)
+
+-(BOOL)loadBookmark: (NSDictionary *)bookmark {
+    
+    NSBrowser *browser = (NSBrowser *)[self view];
+    NSString *machine = [bookmark objectForKey: @"machine"];
+    
+    NSIndexPath *path = nil;
+    NSUInteger ix[2] = {0, 0 };
+    for (NSDictionary *d in _data) {
+        
+        NSArray *children = [d objectForKey: @"children"];
+
+        for (NSDictionary *dd in children) {
+            NSString *value = [dd objectForKey: @"value"];
+
+            if ([machine isEqualToString: value]) {
+                path = [NSIndexPath indexPathWithIndexes: ix length: 2];
+                [browser selectRow: ix[0] inColumn: 0];
+                [browser selectRow: ix[1] inColumn: 1];
+
+                //[browser setSelectionIndexPath: path];
+                return YES;
+            }
+            ++ix[1];
+        }
+        ix[1] = 0;
+
+
+        // check parent after.
+        NSString *value = [d objectForKey: @"value"];
+        if ([machine isEqualToString: value]) {
+            path = [NSIndexPath indexPathWithIndexes: ix length: 1];
+            [browser selectRow: ix[0] inColumn: 0];
+            // "setSelectionIndexPath: is not supported for browsers with matrix delegates."
+            //[browser setSelectionIndexPath: path];
+            return YES;
+        }
+
+
+
+
+
+        ++ix[0];
+        
+    }
+    NSLog(@"MachineViewController: Unable to find %@", machine);
+    return NO;
+}
+
+-(BOOL)saveBookmark: (NSMutableDictionary *)bookmark {
+    // machine saved in parent.
+    return YES;
+}
+
+-(void)willLoadBookmark:(NSDictionary *)bookmark {
+}
+
+-(void)didLoadBookmark:(NSDictionary *)bookmark {
+}
 
 @end

Ample/Media.h

@@ -0,0 +1,31 @@
+//
+//  Media.h
+//  Ample
+//
+//  Created by Kelvin Sherlock on 3/7/2021.
+//  Copyright © 2021 Kelvin Sherlock. All rights reserved.
+//
+
+#ifndef Media_h
+#define Media_h
+
+
+typedef struct Media {
+    unsigned cass;
+    unsigned cdrom;
+    unsigned hard;
+    unsigned floppy_5_25;
+    unsigned floppy_3_5;
+    unsigned pseudo_disk;
+    unsigned bitbanger;
+} Media;
+
+struct Media MediaFromDictionary(NSDictionary *);
+
+void MediaAdd(Media *dest, const Media *src);
+
+BOOL MediaEqual(const Media *lhs, const Media *rhs);
+
+extern const Media EmptyMedia;
+
+#endif /* Media_h */

Ample/Media.m

@@ -0,0 +1,61 @@
+//
+//  Media.m
+//  Ample
+//
+//  Created by Kelvin Sherlock on 3/7/2021.
+//  Copyright © 2021 Kelvin Sherlock. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import "Media.h"
+
+const Media EmptyMedia = { 0 };
+
+struct Media MediaFromDictionary(NSDictionary *dict) {
+    
+    Media m = { 0 };
+
+#define _(name) m.name = [[dict objectForKey: @ # name] unsignedIntValue]
+    _(cass);
+    _(cdrom);
+    _(hard);
+    _(floppy_3_5);
+    _(floppy_5_25);
+    _(pseudo_disk);
+    _(bitbanger);
+
+    return m;
+#undef _
+}
+
+void MediaAdd(Media *dest, const Media *src) {
+
+    if (!src || !dest) return;
+
+#define _(name) dest->name += src->name;
+    _(cass);
+    _(cdrom);
+    _(hard);
+    _(floppy_3_5);
+    _(floppy_5_25);
+    _(pseudo_disk);
+    _(bitbanger);
+#undef _
+}
+
+BOOL MediaEqual(const Media *lhs, const Media *rhs) {
+    if (lhs == rhs) return YES;
+    if (!lhs || !rhs) return NO;
+    
+
+#define _(name) if (lhs->name != rhs->name) return NO;
+    _(cass);
+    _(cdrom);
+    _(hard);
+    _(floppy_3_5);
+    _(floppy_5_25);
+    _(pseudo_disk);
+    _(bitbanger);
+    return YES;
+#undef _
+}

Ample/MediaViewController.h

@@ -7,29 +7,28 @@
 //
 
 #import <Cocoa/Cocoa.h>
+#import "Media.h"
+#import "Ample.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
 @interface MediaViewController : NSViewController <NSOutlineViewDelegate, NSOutlineViewDataSource>
 
 @property (weak) IBOutlet NSOutlineView *outlineView;
-@property (nonatomic) NSDictionary *media;
+@property (nonatomic) Media media;
 @property NSArray *args;
 
 - (IBAction)ejectAction:(id)sender;
 - (IBAction)pathAction:(id)sender;
 
+-(IBAction)resetMedia:(id)sender;
 
-//-(void)setMedia: (NSDictionary *)media;
+@end
+
+@interface MediaViewController (Bookmark) <Bookmark>
 
 @end
 
 
 
-@interface TablePathView : NSTableCellView
-@property (weak) IBOutlet NSPathControl *pathControl;
-@property (weak) IBOutlet NSButton *ejectButton;
-
-@end
-
 NS_ASSUME_NONNULL_END

Ample/MediaViewController.m

@@ -7,17 +7,27 @@
 //
 
 #import "MediaViewController.h"
+#import "TableCellView.h"
 
+enum {
+    kIndexFloppy525 = 0,
+    kIndexFloppy35,
+    kIndexHardDrive,
+    kIndexCDROM,
+    kIndexCassette,
+    kIndexDiskImage,
+    kIndexBitBanger,
+};
 
-@implementation TablePathView
-
-@end
+#define CATEGORY_COUNT 7
+#define SIZEOF(x) (sizeof(x) / sizeof(x[0]))
 
 
 @protocol MediaNode
 -(BOOL)isGroupItem;
 -(BOOL)isExpandable;
--(NSInteger) count;
+-(NSInteger)count;
+-(NSInteger)category;
 
 -(NSString *)viewIdentifier;
 -(void)prepareView: (NSTableCellView *)view;
@@ -32,6 +42,7 @@
 @property NSMutableArray *children; // URLs?
 @property NSString *title;
 @property NSInteger index;
+@property NSInteger category;
 
 -(NSInteger)count;
 -(id)objectAtIndex:(NSInteger)index;
@@ -40,9 +51,13 @@
 
 @interface MediaItem : NSObject <MediaNode>
 
+@property NSString *string;
 @property NSURL *url;
 @property BOOL valid;
 @property NSInteger index;
+@property NSInteger category;
+
+@property (readonly) BOOL occupied;
 
 -(NSInteger)count;
 -(id)objectAtIndex:(NSInteger)index;
@@ -55,6 +70,10 @@
 
 @implementation MediaCategory
 
++(instancetype)categoryWithTitle: (NSString *)title {
+    return [[self alloc] initWithTitle: title];
+}
+
 -(instancetype)initWithTitle: (NSString *)title {
     [self setTitle: title];
     return self;
@@ -80,7 +99,7 @@
 }
 
 -(void)prepareView: (NSTableCellView *)view {
-    [[view textField] setStringValue: _title];
+
 }
 
 -(CGFloat)height {
@@ -102,6 +121,7 @@
     for (unsigned i = count; i < newCount; ++i) {
         MediaItem *item = [MediaItem new];
         [item setIndex: i];
+        [item setCategory: _category];
         [_children addObject: item];
     }
 
@@ -113,7 +133,7 @@
 
     for (unsigned i = newCount; i < count; ++i) {
         MediaItem *item = [_children lastObject];
-        if ([item url]) break;
+        if ([item occupied]) break;
         
         [_children removeLastObject];
     }
@@ -121,25 +141,32 @@
     return YES;
 }
 
--(BOOL)pruneChildren {
+-(BOOL)pruneChildrenWithOutlineView: (NSOutlineView *)view {
     NSUInteger count = [_children count];
     BOOL delta = NO;
     if (_validCount == count) return NO;
+    NSMutableIndexSet *set = [NSMutableIndexSet new];
 
     for (NSInteger i = _validCount; i < count; ++i) {
         MediaItem *item = [_children lastObject];
-        if ([item url]) break;
+        if ([item occupied]) break;
     
         [_children removeLastObject];
+        [set addIndex: [_children count]];
+
         delta = YES;
     }
     if (delta) {
+
+        if (view)
+            [view removeItemsAtIndexes: set inParent: self withAnimation: NSTableViewAnimationEffectFade];
+
         return YES;
     }
     return NO;
 }
 
--(BOOL)moveItemFrom: (NSInteger)oldIndex to: (NSInteger)newIndex {
+-(BOOL)moveItemFrom: (NSInteger)oldIndex to: (NSInteger)newIndex outlineView: (NSOutlineView *)view {
     if (newIndex == oldIndex) return NO;
     NSUInteger count = [_children count];
     if (oldIndex >= count) return NO;
@@ -152,26 +179,57 @@
     } else {
         [_children insertObject: item atIndex: newIndex];
     }
-    
+    if (view) [view moveItemAtIndex: oldIndex inParent: self toIndex: newIndex inParent: self];
+
     // re-index and re-validate.
     unsigned ix = 0;
     for (MediaItem *item in _children) {
         [item setIndex: ix];
         [item setValid: ix < _validCount];
+        
+//        [view reloadItem: item];
+        
         ++ix;
     }
-    [self pruneChildren];
+    [self pruneChildrenWithOutlineView: view];
+    //[view reloadItem: self reloadChildren: YES];
     return YES;
 }
 @end
 
 @implementation MediaItem
 
+
+
 -(instancetype)initWithURL: (NSURL *)url {
-    [self setUrl: url];
+    _url = url;
     return self;
 }
 
+-(instancetype)initWithString: (NSString *)string {
+    _string = string;
+    return self;
+}
+
+-(NSString *)argument {
+    if (_string)
+        return _string;
+
+    // todo -- have setURL also update _string?
+    if (_url)
+        return [NSString stringWithCString: [_url fileSystemRepresentation] encoding: NSUTF8StringEncoding];
+
+    return nil;
+}
+
++(NSSet *)keyPathsForValuesAffectingOccupied {
+    return [NSSet setWithObjects: @"url", @"string", nil];
+}
+
+-(BOOL)occupied {
+    return _url || _string;
+}
+
 -(NSInteger) count {
     return 0;
 }
@@ -189,24 +247,12 @@
 }
 
 -(NSString *)viewIdentifier {
+    if (_category == kIndexBitBanger) return @"BBItemView";
     return @"ItemView";
 }
 
 -(void)prepareView: (TablePathView *)view {
-    NSPathControl *pc = [view pathControl];
-    NSButton *button = [view ejectButton];
-
-    [pc unbind: @"value"];
-    [pc bind: @"value" toObject: self withKeyPath: @"url" options: nil];
     
-    [button unbind: @"enabled"];
-    NSValueTransformer *t = [NSValueTransformer valueTransformerForName: NSIsNotNilTransformerName];
-    NSDictionary *options = @{ NSValueTransformerBindingOption: t};
-    [button bind: @"enabled" toObject: self withKeyPath: @"url" options: options];
-    
-    NSColor *tintColor = nil;
-    if (!_valid) tintColor = [NSColor redColor];
-    [button setContentTintColor: tintColor];
 }
 
 -(CGFloat)height {
@@ -214,21 +260,29 @@
 }
 
 -(void)invalidate {
-    _valid = NO;
+    if (!_valid) return;
+    [self setValid: NO];
 }
 @end
 
+
+
+
 @interface MediaViewController () {
 
-    MediaCategory *_data[5];
+    MediaCategory *_data[CATEGORY_COUNT];
     NSArray *_root;
-    NSDictionary *_media;
+    Media _media;
+    
+    BOOL _loadingBookmark;
 }
 
 @end
 
 @implementation MediaViewController
 
+
+
 -(void)awakeFromNib {
     
     static unsigned first = 0;
@@ -236,44 +290,34 @@
     if (first) return;
     first++;
 
-    MediaCategory *a, *b, *c, *d, *e;
-    
-    a = [[MediaCategory alloc] initWithTitle: @"5.25\" Floppies"];
-    b = [[MediaCategory alloc] initWithTitle: @"3.5\" Floppies"];
-    c = [[MediaCategory alloc] initWithTitle: @"Hard Drives"];
-    d = [[MediaCategory alloc] initWithTitle: @"CD-ROMs"];
-    e = [[MediaCategory alloc] initWithTitle: @"Casettes"];
+    _data[kIndexFloppy525] = [MediaCategory categoryWithTitle: @"5.25\" Floppies"];
+    _data[kIndexFloppy35] = [MediaCategory categoryWithTitle: @"3.5\" Floppies"];
+    _data[kIndexHardDrive] = [MediaCategory categoryWithTitle: @"Hard Drives"];
+    _data[kIndexCDROM] = [MediaCategory categoryWithTitle: @"CD-ROMs"];
+    _data[kIndexCassette] = [MediaCategory categoryWithTitle: @"Cassettes"];
+    _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];
     
-    _data[0] = a;
-    _data[1] = b;
-    _data[2] = c;
-    _data[3] = d;
-    _data[4] = e;
-
     _root = @[];
 
 }
 
 
-enum {
-    kIndexFloppy_5_25 = 0,
-    kIndexFloppy_3_5,
-    kIndex_HardDrive,
-    kIndexCDROM,
-    kIndexCassette
-};
 
 -(void)rebuildArgs {
     
     static char* prefix[] = {
-        "flop", "flop", "hard", "cdrm", "cass"
+        "flop", "flop", "hard", "cdrm", "cass", "disk", "bitb",
     };
+    static_assert(SIZEOF(prefix) == CATEGORY_COUNT, "Missing item");
     NSMutableArray *args = [NSMutableArray new];
     
-    unsigned counts[5] = { 0, 0, 0, 0, 0 };
+    unsigned counts[CATEGORY_COUNT] = { 0 };
     
-    for (unsigned j = 0; j < 5; ++j) {
+    for (unsigned j = 0; j < CATEGORY_COUNT; ++j) {
     
         MediaCategory *cat = _data[j];
         NSInteger valid = [cat validCount];
@@ -281,12 +325,12 @@ enum {
             counts[j]++;
 
             MediaItem *item = [cat objectAtIndex: i];
-            NSURL *url = [item url];
-            if (!url) continue;
-            [args addObject: [NSString stringWithFormat: @"-%s%u", prefix[j], counts[j]]];
-            NSString *s = [NSString stringWithCString: [url fileSystemRepresentation] encoding: NSUTF8StringEncoding];
-            
-            [args addObject: s];
+            NSString *arg = [item argument];
+
+            if (arg) {
+                [args addObject: [NSString stringWithFormat: @"-%s%u", prefix[j], counts[j]]];
+                [args addObject: arg];
+            }
         }
         if (j == 0) counts[1] = counts[0]; // 3.5/5.25
     }
@@ -297,7 +341,7 @@ enum {
 -(void)rebuildRoot {
     NSMutableArray *tmp = [NSMutableArray new];
     int ix = 0;
-    for (unsigned j = 0 ; j < 5; ++j) {
+    for (unsigned j = 0 ; j < CATEGORY_COUNT; ++j) {
         MediaCategory *cat = _data[j];
         [cat setIndex: -1];
         if ([cat count]) {
@@ -307,41 +351,63 @@ enum {
     }
     _root = tmp;
 
-    [_outlineView reloadData];
-    [_outlineView expandItem: nil expandChildren: YES];
+    // todo - switch this to use removeItemsAtIndexes:inParent:withAnimation:
+    // and insertItemsAtIndexes:inParent:withAnimation:
+    
+    if (!_loadingBookmark) {
+        [_outlineView reloadData];
+        [_outlineView expandItem: nil expandChildren: YES];
+    }
 }
 
--(void)setMedia: (NSDictionary *)media {
+-(void)setMedia: (Media)media {
     
-    static NSString *Keys[] = {
-        @"flop_5_25",
-        @"flop_3_5",
-        @"hard",
-        @"cdrm",
-        @"cass"
-    };
-
-    NSNumber *o;
     MediaCategory *cat;
-    unsigned i;
     BOOL delta = NO;
-    
-    
-    if (_media == media) return;
+    unsigned x;
+
+    if (MediaEqual(&_media, &media)) return;
     _media = media;
     
-    for (unsigned j = 0; j < 5; ++j) {
     
-        o = [media objectForKey: Keys[j]];
-        i = [o unsignedIntValue];
-        cat = _data[j];
-        delta |= [cat setItemCount: i];
-    }
+#undef _
+#define _(name, index) \
+x = media.name; cat = _data[index]; delta |= [cat setItemCount: x]
+    _(cass, kIndexCassette);
+    _(cdrom, kIndexCDROM);
+    _(hard, kIndexHardDrive);
+    _(floppy_3_5, kIndexFloppy35);
+    _(floppy_5_25, kIndexFloppy525);
+    _(pseudo_disk, kIndexDiskImage);
+    _(bitbanger, kIndexBitBanger);
+
 
-    
     if (delta) {
         [self rebuildRoot];
-        [self rebuildArgs];
+        if (!_loadingBookmark) [self rebuildArgs];
+    }
+}
+
+-(void)resetDiskImages {
+
+    BOOL delta = NO;
+    for (unsigned j = 0; j < CATEGORY_COUNT; ++j) {
+    
+        MediaCategory *cat = _data[j];
+        NSInteger count = [cat count];
+        for (NSInteger i = 0; i < count; ++i) {
+
+            MediaItem *item = [cat objectAtIndex: i];
+            if (![item occupied]) continue;
+            [item setUrl: nil];
+            [item setString: nil];
+            delta = YES;
+        }
+        if ([cat pruneChildrenWithOutlineView: _outlineView]) delta = YES;
+    }
+    if (delta) {
+        [self rebuildRoot];
+        if (!_loadingBookmark) [self rebuildArgs];
     }
 }
 
@@ -371,13 +437,13 @@ static NSString *kDragType = @"private.ample.media";
     
 }
 
-//- (NSTableRowView *)outlineView:(NSOutlineView *)outlineView rowViewForItem:(id)item;
-
 - (NSView *)outlineView:(NSOutlineView *)outlineView viewForTableColumn:(NSTableColumn *)tableColumn item:(id<MediaNode>)item {
     
     NSString *ident = [item viewIdentifier];
     if (!ident) return nil;
     NSTableCellView *v = [outlineView makeViewWithIdentifier: ident owner: self];
+    [v setObjectValue: item];
+
     [(id<MediaNode>)item prepareView: v];
     return v;
 }
@@ -410,12 +476,6 @@ static NSString *kDragType = @"private.ample.media";
 }
 
 
-- (NSCell *)outlineView:(NSOutlineView *)outlineView dataCellForTableColumn:(NSTableColumn *)tableColumn item:(id)item {
-    //return nil;
-    return [[item cellClass] new];
-}
-
-
 
 
 #pragma mark - NSOutlineViewDataSource
@@ -479,7 +539,7 @@ static NSString *kDragType = @"private.ample.media";
     NSInteger indexes[2] =  { 0, 0 };
     indexes[0] = [cat index];
     indexes[1] = [item index];
-    NSData *data =[NSData dataWithBytes: indexes length: sizeof(indexes)];
+    NSData *data = [NSData dataWithBytes: indexes length: sizeof(indexes)];
 
     [pasteboard setData: data forType: kDragType];
     return YES;
@@ -559,10 +619,12 @@ static NSString *kDragType = @"private.ample.media";
     
     NSInteger oldIndex = indexes[1];
 
-    [cat moveItemFrom: oldIndex to: index];
+    [_outlineView beginUpdates];
+    [cat moveItemFrom: oldIndex to: index outlineView: _outlineView];
+    [_outlineView endUpdates];
     [self rebuildArgs];
 
-    [_outlineView reloadItem: cat reloadChildren: YES];
+    //[_outlineView reloadItem: cat reloadChildren: YES];
     return YES;
 
 }
@@ -576,21 +638,184 @@ static NSString *kDragType = @"private.ample.media";
     NSInteger row = [_outlineView rowForView: sender];
     if (row < 0) return;
 
-    //TablePathView *pv = [_outlineView viewAtColumn: 0 row: row makeIfNecessary: NO];
     MediaItem *item = [_outlineView itemAtRow: row];
     [item setUrl: nil];
-    //[[pv pathControl] setURL: nil];
+    [item setString: nil];
     
     // if item is invalid, should attempt to remove...
     if (![item valid]) {
         MediaCategory *cat = [_outlineView parentForItem: item];
-        if ([cat pruneChildren]) [self rebuildRoot];
+        [_outlineView beginUpdates];
+        [cat pruneChildrenWithOutlineView: _outlineView];
+        [_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 {
-    // need to update the eject button...
+    
+    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];
+    }
+    
     [self rebuildArgs];
 }
+
+-(IBAction)textAction: (id)sender {
+    [self rebuildArgs];
+}
+
+-(IBAction)resetMedia:(id)sender {
+    [self resetDiskImages];
+}
+
+@end
+
+@implementation MediaViewController (Bookmark)
+
+-(void)willLoadBookmark:(NSDictionary *)bookmark {
+    _loadingBookmark = YES;
+    [self resetDiskImages];
+}
+-(void)didLoadBookmark:(NSDictionary *)bookmark {
+    _loadingBookmark = NO;
+
+
+    [self rebuildRoot];
+    [self rebuildArgs];
+}
+
+static NSString * BookmarkStrings[] = {
+    @"flop_525", @"flop_35", @"hard", @"cdrm", @"cass", @"disk", @"bitb",
+};
+static_assert(SIZEOF(BookmarkStrings) == CATEGORY_COUNT, "Missing item");
+
+static int BookmarkIndex(NSString *str) {
+    if (!str) return -1;
+    for (int i = 0; i < SIZEOF(BookmarkStrings); ++i) {
+        if ([str isEqualToString: BookmarkStrings[i]]) return i;
+    }
+    return -1;
+}
+
+
+-(BOOL)loadBookmark: (NSDictionary *)bookmark {
+
+    // fragile - depends on order
+    id media = [bookmark objectForKey: @"media"];
+    
+    if ([media isKindOfClass: [NSArray class]]) {
+        unsigned ix = 0;
+        for (NSArray *a in (NSArray *)media) {
+            if (ix >= CATEGORY_COUNT) {
+                NSLog(@"MediaViewController: too many categories.");
+                break;
+            }
+            MediaCategory *cat = _data[ix];
+            NSInteger count = [cat count];
+            unsigned i = 0;
+            for (NSString *path in a) {
+                if (i >= count) {
+                    NSLog(@"MediaViewController: too many files.");
+                    break; //
+                }
+                MediaItem *item = [cat objectAtIndex: i++];
+                if (![path length]) continue;
+
+                if (ix == kIndexBitBanger) {
+                    [item setString: path];
+                } else {
+                    NSURL *url = [NSURL fileURLWithPath: path];
+                    [item setUrl: url];
+                }
+            }
+            ++ix;
+        }
+        return YES;
+    }
+    if ([media isKindOfClass: [NSDictionary class]]) {
+        
+        for (NSString *key in (NSDictionary *)media) {
+            NSInteger ix = BookmarkIndex(key);
+            if (ix < 0) {
+                NSLog(@"MediaViewController: unrecognized category: %@", key);
+                continue;
+            }
+            MediaCategory *cat = _data[ix];
+            NSInteger count = [cat count];
+            NSArray *a = [(NSDictionary *)media objectForKey: key];
+            unsigned i = 0;
+
+            for (NSString *path in a) {
+                if (i >= count) {
+                    NSLog(@"MediaViewController: too many files.");
+                    break; //
+                }
+                MediaItem *item = [cat objectAtIndex: i++];
+                if (![path length]) continue;
+
+                if (ix == kIndexBitBanger) {
+                    [item setString: path];
+                } else {
+                    NSURL *url = [NSURL fileURLWithPath: path];
+                    [item setUrl: url];
+                }
+            }
+        }
+        
+        return YES;
+    }
+    return NO;
+}
+
+static void CompressArray(NSMutableArray *array) {
+    
+    for(;;) {
+        NSString *s = [array lastObject];
+        if (!s) return;
+        if ([s length]) return;
+        [array removeLastObject];
+    }
+}
+
+-(BOOL)saveBookmark: (NSMutableDictionary *)bookmark {
+
+
+    NSMutableDictionary *media = [NSMutableDictionary new];
+
+    for (unsigned ix = 0; ix < CATEGORY_COUNT; ++ix) {
+    
+        MediaCategory *cat = _data[ix];
+        NSInteger count = [cat validCount];
+        if (!count) continue;
+        
+        NSMutableArray *array = [NSMutableArray new];
+        for (NSInteger i = 0; i < count; ++i) {
+
+            MediaItem *item = [cat objectAtIndex: i];
+            NSString *s = [item argument];
+            if (!s) s = @"";
+            [array addObject: s];
+        }
+
+        CompressArray(array);
+        
+        if ([array count])
+            [media setObject: array forKey: BookmarkStrings[ix]];
+    }
+    
+    [bookmark setObject: media forKey: @"media"];
+    
+    return YES;
+}
+
+
 @end

Ample/Menu.h

@@ -0,0 +1,15 @@
+//
+//  Menu.h
+//  Ample
+//
+//  Created by Kelvin Sherlock on 10/3/2020.
+//  Copyright © 2020 Kelvin Sherlock. All rights reserved.
+//
+
+#ifndef Menu_h
+#define Menu_h
+
+NSFont *ItalicMenuFont(void);
+NSAttributedString *ItalicMenuString(NSString *s);
+
+#endif /* Menu_h */

Ample/Menu.m

@@ -0,0 +1,27 @@
+//
+//  Menu.m
+//  Ample
+//
+//  Created by Kelvin Sherlock on 10/3/2020.
+//  Copyright © 2020 Kelvin Sherlock. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import <Cocoa/Cocoa.h>
+
+NSFont *ItalicMenuFont(void) {
+    NSFont *font = [NSFont menuFontOfSize: 0];
+    NSFontDescriptor *fd = [font fontDescriptor];
+    NSFontDescriptor *fd2 = [fd fontDescriptorWithSymbolicTraits: NSFontDescriptorTraitItalic];
+    return [NSFont fontWithDescriptor: fd2 size: [font pointSize]];
+}
+
+NSAttributedString *ItalicMenuString(NSString *s) {
+    static NSDictionary *attr = nil;
+    if (!attr) {
+        attr = @{
+            NSFontAttributeName: ItalicMenuFont()
+        };
+    }
+    return [[NSAttributedString alloc] initWithString: s attributes: attr];
+}

Ample/NewMachineViewController.h

@@ -0,0 +1,30 @@
+//
+//  NewMachineViewController.h
+//  Ample
+//
+//  Created by Kelvin Sherlock on 6/8/2021.
+//  Copyright © 2021 Kelvin Sherlock. All rights reserved.
+//
+
+#import <Cocoa/Cocoa.h>
+#import "Ample.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface NewMachineViewController : NSViewController
+
+@property (nullable) NSString *machine;
+
+-(void)reset;
+
+@end
+
+@interface NewMachineViewController (Table) <NSOutlineViewDelegate, NSOutlineViewDataSource>
+
+@end
+
+@interface NewMachineViewController (Bookmark) <Bookmark>
+
+@end
+
+NS_ASSUME_NONNULL_END

Ample/NewMachineViewController.m

@@ -0,0 +1,234 @@
+//
+//  NewMachineViewController.m
+//  Ample
+//
+//  Created by Kelvin Sherlock on 6/8/2021.
+//  Copyright © 2021 Kelvin Sherlock. All rights reserved.
+//
+
+#import "NewMachineViewController.h"
+
+@interface NewMachineViewController () {
+
+    NSArray *_data;
+}
+
+@property (weak) IBOutlet NSOutlineView *outlineView;
+
+@end
+
+@implementation NewMachineViewController
+
+-(void)awakeFromNib {
+    
+    static unsigned first = 0;
+    
+    if (first) return;
+    first++;
+
+    NSBundle *bundle = [NSBundle mainBundle];
+    NSString *path = [bundle pathForResource: @"models" ofType: @"plist"];
+    _data = [NSArray arrayWithContentsOfFile: path];
+
+}
+
+-(void)viewDidLoad {
+    [super viewDidLoad];
+
+    //[_outlineView reloadData];
+    //[_outlineView setAutosaveExpandedItems: YES];
+    //[_outlineView expandItem: nil expandChildren: YES];
+}
+
+#pragma mark - IBActions
+- (IBAction)clickAction:(id)sender {
+    
+    NSInteger row = [_outlineView clickedRow];
+    if (row < 0) return;
+    NSDictionary *item = [_outlineView itemAtRow: row];
+    if (!item) return;
+
+    NSString *value = [item objectForKey: @"value"];
+    NSArray *children = [item objectForKey: @"children"];
+    
+    if (value) {
+        [self setMachine: value];
+    } else if (children) {
+        id ap = [_outlineView animator];
+        [_outlineView isItemExpanded: item] ? [ap collapseItem: item] : [ap expandItem: item];
+    }
+
+
+}
+
+-(void)reset {
+    
+    [_outlineView deselectAll: nil];
+    [self setMachine: nil];
+}
+@end
+
+
+@implementation NewMachineViewController (Table)
+
+#if 0
+- (BOOL)outlineView:(NSOutlineView *)outlineView shouldExpandItem:(id)item {
+    return YES;
+}
+
+- (BOOL)outlineView:(NSOutlineView *)outlineView shouldCollapseItem:(id)item {
+    return NO;
+}
+#endif
+
+- (BOOL)outlineView:(NSOutlineView *)outlineView shouldShowOutlineCellForItem:(id)item {
+    // disclosure triangle.
+    if (!item) return YES;
+    NSArray *children = [(NSDictionary *)item objectForKey: @"children"];
+    return [children count] > 0;
+}
+
+
+- (BOOL)outlineView:(NSOutlineView *)outlineView isItemExpandable:(id)item {
+    if (!item) return YES;
+    NSArray *children = [(NSDictionary *)item objectForKey: @"children"];
+    return [children count] > 0;
+}
+
+- (BOOL)outlineView:(NSOutlineView *)outlineView isGroupItem:(id)item {
+    
+#if 0
+    NSArray *children = [(NSDictionary *)item objectForKey: @"children"];
+    return [children count] > 0;
+#else
+    return NO;
+#endif
+}
+
+
+- (NSView *)outlineView:(NSOutlineView *)outlineView viewForTableColumn:(NSTableColumn *)tableColumn item:(id)item {
+
+#if 0
+    NSArray *children = [(NSDictionary *)item objectForKey: @"children"];
+    if ([children count]) {
+        return [outlineView makeViewWithIdentifier: @"HeaderCell" owner: self];
+    }
+#endif
+    NSTableCellView *v = [outlineView makeViewWithIdentifier: @"DataCell" owner: self];
+    //[v setObjectValue: item];
+    return v;
+}
+
+- (NSInteger)outlineView:(NSOutlineView *)outlineView numberOfChildrenOfItem:(id)item {
+    if (!item) return [_data count];
+    NSArray *children = [(NSDictionary *)item objectForKey: @"children"];
+    return [children count];
+}
+
+- (id)outlineView:(NSOutlineView *)outlineView child:(NSInteger)index ofItem:(id)item {
+    
+    if (item == nil) {
+        return [_data objectAtIndex: index];
+    }
+    NSArray *children = [(NSDictionary *)item objectForKey: @"children"];
+    return [children objectAtIndex: index];
+}
+
+- (id)outlineView:(NSOutlineView *)outlineView objectValueForTableColumn:(NSTableColumn *)tableColumn byItem:(id)item {
+    return item;
+}
+
+
+- (BOOL)outlineView:(NSOutlineView *)outlineView shouldSelectItem:(id)item {
+    if (!item) return NO;
+    return [(NSDictionary *)item objectForKey: @"value"] != nil;
+}
+
+
+// saving/restoring expanded items
+- (id)outlineView:(NSOutlineView *)outlineView persistentObjectForItem:(id)item {
+    
+    return [item objectForKey: @"description"];
+}
+
+- (id)outlineView:(NSOutlineView *)outlineView itemForPersistentObject:(id)object {
+    
+    if ([object isKindOfClass: [NSString class]]) {
+        
+        for(NSDictionary *d in _data) {
+            if ([(NSString *)object isEqualToString: [d objectForKey: @"description"]])
+                return d;
+        }
+        
+    }
+    return nil;
+    //return object;
+}
+
+
+@end
+
+
+@implementation NewMachineViewController (Bookmark)
+
+
+- (void)didLoadBookmark:(NSDictionary *)bookmark {
+}
+
+- (BOOL)loadBookmark:(NSDictionary *)bookmark {
+    NSString *machine = [bookmark objectForKey: @"machine"];
+
+    
+
+    //NSInteger row = [_outlineView selectedRow];
+    if (!machine) {
+        [self setMachine: nil];
+        [_outlineView deselectAll: nil];
+        return NO;
+    }
+
+    for (NSDictionary *parent in _data) {
+        NSArray *children = [parent objectForKey: @"children"];
+        
+        for (NSDictionary *child in children) {
+            if ([machine isEqualToString: [child objectForKey: @"value"]]) {
+                
+                id ap = [_outlineView animator];
+                [ap expandItem: parent];
+                NSInteger row = [_outlineView rowForItem: child];
+                if (row >= 0) {
+                    NSIndexSet *set = [NSIndexSet indexSetWithIndex: row];
+                    [_outlineView selectRowIndexes: set byExtendingSelection: NO];
+                    [_outlineView scrollRowToVisible: row];
+                    return YES;
+                }
+                return NO;
+            }
+        }
+
+        // could also match parent.
+        if ([machine isEqualToString: [parent objectForKey: @"value"]]) {
+            NSInteger row = [_outlineView rowForItem: parent];
+            if (row >= 0) {
+                NSIndexSet *set = [NSIndexSet indexSetWithIndex: row];
+                [_outlineView selectRowIndexes: set byExtendingSelection: NO];
+                [_outlineView scrollRowToVisible: row];
+                return YES;
+            }
+            return NO;
+        }
+    }
+    
+    return NO;
+}
+
+- (BOOL)saveBookmark:(NSMutableDictionary *)bookmark {
+    // machine saved in parent.
+    return YES;
+}
+
+- (void)willLoadBookmark:(NSDictionary *)bookmark {
+
+}
+
+@end

Ample/PreferencesWindowController.m

@@ -9,8 +9,13 @@
 #import "Ample.h"
 #import "PreferencesWindowController.h"
 
+#import <Security/Security.h>
+
+
 @interface PreferencesWindowController ()
 @property (weak) IBOutlet NSTextField *pathField;
+@property (weak) IBOutlet NSTextField *wdField;
+@property (weak) IBOutlet NSButton *fixButton;
 
 @end
 
@@ -27,19 +32,41 @@
     // Implement this method to handle any initialization after your window controller's window has been loaded from its nib file.
     
     [self validateMamePath: [defaults stringForKey: kMamePath]];
+    [self validateMameWD: [defaults stringForKey: kMameWorkingDirectory]];
+
+    /* check vmnet_helper permissions */
     
+    int needs_fixin = [self checkHelperPermissions: nil];
+    [_fixButton setEnabled: needs_fixin > 0];
 }
 
 -(void)validateMamePath: (NSString *)path {
     NSFileManager * fm = [NSFileManager defaultManager];
 
     if ([path length] == 0 || [fm isExecutableFileAtPath: path]) {
-        [_pathField setTextColor: [NSColor blackColor]];
+        [_pathField setTextColor: nil];
     } else {
-        [_pathField setTextColor: [NSColor redColor]];
+        [_pathField setTextColor: [NSColor systemRedColor]];
     }
 }
 
+-(void)validateMameWD: (NSString *)path {
+    NSFileManager * fm = [NSFileManager defaultManager];
+    BOOL directory = YES;
+    
+    if ([path length] == 0) {
+        [_wdField setTextColor: nil];
+        return;
+    }
+    
+    if ([fm fileExistsAtPath: path isDirectory: &directory] && directory) {
+        [_wdField setTextColor: nil];
+        return;
+
+    }
+    [_wdField setTextColor: [NSColor systemRedColor]];
+}
+
 - (IBAction)pathChanged:(id)sender {
 
     NSString *path = [sender stringValue];
@@ -47,6 +74,126 @@
     [self validateMamePath: path];
 
 }
+- (IBAction)wdChanged:(id)sender {
+
+    NSString *path = [sender stringValue];
+    
+    [self validateMameWD: path];
+}
+
+// -1 - error
+// 1 - needs help
+// 0 - a-ok
+-(int)checkHelperPermissions: (NSString *)path {
+
+    static const unsigned Mask = S_ISUID | S_ISGID;
+    if (!path) {
+        NSBundle *bundle = [NSBundle mainBundle];
+        path = [bundle pathForAuxiliaryExecutable: @"vmnet_helper"];
+    }
+    if (!path) return -1;
+
+    NSFileManager *fm = [NSFileManager defaultManager];
+    NSError *error = nil;
+    NSDictionary *attr = [fm attributesOfItemAtPath: path error: &error];
+    
+    if (error) return -1;
+
+    NSNumber *owner = [attr objectForKey: NSFileOwnerAccountID];
+    NSNumber *perm = [attr objectForKey: NSFilePosixPermissions];
+    if ([owner longValue] == 0 && ([perm unsignedIntValue] & Mask) == Mask) return 0;
+    return 1;
+}
+
+- (IBAction)fixPerms:(id)sender {
+
+    NSBundle *bundle = [NSBundle mainBundle];
+    NSString *path = [bundle pathForAuxiliaryExecutable: @"vmnet_helper"];
+    if (!path) return;
+    
+    
+#if 0
+    // this requires an entitlement and sanboxing and Apple's permission.
+    NSWorkspace *ws = [NSWorkspace sharedWorkspace];
+    
+    [ws requestAuthorizationOfType:NSWorkspaceAuthorizationTypeSetAttributes
+                 completionHandler: ^(NSWorkspaceAuthorization *a, NSError *e){
+        if (e || !a) return;
+
+        NSError *error = nil;
+        NSDictionary *attr = @{
+            NSFileOwnerAccountID: @0, /* root */
+            NSFileGroupOwnerAccountID: @20, /* staff */
+//            NSFilePosixPermissions: @0106755 /* 755 + setuid + setgid */
+        };
+
+
+        
+        NSFileManager *fm = [NSFileManager fileManagerWithAuthorization: a];
+        [fm setAttributes: attr ofItemAtPath: path error: &error];
+        if (error) {
+            NSLog(@"%@", error);
+//            NSAlert *a = [NSAlert alertWithError: error];
+//            [a runModal];
+        }
+        else {
+            [self->_fixButton setEnabled: NO];
+        }
+        
+    }];
+#endif
+
+    // AuthorizationExecuteWithPrivileges - deprecated in 10.7
+    // https://github.com/sveinbjornt/STPrivilegedTask
+    // XMJobBless + launchd stuff - the preferred way to do it...
+    // https://developer.apple.com/library/archive/samplecode/BetterAuthorizationSample/Introduction/Intro.html
+    // https://developer.apple.com/library/archive/samplecode/SMJobBless/Listings/ReadMe_txt.html#//apple_ref/doc/uid/DTS40010071-ReadMe_txt-DontLinkElementID_3
+    //
+    // really should be a launchd service but that's for another time...
+   
+    AuthorizationRef myAuthorizationRef = 0;
+    OSStatus myStatus = AuthorizationCreate(NULL, kAuthorizationEmptyEnvironment, kAuthorizationFlagDefaults, &myAuthorizationRef);
+    if (myStatus) return;
+
+    AuthorizationItem myItems[1] = {{0}};
+    myItems[0].name = kAuthorizationRightExecute;
+    myItems[0].valueLength = 0;
+    myItems[0].value = NULL;
+    myItems[0].flags = 0;
+    AuthorizationRights myRights = {0};
+    myRights.count = sizeof(myItems) / sizeof(myItems[0]);
+    myRights.items = myItems;
+    AuthorizationFlags myFlags = kAuthorizationFlagDefaults | kAuthorizationFlagInteractionAllowed |
+                                 kAuthorizationFlagExtendRights | kAuthorizationFlagPreAuthorize;
+    myStatus = AuthorizationCopyRights(myAuthorizationRef, &myRights,
+                                                             kAuthorizationEmptyEnvironment, myFlags, NULL);
+
+    if (!myStatus) {
+        FILE *fp = NULL;
+        static char buffer[4096];
+        const char *cp = [path fileSystemRepresentation];
+        const char* args_chown[] = {"root", cp , NULL};
+        const char* args_chmod[] = {"+s", cp, NULL};
+        
+        // well ... the second command executes a lot more consistently when the (optional) fp is provided and the we fgets the buffer.
+        // textmate does a wait() to wait for a child to exit. Using the fp (which is popened()?) and reading until EOF
+        // accomplishes the same thing.
+        myStatus = AuthorizationExecuteWithPrivileges(myAuthorizationRef, "/usr/sbin/chown", kAuthorizationFlagDefaults, (char**)args_chown, &fp);
+        while (fgets(buffer, sizeof(buffer), fp));
+        fclose(fp);
+//        fprintf(stderr, "myStatus = %d\ndata: %s\n", myStatus, buffer);
+
+        myStatus = AuthorizationExecuteWithPrivileges(myAuthorizationRef, "/bin/chmod", kAuthorizationFlagDefaults, (char**)args_chmod, &fp);
+        while (fgets(buffer, sizeof(buffer), fp));
+        fclose(fp);
+//        fprintf(stderr, "myStatus = %d\ndata: %s\n", myStatus, buffer);
+
+    }
+    AuthorizationFree(myAuthorizationRef, kAuthorizationFlagDestroyRights);
+    
+    int needs_fixin = [self checkHelperPermissions: path];
+    [_fixButton setEnabled: needs_fixin > 0];
+}
 
 
 @end

Ample/Resources/CheatSheet.html

@@ -0,0 +1,227 @@
+<!DOCTYPE html>
+<html lang="en">
+    <head>
+        <meta charset="UTF-8">
+        <title>Keyboard Cheat Sheet</title>
+        <style type="text/css">
+            :root {
+              color-scheme: light dark;
+              font-family: -apple-system, 'HelveticaNeue' ;
+              font: -apple-system-body;
+            }
+
+            body {
+                user-select: none;
+
+                background-color: rgb(236, 236, 236);
+                color: rgb(38, 38, 38);
+            }
+            h1, h2 {
+                text-align: center;
+                font-size: 150%;
+            }
+            table {
+              width: 100%;
+            }
+
+            kbd {
+              display: inline-block;
+              border-radius: 3px;
+              padding-left: .5em;
+              padding-right: .5em;
+              padding-top: 4px;
+              padding-bottom: 2px;
+              margin-bottom: 5px;
+              margin-right: 5px;
+              margin-left: 4px;
+
+              border: solid 1px black;
+              box-shadow: 1px 1px 2px 0px rgba(0,0,0,0.75), inset 1px 1px 2px 0px white;
+              text-shadow: 0px 1px 0px rgb(255, 255, 255);
+              background-color: rgb(225, 225, 225);
+            }
+
+            @media (prefers-color-scheme: dark) {
+                body {
+                    background-color: rgb(50, 50, 50);
+                    color: rgb(225, 225, 225);
+                }
+
+                kbd {
+                  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);                  
+                }
+            }
+        </style>
+        <script type="text/javascript">
+          /* os x 10.11 */
+          if (window.NodeList && !NodeList.prototype.forEach) {
+             NodeList.prototype.forEach = Array.prototype.forEach;
+          }
+
+        function macbook(onoff) {
+            var nodes = document.querySelectorAll("[data-macbook]");
+            nodes.forEach( function(e) {
+              var m = (e.dataset.macbook == "true");
+              e.hidden = m ^ onoff;
+            });
+          }
+          window.addEventListener('load', function(event) {
+            macbook(false);
+
+            var e = document.getElementById('macbook');
+            if (e) {
+              e.checked = false;
+              e.addEventListener('click', function (event) {
+                macbook(e.checked);
+              });
+            }
+          })
+        </script>
+    </head>
+    <body>
+        <div>
+          MacBook: <input type="checkbox" id="macbook" />
+        </div>
+        <h1>Full UI Mode</h1>
+        <table>
+            <colgroup>
+              <col style="width: 14em;" />
+              <col />
+            </colgroup>
+            <tbody>
+                <tr>
+                    <td>
+                      <span data-macbook=false><kbd>Delete</kbd></span>
+                      <span data-macbook=true><kbd>Fn</kbd>+<kbd>Delete</kbd></span>
+                    </td>
+                    <td>Toggle partial UI mode</td>
+                </tr>
+                <tr>
+                    <td><kbd>Option</kbd>+<kbd>Enter</kbd></td>
+                    <td>Toggle full screen mode</td>
+                </tr>
+                <tr>
+                    <td><kbd>F12</kbd></td>
+                    <td>Reset Key</td>
+                </tr>
+            </tbody>
+        </table>
+
+        <h1>Partial UI Mode</h1>
+   
+        <table>
+            <colgroup>
+              <col style="width: 14em;" />
+              <col />
+            </colgroup>
+            <tbody>
+                <tr>
+                    <td>
+                      <span data-macbook=false><kbd>Delete</kbd></span>
+                      <span data-macbook=true><kbd>Fn</kbd>+<kbd>Delete</kbd></span>
+                    </td>
+                    <td>Toggle full UI mode</td>
+                </tr>
+                <tr>
+                    <td><kbd>Option</kbd>+<kbd>Enter</kbd></td>
+                    <td>Toggle full screen mode</td>
+                </tr>
+                <tr>
+                    <td><kbd>Tab</kbd></td>
+                    <td>Config menu</td>
+                </tr>
+                <tr>
+                    <td><kbd>Esc</kbd></td>
+                    <td>Quit</td>
+                </tr>
+                <tr>
+                    <td><kbd>P</kbd></td>
+                    <td>Pause</td>
+                </tr>
+
+                <tr>
+                    <td><kbd>~</kbd></td>
+                    <td>Debugger break (when active)</td>
+                </tr>
+
+                <tr>
+                    <td>
+                      <span data-macbook=false><kbd>Page Down</kbd></span>
+                      <span data-macbook=true><kbd>Fn</kbd>+<kbd>Down Arrow</kbd></span>
+                    </td>
+                    <td>Fast forward (while pressed)</td>
+                </tr>
+
+                <tr>
+                    <td><kbd>F3</kbd></td>
+                    <td>Soft reset</td>
+                </tr>
+                <tr>
+                    <td><kbd>Shift</kbd>+<kbd>F3</kbd></td>
+                    <td>Hard reset</td>
+                </tr>
+
+
+                <tr>
+                    <td><kbd>F5</kbd></td>
+                    <td>Toggle debugger</td>
+                </tr>
+                <tr>
+                    <td><kbd>Shift</kbd>+<kbd>F5</kbd></td>
+                    <td>Toggle graphic filters</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>
+                </tr>
+
+                <tr>
+                    <td><kbd>F10</kbd></td>
+                    <td>Toggle throttle</td>
+                </tr>
+
+                <tr>
+                    <td><kbd>F11</kbd></td>
+                    <td>Show FPS</td>
+                </tr>
+
+                <tr>
+                    <td><kbd>Shift</kbd>+<kbd>F11</kbd></td>
+                    <td>Show profiler</td>
+                </tr>
+
+                <tr>
+                    <td><kbd>F12</kbd></td>
+                    <td>Save snapshot</td>
+                </tr>
+
+                <tr>
+                    <td><kbd>Shift</kbd>+<kbd>F12</kbd></td>
+                    <td>Record MNG video</td>
+                </tr>
+                <tr>
+                    <td><kbd>Control</kbd>+<kbd>Shift</kbd>+<kbd>F12</kbd></td>
+                    <td>Record AVI video</td>
+                </tr>
+                <tr>
+                    <td><kbd>Option</kbd>+<kbd>Shift</kbd>+<kbd>F12</kbd></td>
+                    <td>Record rendered AVI video</td>
+                </tr>
+            </tbody>
+        </table>
+
+        <h2>Note</h2>
+        <ul class="note">
+          <li><kbd>F</kbd> keys may require <kbd>Fn</kbd> key depending on keyboard and system settings.</li>
+          <li><kbd>Shift</kbd>, <kbd>Control</kbd>, and <kbd>Option</kbd> assume left-key unless otherwise specified.</li>
+        </ul>
+    </body>
+</html>

Ample/Resources/agat7.plist

@@ -6,17 +6,6 @@
     <string>agat7</string>
     <key>description</key>
     <string>Agat-7</string>
-    <key>ram</key>
-    <array>
-      <dict>
-        <key>value</key>
-        <integer>32768</integer>
-        <key>description</key>
-        <string>32K</string>
-        <key>default</key>
-        <true/>
-      </dict>
-    </array>
     <key>media</key>
     <dict>
       <key>cass</key>
@@ -27,325 +16,562 @@
       <integer>512</integer>
       <integer>512</integer>
     </array>
-    <key>sl2</key>
+    <key>slots</key>
     <array>
       <dict>
-        <key>value</key>
-        <string></string>
+        <key>name</key>
+        <string>ramsize</string>
         <key>description</key>
-        <string>—None—</string>
-        <key>default</key>
-        <false/>
+        <string>RAM</string>
+        <key>options</key>
+        <array>
+          <dict>
+            <key>intValue</key>
+            <integer>32768</integer>
+            <key>description</key>
+            <string>32K</string>
+            <key>value</key>
+            <string>32K</string>
+            <key>default</key>
+            <true/>
+          </dict>
+        </array>
       </dict>
       <dict>
-        <key>value</key>
-        <string>a9fdchle</string>
+        <key>name</key>
+        <string>sl2</string>
         <key>description</key>
-        <string>Agat 840K floppy card</string>
-        <key>default</key>
-        <false/>
+        <string>Slot 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>a9fdchle</string>
+            <key>description</key>
+            <string>Agat 840K floppy card</string>
+            <key>devname</key>
+            <string>agat840k_hle</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>a9fdc</string>
+            <key>description</key>
+            <string>Agat 840K floppy controller card</string>
+            <key>devname</key>
+            <string>agat_fdc</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>a7fdc</string>
+            <key>description</key>
+            <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>
+            <string>a7lang</string>
+            <key>description</key>
+            <string>Agat-7 32K Language Card</string>
+            <key>default</key>
+            <true/>
+            <key>devname</key>
+            <string>a7lang</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>a7ram</string>
+            <key>description</key>
+            <string>Agat-7 32K RAM Card</string>
+            <key>devname</key>
+            <string>a7ram</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>a7ports</string>
+            <key>description</key>
+            <string>Agat-7 Ports Card</string>
+            <key>devname</key>
+            <string>a7ports</string>
+          </dict>
+        </array>
       </dict>
       <dict>
-        <key>value</key>
-        <string>a9fdc</string>
+        <key>name</key>
+        <string>sl3</string>
         <key>description</key>
-        <string>Agat 840K floppy controller card</string>
-        <key>default</key>
-        <false/>
+        <string>Slot 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>a9fdchle</string>
+            <key>description</key>
+            <string>Agat 840K floppy card</string>
+            <key>devname</key>
+            <string>agat840k_hle</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>a9fdc</string>
+            <key>description</key>
+            <string>Agat 840K floppy controller card</string>
+            <key>devname</key>
+            <string>agat_fdc</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>a7fdc</string>
+            <key>description</key>
+            <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>
+            <string>a7lang</string>
+            <key>description</key>
+            <string>Agat-7 32K Language Card</string>
+            <key>devname</key>
+            <string>a7lang</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>a7ram</string>
+            <key>description</key>
+            <string>Agat-7 32K RAM Card</string>
+            <key>devname</key>
+            <string>a7ram</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>a7ports</string>
+            <key>description</key>
+            <string>Agat-7 Ports Card</string>
+            <key>devname</key>
+            <string>a7ports</string>
+          </dict>
+        </array>
       </dict>
       <dict>
-        <key>value</key>
-        <string>a7fdc</string>
+        <key>name</key>
+        <string>sl4</string>
         <key>description</key>
-        <string>Agat-7 140K floppy card</string>
-        <key>default</key>
-        <false/>
-        <key>media</key>
-        <dict>
-          <key>flop_5_25</key>
-          <integer>2</integer>
-        </dict>
+        <string>Slot 4</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>a9fdchle</string>
+            <key>description</key>
+            <string>Agat 840K floppy card</string>
+            <key>devname</key>
+            <string>agat840k_hle</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>a9fdc</string>
+            <key>description</key>
+            <string>Agat 840K floppy controller card</string>
+            <key>devname</key>
+            <string>agat_fdc</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>a7fdc</string>
+            <key>description</key>
+            <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>
+            <string>a7lang</string>
+            <key>description</key>
+            <string>Agat-7 32K Language Card</string>
+            <key>devname</key>
+            <string>a7lang</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>a7ram</string>
+            <key>description</key>
+            <string>Agat-7 32K RAM Card</string>
+            <key>devname</key>
+            <string>a7ram</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>a7ports</string>
+            <key>description</key>
+            <string>Agat-7 Ports Card</string>
+            <key>default</key>
+            <true/>
+            <key>devname</key>
+            <string>a7ports</string>
+          </dict>
+        </array>
       </dict>
       <dict>
-        <key>value</key>
-        <string>a7lang</string>
+        <key>name</key>
+        <string>sl5</string>
         <key>description</key>
-        <string>Agat-7 32K Language Card</string>
-        <key>default</key>
-        <true/>
+        <string>Slot 5</string>
+        <key>options</key>
+        <array>
+          <dict>
+            <key>value</key>
+            <string></string>
+            <key>description</key>
+            <string>—None—</string>
+            <key>default</key>
+            <true/>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>a9fdchle</string>
+            <key>description</key>
+            <string>Agat 840K floppy card</string>
+            <key>devname</key>
+            <string>agat840k_hle</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>a9fdc</string>
+            <key>description</key>
+            <string>Agat 840K floppy controller card</string>
+            <key>devname</key>
+            <string>agat_fdc</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>a7fdc</string>
+            <key>description</key>
+            <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>
+            <string>a7lang</string>
+            <key>description</key>
+            <string>Agat-7 32K Language Card</string>
+            <key>devname</key>
+            <string>a7lang</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>a7ram</string>
+            <key>description</key>
+            <string>Agat-7 32K RAM Card</string>
+            <key>devname</key>
+            <string>a7ram</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>a7ports</string>
+            <key>description</key>
+            <string>Agat-7 Ports Card</string>
+            <key>devname</key>
+            <string>a7ports</string>
+          </dict>
+        </array>
       </dict>
       <dict>
-        <key>value</key>
-        <string>a7ram</string>
+        <key>name</key>
+        <string>sl6</string>
         <key>description</key>
-        <string>Agat-7 32K RAM Card</string>
-        <key>default</key>
-        <false/>
-      </dict>
-      <dict>
-        <key>value</key>
-        <string>a7ports</string>
-        <key>description</key>
-        <string>Agat-7 Ports Card</string>
-        <key>default</key>
-        <false/>
+        <string>Slot 6</string>
+        <key>options</key>
+        <array>
+          <dict>
+            <key>value</key>
+            <string></string>
+            <key>description</key>
+            <string>—None—</string>
+            <key>default</key>
+            <false/>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>a9fdchle</string>
+            <key>description</key>
+            <string>Agat 840K floppy card</string>
+            <key>devname</key>
+            <string>agat840k_hle</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>a9fdc</string>
+            <key>description</key>
+            <string>Agat 840K floppy controller card</string>
+            <key>devname</key>
+            <string>agat_fdc</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>a7fdc</string>
+            <key>description</key>
+            <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>
+            <string>a7lang</string>
+            <key>description</key>
+            <string>Agat-7 32K Language Card</string>
+            <key>devname</key>
+            <string>a7lang</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>a7ram</string>
+            <key>description</key>
+            <string>Agat-7 32K RAM Card</string>
+            <key>default</key>
+            <true/>
+            <key>devname</key>
+            <string>a7ram</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>a7ports</string>
+            <key>description</key>
+            <string>Agat-7 Ports Card</string>
+            <key>devname</key>
+            <string>a7ports</string>
+          </dict>
+        </array>
       </dict>
     </array>
-    <key>sl3</key>
+    <key>devices</key>
     <array>
       <dict>
-        <key>value</key>
-        <string></string>
-        <key>description</key>
-        <string>—None—</string>
-        <key>default</key>
-        <false/>
-      </dict>
-      <dict>
-        <key>value</key>
-        <string>a9fdchle</string>
-        <key>description</key>
-        <string>Agat 840K floppy card</string>
-        <key>default</key>
-        <false/>
-      </dict>
-      <dict>
-        <key>value</key>
-        <string>a9fdc</string>
-        <key>description</key>
-        <string>Agat 840K floppy controller card</string>
-        <key>default</key>
-        <false/>
-      </dict>
-      <dict>
-        <key>value</key>
-        <string>a7fdc</string>
-        <key>description</key>
-        <string>Agat-7 140K floppy card</string>
-        <key>default</key>
-        <true/>
-        <key>media</key>
-        <dict>
-          <key>flop_5_25</key>
-          <integer>2</integer>
-        </dict>
-      </dict>
-      <dict>
-        <key>value</key>
-        <string>a7lang</string>
-        <key>description</key>
-        <string>Agat-7 32K Language Card</string>
-        <key>default</key>
-        <false/>
-      </dict>
-      <dict>
-        <key>value</key>
-        <string>a7ram</string>
-        <key>description</key>
-        <string>Agat-7 32K RAM Card</string>
-        <key>default</key>
-        <false/>
-      </dict>
-      <dict>
-        <key>value</key>
+        <key>name</key>
         <string>a7ports</string>
-        <key>description</key>
-        <string>Agat-7 Ports Card</string>
-        <key>default</key>
-        <false/>
+        <key>slots</key>
+        <array>
+          <dict>
+            <key>name</key>
+            <string>:centronics</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/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>pl80</string>
+                <key>description</key>
+                <string>COMX PL-80</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>covox_stereo</string>
+                <key>description</key>
+                <string>Covox (Stereo-in-1)</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>covox</string>
+                <key>description</key>
+                <string>Covox Speech Thing</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>ap2000</string>
+                <key>description</key>
+                <string>Epson ActionPrinter 2000</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>ex800</string>
+                <key>description</key>
+                <string>Epson EX-800</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>lx800</string>
+                <key>description</key>
+                <string>Epson LX-800</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>lx810l</string>
+                <key>description</key>
+                <string>Espon LX-810L</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>p72</string>
+                <key>description</key>
+                <string>NEC PinWriter P72</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>samdac</string>
+                <key>description</key>
+                <string>SAMDAC</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>chessmec</string>
+                <key>description</key>
+                <string>Tasc ChessMachine EC Interface</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>smartboard</string>
+                <key>description</key>
+                <string>Tasc SmartBoard SB30 Interface</string>
+                <key>default</key>
+                <false/>
+              </dict>
+            </array>
+          </dict>
+        </array>
+      </dict>
+      <dict>
+        <key>name</key>
+        <string>agat_fdc</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>525dsqd</string>
+                <key>description</key>
+                <string>5.25" quad density floppy drive</string>
+                <key>default</key>
+                <true/>
+              </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>525dsqd</string>
+                <key>description</key>
+                <string>5.25" quad density floppy drive</string>
+                <key>default</key>
+                <true/>
+              </dict>
+            </array>
+          </dict>
+        </array>
       </dict>
     </array>
-    <key>sl4</key>
+    <key>software</key>
     <array>
-      <dict>
-        <key>value</key>
-        <string></string>
-        <key>description</key>
-        <string>—None—</string>
-        <key>default</key>
-        <false/>
-      </dict>
-      <dict>
-        <key>value</key>
-        <string>a9fdchle</string>
-        <key>description</key>
-        <string>Agat 840K floppy card</string>
-        <key>default</key>
-        <false/>
-      </dict>
-      <dict>
-        <key>value</key>
-        <string>a9fdc</string>
-        <key>description</key>
-        <string>Agat 840K floppy controller card</string>
-        <key>default</key>
-        <false/>
-      </dict>
-      <dict>
-        <key>value</key>
-        <string>a7fdc</string>
-        <key>description</key>
-        <string>Agat-7 140K floppy card</string>
-        <key>default</key>
-        <false/>
-        <key>media</key>
-        <dict>
-          <key>flop_5_25</key>
-          <integer>2</integer>
-        </dict>
-      </dict>
-      <dict>
-        <key>value</key>
-        <string>a7lang</string>
-        <key>description</key>
-        <string>Agat-7 32K Language Card</string>
-        <key>default</key>
-        <false/>
-      </dict>
-      <dict>
-        <key>value</key>
-        <string>a7ram</string>
-        <key>description</key>
-        <string>Agat-7 32K RAM Card</string>
-        <key>default</key>
-        <false/>
-      </dict>
-      <dict>
-        <key>value</key>
-        <string>a7ports</string>
-        <key>description</key>
-        <string>Agat-7 Ports Card</string>
-        <key>default</key>
-        <true/>
-      </dict>
-    </array>
-    <key>sl5</key>
-    <array>
-      <dict>
-        <key>value</key>
-        <string></string>
-        <key>description</key>
-        <string>—None—</string>
-        <key>default</key>
-        <true/>
-      </dict>
-      <dict>
-        <key>value</key>
-        <string>a9fdchle</string>
-        <key>description</key>
-        <string>Agat 840K floppy card</string>
-        <key>default</key>
-        <false/>
-      </dict>
-      <dict>
-        <key>value</key>
-        <string>a9fdc</string>
-        <key>description</key>
-        <string>Agat 840K floppy controller card</string>
-        <key>default</key>
-        <false/>
-      </dict>
-      <dict>
-        <key>value</key>
-        <string>a7fdc</string>
-        <key>description</key>
-        <string>Agat-7 140K floppy card</string>
-        <key>default</key>
-        <false/>
-        <key>media</key>
-        <dict>
-          <key>flop_5_25</key>
-          <integer>2</integer>
-        </dict>
-      </dict>
-      <dict>
-        <key>value</key>
-        <string>a7lang</string>
-        <key>description</key>
-        <string>Agat-7 32K Language Card</string>
-        <key>default</key>
-        <false/>
-      </dict>
-      <dict>
-        <key>value</key>
-        <string>a7ram</string>
-        <key>description</key>
-        <string>Agat-7 32K RAM Card</string>
-        <key>default</key>
-        <false/>
-      </dict>
-      <dict>
-        <key>value</key>
-        <string>a7ports</string>
-        <key>description</key>
-        <string>Agat-7 Ports Card</string>
-        <key>default</key>
-        <false/>
-      </dict>
-    </array>
-    <key>sl6</key>
-    <array>
-      <dict>
-        <key>value</key>
-        <string></string>
-        <key>description</key>
-        <string>—None—</string>
-        <key>default</key>
-        <false/>
-      </dict>
-      <dict>
-        <key>value</key>
-        <string>a9fdchle</string>
-        <key>description</key>
-        <string>Agat 840K floppy card</string>
-        <key>default</key>
-        <false/>
-      </dict>
-      <dict>
-        <key>value</key>
-        <string>a9fdc</string>
-        <key>description</key>
-        <string>Agat 840K floppy controller card</string>
-        <key>default</key>
-        <false/>
-      </dict>
-      <dict>
-        <key>value</key>
-        <string>a7fdc</string>
-        <key>description</key>
-        <string>Agat-7 140K floppy card</string>
-        <key>default</key>
-        <false/>
-        <key>media</key>
-        <dict>
-          <key>flop_5_25</key>
-          <integer>2</integer>
-        </dict>
-      </dict>
-      <dict>
-        <key>value</key>
-        <string>a7lang</string>
-        <key>description</key>
-        <string>Agat-7 32K Language Card</string>
-        <key>default</key>
-        <false/>
-      </dict>
-      <dict>
-        <key>value</key>
-        <string>a7ram</string>
-        <key>description</key>
-        <string>Agat-7 32K RAM Card</string>
-        <key>default</key>
-        <true/>
-      </dict>
-      <dict>
-        <key>value</key>
-        <string>a7ports</string>
-        <key>description</key>
-        <string>Agat-7 Ports Card</string>
-        <key>default</key>
-        <false/>
-      </dict>
     </array>
   </dict>
 </plist>

Ample/Resources/apple1.plist

@@ -6,105 +6,6 @@
     <string>apple1</string>
     <key>description</key>
     <string>Apple I</string>
-    <key>ram</key>
-    <array>
-      <dict>
-        <key>value</key>
-        <integer>4096</integer>
-        <key>description</key>
-        <string>4K</string>
-        <key>default</key>
-        <false/>
-      </dict>
-      <dict>
-        <key>value</key>
-        <integer>8192</integer>
-        <key>description</key>
-        <string>8K</string>
-        <key>default</key>
-        <false/>
-      </dict>
-      <dict>
-        <key>value</key>
-        <integer>12288</integer>
-        <key>description</key>
-        <string>12K</string>
-        <key>default</key>
-        <false/>
-      </dict>
-      <dict>
-        <key>value</key>
-        <integer>16384</integer>
-        <key>description</key>
-        <string>16K</string>
-        <key>default</key>
-        <false/>
-      </dict>
-      <dict>
-        <key>value</key>
-        <integer>20480</integer>
-        <key>description</key>
-        <string>20K</string>
-        <key>default</key>
-        <false/>
-      </dict>
-      <dict>
-        <key>value</key>
-        <integer>24576</integer>
-        <key>description</key>
-        <string>24K</string>
-        <key>default</key>
-        <false/>
-      </dict>
-      <dict>
-        <key>value</key>
-        <integer>28672</integer>
-        <key>description</key>
-        <string>28K</string>
-        <key>default</key>
-        <false/>
-      </dict>
-      <dict>
-        <key>value</key>
-        <integer>32768</integer>
-        <key>description</key>
-        <string>32K</string>
-        <key>default</key>
-        <false/>
-      </dict>
-      <dict>
-        <key>value</key>
-        <integer>36864</integer>
-        <key>description</key>
-        <string>36K</string>
-        <key>default</key>
-        <false/>
-      </dict>
-      <dict>
-        <key>value</key>
-        <integer>40960</integer>
-        <key>description</key>
-        <string>40K</string>
-        <key>default</key>
-        <false/>
-      </dict>
-      <dict>
-        <key>value</key>
-        <integer>45056</integer>
-        <key>description</key>
-        <string>44K</string>
-        <key>default</key>
-        <false/>
-      </dict>
-      <dict>
-        <key>value</key>
-        <integer>49152</integer>
-        <key>description</key>
-        <string>48K</string>
-        <key>default</key>
-        <true/>
-      </dict>
-    </array>
     <key>media</key>
     <dict>
     </dict>
@@ -113,42 +14,273 @@
       <integer>560</integer>
       <integer>384</integer>
     </array>
-    <key>exp</key>
+    <key>slots</key>
     <array>
       <dict>
-        <key>value</key>
-        <string></string>
+        <key>name</key>
+        <string>ramsize</string>
         <key>description</key>
-        <string>—None—</string>
-        <key>default</key>
-        <false/>
+        <string>RAM</string>
+        <key>options</key>
+        <array>
+          <dict>
+            <key>intValue</key>
+            <integer>4096</integer>
+            <key>description</key>
+            <string>4K</string>
+            <key>value</key>
+            <string>4K</string>
+            <key>default</key>
+            <false/>
+          </dict>
+          <dict>
+            <key>intValue</key>
+            <integer>8192</integer>
+            <key>description</key>
+            <string>8K</string>
+            <key>value</key>
+            <string>8K</string>
+            <key>default</key>
+            <false/>
+          </dict>
+          <dict>
+            <key>intValue</key>
+            <integer>12288</integer>
+            <key>description</key>
+            <string>12K</string>
+            <key>value</key>
+            <string>12K</string>
+            <key>default</key>
+            <false/>
+          </dict>
+          <dict>
+            <key>intValue</key>
+            <integer>16384</integer>
+            <key>description</key>
+            <string>16K</string>
+            <key>value</key>
+            <string>16K</string>
+            <key>default</key>
+            <false/>
+          </dict>
+          <dict>
+            <key>intValue</key>
+            <integer>20480</integer>
+            <key>description</key>
+            <string>20K</string>
+            <key>value</key>
+            <string>20K</string>
+            <key>default</key>
+            <false/>
+          </dict>
+          <dict>
+            <key>intValue</key>
+            <integer>24576</integer>
+            <key>description</key>
+            <string>24K</string>
+            <key>value</key>
+            <string>24K</string>
+            <key>default</key>
+            <false/>
+          </dict>
+          <dict>
+            <key>intValue</key>
+            <integer>28672</integer>
+            <key>description</key>
+            <string>28K</string>
+            <key>value</key>
+            <string>28K</string>
+            <key>default</key>
+            <false/>
+          </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>
+          <dict>
+            <key>intValue</key>
+            <integer>36864</integer>
+            <key>description</key>
+            <string>36K</string>
+            <key>value</key>
+            <string>36K</string>
+            <key>default</key>
+            <false/>
+          </dict>
+          <dict>
+            <key>intValue</key>
+            <integer>40960</integer>
+            <key>description</key>
+            <string>40K</string>
+            <key>value</key>
+            <string>40K</string>
+            <key>default</key>
+            <false/>
+          </dict>
+          <dict>
+            <key>intValue</key>
+            <integer>45056</integer>
+            <key>description</key>
+            <string>44K</string>
+            <key>value</key>
+            <string>44K</string>
+            <key>default</key>
+            <false/>
+          </dict>
+          <dict>
+            <key>intValue</key>
+            <integer>49152</integer>
+            <key>description</key>
+            <string>48K</string>
+            <key>value</key>
+            <string>48K</string>
+            <key>default</key>
+            <true/>
+          </dict>
+        </array>
       </dict>
       <dict>
-        <key>value</key>
-        <string>cassette</string>
+        <key>name</key>
+        <string>exp</string>
         <key>description</key>
-        <string>Apple I cassette board</string>
-        <key>default</key>
-        <true/>
-        <key>media</key>
-        <dict>
-          <key>cass</key>
-          <integer>1</integer>
-        </dict>
+        <string>Expansion</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>cassette</string>
+            <key>description</key>
+            <string>Apple I cassette board</string>
+            <key>default</key>
+            <true/>
+            <key>devname</key>
+            <string>a1cass</string>
+            <key>media</key>
+            <dict>
+              <key>cass</key>
+              <integer>1</integer>
+            </dict>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>cffa</string>
+            <key>description</key>
+            <string>CFFA Compact Flash for Apple I</string>
+            <key>devname</key>
+            <string>cffa1</string>
+          </dict>
+        </array>
       </dict>
+    </array>
+    <key>devices</key>
+    <array>
       <dict>
-        <key>value</key>
-        <string>cffa</string>
-        <key>description</key>
-        <string>CFFA Compact Flash for Apple I</string>
-        <key>default</key>
-        <false/>
-        <key>media</key>
-        <dict>
-          <key>hard</key>
-          <integer>1</integer>
-        </dict>
+        <key>name</key>
+        <string>cffa1</string>
+        <key>slots</key>
+        <array>
+          <dict>
+            <key>name</key>
+            <string>:cffa_ata: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>cdrom</string>
+                <key>description</key>
+                <string>CD-ROM</string>
+                <key>default</key>
+                <false/>
+                <key>media</key>
+                <dict>
+                  <key>cdrom</key>
+                  <integer>1</integer>
+                </dict>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>hdd</string>
+                <key>description</key>
+                <string>Hard Disk</string>
+                <key>default</key>
+                <true/>
+                <key>media</key>
+                <dict>
+                  <key>hard</key>
+                  <integer>1</integer>
+                </dict>
+              </dict>
+            </array>
+          </dict>
+          <dict>
+            <key>name</key>
+            <string>:cffa_ata: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>cdrom</string>
+                <key>description</key>
+                <string>CD-ROM</string>
+                <key>default</key>
+                <false/>
+                <key>media</key>
+                <dict>
+                  <key>cdrom</key>
+                  <integer>1</integer>
+                </dict>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>hdd</string>
+                <key>description</key>
+                <string>Hard Disk</string>
+                <key>default</key>
+                <false/>
+                <key>media</key>
+                <dict>
+                  <key>hard</key>
+                  <integer>1</integer>
+                </dict>
+              </dict>
+            </array>
+          </dict>
+        </array>
       </dict>
     </array>
+    <key>software</key>
+    <array>
+      <string>apple1.xml</string>
+    </array>
   </dict>
 </plist>

Ample/Resources/apple2c.plist

@@ -6,251 +6,512 @@
     <string>apple2c</string>
     <key>description</key>
     <string>Apple //c</string>
-    <key>ram</key>
-    <array>
-      <dict>
-        <key>value</key>
-        <integer>131072</integer>
-        <key>description</key>
-        <string>128K</string>
-        <key>default</key>
-        <true/>
-      </dict>
-    </array>
     <key>media</key>
     <dict>
-      <key>flop_5_25</key>
-      <integer>2</integer>
     </dict>
     <key>resolution</key>
     <array>
       <integer>560</integer>
       <integer>384</integer>
     </array>
-    <key>gameio</key>
+    <key>slots</key>
     <array>
       <dict>
-        <key>value</key>
-        <string></string>
+        <key>name</key>
+        <string>ramsize</string>
         <key>description</key>
-        <string>—None—</string>
-        <key>default</key>
-        <true/>
+        <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>value</key>
-        <string>joy</string>
+        <key>name</key>
+        <string>smartport</string>
         <key>description</key>
-        <string>Apple II analog joysticks</string>
-        <key>default</key>
-        <false/>
+        <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>value</key>
-        <string>paddles</string>
+        <key>name</key>
+        <string>gameio</string>
         <key>description</key>
-        <string>Apple II paddles</string>
-        <key>default</key>
-        <false/>
+        <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>
+          </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>value</key>
-        <string>compeyes</string>
-        <key>description</key>
-        <string>Digital Vision ComputerEyes</string>
-        <key>default</key>
-        <false/>
-      </dict>
-      <dict>
-        <key>value</key>
-        <string>gizmo</string>
-        <key>description</key>
-        <string>HAL Labs Gizmo</string>
-        <key>default</key>
-        <false/>
-      </dict>
-    </array>
-    <key>printer</key>
-    <array>
-      <dict>
-        <key>value</key>
-        <string></string>
-        <key>description</key>
-        <string>—None—</string>
-        <key>default</key>
-        <true/>
-      </dict>
-      <dict>
-        <key>value</key>
-        <string>ie15</string>
-        <key>description</key>
-        <string>IE15 Terminal</string>
-        <key>default</key>
-        <false/>
-      </dict>
-      <dict>
-        <key>value</key>
-        <string>pty</string>
-        <key>description</key>
-        <string>Pseudo terminal</string>
-        <key>default</key>
-        <false/>
-      </dict>
-      <dict>
-        <key>value</key>
-        <string>loopback</string>
-        <key>description</key>
-        <string>RS232 Loopback</string>
-        <key>default</key>
-        <false/>
-      </dict>
-      <dict>
-        <key>value</key>
-        <string>dec_loopback</string>
-        <key>description</key>
-        <string>RS232 Loopback (DEC 12-15336-00)</string>
-        <key>default</key>
-        <false/>
-      </dict>
-      <dict>
-        <key>value</key>
-        <string>null_modem</string>
-        <key>description</key>
-        <string>RS232 Null Modem</string>
-        <key>default</key>
-        <false/>
-      </dict>
-      <dict>
-        <key>value</key>
-        <string>keyboard</string>
-        <key>description</key>
-        <string>Serial Keyboard</string>
-        <key>default</key>
-        <false/>
-      </dict>
-      <dict>
-        <key>value</key>
+        <key>name</key>
         <string>printer</string>
         <key>description</key>
-        <string>Serial Printer</string>
-        <key>default</key>
-        <false/>
+        <string>Printer</string>
+        <key>options</key>
+        <array>
+          <dict>
+            <key>value</key>
+            <string></string>
+            <key>description</key>
+            <string>—None—</string>
+            <key>default</key>
+            <true/>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>ie15</string>
+            <key>description</key>
+            <string>IE15 Terminal</string>
+            <key>devname</key>
+            <string>ie15_terminal</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>pty</string>
+            <key>description</key>
+            <string>Pseudo terminal</string>
+            <key>devname</key>
+            <string>pseudo_terminal</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>rs_printer</string>
+            <key>description</key>
+            <string>Radio Shack Serial Printer</string>
+            <key>devname</key>
+            <string>rs_serial_printer</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>loopback</string>
+            <key>description</key>
+            <string>RS232 Loopback</string>
+            <key>devname</key>
+            <string>rs232_loopback</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>dec_loopback</string>
+            <key>description</key>
+            <string>RS232 Loopback (DEC 12-15336-00)</string>
+            <key>devname</key>
+            <string>dec_rs232_loopback</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>null_modem</string>
+            <key>description</key>
+            <string>RS232 Null Modem</string>
+            <key>devname</key>
+            <string>null_modem</string>
+            <key>media</key>
+            <dict>
+              <key>bitbanger</key>
+              <integer>1</integer>
+            </dict>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>rs232_sync_io</string>
+            <key>description</key>
+            <string>RS232 Synchronous I/O</string>
+            <key>devname</key>
+            <string>rs232_sync_io</string>
+            <key>media</key>
+            <dict>
+              <key>bitbanger</key>
+              <integer>1</integer>
+            </dict>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>keyboard</string>
+            <key>description</key>
+            <string>Serial Keyboard</string>
+            <key>devname</key>
+            <string>serial_keyboard</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>printer</string>
+            <key>description</key>
+            <string>Serial Printer</string>
+            <key>devname</key>
+            <string>serial_printer</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>terminal</string>
+            <key>description</key>
+            <string>Serial Terminal</string>
+            <key>devname</key>
+            <string>serial_terminal</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>sunkbd</string>
+            <key>description</key>
+            <string>Sun Keyboard Adaptor</string>
+            <key>devname</key>
+            <string>sunkbd_adaptor</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>mockingboard</string>
+            <key>description</key>
+            <string>Sweet Micro Systems Mockingboard D</string>
+            <key>devname</key>
+            <string>mockingboardd</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>swtpc8212</string>
+            <key>description</key>
+            <string>SWTPC8212 Terminal</string>
+            <key>devname</key>
+            <string>swtpc8212_terminal</string>
+          </dict>
+        </array>
       </dict>
       <dict>
-        <key>value</key>
-        <string>terminal</string>
+        <key>name</key>
+        <string>modem</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>swtpc8212</string>
-        <key>description</key>
-        <string>SWTPC8212 Terminal</string>
-        <key>default</key>
-        <false/>
+        <string>Modem</string>
+        <key>options</key>
+        <array>
+          <dict>
+            <key>value</key>
+            <string></string>
+            <key>description</key>
+            <string>—None—</string>
+            <key>default</key>
+            <true/>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>ie15</string>
+            <key>description</key>
+            <string>IE15 Terminal</string>
+            <key>devname</key>
+            <string>ie15_terminal</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>pty</string>
+            <key>description</key>
+            <string>Pseudo terminal</string>
+            <key>devname</key>
+            <string>pseudo_terminal</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>rs_printer</string>
+            <key>description</key>
+            <string>Radio Shack Serial Printer</string>
+            <key>devname</key>
+            <string>rs_serial_printer</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>loopback</string>
+            <key>description</key>
+            <string>RS232 Loopback</string>
+            <key>devname</key>
+            <string>rs232_loopback</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>dec_loopback</string>
+            <key>description</key>
+            <string>RS232 Loopback (DEC 12-15336-00)</string>
+            <key>devname</key>
+            <string>dec_rs232_loopback</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>null_modem</string>
+            <key>description</key>
+            <string>RS232 Null Modem</string>
+            <key>devname</key>
+            <string>null_modem</string>
+            <key>media</key>
+            <dict>
+              <key>bitbanger</key>
+              <integer>1</integer>
+            </dict>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>rs232_sync_io</string>
+            <key>description</key>
+            <string>RS232 Synchronous I/O</string>
+            <key>devname</key>
+            <string>rs232_sync_io</string>
+            <key>media</key>
+            <dict>
+              <key>bitbanger</key>
+              <integer>1</integer>
+            </dict>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>keyboard</string>
+            <key>description</key>
+            <string>Serial Keyboard</string>
+            <key>devname</key>
+            <string>serial_keyboard</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>printer</string>
+            <key>description</key>
+            <string>Serial Printer</string>
+            <key>devname</key>
+            <string>serial_printer</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>terminal</string>
+            <key>description</key>
+            <string>Serial Terminal</string>
+            <key>devname</key>
+            <string>serial_terminal</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>sunkbd</string>
+            <key>description</key>
+            <string>Sun Keyboard Adaptor</string>
+            <key>devname</key>
+            <string>sunkbd_adaptor</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>mockingboard</string>
+            <key>description</key>
+            <string>Sweet Micro Systems Mockingboard D</string>
+            <key>devname</key>
+            <string>mockingboardd</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>swtpc8212</string>
+            <key>description</key>
+            <string>SWTPC8212 Terminal</string>
+            <key>devname</key>
+            <string>swtpc8212_terminal</string>
+          </dict>
+        </array>
       </dict>
     </array>
-    <key>modem</key>
+    <key>devices</key>
     <array>
       <dict>
-        <key>value</key>
-        <string></string>
-        <key>description</key>
-        <string>—None—</string>
-        <key>default</key>
-        <true/>
+        <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>value</key>
-        <string>ie15</string>
-        <key>description</key>
-        <string>IE15 Terminal</string>
-        <key>default</key>
-        <false/>
+        <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>value</key>
-        <string>pty</string>
-        <key>description</key>
-        <string>Pseudo terminal</string>
-        <key>default</key>
-        <false/>
-      </dict>
-      <dict>
-        <key>value</key>
-        <string>loopback</string>
-        <key>description</key>
-        <string>RS232 Loopback</string>
-        <key>default</key>
-        <false/>
-      </dict>
-      <dict>
-        <key>value</key>
-        <string>dec_loopback</string>
-        <key>description</key>
-        <string>RS232 Loopback (DEC 12-15336-00)</string>
-        <key>default</key>
-        <false/>
-      </dict>
-      <dict>
-        <key>value</key>
-        <string>null_modem</string>
-        <key>description</key>
-        <string>RS232 Null Modem</string>
-        <key>default</key>
-        <false/>
-      </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>swtpc8212</string>
-        <key>description</key>
-        <string>SWTPC8212 Terminal</string>
-        <key>default</key>
-        <false/>
+        <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/apple2cp.plist

@@ -6,54 +6,11 @@
     <string>apple2cp</string>
     <key>description</key>
     <string>Apple //c Plus</string>
-    <key>ram</key>
-    <array>
-      <dict>
-        <key>value</key>
-        <integer>131072</integer>
-        <key>description</key>
-        <string>128K</string>
-        <key>default</key>
-        <true/>
-      </dict>
-      <dict>
-        <key>value</key>
-        <integer>393216</integer>
-        <key>description</key>
-        <string>384K</string>
-        <key>default</key>
-        <false/>
-      </dict>
-      <dict>
-        <key>value</key>
-        <integer>655360</integer>
-        <key>description</key>
-        <string>640K</string>
-        <key>default</key>
-        <false/>
-      </dict>
-      <dict>
-        <key>value</key>
-        <integer>917504</integer>
-        <key>description</key>
-        <string>896K</string>
-        <key>default</key>
-        <false/>
-      </dict>
-      <dict>
-        <key>value</key>
-        <integer>1179648</integer>
-        <key>description</key>
-        <string>1152K</string>
-        <key>default</key>
-        <false/>
-      </dict>
-    </array>
     <key>media</key>
     <dict>
-      <key>flop_5_25</key>
+      <key>floppy_5_25</key>
       <integer>2</integer>
-      <key>flop_3_5</key>
+      <key>floppy_3_5</key>
       <integer>2</integer>
     </dict>
     <key>resolution</key>
@@ -61,230 +18,462 @@
       <integer>560</integer>
       <integer>384</integer>
     </array>
-    <key>gameio</key>
+    <key>slots</key>
     <array>
       <dict>
-        <key>value</key>
-        <string></string>
+        <key>name</key>
+        <string>ramsize</string>
         <key>description</key>
-        <string>—None—</string>
-        <key>default</key>
-        <true/>
+        <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>
+          <dict>
+            <key>intValue</key>
+            <integer>393216</integer>
+            <key>description</key>
+            <string>384K</string>
+            <key>value</key>
+            <string>384K</string>
+            <key>default</key>
+            <false/>
+          </dict>
+          <dict>
+            <key>intValue</key>
+            <integer>655360</integer>
+            <key>description</key>
+            <string>640K</string>
+            <key>value</key>
+            <string>640K</string>
+            <key>default</key>
+            <false/>
+          </dict>
+          <dict>
+            <key>intValue</key>
+            <integer>917504</integer>
+            <key>description</key>
+            <string>896K</string>
+            <key>value</key>
+            <string>896K</string>
+            <key>default</key>
+            <false/>
+          </dict>
+          <dict>
+            <key>intValue</key>
+            <integer>1179648</integer>
+            <key>description</key>
+            <string>1152K</string>
+            <key>value</key>
+            <string>1152K</string>
+            <key>default</key>
+            <false/>
+          </dict>
+        </array>
       </dict>
       <dict>
-        <key>value</key>
-        <string>joy</string>
+        <key>name</key>
+        <string>gameio</string>
         <key>description</key>
-        <string>Apple II analog joysticks</string>
-        <key>default</key>
-        <false/>
+        <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>
+          </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>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/>
-      </dict>
-      <dict>
-        <key>value</key>
-        <string>gizmo</string>
-        <key>description</key>
-        <string>HAL Labs Gizmo</string>
-        <key>default</key>
-        <false/>
-      </dict>
-    </array>
-    <key>printer</key>
-    <array>
-      <dict>
-        <key>value</key>
-        <string></string>
-        <key>description</key>
-        <string>—None—</string>
-        <key>default</key>
-        <true/>
-      </dict>
-      <dict>
-        <key>value</key>
-        <string>ie15</string>
-        <key>description</key>
-        <string>IE15 Terminal</string>
-        <key>default</key>
-        <false/>
-      </dict>
-      <dict>
-        <key>value</key>
-        <string>pty</string>
-        <key>description</key>
-        <string>Pseudo terminal</string>
-        <key>default</key>
-        <false/>
-      </dict>
-      <dict>
-        <key>value</key>
-        <string>loopback</string>
-        <key>description</key>
-        <string>RS232 Loopback</string>
-        <key>default</key>
-        <false/>
-      </dict>
-      <dict>
-        <key>value</key>
-        <string>dec_loopback</string>
-        <key>description</key>
-        <string>RS232 Loopback (DEC 12-15336-00)</string>
-        <key>default</key>
-        <false/>
-      </dict>
-      <dict>
-        <key>value</key>
-        <string>null_modem</string>
-        <key>description</key>
-        <string>RS232 Null Modem</string>
-        <key>default</key>
-        <false/>
-      </dict>
-      <dict>
-        <key>value</key>
-        <string>keyboard</string>
-        <key>description</key>
-        <string>Serial Keyboard</string>
-        <key>default</key>
-        <false/>
-      </dict>
-      <dict>
-        <key>value</key>
+        <key>name</key>
         <string>printer</string>
         <key>description</key>
-        <string>Serial Printer</string>
-        <key>default</key>
-        <false/>
+        <string>Printer</string>
+        <key>options</key>
+        <array>
+          <dict>
+            <key>value</key>
+            <string></string>
+            <key>description</key>
+            <string>—None—</string>
+            <key>default</key>
+            <true/>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>ie15</string>
+            <key>description</key>
+            <string>IE15 Terminal</string>
+            <key>devname</key>
+            <string>ie15_terminal</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>pty</string>
+            <key>description</key>
+            <string>Pseudo terminal</string>
+            <key>devname</key>
+            <string>pseudo_terminal</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>rs_printer</string>
+            <key>description</key>
+            <string>Radio Shack Serial Printer</string>
+            <key>devname</key>
+            <string>rs_serial_printer</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>loopback</string>
+            <key>description</key>
+            <string>RS232 Loopback</string>
+            <key>devname</key>
+            <string>rs232_loopback</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>dec_loopback</string>
+            <key>description</key>
+            <string>RS232 Loopback (DEC 12-15336-00)</string>
+            <key>devname</key>
+            <string>dec_rs232_loopback</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>null_modem</string>
+            <key>description</key>
+            <string>RS232 Null Modem</string>
+            <key>devname</key>
+            <string>null_modem</string>
+            <key>media</key>
+            <dict>
+              <key>bitbanger</key>
+              <integer>1</integer>
+            </dict>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>rs232_sync_io</string>
+            <key>description</key>
+            <string>RS232 Synchronous I/O</string>
+            <key>devname</key>
+            <string>rs232_sync_io</string>
+            <key>media</key>
+            <dict>
+              <key>bitbanger</key>
+              <integer>1</integer>
+            </dict>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>keyboard</string>
+            <key>description</key>
+            <string>Serial Keyboard</string>
+            <key>devname</key>
+            <string>serial_keyboard</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>printer</string>
+            <key>description</key>
+            <string>Serial Printer</string>
+            <key>devname</key>
+            <string>serial_printer</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>terminal</string>
+            <key>description</key>
+            <string>Serial Terminal</string>
+            <key>devname</key>
+            <string>serial_terminal</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>sunkbd</string>
+            <key>description</key>
+            <string>Sun Keyboard Adaptor</string>
+            <key>devname</key>
+            <string>sunkbd_adaptor</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>mockingboard</string>
+            <key>description</key>
+            <string>Sweet Micro Systems Mockingboard D</string>
+            <key>devname</key>
+            <string>mockingboardd</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>swtpc8212</string>
+            <key>description</key>
+            <string>SWTPC8212 Terminal</string>
+            <key>devname</key>
+            <string>swtpc8212_terminal</string>
+          </dict>
+        </array>
       </dict>
       <dict>
-        <key>value</key>
-        <string>terminal</string>
+        <key>name</key>
+        <string>modem</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>swtpc8212</string>
-        <key>description</key>
-        <string>SWTPC8212 Terminal</string>
-        <key>default</key>
-        <false/>
+        <string>Modem</string>
+        <key>options</key>
+        <array>
+          <dict>
+            <key>value</key>
+            <string></string>
+            <key>description</key>
+            <string>—None—</string>
+            <key>default</key>
+            <true/>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>ie15</string>
+            <key>description</key>
+            <string>IE15 Terminal</string>
+            <key>devname</key>
+            <string>ie15_terminal</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>pty</string>
+            <key>description</key>
+            <string>Pseudo terminal</string>
+            <key>devname</key>
+            <string>pseudo_terminal</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>rs_printer</string>
+            <key>description</key>
+            <string>Radio Shack Serial Printer</string>
+            <key>devname</key>
+            <string>rs_serial_printer</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>loopback</string>
+            <key>description</key>
+            <string>RS232 Loopback</string>
+            <key>devname</key>
+            <string>rs232_loopback</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>dec_loopback</string>
+            <key>description</key>
+            <string>RS232 Loopback (DEC 12-15336-00)</string>
+            <key>devname</key>
+            <string>dec_rs232_loopback</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>null_modem</string>
+            <key>description</key>
+            <string>RS232 Null Modem</string>
+            <key>devname</key>
+            <string>null_modem</string>
+            <key>media</key>
+            <dict>
+              <key>bitbanger</key>
+              <integer>1</integer>
+            </dict>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>rs232_sync_io</string>
+            <key>description</key>
+            <string>RS232 Synchronous I/O</string>
+            <key>devname</key>
+            <string>rs232_sync_io</string>
+            <key>media</key>
+            <dict>
+              <key>bitbanger</key>
+              <integer>1</integer>
+            </dict>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>keyboard</string>
+            <key>description</key>
+            <string>Serial Keyboard</string>
+            <key>devname</key>
+            <string>serial_keyboard</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>printer</string>
+            <key>description</key>
+            <string>Serial Printer</string>
+            <key>devname</key>
+            <string>serial_printer</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>terminal</string>
+            <key>description</key>
+            <string>Serial Terminal</string>
+            <key>devname</key>
+            <string>serial_terminal</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>sunkbd</string>
+            <key>description</key>
+            <string>Sun Keyboard Adaptor</string>
+            <key>devname</key>
+            <string>sunkbd_adaptor</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>mockingboard</string>
+            <key>description</key>
+            <string>Sweet Micro Systems Mockingboard D</string>
+            <key>devname</key>
+            <string>mockingboardd</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>swtpc8212</string>
+            <key>description</key>
+            <string>SWTPC8212 Terminal</string>
+            <key>devname</key>
+            <string>swtpc8212_terminal</string>
+          </dict>
+        </array>
       </dict>
     </array>
-    <key>modem</key>
+    <key>devices</key>
     <array>
       <dict>
-        <key>value</key>
-        <string></string>
-        <key>description</key>
-        <string>—None—</string>
-        <key>default</key>
-        <true/>
+        <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>value</key>
-        <string>ie15</string>
-        <key>description</key>
-        <string>IE15 Terminal</string>
-        <key>default</key>
-        <false/>
-      </dict>
-      <dict>
-        <key>value</key>
-        <string>pty</string>
-        <key>description</key>
-        <string>Pseudo terminal</string>
-        <key>default</key>
-        <false/>
-      </dict>
-      <dict>
-        <key>value</key>
-        <string>loopback</string>
-        <key>description</key>
-        <string>RS232 Loopback</string>
-        <key>default</key>
-        <false/>
-      </dict>
-      <dict>
-        <key>value</key>
-        <string>dec_loopback</string>
-        <key>description</key>
-        <string>RS232 Loopback (DEC 12-15336-00)</string>
-        <key>default</key>
-        <false/>
-      </dict>
-      <dict>
-        <key>value</key>
-        <string>null_modem</string>
-        <key>description</key>
-        <string>RS232 Null Modem</string>
-        <key>default</key>
-        <false/>
-      </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>swtpc8212</string>
-        <key>description</key>
-        <string>SWTPC8212 Terminal</string>
-        <key>default</key>
-        <false/>
+        <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/las128e2.plist

@@ -6,52 +6,9 @@
     <string>las128e2</string>
     <key>description</key>
     <string>Laser 128ex2 (version 6.1)</string>
-    <key>ram</key>
-    <array>
-      <dict>
-        <key>value</key>
-        <integer>131072</integer>
-        <key>description</key>
-        <string>128K</string>
-        <key>default</key>
-        <true/>
-      </dict>
-      <dict>
-        <key>value</key>
-        <integer>393216</integer>
-        <key>description</key>
-        <string>384K</string>
-        <key>default</key>
-        <false/>
-      </dict>
-      <dict>
-        <key>value</key>
-        <integer>655360</integer>
-        <key>description</key>
-        <string>640K</string>
-        <key>default</key>
-        <false/>
-      </dict>
-      <dict>
-        <key>value</key>
-        <integer>917504</integer>
-        <key>description</key>
-        <string>896K</string>
-        <key>default</key>
-        <false/>
-      </dict>
-      <dict>
-        <key>value</key>
-        <integer>1179648</integer>
-        <key>description</key>
-        <string>1152K</string>
-        <key>default</key>
-        <false/>
-      </dict>
-    </array>
     <key>media</key>
     <dict>
-      <key>flop_5_25</key>
+      <key>floppy_5_25</key>
       <integer>2</integer>
     </dict>
     <key>resolution</key>
@@ -59,230 +16,462 @@
       <integer>560</integer>
       <integer>384</integer>
     </array>
-    <key>gameio</key>
+    <key>slots</key>
     <array>
       <dict>
-        <key>value</key>
-        <string></string>
+        <key>name</key>
+        <string>ramsize</string>
         <key>description</key>
-        <string>—None—</string>
-        <key>default</key>
-        <true/>
+        <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>
+          <dict>
+            <key>intValue</key>
+            <integer>393216</integer>
+            <key>description</key>
+            <string>384K</string>
+            <key>value</key>
+            <string>384K</string>
+            <key>default</key>
+            <false/>
+          </dict>
+          <dict>
+            <key>intValue</key>
+            <integer>655360</integer>
+            <key>description</key>
+            <string>640K</string>
+            <key>value</key>
+            <string>640K</string>
+            <key>default</key>
+            <false/>
+          </dict>
+          <dict>
+            <key>intValue</key>
+            <integer>917504</integer>
+            <key>description</key>
+            <string>896K</string>
+            <key>value</key>
+            <string>896K</string>
+            <key>default</key>
+            <false/>
+          </dict>
+          <dict>
+            <key>intValue</key>
+            <integer>1179648</integer>
+            <key>description</key>
+            <string>1152K</string>
+            <key>value</key>
+            <string>1152K</string>
+            <key>default</key>
+            <false/>
+          </dict>
+        </array>
       </dict>
       <dict>
-        <key>value</key>
-        <string>joy</string>
+        <key>name</key>
+        <string>gameio</string>
         <key>description</key>
-        <string>Apple II analog joysticks</string>
-        <key>default</key>
-        <false/>
+        <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>
+          </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>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/>
-      </dict>
-      <dict>
-        <key>value</key>
-        <string>gizmo</string>
-        <key>description</key>
-        <string>HAL Labs Gizmo</string>
-        <key>default</key>
-        <false/>
-      </dict>
-    </array>
-    <key>printer</key>
-    <array>
-      <dict>
-        <key>value</key>
-        <string></string>
-        <key>description</key>
-        <string>—None—</string>
-        <key>default</key>
-        <true/>
-      </dict>
-      <dict>
-        <key>value</key>
-        <string>ie15</string>
-        <key>description</key>
-        <string>IE15 Terminal</string>
-        <key>default</key>
-        <false/>
-      </dict>
-      <dict>
-        <key>value</key>
-        <string>pty</string>
-        <key>description</key>
-        <string>Pseudo terminal</string>
-        <key>default</key>
-        <false/>
-      </dict>
-      <dict>
-        <key>value</key>
-        <string>loopback</string>
-        <key>description</key>
-        <string>RS232 Loopback</string>
-        <key>default</key>
-        <false/>
-      </dict>
-      <dict>
-        <key>value</key>
-        <string>dec_loopback</string>
-        <key>description</key>
-        <string>RS232 Loopback (DEC 12-15336-00)</string>
-        <key>default</key>
-        <false/>
-      </dict>
-      <dict>
-        <key>value</key>
-        <string>null_modem</string>
-        <key>description</key>
-        <string>RS232 Null Modem</string>
-        <key>default</key>
-        <false/>
-      </dict>
-      <dict>
-        <key>value</key>
-        <string>keyboard</string>
-        <key>description</key>
-        <string>Serial Keyboard</string>
-        <key>default</key>
-        <false/>
-      </dict>
-      <dict>
-        <key>value</key>
+        <key>name</key>
         <string>printer</string>
         <key>description</key>
-        <string>Serial Printer</string>
-        <key>default</key>
-        <false/>
+        <string>Printer</string>
+        <key>options</key>
+        <array>
+          <dict>
+            <key>value</key>
+            <string></string>
+            <key>description</key>
+            <string>—None—</string>
+            <key>default</key>
+            <true/>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>ie15</string>
+            <key>description</key>
+            <string>IE15 Terminal</string>
+            <key>devname</key>
+            <string>ie15_terminal</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>pty</string>
+            <key>description</key>
+            <string>Pseudo terminal</string>
+            <key>devname</key>
+            <string>pseudo_terminal</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>rs_printer</string>
+            <key>description</key>
+            <string>Radio Shack Serial Printer</string>
+            <key>devname</key>
+            <string>rs_serial_printer</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>loopback</string>
+            <key>description</key>
+            <string>RS232 Loopback</string>
+            <key>devname</key>
+            <string>rs232_loopback</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>dec_loopback</string>
+            <key>description</key>
+            <string>RS232 Loopback (DEC 12-15336-00)</string>
+            <key>devname</key>
+            <string>dec_rs232_loopback</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>null_modem</string>
+            <key>description</key>
+            <string>RS232 Null Modem</string>
+            <key>devname</key>
+            <string>null_modem</string>
+            <key>media</key>
+            <dict>
+              <key>bitbanger</key>
+              <integer>1</integer>
+            </dict>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>rs232_sync_io</string>
+            <key>description</key>
+            <string>RS232 Synchronous I/O</string>
+            <key>devname</key>
+            <string>rs232_sync_io</string>
+            <key>media</key>
+            <dict>
+              <key>bitbanger</key>
+              <integer>1</integer>
+            </dict>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>keyboard</string>
+            <key>description</key>
+            <string>Serial Keyboard</string>
+            <key>devname</key>
+            <string>serial_keyboard</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>printer</string>
+            <key>description</key>
+            <string>Serial Printer</string>
+            <key>devname</key>
+            <string>serial_printer</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>terminal</string>
+            <key>description</key>
+            <string>Serial Terminal</string>
+            <key>devname</key>
+            <string>serial_terminal</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>sunkbd</string>
+            <key>description</key>
+            <string>Sun Keyboard Adaptor</string>
+            <key>devname</key>
+            <string>sunkbd_adaptor</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>mockingboard</string>
+            <key>description</key>
+            <string>Sweet Micro Systems Mockingboard D</string>
+            <key>devname</key>
+            <string>mockingboardd</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>swtpc8212</string>
+            <key>description</key>
+            <string>SWTPC8212 Terminal</string>
+            <key>devname</key>
+            <string>swtpc8212_terminal</string>
+          </dict>
+        </array>
       </dict>
       <dict>
-        <key>value</key>
-        <string>terminal</string>
+        <key>name</key>
+        <string>modem</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>swtpc8212</string>
-        <key>description</key>
-        <string>SWTPC8212 Terminal</string>
-        <key>default</key>
-        <false/>
+        <string>Modem</string>
+        <key>options</key>
+        <array>
+          <dict>
+            <key>value</key>
+            <string></string>
+            <key>description</key>
+            <string>—None—</string>
+            <key>default</key>
+            <true/>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>ie15</string>
+            <key>description</key>
+            <string>IE15 Terminal</string>
+            <key>devname</key>
+            <string>ie15_terminal</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>pty</string>
+            <key>description</key>
+            <string>Pseudo terminal</string>
+            <key>devname</key>
+            <string>pseudo_terminal</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>rs_printer</string>
+            <key>description</key>
+            <string>Radio Shack Serial Printer</string>
+            <key>devname</key>
+            <string>rs_serial_printer</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>loopback</string>
+            <key>description</key>
+            <string>RS232 Loopback</string>
+            <key>devname</key>
+            <string>rs232_loopback</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>dec_loopback</string>
+            <key>description</key>
+            <string>RS232 Loopback (DEC 12-15336-00)</string>
+            <key>devname</key>
+            <string>dec_rs232_loopback</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>null_modem</string>
+            <key>description</key>
+            <string>RS232 Null Modem</string>
+            <key>devname</key>
+            <string>null_modem</string>
+            <key>media</key>
+            <dict>
+              <key>bitbanger</key>
+              <integer>1</integer>
+            </dict>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>rs232_sync_io</string>
+            <key>description</key>
+            <string>RS232 Synchronous I/O</string>
+            <key>devname</key>
+            <string>rs232_sync_io</string>
+            <key>media</key>
+            <dict>
+              <key>bitbanger</key>
+              <integer>1</integer>
+            </dict>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>keyboard</string>
+            <key>description</key>
+            <string>Serial Keyboard</string>
+            <key>devname</key>
+            <string>serial_keyboard</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>printer</string>
+            <key>description</key>
+            <string>Serial Printer</string>
+            <key>devname</key>
+            <string>serial_printer</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>terminal</string>
+            <key>description</key>
+            <string>Serial Terminal</string>
+            <key>devname</key>
+            <string>serial_terminal</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>sunkbd</string>
+            <key>description</key>
+            <string>Sun Keyboard Adaptor</string>
+            <key>devname</key>
+            <string>sunkbd_adaptor</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>mockingboard</string>
+            <key>description</key>
+            <string>Sweet Micro Systems Mockingboard D</string>
+            <key>devname</key>
+            <string>mockingboardd</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>swtpc8212</string>
+            <key>description</key>
+            <string>SWTPC8212 Terminal</string>
+            <key>devname</key>
+            <string>swtpc8212_terminal</string>
+          </dict>
+        </array>
       </dict>
     </array>
-    <key>modem</key>
+    <key>devices</key>
     <array>
       <dict>
-        <key>value</key>
-        <string></string>
-        <key>description</key>
-        <string>—None—</string>
-        <key>default</key>
-        <true/>
+        <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>value</key>
-        <string>ie15</string>
-        <key>description</key>
-        <string>IE15 Terminal</string>
-        <key>default</key>
-        <false/>
-      </dict>
-      <dict>
-        <key>value</key>
-        <string>pty</string>
-        <key>description</key>
-        <string>Pseudo terminal</string>
-        <key>default</key>
-        <false/>
-      </dict>
-      <dict>
-        <key>value</key>
-        <string>loopback</string>
-        <key>description</key>
-        <string>RS232 Loopback</string>
-        <key>default</key>
-        <false/>
-      </dict>
-      <dict>
-        <key>value</key>
-        <string>dec_loopback</string>
-        <key>description</key>
-        <string>RS232 Loopback (DEC 12-15336-00)</string>
-        <key>default</key>
-        <false/>
-      </dict>
-      <dict>
-        <key>value</key>
-        <string>null_modem</string>
-        <key>description</key>
-        <string>RS232 Null Modem</string>
-        <key>default</key>
-        <false/>
-      </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>swtpc8212</string>
-        <key>description</key>
-        <string>SWTPC8212 Terminal</string>
-        <key>default</key>
-        <false/>
+        <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/mac128k.plist

@@ -0,0 +1,370 @@
+<?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>mac128k</string>
+    <key>description</key>
+    <string>Macintosh 128k</string>
+    <key>media</key>
+    <dict>
+    </dict>
+    <key>resolution</key>
+    <array>
+      <integer>512</integer>
+      <integer>342</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>
+    </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>
+                <false/>
+                <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>
+                <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>
+                <false/>
+              </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>
+              <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>
+                <true/>
+                <key>media</key>
+                <dict>
+                  <key>floppy_3_5</key>
+                  <integer>1</integer>
+                </dict>
+              </dict>
+            </array>
+          </dict>
+        </array>
+      </dict>
+      <dict>
+        <key>name</key>
+        <string>mackbd_m0120</string>
+        <key>slots</key>
+        <array>
+          <dict>
+            <key>name</key>
+            <string>:kbd</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>gb</string>
+                <key>description</key>
+                <string>Macintosh Keyboard (British - M0110B)</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>fr</string>
+                <key>description</key>
+                <string>Macintosh Keyboard (French - M0110F)</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>it</string>
+                <key>description</key>
+                <string>Macintosh Keyboard (Italian - M0110T)</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>us</string>
+                <key>description</key>
+                <string>Macintosh Keyboard (U.S. - M0110)</string>
+                <key>default</key>
+                <true/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>pad</string>
+                <key>description</key>
+                <string>Macintosh Numeric Keypad (English - M0120)</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>eupad</string>
+                <key>description</key>
+                <string>Macintosh Numeric Keypad (European - M0120P)</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>frp</string>
+                <key>description</key>
+                <string>Macintosh Plus Keyboard (French - M0110A F)</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>jpp</string>
+                <key>description</key>
+                <string>Macintosh Plus Keyboard (Japanese - M0110A J)</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>usp</string>
+                <key>description</key>
+                <string>Macintosh Plus Keyboard (U.S. - M0110A)</string>
+                <key>default</key>
+                <false/>
+              </dict>
+            </array>
+          </dict>
+        </array>
+      </dict>
+      <dict>
+        <key>name</key>
+        <string>mackbd_m0120p</string>
+        <key>slots</key>
+        <array>
+          <dict>
+            <key>name</key>
+            <string>:kbd</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>gb</string>
+                <key>description</key>
+                <string>Macintosh Keyboard (British - M0110B)</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>fr</string>
+                <key>description</key>
+                <string>Macintosh Keyboard (French - M0110F)</string>
+                <key>default</key>
+                <true/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>it</string>
+                <key>description</key>
+                <string>Macintosh Keyboard (Italian - M0110T)</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>us</string>
+                <key>description</key>
+                <string>Macintosh Keyboard (U.S. - M0110)</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>pad</string>
+                <key>description</key>
+                <string>Macintosh Numeric Keypad (English - M0120)</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>eupad</string>
+                <key>description</key>
+                <string>Macintosh Numeric Keypad (European - M0120P)</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>frp</string>
+                <key>description</key>
+                <string>Macintosh Plus Keyboard (French - M0110A F)</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>jpp</string>
+                <key>description</key>
+                <string>Macintosh Plus Keyboard (Japanese - M0110A J)</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>usp</string>
+                <key>description</key>
+                <string>Macintosh Plus Keyboard (U.S. - M0110A)</string>
+                <key>default</key>
+                <false/>
+              </dict>
+            </array>
+          </dict>
+        </array>
+      </dict>
+    </array>
+    <key>software</key>
+    <array>
+      <string>mac_flop.xml</string>
+      <string>mac_hdd.xml</string>
+    </array>
+  </dict>
+</plist>

Ample/Resources/mac512k.plist

@@ -0,0 +1,370 @@
+<?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>mac512k</string>
+    <key>description</key>
+    <string>Macintosh 512k</string>
+    <key>media</key>
+    <dict>
+    </dict>
+    <key>resolution</key>
+    <array>
+      <integer>512</integer>
+      <integer>342</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>524288</integer>
+            <key>description</key>
+            <string>512K</string>
+            <key>value</key>
+            <string>512K</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>
+    </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>
+                <false/>
+                <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>
+                <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>
+                <false/>
+              </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>
+              <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>
+                <true/>
+                <key>media</key>
+                <dict>
+                  <key>floppy_3_5</key>
+                  <integer>1</integer>
+                </dict>
+              </dict>
+            </array>
+          </dict>
+        </array>
+      </dict>
+      <dict>
+        <key>name</key>
+        <string>mackbd_m0120</string>
+        <key>slots</key>
+        <array>
+          <dict>
+            <key>name</key>
+            <string>:kbd</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>gb</string>
+                <key>description</key>
+                <string>Macintosh Keyboard (British - M0110B)</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>fr</string>
+                <key>description</key>
+                <string>Macintosh Keyboard (French - M0110F)</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>it</string>
+                <key>description</key>
+                <string>Macintosh Keyboard (Italian - M0110T)</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>us</string>
+                <key>description</key>
+                <string>Macintosh Keyboard (U.S. - M0110)</string>
+                <key>default</key>
+                <true/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>pad</string>
+                <key>description</key>
+                <string>Macintosh Numeric Keypad (English - M0120)</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>eupad</string>
+                <key>description</key>
+                <string>Macintosh Numeric Keypad (European - M0120P)</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>frp</string>
+                <key>description</key>
+                <string>Macintosh Plus Keyboard (French - M0110A F)</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>jpp</string>
+                <key>description</key>
+                <string>Macintosh Plus Keyboard (Japanese - M0110A J)</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>usp</string>
+                <key>description</key>
+                <string>Macintosh Plus Keyboard (U.S. - M0110A)</string>
+                <key>default</key>
+                <false/>
+              </dict>
+            </array>
+          </dict>
+        </array>
+      </dict>
+      <dict>
+        <key>name</key>
+        <string>mackbd_m0120p</string>
+        <key>slots</key>
+        <array>
+          <dict>
+            <key>name</key>
+            <string>:kbd</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>gb</string>
+                <key>description</key>
+                <string>Macintosh Keyboard (British - M0110B)</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>fr</string>
+                <key>description</key>
+                <string>Macintosh Keyboard (French - M0110F)</string>
+                <key>default</key>
+                <true/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>it</string>
+                <key>description</key>
+                <string>Macintosh Keyboard (Italian - M0110T)</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>us</string>
+                <key>description</key>
+                <string>Macintosh Keyboard (U.S. - M0110)</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>pad</string>
+                <key>description</key>
+                <string>Macintosh Numeric Keypad (English - M0120)</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>eupad</string>
+                <key>description</key>
+                <string>Macintosh Numeric Keypad (European - M0120P)</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>frp</string>
+                <key>description</key>
+                <string>Macintosh Plus Keyboard (French - M0110A F)</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>jpp</string>
+                <key>description</key>
+                <string>Macintosh Plus Keyboard (Japanese - M0110A J)</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>usp</string>
+                <key>description</key>
+                <string>Macintosh Plus Keyboard (U.S. - M0110A)</string>
+                <key>default</key>
+                <false/>
+              </dict>
+            </array>
+          </dict>
+        </array>
+      </dict>
+    </array>
+    <key>software</key>
+    <array>
+      <string>mac_flop.xml</string>
+      <string>mac_hdd.xml</string>
+    </array>
+  </dict>
+</plist>