diff --git a/Ample/Resources/a2000.plist b/Ample/Resources/a2000.plist
index 67c999a..39824ed 100644
--- a/Ample/Resources/a2000.plist
+++ b/Ample/Resources/a2000.plist
@@ -439,6 +439,46 @@
             <key>devname</key>
             <string>zorro_a2232</string>
           </dict>
+          <dict>
+            <key>value</key>
+            <string>framemaster</string>
+            <key>description</key>
+            <string>FrameMaster Framebuffer</string>
+            <key>devname</key>
+            <string>zorro_framemaster</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>picasso2p</string>
+            <key>description</key>
+            <string>Picasso II+ RTG</string>
+            <key>devname</key>
+            <string>zorro_picasso2p</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>rainbow2</string>
+            <key>description</key>
+            <string>Rainbow II Framebuffer</string>
+            <key>devname</key>
+            <string>zorro_rainbow2</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>ripple</string>
+            <key>description</key>
+            <string>RIPPLE IDE Interface</string>
+            <key>devname</key>
+            <string>zorro_ripple</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>toccata</string>
+            <key>description</key>
+            <string>Toccata SoundCard</string>
+            <key>devname</key>
+            <string>zorro_toccata</string>
+          </dict>
         </array>
       </dict>
       <dict>
@@ -504,6 +544,46 @@
             <key>devname</key>
             <string>zorro_a2232</string>
           </dict>
+          <dict>
+            <key>value</key>
+            <string>framemaster</string>
+            <key>description</key>
+            <string>FrameMaster Framebuffer</string>
+            <key>devname</key>
+            <string>zorro_framemaster</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>picasso2p</string>
+            <key>description</key>
+            <string>Picasso II+ RTG</string>
+            <key>devname</key>
+            <string>zorro_picasso2p</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>rainbow2</string>
+            <key>description</key>
+            <string>Rainbow II Framebuffer</string>
+            <key>devname</key>
+            <string>zorro_rainbow2</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>ripple</string>
+            <key>description</key>
+            <string>RIPPLE IDE Interface</string>
+            <key>devname</key>
+            <string>zorro_ripple</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>toccata</string>
+            <key>description</key>
+            <string>Toccata SoundCard</string>
+            <key>devname</key>
+            <string>zorro_toccata</string>
+          </dict>
         </array>
       </dict>
       <dict>
@@ -569,6 +649,46 @@
             <key>devname</key>
             <string>zorro_a2232</string>
           </dict>
+          <dict>
+            <key>value</key>
+            <string>framemaster</string>
+            <key>description</key>
+            <string>FrameMaster Framebuffer</string>
+            <key>devname</key>
+            <string>zorro_framemaster</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>picasso2p</string>
+            <key>description</key>
+            <string>Picasso II+ RTG</string>
+            <key>devname</key>
+            <string>zorro_picasso2p</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>rainbow2</string>
+            <key>description</key>
+            <string>Rainbow II Framebuffer</string>
+            <key>devname</key>
+            <string>zorro_rainbow2</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>ripple</string>
+            <key>description</key>
+            <string>RIPPLE IDE Interface</string>
+            <key>devname</key>
+            <string>zorro_ripple</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>toccata</string>
+            <key>description</key>
+            <string>Toccata SoundCard</string>
+            <key>devname</key>
+            <string>zorro_toccata</string>
+          </dict>
         </array>
       </dict>
       <dict>
@@ -634,6 +754,46 @@
             <key>devname</key>
             <string>zorro_a2232</string>
           </dict>
+          <dict>
+            <key>value</key>
+            <string>framemaster</string>
+            <key>description</key>
+            <string>FrameMaster Framebuffer</string>
+            <key>devname</key>
+            <string>zorro_framemaster</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>picasso2p</string>
+            <key>description</key>
+            <string>Picasso II+ RTG</string>
+            <key>devname</key>
+            <string>zorro_picasso2p</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>rainbow2</string>
+            <key>description</key>
+            <string>Rainbow II Framebuffer</string>
+            <key>devname</key>
+            <string>zorro_rainbow2</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>ripple</string>
+            <key>description</key>
+            <string>RIPPLE IDE Interface</string>
+            <key>devname</key>
+            <string>zorro_ripple</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>toccata</string>
+            <key>description</key>
+            <string>Toccata SoundCard</string>
+            <key>devname</key>
+            <string>zorro_toccata</string>
+          </dict>
         </array>
       </dict>
       <dict>
@@ -699,6 +859,46 @@
             <key>devname</key>
             <string>zorro_a2232</string>
           </dict>
+          <dict>
+            <key>value</key>
+            <string>framemaster</string>
+            <key>description</key>
+            <string>FrameMaster Framebuffer</string>
+            <key>devname</key>
+            <string>zorro_framemaster</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>picasso2p</string>
+            <key>description</key>
+            <string>Picasso II+ RTG</string>
+            <key>devname</key>
+            <string>zorro_picasso2p</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>rainbow2</string>
+            <key>description</key>
+            <string>Rainbow II Framebuffer</string>
+            <key>devname</key>
+            <string>zorro_rainbow2</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>ripple</string>
+            <key>description</key>
+            <string>RIPPLE IDE Interface</string>
+            <key>devname</key>
+            <string>zorro_ripple</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>toccata</string>
+            <key>description</key>
+            <string>Toccata SoundCard</string>
+            <key>devname</key>
+            <string>zorro_toccata</string>
+          </dict>
         </array>
       </dict>
       <dict>
@@ -3408,6 +3608,296 @@
           </dict>
         </array>
       </dict>
+      <dict>
+        <key>name</key>
+        <string>zorro_ripple</string>
+        <key>slots</key>
+        <array>
+          <dict>
+            <key>name</key>
+            <string>bios</string>
+            <key>description</key>
+            <string>ROM</string>
+            <key>options</key>
+            <array>
+              <dict>
+                <key>value</key>
+                <string></string>
+                <key>description</key>
+                <string>—Default—</string>
+                <key>default</key>
+                <true/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>40.8</string>
+                <key>description</key>
+                <string>Release 40.8</string>
+              </dict>
+            </array>
+          </dict>
+          <dict>
+            <key>name</key>
+            <string>:ata_0:0</string>
+            <key>options</key>
+            <array>
+              <dict>
+                <key>value</key>
+                <string></string>
+                <key>description</key>
+                <string>—None—</string>
+                <key>default</key>
+                <true/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>cdrom</string>
+                <key>description</key>
+                <string>CD-ROM</string>
+                <key>default</key>
+                <false/>
+                <key>media</key>
+                <dict>
+                  <key>cdrom</key>
+                  <integer>1</integer>
+                </dict>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>hdd</string>
+                <key>description</key>
+                <string>Hard Disk</string>
+                <key>default</key>
+                <false/>
+                <key>media</key>
+                <dict>
+                  <key>hard</key>
+                  <integer>1</integer>
+                </dict>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>zip100</string>
+                <key>description</key>
+                <string>Iomega Zip 100MB IDE Drive</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>cr589</string>
+                <key>description</key>
+                <string>Matsushita CR589 CD-ROM Drive</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>xm3301</string>
+                <key>description</key>
+                <string>Toshiba XM-3301 CD-ROM Drive</string>
+                <key>default</key>
+                <false/>
+              </dict>
+            </array>
+          </dict>
+          <dict>
+            <key>name</key>
+            <string>:ata_0:1</string>
+            <key>options</key>
+            <array>
+              <dict>
+                <key>value</key>
+                <string></string>
+                <key>description</key>
+                <string>—None—</string>
+                <key>default</key>
+                <true/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>cdrom</string>
+                <key>description</key>
+                <string>CD-ROM</string>
+                <key>default</key>
+                <false/>
+                <key>media</key>
+                <dict>
+                  <key>cdrom</key>
+                  <integer>1</integer>
+                </dict>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>hdd</string>
+                <key>description</key>
+                <string>Hard Disk</string>
+                <key>default</key>
+                <false/>
+                <key>media</key>
+                <dict>
+                  <key>hard</key>
+                  <integer>1</integer>
+                </dict>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>zip100</string>
+                <key>description</key>
+                <string>Iomega Zip 100MB IDE Drive</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>cr589</string>
+                <key>description</key>
+                <string>Matsushita CR589 CD-ROM Drive</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>xm3301</string>
+                <key>description</key>
+                <string>Toshiba XM-3301 CD-ROM Drive</string>
+                <key>default</key>
+                <false/>
+              </dict>
+            </array>
+          </dict>
+          <dict>
+            <key>name</key>
+            <string>:ata_1:0</string>
+            <key>options</key>
+            <array>
+              <dict>
+                <key>value</key>
+                <string></string>
+                <key>description</key>
+                <string>—None—</string>
+                <key>default</key>
+                <true/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>cdrom</string>
+                <key>description</key>
+                <string>CD-ROM</string>
+                <key>default</key>
+                <false/>
+                <key>media</key>
+                <dict>
+                  <key>cdrom</key>
+                  <integer>1</integer>
+                </dict>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>hdd</string>
+                <key>description</key>
+                <string>Hard Disk</string>
+                <key>default</key>
+                <false/>
+                <key>media</key>
+                <dict>
+                  <key>hard</key>
+                  <integer>1</integer>
+                </dict>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>zip100</string>
+                <key>description</key>
+                <string>Iomega Zip 100MB IDE Drive</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>cr589</string>
+                <key>description</key>
+                <string>Matsushita CR589 CD-ROM Drive</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>xm3301</string>
+                <key>description</key>
+                <string>Toshiba XM-3301 CD-ROM Drive</string>
+                <key>default</key>
+                <false/>
+              </dict>
+            </array>
+          </dict>
+          <dict>
+            <key>name</key>
+            <string>:ata_1:1</string>
+            <key>options</key>
+            <array>
+              <dict>
+                <key>value</key>
+                <string></string>
+                <key>description</key>
+                <string>—None—</string>
+                <key>default</key>
+                <true/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>cdrom</string>
+                <key>description</key>
+                <string>CD-ROM</string>
+                <key>default</key>
+                <false/>
+                <key>media</key>
+                <dict>
+                  <key>cdrom</key>
+                  <integer>1</integer>
+                </dict>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>hdd</string>
+                <key>description</key>
+                <string>Hard Disk</string>
+                <key>default</key>
+                <false/>
+                <key>media</key>
+                <dict>
+                  <key>hard</key>
+                  <integer>1</integer>
+                </dict>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>zip100</string>
+                <key>description</key>
+                <string>Iomega Zip 100MB IDE Drive</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>cr589</string>
+                <key>description</key>
+                <string>Matsushita CR589 CD-ROM Drive</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>xm3301</string>
+                <key>description</key>
+                <string>Toshiba XM-3301 CD-ROM Drive</string>
+                <key>default</key>
+                <false/>
+              </dict>
+            </array>
+          </dict>
+        </array>
+      </dict>
     </array>
     <key>software</key>
     <array>
diff --git a/Ample/Resources/a2000n.plist b/Ample/Resources/a2000n.plist
index b1d3381..8e3d614 100644
--- a/Ample/Resources/a2000n.plist
+++ b/Ample/Resources/a2000n.plist
@@ -439,6 +439,46 @@
             <key>devname</key>
             <string>zorro_a2232</string>
           </dict>
+          <dict>
+            <key>value</key>
+            <string>framemaster</string>
+            <key>description</key>
+            <string>FrameMaster Framebuffer</string>
+            <key>devname</key>
+            <string>zorro_framemaster</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>picasso2p</string>
+            <key>description</key>
+            <string>Picasso II+ RTG</string>
+            <key>devname</key>
+            <string>zorro_picasso2p</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>rainbow2</string>
+            <key>description</key>
+            <string>Rainbow II Framebuffer</string>
+            <key>devname</key>
+            <string>zorro_rainbow2</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>ripple</string>
+            <key>description</key>
+            <string>RIPPLE IDE Interface</string>
+            <key>devname</key>
+            <string>zorro_ripple</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>toccata</string>
+            <key>description</key>
+            <string>Toccata SoundCard</string>
+            <key>devname</key>
+            <string>zorro_toccata</string>
+          </dict>
         </array>
       </dict>
       <dict>
@@ -504,6 +544,46 @@
             <key>devname</key>
             <string>zorro_a2232</string>
           </dict>
+          <dict>
+            <key>value</key>
+            <string>framemaster</string>
+            <key>description</key>
+            <string>FrameMaster Framebuffer</string>
+            <key>devname</key>
+            <string>zorro_framemaster</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>picasso2p</string>
+            <key>description</key>
+            <string>Picasso II+ RTG</string>
+            <key>devname</key>
+            <string>zorro_picasso2p</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>rainbow2</string>
+            <key>description</key>
+            <string>Rainbow II Framebuffer</string>
+            <key>devname</key>
+            <string>zorro_rainbow2</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>ripple</string>
+            <key>description</key>
+            <string>RIPPLE IDE Interface</string>
+            <key>devname</key>
+            <string>zorro_ripple</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>toccata</string>
+            <key>description</key>
+            <string>Toccata SoundCard</string>
+            <key>devname</key>
+            <string>zorro_toccata</string>
+          </dict>
         </array>
       </dict>
       <dict>
@@ -569,6 +649,46 @@
             <key>devname</key>
             <string>zorro_a2232</string>
           </dict>
+          <dict>
+            <key>value</key>
+            <string>framemaster</string>
+            <key>description</key>
+            <string>FrameMaster Framebuffer</string>
+            <key>devname</key>
+            <string>zorro_framemaster</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>picasso2p</string>
+            <key>description</key>
+            <string>Picasso II+ RTG</string>
+            <key>devname</key>
+            <string>zorro_picasso2p</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>rainbow2</string>
+            <key>description</key>
+            <string>Rainbow II Framebuffer</string>
+            <key>devname</key>
+            <string>zorro_rainbow2</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>ripple</string>
+            <key>description</key>
+            <string>RIPPLE IDE Interface</string>
+            <key>devname</key>
+            <string>zorro_ripple</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>toccata</string>
+            <key>description</key>
+            <string>Toccata SoundCard</string>
+            <key>devname</key>
+            <string>zorro_toccata</string>
+          </dict>
         </array>
       </dict>
       <dict>
@@ -634,6 +754,46 @@
             <key>devname</key>
             <string>zorro_a2232</string>
           </dict>
+          <dict>
+            <key>value</key>
+            <string>framemaster</string>
+            <key>description</key>
+            <string>FrameMaster Framebuffer</string>
+            <key>devname</key>
+            <string>zorro_framemaster</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>picasso2p</string>
+            <key>description</key>
+            <string>Picasso II+ RTG</string>
+            <key>devname</key>
+            <string>zorro_picasso2p</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>rainbow2</string>
+            <key>description</key>
+            <string>Rainbow II Framebuffer</string>
+            <key>devname</key>
+            <string>zorro_rainbow2</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>ripple</string>
+            <key>description</key>
+            <string>RIPPLE IDE Interface</string>
+            <key>devname</key>
+            <string>zorro_ripple</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>toccata</string>
+            <key>description</key>
+            <string>Toccata SoundCard</string>
+            <key>devname</key>
+            <string>zorro_toccata</string>
+          </dict>
         </array>
       </dict>
       <dict>
@@ -699,6 +859,46 @@
             <key>devname</key>
             <string>zorro_a2232</string>
           </dict>
+          <dict>
+            <key>value</key>
+            <string>framemaster</string>
+            <key>description</key>
+            <string>FrameMaster Framebuffer</string>
+            <key>devname</key>
+            <string>zorro_framemaster</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>picasso2p</string>
+            <key>description</key>
+            <string>Picasso II+ RTG</string>
+            <key>devname</key>
+            <string>zorro_picasso2p</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>rainbow2</string>
+            <key>description</key>
+            <string>Rainbow II Framebuffer</string>
+            <key>devname</key>
+            <string>zorro_rainbow2</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>ripple</string>
+            <key>description</key>
+            <string>RIPPLE IDE Interface</string>
+            <key>devname</key>
+            <string>zorro_ripple</string>
+          </dict>
+          <dict>
+            <key>value</key>
+            <string>toccata</string>
+            <key>description</key>
+            <string>Toccata SoundCard</string>
+            <key>devname</key>
+            <string>zorro_toccata</string>
+          </dict>
         </array>
       </dict>
       <dict>
@@ -3408,6 +3608,296 @@
           </dict>
         </array>
       </dict>
+      <dict>
+        <key>name</key>
+        <string>zorro_ripple</string>
+        <key>slots</key>
+        <array>
+          <dict>
+            <key>name</key>
+            <string>bios</string>
+            <key>description</key>
+            <string>ROM</string>
+            <key>options</key>
+            <array>
+              <dict>
+                <key>value</key>
+                <string></string>
+                <key>description</key>
+                <string>—Default—</string>
+                <key>default</key>
+                <true/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>40.8</string>
+                <key>description</key>
+                <string>Release 40.8</string>
+              </dict>
+            </array>
+          </dict>
+          <dict>
+            <key>name</key>
+            <string>:ata_0:0</string>
+            <key>options</key>
+            <array>
+              <dict>
+                <key>value</key>
+                <string></string>
+                <key>description</key>
+                <string>—None—</string>
+                <key>default</key>
+                <true/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>cdrom</string>
+                <key>description</key>
+                <string>CD-ROM</string>
+                <key>default</key>
+                <false/>
+                <key>media</key>
+                <dict>
+                  <key>cdrom</key>
+                  <integer>1</integer>
+                </dict>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>hdd</string>
+                <key>description</key>
+                <string>Hard Disk</string>
+                <key>default</key>
+                <false/>
+                <key>media</key>
+                <dict>
+                  <key>hard</key>
+                  <integer>1</integer>
+                </dict>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>zip100</string>
+                <key>description</key>
+                <string>Iomega Zip 100MB IDE Drive</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>cr589</string>
+                <key>description</key>
+                <string>Matsushita CR589 CD-ROM Drive</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>xm3301</string>
+                <key>description</key>
+                <string>Toshiba XM-3301 CD-ROM Drive</string>
+                <key>default</key>
+                <false/>
+              </dict>
+            </array>
+          </dict>
+          <dict>
+            <key>name</key>
+            <string>:ata_0:1</string>
+            <key>options</key>
+            <array>
+              <dict>
+                <key>value</key>
+                <string></string>
+                <key>description</key>
+                <string>—None—</string>
+                <key>default</key>
+                <true/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>cdrom</string>
+                <key>description</key>
+                <string>CD-ROM</string>
+                <key>default</key>
+                <false/>
+                <key>media</key>
+                <dict>
+                  <key>cdrom</key>
+                  <integer>1</integer>
+                </dict>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>hdd</string>
+                <key>description</key>
+                <string>Hard Disk</string>
+                <key>default</key>
+                <false/>
+                <key>media</key>
+                <dict>
+                  <key>hard</key>
+                  <integer>1</integer>
+                </dict>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>zip100</string>
+                <key>description</key>
+                <string>Iomega Zip 100MB IDE Drive</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>cr589</string>
+                <key>description</key>
+                <string>Matsushita CR589 CD-ROM Drive</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>xm3301</string>
+                <key>description</key>
+                <string>Toshiba XM-3301 CD-ROM Drive</string>
+                <key>default</key>
+                <false/>
+              </dict>
+            </array>
+          </dict>
+          <dict>
+            <key>name</key>
+            <string>:ata_1:0</string>
+            <key>options</key>
+            <array>
+              <dict>
+                <key>value</key>
+                <string></string>
+                <key>description</key>
+                <string>—None—</string>
+                <key>default</key>
+                <true/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>cdrom</string>
+                <key>description</key>
+                <string>CD-ROM</string>
+                <key>default</key>
+                <false/>
+                <key>media</key>
+                <dict>
+                  <key>cdrom</key>
+                  <integer>1</integer>
+                </dict>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>hdd</string>
+                <key>description</key>
+                <string>Hard Disk</string>
+                <key>default</key>
+                <false/>
+                <key>media</key>
+                <dict>
+                  <key>hard</key>
+                  <integer>1</integer>
+                </dict>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>zip100</string>
+                <key>description</key>
+                <string>Iomega Zip 100MB IDE Drive</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>cr589</string>
+                <key>description</key>
+                <string>Matsushita CR589 CD-ROM Drive</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>xm3301</string>
+                <key>description</key>
+                <string>Toshiba XM-3301 CD-ROM Drive</string>
+                <key>default</key>
+                <false/>
+              </dict>
+            </array>
+          </dict>
+          <dict>
+            <key>name</key>
+            <string>:ata_1:1</string>
+            <key>options</key>
+            <array>
+              <dict>
+                <key>value</key>
+                <string></string>
+                <key>description</key>
+                <string>—None—</string>
+                <key>default</key>
+                <true/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>cdrom</string>
+                <key>description</key>
+                <string>CD-ROM</string>
+                <key>default</key>
+                <false/>
+                <key>media</key>
+                <dict>
+                  <key>cdrom</key>
+                  <integer>1</integer>
+                </dict>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>hdd</string>
+                <key>description</key>
+                <string>Hard Disk</string>
+                <key>default</key>
+                <false/>
+                <key>media</key>
+                <dict>
+                  <key>hard</key>
+                  <integer>1</integer>
+                </dict>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>zip100</string>
+                <key>description</key>
+                <string>Iomega Zip 100MB IDE Drive</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>cr589</string>
+                <key>description</key>
+                <string>Matsushita CR589 CD-ROM Drive</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>xm3301</string>
+                <key>description</key>
+                <string>Toshiba XM-3301 CD-ROM Drive</string>
+                <key>default</key>
+                <false/>
+              </dict>
+            </array>
+          </dict>
+        </array>
+      </dict>
     </array>
     <key>software</key>
     <array>
diff --git a/Ample/Resources/models~extra.plist b/Ample/Resources/models~extra.plist
index c85c625..7fdde0b 100644
--- a/Ample/Resources/models~extra.plist
+++ b/Ample/Resources/models~extra.plist
@@ -48,12 +48,6 @@
           <key>value</key>
           <string>apple2e</string>
         </dict>
-        <dict>
-          <key>description</key>
-          <string>Apple //e (Spain)</string>
-          <key>value</key>
-          <string>apple2ees</string>
-        </dict>
         <dict>
           <key>description</key>
           <string>Apple //e (UK)</string>
@@ -62,10 +56,37 @@
         </dict>
         <dict>
           <key>description</key>
-          <string>Apple //e (Platinum)</string>
+          <string>Apple //e (Germany)</string>
           <key>value</key>
-          <string>apple2ep</string>
+          <string>apple2ede</string>
         </dict>
+        <dict>
+          <key>description</key>
+          <string>Apple //e (Sweden)</string>
+          <key>value</key>
+          <string>apple2ese</string>
+        </dict>
+        <dict>
+          <key>description</key>
+          <string>Apple //e (France)</string>
+          <key>value</key>
+          <string>apple2efr</string>
+        </dict>
+        <dict>
+          <key>description</key>
+          <string>Apple //e (Spain)</string>
+          <key>value</key>
+          <string>apple2ees</string>
+        </dict>
+      </array>
+    </dict>
+    <dict>
+      <key>description</key>
+      <string>Apple IIe (enhanced)</string>
+      <key>value</key>
+      <string>apple2ee</string>
+      <key>children</key>
+      <array>
         <dict>
           <key>description</key>
           <string>Apple //e (enhanced)</string>
@@ -78,6 +99,18 @@
           <key>value</key>
           <string>apple2eeuk</string>
         </dict>
+        <dict>
+          <key>description</key>
+          <string>Apple //e (enhanced, Germany)</string>
+          <key>value</key>
+          <string>apple2eede</string>
+        </dict>
+        <dict>
+          <key>description</key>
+          <string>Apple //e (enhanced, Sweden)</string>
+          <key>value</key>
+          <string>apple2eese</string>
+        </dict>
         <dict>
           <key>description</key>
           <string>Apple //e (enhanced, France)</string>
@@ -86,6 +119,45 @@
         </dict>
       </array>
     </dict>
+    <dict>
+      <key>description</key>
+      <string>Apple IIe (platinum)</string>
+      <key>value</key>
+      <string>apple2p</string>
+      <key>children</key>
+      <array>
+        <dict>
+          <key>description</key>
+          <string>Apple //e (Platinum)</string>
+          <key>value</key>
+          <string>apple2ep</string>
+        </dict>
+        <dict>
+          <key>description</key>
+          <string>Apple //e (Platinum, UK)</string>
+          <key>value</key>
+          <string>apple2epuk</string>
+        </dict>
+        <dict>
+          <key>description</key>
+          <string>Apple //e (Platinum, Germany)</string>
+          <key>value</key>
+          <string>apple2epde</string>
+        </dict>
+        <dict>
+          <key>description</key>
+          <string>Apple //e (Platinum, Sweden)</string>
+          <key>value</key>
+          <string>apple2epse</string>
+        </dict>
+        <dict>
+          <key>description</key>
+          <string>Apple //e (Platinum, France)</string>
+          <key>value</key>
+          <string>apple2epfr</string>
+        </dict>
+      </array>
+    </dict>
     <dict>
       <key>description</key>
       <string>Apple //c</string>
@@ -717,6 +789,67 @@
         </dict>
       </array>
     </dict>
+    <dict>
+      <key>description</key>
+      <string>Macintosh (PowerBook)</string>
+      <key>children</key>
+      <array>
+        <dict>
+          <key>description</key>
+          <string>Macintosh PowerBook 140</string>
+          <key>value</key>
+          <string>macpb140</string>
+        </dict>
+        <dict>
+          <key>description</key>
+          <string>Macintosh PowerBook 145</string>
+          <key>value</key>
+          <string>macpb145</string>
+        </dict>
+        <dict>
+          <key>description</key>
+          <string>Macintosh PowerBook 145B</string>
+          <key>value</key>
+          <string>macpb145b</string>
+        </dict>
+        <dict>
+          <key>description</key>
+          <string>Macintosh PowerBook 160</string>
+          <key>value</key>
+          <string>macpb160</string>
+        </dict>
+        <dict>
+          <key>description</key>
+          <string>Macintosh PowerBook 165</string>
+          <key>value</key>
+          <string>macpb165</string>
+        </dict>
+        <dict>
+          <key>description</key>
+          <string>Macintosh PowerBook 165c</string>
+          <key>value</key>
+          <string>macpb165c</string>
+        </dict>
+        <dict>
+          <key>description</key>
+          <string>Macintosh PowerBook 170</string>
+          <key>value</key>
+          <string>macpb170</string>
+        </dict>
+        <dict>
+          <key>description</key>
+          <string>Macintosh PowerBook 180</string>
+          <key>value</key>
+          <string>macpb180</string>
+        </dict>
+        <dict>
+          <key>description</key>
+          <string>Macintosh PowerBook 180c</string>
+          <key>value</key>
+          <string>macpb180c</string>
+        </dict>
+      </array>
+    </dict>
     <dict>
       <key>description</key>
       <string>Atari ST</string>
diff --git a/Ample/Resources/pdp11qb.plist b/Ample/Resources/pdp11qb.plist
index ca5b0cc..4078a98 100644
--- a/Ample/Resources/pdp11qb.plist
+++ b/Ample/Resources/pdp11qb.plist
@@ -198,6 +198,14 @@
             <key>default</key>
             <false/>
           </dict>
+          <dict>
+            <key>value</key>
+            <string>by</string>
+            <key>description</key>
+            <string>BK0010 Floppy</string>
+            <key>devname</key>
+            <string>bk_kmd</string>
+          </dict>
           <dict>
             <key>value</key>
             <string>pc11</string>
@@ -273,6 +281,14 @@
             <key>default</key>
             <true/>
           </dict>
+          <dict>
+            <key>value</key>
+            <string>by</string>
+            <key>description</key>
+            <string>BK0010 Floppy</string>
+            <key>devname</key>
+            <string>bk_kmd</string>
+          </dict>
           <dict>
             <key>value</key>
             <string>pc11</string>
@@ -346,6 +362,14 @@
             <key>default</key>
             <true/>
           </dict>
+          <dict>
+            <key>value</key>
+            <string>by</string>
+            <key>description</key>
+            <string>BK0010 Floppy</string>
+            <key>devname</key>
+            <string>bk_kmd</string>
+          </dict>
           <dict>
             <key>value</key>
             <string>pc11</string>
@@ -419,6 +443,14 @@
             <key>default</key>
             <true/>
           </dict>
+          <dict>
+            <key>value</key>
+            <string>by</string>
+            <key>description</key>
+            <string>BK0010 Floppy</string>
+            <key>devname</key>
+            <string>bk_kmd</string>
+          </dict>
           <dict>
             <key>value</key>
             <string>pc11</string>
@@ -480,6 +512,104 @@
     </array>
     <key>devices</key>
     <array>
+      <dict>
+        <key>name</key>
+        <string>bk_kmd</string>
+        <key>slots</key>
+        <array>
+          <dict>
+            <key>name</key>
+            <string>bios</string>
+            <key>description</key>
+            <string>ROM</string>
+            <key>options</key>
+            <array>
+              <dict>
+                <key>value</key>
+                <string></string>
+                <key>description</key>
+                <string>—Default—</string>
+                <key>default</key>
+                <true/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>253</string>
+                <key>description</key>
+                <string>mask 253</string>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>326</string>
+                <key>description</key>
+                <string>mask 326</string>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>327v12</string>
+                <key>description</key>
+                <string>327 v12</string>
+              </dict>
+            </array>
+          </dict>
+          <dict>
+            <key>name</key>
+            <string>:fdc:0</string>
+            <key>options</key>
+            <array>
+              <dict>
+                <key>value</key>
+                <string></string>
+                <key>description</key>
+                <string>—None—</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>525qd</string>
+                <key>description</key>
+                <string>5.25" quad density floppy drive</string>
+                <key>default</key>
+                <true/>
+                <key>media</key>
+                <dict>
+                  <key>floppy_5_25</key>
+                  <integer>1</integer>
+                </dict>
+              </dict>
+            </array>
+          </dict>
+          <dict>
+            <key>name</key>
+            <string>:fdc:1</string>
+            <key>options</key>
+            <array>
+              <dict>
+                <key>value</key>
+                <string></string>
+                <key>description</key>
+                <string>—None—</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>525qd</string>
+                <key>description</key>
+                <string>5.25" quad density floppy drive</string>
+                <key>default</key>
+                <true/>
+                <key>media</key>
+                <dict>
+                  <key>floppy_5_25</key>
+                  <integer>1</integer>
+                </dict>
+              </dict>
+            </array>
+          </dict>
+        </array>
+      </dict>
       <dict>
         <key>name</key>
         <string>cdd2000</string>
diff --git a/Ample/Resources/pdp11ub.plist b/Ample/Resources/pdp11ub.plist
index 090dd3b..5ef829e 100644
--- a/Ample/Resources/pdp11ub.plist
+++ b/Ample/Resources/pdp11ub.plist
@@ -198,6 +198,14 @@
             <key>default</key>
             <false/>
           </dict>
+          <dict>
+            <key>value</key>
+            <string>by</string>
+            <key>description</key>
+            <string>BK0010 Floppy</string>
+            <key>devname</key>
+            <string>bk_kmd</string>
+          </dict>
           <dict>
             <key>value</key>
             <string>pc11</string>
@@ -273,6 +281,14 @@
             <key>default</key>
             <true/>
           </dict>
+          <dict>
+            <key>value</key>
+            <string>by</string>
+            <key>description</key>
+            <string>BK0010 Floppy</string>
+            <key>devname</key>
+            <string>bk_kmd</string>
+          </dict>
           <dict>
             <key>value</key>
             <string>pc11</string>
@@ -346,6 +362,14 @@
             <key>default</key>
             <true/>
           </dict>
+          <dict>
+            <key>value</key>
+            <string>by</string>
+            <key>description</key>
+            <string>BK0010 Floppy</string>
+            <key>devname</key>
+            <string>bk_kmd</string>
+          </dict>
           <dict>
             <key>value</key>
             <string>pc11</string>
@@ -419,6 +443,14 @@
             <key>default</key>
             <true/>
           </dict>
+          <dict>
+            <key>value</key>
+            <string>by</string>
+            <key>description</key>
+            <string>BK0010 Floppy</string>
+            <key>devname</key>
+            <string>bk_kmd</string>
+          </dict>
           <dict>
             <key>value</key>
             <string>pc11</string>
@@ -480,6 +512,104 @@
     </array>
     <key>devices</key>
     <array>
+      <dict>
+        <key>name</key>
+        <string>bk_kmd</string>
+        <key>slots</key>
+        <array>
+          <dict>
+            <key>name</key>
+            <string>bios</string>
+            <key>description</key>
+            <string>ROM</string>
+            <key>options</key>
+            <array>
+              <dict>
+                <key>value</key>
+                <string></string>
+                <key>description</key>
+                <string>—Default—</string>
+                <key>default</key>
+                <true/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>253</string>
+                <key>description</key>
+                <string>mask 253</string>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>326</string>
+                <key>description</key>
+                <string>mask 326</string>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>327v12</string>
+                <key>description</key>
+                <string>327 v12</string>
+              </dict>
+            </array>
+          </dict>
+          <dict>
+            <key>name</key>
+            <string>:fdc:0</string>
+            <key>options</key>
+            <array>
+              <dict>
+                <key>value</key>
+                <string></string>
+                <key>description</key>
+                <string>—None—</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>525qd</string>
+                <key>description</key>
+                <string>5.25" quad density floppy drive</string>
+                <key>default</key>
+                <true/>
+                <key>media</key>
+                <dict>
+                  <key>floppy_5_25</key>
+                  <integer>1</integer>
+                </dict>
+              </dict>
+            </array>
+          </dict>
+          <dict>
+            <key>name</key>
+            <string>:fdc:1</string>
+            <key>options</key>
+            <array>
+              <dict>
+                <key>value</key>
+                <string></string>
+                <key>description</key>
+                <string>—None—</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>525qd</string>
+                <key>description</key>
+                <string>5.25" quad density floppy drive</string>
+                <key>default</key>
+                <true/>
+                <key>media</key>
+                <dict>
+                  <key>floppy_5_25</key>
+                  <integer>1</integer>
+                </dict>
+              </dict>
+            </array>
+          </dict>
+        </array>
+      </dict>
       <dict>
         <key>name</key>
         <string>cdd2000</string>
diff --git a/Ample/Resources/pdp11ub2.plist b/Ample/Resources/pdp11ub2.plist
index 7b3ec8f..5d5a239 100644
--- a/Ample/Resources/pdp11ub2.plist
+++ b/Ample/Resources/pdp11ub2.plist
@@ -198,6 +198,14 @@
             <key>default</key>
             <false/>
           </dict>
+          <dict>
+            <key>value</key>
+            <string>by</string>
+            <key>description</key>
+            <string>BK0010 Floppy</string>
+            <key>devname</key>
+            <string>bk_kmd</string>
+          </dict>
           <dict>
             <key>value</key>
             <string>pc11</string>
@@ -273,6 +281,14 @@
             <key>default</key>
             <true/>
           </dict>
+          <dict>
+            <key>value</key>
+            <string>by</string>
+            <key>description</key>
+            <string>BK0010 Floppy</string>
+            <key>devname</key>
+            <string>bk_kmd</string>
+          </dict>
           <dict>
             <key>value</key>
             <string>pc11</string>
@@ -346,6 +362,14 @@
             <key>default</key>
             <true/>
           </dict>
+          <dict>
+            <key>value</key>
+            <string>by</string>
+            <key>description</key>
+            <string>BK0010 Floppy</string>
+            <key>devname</key>
+            <string>bk_kmd</string>
+          </dict>
           <dict>
             <key>value</key>
             <string>pc11</string>
@@ -419,6 +443,14 @@
             <key>default</key>
             <true/>
           </dict>
+          <dict>
+            <key>value</key>
+            <string>by</string>
+            <key>description</key>
+            <string>BK0010 Floppy</string>
+            <key>devname</key>
+            <string>bk_kmd</string>
+          </dict>
           <dict>
             <key>value</key>
             <string>pc11</string>
@@ -480,6 +512,104 @@
     </array>
     <key>devices</key>
     <array>
+      <dict>
+        <key>name</key>
+        <string>bk_kmd</string>
+        <key>slots</key>
+        <array>
+          <dict>
+            <key>name</key>
+            <string>bios</string>
+            <key>description</key>
+            <string>ROM</string>
+            <key>options</key>
+            <array>
+              <dict>
+                <key>value</key>
+                <string></string>
+                <key>description</key>
+                <string>—Default—</string>
+                <key>default</key>
+                <true/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>253</string>
+                <key>description</key>
+                <string>mask 253</string>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>326</string>
+                <key>description</key>
+                <string>mask 326</string>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>327v12</string>
+                <key>description</key>
+                <string>327 v12</string>
+              </dict>
+            </array>
+          </dict>
+          <dict>
+            <key>name</key>
+            <string>:fdc:0</string>
+            <key>options</key>
+            <array>
+              <dict>
+                <key>value</key>
+                <string></string>
+                <key>description</key>
+                <string>—None—</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>525qd</string>
+                <key>description</key>
+                <string>5.25" quad density floppy drive</string>
+                <key>default</key>
+                <true/>
+                <key>media</key>
+                <dict>
+                  <key>floppy_5_25</key>
+                  <integer>1</integer>
+                </dict>
+              </dict>
+            </array>
+          </dict>
+          <dict>
+            <key>name</key>
+            <string>:fdc:1</string>
+            <key>options</key>
+            <array>
+              <dict>
+                <key>value</key>
+                <string></string>
+                <key>description</key>
+                <string>—None—</string>
+                <key>default</key>
+                <false/>
+              </dict>
+              <dict>
+                <key>value</key>
+                <string>525qd</string>
+                <key>description</key>
+                <string>5.25" quad density floppy drive</string>
+                <key>default</key>
+                <true/>
+                <key>media</key>
+                <dict>
+                  <key>floppy_5_25</key>
+                  <integer>1</integer>
+                </dict>
+              </dict>
+            </array>
+          </dict>
+        </array>
+      </dict>
       <dict>
         <key>name</key>
         <string>cdd2000</string>