diff --git a/extras/conf/SRB2Kart2.cfg b/extras/conf/D3R-Config.cfg
similarity index 75%
rename from extras/conf/SRB2Kart2.cfg
rename to extras/conf/D3R-Config.cfg
index 97db26fc2..354d7a176 100644
--- a/extras/conf/SRB2Kart2.cfg
+++ b/extras/conf/D3R-Config.cfg
@@ -1,22 +1,26 @@
 /*********************************************************\
 	vim: ai
 	Zone Builder Game Configuration
-	For SRB2Kart Version 2.0
-	Based on the Configuration for Sonic Robo Blast 2 Version 2.1
+	For Dr. Robotnik's Ring Racers
+	Based on the Configuration for Sonic Robo Blast 2 Version 2.2
 	Contributors (alphabetical):
 	* Foxboy
+	* James(/Jart)
 	* JJames19119
 	* Kalaron
 	* Kristos
 	* MascaraSnake
+	* MK
 	* Morpheus
 	* Neo Chaotikal
 	* Oogaland
 	* Rob
+	* SeventhSentinel
 	* Shadow Hog
 	* SRB2-Playah
 	* SSNTails
 	* ST218
+	* TehRealSalt
 	* toaster
 	* Viola
 \*********************************************************/
@@ -25,7 +29,7 @@
 type = "Doom Builder 2 Game Configuration";
 
 // This is the title to show for this game
-game = "SRB2Jart v2.0";
+game = "Dr. Robotnik's Ring Racers";
 
 //GZDB specific. Don't try to load lumps that don't exist.
 basegame = 0;
@@ -126,7 +130,7 @@ skins
 	Knuckles;
 	Amy;
 	Mighty;
-	Ray;
+	Motobug;
 	Eggman;
 	MetalSonic;
 	Fang;
@@ -158,7 +162,7 @@ generalizedsectors = true;
 defaultwalltexture = "GFZROCK";
 defaultfloortexture = "GFZFLR01";
 defaultceilingtexture = "F_SKY1";
-mixtexturesflats = false;
+mixtexturesflats = true;
 defaulttexturescale = 1.0f;
 defaultflatscale = 1.0f;
 
@@ -223,34 +227,6 @@ sprites
 	}
 }
 
-// Flat sources
-flats
-{
-	standard1
-	{
-		start = "F_START";
-		end = "F_END";
-	}
-
-	standard2
-	{
-		start = "FF_START";
-		end = "FF_END";
-	}
-
-	standard3
-	{
-		start = "FF_START";
-		end = "F_END";
-	}
-
-	standard4
-	{
-		start = "F_START";
-		end = "FF_END";
-	}
-}
-
 
 /*
 GAME DETECT PATTERN
@@ -367,6 +343,34 @@ maplumpnames
 		nodebuild = true;
 		allowempty = true;
 	}
+
+	PICTURE
+	{
+		required = false;
+		blindcopy = true;
+		nodebuild = false;
+	}
+
+	MINIMAP
+	{
+		required = false;
+		blindcopy = true;
+		nodebuild = false;
+	}
+
+	TWEAKMAP
+	{
+		required = false;
+		blindcopy = true;
+		nodebuild = false;
+	}
+
+	ENCORE
+	{
+		required = false;
+		blindcopy = true;
+		nodebuild = false;
+	}
 }
 
 scriptlumpnames
@@ -656,11 +660,9 @@ linedeftypes
 		{
 			title = "Sector Flat Alignment";
 			prefix = "(7)";
-			flags64text = "[6] Align only floor";
-			flags2text = "[1] Align only ceiling";
-			flags512text = "[9] Rotate flats";
-			flags16384text = "[14] Rotate only floor";
-			flags1024text = "[10] Rotate only ceiling";
+			flags2048text = "[11] Don't align floor";
+			flags4096text = "[12] Don't align ceiling";
+			flags8192text = "[13] Use texture offsets";
 		}
 
 		10
@@ -681,6 +683,12 @@ linedeftypes
 			title = "Visual Portal Between Tagged Linedefs";
 			prefix = "(40)";
 		}
+
+		41
+		{
+			title = "Horizon Effect";
+			prefix = "(41)";
+		}
 		
 		50
 		{
@@ -706,6 +714,12 @@ linedeftypes
 			prefix = "(80)";
 		}
 
+		81
+		{
+			title = "Block enemies";
+			prefix = "(81)";
+		}
+
 		96
 		{
 			title = "Apply Tag to Tagged Sectors";
@@ -769,7 +783,9 @@ linedeftypes
 		{
 			title = "Special Sector Properties";
 			prefix = "(8)";
+			flags32text = "[5] Invert precipitation";
 			flags64text = "[6] Touch only ceiling";
+			flags128text = "[7] Allow opposite gravity";
 			flags256text = "[8] Touch sector edge";
 			flags512text = "[9] Touch floor or ceiling";
 		}
@@ -778,7 +794,12 @@ linedeftypes
 		{
 			title = "Chain Parameters";
 			prefix = "(9)";
-			flags64text = "[6] Fixed spinning direction";
+			flags32text = "[5] Swing instead of spin";
+			flags128text = "[7] Make chain from end item";
+			flags64text = "[6] Player-turnable chain";
+			flags256text = "[8] Spawn link at origin";
+			flags512text = "[9] Don't clip inside ground";
+			flags1024text = "[10] No distance check";
 		}
 
 		11
@@ -796,6 +817,19 @@ linedeftypes
 			flags64text = "[6] Randomize speed";
 		}
 
+		14
+		{
+			title = "Bustable Block Parameters";
+			prefix = "(14)";
+			flags32text = "[5] Particles launch from center";
+		}	
+
+		15
+		{
+			title = "Fan Particle Spawner Parameters";
+			prefix = "(15)";
+		}
+
 		64
 		{
 			title = "Continuously Appearing/Disappearing FOF";
@@ -817,37 +851,42 @@ linedeftypes
 
 		20
 		{
-			title = "First Line";
+			title = "PolyObject First Line";
 			prefix = "(20)";
-			flags64text = "[6] Trigger linedef executor";
-			flags128text = "[7] Intangible";
-			flags256text = "[8] Stopped by pushables";
-			flags512text = "[9] Render flats";
-		}
-
-		21
-		{
-			title = "Explicitly Include Line";
-			prefix = "(21)";
 		}
 
 		22
 		{
-			title = "Parameters";
+			title = "PolyObject Parameters";
 			prefix = "(22)";
+			flags8text = "[3] Set translucency by X offset";
+			flags32text = "[5] Render outer sides only";
+			flags64text = "[6] Trigger linedef executor";
+			flags128text = "[7] Intangible";
+			flags256text = "[8] Stopped by pushables";
+			flags512text = "[9] Render flats";
+			flags8192text = "[13] Cut cyan flat pixels";
 		}
 
 		30
 		{
-			title = "Waving Flag";
+			title = "PolyObject Waving Flag";
 			prefix = "(30)";
 		}
 		
 		31
 		{
-			title = "Displacement by Front Sector";
+			title = "Move PolyObject by Front Sector Displacement";
 			prefix = "(31)";
 		}
+
+		32
+		{
+			title = "Rotate PolyObject by Front Sector Displacement";
+			prefix = "(32)";
+			flags64text = "[6] Don't turn players";
+			flags512text = "[9] Turn all objects";
+		}
 	}
 
 	planemove
@@ -1760,7 +1799,7 @@ linedeftypes
 			title = "Set Tagged Sector's Floor Height/Texture";
 			prefix = "(400)";
 			flags8text = "[3] Set delay by backside sector";
-			flags64text = "[6] Don't change floor texture";
+			flags64text = "[6] Keep floor flat";
 		}
 
 		401
@@ -1856,7 +1895,7 @@ linedeftypes
 			prefix = "(403)";
 			flags2text = "[1] Trigger linedef executor";
 			flags8text = "[3] Set delay by backside sector";
-			flags64text = "[6] Change floor texture";
+			flags64text = "[6] Change floor flat";
 		}
 
 		404
@@ -1865,7 +1904,7 @@ linedeftypes
 			prefix = "(404)";
 			flags2text = "[1] Trigger linedef executor";
 			flags8text = "[3] Set delay by backside sector";
-			flags64text = "[6] Change ceiling texture";
+			flags64text = "[6] Change ceiling flat";
 		}
 
 		405
@@ -2107,7 +2146,6 @@ linedeftypes
 			flags8text = "[3] Set delay by backside sector";
 		}
 
-
 		445
 		{
 			title = "Make FOF Disappear/Reappear";
@@ -2116,6 +2154,45 @@ linedeftypes
 			flags64text = "[6] Reappear";
 		}
 
+		446
+		{
+			title = "Make FOF Crumble";
+			prefix = "(446)";
+			flags2text = "[1] Flags determine respawn";
+			flags8text = "[3] Set delay by backside sector";
+			flags64text = "[6] Don't respawn";
+		}
+
+		447
+		{
+			title = "Change Tagged Sector's Colormap";
+			prefix = "(447)";
+			flags8text = "[3] Set delay by backside sector";
+			flags16text = "[4] Front X/Y = Alpha";
+			flags32text = "[5] Subtract Red value";
+			flags64text = "[6] Subtract Green value";
+			flags128text = "[7] Subtract Blue value";
+			flags256text = "[8] Set relative to current";
+			flags32768text = "[15] Use backside colormap";
+		}
+
+		448
+		{
+			title = "Change Skybox";
+			prefix = "(448)";
+			flags2text = "[1] Change centerpoint";
+			flags8text = "[3] Set delay by backside sector";
+			flags64text = "[6] For everyone";
+			flags512text = "[9] Don't change viewpoint";
+		}
+
+		449
+		{
+			title = "Enable/Disable Waypoints";
+			prefix = "(449)";
+			flags64text = "[6] Enable waypoints";
+		}
+
 		450
 		{
 			title = "Execute Linedef Executor (specific tag)";
@@ -2129,6 +2206,12 @@ linedeftypes
 			prefix = "(451)";
 			flags8text = "[3] Set delay by backside sector";
 		}
+
+		460
+		{
+			title = "Award Rings";
+			prefix = "(460)";
+		}
 	}
 
 	linedefexecpoly
@@ -2201,7 +2284,7 @@ linedeftypes
 
 		488
 		{
-			title = "Move by Waypoints";
+			title = "Move by Zoom Tube Waypoints";
 			prefix = "(488)";
 			flags8text = "[3] Set delay by backside sector";
 			flags32text = "[5] Reverse order";
@@ -2520,8 +2603,10 @@ linedeftypes
 			prefix = "(700)";
 			flags2048text = "[11] No physics";
 			flags4096text = "[12] Not dynamic";
+			flags32768text = "[15] Copy to other side";
 			slope = "regular";
 			slopeargs = 1;
+			copyslopeargs = 1;
 		}
 
 		701
@@ -2530,8 +2615,10 @@ linedeftypes
 			prefix = "(701)";
 			flags2048text = "[11] No physics";
 			flags4096text = "[12] Not dynamic";
+			flags32768text = "[15] Copy to other side";
 			slope = "regular";
 			slopeargs = 2;
+			copyslopeargs = 4;
 		}
 
 		702
@@ -2540,8 +2627,10 @@ linedeftypes
 			prefix = "(702)";
 			flags2048text = "[11] No physics";
 			flags4096text = "[12] Not dynamic";
+			flags32768text = "[15] Copy to other side";
 			slope = "regular";
 			slopeargs = 3;
+			copyslopeargs = 5;
 		}
 
 		703
@@ -2550,8 +2639,10 @@ linedeftypes
 			prefix = "(703)";
 			flags2048text = "[11] No physics";
 			flags4096text = "[12] Not dynamic";
+			flags32768text = "[15] Copy to other side";
 			slope = "regular";
 			slopeargs = 9;
+			copyslopeargs = 8;
 		}
 
 		704
@@ -2582,8 +2673,10 @@ linedeftypes
 			prefix = "(710)";
 			flags2048text = "[11] No physics";
 			flags4096text = "[12] Not dynamic";
+			flags32768text = "[15] Copy to other side";
 			slope = "regular";
 			slopeargs = 4;
+			copyslopeargs = 2;
 		}
 
 		711
@@ -2592,8 +2685,10 @@ linedeftypes
 			prefix = "(711)";
 			flags2048text = "[11] No physics";
 			flags4096text = "[12] Not dynamic";
+			flags32768text = "[15] Copy to other side";
 			slope = "regular";
 			slopeargs = 8;
+			copyslopeargs = 8;
 		}
 
 		712
@@ -2602,8 +2697,10 @@ linedeftypes
 			prefix = "(712)";
 			flags2048text = "[11] No physics";
 			flags4096text = "[12] Not dynamic";
+			flags32768text = "[15] Copy to other side";
 			slope = "regular";
 			slopeargs = 12;
+			copyslopeargs = 10;
 		}
 
 		713
@@ -2612,8 +2709,10 @@ linedeftypes
 			prefix = "(713)";
 			flags2048text = "[11] No physics";
 			flags4096text = "[12] Not dynamic";
+			flags32768text = "[15] Copy to other side";
 			slope = "regular";
 			slopeargs = 6;
+			copyslopeargs = 6;
 		}
 
 		714
@@ -2662,6 +2761,30 @@ linedeftypes
 			slopeargs = 3;
 		}
 
+		720
+		{
+			title = "Copy Frontside Floor Slope from Line Tag";
+			prefix = "(720)";
+			slope = "copy";
+			slopeargs = 1;
+		}
+
+		721
+		{
+			title = "Copy Frontside Ceiling Slope from Line Tag";
+			prefix = "(721)";
+			slope = "copy";
+			slopeargs = 2;
+		}
+
+		722
+		{
+			title = "Copy Frontside Floor and Ceiling Slope from Line Tag";
+			prefix = "(722)";
+			slope = "copy";
+			slopeargs = 3;
+		}
+
 		723
 		{
 			title = "Copy Backside Floor Slope from Line Tag";
@@ -2691,7 +2814,6 @@ linedeftypes
 			title = "Copy Frontside Floor Slope to Backside";
 			prefix = "(730)";
 			slope = "copy";
-			slopeargs = 1;
 			copyslopeargs = 1;
 		}
 
@@ -2700,7 +2822,6 @@ linedeftypes
 			title = "Copy Frontside Ceiling Slope to Backside";
 			prefix = "(731)";
 			slope = "copy";
-			slopeargs = 2;
 			copyslopeargs = 4;
 		}
 
@@ -2709,7 +2830,6 @@ linedeftypes
 			title = "Copy Frontside Floor and Ceiling Slope to Backside";
 			prefix = "(732)";
 			slope = "copy";
-			slopeargs = 3;
 			copyslopeargs = 5;
 		}
 
@@ -2718,7 +2838,6 @@ linedeftypes
 			title = "Copy Backside Floor Slope to Frontside";
 			prefix = "(733)";
 			slope = "copy";
-			slopeargs = 1;
 			copyslopeargs = 2;
 		}
 
@@ -2727,7 +2846,6 @@ linedeftypes
 			title = "Copy Backside Ceiling Slope to Frontside";
 			prefix = "(734)";
 			slope = "copy";
-			slopeargs = 2;
 			copyslopeargs = 8;
 		}
 
@@ -2736,7 +2854,6 @@ linedeftypes
 			title = "Copy Backside Floor and Ceiling Slope to Frontside";
 			prefix = "(735)";
 			slope = "copy";
-			slopeargs = 3;
 			copyslopeargs = 10;
 		}
 
@@ -2768,7 +2885,7 @@ linedeftypes
 			flags2048text = "[11] No physics";
 			flags4096text = "[12] Dynamic";
 		}
-
+		
 		799
 		{
 			title = "Set Tagged Dynamic Slope Vertex to Front Sector Height";
@@ -2839,11 +2956,35 @@ linedeftypes
 			title = "Fog Wall";
 			prefix = "(909)";
 		}
+
+		910
+		{
+			title = "Additive Blend";
+			prefix = "(910)";
+		}
+
+		911
+		{
+			title = "Subtractive Blend";
+			prefix = "(911)";
+		}
+
+		912
+		{
+			title = "Reverse-Subtractive Blend";
+			prefix = "(912)";
+		}
+
+		913
+		{
+			title = "Modulate Blend";
+			prefix = "(913)";
+		}
 	}
 
 	derrlines
 	{
-		title = "SRB2Kart";
+		title = "Ring Racers";
 
 		2000
 		{
@@ -2857,6 +2998,28 @@ linedeftypes
 			prefix = "(2001)";
 			flags64text = "[6] Use backside";
 		}
+		
+		2002
+		{
+			title = "Per Lap Executor";
+			prefix = "(2002)";
+			flags2text = "[2] Every lap lower";
+			flags64text = "[6] Every lap higher";
+			flags512text = "[9] Activate for 1st place";
+		}
+
+		2003
+		{
+			title = "Death Line";
+			prefix = "(2003)";
+			flags64text = "[6] Use frontside";
+		}
+
+		2004
+		{
+			title = "Bot Trick Controller";
+			prefix = "(2004)";
+		}
 	}
 }
 
@@ -3014,193 +3177,6 @@ thingtypes
 		}*/
 	}
 
-	enemies
-	{
-		color = 9; // Light_Blue
-		arrow = 1;
-		title = "Enemies";
-		width = 24;
-		height = 32;
-		sprite = "POSSA1";
-
-		100
-		{
-			title = "Crawla (Blue)";
-			sprite = "POSSA1";
-		}
-		101
-		{
-			title = "Crawla (Red)";
-			sprite = "SPOSA1";
-		}
-		102
-		{
-			title = "Stupid Dumb Unnamed RoboFish";
-			sprite = "FISHA0";
-			width = 8;
-			height = 28;
-			angletext = "Jump strength";
-		}
-		103
-		{
-			title = "Buzz (Gold)";
-			sprite = "BUZZA1";
-			width = 20;
-			height = 24;
-			flags8text = "[8] Cannot move";
-		}
-		104
-		{
-			title = "Buzz (Red)";
-			sprite = "RBUZA1";
-			width = 20;
-			height = 24;
-			flags8text = "[8] Cannot move";
-		}
-		124
-		{
-			title = "Buzz (Aqua)";
-			sprite = "BBUZA1";
-			width = 20;
-			height = 24;
-		}
-		105
-		{
-			title = "Jetty-Syn Bomber";
-			sprite = "JETBB1";
-			width = 20;
-			height = 48;
-			flags8text = "[8] Cannot move";
-		}
-		106
-		{
-			title = "Jetty-Syn Gunner";
-			sprite = "JETGB1";
-			width = 20;
-			height = 48;
-			flags8text = "[8] Cannot move";
-		}
-		107
-		{
-			title = "Crawla Commander";
-			sprite = "CCOMA1";
-			width = 16;
-		}
-		108
-		{
-			title = "Deton";
-			sprite = "DETNA1";
-			width = 20;
-		}
-		109
-		{
-			title = "Skim";
-			sprite = "SKIMA1";
-			width = 16;
-			height = 24;
-		}
-		110
-		{
-			title = "Turret";
-			sprite = "TRETA1";
-			width = 16;
-			height = 32;
-		}
-		111
-		{
-			title = "Pop-up Turret";
-			sprite = "TURRI1";
-			width = 12;
-			height = 64;
-			angletext = "Firing delay";
-		}
-		112
-		{
-			title = "Sharp";
-			sprite = "SHRPA1";
-			width = 16;
-			height = 24;
-		}
-		113
-		{
-			title = "Jet Jaw";
-			sprite = "JJAWA3A7";
-			width = 12;
-			height = 20;
-		}
-		114
-		{
-			title = "Snailer";
-			sprite = "SNLRA3A7";
-			height = 48;
-		}
-		115
-		{
-			title = "Bird Aircraft Strike Hazard";
-			sprite = "VLTRF1";
-			width = 12;
-			height = 24;
-		}
-		116
-		{
-			title = "Pointy";
-			sprite = "PNTYA1";
-			width = 8;
-			height = 16;
-		}
-		117
-		{
-			title = "Robo-Hood";
-			sprite = "ARCHA1";
-			flags8text = "[8] Cannot jump";
-		}
-		118
-		{
-			title = "CastleBot FaceStabber";
-			sprite = "CBFSA1";
-			width = 32;
-			height = 64;
-		}
-		119
-		{
-			title = "Egg Guard";
-			sprite = "ESHIA1";
-			width = 16;
-			height = 48;
-			flags8text = "[8] Double speed";
-		}
-		120
-		{
-			title = "Green Snapper";
-			sprite = "GSNPA1";
-			height = 24;
-		}
-		121
-		{
-			title = "Minus";
-			sprite = "MNUSA1";
-		}
-		122
-		{
-			title = "Spring Shell (Green)";
-			sprite = "SSHLA1";
-			height = 40;
-		}
-		125
-		{
-			title = "Spring Shell (Yellow)";
-			sprite = "SSHLI1";
-			height = 40;
-		}
-		123
-		{
-			title = "Unidus";
-			sprite = "UNIDA1";
-			width = 18;
-			height = 36;
-		}
-	}
-
 	bosses
 	{
 		color = 8; // Dark_Gray
@@ -3208,76 +3184,15 @@ thingtypes
 		title = "Bosses";
 		width = 24;
 		height = 52;
-		sprite = "EGGMA1";
+		sprite = "internal:eggmanway";
 
-		200
-		{
-			title = "Boss 1 - Egg Mobile";
-			sprite = "EGGMA1";
-			flags4text = "[4] End level on death";
-			flags8text = "[8] Alternate laser attack";
-		}
-		201
-		{
-			title = "Boss 2 - Egg Slimer";
-			sprite = "EGGNA1";
-			height = 48;
-			flags4text = "[4] End level on death";
-			flags8text = "[8] Speed up when hit";
-		}
-		202
-		{
-			title = "Boss 3 - Sea Egg";
-			sprite = "EGGOA1";
-			width = 32;
-			height = 80;
-			flags4text = "[4] End level on death";
-		}
-		203
-		{
-			title = "Boss 4 - Eggscalibur";
-			sprite = "EGGPA1";
-			flags4text = "[4] End level on death";
-		}
-		207
-		{
-			title = "Boss 5A - Metal Sonic (Race)";
-			sprite = "METLI1";
-			width = 16;
-			height = 48;
-		}
-		208
-		{
-			title = "Boss 5B - Metal Sonic (Battle)";
-			sprite = "METLC1";
-			width = 16;
-			height = 48;
-			flags4text = "[4] End level on death";
-		}
-		209
-		{
-			title = "Boss 6 - Brak Eggman";
-			sprite = "BRAK[1";
-			width = 48;
-			height = 160;
-			flags4text = "[4] End level on death";
-			flags8text = "[8] Electric barrier";
-		}
-		206
-		{
-			title = "Boss ? - Brak Eggman (Old)";
-			sprite = "BRAKB1";
-			width = 48;
-			height = 160;
-			flags4text = "[4] End level on death";
-		}
 		290
 		{
 			arrow = 0;
 			title = "Boss Escape Point";
 			width = 8;
 			height = 16;
-			sprite = "internal:eggmanend";
+			sprite = "internal:eggmanendy";
 		}
 		291
 		{
@@ -3298,12 +3213,22 @@ thingtypes
 			angletext = "No. (Sea Egg)";
 			flagsvaluetext = "No. (Brak)";
 			parametertext = "Next";
+			fixedrotation = 1;
 		}
 		293
 		{
 			title = "Metal Sonic Gather Point";
 			sprite = "internal:metal";
 		}
+		294
+		{
+			arrow = 0;
+			title = "Fang Waypoint";
+			flags8text = "[8] Center waypoint";
+			sprite = "internal:eggmanway";
+			width = 8;
+			height = 16;
+		}
 	}
 
 	rings
@@ -3322,83 +3247,6 @@ thingtypes
 			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
@@ -3408,204 +3256,27 @@ thingtypes
 		width = 16;
 		height = 32;
 		sort = 1;
-		sprite = "CEMGA0";
+		sprite = "ITEMALAR";
 
-		310
+		2000
 		{
-			title = "CTF Red Flag";
-			sprite = "RFLGA0";
-			width = 24;
-			height = 64;
+			title = "Random Item";
+			sprite = "RNDMA0";
+			width = 36;
+			height = 36;
 		}
-		311
+		2010
 		{
-			title = "CTF Blue Flag";
-			sprite = "BFLGA0";
-			width = 24;
-			height = 64;
-		}
-		312
-		{
-			title = "Special Stage Token";
-			sprite = "internal:token";
-			width = 8;
-			height = 16;
-			flags8height = 24;
-			flags4text = "[4] Mario Block version";
-			flags8text = "[8] Float";
-		}
-		313
-		{
-			title = "Chaos Emerald 1 (Green)";
-			sprite = "EMMYA0";
-		}
-		314
-		{
-			title = "Chaos Emerald 2 (Purple)";
-			sprite = "EMMYB0";
-		}
-		315
-		{
-			title = "Chaos Emerald 3 (Blue)";
-			sprite = "EMMYC0";
-		}
-		316
-		{
-			title = "Chaos Emerald 4 (Cyan)";
-			sprite = "EMMYD0";
-		}
-		317
-		{
-			title = "Chaos Emerald 5 (Orange)";
-			sprite = "EMMYE0";
-		}
-		318
-		{
-			title = "Chaos Emerald 6 (Red)";
-			sprite = "EMMYF0";
-		}
-		319
-		{
-			title = "Chaos Emerald 7 (Gray)";
-			sprite = "EMMYG0";
-		}
-		320
-		{
-			title = "Emerald Hunt Location";
-			sprite = "internal:hunt";
-		}
-		323
-		{
-			title = "Match Chaos Emerald Spawn";
-			sprite = "CEMGA0";
-			width = 8;
-			height = 16;
-			flags8height = 24;
-			flags8text = "[8] Float";
-		}
-	}
-
-	boxes
-	{
-		color = 7; // Gray
-		blocking = 2;
-		title = "Monitors";
-		width = 16;
-		height = 32;
-		flags4text = "[4] Random (Strong)";
-		flags8text = "[8] Random (Weak)";
-		sprite = "SRBXA0";
-
-		400
-		{
-			title = "Super Ring (10 Rings)";
-			sprite = "SRBXA0";
-		}
-		401
-		{
-			title = "Pity Shield";
-			sprite = "GRTVA0";
-		}
-		402
-		{
-			title = "Attraction Shield";
-			sprite = "YLTVA0";
-		}
-		403
-		{
-			title = "Force Shield";
-			sprite = "BLTVA0";
-		}
-		404
-		{
-			title = "Armageddon Shield";
-			sprite = "BKTVA0";
-		}
-		405
-		{
-			title = "Whirlwind Shield";
-			sprite = "WHTVA0";
-		}
-		406
-		{
-			title = "Elemental Shield";
-			sprite = "ELTVA0";
-		}
-		407
-		{
-			title = "Super Sneakers";
-			sprite = "SHTVA0";
-		}
-		408
-		{
-			title = "Invincibility";
-			sprite = "PINVA0";
-		}
-		409
-		{
-			title = "Extra Life";
-			sprite = "PRUPA0";
-			flags4text = "[4] Random (Strong) / 10k points";
-			flags8text = "[8] Random (Weak) / 10k points";
-		}
-		410
-		{
-			title = "Eggman";
-			sprite = "EGGBA0";
-			flags4text = "[4] Special";
-			flags8text = "[8] Ambush";
-		}
-		411
-		{
-			title = "Teleporter";
-			sprite = "MIXUA0";
-		}
-		412
-		{
-			title = "Random";
-			sprite = "QUESA0";
-			flags4text = "[4] Special";
-			flags8text = "[8] Ambush";
-		}
-		413
-		{
-			title = "Gravity Boots";
-			sprite = "GBTVA0";
-			flags4text = "[4] Special";
-			flags8text = "[8] Ambush";
-		}
-		414
-		{
-			title = "CTF Team Ring Monitor (Red)";
-			sprite = "RRBXA0";
-			flags4text = "[4] Special";
-			flags8text = "[8] Ambush";
-		}
-		415
-		{
-			title = "CTF Team Ring Monitor (Blue)";
-			sprite = "BRBXA0";
-			flags4text = "[4] Special";
-			flags8text = "[8] Ambush";
-		}
-		416
-		{
-			title = "Recycler";
-			sprite = "RECYA0";
-		}
-		418
-		{
-			title = "Score (1,000 Points)";
-			sprite = "PTTVA0";
-			flags4text = "[4] Special";
-			flags8text = "[8] Ambush";
-		}
-		419
-		{
-			title = "Score (10,000 Points)";
-			sprite = "PTTVF0";
-			flags4text = "[4] Special";
-			flags8text = "[8] Ambush";
+			title = "Item Capsule";
+			sprite = "ICAPA0";
+			width = 56;
+			height = 96;
+			angletext = "Object Type";
+			parametertext = "Amount";
+			flags1text = "[1] Toggle RA persistence";
+			flags4text = "[4] Add 16";
+			flags8text = "[8] Double Size";
+			fixedrotation = 1;
 		}
 	}
 
@@ -3615,175 +3286,143 @@ thingtypes
 		title = "Miscellaneous";
 		width = 16;
 		height = 40;
-		sprite = "STPTA0";
+		sprite = "SIGND0";
 
-		500
+		2424
 		{
-			title = "Air Bubble Patch";
-			sprite = "BUBLA0";
-			width = 8;
-			height = 16;
-			flags8text = "[8] No distance check";
+			title = "Finish-Line Beam Points";
+			sprite = "FLBMA0";
 		}
 		501
 		{
+			arrow = 1;
 			title = "Level End Sign";
 			sprite = "SIGND0";
 			width = 8;
 			height = 32;
 		}
-		502
+		3775
+		{
+			title = "Kiosk";
+			sprite = "OTCPA0";
+			width = 12;
+			height = 48;
+		}
+		2333
 		{
 			arrow = 1;
-			title = "Star Post";
-			sprite = "STPTA0";
-			width = 64;
-			height = 80;
-			angletext = "Angle/Order";
-		}
-		526
-		{
+			title = "Target Capsule";
+			//sprite = "internal:kartcapsule";
+			width = 28;
+			height = 112;
 			blocking = 2;
-			title = "Cannonball";
-			sprite = "CBLLA0";
-			width = 20;
-			flags4text = "[4] Slides when pushed";
-			flags8text = "[8] Not pushable";
+			angletext = "Speed";
+			parametertext = "Movement sequence";
+			flags4text = "[4] Reverse movement";
+			flags8text = "[8] Back and forth";
+			fixedrotation = 1;
 		}
-		1000
+		1104
 		{
-			arrow = 1;
-			blocking = 2;
-			title = "Gargoyle";
-			sprite = "GARGA1";
-			flags4text = "[4] Slides when pushed";
-			flags8text = "[8] Not pushable";
-		}
-		1102
-		{
-			arrow = 1;
-			blocking = 2;
-			title = "Eggman Statue";
-			sprite = "ESTAA1";
-			width = 32;
-			height = 240;
-			flags4text = "[4] Slides when pushed";
-			flags8text = "[8] Not pushable";
-		}
-		1106
-		{
-			arrow = 1;
-			title = "Chain (Swinging)";
-			sprite = "internal:chain1";
-			height = 32;
+			title = "Mace Spawnpoint";
+			sprite = "SMCEA0";
+			width = 17;
+			height = 34;
+			flags4text = "[4] No sounds";
 			flags8text = "[8] Double size";
 			angletext = "Tag";
+			parametertext = "Spokes";
+			fixedrotation = 1;
+			fixedrotation = 1;
+		}
+		1105
+		{
+			title = "Chain with Maces Spawnpoint";
+			sprite = "SMCEA0";
+			width = 17;
+			height = 34;
+			flags4text = "[4] No sounds";
+			flags8text = "[8] Double size";
+			angletext = "Tag";
+			parametertext = "Spokes";
+			fixedrotation = 1;
 		}
 		1107
 		{
-			arrow = 1;
-			title = "Chain (Spinning)";
-			sprite = "internal:chain2";
-			height = 32;
+			title = "Chain Spawnpoint";
+			sprite = "BMCHA0";
+			width = 17;
+			height = 34;
 			flags8text = "[8] Double size";
 			angletext = "Tag";
+			parametertext = "Spokes";
+			fixedrotation = 1;
 		}
 		1108
 		{
 			arrow = 1;
-			title = "Chain (Hidden)";
+			title = "Hidden Chain Spawnpoint";
 			sprite = "internal:chain3";
-			height = 32;
+			width = 17;
+			height = 34;
 			flags8text = "[8] Double size";
 		}
-		1200
+		1109
 		{
-			title = "Tumbleweed (Big)";
-			sprite = "BTBLA0";
-			width = 24;
-			height = 48;
-			flags8text = "[8] Moves perpetually";
+			title = "Firebar Spawnpoint";
+			sprite = "BFBRA0";
+			width = 17;
+			height = 34;
+			flags4text = "[4] No sounds";
+			flags8text = "[8] Double size";
+			angletext = "Tag";
+			parametertext = "Spokes";
+			fixedrotation = 1;
 		}
-		1201
+		1110
 		{
-			title = "Tumbleweed (Small)";
-			sprite = "STBLA0";
-			width = 12;
-			height = 24;
-			flags8text = "[8] Moves perpetually";
-		}
-		1504
-		{
-			title = "ATZ Target";
-			sprite = "RCRYB0";
-			width = 24;
-			height = 32;
-		}
-		1852
-		{
-			blocking = 2;
-			title = "Snowman";
-			sprite = "XMS3A0";
-			flags4text = "[4] Slides when pushed";
-			flags8text = "[8] Not pushable";
-		}
-		1876
-		{
-			arrow = 1;
-			blocking = 2;
-			title = "Eggman Disco Statue";
-			sprite = "ESTAB1";
-			width = 20;
-			height = 96;
-			flags4text = "[4] Slides when pushed";
-			flags8text = "[8] Not pushable";
+			title = "Custom Mace Spawnpoint";
+			sprite = "SMCEA0";
+			width = 17;
+			height = 34;
+			flags4text = "[4] No sounds";
+			angletext = "Tag";
+			parametertext = "Spokes";
+			fixedrotation = 1;
 		}
 	}
 
 	springs
 	{
 		color = 12; // Light_Red
-		title = "Springs and Fans";
+		title = "Springs and Dash Rings";
 		width = 48;
 		height = 32;
 		sprite = "RSPRD2";
 
-		540
-		{
-			title = "Fan";
-			sprite = "FANSA0D0";
-			width = 16;
-			height = 16;
-			flags4text = "[4] Invisible";
-			flags8text = "[8] No distance check";
-			angletext = "Lift height";
-		}
-		541
-		{
-			title = "Gas Jet";
-			sprite = "STEMD0";
-			width = 32;
-			height = 16;
-		}
 		550
 		{
 			title = "Yellow Spring";
 			sprite = "SPVYA0";
+			flags8text = "[8] Add Gravity";
 		}
 		551
 		{
 			title = "Red Spring";
 			sprite = "SPVRA0";
+			flags8text = "[8] Add Gravity";
 		}
 		552
 		{
 			title = "Blue Spring";
 			sprite = "SPVBA0";
+			flags8text = "[8] Add Gravity";
 		}
 		553
 		{
 			title = "Grey Spring";
 			sprite = "SPVGA0";
+			flags8text = "[8] Add Gravity";
 		}
 		554
 		{
@@ -3841,92 +3480,34 @@ thingtypes
 			sprite = "SPHGA2A8";
 			flags8text = "[8] Rotate 22.5° CCW";
 		}
-	}
-
-	patterns
-	{
-		color = 5; // Magenta
-		arrow = 1;
-		title = "Special Placement Patterns";
-		width = 16;
-		height = 384;
-		sprite = "RINGA0";
-
-		600
+		3441
 		{
-			arrow = 0;
-			title = "5 Vertical Rings (Yellow Spring)";
-			sprite = "RINGA0";
+			title = "Dash Ring";
+			sprite = "DASRA1";
+			width = 32;
+			height = 45;
+			parametertext = "Strength";
+			flags1text = "[1] 30 Degrees Up";
+			flags4text = "[4] 60 Degrees Up";
+			flags8text = "[8] Angle Upwards";
 		}
-		601
+		3442
 		{
-			arrow = 0;
-			title = "5 Vertical Rings (Red Spring)";
-			sprite = "RINGA0";
-			height = 1024;
+			title = "Rainbow Ring";
+			sprite = "RAIRA1";
+			width = 32;
+			height = 45;
+			parametertext = "Strength";
+			flags1text = "[1] 30 Degrees Up";
+			flags4text = "[4] 60 Degrees Up";
+			flags8text = "[8] Angle Upwards";
 		}
-		602
+		541
 		{
-			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;
-			unflippable = true;
-			centerHitbox = true;
-		}
-		605
-		{
-			title = "Circle of Rings (Big)";
-			sprite = "RINGA0";
-			width = 192;
-			unflippable = true;
-			centerHitbox = true;
-		}
-		606
-		{
-			title = "Circle of Wing Logos";
-			sprite = "NWNGA0";
-			width = 96;
-			height = 192;
-			unflippable = true;
-			centerHitbox = true;
-		}
-		607
-		{
-			title = "Circle of Wing Logos (Big)";
-			sprite = "NWNGA0";
-			width = 192;
-			unflippable = true;
-			centerHitbox = true;
-		}
-		608
-		{
-			title = "Circle of Rings and Wings";
-			sprite = "NWNGA0";
-			width = 96;
-			height = 192;
-			unflippable = true;
-			centerHitbox = true;
-		}
-		609
-		{
-			title = "Circle of Rings and Wings (Big)";
-			sprite = "NWNGA0";
-			width = 192;
-			unflippable = true;
-			centerHitbox = true;
+			title = "Gas Jet";
+			sprite = "STEMD0";
+			width = 32;
+			height = 16;
 		}
 	}
 
@@ -3938,12 +3519,140 @@ thingtypes
 		height = 16;
 		sprite = "UNKNA0";
 
+		750
+		{
+			title = "Slope Vertex";
+			sprite = "internal:vertexslope";
+			angletext = "Tag";
+			fixedrotation = 1;
+		}
+
+		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";
+			angletext = "Order";
+			fixedrotation = 1;
+		}
+
+		754
+		{
+			title = "Push Point";
+			flags4text = "[4] Fades using XY";
+			flags8text = "[8] Push using XYZ";
+			sprite = "internal:tele";
+			angletext = "Radius";
+			fixedrotation = 1;
+		}
+		755
+		{
+			title = "Pull Point";
+			flags4text = "[4] Fades using XY";
+			flags8text = "[8] Pull using XYZ";
+			sprite = "internal:tele";
+			angletext = "Radius";
+			fixedrotation = 1;
+		}
+		756
+		{
+			title = "Blast Linedef Executor";
+			sprite = "internal:tele";
+			width = 32;
+			height = 16;
+			angletext = "Tag";
+			fixedrotation = 1;
+		}
+		757
+		{
+			title = "Fan Particle Generator";
+			sprite = "PRTLA0";
+			width = 8;
+			height = 16;
+			angletext = "Tag";
+			fixedrotation = 1;
+		}
+		758
+		{
+			title = "Object Angle Anchor";
+			sprite = "internal:view";
+		}
+		760
+		{
+			title = "PolyObject Anchor";
+			sprite = "internal:polyanchor";
+			angletext = "ID";
+			fixedrotation = 1;
+		}
+
+		761
+		{
+			title = "PolyObject Spawn Point";
+			sprite = "internal:polycenter";
+			angletext = "ID";
+			fixedrotation = 1;
+		}
+
+		762
+		{
+			title = "PolyObject Spawn Point (Crush)";
+			sprite = "internal:polycentercrush";
+			flags4text = "[4] In-map centerpoint";
+			angletext = "ID";
+			fixedrotation = 1;
+		}
+
+		777
+		{
+			title = "Floor Slope Anchor";
+			sprite = "SAFA0";
+			parametertext = "Level";
+		}
+
+		778
+		{
+			title = "Ceiling Slope Anchor";
+			sprite = "SACA0";
+			parametertext = "Level";
+		}
+
+		780
+		{
+			title = "Skybox View Point";
+			sprite = "internal:skyb";
+			flags4text = "[4] In-map reference point";
+			angletext = "View height";
+			fixedrotation = 1;
+		}
+	}
+
+	ambience
+	{
+		color = 15; // White
+		title = "Ambience";
+		width = 8;
+		height = 16;
+		sprite = "UNKNA0";
+
 		700
 		{
 			title = "Water Ambience A (Large)";
 			sprite = "internal:ambiance";
 		}
-		
+
 		701
 		{
 			title = "Water Ambience B (Large)";
@@ -3998,94 +3707,21 @@ thingtypes
 			sprite = "internal:ambiance";
 		}
 
-		750
+		710
 		{
-			title = "Slope Vertex";
-			sprite = "internal:vertexslope";
-			angletext = "Tag";
+			title = "Machine Ambience";
+			sprite = "internal:ambiance";
 		}
-
-		751
+		735
 		{
-			arrow = 1;
-			title = "Teleport Destination";
-			sprite = "internal:tele";
+			title = "PC Merry-Go-Round Ambience";
+			sprite = "internal:ambiance";
 		}
-
-		752
+		734
 		{
-			arrow = 1;
-			title = "Alternate View Point";
-			sprite = "internal:view";
+			title = "Twinkle Cart Ambience";
+			sprite = "internal:ambiance";
 		}
-
-		753
-		{
-			title = "Zoom Tube Waypoint";
-			sprite = "internal:zoom";
-			angletext = "Order";
-		}
-
-		754
-		{
-			title = "Push Point";
-			flags4text = "[4] Fades using XY";
-			flags8text = "[8] Push using XYZ";
-			sprite = "GWLGA0";
-			angletext = "Radius";
-		}
-		755
-		{
-			title = "Pull Point";
-			flags4text = "[4] Fades using XY";
-			flags8text = "[8] Pull using XYZ";
-			sprite = "GWLRA0";
-			angletext = "Radius";
-		}
-
-		760
-		{
-			title = "PolyObject Anchor";
-			sprite = "internal:polyanchor";
-			angletext = "ID";
-		}
-
-		761
-		{
-			title = "PolyObject Spawn Point";
-			sprite = "internal:polycenter";
-			angletext = "ID";
-		}
-
-		762
-		{
-			title = "PolyObject Spawn Point (Crush)";
-			sprite = "internal:polycentercrush";
-			angletext = "ID";
-		}
-
-		777
-		{
-			title = "Floor Slope Anchor";
-			sprite = "internal:Vertex_Anchor_Floor.png";
-			parametertext = "Level";
-		}
-
-		778
-		{
-			title = "Ceiling Slope Anchor";
-			sprite = "internal:Ceiling_Anchor_Floor.png";
-			parametertext = "Level";
-		}
-
-		780
-		{
-			title = "Skybox View Point";
-			sprite = "internal:skyb";
-			flags4text = "[4] In-map reference point";
-			angletext = "View height";
-		}
-
 	}
 
 	hazards
@@ -4104,59 +3740,58 @@ thingtypes
 			flags8height = 24;
 			flags8text = "[8] Float";
 		}
+		522
+		{
+			title = "Wall Spike";
+			sprite = "WSPKALAR";
+			width = 16;
+			height = 14;
+			arrow = 1;
+			flags1text = "[1] Start retracted";
+			flags4text = "[4] Retractable";
+			flags8text = "[8] Intangible";
+			parametertext = "Start delay";
+		}
 		523
 		{
 			title = "Spike";
 			sprite = "USPKA0";
 			width = 8;
-			height = 42;
+			height = 32;
+			flags1text = "[1] Start retracted";
 			flags4text = "[4] Retractable";
-			flags8text = "[8] Solid";
+			flags8text = "[8] Intangible";
 			angletext = "Retraction interval";
+			fixedrotation = 1;
+			parametertext = "Start delay";
 		}
-		524
+		1130
 		{
-			arrow = 1;
-			title = "Big Floating Mine";
-			width = 16;
-			height = 32;
-			sprite = "BMNEA1";
+			title = "Small Mace";
+			sprite = "SMCEA0";
+			width = 17;
+			height = 34;
 		}
-		527
+		1131
 		{
-			arrow = 1;
-			title = "Big Floating Mine (Air)";
-			width = 16;
-			height = 32;
-			sprite = "BMNEA1";
+			title = "Big Mace";
+			sprite = "BMCEA0";
+			width = 34;
+			height = 68;
 		}
-		525
+		1136
 		{
-			title = "Cannonball Launcher";
-			sprite = "internal:cannonball";
+			title = "Small Fireball";
+			sprite = "SFBRA0";
+			width = 17;
+			height = 34;
 		}
-		1101
+		1137
 		{
-			title = "Torch";
-			sprite = "FLAMA0";
-			width = 8;
-			height = 32;
-		}
-		1105
-		{
-			title = "Mace (Swinging)";
-			sprite = "internal:mace1";
-			flags4text = "[4] No sounds";
-			flags8text = "[8] Double size";
-			angletext = "Tag";
-		}
-		1104
-		{
-			title = "Mace (Spinning)";
-			sprite = "internal:mace2";
-			flags4text = "[4] No sounds";
-			flags8text = "[8] Double size";
-			angletext = "Tag";
+			title = "Large Fireball";
+			sprite = "BFBRA0";
+			width = 34;
+			height = 68;
 		}
 		1202
 		{
@@ -4164,6 +3799,7 @@ thingtypes
 			title = "Rock Spawner";
 			sprite = "ROIAA0";
 			angletext = "Tag";
+			fixedrotation = 1;
 		}
 		1300
 		{
@@ -4174,6 +3810,7 @@ thingtypes
 			flags8text = "[8] Waves vertically";
 			angletext = "On/Off time";
 			parametertext = "Strength";
+			fixedrotation = 1;
 		}
 		1301
 		{
@@ -4183,50 +3820,7 @@ thingtypes
 			flags8text = "[8] Shoot downwards";
 			angletext = "On/Off time";
 			parametertext = "Strength";
-		}
-		1500
-		{
-			arrow = 1;
-			blocking = 2;
-			title = "Trapgoyle";
-			sprite = "GARGA1";
-			width = 16;
-			height = 40;
-			flags4text = "[4] Slides when pushed";
-			flags8text = "[8] Not pushable";
-		}
-		1501
-		{
-			arrow = 1;
-			blocking = 2;
-			title = "Trapgoyle (Up)";
-			sprite = "GARGA1";
-			width = 16;
-			height = 40;
-			flags4text = "[4] Slides when pushed";
-			flags8text = "[8] Not pushable";
-		}
-		1502
-		{
-			arrow = 1;
-			blocking = 2;
-			title = "Trapgoyle (Down)";
-			sprite = "GARGA1";
-			width = 16;
-			height = 40;
-			flags4text = "[4] Slides when pushed";
-			flags8text = "[8] Not pushable";
-		}
-		1503
-		{
-			arrow = 1;
-			blocking = 2;
-			title = "Trapgoyle (Long)";
-			sprite = "GARGA1";
-			width = 16;
-			height = 40;
-			flags4text = "[4] Slides when pushed";
-			flags8text = "[8] Not pushable";
+			fixedrotation = 1;
 		}
 		3576
 		{
@@ -4250,15 +3844,6 @@ thingtypes
 		height = 40;
 		sprite = "FWR1A0";
 
-		757
-		{
-			title = "Fan Particle Generator";
-			sprite = "PRTLA0";
-			width = 8;
-			height = 16;
-			angletext = "Particle speed";
-			parametertext = "Interval";
-		}
 		800
 		{
 			title = "GFZ Flower";
@@ -4319,27 +3904,7 @@ thingtypes
 			height = 16;
 			hangs = 1;
 			angletext = "Dripping interval";
-		}
-		1003
-		{
-			title = "Coral (Green)";
-			sprite = "CRL1A0";
-			width = 8;
-			height = 16;
-		}
-		1004
-		{
-			title = "Coral (Red)";
-			sprite = "CRL2A0";
-			width = 8;
-			height = 16;
-		}
-		1005
-		{
-			title = "Coral (Orange)";
-			sprite = "CRL3A0";
-			width = 8;
-			height = 16;
+			fixedrotation = 1;
 		}
 		1006
 		{
@@ -4456,104 +4021,6 @@ thingtypes
 		}
 	}
 
-	nights
-	{
-		color = 13; // Pink
-		title = "NiGHTS Items";
-		width = 12;
-		height = 32;
-		sprite = "NWNGA0";
-
-		1703
-		{
-			title = "Ideya Drone";
-			sprite = "NDRNA1";
-			width = 16;
-			height = 56;
-			flags8text = "[8] Die upon time up";
-			angletext = "Time limit";
-		}
-		1704
-		{
-			arrow = 1;
-			title = "Bumper";
-			sprite = "NBMPG3G7";
-			width = 32;
-			height = 64;
-			unflippable = true;
-			flagsvaluetext = "Pitch";
-			angletext = "Yaw";
-		}
-		1705
-		{
-			arrow = 1;
-			title = "Hoop (Generic)";
-			sprite = "HOOPA0";
-			width = 80;
-			height = 160;
-			unflippable = true;
-			centerHitbox = true;
-			flagsvaluetext = "Height";
-			angletext = "Pitch/Yaw";
-		}
-		1706
-		{
-			title = "Wing Logo";
-			sprite = "NWNGA0";
-			height = 24;
-			unflippable = true;
-		}
-		1707
-		{
-			title = "Super Paraloop";
-			sprite = "NPRUA0";
-			flags4text = "[4] Bonus time only";
-			flags8text = "[8] Spawn immediately";
-		}
-		1708
-		{
-			title = "Drill Refill";
-			sprite = "NPRUB0";
-			flags4text = "[4] Bonus time only";
-			flags8text = "[8] Spawn immediately";
-		}
-		1709
-		{
-			title = "Nightopian Helper";
-			sprite = "NPRUC0";
-			flags4text = "[4] Bonus time only";
-			flags8text = "[8] Spawn immediately";
-		}
-		1711
-		{
-			title = "Extra Time";
-			sprite = "NPRUD0";
-			flags4text = "[4] Bonus time only";
-			flags8text = "[8] Spawn immediately";
-		}
-		1712
-		{
-			title = "Link Freeze";
-			sprite = "NPRUE0";
-			flags4text = "[4] Bonus time only";
-			flags8text = "[8] Spawn immediately";
-		}
-		1713
-		{
-			arrow = 1;
-			title = "Hoop (Customizable)";
-			flags1text = "[1] Radius +16";
-			flags2text = "[2] Radius +32";
-			flags4text = "[4] Radius +64";
-			flags8text = "[8] Radius +128";
-			sprite = "HOOPA0";
-			width = 80;
-			height = 160;
-			unflippable = true;
-			centerHitbox = true;
-		}
-	}
-
 	nightstrk
 	{
 		color = 13; // Pink
@@ -4572,6 +4039,7 @@ thingtypes
 			flagsvaluetext = "Order";
 			angletext = "Radius/Direction";
 			parametertext = "Mare";
+			fixedrotation = 1;
 		}
 		1701
 		{
@@ -4591,216 +4059,6 @@ thingtypes
 			flagsvaluetext = "Order";
 			parametertext = "Mare";
 		}
-		1710
-		{
-			title = "Ideya Capture";
-			sprite = "CAPSA0";
-			width = 72;
-			height = 144;
-			angletext = "Rings";
-			parametertext = "Mare";
-		}
-	}
-
-	mario
-	{
-		color = 6; // Brown
-		title = "Mario Items";
-		width = 16;
-		height = 32;
-		sprite = "GOOMA0";
-
-		1800
-		{
-			title = "Coin";
-			sprite = "COINA0";
-			height = 24;
-			flags8height = 24;
-			flags8text = "[8] Float";
-		}
-		1801
-		{
-			arrow = 1;
-			title = "Goomba";
-			sprite = "GOOMA0";
-			width = 24;
-		}
-		1802
-		{
-			arrow = 1;
-			title = "Goomba (Blue)";
-			sprite = "BGOMA0";
-			width = 24;
-		}
-		1803
-		{
-			title = "Fire Flower";
-			sprite = "FFWRB0";
-		}
-		1804
-		{
-			title = "Koopa Shell";
-			sprite = "SHLLA0";
-			width = 8;
-			height = 16;
-		}
-		1805
-		{
-			title = "Puma (Jumping Fireball)";
-			sprite = "PUMAA0";
-			width = 8;
-			height = 16;
-			angletext = "Jump strength";
-		}
-		1806
-		{
-			title = "King Bowser";
-			sprite = "KOOPA0";
-			height = 28;
-		}
-		1807
-		{
-			title = "Axe";
-			sprite = "MAXEA0";
-			width = 8;
-			height = 16;
-		}
-		1808
-		{
-			title = "Bush (Short)";
-			sprite = "MUS1A0";
-		}
-		1809
-		{
-			title = "Bush (Tall)";
-			sprite = "MUS2A0";
-		}
-		1810
-		{
-			title = "Toad";
-			sprite = "TOADA0";
-			width = 8;
-		}
-	}
-
-	srb1
-	{
-		color = 3; // Cyan
-		arrow = 1;
-		title = "SRB1 Remake";
-		width = 20;
-		height = 32;
-		sprite = "SRBAA1";
-
-		4000
-		{
-			title = "SRB1 Crawla";
-			sprite = "SRBAA1";
-			height = 40;
-		}
-		4001
-		{
-			title = "GuardRobo";
-			sprite = "SRBBA1";
-			width = 17;
-			height = 40;
-		}
-		4002
-		{
-			title = "Pyrin";
-			sprite = "SRBCB1";
-			width = 22;
-		}
-		4003
-		{
-			title = "HotRobo";
-			sprite = "SRBDA0";
-			height = 40;
-		}
-		4004
-		{
-			title = "Pogminz";
-			sprite = "SRBEA1";
-		}
-		4005
-		{
-			title = "Pogminz (Water)";
-			sprite = "SRBEA1";
-		}
-		4006
-		{
-			title = "Pog-GX2";
-			sprite = "SRBFA0";
-			width = 10;
-			height = 34;
-		}
-		4007
-		{
-			title = "Pyrex";
-			sprite = "SRBGA1";
-			width = 24;
-		}
-		4008
-		{
-			title = "SRB1 Turret";
-			sprite = "SRBHA0";
-			width = 24;
-			hangs = 1;
-		}
-		4009
-		{
-			title = "SWAT Bot";
-			sprite = "SRBIA1";
-			width = 21;
-			height = 69;
-		}
-		4010
-		{
-			title = "SpyBot 2000";
-			sprite = "SRBJA0";
-			width = 36;
-			height = 62;
-		}
-		4011
-		{
-			title = "Buzz Bomber";
-			sprite = "SRBKA0";
-			width = 44;
-			height = 45;
-		}
-		4012
-		{
-			arrow = 0;
-			title = "RBZ Spike";
-			sprite = "SRBLA0";
-			width = 10;
-			height = 53;
-		}
-		4013
-		{
-			arrow = 0;
-			blocking = 2;
-			title = "Dumb Metal Sonic";
-			sprite = "SRBMC0";
-			width = 16;
-			height = 40;
-			flags4text = "[4] Slides when pushed";
-			flags8text = "[8] Not pushable";
-		}
-		4014
-		{
-			title = "Super SWAT Bot";
-			sprite = "SRBNA1";
-			width = 21;
-			height = 69;
-		}
-		4015
-		{
-			title = "Genrex";
-			sprite = "SRBOA1";
-			width = 17;
-			height = 40;
-		}
 	}
 
 	bsz
@@ -4900,36 +4158,6 @@ thingtypes
 			title = "Short Flower (Orange)";
 			sprite = "BSZ3F0";
 		}
-		1430
-		{
-			title = "Tulip (Red)";
-			sprite = "BSZ4A0";
-		}
-		1431
-		{
-			title = "Tulip (Purple)";
-			sprite = "BSZ4B0";
-		}
-		1432
-		{
-			title = "Tulip (Blue)";
-			sprite = "BSZ4C0";
-		}
-		1433
-		{
-			title = "Tulip (Cyan)";
-			sprite = "BSZ4D0";
-		}
-		1434
-		{
-			title = "Tulip (Yellow)";
-			sprite = "BSZ4E0";
-		}
-		1435
-		{
-			title = "Tulip (Orange)";
-			sprite = "BSZ4F0";
-		}
 		1440
 		{
 			title = "Cluster (Red)";
@@ -5046,29 +4274,17 @@ thingtypes
 	{
 		color = 4; // Red
 		arrow = 1;
-		title = "SRB2Kart Stuff";
-		sprite = "ITEMALAR";
+		title = "Ring Racers Stuff";
+		sprite = "AUDIA2A8";
 		width = 8;
 		height = 16;
 
-		2000
+		4095
 		{
-			title = "Random Item";
-			sprite = "RNDMA0";
-			width = 36;
-			height = 36;
-		}
-		2333
-		{
-			title = "Capsule";
-			//sprite = "internal:kartcapsule";
-			width = 28;
-			height = 112;
-			blocking = 2;
-			angletext = "Speed";
-			parametertext = "Movement sequence";
-			flags4text = "[4] Reverse movement";
-			flags8text = "[8] Back and forth";
+			title = "Empty Kart";
+			sprite = "KARTA2A8";
+			width = 30;
+			height = 30;
 		}
 		1488
 		{
@@ -5078,13 +4294,6 @@ thingtypes
 			width = 8;
 			height = 20;
 		}
-		1479
-		{
-			title = "Torch (no fullbright)";
-			sprite = "FLAMA0";
-			width = 8;
-			height = 32;
-		}
 		1480
 		{
 			blocking = 2;
@@ -5406,6 +4615,30 @@ thingtypes
 			width = 5;
 			height = 204;
 		}
+		691
+		{
+			title = "FPZ FrostThrower";
+			sprite = "SFTRB0";
+			width = 32;
+			height = 45;
+			flags1text = "[1] Max Range";
+			flags8text = "[8] Alternate timming";
+			angletext = "Delay";
+		}
+		693
+		{
+			title = "FPZ Side-FrostThrower";
+			sprite = "SFTRB0";
+			width = 32;
+			height = 45;
+		}
+		3456
+		{
+			title = "SSZ Cloud Cluster";
+			sprite = "SSCLA0";
+			width = 48;
+			height = 45;
+		}
 		717
 		{
 			title = "HTZ Bush";
@@ -5767,16 +5000,6 @@ thingtypes
 			width = 16;
 			height = 64;
 		}
-		735
-		{
-			title = "PC Merry-Go-Round Ambience";
-			sprite = "internal:ambiance";
-		}
-		734
-		{
-			title = "Twinkle Cart Ambience";
-			sprite = "internal:ambiance";
-		}
 		733
 		{
 			title = "PC Exploding Barrel";
@@ -5902,35 +5125,40 @@ thingtypes
 		2001
 		{
 			title = "Waypoint (height = next waypoint ID)";
-			sprite = "EMBMP0";
+			sprite = "WAY1A0";
 			angletext = "ID";
 			flags1text = "[1] Disable";
-			flags4text = "[4] Shortcut";
+			flags4text = "[4] Start of shortcut";
 			flags8text = "[8] No respawn";
 			heighttext = "Next";
+			parametertext = "Finish?";
+			fixedrotation = 1;
 		}
 		2002
 		{
 			title = "Waypoint Riser";
-			sprite = "EMBMY0";
+			sprite = "WAY3A0";
 			angletext = "ID (if flag [4] set)";
 			flags2text = "[2] Look for FOF above";
 			flags4text = "[4] Require matching waypoint ID";
 			flags8text = "[8] Copy exact height";
+			fixedrotation = 1;
 		}
 		2003
 		{
 			title = "Waypoint Anchor";
-			sprite = "EMBMR0";
+			sprite = "WAY2A0";
 			angletext = "ID";
+			fixedrotation = 1;
 		}
 		2004
 		{
 			title = "Bot Hint";
-			sprite = "EMBMA0";
+			sprite = "WAY4A0";
 			angletext = "Radius";
 			flags8text = "[8] Avoid this area";
 			parametertext = "Strength (default = 2)";
+			fixedrotation = 1;
 		}
 	}
 }
@@ -6006,333 +5234,3 @@ thingsfilters
 		type = 292;
 	}
 }
-
-texturesets
-{
-   
-    set0
-    {
-        name = "Greenflower Zone";
-        filter0 = "GFZ*";
-        filter1 = "FWATER*";
-        filter2 = "CFALL*";
-        filter3 = "GFALL*";
-        filter4 = "FLOOR0_4";
-        filter5 = "FLOOR1_2";
-        filter6 = "FLOOR1_3";
-        filter7 = "BWATER*";
-        filter8 = "FLOOR0_2";
-        filter9 = "DEM1_5";
-        filter10 = "OLDROCKW";
-        filter11 = "ROCKY*";
-        filter12 = "OWOODW";
-        filter13 = "WOODFLR";
-    }
-   
-    set1
-    {
-        name = "Techno Hill Zone";
-        filter0 = "TH*";
-        filter1 = "CHEMG*";
-        filter2 = "TFALL?";
-        filter3 = "ALTBOX*";
-        filter4 = "BOXWARN?";
-        filter5 = "PIPE*";
-        filter6 = "PISTON";
-        filter7 = "WHZ*";
-        filter8 = "BAR*";
-        filter9 = "COMP?";
-        filter10 = "INFOWAL?";
-        filter11 = "SPECWLL?";
-        filter12 = "SUPPORT?";
-        filter13 = "LITE*";
-        filter14 = "BLUEW?";
-        filter15 = "GREYW?";
-        filter16 = "RED?";
-        filter17 = "YEL?";
-        filter18 = "SLITE?";
-        filter19 = "DOORTRK1";
-        filter20 = "GOOP*";
-        filter21 = "AFALL?";
-        filter22 = "STEEL*";
-        filter23 = "CONVEY?";
-    }
-   
-    set2
-    {
-        name = "Deep Sea Zone";
-        filter0 = "DSZ*";
-        filter1 = "LWATER*";
-        filter2 = "LFALL?";
-        filter3 = "BFALL?";
-        filter4 = "DEEPSE*";
-        filter5 = "WEB?";
-        filter6 = "RUINS1_1";
-        filter7 = "CLRWAL*";
-    }
-   
-    set3
-    {
-        name = "Castle Eggman Zone";
-        filter0 = "CASTLE*";
-        filter1 = "STONE*";
-        filter2 = "DMA*";
-        filter3 = "LIB*";
-        filter4 = "CEZ*";
-        filter5 = "CEFLAG*";
-        filter6 = "TOMBST?";
-        filter7 = "NCEZW?";
-        filter8 = "DEM1_1";
-        filter9 = "WEBB?";
-        filter10 = "LFZ*";
-        filter11 = "WEEDWALL";
-        filter12 = "STORM1";
-        filter13 = "STR_M1";
-    }
-   
-    set4
-    {
-        name = "Arid Canyon Zone";
-        filter0 = "AC*";
-        filter1 = "OIL*";
-        filter2 = "SOLFALL?";
-    }
-   
-    set5
-    {
-        name = "Red Volcano Zone";
-        filter0 = "RVZ*";
-        filter1 = "D2LAVA";
-        filter2 = "MM*";
-        filter3 = "ROCKFLR*";
-        filter4 = "ROCKWLL*";
-        filter5 = "DLAVA?";
-        filter6 = "LAVA?";
-        filter7 = "RLAVA?";
-        filter8 = "SFALL?";
-        filter9 = "MINE*";
-        filter10 = "LVASAND?";
-        filter11 = "FLOOR6_2";
-        filter12 = "TLITE6_1";
-        filter13 = "ROCKBOIL";
-        filter14 = "TLITE6_5";
-        filter15 = "TLITE6_6";
-        filter16 = "FLOOR6_1";
-    }
-   
-    set6
-    {
-        name = "Dark City Zone";
-        filter0 = "DC*";
-        filter1 = "SIDEWALK";
-        filter2 = "BRICK*";
-        filter3 = "CEMENT?";
-        filter4 = "BRIDGE*";
-        filter5 = "CATFLR02";
-        filter6 = "LIFT*";
-    }
-   
-    set7
-    {
-        name = "Doomship Zone";
-        filter0 = "DSHIP*";
-    }
-   
-    set8
-    {
-        name = "Egg Rock Zone";
-        filter0 = "ER*";
-        filter1 = "MEK*";
-        filter2 = "VENT*";
-        filter3 = "DOWN*";
-        filter4 = "UP*";
-        filter5 = "LITE*";
-        filter6 = "BLUEW?";
-        filter7 = "GREYW?";
-        filter8 = "RED?";
-        filter9 = "YEL?";
-        filter10 = "EGRID*";
-        filter11 = "CONVEY?";
-    }
-   
-    set9
-    {
-        name = "Mario";
-        filter0 = "MARFLAG?";
-        filter1 = "THWOMP*";
-        filter2 = "PTZ*";
-        filter3 = "MARIO*";
-        filter4 = "MARROCK?";
-    }
-   
-    set10
-    {
-        name = "Special Stage";
-        filter0 = "ASPEC*";
-        filter1 = "CSPEC*";
-        filter2 = "EMTEX?";
-        filter3 = "GSPEC*";
-        filter4 = "PSPEC*";
-        filter5 = "RSPEC*";
-        filter6 = "SFLR*";
-        filter7 = "SPACE*";
-        filter8 = "SPC*";
-        filter9 = "SPEC*";
-        filter10 = "VOID*";
-        filter11 = "WSPEC*";
-        filter12 = "YSPEC*";
-        filter13 = "BSPEC*";
-    }
-   
-    set11
-    {
-        name = "Multiplayer levels";
-        filter0 = "ALLYRING";
-        filter1 = "BRAKCAT?";
-        filter2 = "SANDWLL";
-        filter3 = "LAKE*";
-        filter4 = "AP*";
-        filter5 = "ZIM*";
-        filter6 = "RCZ*";
-    }
-   
-    set12
-    {
-        name = "Caves and Cliffs";
-        filter0 = "CAVE*";
-        filter1 = "ROCK?";
-        filter2 = "ROCKF?";
-        filter3 = "CLIFF*";
-        filter4 = "SHAL*";
-        filter5 = "MRNR*";
-    }
-   
-    set13
-    {
-        name = "Christmas";
-        filter0 = "XM*";
-        filter1 = "FROST*";
-        filter2 = "GRSWALL3";
-        filter3 = "GRSWALL4";
-    }
-   
-    set14
-    {
-        name = "Forts";
-        filter0 = "2FORT*";
-    }
-   
-    set15
-    {
-        name = "Ice and Snow";
-        filter0 = "ICE*";
-        filter1 = "SNOW*";
-    }
-   
-    set16
-    {
-        name = "Jungle";
-        filter0 = "GRSEDG?";
-        filter1 = "JNG*";
-        filter2 = "SHROOM*";
-    }
-   
-    set17
-    {
-        name = "Sand";
-        filter0 = "SAND";
-        filter1 = "SANDW";
-        filter2 = "SANDFLR*";
-        filter3 = "SND*";
-        filter4 = "AGZ*";
-        filter5 = "QUIK*";
-        filter6 = "Q?FALL?";
-    }
-   
-    set18
-    {
-        name = "Forest";
-        filter0 = "WOOD*";
-        filter1 = "EC*";
-        filter2 = "GRASS1*";
-        filter3 = "VFZ*";
-        filter4 = "OWOODW";
-        filter5 = "DEM1_2";
-    }
-   
-    set19
-    {
-        name = "Generic";
-        filter0 = "BUST*";
-        filter1 = "CEIL3_1";
-        filter2 = "CTFFLG*";
-        filter3 = "DEM1_3";
-        filter4 = "BIGX";
-        filter5 = "ARROW?";
-        filter6 = "HAZARD?";
-        filter7 = "*PIT";
-        filter8 = "SPIKE*";
-        filter9 = "*CAUTN";
-        filter10 = "TRAPFLR";
-        filter11 = "EGGTRAP?";
-        filter12 = "GLASS*";
-        filter13 = "DIRT*";
-        filter14 = "EGGOLD*";
-        filter15 = "MARE*";
-        filter16 = "BLUEFLR";
-        filter17 = "BLUWALL";
-        filter18 = "CYAN*";
-        filter19 = "GOLD*";
-        filter20 = "GREENFLR";
-        filter21 = "GRNWALL";
-        filter22 = "GREYFLR";
-        filter23 = "GRYWALL";
-        filter24 = "LIME*";
-        filter25 = "NEOG*";
-        filter26 = "ORGFLR";
-        filter27 = "ORANGE";
-        filter28 = "PUR*";
-        filter29 = "REDFLR";
-        filter30 = "REDWALL";
-        filter31 = "VIO*";
-        filter32 = "YELFLR";
-        filter33 = "YELWALL";
-    }
-   
-    set20
-    {
-        name = "Unsorted";
-        filter0 = "FLAT1_2";
-        filter1 = "FOSSIL*";
-        filter2 = "F_METAL?";
-        filter3 = "GRASSY*";
-        filter4 = "WATER?";
-        filter5 = "SURF*";
-        filter6 = "OFALL?";
-        filter7 = "MFALL1";
-        filter8 = "SCREEN01";
-        filter9 = "TRCKWLL1";
-        filter10 = "WINDOW";
-        filter11 = "XTRMCHK*";
-        filter12 = "CHAINFEN";
-        filter13 = "SRB1*";
-        filter14 = "DISCO*";
-        filter15 = "DANCE?";
-        filter16 = "RECORD";
-        filter17 = "DFZ*";
-    }
-   
-    set21
-    {
-        name = "Classic levels";
-        filter0 = "GHZ*";
-        filter1 = "HPZ*";
-        filter2 = "LBZ*";
-        filter3 = "GRASS2";
-        filter4 = "GRASS3";
-        filter5 = "GRSWALL";
-        filter6 = "GRNLITE1";
-        filter7 = "GATE2";
-        filter8 = "DEM1_6";
-    }
-}