diff --git a/wadsrc/static/mapinfo/urbanbrawl.txt b/wadsrc/static/filter/urbanbrawl/mapinfo.txt
similarity index 75%
rename from wadsrc/static/mapinfo/urbanbrawl.txt
rename to wadsrc/static/filter/urbanbrawl/mapinfo.txt
index 07ddd02da..9baad35f4 100644
--- a/wadsrc/static/mapinfo/urbanbrawl.txt
+++ b/wadsrc/static/filter/urbanbrawl/mapinfo.txt
@@ -1,4 +1,4 @@
-include "mapinfo/doom2.txt"
+
 
 gameinfo
 {
diff --git a/wadsrc/static/mapinfo/harmony.txt b/wadsrc/static/mapinfo/harmony.txt
deleted file mode 100644
index 117d5d175..000000000
--- a/wadsrc/static/mapinfo/harmony.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-include "mapinfo/doom2.txt"
-
-gameinfo
-{
-	cursorpic = "cursor"
-	statusbarclass = "HarmonyStatusBar"
-	forcenogfxsubstitution = true
-}
-
diff --git a/wadsrc/static/mapinfo/chex3.txt b/wadsrc_extra/static/filter/chex.chex3/mapinfo.txt
similarity index 83%
rename from wadsrc/static/mapinfo/chex3.txt
rename to wadsrc_extra/static/filter/chex.chex3/mapinfo.txt
index e2d6fcccb..724c898ac 100644
--- a/wadsrc/static/mapinfo/chex3.txt
+++ b/wadsrc_extra/static/filter/chex.chex3/mapinfo.txt
@@ -1,5 +1,3 @@
-include "mapinfo/chex.txt"
-
 // Chex Quest 3 gameinfo
 
 gameinfo
diff --git a/wadsrc_extra/static/filter/hacx.hacx1/after_iwad/zmapinfo.txt b/wadsrc_extra/static/filter/hacx.hacx1/after_iwad/zmapinfo.txt
index 20c8a4f2a..ebd1450a0 100644
--- a/wadsrc_extra/static/filter/hacx.hacx1/after_iwad/zmapinfo.txt
+++ b/wadsrc_extra/static/filter/hacx.hacx1/after_iwad/zmapinfo.txt
@@ -7,6 +7,7 @@ defaultmap
 
 gameinfo
 {
+	cursorpic = "cursor"
 	forcenogfxsubstitution = false
 	statscreen_finishedfont = "*BigFont"
 	statscreen_enteringfont = "*BigFont"
diff --git a/wadsrc_extra/static/filter/harmony/mapinfo.txt b/wadsrc_extra/static/filter/harmony/mapinfo.txt
index 57a667ada..84b81c1bf 100644
--- a/wadsrc_extra/static/filter/harmony/mapinfo.txt
+++ b/wadsrc_extra/static/filter/harmony/mapinfo.txt
@@ -1,6 +1,7 @@
 
 gameinfo
 {
+	cursorpic = "cursor"
 	forcenogfxsubstitution = false
 	statscreen_finishedfont = "*SmallFont"
 	statscreen_enteringfont = "*SmallFont"
diff --git a/wadsrc/static/mapinfo/hereticsw.txt b/wadsrc_extra/static/filter/hereticshareware/mapinfo.txt
similarity index 77%
rename from wadsrc/static/mapinfo/hereticsw.txt
rename to wadsrc_extra/static/filter/hereticshareware/mapinfo.txt
index c1a76752f..2f013637a 100644
--- a/wadsrc/static/mapinfo/hereticsw.txt
+++ b/wadsrc_extra/static/filter/hereticshareware/mapinfo.txt
@@ -1,5 +1,3 @@
-include "mapinfo/heretic.txt"
-
 gameinfo
 {
 	finalepage = "ORDER"
diff --git a/wadsrc/static/mapinfo/hacx.txt b/wadsrc_extra/static/hacx.hacx2/mapinfo.txt
similarity index 100%
rename from wadsrc/static/mapinfo/hacx.txt
rename to wadsrc_extra/static/hacx.hacx2/mapinfo.txt
diff --git a/wadsrc_extra/static/iwadinfo.txt b/wadsrc_extra/static/iwadinfo.txt
index 8ba0141fc..279c5842f 100644
--- a/wadsrc_extra/static/iwadinfo.txt
+++ b/wadsrc_extra/static/iwadinfo.txt
@@ -55,7 +55,7 @@ IWad
 	Game = "Doom"
 	Config = "Harmony"
 	IWADName = "harm1.wad"
-	Mapinfo = "mapinfo/harmony.txt"
+	Mapinfo = "mapinfo/doom2.txt"
 	MustContain = "MAP01", "0HAWK01", "0CARA3", "0NOSE1"
 	BannerColors = "6e b4 d6", "45 4f 7e"
 	DeleteLumps = "DEHACKED", "MAPINFO", "LANGUAGE", "DECALDEF", "DBIGFONT"	// these get into the way of a clean setup.
@@ -69,7 +69,7 @@ IWad
 	Config = "Hacx"
 	Autoname = "hacx.hacx2"
 	IWADName = "hacx2.wad"
-	Mapinfo = "mapinfo/hacx.txt"
+	Mapinfo = "mapinfo/doom2.txt"
 	MustContain = "MAP01", "HACX-E"
 	BannerColors = "ff ff ff", "00 88 22"
 }
@@ -81,7 +81,7 @@ IWad
 	Config = "Hacx"
 	Autoname = "hacx.hacx1"
 	IWADName = "hacx.wad"
-	Mapinfo = "mapinfo/hacx.txt"
+	Mapinfo = "mapinfo/doom2.txt"
 	MustContain = "MAP01", "HACX-R"
 	BannerColors = "00 00 a8", "a8 a8 a8"
 	DeleteLumps = "FONTDEFS"
@@ -95,7 +95,7 @@ IWad
 	Game = "Doom"
 	Config = "UrbanBrawl"
 	IWADName = "action2.wad"
-	Mapinfo = "mapinfo/urbanbrawl.txt"
+	Mapinfo = "mapinfo/doom2.txt"
 	MustContain = "MAP01", "AD2LIB"
 	BannerColors = "a8 a8 00", "a8 00 00"
 }
@@ -191,7 +191,7 @@ IWad
 	BannerColors = "f0 f0 f0", "6b 3c 18"
 	DeleteLumps = "FONTB01", "FONTB02", "FONTB03", "FONTB04", "FONTB06", "FONTB08", "FONTB09", "FONTB10", "FONTB11", "FONTB27", "FONTB28", "FONTB29", "FONTB30"
 }
-	
+
 IWad
 {
 	Name = "Hexen: Deathkings of the Dark Citadel"
@@ -216,7 +216,7 @@ IWad
 	BannerColors = "f0 f0 f0", "6b 3c 18"
 	DeleteLumps = "FONTB01", "FONTB02", "FONTB03", "FONTB04", "FONTB06", "FONTB08", "FONTB09", "FONTB10", "FONTB11", "FONTB27", "FONTB28", "FONTB29", "FONTB30"
 }
-	
+
 IWad
 {
 	Name = "Blasphemer"
@@ -258,10 +258,11 @@ IWad
 
 IWad
 {
+	Autoname = "hereticshareware"
 	Name = "Heretic Shareware"
 	Game = "Heretic"
 	Config = "Heretic"
-	Mapinfo = "mapinfo/hereticsw.txt"
+	Mapinfo = "mapinfo/heretic.txt"
 	Compatibility = "Shareware"
 	MustContain = "E1M1", "TITLE", "MUS_E1M1"
 	BannerColors = "fc fc 00", "a8 00 00"
@@ -303,7 +304,7 @@ IWad
 	MustContain = "E1M1", "E2M1", "E3M1", "FREEDOOM"
 	BannerColors = "32 54 43", "c6 dc d1"
 }
-	
+
 IWad
 {
 	Name = "Freedoom: Demo Version"
@@ -314,7 +315,7 @@ IWad
 	MustContain = "E1M1", "FREEDOOM"
 	BannerColors = "32 54 43", "c6 dc d1"
 }
-	
+
 IWad
 {
 	Name = "DOOM: BFG Edition"
@@ -446,10 +447,10 @@ IWad
 	BannerColors = "a8 00 00", "a8 a8 a8"
 	IgnoreTitlePatches = 1
 }
-	
+
 
 Names
-{	
+{
 	"doom_complete.pk3"
 	"doom2.wad"
 	"plutonia.wad"