diff --git a/hash/a2600.xml b/hash/a2600.xml
index c084244badd..416e78cc906 100644
--- a/hash/a2600.xml
+++ b/hash/a2600.xml
@@ -2132,7 +2132,7 @@ X-1414 : Streetracer
 		<part name="cart" interface="a2600_cart">
 			<feature name="slot" value="a26_f8" />
 			<dataarea name="rom" size="8192">
-			<rom name="big bird's egg catch (grover's egg catch) (kid's controller) (children's computer workshop) (cx26104) (pal).bin" size="8192" crc="b0555578" sha1="fd9822ec54add04569b629d631182d9deac7184d"/>
+				<rom name="big bird's egg catch (grover's egg catch) (kid's controller) (children's computer workshop) (cx26104) (pal).bin" size="8192" crc="b0555578" sha1="fd9822ec54add04569b629d631182d9deac7184d"/>
 			</dataarea>
 		</part>
 	</software>
diff --git a/hash/ibm5170.xml b/hash/ibm5170.xml
index 84120620d34..e968840cbe6 100644
--- a/hash/ibm5170.xml
+++ b/hash/ibm5170.xml
@@ -13846,7 +13846,8 @@ license:CC0
 	<!-- Riki (Slovakia) -->
 
 	<!-- Riki 8 undumped
-	    <info name="Contents" value="The Mask" />-->
+	    <info name="Contents" value="The Mask" />
+	-->
 
 	<software name="riki10">
 		<description>Riki Coverdisk (June 1995) (Slovak)</description>
@@ -14018,7 +14019,8 @@ license:CC0
 
 	<!-- PC Gamer (Germany) -->
 	<!-- October 1992 undumped
-	    <info name="Contents" value="Soul Magican / Atom Demo" />-->
+	    <info name="Contents" value="Soul Magican / Atom Demo" />
+	-->
 
 	<software name="pcga9211">
 		<description>PC Games Coverdisk (November 1992) (German)</description>
@@ -14033,7 +14035,8 @@ license:CC0
 	</software>
 
 	<!-- December 1992 undumped
-	    <info name="Contents" value="Ween the Prophecy Demo" />-->
+	    <info name="Contents" value="Ween the Prophecy Demo" />
+	-->
 
 	<software name="pcga9301">
 		<description>PC Games Coverdisk (January 1993) (German)</description>
@@ -14060,13 +14063,16 @@ license:CC0
 	</software>
 
 	<!-- March 1993 undumped
-	    <info name="Contents" value="Ween the Prophecy Demo" />-->
+	    <info name="Contents" value="Ween the Prophecy Demo" />
+	-->
 
 	<!-- April 1993 undumped
-	    <info name="Contents" value="Zool Demo" />-->
+	    <info name="Contents" value="Zool Demo" />
+	-->
 
 	<!-- May 1993 undumped
-	    <info name="Contents" value="Tornado Demo" />-->
+	    <info name="Contents" value="Tornado Demo" />
+	-->
 
 	<software name="pcga9306">
 		<description>PC Games Coverdisk (June 1993) (German)</description>
@@ -14105,7 +14111,8 @@ license:CC0
 	</software>
 
 	<!-- September 1993 undumped
-	    <info name="Contents" value="Ambush at Sorinor Demo" />-->
+	    <info name="Contents" value="Ambush at Sorinor Demo" />
+	-->
 
 	<software name="pcga9310">
 		<description>PC Games Coverdisk (October 1993) (German)</description>
@@ -14120,13 +14127,16 @@ license:CC0
 	</software>
 
 	<!-- November 1993 undumped
-	    <info name="Contents" value="Energie Manager Demo" />-->
+	    <info name="Contents" value="Energie Manager Demo" />
+	-->
 
 	<!-- December 1993 undumped
-	    <info name="Contents" value="Micro Machines Demo" />-->
+	    <info name="Contents" value="Micro Machines Demo" />
+	-->
 
 	<!-- January 1994 undumped
-	    <info name="Contents" value="Android Demo" />-->
+	    <info name="Contents" value="Android Demo" />
+	-->
 
 	<software name="pcga9402">
 		<description>PC Games Coverdisk (February 1994) (German)</description>
@@ -14141,7 +14151,8 @@ license:CC0
 	</software>
 
 	<!-- March 1994 undumped
-	    <info name="Contents" value="Pinball Fantasies Demo" />-->
+	    <info name="Contents" value="Pinball Fantasies Demo" />
+	-->
 
 	<software name="pcga9404">
 		<description>PC Games Coverdisk (April 1994) (German)</description>
@@ -14180,22 +14191,28 @@ license:CC0
 	</software>
 
 	<!-- July 1994 undumped
-	    <info name="Contents" value="Tubular Worlds / Empire Soccer Demo" />-->
+	    <info name="Contents" value="Tubular Worlds / Empire Soccer Demo" />
+	-->
 
 	<!-- August 1994 undumped
-	    <info name="Contents" value="Der Clou Demo / 3 New Doom Level" />-->
+	    <info name="Contents" value="Der Clou Demo / 3 New Doom Level" />
+	-->
 
 	<!-- September 1994 undumped
-	    <info name="Contents" value="Tony and Friends in Kellogg's Land Demo" />-->
+	    <info name="Contents" value="Tony and Friends in Kellogg's Land Demo" />
+	-->
 
 	<!-- October 1994 undumped
-	    <info name="Contents" value="Cool Spot / Cheat It Demo" />-->
+	    <info name="Contents" value="Cool Spot / Cheat It Demo" />
+	-->
 
 	<!-- November 1994 undumped
-	    <info name="Contents" value="Bundesliga Manager Hattrick / 3 New Doom Level / Cheat it Demo" />-->
+	    <info name="Contents" value="Bundesliga Manager Hattrick / 3 New Doom Level / Cheat it Demo" />
+	-->
 
 	<!-- December 1994 undumped
-	    <info name="Contents" value="Desert Strike Demo / Bundesliga Manager Hattrick Update" />-->
+	    <info name="Contents" value="Desert Strike Demo / Bundesliga Manager Hattrick Update" />
+	-->
 
 	<software name="pcga9501">
 		<description>PC Games Coverdisk (January 1995) (German)</description>
diff --git a/hash/mc1000_cass.xml b/hash/mc1000_cass.xml
index 9dbb24da7ea..cc5e8bd8d8c 100644
--- a/hash/mc1000_cass.xml
+++ b/hash/mc1000_cass.xml
@@ -852,8 +852,10 @@ Info for original games comes from https://web.archive.org/web/20141023024713/mc
 		<publisher>&lt;unknown&gt;</publisher>
 
 		<part name="cass1" interface="mc1000_cass">
-<!--            <dataarea name="cass" size="702764">
-                <rom name="aventura.wav" size="702764" crc="82a6263b" sha1="834d9511e22f5c34244923108366201e82b89179"/> -->
+<!--
+			<dataarea name="cass" size="702764">
+				<rom name="aventura.wav" size="702764" crc="82a6263b" sha1="834d9511e22f5c34244923108366201e82b89179"/>
+-->
 			<dataarea name="cass" size="168558">
 				<rom name="aventura.wav" size="168558" crc="208c0c8b" sha1="169010d35d4fa3a63cf00f5758717e57fd4754e2"/>
 			</dataarea>
@@ -907,8 +909,10 @@ Info for original games comes from https://web.archive.org/web/20141023024713/mc
 		<publisher>&lt;unknown&gt;</publisher>
 
 		<part name="cass1" interface="mc1000_cass">
-<!--            <dataarea name="cass" size="176812">
-                <rom name="circulos.wav" size="176812" crc="402caaea" sha1="614201ff32f80c91bf433243bc046eee78e190bf"/> -->
+<!--
+			<dataarea name="cass" size="176812">
+				<rom name="circulos.wav" size="176812" crc="402caaea" sha1="614201ff32f80c91bf433243bc046eee78e190bf"/>
+-->
 			<dataarea name="cass" size="40350">
 				<rom name="circulos.wav" size="40350" crc="007a7c30" sha1="0002df62b1b37cd1c3d5b0db3a7a86f733604106"/>
 			</dataarea>
@@ -974,8 +978,10 @@ Info for original games comes from https://web.archive.org/web/20141023024713/mc
 		<publisher>&lt;type-in&gt;</publisher>
 
 		<part name="cass1" interface="mc1000_cass">
-<!--            <dataarea name="cass" size="549964">
-                <rom name="explosao.wav" size="549964" crc="d231d3af" sha1="a3cce871efa9f8762257ac7ea47c71311f25920f"/> -->
+<!--
+			<dataarea name="cass" size="549964">
+				<rom name="explosao.wav" size="549964" crc="d231d3af" sha1="a3cce871efa9f8762257ac7ea47c71311f25920f"/>
+-->
 			<dataarea name="cass" size="130822">
 				<rom name="explosao.wav" size="130822" crc="0b46f290" sha1="821b95bd675097d5ffba1c4c97898d20c9d10bb3"/>
 			</dataarea>
diff --git a/hash/nuon.xml b/hash/nuon.xml
index f01eb0ced8a..b4a1d677360 100644
--- a/hash/nuon.xml
+++ b/hash/nuon.xml
@@ -7,81 +7,81 @@ NOTE: This list is here only to document available dumps and it's not hooked up
 
 <softwarelist name="nuon" description="NUON DVD-ROMs">
 
-    <software name="ballstic">
-        <description>Ballistic</description>
-        <year>2000</year>
-        <publisher>VM Labs, Inc.</publisher>
+	<software name="ballstic">
+		<description>Ballistic</description>
+		<year>2000</year>
+		<publisher>VM Labs, Inc.</publisher>
         <part interface="dvdrom" name="dvdrom">
-            <diskarea name="dvdrom">
-                <disk name="ballstic" sha1="92b386f176eecc7d3b1e13675ccaf0b60a543175" />
-            </diskarea>
-        </part>
-    </software>
+			<diskarea name="dvdrom">
+				<disk name="ballstic" sha1="92b386f176eecc7d3b1e13675ccaf0b60a543175" />
+			</diskarea>
+		</part>
+	</software>
 
-    <software name="freefall">
-        <description>FreeFall 3050 A.D.</description>
-        <year>200?</year>
-        <publisher>VM Labs, Inc.</publisher>
+	<software name="freefall">
+		<description>FreeFall 3050 A.D.</description>
+		<year>200?</year>
+		<publisher>VM Labs, Inc.</publisher>
         <part interface="dvdrom" name="dvdrom">
-            <diskarea name="dvdrom">
-                <disk name="freefall" sha1="56540609dcdf3d5234a1d045b28cba58ba6adae8" />
-            </diskarea>
-        </part>
-    </software>
+			<diskarea name="dvdrom">
+				<disk name="freefall" sha1="56540609dcdf3d5234a1d045b28cba58ba6adae8" />
+			</diskarea>
+		</part>
+	</software>
     
-    <software name="is3">
-        <description>Iron Soldier 3</description>
-        <year>2001</year>
-        <publisher>VM Labs, Inc.</publisher>
+	<software name="is3">
+		<description>Iron Soldier 3</description>
+		<year>2001</year>
+		<publisher>VM Labs, Inc.</publisher>
         <part interface="dvdrom" name="dvdrom">
-            <diskarea name="dvdrom">
-                <disk name="is3" sha1="47dec1bbb819342cf8bc2fee98fc7b18d1302503" />
-            </diskarea>
-        </part>
-    </software>
+			<diskarea name="dvdrom">
+				<disk name="is3" sha1="47dec1bbb819342cf8bc2fee98fc7b18d1302503" />
+			</diskarea>
+		</part>
+	</software>
     
-    <software name="merlinr">
-        <description>Merlin Racing</description>
-        <year>200?</year>
-        <publisher>VM Labs, Inc.</publisher>
+	<software name="merlinr">
+		<description>Merlin Racing</description>
+		<year>200?</year>
+		<publisher>VM Labs, Inc.</publisher>
         <part interface="dvdrom" name="dvdrom">
-            <diskarea name="dvdrom">
-                <disk name="merlinr" sha1="80116c3c9440492678f8f072c5fabd2cedb3034e" />
-            </diskarea>
-        </part>
-    </software>
+			<diskarea name="dvdrom">
+				<disk name="merlinr" sha1="80116c3c9440492678f8f072c5fabd2cedb3034e" />
+			</diskarea>
+		</part>
+	</software>
     
-    <software name="spacinvx">
-        <description>Space Invaders XL</description>
-        <year>200?</year>
-        <publisher>VM Labs, Inc.</publisher>
+	<software name="spacinvx">
+		<description>Space Invaders XL</description>
+		<year>200?</year>
+		<publisher>VM Labs, Inc.</publisher>
         <part interface="dvdrom" name="dvdrom">
-            <diskarea name="dvdrom">
-                <disk name="spacinvx" sha1="76518e106ab04819f6b85cc3e1eea08968b7b249" />
-            </diskarea>
-        </part>
-    </software>
+			<diskarea name="dvdrom">
+				<disk name="spacinvx" sha1="76518e106ab04819f6b85cc3e1eea08968b7b249" />
+			</diskarea>
+		</part>
+	</software>
     
-    <software name="tempest3">
-        <description>Tempest 3000</description>
-        <year>200?</year>
-        <publisher>VM Labs, Inc.</publisher>
+	<software name="tempest3">
+		<description>Tempest 3000</description>
+		<year>200?</year>
+		<publisher>VM Labs, Inc.</publisher>
         <part interface="dvdrom" name="dvdrom">
-            <diskarea name="dvdrom">
-                <disk name="tempest3" sha1="48e44d3de2642bb7b4fc5a044caf4cb2e8ad5c25" />
-            </diskarea>
-        </part>
-    </software>
+			<diskarea name="dvdrom">
+				<disk name="tempest3" sha1="48e44d3de2642bb7b4fc5a044caf4cb2e8ad5c25" />
+			</diskarea>
+		</part>
+	</software>
     
-    <software name="toshsamp">
-        <description>Toshiba Sampler (11-1-2000)</description>
-        <year>200?</year>
-        <publisher>VM Labs, Inc.</publisher>
+	<software name="toshsamp">
+		<description>Toshiba Sampler (11-1-2000)</description>
+		<year>200?</year>
+		<publisher>VM Labs, Inc.</publisher>
         <part interface="dvdrom" name="dvdrom">
-            <diskarea name="dvdrom">
-                <disk name="toshsamp" sha1="e312c9cec7f11a4594c1a3340fbcc9f66a65e9b1" />
-            </diskarea>
-        </part>
-    </software>
+			<diskarea name="dvdrom">
+				<disk name="toshsamp" sha1="e312c9cec7f11a4594c1a3340fbcc9f66a65e9b1" />
+			</diskarea>
+		</part>
+	</software>
     
 </softwarelist>
diff --git a/hash/pc8801_flop.xml b/hash/pc8801_flop.xml
index c5b31729665..d1d87da511e 100644
--- a/hash/pc8801_flop.xml
+++ b/hash/pc8801_flop.xml
@@ -54113,8 +54113,10 @@ ExtractDisk  [10]"Super-88_Disk#10" -> "pc88 oldgame collection (super-88 disks
 ExtractDisk  [11]"Super-88_Disk#11" -> "pc88 oldgame collection (super-88 disks 1-12)_11.d88"
 ExtractDisk  [12]"Super-88_Disk#12" -> "pc88 oldgame collection (super-88 disks 1-12)_12.d88"   5fbceedf (same as sp88-12)
 -->
-<!-- Alt disk exists with disks 1-6 (sixth disk underdumped)
-                <rom name="88 oldgame collection(super 88 1-6).d88" size="1832540" crc="51e02647" sha1="1a872df51ccba34f193ce88c154e3ada79f888a9"/-->
+<!--
+Alt disk exists with disks 1-6 (sixth disk underdumped)
+                <rom name="88 oldgame collection(super 88 1-6).d88" size="1832540" crc="51e02647" sha1="1a872df51ccba34f193ce88c154e3ada79f888a9"/>
+-->
 	<software name="pc88oldg">
 		<description>PC88 Oldgame Collection (Super-88 Disks 1-12)</description>
 		<year>19??</year>
diff --git a/hash/pi_storyreader_cart.xml b/hash/pi_storyreader_cart.xml
index 005ff88b07a..0a7eceddfee 100644
--- a/hash/pi_storyreader_cart.xml
+++ b/hash/pi_storyreader_cart.xml
@@ -378,81 +378,81 @@ license:CC0
 		</part>
 	</software>
 
-  <software name="arielle" supported="no">
-	<description>Arielle  - Die Meerjungfrau (Germany)</description>
-	<year>200?</year>
-	<publisher>Publications International Ltd. / Disney</publisher>
-	<part name="cart" interface="pi_storyreader_cart">
-	  <dataarea name="rom" size="0x100000">
-		<rom name="Arielle  - Die Meerjungfrau (GER).bin" size="0x100000" crc="a113accf" sha1="a7e3a915ce71ddea58e03fdd762c97ad0e72c33e" />
-	  </dataarea>
-	</part>
-  </software>
+	<software name="arielle" supported="no">
+		<description>Arielle  - Die Meerjungfrau (Germany)</description>
+		<year>200?</year>
+		<publisher>Publications International Ltd. / Disney</publisher>
+		<part name="cart" interface="pi_storyreader_cart">
+			<dataarea name="rom" size="0x100000">
+				<rom name="Arielle  - Die Meerjungfrau (GER).bin" size="0x100000" crc="a113accf" sha1="a7e3a915ce71ddea58e03fdd762c97ad0e72c33e" />
+			</dataarea>
+		</part>
+	</software>
 
-  <software name="bambi" supported="no">
-	<description>Bambi (Germany)</description>
-	<year>200?</year>
-	<publisher>Publications International Ltd. / Disney</publisher>
-	<part name="cart" interface="pi_storyreader_cart">
-	  <dataarea name="rom" size="0x100000">
-		<rom name="Bambi (GER).bin" size="0x100000" crc="fec017bd" sha1="6ffd67e7d6e5bc3ce17e1f21646269711386d694" />
-	  </dataarea>
-	</part>
-  </software>
+	<software name="bambi" supported="no">
+		<description>Bambi (Germany)</description>
+		<year>200?</year>
+		<publisher>Publications International Ltd. / Disney</publisher>
+		<part name="cart" interface="pi_storyreader_cart">
+			<dataarea name="rom" size="0x100000">
+				<rom name="Bambi (GER).bin" size="0x100000" crc="fec017bd" sha1="6ffd67e7d6e5bc3ce17e1f21646269711386d694" />
+			</dataarea>
+		</part>
+	</software>
 
-  <software name="cinder" supported="no">
-	<description>Cinderella (Germany)</description>
-	<year>200?</year>
-	<publisher>Publications International Ltd. / Disney</publisher>
-	<part name="cart" interface="pi_storyreader_cart">
-	  <dataarea name="rom" size="0x100000">
-		<rom name="Cinderella (GER).bin" size="0x100000" crc="742d2e0f" sha1="26583dfb23eb56fce4f2518c4009db407e8b72d6" />
-	  </dataarea>
-	</part>
-  </software>
+	<software name="cinder" supported="no">
+		<description>Cinderella (Germany)</description>
+		<year>200?</year>
+		<publisher>Publications International Ltd. / Disney</publisher>
+		<part name="cart" interface="pi_storyreader_cart">
+			<dataarea name="rom" size="0x100000">
+				<rom name="Cinderella (GER).bin" size="0x100000" crc="742d2e0f" sha1="26583dfb23eb56fce4f2518c4009db407e8b72d6" />
+			</dataarea>
+		</part>
+	</software>
 
-  <software name="schone" supported="no">
-	<description>Die Schöne und das Biest (GER) (Germany)</description>
-	<year>200?</year>
-	<publisher>Publications International Ltd. / Disney</publisher>
-	<part name="cart" interface="pi_storyreader_cart">
-	  <dataarea name="rom" size="0x100000">
-		<rom name="Die Schone und das Biest (GER).bin" size="0x100000" crc="8f8d1dd8" sha1="0d125bcf2bb583d3733074afc2ca35c50368e56f" />
-	  </dataarea>
-	</part>
-  </software>
+	<software name="schone" supported="no">
+		<description>Die Schöne und das Biest (GER) (Germany)</description>
+		<year>200?</year>
+		<publisher>Publications International Ltd. / Disney</publisher>
+		<part name="cart" interface="pi_storyreader_cart">
+			<dataarea name="rom" size="0x100000">
+				<rom name="Die Schone und das Biest (GER).bin" size="0x100000" crc="8f8d1dd8" sha1="0d125bcf2bb583d3733074afc2ca35c50368e56f" />
+			</dataarea>
+		</part>
+	</software>
 
-  <software name="pino" supported="no">
-	<description>Pinocchio (Germany)</description>
-	<year>200?</year>
-	<publisher>Publications International Ltd. / Disney</publisher>
-	<part name="cart" interface="pi_storyreader_cart">
-	  <dataarea name="rom" size="0x100000">
-		<rom name="Pinocchio (GER).bin" size="0x100000" crc="ec576e74" sha1="d385ce39f359707b5cdc84d28b32444e24d7ab3a" />
-	  </dataarea>
-	</part>
-  </software>
+	<software name="pino" supported="no">
+		<description>Pinocchio (Germany)</description>
+		<year>200?</year>
+		<publisher>Publications International Ltd. / Disney</publisher>
+		<part name="cart" interface="pi_storyreader_cart">
+			<dataarea name="rom" size="0x100000">
+				<rom name="Pinocchio (GER).bin" size="0x100000" crc="ec576e74" sha1="d385ce39f359707b5cdc84d28b32444e24d7ab3a" />
+			</dataarea>
+		</part>
+	</software>
 
-  <software name="scheewtn" supported="no">
-	<description>Schneewittchen und die Sieben Zwerge (Germany)</description>
-	<year>200?</year>
-	<publisher>Publications International Ltd. / Disney</publisher>
-	<part name="cart" interface="pi_storyreader_cart">
-	  <dataarea name="rom" size="0x100000">
-		<rom name="Schneewittchen und die Sieben Zwerge (GER).bin" size="0x100000" crc="893f0743" sha1="f2e9d802f4856b77ed959e1178b5db465bf3fcf4" />
-	  </dataarea>
-	</part>
-  </software>
+	<software name="scheewtn" supported="no">
+		<description>Schneewittchen und die Sieben Zwerge (Germany)</description>
+		<year>200?</year>
+		<publisher>Publications International Ltd. / Disney</publisher>
+		<part name="cart" interface="pi_storyreader_cart">
+			<dataarea name="rom" size="0x100000">
+				<rom name="Schneewittchen und die Sieben Zwerge (GER).bin" size="0x100000" crc="893f0743" sha1="f2e9d802f4856b77ed959e1178b5db465bf3fcf4" />
+			</dataarea>
+		</part>
+	</software>
 
-  <software name="susistro" supported="no">
-	<description>Susi und STROLCH (Germany)</description>
-	<year>200?</year>
-	<publisher>Publications International Ltd. / Disney</publisher>
-	<part name="cart" interface="pi_storyreader_cart">
-	  <dataarea name="rom" size="0x100000">
-		<rom name="Susi und STROLCH (GER).bin" size="0x100000" crc="1181ea02" sha1="2d1d660d5f1bf014f5fa445e3424634016e8aaa6" />
-	  </dataarea>
-	</part>
-  </software>
+	<software name="susistro" supported="no">
+		<description>Susi und STROLCH (Germany)</description>
+		<year>200?</year>
+		<publisher>Publications International Ltd. / Disney</publisher>
+		<part name="cart" interface="pi_storyreader_cart">
+			<dataarea name="rom" size="0x100000">
+				<rom name="Susi und STROLCH (GER).bin" size="0x100000" crc="1181ea02" sha1="2d1d660d5f1bf014f5fa445e3424634016e8aaa6" />
+			</dataarea>
+		</part>
+	</software>
 
 </softwarelist>
diff --git a/hash/specpls3_flop.xml b/hash/specpls3_flop.xml
index 118aeac847e..fac29e5684d 100644
--- a/hash/specpls3_flop.xml
+++ b/hash/specpls3_flop.xml
@@ -644,9 +644,12 @@ license:CC0
 		</part>
 	</software>
 
-<!--    <software name="ledstorm">-->
-		<!-- SPS (CAPS) release 3585 -->
-<!--        <description>LED Storm Rally 2011</description>
+<!--
+	<software name="ledstorm">
+-->
+<!-- SPS (CAPS) release 3585 -->
+<!--
+        <description>LED Storm Rally 2011</description>
         <year>1988</year>
         <publisher>Go!</publisher>
         <part name="flop1" interface="floppy_3">
@@ -654,7 +657,8 @@ license:CC0
                 <rom name="3585 - led storm - lazer enhanced destruction (europe).ipf" size="266892" crc="a861168e" sha1="" offset="0" />
             </dataarea>
         </part>
-    </software>-->
+    </software>
+-->
 
 	<software name="lmidnght">
 		<!-- SPS (CAPS) release 3518 -->
@@ -1007,9 +1011,12 @@ license:CC0
 		</part>
 	</software>
 
-<!--    <software name="rockhams">-->
-		<!-- SPS (CAPS) release 3607 -->
-<!--        <description>Rock Star Ate My Hamster</description>
+<!--
+	<software name="rockhams">
+-->
+<!-- SPS (CAPS) release 3607 -->
+<!--
+        <description>Rock Star Ate My Hamster</description>
         <year>1989</year>
         <publisher>Code Masters</publisher>
         <part name="flop1" interface="floppy_3">
@@ -1017,7 +1024,8 @@ license:CC0
                 <rom name="3607 - rock star ate my hamster (europe).ipf" size="234180" crc="7cbd3549" sha1="" offset="0" />
             </dataarea>
         </part>
-    </software>-->
+    </software>
+-->
 
 	<software name="rthunder">
 		<!-- SPS (CAPS) release 3608 -->
@@ -1442,9 +1450,12 @@ license:CC0
 		</part>
 	</software>
 
-<!--    <software name="tigeroad">-->
-		<!-- SPS (CAPS) release 3625 -->
-<!--        <description>Tiger Road</description>
+<!--
+	<software name="tigeroad">
+-->
+<!-- SPS (CAPS) release 3625 -->
+<!--
+        <description>Tiger Road</description>
         <year>1988</year>
         <publisher>Go!</publisher>
         <part name="flop1" interface="floppy_3">
@@ -1452,7 +1463,8 @@ license:CC0
                 <rom name="3625 - tiger road (europe).ipf" size="266892" crc="f47981e2" sha1="" offset="0" />
             </dataarea>
         </part>
-    </software>-->
+    </software>
+-->
 
 	<software name="totrecal">
 		<!-- SPS (CAPS) release 3542 -->
@@ -2686,7 +2698,7 @@ license:CC0
 		<publisher>Topo Soft</publisher>
 		<part name="flop1" interface="floppy_3">
 		<!-- Side missing from dump, using same as parent set -->
-		<feature name="part_id" value="Side A"/>
+			<feature name="part_id" value="Side A"/>
 			<dataarea name="flop" size="180224">
 				<rom name="transfer +3 (1988)(topo soft)(es)(side a).dsk" size="180224" crc="ce9356db" sha1="3c20847d71a2ff8227ba0205b5fecad8bb3597d0" offset="0" />
 			</dataarea>
diff --git a/hash/tandy2k.xml b/hash/tandy2k.xml
index b5ac17c335b..ca9817c4ac4 100644
--- a/hash/tandy2k.xml
+++ b/hash/tandy2k.xml
@@ -17,8 +17,8 @@ license:CC0
 		<description>Lotus 1-2-3</description>
 		<year>1983</year>
 		<publisher>Lotus</publisher>
-
-<!--        <part name="flop1" interface="floppy_5_25">
+<!--
+        <part name="flop1" interface="floppy_5_25">
             <dataarea name="flop" size="331572">
                 <rom name="123-sys.td0" size="331572" crc="a7cacc1e" sha1="8720bb7614821403c269012adea81f6cb6d84f7d" offset="0"/>
             </dataarea>
@@ -28,7 +28,8 @@ license:CC0
             <dataarea name="flop" size="533442">
                 <rom name="123_sys.td0" size="533442" crc="cc6845f9" sha1="a819783b18c35f7ad2531c108acfa0acdf3225bf" offset="0"/>
             </dataarea>
-        </part> -->
+        </part>
+-->
 		<!-- repaired copy protected by hand -->
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="2002793">
diff --git a/hash/tvgogo.xml b/hash/tvgogo.xml
index 45322ab87c4..a1e14ae3c0d 100644
--- a/hash/tvgogo.xml
+++ b/hash/tvgogo.xml
@@ -39,7 +39,7 @@ _(EU)__|__(US)__|____________|_____________________________________
 		</part>
 	</software>
 
-  <software name="4in1u" cloneof="4in1" supported="no">
+	<software name="4in1u" cloneof="4in1" supported="no">
 		<description>4-in-1 (Flashcard Fishing, Break a Brick, Balloon Juggling, Penguin Maze) (US)</description>
 		<year>2005</year>
 		<publisher>Toyquest</publisher>
@@ -48,9 +48,9 @@ _(EU)__|__(US)__|____________|_____________________________________
 				<rom name="tvgogo4in1_m5m29gb320_001c0021.bin" size="0x400000" crc="2bbcbeff" sha1="1e58c05c1efa344622962476d465c1540d964d14"/>
 			</dataarea>
 		</part>
-  </software>
+	</software>
 
-  <software name="basebalu" supported="no">
+	<software name="basebalu" supported="no">
 		<description>Baseball (US)</description>
 		<year>2005</year>
 		<publisher>Toyquest</publisher>
@@ -61,7 +61,7 @@ _(EU)__|__(US)__|____________|_____________________________________
 		</part>
 	</software>
 
-  <software name="tennis" supported="no">
+	<software name="tennis" supported="no">
 		<description>Tennis (EU)</description>
 		<year>2005</year>
 		<publisher>Toyquest</publisher>
@@ -94,7 +94,7 @@ _(EU)__|__(US)__|____________|_____________________________________
 		</part>
 	</software>
 
-  <software name="dodgebalu" supported="no">
+	<software name="dodgebalu" supported="no">
 		<description>Dodgeball (US)</description>
 		<year>2005</year>
 		<publisher>Toyquest</publisher>
@@ -103,6 +103,6 @@ _(EU)__|__(US)__|____________|_____________________________________
 				<rom name="tvgogododgeball_m5m29gt320_001c0020.bin" size="0x400000" crc="785f4305" sha1="0c96d6330acd2771adb4dbdcb6b9ccaa73ffc513"/>
 			</dataarea>
 		</part>
-  </software>
+	</software>
 
 </softwarelist>
diff --git a/hash/vgmplay.xml b/hash/vgmplay.xml
index 758aa43be0b..7575abbe80f 100644
--- a/hash/vgmplay.xml
+++ b/hash/vgmplay.xml
@@ -314209,7 +314209,7 @@ license:CC0
 	<!-- Project 2612 VGM Archives located at http://project2612.org/list.php
      Update May 2, 2020 - 5 new entries -->
 
- 	<software name="joemont2_md">
+	 <software name="joemont2_md">
 		<description>Joe Montana II - Sports Talk Football (GEN/MD)</description>
 		<year>1991</year>
 		<publisher>Sega</publisher>