diff --git a/language.version b/language.version
index b5d1be7b3..1f75ef3ef 100644
--- a/language.version
+++ b/language.version
@@ -1,3 +1,3 @@
 [default]
-SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r534 \cu(Thu 10 Jun 16:19:23 CEST 2021)\c-";
-SWWM_SHORTVER="\cw0.9.11b-pre r534 \cu(2021-06-10 16:19:23)\c-";
+SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r535 \cu(Thu 10 Jun 17:20:04 CEST 2021)\c-";
+SWWM_SHORTVER="\cw0.9.11b-pre r535 \cu(2021-06-10 17:20:04)\c-";
diff --git a/shaders/glsl/Shinemap_error.fp b/shaders/glsl/Shinemap_error.fp
index e7346ce73..17b763345 100644
--- a/shaders/glsl/Shinemap_error.fp
+++ b/shaders/glsl/Shinemap_error.fp
@@ -3,8 +3,12 @@
 void SetupMaterial( inout Material mat )
 {
 	vec3 rnorm = normalize(vEyeNormal.xyz)*vec3(1,-1,1);
-	float glow = .75+.25*sin(timer*8);
 	mat.Base = getTexel(rnorm.xy*.49+.5);
 	mat.Normal = ApplyNormalMap(vTexCoord.st);
-	mat.Bright = vec4(vec3(glow),1.);
+}
+
+vec4 ProcessLight( Material mat, vec4 color )
+{
+	float glow = .75+.25*sin(timer*8);
+	return vec4(vec3(glow),color.a);
 }
diff --git a/zscript/handler/swwm_handler_process.zsc b/zscript/handler/swwm_handler_process.zsc
index 4d6c99865..fb4e2ace7 100644
--- a/zscript/handler/swwm_handler_process.zsc
+++ b/zscript/handler/swwm_handler_process.zsc
@@ -206,6 +206,7 @@ extend Class SWWMHandler
 			Console.Printf("ClientSparkles: %08x",Random2[ClientSparkles]());
 			Console.Printf("Corrode:        %08x",Random2[Corrode]());
 			Console.Printf("DemoLines:      %08x",Random2[DemoLines]());
+			Console.Printf("DropChance:     %08x",Random2[DropChance]());
 			Console.Printf("DoBlast:        %08x",Random2[DoBlast]());
 			Console.Printf("Eviscerator:    %08x",Random2[Eviscerator]());
 			Console.Printf("Explodium:      %08x",Random2[Explodium]());
diff --git a/zscript/handler/swwm_handler_replacements.zsc b/zscript/handler/swwm_handler_replacements.zsc
index b8dee53c4..d14a0f8b7 100644
--- a/zscript/handler/swwm_handler_replacements.zsc
+++ b/zscript/handler/swwm_handler_replacements.zsc
@@ -622,13 +622,10 @@ extend Class SWWMHandler
 		}
 		else if ( e.Replacee is 'BlueCard' ) e.Replacement = 'SWWMBlueCard';
 		else if ( e.Replacee is 'YellowCard' ) e.Replacement = 'SWWMYellowCard';
-		else if ( e.Replacee.GetClassName() == 'KDiZDSilverKey' ) e.Replacement = 'SWWMSilverCardKDiZD';
-		else if ( e.Replacee.GetClassName() == 'KDiZDGreenKey' ) e.Replacement = 'SWWMGreenCardKDiZD';
-		else if ( e.Replacee.GetClassName() == 'KDiZDOrangeKey' ) e.Replacement = 'SWWMOrangeCardKDiZD';
 		else if ( e.Replacee.GetClassName() == 'GreenCard' ) e.Replacement = 'SWWMGreenCard';
-		else if ( e.Replacee is 'RedSkull' ) e.Replacement = 'SWWMRedSkull';
-		else if ( e.Replacee is 'BlueSkull' ) e.Replacement = 'SWWMBlueSkull';
-		else if ( e.Replacee is 'YellowSkull' ) e.Replacement = 'SWWMYellowSkull';
+		else if ( e.Replacee is 'RedSkull' ) e.Replacement = iskdizd?'SWWMSilverCardKDiZD':'SWWMRedSkull';
+		else if ( e.Replacee is 'BlueSkull' ) e.Replacement = iskdizd?'SWWMGreenCardKDiZD':'SWWMBlueSkull';
+		else if ( e.Replacee is 'YellowSkull' ) e.Replacement = iskdizd?'SWWMOrangeCardKDiZD':'SWWMYellowSkull';
 		else if ( e.Replacee is 'KeyGreen' ) e.Replacement = 'SWWMKeyGreen';
 		else if ( e.Replacee is 'KeyBlue' ) e.Replacement = 'SWWMKeyBlue';
 		else if ( e.Replacee is 'KeyYellow' ) e.Replacement = 'SWWMKeyYellow';
diff --git a/zscript/hud/swwm_hud.zsc b/zscript/hud/swwm_hud.zsc
index 5aba29f02..a1402e78e 100644
--- a/zscript/hud/swwm_hud.zsc
+++ b/zscript/hud/swwm_hud.zsc
@@ -189,7 +189,7 @@ Class SWWMStatusBar : BaseStatusBar
 			return true;
 		if ( outline.left(18) == "\cxSWWM GZ RNG dump" )
 		{
-			ignoremsg = 51;
+			ignoremsg = 52;
 			return true;
 		}
 		if ( koraxhack )
diff --git a/zscript/swwm_handler.zsc b/zscript/swwm_handler.zsc
index 1c8bef642..07a071ecc 100644
--- a/zscript/swwm_handler.zsc
+++ b/zscript/swwm_handler.zsc
@@ -23,6 +23,7 @@ Class SWWMHandler : EventHandler
 
 	// for checkreplacement
 	bool hasdrlamonsters;
+	int iskdizd;
 
 	// profiling data
 	bool profiling;
@@ -49,6 +50,8 @@ Class SWWMHandler : EventHandler
 			hasdrlamonsters = true;
 			break;
 		}
+		if ( LevelInfo.MapExists("Z1M1") && (LevelInfo.MapChecksum("Z1M1") ~== "2B7744234ED2C162AD08A3255E979F65") )
+			iskdizd = true;
 	}
 
 	override void WorldTick()