diff --git a/extras/conf/Includes/Game_SRB222.cfg b/extras/conf/Includes/Game_SRB222.cfg
index e68ac9b5b..7132548e0 100644
--- a/extras/conf/Includes/Game_SRB222.cfg
+++ b/extras/conf/Includes/Game_SRB222.cfg
@@ -3,9 +3,6 @@ defaultlumpname = "MAP01";
 //GZDB specific. Don't try to load lumps that don't exist.
 basegame = 0;
 
-// Decorate actors to include depending on actor game property
-decorategames = 0;
-
 //Sky textures for vanilla maps
 defaultskytextures
 {
diff --git a/extras/conf/Includes/SRB222_misc.cfg b/extras/conf/Includes/SRB222_misc.cfg
index e8d22ade8..4942a0879 100644
--- a/extras/conf/Includes/SRB222_misc.cfg
+++ b/extras/conf/Includes/SRB222_misc.cfg
@@ -383,18 +383,18 @@ doommaplumpnames
 
 udmfmaplumpnames
 {
-	BEHAVIOR
+	~MAP
 	{
-		required = false;
-		nodebuild = false;
+		required = true;
 		blindcopy = true;
+		nodebuild = false;
 	}
 	
-	DIALOGUE
+	TEXTMAP
 	{
-		required = false;
-		nodebuild = false;
-		script = "ZDoom_USDF.cfg";
+		required = true;
+		nodebuild = true;
+		allowempty = true;
 	}
 	
 	ZNODES
@@ -404,6 +404,13 @@ udmfmaplumpnames
 		allowempty = false;
 	}
 	
+	REJECT
+	{
+		required = false;
+		nodebuild = true;
+		allowempty = false;
+	}
+
 	BLOCKMAP
 	{
 		required = false;
@@ -411,18 +418,118 @@ udmfmaplumpnames
 		allowempty = true;
 	}
 	
-	REJECT
+	ENDMAP
 	{
-		required = false;
-		nodebuild = true;
+		required = true;
+		nodebuild = false;
 		allowempty = true;
 	}
-	
-	SCRIPTS
+}
+
+// ENUMERATIONS
+// These are enumerated lists for linedef types and UDMF fields.
+// Reserved names are: angledeg, anglerad, color, texture, flat
+enums
+{
+	falsetrue
 	{
-		required = false;
-		nodebuild = false;
-		scriptbuild = true;
+		0 = "False";
+		1 = "True";
+	}
+	
+	yesno
+	{
+		0 = "Yes";
+		1 = "No";
+	}
+	
+	noyes
+	{
+		0 = "No";
+		1 = "Yes";
+	}
+	
+	onoff
+	{
+		0 = "On";
+		1 = "Off";
+	}
+	
+	offon
+	{
+		0 = "Off";
+		1 = "On";
+	}
+	
+	updown
+	{
+		0 = "Up";
+		1 = "Down";
+	}
+	
+	downup
+	{
+		0 = "Down";
+		1 = "Up";
+	}
+	
+	addset
+	{
+		0 = "Add";
+		1 = "Set";
+	}
+	
+	floorceiling
+	{
+		0 = "Floor";
+		1 = "Ceiling";
+		2 = "Floor and ceiling";
+	}
+	
+	triggertype
+	{
+		0 = "Continuous";
+		1 = "Each Time (Enter)";
+		2 = "Each Time (Enter and leave)";
+		3 = "Once";
+	}
+	
+	frontback
+	{
+		0 = "None";
+		1 = "Front";
+		2 = "Back";
+	}
+	
+	ctfteam
+	{
+		0 = "None";
+		1 = "Red";
+		2 = "Blue";
+	}
+	
+	triggerobjects
+	{
+		0 = "Any player";
+		1 = "All players";
+		2 = "Pushable object";
+		3 = "Any object with thinker";
+	}
+	
+	triggersurfaces
+	{
+		0 = "Floor touch";
+		1 = "Ceiling touch";
+		2 = "Floor or ceiling touch";
+		3 = "Anywhere in sector";
+	}
+	
+	tangibility
+	{
+		1 = "Intangible from top";
+		2 = "Intangible from bottom";
+		4 = "Don't block players";
+		8 = "Don't block non-players";
 	}
 }
 
diff --git a/extras/conf/SRB2_22UDMF.cfg b/extras/conf/SRB2_22UDMF.cfg
index a8425d95a..7ef25fbe3 100644
--- a/extras/conf/SRB2_22UDMF.cfg
+++ b/extras/conf/SRB2_22UDMF.cfg
@@ -25,14 +25,23 @@ scriptlumpnames
 	include("Includes\\SRB222_misc.cfg", "scriptlumpnames");
 }
 
+//Default things filters
+thingsfilters
+{
+	include("Includes\\SRB222_misc.cfg", "thingsfilters_udmf");
+}
+
 // THING TYPES
 thingtypes
 {
 	include("Includes\\SRB222_things.cfg");
 }
 
-//Default things filters
-thingsfilters
+// ENUMERATIONS
+// Each engine has its own additional thing types
+// These are enumerated lists for linedef types and UDMF fields.
+enums
 {
-	include("Includes\\SRB222_misc.cfg", "thingsfilters_udmf");
-}
\ No newline at end of file
+	// Basic game enums
+	include("Includes\\SRB222_misc.cfg", "enums");
+}