diff --git a/Build/Configurations/SRB2-22.cfg b/Build/Configurations/SRB2-22.cfg
index 06924db..111b6e7 100644
--- a/Build/Configurations/SRB2-22.cfg
+++ b/Build/Configurations/SRB2-22.cfg
@@ -4968,7 +4968,7 @@ thingtypes
 		604
 		{
 			title = "Circle of Rings";
-			sprite = "RINGA0";
+			sprite = "internal:circlering";
 			width = 96;
 			height = 192;
 			unflippable = true;
@@ -4977,7 +4977,7 @@ thingtypes
 		605
 		{
 			title = "Circle of Rings (Big)";
-			sprite = "RINGA0";
+			sprite = "internal:circlebigring";
 			width = 192;
 			unflippable = true;
 			centerHitbox = true;
@@ -4985,7 +4985,7 @@ thingtypes
 		606
 		{
 			title = "Circle of Blue Spheres";
-			sprite = "SPHRA0";
+			sprite = "internal:circlesphere";
 			width = 96;
 			height = 192;
 			unflippable = true;
@@ -4994,7 +4994,7 @@ thingtypes
 		607
 		{
 			title = "Circle of Blue Spheres (Big)";
-			sprite = "SPHRA0";
+			sprite = "internal:circlebigsphere";
 			width = 192;
 			unflippable = true;
 			centerHitbox = true;
@@ -5002,7 +5002,7 @@ thingtypes
 		608
 		{
 			title = "Circle of Rings and Spheres";
-			sprite = "SPHRA0";
+			sprite = "internal:circleringsphere";
 			width = 96;
 			height = 192;
 			unflippable = true;
@@ -5011,7 +5011,7 @@ thingtypes
 		609
 		{
 			title = "Circle of Rings and Spheres (Big)";
-			sprite = "SPHRA0";
+			sprite = "internal:circlebigringsphere";
 			width = 192;
 			unflippable = true;
 			centerHitbox = true;
@@ -5024,72 +5024,61 @@ thingtypes
 		title = "Ambience";
 		width = 8;
 		height = 16;
-		sprite = "UNKNA0";
+		sprite = "internal:ambiance";
 
 		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";
 		}
 	}
 
@@ -6444,7 +6433,7 @@ thingtypes
 
 	nightstrk
 	{
-		color = 13; // Pink
+		color = 16; // Light Pink
 		title = "NiGHTS Track";
 		width = 8;
 		height = 4096;
@@ -6480,15 +6469,6 @@ thingtypes
 			flagsvaluetext = "Order";
 			parametertext = "Mare";
 		}
-		1710
-		{
-			title = "Ideya Capture";
-			sprite = "CAPSA0";
-			width = 72;
-			height = 144;
-			angletext = "Spheres";
-			parametertext = "Mare";
-		}
 	}
 
 	nights
@@ -6521,7 +6501,6 @@ thingtypes
 			unflippable = true;
 			flagsvaluetext = "Pitch";
 			angletext = "Yaw";
-			fixedrotation = 1;
 		}
 		1705
 		{
@@ -6544,7 +6523,6 @@ thingtypes
 			height = 24;
 			flags8height = 24;
 			flags8text = "[8] Float";
-			unflippable = true;
 		}
 		1707
 		{
@@ -6567,6 +6545,15 @@ thingtypes
 			flags4text = "[4] Bonus time only";
 			flags8text = "[8] Spawn immediately";
 		}
+		1710
+		{
+			title = "Ideya Capture";
+			sprite = "CAPSA0";
+			width = 72;
+			height = 144;
+			angletext = "Spheres";
+			parametertext = "Mare";
+		}
 		1711
 		{
 			title = "Extra Time";
diff --git a/Build/Sprites/circlebigring.png b/Build/Sprites/circlebigring.png
new file mode 100644
index 0000000..3c6a290
Binary files /dev/null and b/Build/Sprites/circlebigring.png differ
diff --git a/Build/Sprites/circlebigringsphere.png b/Build/Sprites/circlebigringsphere.png
new file mode 100644
index 0000000..da43fca
Binary files /dev/null and b/Build/Sprites/circlebigringsphere.png differ
diff --git a/Build/Sprites/circlebigsphere.png b/Build/Sprites/circlebigsphere.png
new file mode 100644
index 0000000..1923967
Binary files /dev/null and b/Build/Sprites/circlebigsphere.png differ
diff --git a/Build/Sprites/circlering.png b/Build/Sprites/circlering.png
new file mode 100644
index 0000000..9ebef3f
Binary files /dev/null and b/Build/Sprites/circlering.png differ
diff --git a/Build/Sprites/circleringsphere.png b/Build/Sprites/circleringsphere.png
new file mode 100644
index 0000000..1b1834a
Binary files /dev/null and b/Build/Sprites/circleringsphere.png differ
diff --git a/Build/Sprites/circlesphere.png b/Build/Sprites/circlesphere.png
new file mode 100644
index 0000000..e59a760
Binary files /dev/null and b/Build/Sprites/circlesphere.png differ