diff --git a/extras/conf/SRB2-22.cfg b/extras/conf/SRB2-22.cfg
index 606b8af68c7067775298625aa0846cc8ddace222..41e8a30eacbd9635d31cfb3a93675ee49a320235 100644
--- a/extras/conf/SRB2-22.cfg
+++ b/extras/conf/SRB2-22.cfg
@@ -4141,6 +4141,34 @@ thingtypes
 			angletext = "Retraction interval";
 			parametertext = "Initial delay";
 		}
+		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
@@ -4248,6 +4276,20 @@ thingtypes
 			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;
+		}
 	}
 
 	patterns
@@ -4828,7 +4870,7 @@ thingtypes
 		}
 		1104
 		{
-			title = "Mace";
+			title = "Mace Spawnpoint";
 			sprite = "SMCEA0";
 			width = 17;
 			height = 34;
@@ -4838,7 +4880,7 @@ thingtypes
 		}
 		1105
 		{
-			title = "Chain & Maces";
+			title = "Chain with Maces Spawnpoint";
 			sprite = "SMCEA0";
 			width = 17;
 			height = 34;
@@ -4848,7 +4890,7 @@ thingtypes
 		}
 		1106
 		{
-			title = "Chained Spring";
+			title = "Chained Spring Spawnpoint";
 			sprite = "YSPBA0";
 			width = 17;
 			height = 34;
@@ -4858,7 +4900,7 @@ thingtypes
 		}
 		1107
 		{
-			title = "Chain";
+			title = "Chain Spawnpoint";
 			sprite = "BMCHA0";
 			width = 17;
 			height = 34;
@@ -4868,7 +4910,7 @@ thingtypes
 		1108
 		{
 			arrow = 1;
-			title = "Chain (Hidden)";
+			title = "Hidden Chain Spawnpoint";
 			sprite = "internal:chain3";
 			width = 17;
 			height = 34;
@@ -4876,7 +4918,7 @@ thingtypes
 		}
 		1109
 		{
-			title = "Firebar";
+			title = "Firebar Spawnpoint";
 			sprite = "BFBRA0";
 			width = 17;
 			height = 34;
@@ -4886,7 +4928,7 @@ thingtypes
 		}
 		1110
 		{
-			title = "Custom Mace";
+			title = "Custom Mace Spawnpoint";
 			sprite = "SMCEA0";
 			width = 17;
 			height = 34;
@@ -5038,62 +5080,6 @@ thingtypes
 			width = 8;
 			height = 208;
 		}
-		1130
-		{
-			title = "Small Mace";
-			sprite = "SMCEA0";
-			width = 17;
-			height = 34;
-		}
-		1131
-		{
-			title = "Big Mace";
-			sprite = "BMCEA0";
-			width = 34;
-			height = 68;
-		}
-		1132
-		{
-			title = "Small Grabbable Chain";
-			sprite = "SMCHA0";
-			width = 17;
-			height = 34;
-		}
-		1133
-		{
-			title = "Big Grabbable Chain";
-			sprite = "BMCHA0";
-			width = 17;
-			height = 34;
-		}
-		1134
-		{
-			title = "Yellow Spring Ball";
-			sprite = "YSPBA0";
-			width = 17;
-			height = 34;
-		}
-		1135
-		{
-			title = "Red Spring Ball";
-			sprite = "RSPBA0";
-			width = 34;
-			height = 68;
-		}
-		1136
-		{
-			title = "Small Fireball";
-			sprite = "SFBRA0";
-			width = 17;
-			height = 34;
-		}
-		1136
-		{
-			title = "Large Fireball";
-			sprite = "BFBRA0";
-			width = 17;
-			height = 34;
-		}
 	}
 
 	aridcanyon