diff --git a/Effects/model-combined-deferred.eff b/Effects/model-combined-deferred.eff
index 555fd3ac9..deeb6b095 100644
--- a/Effects/model-combined-deferred.eff
+++ b/Effects/model-combined-deferred.eff
@@ -242,8 +242,8 @@ the objects that use it, and replaces it with the default shader.
 				<use>vertex-program-two-side</use>
 			</vertex-program-two-side>
 
-	  <program>
-		<vertex-shader>Shaders/ubershader.vert</vertex-shader>
+	  <program n="0">
+		<vertex-shader n="0">Shaders/ubershader.vert</vertex-shader>
 		<fragment-shader>Shaders/ubershader-gbuffer.frag</fragment-shader>
 		<fragment-shader>Shaders/gbuffer-functions.frag</fragment-shader>
 		<fragment-shader>Shaders/gbuffer-encode.frag</fragment-shader>
diff --git a/Effects/model-combined-transparent.eff b/Effects/model-combined-transparent.eff
index 32490a33d..05470e77f 100644
--- a/Effects/model-combined-transparent.eff
+++ b/Effects/model-combined-transparent.eff
@@ -12,7 +12,7 @@ and fallback to plain transparency when the model shader is disabled.
 			<and>
 			  <equal>
 				<float-property>/sim/rendering/shaders/model</float-property>
-				<value type="int">0</value>
+				<value type="float">0.0</value>
 			  </equal>
 			  <or>
 				<less-equal>
diff --git a/Effects/model-combined.eff b/Effects/model-combined.eff
index dd21306cc..158c83c12 100644
--- a/Effects/model-combined.eff
+++ b/Effects/model-combined.eff
@@ -845,7 +845,7 @@ please see Docs/README.model-combined.eff for documentation
 		  </or>
 		</and>
 	  </predicate>
-	  <pass>
+	  <pass n="0">
 		<lighting>true</lighting>
 		<material>
 		  <active>
@@ -1041,7 +1041,7 @@ please see Docs/README.model-combined.eff for documentation
 			<use>vertex-program-two-side</use>
 		  </vertex-program-two-side>
 
-		  <program>
+		  <program n="0">
 			<!-- <vertex-shader n="0">Shaders/include_fog.vert</vertex-shader> -->
 			  <vertex-shader n="1">Shaders/ubershader.vert</vertex-shader>
 			  <fragment-shader n="0">Shaders/include_fog.frag</fragment-shader>
diff --git a/Effects/model-default.eff b/Effects/model-default.eff
index a7a40b9f7..442e50bc2 100644
--- a/Effects/model-default.eff
+++ b/Effects/model-default.eff
@@ -219,8 +219,8 @@
 		<vertex-program-two-side>
 			<use>vertex-program-two-side</use>
 		</vertex-program-two-side>
-		<program>
-			<vertex-shader>Shaders/deferred-gbuffer.vert</vertex-shader>
+		<program n="0">
+			<vertex-shader n="0">Shaders/deferred-gbuffer.vert</vertex-shader>
 			<fragment-shader>Shaders/deferred-gbuffer.frag</fragment-shader>
 			<fragment-shader>Shaders/gbuffer-functions.frag</fragment-shader>
 			<fragment-shader>Shaders/gbuffer-encode.frag</fragment-shader>
@@ -332,12 +332,10 @@
 			<vertex-program-two-side>
 				<use>vertex-program-two-side</use>
 			</vertex-program-two-side>
-			<program>
-<!-- 				<vertex-shader n="0">Shaders/include_fog.vert</vertex-shader> -->
-				<!--fog include-->
+			<program n="0">
+<!-- 				<vertex-shader n="0">Shaders/include_fog.vert</vertex-shader> -->			<!--fog include-->
 				<vertex-shader n="1">Shaders/default.vert</vertex-shader>
-				<fragment-shader n="0">Shaders/include_fog.frag</fragment-shader>
-				<!--fog include-->
+				<fragment-shader n="0">Shaders/include_fog.frag</fragment-shader>				<!--fog include-->
 				<fragment-shader n="1">Shaders/default.frag</fragment-shader>
 			</program>
 			<!-- 			BEGIN fog include -->
@@ -398,7 +396,7 @@
 			</uniform>
 		</pass>
 	</technique>
-	<technique n="12">
+	<technique n="13">
 		<pass>
 			<lighting>true</lighting>
 			<material>