From a96dd30d3c1e2243dc41cf303190d60ac0881715 Mon Sep 17 00:00:00 2001
From: angelosa <lordkale4@gmail.com>
Date: Mon, 1 Apr 2024 20:17:47 +0200
Subject: [PATCH] hash/ibm5170_cdrom: reorder OSes to own section

---
 hash/ibm5170_cdrom.xml | 801 ++++++++++++++++++++---------------------
 1 file changed, 400 insertions(+), 401 deletions(-)

diff --git a/hash/ibm5170_cdrom.xml b/hash/ibm5170_cdrom.xml
index 6d7885069e7..1344f8c5a33 100644
--- a/hash/ibm5170_cdrom.xml
+++ b/hash/ibm5170_cdrom.xml
@@ -6509,98 +6509,9 @@ Has setup menu glitch with text [8514]
 	</software>
 
 	<!--                                         -->
-	<!-- Drivers / Utilities / Operating Systems -->
+	<!-- x86 Operating Systems                   -->
 	<!--                                         -->
 
-	<software name="acercpr" supported="no">
-		<!-- Floppy dumped via Kryoflux, three tracks show as modified -->
-		<description>Acer CPR</description>
-		<year>1995</year>
-		<publisher>Acer America Corporation</publisher>
-		<info name="version" value="1.2a" />    <!-- floppy version 1.2a, CD version 1.2 -->
-
-		<part name="flop1" interface="floppy_3_5">
-			<feature name="disk_label" value="Hard Drive Recovery Start-Up Diskette" />
-			<dataarea name="flop" size="1474560">
-				<rom name="acer cpr.img" size="1474560" crc="6f88a82a" sha1="a0afd6dcddbf6ae67d5c28c068af2fa9843dcb5f" status="baddump" />
-			</dataarea>
-		</part>
-		<part name="cdrom" interface="cdrom">
-			<feature name="disk_label" value="Hard Drive Recovery" />
-			<diskarea name="cdrom">
-				<disk name="acercpr" sha1="a0f073387e661318eae2d1fdd30dfb116d1295ae" />
-			</diskarea>
-		</part>
-	</software>
-
-	<!-- DOS -->
-	<software name="div103b" supported="partial">
-		<description>DIV Games Studio (English, v1.03b)</description>
-		<year>1998</year>
-		<publisher>Hammer Technologies</publisher>
-		<notes><![CDATA[
-Games packages all boots in ct486 but frameskips a lot, presumably needs Pentium 1 or 2 class machine
-Has [VESA] video mode options
-CDiv Player doesn't output any [redbook] sound (verify if access to CD is real)
-IDE not extensively tested
-v2 is OSS at https://github.com/DIVGAMES/DIV-Games-Studio
-]]></notes>
-		<info name="usage" value="Requires a VESA driver"/>
-		<part name="cdrom" interface="cdrom">
-			<diskarea name="cdrom">
-				<disk name="divgamestudio" sha1="8fe4e601ca118bca1e45e61adcbbc9f49daa371e"/>
-			</diskarea>
-		</part>
-	</software>
-
-	<software name="div103b_fr" cloneof="div103b" supported="partial">
-		<description>DIV Games Studio (French, v1.03b)</description>
-		<year>2000</year>
-		<publisher>Hammer Technologies</publisher>
-		<notes><![CDATA[
-French version with extra examples compared to English one
-]]></notes>
-		<part name="cdrom" interface="cdrom">
-			<diskarea name="cdrom">
-				<disk name="div_games_studio_fr" sha1="cc3f10a85ca645ab2bf55f4864383cb78c493c98"/>
-			</diskarea>
-		</part>
-	</software>
-
-	<software name="ezscsi401a" supported="no">
-		<description>Adaptec EZ-SCSI 4.01 (Rev A)</description>
-		<year>1996</year>
-		<publisher>Adaptec</publisher>
-		<notes><![CDATA[
-Support disk driver for Adaptec based SCSI controller cfr. [aha2940au] emulation, Windows 3.1/95 based
-ACAP folder has Adaptec Directory Listing in .hlp file (catalogue of supported products)
-SCSITUTR folder has a tutorial about SCSI in .hlp file
-]]></notes>
-		<part name="cdrom" interface="cdrom">
-			<diskarea name="cdrom">
-				<disk name="ezscsi_401" sha1="c090b80f703d89c257c6d32b2fca693f25903442"/>
-			</diskarea>
-		</part>
-	</software>
-
-	<software name="ezscsi50dx" supported="no">
-		<description>Adaptec EZ-SCSI 5.0 Deluxe Edition (Rev B)</description>
-		<!-- 1998 on disk print, '99 on back cover sleeve -->
-		<year>1999</year>
-		<publisher>Adaptec</publisher>
-		<notes><![CDATA[
-Support disk driver for Adaptec based SCSI controller, Windows 95/NT based
-Compatibility with [aha2940au] thru AHA-2940 driver to be verified.
-EZCDLITE Contains Easy CD Creator Lite ASPI setup
-]]></notes>
-		<part name="cdrom" interface="cdrom">
-			<diskarea name="cdrom">
-				<disk name="ezscsi_50dx" sha1="309f0b310812ecab2b242cd5df4e3dd19c7e7745"/>
-			</diskarea>
-		</part>
-	</software>
-
-
 	<software name="freedos10">
 		<description>FreeDOS 1.0</description>
 		<year>2006</year>
@@ -6782,64 +6693,6 @@ EZCDLITE Contains Easy CD Creator Lite ASPI setup
 		</part>
 	</software>
 
-
-	<!-- DOS -->
-	<!-- Rereleased software, apparently identical to the floppy counterpart -->
-	<software name="keycad">
-		<description>Key CAD Complete Creations (v6.0)</description>
-		<year>1996</year>
-		<publisher>SoftKey</publisher>
-		<info name="version" value="6.0" />
-
-		<part name="cdrom" interface="cdrom">
-			<diskarea name="cdrom">
-				<disk name="cad creations (1996)(softkey)" sha1="15586355d3cdb4aac612dac765e88cc682324fb2" />
-			</diskarea>
-		</part>
-	</software>
-
-	<software name="lexz22z32">
-		<description>Lexmark Z22 / Z32 Color Jetprinter</description>
-		<year>2000</year>
-		<publisher>Lexmark</publisher>
-		<part name="cdrom" interface="cdrom">
-			<diskarea name="cdrom">
-				<disk name="Lexmark Z22 Z32" sha1="e8e39d2a15ffb1c7d675b98d06fb7c8bad5892e5" />
-			</diskarea>
-		</part>
-	</software>
-
-	<software name="mgamil1" supported="no">
-		<description>The Matrox Millennium Multimedia SuperPack (v1.60)</description>
-		<year>1996</year>
-		<publisher>Matrox</publisher>
-		<notes><![CDATA[
-cfr. [mga2064w] emulation
-Anything beyond Windows 3.1 is untested
-]]></notes>
-		<part name="cdrom" interface="cdrom">
-			<diskarea name="cdrom">
-				<disk name="matroxmil1" sha1="f3d826066dafb3e9eb3a0a7f5eaabc97642dd714"/>
-			</diskarea>
-		</part>
-	</software>
-
-	<!-- Win 3.1 / 95 -->
-	<!-- Mac OS with System 7.0 -->
-	<software name="muscan" supported="no">
-		<description>Mustek Power of Scanning</description>
-		<year>1997</year>
-		<publisher>Mustek</publisher>
-		<notes><![CDATA[
-Contains software drivers for a ScanExpress 6000SP Flatbed Scanner, SCSI i/f
-]]></notes>
-		<part name="cdrom" interface="cdrom">
-			<diskarea name="cdrom">
-				<disk name="mustek_scanner" sha1="5f708270ed5885c07a49fadc79ab3ffed420af52" />
-			</diskarea>
-		</part>
-	</software>
-
 	<software name="nasfdu12">
 		<description>NASLite NAS Server Operating System (v1.x)</description>
 		<year>2004</year>
@@ -6852,93 +6705,6 @@ Contains software drivers for a ScanExpress 6000SP Flatbed Scanner, SCSI i/f
 		</part>
 	</software>
 
-	<!-- OS/2 -->
-	<software name="notes33exp_os2">
-		<description>Lotus Notes Express v3.30 for OS2, Special Promotion Copy NFR</description>
-		<year>1995</year>
-		<publisher>Lotus Development Corporation</publisher>
-		<part name="cdrom" interface="cdrom">
-			<!-- Origin: archive.org -->
-			<feature name="part_number" value="27H9175"/>
-			<diskarea name="cdrom">
-				<disk name="lotus_notes_express_v3_30_for_os2_special_promotion_copy_nfr_27h9175_lotus_development_corporation_1995" sha1="00b6e6eb8132065c967ba4a967ea403fb3cec14d"/>
-			</diskarea>
-		</part>
-	</software>
-
-	<software name="odosmrs701">
-		<description>Caldera OpenDOS Machine Readable Source Kit (M.R.S) 7.01</description>
-		<year>1997</year>
-		<publisher>Caldera</publisher>
-		<part name="cdrom" interface="cdrom">
-			<!-- Origin: archive.org -->
-			<!-- Reconstructed from a ZIP archive, needs redump -->
-			<diskarea name="cdrom">
-				<disk name="opendosmrs" sha1="f2fb6ad42d42aed26f54e2494ca92ba779458ace" status="baddump"/>
-			</diskarea>
-		</part>
-	</software>
-
-	<!-- OS/2 -->
-	<software name="os2demopkg">
-		<description>IBM DEMOpkg for OS2 - First Edition 99Q3</description>
-		<year>1999</year>
-		<publisher>IBM</publisher>
-		<part name="cdrom1" interface="cdrom">
-			<diskarea name="cdrom">
-				<disk name="cd1_setup_installation" sha1="1ac98794670346b1fb0fb866f8060f61500fabf6"/>
-			</diskarea>
-		</part>
-		<part name="cdrom2" interface="cdrom">
-			<!-- Origin: archive.org -->
-			<diskarea name="cdrom">
-				<disk name="cd2_data_management" sha1="caf7a162e7ebcb8ec822b6ec44caf400628ba2d7"/>
-			</diskarea>
-		</part>
-		<part name="cdrom3" interface="cdrom">
-			<!-- Origin: archive.org -->
-			<diskarea name="cdrom">
-				<disk name="cd3_java" sha1="9b4d9fa06f682395ef6198a0a22b5269cf1e93ac"/>
-			</diskarea>
-		</part>
-		<part name="cdrom4" interface="cdrom">
-			<!-- Origin: archive.org -->
-			<diskarea name="cdrom">
-				<disk name="cd4_lotus_products" sha1="997e98788ac69a5a3d6e0d972ca3eee225552a7e"/>
-			</diskarea>
-		</part>
-		<part name="cdrom5" interface="cdrom">
-			<!-- Origin: archive.org -->
-			<diskarea name="cdrom">
-				<disk name="cd5_miscellaneous" sha1="92a4a37d96f064eeee3c4601cc64255d552fe3ac"/>
-			</diskarea>
-		</part>
-		<part name="cdrom6" interface="cdrom">
-			<!-- Origin: archive.org -->
-			<diskarea name="cdrom">
-				<disk name="cd6_networking" sha1="f0bcc3c1b75d14effe4656a8bde7ce62e1b94052"/>
-			</diskarea>
-		</part>
-		<part name="cdrom7" interface="cdrom">
-			<!-- Origin: archive.org -->
-			<diskarea name="cdrom">
-				<disk name="cd7_warp_server" sha1="4561f06b8c56a523e0e2b45cdc3c09aafd7f0b87"/>
-			</diskarea>
-		</part>
-		<part name="cdrom8" interface="cdrom">
-			<!-- Origin: archive.org -->
-			<diskarea name="cdrom">
-				<disk name="cd8_warp_server_installation" sha1="4dba7d9093a76fedb7a37b94c397c591db189bf5"/>
-			</diskarea>
-		</part>
-		<part name="cdrom9" interface="cdrom">
-			<!-- Origin: archive.org -->
-			<diskarea name="cdrom">
-				<disk name="cd9_workspace_on_demand" sha1="6a7906230637d67cff6560e61dbec6a336965a81"/>
-			</diskarea>
-		</part>
-	</software>
-
 	<!-- OS/2 -->
 	<software name="os2special">
 		<description>OS/2 Warp Special CD - november 1995</description>
@@ -7043,24 +6809,6 @@ Contains software drivers for a ScanExpress 6000SP Flatbed Scanner, SCSI i/f
 		</part>
 	</software>
 
-	<software name="paranasalibm">
-		<!--
-		Origin: Gaming Alexandria
-		<rom name="Paranasal Sinuses & Anterior Skull Base.bin" size="725312112" crc="ddeb9c15" md5="883b0e0122e688d067ae6f96001bdc73"/>
-		<rom name="Paranasal Sinuses & Anterior Skull Base.cue" size="128" crc="6dbd3a2c" md5="8de5a6d9098ba9629e0f14a673f63aa2"/>
-
-		This disc was sold in a package with the CD-i version. This requires Windows 3.1 and Video for Windows to be installed.
-		-->
-		<description>Paranasal Sinuses &amp; Anterior Skull Base</description>
-		<year>1993</year>
-		<publisher>Elsevier Science B.V.</publisher>
-		<part name="cdrom" interface="cdi_cdrom">
-			<diskarea name="cdrom">
-				<disk name="paranasal sinuses &amp; anterior skull base (1993)(elsevier science b.v.)(windows 3.1 disc)" sha1="fddedb4f78bc5687d65f11fd4e18463e1fc4edda"/>
-			</diskarea>
-		</part>
-	</software>
-
 	<software name="pcdos7">
 		<description>PC DOS 7</description>
 		<year>1995</year>
@@ -7086,6 +6834,405 @@ Contains software drivers for a ScanExpress 6000SP Flatbed Scanner, SCSI i/f
 		</part>
 	</software>
 
+	<software name="win95">
+		<description>Windows 95 (en 4.00.950)</description>
+		<year>1995</year>
+		<publisher>Microsoft</publisher>
+
+		<part name="cdrom" interface="cdrom">
+			<diskarea name="cdrom">
+				<disk name="win95_4.00.950_en" sha1="ef1b482b5f6e746b673def87724d9e7ff833ac43" />
+			</diskarea>
+		</part>
+	</software>
+
+	<software name="win95a">
+		<description>Windows 95 OSR1 (en 4.00.950.osr1)</description>
+		<year>1996</year>
+		<publisher>Microsoft</publisher>
+		<info name="alt_title" value="Windows 95A" />
+
+		<part name="cdrom" interface="cdrom">
+			<diskarea name="cdrom">
+				<disk name="win95_4.00.950_osr1_en" sha1="bc43d85ea8d0ee65b6102ac7cd425c57398c09ce" />
+			</diskarea>
+		</part>
+	</software>
+
+	<software name="win95b">
+		<description>Windows 95 OSR2 (en 4.00.1111.osr2)</description>
+		<year>1996</year>
+		<publisher>Microsoft</publisher>
+		<info name="alt_title" value="Windows 95B" />
+
+		<part name="cdrom" interface="cdrom">
+			<diskarea name="cdrom">
+				<disk name="win95_4.00.1111_osr2_en" sha1="e15bd9a4e2c930bd4913996a2d9d11d1567635f5" />
+			</diskarea>
+		</part>
+	</software>
+
+	<software name="win95c">
+		<description>Windows 95 OSR2.5 (en 4.03.1216.osr2.5)</description> <!-- aka Windows 95C -->
+		<year>1997</year>
+		<publisher>Microsoft</publisher>
+
+		<part name="cdrom" interface="cdrom">
+			<diskarea name="cdrom">
+				<disk name="win95_4.03.1216_osr2_5_en" sha1="b000931531cedcbb3f9a00d13d315406cf7c2d52" />
+			</diskarea>
+		</part>
+	</software>
+
+	<software name="win98">
+		<description>Windows 98 (en 4.10.1998) (Retail Full)</description> <!-- aka Windows 98 First Edition -->
+		<year>1998</year>
+		<publisher>Microsoft</publisher>
+
+		<part name="cdrom" interface="cdrom">
+			<diskarea name="cdrom">
+				<disk name="windows 98 (en 4.10.1998 retail full)" sha1="1e725b0a7ea471e2b91500d09f242d05330b4f50" />
+			</diskarea>
+		</part>
+	</software>
+
+	<software name="win98se">
+		<description>Windows 98 Second Edition (en 4.10.2222) (Retail Full)</description>
+		<year>1999</year>
+		<publisher>Microsoft</publisher>
+
+		<part name="cdrom" interface="cdrom">
+			<diskarea name="cdrom">
+				<disk name="windows 98 se (en 4.10.2222 retail full)" sha1="3d9b3e69d03aef2ed5e54c3c73702d1e9b53255c" />
+			</diskarea>
+		</part>
+	</software>
+
+	<!-- Supports IBM PC-AT and PC-98 architectures -->
+	<software name="win98sejp">
+		<!--
+		Origin: Neo Kobe Collection
+		CCD converted to CUE with GNU ccd2cue
+		<rom name="Microsoft Windows 98SE.ccd" size="772" crc="65e992be" sha1="b869a3e83459f562966739caa22b46b5204e20cb"/>
+		<rom name="Microsoft Windows 98SE.cue" size="84" crc="a529c2b7" sha1="050dc1be1c9aeafd7e4d7ce7235285b8296f9eee"/>
+		<rom name="Microsoft Windows 98SE.img" size="546019152" crc="cbaea25b" sha1="6b1689232640632a7cc6e5de4967b922637c055d"/>
+		<rom name="Microsoft Windows 98SE.sub" size="22286496" crc="6dec77e2" sha1="41843630fb1a58131b5ecf6dd187884fb29e6685"/>
+		-->
+		<description>Windows 98 Second Edition (jp 4.10.2222) (Retail Full)</description>
+		<year>1999</year>
+		<publisher>Microsoft</publisher>
+		<info name="alt_title" value="マイクロソフト ウィンドウズ 98 オペレイティング システム SECOND EDITION" />
+		<info name="serial" value="X04-67430"/>
+
+		<part name="cdrom" interface="cdrom">
+			<diskarea name="cdrom">
+				<disk name="microsoft windows 98se" sha1="eb0bdd209334b3709fa31043f390838351127bc0" />
+			</diskarea>
+		</part>
+	</software>
+
+	<software name="winme">
+		<description>Windows ME (en 4.90.3000) (Retail Full)</description> <!-- aka Millennium Edition -->
+		<year>2000</year>
+		<publisher>Microsoft</publisher>
+
+		<part name="cdrom" interface="cdrom">
+			<diskarea name="cdrom">
+				<disk name="windows me (en 4.90.3000 retail full)" sha1="3bb9b89f2b5918b7dbe393d250a8f1a530a175ef" />
+			</diskarea>
+		</part>
+	</software>
+
+	<software name="winnt31w">
+		<description>Windows NT 3.1 Workstation (3.10.511.1)</description>
+		<year>1993</year>
+		<publisher>Microsoft</publisher>
+		<part name="cdrom" interface="cdrom">
+			<!-- Origin: WinWorld -->
+			<diskarea name="cdrom">
+				<disk name="en_winnt_3_1_wks" sha1="0a542add03b6c9ab130421d24f94731c4992e0a7"/>
+			</diskarea>
+		</part>
+	</software>
+
+	<software name="winnt351w">
+		<description>Windows NT 3.51 Workstation (3.51.1057.1)</description>
+		<year>1995</year>
+		<publisher>Microsoft</publisher>
+		<part name="cdrom" interface="cdrom">
+			<!-- Origin: WinWorld -->
+			<diskarea name="cdrom">
+				<disk name="en_winnt_3_51_wks" sha1="5a5d3cf9d244b6b24b007271be478b94a9c349f4"/>
+			</diskarea>
+		</part>
+	</software>
+
+	<software name="win2kps4">
+		<description>Windows 2000 Professional (with Service Pack 4) (en 5.00.2195.6717)</description>
+		<year>1999</year>
+		<publisher>Microsoft</publisher>
+
+		<part name="cdrom" interface="cdrom">
+			<diskarea name="cdrom">
+				<disk name="en_win2000_pro_sp4" sha1="9344cce041f092f0194944bdc690af7df7185cf6" />
+			</diskarea>
+		</part>
+	</software>
+
+	<!--                                         -->
+	<!-- Drivers / Utilities                     -->
+	<!--                                         -->
+
+	<software name="acercpr" supported="no">
+		<!-- Floppy dumped via Kryoflux, three tracks show as modified -->
+		<description>Acer CPR</description>
+		<year>1995</year>
+		<publisher>Acer America Corporation</publisher>
+		<info name="version" value="1.2a" />    <!-- floppy version 1.2a, CD version 1.2 -->
+
+		<part name="flop1" interface="floppy_3_5">
+			<feature name="disk_label" value="Hard Drive Recovery Start-Up Diskette" />
+			<dataarea name="flop" size="1474560">
+				<rom name="acer cpr.img" size="1474560" crc="6f88a82a" sha1="a0afd6dcddbf6ae67d5c28c068af2fa9843dcb5f" status="baddump" />
+			</dataarea>
+		</part>
+		<part name="cdrom" interface="cdrom">
+			<feature name="disk_label" value="Hard Drive Recovery" />
+			<diskarea name="cdrom">
+				<disk name="acercpr" sha1="a0f073387e661318eae2d1fdd30dfb116d1295ae" />
+			</diskarea>
+		</part>
+	</software>
+
+	<!-- DOS -->
+	<software name="div103b" supported="partial">
+		<description>DIV Games Studio (English, v1.03b)</description>
+		<year>1998</year>
+		<publisher>Hammer Technologies</publisher>
+		<notes><![CDATA[
+Games packages all boots in ct486 but frameskips a lot, presumably needs Pentium 1 or 2 class machine
+Has [VESA] video mode options
+CDiv Player doesn't output any [redbook] sound (verify if access to CD is real)
+IDE not extensively tested
+v2 is OSS at https://github.com/DIVGAMES/DIV-Games-Studio
+]]></notes>
+		<info name="usage" value="Requires a VESA driver"/>
+		<part name="cdrom" interface="cdrom">
+			<diskarea name="cdrom">
+				<disk name="divgamestudio" sha1="8fe4e601ca118bca1e45e61adcbbc9f49daa371e"/>
+			</diskarea>
+		</part>
+	</software>
+
+	<software name="div103b_fr" cloneof="div103b" supported="partial">
+		<description>DIV Games Studio (French, v1.03b)</description>
+		<year>2000</year>
+		<publisher>Hammer Technologies</publisher>
+		<notes><![CDATA[
+French version with extra examples compared to English one
+]]></notes>
+		<part name="cdrom" interface="cdrom">
+			<diskarea name="cdrom">
+				<disk name="div_games_studio_fr" sha1="cc3f10a85ca645ab2bf55f4864383cb78c493c98"/>
+			</diskarea>
+		</part>
+	</software>
+
+	<software name="ezscsi401a" supported="no">
+		<description>Adaptec EZ-SCSI 4.01 (Rev A)</description>
+		<year>1996</year>
+		<publisher>Adaptec</publisher>
+		<notes><![CDATA[
+Support disk driver for Adaptec based SCSI controller cfr. [aha2940au] emulation, Windows 3.1/95 based
+ACAP folder has Adaptec Directory Listing in .hlp file (catalogue of supported products)
+SCSITUTR folder has a tutorial about SCSI in .hlp file
+]]></notes>
+		<part name="cdrom" interface="cdrom">
+			<diskarea name="cdrom">
+				<disk name="ezscsi_401" sha1="c090b80f703d89c257c6d32b2fca693f25903442"/>
+			</diskarea>
+		</part>
+	</software>
+
+	<software name="ezscsi50dx" supported="no">
+		<description>Adaptec EZ-SCSI 5.0 Deluxe Edition (Rev B)</description>
+		<!-- 1998 on disk print, '99 on back cover sleeve -->
+		<year>1999</year>
+		<publisher>Adaptec</publisher>
+		<notes><![CDATA[
+Support disk driver for Adaptec based SCSI controller, Windows 95/NT based
+Compatibility with [aha2940au] thru AHA-2940 driver to be verified.
+EZCDLITE Contains Easy CD Creator Lite ASPI setup
+]]></notes>
+		<part name="cdrom" interface="cdrom">
+			<diskarea name="cdrom">
+				<disk name="ezscsi_50dx" sha1="309f0b310812ecab2b242cd5df4e3dd19c7e7745"/>
+			</diskarea>
+		</part>
+	</software>
+
+	<!-- DOS -->
+	<!-- Rereleased software, apparently identical to the floppy counterpart -->
+	<software name="keycad">
+		<description>Key CAD Complete Creations (v6.0)</description>
+		<year>1996</year>
+		<publisher>SoftKey</publisher>
+		<info name="version" value="6.0" />
+
+		<part name="cdrom" interface="cdrom">
+			<diskarea name="cdrom">
+				<disk name="cad creations (1996)(softkey)" sha1="15586355d3cdb4aac612dac765e88cc682324fb2" />
+			</diskarea>
+		</part>
+	</software>
+
+	<software name="lexz22z32">
+		<description>Lexmark Z22 / Z32 Color Jetprinter</description>
+		<year>2000</year>
+		<publisher>Lexmark</publisher>
+		<part name="cdrom" interface="cdrom">
+			<diskarea name="cdrom">
+				<disk name="Lexmark Z22 Z32" sha1="e8e39d2a15ffb1c7d675b98d06fb7c8bad5892e5" />
+			</diskarea>
+		</part>
+	</software>
+
+	<software name="mgamil1" supported="no">
+		<description>The Matrox Millennium Multimedia SuperPack (v1.60)</description>
+		<year>1996</year>
+		<publisher>Matrox</publisher>
+		<notes><![CDATA[
+cfr. [mga2064w] emulation
+Anything beyond Windows 3.1 is untested
+]]></notes>
+		<part name="cdrom" interface="cdrom">
+			<diskarea name="cdrom">
+				<disk name="matroxmil1" sha1="f3d826066dafb3e9eb3a0a7f5eaabc97642dd714"/>
+			</diskarea>
+		</part>
+	</software>
+
+	<!-- Win 3.1 / 95 -->
+	<!-- Mac OS with System 7.0 -->
+	<software name="muscan" supported="no">
+		<description>Mustek Power of Scanning</description>
+		<year>1997</year>
+		<publisher>Mustek</publisher>
+		<notes><![CDATA[
+Contains software drivers for a ScanExpress 6000SP Flatbed Scanner, SCSI i/f
+]]></notes>
+		<part name="cdrom" interface="cdrom">
+			<diskarea name="cdrom">
+				<disk name="mustek_scanner" sha1="5f708270ed5885c07a49fadc79ab3ffed420af52" />
+			</diskarea>
+		</part>
+	</software>
+
+	<!-- OS/2 -->
+	<software name="notes33exp_os2">
+		<description>Lotus Notes Express v3.30 for OS2, Special Promotion Copy NFR</description>
+		<year>1995</year>
+		<publisher>Lotus Development Corporation</publisher>
+		<part name="cdrom" interface="cdrom">
+			<!-- Origin: archive.org -->
+			<feature name="part_number" value="27H9175"/>
+			<diskarea name="cdrom">
+				<disk name="lotus_notes_express_v3_30_for_os2_special_promotion_copy_nfr_27h9175_lotus_development_corporation_1995" sha1="00b6e6eb8132065c967ba4a967ea403fb3cec14d"/>
+			</diskarea>
+		</part>
+	</software>
+
+	<software name="odosmrs701">
+		<description>Caldera OpenDOS Machine Readable Source Kit (M.R.S) 7.01</description>
+		<year>1997</year>
+		<publisher>Caldera</publisher>
+		<part name="cdrom" interface="cdrom">
+			<!-- Origin: archive.org -->
+			<!-- Reconstructed from a ZIP archive, needs redump -->
+			<diskarea name="cdrom">
+				<disk name="opendosmrs" sha1="f2fb6ad42d42aed26f54e2494ca92ba779458ace" status="baddump"/>
+			</diskarea>
+		</part>
+	</software>
+
+	<!-- OS/2 -->
+	<software name="os2demopkg">
+		<description>IBM DEMOpkg for OS2 - First Edition 99Q3</description>
+		<year>1999</year>
+		<publisher>IBM</publisher>
+		<part name="cdrom1" interface="cdrom">
+			<diskarea name="cdrom">
+				<disk name="cd1_setup_installation" sha1="1ac98794670346b1fb0fb866f8060f61500fabf6"/>
+			</diskarea>
+		</part>
+		<part name="cdrom2" interface="cdrom">
+			<!-- Origin: archive.org -->
+			<diskarea name="cdrom">
+				<disk name="cd2_data_management" sha1="caf7a162e7ebcb8ec822b6ec44caf400628ba2d7"/>
+			</diskarea>
+		</part>
+		<part name="cdrom3" interface="cdrom">
+			<!-- Origin: archive.org -->
+			<diskarea name="cdrom">
+				<disk name="cd3_java" sha1="9b4d9fa06f682395ef6198a0a22b5269cf1e93ac"/>
+			</diskarea>
+		</part>
+		<part name="cdrom4" interface="cdrom">
+			<!-- Origin: archive.org -->
+			<diskarea name="cdrom">
+				<disk name="cd4_lotus_products" sha1="997e98788ac69a5a3d6e0d972ca3eee225552a7e"/>
+			</diskarea>
+		</part>
+		<part name="cdrom5" interface="cdrom">
+			<!-- Origin: archive.org -->
+			<diskarea name="cdrom">
+				<disk name="cd5_miscellaneous" sha1="92a4a37d96f064eeee3c4601cc64255d552fe3ac"/>
+			</diskarea>
+		</part>
+		<part name="cdrom6" interface="cdrom">
+			<!-- Origin: archive.org -->
+			<diskarea name="cdrom">
+				<disk name="cd6_networking" sha1="f0bcc3c1b75d14effe4656a8bde7ce62e1b94052"/>
+			</diskarea>
+		</part>
+		<part name="cdrom7" interface="cdrom">
+			<!-- Origin: archive.org -->
+			<diskarea name="cdrom">
+				<disk name="cd7_warp_server" sha1="4561f06b8c56a523e0e2b45cdc3c09aafd7f0b87"/>
+			</diskarea>
+		</part>
+		<part name="cdrom8" interface="cdrom">
+			<!-- Origin: archive.org -->
+			<diskarea name="cdrom">
+				<disk name="cd8_warp_server_installation" sha1="4dba7d9093a76fedb7a37b94c397c591db189bf5"/>
+			</diskarea>
+		</part>
+		<part name="cdrom9" interface="cdrom">
+			<!-- Origin: archive.org -->
+			<diskarea name="cdrom">
+				<disk name="cd9_workspace_on_demand" sha1="6a7906230637d67cff6560e61dbec6a336965a81"/>
+			</diskarea>
+		</part>
+	</software>
+
+	<software name="paranasalibm">
+		<!--
+		Origin: Gaming Alexandria
+		<rom name="Paranasal Sinuses & Anterior Skull Base.bin" size="725312112" crc="ddeb9c15" md5="883b0e0122e688d067ae6f96001bdc73"/>
+		<rom name="Paranasal Sinuses & Anterior Skull Base.cue" size="128" crc="6dbd3a2c" md5="8de5a6d9098ba9629e0f14a673f63aa2"/>
+
+		This disc was sold in a package with the CD-i version. This requires Windows 3.1 and Video for Windows to be installed.
+		-->
+		<description>Paranasal Sinuses &amp; Anterior Skull Base</description>
+		<year>1993</year>
+		<publisher>Elsevier Science B.V.</publisher>
+		<part name="cdrom" interface="cdi_cdrom">
+			<diskarea name="cdrom">
+				<disk name="paranasal sinuses &amp; anterior skull base (1993)(elsevier science b.v.)(windows 3.1 disc)" sha1="fddedb4f78bc5687d65f11fd4e18463e1fc4edda"/>
+			</diskarea>
+		</part>
+	</software>
+
 	<software name="s3drv21" supported="no">
 		<description>S3 Drivers Collection 1998 (Rev 2.1)</description>
 		<year>1998</year>
@@ -7249,152 +7396,4 @@ Wave Studio v3.12
 		</part>
 	</software>
 
-	<!-- various Windows CDROMs
-	   so far the listed discs should all be full english language retail discs, this can be expanded later -->
-
-	<software name="win95">
-		<description>Windows 95 (en 4.00.950)</description>
-		<year>1995</year>
-		<publisher>Microsoft</publisher>
-
-		<part name="cdrom" interface="cdrom">
-			<diskarea name="cdrom">
-				<disk name="win95_4.00.950_en" sha1="ef1b482b5f6e746b673def87724d9e7ff833ac43" />
-			</diskarea>
-		</part>
-	</software>
-
-	<software name="win95a">
-		<description>Windows 95 OSR1 (en 4.00.950.osr1)</description> <!-- aka Windows 95A -->
-		<year>1996</year>
-		<publisher>Microsoft</publisher>
-
-		<part name="cdrom" interface="cdrom">
-			<diskarea name="cdrom">
-				<disk name="win95_4.00.950_osr1_en" sha1="bc43d85ea8d0ee65b6102ac7cd425c57398c09ce" />
-			</diskarea>
-		</part>
-	</software>
-
-	<software name="win95b">
-		<description>Windows 95 OSR2 (en 4.00.1111.osr2)</description> <!-- aka Windows 95B -->
-		<year>1996</year>
-		<publisher>Microsoft</publisher>
-
-		<part name="cdrom" interface="cdrom">
-			<diskarea name="cdrom">
-				<disk name="win95_4.00.1111_osr2_en" sha1="e15bd9a4e2c930bd4913996a2d9d11d1567635f5" />
-			</diskarea>
-		</part>
-	</software>
-
-	<software name="win95c">
-		<description>Windows 95 OSR2.5 (en 4.03.1216.osr2.5)</description> <!-- aka Windows 95C -->
-		<year>1997</year>
-		<publisher>Microsoft</publisher>
-
-		<part name="cdrom" interface="cdrom">
-			<diskarea name="cdrom">
-				<disk name="win95_4.03.1216_osr2_5_en" sha1="b000931531cedcbb3f9a00d13d315406cf7c2d52" />
-			</diskarea>
-		</part>
-	</software>
-
-	<software name="win98">
-		<description>Windows 98 (en 4.10.1998) (Retail Full)</description> <!-- aka Windows 98 First Edition -->
-		<year>1998</year>
-		<publisher>Microsoft</publisher>
-
-		<part name="cdrom" interface="cdrom">
-			<diskarea name="cdrom">
-				<disk name="windows 98 (en 4.10.1998 retail full)" sha1="1e725b0a7ea471e2b91500d09f242d05330b4f50" />
-			</diskarea>
-		</part>
-	</software>
-
-	<software name="win98se">
-		<description>Windows 98 Second Edition (en 4.10.2222) (Retail Full)</description>
-		<year>1999</year>
-		<publisher>Microsoft</publisher>
-
-		<part name="cdrom" interface="cdrom">
-			<diskarea name="cdrom">
-				<disk name="windows 98 se (en 4.10.2222 retail full)" sha1="3d9b3e69d03aef2ed5e54c3c73702d1e9b53255c" />
-			</diskarea>
-		</part>
-	</software>
-
-	<!-- Supports IBM PC-AT and PC-98 architectures -->
-	<software name="win98sejp">
-		<!--
-		Origin: Neo Kobe Collection
-		CCD converted to CUE with GNU ccd2cue
-		<rom name="Microsoft Windows 98SE.ccd" size="772" crc="65e992be" sha1="b869a3e83459f562966739caa22b46b5204e20cb"/>
-		<rom name="Microsoft Windows 98SE.cue" size="84" crc="a529c2b7" sha1="050dc1be1c9aeafd7e4d7ce7235285b8296f9eee"/>
-		<rom name="Microsoft Windows 98SE.img" size="546019152" crc="cbaea25b" sha1="6b1689232640632a7cc6e5de4967b922637c055d"/>
-		<rom name="Microsoft Windows 98SE.sub" size="22286496" crc="6dec77e2" sha1="41843630fb1a58131b5ecf6dd187884fb29e6685"/>
-		-->
-		<description>Windows 98 Second Edition (jp 4.10.2222) (Retail Full)</description>
-		<year>1999</year>
-		<publisher>Microsoft</publisher>
-		<info name="alt_title" value="マイクロソフト ウィンドウズ 98 オペレイティング システム SECOND EDITION" />
-		<info name="serial" value="X04-67430"/>
-
-		<part name="cdrom" interface="cdrom">
-			<diskarea name="cdrom">
-				<disk name="microsoft windows 98se" sha1="eb0bdd209334b3709fa31043f390838351127bc0" />
-			</diskarea>
-		</part>
-	</software>
-
-	<software name="winme">
-		<description>Windows ME (en 4.90.3000) (Retail Full)</description> <!-- aka Millennium Edition -->
-		<year>2000</year>
-		<publisher>Microsoft</publisher>
-
-		<part name="cdrom" interface="cdrom">
-			<diskarea name="cdrom">
-				<disk name="windows me (en 4.90.3000 retail full)" sha1="3bb9b89f2b5918b7dbe393d250a8f1a530a175ef" />
-			</diskarea>
-		</part>
-	</software>
-
-	<software name="winnt31w">
-		<description>Windows NT 3.1 Workstation (3.10.511.1)</description>
-		<year>1993</year>
-		<publisher>Microsoft</publisher>
-		<part name="cdrom" interface="cdrom">
-			<!-- Origin: WinWorld -->
-			<diskarea name="cdrom">
-				<disk name="en_winnt_3_1_wks" sha1="0a542add03b6c9ab130421d24f94731c4992e0a7"/>
-			</diskarea>
-		</part>
-	</software>
-
-	<software name="winnt351w">
-		<description>Windows NT 3.51 Workstation (3.51.1057.1)</description>
-		<year>1995</year>
-		<publisher>Microsoft</publisher>
-		<part name="cdrom" interface="cdrom">
-			<!-- Origin: WinWorld -->
-			<diskarea name="cdrom">
-				<disk name="en_winnt_3_51_wks" sha1="5a5d3cf9d244b6b24b007271be478b94a9c349f4"/>
-			</diskarea>
-		</part>
-	</software>
-
-	<software name="win2kps4">
-		<description>Windows 2000 Professional (with Service Pack 4) (en 5.00.2195.6717)</description>
-		<year>1999</year>
-		<publisher>Microsoft</publisher>
-
-		<part name="cdrom" interface="cdrom">
-			<diskarea name="cdrom">
-				<disk name="en_win2000_pro_sp4" sha1="9344cce041f092f0194944bdc690af7df7185cf6" />
-			</diskarea>
-		</part>
-	</software>
-
-
-
 </softwarelist>