build 27 was 241-1, bump to 28

keep file size (will display later)

Ample.xcodeproj/project.pbxproj

@@ -1602,7 +1602,7 @@
 				CODE_SIGN_ENTITLEMENTS = Ample/Ample.entitlements;
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 26;
+				CURRENT_PROJECT_VERSION = 28;
 				ENABLE_HARDENED_RUNTIME = YES;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -1613,7 +1613,7 @@
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				MARKETING_VERSION = 0.241;
+				MARKETING_VERSION = 0.242;
 				PRODUCT_BUNDLE_IDENTIFIER = com.ksherlock.ample;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
@@ -1626,7 +1626,7 @@
 				CODE_SIGN_ENTITLEMENTS = Ample/Ample.entitlements;
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 26;
+				CURRENT_PROJECT_VERSION = 28;
 				ENABLE_HARDENED_RUNTIME = YES;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -1637,7 +1637,7 @@
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				MARKETING_VERSION = 0.241;
+				MARKETING_VERSION = 0.242;
 				PRODUCT_BUNDLE_IDENTIFIER = com.ksherlock.ample;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};

Ample/Base.lproj/DownloadWindow.xib

@@ -298,6 +298,12 @@
                         <action selector="showInFinder:" target="-2" id="ltL-yL-7EP"/>
                     </connections>
                 </menuItem>
+                <menuItem title="Move to Trash" id="x1Q-OF-5hM">
+                    <modifierMask key="keyEquivalentModifierMask"/>
+                    <connections>
+                        <action selector="moveToTrash:" target="-2" id="swr-yf-hA2"/>
+                    </connections>
+                </menuItem>
                 <menuItem title="Download" tag="2" id="ree-Zg-jYB">
                     <modifierMask key="keyEquivalentModifierMask"/>
                     <connections>

Ample/Base.lproj/MainMenu.xib

@@ -16,6 +16,7 @@
         <customObject id="rSq-qV-SGy" customClass="BookmarkManager">
             <connections>
                 <outlet property="menu" destination="ha0-nx-PIl" id="Ozd-ID-egK"/>
+                <outlet property="updateMenuItem" destination="30b-vT-HIa" id="AgZ-LE-no6"/>
             </connections>
         </customObject>
         <customObject id="Voe-Tx-rLC" customClass="AppDelegate">
@@ -416,6 +417,11 @@
                                     <action selector="addBookmark:" target="-1" id="cqp-ko-BfQ"/>
                                 </connections>
                             </menuItem>
+                            <menuItem title="Update Bookmark" keyEquivalent="D" id="30b-vT-HIa">
+                                <connections>
+                                    <action selector="updateBookmark:" target="-1" id="Au0-Sp-cUD"/>
+                                </connections>
+                            </menuItem>
                             <menuItem title="Set Default" hidden="YES" id="vbR-vS-lqO">
                                 <modifierMask key="keyEquivalentModifierMask"/>
                                 <connections>

Ample/BookmarkManager.h

@@ -10,6 +10,7 @@
 #import <CoreData/CoreData.h>
 
 @class NSMenu;
+@class NSMenuItem;
 @class Bookmark;
 @class DiskImage;
 
@@ -18,8 +19,11 @@ NS_ASSUME_NONNULL_BEGIN
 @interface BookmarkManager : NSObject
 
 @property (weak) IBOutlet NSMenu *menu;
+@property (weak) IBOutlet NSMenuItem *updateMenuItem;
 @property (readonly) NSManagedObjectContext *managedObjectContext;
 
+@property (nullable) Bookmark *currentBookmark;
+
 +(instancetype)sharedManager;
 
 -(NSString *)uniqueBookmarkName: (NSString *)name;
@@ -28,13 +32,13 @@ NS_ASSUME_NONNULL_BEGIN
 
 //-(NSError *)saveDefault: (NSDictionary *)bookmark;
 
+-(Bookmark *)defaultBookmark;
 -(NSDictionary *)loadDefault;
 
 -(NSError *)setAutomatic: (Bookmark *)bookmark;
 
 -(BOOL)addDiskImage: (NSObject *)pathOrURL;
 
-
 //-(void)convertLegacyBookmarks;
 @end
 

Ample/BookmarkManager.m

@@ -28,6 +28,8 @@
     NSArrayController *_items;
     NSUInteger _newMenuGeneration;
     NSUInteger _currentMenuGeneration;
+    
+    Bookmark *_currentBookmark;
 }
 
 @end
@@ -235,20 +237,22 @@ static BookmarkManager *singleton = nil;
 }
 
 
--(NSDictionary *)loadDefault {
+-(Bookmark *)defaultBookmark {
+
     NSFetchRequest *req;
     NSError *error;
     NSArray *array;
-    Bookmark *b;
 
     req = [Bookmark fetchRequest];
     [req setPredicate: [NSPredicate predicateWithFormat: @"automatic == TRUE"]];
     array = [_moc executeFetchRequest: req error: &error];
 
-    b = [array firstObject];
-    
-    return [b dictionary];
+    return [array firstObject];
+}
 
+-(NSDictionary *)loadDefault {
+    Bookmark *b = [self defaultBookmark];
+    return [b dictionary];
 }
 
 /* save as .Default */
@@ -557,17 +561,37 @@ static NSString *kMenuContext = @"";
 {
 }
 
+-(Bookmark *)currentBookmark {
+    return _currentBookmark;
+}
+-(void)setCurrentBookmark:(Bookmark *)currentBookmark {
+    if (currentBookmark == _currentBookmark) return;
+    _currentBookmark = currentBookmark;
+    _newMenuGeneration++;
+}
+
 -(void)menuNeedsUpdate:(NSMenu *)menu {
     
     if (_currentMenuGeneration == _newMenuGeneration) return;
     _currentMenuGeneration = _newMenuGeneration;
+
+    if (_currentBookmark && _updateMenuItem) {
+        NSString *title = [NSString stringWithFormat: @"Update “%@”", [_currentBookmark name]];
+        [_updateMenuItem setHidden: NO];
+        [_updateMenuItem setTitle: title];
+        [_updateMenuItem setRepresentedObject: _currentBookmark];
+    } else {
+        [_updateMenuItem setHidden: YES];
+        [_updateMenuItem setRepresentedObject: nil];
+    }
+    
     
 
     NSArray *menus = [menu itemArray];
     for (NSMenuItem *item in [menus reverseObjectEnumerator]) {
         if ([item tag] == 0xdeadbeef) [_menu removeItem: item];
     }
-    
+
     NSArray *array = [_items arrangedObjects];
     for (Bookmark *b in array) {
 

Ample/Defaults.plist

@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>MameComponentsDate</key>
-	<date>2022-02-23T17:00:00Z</date>
+	<date>2022-04-01T16:00:00Z</date>
 	<key>UseCustomMame</key>
 	<false/>
 	<key>AutoCloseLogWindow</key>

Ample/DownloadWindowController.m

@@ -11,6 +11,9 @@
 #import "Menu.h"
 
 
+static NSString *Extensions[] = { @"zip", @"7z" };
+
+
 enum {
     kTagZip = 1,
     kTag7z = 2,
@@ -90,6 +93,7 @@ enum {
 
 @property NSUInteger status;
 @property NSUInteger index;
+@property NSUInteger fileSize;
 
 @property (readonly) NSColor *titleColor;
 @property (readonly) NSColor *descriptionColor;
@@ -99,6 +103,8 @@ enum {
 -(void)beginDownloadWithTask:(NSURLSessionDownloadTask *)task;
 -(void)completeWithError: (NSError *)error;
 -(NSString *)statusDescription;
+
+-(void)refresh: (NSURL *)localURL;
 @end
 
 
@@ -135,7 +141,7 @@ enum {
 @end
 
 @implementation DownloadWindowController {
-    
+
     NSArray *_items;
     NSURL *_romFolder;
     NSURL *_defaultDownloadURL;
@@ -144,7 +150,7 @@ enum {
     NSURLSession *_session;
     NSMutableDictionary *_taskIndex;
     NSUserDefaults *_defaults;
-    
+
     NSArray<NSButton *> *_filterButtons;
 }
 
@@ -168,7 +174,7 @@ enum {
 
 #if 0
 - (void)encodeWithCoder:(nonnull NSCoder *)coder {
-    
+
 }
 #endif
 
@@ -178,11 +184,11 @@ enum {
 
 -(void)windowWillLoad {
     _defaults = [NSUserDefaults standardUserDefaults];
-    
+
     // set here so binding works.
     NSString *s = [_defaults stringForKey: kDownloadExtension];
     if (![s length]) s = [_defaults stringForKey: kDefaultDownloadExtension];
-    
+
     _downloadExtension = s;
 }
 
@@ -194,12 +200,12 @@ enum {
     [window setRestorable: YES];
     [window setRestorationClass: [self class]];
 #endif
-    
+
     _filterButtons = @[
         _allFilterButton,
         _missingFilterButton
     ];
-    
+
 
     // Implement this method to handle any initialization after your window controller's window has been loaded from its nib file.
 
@@ -208,20 +214,20 @@ enum {
     NSFileManager *fm = [NSFileManager defaultManager];
 
     NSURL *url = [bundle URLForResource: @"roms" withExtension: @"plist"];
-    
+
     NSArray *roms = [NSArray arrayWithContentsOfURL: url];
-    
+
     NSURL *sd = SupportDirectory();
 
     _romFolder = [sd URLByAppendingPathComponent: @"roms"];
-    
+
     [fm createDirectoryAtURL: _romFolder withIntermediateDirectories: YES attributes: nil error: &error];
 
     // so blank URL isn't overwritten.
     NSString *s = [_defaults stringForKey: kDefaultDownloadURL];
     _defaultDownloadURL = [NSURL URLWithString: s];
     [_downloadField setPlaceholderString: s];
-    
+
     s = [_defaults stringForKey: kDownloadURL];
     if ([s length]) {
         [_downloadField setStringValue: s];
@@ -229,20 +235,20 @@ enum {
     } else {
         _downloadURL = _defaultDownloadURL;
     }
-    
+
     [self initializeExtensionMenu];
-    
+
 
     [self setCurrentROM: @""];
     [self setCurrentCount: 0];
     [self setTotalCount: [roms count]];
     [self setErrorCount: 0];
-    
+
 
     NSMutableArray *tmp = [NSMutableArray arrayWithCapacity: [roms count]];
     unsigned ix = 0;
     for (NSDictionary *d in roms) {
-        
+
         DownloadItem *item  = [DownloadItem new];
         [item setValue: [d objectForKey: @"value"]];
         [item setName: [d objectForKey: @"description"]];
@@ -258,7 +264,7 @@ enum {
     NSURLSessionConfiguration *config = [NSURLSessionConfiguration defaultSessionConfiguration];
     _session = [NSURLSession sessionWithConfiguration: config delegate: self delegateQueue: nil];
     _taskIndex = [NSMutableDictionary dictionaryWithCapacity: [_items count]];
-    
+
     //[self download];
 }
 
@@ -267,13 +273,13 @@ enum {
 #if 0
 -(void)validateURL: (NSString *)url {
     NSURL *v;
-    
+
     if (![url length]) {
         _effectiveURL = [NSURL URLWithString: _downloadURL];
         [_downloadField setTextColor: nil];
         return;
     }
-    
+
     v = [NSURL URLWithString: url];
     if (v) {
         _effectiveURL = v;
@@ -291,36 +297,36 @@ enum {
         NSURLSessionConfiguration *config = [NSURLSessionConfiguration defaultSessionConfiguration];
         _session = [NSURLSession sessionWithConfiguration: config delegate: self delegateQueue: nil];
     }
-    
+
     NSURLSessionDownloadTask *task;
     NSString *s = [item value];
     NSString *path = [s stringByAppendingPathExtension: _downloadExtension];
     NSURL *url = [_downloadURL URLByAppendingPathComponent: path];
-    
+
     task = [_session downloadTaskWithURL: url];
-    
+
     [item beginDownloadWithTask: task];
     [_taskIndex setObject: item forKey: task];
 
     [task resume];
-    
+
 }
 
 -(void)download {
-    
+
     // run in thread?
     //unsigned count = 0;
 
     for (DownloadItem *item in _items) {
-            
+
         NSURLSessionDownloadTask *task;
         NSString *s = [item value];
         NSString *path = [s stringByAppendingPathExtension: _downloadExtension];
         NSURL *url = [_downloadURL URLByAppendingPathComponent: path];
-        
+
         task = [_session downloadTaskWithURL: url];
         [_taskIndex setObject: item forKey: task];
-        
+
         [item setTask: task];
 
         [task resume];
@@ -329,7 +335,7 @@ enum {
         //if (count >= 2) break;
     }
     [self setActive: YES];
-    
+
 }
 
 -(DownloadItem *)clickedItem {
@@ -340,24 +346,24 @@ enum {
 }
 #if 0
 -(void)redrawRow: (NSUInteger)row {
-    
+
     //NSRect r = [_tableView rectOfRow: row];
     //[_tableView setNeedsDisplayInRect: r];
-    
+
     NSIndexSet *rIx = [NSIndexSet indexSetWithIndex: row];
     NSIndexSet *cIx = [NSIndexSet indexSetWithIndex: 0];
-    
+
     [_tableView reloadDataForRowIndexes: rIx columnIndexes: cIx];
 }
 #endif
 
 -(void)initializeExtensionMenu {
-    
+
     unsigned tag;
     // mark default download extension.
     NSString *defaultExt = [_defaults stringForKey: kDefaultDownloadExtension];
     tag = [DownloadExtensionTransformer stringToNumber: defaultExt];
-    
+
     NSMenuItem *item = [[_formatButton menu] itemWithTag: tag];
     if (item) {
         [item setAttributedTitle: ItalicMenuString([item title])];
@@ -405,7 +411,7 @@ enum {
             delta = YES;
         }
     }
-    
+
     if (delta) {
         [self setActive: YES];
     }
@@ -417,30 +423,31 @@ enum {
 }
 
 -(IBAction)refreshROMs: (id)sender {
-    
+
     NSString *romdir = [SupportDirectoryPath() stringByAppendingPathComponent: @"roms"];
     NSFileManager *fm = [NSFileManager defaultManager];
 
     for (DownloadItem *item in _items) {
+        NSDictionary *attr = nil;
         NSString *value = [item value];
         NSString *s = [romdir stringByAppendingPathComponent: value];
         NSString *path;
-        path = [s stringByAppendingPathExtension: @"zip"];
-        if ([fm fileExistsAtPath: path]) {
-            [item setStatus: ItemFound];
-            [item setLocalURL: [NSURL fileURLWithPath: path]];
-            continue;
+
+        for (unsigned i = 0; i < 2; ++i) {
+            path = [s stringByAppendingPathExtension: Extensions[i]];
+            attr = [fm attributesOfItemAtPath: path error: nil];
+            if (attr) break;
         }
 
-        path = [s stringByAppendingPathExtension: @"7z"];
-        if ([fm fileExistsAtPath: path]) {
+        if (attr) {
             [item setStatus: ItemFound];
             [item setLocalURL: [NSURL fileURLWithPath: path]];
-            continue;
+            [item setFileSize: [attr fileSize]];
+        } else {
+            [item setStatus: ItemMissing];
+            [item setLocalURL: nil];
+            [item setFileSize: 0];
         }
-        
-        [item setStatus: ItemMissing];
-        [item setLocalURL: nil];
     }
 }
 
@@ -454,12 +461,29 @@ enum {
     [ws activateFileViewerSelectingURLs: @[url]];
 }
 
+- (IBAction)moveToTrash:(id)sender {
+    NSError *error = nil;
+
+    DownloadItem *item = [self clickedItem];
+    if (!item) return;
+    NSURL *url = [item localURL];
+    if (!url) return;
+
+    NSFileManager *fm = [NSFileManager defaultManager];
+    if ([fm trashItemAtURL: url resultingItemURL: NULL error: &error]) {
+        [item refresh: nil];
+    } else {
+        [self presentError: error];
+    }
+
+}
+
 - (IBAction)download:(id)sender {
     DownloadItem *item = [self clickedItem];
     if (!item) return;
 
     [self defocus];
-    
+
     [self downloadItem: item];
     [self setActive: YES];
 }
@@ -542,7 +566,7 @@ static NSInteger TaskStatusCode(NSURLSessionTask *task) {
         error = [NSError errorWithDomain: NSURLErrorDomain code: NSURLErrorFileDoesNotExist userInfo: info];
     }
 
-    
+
     // not sure if strictly necessary but this happens in a background thread
     // and these are used in KVO binding.  Also, main thread only
     // means no race conditions.
@@ -559,22 +583,22 @@ static NSInteger TaskStatusCode(NSURLSessionTask *task) {
         if ([taskIndex count] == 0) {
             [self setActive: NO];
         }
-        
+
         if (item) {
             [item completeWithError: error];
         }
     });
-    
+
 }
 
 - (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.
@@ -582,13 +606,14 @@ static NSInteger TaskStatusCode(NSURLSessionTask *task) {
     NSURL *src = [[task originalRequest] URL];
     NSURL *dest = [_romFolder URLByAppendingPathComponent: [src lastPathComponent]];
     NSError *error = nil;
-    
+
     [fm moveItemAtURL: location toURL: dest error: &error];
 
     dispatch_async(dispatch_get_main_queue(), ^(void){
         NSMutableDictionary *taskIndex = self->_taskIndex;
         DownloadItem *item = [taskIndex objectForKey: task];
-        [item setLocalURL: dest];
+
+        [item refresh: dest];
     });
 
     NSLog(@"%@", src);
@@ -598,13 +623,13 @@ static NSInteger TaskStatusCode(NSURLSessionTask *task) {
 
 -(NSURLCredential *)credentialForChallenge: (NSURLAuthenticationChallenge *)challenge {
 
-    
+
     //if ([challenge previousFailureCount]) return nil;
 
     NSURLCredential *credential = nil;
     NSURLProtectionSpace *space = [challenge protectionSpace];
-    
-    
+
+
     OSStatus status;
     NSDictionary *query;
     CFTypeRef item = nil;
@@ -620,41 +645,41 @@ static NSInteger TaskStatusCode(NSURLSessionTask *task) {
     };
 
     status = SecItemCopyMatching((CFDictionaryRef)query, &item);
-    NSLog(@"%@", query);
+    //NSLog(@"%@", query);
     if (status != 0) return nil;
 
     NSDictionary *d = (__bridge NSDictionary *)item;
-    NSLog(@"%@", d);
+    //NSLog(@"%@", d);
 
     NSString *account = [d objectForKey: (id)kSecAttrAccount];
     NSData *passwordData = [d objectForKey: (id)kSecValueData];
     NSString *password = [[NSString alloc] initWithData: passwordData encoding: NSUTF8StringEncoding];
-    
+
 
     credential = [NSURLCredential credentialWithUser: account password: password persistence: NSURLCredentialPersistenceForSession];
-    
+
     return credential;
 
 }
 
 - (void)URLSession:(NSURLSession *)session task:(NSURLSessionTask *)task didReceiveChallenge:(NSURLAuthenticationChallenge *)challenge completionHandler:(void (^)(NSURLSessionAuthChallengeDisposition disposition, NSURLCredential *credential))completionHandler {
-    
+
     NSLog(@"challenge: %@", challenge);
-    
+
     if ([challenge previousFailureCount]) {
         completionHandler(NSURLSessionAuthChallengeCancelAuthenticationChallenge, nil);
         return;
     }
-    
+
     NSURLProtectionSpace *space = [challenge protectionSpace];
     NSString *method = [space authenticationMethod];
-    
+
     if ([NSURLAuthenticationMethodHTTPBasic isEqualToString: method] ||
         [NSURLAuthenticationMethodNTLM isEqualToString: method] ||
         [NSURLAuthenticationMethodHTTPDigest isEqualToString: method]) {
-    
+
         NSURLCredential *credential = [self credentialForChallenge: challenge];
-        
+
         if (credential) {
             completionHandler(NSURLSessionAuthChallengeUseCredential, credential);
             return;
@@ -697,6 +722,42 @@ static NSInteger TaskStatusCode(NSURLSessionTask *task) {
     }
 }
 
+
+-(void)refresh: (NSURL *)localURL {
+    NSDictionary *attr = nil;
+    NSError * error = nil;
+    NSFileManager *fm = [NSFileManager defaultManager];
+
+    if (localURL) {
+        attr = [fm attributesOfItemAtPath: [localURL path] error: &error];
+    } else {
+        NSString *romdir = [SupportDirectoryPath() stringByAppendingPathComponent: @"roms"];
+        NSString *s = [romdir stringByAppendingPathComponent: _value];
+
+        NSString *path = nil;
+        for (unsigned i = 0; i < 2; ++i) {
+            path = [s stringByAppendingPathExtension: Extensions[i]];
+            attr = [fm attributesOfItemAtPath: path error: nil];
+            if (attr) {
+                localURL = [NSURL fileURLWithPath: path];
+                break;
+            }
+        }
+    }
+
+    if (attr && localURL) {
+        [self setLocalURL: localURL];
+        [self setFileSize: [attr fileSize]];
+        [self setStatus: ItemFound];
+    } else {
+        [self setLocalURL: nil];
+        [self setFileSize: 0];
+        if (_status == ItemFound || _status == ItemDownloaded)
+            [self setStatus: ItemMissing];
+    }
+
+}
+
 +(NSSet *)keyPathsForValuesAffectingStatusDescription {
     return [NSSet setWithObjects: @"error", @"status", nil];
 }
@@ -742,27 +803,34 @@ enum {
 };
 
 - (BOOL)validateMenuItem:(NSMenuItem *)menuItem {
-    
-    if ([menuItem action] == @selector(downloadExtensionChanged:)) return YES;
 
+    SEL action = [menuItem action];
+    if (action == @selector(downloadExtensionChanged:)) return YES;
+
+    DownloadItem *item = [self clickedItem];
+    if (!item) return NO;
+#if 0
     NSInteger row = [_tableView clickedRow];
     if (row < 0) return NO;
     DownloadItem *item = [[_arrayController arrangedObjects] objectAtIndex: row]; //[_items objectAtIndex: row];
-    
+#endif
+
     NSUInteger status = [item status];
-    switch([menuItem tag]) {
-        case kOpenInFinder:
-            return status == ItemFound || status == ItemDownloaded;
-            break;
-        case kDownload:
-            return YES;
-            //return status == ItemMissing || status == ItemError || status == ItemCanceled;
-            break;
-        case kCancel:
-            return status == ItemDownloading;
-            break;
-            
+
+    if (action == @selector(moveToTrash:)) {
+        return [item localURL] != nil;
     }
+    if (action == @selector(showInFinder:)) {
+        return [item localURL] != nil;
+    }
+    if (action == @selector(download:)) {
+        return YES;
+    }
+    if (action == @selector(cancel:)) {
+        return status == ItemDownloading;
+    }
+
+
     return NO;
 }
 

Ample/LaunchWindowController.m

@@ -29,6 +29,7 @@ static NSString *kContextMachine = @"kContextMachine";
     BOOL _loadingBookmark;
     NSString *_machine;
     NSDictionary *_machineDescription;
+    BookmarkManager *_manager;
 }
 @property (strong) IBOutlet MediaViewController *mediaController;
 @property (strong) IBOutlet SlotViewController *slotController;
@@ -189,6 +190,8 @@ static int EffectsIndex(NSString *str) {
 
 -(void)windowWillLoad {
 
+    _manager = [BookmarkManager sharedManager];
+    
     // if this calls [self window], it will recurse.  that is bad.
     //[self defaultLoad: nil];
     [self reset];
@@ -731,6 +734,7 @@ static NSString *ShellQuote(NSString *s) {
 
 -(IBAction)resetAll:(id)sender {
 
+    [_manager setCurrentBookmark: nil];
     [self reset];
     [self resetSoftware];
     [_slotController resetSlots: sender];
@@ -779,37 +783,40 @@ static NSString *ShellQuote(NSString *s) {
 
 -(IBAction)defaultSave:(id)sender {
 
-    #if 0
-
-    BookmarkManager *bm = [BookmarkManager sharedManager];
-
+#if 0
     NSDictionary *d = [self makeBookmark];
 
-    [bm saveDefault: d];
+    [_manager saveDefault: d];
 #endif
 }
 
 -(IBAction)defaultLoad:(id)sender {
 
-    BookmarkManager *bm = [BookmarkManager sharedManager];
+    Bookmark *b = [_manager defaultBookmark];
 
-    NSDictionary *d = [bm loadDefault];
-    if (!d) {
+    if (!b) {
         [self resetAll: sender];
         [self setMachine: nil];
         [_machineViewController reset];
         [_slotController setMachine: nil];
         return;
     }
-    [self loadBookmark: d];
+    [self loadBookmark: b];
+}
+
+-(IBAction)updateBookmark: (id)sender {
+    
+    Bookmark *b = [sender representedObject];
+    if (!b) return;
+    
+    NSDictionary *d = [self makeBookmark];
+    [b setDictionary: d];
 }
 
 -(IBAction)addBookmark:(id)sender {
     
     if (!_machine) return;
 
-    BookmarkManager *bm = [BookmarkManager sharedManager];
-
     NSString *name = nil;
     if (_machineDescription) name = [_machineDescription objectForKey:@"description"];
     if (!name) name = _machine;
@@ -819,7 +826,7 @@ static NSString *ShellQuote(NSString *s) {
         name = [name stringByAppendingFormat: @" - %@", [_software title]];
     }
     
-    name = [bm uniqueBookmarkName: name];
+    name = [_manager uniqueBookmarkName: name];
     
     [self setBookmarkName: name];
     [self setBookmarkDefault: NO];
@@ -836,10 +843,9 @@ static NSString *ShellQuote(NSString *s) {
 
 -(IBAction)bookmarkSave:(id)sender {
         
-    BookmarkManager *bm = [BookmarkManager sharedManager];
 
 #if 0
-    if (![bm validateName: _bookmarkName]) {
+    if (![_manager validateName: _bookmarkName]) {
         [_bookmarkTextField selectText: nil];
         NSBeep();
         return;
@@ -849,7 +855,7 @@ static NSString *ShellQuote(NSString *s) {
     NSDictionary *d = [self makeBookmark];
     NSError *e;
     
-    if (( e = [bm saveBookmark: d name: _bookmarkName automatic: _bookmarkDefault])) {
+    if (( e = [_manager saveBookmark: d name: _bookmarkName automatic: _bookmarkDefault])) {
         // probably a duplicate name...
         [_bookmarkTextField selectText: nil];
         [_bookmarkErrorField setStringValue: [e localizedDescription]];
@@ -866,31 +872,24 @@ static NSString *ShellQuote(NSString *s) {
 -(void)bookmarkNotification: (NSNotification *)notification {
     
     Bookmark *b = [notification object];
-    NSDictionary *d = [b dictionary];
-    
-    [self loadBookmark: d];
+    [self loadBookmark: b];
 }
 
 -(IBAction)bookmarkMenu:(id)sender {
-    
-#if 0
-    NSURL *url = [sender representedObject];
-    if (!url) return;
-    
-    NSDictionary *d = [NSDictionary dictionaryWithContentsOfURL: url];
-    if (!d) return; // oops...
-    
-#endif
+
     // represented object is a Bookmark.
-    NSDictionary *d = [(Bookmark *)[sender representedObject] dictionary];
-    [self loadBookmark: d];
+    Bookmark *b = [sender representedObject];
+    [self loadBookmark: b];
 }
 
 
--(void)loadBookmark: (NSDictionary *)d {
+-(void)loadBookmark: (Bookmark *)b {
     Class StringClass = [NSString class];
     Class NumberClass = [NSNumber class];
-    
+
+    NSDictionary *d = [b dictionary];
+
+    [_manager setCurrentBookmark: b];
     
     NSString *machine = [d objectForKey: @"machine"];
     if (!machine) return;

Ample/Resources/ace100.plist

@@ -368,7 +368,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -376,7 +376,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -891,7 +891,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -899,7 +899,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -1414,7 +1414,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -1422,7 +1422,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -1937,7 +1937,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -1945,7 +1945,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -2462,7 +2462,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -2470,7 +2470,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -2987,7 +2987,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -2995,7 +2995,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -3510,7 +3510,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -3518,7 +3518,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>

Ample/Resources/ace1000.plist

@@ -308,7 +308,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -316,7 +316,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -831,7 +831,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -839,7 +839,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -1354,7 +1354,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -1362,7 +1362,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -1877,7 +1877,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -1885,7 +1885,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -2402,7 +2402,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -2410,7 +2410,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -2927,7 +2927,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -2935,7 +2935,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -3450,7 +3450,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -3458,7 +3458,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>

Ample/Resources/ace2200.plist

@@ -333,7 +333,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -341,7 +341,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -949,7 +949,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -957,7 +957,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -1567,7 +1567,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -1575,7 +1575,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>

Ample/Resources/agat7.plist

@@ -396,6 +396,27 @@
         </array>
       </dict>
     </array>
+    <key>bios</key>
+    <array>
+      <dict>
+        <key>value</key>
+        <string>v1</string>
+        <key>description</key>
+        <string>Version 1</string>
+      </dict>
+      <dict>
+        <key>value</key>
+        <string>v2</string>
+        <key>description</key>
+        <string>Version 2</string>
+      </dict>
+      <dict>
+        <key>value</key>
+        <string>debug</string>
+        <key>description</key>
+        <string>Debug</string>
+      </dict>
+    </array>
     <key>devices</key>
     <array>
       <dict>

Ample/Resources/agat9.plist

@@ -492,6 +492,21 @@
         </array>
       </dict>
     </array>
+    <key>bios</key>
+    <array>
+      <dict>
+        <key>value</key>
+        <string>v1</string>
+        <key>description</key>
+        <string>Version 1</string>
+      </dict>
+      <dict>
+        <key>value</key>
+        <string>v2</string>
+        <key>description</key>
+        <string>Version 2</string>
+      </dict>
+    </array>
     <key>devices</key>
     <array>
       <dict>

Ample/Resources/albert.plist

@@ -308,7 +308,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -316,7 +316,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -831,7 +831,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -839,7 +839,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -1354,7 +1354,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -1362,7 +1362,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -1877,7 +1877,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -1885,7 +1885,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -2402,7 +2402,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -2410,7 +2410,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -2927,7 +2927,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -2935,7 +2935,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -3450,7 +3450,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -3458,7 +3458,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>

Ample/Resources/am100.plist

@@ -308,7 +308,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -316,7 +316,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -831,7 +831,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -839,7 +839,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -1354,7 +1354,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -1362,7 +1362,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -1877,7 +1877,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -1885,7 +1885,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -2402,7 +2402,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -2410,7 +2410,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -2927,7 +2927,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -2935,7 +2935,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -3450,7 +3450,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -3458,7 +3458,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>

Ample/Resources/am64.plist

@@ -308,7 +308,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -316,7 +316,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -831,7 +831,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -839,7 +839,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -1354,7 +1354,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -1362,7 +1362,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -1877,7 +1877,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -1885,7 +1885,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -2402,7 +2402,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -2410,7 +2410,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -2927,7 +2927,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -2935,7 +2935,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -3450,7 +3450,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -3458,7 +3458,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>

Ample/Resources/apple2.plist

@@ -368,7 +368,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -376,7 +376,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -891,7 +891,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -899,7 +899,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -1414,7 +1414,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -1422,7 +1422,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -1937,7 +1937,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -1945,7 +1945,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -2462,7 +2462,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -2470,7 +2470,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -2987,7 +2987,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -2995,7 +2995,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -3510,7 +3510,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -3518,7 +3518,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -3880,6 +3880,21 @@
         </array>
       </dict>
     </array>
+    <key>bios</key>
+    <array>
+      <dict>
+        <key>value</key>
+        <string>default</string>
+        <key>description</key>
+        <string>Original Monitor</string>
+      </dict>
+      <dict>
+        <key>value</key>
+        <string>autostart</string>
+        <key>description</key>
+        <string>Autostart Monitor</string>
+      </dict>
+    </array>
     <key>devices</key>
     <array>
       <dict>

Ample/Resources/apple2e.plist

@@ -314,7 +314,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -322,7 +322,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -930,7 +930,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -938,7 +938,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -1546,7 +1546,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -1554,7 +1554,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -2162,7 +2162,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -2170,7 +2170,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -2780,7 +2780,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -2788,7 +2788,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -3398,7 +3398,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -3406,7 +3406,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -4014,7 +4014,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -4022,7 +4022,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>

Ample/Resources/apple2ee.plist

@@ -314,7 +314,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -322,7 +322,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -930,7 +930,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -938,7 +938,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -1546,7 +1546,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -1554,7 +1554,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -2162,7 +2162,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -2170,7 +2170,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -2780,7 +2780,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -2788,7 +2788,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -3398,7 +3398,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -3406,7 +3406,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -4014,7 +4014,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -4022,7 +4022,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>

Ample/Resources/apple2eefr.plist

@@ -314,7 +314,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -322,7 +322,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -930,7 +930,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -938,7 +938,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -1546,7 +1546,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -1554,7 +1554,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -2162,7 +2162,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -2170,7 +2170,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -2780,7 +2780,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -2788,7 +2788,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -3398,7 +3398,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -3406,7 +3406,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -4014,7 +4014,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -4022,7 +4022,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>

Ample/Resources/apple2ees.plist

@@ -314,7 +314,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -322,7 +322,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -930,7 +930,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -938,7 +938,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -1546,7 +1546,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -1554,7 +1554,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -2162,7 +2162,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -2170,7 +2170,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -2780,7 +2780,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -2788,7 +2788,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -3398,7 +3398,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -3406,7 +3406,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -4014,7 +4014,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -4022,7 +4022,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>

Ample/Resources/apple2eeuk.plist

@@ -314,7 +314,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -322,7 +322,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -930,7 +930,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -938,7 +938,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -1546,7 +1546,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -1554,7 +1554,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -2162,7 +2162,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -2170,7 +2170,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -2780,7 +2780,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -2788,7 +2788,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -3398,7 +3398,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -3406,7 +3406,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -4014,7 +4014,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -4022,7 +4022,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>

Ample/Resources/apple2ep.plist

@@ -314,7 +314,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -322,7 +322,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -930,7 +930,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -938,7 +938,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -1546,7 +1546,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -1554,7 +1554,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -2162,7 +2162,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -2170,7 +2170,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -2780,7 +2780,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -2788,7 +2788,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -3398,7 +3398,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -3406,7 +3406,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -4014,7 +4014,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -4022,7 +4022,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>

Ample/Resources/apple2euk.plist

@@ -314,7 +314,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -322,7 +322,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -930,7 +930,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -938,7 +938,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -1546,7 +1546,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -1554,7 +1554,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -2162,7 +2162,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -2170,7 +2170,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -2780,7 +2780,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -2788,7 +2788,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -3398,7 +3398,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -3406,7 +3406,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -4014,7 +4014,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -4022,7 +4022,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>

Ample/Resources/apple2gs.plist

@@ -343,7 +343,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>disabled</key>
             <true/>
           </dict>
@@ -351,7 +351,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -872,7 +872,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>disabled</key>
             <true/>
           </dict>
@@ -880,7 +880,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -1401,7 +1401,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>disabled</key>
             <true/>
           </dict>
@@ -1409,7 +1409,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -1930,7 +1930,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>disabled</key>
             <true/>
           </dict>
@@ -1938,7 +1938,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -2459,7 +2459,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>disabled</key>
             <true/>
           </dict>
@@ -2467,7 +2467,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -2988,7 +2988,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>disabled</key>
             <true/>
           </dict>
@@ -2996,7 +2996,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -3517,7 +3517,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>disabled</key>
             <true/>
           </dict>
@@ -3525,7 +3525,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>

Ample/Resources/apple2gsr0.plist

@@ -383,7 +383,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>disabled</key>
             <true/>
           </dict>
@@ -391,7 +391,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -912,7 +912,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>disabled</key>
             <true/>
           </dict>
@@ -920,7 +920,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -1441,7 +1441,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>disabled</key>
             <true/>
           </dict>
@@ -1449,7 +1449,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -1970,7 +1970,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>disabled</key>
             <true/>
           </dict>
@@ -1978,7 +1978,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -2499,7 +2499,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>disabled</key>
             <true/>
           </dict>
@@ -2507,7 +2507,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -3028,7 +3028,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>disabled</key>
             <true/>
           </dict>
@@ -3036,7 +3036,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -3557,7 +3557,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>disabled</key>
             <true/>
           </dict>
@@ -3565,7 +3565,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>

Ample/Resources/apple2gsr1.plist

@@ -383,7 +383,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>disabled</key>
             <true/>
           </dict>
@@ -391,7 +391,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -912,7 +912,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>disabled</key>
             <true/>
           </dict>
@@ -920,7 +920,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -1441,7 +1441,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>disabled</key>
             <true/>
           </dict>
@@ -1449,7 +1449,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -1970,7 +1970,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>disabled</key>
             <true/>
           </dict>
@@ -1978,7 +1978,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -2499,7 +2499,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>disabled</key>
             <true/>
           </dict>
@@ -2507,7 +2507,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -3028,7 +3028,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>disabled</key>
             <true/>
           </dict>
@@ -3036,7 +3036,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -3557,7 +3557,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>disabled</key>
             <true/>
           </dict>
@@ -3565,7 +3565,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>

Ample/Resources/apple2jp.plist

@@ -308,7 +308,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -316,7 +316,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -831,7 +831,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -839,7 +839,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -1354,7 +1354,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -1362,7 +1362,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -1877,7 +1877,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -1885,7 +1885,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -2402,7 +2402,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -2410,7 +2410,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -2927,7 +2927,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -2935,7 +2935,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -3450,7 +3450,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -3458,7 +3458,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>

Ample/Resources/apple2p.plist

@@ -308,7 +308,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -316,7 +316,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -831,7 +831,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -839,7 +839,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -1354,7 +1354,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -1362,7 +1362,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -1877,7 +1877,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -1885,7 +1885,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -2402,7 +2402,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -2410,7 +2410,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -2927,7 +2927,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -2935,7 +2935,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -3450,7 +3450,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -3458,7 +3458,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>

Ample/Resources/apple3.plist

@@ -101,7 +101,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -198,7 +198,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -295,7 +295,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -392,7 +392,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -602,6 +602,21 @@
         </array>
       </dict>
     </array>
+    <key>bios</key>
+    <array>
+      <dict>
+        <key>value</key>
+        <string>original</string>
+        <key>description</key>
+        <string>Apple /// boot ROM</string>
+      </dict>
+      <dict>
+        <key>value</key>
+        <string>soshd</string>
+        <key>description</key>
+        <string>Rob Justice SOSHDBOOT</string>
+      </dict>
+    </array>
     <key>devices</key>
     <array>
       <dict>

Ample/Resources/basis108.plist

@@ -368,7 +368,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -376,7 +376,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -891,7 +891,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -899,7 +899,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -1414,7 +1414,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -1422,7 +1422,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -1937,7 +1937,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -1945,7 +1945,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -2462,7 +2462,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -2470,7 +2470,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -2987,7 +2987,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -2995,7 +2995,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -3510,7 +3510,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -3518,7 +3518,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>

Ample/Resources/cec2000.plist

@@ -333,7 +333,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -341,7 +341,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -949,7 +949,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -957,7 +957,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -1565,7 +1565,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -1573,7 +1573,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -2183,7 +2183,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -2191,7 +2191,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -2799,7 +2799,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -2807,7 +2807,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>

Ample/Resources/cece.plist

@@ -333,7 +333,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -341,7 +341,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -949,7 +949,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -957,7 +957,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -1565,7 +1565,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -1573,7 +1573,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -2183,7 +2183,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -2191,7 +2191,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -2799,7 +2799,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -2807,7 +2807,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>

Ample/Resources/cecg.plist

@@ -333,7 +333,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -341,7 +341,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -949,7 +949,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -957,7 +957,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -1565,7 +1565,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -1573,7 +1573,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -2183,7 +2183,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -2191,7 +2191,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -2799,7 +2799,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -2807,7 +2807,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>

Ample/Resources/ceci.plist

@@ -333,7 +333,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -341,7 +341,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -949,7 +949,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -957,7 +957,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -1565,7 +1565,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -1573,7 +1573,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -2183,7 +2183,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -2191,7 +2191,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -2799,7 +2799,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -2807,7 +2807,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -3193,6 +3193,27 @@
         </array>
       </dict>
     </array>
+    <key>bios</key>
+    <array>
+      <dict>
+        <key>value</key>
+        <string>default</string>
+        <key>description</key>
+        <string>ver 1.21</string>
+      </dict>
+      <dict>
+        <key>value</key>
+        <string>older</string>
+        <key>description</key>
+        <string>ver 1.1</string>
+      </dict>
+      <dict>
+        <key>value</key>
+        <string>diag</string>
+        <key>description</key>
+        <string>self test</string>
+      </dict>
+    </array>
     <key>devices</key>
     <array>
       <dict>

Ample/Resources/cecm.plist

@@ -333,7 +333,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -341,7 +341,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -949,7 +949,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -957,7 +957,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -1565,7 +1565,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -1573,7 +1573,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -2183,7 +2183,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -2191,7 +2191,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -2799,7 +2799,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -2807,7 +2807,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>

Ample/Resources/craft2p.plist

@@ -308,7 +308,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -316,7 +316,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -831,7 +831,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -839,7 +839,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -1354,7 +1354,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -1362,7 +1362,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -1877,7 +1877,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -1885,7 +1885,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -2402,7 +2402,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -2410,7 +2410,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -2927,7 +2927,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -2935,7 +2935,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -3450,7 +3450,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -3458,7 +3458,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>

Ample/Resources/dodo.plist

@@ -308,7 +308,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -316,7 +316,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -831,7 +831,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -839,7 +839,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -1354,7 +1354,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -1362,7 +1362,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -1877,7 +1877,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -1885,7 +1885,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -2402,7 +2402,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -2410,7 +2410,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -2927,7 +2927,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -2935,7 +2935,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -3450,7 +3450,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -3458,7 +3458,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>

Ample/Resources/elppa.plist

@@ -308,7 +308,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -316,7 +316,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -831,7 +831,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -839,7 +839,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -1354,7 +1354,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -1362,7 +1362,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -1877,7 +1877,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -1885,7 +1885,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -2402,7 +2402,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -2410,7 +2410,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -2927,7 +2927,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -2935,7 +2935,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -3450,7 +3450,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -3458,7 +3458,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>

Ample/Resources/hkc8800a.plist

@@ -308,7 +308,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -316,7 +316,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -831,7 +831,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -839,7 +839,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -1354,7 +1354,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -1362,7 +1362,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -1877,7 +1877,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -1885,7 +1885,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -2402,7 +2402,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -2410,7 +2410,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -2927,7 +2927,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -2935,7 +2935,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -3450,7 +3450,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -3458,7 +3458,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>

Ample/Resources/ivelultr.plist

@@ -308,7 +308,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -316,7 +316,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -831,7 +831,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -839,7 +839,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -1354,7 +1354,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -1362,7 +1362,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -1877,7 +1877,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -1885,7 +1885,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -2402,7 +2402,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -2410,7 +2410,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -2927,7 +2927,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -2935,7 +2935,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -3450,7 +3450,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -3458,7 +3458,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>

Ample/Resources/las128ex.plist

@@ -354,7 +354,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -362,7 +362,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -970,7 +970,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -978,7 +978,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>

Ample/Resources/laser128.plist

@@ -354,7 +354,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -362,7 +362,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -970,7 +970,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -978,7 +978,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -1642,6 +1642,27 @@
         </array>
       </dict>
     </array>
+    <key>bios</key>
+    <array>
+      <dict>
+        <key>value</key>
+        <string>871222</string>
+        <key>description</key>
+        <string>v4.3</string>
+      </dict>
+      <dict>
+        <key>value</key>
+        <string>870917</string>
+        <key>description</key>
+        <string>v4.2</string>
+      </dict>
+      <dict>
+        <key>value</key>
+        <string>870724</string>
+        <key>description</key>
+        <string>v4.1</string>
+      </dict>
+    </array>
     <key>devices</key>
     <array>
       <dict>

Ample/Resources/laser128o.plist

@@ -314,7 +314,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -322,7 +322,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -930,7 +930,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -938,7 +938,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -1602,6 +1602,39 @@
         </array>
       </dict>
     </array>
+    <key>bios</key>
+    <array>
+      <dict>
+        <key>value</key>
+        <string>871212</string>
+        <key>description</key>
+        <string>v3.3</string>
+      </dict>
+      <dict>
+        <key>value</key>
+        <string>870320</string>
+        <key>description</key>
+        <string>v3.0</string>
+      </dict>
+      <dict>
+        <key>value</key>
+        <string>870203</string>
+        <key>description</key>
+        <string>v2.9</string>
+      </dict>
+      <dict>
+        <key>value</key>
+        <string>860915</string>
+        <key>description</key>
+        <string>860915</string>
+      </dict>
+      <dict>
+        <key>value</key>
+        <string>860801</string>
+        <key>description</key>
+        <string>860801</string>
+      </dict>
+    </array>
     <key>devices</key>
     <array>
       <dict>

Ample/Resources/laser2c.plist

@@ -308,7 +308,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -316,7 +316,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -831,7 +831,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -839,7 +839,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -1354,7 +1354,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -1362,7 +1362,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -1877,7 +1877,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -1885,7 +1885,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -2402,7 +2402,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -2410,7 +2410,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -2927,7 +2927,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -2935,7 +2935,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -3450,7 +3450,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -3458,7 +3458,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>

Ample/Resources/mac512ke.plist

@@ -55,6 +55,27 @@
         </array>
       </dict>
     </array>
+    <key>bios</key>
+    <array>
+      <dict>
+        <key>value</key>
+        <string>v3</string>
+        <key>description</key>
+        <string>Loud Harmonicas</string>
+      </dict>
+      <dict>
+        <key>value</key>
+        <string>v2</string>
+        <key>description</key>
+        <string>Lonely Heifers</string>
+      </dict>
+      <dict>
+        <key>value</key>
+        <string>v1</string>
+        <key>description</key>
+        <string>Lonely Hearts</string>
+      </dict>
+    </array>
     <key>devices</key>
     <array>
       <dict>

Ample/Resources/macii.plist

@@ -1007,6 +1007,21 @@
         </array>
       </dict>
     </array>
+    <key>bios</key>
+    <array>
+      <dict>
+        <key>value</key>
+        <string>default</string>
+        <key>description</key>
+        <string>rev. B</string>
+      </dict>
+      <dict>
+        <key>value</key>
+        <string>original</string>
+        <key>description</key>
+        <string>rev. A</string>
+      </dict>
+    </array>
     <key>devices</key>
     <array>
       <dict>

Ample/Resources/maciihmu.plist

@@ -1007,6 +1007,21 @@
         </array>
       </dict>
     </array>
+    <key>bios</key>
+    <array>
+      <dict>
+        <key>value</key>
+        <string>default</string>
+        <key>description</key>
+        <string>rev. B</string>
+      </dict>
+      <dict>
+        <key>value</key>
+        <string>original</string>
+        <key>description</key>
+        <string>rev. A</string>
+      </dict>
+    </array>
     <key>devices</key>
     <array>
       <dict>

Ample/Resources/macplus.plist

@@ -85,6 +85,39 @@
         </array>
       </dict>
     </array>
+    <key>bios</key>
+    <array>
+      <dict>
+        <key>value</key>
+        <string>v3</string>
+        <key>description</key>
+        <string>Loud Harmonicas</string>
+      </dict>
+      <dict>
+        <key>value</key>
+        <string>v2</string>
+        <key>description</key>
+        <string>Lonely Heifers</string>
+      </dict>
+      <dict>
+        <key>value</key>
+        <string>v1</string>
+        <key>description</key>
+        <string>Lonely Hearts</string>
+      </dict>
+      <dict>
+        <key>value</key>
+        <string>romdisk</string>
+        <key>description</key>
+        <string>mac68k.info self-boot (1/1/2015)</string>
+      </dict>
+      <dict>
+        <key>value</key>
+        <string>romdisk2</string>
+        <key>description</key>
+        <string>bigmessofwires.com ROMinator (2/25/2015)</string>
+      </dict>
+    </array>
     <key>devices</key>
     <array>
       <dict>

Ample/Resources/maxxi.plist

@@ -308,7 +308,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -316,7 +316,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -831,7 +831,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -839,7 +839,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -1354,7 +1354,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -1362,7 +1362,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -1877,7 +1877,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -1885,7 +1885,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -2402,7 +2402,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -2410,7 +2410,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -2927,7 +2927,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -2935,7 +2935,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -3450,7 +3450,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -3458,7 +3458,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>

Ample/Resources/microeng.plist

@@ -308,7 +308,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -316,7 +316,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -831,7 +831,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -839,7 +839,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -1354,7 +1354,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -1362,7 +1362,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -1877,7 +1877,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -1885,7 +1885,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -2402,7 +2402,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -2410,7 +2410,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -2927,7 +2927,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -2935,7 +2935,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -3450,7 +3450,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -3458,7 +3458,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>

Ample/Resources/mprof3.plist

@@ -314,7 +314,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -322,7 +322,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -930,7 +930,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -938,7 +938,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -1546,7 +1546,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -1554,7 +1554,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -2162,7 +2162,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -2170,7 +2170,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -2780,7 +2780,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -2788,7 +2788,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -3398,7 +3398,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -3406,7 +3406,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -4014,7 +4014,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -4022,7 +4022,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>

Ample/Resources/prav82.plist

@@ -308,7 +308,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -316,7 +316,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -831,7 +831,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -839,7 +839,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -1354,7 +1354,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -1362,7 +1362,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -1877,7 +1877,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -1885,7 +1885,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -2402,7 +2402,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -2410,7 +2410,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -2927,7 +2927,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -2935,7 +2935,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -3450,7 +3450,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -3458,7 +3458,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>

Ample/Resources/prav8c.plist

@@ -314,7 +314,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -322,7 +322,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -930,7 +930,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -938,7 +938,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -1546,7 +1546,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -1554,7 +1554,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -2162,7 +2162,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -2170,7 +2170,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -2780,7 +2780,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -2788,7 +2788,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -3398,7 +3398,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -3406,7 +3406,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -4014,7 +4014,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -4022,7 +4022,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>

Ample/Resources/prav8m.plist

@@ -308,7 +308,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -316,7 +316,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -831,7 +831,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -839,7 +839,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -1354,7 +1354,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -1362,7 +1362,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -1877,7 +1877,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -1885,7 +1885,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -2402,7 +2402,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -2410,7 +2410,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -2927,7 +2927,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -2935,7 +2935,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -3450,7 +3450,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -3458,7 +3458,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>

Ample/Resources/roms.plist

@@ -414,13 +414,13 @@
       <key>value</key>
       <string>a2cffa02</string>
       <key>description</key>
-      <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+      <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
     </dict>
     <dict>
       <key>value</key>
       <string>a2cffa2</string>
       <key>description</key>
-      <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+      <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
     </dict>
     <dict>
       <key>value</key>

Ample/Resources/space84.plist

@@ -308,7 +308,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -316,7 +316,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -831,7 +831,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -839,7 +839,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -1354,7 +1354,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -1362,7 +1362,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -1877,7 +1877,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -1885,7 +1885,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -2402,7 +2402,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -2410,7 +2410,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -2927,7 +2927,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -2935,7 +2935,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -3450,7 +3450,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -3458,7 +3458,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>

Ample/Resources/spectred.plist

@@ -314,7 +314,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -322,7 +322,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -930,7 +930,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -938,7 +938,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -1546,7 +1546,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -1554,7 +1554,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -2162,7 +2162,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -2170,7 +2170,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -2780,7 +2780,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -2788,7 +2788,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -3398,7 +3398,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -3406,7 +3406,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -4014,7 +4014,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -4022,7 +4022,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>

Ample/Resources/tk3000.plist

@@ -314,7 +314,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -322,7 +322,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -930,7 +930,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -938,7 +938,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -1546,7 +1546,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -1554,7 +1554,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -2162,7 +2162,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -2170,7 +2170,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -2780,7 +2780,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -2788,7 +2788,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -3398,7 +3398,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -3406,7 +3406,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -4014,7 +4014,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -4022,7 +4022,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>

Ample/Resources/uniap2en.plist

@@ -308,7 +308,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -316,7 +316,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -831,7 +831,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -839,7 +839,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -1354,7 +1354,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -1362,7 +1362,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -1877,7 +1877,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -1885,7 +1885,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -2402,7 +2402,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -2410,7 +2410,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -2927,7 +2927,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -2935,7 +2935,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -3450,7 +3450,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -3458,7 +3458,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>

Ample/Resources/uniap2pt.plist

@@ -308,7 +308,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -316,7 +316,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -831,7 +831,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -839,7 +839,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -1354,7 +1354,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -1362,7 +1362,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -1877,7 +1877,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -1885,7 +1885,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -2402,7 +2402,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -2410,7 +2410,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -2927,7 +2927,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -2935,7 +2935,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -3450,7 +3450,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -3458,7 +3458,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>

Ample/Resources/uniap2ti.plist

@@ -308,7 +308,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -316,7 +316,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -831,7 +831,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -839,7 +839,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -1354,7 +1354,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -1362,7 +1362,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -1877,7 +1877,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -1885,7 +1885,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -2402,7 +2402,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -2410,7 +2410,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -2927,7 +2927,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -2935,7 +2935,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -3450,7 +3450,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -3458,7 +3458,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>

Ample/Resources/zijini.plist

@@ -333,7 +333,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -341,7 +341,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -949,7 +949,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -957,7 +957,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -1565,7 +1565,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -1573,7 +1573,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -2183,7 +2183,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -2191,7 +2191,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>
@@ -2799,7 +2799,7 @@
             <key>value</key>
             <string>cffa202</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (6502 firmware)</string>
             <key>devname</key>
             <string>a2cffa02</string>
           </dict>
@@ -2807,7 +2807,7 @@
             <key>value</key>
             <string>cffa2</string>
             <key>description</key>
-            <string>CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)</string>
+            <string>CFFA 2.0 Compact Flash (65C02 firmware)</string>
             <key>devname</key>
             <string>a2cffa2</string>
           </dict>

Ample/SoftwareList.h

@@ -32,6 +32,8 @@
 
 -(NSString *)fullName;
 
+@property NSString *searchTitle;
+
 @end
 
 @interface SoftwareSet : NSObject <NSFastEnumeration, AutoCompleteDelegate>

Ample/SoftwareList.m

@@ -614,14 +614,26 @@ NSArray<SoftwareList *> *SoftwareListForMachine(NSString *machine) {
 }
 
 
-// NSStringTransformStripDiacritics
-// pre-process all entries to lowercase and remove diacritics (second string for search text?)
-#if 0
-static unichar diacritics[][2] = {
-    { 0xd8, 'O' }, // Ø
-    { 0xf8, 'o' }, // ø
-};
-#endif
+
+static NSString *SearchString(NSString *s) {
+    
+    s = [s stringByFoldingWithOptions: NSCaseInsensitiveSearch|NSWidthInsensitiveSearch|NSDiacriticInsensitiveSearch locale: nil];
+    
+    // strip leading "the " ???
+    NSUInteger l = [s length];
+    if (l > 4) {
+        unichar buffer[4];
+        static unichar the_l[4] = { 't', 'h', 'e', ' '};
+        static unichar the_u[4] = { 'T', 'H', 'E', ' '};
+
+        [s getCharacters: buffer range: NSMakeRange(0, 4)];
+        if (!memcmp(buffer, the_l, sizeof(buffer))) return [s substringFromIndex: 4];
+        if (!memcmp(buffer, the_u, sizeof(buffer))) return [s substringFromIndex: 4];
+    }
+    if (l > 256) return [s substringToIndex: 256];
+    return s;
+}
+
 - (nonnull NSArray<id<AutocompleteItem>> *)autocomplete:(nonnull AutocompleteControl *)control completionsForString:(nonnull NSString *)string {
 
     if (!_cache) {
@@ -629,27 +641,29 @@ static unichar diacritics[][2] = {
         [_cache setCountLimit: 10];
     }
     
-    // todo -- diacritic normalization.
-    // déjá vu -> deja vu
+
     
+    // diacritic normalization.
+    // déjá vu -> deja vu
+    string = SearchString(string);
+
     enum { max_haystack_length = 256, max_needle_length = 256 };
 
     unichar needle_data[max_needle_length];
     
     if (!_items) return @[];
-
-    //string = [string stringByApplyingTransform: NSStringTransformStripDiacritics reverse: NO];
     
     NSUInteger needle_length = [string length];
     needle_length = MIN(needle_length, max_needle_length);
 
     [string getCharacters: needle_data range: NSMakeRange(0, needle_length)];
     
+    // based on testing, NSCaseInsensitiveSearch uses lowercase but it's not guaranteed.
     for (NSUInteger i = 0; i < needle_length; ++i)
         needle_data[i] = towlower(needle_data[i]);
-    
     string = InternString([NSString stringWithCharacters: needle_data length: needle_length]);
 
+
     NSArray *a = [_cache objectForKey: string];
     if (a) return a;
 
@@ -688,7 +702,12 @@ static unichar diacritics[][2] = {
             if (!memcmp(haystack_data, needle_data_ptr, needle_length * sizeof(unichar))) return YES;
         }
 
-        haystack = [o title];
+        haystack = [o searchTitle];
+        if (!haystack) {
+            haystack = SearchString([o title]);
+            [o setSearchTitle: haystack];
+        }
+
         length = [haystack length];
         length = MIN(length, max_haystack_length);
         if (length >= needle_length) {

Ample/TableCellView.m

@@ -164,9 +164,9 @@ static NSString *kNone = @"—None—";
     MidiManager *mgr = [MidiManager sharedManager];
     
     NSArray *array = _category == kIndexMidiIn ? [mgr sources] : [mgr destinations];
-    
+
+    NSString *selected = [[_popUpButton selectedItem] title];
     [menu removeAllItems];
-    NSString *selected = [[_popUpButton selectedItem] representedObject];
     int selectedIndex = -1;
     NSMenuItem *item;
 

embedded/download-sparkle.sh

@@ -1,7 +1,7 @@
 
 #!/bin/sh
 
-VERSION=2.0.0
+VERSION=2.1.0
 TAR=Sparkle-${VERSION}.tar.xz
 URL=https://github.com/sparkle-project/Sparkle/releases/download/${VERSION}/Sparkle-${VERSION}.tar.xz
 FRAMEWORK=Sparkle.framework
@@ -16,3 +16,12 @@ if [ ! -e $FRAMEWORK ] ; then tar xfz ../$TAR ; fi
 cd ..
 
 ditto Sparkle-${VERSION}/$FRAMEWORK $FRAMEWORK
+
+# older version of xcode need a Versions/A directory
+
+SW_VERSION=`sw_vers -productVersion`
+case $SW_VERSION in
+  10.14|10.14.*) 
+    if [ ! -e $FRAMEWORK/Versions/A ] ; then ln -s B $FRAMEWORK/Versions/A ; fi
+esac 
+

python/mkmachines.py

@@ -422,7 +422,7 @@ def make_smartport(machine):
 	# iic: <slot name="sl6:0" .. "sl6:1">
 	# apple 3: <slot name="0" .. "3">
 	# apple 2: diskiing card
-	# maclc <slot name="scsi:1" .. "scsi:7" (but not 4-7 not configurable)
+	# maclc <slot name="scsi:1" .. "scsi:7" (but 4-7 not configurable)
 	# maciix <slot name="scsi:6">
 	# macse <slot name="scsibus:6">
 
@@ -453,6 +453,10 @@ def make_smartport(machine):
 		"slots": slots
 	}
 
+def fix_machine_description(x):
+	#
+	x = x.replace(", www.dreher.net","")
+	return x
 
 def make_slot(m, slotname, nodes):
 
@@ -466,7 +470,7 @@ def make_slot(m, slotname, nodes):
 		default = x.get("default") == "yes"
 		disabled = name in DISABLED or (m, name) in DISABLED
 
-		d = { "value": name, "description": desc } # "devname": devname or ''}
+		d = { "value": name, "description": fix_machine_description(desc) } # "devname": devname or ''}
 		if default: d["default"] = True
 		if disabled: d["disabled"] = True
 		if not disabled:
@@ -490,6 +494,18 @@ def make_slot(m, slotname, nodes):
 	}
 
 
+def make_bios(m):
+
+	bios = []
+	for x in m.findall('./biosset'):
+		bios.append({
+			"value": x.get("name"),
+			"description": x.get("description")
+		})
+
+	return bios
+
+
 
 devices = {}
 
@@ -567,6 +583,9 @@ for m in machines:
 
 	data["slots"] = slots
 
+	bios = make_bios(machine)
+	if bios: data["bios"] = bios
+
 	devices = make_devices()
 	if smartport: devices.insert(0, smartport)
 	data["devices"] = devices

python/mkroms.py

@@ -110,6 +110,10 @@ EXCLUDE = set([
 
 ])
 
+def fix_machine_description(x):
+	# CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)
+	x = x.replace(", www.dreher.net","")
+	return x
 
 def build_known_roms_list():
 	infile = "mame-0233-full.html"
@@ -186,7 +190,7 @@ for m in machines:
 
 # if full: ROMS = list(mnames)
 # else: ROMS = list(mnames.difference(EXCLUDE))
-ROMS =  [{ 'value': k, 'description': v} for k, v in mnames.items()];
+ROMS =  [{ 'value': k, 'description': fix_machine_description(v)} for k, v in mnames.items()];
 ROMS.sort(key=lambda x: x.get('description'))
 
 # data = []