diff --git a/Build/Configurations/Includes/ZDoom_linedefs.cfg b/Build/Configurations/Includes/ZDoom_linedefs.cfg
index 769aec1fc09154e0c4af972ea34a7ba8b545522a..b5f7f64b15a5eec24abfe0d64ee6833939f363a6 100644
--- a/Build/Configurations/Includes/ZDoom_linedefs.cfg
+++ b/Build/Configurations/Includes/ZDoom_linedefs.cfg
@@ -3324,7 +3324,7 @@ zdoom
 			}
 			arg3
 			{
-				title = "Alpha";
+				title = "Opacity";
 				default = 255;
 			}
 		}
diff --git a/Source/Core/Rendering/D3DShader.cs b/Source/Core/Rendering/D3DShader.cs
index deae788bcf08acece5362e8e279b323c05798cee..b5275e416d986a9563f03706221efd7aaf50dd1b 100644
--- a/Source/Core/Rendering/D3DShader.cs
+++ b/Source/Core/Rendering/D3DShader.cs
@@ -112,6 +112,9 @@ namespace CodeImp.DoomBuilder.Rendering
 				// Compiling failed, try with debug information
 				try
 				{
+					//mxd. Rewind before use!
+					fxdata.Seek(0, SeekOrigin.Begin);
+					
 					// Compile effect
 					fx = Effect.FromStream(General.Map.Graphics.Device, fxdata, null, null, null, ShaderFlags.Debug, null, out errors);
 					if(!string.IsNullOrEmpty(errors))
diff --git a/Source/Core/Resources/world3d.fx b/Source/Core/Resources/world3d.fx
index 256786b151abe0575fb5f968f018c38df6849863..68ef41faa100432f1e43c686cf1c9bb11ebbb330 100644
--- a/Source/Core/Resources/world3d.fx
+++ b/Source/Core/Resources/world3d.fx
@@ -169,7 +169,7 @@ float4 ps_fullbright(PixelData pd) : COLOR
 float4 ps_main_highlight(PixelData pd) : COLOR
 {
 	float4 tcolor = tex2D(texturesamp, pd.uv);
-	if(tcolor.a == 0) clip(-1);
+	if(tcolor.a == 0) return tcolor;
 	
 	// Blend texture color and vertex color
 	float4 ncolor = tcolor * pd.color;
@@ -181,7 +181,7 @@ float4 ps_main_highlight(PixelData pd) : COLOR
 float4 ps_fullbright_highlight(PixelData pd) : COLOR
 {
 	float4 tcolor = tex2D(texturesamp, pd.uv);
-	if(tcolor.a == 0) clip(-1);
+	if(tcolor.a == 0) return tcolor;
 	
 	// Blend texture color and vertex color
 	float4 ncolor = tcolor * pd.color;
@@ -204,7 +204,7 @@ float4 getFogColor(LitPixelData pd, float4 color)
 float4 ps_main_fog(LitPixelData pd) : COLOR 
 {
 	float4 tcolor = tex2D(texturesamp, pd.uv);
-	if(tcolor.a == 0) clip(-1);
+	if(tcolor.a == 0) return tcolor;
 	
 	return getFogColor(pd, tcolor * pd.color);
 }
@@ -213,7 +213,7 @@ float4 ps_main_fog(LitPixelData pd) : COLOR
 float4 ps_main_highlight_fog(LitPixelData pd) : COLOR 
 {
 	float4 tcolor = tex2D(texturesamp, pd.uv);
-	if(tcolor.a == 0) clip(-1);
+	if(tcolor.a == 0) return tcolor;
 	
 	// Blend texture color and vertex color
 	float4 ncolor = getFogColor(pd, tcolor * pd.color);