diff --git a/Effects/building.eff b/Effects/building.eff
index 13807c209..9a7b8bde5 100644
--- a/Effects/building.eff
+++ b/Effects/building.eff
@@ -342,7 +342,7 @@
   <technique n="11">
     <pass>
       <program n="0">
-        <vertex-shader n="0">Shaders/building-default.vert</vertex-shader>
+        <vertex-shader n="1">Shaders/building-default.vert</vertex-shader>
       </program>
     </pass>
   </technique>  
diff --git a/Effects/crop.eff b/Effects/crop.eff
index 0783e70be..9bc934808 100644
--- a/Effects/crop.eff
+++ b/Effects/crop.eff
@@ -21,6 +21,7 @@
   <technique n="9">
     <predicate>
       <and>
+	    <property>/sim/rendering/shaders/quality-level</property>
         <property>/sim/rendering/shaders/crop</property>
 		<equal>
 			<value type="float">0.0</value>
diff --git a/Effects/flutter.eff b/Effects/flutter.eff
index 5971d5d19..47c46b65b 100644
--- a/Effects/flutter.eff
+++ b/Effects/flutter.eff
@@ -51,6 +51,7 @@
 	<technique n="9">
 		<predicate>
 			<and>
+				<property>/sim/rendering/shaders/quality-level</property>
 				<property>/sim/rendering/shaders/generic</property>
 				<or>
 					<less-equal>
diff --git a/Effects/forest.eff b/Effects/forest.eff
index ddc37d1ed..df29c1c02 100644
--- a/Effects/forest.eff
+++ b/Effects/forest.eff
@@ -69,7 +69,8 @@
   <technique n="9">
     <predicate>
       <and>
-        <property>/sim/rendering/shaders/transition</property>
+		<property>/sim/rendering/shaders/quality-level</property>
+		<property>/sim/rendering/shaders/transition</property>
 		<equal>
 			<value type="float">0.0</value>
 			<float-property>/sim/rendering/rembrandt/enabled</float-property>
diff --git a/Effects/glacier.eff b/Effects/glacier.eff
index 2d50687d7..f51c1fdd8 100644
--- a/Effects/glacier.eff
+++ b/Effects/glacier.eff
@@ -70,6 +70,7 @@
   <technique n="9">
     <predicate>
       <and>
+		<property>/sim/rendering/shaders/quality-level</property>
         <property>/sim/rendering/shaders/transition</property>
 		<equal>
 			<value type="float">0.0</value>
diff --git a/Effects/herbtundra.eff b/Effects/herbtundra.eff
index fd4c4af67..079f15b8a 100644
--- a/Effects/herbtundra.eff
+++ b/Effects/herbtundra.eff
@@ -70,6 +70,7 @@
   <technique n="9">
     <predicate>
       <and>
+		<property>/sim/rendering/shaders/quality-level</property>
         <property>/sim/rendering/shaders/transition</property>
 		<equal>
 			<value type="float">0.0</value>
diff --git a/Effects/landmass.eff b/Effects/landmass.eff
index f638b613f..2638bb34f 100644
--- a/Effects/landmass.eff
+++ b/Effects/landmass.eff
@@ -48,6 +48,7 @@
 	<technique n="8">
 		<predicate>
 			<and>
+				<property>/sim/rendering/shaders/quality-level</property>
 				<property>/sim/rendering/shaders/landmass</property>
 				<less-equal>
 					<value type="float">4.0</value>
@@ -375,6 +376,7 @@
 	<technique n="9">
 		<predicate>
 			<and>
+				<property>/sim/rendering/shaders/quality-level</property>
 				<property>/sim/rendering/shaders/landmass</property>
 				<equal>
 					<value type="float">0.0</value>
diff --git a/Effects/model-combined.eff b/Effects/model-combined.eff
index 5d82d862a..db5ac8fbb 100644
--- a/Effects/model-combined.eff
+++ b/Effects/model-combined.eff
@@ -766,6 +766,7 @@ please see Docs/README.model-combined.eff for documentation
 	<technique n="9">
 	  <predicate>
 		<and>
+		  <property>/sim/rendering/shaders/quality-level</property>
 		  <property>/sim/rendering/shaders/model</property>
 		  <or>
 			<less-equal>
diff --git a/Effects/model-default.eff b/Effects/model-default.eff
index 25b02fa91..41bfd6994 100644
--- a/Effects/model-default.eff
+++ b/Effects/model-default.eff
@@ -207,6 +207,7 @@
 	<technique n="11">
 		<predicate>
 			<and>
+				<property>/sim/rendering/shaders/quality-level</property>
 				<property>/sim/rendering/shaders/generic</property>
 				<or>
 					<less-equal>
diff --git a/Effects/reflect-bump-spec.eff b/Effects/reflect-bump-spec.eff
index 4ab41666f..dcd751558 100644
--- a/Effects/reflect-bump-spec.eff
+++ b/Effects/reflect-bump-spec.eff
@@ -135,6 +135,7 @@ EXAMPLES: You can find examples of both usages in the Hunter and Lightning model
 	<technique n="9">
 		<predicate>
 			<and>
+				<property>/sim/rendering/shaders/quality-level</property>
 				<property>/sim/rendering/shaders/model</property>
 				<or>
 					<less-equal>
diff --git a/Effects/reflect.eff b/Effects/reflect.eff
index 1681055dc..1f27b5a05 100644
--- a/Effects/reflect.eff
+++ b/Effects/reflect.eff
@@ -114,6 +114,7 @@
 
 		<predicate>
 			<and>
+				<property>/sim/rendering/shaders/quality-level</property>
 				<property>/sim/rendering/shaders/model</property>
 				<or>
 					<less-equal>
diff --git a/Effects/runway.eff b/Effects/runway.eff
index cb5641766..45e65f124 100644
--- a/Effects/runway.eff
+++ b/Effects/runway.eff
@@ -413,6 +413,7 @@
 	<technique n="9">
 		<predicate>
 			<and>
+				<property>/sim/rendering/shaders/quality-level</property>
 				<property>/sim/rendering/shaders/generic</property>
 				<or>
 					<less-equal>
diff --git a/Effects/terrain-default.eff b/Effects/terrain-default.eff
index b9a4a1ab4..f51b1035c 100644
--- a/Effects/terrain-default.eff
+++ b/Effects/terrain-default.eff
@@ -540,6 +540,7 @@
   <technique n="11">
     <predicate>
       <and>
+		<property>/sim/rendering/shaders/quality-level</property>
         <property>/sim/rendering/shaders/generic</property>
         <or>
           <less-equal>
diff --git a/Effects/transition.eff b/Effects/transition.eff
index 43a1e0a96..f235f3e0a 100644
--- a/Effects/transition.eff
+++ b/Effects/transition.eff
@@ -388,6 +388,7 @@ parameters :
 	<technique n="9">
 		<predicate>
 			<and>
+				<property>/sim/rendering/shaders/quality-level</property>
 				<property>/sim/rendering/shaders/transition</property>
 				<equal>
 					<value type="float">0.0</value>
diff --git a/Effects/tree.eff b/Effects/tree.eff
index 9cc038112..3970b7de1 100644
--- a/Effects/tree.eff
+++ b/Effects/tree.eff
@@ -389,6 +389,7 @@
 	<technique n="10">
 		<predicate>
 			<and>
+				<property>/sim/rendering/shaders/quality-level</property>
 				<property>/sim/rendering/random-vegetation</property>
 				<less-equal>
 					<value type="float">1.0</value>
diff --git a/Effects/urban.eff b/Effects/urban.eff
index b2946a74f..05c779b09 100644
--- a/Effects/urban.eff
+++ b/Effects/urban.eff
@@ -934,6 +934,7 @@
 	<technique n="8">
 		<predicate>
 			<and>
+				<property>/sim/rendering/shaders/quality-level</property>
 				<property>/sim/rendering/shaders/urban</property>
 				<less-equal>
 					<value type="float">4.0</value>
@@ -1183,6 +1184,7 @@
 	<technique n="9">
 		<predicate>
 			<and>
+				<property>/sim/rendering/shaders/quality-level</property>
 				<property>/sim/rendering/shaders/urban</property>
 				<less-equal>
 					<value type="float">1.0</value>
diff --git a/Effects/water.eff b/Effects/water.eff
index e2f3e53f8..318a2cb4a 100644
--- a/Effects/water.eff
+++ b/Effects/water.eff
@@ -1637,6 +1637,7 @@
 	<technique n="8">
 		<predicate>
 			<and>
+				<property>/sim/rendering/shaders/quality-level</property>
 				<property>/sim/rendering/shaders/water</property>
 				<less-equal>
 					<value type="float">4.0</value>
@@ -2010,6 +2011,7 @@
 	<technique n="9">
 		<predicate>
 			<and>
+				<property>/sim/rendering/shaders/quality-level</property>
 				<property>/sim/rendering/shaders/water</property>
 				<less-equal>
 					<value type="float">2.0</value>
diff --git a/Nasal/gui.nas b/Nasal/gui.nas
index c4fd177b5..5f9ffc1e6 100644
--- a/Nasal/gui.nas
+++ b/Nasal/gui.nas
@@ -1435,7 +1435,9 @@ var update_shader_settings = func() {
         setprop("/sim/rendering/shaders/crop",qualityLvl);
         setprop("/sim/rendering/shaders/generic",qualityLvl);
         setprop("/sim/rendering/shaders/transition",qualityLvl);
-    }
+    } else {
+		setprop("/sim/rendering/shaders/quality-level",-1);
+	}
 
     if (rembrandtOn) {
 		setprop("/sim/rendering/shaders/skydome",0);