diff --git a/Build/Configurations/Includes/Eternity_common.cfg b/Build/Configurations/Includes/Eternity_common.cfg
index e9a0f44a9aa63257a15e93131695f7e1850b408e..b8638533a689afbd7cdb12269ef05c2c1d10be07 100755
--- a/Build/Configurations/Includes/Eternity_common.cfg
+++ b/Build/Configurations/Includes/Eternity_common.cfg
@@ -236,6 +236,9 @@ mapformat_udmf
 	// WARNING: enabling this will make maps incompatible with Doom Builder 2 and can lead to problems in Slade 3!
 	longtexturenames = true;
 	
+	// Enables setting brightness for floor and ceiling independently from each other
+	distinctfloorandceilingbrightness = true;
+	
 	// Default nodebuilder configurations
 	defaultsavecompiler = "zdbsp_udmf_normal";
 	defaulttestcompiler = "zdbsp_udmf_fast";
diff --git a/Build/Configurations/Includes/ZDoom_common.cfg b/Build/Configurations/Includes/ZDoom_common.cfg
index 0498a12af8f616ed99d366c235fd3f8b3d7d57ef..878143e32adad92d89cab3f765ab297e65ee4347 100755
--- a/Build/Configurations/Includes/ZDoom_common.cfg
+++ b/Build/Configurations/Includes/ZDoom_common.cfg
@@ -365,7 +365,8 @@ mapformat_udmf
 	planeequationsupport = true;
 	
 	// Enables setting brightness for floor, ceiling, and walls independently from each other
-	distinctsurfacebrightness = true;
+	distinctfloorandceilingbrightness = true;
+	distinctwallbrightness = true;
 	
 	// Default nodebuilder configurations
 	defaultsavecompiler = "zdbsp_udmf_normal";
diff --git a/Source/Core/Config/GameConfiguration.cs b/Source/Core/Config/GameConfiguration.cs
index e47a32201da05b790fc35fb517b7441b6edf9518..39fa8132f89101a968f9179e8dbad03f5eed9224 100755
--- a/Source/Core/Config/GameConfiguration.cs
+++ b/Source/Core/Config/GameConfiguration.cs
@@ -110,7 +110,8 @@ namespace CodeImp.DoomBuilder.Config
 		private readonly bool localsidedeftextureoffsets; //MaxW
 		private readonly bool effect3dfloorsupport;
 		private readonly bool planeequationsupport;
-		private readonly bool distinctsurfacebrightness;
+		private readonly bool distinctfloorandceilingbrightness;
+		private readonly bool distinctwallbrightness;
 
 		// Skills
 		private readonly List<SkillInfo> skills;
@@ -283,7 +284,8 @@ namespace CodeImp.DoomBuilder.Config
 		public bool UseLocalSidedefTextureOffsets { get { return localsidedeftextureoffsets; } } //MaxW
 		public bool Effect3DFloorSupport { get { return effect3dfloorsupport; } }
 		public bool PlaneEquationSupport { get { return planeequationsupport; } }
-		public bool DistinctSurfaceBrightness { get { return distinctsurfacebrightness; } }
+		public bool DistinctFloorAndCeilingBrightness { get { return distinctfloorandceilingbrightness; } }
+		public bool DistinctWallBrightness { get { return distinctwallbrightness; } }
 
 		// Texture/flat/voxel sources
 		public IDictionary TextureRanges { get { return textureranges; } }
@@ -458,7 +460,8 @@ namespace CodeImp.DoomBuilder.Config
 			localsidedeftextureoffsets = (cfg.ReadSetting("localsidedeftextureoffsets", false)); //MaxW
 			effect3dfloorsupport = cfg.ReadSetting("effect3dfloorsupport", false);
 			planeequationsupport = cfg.ReadSetting("planeequationsupport", false);
-			distinctsurfacebrightness = cfg.ReadSetting("distinctsurfacebrightness", false);
+			distinctfloorandceilingbrightness = cfg.ReadSetting("distinctfloorandceilingbrightness", false);
+			distinctwallbrightness = cfg.ReadSetting("distinctwallbrightness", false);
 			for (int i = 0; i < Linedef.NUM_ARGS; i++) makedoorargs[i] = cfg.ReadSetting("makedoorarg" + i.ToString(CultureInfo.InvariantCulture), 0);
 
 			//mxd. Update map format flags
diff --git a/Source/Core/Windows/LinedefEditFormUDMF.cs b/Source/Core/Windows/LinedefEditFormUDMF.cs
index 42394c7046073035f9b38b87abfbe78f3f9fff0d..a24f19778cbf50f0842183f0e6cd300b8be9384b 100755
--- a/Source/Core/Windows/LinedefEditFormUDMF.cs
+++ b/Source/Core/Windows/LinedefEditFormUDMF.cs
@@ -239,7 +239,7 @@ namespace CodeImp.DoomBuilder.Windows
 			}
 
 			// Diable brightness controls?
-			if(!General.Map.Config.DistinctSurfaceBrightness)
+			if(!General.Map.Config.DistinctWallBrightness)
 			{
 				lightFront.Enabled = false;
 				cbLightAbsoluteFront.Enabled = false;
diff --git a/Source/Core/Windows/SectorEditFormUDMF.cs b/Source/Core/Windows/SectorEditFormUDMF.cs
index e4898553b0bfd3e23ab84a1def16bf6746c73571..5fd8839bfb91cbb2e2ee3f2c6ad61aa7376571c3 100755
--- a/Source/Core/Windows/SectorEditFormUDMF.cs
+++ b/Source/Core/Windows/SectorEditFormUDMF.cs
@@ -300,7 +300,7 @@ namespace CodeImp.DoomBuilder.Windows
 			floorslopecontrol.PivotMode = (SlopePivotMode)General.Settings.ReadSetting("windows." + configname + ".floorpivotmode", (int)SlopePivotMode.LOCAL);
 
 			// Diable brightness controls?
-			if(!General.Map.Config.DistinctSurfaceBrightness)
+			if(!General.Map.Config.DistinctFloorAndCeilingBrightness)
 			{
 				ceilBrightness.Enabled = false;
 				ceilLightAbsolute.Enabled = false;
diff --git a/Source/Plugins/BuilderModes/VisualModes/BaseVisualGeometrySidedef.cs b/Source/Plugins/BuilderModes/VisualModes/BaseVisualGeometrySidedef.cs
index 462b6fe9aae1f47d65d6db9883d18688ee81df33..9a365e6f0f3fe2cb9d5fd47393e1905ba9e99f85 100755
--- a/Source/Plugins/BuilderModes/VisualModes/BaseVisualGeometrySidedef.cs
+++ b/Source/Plugins/BuilderModes/VisualModes/BaseVisualGeometrySidedef.cs
@@ -1550,7 +1550,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
 		public virtual void OnChangeTargetBrightness(bool up)
 		{
 			//mxd. Change UDMF wall light?
-			if(General.Map.UDMF && General.Map.Config.DistinctSurfaceBrightness)
+			if(General.Map.UDMF && General.Map.Config.DistinctWallBrightness)
 			{
 				int light = Sidedef.Fields.GetValue("light", 0);
 				bool absolute = Sidedef.Fields.GetValue("lightabsolute", false);
diff --git a/Source/Plugins/BuilderModes/VisualModes/VisualCeiling.cs b/Source/Plugins/BuilderModes/VisualModes/VisualCeiling.cs
index 0193f8633610642ee28fc0e18aad89586f9f4467..a1d85c029ded767e65ae7cf84f309d0bf02d28de 100755
--- a/Source/Plugins/BuilderModes/VisualModes/VisualCeiling.cs
+++ b/Source/Plugins/BuilderModes/VisualModes/VisualCeiling.cs
@@ -459,7 +459,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
 			{
 				// Change the sector brightness if the map is not in UDMF format, or this ceiling is part of 3D-floor,
 				// or the game configuration doesn't support distinct surfave brightnesses
-				if(!General.Map.UDMF || (level != null && Sector.Sector != level.sector) || !General.Map.Config.DistinctSurfaceBrightness) 
+				if(!General.Map.UDMF || (level != null && Sector.Sector != level.sector) || !General.Map.Config.DistinctFloorAndCeilingBrightness) 
 				{
 					base.OnChangeTargetBrightness(up);
 					return;