diff --git a/hash/abc806_flop.xml b/hash/abc806_flop.xml
index c6d3853463c..f4caa8c8139 100644
--- a/hash/abc806_flop.xml
+++ b/hash/abc806_flop.xml
@@ -50,7 +50,100 @@ license:CC0-1.0
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="163840">
-				<rom name="colorful_animals.dsk" size="163840" crc="ba6ba9a1" sha1="36f9a0b814b222eb5664a87f3b52c0268dfd18c1" />
+				<rom name="colorful_animals.img" size="163840" crc="ba6ba9a1" sha1="36f9a0b814b222eb5664a87f3b52c0268dfd18c1" />
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="it100">
+		<description>IT100</description>
+		<year>1985</year>
+		<publisher>DIAB</publisher>
+
+		<part name="flop1" interface="floppy_5_25">
+			<dataarea name="flop" size="655360">
+				<rom name="it100_vg100.img" size="655360" crc="aec9b42d" sha1="6798c6eca6a3cc7f44a568201878823e0883fef2"/>
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="vg100" cloneof="it100">
+		<description>VG100</description>
+		<year>1985</year>
+		<publisher>DIAB</publisher>
+
+		<part name="flop1" interface="floppy_5_25">
+			<dataarea name="flop" size="655360">
+				<rom name="vg100_abc.img" size="655360" crc="8eb22c63" sha1="fc3ab80cc92527861ef38622031c13d6f558336b"/>
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="ord3">
+		<description>Ord III v2.0</description>
+		<year>198?</year>
+		<publisher>unknown</publisher>
+
+		<part name="flop1" interface="floppy_5_25">
+			<dataarea name="flop" size="655360">
+				<rom name="ordiii.img" size="655360" crc="b99cc50a" sha1="b7c7eb940c74aa89d5c154283e41ad50f9250b83"/>
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="smallc">
+		<description>Small C v2.03</description>
+		<year>1988</year>
+		<publisher>Stefan Gartz</publisher>
+
+		<part name="flop1" interface="floppy_5_25">
+			<dataarea name="flop" size="655360">
+				<rom name="small_c_800.img" size="655360" crc="d7b80178" sha1="e9646fd10cc5a2759a691b1cf4fc22016c70a14f"/>
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="turbo">
+		<description>Turbo</description>
+		<year>198?</year>
+		<publisher>unknown</publisher>
+
+		<part name="flop1" interface="floppy_5_25">
+			<dataarea name="flop" size="655360">
+				<rom name="cpm_turbo.img" size="655360" crc="813569d" sha1="4c30813fb28e817257277ebd1c555622bfc840c4"/>
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="tpascal">
+		<description>Turbo Pascal</description>
+		<year>198?</year>
+		<publisher>unknown</publisher>
+
+		<part name="flop1" interface="floppy_5_25">
+			<dataarea name="flop" size="655360">
+				<rom name="cpm_3.0.img" size="655360" crc="18895645" sha1="7f2bfc6299ce468fd678a66a1b5ef1ed4714b7f2"/>
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="massyh">
+		<description>Massy H</description>
+		<year>198?</year>
+		<publisher>Promedia Konsult</publisher>
+		<sharedfeat name="bus_default" value="abc838" />
+
+		<part name="flop1" interface="floppy_8">
+			<feature name="part_id" value="Skiva 0" />
+			<dataarea name="flop" size="1025024">
+				<rom name="disk003.img" size="1025024" crc="f1955516" sha1="d1fac8ec9d21d650a89b5bda2d52ce57b854b1d6"/>
+			</dataarea>
+		</part>
+
+		<part name="flop2" interface="floppy_8">
+			<feature name="part_id" value="Skiva 1" />
+			<dataarea name="flop" size="1025024">
+				<rom name="disk002.img" size="1025024" crc="4147db20" sha1="46120043f9678d0b5473805fe18ce1eda969cb0a"/>
 			</dataarea>
 		</part>
 	</software>
diff --git a/hash/abc830_flop.xml b/hash/abc830_flop.xml
index 0751daa0ade..bd613f9eae6 100644
--- a/hash/abc830_flop.xml
+++ b/hash/abc830_flop.xml
@@ -43,7 +43,7 @@ license:CC0-1.0
 	</software>
 
 	<software name="ord800">
-		<description>ORD 800 v2.4 (Sweden)</description>
+		<description>ORD 800 v2.4</description>
 		<year>198?</year>
 		<publisher>P-Data</publisher>
 
@@ -55,7 +55,7 @@ license:CC0-1.0
 	</software>
 
 	<software name="prommis">
-		<description>PROMMIS v6.2 (Sweden)</description>
+		<description>PROMMIS v6.2</description>
 		<year>1983</year>
 		<publisher>ELogik</publisher>
 
@@ -67,7 +67,7 @@ license:CC0-1.0
 	</software>
 
 	<software name="red800">
-		<description>Bokföring 800 v2.0 (Sweden)</description>
+		<description>Bokföring 800 v2.0</description>
 		<year>198?</year>
 		<publisher>P-Data</publisher>
 
@@ -92,7 +92,7 @@ license:CC0-1.0
 	</software>
 
 	<software name="tty800">
-		<description>TTY800 v1.5 (Sweden)</description>
+		<description>TTY800 v1.5</description>
 		<year>1983</year>
 		<publisher>Front-Line</publisher>
 
@@ -104,10 +104,10 @@ license:CC0-1.0
 	</software>
 
 	<software name="tty800a" cloneof="tty800">
-		<description>TTY800 v1.5 (Sweden) (no autoboot)</description>
+		<description>TTY800 v1.5 (no autoboot)</description>
 		<year>1983</year>
 		<publisher>Front-Line</publisher>
-		<info name="usage" value="RUN&quot;TTY&quot;" />
+		<info name="usage" value="RUN TTY" />
 
 		<part name="flop" interface="floppy_5_25">
 			<dataarea name="flop" size="40815">
@@ -120,7 +120,7 @@ license:CC0-1.0
 		<description>CAT800L v8.6 for CATNET v1.3</description>
 		<year>198?</year>
 		<publisher>Luxor</publisher>
-		<info name="usage" value="RUN&quot;CATNETL&quot;" />
+		<info name="usage" value="RUN CATNETL" />
 
 		<part name="flop" interface="floppy_5_25">
 			<dataarea name="flop" size="32173">
@@ -133,7 +133,7 @@ license:CC0-1.0
 		<description>Systeemilevy ABC800 v1.0 (Finland)</description>
 		<year>198?</year>
 		<publisher>Luxor</publisher>
-		<info name="usage" value="RUN&quot;LIB&quot;" />
+		<info name="usage" value="RUN LIB" />
 
 		<part name="flop" interface="floppy_5_25">
 			<dataarea name="flop" size="22884">
@@ -143,11 +143,11 @@ license:CC0-1.0
 	</software>
 
 	<software name="sys10sw">
-		<description>Systemskiva ABC800 v1.0 (Sweden)</description>
+		<description>Systemskiva ABC800 v1.0</description>
 		<year>198?</year>
 		<publisher>Luxor</publisher>
 		<info name="serial" value="68 29011-41" />
-		<info name="usage" value="RUN&quot;LIB&quot;" />
+		<info name="usage" value="RUN LIB" />
 
 		<part name="flop" interface="floppy_5_25">
 			<dataarea name="flop" size="24026">
@@ -160,7 +160,7 @@ license:CC0-1.0
 		<description>System disk v6.19 for UFD-DOS</description>
 		<year>198?</year>
 		<publisher>Luxor</publisher>
-		<info name="usage" value="RUN&quot;LIB&quot;" />
+		<info name="usage" value="RUN LIB" />
 
 		<part name="flop" interface="floppy_5_25">
 			<dataarea name="flop" size="119474">
@@ -173,7 +173,7 @@ license:CC0-1.0
 		<description>System disk v6.19a6 for UFD-DOS</description>
 		<year>198?</year>
 		<publisher>Luxor</publisher>
-		<info name="usage" value="RUN&quot;LIB&quot;" />
+		<info name="usage" value="RUN LIB" />
 
 		<part name="flop" interface="floppy_5_25">
 			<dataarea name="flop" size="136796">
@@ -209,4 +209,29 @@ license:CC0-1.0
 		</part>
 	</software>
 
+	<software name="kompil">
+		<description>Kompil</description>
+		<year>198?</year>
+		<publisher>unknown</publisher>
+		<info name="usage" value="RUN KOMPIL" />
+
+		<part name="flop1" interface="floppy_5_25">
+			<dataarea name="flop" size="163840">
+				<rom name="830_kompil.img" size="163840" crc="961c00be" sha1="1672c14c931633d9f6e7f8af629e081daa710570"/>
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="trim">
+		<description>Trim</description>
+		<year>198?</year>
+		<publisher>unknown</publisher>
+
+		<part name="flop1" interface="floppy_5_25">
+			<dataarea name="flop" size="163840">
+				<rom name="trim.img" size="163840" crc="f3a6b2ff" sha1="a4253906d483697891314537882c82ff9288cfeb"/>
+			</dataarea>
+		</part>
+	</software>
+
 </softwarelist>
diff --git a/hash/abc832_flop.xml b/hash/abc832_flop.xml
index e5c8d613411..c6a7a5796ea 100644
--- a/hash/abc832_flop.xml
+++ b/hash/abc832_flop.xml
@@ -5,8 +5,8 @@ license:CC0-1.0
 -->
 <softwarelist name="abc832_flop" description="Luxor ABC 832 diskettes">
 
-	<software name="abc832" supported="no">
-		<description>ABC832 Systemskiva v2.5 (Sweden)</description>
+	<software name="abc832">
+		<description>ABC832 Systemskiva v2.5</description>
 		<year>1982</year>
 		<publisher>Luxor</publisher>
 		<info name="usage" value="BYE" />
@@ -20,11 +20,11 @@ license:CC0-1.0
 	</software>
 
 	<software name="ufd631">
-		<description>Systemskiva v6.31 för UFD-DOS (Sweden)</description>
+		<description>Systemskiva v6.31 för UFD-DOS</description>
 		<year>198?</year>
 		<publisher>Luxor</publisher>
 		<info name="serial" value="68 29251-51" />
-		<info name="usage" value="RUN&quot;LIB&quot;" />
+		<info name="usage" value="RUN LIB" />
 		<sharedfeat name="bus_default" value="abc832" />
 
 		<part name="flop" interface="floppy_5_25">
@@ -34,4 +34,259 @@ license:CC0-1.0
 		</part>
 	</software>
 
+	<software name="abcute">
+		<description>ABCUTE Universell Terminalemulator</description>
+		<year>1982</year>
+		<publisher>Sören Tirfing &amp; Kari Dubbelman</publisher>
+
+		<part name="flop1" interface="floppy_5_25">
+			<dataarea name="flop" size="655360">
+				<rom name="abcute_2.img" size="655360" crc="2bbcd44c" sha1="3484edf6a60e1c10ac493af055c2bd87d9fb352e"/>
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="abcute14" cloneof="abcute">
+		<description>ABCUTE Universell Terminalemulator (v1.4)</description>
+		<year>1982</year>
+		<publisher>Sören Tirfing &amp; Kari Dubbelman</publisher>
+
+		<part name="flop1" interface="floppy_5_25">
+			<dataarea name="flop" size="655360">
+				<rom name="ute_v1.4.img" size="655360" crc="1fc448ad" sha1="03d0595ee6cd08bf7c5bb170463952599ab6367d"/>
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="asm800">
+		<description>asm800</description>
+		<year>198?</year>
+		<publisher>unknown</publisher>
+
+		<part name="flop1" interface="floppy_5_25">
+			<dataarea name="flop" size="655360">
+				<rom name="asm800.img" size="655360" crc="5b180f79" sha1="f8cadfbe4e53871ce4d1a67ef0a9d5653d75e1fd"/>
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="asm800a">
+		<description>asm800 (alt)</description>
+		<year>198?</year>
+		<publisher>unknown</publisher>
+
+		<part name="flop1" interface="floppy_5_25">
+			<dataarea name="flop" size="655360">
+				<rom name="asm800_ver1.00_ser.img" size="655360" crc="975a04b2" sha1="f54b2f79306ae3c1b77aaa93fe04224d62b41f20"/>
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="catext">
+		<description>Extend 800</description>
+		<year>1984</year>
+		<publisher>unknown</publisher>
+		<info name="usage" value="RUN EXTEND" />
+
+		<part name="flop1" interface="floppy_5_25">
+			<dataarea name="flop" size="655360">
+				<rom name="catnet_extender.img" size="655360" crc="91d30f01" sha1="8a3f933bb3bdaf6e33b34471a647b8b17eab0935"/>
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="eeprom">
+		<description>EEPROM Programmer</description>
+		<year>198?</year>
+		<publisher>unknown</publisher>
+		<info name="usage" value="RUN E" />
+
+		<part name="flop1" interface="floppy_5_25">
+			<feature name="part_id" value="eeprom_programer" />
+			<dataarea name="flop" size="655360">
+				<rom name="eeprom_programer.img" size="655360" crc="642422a9" sha1="e9b37953454f1ec64e7a578efb30cea0288351d1"/>
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="inprak">
+		<description>Inpräk</description>
+		<year>198?</year>
+		<publisher>unknown</publisher>
+
+		<part name="flop1" interface="floppy_5_25">
+			<dataarea name="flop" size="655360">
+				<rom name="inprak(orgina).img" size="655360" crc="53a656f7" sha1="7228b99854d1275242b8f55d517a2c06769604af"/>
+			</dataarea>
+		</part>
+
+		<part name="flop2" interface="floppy_5_25">
+			<dataarea name="flop" size="655360">
+				<rom name="inprak_2.img" size="655360" crc="422e642e" sha1="ca43332383f34c40772a98429d42f5b384705b4a"/>
+			</dataarea>
+		</part>
+
+		<part name="flop3" interface="floppy_5_25">
+			<dataarea name="flop" size="655360">
+				<rom name="inprak_3.img" size="655360" crc="374b18c6" sha1="56d1e76510e4fef0ff7cb9e12d320d8c89af375e"/>
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="llforth">
+		<description>L&amp;L Forth</description>
+		<year>198?</year>
+		<publisher>unknown</publisher>
+
+		<part name="flop1" interface="floppy_5_25">
+			<dataarea name="flop" size="655360">
+				<rom name="l_l_forth.img" size="655360" crc="468b1bc9" sha1="fc24a89a645329d82cf301acb20c1d1dafb2fd8d"/>
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="meny0">
+		<description>Meny0 v6.03</description>
+		<year>198?</year>
+		<publisher>Luxor</publisher>
+
+		<part name="flop1" interface="floppy_5_25">
+			<dataarea name="flop" size="655360">
+				<rom name="meny0.img" size="655360" crc="98f211ee" sha1="ad8f079f59973c75dabff069c78c04099c3a6ca4"/>
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="misc1">
+		<description>Miscellanous 1</description>
+		<year>198?</year>
+		<publisher>unknown</publisher>
+
+		<part name="flop1" interface="floppy_5_25">
+			<dataarea name="flop" size="655360">
+				<rom name="okänd.img" size="655360" crc="64a139ac" sha1="110516288aacf899ae3000dec66ba6bb5f7a1986"/>
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="misc2">
+		<description>Miscellanous 2</description>
+		<year>198?</year>
+		<publisher>unknown</publisher>
+
+		<part name="flop1" interface="floppy_5_25">
+			<dataarea name="flop" size="655360">
+				<rom name="okand2.img" size="655360" crc="62724ace" sha1="56c8d29efa321ab8aa073cacaa9ecec3bb23afd8"/>
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="misc3">
+		<description>Miscellanous 3</description>
+		<year>198?</year>
+		<publisher>unknown</publisher>
+
+		<part name="flop1" interface="floppy_5_25">
+			<dataarea name="flop" size="655360">
+				<rom name="okand3.img" size="655360" crc="a00d67c2" sha1="c14a2bb65fd0091ac1ea726df0e472bddde41ddc"/>
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="ord800a">
+		<description>Ord 800 v2.3W</description>
+		<year>198?</year>
+		<publisher>P-Data</publisher>
+
+		<part name="flop1" interface="floppy_5_25">
+			<dataarea name="flop" size="655360">
+				<rom name="ord800.img" size="655360" crc="af583a00" sha1="e4a219ab384817f682febdf99928a0e5fbdddc0e"/>
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="prod856">
+		<description>Produktion 856</description>
+		<year>198?</year>
+		<publisher>unknown</publisher>
+
+		<part name="flop1" interface="floppy_5_25">
+			<dataarea name="flop" size="655360">
+				<rom name="produktion856.img" size="655360" crc="667e1323" sha1="4a2505766559180d1779083e8e0f6950cea0beb7"/>
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="prodtest">
+		<description>PUG programutveckling</description>
+		<year>198?</year>
+		<publisher>unknown</publisher>
+
+		<part name="flop1" interface="floppy_5_25">
+			<dataarea name="flop" size="655360">
+				<rom name="prodtest.img" size="655360" crc="7753ce44" sha1="8d31d748fe47a8d6dac78a13258463d1238d70cf"/>
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="snoka">
+		<description>Snoka</description>
+		<year>198?</year>
+		<publisher>unknown</publisher>
+
+		<part name="flop1" interface="floppy_5_25">
+			<dataarea name="flop" size="655360">
+				<rom name="snoka.img" size="655360" crc="44521ff5" sha1="91a50e97f40f58dce0b7931da5e001f0fc5176be"/>
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="sys850">
+		<description>Systemskiva för ABC850 v6.43</description>
+		<year>198?</year>
+		<publisher>Luxor</publisher>
+
+		<part name="flop1" interface="floppy_5_25">
+			<dataarea name="flop" size="655360">
+				<rom name="systemskiva_850_v6.43.img" size="655360" crc="57d21f9d" sha1="dcb36be1be511455f6d16f24ac1a0f321bb63750"/>
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="syshd">
+		<description>Systemskiva HD v6.43</description>
+		<year>198?</year>
+		<publisher>unknown</publisher>
+
+		<part name="flop1" interface="floppy_5_25">
+			<dataarea name="flop" size="655360">
+				<rom name="systemskiva_hd_643.img" size="655360" crc="58ce9844" sha1="56c64168fe66fe17d7399e93b3da0322182f58c7"/>
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="systrans">
+		<description>Systemskiva Transfor</description>
+		<year>198?</year>
+		<publisher>unknown</publisher>
+
+		<part name="flop1" interface="floppy_5_25">
+			<dataarea name="flop" size="655360">
+				<rom name="systemskiva_transfor.img" size="655360" crc="b3703430" sha1="b05addc2f7a632cba58381babe4e9953e797bbc3"/>
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="ufd631a">
+		<description>Systemskiva v6.31 för UFD-DOS (alt)</description>
+		<year>198?</year>
+		<publisher>Luxor</publisher>
+
+		<part name="flop1" interface="floppy_5_25">
+			<dataarea name="flop" size="655360">
+				<rom name="systemskiva_ufd_631.img" size="655360" crc="c0893bae" sha1="89863c9b2a0d6400c543060fb82d9b4ce0c4b6cf"/>
+			</dataarea>
+		</part>
+	</software>
+
 </softwarelist>
diff --git a/hash/abc838_flop.xml b/hash/abc838_flop.xml
index 4666d8dbabd..836fb9e429f 100644
--- a/hash/abc838_flop.xml
+++ b/hash/abc838_flop.xml
@@ -6,7 +6,7 @@ license:CC0-1.0
 <softwarelist name="abc838_flop" description="Luxor ABC 838 diskettes">
 
 	<software name="sys800_8">
-		<description>Systemskiva ABC800 v1.0 (Sweden)</description>
+		<description>Systemskiva ABC800 v1.0</description>
 		<year>198?</year>
 		<publisher>Luxor</publisher>
 		<info name="serial" value="68 29111-81" />
@@ -20,7 +20,7 @@ license:CC0-1.0
 	</software>
 
 	<software name="ufd63_8">
-		<description>Systemskiva för UFD-DOS v6.3 (Sweden)</description>
+		<description>Systemskiva för UFD-DOS v6.3</description>
 		<year>198?</year>
 		<publisher>Luxor</publisher>
 		<info name="serial" value="68 29251-81" />
@@ -33,4 +33,31 @@ license:CC0-1.0
 		</part>
 	</software>
 
+	<software name="skolbas">
+		<description>Skolbas</description>
+		<year>198?</year>
+		<publisher>unknown</publisher>
+		<info name="usage" value="RUN SKOLBAS" />
+		<sharedfeat name="bus_default" value="abc838" />
+
+		<part name="flop1" interface="floppy_8">
+			<dataarea name="flop" size="1025024">
+				<rom name="disk001.img" size="1025024" crc="e4362c24" sha1="54b91f3a2414da8d7319f4e34af6033a5684971f"/>
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="apotek">
+		<description>Artikeldiskett apotekväla</description>
+		<year>198?</year>
+		<publisher>unknown</publisher>
+		<sharedfeat name="bus_default" value="abc838" />
+
+		<part name="flop1" interface="floppy_8">
+			<dataarea name="flop" size="1025024">
+				<rom name="disk004.img" size="1025024" crc="a4bab713" sha1="710bb937b2864e8c57c5825aed894034df71f17e"/>
+			</dataarea>
+		</part>
+	</software>
+
 </softwarelist>