diff --git a/Build/Configurations/Includes/GZDoom_things.cfg b/Build/Configurations/Includes/GZDoom_things.cfg
index 2740eced..d0416629 100755
--- a/Build/Configurations/Includes/GZDoom_things.cfg
+++ b/Build/Configurations/Includes/GZDoom_things.cfg
@@ -75,28 +75,13 @@ gzdoom_lights
 		{
 			title = "ZDRayInfo";
 			class = "ZDRaySun"; // Fake class name
-			arg0
+			adduniversalfields
 			{
-				title = "Sun color";
-				default = 16777215;
-				str = true;
+				lm_suncolor;
+				lm_sampledistance;
+				lm_gridsize;
 			}
-			arg1
-			{
-				title = "Sample distance";
-				default = 8;
-			}
-			arg2
-			{
-				title = "Bounces";
-				default = 1;
-			}
-			arg3
-			{
-				title = "Probe grid size";
-				default = 32;
-			}
-		}			
+		}
 	}
 	
 	dynlights
diff --git a/Build/Configurations/Includes/ZDoom_misc.cfg b/Build/Configurations/Includes/ZDoom_misc.cfg
index 609ed462..588a8c89 100755
--- a/Build/Configurations/Includes/ZDoom_misc.cfg
+++ b/Build/Configurations/Includes/ZDoom_misc.cfg
@@ -376,22 +376,28 @@ universalfields
 			default = "";
 		}
 
-		lightcolorline
+		lm_sampledist_line
 		{
-			type = 10;
-			default = 16777215;
+			type = 0;
+			default = 0;
 		}
 		
-		lightintensityline
+		lm_sampledist_top
 		{
-			type = 1;
-			default = 1.0;
+			type = 0;
+			default = 0;
 		}
 		
-		lightdistanceline
+		lm_sampledist_mid
 		{
-			type = 1;
-			default = 0.0;
+			type = 0;
+			default = 0;
+		}
+
+		lm_sampledist_bot
+		{
+			type = 0;
+			default = 0;
 		}
 	}
 	
@@ -729,6 +735,27 @@ universalfields
 			type = 1;
 			default = 1.0;
 		}
+
+		lm_suncolor
+		{
+			type = 10;
+			default = 16777215;
+			thingtypespecific = true;
+		}
+
+		lm_sampledistance
+		{
+			type = 0;
+			default = 8;
+			thingtypespecific = true;
+		}
+
+		lm_gridsize
+		{
+			type = 1;
+			default = 32.0;
+			thingtypespecific = true;
+		}
 	}
 	
 	sector
@@ -1033,40 +1060,16 @@ universalfields
 			default = false;
 		}
 		
-		lightcolorfloor
+		lm_sampledist_floor
 		{
-			type = 10;
-			default = 16777215;
+			type = 0;
+			default = 0;
 		}
 		
-		lightintensityfloor
+		lm_sampledist_ceiling
 		{
-			type = 1;
-			default = 1.0;
-		}
-		
-		lightdistancefloor
-		{
-			type = 1;
-			default = 0.0;
-		}
-		
-		lightcolorceiling
-		{
-			type = 10;
-			default = 16777215;
-		}
-		
-		lightintensityceiling
-		{
-			type = 1;
-			default = 1.0;
-		}
-		
-		lightdistanceceiling
-		{
-			type = 1;
-			default = 0.0;
+			type = 0;
+			default = 0;
 		}
 	}
 }