diff --git a/build.gradle.kts b/build.gradle.kts
index e2b7849303..6afb483a2f 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -5,7 +5,7 @@ plugins {
 }
 
 val MINECRAFT_VERSION by extra { "1.21.1" }
-val NEOFORGE_VERSION by extra { "21.1.46" }
+val NEOFORGE_VERSION by extra { "21.1.58" }
 val FABRIC_LOADER_VERSION by extra { "0.16.4" }
 val FABRIC_API_VERSION by extra { "0.103.0+1.21.1" }
 
diff --git a/common/src/main/java/net/irisshaders/iris/pathways/LightningHandler.java b/common/src/main/java/net/irisshaders/iris/pathways/LightningHandler.java
index 3787892511..a091255196 100644
--- a/common/src/main/java/net/irisshaders/iris/pathways/LightningHandler.java
+++ b/common/src/main/java/net/irisshaders/iris/pathways/LightningHandler.java
@@ -46,13 +46,13 @@ public class LightningHandler extends RenderType {
 			.createCompositeState(true)
 	);
 
-	public static final Function<ResourceLocation, RenderType> SPS = Util.memoize(r -> new InnerWrappedRenderType("iris_sps", create("sps", DefaultVertexFormat.POSITION_TEX_COLOR, VertexFormat.Mode.QUADS, 1_536, true, false,
+	public static final Function<ResourceLocation, RenderType> SPS = Util.memoize(r -> create("sps", DefaultVertexFormat.POSITION_TEX_COLOR, VertexFormat.Mode.QUADS, 1_536, true, false,
 		RenderType.CompositeState.builder()
 			.setShaderState(new ShaderStateShard(ShaderAccess::getSPSShader))
 			.setTextureState(new RenderStateShard.TextureStateShard(r, false, false))
 			.setTransparencyState(RenderStateShard.LIGHTNING_TRANSPARENCY)
 			.createCompositeState(true)
-	), new LightningRenderStateShard()));
+	));
 
 	public LightningHandler(String pRenderType0, VertexFormat pVertexFormat1, VertexFormat.Mode pVertexFormat$Mode2, int pInt3, boolean pBoolean4, boolean pBoolean5, Runnable pRunnable6, Runnable pRunnable7) {
 		super(pRenderType0, pVertexFormat1, pVertexFormat$Mode2, pInt3, pBoolean4, pBoolean5, pRunnable6, pRunnable7);
diff --git a/common/src/main/java/net/irisshaders/iris/pipeline/programs/ShaderAccess.java b/common/src/main/java/net/irisshaders/iris/pipeline/programs/ShaderAccess.java
index c2f1ca0f45..6b7cce0e5c 100644
--- a/common/src/main/java/net/irisshaders/iris/pipeline/programs/ShaderAccess.java
+++ b/common/src/main/java/net/irisshaders/iris/pipeline/programs/ShaderAccess.java
@@ -68,7 +68,7 @@ public static ShaderInstance getSPSShader() {
 		WorldRenderingPipeline pipeline = Iris.getPipelineManager().getPipelineNullable();
 
 		if (pipeline instanceof ShaderRenderingPipeline) {
-			return ((ShaderRenderingPipeline) pipeline).getShaderMap().getShader(ShadowRenderingState.areShadowsCurrentlyBeingRendered() ? ShaderKey.SHADOW_LIGHTNING : ShaderKey.SPS);
+			return ((ShaderRenderingPipeline) pipeline).getShaderMap().getShader(ShadowRenderingState.areShadowsCurrentlyBeingRendered() ? ShaderKey.SHADOW_ENTITIES_CUTOUT : ShaderKey.SPS);
 		}
 
 		return GameRenderer.getRendertypeEntityCutoutShader();
diff --git a/common/src/main/java/net/irisshaders/iris/pipeline/programs/ShaderKey.java b/common/src/main/java/net/irisshaders/iris/pipeline/programs/ShaderKey.java
index be7c285c67..7140f0b726 100644
--- a/common/src/main/java/net/irisshaders/iris/pipeline/programs/ShaderKey.java
+++ b/common/src/main/java/net/irisshaders/iris/pipeline/programs/ShaderKey.java
@@ -20,7 +20,7 @@ public enum ShaderKey {
 	BASIC_COLOR(ProgramId.Basic, AlphaTests.NON_ZERO_ALPHA, DefaultVertexFormat.POSITION_COLOR, FogMode.OFF, LightingModel.LIGHTMAP),
 	TEXTURED(ProgramId.Textured, AlphaTests.NON_ZERO_ALPHA, DefaultVertexFormat.POSITION_TEX, FogMode.OFF, LightingModel.LIGHTMAP),
 	TEXTURED_COLOR(ProgramId.Textured, AlphaTests.ONE_TENTH_ALPHA, DefaultVertexFormat.POSITION_TEX_COLOR, FogMode.OFF, LightingModel.LIGHTMAP),
-	SPS(ProgramId.Lightning, AlphaTests.ONE_TENTH_ALPHA, DefaultVertexFormat.POSITION_TEX_COLOR, FogMode.PER_FRAGMENT, LightingModel.FULLBRIGHT),
+	SPS(ProgramId.SpiderEyes, AlphaTests.OFF, DefaultVertexFormat.POSITION_TEX_COLOR, FogMode.PER_FRAGMENT, LightingModel.FULLBRIGHT),
 	SKY_BASIC(ProgramId.SkyBasic, AlphaTests.OFF, DefaultVertexFormat.POSITION, FogMode.PER_VERTEX, LightingModel.LIGHTMAP),
 	SKY_BASIC_COLOR(ProgramId.SkyBasic, AlphaTests.NON_ZERO_ALPHA, DefaultVertexFormat.POSITION_COLOR, FogMode.OFF, LightingModel.LIGHTMAP),
 	SKY_TEXTURED(ProgramId.SkyTextured, AlphaTests.OFF, DefaultVertexFormat.POSITION_TEX, FogMode.OFF, LightingModel.LIGHTMAP),