diff --git a/Ample.xcodeproj/project.pbxproj b/Ample.xcodeproj/project.pbxproj
index 664691f..e595a8e 100644
--- a/Ample.xcodeproj/project.pbxproj
+++ b/Ample.xcodeproj/project.pbxproj
@@ -58,6 +58,10 @@
 		B6109A4124F5F377005CB652 /* apple2cp.plist in Resources */ = {isa = PBXBuildFile; fileRef = B6109A1424F5F376005CB652 /* apple2cp.plist */; };
 		B6109A4224F5F377005CB652 /* apple2p.plist in Resources */ = {isa = PBXBuildFile; fileRef = B6109A1524F5F376005CB652 /* apple2p.plist */; };
 		B6109A4324F5F377005CB652 /* agat7.plist in Resources */ = {isa = PBXBuildFile; fileRef = B6109A1624F5F376005CB652 /* agat7.plist */; };
+		B6152B5625F4549F00605E6E /* Slot.m in Sources */ = {isa = PBXBuildFile; fileRef = B6152B5525F4549F00605E6E /* Slot.m */; };
+		B6152B5725F4549F00605E6E /* Slot.m in Sources */ = {isa = PBXBuildFile; fileRef = B6152B5525F4549F00605E6E /* Slot.m */; };
+		B6152B5A25F5B57E00605E6E /* Media.m in Sources */ = {isa = PBXBuildFile; fileRef = B6152B5925F5B57E00605E6E /* Media.m */; };
+		B6152B5B25F5B57E00605E6E /* Media.m in Sources */ = {isa = PBXBuildFile; fileRef = B6152B5925F5B57E00605E6E /* Media.m */; };
 		B63C1B8B24FF4BF700511A71 /* Ample.m in Sources */ = {isa = PBXBuildFile; fileRef = B63C1B8A24FF4BF700511A71 /* Ample.m */; };
 		B63C1B8C24FF4BF700511A71 /* Ample.m in Sources */ = {isa = PBXBuildFile; fileRef = B63C1B8A24FF4BF700511A71 /* Ample.m */; };
 		B63C1B8E25004C6D00511A71 /* mame-data.tgz in Resources */ = {isa = PBXBuildFile; fileRef = B63C1B8D25004C6D00511A71 /* mame-data.tgz */; };
@@ -306,6 +310,10 @@
 		B6109A1424F5F376005CB652 /* apple2cp.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = apple2cp.plist; sourceTree = "<group>"; };
 		B6109A1524F5F376005CB652 /* apple2p.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = apple2p.plist; sourceTree = "<group>"; };
 		B6109A1624F5F376005CB652 /* agat7.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = agat7.plist; sourceTree = "<group>"; };
+		B6152B5425F4549F00605E6E /* Slot.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Slot.h; sourceTree = "<group>"; };
+		B6152B5525F4549F00605E6E /* Slot.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = Slot.m; sourceTree = "<group>"; };
+		B6152B5825F5B4F100605E6E /* Media.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Media.h; sourceTree = "<group>"; };
+		B6152B5925F5B57E00605E6E /* Media.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = Media.m; sourceTree = "<group>"; };
 		B63C1B8924FF4B7100511A71 /* Ample.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Ample.h; sourceTree = "<group>"; };
 		B63C1B8A24FF4BF700511A71 /* Ample.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = Ample.m; sourceTree = "<group>"; };
 		B63C1B8D25004C6D00511A71 /* mame-data.tgz */ = {isa = PBXFileReference; lastKnownFileType = file; name = "mame-data.tgz"; path = "embedded/mame-data.tgz"; sourceTree = "<group>"; };
@@ -538,9 +546,13 @@
 				B6BA257E24E99BE9005FB8FF /* AppDelegate.h */,
 				B6BA257F24E99BE9005FB8FF /* AppDelegate.m */,
 				B63C1B8924FF4B7100511A71 /* Ample.h */,
+				B6152B5825F5B4F100605E6E /* Media.h */,
 				B63C1B8A24FF4BF700511A71 /* Ample.m */,
 				B64AF1F4250ED5E400A09B9B /* TableCellView.h */,
 				B64AF1F5250ED5E400A09B9B /* TableCellView.m */,
+				B6152B5425F4549F00605E6E /* Slot.h */,
+				B6152B5525F4549F00605E6E /* Slot.m */,
+				B6152B5925F5B57E00605E6E /* Media.m */,
 				B6E9A17E25088B1B005E7525 /* NewSlotViewController.h */,
 				B6E9A17F25088B1B005E7525 /* NewSlotViewController.m */,
 				B6A1A1932528EB1700DB0FD7 /* Menu.m */,
@@ -910,6 +922,8 @@
 				B6BA258824E99BEB005FB8FF /* main.m in Sources */,
 				B63C1B8B24FF4BF700511A71 /* Ample.m in Sources */,
 				B6B9EA662506A5550080E70D /* EjectButton.m in Sources */,
+				B6152B5A25F5B57E00605E6E /* Media.m in Sources */,
+				B6152B5625F4549F00605E6E /* Slot.m in Sources */,
 				B6D6DE4124FADFAC00661A5F /* LaunchWindowController.m in Sources */,
 				B64E15A924EA1D5300E8AD3D /* MachineViewController.m in Sources */,
 				B64979C224EF6703008ABD20 /* MediaViewController.m in Sources */,
@@ -937,7 +951,9 @@
 				B64AF1F3250ECB2E00A09B9B /* DiskImagesWindowController.m in Sources */,
 				B6B9EA672506A5550080E70D /* EjectButton.m in Sources */,
 				B6A1A1952528EB1700DB0FD7 /* Menu.m in Sources */,
+				B6152B5B25F5B57E00605E6E /* Media.m in Sources */,
 				B6E4B5B124FDE2670094A35C /* LaunchWindowController.m in Sources */,
+				B6152B5725F4549F00605E6E /* Slot.m in Sources */,
 				B6E4B5B224FDE2670094A35C /* MachineViewController.m in Sources */,
 				B6E4B5B324FDE2670094A35C /* MediaViewController.m in Sources */,
 				B64AF1F7250ED5E400A09B9B /* TableCellView.m in Sources */,
diff --git a/Ample/Ample.h b/Ample/Ample.h
index a3132ae..44968f5 100644
--- a/Ample/Ample.h
+++ b/Ample/Ample.h
@@ -23,6 +23,7 @@ NSString *MamePath(void);
 NSURL *MameWorkingDirectory(void);
 NSString *MameWorkingDirectoryPath(void);
 
+NSString *InternString(NSString *key);
 
 NSDictionary *MameMachine(NSString *machine);
 
diff --git a/Ample/Ample.m b/Ample/Ample.m
index 0d76a86..63db253 100644
--- a/Ample/Ample.m
+++ b/Ample/Ample.m
@@ -108,6 +108,23 @@ NSDictionary *MameMachine(NSString *machine) {
     return d;
 }
 
+/* NSCache doesn't retain it's key. This essentially interns it. */
+/* could just abuse NSSelectorFromString() */
+NSString *InternString(NSString *key) {
+    static NSMutableDictionary *storage = nil;
+    
+    if (!storage) {
+        storage = [NSMutableDictionary new];
+    }
+    NSString *copy = [storage objectForKey: key];
+    if (!copy) {
+        copy = [key copy];
+        [storage setObject: copy forKey: copy];
+    }
+    return copy;
+}
+
+
 NSString *kUseCustomMame = @"UseCustomMame";
 NSString *kMamePath = @"MamePath";
 NSString *kMameWorkingDirectory = @"MameWorkingDirectory";
diff --git a/Ample/Media.h b/Ample/Media.h
new file mode 100644
index 0000000..1f87740
--- /dev/null
+++ b/Ample/Media.h
@@ -0,0 +1,30 @@
+//
+//  Media.h
+//  Ample
+//
+//  Created by Kelvin Sherlock on 3/7/2021.
+//  Copyright © 2021 Kelvin Sherlock. All rights reserved.
+//
+
+#ifndef Media_h
+#define Media_h
+
+
+typedef struct Media {
+    unsigned cass;
+    unsigned cdrom;
+    unsigned hard;
+    unsigned floppy_5_25;
+    unsigned floppy_3_5;
+    unsigned pseudo_disk;
+} Media;
+
+struct Media MediaFromDictionary(NSDictionary *);
+
+void MediaAdd(Media *dest, const Media *src);
+
+BOOL MediaEqual(const Media *lhs, const Media *rhs);
+
+extern const Media EmptyMedia;
+
+#endif /* Media_h */
diff --git a/Ample/Media.m b/Ample/Media.m
new file mode 100644
index 0000000..dcb1adf
--- /dev/null
+++ b/Ample/Media.m
@@ -0,0 +1,58 @@
+//
+//  Media.m
+//  Ample
+//
+//  Created by Kelvin Sherlock on 3/7/2021.
+//  Copyright © 2021 Kelvin Sherlock. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import "Media.h"
+
+const Media EmptyMedia = { 0 };
+
+struct Media MediaFromDictionary(NSDictionary *dict) {
+    
+    Media m = { 0 };
+
+#define _(name) m.name = [[dict objectForKey: @ # name] unsignedIntValue]
+    _(cass);
+    _(cdrom);
+    _(hard);
+    _(floppy_3_5);
+    _(floppy_5_25);
+    _(pseudo_disk);
+
+    return m;
+#undef _
+}
+
+void MediaAdd(Media *dest, const Media *src) {
+
+    if (!src || !dest) return;
+
+#define _(name) dest->name += src->name;
+    _(cass);
+    _(cdrom);
+    _(hard);
+    _(floppy_3_5);
+    _(floppy_5_25);
+    _(pseudo_disk);
+#undef _
+}
+
+BOOL MediaEqual(const Media *lhs, const Media *rhs) {
+    if (lhs == rhs) return YES;
+    if (!lhs || !rhs) return NO;
+    
+
+#define _(name) if (lhs->name != rhs->name) return NO;
+    _(cass);
+    _(cdrom);
+    _(hard);
+    _(floppy_3_5);
+    _(floppy_5_25);
+    _(pseudo_disk);
+    return YES;
+#undef _
+}
diff --git a/Ample/MediaViewController.h b/Ample/MediaViewController.h
index df9b61f..e8e9ac4 100644
--- a/Ample/MediaViewController.h
+++ b/Ample/MediaViewController.h
@@ -7,13 +7,14 @@
 //
 
 #import <Cocoa/Cocoa.h>
+#import "Media.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
 @interface MediaViewController : NSViewController <NSOutlineViewDelegate, NSOutlineViewDataSource>
 
 @property (weak) IBOutlet NSOutlineView *outlineView;
-@property (nonatomic) NSDictionary *media;
+@property (nonatomic) Media media;
 @property NSArray *args;
 
 - (IBAction)ejectAction:(id)sender;
diff --git a/Ample/MediaViewController.m b/Ample/MediaViewController.m
index b2e5485..4a11d26 100644
--- a/Ample/MediaViewController.m
+++ b/Ample/MediaViewController.m
@@ -51,6 +51,10 @@
 
 @implementation MediaCategory
 
++(instancetype)categoryWithTitle: (NSString *)title {
+    return [[self alloc] initWithTitle: title];
+}
+
 -(instancetype)initWithTitle: (NSString *)title {
     [self setTitle: title];
     return self;
@@ -248,13 +252,23 @@
 
     MediaCategory *_data[CATEGORY_COUNT];
     NSArray *_root;
-    NSDictionary *_media;
+    Media _media;
 }
 
 @end
 
 @implementation MediaViewController
 
+enum {
+    kIndexFloppy525 = 0,
+    kIndexFloppy35,
+    kIndexHardDrive,
+    kIndexCDROM,
+    kIndexCassette,
+    kIndexDiskImage,
+};
+
+
 -(void)awakeFromNib {
     
     static unsigned first = 0;
@@ -262,35 +276,18 @@
     if (first) return;
     first++;
 
-    MediaCategory *a, *b, *c, *d, *e, *f;
-    
-    a = [[MediaCategory alloc] initWithTitle: @"5.25\" Floppies"];
-    b = [[MediaCategory alloc] initWithTitle: @"3.5\" Floppies"];
-    c = [[MediaCategory alloc] initWithTitle: @"Hard Drives"];
-    d = [[MediaCategory alloc] initWithTitle: @"CD-ROMs"];
-    e = [[MediaCategory alloc] initWithTitle: @"Cassettes"];
-    f = [[MediaCategory alloc] initWithTitle: @"Hard Disk Images"]; // Mac Nubus psuedo image device
-    
-    _data[0] = a;
-    _data[1] = b;
-    _data[2] = c;
-    _data[3] = d;
-    _data[4] = e;
-    _data[5] = f;
+    _data[kIndexFloppy525] = [MediaCategory categoryWithTitle: @"5.25\" Floppies"];
+    _data[kIndexFloppy35] = [MediaCategory categoryWithTitle: @"3.5\" Floppies"];
+    _data[kIndexHardDrive] = [MediaCategory categoryWithTitle: @"Hard Drives"];
+    _data[kIndexCDROM] = [MediaCategory categoryWithTitle: @"CD-ROMs"];
+    _data[kIndexCassette] = [MediaCategory categoryWithTitle: @"Cassettes"];
+    _data[kIndexDiskImage] = [MediaCategory categoryWithTitle: @"Hard Disk Images"]; // Mac Nubus psuedo image device
 
     _root = @[];
 
 }
 
 
-enum {
-    kIndexFloppy_5_25 = 0,
-    kIndexFloppy_3_5,
-    kIndex_HardDrive,
-    kIndexCDROM,
-    kIndexCassette,
-    kIndexDisk,
-};
 
 -(void)rebuildArgs {
     
@@ -343,36 +340,27 @@ enum {
     [_outlineView expandItem: nil expandChildren: YES];
 }
 
--(void)setMedia: (NSDictionary *)media {
+-(void)setMedia: (Media)media {
     
-    static NSString *Keys[] = {
-        @"flop_5_25",
-        @"flop_3_5",
-        @"hard",
-        @"cdrm",
-        @"cass",
-        @"disk",
-    };
-    static_assert(SIZEOF(Keys) == CATEGORY_COUNT, "Missing item");
-
-    NSNumber *o;
     MediaCategory *cat;
-    unsigned i;
     BOOL delta = NO;
-    
-    
-    if (_media == media) return;
+    unsigned x;
+
+    if (MediaEqual(&_media, &media)) return;
     _media = media;
     
-    for (unsigned j = 0; j < CATEGORY_COUNT; ++j) {
     
-        o = [media objectForKey: Keys[j]];
-        i = [o unsignedIntValue];
-        cat = _data[j];
-        delta |= [cat setItemCount: i];
-    }
+#undef _
+#define _(name, index) \
+x = media.name; cat = _data[index]; delta |= [cat setItemCount: x]
+    _(cass, kIndexCassette);
+    _(cdrom, kIndexCDROM);
+    _(hard, kIndexHardDrive);
+    _(floppy_3_5, kIndexFloppy35);
+    _(floppy_5_25, kIndexFloppy525);
+    _(pseudo_disk, kIndexDiskImage);
+
 
-    
     if (delta) {
         [self rebuildRoot];
         [self rebuildArgs];
diff --git a/Ample/NewSlotViewController.h b/Ample/NewSlotViewController.h
index 5c85cbb..2ca01ad 100644
--- a/Ample/NewSlotViewController.h
+++ b/Ample/NewSlotViewController.h
@@ -7,13 +7,14 @@
 //
 
 #import <Cocoa/Cocoa.h>
+#import "Media.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
 @interface NewSlotViewController : NSViewController
 
 @property NSArray *args;
-@property NSDictionary *media;
+@property Media media;
 @property NSSize resolution;
 @property (nonatomic) NSString *machine;
 @end
@@ -22,26 +23,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 @end
 
-@interface SlotTableCellView  : NSTableCellView
 
-@property (weak) IBOutlet NSPopUpButton *menuButton;
-
-@end
-
-
-@interface SlotItem : NSObject
-@property unsigned index;
-@property NSArray *children;
-@property NSArray *menuItems;
-@property NSInteger defaultIndex;
-@property NSInteger selectedIndex;
-
--(NSDictionary *)selectedItem;
--(NSDictionary *)selectedMedia;
--(BOOL)hasDefault;
-
--(void)reset;
-@end
 
 
 NS_ASSUME_NONNULL_END
diff --git a/Ample/NewSlotViewController.m b/Ample/NewSlotViewController.m
index a25e5a7..986a987 100644
--- a/Ample/NewSlotViewController.m
+++ b/Ample/NewSlotViewController.m
@@ -6,8 +6,11 @@
 //  Copyright © 2020 Kelvin Sherlock. All rights reserved.
 //
 
+#import "Ample.h"
 #import "NewSlotViewController.h"
 #import "Menu.h"
+#import "Slot.h"
+#import "Media.h"
 
 /* number of slot types.  bitmask used so should be < sizeof(unsigned *8) */
 #define SLOT_COUNT 21
@@ -15,160 +18,6 @@ static_assert(SLOT_COUNT <= sizeof(unsigned) * 8, "too many slot types");
 
 #define SIZEOF(x) (sizeof(x) / sizeof(x[0]))
 
-@implementation SlotTableCellView
-
-@end
-
-@implementation SlotItem
-
--(id)init {
-    _defaultIndex = -1;
-    _selectedIndex = -1;
-
-    return self;
-}
-
--(NSString *)label {
-    static NSString *Names[] = {
-        @"RAM:",
-        @"Slot 0:",
-        @"Slot 1:",
-        @"Slot 2:",
-        @"Slot 3:",
-        @"Slot 4:",
-        @"Slot 5:",
-        @"Slot 6:",
-        @"Slot 7:",
-        @"Expansion:",
-        @"Auxiliary:",
-        @"RS232:",
-        @"Game I/O:",
-        @"Modem:",
-        @"Printer:",
-
-        // nubus mac
-        @"Slot 9:",
-        @"Slot A:",
-        @"Slot B:",
-        @"Slot C:",
-        @"Slot D:",
-        @"Slot E:",
-    };
-
-    static_assert(SIZEOF(Names) == SLOT_COUNT, "Missing slot");
-    return Names[_index];
-}
-
--(NSString *)flag {
-
-    static NSString *Names[] = {
-        @"-ramsize",
-        @"-sl0",
-        @"-sl1",
-        @"-sl2",
-        @"-sl3",
-        @"-sl4",
-        @"-sl5",
-        @"-sl6",
-        @"-sl7",
-        @"-exp",
-        @"-aux",
-        @"-rs232",
-        @"-gameio",
-        @"-modem",
-        @"-printer",
-        
-        // nubus mac
-        @"-nb9",
-        @"-nba",
-        @"-nbb",
-        @"-nbc",
-        @"-nbd",
-        @"-nbe",
-    };
-    static_assert(SIZEOF(Names) == SLOT_COUNT, "Missing Slot");
-    return Names[_index];
-    
-}
-
--(void)buildMenuWithSelectedValue: (NSString *)value {
-    
-    NSMutableArray *tmp = [NSMutableArray arrayWithCapacity: [_children count]];
-    _defaultIndex = -1;
-    _selectedIndex = -1;
-    
-    int ix = 0;
-    for (NSDictionary *d in _children) {
-        NSString *title = [d objectForKey: @"description"];
-        NSMenuItem *mi = [[NSMenuItem alloc] initWithTitle: title  action: NULL keyEquivalent: @""];
-        
-        // row 0 for slots is -- None -- which should be nil...
-        [mi setRepresentedObject: d];
-
-        
-        BOOL disabled = [(NSNumber *)[d objectForKey: @"disabled"] boolValue];
-        if (disabled) {
-            [mi setEnabled: NO];
-        }
-        
-        BOOL def = [(NSNumber *)[d objectForKey: @"default"] boolValue];
-        if (def) {
-            [mi setAttributedTitle: ItalicMenuString(title)];
-            _defaultIndex = ix;
-        }
-        
-        if (value) {
-            NSString *v = [d objectForKey: @"value"];
-            if ([value compare: v] == NSOrderedSame) {
-                _selectedIndex = ix;
-            }
-        }
-        
-        [tmp addObject: mi];
-        ++ix;
-    }
-    
-    
-    [self setMenuItems: tmp];
-    if (_selectedIndex < 0) _selectedIndex = _defaultIndex;
-    if (_selectedIndex < 0) _selectedIndex = 0;
-}
-
--(void)reset {
-    [self setSelectedIndex: _defaultIndex >= 0 ? _defaultIndex : 0];
-}
-
--(NSDictionary *)selectedItem {
-    if (_selectedIndex < 0) return nil;
-    return [_children objectAtIndex: _selectedIndex];
-}
-
--(NSDictionary *)selectedMedia {
-    if (_selectedIndex < 0) return nil;
-    NSDictionary *d = [_children objectAtIndex: _selectedIndex];
-    return [d objectForKey: @"media"];
-}
-
--(BOOL)hasDefault {
-    return _defaultIndex >= 0;
-}
-
--(void)prepareView: (SlotTableCellView *)view {
-    
-    NSPopUpButton *button = [view menuButton];
-    NSTextField *text = [view textField];
-    
-    [text setObjectValue: [self label]];
-    
-    [button unbind: @"selectedIndex"];
-    [[button menu] setItemArray: _menuItems];
-    [button bind: @"selectedIndex" toObject: self withKeyPath: @"selectedIndex" options: nil];
-    [button setTag: _index];
-}
-
-@end
-
-
 
 
 
@@ -178,70 +27,57 @@ static_assert(SLOT_COUNT <= sizeof(unsigned) * 8, "too many slot types");
 @end
 
 @implementation NewSlotViewController {
-    NSMutableArray *_root;
+    NSArray *_root;
 
     unsigned _slots_explicit;
     unsigned _slots_valid;
     unsigned _slots_default;
 
-    NSDictionary *_slot_object[SLOT_COUNT];
-    NSDictionary *_slot_media[SLOT_COUNT];
+    Slot *_slot_object[SLOT_COUNT];
     NSString *_slot_value[SLOT_COUNT]; // when explicitely set.
-    NSDictionary *_machine_media;
+
+    Media _slot_media[SLOT_COUNT];
+    Media _machine_media;
     
     NSDictionary *_machine_data;
+        
+    
 }
 
 - (void)viewDidLoad {
     [super viewDidLoad];
     // Do view setup here.
     
-    _root = [NSMutableArray new];
+    _root = @[];
 }
 
 -(void)resetMachine {
 
-    [_root removeAllObjects];
+    _root = @[];
     [_outlineView reloadData];
 
     _slots_valid = 0;
     _slots_explicit = 0;
     _slots_default = 0;
-    _machine_media = nil;
+    _machine_media = EmptyMedia;
     _machine_data = nil;
     
     for (unsigned i = 0; i < SLOT_COUNT; ++i) {
-        _slot_media[i] = nil;
+        _slot_media[i] = EmptyMedia;
         _slot_object[i] = nil;
         _slot_value[i] = nil;
     }
 
     [self setResolution: NSMakeSize(0, 0)];
     [self setArgs: @[]];
-    [self setMedia: @{}];
+    [self setMedia: EmptyMedia];
 }
 
 -(void)loadMachine {
 
-    static NSString *Keys[] = {
-        @"ram",
-        @"sl0", @"sl1", @"sl2", @"sl3",
-        @"sl4", @"sl5", @"sl6", @"sl7",
-        @"exp", @"aux", @"rs232",
-        @"gameio", @"printer", @"modem",
-        
-        // mac
-        @"nb9", @"nba", @"nbb", @"nbc", @"nbd", @"nbe",
-    };
     
-    static_assert(SIZEOF(Keys) == SLOT_COUNT, "Missing slot");
-    static unsigned SizeofKeys = SIZEOF(Keys);
+    NSDictionary *d = MameMachine(_machine);
     
-    
-    NSBundle *bundle = [NSBundle mainBundle];
-    NSURL *url= [bundle URLForResource: _machine withExtension: @"plist"];
-    
-    NSDictionary *d = [NSDictionary dictionaryWithContentsOfURL: url];
 
     if (!d) {
         [self resetMachine];
@@ -260,40 +96,36 @@ static_assert(SLOT_COUNT <= sizeof(unsigned) * 8, "too many slot types");
     //_slots_explicit = 0;
     _slots_default = 0;
     
-    _machine_media = [d objectForKey: @"media"];
+    _machine_media = MediaFromDictionary([d objectForKey: @"media"]);
 
     _machine_data = d;
     
-    [_root removeAllObjects];
-    
-    unsigned mask = 1;
-    for (unsigned i = 0; i < SizeofKeys; ++i, mask <<= 1) {
-        
-        NSString *v = [_slot_object[i] objectForKey: @"value"];
-        _slot_media[i] = nil;
+    for (unsigned i = 0; i < SLOT_COUNT; ++i) {
+        _slot_media[i] = EmptyMedia;
         _slot_object[i] = nil;
-        if (v) _slot_value[i] = v;
-
-        NSArray *options = [d objectForKey: Keys[i]];
-        if (!options) continue;
-        
-        _slots_valid |= mask;
-
-        SlotItem *item = [SlotItem new];
-        [item setIndex: i];
-        [item setChildren: options];
-        [item buildMenuWithSelectedValue: _slot_value[i]];
-        
-        if ([item defaultIndex] >= 0) {
-            _slots_default |= mask;
-        }
-        // default media...
-        _slot_media[i] = [item selectedMedia];
-        [_root addObject: item];
     }
     
+
+    extern NSArray *BuildSlots(NSString *name, NSDictionary *data);
+    _root = BuildSlots(_machine, d);
     
-    
+    for (Slot *item in _root) {
+        NSInteger index = [item index];
+        if (index < 0) continue;
+        unsigned mask = 1 << index;
+
+        _slots_valid |= mask;
+        if ([item defaultIndex] >= 0)
+            _slots_default |= mask;
+        
+        if (_slot_value[index])
+            [item selectValue: _slot_value[index]];
+        
+        _slot_media[index] = [item selectedMedia];
+        _slot_object[index] = item;
+    }
+
+
     [_outlineView reloadData];
     [self rebuildMedia];
     [self rebuildArgs];
@@ -316,180 +148,71 @@ static_assert(SLOT_COUNT <= sizeof(unsigned) * 8, "too many slot types");
 
 -(void)rebuildMedia {
 
-
-    #define _(var, o) var += [[o objectForKey: @ # var ] unsignedIntValue]
-        
-    unsigned cass = 0;
-    unsigned cdrm = 0;
-    unsigned hard = 0;
-    unsigned flop_5_25 = 0;
-    unsigned flop_3_5 = 0;
-    unsigned pseudo_disk = 0; // mac psuedo disk
-
-#if 0
-    for (SlotItem *item in _root) {
-        NSDictionary *tmp = [item selectedMedia];
-        if (tmp) {
-            _(cass, tmp);
-            _(cdrm, tmp);
-            _(hard, tmp);
-            _(flop_5_25, tmp);
-            _(flop_3_5, tmp);
-            _(pseudo_disk, tmp);
-        }
-    }
-#endif
-#if 1
+    
+    Media media = _machine_media;
+    
     unsigned mask = 1;
     for (unsigned i = 0; i < SLOT_COUNT; ++i, mask <<= 1) {
         
         if (_slots_valid & mask) {
-            NSDictionary *tmp = _slot_media[i];
-            if (tmp) {
-                _(cass, tmp);
-                _(cdrm, tmp);
-                _(hard, tmp);
-                _(flop_5_25, tmp);
-                _(flop_3_5, tmp);
-                _(pseudo_disk, tmp);
-            }
+            MediaAdd(&media, &_slot_media[i]);
         }
     }
-#endif
-    NSDictionary *tmp = _machine_media;
-    if (tmp) {
-        _(cass, tmp);
-        _(cdrm, tmp);
-        _(hard, tmp);
-        _(flop_5_25, tmp);
-        _(flop_3_5, tmp);
-        _(pseudo_disk, tmp);
-    }
-    
-    [self setMedia: @{
-        @"cass": @(cass),
-        @"cdrm": @(cdrm),
-        @"hard": @(hard),
-        @"flop_5_25": @(flop_5_25),
-        @"flop_3_5": @(flop_3_5),
-        @"disk": @(pseudo_disk),
-    }];
-    
+
+    [self setMedia: media];
 }
 
 
-static NSString *SlotFlagForIndex(unsigned index){
-     static NSString *Names[] = {
-         @"-ramsize",
-         @"-sl0",
-         @"-sl1",
-         @"-sl2",
-         @"-sl3",
-         @"-sl4",
-         @"-sl5",
-         @"-sl6",
-         @"-sl7",
-         @"-exp",
-         @"-aux",
-         @"-rs232",
-         @"-gameio",
-         @"-modem",
-         @"-printer",
-         // nubus mac
-         @"-nb9",
-         @"-nba",
-         @"-nbb",
-         @"-nbc",
-         @"-nbd",
-         @"-nbe",
-     };
-     static_assert(SIZEOF(Names) == SLOT_COUNT, "Missing slot");
-     return Names[index];
-}
-
 -(void)rebuildArgs {
 
     NSMutableArray *args = [NSMutableArray new];
 
-    for (SlotItem *item in _root) {
-        NSDictionary *d  = [item selectedItem];
-        if ([(NSNumber *)[d objectForKey: @"default"] boolValue]) {
-            continue; // default, don't include it.
-        }
-        NSString *value = [d objectForKey: @"value"];
+    for (Slot *item in _root) {
+        
+        NSArray *x = [item args];
+        if (x) [args addObjectsFromArray: x];
+    }
 
-        if (!value || ![value length]) {
-            if (![item hasDefault]) continue;
-            value = @"";
-        }
-        [args addObject: [item flag]];
-        [args addObject: value];
-    }
-    
-#if 0
-    unsigned mask = 1;
-    for (unsigned i = 0 ; i < SLOT_COUNT; ++i, mask <<= 1) {
-        
-        if (!(_slots_valid & mask)) continue;
-        NSDictionary *d = _slot_object[i];
-        
-        if ([(NSNumber *)[d objectForKey: @"default"] boolValue]) {
-            continue; // default, don't include it.
-        }
-        NSString *value = [d objectForKey: @"value"];
-        
-        if (!value) {
-            // if slot has a default, need to overwrite it.
-            if (!(_slots_default & mask)) continue;
-            value = @"";
-        }
-        
-        [args addObject: SlotFlagForIndex(i)];
-        [args addObject: value];
-    }
-#endif
     [self setArgs: args];
 }
 
 - (IBAction)menuChanged:(NSPopUpButton *)sender {
 
-    unsigned index = (unsigned)[sender tag];
+    NSInteger index = [sender tag];
+    if (index < 0) return; //
     unsigned mask = 1 << index;
 
 
     // index 0 = ram = special case...
     
-    NSDictionary *d = [[sender selectedItem] representedObject];
+    SlotOption *o = [[sender selectedItem] representedObject];
+    Slot *item = _slot_object[index];
 
     _slots_explicit |= mask;
-    _slot_value[index] = [d objectForKey: @"value"];
+    _slot_value[index] = [o value];
     //_slots_default &= ~mask;
     
-    //_slot_object[index] = d;
-
-    // media...
-    NSDictionary *newMedia = [d objectForKey: @"media"];
-    NSDictionary *oldMedia = _slot_media[index];
-    
-    if (newMedia != oldMedia) {
-        _slot_media[index] = newMedia;
+    Media media = [item selectedMedia];
+    if (!MediaEqual(&media, &_slot_media[index])) {
+        _slot_media[index] = media;
         [self rebuildMedia];
+
     }
-    
+
     [self rebuildArgs];
 }
 -(IBAction)resetSlots:(id)sender {
     
     _slots_explicit = 0;
     for (unsigned i = 0; i < SLOT_COUNT; ++i) {
-        _slot_media[i] = nil;
-        _slot_object[i] = nil;
+        _slot_media[i] = EmptyMedia;
         _slot_value[i] = nil;
     }
-    for (SlotItem *item in _root) {
+    for (Slot *item in _root) {
         [item reset];
         // if children, reset them too...
-        unsigned index = [item index];
+        NSInteger index = [item index];
+        if (index < 0) continue;
         _slot_media[index] = [item selectedMedia];
     }
     //[_outlineView reloadData]; // will need to reload if changing the default makes children disappear.
@@ -523,7 +246,7 @@ static NSString *SlotFlagForIndex(unsigned index){
 
 
 
-- (NSView *)outlineView:(NSOutlineView *)outlineView viewForTableColumn:(NSTableColumn *)tableColumn item:(SlotItem *)item {
+- (NSView *)outlineView:(NSOutlineView *)outlineView viewForTableColumn:(NSTableColumn *)tableColumn item:(Slot *)item {
 
     SlotTableCellView *v = [outlineView makeViewWithIdentifier: @"MenuCell" owner: self];
 
diff --git a/Ample/Resources/ace100.plist b/Ample/Resources/ace100.plist
index e75cb47..41d1b86 100644
--- a/Ample/Resources/ace100.plist
+++ b/Ample/Resources/ace100.plist
@@ -179,7 +179,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -192,7 +192,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -205,7 +205,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -218,7 +218,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -263,7 +263,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -286,7 +286,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -676,7 +676,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -689,7 +689,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -702,7 +702,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -715,7 +715,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -760,7 +760,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -783,7 +783,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1173,7 +1173,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1186,7 +1186,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1199,7 +1199,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1212,7 +1212,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1257,7 +1257,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -1280,7 +1280,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1670,7 +1670,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1683,7 +1683,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1696,7 +1696,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1709,7 +1709,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1754,7 +1754,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -1777,7 +1777,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2167,7 +2167,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2180,7 +2180,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2193,7 +2193,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2206,7 +2206,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2251,7 +2251,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -2274,7 +2274,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2664,7 +2664,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2677,7 +2677,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2690,7 +2690,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2703,7 +2703,7 @@
         <true/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2748,7 +2748,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -2771,7 +2771,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3161,7 +3161,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3174,7 +3174,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3187,7 +3187,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3200,7 +3200,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3245,7 +3245,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -3268,7 +3268,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
diff --git a/Ample/Resources/agat7.plist b/Ample/Resources/agat7.plist
index c38704a..361d88c 100644
--- a/Ample/Resources/agat7.plist
+++ b/Ample/Resources/agat7.plist
@@ -64,7 +64,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -128,7 +128,7 @@
         <true/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -192,7 +192,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -256,7 +256,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -320,7 +320,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
diff --git a/Ample/Resources/agat9.plist b/Ample/Resources/agat9.plist
index bb9184e..774c1f0 100644
--- a/Ample/Resources/agat9.plist
+++ b/Ample/Resources/agat9.plist
@@ -72,7 +72,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -85,7 +85,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -141,7 +141,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -154,7 +154,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -210,7 +210,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -223,7 +223,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -279,7 +279,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -292,7 +292,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -348,7 +348,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -361,7 +361,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -417,7 +417,7 @@
         <true/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -430,7 +430,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
diff --git a/Ample/Resources/albert.plist b/Ample/Resources/albert.plist
index ee6c1fc..089e8f8 100644
--- a/Ample/Resources/albert.plist
+++ b/Ample/Resources/albert.plist
@@ -119,7 +119,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -132,7 +132,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -145,7 +145,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -158,7 +158,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -203,7 +203,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -226,7 +226,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -616,7 +616,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -629,7 +629,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -642,7 +642,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -655,7 +655,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -700,7 +700,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -723,7 +723,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1113,7 +1113,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1126,7 +1126,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1139,7 +1139,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1152,7 +1152,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1197,7 +1197,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -1220,7 +1220,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1610,7 +1610,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1623,7 +1623,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1636,7 +1636,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1649,7 +1649,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1694,7 +1694,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -1717,7 +1717,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2107,7 +2107,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2120,7 +2120,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2133,7 +2133,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2146,7 +2146,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2191,7 +2191,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -2214,7 +2214,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2604,7 +2604,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2617,7 +2617,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2630,7 +2630,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2643,7 +2643,7 @@
         <true/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2688,7 +2688,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -2711,7 +2711,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3101,7 +3101,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3114,7 +3114,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3127,7 +3127,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3140,7 +3140,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3185,7 +3185,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -3208,7 +3208,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
diff --git a/Ample/Resources/am100.plist b/Ample/Resources/am100.plist
index 5c6f9fc..6afb78a 100644
--- a/Ample/Resources/am100.plist
+++ b/Ample/Resources/am100.plist
@@ -119,7 +119,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -132,7 +132,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -145,7 +145,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -158,7 +158,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -203,7 +203,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -226,7 +226,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -616,7 +616,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -629,7 +629,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -642,7 +642,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -655,7 +655,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -700,7 +700,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -723,7 +723,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1113,7 +1113,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1126,7 +1126,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1139,7 +1139,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1152,7 +1152,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1197,7 +1197,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -1220,7 +1220,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1610,7 +1610,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1623,7 +1623,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1636,7 +1636,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1649,7 +1649,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1694,7 +1694,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -1717,7 +1717,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2107,7 +2107,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2120,7 +2120,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2133,7 +2133,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2146,7 +2146,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2191,7 +2191,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -2214,7 +2214,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2604,7 +2604,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2617,7 +2617,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2630,7 +2630,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2643,7 +2643,7 @@
         <true/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2688,7 +2688,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -2711,7 +2711,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3101,7 +3101,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3114,7 +3114,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3127,7 +3127,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3140,7 +3140,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3185,7 +3185,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -3208,7 +3208,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
diff --git a/Ample/Resources/am64.plist b/Ample/Resources/am64.plist
index 2608c47..b0345af 100644
--- a/Ample/Resources/am64.plist
+++ b/Ample/Resources/am64.plist
@@ -119,7 +119,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -132,7 +132,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -145,7 +145,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -158,7 +158,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -203,7 +203,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -226,7 +226,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -616,7 +616,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -629,7 +629,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -642,7 +642,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -655,7 +655,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -700,7 +700,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -723,7 +723,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1113,7 +1113,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1126,7 +1126,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1139,7 +1139,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1152,7 +1152,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1197,7 +1197,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -1220,7 +1220,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1610,7 +1610,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1623,7 +1623,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1636,7 +1636,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1649,7 +1649,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1694,7 +1694,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -1717,7 +1717,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2107,7 +2107,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2120,7 +2120,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2133,7 +2133,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2146,7 +2146,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2191,7 +2191,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -2214,7 +2214,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2604,7 +2604,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2617,7 +2617,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2630,7 +2630,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2643,7 +2643,7 @@
         <true/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2688,7 +2688,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -2711,7 +2711,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3101,7 +3101,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3114,7 +3114,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3127,7 +3127,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3140,7 +3140,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3185,7 +3185,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -3208,7 +3208,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
diff --git a/Ample/Resources/apple2.plist b/Ample/Resources/apple2.plist
index 4ee95ab..bf1cc0a 100644
--- a/Ample/Resources/apple2.plist
+++ b/Ample/Resources/apple2.plist
@@ -179,7 +179,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -192,7 +192,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -205,7 +205,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -218,7 +218,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -263,7 +263,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -286,7 +286,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -676,7 +676,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -689,7 +689,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -702,7 +702,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -715,7 +715,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -760,7 +760,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -783,7 +783,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1173,7 +1173,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1186,7 +1186,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1199,7 +1199,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1212,7 +1212,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1257,7 +1257,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -1280,7 +1280,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1670,7 +1670,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1683,7 +1683,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1696,7 +1696,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1709,7 +1709,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1754,7 +1754,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -1777,7 +1777,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2167,7 +2167,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2180,7 +2180,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2193,7 +2193,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2206,7 +2206,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2251,7 +2251,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -2274,7 +2274,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2664,7 +2664,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2677,7 +2677,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2690,7 +2690,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2703,7 +2703,7 @@
         <true/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2748,7 +2748,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -2771,7 +2771,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3161,7 +3161,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3174,7 +3174,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3187,7 +3187,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3200,7 +3200,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3245,7 +3245,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -3268,7 +3268,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
diff --git a/Ample/Resources/apple2c.plist b/Ample/Resources/apple2c.plist
index 15ad1dd..5fe45bf 100644
--- a/Ample/Resources/apple2c.plist
+++ b/Ample/Resources/apple2c.plist
@@ -21,7 +21,7 @@
     </array>
     <key>media</key>
     <dict>
-      <key>flop_5_25</key>
+      <key>floppy_5_25</key>
       <integer>2</integer>
     </dict>
     <key>resolution</key>
diff --git a/Ample/Resources/apple2cp.plist b/Ample/Resources/apple2cp.plist
index 6f885f1..13d7f93 100644
--- a/Ample/Resources/apple2cp.plist
+++ b/Ample/Resources/apple2cp.plist
@@ -61,9 +61,9 @@
     </array>
     <key>media</key>
     <dict>
-      <key>flop_5_25</key>
+      <key>floppy_5_25</key>
       <integer>2</integer>
-      <key>flop_3_5</key>
+      <key>floppy_3_5</key>
       <integer>2</integer>
     </dict>
     <key>resolution</key>
diff --git a/Ample/Resources/apple2e.plist b/Ample/Resources/apple2e.plist
index eb66c38..304b256 100644
--- a/Ample/Resources/apple2e.plist
+++ b/Ample/Resources/apple2e.plist
@@ -80,7 +80,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -93,7 +93,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -106,7 +106,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -119,7 +119,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -174,7 +174,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -197,7 +197,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -326,11 +326,8 @@
         <string>CMS SCSI II Card</string>
         <key>default</key>
         <false/>
-        <key>media</key>
-        <dict>
-          <key>hard</key>
-          <integer>1</integer>
-        </dict>
+        <key>disabled</key>
+        <true/>
       </dict>
       <dict>
         <key>value</key>
@@ -650,7 +647,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -663,7 +660,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -676,7 +673,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -689,7 +686,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -744,7 +741,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -767,7 +764,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -896,11 +893,8 @@
         <string>CMS SCSI II Card</string>
         <key>default</key>
         <false/>
-        <key>media</key>
-        <dict>
-          <key>hard</key>
-          <integer>1</integer>
-        </dict>
+        <key>disabled</key>
+        <true/>
       </dict>
       <dict>
         <key>value</key>
@@ -1220,7 +1214,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1233,7 +1227,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1246,7 +1240,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1259,7 +1253,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1314,7 +1308,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -1337,7 +1331,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1466,11 +1460,8 @@
         <string>CMS SCSI II Card</string>
         <key>default</key>
         <false/>
-        <key>media</key>
-        <dict>
-          <key>hard</key>
-          <integer>1</integer>
-        </dict>
+        <key>disabled</key>
+        <true/>
       </dict>
       <dict>
         <key>value</key>
@@ -1790,7 +1781,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1803,7 +1794,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1816,7 +1807,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1829,7 +1820,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1884,7 +1875,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -1907,7 +1898,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2036,11 +2027,8 @@
         <string>CMS SCSI II Card</string>
         <key>default</key>
         <false/>
-        <key>media</key>
-        <dict>
-          <key>hard</key>
-          <integer>1</integer>
-        </dict>
+        <key>disabled</key>
+        <true/>
       </dict>
       <dict>
         <key>value</key>
@@ -2360,7 +2348,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2373,7 +2361,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2386,7 +2374,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2399,7 +2387,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2454,7 +2442,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -2477,7 +2465,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2606,11 +2594,8 @@
         <string>CMS SCSI II Card</string>
         <key>default</key>
         <false/>
-        <key>media</key>
-        <dict>
-          <key>hard</key>
-          <integer>1</integer>
-        </dict>
+        <key>disabled</key>
+        <true/>
       </dict>
       <dict>
         <key>value</key>
@@ -2930,7 +2915,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2943,7 +2928,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2956,7 +2941,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2969,7 +2954,7 @@
         <true/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3024,7 +3009,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -3047,7 +3032,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3176,11 +3161,8 @@
         <string>CMS SCSI II Card</string>
         <key>default</key>
         <false/>
-        <key>media</key>
-        <dict>
-          <key>hard</key>
-          <integer>1</integer>
-        </dict>
+        <key>disabled</key>
+        <true/>
       </dict>
       <dict>
         <key>value</key>
@@ -3500,7 +3482,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3513,7 +3495,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3526,7 +3508,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3539,7 +3521,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3594,7 +3576,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -3617,7 +3599,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3746,11 +3728,8 @@
         <string>CMS SCSI II Card</string>
         <key>default</key>
         <false/>
-        <key>media</key>
-        <dict>
-          <key>hard</key>
-          <integer>1</integer>
-        </dict>
+        <key>disabled</key>
+        <true/>
       </dict>
       <dict>
         <key>value</key>
diff --git a/Ample/Resources/apple2ee.plist b/Ample/Resources/apple2ee.plist
index d4d7e13..ac6fbaa 100644
--- a/Ample/Resources/apple2ee.plist
+++ b/Ample/Resources/apple2ee.plist
@@ -80,7 +80,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -93,7 +93,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -106,7 +106,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -119,7 +119,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -174,7 +174,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -197,7 +197,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -326,11 +326,8 @@
         <string>CMS SCSI II Card</string>
         <key>default</key>
         <false/>
-        <key>media</key>
-        <dict>
-          <key>hard</key>
-          <integer>1</integer>
-        </dict>
+        <key>disabled</key>
+        <true/>
       </dict>
       <dict>
         <key>value</key>
@@ -650,7 +647,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -663,7 +660,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -676,7 +673,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -689,7 +686,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -744,7 +741,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -767,7 +764,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -896,11 +893,8 @@
         <string>CMS SCSI II Card</string>
         <key>default</key>
         <false/>
-        <key>media</key>
-        <dict>
-          <key>hard</key>
-          <integer>1</integer>
-        </dict>
+        <key>disabled</key>
+        <true/>
       </dict>
       <dict>
         <key>value</key>
@@ -1220,7 +1214,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1233,7 +1227,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1246,7 +1240,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1259,7 +1253,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1314,7 +1308,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -1337,7 +1331,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1466,11 +1460,8 @@
         <string>CMS SCSI II Card</string>
         <key>default</key>
         <false/>
-        <key>media</key>
-        <dict>
-          <key>hard</key>
-          <integer>1</integer>
-        </dict>
+        <key>disabled</key>
+        <true/>
       </dict>
       <dict>
         <key>value</key>
@@ -1790,7 +1781,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1803,7 +1794,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1816,7 +1807,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1829,7 +1820,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1884,7 +1875,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -1907,7 +1898,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2036,11 +2027,8 @@
         <string>CMS SCSI II Card</string>
         <key>default</key>
         <false/>
-        <key>media</key>
-        <dict>
-          <key>hard</key>
-          <integer>1</integer>
-        </dict>
+        <key>disabled</key>
+        <true/>
       </dict>
       <dict>
         <key>value</key>
@@ -2360,7 +2348,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2373,7 +2361,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2386,7 +2374,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2399,7 +2387,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2454,7 +2442,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -2477,7 +2465,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2606,11 +2594,8 @@
         <string>CMS SCSI II Card</string>
         <key>default</key>
         <false/>
-        <key>media</key>
-        <dict>
-          <key>hard</key>
-          <integer>1</integer>
-        </dict>
+        <key>disabled</key>
+        <true/>
       </dict>
       <dict>
         <key>value</key>
@@ -2930,7 +2915,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2943,7 +2928,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2956,7 +2941,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2969,7 +2954,7 @@
         <true/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3024,7 +3009,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -3047,7 +3032,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3176,11 +3161,8 @@
         <string>CMS SCSI II Card</string>
         <key>default</key>
         <false/>
-        <key>media</key>
-        <dict>
-          <key>hard</key>
-          <integer>1</integer>
-        </dict>
+        <key>disabled</key>
+        <true/>
       </dict>
       <dict>
         <key>value</key>
@@ -3500,7 +3482,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3513,7 +3495,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3526,7 +3508,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3539,7 +3521,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3594,7 +3576,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -3617,7 +3599,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3746,11 +3728,8 @@
         <string>CMS SCSI II Card</string>
         <key>default</key>
         <false/>
-        <key>media</key>
-        <dict>
-          <key>hard</key>
-          <integer>1</integer>
-        </dict>
+        <key>disabled</key>
+        <true/>
       </dict>
       <dict>
         <key>value</key>
diff --git a/Ample/Resources/apple2eefr.plist b/Ample/Resources/apple2eefr.plist
index 3d1cee1..dce0e4f 100644
--- a/Ample/Resources/apple2eefr.plist
+++ b/Ample/Resources/apple2eefr.plist
@@ -80,7 +80,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -93,7 +93,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -106,7 +106,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -119,7 +119,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -174,7 +174,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -197,7 +197,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -326,11 +326,8 @@
         <string>CMS SCSI II Card</string>
         <key>default</key>
         <false/>
-        <key>media</key>
-        <dict>
-          <key>hard</key>
-          <integer>1</integer>
-        </dict>
+        <key>disabled</key>
+        <true/>
       </dict>
       <dict>
         <key>value</key>
@@ -650,7 +647,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -663,7 +660,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -676,7 +673,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -689,7 +686,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -744,7 +741,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -767,7 +764,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -896,11 +893,8 @@
         <string>CMS SCSI II Card</string>
         <key>default</key>
         <false/>
-        <key>media</key>
-        <dict>
-          <key>hard</key>
-          <integer>1</integer>
-        </dict>
+        <key>disabled</key>
+        <true/>
       </dict>
       <dict>
         <key>value</key>
@@ -1220,7 +1214,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1233,7 +1227,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1246,7 +1240,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1259,7 +1253,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1314,7 +1308,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -1337,7 +1331,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1466,11 +1460,8 @@
         <string>CMS SCSI II Card</string>
         <key>default</key>
         <false/>
-        <key>media</key>
-        <dict>
-          <key>hard</key>
-          <integer>1</integer>
-        </dict>
+        <key>disabled</key>
+        <true/>
       </dict>
       <dict>
         <key>value</key>
@@ -1790,7 +1781,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1803,7 +1794,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1816,7 +1807,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1829,7 +1820,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1884,7 +1875,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -1907,7 +1898,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2036,11 +2027,8 @@
         <string>CMS SCSI II Card</string>
         <key>default</key>
         <false/>
-        <key>media</key>
-        <dict>
-          <key>hard</key>
-          <integer>1</integer>
-        </dict>
+        <key>disabled</key>
+        <true/>
       </dict>
       <dict>
         <key>value</key>
@@ -2360,7 +2348,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2373,7 +2361,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2386,7 +2374,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2399,7 +2387,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2454,7 +2442,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -2477,7 +2465,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2606,11 +2594,8 @@
         <string>CMS SCSI II Card</string>
         <key>default</key>
         <false/>
-        <key>media</key>
-        <dict>
-          <key>hard</key>
-          <integer>1</integer>
-        </dict>
+        <key>disabled</key>
+        <true/>
       </dict>
       <dict>
         <key>value</key>
@@ -2930,7 +2915,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2943,7 +2928,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2956,7 +2941,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2969,7 +2954,7 @@
         <true/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3024,7 +3009,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -3047,7 +3032,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3176,11 +3161,8 @@
         <string>CMS SCSI II Card</string>
         <key>default</key>
         <false/>
-        <key>media</key>
-        <dict>
-          <key>hard</key>
-          <integer>1</integer>
-        </dict>
+        <key>disabled</key>
+        <true/>
       </dict>
       <dict>
         <key>value</key>
@@ -3500,7 +3482,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3513,7 +3495,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3526,7 +3508,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3539,7 +3521,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3594,7 +3576,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -3617,7 +3599,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3746,11 +3728,8 @@
         <string>CMS SCSI II Card</string>
         <key>default</key>
         <false/>
-        <key>media</key>
-        <dict>
-          <key>hard</key>
-          <integer>1</integer>
-        </dict>
+        <key>disabled</key>
+        <true/>
       </dict>
       <dict>
         <key>value</key>
diff --git a/Ample/Resources/apple2ees.plist b/Ample/Resources/apple2ees.plist
index 041d75f..a2d0a9e 100644
--- a/Ample/Resources/apple2ees.plist
+++ b/Ample/Resources/apple2ees.plist
@@ -80,7 +80,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -93,7 +93,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -106,7 +106,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -119,7 +119,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -174,7 +174,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -197,7 +197,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -326,11 +326,8 @@
         <string>CMS SCSI II Card</string>
         <key>default</key>
         <false/>
-        <key>media</key>
-        <dict>
-          <key>hard</key>
-          <integer>1</integer>
-        </dict>
+        <key>disabled</key>
+        <true/>
       </dict>
       <dict>
         <key>value</key>
@@ -650,7 +647,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -663,7 +660,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -676,7 +673,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -689,7 +686,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -744,7 +741,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -767,7 +764,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -896,11 +893,8 @@
         <string>CMS SCSI II Card</string>
         <key>default</key>
         <false/>
-        <key>media</key>
-        <dict>
-          <key>hard</key>
-          <integer>1</integer>
-        </dict>
+        <key>disabled</key>
+        <true/>
       </dict>
       <dict>
         <key>value</key>
@@ -1220,7 +1214,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1233,7 +1227,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1246,7 +1240,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1259,7 +1253,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1314,7 +1308,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -1337,7 +1331,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1466,11 +1460,8 @@
         <string>CMS SCSI II Card</string>
         <key>default</key>
         <false/>
-        <key>media</key>
-        <dict>
-          <key>hard</key>
-          <integer>1</integer>
-        </dict>
+        <key>disabled</key>
+        <true/>
       </dict>
       <dict>
         <key>value</key>
@@ -1790,7 +1781,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1803,7 +1794,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1816,7 +1807,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1829,7 +1820,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1884,7 +1875,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -1907,7 +1898,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2036,11 +2027,8 @@
         <string>CMS SCSI II Card</string>
         <key>default</key>
         <false/>
-        <key>media</key>
-        <dict>
-          <key>hard</key>
-          <integer>1</integer>
-        </dict>
+        <key>disabled</key>
+        <true/>
       </dict>
       <dict>
         <key>value</key>
@@ -2360,7 +2348,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2373,7 +2361,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2386,7 +2374,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2399,7 +2387,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2454,7 +2442,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -2477,7 +2465,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2606,11 +2594,8 @@
         <string>CMS SCSI II Card</string>
         <key>default</key>
         <false/>
-        <key>media</key>
-        <dict>
-          <key>hard</key>
-          <integer>1</integer>
-        </dict>
+        <key>disabled</key>
+        <true/>
       </dict>
       <dict>
         <key>value</key>
@@ -2930,7 +2915,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2943,7 +2928,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2956,7 +2941,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2969,7 +2954,7 @@
         <true/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3024,7 +3009,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -3047,7 +3032,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3176,11 +3161,8 @@
         <string>CMS SCSI II Card</string>
         <key>default</key>
         <false/>
-        <key>media</key>
-        <dict>
-          <key>hard</key>
-          <integer>1</integer>
-        </dict>
+        <key>disabled</key>
+        <true/>
       </dict>
       <dict>
         <key>value</key>
@@ -3500,7 +3482,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3513,7 +3495,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3526,7 +3508,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3539,7 +3521,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3594,7 +3576,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -3617,7 +3599,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3746,11 +3728,8 @@
         <string>CMS SCSI II Card</string>
         <key>default</key>
         <false/>
-        <key>media</key>
-        <dict>
-          <key>hard</key>
-          <integer>1</integer>
-        </dict>
+        <key>disabled</key>
+        <true/>
       </dict>
       <dict>
         <key>value</key>
diff --git a/Ample/Resources/apple2eeuk.plist b/Ample/Resources/apple2eeuk.plist
index 4582e4b..88d5608 100644
--- a/Ample/Resources/apple2eeuk.plist
+++ b/Ample/Resources/apple2eeuk.plist
@@ -80,7 +80,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -93,7 +93,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -106,7 +106,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -119,7 +119,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -174,7 +174,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -197,7 +197,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -326,11 +326,8 @@
         <string>CMS SCSI II Card</string>
         <key>default</key>
         <false/>
-        <key>media</key>
-        <dict>
-          <key>hard</key>
-          <integer>1</integer>
-        </dict>
+        <key>disabled</key>
+        <true/>
       </dict>
       <dict>
         <key>value</key>
@@ -650,7 +647,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -663,7 +660,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -676,7 +673,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -689,7 +686,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -744,7 +741,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -767,7 +764,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -896,11 +893,8 @@
         <string>CMS SCSI II Card</string>
         <key>default</key>
         <false/>
-        <key>media</key>
-        <dict>
-          <key>hard</key>
-          <integer>1</integer>
-        </dict>
+        <key>disabled</key>
+        <true/>
       </dict>
       <dict>
         <key>value</key>
@@ -1220,7 +1214,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1233,7 +1227,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1246,7 +1240,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1259,7 +1253,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1314,7 +1308,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -1337,7 +1331,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1466,11 +1460,8 @@
         <string>CMS SCSI II Card</string>
         <key>default</key>
         <false/>
-        <key>media</key>
-        <dict>
-          <key>hard</key>
-          <integer>1</integer>
-        </dict>
+        <key>disabled</key>
+        <true/>
       </dict>
       <dict>
         <key>value</key>
@@ -1790,7 +1781,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1803,7 +1794,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1816,7 +1807,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1829,7 +1820,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1884,7 +1875,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -1907,7 +1898,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2036,11 +2027,8 @@
         <string>CMS SCSI II Card</string>
         <key>default</key>
         <false/>
-        <key>media</key>
-        <dict>
-          <key>hard</key>
-          <integer>1</integer>
-        </dict>
+        <key>disabled</key>
+        <true/>
       </dict>
       <dict>
         <key>value</key>
@@ -2360,7 +2348,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2373,7 +2361,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2386,7 +2374,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2399,7 +2387,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2454,7 +2442,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -2477,7 +2465,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2606,11 +2594,8 @@
         <string>CMS SCSI II Card</string>
         <key>default</key>
         <false/>
-        <key>media</key>
-        <dict>
-          <key>hard</key>
-          <integer>1</integer>
-        </dict>
+        <key>disabled</key>
+        <true/>
       </dict>
       <dict>
         <key>value</key>
@@ -2930,7 +2915,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2943,7 +2928,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2956,7 +2941,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2969,7 +2954,7 @@
         <true/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3024,7 +3009,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -3047,7 +3032,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3176,11 +3161,8 @@
         <string>CMS SCSI II Card</string>
         <key>default</key>
         <false/>
-        <key>media</key>
-        <dict>
-          <key>hard</key>
-          <integer>1</integer>
-        </dict>
+        <key>disabled</key>
+        <true/>
       </dict>
       <dict>
         <key>value</key>
@@ -3500,7 +3482,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3513,7 +3495,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3526,7 +3508,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3539,7 +3521,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3594,7 +3576,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -3617,7 +3599,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3746,11 +3728,8 @@
         <string>CMS SCSI II Card</string>
         <key>default</key>
         <false/>
-        <key>media</key>
-        <dict>
-          <key>hard</key>
-          <integer>1</integer>
-        </dict>
+        <key>disabled</key>
+        <true/>
       </dict>
       <dict>
         <key>value</key>
diff --git a/Ample/Resources/apple2ep.plist b/Ample/Resources/apple2ep.plist
index adcfa17..d6b61b5 100644
--- a/Ample/Resources/apple2ep.plist
+++ b/Ample/Resources/apple2ep.plist
@@ -80,7 +80,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -93,7 +93,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -106,7 +106,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -119,7 +119,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -174,7 +174,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -197,7 +197,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -326,11 +326,8 @@
         <string>CMS SCSI II Card</string>
         <key>default</key>
         <false/>
-        <key>media</key>
-        <dict>
-          <key>hard</key>
-          <integer>1</integer>
-        </dict>
+        <key>disabled</key>
+        <true/>
       </dict>
       <dict>
         <key>value</key>
@@ -650,7 +647,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -663,7 +660,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -676,7 +673,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -689,7 +686,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -744,7 +741,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -767,7 +764,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -896,11 +893,8 @@
         <string>CMS SCSI II Card</string>
         <key>default</key>
         <false/>
-        <key>media</key>
-        <dict>
-          <key>hard</key>
-          <integer>1</integer>
-        </dict>
+        <key>disabled</key>
+        <true/>
       </dict>
       <dict>
         <key>value</key>
@@ -1220,7 +1214,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1233,7 +1227,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1246,7 +1240,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1259,7 +1253,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1314,7 +1308,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -1337,7 +1331,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1466,11 +1460,8 @@
         <string>CMS SCSI II Card</string>
         <key>default</key>
         <false/>
-        <key>media</key>
-        <dict>
-          <key>hard</key>
-          <integer>1</integer>
-        </dict>
+        <key>disabled</key>
+        <true/>
       </dict>
       <dict>
         <key>value</key>
@@ -1790,7 +1781,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1803,7 +1794,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1816,7 +1807,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1829,7 +1820,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1884,7 +1875,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -1907,7 +1898,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2036,11 +2027,8 @@
         <string>CMS SCSI II Card</string>
         <key>default</key>
         <false/>
-        <key>media</key>
-        <dict>
-          <key>hard</key>
-          <integer>1</integer>
-        </dict>
+        <key>disabled</key>
+        <true/>
       </dict>
       <dict>
         <key>value</key>
@@ -2360,7 +2348,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2373,7 +2361,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2386,7 +2374,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2399,7 +2387,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2454,7 +2442,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -2477,7 +2465,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2606,11 +2594,8 @@
         <string>CMS SCSI II Card</string>
         <key>default</key>
         <false/>
-        <key>media</key>
-        <dict>
-          <key>hard</key>
-          <integer>1</integer>
-        </dict>
+        <key>disabled</key>
+        <true/>
       </dict>
       <dict>
         <key>value</key>
@@ -2930,7 +2915,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2943,7 +2928,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2956,7 +2941,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2969,7 +2954,7 @@
         <true/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3024,7 +3009,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -3047,7 +3032,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3176,11 +3161,8 @@
         <string>CMS SCSI II Card</string>
         <key>default</key>
         <false/>
-        <key>media</key>
-        <dict>
-          <key>hard</key>
-          <integer>1</integer>
-        </dict>
+        <key>disabled</key>
+        <true/>
       </dict>
       <dict>
         <key>value</key>
@@ -3500,7 +3482,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3513,7 +3495,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3526,7 +3508,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3539,7 +3521,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3594,7 +3576,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -3617,7 +3599,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3746,11 +3728,8 @@
         <string>CMS SCSI II Card</string>
         <key>default</key>
         <false/>
-        <key>media</key>
-        <dict>
-          <key>hard</key>
-          <integer>1</integer>
-        </dict>
+        <key>disabled</key>
+        <true/>
       </dict>
       <dict>
         <key>value</key>
diff --git a/Ample/Resources/apple2euk.plist b/Ample/Resources/apple2euk.plist
index 1c3909c..d52b9ba 100644
--- a/Ample/Resources/apple2euk.plist
+++ b/Ample/Resources/apple2euk.plist
@@ -80,7 +80,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -93,7 +93,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -106,7 +106,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -119,7 +119,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -174,7 +174,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -197,7 +197,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -326,11 +326,8 @@
         <string>CMS SCSI II Card</string>
         <key>default</key>
         <false/>
-        <key>media</key>
-        <dict>
-          <key>hard</key>
-          <integer>1</integer>
-        </dict>
+        <key>disabled</key>
+        <true/>
       </dict>
       <dict>
         <key>value</key>
@@ -650,7 +647,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -663,7 +660,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -676,7 +673,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -689,7 +686,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -744,7 +741,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -767,7 +764,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -896,11 +893,8 @@
         <string>CMS SCSI II Card</string>
         <key>default</key>
         <false/>
-        <key>media</key>
-        <dict>
-          <key>hard</key>
-          <integer>1</integer>
-        </dict>
+        <key>disabled</key>
+        <true/>
       </dict>
       <dict>
         <key>value</key>
@@ -1220,7 +1214,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1233,7 +1227,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1246,7 +1240,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1259,7 +1253,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1314,7 +1308,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -1337,7 +1331,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1466,11 +1460,8 @@
         <string>CMS SCSI II Card</string>
         <key>default</key>
         <false/>
-        <key>media</key>
-        <dict>
-          <key>hard</key>
-          <integer>1</integer>
-        </dict>
+        <key>disabled</key>
+        <true/>
       </dict>
       <dict>
         <key>value</key>
@@ -1790,7 +1781,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1803,7 +1794,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1816,7 +1807,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1829,7 +1820,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1884,7 +1875,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -1907,7 +1898,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2036,11 +2027,8 @@
         <string>CMS SCSI II Card</string>
         <key>default</key>
         <false/>
-        <key>media</key>
-        <dict>
-          <key>hard</key>
-          <integer>1</integer>
-        </dict>
+        <key>disabled</key>
+        <true/>
       </dict>
       <dict>
         <key>value</key>
@@ -2360,7 +2348,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2373,7 +2361,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2386,7 +2374,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2399,7 +2387,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2454,7 +2442,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -2477,7 +2465,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2606,11 +2594,8 @@
         <string>CMS SCSI II Card</string>
         <key>default</key>
         <false/>
-        <key>media</key>
-        <dict>
-          <key>hard</key>
-          <integer>1</integer>
-        </dict>
+        <key>disabled</key>
+        <true/>
       </dict>
       <dict>
         <key>value</key>
@@ -2930,7 +2915,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2943,7 +2928,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2956,7 +2941,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2969,7 +2954,7 @@
         <true/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3024,7 +3009,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -3047,7 +3032,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3176,11 +3161,8 @@
         <string>CMS SCSI II Card</string>
         <key>default</key>
         <false/>
-        <key>media</key>
-        <dict>
-          <key>hard</key>
-          <integer>1</integer>
-        </dict>
+        <key>disabled</key>
+        <true/>
       </dict>
       <dict>
         <key>value</key>
@@ -3500,7 +3482,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3513,7 +3495,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3526,7 +3508,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3539,7 +3521,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3594,7 +3576,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -3617,7 +3599,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3746,11 +3728,8 @@
         <string>CMS SCSI II Card</string>
         <key>default</key>
         <false/>
-        <key>media</key>
-        <dict>
-          <key>hard</key>
-          <integer>1</integer>
-        </dict>
+        <key>disabled</key>
+        <true/>
       </dict>
       <dict>
         <key>value</key>
diff --git a/Ample/Resources/apple2gs.plist b/Ample/Resources/apple2gs.plist
index f47698d..fc8c47c 100644
--- a/Ample/Resources/apple2gs.plist
+++ b/Ample/Resources/apple2gs.plist
@@ -91,9 +91,9 @@
     </array>
     <key>media</key>
     <dict>
-      <key>flop_5_25</key>
+      <key>floppy_5_25</key>
       <integer>2</integer>
-      <key>flop_3_5</key>
+      <key>floppy_3_5</key>
       <integer>2</integer>
     </dict>
     <key>resolution</key>
@@ -152,7 +152,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -207,7 +207,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -312,11 +312,8 @@
         <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
         <key>default</key>
         <false/>
-        <key>media</key>
-        <dict>
-          <key>hard</key>
-          <integer>2</integer>
-        </dict>
+        <key>disabled</key>
+        <true/>
       </dict>
       <dict>
         <key>value</key>
@@ -338,11 +335,8 @@
         <string>CMS SCSI II Card</string>
         <key>default</key>
         <false/>
-        <key>media</key>
-        <dict>
-          <key>hard</key>
-          <integer>1</integer>
-        </dict>
+        <key>disabled</key>
+        <true/>
       </dict>
       <dict>
         <key>value</key>
@@ -638,7 +632,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -693,7 +687,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -798,11 +792,8 @@
         <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
         <key>default</key>
         <false/>
-        <key>media</key>
-        <dict>
-          <key>hard</key>
-          <integer>2</integer>
-        </dict>
+        <key>disabled</key>
+        <true/>
       </dict>
       <dict>
         <key>value</key>
@@ -824,11 +815,8 @@
         <string>CMS SCSI II Card</string>
         <key>default</key>
         <false/>
-        <key>media</key>
-        <dict>
-          <key>hard</key>
-          <integer>1</integer>
-        </dict>
+        <key>disabled</key>
+        <true/>
       </dict>
       <dict>
         <key>value</key>
@@ -1124,7 +1112,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1179,7 +1167,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -1284,11 +1272,8 @@
         <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
         <key>default</key>
         <false/>
-        <key>media</key>
-        <dict>
-          <key>hard</key>
-          <integer>2</integer>
-        </dict>
+        <key>disabled</key>
+        <true/>
       </dict>
       <dict>
         <key>value</key>
@@ -1310,11 +1295,8 @@
         <string>CMS SCSI II Card</string>
         <key>default</key>
         <false/>
-        <key>media</key>
-        <dict>
-          <key>hard</key>
-          <integer>1</integer>
-        </dict>
+        <key>disabled</key>
+        <true/>
       </dict>
       <dict>
         <key>value</key>
@@ -1610,7 +1592,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1665,7 +1647,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -1770,11 +1752,8 @@
         <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
         <key>default</key>
         <false/>
-        <key>media</key>
-        <dict>
-          <key>hard</key>
-          <integer>2</integer>
-        </dict>
+        <key>disabled</key>
+        <true/>
       </dict>
       <dict>
         <key>value</key>
@@ -1796,11 +1775,8 @@
         <string>CMS SCSI II Card</string>
         <key>default</key>
         <false/>
-        <key>media</key>
-        <dict>
-          <key>hard</key>
-          <integer>1</integer>
-        </dict>
+        <key>disabled</key>
+        <true/>
       </dict>
       <dict>
         <key>value</key>
@@ -2096,7 +2072,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2151,7 +2127,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -2256,11 +2232,8 @@
         <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
         <key>default</key>
         <false/>
-        <key>media</key>
-        <dict>
-          <key>hard</key>
-          <integer>2</integer>
-        </dict>
+        <key>disabled</key>
+        <true/>
       </dict>
       <dict>
         <key>value</key>
@@ -2282,11 +2255,8 @@
         <string>CMS SCSI II Card</string>
         <key>default</key>
         <false/>
-        <key>media</key>
-        <dict>
-          <key>hard</key>
-          <integer>1</integer>
-        </dict>
+        <key>disabled</key>
+        <true/>
       </dict>
       <dict>
         <key>value</key>
@@ -2582,7 +2552,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2637,7 +2607,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -2742,11 +2712,8 @@
         <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
         <key>default</key>
         <false/>
-        <key>media</key>
-        <dict>
-          <key>hard</key>
-          <integer>2</integer>
-        </dict>
+        <key>disabled</key>
+        <true/>
       </dict>
       <dict>
         <key>value</key>
@@ -2768,11 +2735,8 @@
         <string>CMS SCSI II Card</string>
         <key>default</key>
         <false/>
-        <key>media</key>
-        <dict>
-          <key>hard</key>
-          <integer>1</integer>
-        </dict>
+        <key>disabled</key>
+        <true/>
       </dict>
       <dict>
         <key>value</key>
@@ -3068,7 +3032,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3123,7 +3087,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -3228,11 +3192,8 @@
         <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
         <key>default</key>
         <false/>
-        <key>media</key>
-        <dict>
-          <key>hard</key>
-          <integer>2</integer>
-        </dict>
+        <key>disabled</key>
+        <true/>
       </dict>
       <dict>
         <key>value</key>
@@ -3254,11 +3215,8 @@
         <string>CMS SCSI II Card</string>
         <key>default</key>
         <false/>
-        <key>media</key>
-        <dict>
-          <key>hard</key>
-          <integer>1</integer>
-        </dict>
+        <key>disabled</key>
+        <true/>
       </dict>
       <dict>
         <key>value</key>
diff --git a/Ample/Resources/apple2gsr0.plist b/Ample/Resources/apple2gsr0.plist
index 9900200..89ba538 100644
--- a/Ample/Resources/apple2gsr0.plist
+++ b/Ample/Resources/apple2gsr0.plist
@@ -131,9 +131,9 @@
     </array>
     <key>media</key>
     <dict>
-      <key>flop_5_25</key>
+      <key>floppy_5_25</key>
       <integer>2</integer>
-      <key>flop_3_5</key>
+      <key>floppy_3_5</key>
       <integer>2</integer>
     </dict>
     <key>resolution</key>
@@ -192,7 +192,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -247,7 +247,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -352,11 +352,8 @@
         <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
         <key>default</key>
         <false/>
-        <key>media</key>
-        <dict>
-          <key>hard</key>
-          <integer>2</integer>
-        </dict>
+        <key>disabled</key>
+        <true/>
       </dict>
       <dict>
         <key>value</key>
@@ -378,11 +375,8 @@
         <string>CMS SCSI II Card</string>
         <key>default</key>
         <false/>
-        <key>media</key>
-        <dict>
-          <key>hard</key>
-          <integer>1</integer>
-        </dict>
+        <key>disabled</key>
+        <true/>
       </dict>
       <dict>
         <key>value</key>
@@ -678,7 +672,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -733,7 +727,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -838,11 +832,8 @@
         <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
         <key>default</key>
         <false/>
-        <key>media</key>
-        <dict>
-          <key>hard</key>
-          <integer>2</integer>
-        </dict>
+        <key>disabled</key>
+        <true/>
       </dict>
       <dict>
         <key>value</key>
@@ -864,11 +855,8 @@
         <string>CMS SCSI II Card</string>
         <key>default</key>
         <false/>
-        <key>media</key>
-        <dict>
-          <key>hard</key>
-          <integer>1</integer>
-        </dict>
+        <key>disabled</key>
+        <true/>
       </dict>
       <dict>
         <key>value</key>
@@ -1164,7 +1152,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1219,7 +1207,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -1324,11 +1312,8 @@
         <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
         <key>default</key>
         <false/>
-        <key>media</key>
-        <dict>
-          <key>hard</key>
-          <integer>2</integer>
-        </dict>
+        <key>disabled</key>
+        <true/>
       </dict>
       <dict>
         <key>value</key>
@@ -1350,11 +1335,8 @@
         <string>CMS SCSI II Card</string>
         <key>default</key>
         <false/>
-        <key>media</key>
-        <dict>
-          <key>hard</key>
-          <integer>1</integer>
-        </dict>
+        <key>disabled</key>
+        <true/>
       </dict>
       <dict>
         <key>value</key>
@@ -1650,7 +1632,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1705,7 +1687,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -1810,11 +1792,8 @@
         <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
         <key>default</key>
         <false/>
-        <key>media</key>
-        <dict>
-          <key>hard</key>
-          <integer>2</integer>
-        </dict>
+        <key>disabled</key>
+        <true/>
       </dict>
       <dict>
         <key>value</key>
@@ -1836,11 +1815,8 @@
         <string>CMS SCSI II Card</string>
         <key>default</key>
         <false/>
-        <key>media</key>
-        <dict>
-          <key>hard</key>
-          <integer>1</integer>
-        </dict>
+        <key>disabled</key>
+        <true/>
       </dict>
       <dict>
         <key>value</key>
@@ -2136,7 +2112,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2191,7 +2167,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -2296,11 +2272,8 @@
         <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
         <key>default</key>
         <false/>
-        <key>media</key>
-        <dict>
-          <key>hard</key>
-          <integer>2</integer>
-        </dict>
+        <key>disabled</key>
+        <true/>
       </dict>
       <dict>
         <key>value</key>
@@ -2322,11 +2295,8 @@
         <string>CMS SCSI II Card</string>
         <key>default</key>
         <false/>
-        <key>media</key>
-        <dict>
-          <key>hard</key>
-          <integer>1</integer>
-        </dict>
+        <key>disabled</key>
+        <true/>
       </dict>
       <dict>
         <key>value</key>
@@ -2622,7 +2592,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2677,7 +2647,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -2782,11 +2752,8 @@
         <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
         <key>default</key>
         <false/>
-        <key>media</key>
-        <dict>
-          <key>hard</key>
-          <integer>2</integer>
-        </dict>
+        <key>disabled</key>
+        <true/>
       </dict>
       <dict>
         <key>value</key>
@@ -2808,11 +2775,8 @@
         <string>CMS SCSI II Card</string>
         <key>default</key>
         <false/>
-        <key>media</key>
-        <dict>
-          <key>hard</key>
-          <integer>1</integer>
-        </dict>
+        <key>disabled</key>
+        <true/>
       </dict>
       <dict>
         <key>value</key>
@@ -3108,7 +3072,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3163,7 +3127,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -3268,11 +3232,8 @@
         <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
         <key>default</key>
         <false/>
-        <key>media</key>
-        <dict>
-          <key>hard</key>
-          <integer>2</integer>
-        </dict>
+        <key>disabled</key>
+        <true/>
       </dict>
       <dict>
         <key>value</key>
@@ -3294,11 +3255,8 @@
         <string>CMS SCSI II Card</string>
         <key>default</key>
         <false/>
-        <key>media</key>
-        <dict>
-          <key>hard</key>
-          <integer>1</integer>
-        </dict>
+        <key>disabled</key>
+        <true/>
       </dict>
       <dict>
         <key>value</key>
diff --git a/Ample/Resources/apple2gsr1.plist b/Ample/Resources/apple2gsr1.plist
index 40a8c37..be75eae 100644
--- a/Ample/Resources/apple2gsr1.plist
+++ b/Ample/Resources/apple2gsr1.plist
@@ -131,9 +131,9 @@
     </array>
     <key>media</key>
     <dict>
-      <key>flop_5_25</key>
+      <key>floppy_5_25</key>
       <integer>2</integer>
-      <key>flop_3_5</key>
+      <key>floppy_3_5</key>
       <integer>2</integer>
     </dict>
     <key>resolution</key>
@@ -192,7 +192,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -247,7 +247,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -352,11 +352,8 @@
         <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
         <key>default</key>
         <false/>
-        <key>media</key>
-        <dict>
-          <key>hard</key>
-          <integer>2</integer>
-        </dict>
+        <key>disabled</key>
+        <true/>
       </dict>
       <dict>
         <key>value</key>
@@ -378,11 +375,8 @@
         <string>CMS SCSI II Card</string>
         <key>default</key>
         <false/>
-        <key>media</key>
-        <dict>
-          <key>hard</key>
-          <integer>1</integer>
-        </dict>
+        <key>disabled</key>
+        <true/>
       </dict>
       <dict>
         <key>value</key>
@@ -678,7 +672,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -733,7 +727,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -838,11 +832,8 @@
         <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
         <key>default</key>
         <false/>
-        <key>media</key>
-        <dict>
-          <key>hard</key>
-          <integer>2</integer>
-        </dict>
+        <key>disabled</key>
+        <true/>
       </dict>
       <dict>
         <key>value</key>
@@ -864,11 +855,8 @@
         <string>CMS SCSI II Card</string>
         <key>default</key>
         <false/>
-        <key>media</key>
-        <dict>
-          <key>hard</key>
-          <integer>1</integer>
-        </dict>
+        <key>disabled</key>
+        <true/>
       </dict>
       <dict>
         <key>value</key>
@@ -1164,7 +1152,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1219,7 +1207,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -1324,11 +1312,8 @@
         <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
         <key>default</key>
         <false/>
-        <key>media</key>
-        <dict>
-          <key>hard</key>
-          <integer>2</integer>
-        </dict>
+        <key>disabled</key>
+        <true/>
       </dict>
       <dict>
         <key>value</key>
@@ -1350,11 +1335,8 @@
         <string>CMS SCSI II Card</string>
         <key>default</key>
         <false/>
-        <key>media</key>
-        <dict>
-          <key>hard</key>
-          <integer>1</integer>
-        </dict>
+        <key>disabled</key>
+        <true/>
       </dict>
       <dict>
         <key>value</key>
@@ -1650,7 +1632,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1705,7 +1687,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -1810,11 +1792,8 @@
         <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
         <key>default</key>
         <false/>
-        <key>media</key>
-        <dict>
-          <key>hard</key>
-          <integer>2</integer>
-        </dict>
+        <key>disabled</key>
+        <true/>
       </dict>
       <dict>
         <key>value</key>
@@ -1836,11 +1815,8 @@
         <string>CMS SCSI II Card</string>
         <key>default</key>
         <false/>
-        <key>media</key>
-        <dict>
-          <key>hard</key>
-          <integer>1</integer>
-        </dict>
+        <key>disabled</key>
+        <true/>
       </dict>
       <dict>
         <key>value</key>
@@ -2136,7 +2112,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2191,7 +2167,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -2296,11 +2272,8 @@
         <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
         <key>default</key>
         <false/>
-        <key>media</key>
-        <dict>
-          <key>hard</key>
-          <integer>2</integer>
-        </dict>
+        <key>disabled</key>
+        <true/>
       </dict>
       <dict>
         <key>value</key>
@@ -2322,11 +2295,8 @@
         <string>CMS SCSI II Card</string>
         <key>default</key>
         <false/>
-        <key>media</key>
-        <dict>
-          <key>hard</key>
-          <integer>1</integer>
-        </dict>
+        <key>disabled</key>
+        <true/>
       </dict>
       <dict>
         <key>value</key>
@@ -2622,7 +2592,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2677,7 +2647,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -2782,11 +2752,8 @@
         <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
         <key>default</key>
         <false/>
-        <key>media</key>
-        <dict>
-          <key>hard</key>
-          <integer>2</integer>
-        </dict>
+        <key>disabled</key>
+        <true/>
       </dict>
       <dict>
         <key>value</key>
@@ -2808,11 +2775,8 @@
         <string>CMS SCSI II Card</string>
         <key>default</key>
         <false/>
-        <key>media</key>
-        <dict>
-          <key>hard</key>
-          <integer>1</integer>
-        </dict>
+        <key>disabled</key>
+        <true/>
       </dict>
       <dict>
         <key>value</key>
@@ -3108,7 +3072,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3163,7 +3127,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -3268,11 +3232,8 @@
         <string>CFFA 2.0 Compact Flash (6502 firmware, www.dreher.net)</string>
         <key>default</key>
         <false/>
-        <key>media</key>
-        <dict>
-          <key>hard</key>
-          <integer>2</integer>
-        </dict>
+        <key>disabled</key>
+        <true/>
       </dict>
       <dict>
         <key>value</key>
@@ -3294,11 +3255,8 @@
         <string>CMS SCSI II Card</string>
         <key>default</key>
         <false/>
-        <key>media</key>
-        <dict>
-          <key>hard</key>
-          <integer>1</integer>
-        </dict>
+        <key>disabled</key>
+        <true/>
       </dict>
       <dict>
         <key>value</key>
diff --git a/Ample/Resources/apple2jp.plist b/Ample/Resources/apple2jp.plist
index 0e1a93a..abea457 100644
--- a/Ample/Resources/apple2jp.plist
+++ b/Ample/Resources/apple2jp.plist
@@ -119,7 +119,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -132,7 +132,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -145,7 +145,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -158,7 +158,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -203,7 +203,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -226,7 +226,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -616,7 +616,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -629,7 +629,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -642,7 +642,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -655,7 +655,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -700,7 +700,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -723,7 +723,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1113,7 +1113,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1126,7 +1126,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1139,7 +1139,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1152,7 +1152,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1197,7 +1197,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -1220,7 +1220,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1610,7 +1610,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1623,7 +1623,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1636,7 +1636,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1649,7 +1649,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1694,7 +1694,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -1717,7 +1717,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2107,7 +2107,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2120,7 +2120,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2133,7 +2133,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2146,7 +2146,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2191,7 +2191,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -2214,7 +2214,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2604,7 +2604,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2617,7 +2617,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2630,7 +2630,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2643,7 +2643,7 @@
         <true/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2688,7 +2688,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -2711,7 +2711,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3101,7 +3101,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3114,7 +3114,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3127,7 +3127,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3140,7 +3140,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3185,7 +3185,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -3208,7 +3208,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
diff --git a/Ample/Resources/apple2p.plist b/Ample/Resources/apple2p.plist
index 806dad5..b7c5c55 100644
--- a/Ample/Resources/apple2p.plist
+++ b/Ample/Resources/apple2p.plist
@@ -119,7 +119,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -132,7 +132,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -145,7 +145,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -158,7 +158,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -203,7 +203,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -226,7 +226,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -616,7 +616,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -629,7 +629,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -642,7 +642,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -655,7 +655,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -700,7 +700,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -723,7 +723,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1113,7 +1113,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1126,7 +1126,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1139,7 +1139,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1152,7 +1152,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1197,7 +1197,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -1220,7 +1220,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1610,7 +1610,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1623,7 +1623,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1636,7 +1636,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1649,7 +1649,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1694,7 +1694,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -1717,7 +1717,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2107,7 +2107,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2120,7 +2120,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2133,7 +2133,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2146,7 +2146,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2191,7 +2191,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -2214,7 +2214,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2604,7 +2604,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2617,7 +2617,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2630,7 +2630,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2643,7 +2643,7 @@
         <true/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2688,7 +2688,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -2711,7 +2711,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3101,7 +3101,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3114,7 +3114,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3127,7 +3127,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3140,7 +3140,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3185,7 +3185,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -3208,7 +3208,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
diff --git a/Ample/Resources/apple3.plist b/Ample/Resources/apple3.plist
index 3620452..92dc7d0 100644
--- a/Ample/Resources/apple3.plist
+++ b/Ample/Resources/apple3.plist
@@ -41,7 +41,7 @@
     </array>
     <key>media</key>
     <dict>
-      <key>flop_5_25</key>
+      <key>floppy_5_25</key>
       <integer>4</integer>
     </dict>
     <key>resolution</key>
@@ -87,11 +87,8 @@
         <string>CMS SCSI II Card</string>
         <key>default</key>
         <false/>
-        <key>media</key>
-        <dict>
-          <key>hard</key>
-          <integer>1</integer>
-        </dict>
+        <key>disabled</key>
+        <true/>
       </dict>
       <dict>
         <key>value</key>
@@ -158,11 +155,8 @@
         <string>CMS SCSI II Card</string>
         <key>default</key>
         <false/>
-        <key>media</key>
-        <dict>
-          <key>hard</key>
-          <integer>1</integer>
-        </dict>
+        <key>disabled</key>
+        <true/>
       </dict>
       <dict>
         <key>value</key>
@@ -229,11 +223,8 @@
         <string>CMS SCSI II Card</string>
         <key>default</key>
         <false/>
-        <key>media</key>
-        <dict>
-          <key>hard</key>
-          <integer>1</integer>
-        </dict>
+        <key>disabled</key>
+        <true/>
       </dict>
       <dict>
         <key>value</key>
@@ -300,11 +291,8 @@
         <string>CMS SCSI II Card</string>
         <key>default</key>
         <false/>
-        <key>media</key>
-        <dict>
-          <key>hard</key>
-          <integer>1</integer>
-        </dict>
+        <key>disabled</key>
+        <true/>
       </dict>
       <dict>
         <key>value</key>
diff --git a/Ample/Resources/basis108.plist b/Ample/Resources/basis108.plist
index 96e0c70..cb7ed7c 100644
--- a/Ample/Resources/basis108.plist
+++ b/Ample/Resources/basis108.plist
@@ -179,7 +179,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -192,7 +192,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -205,7 +205,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -218,7 +218,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -263,7 +263,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -286,7 +286,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -676,7 +676,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -689,7 +689,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -702,7 +702,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -715,7 +715,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -760,7 +760,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -783,7 +783,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1173,7 +1173,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1186,7 +1186,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1199,7 +1199,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1212,7 +1212,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1257,7 +1257,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -1280,7 +1280,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1670,7 +1670,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1683,7 +1683,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1696,7 +1696,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1709,7 +1709,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1754,7 +1754,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -1777,7 +1777,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2167,7 +2167,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2180,7 +2180,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2193,7 +2193,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2206,7 +2206,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2251,7 +2251,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -2274,7 +2274,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2664,7 +2664,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2677,7 +2677,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2690,7 +2690,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2703,7 +2703,7 @@
         <true/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2748,7 +2748,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -2771,7 +2771,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3161,7 +3161,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3174,7 +3174,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3187,7 +3187,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3200,7 +3200,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3245,7 +3245,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -3268,7 +3268,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
diff --git a/Ample/Resources/cec2000.plist b/Ample/Resources/cec2000.plist
index 64ceac7..b7aa29a 100644
--- a/Ample/Resources/cec2000.plist
+++ b/Ample/Resources/cec2000.plist
@@ -80,7 +80,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -93,7 +93,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -106,7 +106,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -119,7 +119,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -174,7 +174,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -197,7 +197,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -326,11 +326,8 @@
         <string>CMS SCSI II Card</string>
         <key>default</key>
         <false/>
-        <key>media</key>
-        <dict>
-          <key>hard</key>
-          <integer>1</integer>
-        </dict>
+        <key>disabled</key>
+        <true/>
       </dict>
       <dict>
         <key>value</key>
@@ -650,7 +647,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -663,7 +660,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -676,7 +673,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -689,7 +686,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -744,7 +741,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -767,7 +764,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -896,11 +893,8 @@
         <string>CMS SCSI II Card</string>
         <key>default</key>
         <false/>
-        <key>media</key>
-        <dict>
-          <key>hard</key>
-          <integer>1</integer>
-        </dict>
+        <key>disabled</key>
+        <true/>
       </dict>
       <dict>
         <key>value</key>
@@ -1220,7 +1214,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1233,7 +1227,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1246,7 +1240,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1259,7 +1253,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1314,7 +1308,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -1337,7 +1331,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1466,11 +1460,8 @@
         <string>CMS SCSI II Card</string>
         <key>default</key>
         <false/>
-        <key>media</key>
-        <dict>
-          <key>hard</key>
-          <integer>1</integer>
-        </dict>
+        <key>disabled</key>
+        <true/>
       </dict>
       <dict>
         <key>value</key>
@@ -1790,7 +1781,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1803,7 +1794,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1816,7 +1807,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1829,7 +1820,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1884,7 +1875,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -1907,7 +1898,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2036,11 +2027,8 @@
         <string>CMS SCSI II Card</string>
         <key>default</key>
         <false/>
-        <key>media</key>
-        <dict>
-          <key>hard</key>
-          <integer>1</integer>
-        </dict>
+        <key>disabled</key>
+        <true/>
       </dict>
       <dict>
         <key>value</key>
@@ -2360,7 +2348,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2373,7 +2361,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2386,7 +2374,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2399,7 +2387,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2454,7 +2442,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -2477,7 +2465,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2606,11 +2594,8 @@
         <string>CMS SCSI II Card</string>
         <key>default</key>
         <false/>
-        <key>media</key>
-        <dict>
-          <key>hard</key>
-          <integer>1</integer>
-        </dict>
+        <key>disabled</key>
+        <true/>
       </dict>
       <dict>
         <key>value</key>
diff --git a/Ample/Resources/cece.plist b/Ample/Resources/cece.plist
index 8f5e139..0a74742 100644
--- a/Ample/Resources/cece.plist
+++ b/Ample/Resources/cece.plist
@@ -80,7 +80,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -93,7 +93,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -106,7 +106,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -119,7 +119,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -174,7 +174,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -197,7 +197,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -326,11 +326,8 @@
         <string>CMS SCSI II Card</string>
         <key>default</key>
         <false/>
-        <key>media</key>
-        <dict>
-          <key>hard</key>
-          <integer>1</integer>
-        </dict>
+        <key>disabled</key>
+        <true/>
       </dict>
       <dict>
         <key>value</key>
@@ -650,7 +647,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -663,7 +660,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -676,7 +673,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -689,7 +686,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -744,7 +741,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -767,7 +764,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -896,11 +893,8 @@
         <string>CMS SCSI II Card</string>
         <key>default</key>
         <false/>
-        <key>media</key>
-        <dict>
-          <key>hard</key>
-          <integer>1</integer>
-        </dict>
+        <key>disabled</key>
+        <true/>
       </dict>
       <dict>
         <key>value</key>
@@ -1220,7 +1214,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1233,7 +1227,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1246,7 +1240,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1259,7 +1253,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1314,7 +1308,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -1337,7 +1331,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1466,11 +1460,8 @@
         <string>CMS SCSI II Card</string>
         <key>default</key>
         <false/>
-        <key>media</key>
-        <dict>
-          <key>hard</key>
-          <integer>1</integer>
-        </dict>
+        <key>disabled</key>
+        <true/>
       </dict>
       <dict>
         <key>value</key>
@@ -1790,7 +1781,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1803,7 +1794,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1816,7 +1807,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1829,7 +1820,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1884,7 +1875,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -1907,7 +1898,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2036,11 +2027,8 @@
         <string>CMS SCSI II Card</string>
         <key>default</key>
         <false/>
-        <key>media</key>
-        <dict>
-          <key>hard</key>
-          <integer>1</integer>
-        </dict>
+        <key>disabled</key>
+        <true/>
       </dict>
       <dict>
         <key>value</key>
@@ -2360,7 +2348,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2373,7 +2361,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2386,7 +2374,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2399,7 +2387,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2454,7 +2442,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -2477,7 +2465,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2606,11 +2594,8 @@
         <string>CMS SCSI II Card</string>
         <key>default</key>
         <false/>
-        <key>media</key>
-        <dict>
-          <key>hard</key>
-          <integer>1</integer>
-        </dict>
+        <key>disabled</key>
+        <true/>
       </dict>
       <dict>
         <key>value</key>
diff --git a/Ample/Resources/cecg.plist b/Ample/Resources/cecg.plist
index cbc78cf..e0b45c1 100644
--- a/Ample/Resources/cecg.plist
+++ b/Ample/Resources/cecg.plist
@@ -80,7 +80,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -93,7 +93,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -106,7 +106,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -119,7 +119,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -174,7 +174,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -197,7 +197,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -326,11 +326,8 @@
         <string>CMS SCSI II Card</string>
         <key>default</key>
         <false/>
-        <key>media</key>
-        <dict>
-          <key>hard</key>
-          <integer>1</integer>
-        </dict>
+        <key>disabled</key>
+        <true/>
       </dict>
       <dict>
         <key>value</key>
@@ -650,7 +647,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -663,7 +660,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -676,7 +673,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -689,7 +686,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -744,7 +741,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -767,7 +764,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -896,11 +893,8 @@
         <string>CMS SCSI II Card</string>
         <key>default</key>
         <false/>
-        <key>media</key>
-        <dict>
-          <key>hard</key>
-          <integer>1</integer>
-        </dict>
+        <key>disabled</key>
+        <true/>
       </dict>
       <dict>
         <key>value</key>
@@ -1220,7 +1214,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1233,7 +1227,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1246,7 +1240,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1259,7 +1253,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1314,7 +1308,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -1337,7 +1331,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1466,11 +1460,8 @@
         <string>CMS SCSI II Card</string>
         <key>default</key>
         <false/>
-        <key>media</key>
-        <dict>
-          <key>hard</key>
-          <integer>1</integer>
-        </dict>
+        <key>disabled</key>
+        <true/>
       </dict>
       <dict>
         <key>value</key>
@@ -1790,7 +1781,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1803,7 +1794,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1816,7 +1807,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1829,7 +1820,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1884,7 +1875,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -1907,7 +1898,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2036,11 +2027,8 @@
         <string>CMS SCSI II Card</string>
         <key>default</key>
         <false/>
-        <key>media</key>
-        <dict>
-          <key>hard</key>
-          <integer>1</integer>
-        </dict>
+        <key>disabled</key>
+        <true/>
       </dict>
       <dict>
         <key>value</key>
@@ -2360,7 +2348,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2373,7 +2361,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2386,7 +2374,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2399,7 +2387,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2454,7 +2442,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -2477,7 +2465,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2606,11 +2594,8 @@
         <string>CMS SCSI II Card</string>
         <key>default</key>
         <false/>
-        <key>media</key>
-        <dict>
-          <key>hard</key>
-          <integer>1</integer>
-        </dict>
+        <key>disabled</key>
+        <true/>
       </dict>
       <dict>
         <key>value</key>
diff --git a/Ample/Resources/ceci.plist b/Ample/Resources/ceci.plist
index 8418960..51a417b 100644
--- a/Ample/Resources/ceci.plist
+++ b/Ample/Resources/ceci.plist
@@ -80,7 +80,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -93,7 +93,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -106,7 +106,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -119,7 +119,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -174,7 +174,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -197,7 +197,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -326,11 +326,8 @@
         <string>CMS SCSI II Card</string>
         <key>default</key>
         <false/>
-        <key>media</key>
-        <dict>
-          <key>hard</key>
-          <integer>1</integer>
-        </dict>
+        <key>disabled</key>
+        <true/>
       </dict>
       <dict>
         <key>value</key>
@@ -650,7 +647,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -663,7 +660,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -676,7 +673,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -689,7 +686,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -744,7 +741,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -767,7 +764,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -896,11 +893,8 @@
         <string>CMS SCSI II Card</string>
         <key>default</key>
         <false/>
-        <key>media</key>
-        <dict>
-          <key>hard</key>
-          <integer>1</integer>
-        </dict>
+        <key>disabled</key>
+        <true/>
       </dict>
       <dict>
         <key>value</key>
@@ -1220,7 +1214,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1233,7 +1227,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1246,7 +1240,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1259,7 +1253,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1314,7 +1308,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -1337,7 +1331,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1466,11 +1460,8 @@
         <string>CMS SCSI II Card</string>
         <key>default</key>
         <false/>
-        <key>media</key>
-        <dict>
-          <key>hard</key>
-          <integer>1</integer>
-        </dict>
+        <key>disabled</key>
+        <true/>
       </dict>
       <dict>
         <key>value</key>
@@ -1790,7 +1781,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1803,7 +1794,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1816,7 +1807,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1829,7 +1820,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1884,7 +1875,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -1907,7 +1898,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2036,11 +2027,8 @@
         <string>CMS SCSI II Card</string>
         <key>default</key>
         <false/>
-        <key>media</key>
-        <dict>
-          <key>hard</key>
-          <integer>1</integer>
-        </dict>
+        <key>disabled</key>
+        <true/>
       </dict>
       <dict>
         <key>value</key>
@@ -2360,7 +2348,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2373,7 +2361,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2386,7 +2374,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2399,7 +2387,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2454,7 +2442,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -2477,7 +2465,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2606,11 +2594,8 @@
         <string>CMS SCSI II Card</string>
         <key>default</key>
         <false/>
-        <key>media</key>
-        <dict>
-          <key>hard</key>
-          <integer>1</integer>
-        </dict>
+        <key>disabled</key>
+        <true/>
       </dict>
       <dict>
         <key>value</key>
diff --git a/Ample/Resources/cecm.plist b/Ample/Resources/cecm.plist
index 8784d9c..884b7b7 100644
--- a/Ample/Resources/cecm.plist
+++ b/Ample/Resources/cecm.plist
@@ -80,7 +80,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -93,7 +93,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -106,7 +106,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -119,7 +119,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -174,7 +174,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -197,7 +197,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -326,11 +326,8 @@
         <string>CMS SCSI II Card</string>
         <key>default</key>
         <false/>
-        <key>media</key>
-        <dict>
-          <key>hard</key>
-          <integer>1</integer>
-        </dict>
+        <key>disabled</key>
+        <true/>
       </dict>
       <dict>
         <key>value</key>
@@ -650,7 +647,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -663,7 +660,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -676,7 +673,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -689,7 +686,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -744,7 +741,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -767,7 +764,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -896,11 +893,8 @@
         <string>CMS SCSI II Card</string>
         <key>default</key>
         <false/>
-        <key>media</key>
-        <dict>
-          <key>hard</key>
-          <integer>1</integer>
-        </dict>
+        <key>disabled</key>
+        <true/>
       </dict>
       <dict>
         <key>value</key>
@@ -1220,7 +1214,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1233,7 +1227,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1246,7 +1240,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1259,7 +1253,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1314,7 +1308,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -1337,7 +1331,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1466,11 +1460,8 @@
         <string>CMS SCSI II Card</string>
         <key>default</key>
         <false/>
-        <key>media</key>
-        <dict>
-          <key>hard</key>
-          <integer>1</integer>
-        </dict>
+        <key>disabled</key>
+        <true/>
       </dict>
       <dict>
         <key>value</key>
@@ -1790,7 +1781,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1803,7 +1794,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1816,7 +1807,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1829,7 +1820,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1884,7 +1875,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -1907,7 +1898,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2036,11 +2027,8 @@
         <string>CMS SCSI II Card</string>
         <key>default</key>
         <false/>
-        <key>media</key>
-        <dict>
-          <key>hard</key>
-          <integer>1</integer>
-        </dict>
+        <key>disabled</key>
+        <true/>
       </dict>
       <dict>
         <key>value</key>
@@ -2360,7 +2348,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2373,7 +2361,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2386,7 +2374,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2399,7 +2387,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2454,7 +2442,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -2477,7 +2465,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2606,11 +2594,8 @@
         <string>CMS SCSI II Card</string>
         <key>default</key>
         <false/>
-        <key>media</key>
-        <dict>
-          <key>hard</key>
-          <integer>1</integer>
-        </dict>
+        <key>disabled</key>
+        <true/>
       </dict>
       <dict>
         <key>value</key>
diff --git a/Ample/Resources/craft2p.plist b/Ample/Resources/craft2p.plist
index 420408d..09fb5ec 100644
--- a/Ample/Resources/craft2p.plist
+++ b/Ample/Resources/craft2p.plist
@@ -119,7 +119,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -132,7 +132,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -145,7 +145,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -158,7 +158,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -203,7 +203,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -226,7 +226,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -616,7 +616,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -629,7 +629,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -642,7 +642,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -655,7 +655,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -700,7 +700,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -723,7 +723,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1113,7 +1113,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1126,7 +1126,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1139,7 +1139,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1152,7 +1152,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1197,7 +1197,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -1220,7 +1220,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1610,7 +1610,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1623,7 +1623,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1636,7 +1636,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1649,7 +1649,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1694,7 +1694,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -1717,7 +1717,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2107,7 +2107,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2120,7 +2120,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2133,7 +2133,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2146,7 +2146,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2191,7 +2191,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -2214,7 +2214,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2604,7 +2604,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2617,7 +2617,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2630,7 +2630,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2643,7 +2643,7 @@
         <true/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2688,7 +2688,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -2711,7 +2711,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3101,7 +3101,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3114,7 +3114,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3127,7 +3127,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3140,7 +3140,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3185,7 +3185,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -3208,7 +3208,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
diff --git a/Ample/Resources/dodo.plist b/Ample/Resources/dodo.plist
index 2de8acb..fd9e79f 100644
--- a/Ample/Resources/dodo.plist
+++ b/Ample/Resources/dodo.plist
@@ -119,7 +119,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -132,7 +132,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -145,7 +145,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -158,7 +158,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -203,7 +203,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -226,7 +226,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -616,7 +616,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -629,7 +629,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -642,7 +642,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -655,7 +655,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -700,7 +700,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -723,7 +723,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1113,7 +1113,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1126,7 +1126,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1139,7 +1139,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1152,7 +1152,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1197,7 +1197,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -1220,7 +1220,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1610,7 +1610,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1623,7 +1623,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1636,7 +1636,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1649,7 +1649,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1694,7 +1694,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -1717,7 +1717,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2107,7 +2107,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2120,7 +2120,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2133,7 +2133,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2146,7 +2146,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2191,7 +2191,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -2214,7 +2214,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2604,7 +2604,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2617,7 +2617,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2630,7 +2630,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2643,7 +2643,7 @@
         <true/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2688,7 +2688,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -2711,7 +2711,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3101,7 +3101,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3114,7 +3114,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3127,7 +3127,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3140,7 +3140,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3185,7 +3185,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -3208,7 +3208,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
diff --git a/Ample/Resources/elppa.plist b/Ample/Resources/elppa.plist
index 9817ede..f20b49a 100644
--- a/Ample/Resources/elppa.plist
+++ b/Ample/Resources/elppa.plist
@@ -119,7 +119,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -132,7 +132,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -145,7 +145,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -158,7 +158,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -203,7 +203,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -226,7 +226,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -616,7 +616,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -629,7 +629,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -642,7 +642,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -655,7 +655,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -700,7 +700,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -723,7 +723,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1113,7 +1113,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1126,7 +1126,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1139,7 +1139,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1152,7 +1152,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1197,7 +1197,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -1220,7 +1220,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1610,7 +1610,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1623,7 +1623,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1636,7 +1636,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1649,7 +1649,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1694,7 +1694,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -1717,7 +1717,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2107,7 +2107,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2120,7 +2120,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2133,7 +2133,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2146,7 +2146,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2191,7 +2191,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -2214,7 +2214,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2604,7 +2604,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2617,7 +2617,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2630,7 +2630,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2643,7 +2643,7 @@
         <true/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2688,7 +2688,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -2711,7 +2711,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3101,7 +3101,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3114,7 +3114,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3127,7 +3127,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3140,7 +3140,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3185,7 +3185,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -3208,7 +3208,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
diff --git a/Ample/Resources/hkc8800a.plist b/Ample/Resources/hkc8800a.plist
index 4bc5e04..288079e 100644
--- a/Ample/Resources/hkc8800a.plist
+++ b/Ample/Resources/hkc8800a.plist
@@ -119,7 +119,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -132,7 +132,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -145,7 +145,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -158,7 +158,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -203,7 +203,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -226,7 +226,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -616,7 +616,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -629,7 +629,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -642,7 +642,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -655,7 +655,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -700,7 +700,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -723,7 +723,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1113,7 +1113,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1126,7 +1126,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1139,7 +1139,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1152,7 +1152,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1197,7 +1197,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -1220,7 +1220,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1610,7 +1610,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1623,7 +1623,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1636,7 +1636,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1649,7 +1649,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1694,7 +1694,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -1717,7 +1717,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2107,7 +2107,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2120,7 +2120,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2133,7 +2133,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2146,7 +2146,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2191,7 +2191,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -2214,7 +2214,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2604,7 +2604,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2617,7 +2617,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2630,7 +2630,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2643,7 +2643,7 @@
         <true/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2688,7 +2688,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -2711,7 +2711,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3101,7 +3101,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3114,7 +3114,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3127,7 +3127,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3140,7 +3140,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3185,7 +3185,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -3208,7 +3208,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
diff --git a/Ample/Resources/ivelultr.plist b/Ample/Resources/ivelultr.plist
index 1b89086..4e513b9 100644
--- a/Ample/Resources/ivelultr.plist
+++ b/Ample/Resources/ivelultr.plist
@@ -119,7 +119,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -132,7 +132,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -145,7 +145,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -158,7 +158,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -203,7 +203,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -226,7 +226,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -616,7 +616,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -629,7 +629,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -642,7 +642,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -655,7 +655,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -700,7 +700,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -723,7 +723,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1113,7 +1113,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1126,7 +1126,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1139,7 +1139,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1152,7 +1152,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1197,7 +1197,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -1220,7 +1220,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1610,7 +1610,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1623,7 +1623,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1636,7 +1636,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1649,7 +1649,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1694,7 +1694,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -1717,7 +1717,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2107,7 +2107,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2120,7 +2120,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2133,7 +2133,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2146,7 +2146,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2191,7 +2191,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -2214,7 +2214,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2604,7 +2604,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2617,7 +2617,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2630,7 +2630,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2643,7 +2643,7 @@
         <true/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2688,7 +2688,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -2711,7 +2711,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3101,7 +3101,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3114,7 +3114,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3127,7 +3127,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3140,7 +3140,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3185,7 +3185,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -3208,7 +3208,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
diff --git a/Ample/Resources/las128e2.plist b/Ample/Resources/las128e2.plist
index 42dee62..64f41e8 100644
--- a/Ample/Resources/las128e2.plist
+++ b/Ample/Resources/las128e2.plist
@@ -61,7 +61,7 @@
     </array>
     <key>media</key>
     <dict>
-      <key>flop_5_25</key>
+      <key>floppy_5_25</key>
       <integer>2</integer>
     </dict>
     <key>resolution</key>
diff --git a/Ample/Resources/las128ex.plist b/Ample/Resources/las128ex.plist
index bf46104..aa17a95 100644
--- a/Ample/Resources/las128ex.plist
+++ b/Ample/Resources/las128ex.plist
@@ -61,7 +61,7 @@
     </array>
     <key>media</key>
     <dict>
-      <key>flop_5_25</key>
+      <key>floppy_5_25</key>
       <integer>2</integer>
     </dict>
     <key>resolution</key>
@@ -120,7 +120,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -133,7 +133,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -146,7 +146,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -159,7 +159,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -214,7 +214,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -237,7 +237,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -366,11 +366,8 @@
         <string>CMS SCSI II Card</string>
         <key>default</key>
         <false/>
-        <key>media</key>
-        <dict>
-          <key>hard</key>
-          <integer>1</integer>
-        </dict>
+        <key>disabled</key>
+        <true/>
       </dict>
       <dict>
         <key>value</key>
@@ -690,7 +687,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -703,7 +700,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -716,7 +713,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -729,7 +726,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -784,7 +781,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -807,7 +804,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -936,11 +933,8 @@
         <string>CMS SCSI II Card</string>
         <key>default</key>
         <false/>
-        <key>media</key>
-        <dict>
-          <key>hard</key>
-          <integer>1</integer>
-        </dict>
+        <key>disabled</key>
+        <true/>
       </dict>
       <dict>
         <key>value</key>
diff --git a/Ample/Resources/laser128.plist b/Ample/Resources/laser128.plist
index 11f401b..2c16233 100644
--- a/Ample/Resources/laser128.plist
+++ b/Ample/Resources/laser128.plist
@@ -61,7 +61,7 @@
     </array>
     <key>media</key>
     <dict>
-      <key>flop_5_25</key>
+      <key>floppy_5_25</key>
       <integer>2</integer>
     </dict>
     <key>resolution</key>
@@ -120,7 +120,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -133,7 +133,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -146,7 +146,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -159,7 +159,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -214,7 +214,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -237,7 +237,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -366,11 +366,8 @@
         <string>CMS SCSI II Card</string>
         <key>default</key>
         <false/>
-        <key>media</key>
-        <dict>
-          <key>hard</key>
-          <integer>1</integer>
-        </dict>
+        <key>disabled</key>
+        <true/>
       </dict>
       <dict>
         <key>value</key>
@@ -690,7 +687,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -703,7 +700,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -716,7 +713,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -729,7 +726,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -784,7 +781,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -807,7 +804,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -936,11 +933,8 @@
         <string>CMS SCSI II Card</string>
         <key>default</key>
         <false/>
-        <key>media</key>
-        <dict>
-          <key>hard</key>
-          <integer>1</integer>
-        </dict>
+        <key>disabled</key>
+        <true/>
       </dict>
       <dict>
         <key>value</key>
diff --git a/Ample/Resources/laser2c.plist b/Ample/Resources/laser2c.plist
index 5ba5241..d1b960c 100644
--- a/Ample/Resources/laser2c.plist
+++ b/Ample/Resources/laser2c.plist
@@ -119,7 +119,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -132,7 +132,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -145,7 +145,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -158,7 +158,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -203,7 +203,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -226,7 +226,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -616,7 +616,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -629,7 +629,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -642,7 +642,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -655,7 +655,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -700,7 +700,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -723,7 +723,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1113,7 +1113,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1126,7 +1126,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1139,7 +1139,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1152,7 +1152,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1197,7 +1197,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -1220,7 +1220,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1610,7 +1610,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1623,7 +1623,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1636,7 +1636,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1649,7 +1649,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1694,7 +1694,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -1717,7 +1717,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2107,7 +2107,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2120,7 +2120,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2133,7 +2133,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2146,7 +2146,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2191,7 +2191,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -2214,7 +2214,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2604,7 +2604,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2617,7 +2617,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2630,7 +2630,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2643,7 +2643,7 @@
         <true/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2688,7 +2688,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -2711,7 +2711,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3101,7 +3101,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3114,7 +3114,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3127,7 +3127,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3140,7 +3140,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3185,7 +3185,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -3208,7 +3208,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
diff --git a/Ample/Resources/maciici.plist b/Ample/Resources/maciici.plist
index 01068d4..4c56088 100644
--- a/Ample/Resources/maciici.plist
+++ b/Ample/Resources/maciici.plist
@@ -91,7 +91,7 @@
     </array>
     <key>media</key>
     <dict>
-      <key>flop_3_5</key>
+      <key>floppy_3_5</key>
       <integer>2</integer>
       <key>hard</key>
       <integer>2</integer>
diff --git a/Ample/Resources/maclc.plist b/Ample/Resources/maclc.plist
index 535bdb4..9ffce0c 100644
--- a/Ample/Resources/maclc.plist
+++ b/Ample/Resources/maclc.plist
@@ -61,7 +61,7 @@
     </array>
     <key>media</key>
     <dict>
-      <key>flop_3_5</key>
+      <key>floppy_3_5</key>
       <integer>2</integer>
       <key>hard</key>
       <integer>2</integer>
diff --git a/Ample/Resources/maclc2.plist b/Ample/Resources/maclc2.plist
index 775ee68..27645a3 100644
--- a/Ample/Resources/maclc2.plist
+++ b/Ample/Resources/maclc2.plist
@@ -51,7 +51,7 @@
     </array>
     <key>media</key>
     <dict>
-      <key>flop_3_5</key>
+      <key>floppy_3_5</key>
       <integer>2</integer>
       <key>hard</key>
       <integer>2</integer>
diff --git a/Ample/Resources/maclc3.plist b/Ample/Resources/maclc3.plist
index 02a3786..8e93336 100644
--- a/Ample/Resources/maclc3.plist
+++ b/Ample/Resources/maclc3.plist
@@ -81,7 +81,7 @@
     </array>
     <key>media</key>
     <dict>
-      <key>flop_3_5</key>
+      <key>floppy_3_5</key>
       <integer>2</integer>
       <key>hard</key>
       <integer>2</integer>
diff --git a/Ample/Resources/maxxi.plist b/Ample/Resources/maxxi.plist
index 5b04edc..2547a20 100644
--- a/Ample/Resources/maxxi.plist
+++ b/Ample/Resources/maxxi.plist
@@ -119,7 +119,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -132,7 +132,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -145,7 +145,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -158,7 +158,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -203,7 +203,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -226,7 +226,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -616,7 +616,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -629,7 +629,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -642,7 +642,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -655,7 +655,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -700,7 +700,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -723,7 +723,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1113,7 +1113,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1126,7 +1126,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1139,7 +1139,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1152,7 +1152,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1197,7 +1197,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -1220,7 +1220,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1610,7 +1610,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1623,7 +1623,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1636,7 +1636,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1649,7 +1649,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1694,7 +1694,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -1717,7 +1717,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2107,7 +2107,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2120,7 +2120,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2133,7 +2133,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2146,7 +2146,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2191,7 +2191,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -2214,7 +2214,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2604,7 +2604,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2617,7 +2617,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2630,7 +2630,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2643,7 +2643,7 @@
         <true/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2688,7 +2688,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -2711,7 +2711,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3101,7 +3101,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3114,7 +3114,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3127,7 +3127,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3140,7 +3140,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3185,7 +3185,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -3208,7 +3208,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
diff --git a/Ample/Resources/microeng.plist b/Ample/Resources/microeng.plist
index 9dfe4e3..484e479 100644
--- a/Ample/Resources/microeng.plist
+++ b/Ample/Resources/microeng.plist
@@ -119,7 +119,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -132,7 +132,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -145,7 +145,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -158,7 +158,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -203,7 +203,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -226,7 +226,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -616,7 +616,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -629,7 +629,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -642,7 +642,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -655,7 +655,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -700,7 +700,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -723,7 +723,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1113,7 +1113,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1126,7 +1126,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1139,7 +1139,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1152,7 +1152,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1197,7 +1197,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -1220,7 +1220,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1610,7 +1610,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1623,7 +1623,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1636,7 +1636,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1649,7 +1649,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1694,7 +1694,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -1717,7 +1717,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2107,7 +2107,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2120,7 +2120,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2133,7 +2133,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2146,7 +2146,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2191,7 +2191,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -2214,7 +2214,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2604,7 +2604,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2617,7 +2617,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2630,7 +2630,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2643,7 +2643,7 @@
         <true/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2688,7 +2688,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -2711,7 +2711,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3101,7 +3101,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3114,7 +3114,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3127,7 +3127,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3140,7 +3140,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3185,7 +3185,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -3208,7 +3208,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
diff --git a/Ample/Resources/mprof3.plist b/Ample/Resources/mprof3.plist
index 597f234..da53f8d 100644
--- a/Ample/Resources/mprof3.plist
+++ b/Ample/Resources/mprof3.plist
@@ -80,7 +80,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -93,7 +93,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -106,7 +106,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -119,7 +119,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -174,7 +174,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -197,7 +197,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -326,11 +326,8 @@
         <string>CMS SCSI II Card</string>
         <key>default</key>
         <false/>
-        <key>media</key>
-        <dict>
-          <key>hard</key>
-          <integer>1</integer>
-        </dict>
+        <key>disabled</key>
+        <true/>
       </dict>
       <dict>
         <key>value</key>
@@ -650,7 +647,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -663,7 +660,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -676,7 +673,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -689,7 +686,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -744,7 +741,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -767,7 +764,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -896,11 +893,8 @@
         <string>CMS SCSI II Card</string>
         <key>default</key>
         <false/>
-        <key>media</key>
-        <dict>
-          <key>hard</key>
-          <integer>1</integer>
-        </dict>
+        <key>disabled</key>
+        <true/>
       </dict>
       <dict>
         <key>value</key>
@@ -1220,7 +1214,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1233,7 +1227,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1246,7 +1240,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1259,7 +1253,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1314,7 +1308,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -1337,7 +1331,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1466,11 +1460,8 @@
         <string>CMS SCSI II Card</string>
         <key>default</key>
         <false/>
-        <key>media</key>
-        <dict>
-          <key>hard</key>
-          <integer>1</integer>
-        </dict>
+        <key>disabled</key>
+        <true/>
       </dict>
       <dict>
         <key>value</key>
@@ -1790,7 +1781,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1803,7 +1794,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1816,7 +1807,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1829,7 +1820,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1884,7 +1875,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -1907,7 +1898,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2036,11 +2027,8 @@
         <string>CMS SCSI II Card</string>
         <key>default</key>
         <false/>
-        <key>media</key>
-        <dict>
-          <key>hard</key>
-          <integer>1</integer>
-        </dict>
+        <key>disabled</key>
+        <true/>
       </dict>
       <dict>
         <key>value</key>
@@ -2360,7 +2348,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2373,7 +2361,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2386,7 +2374,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2399,7 +2387,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2454,7 +2442,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -2477,7 +2465,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2606,11 +2594,8 @@
         <string>CMS SCSI II Card</string>
         <key>default</key>
         <false/>
-        <key>media</key>
-        <dict>
-          <key>hard</key>
-          <integer>1</integer>
-        </dict>
+        <key>disabled</key>
+        <true/>
       </dict>
       <dict>
         <key>value</key>
@@ -2930,7 +2915,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2943,7 +2928,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2956,7 +2941,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2969,7 +2954,7 @@
         <true/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3024,7 +3009,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -3047,7 +3032,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3176,11 +3161,8 @@
         <string>CMS SCSI II Card</string>
         <key>default</key>
         <false/>
-        <key>media</key>
-        <dict>
-          <key>hard</key>
-          <integer>1</integer>
-        </dict>
+        <key>disabled</key>
+        <true/>
       </dict>
       <dict>
         <key>value</key>
@@ -3500,7 +3482,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3513,7 +3495,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3526,7 +3508,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3539,7 +3521,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3594,7 +3576,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -3617,7 +3599,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3746,11 +3728,8 @@
         <string>CMS SCSI II Card</string>
         <key>default</key>
         <false/>
-        <key>media</key>
-        <dict>
-          <key>hard</key>
-          <integer>1</integer>
-        </dict>
+        <key>disabled</key>
+        <true/>
       </dict>
       <dict>
         <key>value</key>
diff --git a/Ample/Resources/prav82.plist b/Ample/Resources/prav82.plist
index b6cc645..b263fd8 100644
--- a/Ample/Resources/prav82.plist
+++ b/Ample/Resources/prav82.plist
@@ -119,7 +119,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -132,7 +132,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -145,7 +145,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -158,7 +158,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -203,7 +203,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -226,7 +226,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -616,7 +616,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -629,7 +629,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -642,7 +642,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -655,7 +655,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -700,7 +700,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -723,7 +723,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1113,7 +1113,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1126,7 +1126,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1139,7 +1139,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1152,7 +1152,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1197,7 +1197,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -1220,7 +1220,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1610,7 +1610,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1623,7 +1623,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1636,7 +1636,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1649,7 +1649,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1694,7 +1694,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -1717,7 +1717,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2107,7 +2107,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2120,7 +2120,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2133,7 +2133,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2146,7 +2146,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2191,7 +2191,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -2214,7 +2214,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2604,7 +2604,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2617,7 +2617,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2630,7 +2630,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2643,7 +2643,7 @@
         <true/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2688,7 +2688,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -2711,7 +2711,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3101,7 +3101,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3114,7 +3114,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3127,7 +3127,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3140,7 +3140,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3185,7 +3185,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -3208,7 +3208,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
diff --git a/Ample/Resources/prav8c.plist b/Ample/Resources/prav8c.plist
index d59ba0e..5176570 100644
--- a/Ample/Resources/prav8c.plist
+++ b/Ample/Resources/prav8c.plist
@@ -80,7 +80,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -93,7 +93,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -106,7 +106,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -119,7 +119,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -174,7 +174,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -197,7 +197,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -326,11 +326,8 @@
         <string>CMS SCSI II Card</string>
         <key>default</key>
         <false/>
-        <key>media</key>
-        <dict>
-          <key>hard</key>
-          <integer>1</integer>
-        </dict>
+        <key>disabled</key>
+        <true/>
       </dict>
       <dict>
         <key>value</key>
@@ -650,7 +647,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -663,7 +660,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -676,7 +673,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -689,7 +686,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -744,7 +741,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -767,7 +764,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -896,11 +893,8 @@
         <string>CMS SCSI II Card</string>
         <key>default</key>
         <false/>
-        <key>media</key>
-        <dict>
-          <key>hard</key>
-          <integer>1</integer>
-        </dict>
+        <key>disabled</key>
+        <true/>
       </dict>
       <dict>
         <key>value</key>
@@ -1220,7 +1214,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1233,7 +1227,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1246,7 +1240,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1259,7 +1253,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1314,7 +1308,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -1337,7 +1331,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1466,11 +1460,8 @@
         <string>CMS SCSI II Card</string>
         <key>default</key>
         <false/>
-        <key>media</key>
-        <dict>
-          <key>hard</key>
-          <integer>1</integer>
-        </dict>
+        <key>disabled</key>
+        <true/>
       </dict>
       <dict>
         <key>value</key>
@@ -1790,7 +1781,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1803,7 +1794,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1816,7 +1807,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1829,7 +1820,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1884,7 +1875,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -1907,7 +1898,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2036,11 +2027,8 @@
         <string>CMS SCSI II Card</string>
         <key>default</key>
         <false/>
-        <key>media</key>
-        <dict>
-          <key>hard</key>
-          <integer>1</integer>
-        </dict>
+        <key>disabled</key>
+        <true/>
       </dict>
       <dict>
         <key>value</key>
@@ -2360,7 +2348,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2373,7 +2361,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2386,7 +2374,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2399,7 +2387,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2454,7 +2442,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -2477,7 +2465,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2606,11 +2594,8 @@
         <string>CMS SCSI II Card</string>
         <key>default</key>
         <false/>
-        <key>media</key>
-        <dict>
-          <key>hard</key>
-          <integer>1</integer>
-        </dict>
+        <key>disabled</key>
+        <true/>
       </dict>
       <dict>
         <key>value</key>
@@ -2930,7 +2915,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2943,7 +2928,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2956,7 +2941,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2969,7 +2954,7 @@
         <true/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3024,7 +3009,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -3047,7 +3032,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3176,11 +3161,8 @@
         <string>CMS SCSI II Card</string>
         <key>default</key>
         <false/>
-        <key>media</key>
-        <dict>
-          <key>hard</key>
-          <integer>1</integer>
-        </dict>
+        <key>disabled</key>
+        <true/>
       </dict>
       <dict>
         <key>value</key>
@@ -3500,7 +3482,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3513,7 +3495,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3526,7 +3508,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3539,7 +3521,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3594,7 +3576,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -3617,7 +3599,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3746,11 +3728,8 @@
         <string>CMS SCSI II Card</string>
         <key>default</key>
         <false/>
-        <key>media</key>
-        <dict>
-          <key>hard</key>
-          <integer>1</integer>
-        </dict>
+        <key>disabled</key>
+        <true/>
       </dict>
       <dict>
         <key>value</key>
diff --git a/Ample/Resources/prav8m.plist b/Ample/Resources/prav8m.plist
index 7bde2a8..a57cc45 100644
--- a/Ample/Resources/prav8m.plist
+++ b/Ample/Resources/prav8m.plist
@@ -119,7 +119,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -132,7 +132,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -145,7 +145,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -158,7 +158,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -203,7 +203,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -226,7 +226,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -616,7 +616,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -629,7 +629,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -642,7 +642,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -655,7 +655,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -700,7 +700,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -723,7 +723,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1113,7 +1113,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1126,7 +1126,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1139,7 +1139,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1152,7 +1152,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1197,7 +1197,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -1220,7 +1220,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1610,7 +1610,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1623,7 +1623,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1636,7 +1636,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1649,7 +1649,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1694,7 +1694,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -1717,7 +1717,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2107,7 +2107,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2120,7 +2120,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2133,7 +2133,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2146,7 +2146,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2191,7 +2191,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -2214,7 +2214,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2604,7 +2604,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2617,7 +2617,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2630,7 +2630,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2643,7 +2643,7 @@
         <true/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2688,7 +2688,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -2711,7 +2711,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3101,7 +3101,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3114,7 +3114,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3127,7 +3127,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3140,7 +3140,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3185,7 +3185,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -3208,7 +3208,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
diff --git a/Ample/Resources/space84.plist b/Ample/Resources/space84.plist
index 08ebe8c..7b0ef74 100644
--- a/Ample/Resources/space84.plist
+++ b/Ample/Resources/space84.plist
@@ -119,7 +119,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -132,7 +132,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -145,7 +145,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -158,7 +158,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -203,7 +203,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -226,7 +226,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -616,7 +616,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -629,7 +629,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -642,7 +642,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -655,7 +655,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -700,7 +700,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -723,7 +723,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1113,7 +1113,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1126,7 +1126,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1139,7 +1139,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1152,7 +1152,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1197,7 +1197,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -1220,7 +1220,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1610,7 +1610,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1623,7 +1623,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1636,7 +1636,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1649,7 +1649,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1694,7 +1694,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -1717,7 +1717,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2107,7 +2107,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2120,7 +2120,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2133,7 +2133,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2146,7 +2146,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2191,7 +2191,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -2214,7 +2214,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2604,7 +2604,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2617,7 +2617,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2630,7 +2630,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2643,7 +2643,7 @@
         <true/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2688,7 +2688,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -2711,7 +2711,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3101,7 +3101,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3114,7 +3114,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3127,7 +3127,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3140,7 +3140,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3185,7 +3185,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -3208,7 +3208,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
diff --git a/Ample/Resources/spectred.plist b/Ample/Resources/spectred.plist
index c7a5ce5..d1a78e2 100644
--- a/Ample/Resources/spectred.plist
+++ b/Ample/Resources/spectred.plist
@@ -80,7 +80,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -93,7 +93,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -106,7 +106,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -119,7 +119,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -174,7 +174,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -197,7 +197,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -326,11 +326,8 @@
         <string>CMS SCSI II Card</string>
         <key>default</key>
         <false/>
-        <key>media</key>
-        <dict>
-          <key>hard</key>
-          <integer>1</integer>
-        </dict>
+        <key>disabled</key>
+        <true/>
       </dict>
       <dict>
         <key>value</key>
@@ -650,7 +647,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -663,7 +660,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -676,7 +673,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -689,7 +686,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -744,7 +741,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -767,7 +764,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -896,11 +893,8 @@
         <string>CMS SCSI II Card</string>
         <key>default</key>
         <false/>
-        <key>media</key>
-        <dict>
-          <key>hard</key>
-          <integer>1</integer>
-        </dict>
+        <key>disabled</key>
+        <true/>
       </dict>
       <dict>
         <key>value</key>
@@ -1220,7 +1214,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1233,7 +1227,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1246,7 +1240,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1259,7 +1253,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1314,7 +1308,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -1337,7 +1331,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1466,11 +1460,8 @@
         <string>CMS SCSI II Card</string>
         <key>default</key>
         <false/>
-        <key>media</key>
-        <dict>
-          <key>hard</key>
-          <integer>1</integer>
-        </dict>
+        <key>disabled</key>
+        <true/>
       </dict>
       <dict>
         <key>value</key>
@@ -1790,7 +1781,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1803,7 +1794,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1816,7 +1807,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1829,7 +1820,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1884,7 +1875,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -1907,7 +1898,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2036,11 +2027,8 @@
         <string>CMS SCSI II Card</string>
         <key>default</key>
         <false/>
-        <key>media</key>
-        <dict>
-          <key>hard</key>
-          <integer>1</integer>
-        </dict>
+        <key>disabled</key>
+        <true/>
       </dict>
       <dict>
         <key>value</key>
@@ -2360,7 +2348,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2373,7 +2361,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2386,7 +2374,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2399,7 +2387,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2454,7 +2442,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -2477,7 +2465,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2606,11 +2594,8 @@
         <string>CMS SCSI II Card</string>
         <key>default</key>
         <false/>
-        <key>media</key>
-        <dict>
-          <key>hard</key>
-          <integer>1</integer>
-        </dict>
+        <key>disabled</key>
+        <true/>
       </dict>
       <dict>
         <key>value</key>
@@ -2930,7 +2915,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2943,7 +2928,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2956,7 +2941,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2969,7 +2954,7 @@
         <true/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3024,7 +3009,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -3047,7 +3032,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3176,11 +3161,8 @@
         <string>CMS SCSI II Card</string>
         <key>default</key>
         <false/>
-        <key>media</key>
-        <dict>
-          <key>hard</key>
-          <integer>1</integer>
-        </dict>
+        <key>disabled</key>
+        <true/>
       </dict>
       <dict>
         <key>value</key>
@@ -3500,7 +3482,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3513,7 +3495,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3526,7 +3508,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3539,7 +3521,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3594,7 +3576,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -3617,7 +3599,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3746,11 +3728,8 @@
         <string>CMS SCSI II Card</string>
         <key>default</key>
         <false/>
-        <key>media</key>
-        <dict>
-          <key>hard</key>
-          <integer>1</integer>
-        </dict>
+        <key>disabled</key>
+        <true/>
       </dict>
       <dict>
         <key>value</key>
diff --git a/Ample/Resources/uniap2en.plist b/Ample/Resources/uniap2en.plist
index ac14dcd..a4fed6c 100644
--- a/Ample/Resources/uniap2en.plist
+++ b/Ample/Resources/uniap2en.plist
@@ -119,7 +119,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -132,7 +132,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -145,7 +145,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -158,7 +158,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -203,7 +203,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -226,7 +226,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -616,7 +616,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -629,7 +629,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -642,7 +642,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -655,7 +655,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -700,7 +700,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -723,7 +723,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1113,7 +1113,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1126,7 +1126,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1139,7 +1139,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1152,7 +1152,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1197,7 +1197,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -1220,7 +1220,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1610,7 +1610,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1623,7 +1623,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1636,7 +1636,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1649,7 +1649,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1694,7 +1694,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -1717,7 +1717,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2107,7 +2107,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2120,7 +2120,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2133,7 +2133,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2146,7 +2146,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2191,7 +2191,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -2214,7 +2214,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2604,7 +2604,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2617,7 +2617,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2630,7 +2630,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2643,7 +2643,7 @@
         <true/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2688,7 +2688,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -2711,7 +2711,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3101,7 +3101,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3114,7 +3114,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3127,7 +3127,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3140,7 +3140,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3185,7 +3185,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -3208,7 +3208,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
diff --git a/Ample/Resources/uniap2pt.plist b/Ample/Resources/uniap2pt.plist
index 058ffd9..18557df 100644
--- a/Ample/Resources/uniap2pt.plist
+++ b/Ample/Resources/uniap2pt.plist
@@ -119,7 +119,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -132,7 +132,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -145,7 +145,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -158,7 +158,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -203,7 +203,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -226,7 +226,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -616,7 +616,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -629,7 +629,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -642,7 +642,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -655,7 +655,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -700,7 +700,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -723,7 +723,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1113,7 +1113,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1126,7 +1126,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1139,7 +1139,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1152,7 +1152,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1197,7 +1197,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -1220,7 +1220,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1610,7 +1610,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1623,7 +1623,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1636,7 +1636,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1649,7 +1649,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1694,7 +1694,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -1717,7 +1717,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2107,7 +2107,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2120,7 +2120,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2133,7 +2133,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2146,7 +2146,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2191,7 +2191,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -2214,7 +2214,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2604,7 +2604,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2617,7 +2617,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2630,7 +2630,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2643,7 +2643,7 @@
         <true/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2688,7 +2688,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -2711,7 +2711,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3101,7 +3101,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3114,7 +3114,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3127,7 +3127,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3140,7 +3140,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3185,7 +3185,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -3208,7 +3208,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
diff --git a/Ample/Resources/uniap2ti.plist b/Ample/Resources/uniap2ti.plist
index 447a6dd..f9a7816 100644
--- a/Ample/Resources/uniap2ti.plist
+++ b/Ample/Resources/uniap2ti.plist
@@ -119,7 +119,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -132,7 +132,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -145,7 +145,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -158,7 +158,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -203,7 +203,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -226,7 +226,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -616,7 +616,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -629,7 +629,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -642,7 +642,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -655,7 +655,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -700,7 +700,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -723,7 +723,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1113,7 +1113,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1126,7 +1126,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1139,7 +1139,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1152,7 +1152,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1197,7 +1197,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -1220,7 +1220,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1610,7 +1610,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1623,7 +1623,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1636,7 +1636,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1649,7 +1649,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1694,7 +1694,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -1717,7 +1717,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2107,7 +2107,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2120,7 +2120,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2133,7 +2133,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2146,7 +2146,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2191,7 +2191,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -2214,7 +2214,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2604,7 +2604,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2617,7 +2617,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2630,7 +2630,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2643,7 +2643,7 @@
         <true/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2688,7 +2688,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -2711,7 +2711,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3101,7 +3101,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3114,7 +3114,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3127,7 +3127,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3140,7 +3140,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -3185,7 +3185,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -3208,7 +3208,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
diff --git a/Ample/Resources/zijini.plist b/Ample/Resources/zijini.plist
index 87424df..e1fc1f9 100644
--- a/Ample/Resources/zijini.plist
+++ b/Ample/Resources/zijini.plist
@@ -80,7 +80,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -93,7 +93,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -106,7 +106,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -119,7 +119,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -174,7 +174,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -197,7 +197,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -326,11 +326,8 @@
         <string>CMS SCSI II Card</string>
         <key>default</key>
         <false/>
-        <key>media</key>
-        <dict>
-          <key>hard</key>
-          <integer>1</integer>
-        </dict>
+        <key>disabled</key>
+        <true/>
       </dict>
       <dict>
         <key>value</key>
@@ -650,7 +647,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -663,7 +660,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -676,7 +673,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -689,7 +686,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -744,7 +741,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -767,7 +764,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -896,11 +893,8 @@
         <string>CMS SCSI II Card</string>
         <key>default</key>
         <false/>
-        <key>media</key>
-        <dict>
-          <key>hard</key>
-          <integer>1</integer>
-        </dict>
+        <key>disabled</key>
+        <true/>
       </dict>
       <dict>
         <key>value</key>
@@ -1220,7 +1214,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1233,7 +1227,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1246,7 +1240,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1259,7 +1253,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1314,7 +1308,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -1337,7 +1331,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1466,11 +1460,8 @@
         <string>CMS SCSI II Card</string>
         <key>default</key>
         <false/>
-        <key>media</key>
-        <dict>
-          <key>hard</key>
-          <integer>1</integer>
-        </dict>
+        <key>disabled</key>
+        <true/>
       </dict>
       <dict>
         <key>value</key>
@@ -1790,7 +1781,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1803,7 +1794,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1816,7 +1807,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1829,7 +1820,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -1884,7 +1875,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -1907,7 +1898,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2036,11 +2027,8 @@
         <string>CMS SCSI II Card</string>
         <key>default</key>
         <false/>
-        <key>media</key>
-        <dict>
-          <key>hard</key>
-          <integer>1</integer>
-        </dict>
+        <key>disabled</key>
+        <true/>
       </dict>
       <dict>
         <key>value</key>
@@ -2360,7 +2348,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2373,7 +2361,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2386,7 +2374,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2399,7 +2387,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2454,7 +2442,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>cdrm</key>
+          <key>cdrom</key>
           <integer>1</integer>
           <key>hard</key>
           <integer>1</integer>
@@ -2477,7 +2465,7 @@
         <false/>
         <key>media</key>
         <dict>
-          <key>flop_5_25</key>
+          <key>floppy_5_25</key>
           <integer>2</integer>
         </dict>
       </dict>
@@ -2606,11 +2594,8 @@
         <string>CMS SCSI II Card</string>
         <key>default</key>
         <false/>
-        <key>media</key>
-        <dict>
-          <key>hard</key>
-          <integer>1</integer>
-        </dict>
+        <key>disabled</key>
+        <true/>
       </dict>
       <dict>
         <key>value</key>
diff --git a/Ample/Slot.h b/Ample/Slot.h
new file mode 100644
index 0000000..b17ccb9
--- /dev/null
+++ b/Ample/Slot.h
@@ -0,0 +1,60 @@
+//
+//  Slot.h
+//  Ample
+//
+//  Created by Kelvin Sherlock on 3/6/2021.
+//  Copyright © 2021 Kelvin Sherlock. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import <Cocoa/Cocoa.h>
+#import "Media.h"
+
+//NS_ASSUME_NONNULL_BEGIN
+@class Slot, SlotOption, SlotTableCellView;
+
+
+@interface Slot : NSObject<NSCopying>
+
+@property NSInteger defaultIndex;
+@property NSInteger selectedIndex;
+@property NSInteger index;
+
+@property (readonly) NSString *name;
+@property (readonly) NSString *title;
+@property (readonly) NSArray *menuItems;
+
+
+-(NSArray *)args;
+-(NSArray *)serialize;
+
+-(void)reset;
+-(void)prepareView: (SlotTableCellView *)view;
+-(void)loadDeviceSlots: (NSDictionary *)devices;
+
+-(void)selectValue: (NSString *)value;
+-(SlotOption *)selectedItem;
+-(Media)selectedMedia;
+
+-(instancetype)initWithName: (NSString *)name title: (NSString *)title data: (NSArray *)data;
+
+
+@end
+
+@interface SlotOption : NSObject<NSCopying>
+
+@property NSString *value;
+@property NSString *title;
+@property BOOL isDefault;
+@property BOOL disabled;
+
+@end
+
+@interface SlotTableCellView  : NSTableCellView
+
+@property (weak) IBOutlet NSPopUpButton *menuButton;
+
+@end
+
+
+//NS_ASSUME_NONNULL_END
diff --git a/Ample/Slot.m b/Ample/Slot.m
new file mode 100644
index 0000000..fd8c74e
--- /dev/null
+++ b/Ample/Slot.m
@@ -0,0 +1,415 @@
+//
+//  Slot.m
+//  Ample
+//
+//  Created by Kelvin Sherlock on 3/6/2021.
+//  Copyright © 2021 Kelvin Sherlock. All rights reserved.
+//
+
+#import <Cocoa/Cocoa.h>
+#import "Slot.h"
+
+
+static NSArray *DeepCopyArray(NSArray *src) {
+    if (!src) return nil;
+    return [[NSArray alloc] initWithArray: src copyItems: YES];
+}
+
+@interface Slot () {
+    NSArray<SlotOption *> *_options;
+    //NSArray<NSMenuItem *> *_menuItems;
+}
+
+-(SlotOption *)selectedItem;
+
+-(void)setKeyPath;
+-(void)setKeyPath: (NSString *)path;
+//-(NSArray *)buildArgs: (NSMutableArray *)args prefix: (NSString *)prefix;
+//-(void)buildMedia: (MediaBuilder *)builder;
+//-(NSArray *)buildSerial: (NSMutableArray *)array;
+@end
+
+@interface SlotOption() {
+    NSArray<Slot *> *_children;
+    //NSDictionary *_media;
+    Media _media;
+    NSString *_keyPath;
+    NSString *_devName;
+    BOOL _default;
+}
+
+-(instancetype)initWithDictionary: (NSDictionary *)dictionary;
+
+-(NSMenuItem *)menuItem;
+
+-(void)reset;
+
+-(void)setKeyPath: (NSString *)path;
+-(void)buildArgs: (NSMutableArray *)args;
+-(void)buildMedia: (Media *)media;
+-(void)buildSerial: (NSMutableArray *)array;
+
+-(BOOL)loadDeviceSlots: (NSDictionary *)devices;
+
+@end
+
+@implementation Slot
+
+
+-(void)reset {
+    [self setSelectedIndex: _defaultIndex >= 0 ? _defaultIndex : 0];
+    for (SlotOption *s in _options) {
+        [s reset];
+    }
+}
+
+-(void)selectValue: (NSString *)value {
+
+    if (value) {
+        NSInteger index = 0;
+        for (SlotOption *item in _options) {
+            if ([[item value] isEqualToString: value]) {
+                [self setSelectedIndex: index];
+                return;
+            }
+            ++index;
+        }
+    }
+    //[self setSelectedIndex: _defaultIndex >= 0 ? _defaultIndex : 0];
+}
+
+-(SlotOption *)selectedItem {
+    if (_selectedIndex < 0) return nil;
+    return [_options objectAtIndex: _selectedIndex];
+}
+
+-(NSArray *)args {
+    if (_selectedIndex < 0) return nil;
+    NSMutableArray *rv = [NSMutableArray new];
+    SlotOption *option = [_options objectAtIndex: _selectedIndex];
+    
+    [option buildArgs: rv];
+    return rv;
+}
+
+-(NSArray *)serialize {
+    if (_selectedIndex < 0) return nil;
+    
+    NSMutableArray *array = [NSMutableArray new];
+    SlotOption *option = [_options objectAtIndex: _selectedIndex];
+    [option buildSerial: array];
+    return array;
+}
+
+-(Media)selectedMedia {
+
+    if (_selectedIndex < 0) return EmptyMedia;
+
+    Media media = { 0 };
+    SlotOption *option = [_options objectAtIndex: _selectedIndex];
+
+    [option buildMedia: &media];
+    return media;
+
+}
+
+
+-(id)copyWithZone:(NSZone *)zone {
+    
+    Slot *child = [Slot new];
+    child->_index = _index;
+    child->_defaultIndex = _defaultIndex;
+    child->_selectedIndex = _selectedIndex;
+    child->_name = [_name copyWithZone: zone];
+    child->_title = [_title copyWithZone: zone];
+    child->_options = DeepCopyArray(_options);
+    
+    #if 0
+    // menu could still be in use by an off-screen pop up button, so it can't be cached.
+    child->_menuItems = DeepCopyArray(_menuItems);
+    // update represented object.
+    NSInteger index = 0;
+    for (NSMenuItem *item in child->_menuItems) {
+        [item setRepresentedObject: child->_options[index]];
+        ++index;
+    }
+    #endif
+    return child;
+}
+
+
+-(void)setKeyPath {
+    if (![_name length]) return;
+    for (SlotOption *o in _options)
+        [o setKeyPath: _name];
+}
+-(void)setKeyPath: (NSString *)path {
+    
+    NSString *p = [path stringByAppendingString: _name];
+    for (SlotOption *o in _options) {
+        [o setKeyPath: p];
+    }
+}
+
+
+
+-(instancetype)initWithName: (NSString *)name title: (NSString *)title data: (NSArray *)data {
+    
+    _name = [name copy];
+    _title = [title copy];
+    _selectedIndex = -1;
+    _defaultIndex = -1;
+    _index = -1;
+    
+    NSMutableArray *options = [NSMutableArray arrayWithCapacity: [data count]];
+    //NSMutableArray *menuItems = [NSMutableArray arrayWithCapacity: [data count]];
+
+    NSInteger index = 0;
+    for (NSDictionary *d in data) {
+        SlotOption *o = [[SlotOption alloc] initWithDictionary: d];
+        if ([o isDefault]) {
+            _defaultIndex = index;
+        }
+        ++index;
+        [options addObject: o];
+    }
+    _options = options;
+    //_menuItems = menuItems;
+    
+    _selectedIndex = _defaultIndex;
+    if (_selectedIndex < 0) _selectedIndex = 0;
+    
+    return self;
+}
+
+-(NSArray *)menuItems {
+    //if (_menuItems) return _menuItems;
+
+    NSMutableArray *menuItems = [NSMutableArray arrayWithCapacity: [_options count]];
+    for (SlotOption *o in _options) {
+        [menuItems addObject: [o menuItem]];
+    }
+    //_menuItems = tmp;
+    return menuItems;
+}
+
+-(void)loadDeviceSlots: (NSDictionary *)devices {
+    for (SlotOption *s in _options) {
+        [s loadDeviceSlots: devices];
+    }
+}
+
+-(void)prepareView: (SlotTableCellView *)view {
+    
+    // can't cache the menu items since they
+    // may still be in use.
+    
+    NSPopUpButton *button = [view menuButton];
+    NSTextField *text = [view textField];
+    
+    [text setObjectValue: _title];
+    [button unbind: @"selectedIndex"];
+    NSMenu *menu = [button menu];
+    NSArray *menuItems = [self menuItems];
+
+    [menu setItemArray: menuItems];
+    [button bind: @"selectedIndex" toObject: self withKeyPath: @"selectedIndex" options: nil];
+    [button setTag: _index];
+}
+
+
+@end
+
+
+@implementation SlotOption
+
+@synthesize  isDefault = _default;
+
+-(instancetype)initWithDictionary: (NSDictionary *)dictionary {
+    
+    _default = [(NSNumber *)[dictionary objectForKey: @"default"] boolValue];
+    _disabled = [(NSNumber *)[dictionary objectForKey: @"disabled"] boolValue];
+    _value = [dictionary objectForKey: @"value"];
+    _devName = [dictionary objectForKey: @"devName"];
+    _title = [dictionary objectForKey: @"description"];
+    _media = MediaFromDictionary([dictionary objectForKey: @"media"]);
+    //_media = [dictionary objectForKey: @"media"];
+    return self;
+}
+
+-(void)reset {
+    for (Slot *s in _children) {
+        [s reset];
+    }
+}
+
+
+-(NSMenuItem *)menuItem {
+    NSMenuItem *item;
+    extern NSAttributedString *ItalicMenuString(NSString *);
+    
+    item = [[NSMenuItem alloc] initWithTitle: _title action: NULL keyEquivalent: @""];
+    if (_disabled) {
+        [item setEnabled: NO];
+    }
+    if (_default) {
+        [item setAttributedTitle: ItalicMenuString(_title)];
+    }
+    [item setRepresentedObject: self];
+    return item;
+}
+
+-(id)copyWithZone:(NSZone *)zone {
+
+    SlotOption *child = [SlotOption new];
+    
+    child->_default = _default;
+    child->_disabled = _disabled;
+    child->_media = _media;
+    child->_value = [_value copyWithZone: zone];
+    child->_devName = [_devName copyWithZone: zone];
+    child->_title = [_title copyWithZone: zone];
+    //child->_media = [_media copyWithZone: zone];
+    child->_keyPath = [_keyPath copyWithZone: zone];
+
+    child->_children = DeepCopyArray(_children);
+    
+    return child;
+}
+
+
+
+-(void)buildArgs: (NSMutableArray *)args {
+    
+    if (!_default) {
+        [args addObject: _keyPath];
+        [args addObject: _value];
+    }
+    for (Slot *s in _children) {
+        [[s selectedItem] buildArgs: args];
+    }
+}
+
+-(void)buildMedia: (Media *)media {
+    
+#undef _
+#define _(name) media->name += _media.name
+
+    _(cass);
+    _(cdrom);
+    _(hard);
+    _(floppy_3_5);
+    _(floppy_5_25);
+    _(pseudo_disk);
+#undef _
+        
+    for (Slot *s in _children) {
+        [[s selectedItem] buildMedia: media];
+    }
+}
+
+
+-(void)buildSerial: (NSMutableArray *)array {
+
+    if (!_default)
+        [array addObject: _keyPath];
+
+    for (Slot *s in _children)
+        [[s selectedItem] buildSerial: array];
+
+}
+
+
+// propogate
+-(void)setKeyPath: (NSString *)path {
+    
+    _keyPath = path;
+    if (!_children) return;
+    NSString *p = [path stringByAppendingFormat: @":%@", _value];
+    
+    for (Slot *s in _children) {
+        [s setKeyPath: p];
+    }
+}
+
+
+-(BOOL)loadDeviceSlots: (NSDictionary *)devices {
+    NSArray *o = [devices objectForKey: _devName];
+    if (!o) return NO;
+    _children = DeepCopyArray(o);
+    return YES;
+}
+
+@end
+
+
+@implementation SlotTableCellView
+
+@end
+
+
+NSArray *BuildSlots(NSString *name, NSDictionary *data) {
+
+    static NSCache *cache = nil;
+    
+    typedef struct SlotInfo {
+        NSString *key;
+        NSString *flag;
+        NSString *title;
+    } SlotInfo;
+
+    static SlotInfo Slots[] = {
+        { @"ram",        @"-ramsize",    @"RAM:"  },
+        { @"sl0",        @"-sl0",        @"Slot 0:" },
+        { @"sl1",        @"-sl1",        @"Slot 1:" },
+        { @"sl2",        @"-sl2",        @"Slot 2:" },
+        { @"sl3",        @"-sl3",        @"Slot 3:" },
+        { @"sl4",        @"-sl4",        @"Slot 4:" },
+        { @"sl5",        @"-sl5",        @"Slot 5:" },
+        { @"sl6",        @"-sl6",        @"Slot 6:" },
+        { @"sl7",        @"-sl7",        @"Slot 7:" },
+        { @"exp",        @"-exp",        @"Expansion:" },
+        { @"aux",        @"-aux",        @"Auxiliary:" },
+        { @"rs232",      @"-rs232",      @"RS232:" },
+        { @"gameio",     @"-gameio",     @"Game I/O:" },
+        { @"modem",      @"-modem",      @"Modem:" },
+        { @"printer",    @"-printer",    @"Printer:" },
+
+        // nubus mac
+        { @"nb9",        @"-nb9",        @"Slot 9:" },
+        { @"nba",        @"-nba",        @"Slot A:" },
+        { @"nbb",        @"-nbb",        @"Slot B:" },
+        { @"nbc",        @"-nbc",        @"Slot C:" },
+        { @"nbd",        @"-nbd",        @"Slot D:" },
+        { @"nbe",        @"-nbe",        @"Slot E:" },
+    };
+
+    
+    #define SIZEOF(x) (sizeof(x) / sizeof(x[0]))
+    
+    if (!cache) {
+        cache = [NSCache new];
+    }
+    
+    extern NSString *InternString(NSString *);
+    name = InternString(name);
+    NSArray *x = [cache objectForKey: name];
+    if (x) {
+        return x;
+    }
+    
+    NSMutableArray *rv = [NSMutableArray new];
+    for (unsigned i = 0, index = 1; i < 21; ++i, index <<= 1) {
+        NSArray *tmp = [data objectForKey: Slots[i].key];
+        if (!tmp) continue;
+
+        Slot *s = [[Slot alloc] initWithName: Slots[i].flag title: Slots[i].title data: tmp];
+        [s setIndex: i];
+        
+        [s setKeyPath];
+        [rv addObject: s];
+    }
+    
+    [cache setObject: rv forKey: name];
+    return rv;
+}
diff --git a/python/listxml.sh b/python/listxml.sh
new file mode 100644
index 0000000..9f8d1d8
--- /dev/null
+++ b/python/listxml.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+export DYLD_FALLBACK_FRAMEWORK_PATH=../embedded
+
+for machine in $* ; do ../embedded/mame64 "$machine" -listxml -nodtd ; done
+
diff --git a/python/mkmachines.py b/python/mkmachines.py
index 39be85c..5997554 100644
--- a/python/mkmachines.py
+++ b/python/mkmachines.py
@@ -34,6 +34,10 @@ DISABLED = set((
 	'xebec',
 	'sider1',
 	'sider2',
+	'cmsscsi',
+	('apple2gs', 'cffa202'),
+	('apple2gsr0', 'cffa202'),
+	('apple2gsr1', 'cffa202'),
 ))
 
 
@@ -53,11 +57,11 @@ def find_machine_media(parent):
 		"cassette": "cass",
 		"apple1_cass": "cass",
 		"apple2_cass": "cass",
-		"floppy_5_25": "flop_5_25",
-		"floppy_3_5": "flop_3_5",
+		"floppy_5_25": "floppy_5_25",
+		"floppy_3_5": "floppy_3_5",
 		# mac
 		"scsi_hdd": "hard",
-		#"cdrom": "cdrm", -- 2021-01-18 - CD rom is more or less broken so exclude it.
+		#"cdrom": "cdrom", -- 2021-01-18 - CD rom is more or less broken so exclude it.
 	}
 	media = {}
 	for x in parent.findall("./device"):
@@ -122,16 +126,16 @@ def find_media(parent, include_slots=False):
 
 	remap_dev = {
 		"cassette_image": "cass",
-		"floppy_apple": "flop_5_25",
+		"floppy_apple": "floppy_5_25",
 		"harddisk_image": "hard",
-		"floppy_sonny": "flop_3_5",
+		"floppy_sonny": "floppy_3_5",
 		"messimg_disk_image": "pseudo_disk",
 	}
 	remap_slot = {
 		"harddisk": "hard",
 		"hdd": "hard",
-		"cdrom": "cdrm",
-		"525": "flop_5_25",
+		"cdrom": "cdrom",
+		"525": "floppy_5_25",
 		"image": "psuedo_disk",
 	}
 
@@ -167,7 +171,7 @@ def find_media(parent, include_slots=False):
 	# n.b. - floppies are 5.25" 360k or 180k.  not bootable, not usable from prodos
 	# without special prodos file or loading driver into pc transporter ram. 
 	if parent.get("name") == "pcxport":
-		media.get["flop_5_25"] = media.get("flop_5_25", 0) + 2
+		media.get["floppy_5_25"] = media.get("floppy_5_25", 0) + 2
 
 	if not media: return None
 	return media
@@ -177,6 +181,52 @@ def find_software(parent):
 	swl = parent.findall("./softwarelist")
 	return [x.get("name") + ".xml" for x in swl]
 
+
+
+	# given a machine, return a list of slotoptions.
+def slot_options(machine):
+	REMAP = {
+		'cdrom': 'CD-ROM',
+		'hdd': 'Hard Disk',
+		'harddisk': 'Hard Disk',
+	}
+	MEDIA = {
+		'cdrom': 'cdrom',
+		'hdd': 'hard',
+		'harddisk': 'hard',
+	}
+
+	mname = machine.get('name')
+
+	rv = { }
+	for slot in machine.findall('./slot'):
+		slotname = slot.get("name")
+		tmp = []
+		has_default = False
+		for option in slot.findall("./slotoption"):
+			name = option.get("name")
+			if name not in REMAP: continue
+			default = option.get("default") == "yes"
+			has_default |= default
+			tmp.append({
+				'value': name,
+				'description': REMAP[name],
+				'media': MEDIA[name],
+				'default': default
+			})
+		if len(tmp) < 2 : continue # don't bother if only 1 option which is going to be defaulted anyhow.
+
+		tmp.sort(key=lambda x: x["description"].upper() )
+		tmp.insert(0, {"value": "", "description": "—None—", "default": not has_default})
+
+		rv[slotname] = tmp
+
+	if not len(rv): return None
+
+	return rv
+
+
+
 devices = {}
 
 p = argparse.ArgumentParser()
@@ -251,21 +301,35 @@ for m in machines:
 			devname = x.get("devname")
 			desc = mm[devname].find("description").text
 			default = x.get("default") == "yes"
-			disabled = name in DISABLED
+			disabled = name in DISABLED or (m, name) in DISABLED
 
-			d = { "value": name, "description": desc, "default": default }
+			d = { "value": name, "description": desc, "default": default } #, "devname": devname or ''}
 			if disabled: d["disabled"] = True
 			else:
 				media = find_media(mm[devname], True)
 				if media: d["media"] = media
+
+				# slots = find_slot_options(mm[devname])
+				# if slots: d["options"] = slots  # should not include media if it has slot options.
+
 			tmp.append(d)
 			has_default |= default
 
+
 		tmp.sort(key=lambda x: x["description"].upper() )
 		tmp.insert(0, {"value": "", "description": "—None—", "default": not has_default})
 		data[s] = tmp
 
 
+	# also add child slots
+	slots = {}
+	for x in mm.values():
+		name = x.get("name")
+		y = slot_options(x)
+		if y:
+			slots[name] = y
+
+	#if slots: data["device-slots"] = slots
 	data["software"] = find_software(machine)