diff --git a/DATabase/Mappings/NonGood.xml b/DATabase/Mappings/NonGood.xml
index 2decbc61..c5e3312b 100644
--- a/DATabase/Mappings/NonGood.xml
+++ b/DATabase/Mappings/NonGood.xml
@@ -9,14 +9,8 @@
 	<mapping from="NonGoodCPC" to="Amstrad - CPC" />
 	<mapping from="NonGoodGBAv4" to="Nintendo - Game Boy Advance" />
 	<!-- <mapping from="NonGoodGBX" to="Nintendo - Game Boy Color" /> -->
-	<mapping from="NonGoodGB" to="Nintendo - Game Boy" />
-  <mapping from="NonGoodgb" to="Nintendo - Game Boy" />
-	<mapping from="NonGoodGBC" to="Nintendo - Game Boy Color" />
-  <mapping from="NonGoodgbc" to="Nintendo - Game Boy Color" />
-	<mapping from="NonGoodGBX.gb" to="Nintendo - Game Boy" />
-  <mapping from="NonGoodGBX.GB" to="Nintendo - Game Boy" />
-	<mapping from="NonGoodGBX.gbc" to="Nintendo - Game Boy Color" />
-  <mapping from="NonGoodGBX.GBC" to="Nintendo - Game Boy Color" />
+	<mapping from="NonGoodGBX.GB" to="Nintendo - Game Boy" />
+	<mapping from="NonGoodGBX.GBC" to="Nintendo - Game Boy Color" />
 	<mapping from="NonGoodGCom" to="Tiger Electronics - Game.com" />
 	<mapping from="NonGoodGen" to="Sega - Mega Drive, Genesis" />
 	<mapping from="NonGoodGG" to="Sega - Game Gear" />
@@ -32,18 +26,8 @@
 	<mapping from="NonGoodNES" to="Nintendo - Nintendo Entertainment System" />
 	<mapping from="NonGoodNES CHINESE" to="Nintendo - Nintendo Entertainment System" />   
 	<!-- <mapping from="NonGoodNGPX" to="SNK - Neo Geo Pocket Color" /> -->
-	<mapping from="NonGoodNGP" to="SNK - Neo Geo Pocket" />
-  <mapping from="NonGoodngp" to="SNK - Neo Geo Pocket" />
-	<mapping from="NonGoodNGPC" to="SNK - Neo Geo Pocket Color" />
-  <mapping from="NonGoodngpc" to="SNK - Neo Geo Pocket Color" />
-  <mapping from="NonGoodNGC" to="SNK - Neo Geo Pocket Color" />
-  <mapping from="NonGoodngc" to="SNK - Neo Geo Pocket Color" />
-  <mapping from="NonGoodNGPX.NGP" to="SNK - Neo Geo Pocket" />
-  <mapping from="NonGoodNGPX.ngp" to="SNK - Neo Geo Pocket" />
-  <mapping from="NonGoodNGPX.NGC" to="SNK - Neo Geo Pocket Color" />
-	<mapping from="NonGoodNGPX.ngc" to="SNK - Neo Geo Pocket Color" />
-  <mapping from="NonGoodNGPX.NGPC" to="SNK - Neo Geo Pocket Color" />
-  <mapping from="NonGoodNGPX.ngpc" to="SNK - Neo Geo Pocket Color" />
+	<mapping from="NonGoodNGPX.NGP" to="SNK - Neo Geo Pocket" />
+	<mapping from="NonGoodNGPX.NGC" to="SNK - Neo Geo Pocket Color" />
 	<mapping from="NonGoodOric" to="Tangerine - Oric-1, Oric Atmos" />
 	<mapping from="NonGoodPCE" to="NEC - PC Engine, TurboGrafx 16" />
 	<mapping from="NonGoodPico" to="Sega - PICO" />
@@ -54,12 +38,6 @@
 	<mapping from="NonGoodVect" to="GCE - Vectrex" />
 	<mapping from="NonGoodVPac" to="Philips - Videopac+, Odyssey2" />
 	<!-- <mapping from="NonGoodWSX" to="Bandai - WonderSwan Color" /> -->
-	<mapping from="NonGoodWS" to="Bandai - WonderSwan" />
-  <mapping from="NonGoodws" to="Bandai - WonderSwan" />
-	<mapping from="NonGoodWSC" to="Bandai - WonderSwan Color" />
-  <mapping from="NonGoodwsc" to="Bandai - WonderSwan Color" />
-	<mapping from="NonGoodWSX.ws" to="Bandai - WonderSwan" />
-  <mapping from="NonGoodWSX.WS" to="Bandai - WonderSwan" />
-	<mapping from="NonGoodWSX.wsc" to="Bandai - WonderSwan Color" />
-  <mapping from="NonGoodWSX.WSC" to="Bandai - WonderSwan Color" />
+	<mapping from="NonGoodWSX.WS" to="Bandai - WonderSwan" />
+	<mapping from="NonGoodWSX.WSC" to="Bandai - WonderSwan Color" />
 </mappings>
\ No newline at end of file
diff --git a/DatSplit/DatSplit.cs b/DatSplit/DatSplit.cs
index 4fe315d7..26a2b434 100644
--- a/DatSplit/DatSplit.cs
+++ b/DatSplit/DatSplit.cs
@@ -26,8 +26,8 @@ namespace DatSplit
 
 			// Set needed strings
 			_filename = args[0];
-			_extA = (args[1].StartsWith(".") ? args[1] : "." + args[1]);
-			_extB = (args[2].StartsWith(".") ? args[2] : "." + args[2]);
+			_extA = (args[1].StartsWith(".") ? args[1] : "." + args[1]).ToUpperInvariant(); ;
+			_extB = (args[2].StartsWith(".") ? args[2] : "." + args[2]).ToUpperInvariant();
 
 			// Take the filename, and load it as an XML document
 			XmlDocument doc = new XmlDocument();
@@ -96,7 +96,7 @@ namespace DatSplit
 									size = Int64.Parse(child.Attributes["size"].Value);
 								}
 
-								if (child.Attributes["name"].Value.EndsWith(_extA))
+								if (child.Attributes["name"].Value.ToUpperInvariant().EndsWith(_extA))
 								{
 									if (!inA)
 									{
@@ -108,7 +108,7 @@ namespace DatSplit
 									}
 									outA.AppendChild(outDocA.ImportNode(child, true));
 								}
-								else if (child.Attributes["name"].Value.EndsWith(_extB))
+								else if (child.Attributes["name"].Value.ToUpperInvariant().EndsWith(_extB))
 								{
 									if (!inB)
 									{