diff --git a/binaries/data/mods/mod/shaders/effects/bloom.xml b/binaries/data/mods/mod/shaders/effects/bloom.xml
index 8e6775ee66..41444b579b 100644
--- a/binaries/data/mods/mod/shaders/effects/bloom.xml
+++ b/binaries/data/mods/mod/shaders/effects/bloom.xml
@@ -2,14 +2,8 @@
 <effect>
 	<technique>
 		<require shaders="glsl"/>
-		<pass shader="glsl/bloom">
-			<depth test="FALSE" mask="false"/>
-		</pass>
-	</technique>
-
-	<technique>
 		<require shaders="spirv"/>
-		<pass shader="spirv/bloom">
+		<pass shader="bloom">
 			<depth test="FALSE" mask="false"/>
 		</pass>
 	</technique>
diff --git a/binaries/data/mods/mod/shaders/effects/canvas2d.xml b/binaries/data/mods/mod/shaders/effects/canvas2d.xml
index 2882d8e0b2..0f99a582d8 100644
--- a/binaries/data/mods/mod/shaders/effects/canvas2d.xml
+++ b/binaries/data/mods/mod/shaders/effects/canvas2d.xml
@@ -2,23 +2,9 @@
 <effect>
 	<technique>
 		<require shaders="arb"/>
-		<pass shader="arb/canvas2d">
-			<depth test="FALSE" mask="false"/>
-			<blend src="src_alpha" dst="one_minus_src_alpha"/>
-		</pass>
-	</technique>
-
-	<technique>
 		<require shaders="glsl"/>
-		<pass shader="glsl/canvas2d">
-			<depth test="FALSE" mask="false"/>
-			<blend src="src_alpha" dst="one_minus_src_alpha"/>
-		</pass>
-	</technique>
-
-	<technique>
 		<require shaders="spirv"/>
-		<pass shader="spirv/canvas2d">
+		<pass shader="canvas2d">
 			<depth test="FALSE" mask="false"/>
 			<blend src="src_alpha" dst="one_minus_src_alpha"/>
 		</pass>
diff --git a/binaries/data/mods/mod/shaders/effects/cas.xml b/binaries/data/mods/mod/shaders/effects/cas.xml
index ae2c75c685..cca1f7821f 100644
--- a/binaries/data/mods/mod/shaders/effects/cas.xml
+++ b/binaries/data/mods/mod/shaders/effects/cas.xml
@@ -2,13 +2,8 @@
 <effect>
 	<technique>
 		<require shaders="glsl"/>
-		<pass shader="glsl/cas">
-			<depth test="FALSE" mask="false"/>
-		</pass>
-	</technique>
-	<technique>
 		<require shaders="spirv"/>
-		<pass shader="spirv/cas">
+		<pass shader="cas">
 			<depth test="FALSE" mask="false"/>
 		</pass>
 	</technique>
diff --git a/binaries/data/mods/mod/shaders/effects/compute_downscale.xml b/binaries/data/mods/mod/shaders/effects/compute_downscale.xml
index c2013f8fa9..35d0034f53 100644
--- a/binaries/data/mods/mod/shaders/effects/compute_downscale.xml
+++ b/binaries/data/mods/mod/shaders/effects/compute_downscale.xml
@@ -2,10 +2,7 @@
 <effect>
 	<technique>
 		<require shaders="glsl"/>
-		<compute shader="glsl/compute_downscale"/>
-	</technique>
-	<technique>
 		<require shaders="spirv"/>
-		<compute shader="spirv/compute_downscale"/>
+		<compute shader="compute_downscale"/>
 	</technique>
 </effect>
diff --git a/binaries/data/mods/mod/shaders/effects/compute_rcas.xml b/binaries/data/mods/mod/shaders/effects/compute_rcas.xml
index adad244120..7cc328512b 100644
--- a/binaries/data/mods/mod/shaders/effects/compute_rcas.xml
+++ b/binaries/data/mods/mod/shaders/effects/compute_rcas.xml
@@ -2,10 +2,7 @@
 <effect>
 	<technique>
 		<require shaders="glsl"/>
-		<compute shader="glsl/compute_rcas"/>
-	</technique>
-	<technique>
 		<require shaders="spirv"/>
-		<compute shader="spirv/compute_rcas"/>
+		<compute shader="compute_rcas"/>
 	</technique>
 </effect>
diff --git a/binaries/data/mods/mod/shaders/effects/compute_skinning.xml b/binaries/data/mods/mod/shaders/effects/compute_skinning.xml
index 222b9e3b92..edfbf8d8a0 100644
--- a/binaries/data/mods/mod/shaders/effects/compute_skinning.xml
+++ b/binaries/data/mods/mod/shaders/effects/compute_skinning.xml
@@ -2,10 +2,7 @@
 <effect>
 	<technique>
 		<require shaders="glsl"/>
-		<compute shader="glsl/compute_skinning"/>
-	</technique>
-	<technique>
 		<require shaders="spirv"/>
-		<compute shader="spirv/compute_skinning"/>
+		<compute shader="compute_skinning"/>
 	</technique>
 </effect>
diff --git a/binaries/data/mods/mod/shaders/effects/compute_upscale_fsr.xml b/binaries/data/mods/mod/shaders/effects/compute_upscale_fsr.xml
index 2ab9904e61..235c890305 100644
--- a/binaries/data/mods/mod/shaders/effects/compute_upscale_fsr.xml
+++ b/binaries/data/mods/mod/shaders/effects/compute_upscale_fsr.xml
@@ -2,10 +2,7 @@
 <effect>
 	<technique>
 		<require shaders="glsl"/>
-		<compute shader="glsl/compute_upscale_fsr"/>
-	</technique>
-	<technique>
 		<require shaders="spirv"/>
-		<compute shader="spirv/compute_upscale_fsr"/>
+		<compute shader="compute_upscale_fsr"/>
 	</technique>
 </effect>
diff --git a/binaries/data/mods/mod/shaders/effects/debug_line.xml b/binaries/data/mods/mod/shaders/effects/debug_line.xml
index 8249d2b268..c518cad3f9 100644
--- a/binaries/data/mods/mod/shaders/effects/debug_line.xml
+++ b/binaries/data/mods/mod/shaders/effects/debug_line.xml
@@ -1,19 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <effect>
-
     <technique>
         <require shaders="arb"/>
-        <pass shader="arb/debug_overlay"/>
-    </technique>
-
-    <technique>
         <require shaders="glsl"/>
-        <pass shader="glsl/debug_overlay"/>
-    </technique>
-
-    <technique>
         <require shaders="spirv"/>
-        <pass shader="spirv/debug_overlay"/>
+        <pass shader="debug_overlay"/>
     </technique>
-
 </effect>
diff --git a/binaries/data/mods/mod/shaders/effects/debug_overlay.xml b/binaries/data/mods/mod/shaders/effects/debug_overlay.xml
index 11f5ab8fea..fada434d00 100644
--- a/binaries/data/mods/mod/shaders/effects/debug_overlay.xml
+++ b/binaries/data/mods/mod/shaders/effects/debug_overlay.xml
@@ -1,31 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <effect>
-
 	<technique>
 		<define name="DEBUG_TEXTURED" value="1"/>
 		<require shaders="arb"/>
-		<pass shader="arb/debug_overlay">
-			<depth test="FALSE" mask="false"/>
-			<blend src="src_alpha" dst="one_minus_src_alpha"/>
-		</pass>
-	</technique>
-
-	<technique>
-		<define name="DEBUG_TEXTURED" value="1"/>
 		<require shaders="glsl"/>
-		<pass shader="glsl/debug_overlay">
-			<depth test="FALSE" mask="false"/>
-			<blend src="src_alpha" dst="one_minus_src_alpha"/>
-		</pass>
-	</technique>
-
-	<technique>
-		<define name="DEBUG_TEXTURED" value="1"/>
 		<require shaders="spirv"/>
-		<pass shader="spirv/debug_overlay">
+		<pass shader="debug_overlay">
 			<depth test="FALSE" mask="false"/>
 			<blend src="src_alpha" dst="one_minus_src_alpha"/>
 		</pass>
 	</technique>
-
 </effect>
diff --git a/binaries/data/mods/mod/shaders/effects/dummy.xml b/binaries/data/mods/mod/shaders/effects/dummy.xml
index cc0ae3bc74..f1ae89e892 100644
--- a/binaries/data/mods/mod/shaders/effects/dummy.xml
+++ b/binaries/data/mods/mod/shaders/effects/dummy.xml
@@ -2,14 +2,8 @@
 <effect>
 	<technique>
 		<require shaders="arb"/>
-		<pass shader="arb/dummy"/>
-	</technique>
-	<technique>
 		<require shaders="glsl"/>
-		<pass shader="glsl/dummy"/>
-	</technique>
-	<technique>
 		<require shaders="spirv"/>
-		<pass shader="spirv/dummy"/>
+		<pass shader="dummy"/>
 	</technique>
 </effect>
diff --git a/binaries/data/mods/mod/shaders/effects/foreground_overlay.xml b/binaries/data/mods/mod/shaders/effects/foreground_overlay.xml
index ef830fd12f..57363fe748 100644
--- a/binaries/data/mods/mod/shaders/effects/foreground_overlay.xml
+++ b/binaries/data/mods/mod/shaders/effects/foreground_overlay.xml
@@ -1,19 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <effect>
-
     <technique>
         <require shaders="arb"/>
-	<pass shader="arb/foreground_overlay"/>
-    </technique>
-
-    <technique>
         <require shaders="glsl"/>
-	<pass shader="glsl/foreground_overlay"/>
-    </technique>
-
-    <technique>
         <require shaders="spirv"/>
-	<pass shader="spirv/foreground_overlay"/>
+        <pass shader="foreground_overlay"/>
     </technique>
-
 </effect>
diff --git a/binaries/data/mods/mod/shaders/effects/fxaa.xml b/binaries/data/mods/mod/shaders/effects/fxaa.xml
index 6e66b0755d..be1b4824c1 100644
--- a/binaries/data/mods/mod/shaders/effects/fxaa.xml
+++ b/binaries/data/mods/mod/shaders/effects/fxaa.xml
@@ -2,13 +2,8 @@
 <effect>
 	<technique>
 		<require shaders="glsl"/>
-		<pass shader="glsl/fxaa">
-			<depth test="FALSE" mask="false"/>
-		</pass>
-	</technique>
-	<technique>
 		<require shaders="spirv"/>
-		<pass shader="spirv/fxaa">
+		<pass shader="fxaa">
 			<depth test="FALSE" mask="false"/>
 		</pass>
 	</technique>
diff --git a/binaries/data/mods/mod/shaders/effects/los_interp.xml b/binaries/data/mods/mod/shaders/effects/los_interp.xml
index a108d8653d..dd8642d006 100644
--- a/binaries/data/mods/mod/shaders/effects/los_interp.xml
+++ b/binaries/data/mods/mod/shaders/effects/los_interp.xml
@@ -2,14 +2,8 @@
 <effect>
     <technique>
         <require shaders="arb"/>
-        <pass shader="arb/los_interp"/>
-    </technique>
-    <technique>
         <require shaders="glsl"/>
-        <pass shader="glsl/los_interp"/>
-    </technique>
-    <technique>
         <require shaders="spirv"/>
-        <pass shader="spirv/los_interp"/>
+        <pass shader="los_interp"/>
     </technique>
 </effect>
diff --git a/binaries/data/mods/mod/shaders/effects/minimap.xml b/binaries/data/mods/mod/shaders/effects/minimap.xml
index b28983d03e..e77e807826 100644
--- a/binaries/data/mods/mod/shaders/effects/minimap.xml
+++ b/binaries/data/mods/mod/shaders/effects/minimap.xml
@@ -1,25 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <effect>
-
 	<technique>
 		<require shaders="arb"/>
-		<pass shader="arb/minimap">
-			<depth test="FALSE" mask="false"/>
-		</pass>
-	</technique>
-
-	<technique>
 		<require shaders="glsl"/>
-		<pass shader="glsl/minimap">
-			<depth test="FALSE" mask="false"/>
-		</pass>
-	</technique>
-
-	<technique>
 		<require shaders="spirv"/>
-		<pass shader="spirv/minimap">
+		<pass shader="minimap">
 			<depth test="FALSE" mask="false"/>
 		</pass>
 	</technique>
-
 </effect>
diff --git a/binaries/data/mods/mod/shaders/effects/minimap_los.xml b/binaries/data/mods/mod/shaders/effects/minimap_los.xml
index a7297b77db..5040c57e70 100644
--- a/binaries/data/mods/mod/shaders/effects/minimap_los.xml
+++ b/binaries/data/mods/mod/shaders/effects/minimap_los.xml
@@ -1,31 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <effect>
-
 	<technique>
 		<require shaders="arb"/>
-		<define name="MINIMAP_LOS" value="1"/>
-		<pass shader="arb/minimap">
-			<depth test="FALSE" mask="false"/>
-			<color mask_red="FALSE" mask_green="FALSE" mask_blue="FALSE" mask_alpha="TRUE"/>
-		</pass>
-	</technique>
-
-	<technique>
 		<require shaders="glsl"/>
-		<define name="MINIMAP_LOS" value="1"/>
-		<pass shader="glsl/minimap">
-			<depth test="FALSE" mask="false"/>
-			<color mask_red="FALSE" mask_green="FALSE" mask_blue="FALSE" mask_alpha="TRUE"/>
-		</pass>
-	</technique>
-
-	<technique>
 		<require shaders="spirv"/>
 		<define name="MINIMAP_LOS" value="1"/>
-		<pass shader="spirv/minimap">
+		<pass shader="minimap">
 			<depth test="FALSE" mask="false"/>
 			<color mask_red="FALSE" mask_green="FALSE" mask_blue="FALSE" mask_alpha="TRUE"/>
 		</pass>
 	</technique>
-
 </effect>
diff --git a/binaries/data/mods/mod/shaders/effects/overlay_line.xml b/binaries/data/mods/mod/shaders/effects/overlay_line.xml
index 41afe79b47..6cffa6ebb3 100644
--- a/binaries/data/mods/mod/shaders/effects/overlay_line.xml
+++ b/binaries/data/mods/mod/shaders/effects/overlay_line.xml
@@ -2,14 +2,8 @@
 <effect>
     <technique>
         <require shaders="arb"/>
-        <pass shader="arb/overlayline"/>
-    </technique>
-    <technique>
         <require shaders="glsl"/>
-        <pass shader="glsl/overlayline"/>
-    </technique>
-    <technique>
         <require shaders="spirv"/>
-        <pass shader="spirv/overlayline"/>
+        <pass shader="overlayline"/>
     </technique>
 </effect>
diff --git a/binaries/data/mods/mod/shaders/effects/overlay_solid.xml b/binaries/data/mods/mod/shaders/effects/overlay_solid.xml
index 57758e1b25..e96f9fca0a 100644
--- a/binaries/data/mods/mod/shaders/effects/overlay_solid.xml
+++ b/binaries/data/mods/mod/shaders/effects/overlay_solid.xml
@@ -2,14 +2,8 @@
 <effect>
     <technique>
         <require shaders="arb"/>
-        <pass shader="arb/overlay_solid"/>
-    </technique>
-    <technique>
         <require shaders="glsl"/>
-        <pass shader="glsl/overlay_solid"/>
-    </technique>
-    <technique>
         <require shaders="spirv"/>
-        <pass shader="spirv/overlay_solid"/>
+        <pass shader="overlay_solid"/>
     </technique>
 </effect>
diff --git a/binaries/data/mods/mod/shaders/effects/particle.xml b/binaries/data/mods/mod/shaders/effects/particle.xml
index 511d89ab66..e7115a1b12 100644
--- a/binaries/data/mods/mod/shaders/effects/particle.xml
+++ b/binaries/data/mods/mod/shaders/effects/particle.xml
@@ -1,25 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <effect>
-
 	<technique>
 		<require shaders="arb"/>
-		<pass shader="arb/particle">
-			<blend src="src_alpha" dst="one_minus_src_alpha"/>
-		</pass>
-	</technique>
-
-	<technique>
 		<require shaders="glsl"/>
-		<pass shader="glsl/particle">
-			<blend src="src_alpha" dst="one_minus_src_alpha"/>
-		</pass>
-	</technique>
-
-	<technique>
 		<require shaders="spirv"/>
-		<pass shader="spirv/particle">
+		<pass shader="particle">
 			<blend src="src_alpha" dst="one_minus_src_alpha"/>
 		</pass>
 	</technique>
-
 </effect>
diff --git a/binaries/data/mods/mod/shaders/effects/particle_add.xml b/binaries/data/mods/mod/shaders/effects/particle_add.xml
index 2f8fcb7c4c..830a308cd6 100644
--- a/binaries/data/mods/mod/shaders/effects/particle_add.xml
+++ b/binaries/data/mods/mod/shaders/effects/particle_add.xml
@@ -1,28 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <effect>
-
 	<technique>
 		<require shaders="arb"/>
-		<pass shader="arb/particle">
-			<blend src="src_alpha" dst="one"/>
-			<depth mask="false"/>
-		</pass>
-	</technique>
-
-	<technique>
 		<require shaders="glsl"/>
-		<pass shader="glsl/particle">
-			<blend src="src_alpha" dst="one"/>
-			<depth mask="false"/>
-		</pass>
-	</technique>
-
-	<technique>
 		<require shaders="spirv"/>
-		<pass shader="spirv/particle">
+		<pass shader="particle">
 			<blend src="src_alpha" dst="one"/>
 			<depth mask="false"/>
 		</pass>
 	</technique>
-
 </effect>
diff --git a/binaries/data/mods/mod/shaders/effects/particle_multiply.xml b/binaries/data/mods/mod/shaders/effects/particle_multiply.xml
index 1bb616ab8e..8f9399df2d 100644
--- a/binaries/data/mods/mod/shaders/effects/particle_multiply.xml
+++ b/binaries/data/mods/mod/shaders/effects/particle_multiply.xml
@@ -1,28 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <effect>
-
 	<technique>
 		<require shaders="arb"/>
-		<pass shader="arb/particle">
-			<blend src="zero" dst="one_minus_src_color"/>
-			<depth mask="false"/>
-		</pass>
-	</technique>
-
-	<technique>
 		<require shaders="glsl"/>
-		<pass shader="glsl/particle">
-			<blend src="zero" dst="one_minus_src_color"/>
-			<depth mask="false"/>
-		</pass>
-	</technique>
-
-	<technique>
 		<require shaders="spirv"/>
-		<pass shader="spirv/particle">
+		<pass shader="particle">
 			<blend src="zero" dst="one_minus_src_color"/>
 			<depth mask="false"/>
 		</pass>
 	</technique>
-
 </effect>
diff --git a/binaries/data/mods/mod/shaders/effects/particle_overlay.xml b/binaries/data/mods/mod/shaders/effects/particle_overlay.xml
index bd8c5b6804..396f2ad2cc 100644
--- a/binaries/data/mods/mod/shaders/effects/particle_overlay.xml
+++ b/binaries/data/mods/mod/shaders/effects/particle_overlay.xml
@@ -1,28 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <effect>
-
 	<technique>
 		<require shaders="arb"/>
-		<pass shader="arb/particle">
-			<blend src="src_alpha" dst="one_minus_src_alpha"/>
-			<depth mask="false"/>
-		</pass>
-	</technique>
-
-	<technique>
 		<require shaders="glsl"/>
-		<pass shader="glsl/particle">
-			<blend src="src_alpha" dst="one_minus_src_alpha"/>
-			<depth mask="false"/>
-		</pass>
-	</technique>
-
-	<technique>
 		<require shaders="spirv"/>
-		<pass shader="spirv/particle">
+		<pass shader="particle">
 			<blend src="src_alpha" dst="one_minus_src_alpha"/>
 			<depth mask="false"/>
 		</pass>
 	</technique>
-
 </effect>
diff --git a/binaries/data/mods/mod/shaders/effects/particle_solid.xml b/binaries/data/mods/mod/shaders/effects/particle_solid.xml
index 27593b54e3..b5fdec8c45 100644
--- a/binaries/data/mods/mod/shaders/effects/particle_solid.xml
+++ b/binaries/data/mods/mod/shaders/effects/particle_solid.xml
@@ -1,50 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <effect>
+	<technique>
+		<require shaders="arb"/>
+		<require shaders="glsl"/>
+		<require shaders="spirv"/>
+		<require context="MODE_WIREFRAME"/>
+		<pass shader="particle_solid">
+			<polygon mode="LINE"/>
+		</pass>
+	</technique>
 
 	<technique>
 		<require shaders="arb"/>
-		<require context="MODE_WIREFRAME"/>
-		<pass shader="arb/particle_solid">
-			<polygon mode="LINE"/>
-		</pass>
-	</technique>
-
-	<technique>
 		<require shaders="glsl"/>
-		<require context="MODE_WIREFRAME"/>
-		<pass shader="glsl/particle_solid">
-			<polygon mode="LINE"/>
-		</pass>
-	</technique>
-
-	<technique>
 		<require shaders="spirv"/>
-		<require context="MODE_WIREFRAME"/>
-		<pass shader="spirv/particle_solid">
-			<polygon mode="LINE"/>
-		</pass>
-	</technique>
-
-
-	<technique>
-		<require shaders="arb"/>
-		<pass shader="arb/particle_solid">
+		<pass shader="particle_solid">
 			<depth mask="false"/>
 		</pass>
 	</technique>
-
-	<technique>
-		<require shaders="glsl"/>
-		<pass shader="glsl/particle_solid">
-			<depth mask="false"/>
-		</pass>
-	</technique>
-
-	<technique>
-		<require shaders="spirv"/>
-		<pass shader="spirv/particle_solid">
-			<depth mask="false"/>
-		</pass>
-	</technique>
-
 </effect>
diff --git a/binaries/data/mods/mod/shaders/effects/particle_subtract.xml b/binaries/data/mods/mod/shaders/effects/particle_subtract.xml
index 5752f660db..294ae5ee5c 100644
--- a/binaries/data/mods/mod/shaders/effects/particle_subtract.xml
+++ b/binaries/data/mods/mod/shaders/effects/particle_subtract.xml
@@ -1,28 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <effect>
-
 	<technique>
 		<require shaders="arb"/>
-		<pass shader="arb/particle">
-			<blend src="src_alpha" dst="one" op="REVERSE_SUBTRACT"/>
-			<depth mask="false"/>
-		</pass>
-	</technique>
-
-	<technique>
 		<require shaders="glsl"/>
-		<pass shader="glsl/particle">
-			<blend src="src_alpha" dst="one" op="REVERSE_SUBTRACT"/>
-			<depth mask="false"/>
-		</pass>
-	</technique>
-
-	<technique>
 		<require shaders="spirv"/>
-		<pass shader="spirv/particle">
+		<pass shader="particle">
 			<blend src="src_alpha" dst="one" op="REVERSE_SUBTRACT"/>
 			<depth mask="false"/>
 		</pass>
 	</technique>
-
 </effect>
diff --git a/binaries/data/mods/mod/shaders/effects/postproc/DOF.xml b/binaries/data/mods/mod/shaders/effects/postproc/DOF.xml
index de6a183326..712c4fb3be 100644
--- a/binaries/data/mods/mod/shaders/effects/postproc/DOF.xml
+++ b/binaries/data/mods/mod/shaders/effects/postproc/DOF.xml
@@ -2,21 +2,12 @@
 <effect>
 	<technique>
 		<require shaders="glsl"/>
-		<pass shader="glsl/dof">
-			<define name="BLUR_FOV" value="3"/>
-			<depth test="FALSE" mask="false"/>
-		</pass>
-		<pass shader="glsl/hdr">
-			<depth test="FALSE" mask="false"/>
-		</pass>
-	</technique>
-	<technique>
 		<require shaders="spirv"/>
-		<pass shader="spirv/dof">
+		<pass shader="dof">
 			<define name="BLUR_FOV" value="3"/>
 			<depth test="FALSE" mask="false"/>
 		</pass>
-		<pass shader="spirv/hdr">
+		<pass shader="hdr">
 			<depth test="FALSE" mask="false"/>
 		</pass>
 	</technique>
diff --git a/binaries/data/mods/mod/shaders/effects/postproc/hdr.xml b/binaries/data/mods/mod/shaders/effects/postproc/hdr.xml
index e1f5a2f0fb..a4330bc8dc 100644
--- a/binaries/data/mods/mod/shaders/effects/postproc/hdr.xml
+++ b/binaries/data/mods/mod/shaders/effects/postproc/hdr.xml
@@ -1,18 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <effect>
-
 	<technique>
 		<require shaders="glsl"/>
-		<pass shader="glsl/hdr">
-			<depth test="FALSE" mask="false"/>
-		</pass>
-	</technique>
-
-	<technique>
 		<require shaders="spirv"/>
-		<pass shader="spirv/hdr">
+		<pass shader="hdr">
 			<depth test="FALSE" mask="false"/>
 		</pass>
 	</technique>
-
 </effect>
diff --git a/binaries/data/mods/mod/shaders/effects/sky_simple.xml b/binaries/data/mods/mod/shaders/effects/sky_simple.xml
index 3d69ac6ea4..4e0130e01f 100644
--- a/binaries/data/mods/mod/shaders/effects/sky_simple.xml
+++ b/binaries/data/mods/mod/shaders/effects/sky_simple.xml
@@ -1,25 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <effect>
-
 	<technique>
 		<require shaders="arb"/>
-		<pass shader="arb/sky">
-			<depth mask="false"/>
-		</pass>
-	</technique>
-
-	<technique>
 		<require shaders="glsl"/>
-		<pass shader="glsl/sky">
-			<depth mask="false"/>
-		</pass>
-	</technique>
-
-	<technique>
 		<require shaders="spirv"/>
-		<pass shader="spirv/sky">
+		<pass shader="sky">
 			<depth mask="false"/>
 		</pass>
 	</technique>
-
 </effect>
diff --git a/binaries/data/mods/mod/shaders/effects/solid.xml b/binaries/data/mods/mod/shaders/effects/solid.xml
index 93e02d26d7..2f11b17281 100644
--- a/binaries/data/mods/mod/shaders/effects/solid.xml
+++ b/binaries/data/mods/mod/shaders/effects/solid.xml
@@ -1,19 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <effect>
-
     <technique>
         <require shaders="arb"/>
-        <pass shader="arb/solid"/>
-    </technique>
-
-    <technique>
         <require shaders="glsl"/>
-        <pass shader="glsl/solid"/>
-    </technique>
-
-    <technique>
         <require shaders="spirv"/>
-        <pass shader="spirv/solid"/>
+        <pass shader="solid"/>
     </technique>
-
 </effect>
diff --git a/binaries/data/mods/mod/shaders/effects/terrain_base.xml b/binaries/data/mods/mod/shaders/effects/terrain_base.xml
index 72052c2c69..93bda004d1 100644
--- a/binaries/data/mods/mod/shaders/effects/terrain_base.xml
+++ b/binaries/data/mods/mod/shaders/effects/terrain_base.xml
@@ -1,69 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
 <effect>
-
 	<technique>
 		<require context="PASS_REFLECTIONS"/>
 		<require shaders="arb"/>
-		<pass shader="arb/terrain_base">
+		<require shaders="glsl"/>
+		<require shaders="spirv"/>
+		<pass shader="terrain_base">
 			<cull mode="FRONT"/>
 		</pass>
 	</technique>
 
 	<technique>
-		<require context="PASS_REFLECTIONS"/>
+		<require shaders="arb"/>
 		<require shaders="glsl"/>
-		<pass shader="glsl/terrain_base">
-			<cull mode="FRONT"/>
-		</pass>
-	</technique>
-
-	<technique>
-		<require context="PASS_REFLECTIONS"/>
 		<require shaders="spirv"/>
-		<pass shader="spirv/terrain_base">
-			<cull mode="FRONT"/>
+		<require context="MODE_WIREFRAME"/>
+		<pass shader="terrain_base">
+			<polygon mode="LINE"/>
 		</pass>
 	</technique>
 
-
 	<technique>
 		<require shaders="arb"/>
-		<require context="MODE_WIREFRAME"/>
-		<pass shader="arb/terrain_base">
-			<polygon mode="LINE"/>
-		</pass>
-	</technique>
-
-	<technique>
 		<require shaders="glsl"/>
-		<require context="MODE_WIREFRAME"/>
-		<pass shader="glsl/terrain_base">
-			<polygon mode="LINE"/>
-		</pass>
-	</technique>
-
-	<technique>
 		<require shaders="spirv"/>
-		<require context="MODE_WIREFRAME"/>
-		<pass shader="spirv/terrain_base">
-			<polygon mode="LINE"/>
-		</pass>
+		<pass shader="terrain_base"/>
 	</technique>
-
-
-	<technique>
-		<require shaders="arb"/>
-		<pass shader="arb/terrain_base"/>
-	</technique>
-
-	<technique>
-		<require shaders="glsl"/>
-		<pass shader="glsl/terrain_base"/>
-	</technique>
-
-	<technique>
-		<require shaders="spirv"/>
-		<pass shader="spirv/terrain_base"/>
-	</technique>
-
 </effect>
diff --git a/binaries/data/mods/mod/shaders/effects/terrain_blend.xml b/binaries/data/mods/mod/shaders/effects/terrain_blend.xml
index 1a61aa47e4..a80813bd1f 100644
--- a/binaries/data/mods/mod/shaders/effects/terrain_blend.xml
+++ b/binaries/data/mods/mod/shaders/effects/terrain_blend.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <effect>
-
 	<technique>
 		<require context="PASS_REFLECTIONS"/>
 		<require shaders="arb"/>
-		<pass shader="arb/terrain_blend">
+		<require shaders="glsl"/>
+		<require shaders="spirv"/>
+		<pass shader="terrain_blend">
 			<depth mask="false"/>
 			<cull mode="FRONT"/>
 			<blend src="src_alpha" dst="one_minus_src_alpha"/>
@@ -12,79 +13,24 @@
 	</technique>
 
 	<technique>
-		<require context="PASS_REFLECTIONS"/>
+		<require shaders="arb"/>
 		<require shaders="glsl"/>
-		<pass shader="glsl/terrain_blend">
-			<depth mask="false"/>
-			<cull mode="FRONT"/>
-			<blend src="src_alpha" dst="one_minus_src_alpha"/>
-		</pass>
-	</technique>
-
-	<technique>
-		<require context="PASS_REFLECTIONS"/>
 		<require shaders="spirv"/>
-		<pass shader="spirv/terrain_blend">
+		<require context="MODE_WIREFRAME"/>
+		<pass shader="terrain_blend">
 			<depth mask="false"/>
-			<cull mode="FRONT"/>
+			<polygon mode="LINE"/>
 			<blend src="src_alpha" dst="one_minus_src_alpha"/>
 		</pass>
 	</technique>
 
-
 	<technique>
 		<require shaders="arb"/>
-		<require context="MODE_WIREFRAME"/>
-		<pass shader="arb/terrain_blend">
-			<depth mask="false"/>
-			<polygon mode="LINE"/>
-			<blend src="src_alpha" dst="one_minus_src_alpha"/>
-		</pass>
-	</technique>
-
-	<technique>
 		<require shaders="glsl"/>
-		<require context="MODE_WIREFRAME"/>
-		<pass shader="glsl/terrain_blend">
-			<depth mask="false"/>
-			<polygon mode="LINE"/>
-			<blend src="src_alpha" dst="one_minus_src_alpha"/>
-		</pass>
-	</technique>
-
-	<technique>
 		<require shaders="spirv"/>
-		<require context="MODE_WIREFRAME"/>
-		<pass shader="spirv/terrain_blend">
-			<depth mask="false"/>
-			<polygon mode="LINE"/>
-			<blend src="src_alpha" dst="one_minus_src_alpha"/>
-		</pass>
-	</technique>
-
-
-	<technique>
-		<require shaders="arb"/>
-		<pass shader="arb/terrain_blend">
+		<pass shader="terrain_blend">
 			<depth mask="false"/>
 			<blend src="src_alpha" dst="one_minus_src_alpha"/>
 		</pass>
 	</technique>
-
-	<technique>
-		<require shaders="glsl"/>
-		<pass shader="glsl/terrain_blend">
-			<depth mask="false"/>
-			<blend src="src_alpha" dst="one_minus_src_alpha"/>
-		</pass>
-	</technique>
-
-	<technique>
-		<require shaders="spirv"/>
-		<pass shader="spirv/terrain_blend">
-			<depth mask="false"/>
-			<blend src="src_alpha" dst="one_minus_src_alpha"/>
-		</pass>
-	</technique>
-
 </effect>
diff --git a/binaries/data/mods/mod/shaders/effects/terrain_decal.xml b/binaries/data/mods/mod/shaders/effects/terrain_decal.xml
index 1e45204c58..6aa82e778c 100644
--- a/binaries/data/mods/mod/shaders/effects/terrain_decal.xml
+++ b/binaries/data/mods/mod/shaders/effects/terrain_decal.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <effect>
-
 	<technique>
 		<require context="PASS_REFLECTIONS"/>
 		<require shaders="arb"/>
-		<pass shader="arb/terrain_decal">
+		<require shaders="glsl"/>
+		<require shaders="spirv"/>
+		<pass shader="terrain_decal">
 			<depth mask="false"/>
 			<cull mode="FRONT"/>
 			<blend src="src_alpha" dst="one_minus_src_alpha"/>
@@ -12,79 +13,24 @@
 	</technique>
 
 	<technique>
-		<require context="PASS_REFLECTIONS"/>
+		<require shaders="arb"/>
 		<require shaders="glsl"/>
-		<pass shader="glsl/terrain_decal">
-			<depth mask="false"/>
-			<cull mode="FRONT"/>
-			<blend src="src_alpha" dst="one_minus_src_alpha"/>
-		</pass>
-	</technique>
-
-	<technique>
-		<require context="PASS_REFLECTIONS"/>
 		<require shaders="spirv"/>
-		<pass shader="spirv/terrain_decal">
+		<require context="MODE_WIREFRAME"/>
+		<pass shader="terrain_decal">
 			<depth mask="false"/>
-			<cull mode="FRONT"/>
+			<polygon mode="LINE"/>
 			<blend src="src_alpha" dst="one_minus_src_alpha"/>
 		</pass>
 	</technique>
 
-
 	<technique>
 		<require shaders="arb"/>
-		<require context="MODE_WIREFRAME"/>
-		<pass shader="arb/terrain_decal">
-			<depth mask="false"/>
-			<polygon mode="LINE"/>
-			<blend src="src_alpha" dst="one_minus_src_alpha"/>
-		</pass>
-	</technique>
-
-	<technique>
 		<require shaders="glsl"/>
-		<require context="MODE_WIREFRAME"/>
-		<pass shader="glsl/terrain_decal">
-			<depth mask="false"/>
-			<polygon mode="LINE"/>
-			<blend src="src_alpha" dst="one_minus_src_alpha"/>
-		</pass>
-	</technique>
-
-	<technique>
 		<require shaders="spirv"/>
-		<require context="MODE_WIREFRAME"/>
-		<pass shader="spirv/terrain_decal">
-			<depth mask="false"/>
-			<polygon mode="LINE"/>
-			<blend src="src_alpha" dst="one_minus_src_alpha"/>
-		</pass>
-	</technique>
-
-
-	<technique>
-		<require shaders="arb"/>
-		<pass shader="arb/terrain_decal">
+		<pass shader="terrain_decal">
 			<depth mask="false"/>
 			<blend src="src_alpha" dst="one_minus_src_alpha"/>
 		</pass>
 	</technique>
-
-	<technique>
-		<require shaders="glsl"/>
-		<pass shader="glsl/terrain_decal">
-			<depth mask="false"/>
-			<blend src="src_alpha" dst="one_minus_src_alpha"/>
-		</pass>
-	</technique>
-
-	<technique>
-		<require shaders="spirv"/>
-		<pass shader="spirv/terrain_decal">
-			<depth mask="false"/>
-			<blend src="src_alpha" dst="one_minus_src_alpha"/>
-		</pass>
-	</technique>
-
 </effect>
diff --git a/binaries/data/mods/mod/shaders/effects/terrain_solid.xml b/binaries/data/mods/mod/shaders/effects/terrain_solid.xml
index 864dfa2907..4e0251b631 100644
--- a/binaries/data/mods/mod/shaders/effects/terrain_solid.xml
+++ b/binaries/data/mods/mod/shaders/effects/terrain_solid.xml
@@ -1,32 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <effect>
-
 	<technique>
 		<require context="PASS_SHADOWS || MODE_SILHOUETTEOCCLUDER"/>
 		<require shaders="arb"/>
-		<pass shader="arb/dummy">
-			<!-- See GLSL -->
-			<cull mode="FRONT"/>
-			<color mask_red="FALSE" mask_green="FALSE" mask_blue="FALSE" mask_alpha="FALSE"/>
-		</pass>
-	</technique>
-	<technique>
-		<require context="PASS_SHADOWS || MODE_SILHOUETTEOCCLUDER"/>
 		<require shaders="glsl"/>
-		<pass shader="glsl/dummy">
-			<!--
-				To prevent units displaying silhouettes when parts of their model
-				protrude into the ground, only occlude with the back faces of the
-				terrain (so silhouettes will still display when behind hills).
-			-->
-			<cull mode="FRONT"/>
-			<color mask_red="FALSE" mask_green="FALSE" mask_blue="FALSE" mask_alpha="FALSE"/>
-		</pass>
-	</technique>
-	<technique>
-		<require context="PASS_SHADOWS || MODE_SILHOUETTEOCCLUDER"/>
 		<require shaders="spirv"/>
-		<pass shader="spirv/dummy">
+		<pass shader="dummy">
 			<!--
 				To prevent units displaying silhouettes when parts of their model
 				protrude into the ground, only occlude with the back faces of the
@@ -39,37 +18,19 @@
 
 	<technique>
 		<require shaders="arb"/>
-		<require context="MODE_WIREFRAME"/>
-		<pass shader="arb/dummy">
-			<polygon mode="LINE"/>
-		</pass>
-	</technique>
-	<technique>
 		<require shaders="glsl"/>
-		<require context="MODE_WIREFRAME"/>
-		<pass shader="glsl/dummy">
-			<polygon mode="LINE"/>
-		</pass>
-	</technique>
-	<technique>
 		<require shaders="spirv"/>
 		<require context="MODE_WIREFRAME"/>
-		<pass shader="spirv/dummy">
+		<pass shader="dummy">
 			<polygon mode="LINE"/>
 		</pass>
 	</technique>
 
 	<technique>
 		<require shaders="arb"/>
-		<pass shader="arb/dummy"/>
-	</technique>
-	<technique>
 		<require shaders="glsl"/>
-		<pass shader="glsl/dummy"/>
-	</technique>
-	<technique>
 		<require shaders="spirv"/>
-		<pass shader="spirv/dummy"/>
+		<pass shader="dummy"/>
 	</technique>
 
 </effect>
diff --git a/binaries/data/mods/mod/shaders/effects/upscale_bilinear.xml b/binaries/data/mods/mod/shaders/effects/upscale_bilinear.xml
index 01efef3244..1f253536eb 100644
--- a/binaries/data/mods/mod/shaders/effects/upscale_bilinear.xml
+++ b/binaries/data/mods/mod/shaders/effects/upscale_bilinear.xml
@@ -2,13 +2,8 @@
 <effect>
 	<technique>
 		<require shaders="glsl"/>
-		<pass shader="glsl/upscale_bilinear">
-			<depth test="FALSE" mask="false"/>
-		</pass>
-	</technique>
-	<technique>
 		<require shaders="spirv"/>
-		<pass shader="spirv/upscale_bilinear">
+		<pass shader="upscale_bilinear">
 			<depth test="FALSE" mask="false"/>
 		</pass>
 	</technique>
diff --git a/binaries/data/mods/mod/shaders/effects/upscale_nearest.xml b/binaries/data/mods/mod/shaders/effects/upscale_nearest.xml
index c7da548748..9731d77c95 100644
--- a/binaries/data/mods/mod/shaders/effects/upscale_nearest.xml
+++ b/binaries/data/mods/mod/shaders/effects/upscale_nearest.xml
@@ -2,13 +2,8 @@
 <effect>
 	<technique>
 		<require shaders="glsl"/>
-		<pass shader="glsl/upscale_nearest">
-			<depth test="FALSE" mask="false"/>
-		</pass>
-	</technique>
-	<technique>
 		<require shaders="spirv"/>
-		<pass shader="spirv/upscale_nearest">
+		<pass shader="upscale_nearest">
 			<depth test="FALSE" mask="false"/>
 		</pass>
 	</technique>
diff --git a/binaries/data/mods/mod/shaders/effects/water_high.xml b/binaries/data/mods/mod/shaders/effects/water_high.xml
index ca00c729d0..6f4215734a 100644
--- a/binaries/data/mods/mod/shaders/effects/water_high.xml
+++ b/binaries/data/mods/mod/shaders/effects/water_high.xml
@@ -2,15 +2,8 @@
 <effect>
 	<technique>
 		<require shaders="glsl"/>
-		<pass shader="glsl/water_high">
-			<depth test="TRUE"/>
-			<blend src="src_alpha" dst="one_minus_src_alpha"/>
-		</pass>
-	</technique>
-
-	<technique>
 		<require shaders="spirv"/>
-		<pass shader="spirv/water_high">
+		<pass shader="water_high">
 			<depth test="TRUE"/>
 			<blend src="src_alpha" dst="one_minus_src_alpha"/>
 		</pass>
diff --git a/binaries/data/mods/mod/shaders/effects/water_simple.xml b/binaries/data/mods/mod/shaders/effects/water_simple.xml
index 7debcb31a7..7d8f53ff4a 100644
--- a/binaries/data/mods/mod/shaders/effects/water_simple.xml
+++ b/binaries/data/mods/mod/shaders/effects/water_simple.xml
@@ -1,53 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <effect>
+	<technique>
+		<require shaders="arb"/>
+		<require shaders="glsl"/>
+		<require shaders="spirv"/>
+		<require context="MODE_WIREFRAME"/>
+		<pass shader="water_simple">
+			<depth test="TRUE"/>
+			<polygon mode="LINE"/>
+		</pass>
+	</technique>
 
 	<technique>
 		<require shaders="arb"/>
-		<require context="MODE_WIREFRAME"/>
-		<pass shader="arb/water_simple">
-			<depth test="TRUE"/>
-			<polygon mode="LINE"/>
-		</pass>
-	</technique>
-
-	<technique>
 		<require shaders="glsl"/>
-		<require context="MODE_WIREFRAME"/>
-		<pass shader="glsl/water_simple">
-			<depth test="TRUE"/>
-			<polygon mode="LINE"/>
-		</pass>
-	</technique>
-
-	<technique>
 		<require shaders="spirv"/>
-		<require context="MODE_WIREFRAME"/>
-		<pass shader="spirv/water_simple">
-			<depth test="TRUE"/>
-			<polygon mode="LINE"/>
-		</pass>
-	</technique>
-
-
-	<technique>
-		<require shaders="arb"/>
-		<pass shader="arb/water_simple">
+		<pass shader="water_simple">
 			<depth test="TRUE"/>
 		</pass>
 	</technique>
-
-	<technique>
-		<require shaders="glsl"/>
-		<pass shader="glsl/water_simple">
-			<depth test="TRUE"/>
-		</pass>
-	</technique>
-
-	<technique>
-		<require shaders="spirv"/>
-		<pass shader="spirv/water_simple">
-			<depth test="TRUE"/>
-		</pass>
-	</technique>
-
 </effect>
diff --git a/binaries/data/mods/mod/shaders/effects/water_waves.xml b/binaries/data/mods/mod/shaders/effects/water_waves.xml
index a23e27cd83..d52f3013ae 100644
--- a/binaries/data/mods/mod/shaders/effects/water_waves.xml
+++ b/binaries/data/mods/mod/shaders/effects/water_waves.xml
@@ -2,15 +2,8 @@
 <effect>
 	<technique>
 		<require shaders="glsl"/>
-		<pass shader="glsl/waves">
-			<depth test="TRUE" func="always"/>
-			<blend src="src_alpha" dst="one_minus_src_alpha"/>
-		</pass>
-	</technique>
-
-	<technique>
 		<require shaders="spirv"/>
-		<pass shader="spirv/waves">
+		<pass shader="waves">
 			<depth test="TRUE" func="always"/>
 			<blend src="src_alpha" dst="one_minus_src_alpha"/>
 		</pass>
diff --git a/binaries/data/mods/public/shaders/effects/model.xml b/binaries/data/mods/public/shaders/effects/model.xml
index bf19b5501a..974d99b7e0 100644
--- a/binaries/data/mods/public/shaders/effects/model.xml
+++ b/binaries/data/mods/public/shaders/effects/model.xml
@@ -1,26 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <effect>
-
 	<technique>
 		<require context="PASS_REFLECTIONS"/>
 		<require shaders="arb"/>
-		<pass shader="arb/model_common">
-			<cull mode="FRONT"/>
-		</pass>
-	</technique>
-
-	<technique>
-		<require context="PASS_REFLECTIONS"/>
 		<require shaders="glsl"/>
-		<pass shader="glsl/model_common">
-			<cull mode="FRONT"/>
-		</pass>
-	</technique>
-
-	<technique>
-		<require context="PASS_REFLECTIONS"/>
 		<require shaders="spirv"/>
-		<pass shader="spirv/model_common">
+		<pass shader="model_common">
 			<cull mode="FRONT"/>
 		</pass>
 	</technique>
@@ -28,122 +13,49 @@
 	<technique>
 		<require context="MODE_SHADOWCAST || MODE_SILHOUETTEOCCLUDER"/>
 		<require shaders="arb"/>
-		<pass shader="arb/model_solid">
-			<color mask_red="FALSE" mask_green="FALSE" mask_blue="FALSE" mask_alpha="FALSE"/>
-		</pass>
-	</technique>
-
-	<technique>
-		<require context="MODE_SHADOWCAST || MODE_SILHOUETTEOCCLUDER"/>
 		<require shaders="glsl"/>
-		<pass shader="glsl/model_solid">
-			<color mask_red="FALSE" mask_green="FALSE" mask_blue="FALSE" mask_alpha="FALSE"/>
-		</pass>
-	</technique>
-
-	<technique>
-		<require context="MODE_SHADOWCAST || MODE_SILHOUETTEOCCLUDER"/>
 		<require shaders="spirv"/>
-		<pass shader="spirv/model_solid">
+		<pass shader="model_solid">
 			<color mask_red="FALSE" mask_green="FALSE" mask_blue="FALSE" mask_alpha="FALSE"/>
 		</pass>
 	</technique>
 
-
 	<technique>
 		<require context="MODE_WIREFRAME"/>
 		<require shaders="arb"/>
-		<pass shader="arb/model_common">
-			<polygon mode="LINE"/>
-		</pass>
-	</technique>
-
-	<technique>
-		<require context="MODE_WIREFRAME"/>
 		<require shaders="glsl"/>
-		<pass shader="glsl/model_common">
-			<polygon mode="LINE"/>
-		</pass>
-	</technique>
-
-	<technique>
-		<require context="MODE_WIREFRAME"/>
 		<require shaders="spirv"/>
-		<pass shader="spirv/model_common">
-			<polygon mode="LINE"/>
-		</pass>
-	</technique>
-
-
-	<technique>
-		<require context="MODE_WIREFRAME_SOLID"/>
-		<require shaders="arb"/>
-		<pass shader="arb/model_solid_player">
+		<pass shader="model_common">
 			<polygon mode="LINE"/>
 		</pass>
 	</technique>
 
 	<technique>
 		<require context="MODE_WIREFRAME_SOLID"/>
+		<require shaders="arb"/>
 		<require shaders="glsl"/>
-		<pass shader="glsl/model_solid_player">
-			<polygon mode="LINE"/>
-		</pass>
-	</technique>
-
-	<technique>
-		<require context="MODE_WIREFRAME_SOLID"/>
 		<require shaders="spirv"/>
-		<pass shader="spirv/model_solid_player">
+		<pass shader="model_solid_player">
 			<polygon mode="LINE"/>
 		</pass>
 	</technique>
 
-
 	<technique>
 		<require context="MODE_SILHOUETTEDISPLAY"/>
 		<require shaders="arb"/>
-		<pass shader="arb/model_solid_player">
+		<require shaders="glsl"/>
+		<require shaders="spirv"/>
+		<pass shader="model_solid_player">
 			<depth func="gequal"/>
 			<stencil test="TRUE" compare="notequal" reference="1" mask_read="4294967295" pass="REPLACE"/>
 			<blend src="constant_alpha" dst="one_minus_constant_alpha" constant="0 0 0 191"/>
 		</pass>
 	</technique>
 
-	<technique>
-		<require context="MODE_SILHOUETTEDISPLAY"/>
-		<require shaders="glsl"/>
-		<pass shader="glsl/model_solid_player">
-			<depth func="gequal"/>
-			<stencil test="TRUE" compare="notequal" reference="1" mask_read="4294967295" pass="REPLACE"/>
-			<blend src="constant_alpha" dst="one_minus_constant_alpha" constant="0 0 0 191"/>
-		</pass>
-	</technique>
-
-	<technique>
-		<require context="MODE_SILHOUETTEDISPLAY"/>
-		<require shaders="spirv"/>
-		<pass shader="spirv/model_solid_player">
-			<depth func="gequal"/>
-			<stencil test="TRUE" compare="notequal" reference="1" mask_read="4294967295" pass="REPLACE"/>
-			<blend src="constant_alpha" dst="one_minus_constant_alpha" constant="0 0 0 191"/>
-		</pass>
-	</technique>
-
-
 	<technique>
 		<require shaders="arb"/>
-		<pass shader="arb/model_common"/>
-	</technique>
-
-	<technique>
 		<require shaders="glsl"/>
-		<pass shader="glsl/model_common"/>
-	</technique>
-
-	<technique>
 		<require shaders="spirv"/>
-		<pass shader="spirv/model_common"/>
+		<pass shader="model_common"/>
 	</technique>
-
 </effect>
diff --git a/binaries/data/mods/public/shaders/effects/model_transparent.xml b/binaries/data/mods/public/shaders/effects/model_transparent.xml
index ca64db71a9..cff9efc2b7 100644
--- a/binaries/data/mods/public/shaders/effects/model_transparent.xml
+++ b/binaries/data/mods/public/shaders/effects/model_transparent.xml
@@ -4,29 +4,9 @@
 	<technique>
 		<require context="MODE_SHADOWCAST || MODE_SILHOUETTEOCCLUDER"/>
 		<require shaders="arb"/>
-		<pass shader="arb/model_solid_tex">
-			<define name="REQUIRE_ALPHA_GEQUAL" value="0.4"/>
-			<!-- Disable face-culling for two-sided models -->
-			<cull mode="NONE"/>
-			<color mask_red="FALSE" mask_green="FALSE" mask_blue="FALSE" mask_alpha="FALSE"/>
-		</pass>
-	</technique>
-
-	<technique>
-		<require context="MODE_SHADOWCAST || MODE_SILHOUETTEOCCLUDER"/>
 		<require shaders="glsl"/>
-		<pass shader="glsl/model_solid_tex">
-			<define name="REQUIRE_ALPHA_GEQUAL" value="0.4"/>
-			<!-- Disable face-culling for two-sided models -->
-			<cull mode="NONE"/>
-			<color mask_red="FALSE" mask_green="FALSE" mask_blue="FALSE" mask_alpha="FALSE"/>
-		</pass>
-	</technique>
-
-	<technique>
-		<require context="MODE_SHADOWCAST || MODE_SILHOUETTEOCCLUDER"/>
 		<require shaders="spirv"/>
-		<pass shader="spirv/model_solid_tex">
+		<pass shader="model_solid_tex">
 			<define name="REQUIRE_ALPHA_GEQUAL" value="0.4"/>
 			<!-- Disable face-culling for two-sided models -->
 			<cull mode="NONE"/>
@@ -42,82 +22,30 @@
 	<technique>
 		<require context="MODE_SILHOUETTEDISPLAY"/>
 		<require shaders="arb"/>
-		<pass shader="arb/model_solid_player">
+		<require shaders="glsl"/>
+		<require shaders="spirv"/>
+		<pass shader="model_solid_player">
 			<depth func="gequal"/>
 			<stencil test="TRUE" compare="notequal" reference="1" mask_read="4294967295" pass="REPLACE"/>
 		</pass>
 	</technique>
 
-	<technique>
-		<require context="MODE_SILHOUETTEDISPLAY"/>
-		<require shaders="glsl"/>
-		<pass shader="glsl/model_solid_player">
-			<depth func="gequal"/>
-			<stencil test="TRUE" compare="notequal" reference="1" mask_read="4294967295" pass="REPLACE"/>
-		</pass>
-	</technique>
-
-	<technique>
-		<require context="MODE_SILHOUETTEDISPLAY"/>
-		<require shaders="spirv"/>
-		<pass shader="spirv/model_solid_player">
-			<depth func="gequal"/>
-			<stencil test="TRUE" compare="notequal" reference="1" mask_read="4294967295" pass="REPLACE"/>
-		</pass>
-	</technique>
-
-
 	<technique>
 		<require context="MODE_WIREFRAME_SOLID"/>
 		<require shaders="arb"/>
-		<pass shader="arb/model_solid_player">
-			<polygon mode="LINE"/>
-		</pass>
-	</technique>
-
-	<technique>
-		<require context="MODE_WIREFRAME_SOLID"/>
 		<require shaders="glsl"/>
-		<pass shader="glsl/model_solid_player">
-			<polygon mode="LINE"/>
-		</pass>
-	</technique>
-
-	<technique>
-		<require context="MODE_WIREFRAME_SOLID"/>
 		<require shaders="spirv"/>
-		<pass shader="spirv/model_solid_player">
+		<pass shader="model_solid_player">
 			<polygon mode="LINE"/>
 		</pass>
 	</technique>
 
-
 	<technique>
 		<require context="MODE_WIREFRAME"/>
 		<require shaders="arb"/>
-		<pass shader="arb/model_common">
-			<define name="USE_TRANSPARENT" value="1"/>
-			<blend src="src_alpha" dst="one_minus_src_alpha"/>
-			<depth func="less" mask="false"/>
-			<cull mode="NONE"/>
-			<polygon mode="LINE"/>
-		</pass>
-	</technique>
-	<technique>
-		<require context="MODE_WIREFRAME"/>
 		<require shaders="glsl"/>
-		<pass shader="glsl/model_common">
-			<define name="USE_TRANSPARENT" value="1"/>
-			<blend src="src_alpha" dst="one_minus_src_alpha"/>
-			<depth func="less" mask="false"/>
-			<cull mode="NONE"/>
-			<polygon mode="LINE"/>
-		</pass>
-	</technique>
-	<technique>
-		<require context="MODE_WIREFRAME"/>
 		<require shaders="spirv"/>
-		<pass shader="spirv/model_common">
+		<pass shader="model_common">
 			<define name="USE_TRANSPARENT" value="1"/>
 			<blend src="src_alpha" dst="one_minus_src_alpha"/>
 			<depth func="less" mask="false"/>
@@ -126,68 +54,26 @@
 		</pass>
 	</technique>
 
-
 	<technique>
 		<require context="PASS_REFLECTIONS"/>
 		<require context="ALPHABLEND_PASS_OPAQUE"/>
 		<require shaders="arb"/>
-		<pass shader="arb/model_common">
-			<define name="USE_TRANSPARENT" value="1"/>
-			<define name="REQUIRE_ALPHA_GEQUAL" value="0.6375"/>
-			<cull mode="NONE"/>
-		</pass>
-	</technique>
-	<technique>
-		<require context="PASS_REFLECTIONS"/>
-		<require context="ALPHABLEND_PASS_OPAQUE"/>
 		<require shaders="glsl"/>
-		<pass shader="glsl/model_common">
-			<define name="USE_TRANSPARENT" value="1"/>
-			<define name="REQUIRE_ALPHA_GEQUAL" value="0.6375"/>
-			<cull mode="NONE"/>
-		</pass>
-	</technique>
-	<technique>
-		<require context="PASS_REFLECTIONS"/>
-		<require context="ALPHABLEND_PASS_OPAQUE"/>
 		<require shaders="spirv"/>
-		<pass shader="spirv/model_common">
+		<pass shader="model_common">
 			<define name="USE_TRANSPARENT" value="1"/>
 			<define name="REQUIRE_ALPHA_GEQUAL" value="0.6375"/>
 			<cull mode="NONE"/>
 		</pass>
 	</technique>
 
-
 	<technique>
 		<require context="PASS_REFLECTIONS"/>
 		<require context="ALPHABLEND_PASS_BLEND"/>
 		<require shaders="arb"/>
-		<pass shader="arb/model_common">
-			<define name="USE_TRANSPARENT" value="1"/>
-			<define name="REQUIRE_ALPHA_GEQUAL" value="0.05"/>
-			<blend src="src_alpha" dst="one_minus_src_alpha"/>
-			<depth func="less" mask="false"/>
-			<cull mode="NONE"/>
-		</pass>
-	</technique>
-	<technique>
-		<require context="PASS_REFLECTIONS"/>
-		<require context="ALPHABLEND_PASS_BLEND"/>
 		<require shaders="glsl"/>
-		<pass shader="glsl/model_common">
-			<define name="USE_TRANSPARENT" value="1"/>
-			<define name="REQUIRE_ALPHA_GEQUAL" value="0.05"/>
-			<blend src="src_alpha" dst="one_minus_src_alpha"/>
-			<depth func="less" mask="false"/>
-			<cull mode="NONE"/>
-		</pass>
-	</technique>
-	<technique>
-		<require context="PASS_REFLECTIONS"/>
-		<require context="ALPHABLEND_PASS_BLEND"/>
 		<require shaders="spirv"/>
-		<pass shader="spirv/model_common">
+		<pass shader="model_common">
 			<define name="USE_TRANSPARENT" value="1"/>
 			<define name="REQUIRE_ALPHA_GEQUAL" value="0.05"/>
 			<blend src="src_alpha" dst="one_minus_src_alpha"/>
@@ -196,67 +82,27 @@
 		</pass>
 	</technique>
 
-
 	<technique>
 		<require context="ALPHABLEND_PASS_OPAQUE"/>
 		<require shaders="arb"/>
-		<pass shader="arb/model_common">
-			<define name="USE_TRANSPARENT" value="1"/>
-			<define name="REQUIRE_ALPHA_GEQUAL" value="0.6375"/>
-		</pass>
-	</technique>
-
-	<technique>
-		<require context="ALPHABLEND_PASS_OPAQUE"/>
 		<require shaders="glsl"/>
-		<pass shader="glsl/model_common">
-			<define name="USE_TRANSPARENT" value="1"/>
-			<define name="REQUIRE_ALPHA_GEQUAL" value="0.6375"/>
-		</pass>
-	</technique>
-
-	<technique>
-		<require context="ALPHABLEND_PASS_OPAQUE"/>
 		<require shaders="spirv"/>
-		<pass shader="spirv/model_common">
+		<pass shader="model_common">
 			<define name="USE_TRANSPARENT" value="1"/>
 			<define name="REQUIRE_ALPHA_GEQUAL" value="0.6375"/>
 		</pass>
 	</technique>
 
-
-
 	<technique>
 		<require context="ALPHABLEND_PASS_BLEND"/>
 		<require shaders="arb"/>
-		<pass shader="arb/model_common">
-			<define name="USE_TRANSPARENT" value="1"/>
-			<define name="REQUIRE_ALPHA_GEQUAL" value="0.05"/>
-			<blend src="src_alpha" dst="one_minus_src_alpha"/>
-			<depth func="less" mask="false"/>
-		</pass>
-	</technique>
-
-	<technique>
-		<require context="ALPHABLEND_PASS_BLEND"/>
 		<require shaders="glsl"/>
-		<pass shader="glsl/model_common">
-			<define name="USE_TRANSPARENT" value="1"/>
-			<define name="REQUIRE_ALPHA_GEQUAL" value="0.05"/>
-			<blend src="src_alpha" dst="one_minus_src_alpha"/>
-			<depth func="less" mask="false"/>
-		</pass>
-	</technique>
-
-	<technique>
-		<require context="ALPHABLEND_PASS_BLEND"/>
 		<require shaders="spirv"/>
-		<pass shader="spirv/model_common">
+		<pass shader="model_common">
 			<define name="USE_TRANSPARENT" value="1"/>
 			<define name="REQUIRE_ALPHA_GEQUAL" value="0.05"/>
 			<blend src="src_alpha" dst="one_minus_src_alpha"/>
 			<depth func="less" mask="false"/>
 		</pass>
 	</technique>
-
 </effect>
diff --git a/binaries/data/mods/public/shaders/effects/model_water.xml b/binaries/data/mods/public/shaders/effects/model_water.xml
index bde7683e7b..36e8d470a6 100644
--- a/binaries/data/mods/public/shaders/effects/model_water.xml
+++ b/binaries/data/mods/public/shaders/effects/model_water.xml
@@ -2,21 +2,9 @@
 <effect>
     <technique>
         <require shaders="glsl"/>
-        <sort_by_distance/>
-        <pass shader="glsl/model_water">
-            <define name="USE_TRANSPARENT" value="1"/>
-            <define name="USE_SPECULAR" value="1"/>
-            <define name="USE_NORMAL_MAP" value="1"/>
-            <define name="USE_INSTANCING" value="1"/>
-            <define name="REQUIRE_ALPHA_GEQUAL" value="0.05"/>
-            <blend src="src_alpha" dst="one_minus_src_alpha"/>
-            <depth func="less" mask="true"/>
-        </pass>
-    </technique>
-    <technique>
         <require shaders="spirv"/>
         <sort_by_distance/>
-        <pass shader="spirv/model_water">
+        <pass shader="model_water">
             <define name="USE_TRANSPARENT" value="1"/>
             <define name="USE_SPECULAR" value="1"/>
             <define name="USE_NORMAL_MAP" value="1"/>
diff --git a/binaries/data/mods/public/shaders/effects/model_waterfall.xml b/binaries/data/mods/public/shaders/effects/model_waterfall.xml
index bcc527dccb..cb75c325b0 100644
--- a/binaries/data/mods/public/shaders/effects/model_waterfall.xml
+++ b/binaries/data/mods/public/shaders/effects/model_waterfall.xml
@@ -2,18 +2,9 @@
 <effect>
     <technique>
         <require shaders="glsl"/>
-        <sort_by_distance/>
-        <pass shader="glsl/model_waterfall">
-            <define name="USE_TRANSPARENT" value="1"/>
-            <define name="USE_INSTANCING" value="1"/>
-            <blend src="src_alpha" dst="one_minus_src_alpha"/>
-            <depth func="lequal" mask="true"/>
-        </pass>
-    </technique>
-    <technique>
         <require shaders="spirv"/>
         <sort_by_distance/>
-        <pass shader="spirv/model_waterfall">
+        <pass shader="model_waterfall">
             <define name="USE_TRANSPARENT" value="1"/>
             <define name="USE_INSTANCING" value="1"/>
             <blend src="src_alpha" dst="one_minus_src_alpha"/>