diff --git a/hash/c2color_cart.xml b/hash/c2color_cart.xml
index d0438226824..cc448cb7b04 100644
--- a/hash/c2color_cart.xml
+++ b/hash/c2color_cart.xml
@@ -3,21 +3,21 @@
 <softwarelist name="c2color_cart" description="C2 Color cartridges">
 
 	<!--
-	Chinese name		English Translation							Released?	Dumped?	Year Released	Cartridge #		Publisher			Notes														Note 2:
-	带龙王封印			The Agreement with the Dragon King			Y			N		2015			1				Baiyi Animation		Not a separate game, an extension for the built in game	
-	之翼王的试炼			The Trials of King Wing						Y			N		2015			2				Baiyi Animation		Not a separate game, an extension for the built in game	
-	之英雄岛之烈焰魔		The Fire Devil of Hero Island				Y			N		2015			3				Baiyi Animation		Not a separate game, an extension for the built in game	
-	暗黑势力再临			The Dark Ones Come Again					Y			Y		2015			4				Baiyi Animation		Not a separate game, an extension for the built in game	
-	神秘的龙族之王		The Mysterious King of the Dragon Land		Y			Y		2015			5				Baiyi Animation		Not a separate game, an extension for the built in game	
-	植物大战僵尸2			Plants vs. Zombies 2						N			N		N/A				6				PopCap Games		Supposed to be the only standalone game for the C2			Supposed to be released Q1 2016, but never was
-	?					Locke Kingdom search						N			N		N/A				7				Baiyi Animation		Not a separate game, an extension for the built in game		Mentioned as coming soon in a promotional booklet
+	Chinese name        Pinyin                            English Translation                         Released?   Dumped? Year Released   Cartridge #     Publisher           Notes                                                       Note 2:
+	带龙王封印          Dài Lóngwáng Fēngyìn              The Agreement with the Dragon King          Y           N       2015            1               Baiyi Animation     Not a separate game, an extension for the built in game
+	之翼王的试炼        Zhī Yìwáng De Shì Liàn            The Trials of King Wing                     Y           N       2015            2               Baiyi Animation     Not a separate game, an extension for the built in game
+	之英雄岛之烈焰魔    Zhī Yīngxióng Dǎo Zhī Lièyàn Mó   The Fire Devil of Hero Island               Y           N       2015            3               Baiyi Animation     Not a separate game, an extension for the built in game
+	暗黑势力再临        Ànhēi Shìlì Zài Lín               The Dark Ones Come Again                    Y           Y       2015            4               Baiyi Animation     Not a separate game, an extension for the built in game
+	神秘的龙族之王      Shénmì De Lóngzú Zhī Wáng         The Mysterious King of the Dragon Land      Y           Y       2015            5               Baiyi Animation     Not a separate game, an extension for the built in game
+	植物大战僵尸２      Zhíwù Dàzhàn Jiāngshī 2           Plants vs. Zombies 2                        N           N       N/A             6               PopCap Games        Supposed to be the only standalone game for the C2          Supposed to be released Q1 2016, but never was
+	?                   ?                                 Locke Kingdom search                        N           N       N/A             7               Baiyi Animation     Not a separate game, an extension for the built in game     Mentioned as coming soon in a promotional booklet
 	-->
 
 	<software name="darkones" supported="no">
-		<description>The Dark Ones Come Again</description> <!-- TODO, romanized title instead? -->
+		<description>Dì 4 dàn: Ànhēi Shìlì Zài Lín</description>
 		<year>2015</year>
 		<publisher>Baiyi Animation</publisher>
-		<info name="alt_title" value="第4弹-暗黑势力再临"/>
+		<info name="alt_title" value="第４弹：暗黑势力再临"/>
 		<part name="cart" interface="c2color_cart">
 			<dataarea name="rom" size="0x800000">
 				<rom name="darkones.bin" size="0x800000" crc="d2735c91" sha1="f71c1cd300893a22e52d046bc9c489e0236c6b88" offset="0" />
@@ -26,17 +26,17 @@
 	</software>
 
 	<software name="kingdlnd" supported="no">
-		<description>The Mysterious King of the Dragon Land</description> <!-- TODO, romanized title instead? -->
+		<description>Dì 5 dàn: Shénmì De Lóngzú Zhī Wáng</description>
 		<year>2015</year>
 		<publisher>Baiyi Animation</publisher>
-		<info name="alt_title" value="第5弹-神秘的龙族之王"/>
+		<info name="alt_title" value="第５弹：神秘的龙族之王"/>
 		<part name="cart" interface="c2color_cart">
 			<dataarea name="rom" size="0x800000">
 				<rom name="kingdlnd.bin" size="0x800000" crc="1e20d906" sha1="323df1ce05ff4fc1aaefe3e0e2b929aec40cc230" offset="0" />
 			</dataarea>
 		</part>
 	</software>
- 
+
 </softwarelist>
 
 
diff --git a/hash/ibm5170.xml b/hash/ibm5170.xml
index 05cf9fb70cd..3f6a9622db0 100644
--- a/hash/ibm5170.xml
+++ b/hash/ibm5170.xml
@@ -12289,7 +12289,7 @@
 	<!-- 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>
@@ -12461,7 +12461,7 @@
 
 	<!-- 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>
@@ -12476,7 +12476,7 @@
 	</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>
@@ -12503,13 +12503,13 @@
 	</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>
@@ -12548,7 +12548,7 @@
 	</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>
@@ -12563,13 +12563,13 @@
 	</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>
@@ -12584,7 +12584,7 @@
 	</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>
@@ -12623,22 +12623,22 @@
 	</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/msx1_cart.xml b/hash/msx1_cart.xml
index 5447ef3800e..1fdb0f9707f 100644
--- a/hash/msx1_cart.xml
+++ b/hash/msx1_cart.xml
@@ -10324,7 +10324,7 @@ kept for now until finding out what those bytes affect...
 			<feature name="slot" value="konami_scc" />
 			<feature name="mapper" value="KONAMI-SCC" />
 			<dataarea name="rom" size="32768">
-<!-- Original Dump from an 39SF010 flashrom - 128kb Image.  32KB Rom file cropped out of image after discarding unused area (FF)
+				<!-- Original Dump from an 39SF010 flashrom - 128kb Image.  32KB Rom file cropped out of image after discarding unused area (FF)
 				<rom name="roc'n rope.bin" size="131072" crc="a71c2009" sha1="4429fe7090953dd509feccafd87ea4e8deb6360f" offset="0" />  -->
 				<rom name="roc'n rope.rom" size="32768" crc="c0c32c3e" sha1="74b2dbb51437b531ca78c314d666aabe0fd2e177" offset="0" />
 			</dataarea>
diff --git a/hash/pc8801_flop.xml b/hash/pc8801_flop.xml
index e434b531a18..11e211a94e8 100644
--- a/hash/pc8801_flop.xml
+++ b/hash/pc8801_flop.xml
@@ -54111,7 +54111,7 @@ ExtractDisk  [11]"Super-88_Disk#11" -> "pc88 oldgame collection (super-88 disks
 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" offset="0" /-->
+                <rom name="88 oldgame collection(super 88 1-6).d88" size="1832540" crc="51e02647" sha1="1a872df51ccba34f193ce88c154e3ada79f888a9" offset="0" /-->
 	<software name="pc88oldg">
 		<description>PC88 Oldgame Collection (Super-88 Disks 1-12)</description>
 		<year>19??</year>
diff --git a/hash/tandy2k.xml b/hash/tandy2k.xml
index 08980bf1795..902ff8966ea 100644
--- a/hash/tandy2k.xml
+++ b/hash/tandy2k.xml
@@ -25,7 +25,7 @@
             <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="331572">
diff --git a/hash/vsmile_cart.xml b/hash/vsmile_cart.xml
index 63c018604a3..23b84da90bd 100644
--- a/hash/vsmile_cart.xml
+++ b/hash/vsmile_cart.xml
@@ -2142,7 +2142,7 @@ Game cartridges
 			</dataarea>
 		</part>
 	</software>
-	
+
 	<software name="poohg" cloneof="pooh" supported="yes">
 		<description>Disneys Winnie Puuh - Die Honigjagd (Ger)</description>
 		<year>2004?</year>
diff --git a/hash/vsmilem_cart.xml b/hash/vsmilem_cart.xml
index 07bd9990595..33f6f4ad365 100644
--- a/hash/vsmilem_cart.xml
+++ b/hash/vsmilem_cart.xml
@@ -413,7 +413,7 @@ Smartbooks currently have no dumps available, hence they are temporarily listed
 		<part name="cart" interface="vsmile_cart">
 			<feature name="pcb" value="84500 E" />
 			<feature name="u1" value="" /> <!-- EPOXY BLOB ROM --> <!-- 2 globs, uses /CS2 for 2nd glob -->
-			<feature name="u2" value="" /> <!-- EPOXY BLOB ROM --> 
+			<feature name="u2" value="" /> <!-- EPOXY BLOB ROM -->
 			<dataarea name="rom" size="0x1000000">
 				<rom name="vsmile84500.blob1.bin" size="0x0800000" crc="175117f1" sha1="48231caf853e27856eb033d14937b7eb7e74198c" offset="0x0000000" />
 				<rom name="vsmile84500.blob2.bin" size="0x0800000" crc="5dc681ea" sha1="1a3a2ff08bd52ad74183b09059082b492000e571" offset="0x0800000" />
@@ -429,7 +429,7 @@ Smartbooks currently have no dumps available, hence they are temporarily listed
 		<part name="cart" interface="vsmile_cart">
 			<feature name="pcb" value="710654-1" />
 			<feature name="u1" value="" /> <!-- EPOXY BLOB ROM --> <!-- 2 globs, uses /CS2 for 2nd glob -->
-			<feature name="u2" value="" /> <!-- EPOXY BLOB ROM --> 
+			<feature name="u2" value="" /> <!-- EPOXY BLOB ROM -->
 			<dataarea name="rom" size="0x1000000">
 				<rom name="vsmile84504.blob1.bin" size="0x0800000" crc="3f1c79e2" sha1="1b12b9b379dd942356e6ee6594c8b80dbb9db781" offset="0x0000000" />
 				<rom name="vsmile84504.blob2.bin" size="0x0800000" crc="78cf731b" sha1="9b1d1eed7bd216f4feca3160c31912b7c81e4efd" offset="0x0800000" />
@@ -502,7 +502,7 @@ Smartbooks currently have no dumps available, hence they are temporarily listed
 		<part name="cart" interface="vsmile_cart">
 			<feature name="pcb" value="710654-2" />
 			<feature name="u1" value="" /> <!-- EPOXY BLOB ROM --> <!-- 2 globs, uses /CS2 for 2nd glob -->
-			<feature name="u2" value="" /> <!-- EPOXY BLOB ROM --> 
+			<feature name="u2" value="" /> <!-- EPOXY BLOB ROM -->
 			<dataarea name="rom" size="0x1000000">
 				<rom name="vsmile84424.blob1.bin" size="0x0800000" crc="845bbb46" sha1="1b11bb1a119715073560b40d65b77894043dd67a" offset="0x0000000" />
 				<rom name="vsmile84424.blob2.bin" size="0x0800000" crc="c006e9b6" sha1="2f4b32ba578117caa53bb0bf9db717d8d9dd8a13" offset="0x0800000" />