diff --git a/Build/Configurations/Includes/GZDoom_things.cfg b/Build/Configurations/Includes/GZDoom_things.cfg
index eabe0c6a3c34e42cc06af04780df3441314e5fd6..d630fb98420dbe5e2011f7b165543546d39826b6 100755
--- a/Build/Configurations/Includes/GZDoom_things.cfg
+++ b/Build/Configurations/Includes/GZDoom_things.cfg
@@ -586,6 +586,57 @@ gzdoom_lights
 				default = 64;
 			}
 		}
+
+		1502
+		{
+			title = "Vavoom Light";
+			class = "VavoomLightWhite";
+			arg0
+			{
+				title = "Radius";
+				default = 16;
+			}
+		}
+		1503
+		{
+			title = "Vavoom Light Color";
+			class = "VavoomLightColor";
+			arg0
+			{
+				title = "Radius";
+				default = 16;
+			}
+			arg1
+			{
+				title = "Red";
+				default = 255;
+			}
+			arg2
+			{
+				title = "Green";
+				default = 255;
+			}
+			arg3
+			{
+				title = "Blue";
+				default = 255;
+			}
+		}
+	}
+
+	spotlights
+	{
+		color = 7;
+		arrow = 0;
+		title = "Dynamic Spot Lights";
+		sort = 1;
+		width = 0;
+		height = 0;
+		hangs = 0;
+		blocking = 0;
+		fixedsize = true;
+		sprite = "internal:light";
+
 		9840
 		{
 			title = "Spotlight";
@@ -597,18 +648,80 @@ gzdoom_lights
 			}
 			arg1
 			{
-				title = "Start intensity";
+				title = "Inner angle";
+				default = 8;
+			}
+			arg2
+			{
+				title = "Outer angle";
+				default = 32;
+			}
+			arg3
+			{
+				title = "Intensity";
+				default = 64;
+			}
+		}
+		9841
+		{
+			title = "Pulse Spotlight";
+			class = "SpotLightPulse";
+			fixedrotation = true;
+			arg0
+			{
+				title = "Color";
+				default = 16777215;
+			}
+			arg1
+			{
+				title = "Inner angle";
 				default = 8;
 			}
 			arg2
+			{
+				title = "Outer angle";
+				default = 32;
+			}
+			arg3
+			{
+				title = "Start intensity";
+				default = 64;
+			}
+			arg4
 			{
 				title = "End intensity";
 				default = 32;
 			}
+		}
+		9842
+		{
+			title = "Flicker Spotlight";
+			class = "SpotLightFlicker";
+			fixedrotation = true;
+			arg0
+			{
+				title = "Color";
+				default = 16777215;
+			}
+			arg1
+			{
+				title = "Inner angle";
+				default = 8;
+			}
+			arg2
+			{
+				title = "Outer angle";
+				default = 32;
+			}
 			arg3
 			{
-				title = "Radius";
-				default = 128;
+				title = "Primary intensity";
+				default = 64;
+			}
+			arg4
+			{
+				title = "Secondary intensity";
+				default = 32;
 			}
 		}
 		9843
@@ -622,12 +735,12 @@ gzdoom_lights
 			}
 			arg1
 			{
-				title = "Start intensity";
+				title = "Inner angle";
 				default = 8;
 			}
 			arg2
 			{
-				title = "End intensity";
+				title = "Outer angle";
 				default = 32;
 			}
 			arg3
@@ -636,6 +749,37 @@ gzdoom_lights
 				default = 4;
 			}
 		}
+		9844
+		{
+			title = "Random Spotlight";
+			class = "SpotLightFlickerRandom";
+			fixedrotation = true;
+			arg0
+			{
+				title = "Color";
+				default = 16777215;
+			}
+			arg1
+			{
+				title = "Inner angle";
+				default = 8;
+			}
+			arg2
+			{
+				title = "Outer angle";
+				default = 32;
+			}
+			arg3
+			{
+				title = "Minimal intensity";
+				default = 32;
+			}
+			arg4
+			{
+				title = "Maximal intensity";
+				default = 64;
+			}
+		}
 		9850
 		{
 			title = "Additive Spotlight";
@@ -647,18 +791,80 @@ gzdoom_lights
 			}
 			arg1
 			{
-				title = "Start intensity";
+				title = "Inner angle";
 				default = 8;
 			}
 			arg2
+			{
+				title = "Outer angle";
+				default = 32;
+			}
+			arg3
+			{
+				title = "Intensity";
+				default = 64;
+			}
+		}
+		9851
+		{
+			title = "Additive Pulse Spotlight";
+			class = "SpotLightPulseAdditive";
+			fixedrotation = true;
+			arg0
+			{
+				title = "Color";
+				default = 16777215;
+			}
+			arg1
+			{
+				title = "Inner angle";
+				default = 8;
+			}
+			arg2
+			{
+				title = "Outer angle";
+				default = 32;
+			}
+			arg3
+			{
+				title = "Start intensity";
+				default = 32;
+			}
+			arg4
 			{
 				title = "End intensity";
+				default = 64;
+			}
+		}
+		9852
+		{
+			title = "Additive Flicker Spotlight";
+			class = "SpotLightFlickerAdditive";
+			fixedrotation = true;
+			arg0
+			{
+				title = "Color";
+				default = 16777215;
+			}
+			arg1
+			{
+				title = "Inner angle";
+				default = 8;
+			}
+			arg2
+			{
+				title = "Outer angle";
 				default = 32;
 			}
 			arg3
 			{
-				title = "Radius";
-				default = 128;
+				title = "Primary intensity";
+				default = 64;
+			}
+			arg4
+			{
+				title = "Secondary intensity";
+				default = 32;
 			}
 		}
 		9853
@@ -672,12 +878,12 @@ gzdoom_lights
 			}
 			arg1
 			{
-				title = "Start intensity";
+				title = "Inner angle";
 				default = 8;
 			}
 			arg2
 			{
-				title = "End intensity";
+				title = "Outer angle";
 				default = 32;
 			}
 			arg3
@@ -686,6 +892,37 @@ gzdoom_lights
 				default = 4;
 			}
 		}
+		9854
+		{
+			title = "Additive Random Spotlight";
+			class = "SpotLightFlickerRandomAdditive";
+			fixedrotation = true;
+			arg0
+			{
+				title = "Color";
+				default = 16777215;
+			}
+			arg1
+			{
+				title = "Inner angle";
+				default = 8;
+			}
+			arg2
+			{
+				title = "Outer angle";
+				default = 32;
+			}
+			arg3
+			{
+				title = "Minimal intensity";
+				default = 32;
+			}
+			arg4
+			{
+				title = "Maximal intensity";
+				default = 64;
+			}
+		}
 		9860
 		{
 			title = "Subtractive Spotlight";
@@ -697,18 +934,80 @@ gzdoom_lights
 			}
 			arg1
 			{
-				title = "Start intensity";
+				title = "Inner angle";
 				default = 8;
 			}
 			arg2
 			{
-				title = "End intensity";
+				title = "Outer angle";
 				default = 32;
 			}
 			arg3
 			{
 				title = "Radius";
-				default = 128;
+				default = 64;
+			}
+		}
+		9861
+		{
+			title = "Subtractive Pulse Spotlight";
+			class = "SpotLightPulseSubtractive";
+			fixedrotation = true;
+			arg0
+			{
+				title = "Color";
+				default = 16777215;
+			}
+			arg1
+			{
+				title = "Inner angle";
+				default = 8;
+			}
+			arg2
+			{
+				title = "Outer angle";
+				default = 32;
+			}
+			arg3
+			{
+				title = "Start intensity";
+				default = 32;
+			}
+			arg4
+			{
+				title = "End intensity";
+				default = 64;
+			}
+		}
+		9862
+		{
+			title = "Subtractive Flicker Spotlight";
+			class = "SpotLightFlickerSubtractive";
+			fixedrotation = true;
+			arg0
+			{
+				title = "Color";
+				default = 16777215;
+			}
+			arg1
+			{
+				title = "Inner angle";
+				default = 8;
+			}
+			arg2
+			{
+				title = "Outer angle";
+				default = 32;
+			}
+			arg3
+			{
+				title = "Primary intensity";
+				default = 32;
+			}
+			arg4
+			{
+				title = "Secondary intensity";
+				default = 64;
 			}
 		}
 		9863
@@ -722,12 +1021,12 @@ gzdoom_lights
 			}
 			arg1
 			{
-				title = "Start intensity";
+				title = "Inner angle";
 				default = 8;
 			}
 			arg2
 			{
-				title = "End intensity";
+				title = "Outer angle";
 				default = 32;
 			}
 			arg3
@@ -736,6 +1035,37 @@ gzdoom_lights
 				default = 4;
 			}
 		}
+		9864
+		{
+			title = "Subtractive Random Spotlight";
+			class = "SpotLightFlickerRandomSubtractive";
+			fixedrotation = true;
+			arg0
+			{
+				title = "Color";
+				default = 16777215;
+			}
+			arg1
+			{
+				title = "Inner angle";
+				default = 8;
+			}
+			arg2
+			{
+				title = "Outer angle";
+				default = 32;
+			}
+			arg3
+			{
+				title = "Minimal intensity";
+				default = 32;
+			}
+			arg4
+			{
+				title = "Maximal intensity";
+				default = 64;
+			}
+		}
 		9870
 		{
 			title = "Attenuated Spotlight";
@@ -747,24 +1077,25 @@ gzdoom_lights
 			}
 			arg1
 			{
-				title = "Start intensity";
+				title = "Inner angle";
 				default = 8;
 			}
 			arg2
 			{
-				title = "End intensity";
+				title = "Outer angle";
 				default = 32;
 			}
 			arg3
 			{
-				title = "Radius";
-				default = 128;
+				title = "Intensity";
+				default = 64;
 			}
 		}
-		9873
+		9871
 		{
-			title = "Attenuated Sector Spotlight";
-			class = "SectorSpotLightAttenuated";
+			title = "Attenuated Pulse Spotlight";
+			class = "SpotLightPulseAttenuated";
+			fixedrotation = true;
 			arg0
 			{
 				title = "Color";
@@ -772,53 +1103,110 @@ gzdoom_lights
 			}
 			arg1
 			{
-				title = "Start intensity";
+				title = "Inner angle";
 				default = 8;
 			}
 			arg2
+			{
+				title = "Outer angle";
+				default = 32;
+			}
+			arg3
+			{
+				title = "Start intensity";
+				default = 64;
+			}
+			arg4
 			{
 				title = "End intensity";
 				default = 32;
 			}
+		}
+		9872
+		{
+			title = "Attenuated Flicker Spotlight";
+			class = "SpotLightFlickerAttenuated";
+			fixedrotation = true;
+			arg0
+			{
+				title = "Color";
+				default = 16777215;
+			}
+			arg1
+			{
+				title = "Inner angle";
+				default = 8;
+			}
+			arg2
+			{
+				title = "Outer angle";
+				default = 32;
+			}
 			arg3
 			{
-				title = "Intensity scale";
-				default = 4;
+				title = "Primary intensity";
+				default = 64;
+			}
+			arg4
+			{
+				title = "Secondary intensity";
+				default = 32;
 			}
 		}
-		1502
+		9873
 		{
-			title = "Vavoom Light";
-			class = "VavoomLightWhite";
+			title = "Attenuated Sector Spotlight";
+			class = "SectorSpotLightAttenuated";
 			arg0
 			{
-				title = "Radius";
-				default = 16;
+				title = "Color";
+				default = 16777215;
+			}
+			arg1
+			{
+				title = "Inner angle";
+				default = 8;
+			}
+			arg2
+			{
+				title = "Outer angle";
+				default = 32;
+			}
+			arg3
+			{
+				title = "Intensity scale";
+				default = 4;
 			}
 		}
-		1503
+		9874
 		{
-			title = "Vavoom Light Color";
-			class = "VavoomLightColor";
+			title = "Attenuated Random Spotlight";
+			class = "SpotLightFlickerRandomAttenuated";
+			fixedrotation = true;
 			arg0
 			{
-				title = "Radius";
-				default = 16;
+				title = "Color";
+				default = 16777215;
 			}
 			arg1
 			{
-				title = "Red";
-				default = 255;
+				title = "Inner angle";
+				default = 8;
 			}
 			arg2
 			{
-				title = "Green";
-				default = 255;
+				title = "Outer angle";
+				default = 32;
 			}
 			arg3
 			{
-				title = "Blue";
-				default = 255;
+				title = "Minimal intensity";
+				default = 32;
+			}
+			arg4
+			{
+				title = "Maximal intensity";
+				default = 64;
 			}
 		}
 	}