diff --git a/extras/conf/udb/Includes/SRB222_common.cfg b/extras/conf/udb/Includes/SRB222_common.cfg
index 0ff044a6d382cc102c5b5dd98681e04ff3c81b31..9a574d6f2314f5dd9e7d3fd718f7a973ffe7bfee 100644
--- a/extras/conf/udb/Includes/SRB222_common.cfg
+++ b/extras/conf/udb/Includes/SRB222_common.cfg
@@ -15,7 +15,7 @@ common
 	ignoredextensions = "wad pk3 pk7 bak backup1 backup2 backup3 zip rar 7z";
 
 	// Default testing parameters
-	testparameters = "-file \"%AP\" \"%F\" -warp %L";
+	testparameters = "-folder \"%AF\" -file \"%AA\" \"%F\" -warp %L";
 	testshortpaths = true;
 
 	// Action special help
@@ -26,7 +26,7 @@ common
 	generalizedsectors = true;
 
 	// Maximum safe map size check (0 means skip check)
-	safeboundary = 1;
+	safeboundary = 0;
 
 	// Map boundaries. Map objects can only be placed within these boundaries
 	leftboundary = -32768;
@@ -40,6 +40,8 @@ common
 	defaultflatscale = 1.0f;
 	scaledtextureoffsets = true;
 
+	maxcolormapalpha = 25;
+
 	// Thing number for start position in 3D Mode
 	start3dmode = 3328;
 
@@ -68,137 +70,6 @@ common
 	}
 }
 
-mapformat_doom
-{
-	// The format interface handles the map data format
-	formatinterface = "DoomMapSetIO";
-
-	// Default nodebuilder configurations
-	defaultsavecompiler = "zennode_normal";
-	defaulttestcompiler = "zennode_fast";
-
-	/*
-	GAME DETECT PATTERN
-	Used to guess the game for which a WAD file is made.
-
-	1 = One of these lumps must exist
-	2 = None of these lumps must exist
-	3 = All of these lumps must exist
-	*/
-
-	gamedetect
-	{
-		EXTENDED = 2;
-
-
-		BEHAVIOR = 2;
-
-		E#M# = 2;
-
-		MAP?? = 1;
-	}
-
-	/*
-	MAP LUMP NAMES
-	Map lumps are loaded with the map as long as they are right after each other. When the editor
-	meets a lump which is not defined in this list it will ignore the map if not satisfied.
-	The order of items defines the order in which lumps will be written to WAD file on save.
-	To indicate the map header lump, use ~MAP
-
-	Legenda:
-	required = Lump is required to exist.
-	blindcopy = Lump will be copied along with the map blindly. (usefull for lumps Doom Builder doesn't use)
-	nodebuild = The nodebuilder generates this lump.
-	allowempty = The nodebuilder is allowed to leave this lump empty.
-	script = This lump is a text-based script. Specify the filename of the script configuration to use.
-	*/
-
-	maplumpnames
-	{
-		include("SRB222_misc.cfg", "doommaplumpnames");
-	}
-
-	// When this is set to true, sectors with the same tag will light up when a line is highlighted
-	linetagindicatesectors = true;
-
-	// Special linedefs
-	include("SRB222_misc.cfg", "speciallinedefs");
-
-	// Default flags for first new thing
-	defaultthingflags
-	{
-	}
-
-	// DEFAULT SECTOR BRIGHTNESS LEVELS
-	sectorbrightness
-	{
-		include("SRB222_misc.cfg", "sectorbrightness");
-	}
-
-	// SECTOR TYPES
-	sectortypes
-	{
-		include("SRB222_sectors.cfg", "sectortypes");
-	}
-
-	// GENERALISED SECTOR TYPES
-	gen_sectortypes
-	{
-		include("SRB222_sectors.cfg", "gen_sectortypes");
-	}
-
-	// LINEDEF FLAGS
-	linedefflags
-	{
-		include("SRB222_misc.cfg", "linedefflags");
-	}
-
-	// Linedef flags UDMF translation table
-	// This is needed for copy/paste and prefabs to work properly
-	// When the UDMF field name is prefixed with ! it is inverted
-	linedefflagstranslation
-	{
-		include("SRB222_misc.cfg", "linedefflagstranslation");
-	}
-
-	// LINEDEF ACTIVATIONS
-	linedefactivations
-	{
-	}
-
-	// LINEDEF TYPES
-	linedeftypes
-	{
-		include("SRB222_linedefs.cfg", "doom");
-	}
-
-	// THING FLAGS
-	thingflags
-	{
-		include("SRB222_misc.cfg", "thingflags");
-	}
-
-	// Thing flags UDMF translation table
-	// This is needed for copy/paste and prefabs to work properly
-	// When the UDMF field name is prefixed with ! it is inverted
-	thingflagstranslation
-	{
-		include("SRB222_misc.cfg", "thingflagstranslation");
-	}
-
-	// THING FLAGS ERROR MASK
-	// Mask for the thing flags which indicates the options
-	// that make the same thing appear in the same modes
-	thingflagsmask1 = 7;	// 1 + 2 + 4
-	thingflagsmask2 = 0;
-
-	// THING TYPES
-	thingtypes
-	{
-		include("SRB222_things.cfg", "doom");
-	}
-}
-
 mapformat_udmf
 {
 	// The format interface handles the map data format
@@ -222,9 +93,17 @@ mapformat_udmf
 	{
 		include("SRB222_misc.cfg", "universalfields");
 	}
+	
+	// Disable Doom-related modes that don't make sense for SRB2
+	soundsupport = false;
+	automapsupport = false;
 
 	// When this is set to true, sectors with the same tag will light up when a line is highlighted
 	linetagindicatesectors = false;
+	localsidedeftextureoffsets = false;
+	distinctfloorandceilingbrightness = true;
+	
+	planeequationsupport = true;
 
 	// Special linedefs
 	include("SRB222_misc.cfg", "speciallinedefs_udmf");
@@ -240,6 +119,11 @@ mapformat_udmf
 		include("SRB222_misc.cfg", "sectorflags");
 	}
 
+	sectorflagscategories
+	{
+		include("SRB222_misc.cfg", "sectorflagscategories");
+	}
+
 	// DEFAULT SECTOR BRIGHTNESS LEVELS
 	sectorbrightness
 	{
@@ -247,6 +131,7 @@ mapformat_udmf
 	}
 
 	damagetypes = "Generic Water Fire Lava Electric Spike DeathPitTilt DeathPitNoTilt Instakill SpecialStage";
+	triggerertypes = "Player AllPlayers Mobj";
 
 	// LINEDEF FLAGS
 	linedefflags
@@ -282,7 +167,6 @@ mapformat_udmf
 	// How to compare thing flags (for the stuck things error checker)
 	thingflagscompare
 	{
-		include("UDMF_misc.cfg", "thingflagscompare");
 	}
 
 	// THING TYPES
diff --git a/extras/conf/udb/Includes/SRB222_linedefs.cfg b/extras/conf/udb/Includes/SRB222_linedefs.cfg
index b526e84e7bfff6eb77fa3161bbca16df18b8d393..621b4abd53c4ff087664c9b24b0b424eae5d1e8b 100644
--- a/extras/conf/udb/Includes/SRB222_linedefs.cfg
+++ b/extras/conf/udb/Includes/SRB222_linedefs.cfg
@@ -1,1793 +1,3 @@
-doom
-{
-	misc
-	{
-		title = "Miscellaneous";
-
-		0
-		{
-			title = "None";
-			prefix = "(0)";
-		}
-		1
-		{
-			title = "Per-Sector Gravity";
-			prefix = "(1)";
-		}
-		5
-		{
-			title = "Camera Scanner <deprecated>";
-			prefix = "(5)";
-		}
-		7
-		{
-			title = "Sector Flat Alignment";
-			prefix = "(7)";
-		}
-		10
-		{
-			title = "Culling Plane";
-			prefix = "(10)";
-		}
-		13
-		{
-			title = "Heat Wave Effect";
-			prefix = "(13)";
-		}
-		40
-		{
-			title = "Visual Portal Between Tagged Linedefs";
-			prefix = "(40)";
-		}
-		41
-		{
-			title = "Horizon Effect";
-			prefix = "(41)";
-		}
-		50
-		{
-			title = "Instantly Lower Floor on Level Load";
-			prefix = "(50)";
-		}
-		51
-		{
-			title = "Instantly Raise Ceiling on Level Load";
-			prefix = "(51)";
-		}
-		63
-		{
-			title = "Fake Floor/Ceiling Planes";
-			prefix = "(63)";
-		}
-		540
-		{
-			title = "Floor Friction";
-			prefix = "(540)";
-		}
-	}
-
-	parameters
-	{
-		title = "Parameters";
-
-		2
-		{
-			title = "Custom Exit";
-			prefix = "(2)";
-		}
-		3
-		{
-			title = "Zoom Tube Parameters";
-			prefix = "(3)";
-		}
-		4
-		{
-			title = "Speed Pad Parameters";
-			prefix = "(4)";
-		}
-		8
-		{
-			title = "Special Sector Properties";
-			prefix = "(8)";
-		}
-		9
-		{
-			title = "Chain Parameters";
-			prefix = "(9)";
-		}
-		11
-		{
-			title = "Rope Hang Parameters";
-			prefix = "(11)";
-		}
-		12
-		{
-			title = "Rock Spawner Parameters";
-			prefix = "(12)";
-		}
-		14
-		{
-			title = "Bustable Block Parameters";
-			prefix = "(14)";
-		}
-		15
-		{
-			title = "Fan Particle Spawner Parameters";
-			prefix = "(15)";
-		}
-		16
-		{
-			title = "Minecart Parameters";
-			prefix = "(16)";
-		}
-		64
-		{
-			title = "Continuously Appearing/Disappearing FOF";
-			prefix = "(64)";
-		}
-		76
-		{
-			title = "Make FOF Bouncy";
-			prefix = "(76)";
-		}
-	}
-
-	polyobject
-	{
-		title = "PolyObject";
-
-		20
-		{
-			title = "First Line";
-			prefix = "(20)";
-		}
-		21
-		{
-			title = "Explicitly Include Line <disabled>";
-			prefix = "(21)";
-		}
-		22
-		{
-			title = "Parameters";
-			prefix = "(22)";
-		}
-		30
-		{
-			title = "Waving Flag";
-			prefix = "(30)";
-		}
-		31
-		{
-			title = "Displacement by Front Sector";
-			prefix = "(31)";
-		}
-		32
-		{
-			title = "Angular Displacement by Front Sector";
-			prefix = "(32)";
-		}
-	}
-
-	planemove
-	{
-		title = "Plane Movement";
-
-		52
-		{
-			title = "Continuously Falling Sector";
-			prefix = "(52)";
-		}
-		53
-		{
-			title = "Continuous Floor/Ceiling Mover";
-			prefix = "(53)";
-		}
-		54
-		{
-			title = "Continuous Floor Mover";
-			prefix = "(54)";
-		}
-		55
-		{
-			title = "Continuous Ceiling Mover";
-			prefix = "(55)";
-		}
-		56
-		{
-			title = "Continuous Two-Speed Floor/Ceiling Mover";
-			prefix = "(56)";
-		}
-		57
-		{
-			title = "Continuous Two-Speed Floor Mover";
-			prefix = "(57)";
-		}
-		58
-		{
-			title = "Continuous Two-Speed Ceiling Mover";
-			prefix = "(58)";
-		}
-		59
-		{
-			title = "Activate Moving Platform";
-			prefix = "(59)";
-		}
-		60
-		{
-			title = "Activate Moving Platform (Adjustable Speed)";
-			prefix = "(60)";
-		}
-		61
-		{
-			title = "Crusher (Ceiling to Floor)";
-			prefix = "(61)";
-		}
-		62
-		{
-			title = "Crusher (Floor to Ceiling)";
-			prefix = "(62)";
-		}
-		66
-		{
-			title = "Move Floor by Displacement";
-			prefix = "(66)";
-		}
-		67
-		{
-			title = "Move Ceiling by Displacement";
-			prefix = "(67)";
-		}
-		68
-		{
-			title = "Move Floor and Ceiling by Displacement";
-			prefix = "(68)";
-		}
-	}
-
-	fofsolid
-	{
-		title = "FOF (solid)";
-
-		100
-		{
-			title = "Solid, Opaque";
-			prefix = "(100)";
-		}
-		101
-		{
-			title = "Solid, Opaque, No Shadow";
-			prefix = "(101)";
-		}
-		102
-		{
-			title = "Solid, Translucent";
-			prefix = "(102)";
-		}
-		103
-		{
-			title = "Solid, Sides Only";
-			prefix = "(103)";
-		}
-		104
-		{
-			title = "Solid, No Sides";
-			prefix = "(104)";
-		}
-		105
-		{
-			title = "Solid, Invisible";
-			prefix = "(105)";
-		}
-		140
-		{
-			title = "Intangible from Bottom, Opaque";
-			prefix = "(140)";
-		}
-		141
-		{
-			title = "Intangible from Bottom, Translucent";
-			prefix = "(141)";
-		}
-		142
-		{
-			title = "Intangible from Bottom, Translucent, No Sides";
-			prefix = "(142)";
-		}
-		143
-		{
-			title = "Intangible from Top, Opaque";
-			prefix = "(143)";
-		}
-		144
-		{
-			title = "Intangible from Top, Translucent";
-			prefix = "(144)";
-		}
-		145
-		{
-			title = "Intangible from Top, Translucent, No Sides";
-			prefix = "(145)";
-		}
-		146
-		{
-			title = "Only Tangible from Sides";
-			prefix = "(146)";
-		}
-	}
-
-	fofintangible
-	{
-		title = "FOF (intangible)";
-
-		120
-		{
-			title = "Water, Opaque";
-			prefix = "(120)";
-		}
-		121
-		{
-			title = "Water, Translucent";
-			prefix = "(121)";
-		}
-		122
-		{
-			title = "Water, Opaque, No Sides";
-			prefix = "(122)";
-		}
-		123
-		{
-			title = "Water, Translucent, No Sides";
-			prefix = "(123)";
-		}
-		124
-		{
-			title = "Goo Water, Translucent";
-			prefix = "(124)";
-		}
-		125
-		{
-			title = "Goo Water, Translucent, No Sides";
-			prefix = "(125)";
-		}
-		220
-		{
-			title = "Intangible, Opaque";
-			prefix = "(220)";
-		}
-		221
-		{
-			title = "Intangible, Translucent";
-			prefix = "(221)";
-		}
-		222
-		{
-			title = "Intangible, Sides Only";
-			prefix = "(222)";
-		}
-		223
-		{
-			title = "Intangible, Invisible";
-			prefix = "(223)";
-		}
-	}
-
-	fofmoving
-	{
-		title = "FOF (moving)";
-
-		150
-		{
-			title = "Air Bobbing";
-			prefix = "(150)";
-		}
-		151
-		{
-			title = "Air Bobbing (Adjustable)";
-			prefix = "(151)";
-		}
-		152
-		{
-			title = "Reverse Air Bobbing (Adjustable)";
-			prefix = "(152)";
-		}
-		153
-		{
-			title = "Dynamically Sinking Platform";
-			prefix = "(153)";
-		}
-		160
-		{
-			title = "Water Bobbing";
-			prefix = "(160)";
-		}
-		190
-		{
-			title = "Rising Platform, Solid, Opaque";
-			prefix = "(190)";
-		}
-		191
-		{
-			title = "Rising Platform, Solid, Opaque, No Shadow";
-			prefix = "(191)";
-		}
-		192
-		{
-			title = "Rising Platform, Solid, Translucent";
-			prefix = "(192)";
-		}
-		193
-		{
-			title = "Rising Platform, Solid, Invisible";
-			prefix = "(193)";
-		}
-		194
-		{
-			title = "Rising Platform, Intangible from Bottom, Opaque";
-			prefix = "(194)";
-		}
-		195
-		{
-			title = "Rising Platform, Intangible from Bottom, Translucent";
-			prefix = "(195)";
-		}
-	}
-
-	fofcrumbling
-	{
-		title = "FOF (crumbling)";
-
-		170
-		{
-			title = "Crumbling, Respawn";
-			prefix = "(170)";
-		}
-		171
-		{
-			title = "Crumbling, No Respawn";
-			prefix = "(171)";
-		}
-		172
-		{
-			title = "Crumbling, Respawn, Intangible from Bottom";
-			prefix = "(172)";
-		}
-		173
-		{
-			title = "Crumbling, No Respawn, Intangible from Bottom";
-			prefix = "(173)";
-		}
-		174
-		{
-			title = "Crumbling, Respawn, Int. from Bottom, Translucent";
-			prefix = "(174)";
-		}
-		175
-		{
-			title = "Crumbling, No Respawn, Int. from Bottom, Translucent";
-			prefix = "(175)";
-		}
-		176
-		{
-			title = "Crumbling, Respawn, Floating, Bobbing";
-			prefix = "(176)";
-		}
-		177
-		{
-			title = "Crumbling, No Respawn, Floating, Bobbing";
-			prefix = "(177)";
-		}
-		178
-		{
-			title = "Crumbling, Respawn, Floating";
-			prefix = "(178)";
-		}
-		179
-		{
-			title = "Crumbling, No Respawn, Floating";
-			prefix = "(179)";
-		}
-		180
-		{
-			title = "Crumbling, Respawn, Air Bobbing";
-			prefix = "(180)";
-		}
-	}
-
-	fofspecial
-	{
-		title = "FOF (special)";
-
-		200
-		{
-			title = "Light Block";
-			prefix = "(200)";
-		}
-		201
-		{
-			title = "Half Light Block";
-			prefix = "(201)";
-		}
-		202
-		{
-			title = "Fog Block";
-			prefix = "(202)";
-		}
-		250
-		{
-			title = "Mario Block";
-			prefix = "(250)";
-		}
-		251
-		{
-			title = "Thwomp Block";
-			prefix = "(251)";
-		}
-		252
-		{
-			title = "Shatter Block";
-			prefix = "(252)";
-		}
-		253
-		{
-			title = "Shatter Block, Translucent";
-			prefix = "(253)";
-		}
-		254
-		{
-			title = "Bustable Block";
-			prefix = "(254)";
-		}
-		255
-		{
-			title = "Spin-Bustable Block";
-			prefix = "(255)";
-		}
-		256
-		{
-			title = "Spin-Bustable Block, Translucent";
-			prefix = "(256)";
-		}
-		257
-		{
-			title = "Quicksand";
-			prefix = "(257)";
-		}
-		258
-		{
-			title = "Laser";
-			prefix = "(258)";
-		}
-		259
-		{
-			title = "Custom FOF";
-			prefix = "(259)";
-		}
-	}
-
-	linedeftrigger
-	{
-		title = "Linedef Executor Trigger";
-
-		300
-		{
-			title = "Continuous";
-			prefix = "(300)";
-		}
-		301
-		{
-			title = "Each Time";
-			prefix = "(301)";
-		}
-		302
-		{
-			title = "Once";
-			prefix = "(302)";
-		}
-		303
-		{
-			title = "Ring Count - Continuous";
-			prefix = "(303)";
-		}
-		304
-		{
-			title = "Ring Count - Once";
-			prefix = "(304)";
-		}
-		305
-		{
-			title = "Character Ability - Continuous";
-			prefix = "(305)";
-		}
-		306
-		{
-			title = "Character Ability - Each Time";
-			prefix = "(306)";
-		}
-		307
-		{
-			title = "Character Ability - Once";
-			prefix = "(307)";
-		}
-		308
-		{
-			title = "Race Only - Once";
-			prefix = "(308)";
-		}
-		309
-		{
-			title = "CTF Red Team - Continuous";
-			prefix = "(309)";
-		}
-		310
-		{
-			title = "CTF Red Team - Each Time";
-			prefix = "(310)";
-		}
-		311
-		{
-			title = "CTF Blue Team - Continuous";
-			prefix = "(311)";
-		}
-		312
-		{
-			title = "CTF Blue Team - Each Time";
-			prefix = "(312)";
-		}
-		313
-		{
-			title = "No More Enemies - Once";
-			prefix = "(313)";
-		}
-		314
-		{
-			title = "Number of Pushables - Continuous";
-			prefix = "(314)";
-		}
-		315
-		{
-			title = "Number of Pushables - Once";
-			prefix = "(315)";
-		}
-		317
-		{
-			title = "Condition Set Trigger - Continuous";
-			prefix = "(317)";
-		}
-		318
-		{
-			title = "Condition Set Trigger - Once";
-			prefix = "(318)";
-		}
-		319
-		{
-			title = "Unlockable - Continuous";
-			prefix = "(319)";
-		}
-		320
-		{
-			title = "Unlockable - Once";
-			prefix = "(320)";
-		}
-		321
-		{
-			title = "Trigger After X Calls - Continuous";
-			prefix = "(321)";
-		}
-		322
-		{
-			title = "Trigger After X Calls - Each Time";
-			prefix = "(322)";
-		}
-		323
-		{
-			title = "NiGHTSerize - Each Time";
-			prefix = "(323)";
-		}
-		324
-		{
-			title = "NiGHTSerize - Once";
-			prefix = "(324)";
-		}
-		325
-		{
-			title = "De-NiGHTSerize - Each Time";
-			prefix = "(325)";
-		}
-		326
-		{
-			title = "De-NiGHTSerize - Once";
-			prefix = "(326)";
-		}
-		327
-		{
-			title = "NiGHTS Lap - Each Time";
-			prefix = "(327)";
-		}
-		328
-		{
-			title = "NiGHTS Lap - Once";
-			prefix = "(328)";
-		}
-		329
-		{
-			title = "Ideya Capture Touch - Each Time";
-			prefix = "(329)";
-		}
-		330
-		{
-			title = "Ideya Capture Touch - Once";
-			prefix = "(330)";
-		}
-		331
-		{
-			title = "Player Skin - Continuous";
-			flags64text = "[6] Disable for this skin";
-			prefix = "(331)";
-		}
-		332
-		{
-			title = "Player Skin - Each Time";
-			prefix = "(332)";
-		}
-		333
-		{
-			title = "Player Skin - Once";
-			prefix = "(333)";
-		}
-		334
-		{
-			title = "Object Dye - Continuous";
-			prefix = "(334)";
-		}
-		335
-		{
-			title = "Object Dye - Each Time";
-			prefix = "(335)";
-		}
-		336
-		{
-			title = "Object Dye - Once";
-			prefix = "(336)";
-		}
-		337
-		{
-			title = "Emerald Check - Continuous";
-			prefix = "(337)";
-		}
-		338
-		{
-			title = "Emerald Check - Each Time";
-			prefix = "(338)";
-		}
-		339
-		{
-			title = "Emerald Check - Once";
-			prefix = "(339)";
-		}
-		340
-		{
-			title = "NiGHTS Mare - Continuous";
-			prefix = "(340)";
-		}
-		341
-		{
-			title = "NiGHTS Mare - Each Time";
-			prefix = "(341)";
-		}
-		342
-		{
-			title = "NiGHTS Mare - Once";
-			prefix = "(342)";
-		}
-		343
-		{
-			title = "Gravity Check - Continuous";
-			prefix = "(343)";
-		}
-		344
-		{
-			title = "Gravity Check - Each Time";
-			prefix = "(344)";
-		}
-		345
-		{
-			title = "Gravity Check - Once";
-			prefix = "(345)";
-		}
-		399
-		{
-			title = "Level Load";
-			prefix = "(399)";
-		}
-	}
-
-	linedefexecsector
-	{
-		title = "Linedef Executor (sector)";
-
-		400
-		{
-			title = "Set Tagged Sector's Floor Height/Texture";
-			prefix = "(400)";
-		}
-		401
-		{
-			title = "Set Tagged Sector's Ceiling Height/Texture";
-			prefix = "(401)";
-		}
-		402
-		{
-			title = "Copy Light Level to Tagged Sectors";
-			prefix = "(402)";
-		}
-		408
-		{
-			title = "Set Tagged Sector's Flats";
-			prefix = "(408)";
-		}
-		409
-		{
-			title = "Change Tagged Sector's Tag";
-			prefix = "(409)";
-		}
-		410
-		{
-			title = "Change Front Sector's Tag";
-			prefix = "(410)";
-		}
-		416
-		{
-			title = "Start Adjustable Flickering Light";
-			prefix = "(416)";
-		}
-		417
-		{
-			title = "Start Adjustable Pulsating Light";
-			prefix = "(417)";
-		}
-		418
-		{
-			title = "Start Adjustable Blinking Light (unsynchronized)";
-			prefix = "(418)";
-		}
-		419
-		{
-			title = "Start Adjustable Blinking Light (synchronized)";
-			prefix = "(419)";
-		}
-		420
-		{
-			title = "Fade Light Level";
-			prefix = "(420)";
-		}
-		421
-		{
-			title = "Stop Lighting Effect";
-			prefix = "(421)";
-		}
-		435
-		{
-			title = "Change Plane Scroller Direction";
-			prefix = "(435)";
-		}
-		467
-		{
-			title = "Set Tagged Sector's Light Level";
-			prefix = "(467)";
-		}
-	}
-
-	linedefexecplane
-	{
-		title = "Linedef Executor (plane movement)";
-
-		403
-		{
-			title = "Move Tagged Sector's Floor";
-			prefix = "(403)";
-		}
-		404
-		{
-			title = "Move Tagged Sector's Ceiling";
-			prefix = "(404)";
-		}
-		405
-		{
-			title = "Move Floor According to Front Texture Offsets";
-			prefix = "(405)";
-		}
-		407
-		{
-			title = "Move Ceiling According to Front Texture Offsets";
-			prefix = "(407)";
-		}
-		411
-		{
-			title = "Stop Plane Movement";
-			prefix = "(411)";
-		}
-		428
-		{
-			title = "Start Platform Movement";
-			prefix = "(428)";
-		}
-		429
-		{
-			title = "Crush Ceiling Once";
-			prefix = "(429)";
-		}
-		430
-		{
-			title = "Crush Floor Once";
-			prefix = "(430)";
-		}
-		431
-		{
-			title = "Crush Floor and Ceiling Once";
-			prefix = "(431)";
-		}
-	}
-
-	linedefexecplayer
-	{
-		title = "Linedef Executor (player/object)";
-
-		412
-		{
-			title = "Teleporter";
-			prefix = "(412)";
-		}
-		425
-		{
-			title = "Change Object State";
-			prefix = "(425)";
-		}
-		426
-		{
-			title = "Stop Object";
-			prefix = "(426)";
-		}
-		427
-		{
-			title = "Award Score";
-			prefix = "(427)";
-		}
-		432
-		{
-			title = "Enable/Disable 2D Mode";
-			prefix = "(432)";
-		}
-		433
-		{
-			title = "Enable/Disable Gravity Flip";
-			prefix = "(433)";
-		}
-		434
-		{
-			title = "Award Power-Up";
-			prefix = "(434)";
-		}
-		437
-		{
-			title = "Disable Player Control";
-			prefix = "(437)";
-		}
-		438
-		{
-			title = "Change Object Size";
-			prefix = "(438)";
-		}
-		442
-		{
-			title = "Change Object Type State";
-			prefix = "(442)";
-		}
-		457
-		{
-			title = "Track Object's Angle";
-			prefix = "(457)";
-		}
-		458
-		{
-			title = "Stop Tracking Object's Angle";
-			prefix = "(458)";
-		}
-		460
-		{
-			title = "Award Rings";
-			prefix = "(460)";
-		}
-		461
-		{
-			title = "Spawn Object";
-			prefix = "(461)";
-		}
-		462
-		{
-			title = "Stop Timer/Exit Stage in Record Attack";
-			prefix = "(462)";
-		}
-		463
-		{
-			title = "Dye Object";
-			prefix = "(463)";
-		}
-		464
-		{
-			title = "Trigger Egg Capsule";
-			prefix = "(464)";
-		}
-		466
-		{
-			title = "Set Level Failure State";
-			prefix = "(466)";
-		}
-	}
-
-	linedefexecmisc
-	{
-		title = "Linedef Executor (misc.)";
-
-		413
-		{
-			title = "Change Music";
-			prefix = "(413)";
-		}
-		414
-		{
-			title = "Play Sound Effect";
-			prefix = "(414)";
-		}
-		415
-		{
-			title = "Run Script";
-			prefix = "(415)";
-		}
-		422
-		{
-			title = "Switch to Cut-Away View";
-			prefix = "(422)";
-		}
-		423
-		{
-			title = "Change Sky";
-			prefix = "(423)";
-		}
-		424
-		{
-			title = "Change Weather";
-			prefix = "(424)";
-		}
-		436
-		{
-			title = "Shatter FOF";
-			prefix = "(436)";
-		}
-		439
-		{
-			title = "Change Tagged Linedef's Textures";
-			prefix = "(439)";
-		}
-		440
-		{
-			title = "Start Metal Sonic Race";
-			prefix = "(440)";
-		}
-		441
-		{
-			title = "Condition Set Trigger";
-			prefix = "(441)";
-		}
-		443
-		{
-			title = "Call Lua Function";
-			prefix = "(443)";
-		}
-		444
-		{
-			title = "Earthquake";
-			prefix = "(444)";
-		}
-		445
-		{
-			title = "Make FOF Disappear/Reappear";
-			prefix = "(445)";
-		}
-		446
-		{
-			title = "Make FOF Crumble";
-			prefix = "(446)";
-		}
-		447
-		{
-			title = "Change Tagged Sector's Colormap";
-			prefix = "(447)";
-		}
-		448
-		{
-			title = "Change Skybox";
-			prefix = "(448)";
-		}
-		449
-		{
-			title = "Enable Bosses with Parameter";
-			prefix = "(449)";
-		}
-		450
-		{
-			title = "Execute Linedef Executor (specific tag)";
-			prefix = "(450)";
-		}
-		451
-		{
-			title = "Execute Linedef Executor (random tag in range)";
-			prefix = "(451)";
-		}
-		452
-		{
-			title = "Set FOF Translucency";
-			prefix = "(452)";
-		}
-		453
-		{
-			title = "Fade FOF";
-			prefix = "(453)";
-		}
-		454
-		{
-			title = "Stop Fading FOF";
-			prefix = "(454)";
-		}
-		455
-		{
-			title = "Fade Tagged Sector's Colormap";
-			prefix = "(455)";
-		}
-		456
-		{
-			title = "Stop Fading Tagged Sector's Colormap";
-			prefix = "(456)";
-		}
-		459
-		{
-			title = "Control Text Prompt";
-			prefix = "(459)";
-		}
-	}
-
-	linedefexecpoly
-	{
-		title = "Linedef Executor (polyobject)";
-
-		480
-		{
-			title = "Door Slide";
-			prefix = "(480)";
-		}
-		481
-		{
-			title = "Door Swing";
-			prefix = "(481)";
-		}
-		482
-		{
-			title = "Move";
-			prefix = "(482)";
-		}
-		483
-		{
-			title = "Move, Override";
-			prefix = "(483)";
-		}
-		484
-		{
-			title = "Rotate Right";
-			prefix = "(484)";
-		}
-		485
-		{
-			title = "Rotate Right, Override";
-			prefix = "(485)";
-		}
-		486
-		{
-			title = "Rotate Left";
-			prefix = "(486)";
-		}
-		487
-		{
-			title = "Rotate Left, Override";
-			prefix = "(487)";
-		}
-		488
-		{
-			title = "Move by Waypoints";
-			prefix = "(488)";
-		}
-		489
-		{
-			title = "Turn Invisible, Intangible";
-			prefix = "(489)";
-		}
-		490
-		{
-			title = "Turn Visible, Tangible";
-			prefix = "(490)";
-		}
-		491
-		{
-			title = "Set Translucency";
-			prefix = "(491)";
-		}
-		492
-		{
-			title = "Fade Translucency";
-			prefix = "(492)";
-		}
-	}
-
-	wallscroll
-	{
-		title = "Wall Scrolling";
-
-		500
-		{
-			title = "Scroll Wall Front Side Left";
-			prefix = "(500)";
-		}
-		501
-		{
-			title = "Scroll Wall Front Side Right";
-			prefix = "(501)";
-		}
-		502
-		{
-			title = "Scroll Wall According to Linedef";
-			prefix = "(502)";
-		}
-		503
-		{
-			title = "Scroll Wall According to Linedef (Accelerative)";
-			prefix = "(503)";
-		}
-		504
-		{
-			title = "Scroll Wall According to Linedef (Displacement)";
-			prefix = "(504)";
-		}
-		505
-		{
-			title = "Scroll Texture by Front Side Offsets";
-			prefix = "(505)";
-		}
-		506
-		{
-			title = "Scroll Texture by Back Side Offsets";
-			prefix = "(506)";
-		}
-	}
-
-	planescroll
-	{
-		title = "Plane Scrolling";
-
-		510
-		{
-			title = "Scroll Floor Texture";
-			prefix = "(510)";
-		}
-		511
-		{
-			title = "Scroll Floor Texture (Accelerative)";
-			prefix = "(511)";
-		}
-		512
-		{
-			title = "Scroll Floor Texture (Displacement)";
-			prefix = "(512)";
-		}
-		513
-		{
-			title = "Scroll Ceiling Texture";
-			prefix = "(513)";
-		}
-		514
-		{
-			title = "Scroll Ceiling Texture (Accelerative)";
-			prefix = "(514)";
-		}
-		515
-		{
-			title = "Scroll Ceiling Texture (Displacement)";
-			prefix = "(515)";
-		}
-		516
-		{
-			title = "Scroll Floor and Ceiling Texture";
-			prefix = "(516)";
-		}
-		517
-		{
-			title = "Scroll Floor and Ceiling Texture (Accelerative)";
-			prefix = "(517)";
-		}
-		518
-		{
-			title = "Scroll Floor and Ceiling Texture (Displacement)";
-			prefix = "(518)";
-		}
-		520
-		{
-			title = "Carry Objects on Floor";
-			prefix = "(520)";
-		}
-		521
-		{
-			title = "Carry Objects on Floor (Accelerative)";
-			prefix = "(521)";
-		}
-		522
-		{
-			title = "Carry Objects on Floor (Displacement)";
-			prefix = "(522)";
-		}
-		523
-		{
-			title = "Carry Objects on Ceiling";
-			prefix = "(523)";
-		}
-		524
-		{
-			title = "Carry Objects on Ceiling (Accelerative)";
-			prefix = "(524)";
-		}
-		525
-		{
-			title = "Carry Objects on Ceiling (Displacement)";
-			prefix = "(525)";
-		}
-		526
-		{
-			title = "Carry Objects on Floor and Ceiling";
-			prefix = "(526)";
-		}
-		527
-		{
-			title = "Carry Objects on Floor and Ceiling (Accelerative)";
-			prefix = "(527)";
-		}
-		528
-		{
-			title = "Carry Objects on Floor and Ceiling (Displacement)";
-			prefix = "(528)";
-		}
-		530
-		{
-			title = "Scroll Floor Texture and Carry Objects";
-			prefix = "(530)";
-		}
-		531
-		{
-			title = "Scroll Floor Texture and Carry Objects (Accelerative)";
-			prefix = "(531)";
-		}
-		532
-		{
-			title = "Scroll Floor Texture and Carry Objects (Displacement)";
-			prefix = "(532)";
-		}
-		533
-		{
-			title = "Scroll Ceiling Texture and Carry Objects";
-			prefix = "(533)";
-		}
-		534
-		{
-			title = "Scroll Ceiling Texture and Carry Objects (Accelerative)";
-			prefix = "(534)";
-		}
-		535
-		{
-			title = "Scroll Ceiling Texture and Carry Objects (Displacement)";
-			prefix = "(535)";
-		}
-		536
-		{
-			title = "Scroll Floor and Ceiling Texture and Carry Objects";
-			prefix = "(536)";
-		}
-		537
-		{
-			title = "Scroll Floor and Ceiling Texture and Carry Objects (Accelerative)";
-			prefix = "(537)";
-		}
-		538
-		{
-			title = "Scroll Floor and Ceiling Texture and Carry Objects (Displacement)";
-			prefix = "(538)";
-		}
-	}
-
-	pusher
-	{
-		title = "Pusher";
-
-		541
-		{
-			title = "Wind";
-			prefix = "(541)";
-		}
-		542
-		{
-			title = "Upwards Wind";
-			prefix = "(542)";
-		}
-		543
-		{
-			title = "Downwards Wind";
-			prefix = "(543)";
-		}
-		544
-		{
-			title = "Current";
-			prefix = "(544)";
-		}
-		545
-		{
-			title = "Upwards Current";
-			prefix = "(545)";
-		}
-		546
-		{
-			title = "Downwards Current";
-			prefix = "(546)";
-		}
-		547
-		{
-			title = "Push/Pull";
-			prefix = "(547)";
-		}
-	}
-
-	light
-	{
-		title = "Lighting";
-
-		600
-		{
-			title = "Floor Lighting";
-			prefix = "(600)";
-		}
-		601
-		{
-			title = "Ceiling Lighting";
-			prefix = "(601)";
-		}
-		602
-		{
-			title = "Adjustable Pulsating Light";
-			prefix = "(602)";
-		}
-		603
-		{
-			title = "Adjustable Flickering Light";
-			prefix = "(603)";
-		}
-		604
-		{
-			title = "Adjustable Blinking Light (unsynchronized)";
-			prefix = "(604)";
-		}
-		605
-		{
-			title = "Adjustable Blinking Light (synchronized)";
-			prefix = "(605)";
-		}
-		606
-		{
-			title = "Colormap";
-			prefix = "(606)";
-		}
-	}
-
-	slope
-	{
-		title = "Slope";
-
-		700
-		{
-			title = "Slope Frontside Floor";
-			prefix = "(700)";
-		}
-		701
-		{
-			title = "Slope Frontside Ceiling";
-			prefix = "(701)";
-		}
-		702
-		{
-			title = "Slope Frontside Floor and Ceiling";
-			prefix = "(702)";
-		}
-		703
-		{
-			title = "Slope Frontside Floor and Backside Ceiling";
-			prefix = "(703)";
-´		}
-		704
-		{
-			title = "Slope Frontside Floor by 3 Tagged Vertex Things";
-			prefix = "(704)";
-		}
-		705
-		{
-			title = "Slope Frontside Ceiling by 3 Tagged Vertex Things";
-			prefix = "(705)";
-		}
-		710
-		{
-			title = "Slope Backside Floor";
-			prefix = "(710)";
-		}
-		711
-		{
-			title = "Slope Backside Ceiling";
-			prefix = "(711)";
-		}
-		712
-		{
-			title = "Slope Backside Floor and Ceiling";
-			prefix = "(712)";
-		}
-		713
-		{
-			title = "Slope Backside Floor and Frontside Ceiling";
-			prefix = "(713)";
-		}
-		714
-		{
-			title = "Slope Backside Floor by 3 Tagged Vertex Things";
-			prefix = "(714)";
-		}
-		715
-		{
-			title = "Slope Backside Ceiling by 3 Tagged Vertex Things";
-			prefix = "(715)";
-		}
-		720
-		{
-			title = "Copy Frontside Floor Slope from Line Tag";
-			prefix = "(720)";
-		}
-		721
-		{
-			title = "Copy Frontside Ceiling Slope from Line Tag";
-			prefix = "(721)";
-		}
-		722
-		{
-			title = "Copy Frontside Floor and Ceiling Slope from Line Tag";
-			prefix = "(722)";
-		}
-		799
-		{
-			title = "Set Tagged Dynamic Slope Vertex to Front Sector Height";
-			prefix = "(799)";
-		}
-	}
-
-	transwall
-	{
-		title = "Translucent Wall";
-
-		900
-		{
-			title = "90% Opaque";
-			prefix = "(900)";
-		}
-		901
-		{
-			title = "80% Opaque";
-			prefix = "(901)";
-		}
-		902
-		{
-			title = "70% Opaque";
-			prefix = "(902)";
-		}
-		903
-		{
-			title = "60% Opaque";
-			prefix = "(903)";
-		}
-		904
-		{
-			title = "50% Opaque";
-			prefix = "(904)";
-		}
-		905
-		{
-			title = "40% Opaque";
-			prefix = "(905)";
-		}
-		906
-		{
-			title = "30% Opaque";
-			prefix = "(906)";
-		}
-		907
-		{
-			title = "20% Opaque";
-			prefix = "(907)";
-		}
-		908
-		{
-			title = "10% Opaque";
-			prefix = "(908)";
-		}
-		909
-		{
-			title = "Fog Wall";
-			prefix = "(909)";
-		}
-		910
-		{
-			title = "100% Additive";
-			prefix = "(910)";
-		}
-		911
-		{
-			title = "90% Additive";
-			prefix = "(911)";
-		}
-		912
-		{
-			title = "80% Additive";
-			prefix = "(912)";
-		}
-		913
-		{
-			title = "70% Additive";
-			prefix = "(913)";
-		}
-		914
-		{
-			title = "60% Additive";
-			prefix = "(914)";
-		}
-		915
-		{
-			title = "50% Additive";
-			prefix = "(915)";
-		}
-		916
-		{
-			title = "40% Additive";
-			prefix = "(916)";
-		}
-		917
-		{
-			title = "30% Additive";
-			prefix = "(917)";
-		}
-		918
-		{
-			title = "20% Additive";
-			prefix = "(918)";
-		}
-		919
-		{
-			title = "10% Additive";
-			prefix = "(919)";
-		}
-		920
-		{
-			title = "100% Subtractive";
-			prefix = "(920)";
-		}
-		921
-		{
-			title = "90% Subtractive";
-			prefix = "(921)";
-		}
-		922
-		{
-			title = "80% Subtractive";
-			prefix = "(922)";
-		}
-		923
-		{
-			title = "70% Subtractive";
-			prefix = "(923)";
-		}
-		924
-		{
-			title = "60% Subtractive";
-			prefix = "(924)";
-		}
-		925
-		{
-			title = "50% Subtractive";
-			prefix = "(925)";
-		}
-		926
-		{
-			title = "40% Subtractive";
-			prefix = "(926)";
-		}
-		927
-		{
-			title = "30% Subtractive";
-			prefix = "(927)";
-		}
-		928
-		{
-			title = "20% Subtractive";
-			prefix = "(928)";
-		}
-		929
-		{
-			title = "10% Subtractive";
-			prefix = "(929)";
-		}
-		930
-		{
-			title = "100% Reverse Subtractive";
-			prefix = "(930)";
-		}
-		931
-		{
-			title = "90% Reverse Subtractive";
-			prefix = "(931)";
-		}
-		932
-		{
-			title = "80% Reverse Subtractive";
-			prefix = "(932)";
-		}
-		933
-		{
-			title = "70% Reverse Subtractive";
-			prefix = "(933)";
-		}
-		934
-		{
-			title = "60% Reverse Subtractive";
-			prefix = "(934)";
-		}
-		935
-		{
-			title = "50% Reverse Subtractive";
-			prefix = "(935)";
-		}
-		936
-		{
-			title = "40% Reverse Subtractive";
-			prefix = "(936)";
-		}
-		937
-		{
-			title = "30% Reverse Subtractive";
-			prefix = "(937)";
-		}
-		938
-		{
-			title = "20% Reverse Subtractive";
-			prefix = "(938)";
-		}
-		939
-		{
-			title = "10% Reverse Subtractive";
-			prefix = "(939)";
-		}
-		940
-		{
-			title = "Modulate";
-			prefix = "(940)";
-		}
-	}
-}
-
 udmf
 {
 	misc
@@ -2502,6 +712,7 @@ udmf
 		{
 			title = "Solid";
 			prefix = "(100)";
+			id = "srb2_fofsolid";
 			arg0
 			{
 				title = "Target sector tag";
@@ -2544,6 +755,7 @@ udmf
 		{
 			title = "Water";
 			prefix = "(120)";
+			id = "srb2_fofwater";
 			arg0
 			{
 				title = "Target sector tag";
@@ -2580,6 +792,7 @@ udmf
 		{
 			title = "Air Bobbing";
 			prefix = "(150)";
+			id = "srb2_fofsolidopaque";
 			arg0
 			{
 				title = "Target sector tag";
@@ -2606,6 +819,7 @@ udmf
 		{
 			title = "Water Bobbing";
 			prefix = "(160)";
+			id = "srb2_fofsolidopaque";
 			arg0
 			{
 				title = "Target sector tag";
@@ -2617,6 +831,7 @@ udmf
 		{
 			title = "Crumbling";
 			prefix = "(170)";
+			id = "srb2_fofcrumbling";
 			arg0
 			{
 				title = "Target sector tag";
@@ -2653,11 +868,12 @@ udmf
 				}
 			}
 		}
-
+		
 		190
 		{
 			title = "Rising";
 			prefix = "(190)";
+			id = "srb2_fofsolid";
 			arg0
 			{
 				title = "Target sector tag";
@@ -2714,6 +930,7 @@ udmf
 		{
 			title = "Light Block";
 			prefix = "(200)";
+			id = "srb2_foflight";
 			arg0
 			{
 				title = "Target sector tag";
@@ -2731,6 +948,7 @@ udmf
 		{
 			title = "Fog Block";
 			prefix = "(202)";
+			id = "srb2_foffog";
 			arg0
 			{
 				title = "Target sector tag";
@@ -2742,6 +960,7 @@ udmf
 		{
 			title = "Intangible";
 			prefix = "(220)";
+			id = "srb2_fofintangible";
 			arg0
 			{
 				title = "Target sector tag";
@@ -2778,6 +997,7 @@ udmf
 		{
 			title = "Intangible, Invisible";
 			prefix = "(223)";
+			id = "srb2_fofintangibleinvisible";
 			arg0
 			{
 				title = "Target sector tag";
@@ -2789,6 +1009,7 @@ udmf
 		{
 			title = "Mario Block";
 			prefix = "(250)";
+			id = "srb2_fofsolidopaque";
 			arg0
 			{
 				title = "Target sector tag";
@@ -2810,6 +1031,7 @@ udmf
 		{
 			title = "Thwomp Block";
 			prefix = "(251)";
+			id = "srb2_fofsolidopaque";
 			arg0
 			{
 				title = "Target sector tag";
@@ -2834,6 +1056,7 @@ udmf
 		{
 			title = "Bustable Block";
 			prefix = "(254)";
+			id = "srb2_fofbustable";
 			arg0
 			{
 				title = "Target sector tag";
@@ -2885,6 +1108,7 @@ udmf
 		{
 			title = "Quicksand";
 			prefix = "(257)";
+			id = "srb2_fofsolidopaque";
 			arg0
 			{
 				title = "Target sector tag";
@@ -2910,6 +1134,7 @@ udmf
 		{
 			title = "Laser";
 			prefix = "(258)";
+			id = "srb2_foflaser";
 			arg0
 			{
 				title = "Target sector tag";
@@ -2942,6 +1167,7 @@ udmf
 		{
 			title = "Custom";
 			prefix = "(259)";
+			id = "srb2_fofcustom";
 			arg0
 			{
 				title = "Target sector tag";
@@ -5686,6 +3912,7 @@ udmf
 		{
 			title = "Create Vertex-Based Slope";
 			prefix = "(704)";
+			id = "srb2_vertexslope";
 			arg0
 			{
 				title = "Plane";
@@ -5729,6 +3956,7 @@ udmf
 		{
 			title = "Copy Slope";
 			prefix = "(720)";
+			id = "plane_copy";
 			arg0
 			{
 				title = "Front floor tag";
diff --git a/extras/conf/udb/Includes/SRB222_misc.cfg b/extras/conf/udb/Includes/SRB222_misc.cfg
index ed0488a3ff872aa28e5262ee876ccd2b53ce1397..e274fece69ea37d4be43cd8b7560fde69e181ee5 100644
--- a/extras/conf/udb/Includes/SRB222_misc.cfg
+++ b/extras/conf/udb/Includes/SRB222_misc.cfg
@@ -1,24 +1,3 @@
-linedefflags
-{
-	1 = "[0] Impassable";
-	2 = "[1] Block Enemies";
-	4 = "[2] Double-Sided";
-	8 = "[3] Upper Unpegged";
-	16 = "[4] Lower Unpegged";
-	32 = "[5] Slope Skew (E1)";
-	64 = "[6] Not Climbable";
-	128 = "[7] No Midtexture Skew (E2)";
-	256 = "[8] Peg Midtexture (E3)";
-	512 = "[9] Solid Midtexture (E4)";
-	1024 = "[10] Repeat Midtexture (E5)";
-	2048 = "[11] Netgame Only";
-	4096 = "[12] No Netgame";
-	8192 = "[13] Effect 6";
-	16384 = "[14] Bouncy Wall";
-	32768 = "[15] Transfer Line";
-}
-
-
 // Linedef flags UDMF translation table
 // This is needed for copy/paste and prefabs to work properly
 // When the UDMF field name is prefixed with ! it is inverted
@@ -42,7 +21,6 @@ linedefflagstranslation
 	32768 = "transfer";
 }
 
-
 linedefflags_udmf
 {
 	blocking = "Impassable";
@@ -74,19 +52,13 @@ linedefrenderstyles
 
 sectorflags
 {
-	colormapfog = "Fog Planes in Colormap";
-	colormapfadesprites = "Fade Fullbright in Colormap";
-	colormapprotected = "Protected Colormap";
-	flipspecial_nofloor = "No Trigger on Floor Touch";
-	flipspecial_ceiling = "Trigger on Ceiling Touch";
-	triggerspecial_touch = "Trigger on Edge Touch";
-	triggerspecial_headbump = "Trigger on Headbump";
-	triggerline_plane = "Linedef Trigger Requires Plane Touch";
-	triggerline_mobj = "Non-Pushables Can Trigger Linedef";
 	invertprecip = "Invert Precipitation";
 	gravityflip = "Flip Objects in Reverse Gravity";
 	heatwave = "Heat Wave";
 	noclipcamera = "Intangible to the Camera";
+	colormapfog = "Fog Planes";
+	colormapfadesprites = "Fade Fullbright";
+	colormapprotected = "Protected from Tagging";
 	outerspace = "Space Countdown";
 	doublestepup = "Ramp Sector (double step-up/down)";
 	nostepdown = "Non-Ramp Sector (No step-down)";
@@ -104,23 +76,59 @@ sectorflags
 	zoomtubeend = "Zoom Tube End";
 	finishline = "Circuit Finish Line";
 	ropehang = "Rope Hang";
+	jumpflip = "Flip Gravity on Jump";
+	gravityoverride = "Make Reverse Gravity Temporary";
+	flipspecial_nofloor = "No Trigger on Floor Touch";
+	flipspecial_ceiling = "Trigger on Ceiling Touch";
+	triggerspecial_touch = "Trigger on Edge Touch";
+	triggerspecial_headbump = "Trigger on Headbump";
+	triggerline_plane = "Linedef Trigger Requires Plane Touch";
+	triggerline_mobj = "Non-Pushables Can Trigger Linedef";
 }
 
-thingflags
+sectorflagscategories
 {
-	1 = "[1] Extra";
-	2 = "[2] Flip";
-	4 = "[4] Special";
-	8 = "[8] Ambush";
+	invertprecip = "regular";
+	gravityflip = "regular";
+	heatwave = "regular";
+	noclipcamera = "regular";
+	colormapfog = "colormap";
+	colormapfadesprites = "colormap";
+	colormapprotected = "colormap";
+	outerspace = "special";
+	doublestepup = "special";
+	nostepdown = "special";
+	speedpad = "special";
+	starpostactivator = "special";
+	exit = "special";
+	specialstagepit = "special";
+	returnflag = "special";
+	redteambase = "special";
+	blueteambase = "special";
+	fan = "special";
+	supertransform = "special";
+	forcespin = "special";
+	zoomtubestart = "special";
+	zoomtubeend = "special";
+	finishline = "special";
+	ropehang = "special";
+	jumpflip = "special";
+	gravityoverride = "special";
+	flipspecial_nofloor = "trigger";
+	flipspecial_ceiling = "trigger";
+	triggerspecial_touch = "trigger";
+	triggerspecial_headbump = "trigger";
+	triggerline_plane = "trigger";
+	triggerline_mobj = "trigger";
 }
 
 // THING FLAGS
 thingflags_udmf
 {
 	flip = "Flip";
+	absolutez = "Absolute Z height";
 }
 
-
 // Thing flags UDMF translation table
 // This is needed for copy/paste and prefabs to work properly
 // When the UDMF field name is prefixed with ! it is inverted
@@ -130,9 +138,9 @@ thingflagstranslation
 	2 = "flip";
 	4 = "special";
 	8 = "ambush";
+	16 = "absolutez";
 }
 
-
 // DEFAULT SECTOR BRIGHTNESS LEVELS
 sectorbrightness
 {
@@ -171,6 +179,8 @@ sectorbrightness
 	0;
 }
 
+numbrightnesslevels = 32;
+
 /*
 TEXTURES AND FLAT SOURCES
 This tells Doom Builder where to find the information for textures
@@ -221,145 +231,18 @@ universalfields
 {
 	sector
 	{
-		lightalpha
-		{
-			type = 0;
-			default = 25;
-		}
-
-		fadealpha
-		{
-			type = 0;
-			default = 25;
-		}
-
-		fadestart
-		{
-			type = 0;
-			default = 0;
-		}
-
-		fadeend
-		{
-			type = 0;
-			default = 33;
-		}
-
-		foglighting
-		{
-			type = 3;
-			default = false;
-		}
-
-		friction
-		{
-			type = 1;
-			default = 0.90625;
-		}
-
-		triggertag
-		{
-			type = 15;
-			default = 0;
-		}
-
-		triggerer
-		{
-			type = 2;
-			default = "Player";
-		}
 	}
 
 	linedef
 	{
-		arg5
-		{
-			type = 0;
-			default = 0;
-		}
-		arg6
-		{
-			type = 0;
-			default = 0;
-		}
-		arg7
-		{
-			type = 0;
-			default = 0;
-		}
-		arg8
-		{
-			type = 0;
-			default = 0;
-		}
-		arg9
-		{
-			type = 0;
-			default = 0;
-		}
-		stringarg0
-		{
-			type = 2;
-			default = "";
-		}
-		stringarg1
-		{
-			type = 2;
-			default = "";
-		}
-		executordelay
-		{
-			type = 0;
-			default = 0;
-		}
 	}
 
 	sidedef
 	{
-		repeatcnt
-		{
-			type = 0;
-			default = 0;
-		}
 	}
 
 	thing
 	{
-		arg5
-		{
-			type = 0;
-			default = 0;
-		}
-		arg6
-		{
-			type = 0;
-			default = 0;
-		}
-		arg7
-		{
-			type = 0;
-			default = 0;
-		}
-		arg8
-		{
-			type = 0;
-			default = 0;
-		}
-		arg9
-		{
-			type = 0;
-			default = 0;
-		}
-		stringarg0
-		{
-			type = 2;
-			default = "";
-		}
-		stringarg1
-		{
-			type = 2;
-			default = "";
-		}
 	}
 }
 
@@ -378,87 +261,6 @@ allowempty = The nodebuilder is allowed to leave this lump empty.
 scriptbuild = This lump is a text-based script, which should be compiled using current script compiler;
 script = This lump is a text-based script. Specify the filename of the script configuration to use.
 */
-
-doommaplumpnames
-{
-	~MAP
-	{
-		required = true;
-		blindcopy = true;
-		nodebuild = false;
-	}
-
-	THINGS
-	{
-		required = true;
-		nodebuild = true;
-		allowempty = true;
-	}
-
-	LINEDEFS
-	{
-		required = true;
-		nodebuild = true;
-		allowempty = false;
-	}
-
-	SIDEDEFS
-	{
-		required = true;
-		nodebuild = true;
-		allowempty = false;
-	}
-
-	VERTEXES
-	{
-		required = true;
-		nodebuild = true;
-		allowempty = false;
-	}
-
-	SEGS
-	{
-		required = false;
-		nodebuild = true;
-		allowempty = false;
-	}
-
-	SSECTORS
-	{
-		required = false;
-		nodebuild = true;
-		allowempty = false;
-	}
-
-	NODES
-	{
-		required = false;
-		nodebuild = true;
-		allowempty = false;
-	}
-
-	SECTORS
-	{
-		required = true;
-		nodebuild = true;
-		allowempty = false;
-	}
-
-	REJECT
-	{
-		required = false;
-		nodebuild = true;
-		allowempty = false;
-	}
-
-	BLOCKMAP
-	{
-		required = false;
-		nodebuild = true;
-		allowempty = true;
-	}
-}
-
 udmfmaplumpnames
 {
 	ZNODES
@@ -682,48 +484,32 @@ thingsfilters
 
 	}
 
-
-	filter3
-	{
-		name = "Normal Gravity";
-		category = "";
-		type = -1;
-
-		fields
-		{
-			2 = false;
-		}
-
-	}
-
-
-	filter4
-	{
-		name = "Reverse Gravity";
-		category = "";
-		type = -1;
-
-		fields
-		{
-			2 = true;
-		}
-
-	}
+	//filter3
+	//{
+	//	name = "Normal Gravity";
+	//	category = "";
+	//	type = -1;
+	//
+	//	fields
+	//	{
+	//		2 = false;
+	//	}
+	//}
+
+	//filter4
+	//{
+	//	name = "Reverse Gravity";
+	//	category = "";
+	//	type = -1;
+	//
+	//	fields
+	//	{
+	//		2 = true;
+	//	}
+	//}
 }
 
 // Special linedefs
-speciallinedefs
-{
-	soundlinedefflag = 64;	// See linedefflags
-	singlesidedflag = 1;	// See linedefflags
-	doublesidedflag = 4;	// See linedefflags
-	impassableflag = 1;
-	upperunpeggedflag = 8;
-	lowerunpeggedflag = 16;
-	repeatmidtextureflag = 1024;
-	pegmidtextureflag = 256;
-}
-
 speciallinedefs_udmf
 {
 	soundlinedefflag = "noclimb";
@@ -734,6 +520,8 @@ speciallinedefs_udmf
 	lowerunpeggedflag = "dontpegbottom";
 	repeatmidtextureflag = "wrapmidtex";
 	pegmidtextureflag = "midpeg";
+	slopeskewflag = "skewtd";
+	nomidtextureskewflag = "noskew";
 }
 
 scriptlumpnames
diff --git a/extras/conf/udb/Includes/SRB222_sectors.cfg b/extras/conf/udb/Includes/SRB222_sectors.cfg
deleted file mode 100644
index 5b3ad4155c176b229eee741b9a1744121b68d4ae..0000000000000000000000000000000000000000
--- a/extras/conf/udb/Includes/SRB222_sectors.cfg
+++ /dev/null
@@ -1,107 +0,0 @@
-sectortypes
-{
-	0 = "Normal";
-	1 = "Damage";
-	2 = "Damage (Water)";
-	3 = "Damage (Fire)";
-	4 = "Damage (Electrical)";
-	5 = "Spikes";
-	6 = "Death Pit (Camera Tilt)";
-	7 = "Death Pit (No Camera Tilt)";
-	8 = "Instant Kill";
-	9 = "Ring Drainer (Floor Touch)";
-	10 = "Ring Drainer (Anywhere in Sector)";
-	11 = "Special Stage Damage";
-	12 = "Space Countdown";
-	13 = "Ramp Sector (double step-up/down)";
-	14 = "Non-Ramp Sector (no step-down)";
-	15 = "Bouncy FOF <deprecated>";
-	16 = "Trigger Line Ex. (Pushable Objects)";
-	32 = "Trigger Line Ex. (Anywhere, All Players)";
-	48 = "Trigger Line Ex. (Floor Touch, All Players)";
-	64 = "Trigger Line Ex. (Anywhere in Sector)";
-	80 = "Trigger Line Ex. (Floor Touch)";
-	96 = "Trigger Line Ex. (Emerald Check) <deprecated>";
-	112 = "Trigger Line Ex. (NiGHTS Mare) <deprecated>";
-	128 = "Check for Linedef Executor on FOFs";
-	144 = "Egg Capsule";
-	160 = "Special Stage Time/Spheres Parameters <deprecated>";
-	176 = "Custom Global Gravity <deprecated>";
-	1280 = "Speed Pad";
-	1536 = "Flip Gravity on Jump";
-	4096 = "Star Post Activator";
-	8192 = "Exit/Special Stage Pit/Return Flag";
-	12288 = "CTF Red Team Base";
-	16384 = "CTF Blue Team Base";
-	20480 = "Fan Sector";
-	24576 = "Super Sonic Transform";
-	28672 = "Force Spin";
-	32768 = "Zoom Tube Start";
-	36864 = "Zoom Tube End";
-	40960 = "Circuit Finish Line";
-	45056 = "Rope Hang";
-	49152 = "Intangible to the Camera";
-}
-
-gen_sectortypes
-{
-	first
-	{
-		0 = "Normal";
-		1 = "Damage";
-		2 = "Damage (Water)";
-		3 = "Damage (Fire)";
-		4 = "Damage (Electrical)";
-		5 = "Spikes";
-		6 = "Death Pit (Camera Tilt)";
-		7 = "Death Pit (No Camera Tilt)";
-		8 = "Instant Kill";
-		9 = "Ring Drainer (Floor Touch)";
-		10 = "Ring Drainer (Anywhere in Sector)";
-		11 = "Special Stage Damage";
-		12 = "Space Countdown";
-		13 = "Ramp Sector (double step-up/down)";
-		14 = "Non-Ramp Sector (no step-down)";
-		15 = "Bouncy FOF <deprecated>";
-	}
-
-	second
-	{
-		0 = "Normal";
-		16 = "Trigger Line Ex. (Pushable Objects)";
-		32 = "Trigger Line Ex. (Anywhere, All Players)";
-		48 = "Trigger Line Ex. (Floor Touch, All Players)";
-		64 = "Trigger Line Ex. (Anywhere in Sector)";
-		80 = "Trigger Line Ex. (Floor Touch)";
-		96 = "Trigger Line Ex. (Emerald Check) <deprecated>";
-		112 = "Trigger Line Ex. (NiGHTS Mare) <deprecated>";
-		128 = "Check for Linedef Executor on FOFs";
-		144 = "Egg Capsule";
-		160 = "Special Stage Time/Spheres Parameters <deprecated>";
-		176 = "Custom Global Gravity <deprecated>";
-	}
-
-	third
-	{
-		0 = "Normal";
-		1280 = "Speed Pad";
-		1536 = "Flip Gravity on Jump";
-	}
-
-	fourth
-	{
-		0 = "Normal";
-		4096 = "Star Post Activator";
-		8192 = "Exit/Special Stage Pit/Return Flag";
-		12288 = "CTF Red Team Base";
-		16384 = "CTF Blue Team Base";
-		20480 = "Fan Sector";
-		24576 = "Super Sonic Transform";
-		28672 = "Force Spin";
-		32768 = "Zoom Tube Start";
-		36864 = "Zoom Tube End";
-		40960 = "Circuit Finish Line";
-		45056 = "Rope Hang";
-		49152 = "Intangible to the Camera";
-	}
-}
diff --git a/extras/conf/udb/Includes/SRB222_things.cfg b/extras/conf/udb/Includes/SRB222_things.cfg
index b4508c91ea568aecc702ad1bf9927f079e820bd1..df08e3ac50fb47c80b412da2966e10cc2cec5f79 100644
--- a/extras/conf/udb/Includes/SRB222_things.cfg
+++ b/extras/conf/udb/Includes/SRB222_things.cfg
@@ -3,3175 +3,8 @@
 // 8-Dark_Gray 9-Blue 10-Green 11-Cyan 12-Red 13-Magenta
 // 14-Yellow 15-White 16-Pink 17-Orange 18-Gold 19-Cream
 
-doom
-{
-	editor
-	{
-		color = 15; // White
-		arrow = 1;
-		title = "<Editor Things>";
-		error = -1;
-		width = 8;
-		height = 16;
-		sort = 1;
-
-		3328 = "3D Mode Start";
-	}
-
-	starts
-	{
-		color = 1; // Blue
-		arrow = 1;
-		title = "Player Starts";
-		width = 16;
-		height = 48;
-		sprite = "PLAYA0";
-
-		1
-		{
-			title = "Player 01 Start";
-			sprite = "PLAYA0";
-		}
-		2
-		{
-			title = "Player 02 Start";
-			sprite = "PLAYA0";
-		}
-		3
-		{
-			title = "Player 03 Start";
-			sprite = "PLAYA0";
-		}
-		4
-		{
-			title = "Player 04 Start";
-			sprite = "PLAYA0";
-		}
-		5
-		{
-			title = "Player 05 Start";
-			sprite = "PLAYA0";
-		}
-		6
-		{
-			title = "Player 06 Start";
-			sprite = "PLAYA0";
-		}
-		7
-		{
-			title = "Player 07 Start";
-			sprite = "PLAYA0";
-		}
-		8
-		{
-			title = "Player 08 Start";
-			sprite = "PLAYA0";
-		}
-		9
-		{
-			title = "Player 09 Start";
-			sprite = "PLAYA0";
-		}
-		10
-		{
-			title = "Player 10 Start";
-			sprite = "PLAYA0";
-		}
-		11
-		{
-			title = "Player 11 Start";
-			sprite = "PLAYA0";
-		}
-		12
-		{
-			title = "Player 12 Start";
-			sprite = "PLAYA0";
-		}
-		13
-		{
-			title = "Player 13 Start";
-			sprite = "PLAYA0";
-		}
-		14
-		{
-			title = "Player 14 Start";
-			sprite = "PLAYA0";
-		}
-		15
-		{
-			title = "Player 15 Start";
-			sprite = "PLAYA0";
-		}
-		16
-		{
-			title = "Player 16 Start";
-			sprite = "PLAYA0";
-		}
-		17
-		{
-			title = "Player 17 Start";
-			sprite = "PLAYA0";
-		}
-		18
-		{
-			title = "Player 18 Start";
-			sprite = "PLAYA0";
-		}
-		19
-		{
-			title = "Player 19 Start";
-			sprite = "PLAYA0";
-		}
-		20
-		{
-			title = "Player 20 Start";
-			sprite = "PLAYA0";
-		}
-		21
-		{
-			title = "Player 21 Start";
-			sprite = "PLAYA0";
-		}
-		22
-		{
-			title = "Player 22 Start";
-			sprite = "PLAYA0";
-		}
-		23
-		{
-			title = "Player 23 Start";
-			sprite = "PLAYA0";
-		}
-		24
-		{
-			title = "Player 24 Start";
-			sprite = "PLAYA0";
-		}
-		25
-		{
-			title = "Player 25 Start";
-			sprite = "PLAYA0";
-		}
-		26
-		{
-			title = "Player 26 Start";
-			sprite = "PLAYA0";
-		}
-		27
-		{
-			title = "Player 27 Start";
-			sprite = "PLAYA0";
-		}
-		28
-		{
-			title = "Player 28 Start";
-			sprite = "PLAYA0";
-		}
-		29
-		{
-			title = "Player 29 Start";
-			sprite = "PLAYA0";
-		}
-		30
-		{
-			title = "Player 30 Start";
-			sprite = "PLAYA0";
-		}
-		31
-		{
-			title = "Player 31 Start";
-			sprite = "PLAYA0";
-		}
-		32
-		{
-			title = "Player 32 Start";
-			sprite = "PLAYA0";
-		}
-		33
-		{
-			title = "Match Start";
-			sprite = "NDRNA2A8";
-		}
-		34
-		{
-			title = "CTF Red Team Start";
-			sprite = "SIGNG0";
-		}
-		35
-		{
-			title = "CTF Blue Team Start";
-			sprite = "SIGNE0";
-		}
-	}
-
-	enemies
-	{
-		color = 9; // Light_Blue
-		arrow = 1;
-		title = "Enemies";
-
-		100
-		{
-			title = "Crawla (Blue)";
-			sprite = "POSSA1";
-			width = 24;
-			height = 32;
-		}
-		101
-		{
-			title = "Crawla (Red)";
-			sprite = "SPOSA1";
-			width = 24;
-			height = 32;
-		}
-		102
-		{
-			title = "Stupid Dumb Unnamed RoboFish";
-			sprite = "FISHA0";
-			width = 8;
-			height = 28;
-		}
-		103
-		{
-			title = "Buzz (Gold)";
-			sprite = "BUZZA1";
-			width = 28;
-			height = 40;
-		}
-		104
-		{
-			title = "Buzz (Red)";
-			sprite = "RBUZA1";
-			width = 28;
-			height = 40;
-		}
-		108
-		{
-			title = "Deton";
-			sprite = "DETNA1";
-			width = 20;
-			height = 32;
-		}
-		110
-		{
-			title = "Turret";
-			sprite = "TRETA1";
-			width = 16;
-			height = 32;
-		}
-		111
-		{
-			title = "Pop-up Turret";
-			sprite = "TURRI1";
-			width = 12;
-			height = 64;
-		}
-		122
-		{
-			title = "Spring Shell (Green)";
-			sprite = "SSHLA1";
-			width = 24;
-			height = 40;
-		}
-		125
-		{
-			title = "Spring Shell (Yellow)";
-			sprite = "SSHLI1";
-			width = 24;
-			height = 40;
-		}
-		109
-		{
-			title = "Skim";
-			sprite = "SKIMA1";
-			width = 16;
-			height = 24;
-		}
-		113
-		{
-			title = "Jet Jaw";
-			sprite = "JJAWA3A7";
-			width = 12;
-			height = 20;
-		}
-		126
-		{
-			title = "Crushstacean";
-			sprite = "CRABA0";
-			width = 24;
-			height = 32;
-		}
-		138
-		{
-			title = "Banpyura";
-			sprite = "CR2BA0";
-			width = 24;
-			height = 32;
-		}
-		117
-		{
-			title = "Robo-Hood";
-			sprite = "ARCHA1";
-			width = 24;
-			height = 32;
-		}
-		118
-		{
-			title = "Lance-a-Bot";
-			sprite = "CBFSA1";
-			width = 32;
-			height = 72;
-		}
-		1113
-		{
-			title = "Suspicious Lance-a-Bot Statue";
-			sprite = "CBBSA1";
-			width = 32;
-			height = 72;
-		}
-		119
-		{
-			title = "Egg Guard";
-			sprite = "ESHIA1";
-			width = 16;
-			height = 48;
-		}
-		115
-		{
-			title = "Bird Aircraft Strike Hazard";
-			sprite = "VLTRF1";
-			width = 12;
-			height = 24;
-		}
-		120
-		{
-			title = "Green Snapper";
-			sprite = "GSNPA1";
-			width = 24;
-			height = 24;
-		}
-		121
-		{
-			title = "Minus";
-			sprite = "MNUSA0";
-			width = 24;
-			height = 32;
-		}
-		134
-		{
-			title = "Canarivore";
-			sprite = "CANAA0";
-			width = 12;
-			height = 80;
-			hangs = 1;
-		}
-		123
-		{
-			title = "Unidus";
-			sprite = "UNIDA1";
-			width = 18;
-			height = 36;
-		}
-		135
-		{
-			title = "Pterabyte Spawner";
-			sprite = "PTERA2A8";
-			width = 16;
-			height = 16;
-		}
-		136
-		{
-			title = "Pyre Fly";
-			sprite = "PYREA0";
-			width = 24;
-			height = 34;
-		}
-		137
-		{
-			title = "Dragonbomber";
-			sprite = "DRABA1";
-			width = 28;
-			height = 48;
-		}
-		105
-		{
-			title = "Jetty-Syn Bomber";
-			sprite = "JETBB1";
-			width = 20;
-			height = 50;
-		}
-		106
-		{
-			title = "Jetty-Syn Gunner";
-			sprite = "JETGB1";
-			width = 20;
-			height = 48;
-		}
-		112
-		{
-			title = "Spincushion";
-			sprite = "SHRPA1";
-			width = 16;
-			height = 24;
-		}
-		114
-		{
-			title = "Snailer";
-			sprite = "SNLRA3A7";
-			width = 24;
-			height = 48;
-		}
-		129
-		{
-			title = "Penguinator";
-			sprite = "PENGA1";
-			width = 24;
-			height = 32;
-		}
-		130
-		{
-			title = "Pophat";
-			sprite = "POPHA1";
-			width = 24;
-			height = 32;
-		}
-		107
-		{
-			title = "Crawla Commander";
-			sprite = "CCOMA1";
-			width = 16;
-			height = 32;
-		}
-		131
-		{
-			title = "Spinbobert";
-			sprite = "SBOBB0";
-			width = 32;
-			height = 32;
-		}
-		132
-		{
-			title = "Cacolantern";
-			sprite = "CACOA0";
-			width = 32;
-			height = 32;
-		}
-		133
-		{
-			title = "Hangster";
-			sprite = "HBATC1";
-			width = 24;
-			height = 24;
-			hangs = 1;
-		}
-		127
-		{
-			title = "Hive Elemental";
-			sprite = "HIVEA0";
-			width = 32;
-			height = 80;
-		}
-		128
-		{
-			title = "Bumblebore";
-			sprite = "BUMBA1";
-			width = 16;
-			height = 32;
-		}
-		124
-		{
-			title = "Buggle";
-			sprite = "BBUZA1";
-			width = 20;
-			height = 24;
-		}
-		116
-		{
-			title = "Pointy";
-			sprite = "PNTYA1";
-			width = 8;
-			height = 16;
-		}
-	}
-
-	bosses
-	{
-		color = 8; // Dark_Gray
-		arrow = 1;
-		title = "Bosses";
-
-		200
-		{
-			title = "Egg Mobile";
-			sprite = "EGGMA1";
-			width = 24;
-			height = 76;
-		}
-		201
-		{
-			title = "Egg Slimer";
-			sprite = "EGGNA1";
-			width = 24;
-			height = 76;
-		}
-		202
-		{
-			title = "Sea Egg";
-			sprite = "EGGOA1";
-			width = 32;
-			height = 116;
-		}
-		203
-		{
-			title = "Egg Colosseum";
-			sprite = "EGGPA1";
-			width = 24;
-			height = 76;
-		}
-		204
-		{
-			title = "Fang";
-			sprite = "FANGA1";
-			width = 24;
-			height = 60;
-		}
-		206
-		{
-			title = "Brak Eggman (Old)";
-			sprite = "BRAKB1";
-			width = 48;
-			height = 160;
-		}
-		207
-		{
-			title = "Metal Sonic (Race)";
-			sprite = "METLI1";
-			width = 16;
-			height = 48;
-		}
-		208
-		{
-			title = "Metal Sonic (Battle)";
-			sprite = "METLC1";
-			width = 16;
-			height = 48;
-		}
-		209
-		{
-			title = "Brak Eggman";
-			sprite = "BRAK01";
-			width = 48;
-			height = 160;
-		}
-		290
-		{
-			arrow = 0;
-			title = "Boss Escape Point";
-			width = 8;
-			height = 16;
-			sprite = "internal:eggmanend";
-		}
-		291
-		{
-			arrow = 0;
-			title = "Egg Capsule Center";
-			width = 8;
-			height = 16;
-			sprite = "internal:capsule";
-		}
-		292
-		{
-			arrow = 0;
-			title = "Boss Waypoint";
-			width = 8;
-			height = 16;
-			sprite = "internal:eggmanway";
-		}
-		293
-		{
-			title = "Metal Sonic Gather Point";
-			sprite = "internal:metal";
-			width = 8;
-			height = 16;
-		}
-		294
-		{
-			title = "Fang Waypoint";
-			sprite = "internal:eggmanway";
-			width = 8;
-			height = 16;
-		}
-	}
-
-	rings
-	{
-		color = 14; // Yellow
-		title = "Rings and Weapon Panels";
-		width = 24;
-		height = 24;
-		sprite = "RINGA0";
-
-		300
-		{
-			title = "Ring";
-			sprite = "RINGA0";
-			width = 16;
-		}
-		301
-		{
-			title = "Bounce Ring";
-			sprite = "internal:RNGBA0";
-		}
-		302
-		{
-			title = "Rail Ring";
-			sprite = "internal:RNGRA0";
-		}
-		303
-		{
-			title = "Infinity Ring";
-			sprite = "internal:RNGIA0";
-		}
-		304
-		{
-			title = "Automatic Ring";
-			sprite = "internal:RNGAA0";
-		}
-		305
-		{
-			title = "Explosion Ring";
-			sprite = "internal:RNGEA0";
-		}
-		306
-		{
-			title = "Scatter Ring";
-			sprite = "internal:RNGSA0";
-		}
-		307
-		{
-			title = "Grenade Ring";
-			sprite = "internal:RNGGA0";
-		}
-		308
-		{
-			title = "CTF Team Ring (Red)";
-			sprite = "internal:RRNGA0";
-			width = 16;
-		}
-		309
-		{
-			title = "CTF Team Ring (Blue)";
-			sprite = "internal:BRNGA0";
-			width = 16;
-		}
-		330
-		{
-			title = "Bounce Ring Panel";
-			sprite = "internal:PIKBA0";
-		}
-		331
-		{
-			title = "Rail Ring Panel";
-			sprite = "internal:PIKRA0";
-		}
-		332
-		{
-			title = "Automatic Ring Panel";
-			sprite = "internal:PIKAA0";
-		}
-		333
-		{
-			title = "Explosion Ring Panel";
-			sprite = "internal:PIKEA0";
-		}
-		334
-		{
-			title = "Scatter Ring Panel";
-			sprite = "internal:PIKSA0";
-		}
-		335
-		{
-			title = "Grenade Ring Panel";
-			sprite = "internal:PIKGA0";
-		}
-	}
-
-	collectibles
-	{
-		color = 10; // Light_Green
-		title = "Other Collectibles";
-		width = 16;
-		height = 32;
-		sort = 1;
-		sprite = "CEMGA0";
-
-		310
-		{
-			title = "CTF Red Flag";
-			sprite = "RFLGA0";
-			width = 24;
-			height = 64;
-		}
-		311
-		{
-			title = "CTF Blue Flag";
-			sprite = "BFLGA0";
-			width = 24;
-			height = 64;
-		}
-		312
-		{
-			title = "Emerald Token";
-			sprite = "TOKEA0";
-			width = 16;
-			height = 32;
-		}
-		313
-		{
-			title = "Chaos Emerald 1 (Green)";
-			sprite = "CEMGA0";
-		}
-		314
-		{
-			title = "Chaos Emerald 2 (Purple)";
-			sprite = "CEMGB0";
-		}
-		315
-		{
-			title = "Chaos Emerald 3 (Blue)";
-			sprite = "CEMGC0";
-		}
-		316
-		{
-			title = "Chaos Emerald 4 (Cyan)";
-			sprite = "CEMGD0";
-		}
-		317
-		{
-			title = "Chaos Emerald 5 (Orange)";
-			sprite = "CEMGE0";
-		}
-		318
-		{
-			title = "Chaos Emerald 6 (Red)";
-			sprite = "CEMGF0";
-		}
-		319
-		{
-			title = "Chaos Emerald 7 (Gray)";
-			sprite = "CEMGG0";
-		}
-		320
-		{
-			title = "Emerald Hunt Location";
-			sprite = "SHRDA0";
-		}
-		321
-		{
-			title = "Match Chaos Emerald Spawn";
-			sprite = "CEMGA0";
-		}
-		322
-		{
-			title = "Emblem";
-			sprite = "EMBMA0";
-			width = 16;
-			height = 30;
-		}
-	}
-
-	boxes
-	{
-		color = 7; // Gray
-		blocking = 2;
-		title = "Monitors";
-		width = 18;
-		height = 40;
-
-		400
-		{
-			title = "Super Ring (10 Rings)";
-			sprite = "TVRIA0";
-		}
-		401
-		{
-			title = "Pity Shield";
-			sprite = "TVPIA0";
-		}
-		402
-		{
-			title = "Attraction Shield";
-			sprite = "TVATA0";
-		}
-		403
-		{
-			title = "Force Shield";
-			sprite = "TVFOA0";
-		}
-		404
-		{
-			title = "Armageddon Shield";
-			sprite = "TVARA0";
-		}
-		405
-		{
-			title = "Whirlwind Shield";
-			sprite = "TVWWA0";
-		}
-		406
-		{
-			title = "Elemental Shield";
-			sprite = "TVELA0";
-		}
-		407
-		{
-			title = "Super Sneakers";
-			sprite = "TVSSA0";
-		}
-		408
-		{
-			title = "Invincibility";
-			sprite = "TVIVA0";
-		}
-		409
-		{
-			title = "Extra Life";
-			sprite = "TV1UA0";
-		}
-		410
-		{
-			title = "Eggman";
-			sprite = "TVEGA0";
-		}
-		411
-		{
-			title = "Teleporter";
-			sprite = "TVMXA0";
-		}
-		413
-		{
-			title = "Gravity Boots";
-			sprite = "TVGVA0";
-		}
-		414
-		{
-			title = "CTF Team Ring Monitor (Red)";
-			sprite = "TRRIA0";
-		}
-		415
-		{
-			title = "CTF Team Ring Monitor (Blue)";
-			sprite = "TBRIA0";
-		}
-		416
-		{
-			title = "Recycler";
-			sprite = "TVRCA0";
-		}
-		418
-		{
-			title = "Score (1,000 Points)";
-			sprite = "TV1KA0";
-		}
-		419
-		{
-			title = "Score (10,000 Points)";
-			sprite = "TVTKA0";
-		}
-		420
-		{
-			title = "Flame Shield";
-			sprite = "TVFLA0";
-		}
-		421
-		{
-			title = "Water Shield";
-			sprite = "TVBBA0";
-		}
-		422
-		{
-			title = "Lightning Shield";
-			sprite = "TVZPA0";
-		}
-	}
-
-	boxes2
-	{
-		color = 18; // Gold
-		blocking = 2;
-		title = "Monitors (Respawning)";
-		width = 20;
-		height = 44;
-
-		431
-		{
-			title = "Pity Shield (Respawn)";
-			sprite = "TVPIB0";
-		}
-		432
-		{
-			title = "Attraction Shield (Respawn)";
-			sprite = "TVATB0";
-		}
-		433
-		{
-			title = "Force Shield (Respawn)";
-			sprite = "TVFOB0";
-		}
-		434
-		{
-			title = "Armageddon Shield (Respawn)";
-			sprite = "TVARB0";
-		}
-		435
-		{
-			title = "Whirlwind Shield (Respawn)";
-			sprite = "TVWWB0";
-		}
-		436
-		{
-			title = "Elemental Shield (Respawn)";
-			sprite = "TVELB0";
-		}
-		437
-		{
-			title = "Super Sneakers (Respawn)";
-			sprite = "TVSSB0";
-		}
-		438
-		{
-			title = "Invincibility (Respawn)";
-			sprite = "TVIVB0";
-		}
-		440
-		{
-			title = "Eggman (Respawn)";
-			sprite = "TVEGB0";
-		}
-		443
-		{
-			title = "Gravity Boots (Respawn)";
-			sprite = "TVGVB0";
-		}
-		450
-		{
-			title = "Flame Shield (Respawn)";
-			sprite = "TVFLB0";
-		}
-		451
-		{
-			title = "Water Shield (Respawn)";
-			sprite = "TVBBB0";
-		}
-		452
-		{
-			title = "Lightning Shield (Respawn)";
-			sprite = "TVZPB0";
-		}
-	}
-
-	generic
-	{
-		color = 11; // Light_Cyan
-		title = "Generic Items & Hazards";
-
-		500
-		{
-			title = "Air Bubble Patch";
-			sprite = "BUBLE0";
-			width = 8;
-			height = 16;
-		}
-		501
-		{
-			title = "Signpost";
-			sprite = "SIGND0";
-			width = 8;
-			height = 32;
-		}
-		502
-		{
-			arrow = 1;
-			title = "Star Post";
-			sprite = "STPTA0M0";
-			width = 64;
-			height = 128;
-		}
-		520
-		{
-			title = "Bomb Sphere";
-			sprite = "SPHRD0";
-			width = 16;
-			height = 24;
-		}
-		521
-		{
-			title = "Spikeball";
-			sprite = "SPIKA0";
-			width = 12;
-			height = 8;
-		}
-		522
-		{
-			title = "Wall Spike";
-			sprite = "WSPKALAR";
-			width = 16;
-			height = 14;
-			arrow = 1;
-		}
-		523
-		{
-			title = "Spike";
-			sprite = "USPKA0";
-			width = 8;
-			height = 32;
-		}
-		1130
-		{
-			title = "Small Mace";
-			sprite = "SMCEA0";
-			width = 17;
-			height = 34;
-		}
-		1131
-		{
-			title = "Big Mace";
-			sprite = "BMCEA0";
-			width = 34;
-			height = 68;
-		}
-		1136
-		{
-			title = "Small Fireball";
-			sprite = "SFBRA0";
-			width = 17;
-			height = 34;
-		}
-		1137
-		{
-			title = "Large Fireball";
-			sprite = "BFBRA0";
-			width = 34;
-			height = 68;
-		}
-	}
-
-	springs
-	{
-		color = 12; // Light_Red
-		title = "Springs and Fans";
-		width = 20;
-		height = 16;
-		sprite = "RSPRD2";
-
-		540
-		{
-			title = "Fan";
-			sprite = "FANSA0D0";
-			width = 16;
-			height = 8;
-		}
-		541
-		{
-			title = "Gas Jet";
-			sprite = "STEMD0";
-			width = 32;
-		}
-		542
-		{
-			title = "Bumper";
-			sprite = "BUMPA0";
-			width = 32;
-			height = 64;
-		}
-		543
-		{
-			title = "Balloon";
-			sprite = "BLONA0";
-			width = 32;
-			height = 64;
-		}
-		550
-		{
-			title = "Yellow Spring";
-			sprite = "SPRYA0";
-		}
-		551
-		{
-			title = "Red Spring";
-			sprite = "SPRRA0";
-		}
-		552
-		{
-			title = "Blue Spring";
-			sprite = "SPRBA0";
-		}
-		555
-		{
-			arrow = 1;
-			title = "Diagonal Yellow Spring";
-			sprite = "YSPRD2";
-			width = 16;
-		}
-		556
-		{
-			arrow = 1;
-			title = "Diagonal Red Spring";
-			sprite = "RSPRD2";
-			width = 16;
-		}
-		557
-		{
-			arrow = 1;
-			title = "Diagonal Blue Spring";
-			sprite = "BSPRD2";
-			width = 16;
-		}
-		558
-		{
-			arrow = 1;
-			title = "Horizontal Yellow Spring";
-			sprite = "SSWYD2D8";
-			width = 16;
-			height = 32;
-		}
-		559
-		{
-			arrow = 1;
-			title = "Horizontal Red Spring";
-			sprite = "SSWRD2D8";
-			width = 16;
-			height = 32;
-		}
-		560
-		{
-			arrow = 1;
-			title = "Horizontal Blue Spring";
-			sprite = "SSWBD2D8";
-			width = 16;
-			height = 32;
-		}
-		1134
-		{
-			title = "Yellow Spring Ball";
-			sprite = "YSPBA0";
-			width = 17;
-			height = 34;
-		}
-		1135
-		{
-			title = "Red Spring Ball";
-			sprite = "RSPBA0";
-			width = 17;
-			height = 34;
-		}
-		544
-		{
-			arrow = 1;
-			title = "Yellow Boost Panel";
-			sprite = "BSTYA0";
-			width = 28;
-			height = 2;
-		}
-		545
-		{
-			arrow = 1;
-			title = "Red Boost Panel";
-			sprite = "BSTRA0";
-			width = 28;
-			height = 2;
-		}
-	}
-
-	patterns
-	{
-		color = 5; // Magenta
-		arrow = 1;
-		title = "Special Placement Patterns";
-		width = 16;
-		height = 384;
-		sprite = "RINGA0";
-
-		600
-		{
-			arrow = 0;
-			title = "5 Vertical Rings (Yellow Spring)";
-			sprite = "RINGA0";
-		}
-		601
-		{
-			arrow = 0;
-			title = "5 Vertical Rings (Red Spring)";
-			sprite = "RINGA0";
-			height = 1024;
-		}
-		602
-		{
-			title = "5 Diagonal Rings (Yellow Spring)";
-			sprite = "RINGA0";
-			height = 32;
-		}
-		603
-		{
-			title = "10 Diagonal Rings (Red Spring)";
-			sprite = "RINGA0";
-			height = 32;
-		}
-		604
-		{
-			title = "Circle of Rings";
-			sprite = "RINGA0";
-			width = 96;
-			height = 192;
-		}
-		605
-		{
-			title = "Circle of Rings (Big)";
-			sprite = "RINGA0";
-			width = 192;
-		}
-		606
-		{
-			title = "Circle of Blue Spheres";
-			sprite = "SPHRA0";
-			width = 96;
-			height = 192;
-		}
-		607
-		{
-			title = "Circle of Blue Spheres (Big)";
-			sprite = "SPHRA0";
-			width = 192;
-		}
-		608
-		{
-			title = "Circle of Rings and Spheres";
-			sprite = "SPHRA0";
-			width = 96;
-			height = 192;
-		}
-		609
-		{
-			title = "Circle of Rings and Spheres (Big)";
-			sprite = "SPHRA0";
-			width = 192;
-		}
-	}
-
-	invisible
-	{
-		color = 15; // White
-		title = "Misc. Invisible";
-		width = 0;
-		height = 0;
-		sprite = "UNKNA0";
-		sort = 1;
-		fixedsize = true;
-		blocking = 0;
-
-		700
-		{
-			title = "Water Ambience A (Large)";
-			sprite = "internal:ambiance";
-		}
-
-		701
-		{
-			title = "Water Ambience B (Large)";
-			sprite = "internal:ambiance";
-		}
-
-		702
-		{
-			title = "Water Ambience C (Medium)";
-			sprite = "internal:ambiance";
-		}
-
-		703
-		{
-			title = "Water Ambience D (Medium)";
-			sprite = "internal:ambiance";
-		}
-
-		704
-		{
-			title = "Water Ambience E (Small)";
-			sprite = "internal:ambiance";
-		}
-
-		705
-		{
-			title = "Water Ambience F (Small)";
-			sprite = "internal:ambiance";
-		}
-
-		706
-		{
-			title = "Water Ambience G (Extra Large)";
-			sprite = "internal:ambiance";
-		}
-
-		707
-		{
-			title = "Water Ambience H (Extra Large)";
-			sprite = "internal:ambiance";
-		}
-
-		708
-		{
-			title = "Disco Ambience";
-			sprite = "internal:ambiance";
-		}
-
-		709
-		{
-			title = "Volcano Ambience";
-			sprite = "internal:ambiance";
-		}
-
-		710
-		{
-			title = "Machine Ambience";
-			sprite = "internal:ambiance";
-		}
-
-		750
-		{
-			title = "Slope Vertex";
-			sprite = "internal:vertexslope";
-		}
-
-		751
-		{
-			arrow = 1;
-			title = "Teleport Destination";
-			sprite = "internal:tele";
-		}
-
-		752
-		{
-			arrow = 1;
-			title = "Alternate View Point";
-			sprite = "internal:view";
-		}
-
-		753
-		{
-			title = "Zoom Tube Waypoint";
-			sprite = "internal:zoom";
-		}
-
-		754
-		{
-			title = "Push Point";
-			sprite = "GWLGA0";
-		}
-		755
-		{
-			title = "Pull Point";
-			sprite = "GWLRA0";
-		}
-		756
-		{
-			title = "Blast Linedef Executor";
-			sprite = "TOADA0";
-			width = 32;
-			height = 16;
-		}
-		757
-		{
-			title = "Fan Particle Generator";
-			sprite = "PRTLA0";
-			width = 8;
-			height = 16;
-		}
-		758
-		{
-			title = "Object Angle Anchor";
-			sprite = "internal:view";
-		}
-		760
-		{
-			title = "PolyObject Anchor";
-			sprite = "internal:polyanchor";
-		}
-		761
-		{
-			title = "PolyObject Spawn Point";
-			sprite = "internal:polycenter";
-		}
-		762
-		{
-			title = "PolyObject Spawn Point (Crush)";
-			sprite = "internal:polycentercrush";
-		}
-		780
-		{
-			title = "Skybox View Point";
-			sprite = "internal:skyb";
-		}
-	}
-
-	greenflower
-	{
-		color = 10; // Green
-		title = "Greenflower";
-
-		800
-		{
-			title = "GFZ Flower";
-			sprite = "FWR1A0";
-			width = 16;
-			height = 40;
-		}
-		801
-		{
-			title = "Sunflower";
-			sprite = "FWR2A0";
-			width = 16;
-			height = 96;
-		}
-		802
-		{
-			title = "Budding Flower";
-			sprite = "FWR3A0";
-			width = 8;
-			height = 32;
-		}
-		803
-		{
-			title = "Blueberry Bush";
-			sprite = "BUS3A0";
-			width = 16;
-			height = 32;
-		}
-		804
-		{
-			title = "Berry Bush";
-			sprite = "BUS1A0";
-			width = 16;
-			height = 32;
-		}
-		805
-		{
-			title = "Bush";
-			sprite = "BUS2A0";
-			width = 16;
-			height = 32;
-		}
-		806
-		{
-			title = "GFZ Tree";
-			sprite = "TRE1A0";
-			width = 20;
-			height = 128;
-		}
-		807
-		{
-			title = "GFZ Berry Tree";
-			sprite = "TRE1B0";
-			width = 20;
-			height = 128;
-		}
-		808
-		{
-			title = "GFZ Cherry Tree";
-			sprite = "TRE1C0";
-			width = 20;
-			height = 128;
-		}
-		809
-		{
-			title = "Checkered Tree";
-			sprite = "TRE2A0";
-			width = 20;
-			height = 200;
-		}
-		810
-		{
-			title = "Checkered Tree (Sunset)";
-			sprite = "TRE2B0";
-			width = 20;
-			height = 200;
-		}
-		811
-		{
-			title = "Polygon Tree";
-			sprite = "TRE4A0";
-			width = 20;
-			height = 200;
-		}
-		812
-		{
-			title = "Bush Tree";
-			sprite = "TRE5A0";
-			width = 20;
-			height = 200;
-		}
-		813
-		{
-			title = "Red Bush Tree";
-			sprite = "TRE5B0";
-			width = 20;
-			height = 200;
-		}
-	}
-
-	technohill
-	{
-		color = 10; // Green
-		title = "Techno Hill";
-
-		900
-		{
-			title = "THZ Steam Flower";
-			sprite = "THZPA0";
-			width = 8;
-			height = 32;
-		}
-		901
-		{
-			title = "Alarm";
-			sprite = "ALRMA0";
-			width = 8;
-			height = 16;
-			hangs = 1;
-		}
-		902
-		{
-			title = "THZ Spin Flower (Red)";
-			sprite = "FWR5A0";
-			width = 16;
-			height = 64;
-		}
-		903
-		{
-			title = "THZ Spin Flower (Yellow)";
-			sprite = "FWR6A0";
-			width = 16;
-			height = 64;
-		}
-		904
-		{
-			arrow = 1;
-			title = "Whistlebush";
-			sprite = "THZTA0";
-			width = 16;
-			height = 64;
-		}
-	}
-
-	deepsea
-	{
-		color = 10; // Green
-		title = "Deep Sea";
-
-		1000
-		{
-			arrow = 1;
-			blocking = 2;
-			title = "Gargoyle";
-			sprite = "GARGA1";
-			width = 16;
-			height = 40;
-		}
-		1009
-		{
-			arrow = 1;
-			blocking = 2;
-			title = "Gargoyle (Big)";
-			sprite = "GARGB1";
-			width = 32;
-			height = 80;
-		}
-		1001
-		{
-			title = "Seaweed";
-			sprite = "SEWEA0";
-			width = 24;
-			height = 56;
-		}
-		1002
-		{
-			title = "Dripping Water";
-			sprite = "DRIPD0";
-			width = 8;
-			height = 16;
-			hangs = 1;
-		}
-		1003
-		{
-			title = "Coral (Green)";
-			sprite = "CORLA0";
-			width = 29;
-			height = 40;
-		}
-		1004
-		{
-			title = "Coral (Red)";
-			sprite = "CORLB0";
-			width = 30;
-			height = 53;
-		}
-		1005
-		{
-			title = "Coral (Orange)";
-			sprite = "CORLC0";
-			width = 28;
-			height = 41;
-		}
-		1006
-		{
-			title = "Blue Crystal";
-			sprite = "BCRYA1";
-			width = 8;
-			height = 16;
-		}
-		1007
-		{
-			title = "Kelp";
-			sprite = "KELPA0";
-			width = 16;
-			height = 292;
-		}
-		1008
-		{
-			title = "Stalagmite (DSZ1)";
-			sprite = "DSTGA0";
-			width = 8;
-			height = 116;
-		}
-		1010
-		{
-			arrow = 1;
-			title = "Light Beam";
-			sprite = "LIBEARAL";
-			width = 16;
-			height = 16;
-		}
-		1011
-		{
-			title = "Stalagmite (DSZ2)";
-			sprite = "DSTGA0";
-			width = 8;
-			height = 116;
-		}
-		1012
-		{
-			arrow = 1;
-			title = "Big Floating Mine";
-			width = 28;
-			height = 56;
-			sprite = "BMNEA1";
-		}
-		1013
-		{
-			title = "Animated Kelp";
-			sprite = "ALGAA0";
-			width = 48;
-			height = 120;
-		}
-		1014
-		{
-			title = "Large Coral (Brown)";
-			sprite = "CORLD0";
-			width = 56;
-			height = 112;
-		}
-		1015
-		{
-			title = "Large Coral (Beige)";
-			sprite = "CORLE0";
-			width = 56;
-			height = 112;
-		}
-	}
-
-	castleeggman
-	{
-		color = 10; // Green
-		title = "Castle Eggman";
-
-		1100
-		{
-			title = "Chain (Decorative)";
-			sprite = "CHANA0";
-			width = 4;
-			height = 128;
-			hangs = 1;
-		}
-		1101
-		{
-			title = "Torch";
-			sprite = "FLAMA0E0";
-			width = 8;
-			height = 32;
-		}
-		1102
-		{
-			arrow = 1;
-			blocking = 2;
-			title = "Eggman Statue";
-			sprite = "ESTAA1";
-			width = 32;
-			height = 240;
-		}
-		1103
-		{
-			title = "CEZ Flower";
-			sprite = "FWR4A0";
-			width = 16;
-			height = 40;
-		}
-		1104
-		{
-			title = "Mace Spawnpoint";
-			sprite = "SMCEA0";
-			width = 17;
-			height = 34;
-		}
-		1105
-		{
-			title = "Chain with Maces Spawnpoint";
-			sprite = "SMCEA0";
-			width = 17;
-			height = 34;
-		}
-		1106
-		{
-			title = "Chained Spring Spawnpoint";
-			sprite = "YSPBA0";
-			width = 17;
-			height = 34;
-		}
-		1107
-		{
-			title = "Chain Spawnpoint";
-			sprite = "BMCHA0";
-			width = 17;
-			height = 34;
-		}
-		1108
-		{
-			arrow = 1;
-			title = "Hidden Chain Spawnpoint";
-			sprite = "internal:chain3";
-			width = 17;
-			height = 34;
-		}
-		1109
-		{
-			title = "Firebar Spawnpoint";
-			sprite = "BFBRA0";
-			width = 17;
-			height = 34;
-		}
-		1110
-		{
-			title = "Custom Mace Spawnpoint";
-			sprite = "SMCEA0";
-			width = 17;
-			height = 34;
-		}
-		1111
-		{
-			arrow = 1;
-			blocking = 2;
-			title = "Crawla Statue";
-			sprite = "CSTAA1";
-			width = 16;
-			height = 40;
-		}
-		1112
-		{
-			arrow = 1;
-			blocking = 2;
-			title = "Lance-a-Bot Statue";
-			sprite = "CBBSA1";
-			width = 32;
-			height = 72;
-		}
-		1114
-		{
-			title = "Pine Tree";
-			sprite = "PINEA0";
-			width = 16;
-			height = 628;
-		}
-		1115
-		{
-			title = "CEZ Shrub (Small)";
-			sprite = "CEZBA0";
-			width = 16;
-			height = 24;
-		}
-		1116
-		{
-			title = "CEZ Shrub (Large)";
-			sprite = "CEZBB0";
-			width = 32;
-			height = 48;
-		}
-		1117
-		{
-			arrow = 1;
-			title = "Pole Banner (Red)";
-			sprite = "BANRA0";
-			width = 40;
-			height = 224;
-		}
-		1118
-		{
-			arrow = 1;
-			title = "Pole Banner (Blue)";
-			sprite = "BANRA0";
-			width = 40;
-			height = 224;
-		}
-		1119
-		{
-			title = "Candle";
-			sprite = "CNDLA0";
-			width = 8;
-			height = 48;
-		}
-		1120
-		{
-			title = "Candle Pricket";
-			sprite = "CNDLB0";
-			width = 8;
-			height = 176;
-		}
-		1121
-		{
-			title = "Flame Holder";
-			sprite = "FLMHA0";
-			width = 24;
-			height = 80;
-		}
-		1122
-		{
-			title = "Fire Torch";
-			sprite = "CTRCA0";
-			width = 16;
-			height = 80;
-		}
-		1123
-		{
-			title = "Cannonball Launcher";
-			sprite = "internal:cannonball";
-			width = 8;
-			height = 16;
-		}
-		1124
-		{
-			blocking = 2;
-			title = "Cannonball";
-			sprite = "CBLLA0";
-			width = 20;
-			height = 40;
-		}
-		1125
-		{
-			title = "Brambles";
-			sprite = "CABRALAR";
-			width = 48;
-			height = 32;
-		}
-		1126
-		{
-			title = "Invisible Lockon Object";
-			sprite = "LCKNC0";
-			width = 16;
-			height = 32;
-		}
-		1127
-		{
-			title = "Spectator Eggrobo";
-			sprite = "EGR1A1";
-			width = 20;
-			height = 72;
-		}
-		1128
-		{
-			arrow = 1;
-			title = "Waving Flag (Red)";
-			sprite = "CFLGA0";
-			width = 8;
-			height = 208;
-		}
-		1129
-		{
-			arrow = 1;
-			title = "Waving Flag (Blue)";
-			sprite = "CFLGA0";
-			width = 8;
-			height = 208;
-		}
-	}
-
-	aridcanyon
-	{
-		color = 10; // Green
-		title = "Arid Canyon";
-
-		1200
-		{
-			title = "Tumbleweed (Big)";
-			sprite = "BTBLA0";
-			width = 24;
-			height = 48;
-		}
-		1201
-		{
-			title = "Tumbleweed (Small)";
-			sprite = "STBLA0";
-			width = 12;
-			height = 24;
-		}
-		1202
-		{
-			arrow = 1;
-			title = "Rock Spawner";
-			sprite = "ROIAA0";
-			width = 8;
-			height = 16;
-		}
-		1203
-		{
-			title = "Tiny Red Flower Cactus";
-			sprite = "CACTA0";
-			width = 13;
-			height = 24;
-		}
-		1204
-		{
-			title = "Small Red Flower Cactus";
-			sprite = "CACTB0";
-			width = 15;
-			height = 52;
-		}
-		1205
-		{
-			title = "Tiny Blue Flower Cactus";
-			sprite = "CACTC0";
-			width = 13;
-			height = 24;
-		}
-		1206
-		{
-			title = "Small Blue Flower Cactus";
-			sprite = "CACTD0";
-			width = 15;
-			height = 52;
-		}
-		1207
-		{
-			title = "Prickly Pear";
-			sprite = "CACTE0";
-			width = 32;
-			height = 96;
-		}
-		1208
-		{
-			title = "Barrel Cactus";
-			sprite = "CACTF0";
-			width = 20;
-			height = 128;
-		}
-		1209
-		{
-			title = "Tall Barrel Cactus";
-			sprite = "CACTG0";
-			width = 24;
-			height = 224;
-		}
-		1210
-		{
-			title = "Armed Cactus";
-			sprite = "CACTH0";
-			width = 24;
-			height = 256;
-		}
-		1211
-		{
-			title = "Ball Cactus";
-			sprite = "CACTI0";
-			width = 48;
-			height = 96;
-		}
-		1212
-		{
-			title = "Caution Sign";
-			sprite = "WWSGAR";
-			width = 22;
-			height = 64;
-		}
-		1213
-		{
-			title = "Cacti Sign";
-			sprite = "WWS2AR";
-			width = 22;
-			height = 64;
-		}
-		1214
-		{
-			title = "Sharp Turn Sign";
-			sprite = "WWS3ALAR";
-			width = 16;
-			height = 192;
-		}
-		1215
-		{
-			title = "Mine Oil Lamp";
-			sprite = "OILLA0";
-			width = 22;
-			height = 64;
-			hangs = 1;
-		}
-		1216
-		{
-			title = "TNT Barrel";
-			sprite = "BARRA1";
-			width = 24;
-			height = 63;
-		}
-		1217
-		{
-			title = "TNT Proximity Shell";
-			sprite = "REMTA0";
-			width = 64;
-			height = 40;
-		}
-		1218
-		{
-			title = "Dust Devil";
-			sprite = "TAZDCR";
-			width = 80;
-			height = 416;
-		}
-		1219
-		{
-			title = "Minecart Spawner";
-			sprite = "MCRTCLFR";
-			width = 22;
-			height = 32;
-		}
-		1220
-		{
-			title = "Minecart Stopper";
-			sprite = "MCRTIR";
-			width = 32;
-			height = 32;
-		}
-		1221
-		{
-			title = "Minecart Saloon Door";
-			sprite = "SALDARAL";
-			width = 96;
-			height = 160;
-		}
-		1222
-		{
-			title = "Train Cameo Spawner";
-			sprite = "TRAEBRBL";
-			width = 28;
-			height = 32;
-		}
-		1223
-		{
-			title = "Train Dust Spawner";
-			sprite = "ADSTA0";
-			width = 4;
-			height = 4;
-		}
-		1224
-		{
-			title = "Train Steam Spawner";
-			sprite = "STEAA0";
-			width = 4;
-			height = 4;
-		}
-		1229
-		{
-			title = "Minecart Switch Point";
-			sprite = "internal:zoom";
-			width = 8;
-			height = 16;
-		}
-		1230
-		{
-			title = "Tiny Cactus";
-			sprite = "CACTJ0";
-			width = 13;
-			height = 28;
-		}
-		1231
-		{
-			title = "Small Cactus";
-			sprite = "CACTK0";
-			width = 15;
-			height = 60;
-		}
-	}
-
-	redvolcano
-	{
-		color = 10; // Green
-		title = "Red Volcano";
-
-		1300
-		{
-			arrow = 1;
-			title = "Flame Jet (Horizontal)";
-			sprite = "internal:flameh";
-			width = 16;
-			height = 40;
-		}
-		1301
-		{
-			title = "Flame Jet (Vertical)";
-			sprite = "internal:flamev";
-			width = 16;
-			height = 40;
-		}
-		1302
-		{
-			title = "Spinning Flame Jet (Counter-Clockwise)";
-			sprite = "internal:flame2";
-			width = 16;
-			height = 24;
-		}
-		1303
-		{
-			title = "Spinning Flame Jet (Clockwise)";
-			sprite = "internal:flame1";
-			width = 16;
-			height = 24;
-		}
-		1304
-		{
-			title = "Lavafall";
-			sprite = "LFALF0";
-			width = 30;
-			height = 32;
-		}
-		1305
-		{
-			title = "Rollout Rock";
-			sprite = "PUMIA1A5";
-			width = 30;
-			height = 60;
-		}
-		1306
-		{
-			title = "Big Fern";
-			sprite = "JPLAB0";
-			width = 32;
-			height = 48;
-		}
-		1307
-		{
-			title = "Jungle Palm";
-			sprite = "JPLAC0";
-			width = 32;
-			height = 48;
-		}
-		1308
-		{
-			title = "Torch Flower";
-			sprite = "TFLOA0";
-			width = 14;
-			height = 110;
-		}
-		1309
-		{
-			title = "RVZ1 Wall Vine (Long)";
-			sprite = "WVINALAR";
-			width = 1;
-			height = 288;
-		}
-		1310
-		{
-			title = "RVZ1 Wall Vine (Short)";
-			sprite = "WVINBLBR";
-			width = 1;
-			height = 288;
-		}
-	}
-
-	botanicserenity
-	{
-		color = 10; // Green
-		title = "Botanic Serenity";
-		width = 16;
-		height = 32;
-		sprite = "BSZ1A0";
-		1400
-		{
-			title = "Tall Flower (Red)";
-			sprite = "BSZ1A0";
-		}
-		1401
-		{
-			title = "Tall Flower (Purple)";
-			sprite = "BSZ1B0";
-		}
-		1402
-		{
-			title = "Tall Flower (Blue)";
-			sprite = "BSZ1C0";
-		}
-		1403
-		{
-			title = "Tall Flower (Cyan)";
-			sprite = "BSZ1D0";
-		}
-		1404
-		{
-			title = "Tall Flower (Yellow)";
-			sprite = "BSZ1E0";
-		}
-		1405
-		{
-			title = "Tall Flower (Orange)";
-			sprite = "BSZ1F0";
-		}
-		1410
-		{
-			title = "Medium Flower (Red)";
-			sprite = "BSZ2A0";
-		}
-		1411
-		{
-			title = "Medium Flower (Purple)";
-			sprite = "BSZ2B0";
-		}
-		1412
-		{
-			title = "Medium Flower (Blue)";
-			sprite = "BSZ2C0";
-		}
-		1413
-		{
-			title = "Medium Flower (Cyan)";
-			sprite = "BSZ2D0";
-		}
-		1414
-		{
-			title = "Medium Flower (Yellow)";
-			sprite = "BSZ2E0";
-		}
-		1415
-		{
-			title = "Medium Flower (Orange)";
-			sprite = "BSZ2F0";
-		}
-		1420
-		{
-			title = "Short Flower (Red)";
-			sprite = "BSZ3A0";
-		}
-		1421
-		{
-			title = "Short Flower (Purple)";
-			sprite = "BSZ3B0";
-		}
-		1422
-		{
-			title = "Short Flower (Blue)";
-			sprite = "BSZ3C0";
-		}
-		1423
-		{
-			title = "Short Flower (Cyan)";
-			sprite = "BSZ3D0";
-		}
-		1424
-		{
-			title = "Short Flower (Yellow)";
-			sprite = "BSZ3E0";
-		}
-		1425
-		{
-			title = "Short Flower (Orange)";
-			sprite = "BSZ3F0";
-		}
-		1430
-		{
-			title = "Tulip (Red)";
-			sprite = "BST1A0";
-		}
-		1431
-		{
-			title = "Tulip (Purple)";
-			sprite = "BST2A0";
-		}
-		1432
-		{
-			title = "Tulip (Blue)";
-			sprite = "BST3A0";
-		}
-		1433
-		{
-			title = "Tulip (Cyan)";
-			sprite = "BST4A0";
-		}
-		1434
-		{
-			title = "Tulip (Yellow)";
-			sprite = "BST5A0";
-		}
-		1435
-		{
-			title = "Tulip (Orange)";
-			sprite = "BST6A0";
-		}
-		1440
-		{
-			title = "Cluster (Red)";
-			sprite = "BSZ5A0";
-		}
-		1441
-		{
-			title = "Cluster (Purple)";
-			sprite = "BSZ5B0";
-		}
-		1442
-		{
-			title = "Cluster (Blue)";
-			sprite = "BSZ5C0";
-		}
-		1443
-		{
-			title = "Cluster (Cyan)";
-			sprite = "BSZ5D0";
-		}
-		1444
-		{
-			title = "Cluster (Yellow)";
-			sprite = "BSZ5E0";
-		}
-		1445
-		{
-			title = "Cluster (Orange)";
-			sprite = "BSZ5F0";
-		}
-		1450
-		{
-			title = "Bush (Red)";
-			sprite = "BSZ6A0";
-		}
-		1451
-		{
-			title = "Bush (Purple)";
-			sprite = "BSZ6B0";
-		}
-		1452
-		{
-			title = "Bush (Blue)";
-			sprite = "BSZ6C0";
-		}
-		1453
-		{
-			title = "Bush (Cyan)";
-			sprite = "BSZ6D0";
-		}
-		1454
-		{
-			title = "Bush (Yellow)";
-			sprite = "BSZ6E0";
-		}
-		1455
-		{
-			title = "Bush (Orange)";
-			sprite = "BSZ6F0";
-		}
-		1460
-		{
-			title = "Vine (Red)";
-			sprite = "BSZ7A0";
-		}
-		1461
-		{
-			title = "Vine (Purple)";
-			sprite = "BSZ7B0";
-		}
-		1462
-		{
-			title = "Vine (Blue)";
-			sprite = "BSZ7C0";
-		}
-		1463
-		{
-			title = "Vine (Cyan)";
-			sprite = "BSZ7D0";
-		}
-		1464
-		{
-			title = "Vine (Yellow)";
-			sprite = "BSZ7E0";
-		}
-		1465
-		{
-			title = "Vine (Orange)";
-			sprite = "BSZ7F0";
-		}
-		1470
-		{
-			title = "BSZ Shrub";
-			sprite = "BSZ8A0";
-		}
-		1471
-		{
-			title = "BSZ Clover";
-			sprite = "BSZ8B0";
-		}
-		1473
-		{
-			title = "Palm Tree (Big)";
-			width = 16;
-			height = 160;
-			sprite = "BSZ8D0";
-		}
-		1475
-		{
-			title = "Palm Tree (Small)";
-			width = 16;
-			height = 80;
-			sprite = "BSZ8F0";
-		}
-	}
-
-	azuretemple
-	{
-		color = 10; // Green
-		title = "Azure Temple";
-
-		1500
-		{
-			arrow = 1;
-			blocking = 2;
-			title = "Glaregoyle";
-			sprite = "BGARA1";
-			width = 16;
-			height = 40;
-		}
-		1501
-		{
-			arrow = 1;
-			blocking = 2;
-			title = "Glaregoyle (Up)";
-			sprite = "BGARA1";
-			width = 16;
-			height = 40;
-		}
-		1502
-		{
-			arrow = 1;
-			blocking = 2;
-			title = "Glaregoyle (Down)";
-			sprite = "BGARA1";
-			width = 16;
-			height = 40;
-		}
-		1503
-		{
-			arrow = 1;
-			blocking = 2;
-			title = "Glaregoyle (Long)";
-			sprite = "BGARA1";
-			width = 16;
-			height = 40;
-		}
-		1504
-		{
-			title = "ATZ Target";
-			sprite = "RCRYB0";
-			width = 24;
-			height = 32;
-		}
-		1505
-		{
-			title = "Green Flame";
-			sprite = "CFLMA0E0";
-			width = 8;
-			height = 32;
-		}
-		1506
-		{
-			arrow = 1;
-			blocking = 2;
-			title = "Blue Gargoyle";
-			sprite = "BGARD1";
-			width = 16;
-			height = 40;
-		}
-	}
-
-	dreamhill
-	{
-		color = 10; // Green
-		title = "Dream Hill";
-
-		1600
-		{
-			title = "Spring Tree";
-			sprite = "TRE6A0";
-			width = 16;
-			height = 32;
-		}
-		1601
-		{
-			title = "Shleep";
-			sprite = "SHLPA0";
-			width = 24;
-			height = 32;
-		}
-		1602
-		{
-			title = "Nightopian";
-			sprite = "NTPNA1";
-			width = 16;
-			height = 40;
-		}
-	}
-
-	nightstrk
-	{
-		color = 13; // Pink
-		title = "NiGHTS Track";
-		width = 8;
-		height = 4096;
-		sprite = "UNKNA0";
-
-		1700
-		{
-			title = "Axis";
-			sprite = "internal:axis1";
-			circle = 1;
-		}
-		1701
-		{
-			title = "Axis Transfer";
-			sprite = "internal:axis2";
-		}
-		1702
-		{
-			title = "Axis Transfer Line";
-			sprite = "internal:axis3";
-		}
-		1710
-		{
-			title = "Ideya Capture";
-			sprite = "CAPSA0";
-			width = 72;
-			height = 144;
-		}
-	}
-
-	nights
-	{
-		color = 13; // Pink
-		title = "NiGHTS Items";
-		width = 16;
-		height = 32;
-
-		1703
-		{
-			title = "Ideya Drone";
-			sprite = "NDRNA1";
-			width = 16;
-			height = 56;
-		}
-		1704
-		{
-			arrow = 1;
-			title = "NiGHTS Bumper";
-			sprite = "NBMPG3G7";
-			width = 32;
-			height = 64;
-		}
-		1705
-		{
-			arrow = 1;
-			title = "Hoop (Generic)";
-			sprite = "HOOPA0";
-			width = 80;
-			height = 160;
-		}
-		1706
-		{
-			title = "Blue Sphere";
-			sprite = "SPHRA0";
-			width = 16;
-			height = 24;
-		}
-		1707
-		{
-			title = "Super Paraloop";
-			sprite = "NPRUA0";
-		}
-		1708
-		{
-			title = "Drill Refill";
-			sprite = "NPRUB0";
-		}
-		1709
-		{
-			title = "Nightopian Helper";
-			sprite = "NPRUC0";
-		}
-		1711
-		{
-			title = "Extra Time";
-			sprite = "NPRUD0";
-		}
-		1712
-		{
-			title = "Link Freeze";
-			sprite = "NPRUE0";
-		}
-		1713
-		{
-			arrow = 1;
-			title = "Hoop (Customizable)";
-			sprite = "HOOPA0";
-			width = 80;
-			height = 160;
-		}
-		1714
-		{
-			title = "Ideya Anchor Point";
-			sprite = "internal:axis1";
-			width = 8;
-			height = 16;
-		}
-	}
-
-	mario
-	{
-		color = 6; // Brown
-		title = "Mario";
-
-		1800
-		{
-			title = "Coin";
-			sprite = "COINA0";
-			width = 16;
-			height = 24;
-		}
-		1801
-		{
-			arrow = 1;
-			title = "Goomba";
-			sprite = "GOOMA0";
-			width = 24;
-			height = 32;
-		}
-		1802
-		{
-			arrow = 1;
-			title = "Goomba (Blue)";
-			sprite = "BGOMA0";
-			width = 24;
-			height = 32;
-		}
-		1803
-		{
-			title = "Fire Flower";
-			sprite = "FFWRB0";
-			width = 16;
-			height = 32;
-		}
-		1804
-		{
-			title = "Koopa Shell";
-			sprite = "SHLLA1";
-			width = 16;
-			height = 20;
-		}
-		1805
-		{
-			title = "Puma (Jumping Fireball)";
-			sprite = "PUMAA0";
-			width = 8;
-			height = 16;
-		}
-		1806
-		{
-			title = "King Bowser";
-			sprite = "KOOPA0";
-			width = 16;
-			height = 48;
-		}
-		1807
-		{
-			title = "Axe";
-			sprite = "MAXEA0";
-			width = 8;
-			height = 16;
-		}
-		1808
-		{
-			title = "Bush (Short)";
-			sprite = "MUS1A0";
-			width = 16;
-			height = 32;
-		}
-		1809
-		{
-			title = "Bush (Tall)";
-			sprite = "MUS2A0";
-			width = 16;
-			height = 32;
-		}
-		1810
-		{
-			title = "Toad";
-			sprite = "TOADA0";
-			width = 8;
-			height = 32;
-		}
-	}
-
-	christmasdisco
-	{
-		color = 10; // Green
-		title = "Christmas & Disco";
-
-		1850
-		{
-			title = "Christmas Pole";
-			sprite = "XMS1A0";
-			width = 16;
-			height = 40;
-		}
-		1851
-		{
-			title = "Candy Cane";
-			sprite = "XMS2A0";
-			width = 8;
-			height = 32;
-		}
-		1852
-		{
-			blocking = 2;
-			title = "Snowman";
-			sprite = "XMS3A0";
-			width = 16;
-			height = 64;
-		}
-		1853
-		{
-			blocking = 2;
-			title = "Snowman (With Hat)";
-			sprite = "XMS3B0";
-			width = 16;
-			height = 80;
-		}
-		1854
-		{
-			title = "Lamp Post";
-			sprite = "XMS4A0";
-			width = 8;
-			height = 120;
-		}
-		1855
-		{
-			title = "Lamp Post (Snow)";
-			sprite = "XMS4B0";
-			width = 8;
-			height = 120;
-		}
-		1856
-		{
-			title = "Hanging Star";
-			sprite = "XMS5A0";
-			width = 4;
-			height = 80;
-			hangs = 1;
-		}
-		1857
-		{
-			title = "Berry Bush (Snow)";
-			sprite = "BUS1B0";
-			width = 16;
-			height = 32;
-		}
-		1858
-		{
-			title = "Bush (Snow)";
-			sprite = "BUS2B0";
-			width = 16;
-			height = 32;
-		}
-		1859
-		{
-			title = "Blueberry Bush (Snow)";
-			sprite = "BUS3B0";
-			width = 16;
-			height = 32;
-		}
-		1875
-		{
-			title = "Disco Ball";
-			sprite = "DBALA0";
-			width = 16;
-			height = 54;
-			hangs = 1;
-		}
-		1876
-		{
-			arrow = 1;
-			blocking = 2;
-			title = "Eggman Disco Statue";
-			sprite = "ESTAB1";
-			width = 20;
-			height = 96;
-		}
-	}
-
-	stalagmites
-	{
-		color = 10; // Green
-		title = "Stalagmites";
-		width = 16;
-		height = 40;
-
-		1900
-		{
-			title = "Brown Stalagmite (Tall)";
-			sprite = "STLGA0";
-			width = 16;
-			height = 40;
-		}
-		1901
-		{
-			title = "Brown Stalagmite";
-			sprite = "STLGB0";
-			width = 16;
-			height = 40;
-		}
-		1902
-		{
-			title = "Orange Stalagmite (Tall)";
-			sprite = "STLGC0";
-			width = 16;
-			height = 40;
-		}
-		1903
-		{
-			title = "Orange Stalagmite";
-			sprite = "STLGD0";
-			width = 16;
-			height = 40;
-		}
-		1904
-		{
-			title = "Red Stalagmite (Tall)";
-			sprite = "STLGE0";
-			width = 16;
-			height = 40;
-		}
-		1905
-		{
-			title = "Red Stalagmite";
-			sprite = "STLGF0";
-			width = 16;
-			height = 40;
-		}
-		1906
-		{
-			title = "Gray Stalagmite (Tall)";
-			sprite = "STLGG0";
-			width = 24;
-			height = 96;
-		}
-		1907
-		{
-			title = "Gray Stalagmite";
-			sprite = "STLGH0";
-			width = 16;
-			height = 40;
-		}
-		1908
-		{
-			title = "Blue Stalagmite (Tall)";
-			sprite = "STLGI0";
-			width = 16;
-			height = 40;
-		}
-		1909
-		{
-			title = "Blue Stalagmite";
-			sprite = "STLGJ0";
-			width = 16;
-			height = 40;
-		}
-	}
-
-	hauntedheights
-	{
-		color = 10; // Green
-		title = "Haunted Heights";
-
-		2000
-		{
-			title = "Smashing Spikeball";
-			sprite = "FMCEA0";
-			width = 18;
-			height = 28;
-		}
-		2001
-		{
-			title = "HHZ Grass";
-			sprite = "HHZMA0";
-			width = 16;
-			height = 40;
-		}
-		2002
-		{
-			title = "HHZ Tentacle 1";
-			sprite = "HHZMB0";
-			width = 16;
-			height = 40;
-		}
-		2003
-		{
-			title = "HHZ Tentacle 2";
-			sprite = "HHZMC0";
-			width = 16;
-			height = 40;
-		}
-		2004
-		{
-			title = "HHZ Stalagmite (Tall)";
-			sprite = "HHZME0";
-			width = 16;
-			height = 40;
-		}
-		2005
-		{
-			title = "HHZ Stalagmite (Short)";
-			sprite = "HHZMF0";
-			width = 16;
-			height = 40;
-		}
-		2006
-		{
-			title = "Jack-o'-lantern 1";
-			sprite = "PUMKA0";
-			width = 16;
-			height = 40;
-		}
-		2007
-		{
-			title = "Jack-o'-lantern 2";
-			sprite = "PUMKB0";
-			width = 16;
-			height = 40;
-		}
-		2008
-		{
-			title = "Jack-o'-lantern 3";
-			sprite = "PUMKC0";
-			width = 16;
-			height = 40;
-		}
-		2009
-		{
-			title = "Purple Mushroom";
-			sprite = "SHRMD0";
-			width = 16;
-			height = 48;
-		}
-		2010
-		{
-			title = "HHZ Tree";
-			sprite = "HHPLC0";
-			width = 12;
-			height = 40;
-		}
-	}
-
-	frozenhillside
-	{
-		color = 10; // Green
-		title = "Frozen Hillside";
-
-		2100
-		{
-			title = "Ice Shard (Small)";
-			sprite = "FHZIA0";
-			width = 8;
-			height = 32;
-		}
-		2101
-		{
-			title = "Ice Shard (Large)";
-			sprite = "FHZIB0";
-			width = 8;
-			height = 32;
-		}
-		2102
-		{
-			title = "Crystal Tree (Aqua)";
-			sprite = "TRE3A0";
-			width = 20;
-			height = 200;
-		}
-		2103
-		{
-			title = "Crystal Tree (Pink)";
-			sprite = "TRE3B0";
-			width = 20;
-			height = 200;
-		}
-		2104
-		{
-			title = "Amy Cameo";
-			sprite = "ROSYA1";
-			width = 16;
-			height = 48;
-		}
-		2105
-		{
-			title = "Mistletoe";
-			sprite = "XMS6A0";
-			width = 52;
-			height = 106;
-		}
-	}
-
-	tutorial
-	{
-		color = 10; // Green
-		title = "Tutorial";
-
-		799
-		{
-			title = "Tutorial Plant";
-			sprite = "TUPFH0";
-			width = 40;
-			height = 144;
-		}
-	}
-
-	flickies
-	{
-		color = 10; // Green
-		title = "Flickies";
-		width = 8;
-		height = 20;
-
-		2200
-		{
-			title = "Bluebird";
-			sprite = "FL01A1";
-		}
-		2201
-		{
-			title = "Rabbit";
-			sprite = "FL02A1";
-		}
-		2202
-		{
-			title = "Chicken";
-			sprite = "FL03A1";
-		}
-		2203
-		{
-			title = "Seal";
-			sprite = "FL04A1";
-		}
-		2204
-		{
-			title = "Pig";
-			sprite = "FL05A1";
-		}
-		2205
-		{
-			title = "Chipmunk";
-			sprite = "FL06A1";
-		}
-		2206
-		{
-			title = "Penguin";
-			sprite = "FL07A1";
-		}
-		2207
-		{
-			title = "Fish";
-			sprite = "FL08A1";
-		}
-		2208
-		{
-			title = "Ram";
-			sprite = "FL09A1";
-		}
-		2209
-		{
-			title = "Puffin";
-			sprite = "FL10A1";
-		}
-		2210
-		{
-			title = "Cow";
-			sprite = "FL11A1";
-		}
-		2211
-		{
-			title = "Rat";
-			sprite = "FL12A1";
-		}
-		2212
-		{
-			title = "Bear";
-			sprite = "FL13A1";
-		}
-		2213
-		{
-			title = "Dove";
-			sprite = "FL14A1";
-		}
-		2214
-		{
-			title = "Cat";
-			sprite = "FL15A1";
-		}
-		2215
-		{
-			title = "Canary";
-			sprite = "FL16A1";
-		}
-		2216
-		{
-			title = "Spider";
-			sprite = "FS01A1";
-		}
-		2217
-		{
-			title = "Bat";
-			sprite = "FS02A0";
-		}
-	}
-}
-
 udmf
 {
-	editor
-	{
-		color = 15; // White
-		arrow = 1;
-		title = "<Editor Things>";
-		error = -1;
-		width = 8;
-		height = 16;
-		sort = 1;
-
-		3328 = "3D Mode Start";
-	}
 
 	starts
 	{
@@ -3974,7 +807,7 @@ udmf
 
 	bosses
 	{
-		color = 8; // Dark_Gray
+		color = 4; // Dark Red
 		arrow = 1;
 		title = "Bosses";
 
@@ -4355,95 +1188,185 @@ udmf
 		width = 24;
 		height = 24;
 		sprite = "RINGA0";
-		arg0
-		{
-			title = "Float?";
-			type = 11;
-			enum = "yesno";
-		}
 
 		300
 		{
 			title = "Ring";
 			sprite = "RINGA0";
 			width = 16;
+			arg0
+			{
+				title = "Float?";
+				type = 11;
+				enum = "yesno";
+			}
 		}
 		301
 		{
 			title = "Bounce Ring";
-			sprite = "internal:RNGBA0";
+			sprite = "RNGBA0";
+			arg0
+			{
+				title = "Float?";
+				type = 11;
+				enum = "yesno";
+			}
 		}
 		302
 		{
 			title = "Rail Ring";
-			sprite = "internal:RNGRA0";
+			sprite = "RNGRA0";
+			arg0
+			{
+				title = "Float?";
+				type = 11;
+				enum = "yesno";
+			}
 		}
 		303
 		{
 			title = "Infinity Ring";
-			sprite = "internal:RNGIA0";
+			sprite = "RNGIA0";
+			arg0
+			{
+				title = "Float?";
+				type = 11;
+				enum = "yesno";
+			}
 		}
 		304
 		{
 			title = "Automatic Ring";
-			sprite = "internal:RNGAA0";
+			sprite = "RNGAA0";
+			arg0
+			{
+				title = "Float?";
+				type = 11;
+				enum = "yesno";
+			}
 		}
 		305
 		{
 			title = "Explosion Ring";
-			sprite = "internal:RNGEA0";
+			sprite = "RNGEA0";
+			arg0
+			{
+				title = "Float?";
+				type = 11;
+				enum = "yesno";
+			}
 		}
 		306
 		{
 			title = "Scatter Ring";
-			sprite = "internal:RNGSA0";
+			sprite = "RNGSA0";
+			arg0
+			{
+				title = "Float?";
+				type = 11;
+				enum = "yesno";
+			}
 		}
 		307
 		{
 			title = "Grenade Ring";
-			sprite = "internal:RNGGA0";
+			sprite = "RNGGA0";
+			arg0
+			{
+				title = "Float?";
+				type = 11;
+				enum = "yesno";
+			}
 		}
 		308
 		{
 			title = "CTF Team Ring (Red)";
-			sprite = "internal:RRNGA0";
+			sprite = "internal:TRNGA0R";
 			width = 16;
+			arg0
+			{
+				title = "Float?";
+				type = 11;
+				enum = "yesno";
+			}
 		}
 		309
 		{
 			title = "CTF Team Ring (Blue)";
-			sprite = "internal:BRNGA0";
+			sprite = "internal:TRNGA0B";
 			width = 16;
+			arg0
+			{
+				title = "Float?";
+				type = 11;
+				enum = "yesno";
+			}
 		}
 		330
 		{
 			title = "Bounce Ring Panel";
-			sprite = "internal:PIKBA0";
+			sprite = "PIKBA0";
+			arg0
+			{
+				title = "Float?";
+				type = 11;
+				enum = "yesno";
+			}
 		}
 		331
 		{
 			title = "Rail Ring Panel";
-			sprite = "internal:PIKRA0";
+			sprite = "PIKRA0";
+			arg0
+			{
+				title = "Float?";
+				type = 11;
+				enum = "yesno";
+			}
 		}
 		332
 		{
 			title = "Automatic Ring Panel";
-			sprite = "internal:PIKAA0";
+			sprite = "PIKAA0";
+			arg0
+			{
+				title = "Float?";
+				type = 11;
+				enum = "yesno";
+			}
 		}
 		333
 		{
 			title = "Explosion Ring Panel";
-			sprite = "internal:PIKEA0";
+			sprite = "PIKEA0";
+			arg0
+			{
+				title = "Float?";
+				type = 11;
+				enum = "yesno";
+			}
 		}
 		334
 		{
 			title = "Scatter Ring Panel";
-			sprite = "internal:PIKSA0";
+			sprite = "PIKSA0";
+			arg0
+			{
+				title = "Float?";
+				type = 11;
+				enum = "yesno";
+			}
 		}
 		335
 		{
 			title = "Grenade Ring Panel";
-			sprite = "internal:PIKGA0";
+			sprite = "PIKGA0";
+			arg0
+			{
+				title = "Float?";
+				type = 11;
+				enum = "yesno";
+			}
 		}
 	}
 
@@ -4562,16 +1485,16 @@ udmf
 		title = "Monitors";
 		width = 18;
 		height = 40;
-		arg0
-		{
-			title = "Death trigger tag";
-			type = 15;
-		}
 
 		400
 		{
 			title = "Super Ring (10 Rings)";
 			sprite = "TVRIA0";
+			arg0
+			{
+				title = "Death trigger tag";
+				type = 15;
+			}
 			arg1
 			{
 				title = "Respawn behavior";
@@ -4583,6 +1506,11 @@ udmf
 		{
 			title = "Pity Shield";
 			sprite = "TVPIA0";
+			arg0
+			{
+				title = "Death trigger tag";
+				type = 15;
+			}
 			arg1
 			{
 				title = "Respawn behavior";
@@ -4594,6 +1522,11 @@ udmf
 		{
 			title = "Attraction Shield";
 			sprite = "TVATA0";
+			arg0
+			{
+				title = "Death trigger tag";
+				type = 15;
+			}
 			arg1
 			{
 				title = "Respawn behavior";
@@ -4605,6 +1538,11 @@ udmf
 		{
 			title = "Force Shield";
 			sprite = "TVFOA0";
+			arg0
+			{
+				title = "Death trigger tag";
+				type = 15;
+			}
 			arg1
 			{
 				title = "Respawn behavior";
@@ -4616,6 +1554,11 @@ udmf
 		{
 			title = "Armageddon Shield";
 			sprite = "TVARA0";
+			arg0
+			{
+				title = "Death trigger tag";
+				type = 15;
+			}
 			arg1
 			{
 				title = "Respawn behavior";
@@ -4627,6 +1570,11 @@ udmf
 		{
 			title = "Whirlwind Shield";
 			sprite = "TVWWA0";
+			arg0
+			{
+				title = "Death trigger tag";
+				type = 15;
+			}
 			arg1
 			{
 				title = "Respawn behavior";
@@ -4638,6 +1586,11 @@ udmf
 		{
 			title = "Elemental Shield";
 			sprite = "TVELA0";
+			arg0
+			{
+				title = "Death trigger tag";
+				type = 15;
+			}
 			arg1
 			{
 				title = "Respawn behavior";
@@ -4649,6 +1602,11 @@ udmf
 		{
 			title = "Super Sneakers";
 			sprite = "TVSSA0";
+			arg0
+			{
+				title = "Death trigger tag";
+				type = 15;
+			}
 			arg1
 			{
 				title = "Respawn behavior";
@@ -4660,6 +1618,11 @@ udmf
 		{
 			title = "Invincibility";
 			sprite = "TVIVA0";
+			arg0
+			{
+				title = "Death trigger tag";
+				type = 15;
+			}
 			arg1
 			{
 				title = "Respawn behavior";
@@ -4671,6 +1634,11 @@ udmf
 		{
 			title = "Extra Life";
 			sprite = "TV1UA0";
+			arg0
+			{
+				title = "Death trigger tag";
+				type = 15;
+			}
 			arg1
 			{
 				title = "Respawn behavior";
@@ -4692,11 +1660,21 @@ udmf
 		{
 			title = "Eggman";
 			sprite = "TVEGA0";
+			arg0
+			{
+				title = "Death trigger tag";
+				type = 15;
+			}
 		}
 		411
 		{
 			title = "Teleporter";
 			sprite = "TVMXA0";
+			arg0
+			{
+				title = "Death trigger tag";
+				type = 15;
+			}
 			arg1
 			{
 				title = "Respawn behavior";
@@ -4708,21 +1686,41 @@ udmf
 		{
 			title = "Gravity Boots";
 			sprite = "TVGVA0";
+			arg0
+			{
+				title = "Death trigger tag";
+				type = 15;
+			}
 		}
 		414
 		{
 			title = "CTF Team Ring Monitor (Red)";
 			sprite = "TRRIA0";
+			arg0
+			{
+				title = "Death trigger tag";
+				type = 15;
+			}
 		}
 		415
 		{
 			title = "CTF Team Ring Monitor (Blue)";
 			sprite = "TBRIA0";
+			arg0
+			{
+				title = "Death trigger tag";
+				type = 15;
+			}
 		}
 		416
 		{
 			title = "Recycler";
 			sprite = "TVRCA0";
+			arg0
+			{
+				title = "Death trigger tag";
+				type = 15;
+			}
 			arg1
 			{
 				title = "Respawn behavior";
@@ -4734,16 +1732,31 @@ udmf
 		{
 			title = "Score (1,000 Points)";
 			sprite = "TV1KA0";
+			arg0
+			{
+				title = "Death trigger tag";
+				type = 15;
+			}
 		}
 		419
 		{
 			title = "Score (10,000 Points)";
 			sprite = "TVTKA0";
+			arg0
+			{
+				title = "Death trigger tag";
+				type = 15;
+			}
 		}
 		420
 		{
 			title = "Flame Shield";
 			sprite = "TVFLA0";
+			arg0
+			{
+				title = "Death trigger tag";
+				type = 15;
+			}
 			arg1
 			{
 				title = "Respawn behavior";
@@ -4755,6 +1768,11 @@ udmf
 		{
 			title = "Water Shield";
 			sprite = "TVBBA0";
+			arg0
+			{
+				title = "Death trigger tag";
+				type = 15;
+			}
 			arg1
 			{
 				title = "Respawn behavior";
@@ -4766,6 +1784,11 @@ udmf
 		{
 			title = "Lightning Shield";
 			sprite = "TVZPA0";
+			arg0
+			{
+				title = "Death trigger tag";
+				type = 15;
+			}
 			arg1
 			{
 				title = "Respawn behavior";
@@ -4782,76 +1805,136 @@ udmf
 		title = "Monitors (Respawning)";
 		width = 20;
 		height = 44;
-		arg0
-		{
-			title = "Death trigger tag";
-			type = 15;
-		}
 
 		431
 		{
 			title = "Pity Shield (Respawn)";
 			sprite = "TVPIB0";
+			arg0
+			{
+				title = "Death trigger tag";
+				type = 15;
+			}
 		}
 		432
 		{
 			title = "Attraction Shield (Respawn)";
 			sprite = "TVATB0";
+			arg0
+			{
+				title = "Death trigger tag";
+				type = 15;
+			}
 		}
 		433
 		{
 			title = "Force Shield (Respawn)";
 			sprite = "TVFOB0";
+			arg0
+			{
+				title = "Death trigger tag";
+				type = 15;
+			}
 		}
 		434
 		{
 			title = "Armageddon Shield (Respawn)";
 			sprite = "TVARB0";
+			arg0
+			{
+				title = "Death trigger tag";
+				type = 15;
+			}
 		}
 		435
 		{
 			title = "Whirlwind Shield (Respawn)";
 			sprite = "TVWWB0";
+			arg0
+			{
+				title = "Death trigger tag";
+				type = 15;
+			}
 		}
 		436
 		{
 			title = "Elemental Shield (Respawn)";
 			sprite = "TVELB0";
+			arg0
+			{
+				title = "Death trigger tag";
+				type = 15;
+			}
 		}
 		437
 		{
 			title = "Super Sneakers (Respawn)";
 			sprite = "TVSSB0";
+			arg0
+			{
+				title = "Death trigger tag";
+				type = 15;
+			}
 		}
 		438
 		{
 			title = "Invincibility (Respawn)";
 			sprite = "TVIVB0";
+			arg0
+			{
+				title = "Death trigger tag";
+				type = 15;
+			}
 		}
 		440
 		{
 			title = "Eggman (Respawn)";
 			sprite = "TVEGB0";
+			arg0
+			{
+				title = "Death trigger tag";
+				type = 15;
+			}
 		}
 		443
 		{
 			title = "Gravity Boots (Respawn)";
 			sprite = "TVGVB0";
+			arg0
+			{
+				title = "Death trigger tag";
+				type = 15;
+			}
 		}
 		450
 		{
 			title = "Flame Shield (Respawn)";
 			sprite = "TVFLB0";
+			arg0
+			{
+				title = "Death trigger tag";
+				type = 15;
+			}
 		}
 		451
 		{
 			title = "Water Shield (Respawn)";
 			sprite = "TVBBB0";
+			arg0
+			{
+				title = "Death trigger tag";
+				type = 15;
+			}
 		}
 		452
 		{
 			title = "Lightning Shield (Respawn)";
 			sprite = "TVZPB0";
+			arg0
+			{
+				title = "Death trigger tag";
+				type = 15;
+			}
 		}
 	}
 
@@ -5235,13 +2318,13 @@ udmf
 		{
 			arrow = 0;
 			title = "5 Vertical Rings (Yellow Spring)";
-			sprite = "RINGA0";
+			sprite = "internal:ringverticalyellow";
 		}
 		601
 		{
 			arrow = 0;
 			title = "5 Vertical Rings (Red Spring)";
-			sprite = "RINGA0";
+			sprite = "internal:ringverticalred";
 			height = 1024;
 		}
 		602
@@ -5259,41 +2342,47 @@ udmf
 		604
 		{
 			title = "Circle of Rings";
-			sprite = "RINGA0";
+			sprite = "internal:circlering";
 			width = 96;
 			height = 192;
+			centerhitbox = true;
 		}
 		605
 		{
 			title = "Circle of Rings (Big)";
-			sprite = "RINGA0";
+			sprite = "internal:circlebigring";
 			width = 192;
+			centerhitbox = true;
 		}
 		606
 		{
 			title = "Circle of Blue Spheres";
-			sprite = "SPHRA0";
+			sprite = "internal:circlesphere";
 			width = 96;
 			height = 192;
+			centerhitbox = true;
 		}
 		607
 		{
 			title = "Circle of Blue Spheres (Big)";
-			sprite = "SPHRA0";
+			sprite = "internal:circlebigsphere";
 			width = 192;
+			centerhitbox = true;
 		}
 		608
 		{
 			title = "Circle of Rings and Spheres";
-			sprite = "SPHRA0";
+			sprite = "internal:circleringsphere";
 			width = 96;
 			height = 192;
+			centerhitbox = true;
 		}
 		609
 		{
 			title = "Circle of Rings and Spheres (Big)";
-			sprite = "SPHRA0";
+			sprite = "internal:circlebigringsphere";
 			width = 192;
+			centerhitbox = true;
 		}
 		610
 		{
@@ -5322,6 +2411,7 @@ udmf
 			sprite = "RINGA0";
 			width = 96;
 			height = 192;
+			centerhitbox = true;
 			arg0
 			{
 				title = "Number of items";
@@ -5429,7 +2519,7 @@ udmf
 		756
 		{
 			title = "Blast Linedef Executor";
-			sprite = "TOADA0";
+			sprite = "internal:blastexec";
 			width = 32;
 			height = 16;
 			arg0
@@ -5441,7 +2531,7 @@ udmf
 		757
 		{
 			title = "Fan Particle Generator";
-			sprite = "PRTLA0";
+			sprite = "internal:fanparticles";
 			width = 8;
 			height = 16;
 			arg0
@@ -5490,11 +2580,6 @@ udmf
 			title = "PolyObject Spawn Point";
 			sprite = "internal:polycenter";
 		}
-		762
-		{
-			title = "PolyObject Spawn Point (Crush)";
-			sprite = "internal:polycentercrush";
-		}
 		780
 		{
 			title = "Skybox View Point";
@@ -5514,7 +2599,7 @@ udmf
 
 	greenflower
 	{
-		color = 10; // Green
+		color = 2; // Green
 		title = "Greenflower";
 
 		800
@@ -5619,7 +2704,7 @@ udmf
 
 	technohill
 	{
-		color = 10; // Green
+		color = 2; // Green
 		title = "Techno Hill";
 
 		900
@@ -5663,7 +2748,7 @@ udmf
 
 	deepsea
 	{
-		color = 10; // Green
+		color = 2; // Green
 		title = "Deep Sea";
 
 		1000
@@ -5823,7 +2908,7 @@ udmf
 
 	castleeggman
 	{
-		color = 10; // Green
+		color = 2; // Green
 		title = "Castle Eggman";
 
 		1100
@@ -6386,7 +3471,7 @@ udmf
 
 	aridcanyon
 	{
-		color = 10; // Green
+		color = 2; // Green
 		title = "Arid Canyon";
 
 		1200
@@ -6511,6 +3596,7 @@ udmf
 			sprite = "WWSGAR";
 			width = 22;
 			height = 64;
+			wallsprite = true;
 		}
 		1213
 		{
@@ -6518,6 +3604,7 @@ udmf
 			sprite = "WWS2AR";
 			width = 22;
 			height = 64;
+			wallsprite = true;
 		}
 		1214
 		{
@@ -6525,6 +3612,7 @@ udmf
 			sprite = "WWS3ALAR";
 			width = 16;
 			height = 192;
+			wallsprite = true;
 		}
 		1215
 		{
@@ -6644,7 +3732,7 @@ udmf
 
 	redvolcano
 	{
-		color = 10; // Green
+		color = 2; // Green
 		title = "Red Volcano";
 
 		1300
@@ -6789,7 +3877,7 @@ udmf
 
 	botanicserenity
 	{
-		color = 10; // Green
+		color = 2; // Green
 		title = "Botanic Serenity";
 		width = 16;
 		height = 32;
@@ -7032,7 +4120,7 @@ udmf
 
 	azuretemple
 	{
-		color = 10; // Green
+		color = 2; // Green
 		title = "Azure Temple";
 
 		1500
@@ -7144,7 +4232,7 @@ udmf
 
 	dreamhill
 	{
-		color = 10; // Green
+		color = 2; // Green
 		title = "Dream Hill";
 
 		1600
@@ -7178,8 +4266,8 @@ udmf
 
 	nightstrk
 	{
-		color = 13; // Pink
-		title = "NiGHTS Track";
+		color = 16; // Light Pink
+		title = "NiGHTS Track & Misc.";
 		width = 8;
 		height = 4096;
 		sprite = "UNKNA0";
@@ -7207,8 +4295,8 @@ udmf
 				type = 11;
 				enum
 				{
-					0 = "Clockwise";
-					1 = "Counterclockwise";
+					0 = "Counterclockwise";
+					1 = "Clockwise";
 				}
 			}
 		}
@@ -7238,30 +4326,6 @@ udmf
 				title = "Order";
 			}
 		}
-		1710
-		{
-			title = "Ideya Capture";
-			sprite = "CAPSA0";
-			width = 72;
-			height = 144;
-			arg0
-			{
-				title = "Mare";
-			}
-			arg1
-			{
-				title = "Required spheres";
-			}
-		}
-	}
-
-	nights
-	{
-		color = 13; // Pink
-		title = "NiGHTS Items";
-		width = 16;
-		height = 32;
-
 		1703
 		{
 			title = "Ideya Drone";
@@ -7294,11 +4358,46 @@ udmf
 			}
 			arg4
 			{
-				title = "Die upon time up?";
-				type = 11;
-				enum = "noyes";
+				title = "Die upon time up?";
+				type = 11;
+				enum = "noyes";
+			}
+		}
+		1710
+		{
+			title = "Ideya Capture";
+			sprite = "CAPSA0";
+			width = 72;
+			height = 144;
+			arg0
+			{
+				title = "Mare";
+			}
+			arg1
+			{
+				title = "Required spheres";
+			}
+		}
+		1714
+		{
+			title = "Ideya Anchor Point";
+			sprite = "internal:ideya";
+			width = 8;
+			height = 16;
+			arg0
+			{
+				title = "Mare";
 			}
 		}
+	}
+
+	nights
+	{
+		color = 13; // Pink
+		title = "NiGHTS Items";
+		width = 16;
+		height = 32;
+		
 		1704
 		{
 			arrow = 1;
@@ -7399,25 +4498,15 @@ udmf
 		{
 			arrow = 1;
 			title = "Hoop";
-			sprite = "HOOPA0";
+			sprite = "internal:nightshoop";
 			width = 80;
 			height = 160;
+			centerhitbox = true;
 			arg0
 			{
 				title = "Radius";
 			}
 		}
-		1714
-		{
-			title = "Ideya Anchor Point";
-			sprite = "internal:axis1";
-			width = 8;
-			height = 16;
-			arg0
-			{
-				title = "Mare";
-			}
-		}
 	}
 
 	mario
@@ -7528,7 +4617,7 @@ udmf
 
 	christmasdisco
 	{
-		color = 10; // Green
+		color = 2; // Green
 		title = "Christmas & Disco";
 
 		1850
@@ -7643,7 +4732,7 @@ udmf
 
 	stalagmites
 	{
-		color = 10; // Green
+		color = 2; // Green
 		title = "Stalagmites";
 		width = 16;
 		height = 40;
@@ -7722,7 +4811,7 @@ udmf
 
 	hauntedheights
 	{
-		color = 10; // Green
+		color = 2; // Green
 		title = "Haunted Heights";
 
 		2000
@@ -7828,7 +4917,7 @@ udmf
 
 	frozenhillside
 	{
-		color = 10; // Green
+		color = 2; // Green
 		title = "Frozen Hillside";
 
 		2100
@@ -7883,7 +4972,7 @@ udmf
 
 	tutorial
 	{
-		color = 10; // Green
+		color = 2; // Green
 		title = "Tutorial";
 
 		799
@@ -7901,65 +4990,170 @@ udmf
 
 	flickies
 	{
-		color = 10; // Green
+		color = 2; // Green
 		title = "Flickies";
 		width = 8;
 		height = 20;
-		arg0
-		{
-			title = "Radius";
-		}
-		arg1
-		{
-			title = "Flags";
-			type = 12;
-			enum
-			{
-				1 = "Move aimlessly";
-				2 = "No movement";
-				4 = "Hop";
-			}
-		}
 
 		2200
 		{
 			title = "Bluebird";
 			sprite = "FL01A1";
+			arg0
+			{
+				title = "Radius";
+			}
+			arg1
+			{
+				title = "Flags";
+				type = 12;
+				enum
+				{
+					1 = "Move aimlessly";
+					2 = "No movement";
+					4 = "Hop";
+				}
+			}
 		}
 		2201
 		{
 			title = "Rabbit";
 			sprite = "FL02A1";
+			arg0
+			{
+				title = "Radius";
+			}
+			arg1
+			{
+				title = "Flags";
+				type = 12;
+				enum
+				{
+					1 = "Move aimlessly";
+					2 = "No movement";
+					4 = "Hop";
+				}
+			}
 		}
 		2202
 		{
 			title = "Chicken";
 			sprite = "FL03A1";
+			arg0
+			{
+				title = "Radius";
+			}
+			arg1
+			{
+				title = "Flags";
+				type = 12;
+				enum
+				{
+					1 = "Move aimlessly";
+					2 = "No movement";
+					4 = "Hop";
+				}
+			}
 		}
 		2203
 		{
 			title = "Seal";
 			sprite = "FL04A1";
+			arg0
+			{
+				title = "Radius";
+			}
+			arg1
+			{
+				title = "Flags";
+				type = 12;
+				enum
+				{
+					1 = "Move aimlessly";
+					2 = "No movement";
+					4 = "Hop";
+				}
+			}
 		}
 		2204
 		{
 			title = "Pig";
 			sprite = "FL05A1";
+			arg0
+			{
+				title = "Radius";
+			}
+			arg1
+			{
+				title = "Flags";
+				type = 12;
+				enum
+				{
+					1 = "Move aimlessly";
+					2 = "No movement";
+					4 = "Hop";
+				}
+			}
 		}
 		2205
 		{
 			title = "Chipmunk";
 			sprite = "FL06A1";
+			arg0
+			{
+				title = "Radius";
+			}
+			arg1
+			{
+				title = "Flags";
+				type = 12;
+				enum
+				{
+					1 = "Move aimlessly";
+					2 = "No movement";
+					4 = "Hop";
+				}
+			}
 		}
 		2206
 		{
 			title = "Penguin";
 			sprite = "FL07A1";
+			arg0
+			{
+				title = "Radius";
+			}
+			arg1
+			{
+				title = "Flags";
+				type = 12;
+				enum
+				{
+					1 = "Move aimlessly";
+					2 = "No movement";
+					4 = "Hop";
+				}
+			}
 		}
 		2207
 		{
 			title = "Fish";
 			sprite = "FL08A1";
+			arg0
+			{
+				title = "Radius";
+			}
+			arg1
+			{
+				title = "Flags";
+				type = 12;
+				enum
+				{
+					1 = "Move aimlessly";
+					2 = "No movement";
+					4 = "Hop";
+				}
+			}
 			arg2
 			{
 				title = "Color";
@@ -7989,51 +5183,214 @@ udmf
 		{
 			title = "Ram";
 			sprite = "FL09A1";
+			arg0
+			{
+				title = "Radius";
+			}
+			arg1
+			{
+				title = "Flags";
+				type = 12;
+				enum
+				{
+					1 = "Move aimlessly";
+					2 = "No movement";
+					4 = "Hop";
+				}
+			}
 		}
 		2209
 		{
 			title = "Puffin";
 			sprite = "FL10A1";
+			arg0
+			{
+				title = "Radius";
+			}
+			arg1
+			{
+				title = "Flags";
+				type = 12;
+				enum
+				{
+					1 = "Move aimlessly";
+					2 = "No movement";
+					4 = "Hop";
+				}
+			}
 		}
 		2210
 		{
 			title = "Cow";
 			sprite = "FL11A1";
+			arg0
+			{
+				title = "Radius";
+			}
+			arg1
+			{
+				title = "Flags";
+				type = 12;
+				enum
+				{
+					1 = "Move aimlessly";
+					2 = "No movement";
+					4 = "Hop";
+				}
+			}
 		}
 		2211
 		{
 			title = "Rat";
 			sprite = "FL12A1";
+			arg0
+			{
+				title = "Radius";
+			}
+			arg1
+			{
+				title = "Flags";
+				type = 12;
+				enum
+				{
+					1 = "Move aimlessly";
+					2 = "No movement";
+					4 = "Hop";
+				}
+			}
 		}
 		2212
 		{
 			title = "Bear";
 			sprite = "FL13A1";
+			arg0
+			{
+				title = "Radius";
+			}
+			arg1
+			{
+				title = "Flags";
+				type = 12;
+				enum
+				{
+					1 = "Move aimlessly";
+					2 = "No movement";
+					4 = "Hop";
+				}
+			}
 		}
 		2213
 		{
 			title = "Dove";
 			sprite = "FL14A1";
+			arg0
+			{
+				title = "Radius";
+			}
+			arg1
+			{
+				title = "Flags";
+				type = 12;
+				enum
+				{
+					1 = "Move aimlessly";
+					2 = "No movement";
+					4 = "Hop";
+				}
+			}
 		}
 		2214
 		{
 			title = "Cat";
 			sprite = "FL15A1";
+			arg0
+			{
+				title = "Radius";
+			}
+			arg1
+			{
+				title = "Flags";
+				type = 12;
+				enum
+				{
+					1 = "Move aimlessly";
+					2 = "No movement";
+					4 = "Hop";
+				}
+			}
 		}
 		2215
 		{
 			title = "Canary";
 			sprite = "FL16A1";
+			arg0
+			{
+				title = "Radius";
+			}
+			arg1
+			{
+				title = "Flags";
+				type = 12;
+				enum
+				{
+					1 = "Move aimlessly";
+					2 = "No movement";
+					4 = "Hop";
+				}
+			}
 		}
 		2216
 		{
 			title = "Spider";
 			sprite = "FS01A1";
+			arg0
+			{
+				title = "Radius";
+			}
+			arg1
+			{
+				title = "Flags";
+				type = 12;
+				enum
+				{
+					1 = "Move aimlessly";
+					2 = "No movement";
+					4 = "Hop";
+				}
+			}
 		}
 		2217
 		{
 			title = "Bat";
 			sprite = "FS02A0";
+			arg0
+			{
+				title = "Radius";
+			}
+			arg1
+			{
+				title = "Flags";
+				type = 12;
+				enum
+				{
+					1 = "Move aimlessly";
+					2 = "No movement";
+					4 = "Hop";
+				}
+			}
 		}
 	}
-}
+	
+	editor
+	{
+		color = 15; // White
+		arrow = 1;
+		title = "3D Mode Start";
+		error = -1;
+		width = 8;
+		height = 16;
+		sort = 1;
+
+		3328 = "3D Mode Start";
+	}
+}
\ No newline at end of file
diff --git a/extras/conf/udb/SRB2_22Doom.cfg b/extras/conf/udb/SRB2_22Doom.cfg
deleted file mode 100644
index 9e733aa394581a8d48dab2c592e46008b2142f11..0000000000000000000000000000000000000000
--- a/extras/conf/udb/SRB2_22Doom.cfg
+++ /dev/null
@@ -1,32 +0,0 @@
-/************************************************************************\
-	Ultimate Doom Builder Game Configuration for Sonic Robo Blast 2 Version 2.2
-\************************************************************************/
-
-// This is required to prevent accidental use of a different configuration
-type = "Doom Builder 2 Game Configuration";
-
-// This is the title to show for this game
-game = "Sonic Robo Blast 2 - 2.2 (Doom format)";
-
-// This is the simplified game engine/sourceport name
-engine = "zdoom";
-
-// Settings common to all games and all map formats
-include("Includes\\SRB222_common.cfg", "common");
-
-// Settings common to Doom map format
-include("Includes\\SRB222_common.cfg", "mapformat_doom");
-
-include("Includes\\Game_SRB222.cfg");
-
-// Script lumps detection
-scriptlumpnames
-{
-	include("Includes\\SRB222_misc.cfg", "scriptlumpnames");
-}
-
-//Default things filters
-thingsfilters
-{
-	include("Includes\\SRB222_misc.cfg", "thingsfilters");
-}
\ No newline at end of file