diff --git a/Effects/bumpspec.eff b/Effects/bumpspec.eff
index ad11d1e6c..a74aeb326 100644
--- a/Effects/bumpspec.eff
+++ b/Effects/bumpspec.eff
@@ -59,7 +59,7 @@ in Aircraft/A320/Models/Effects/a320_bumpspec.eff ( or whatever, private to the
         <filter><use>texture[0]/filter</use></filter>
         <wrap-s><use>texture[0]/wrap-s</use></wrap-s>
         <wrap-t><use>texture[0]/wrap-t</use></wrap-t>
-        <internal-format><use>texture[1]/internal-format</use></internal-format>
+        <internal-format><use>texture[0]/internal-format</use></internal-format>
       </texture-unit>
       <texture-unit>
         <unit>1</unit>
@@ -70,8 +70,8 @@ in Aircraft/A320/Models/Effects/a320_bumpspec.eff ( or whatever, private to the
         <internal-format><use>texture[2]/internal-format</use></internal-format>
       </texture-unit>
       <program>
-        <vertex-shader n="0">Shaders/bumpspec.vert</vertex-shader>
-        <fragment-shader n="0">Shaders/bumpspec.frag</fragment-shader>
+        <vertex-shader n="1">Shaders/bumpspec.vert</vertex-shader>
+        <fragment-shader n="1">Shaders/bumpspec.frag</fragment-shader>
         <attribute>
           <name>tangent</name>
           <index>6</index>
diff --git a/Effects/cloud-models.eff b/Effects/cloud-models.eff
index 47c42b55c..c60336161 100644
--- a/Effects/cloud-models.eff
+++ b/Effects/cloud-models.eff
@@ -10,7 +10,7 @@
   <technique n="10">
     <predicate>
       <and>
-        <property>/sim/rendering/shader-effects</property>
+        <property>/sim/rendering/shaders/quality-level</property>
         <or>
           <less-equal>
             <value type="float">2.0</value>
diff --git a/Effects/clouds-box.eff b/Effects/clouds-box.eff
index 2dbb18940..a7483263e 100644
--- a/Effects/clouds-box.eff
+++ b/Effects/clouds-box.eff
@@ -8,7 +8,7 @@
   <technique n="10">
     <predicate>
       <and>
-        <property>/sim/rendering/shader-effects</property>
+        <property>/sim/rendering/shaders/quality-level</property>
         <less-equal>
           <value type="float">1.0</value>
           <shader-language/>
diff --git a/Effects/clouds-layered.eff b/Effects/clouds-layered.eff
index 2d1b0b9c5..b638339c7 100644
--- a/Effects/clouds-layered.eff
+++ b/Effects/clouds-layered.eff
@@ -8,7 +8,7 @@
   <technique n="10">
     <predicate>
       <and>
-        <property>/sim/rendering/shader-effects</property>
+        <property>/sim/rendering/shaders/quality-level</property>
         <less-equal>
           <value type="float">1.0</value>
           <shader-language/>
diff --git a/Effects/clouds-thick.eff b/Effects/clouds-thick.eff
index 52dcbb101..7c5beaf7f 100644
--- a/Effects/clouds-thick.eff
+++ b/Effects/clouds-thick.eff
@@ -8,7 +8,7 @@
   <technique n="10">
     <predicate>
       <and>
-        <property>/sim/rendering/shader-effects</property>
+        <property>/sim/rendering/shaders/quality-level</property>
         <less-equal>
           <value type="float">1.0</value>
           <shader-language/>
diff --git a/Effects/clouds-thin.eff b/Effects/clouds-thin.eff
index 94a5fa172..fae3163a7 100644
--- a/Effects/clouds-thin.eff
+++ b/Effects/clouds-thin.eff
@@ -8,7 +8,7 @@
   <technique n="10">
     <predicate>
       <and>
-        <property>/sim/rendering/shader-effects</property>
+        <property>/sim/rendering/shaders/quality-level</property>
         <less-equal>
           <value type="float">1.0</value>
           <shader-language/>
diff --git a/Effects/clouds-thinlayer.eff b/Effects/clouds-thinlayer.eff
index 8d22f82c5..0bf9158df 100644
--- a/Effects/clouds-thinlayer.eff
+++ b/Effects/clouds-thinlayer.eff
@@ -8,7 +8,7 @@
   <technique n="10">
     <predicate>
       <and>
-        <property>/sim/rendering/shader-effects</property>
+        <property>/sim/rendering/shaders/quality-level</property>
         <less-equal>
           <value type="float">1.0</value>
           <shader-language/>
diff --git a/Effects/crop.eff b/Effects/crop.eff
index 2c616ff06..2bcce657a 100644
--- a/Effects/crop.eff
+++ b/Effects/crop.eff
@@ -16,13 +16,12 @@
         <wrap-s>mirror</wrap-s>
         <internal-format>normalized</internal-format>
     </texture>
-    <snow-level><use>/sim/rendering/snow-level-m</use></snow-level>
+    <snow-level><use>/environment/snow-level-m</use></snow-level>
   </parameters>
   <technique n="9">
     <predicate>
       <and>
-        <property>/sim/rendering/crop-shader</property>
-        <property>/sim/rendering/shader-effects</property>
+        <property>/sim/rendering/shaders/crop</property>
         <or>
           <less-equal>
             <value type="float">2.0</value>
diff --git a/Effects/cropgrass.eff b/Effects/cropgrass.eff
index ee78881ce..7ca55d597 100644
--- a/Effects/cropgrass.eff
+++ b/Effects/cropgrass.eff
@@ -16,6 +16,6 @@
         <wrap-s>mirror</wrap-s>
         <internal-format>normalized</internal-format>
     </texture>
-    <snow-level><use>/sim/rendering/snow-level-m</use></snow-level>
+    <snow-level><use>/environment/snow-level-m</use></snow-level>
   </parameters>
 </PropertyList>
diff --git a/Effects/forest.eff b/Effects/forest.eff
index 438d30dfa..5b806190e 100644
--- a/Effects/forest.eff
+++ b/Effects/forest.eff
@@ -30,10 +30,10 @@
       <wrap-t>repeat</wrap-t>
       <internal-format>normalized</internal-format>
     </texture>
-    <snow-level><use>/sim/rendering/snow-level-m</use></snow-level>
+    <snow-level><use>/environment/snow-level-m</use></snow-level>
     <depth-factor type="float">0.04</depth-factor>
     <canopy-height type="float">15.0</canopy-height>
-    <quality-level><use>/sim/rendering/quality-level</use></quality-level>
+    <quality-level><use>/sim/rendering/shaders/transition</use></quality-level>
     
     <!-- sets the season color -->
     <season-red type="float">0.12</season-red>
@@ -49,8 +49,7 @@
   <technique n="9">
     <predicate>
       <and>
-        <property>/sim/rendering/transition-shader</property>
-        <property>/sim/rendering/shader-effects</property>
+        <property>/sim/rendering/shaders/transition</property>
         <or>
           <less-equal>
             <value type="float">2.0</value>
diff --git a/Effects/glacier.eff b/Effects/glacier.eff
index c5fb1f2db..a8b8c71aa 100644
--- a/Effects/glacier.eff
+++ b/Effects/glacier.eff
@@ -30,10 +30,10 @@
       <wrap-t>repeat</wrap-t>
       <internal-format>normalized</internal-format>
     </texture>
-    <snow-level><use>/sim/rendering/snow-level-m</use></snow-level>
+    <snow-level><use>/environment/snow-level-m</use></snow-level>
     <depth-factor type="float">0.01</depth-factor>
     <canopy-height type="float">15.0</canopy-height>
-    <quality-level><use>/sim/rendering/quality-level</use></quality-level>
+    <quality-level><use>/sim/rendering/shaders/transition</use></quality-level>
     
     <!-- sets the season color -->
     <season-red type="float">0.12</season-red>
@@ -49,8 +49,7 @@
   <technique n="9">
     <predicate>
       <and>
-        <property>/sim/rendering/transition-shader</property>
-        <property>/sim/rendering/shader-effects</property>
+        <property>/sim/rendering/shaders/transition</property>
         <or>
           <less-equal>
             <value type="float">2.0</value>
diff --git a/Effects/herbtundra.eff b/Effects/herbtundra.eff
index 6b819d16e..3e2eae61a 100644
--- a/Effects/herbtundra.eff
+++ b/Effects/herbtundra.eff
@@ -30,7 +30,7 @@
       <wrap-t>repeat</wrap-t>
       <internal-format>normalized</internal-format>
     </texture>
-    <snow-level><use>/sim/rendering/snow-level-m</use></snow-level>
+    <snow-level><use>/environment/snow-level-m</use></snow-level>
     <depth-factor type="float">0.01</depth-factor>
     <canopy-height type="float">15.0</canopy-height>
     
@@ -40,7 +40,7 @@
     <season-blue type="float">0.22</season-blue>
     <!-- end season color -->
     
-    <quality-level><use>/sim/rendering/quality-level</use></quality-level>
+    <quality-level><use>/sim/rendering/shaders/transition</use></quality-level>
   </parameters>
   <generate>
     <tangent type="int">6</tangent>
@@ -49,8 +49,7 @@
   <technique n="9">
     <predicate>
       <and>
-        <property>/sim/rendering/transition-shader</property>
-        <property>/sim/rendering/shader-effects</property>
+        <property>/sim/rendering/shaders/transition</property>
         <or>
           <less-equal>
             <value type="float">2.0</value>
diff --git a/Effects/terrain-default.eff b/Effects/terrain-default.eff
index fa48f7a4e..484d1cba2 100644
--- a/Effects/terrain-default.eff
+++ b/Effects/terrain-default.eff
@@ -35,6 +35,24 @@
       <bin-number>0</bin-number>
       <bin-name>RenderBin</bin-name>
     </render-bin>
+		<visibility>
+			<use>/environment/ground-visibility-m</use>
+		</visibility>
+		<avisibility>
+			<use>/environment/visibility-m</use>
+		</avisibility>
+		<lthickness>
+			<use>/environment/ground-haze-thickness-m</use>
+		</lthickness>
+		<scattering>
+			<use>/rendering/scene/scattering</use>
+		</scattering>
+		<terminator>
+			<use>/environment/terminator-relative-position-m</use>
+		</terminator>
+		<fogtype>
+			<use>/sim/rendering/scattering-shader</use>
+		</fogtype>
   </parameters>
   <!-- put techniques at a "high" index to allow derived effects to
        insert their own techniques first. -->
@@ -85,6 +103,7 @@
           </internal-format>
       </texture-unit>
       <program>
+				<vertex-shader>Shaders/include_fog.vert</vertex-shader>
         <vertex-shader>Shaders/default.vert</vertex-shader>
         <fragment-shader>Shaders/terrain-nocolor.frag</fragment-shader>
       </program>
@@ -124,9 +143,53 @@
           </internal-format>
       </texture-unit>
       <program>
+				<vertex-shader>Shaders/include_fog.vert</vertex-shader>
         <vertex-shader>Shaders/default.vert</vertex-shader>
         <fragment-shader>Shaders/default.frag</fragment-shader>
+				<fragment-shader>Shaders/include_fog.frag</fragment-shader>
       </program>
+			<uniform>
+				<name>visibility</name>
+				<type>float</type>
+				<value>
+					<use>visibility</use>
+				</value>
+			</uniform>
+			<uniform>
+				<name>avisibility</name>
+				<type>float</type>
+				<value>
+					<use>avisibility</use>
+				</value>
+			</uniform>
+			<uniform>
+				<name>hazeLayerAltitude</name>
+				<type>float</type>
+				<value>
+					<use>lthickness</use>
+				</value>
+			</uniform>
+			<uniform>
+				<name>scattering</name>
+				<type>float</type>
+				<value>
+					<use>scattering</use>
+				</value>
+			</uniform>
+			<uniform>
+				<name>terminator</name>
+				<type>float</type>
+				<value>
+					<use>terminator</use>
+				</value>
+			</uniform>
+			<uniform>
+				<name>fogType</name>
+				<type>int</type>
+				<value>
+					<use>fogtype</use>
+        </value>
+      </uniform>
       <uniform>
         <name>texture</name>
         <type>sampler-2d</type>
diff --git a/Effects/test.eff b/Effects/test.eff
index c5b4e8435..b6d87eeb3 100644
--- a/Effects/test.eff
+++ b/Effects/test.eff
@@ -1,62 +1,72 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PropertyList>
-  <name>Effects/test</name>
-  <parameters>
-    <texture n ="0">
-    </texture>
-  </parameters>
-  <technique n="10">
-    <predicate>
-      <and>
-        <property>/sim/rendering/shader-effects</property>
-        <less-equal>
-          <value type="float">1.0</value>
-          <shader-language/>
-        </less-equal>
-      </and>
-    </predicate>
-    <pass n="0">
-      <!-- This is apparently not used, so maybe we'll blow it way soon. -->
-      <lighting>true</lighting>
-      <material>
-        <ambient type="vec4d">0.5 0.5 0.5 1.0</ambient>
-        <diffuse type="vec4d">0.5 0.5 0.5 1.0</diffuse>
-        <color-mode>off</color-mode>
-      </material>
-      <alpha-test>
-        <comparison>greater</comparison>
-        <reference type="float">0.01</reference>
-      </alpha-test>
-      <shade-model>smooth</shade-model>
-      <blend>
-        <source>src-alpha</source>
-        <destination>one-minus-src-alpha</destination>
-      </blend>
-      <depth>
-        <write-mask>false</write-mask>
-      </depth>
-      <render-bin>
-        <bin-number>10</bin-number>
-        <bin-name>DepthSortedBin</bin-name>
-      </render-bin>
-      <texture-unit>
-        <unit>0</unit>
-	<type><use>texture[0]/type</use></type>
-        <image><use>texture[0]/image</use></image>
-        <filter><use>texture[0]/filter</use></filter>
-        <wrap-s><use>texture[0]/wrap-s</use></wrap-s>
-        <wrap-t><use>texture[0]/wrap-t</use></wrap-t>
-        <!--<wrap-s>clamp</wrap-s>
+	<name>Effects/test</name>
+	<parameters>
+		<texture n ="0">
+		</texture>
+	</parameters>
+	<technique n="10">
+		<predicate>
+			<and>
+				<property>/sim/rendering/shader-effects</property>
+				<less-equal>
+					<value type="float">1.0</value>
+					<shader-language/>
+				</less-equal>
+			</and>
+		</predicate>
+		<pass n="0">
+			<!-- This is apparently not used, so maybe we'll blow it way soon. -->
+			<lighting>true</lighting>
+			<material>
+				<ambient type="vec4d">0.5 0.5 0.5 1.0</ambient>
+				<diffuse type="vec4d">0.5 0.5 0.5 1.0</diffuse>
+				<color-mode>off</color-mode>
+			</material>
+			<alpha-test>
+				<comparison>greater</comparison>
+				<reference type="float">0.01</reference>
+			</alpha-test>
+			<shade-model>smooth</shade-model>
+			<blend>
+				<source>src-alpha</source>
+				<destination>one-minus-src-alpha</destination>
+			</blend>
+			<depth>
+				<write-mask>false</write-mask>
+			</depth>
+			<render-bin>
+				<bin-number>10</bin-number>
+				<bin-name>DepthSortedBin</bin-name>
+			</render-bin>
+			<texture-unit>
+				<unit>0</unit>
+				<type>
+					<use>texture[0]/type</use>
+				</type>
+				<image>
+					<use>texture[0]/image</use>
+				</image>
+				<filter>
+					<use>texture[0]/filter</use>
+				</filter>
+				<wrap-s>
+					<use>texture[0]/wrap-s</use>
+				</wrap-s>
+				<wrap-t>
+					<use>texture[0]/wrap-t</use>
+				</wrap-t>
+				<!--<wrap-s>clamp</wrap-s>
         <wrap-t>clamp</wrap-t>-->
-      </texture-unit>
-      <!--<attribute>
+			</texture-unit>
+			<!--<attribute>
         <mypars type="vec3">0 0 0</mypars>
         <value type="int">10</value>
       </attribute>-->
-      <program>
-        <vertex-shader>Shaders/test.vert</vertex-shader>
-        <fragment-shader>Shaders/test.frag</fragment-shader>
-         <!--<attribute>
+			<program>
+				<vertex-shader>Shaders/test.vert</vertex-shader>
+				<fragment-shader>Shaders/test.frag</fragment-shader>
+				<!--<attribute>
           <name>usrAttr3</name>
           <index>10</index>
         </attribute>
@@ -64,18 +74,18 @@
           <name>usrAttr4</name>
           <index>11</index>
         </attribute>-->
-      </program>
-      <uniform>
-        <name>baseTexture</name>
-        <type>sampler-2d</type>
-        <value type="int">0</value>
-      </uniform>
-      <uniform>
-        <name>shading</name>
-        <type>float</type>
-        <value type="float">0.5</value>
-      </uniform>
-      <vertex-program-two-side>true</vertex-program-two-side>
-    </pass>
-  </technique>
+			</program>
+			<uniform>
+				<name>baseTexture</name>
+				<type>sampler-2d</type>
+				<value type="int">0</value>
+			</uniform>
+			<uniform>
+				<name>shading</name>
+				<type>float</type>
+				<value type="float">0.5</value>
+			</uniform>
+			<vertex-program-two-side>true</vertex-program-two-side>
+		</pass>
+	</technique>
 </PropertyList>
diff --git a/Effects/water-inland.eff b/Effects/water-inland.eff
index 59f66f1e7..999c90dca 100644
--- a/Effects/water-inland.eff
+++ b/Effects/water-inland.eff
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PropertyList>
-	<name>Effects/water-inland</name>
+	<name>Effects/water</name>
 	<inherits-from>Effects/terrain-default</inherits-from>
 	<parameters>
 		<texture n="0">
@@ -49,6 +49,26 @@
 		<cloud-cover4>
 			<use>/environment/clouds/layer[4]/coverage-type</use>
 		</cloud-cover4>
+		<!-- 	fog include -->
+		<visibility>
+			<use>/environment/ground-visibility-m</use>
+		</visibility>
+		<avisibility>
+			<use>/environment/visibility-m</use>
+		</avisibility>
+		<lthickness>
+			<use>/environment/ground-haze-thickness-m</use>
+		</lthickness>
+		<scattering>
+			<use>/rendering/scene/scattering</use>
+		</scattering>
+		<terminator>
+			<use>/environment/terminator-relative-position-m</use>
+		</terminator>
+		<fogtype>
+			<use>/sim/rendering/scattering-shader</use>
+		</fogtype>
+		<!-- 	END fog include -->
 	</parameters>
 	<technique n="8">
 		<predicate>
@@ -176,6 +196,7 @@
 				</internal-format>
 			</texture-unit>
 			<program>
+				<vertex-shader>Shaders/include_fog.vert</vertex-shader>
 				<vertex-shader>Shaders/water.vert</vertex-shader>
 				<fragment-shader>Shaders/water-inland.frag</fragment-shader>
 			</program>
@@ -240,6 +261,50 @@
 					<use>cloud-cover4</use>
 				</value>
 			</uniform>
+			<!-- 	    BEGIN fog include -->
+			<uniform>
+				<name>visibility</name>
+				<type>float</type>
+				<value>
+					<use>visibility</use>
+				</value>
+			</uniform>
+			<uniform>
+				<name>avisibility</name>
+				<type>float</type>
+				<value>
+					<use>avisibility</use>
+				</value>
+			</uniform>
+			<uniform>
+				<name>hazeLayerAltitude</name>
+				<type>float</type>
+				<value>
+					<use>lthickness</use>
+				</value>
+			</uniform>
+			<uniform>
+				<name>scattering</name>
+				<type>float</type>
+				<value>
+					<use>scattering</use>
+				</value>
+			</uniform>
+			<uniform>
+				<name>terminator</name>
+				<type>float</type>
+				<value>
+					<use>terminator</use>
+				</value>
+			</uniform>
+			<uniform>
+				<name>fogType</name>
+				<type>int</type>
+				<value>
+					<use>fogtype</use>
+				</value>
+			</uniform>
+			<!-- 			END fog include -->
 		</pass>
 	</technique>
 	<technique n="9">