diff --git a/Aircraft/c172p/Models/Effects/interior/c172p-interior-radiance.eff b/Aircraft/c172p/Models/Effects/interior/c172p-interior-radiance.eff
index db416d4cc..c64e0732c 100644
--- a/Aircraft/c172p/Models/Effects/interior/c172p-interior-radiance.eff
+++ b/Aircraft/c172p/Models/Effects/interior/c172p-interior-radiance.eff
@@ -20,10 +20,10 @@
         <light-radius type="float">13</light-radius>
         <irradiance-map-type type="int">2</irradiance-map-type>
         <irradiance-map-strength type="float">.2</irradiance-map-strength>
-        <!--residual-ambience-r type="float"><use>/sim/model/c172p/lighting/rgb-ra-r-factor</use></residual-ambience-r>
+        <residual-ambience-r type="float"><use>/sim/model/c172p/lighting/rgb-ra-r-factor</use></residual-ambience-r>
         <residual-ambience-g type="float"><use>/sim/model/c172p/lighting/rgb-ra-g-factor</use></residual-ambience-g>
         <residual-ambience-b type="float"><use>/sim/model/c172p/lighting/rgb-ra-b-factor</use></residual-ambience-b>
         <ra-irradiance-map-type type="int">0</ra-irradiance-map-type>
-        <ra-irradiance-map-strength type="float">1</ra-irradiance-map-strength-->
+        <ra-irradiance-map-strength type="float">1</ra-irradiance-map-strength>
     </parameters>
 </PropertyList>
diff --git a/Aircraft/c172p/Models/Effects/interior/c172p-interior.eff b/Aircraft/c172p/Models/Effects/interior/c172p-interior.eff
index 7243f05a3..3fd235d2c 100644
--- a/Aircraft/c172p/Models/Effects/interior/c172p-interior.eff
+++ b/Aircraft/c172p/Models/Effects/interior/c172p-interior.eff
@@ -23,10 +23,10 @@
         <light-radius type="float">13</light-radius>
         <irradiance-map-type type="int">2</irradiance-map-type>
         <irradiance-map-strength type="float">.2</irradiance-map-strength>
-        <!--residual-ambience-r type="float"><use>/sim/model/c172p/lighting/rgb-ra-r-factor</use></residual-ambience-r>
+        <residual-ambience-r type="float"><use>/sim/model/c172p/lighting/rgb-ra-r-factor</use></residual-ambience-r>
         <residual-ambience-g type="float"><use>/sim/model/c172p/lighting/rgb-ra-g-factor</use></residual-ambience-g>
         <residual-ambience-b type="float"><use>/sim/model/c172p/lighting/rgb-ra-b-factor</use></residual-ambience-b>
         <ra-irradiance-map-type type="int">0</ra-irradiance-map-type>
-        <ra-irradiance-map-strength type="float">1</ra-irradiance-map-strength-->
+        <ra-irradiance-map-strength type="float">1</ra-irradiance-map-strength>
     </parameters>
 </PropertyList>
diff --git a/Aircraft/c172p/Models/Effects/pontoon/pontoon.xml b/Aircraft/c172p/Models/Effects/pontoon/pontoon.xml
index 48648d7e2..faf650f48 100644
--- a/Aircraft/c172p/Models/Effects/pontoon/pontoon.xml
+++ b/Aircraft/c172p/Models/Effects/pontoon/pontoon.xml
@@ -47,6 +47,28 @@
         <object-name>FloatReinforceJoin</object-name>
     </effect>
 
+    <animation>
+        <type>material</type>
+        <object-name>FloatReinforceLeft</object-name>
+        <object-name>FloatReinforceRight</object-name>
+        <object-name>FloatReinforceJoin</object-name>
+        <object-name>RudderCatch</object-name>
+        <object-name>RudderHandle</object-name>
+        <object-name>RudderScrews</object-name>
+        <object-name>RudderTube</object-name>
+        <object-name>RudderCable</object-name>
+        <condition>
+            <not>
+                <property>/sim/rendering/shaders/skydome</property>
+            </not>
+        </condition>
+        <emission>
+            <red-prop>/sim/model/c172p/lighting/rgb-ra-r-factor</red-prop>
+            <green-prop>/sim/model/c172p/lighting/rgb-ra-g-factor</green-prop>
+            <blue-prop>/sim/model/c172p/lighting/rgb-ra-b-factor</blue-prop>
+        </emission>
+    </animation>
+
     <!-- Specularity fix -->
     <animation>
         <type>material</type>
diff --git a/Aircraft/c172p/Models/Interior/Baggages/suitcase1.xml b/Aircraft/c172p/Models/Interior/Baggages/suitcase1.xml
index accc445b5..f413e00f6 100644
--- a/Aircraft/c172p/Models/Interior/Baggages/suitcase1.xml
+++ b/Aircraft/c172p/Models/Interior/Baggages/suitcase1.xml
@@ -7,7 +7,22 @@
         <inherits-from>../../Effects/interior/c172p-interior</inherits-from>
         <object-name>suitcase1</object-name>
     </effect>
-    
+
+    <animation>
+        <type>material</type>
+        <object-name>suitcase1</object-name>
+        <condition>
+            <not>
+                <property>/sim/rendering/shaders/skydome</property>
+            </not>
+        </condition>
+        <emission>
+            <red-prop>/sim/model/c172p/lighting/rgb-ra-r-factor</red-prop>
+            <green-prop>/sim/model/c172p/lighting/rgb-ra-g-factor</green-prop>
+            <blue-prop>/sim/model/c172p/lighting/rgb-ra-b-factor</blue-prop>
+        </emission>
+    </animation>
+
     <animation>
         <object-name>suitcase1</object-name>
     </animation>
diff --git a/Aircraft/c172p/Models/Interior/Baggages/suitcase2.xml b/Aircraft/c172p/Models/Interior/Baggages/suitcase2.xml
index eafea739a..b48a895af 100644
--- a/Aircraft/c172p/Models/Interior/Baggages/suitcase2.xml
+++ b/Aircraft/c172p/Models/Interior/Baggages/suitcase2.xml
@@ -7,7 +7,22 @@
         <inherits-from>../../Effects/interior/c172p-interior</inherits-from>
         <object-name>suitcase2</object-name>
     </effect>
-    
+
+    <animation>
+        <type>material</type>
+        <object-name>suitcase2</object-name>
+        <condition>
+            <not>
+                <property>/sim/rendering/shaders/skydome</property>
+            </not>
+        </condition>
+        <emission>
+            <red-prop>/sim/model/c172p/lighting/rgb-ra-r-factor</red-prop>
+            <green-prop>/sim/model/c172p/lighting/rgb-ra-g-factor</green-prop>
+            <blue-prop>/sim/model/c172p/lighting/rgb-ra-b-factor</blue-prop>
+        </emission>
+    </animation>
+
     <animation>
         <object-name>suitcase2</object-name>
     </animation>
diff --git a/Aircraft/c172p/Models/Interior/FE-ELT/elt.xml b/Aircraft/c172p/Models/Interior/FE-ELT/elt.xml
index 73506e301..dfc5d2644 100644
--- a/Aircraft/c172p/Models/Interior/FE-ELT/elt.xml
+++ b/Aircraft/c172p/Models/Interior/FE-ELT/elt.xml
@@ -8,6 +8,21 @@
         <object-name>elt</object-name>
     </effect>
 
+    <animation>
+        <type>material</type>
+        <object-name>elt</object-name>
+        <condition>
+            <not>
+                <property>/sim/rendering/shaders/skydome</property>
+            </not>
+        </condition>
+        <emission>
+            <red-prop>/sim/model/c172p/lighting/rgb-ra-r-factor</red-prop>
+            <green-prop>/sim/model/c172p/lighting/rgb-ra-g-factor</green-prop>
+            <blue-prop>/sim/model/c172p/lighting/rgb-ra-b-factor</blue-prop>
+        </emission>
+    </animation>
+
     <animation>
         <object-name>elt</object-name>
     </animation>
diff --git a/Aircraft/c172p/Models/Interior/FE-ELT/fe.xml b/Aircraft/c172p/Models/Interior/FE-ELT/fe.xml
index 896772bee..f0c4141fc 100644
--- a/Aircraft/c172p/Models/Interior/FE-ELT/fe.xml
+++ b/Aircraft/c172p/Models/Interior/FE-ELT/fe.xml
@@ -8,6 +8,21 @@
         <object-name>extinguisher</object-name>
     </effect>
 
+    <animation>
+        <type>material</type>
+        <object-name>extinguisher</object-name>
+        <condition>
+            <not>
+                <property>/sim/rendering/shaders/skydome</property>
+            </not>
+        </condition>
+        <emission>
+            <red-prop>/sim/model/c172p/lighting/rgb-ra-r-factor</red-prop>
+            <green-prop>/sim/model/c172p/lighting/rgb-ra-g-factor</green-prop>
+            <blue-prop>/sim/model/c172p/lighting/rgb-ra-b-factor</blue-prop>
+        </emission>
+    </animation>
+
     <animation>
         <object-name>extinguisher</object-name>
     </animation>
diff --git a/Aircraft/c172p/Models/Interior/FE-ELT/fe2.xml b/Aircraft/c172p/Models/Interior/FE-ELT/fe2.xml
index a573f45c9..4fbec6deb 100644
--- a/Aircraft/c172p/Models/Interior/FE-ELT/fe2.xml
+++ b/Aircraft/c172p/Models/Interior/FE-ELT/fe2.xml
@@ -9,4 +9,19 @@
         <object-name>extinguisher</object-name>
     </effect>
 
+    <animation>
+        <type>material</type>
+        <object-name>extinguisher</object-name>
+        <condition>
+            <not>
+                <property>/sim/rendering/shaders/skydome</property>
+            </not>
+        </condition>
+        <emission>
+            <red-prop>/sim/model/c172p/lighting/rgb-ra-r-factor</red-prop>
+            <green-prop>/sim/model/c172p/lighting/rgb-ra-g-factor</green-prop>
+            <blue-prop>/sim/model/c172p/lighting/rgb-ra-b-factor</blue-prop>
+        </emission>
+    </animation>
+
 </PropertyList>
diff --git a/Aircraft/c172p/Models/Interior/Panel/Flaps/flaps.xml b/Aircraft/c172p/Models/Interior/Panel/Flaps/flaps.xml
index 5de31d7cc..444f064b3 100644
--- a/Aircraft/c172p/Models/Interior/Panel/Flaps/flaps.xml
+++ b/Aircraft/c172p/Models/Interior/Panel/Flaps/flaps.xml
@@ -140,4 +140,21 @@
         </interpolation>
     </animation>
 
+    <animation>
+        <type>material</type>
+        <object-name>FlapSwitch</object-name>
+        <object-name>FlapPos</object-name>
+        <object-name>rect</object-name>
+        <condition>
+            <not>
+                <property>/sim/rendering/shaders/skydome</property>
+            </not>
+        </condition>
+        <emission>
+            <red-prop>/sim/model/c172p/lighting/rgb-ra-r-factor</red-prop>
+            <green-prop>/sim/model/c172p/lighting/rgb-ra-g-factor</green-prop>
+            <blue-prop>/sim/model/c172p/lighting/rgb-ra-b-factor</blue-prop>
+        </emission>
+    </animation>
+
 </PropertyList>
diff --git a/Aircraft/c172p/Models/Interior/Panel/Instruments/AI/AI.xml b/Aircraft/c172p/Models/Interior/Panel/Instruments/AI/AI.xml
index e28b74b72..66750b3e5 100644
--- a/Aircraft/c172p/Models/Interior/Panel/Instruments/AI/AI.xml
+++ b/Aircraft/c172p/Models/Interior/Panel/Instruments/AI/AI.xml
@@ -31,11 +31,27 @@
                 <property>/sim/rendering/shaders/skydome</property>
             </not>
         </condition>
+       <emission>
+            <red-prop>/sim/model/material/instruments/default-red-combined-factor</red-prop>
+            <green-prop>/sim/model/material/instruments/default-green-combined-factor</green-prop>
+            <blue-prop>/sim/model/material/instruments/default-blue-combined-factor</blue-prop>
+        </emission>
+    </animation>
+
+    <animation>
+        <type>material</type>
+        <object-name>AdjustKnob</object-name>
+        <object-name>Bezel</object-name>
+        <object-name>Bracket</object-name>
+        <condition>
+            <not>
+                <property>/sim/rendering/shaders/skydome</property>
+            </not>
+        </condition>
         <emission>
-            <red>  1.0</red>
-            <green>0.8</green>
-            <blue> 0.5</blue>
-            <factor-prop>/sim/model/material/instruments/integral-factor</factor-prop>
+            <red-prop>/sim/model/c172p/lighting/rgb-ra-r-factor</red-prop>
+            <green-prop>/sim/model/c172p/lighting/rgb-ra-g-factor</green-prop>
+            <blue-prop>/sim/model/c172p/lighting/rgb-ra-b-factor</blue-prop>
         </emission>
     </animation>
 
diff --git a/Aircraft/c172p/Models/Interior/Panel/Instruments/BatteryGauge/BatteryGauge.xml b/Aircraft/c172p/Models/Interior/Panel/Instruments/BatteryGauge/BatteryGauge.xml
index 5eefa9493..b2bbe3ed9 100644
--- a/Aircraft/c172p/Models/Interior/Panel/Instruments/BatteryGauge/BatteryGauge.xml
+++ b/Aircraft/c172p/Models/Interior/Panel/Instruments/BatteryGauge/BatteryGauge.xml
@@ -20,6 +20,7 @@
         <type>material</type>
         <object-name>Face</object-name>
         <object-name>PtrTip</object-name>
+        <object-name>Ptr</object-name>
         <object-name>Case</object-name>
         <condition>
             <not>
@@ -27,10 +28,9 @@
             </not>
         </condition>
         <emission>
-            <red>  1.0</red>
-            <green>0.8</green>
-            <blue> 0.5</blue>
-            <factor-prop>/sim/model/material/instruments/integral-factor</factor-prop>
+            <red-prop>/sim/model/material/instruments/default-red-combined-factor</red-prop>
+            <green-prop>/sim/model/material/instruments/default-green-combined-factor</green-prop>
+            <blue-prop>/sim/model/material/instruments/default-blue-combined-factor</blue-prop>
         </emission>
     </animation>
 
diff --git a/Aircraft/c172p/Models/Interior/Panel/Instruments/EGT/EGT.xml b/Aircraft/c172p/Models/Interior/Panel/Instruments/EGT/EGT.xml
index ca7dea449..6590324b9 100644
--- a/Aircraft/c172p/Models/Interior/Panel/Instruments/EGT/EGT.xml
+++ b/Aircraft/c172p/Models/Interior/Panel/Instruments/EGT/EGT.xml
@@ -44,6 +44,7 @@
         <type>material</type>
         <object-name>Needle</object-name>
         <object-name>Bug</object-name>
+        <object-name>Knob</object-name>
         <object-name>Face</object-name>
         <object-name>Case</object-name>
         <condition>
@@ -52,10 +53,24 @@
             </not>
         </condition>
         <emission>
-            <red>  1.0</red>
-            <green>0.8</green>
-            <blue> 0.5</blue>
-            <factor-prop>/sim/model/material/instruments/integral-factor</factor-prop>
+            <red-prop>/sim/model/material/instruments/default-red-combined-factor</red-prop>
+            <green-prop>/sim/model/material/instruments/default-green-combined-factor</green-prop>
+            <blue-prop>/sim/model/material/instruments/default-blue-combined-factor</blue-prop>
+        </emission>
+    </animation>
+
+    <animation>
+        <type>material</type>
+        <object-name>Front</object-name>
+        <condition>
+            <not>
+                <property>/sim/rendering/shaders/skydome</property>
+            </not>
+        </condition>
+        <emission>
+            <red-prop>/sim/model/c172p/lighting/rgb-ra-r-factor</red-prop>
+            <green-prop>/sim/model/c172p/lighting/rgb-ra-g-factor</green-prop>
+            <blue-prop>/sim/model/c172p/lighting/rgb-ra-b-factor</blue-prop>
         </emission>
     </animation>
 
diff --git a/Aircraft/c172p/Models/Interior/Panel/Instruments/FuelOilAmps/c172fuel.xml b/Aircraft/c172p/Models/Interior/Panel/Instruments/FuelOilAmps/c172fuel.xml
index 632b4f89c..e3eb27f17 100644
--- a/Aircraft/c172p/Models/Interior/Panel/Instruments/FuelOilAmps/c172fuel.xml
+++ b/Aircraft/c172p/Models/Interior/Panel/Instruments/FuelOilAmps/c172fuel.xml
@@ -28,10 +28,9 @@
             </not>
         </condition>
         <emission>
-            <red>  1.0</red>
-            <green>0.8</green>
-            <blue> 0.5</blue>
-            <factor-prop>/sim/model/material/instruments/integral-factor</factor-prop>
+            <red-prop>/sim/model/material/instruments/default-red-combined-factor</red-prop>
+            <green-prop>/sim/model/material/instruments/default-green-combined-factor</green-prop>
+            <blue-prop>/sim/model/material/instruments/default-blue-combined-factor</blue-prop>
         </emission>
     </animation>
 
diff --git a/Aircraft/c172p/Models/Interior/Panel/Instruments/FuelOilAmps/c172oil.xml b/Aircraft/c172p/Models/Interior/Panel/Instruments/FuelOilAmps/c172oil.xml
index 711adde77..7e359d023 100644
--- a/Aircraft/c172p/Models/Interior/Panel/Instruments/FuelOilAmps/c172oil.xml
+++ b/Aircraft/c172p/Models/Interior/Panel/Instruments/FuelOilAmps/c172oil.xml
@@ -22,6 +22,26 @@
         <object-name>OilTempNeedle</object-name>
         <object-name>OilPressNeedle</object-name>
         <object-name>Case</object-name>
+        <condition>
+            <not>
+                <property>/sim/rendering/shaders/skydome</property>
+            </not>
+        </condition>
+        <emission>
+            <red-prop>/sim/model/material/instruments/default-red-combined-factor</red-prop>
+            <green-prop>/sim/model/material/instruments/default-green-combined-factor</green-prop>
+            <blue-prop>/sim/model/material/instruments/default-blue-combined-factor</blue-prop>
+        </emission>
+    </animation>
+    <animation>
+        <type>material</type>
+        <object-name>Face</object-name>
+        <object-name>OilTempNeedle</object-name>
+        <object-name>OilPressNeedle</object-name>
+        <object-name>Case</object-name>
+        <condition>
+            <property>/sim/rendering/shaders/skydome</property>
+        </condition>
         <emission>
             <red>  1.0</red>
             <green>0.8</green>
diff --git a/Aircraft/c172p/Models/Interior/Panel/Instruments/RPM/RPM.xml b/Aircraft/c172p/Models/Interior/Panel/Instruments/RPM/RPM.xml
index 39f34c302..693a1b139 100644
--- a/Aircraft/c172p/Models/Interior/Panel/Instruments/RPM/RPM.xml
+++ b/Aircraft/c172p/Models/Interior/Panel/Instruments/RPM/RPM.xml
@@ -27,6 +27,26 @@
         <object-name>Face</object-name>
         <object-name>PointerTip</object-name>
         <object-name>Case</object-name>
+        <object-name>PointerCentre</object-name>
+        <condition>
+            <not>
+                <property>/sim/rendering/shaders/skydome</property>
+            </not>
+        </condition>
+        <emission>
+            <red-prop>/sim/model/material/instruments/default-red-combined-factor</red-prop>
+            <green-prop>/sim/model/material/instruments/default-green-combined-factor</green-prop>
+            <blue-prop>/sim/model/material/instruments/default-blue-combined-factor</blue-prop>
+        </emission>
+    </animation>
+    <animation>
+        <type>material</type>
+        <object-name>Face</object-name>
+        <object-name>PointerTip</object-name>
+        <object-name>Case</object-name>
+        <condition>
+            <property>/sim/rendering/shaders/skydome</property>
+        </condition>
         <emission>
             <red>  1.0</red>
             <green>0.8</green>
diff --git a/Aircraft/c172p/Models/Interior/Panel/Instruments/VSI/VSI.xml b/Aircraft/c172p/Models/Interior/Panel/Instruments/VSI/VSI.xml
index d3de9009d..cbca7d3bf 100644
--- a/Aircraft/c172p/Models/Interior/Panel/Instruments/VSI/VSI.xml
+++ b/Aircraft/c172p/Models/Interior/Panel/Instruments/VSI/VSI.xml
@@ -28,10 +28,9 @@
             </not>
         </condition>
         <emission>
-            <red>  1.0</red>
-            <green>0.8</green>
-            <blue> 0.5</blue>
-            <factor-prop>/sim/model/material/instruments/integral-factor</factor-prop>
+            <red-prop>/sim/model/material/instruments/default-red-combined-factor</red-prop>
+            <green-prop>/sim/model/material/instruments/default-green-combined-factor</green-prop>
+            <blue-prop>/sim/model/material/instruments/default-blue-combined-factor</blue-prop>
         </emission>
     </animation>
 
diff --git a/Aircraft/c172p/Models/Interior/Panel/Instruments/alt/alt.xml b/Aircraft/c172p/Models/Interior/Panel/Instruments/alt/alt.xml
index b949a86df..3b646d744 100644
--- a/Aircraft/c172p/Models/Interior/Panel/Instruments/alt/alt.xml
+++ b/Aircraft/c172p/Models/Interior/Panel/Instruments/alt/alt.xml
@@ -33,10 +33,24 @@
             </not>
         </condition>
         <emission>
-            <red>  1.0</red>
-            <green>0.8</green>
-            <blue> 0.5</blue>
-            <factor-prop>/sim/model/material/instruments/integral-factor</factor-prop>
+            <red-prop>/sim/model/material/instruments/default-red-combined-factor</red-prop>
+            <green-prop>/sim/model/material/instruments/default-green-combined-factor</green-prop>
+            <blue-prop>/sim/model/material/instruments/default-blue-combined-factor</blue-prop>
+        </emission>
+    </animation>
+
+    <animation>
+        <type>material</type>
+        <object-name>disk</object-name>
+        <condition>
+            <not>
+                <property>/sim/rendering/shaders/skydome</property>
+            </not>
+        </condition>
+        <emission>
+            <red-prop>/sim/model/c172p/lighting/rgb-ra-r-factor</red-prop>
+            <green-prop>/sim/model/c172p/lighting/rgb-ra-g-factor</green-prop>
+            <blue-prop>/sim/model/c172p/lighting/rgb-ra-b-factor</blue-prop>
         </emission>
     </animation>
 
diff --git a/Aircraft/c172p/Models/Interior/Panel/Instruments/asi/asi.xml b/Aircraft/c172p/Models/Interior/Panel/Instruments/asi/asi.xml
index 271e33242..68d661277 100644
--- a/Aircraft/c172p/Models/Interior/Panel/Instruments/asi/asi.xml
+++ b/Aircraft/c172p/Models/Interior/Panel/Instruments/asi/asi.xml
@@ -27,10 +27,9 @@
             </not>
         </condition>
         <emission>
-            <red>  1.0</red>
-            <green>0.8</green>
-            <blue> 0.5</blue>
-            <factor-prop>/sim/model/material/instruments/integral-factor</factor-prop>
+            <red-prop>/sim/model/material/instruments/default-red-combined-factor</red-prop>
+            <green-prop>/sim/model/material/instruments/default-green-combined-factor</green-prop>
+            <blue-prop>/sim/model/material/instruments/default-blue-combined-factor</blue-prop>
         </emission>
     </animation>
 
diff --git a/Aircraft/c172p/Models/Interior/Panel/Instruments/clock/clock.xml b/Aircraft/c172p/Models/Interior/Panel/Instruments/clock/clock.xml
index 087f1d694..e21de5f95 100644
--- a/Aircraft/c172p/Models/Interior/Panel/Instruments/clock/clock.xml
+++ b/Aircraft/c172p/Models/Interior/Panel/Instruments/clock/clock.xml
@@ -30,10 +30,9 @@
             </not>
         </condition>
         <emission>
-            <red>  1.0</red>
-            <green>0.8</green>
-            <blue> 0.5</blue>
-            <factor-prop>/sim/model/material/instruments/integral-factor</factor-prop>
+            <red-prop>/sim/model/material/instruments/default-red-combined-factor</red-prop>
+            <green-prop>/sim/model/material/instruments/default-green-combined-factor</green-prop>
+            <blue-prop>/sim/model/material/instruments/default-blue-combined-factor</blue-prop>
         </emission>
     </animation>
 
diff --git a/Aircraft/c172p/Models/Interior/Panel/Instruments/digital-clock/digital-clock.xml b/Aircraft/c172p/Models/Interior/Panel/Instruments/digital-clock/digital-clock.xml
index 73fa20ef5..7bfb4d2af 100644
--- a/Aircraft/c172p/Models/Interior/Panel/Instruments/digital-clock/digital-clock.xml
+++ b/Aircraft/c172p/Models/Interior/Panel/Instruments/digital-clock/digital-clock.xml
@@ -30,11 +30,10 @@
                 <property>/sim/rendering/shaders/skydome</property>
             </not>
         </condition>
-        <emission>
-            <red>1.0</red>
-            <green>0.95</green>
-            <blue>0.88</blue>
-            <factor-prop>/sim/model/material/instruments/integral-factor</factor-prop>
+       <emission>
+            <red-prop>/sim/model/material/instruments/default-red-combined-factor</red-prop>
+            <green-prop>/sim/model/material/instruments/default-green-combined-factor</green-prop>
+            <blue-prop>/sim/model/material/instruments/default-blue-combined-factor</blue-prop>
         </emission>
     </animation>
     
diff --git a/Aircraft/c172p/Models/Interior/Panel/Instruments/dme/ki266.xml b/Aircraft/c172p/Models/Interior/Panel/Instruments/dme/ki266.xml
index 9b3f19742..5e8a77261 100644
--- a/Aircraft/c172p/Models/Interior/Panel/Instruments/dme/ki266.xml
+++ b/Aircraft/c172p/Models/Interior/Panel/Instruments/dme/ki266.xml
@@ -74,6 +74,56 @@
         <object-name>base</object-name>
     </effect>
 
+    <animation>
+        <type>material</type>
+        <object-name>SourceSelectorKnob</object-name>
+        <object-name>PowerSwitch.Lever</object-name>
+        <object-name>on</object-name>
+        <object-name>off</object-name>
+        <object-name>Label3</object-name>
+        <object-name>n1</object-name>
+        <object-name>hld</object-name>
+        <object-name>n2</object-name>
+        <object-name>PowerSwitch.Base</object-name>
+        <object-name>Background</object-name>
+        <object-name>ModeSwitch</object-name>
+        <object-name>Frame</object-name>
+        <object-name>base</object-name>
+        <condition>
+            <not>
+                <property>/sim/rendering/shaders/skydome</property>
+            </not>
+        </condition>
+        <emission>
+            <red-prop>/sim/model/c172p/lighting/rgb-ra-r-factor</red-prop>
+            <green-prop>/sim/model/c172p/lighting/rgb-ra-g-factor</green-prop>
+            <blue-prop>/sim/model/c172p/lighting/rgb-ra-b-factor</blue-prop>
+        </emission>
+    </animation>
+
+    <animation>
+        <type>material</type>
+        <object-name>SourceSelectorKnob</object-name>
+        <object-name>PowerSwitch.Lever</object-name>
+        <object-name>on</object-name>
+        <object-name>off</object-name>
+        <object-name>Label3</object-name>
+        <object-name>n1</object-name>
+        <object-name>hld</object-name>
+        <object-name>n2</object-name>
+        <object-name>PowerSwitch.Base</object-name>
+        <condition>
+            <not>
+                <property>/sim/rendering/shaders/skydome</property>
+            </not>
+        </condition>
+        <emission>
+            <red-prop>/sim/model/material/instruments/default-red-combined-factor</red-prop>
+            <green-prop>/sim/model/material/instruments/default-green-combined-factor</green-prop>
+            <blue-prop>/sim/model/material/instruments/default-blue-combined-factor</blue-prop>
+        </emission>
+    </animation>
+
     <!-- Turn it off, when u/s or switched off -->
     <animation>
         <type>select</type>
diff --git a/Aircraft/c172p/Models/Interior/Panel/Instruments/garmin196/garmin196.xml b/Aircraft/c172p/Models/Interior/Panel/Instruments/garmin196/garmin196.xml
index dce6f5b93..bf70b3c44 100644
--- a/Aircraft/c172p/Models/Interior/Panel/Instruments/garmin196/garmin196.xml
+++ b/Aircraft/c172p/Models/Interior/Panel/Instruments/garmin196/garmin196.xml
@@ -207,6 +207,40 @@
     <object-name>GPSMount</object-name>
   </effect>
 
+    <animation>
+        <type>material</type>
+        <object-name>coque</object-name>
+        <object-name>coque-capot</object-name>
+        <object-name>coque.buttons</object-name>
+        <object-name>antenne</object-name>
+        <object-name>rocker.up</object-name>
+        <object-name>rocker.down</object-name>
+        <object-name>rocker.left</object-name>
+        <object-name>rocker.right</object-name>
+        <object-name>button.in</object-name>
+        <object-name>button.out</object-name>
+        <object-name>button.page</object-name>
+        <object-name>button.quit</object-name>
+        <object-name>button.enter</object-name>
+        <object-name>button.menu</object-name>
+        <object-name>button.nrst</object-name>
+        <object-name>button.power</object-name>
+        <object-name>button.dto</object-name>
+        <object-name>coque.inter</object-name>
+        <object-name>ecran.off</object-name>
+        <object-name>GPSMount</object-name>
+        <condition>
+            <not>
+                <property>/sim/rendering/shaders/skydome</property>
+            </not>
+        </condition>
+        <emission>
+            <red-prop>/sim/model/c172p/lighting/rgb-ra-r-factor</red-prop>
+            <green-prop>/sim/model/c172p/lighting/rgb-ra-g-factor</green-prop>
+            <blue-prop>/sim/model/c172p/lighting/rgb-ra-b-factor</blue-prop>
+        </emission>
+    </animation>
+
   <animation>
     <type>material</type>
     <object-name>ecran.off</object-name>
diff --git a/Aircraft/c172p/Models/Interior/Panel/Instruments/garmin196/gpsmodel.xml b/Aircraft/c172p/Models/Interior/Panel/Instruments/garmin196/gpsmodel.xml
index 285941938..77d0cc3c6 100644
--- a/Aircraft/c172p/Models/Interior/Panel/Instruments/garmin196/gpsmodel.xml
+++ b/Aircraft/c172p/Models/Interior/Panel/Instruments/garmin196/gpsmodel.xml
@@ -8,4 +8,20 @@
         <inherits-from>../../../../Effects/interior/lm-gpsmodel</inherits-from>
         <object-name>gpsmodel</object-name>
     </effect>
+
+    <animation>
+        <type>material</type>
+        <object-name>gpsmodel</object-name>
+        <condition>
+            <not>
+                <property>/sim/rendering/shaders/skydome</property>
+            </not>
+        </condition>
+        <emission>
+            <red-prop>/sim/model/c172p/lighting/rgb-ra-r-factor</red-prop>
+            <green-prop>/sim/model/c172p/lighting/rgb-ra-g-factor</green-prop>
+            <blue-prop>/sim/model/c172p/lighting/rgb-ra-b-factor</blue-prop>
+        </emission>
+    </animation>
+
 </PropertyList>
diff --git a/Aircraft/c172p/Models/Interior/Panel/Instruments/gear/gear-ctl.xml b/Aircraft/c172p/Models/Interior/Panel/Instruments/gear/gear-ctl.xml
index 723b7091e..70a866d5e 100644
--- a/Aircraft/c172p/Models/Interior/Panel/Instruments/gear/gear-ctl.xml
+++ b/Aircraft/c172p/Models/Interior/Panel/Instruments/gear/gear-ctl.xml
@@ -28,4 +28,33 @@
         <object-name>GearScrews</object-name>
     </effect>
 
+    <animation>
+        <type>material</type>
+        <object-name>nosedn1</object-name>
+        <object-name>nosedn2</object-name>
+        <object-name>maindn1</object-name>
+        <object-name>maindn2</object-name>
+        <object-name>noseup1</object-name>
+        <object-name>noseup2</object-name>
+        <object-name>mainup1</object-name>
+        <object-name>mainup2</object-name>
+        <object-name>pump</object-name>
+        <object-name>Switch.nut</object-name>
+        <object-name>Dim.toggle</object-name>
+        <object-name>Dim.bezel</object-name>
+        <object-name>GearFace</object-name>
+        <object-name>GearScrews</object-name>
+        <object-name>Gearswitch</object-name>
+        <condition>
+            <not>
+                <property>/sim/rendering/shaders/skydome</property>
+            </not>
+        </condition>
+        <emission>
+            <red-prop>/sim/model/c172p/lighting/rgb-ra-r-factor</red-prop>
+            <green-prop>/sim/model/c172p/lighting/rgb-ra-g-factor</green-prop>
+            <blue-prop>/sim/model/c172p/lighting/rgb-ra-b-factor</blue-prop>
+        </emission>
+    </animation>
+
 </PropertyList>
diff --git a/Aircraft/c172p/Models/Interior/Panel/Instruments/hi/hi.xml b/Aircraft/c172p/Models/Interior/Panel/Instruments/hi/hi.xml
index 1f42a2099..14fc1289e 100644
--- a/Aircraft/c172p/Models/Interior/Panel/Instruments/hi/hi.xml
+++ b/Aircraft/c172p/Models/Interior/Panel/Instruments/hi/hi.xml
@@ -30,10 +30,25 @@
             </not>
         </condition>
         <emission>
-            <red>  1.0</red>
-            <green>0.8</green>
-            <blue> 0.5</blue>
-            <factor-prop>/sim/model/material/instruments/integral-factor</factor-prop>
+            <red-prop>/sim/model/material/instruments/default-red-combined-factor</red-prop>
+            <green-prop>/sim/model/material/instruments/default-green-combined-factor</green-prop>
+            <blue-prop>/sim/model/material/instruments/default-blue-combined-factor</blue-prop>
+        </emission>
+    </animation>
+
+    <animation>
+        <type>material</type>
+        <object-name>OBS-Knob</object-name>
+        <object-name>Hdg-Knob</object-name>
+        <condition>
+            <not>
+                <property>/sim/rendering/shaders/skydome</property>
+            </not>
+        </condition>
+        <emission>
+            <red-prop>/sim/model/c172p/lighting/rgb-ra-r-factor</red-prop>
+            <green-prop>/sim/model/c172p/lighting/rgb-ra-g-factor</green-prop>
+            <blue-prop>/sim/model/c172p/lighting/rgb-ra-b-factor</blue-prop>
         </emission>
     </animation>
 
diff --git a/Aircraft/c172p/Models/Interior/Panel/Instruments/hobbs/hobbs.xml b/Aircraft/c172p/Models/Interior/Panel/Instruments/hobbs/hobbs.xml
index 5a210580b..60faedbad 100644
--- a/Aircraft/c172p/Models/Interior/Panel/Instruments/hobbs/hobbs.xml
+++ b/Aircraft/c172p/Models/Interior/Panel/Instruments/hobbs/hobbs.xml
@@ -43,10 +43,9 @@
             </not>
         </condition>
         <emission>
-            <red>  1.0</red>
-            <green>0.8</green>
-            <blue> 0.5</blue>
-            <factor-prop>/sim/model/material/instruments/integral-factor</factor-prop>
+            <red-prop>/sim/model/c172p/lighting/rgb-ra-r-factor</red-prop>
+            <green-prop>/sim/model/c172p/lighting/rgb-ra-g-factor</green-prop>
+            <blue-prop>/sim/model/c172p/lighting/rgb-ra-b-factor</blue-prop>
         </emission>
     </animation>
 
diff --git a/Aircraft/c172p/Models/Interior/Panel/Instruments/kap140/KAP140TwoAxisAlt.xml b/Aircraft/c172p/Models/Interior/Panel/Instruments/kap140/KAP140TwoAxisAlt.xml
index 13d9fd0d4..2308f9b61 100644
--- a/Aircraft/c172p/Models/Interior/Panel/Instruments/kap140/KAP140TwoAxisAlt.xml
+++ b/Aircraft/c172p/Models/Interior/Panel/Instruments/kap140/KAP140TwoAxisAlt.xml
@@ -87,6 +87,33 @@ properties' values.
         <object-name>inhg-digit5</object-name>
     </effect>
 
+    <animation>
+        <type>material</type>
+        <object-name>knob-outer</object-name>
+        <object-name>knob-inner</object-name>
+        <object-name>base</object-name>
+        <object-name>ap-btn</object-name>
+        <object-name>hdg-btn</object-name>
+        <object-name>nav-btn</object-name>
+        <object-name>apr-btn</object-name>
+        <object-name>alt-btn</object-name>
+        <object-name>rev-btn</object-name>
+        <object-name>dn-btn</object-name>
+        <object-name>up-btn</object-name>
+        <object-name>arm-btn</object-name>
+        <object-name>baro-btn</object-name>
+        <condition>
+            <not>
+                <property>/sim/rendering/shaders/skydome</property>
+            </not>
+        </condition>
+        <emission>
+            <red-prop>/sim/model/c172p/lighting/rgb-ra-r-factor</red-prop>
+            <green-prop>/sim/model/c172p/lighting/rgb-ra-g-factor</green-prop>
+            <blue-prop>/sim/model/c172p/lighting/rgb-ra-b-factor</blue-prop>
+        </emission>
+    </animation>
+
     <animation>
         <type>material</type>
         <object-name>buttons</object-name>
diff --git a/Aircraft/c172p/Models/Interior/Panel/Instruments/kma20/kma20.xml b/Aircraft/c172p/Models/Interior/Panel/Instruments/kma20/kma20.xml
index 1d81dd8a9..5f41b9710 100644
--- a/Aircraft/c172p/Models/Interior/Panel/Instruments/kma20/kma20.xml
+++ b/Aircraft/c172p/Models/Interior/Panel/Instruments/kma20/kma20.xml
@@ -66,6 +66,34 @@
         <object-name>O</object-name>
     </effect>
 
+    <animation>
+        <type>material</type>
+        <object-name>Knob</object-name>
+        <object-name>Chassis</object-name>
+        <object-name>AUTO</object-name>
+        <object-name>COM1</object-name>
+        <object-name>COM2</object-name>
+        <object-name>NAV1</object-name>
+        <object-name>NAV2</object-name>
+        <object-name>ADF</object-name>
+        <object-name>DME</object-name>
+        <object-name>MKR</object-name>
+        <object-name>SENS</object-name>
+        <object-name>M</object-name>
+        <object-name>A</object-name>
+        <object-name>O</object-name>
+        <condition>
+            <not>
+                <property>/sim/rendering/shaders/skydome</property>
+            </not>
+        </condition>
+        <emission>
+            <red-prop>/sim/model/c172p/lighting/rgb-ra-r-factor</red-prop>
+            <green-prop>/sim/model/c172p/lighting/rgb-ra-g-factor</green-prop>
+            <blue-prop>/sim/model/c172p/lighting/rgb-ra-b-factor</blue-prop>
+        </emission>
+    </animation>
+
     <animation>
         <type>material</type>
         <object-name>O</object-name>
diff --git a/Aircraft/c172p/Models/Interior/Panel/Instruments/kr87-adf/ki227_228.xml b/Aircraft/c172p/Models/Interior/Panel/Instruments/kr87-adf/ki227_228.xml
index b062a7d3d..945647dcc 100644
--- a/Aircraft/c172p/Models/Interior/Panel/Instruments/kr87-adf/ki227_228.xml
+++ b/Aircraft/c172p/Models/Interior/Panel/Instruments/kr87-adf/ki227_228.xml
@@ -21,7 +21,6 @@
         <object-name>CompassRose</object-name>
         <object-name>KI227.ADFNeedle</object-name>
         <object-name>HDGSelector</object-name>
-        
     </effect>
 
     <effect>
@@ -50,10 +49,24 @@
             </not>
         </condition>
         <emission>
-            <red>  1.0</red>
-            <green>0.8</green>
-            <blue> 0.5</blue>
-            <factor-prop>/sim/model/material/instruments/integral-factor</factor-prop>
+            <red-prop>/sim/model/material/instruments/default-red-combined-factor</red-prop>
+            <green-prop>/sim/model/material/instruments/default-green-combined-factor</green-prop>
+            <blue-prop>/sim/model/material/instruments/default-blue-combined-factor</blue-prop>
+        </emission>
+    </animation>
+
+    <animation>
+        <type>material</type>
+        <object-name>HDGSelector</object-name>
+        <condition>
+            <not>
+                <property>/sim/rendering/shaders/skydome</property>
+            </not>
+        </condition>
+        <emission>
+            <red-prop>/sim/model/c172p/lighting/rgb-ra-r-factor</red-prop>
+            <green-prop>/sim/model/c172p/lighting/rgb-ra-g-factor</green-prop>
+            <blue-prop>/sim/model/c172p/lighting/rgb-ra-b-factor</blue-prop>
         </emission>
     </animation>
 
diff --git a/Aircraft/c172p/Models/Interior/Panel/Instruments/kr87-adf/kr87.xml b/Aircraft/c172p/Models/Interior/Panel/Instruments/kr87-adf/kr87.xml
index 750d645ea..63099be9a 100644
--- a/Aircraft/c172p/Models/Interior/Panel/Instruments/kr87-adf/kr87.xml
+++ b/Aircraft/c172p/Models/Interior/Panel/Instruments/kr87-adf/kr87.xml
@@ -45,6 +45,29 @@
         <object-name>indicator.Stby.1</object-name>
     </effect>
 
+    <animation>
+        <type>material</type>
+        <object-name>Volume</object-name>
+        <object-name>FRQOuter</object-name>
+        <object-name>FRQInner</object-name>
+        <object-name>Chassis</object-name>
+        <object-name>knobs.ADF</object-name>
+        <object-name>knobs.BFO</object-name>
+        <object-name>knobs.FRQ</object-name>
+        <object-name>knobs.FLT</object-name>
+        <object-name>knobs.SET</object-name>
+        <condition>
+            <not>
+                <property>/sim/rendering/shaders/skydome</property>
+            </not>
+        </condition>
+        <emission>
+            <red-prop>/sim/model/c172p/lighting/rgb-ra-r-factor</red-prop>
+            <green-prop>/sim/model/c172p/lighting/rgb-ra-g-factor</green-prop>
+            <blue-prop>/sim/model/c172p/lighting/rgb-ra-b-factor</blue-prop>
+        </emission>
+    </animation>
+
     <animation>
         <type>select</type>
         <object-name>indicator</object-name>
diff --git a/Aircraft/c172p/Models/Interior/Panel/Instruments/kt76a/kt76a.xml b/Aircraft/c172p/Models/Interior/Panel/Instruments/kt76a/kt76a.xml
index b5363e341..b1972a071 100644
--- a/Aircraft/c172p/Models/Interior/Panel/Instruments/kt76a/kt76a.xml
+++ b/Aircraft/c172p/Models/Interior/Panel/Instruments/kt76a/kt76a.xml
@@ -52,6 +52,39 @@
         <object-name>test</object-name>
     </effect>
 
+    <animation>
+        <type>material</type>
+        <object-name>Dial1</object-name>
+        <object-name>Dial10</object-name>
+        <object-name>Dial100</object-name>
+        <object-name>Dial1000</object-name>
+        <object-name>Knob1</object-name>
+        <object-name>Knob10</object-name>
+        <object-name>Knob100</object-name>
+        <object-name>Knob1000</object-name>
+        <object-name>KnobMode</object-name>
+        <object-name>Front</object-name>
+        <object-name>Ident</object-name>
+        <object-name>Ident-light</object-name>
+        <object-name>Border</object-name>
+        <!--object-name>vitre</object-name-->
+        <object-name>off</object-name>
+        <object-name>stby</object-name>
+        <object-name>on</object-name>
+        <object-name>alt</object-name>
+        <object-name>test</object-name>
+        <condition>
+            <not>
+                <property>/sim/rendering/shaders/skydome</property>
+            </not>
+        </condition>
+        <emission>
+            <red-prop>/sim/model/c172p/lighting/rgb-ra-r-factor</red-prop>
+            <green-prop>/sim/model/c172p/lighting/rgb-ra-g-factor</green-prop>
+            <blue-prop>/sim/model/c172p/lighting/rgb-ra-b-factor</blue-prop>
+        </emission>
+    </animation>
+
     <animation>
         <object-name>Dial1</object-name>
         <object-name>Dial10</object-name>
diff --git a/Aircraft/c172p/Models/Interior/Panel/Instruments/kx165/kx165-1.xml b/Aircraft/c172p/Models/Interior/Panel/Instruments/kx165/kx165-1.xml
index 686a89d06..68bbf2369 100644
--- a/Aircraft/c172p/Models/Interior/Panel/Instruments/kx165/kx165-1.xml
+++ b/Aircraft/c172p/Models/Interior/Panel/Instruments/kx165/kx165-1.xml
@@ -103,6 +103,35 @@
         <object-name>NavUseDot</object-name>
     </effect>
 
+    <animation>
+        <type>material</type>
+        <object-name>CommToggle</object-name>
+        <object-name>NavToggle</object-name>
+        <object-name>Chassis</object-name>
+        <object-name>CommKnobs</object-name>
+        <object-name>CommVolume</object-name>
+        <object-name>NavKnobs</object-name>
+        <object-name>NavVolume</object-name>
+        <object-name>CommKHz</object-name>
+        <object-name>CommMHz</object-name>
+        <object-name>CommToggle</object-name>
+        <object-name>CommVolume</object-name>
+        <object-name>NavKHz</object-name>
+        <object-name>NavMHz</object-name>
+        <object-name>NavToggle</object-name>
+        <object-name>NavVolume</object-name>
+        <condition>
+            <not>
+                <property>/sim/rendering/shaders/skydome</property>
+            </not>
+        </condition>
+        <emission>
+            <red-prop>/sim/model/c172p/lighting/rgb-ra-r-factor</red-prop>
+            <green-prop>/sim/model/c172p/lighting/rgb-ra-g-factor</green-prop>
+            <blue-prop>/sim/model/c172p/lighting/rgb-ra-b-factor</blue-prop>
+        </emission>
+    </animation>
+
     <animation>
         <object-name>CommKnobs</object-name>
         <object-name>CommKHz</object-name>
diff --git a/Aircraft/c172p/Models/Interior/Panel/Instruments/kx165/kx165-2.xml b/Aircraft/c172p/Models/Interior/Panel/Instruments/kx165/kx165-2.xml
index 8e0c555c7..16b7a9f12 100644
--- a/Aircraft/c172p/Models/Interior/Panel/Instruments/kx165/kx165-2.xml
+++ b/Aircraft/c172p/Models/Interior/Panel/Instruments/kx165/kx165-2.xml
@@ -103,6 +103,35 @@
         <object-name>NavUseDot</object-name>
     </effect>
 
+    <animation>
+        <type>material</type>
+        <object-name>CommToggle</object-name>
+        <object-name>NavToggle</object-name>
+        <object-name>Chassis</object-name>
+        <object-name>CommKnobs</object-name>
+        <object-name>CommVolume</object-name>
+        <object-name>NavKnobs</object-name>
+        <object-name>NavVolume</object-name>
+        <object-name>CommKHz</object-name>
+        <object-name>CommMHz</object-name>
+        <object-name>CommToggle</object-name>
+        <object-name>CommVolume</object-name>
+        <object-name>NavKHz</object-name>
+        <object-name>NavMHz</object-name>
+        <object-name>NavToggle</object-name>
+        <object-name>NavVolume</object-name>
+        <condition>
+            <not>
+                <property>/sim/rendering/shaders/skydome</property>
+            </not>
+        </condition>
+        <emission>
+            <red-prop>/sim/model/c172p/lighting/rgb-ra-r-factor</red-prop>
+            <green-prop>/sim/model/c172p/lighting/rgb-ra-g-factor</green-prop>
+            <blue-prop>/sim/model/c172p/lighting/rgb-ra-b-factor</blue-prop>
+        </emission>
+    </animation>
+
     <animation>
         <object-name>CommKnobs</object-name>
         <object-name>CommKHz</object-name>
diff --git a/Aircraft/c172p/Models/Interior/Panel/Instruments/mag-compass/mag-compass-float.xml b/Aircraft/c172p/Models/Interior/Panel/Instruments/mag-compass/mag-compass-float.xml
index d033260c8..88014f29c 100644
--- a/Aircraft/c172p/Models/Interior/Panel/Instruments/mag-compass/mag-compass-float.xml
+++ b/Aircraft/c172p/Models/Interior/Panel/Instruments/mag-compass/mag-compass-float.xml
@@ -21,6 +21,38 @@
         <object-name>Glass</object-name>
     </effect>
 
+    <animation>
+        <type>material</type>
+        <object-name>Ring</object-name>
+        <object-name>Needle</object-name>
+        <condition>
+            <not>
+                <property>/sim/rendering/shaders/skydome</property>
+            </not>
+        </condition>
+        <emission>
+            <red-prop>/sim/model/material/instruments/default-red-combined-factor</red-prop>
+            <green-prop>/sim/model/material/instruments/default-green-combined-factor</green-prop>
+            <blue-prop>/sim/model/material/instruments/default-blue-combined-factor</blue-prop>
+        </emission>
+    </animation>
+
+    <animation>
+        <type>material</type>
+        <object-name>Casing</object-name>
+        <object-name>Interior</object-name>
+        <condition>
+            <not>
+                <property>/sim/rendering/shaders/skydome</property>
+            </not>
+        </condition>
+        <emission>
+            <red-prop>/sim/model/c172p/lighting/rgb-ra-r-factor</red-prop>
+            <green-prop>/sim/model/c172p/lighting/rgb-ra-g-factor</green-prop>
+            <blue-prop>/sim/model/c172p/lighting/rgb-ra-b-factor</blue-prop>
+        </emission>
+    </animation>
+
     <animation>
         <type>rotate</type>
         <object-name>Ring</object-name>
@@ -49,20 +81,5 @@
             </binding>
         </hovered>
     </animation>
-    <animation>
-        <type>material</type>
-        <object-name>Ring</object-name>
-        <object-name>Needle</object-name>
-        <condition>
-            <not>
-                <property>/sim/rendering/shaders/skydome</property>
-            </not>
-        </condition>
-        <emission>
-            <red>  1.0</red>
-            <green>0.8</green>
-            <blue> 0.5</blue>
-            <factor-prop>/sim/model/material/instruments/factor</factor-prop>
-        </emission>
-    </animation>
+
 </PropertyList>
diff --git a/Aircraft/c172p/Models/Interior/Panel/Instruments/mag-compass/mag-compass.xml b/Aircraft/c172p/Models/Interior/Panel/Instruments/mag-compass/mag-compass.xml
index dead5f30e..de0a37599 100644
--- a/Aircraft/c172p/Models/Interior/Panel/Instruments/mag-compass/mag-compass.xml
+++ b/Aircraft/c172p/Models/Interior/Panel/Instruments/mag-compass/mag-compass.xml
@@ -21,6 +21,38 @@
         <object-name>Glass</object-name>
     </effect>
 
+    <animation>
+        <type>material</type>
+        <object-name>Ring</object-name>
+        <object-name>Needle</object-name>
+        <condition>
+            <not>
+                <property>/sim/rendering/shaders/skydome</property>
+            </not>
+        </condition>
+        <emission>
+            <red-prop>/sim/model/material/instruments/default-red-combined-factor</red-prop>
+            <green-prop>/sim/model/material/instruments/default-green-combined-factor</green-prop>
+            <blue-prop>/sim/model/material/instruments/default-blue-combined-factor</blue-prop>
+        </emission>
+    </animation>
+
+    <animation>
+        <type>material</type>
+        <object-name>Casing</object-name>
+        <object-name>Interior</object-name>
+        <condition>
+            <not>
+                <property>/sim/rendering/shaders/skydome</property>
+            </not>
+        </condition>
+        <emission>
+            <red-prop>/sim/model/c172p/lighting/rgb-ra-r-factor</red-prop>
+            <green-prop>/sim/model/c172p/lighting/rgb-ra-g-factor</green-prop>
+            <blue-prop>/sim/model/c172p/lighting/rgb-ra-b-factor</blue-prop>
+        </emission>
+    </animation>
+
     <animation>
         <type>rotate</type>
         <object-name>Ring</object-name>
@@ -49,20 +81,5 @@
             </binding>
         </hovered>
     </animation>
-    <animation>
-        <type>material</type>
-        <object-name>Ring</object-name>
-        <object-name>Needle</object-name>
-        <condition>
-            <not>
-                <property>/sim/rendering/shaders/skydome</property>
-            </not>
-        </condition>
-        <emission>
-            <red>  1.0</red>
-            <green>0.8</green>
-            <blue> 0.5</blue>
-            <factor-prop>/sim/model/material/instruments/factor</factor-prop>
-        </emission>
-    </animation>
+
 </PropertyList>
diff --git a/Aircraft/c172p/Models/Interior/Panel/Instruments/magneto-switch/magneto-switch.xml b/Aircraft/c172p/Models/Interior/Panel/Instruments/magneto-switch/magneto-switch.xml
index d8da3e812..2b8504725 100644
--- a/Aircraft/c172p/Models/Interior/Panel/Instruments/magneto-switch/magneto-switch.xml
+++ b/Aircraft/c172p/Models/Interior/Panel/Instruments/magneto-switch/magneto-switch.xml
@@ -15,6 +15,23 @@
         <object-name>magsw</object-name>
     </effect>
 
+    <animation>
+        <type>material</type>
+        <object-name>key</object-name>
+        <object-name>start</object-name>
+        <object-name>magsw</object-name>
+        <condition>
+            <not>
+                <property>/sim/rendering/shaders/skydome</property>
+            </not>
+        </condition>
+        <emission>
+            <red-prop>/sim/model/c172p/lighting/rgb-ra-r-factor</red-prop>
+            <green-prop>/sim/model/c172p/lighting/rgb-ra-g-factor</green-prop>
+            <blue-prop>/sim/model/c172p/lighting/rgb-ra-b-factor</blue-prop>
+        </emission>
+    </animation>
+
     <animation>
         <type>material</type>
         <object-name>key</object-name>
diff --git a/Aircraft/c172p/Models/Interior/Panel/Instruments/oat/oat.xml b/Aircraft/c172p/Models/Interior/Panel/Instruments/oat/oat.xml
index b4d789471..6aa0e4be9 100644
--- a/Aircraft/c172p/Models/Interior/Panel/Instruments/oat/oat.xml
+++ b/Aircraft/c172p/Models/Interior/Panel/Instruments/oat/oat.xml
@@ -12,6 +12,24 @@
         <object-name>OAT</object-name>
     </effect>
 
+    <animation>
+        <type>material</type>
+        <object-name>OAT.needle</object-name>
+        <object-name>OAT.face</object-name>
+        <object-name>OAT.frame</object-name>
+        <object-name>OAT</object-name>
+        <condition>
+            <not>
+                <property>/sim/rendering/shaders/skydome</property>
+            </not>
+        </condition>
+        <emission>
+            <red-prop>/sim/model/c172p/lighting/rgb-ra-r-factor</red-prop>
+            <green-prop>/sim/model/c172p/lighting/rgb-ra-g-factor</green-prop>
+            <blue-prop>/sim/model/c172p/lighting/rgb-ra-b-factor</blue-prop>
+        </emission>
+    </animation>
+
     <animation>
         <type>rotate</type>
         <object-name>OAT.needle</object-name>
diff --git a/Aircraft/c172p/Models/Interior/Panel/Instruments/tc/tc.xml b/Aircraft/c172p/Models/Interior/Panel/Instruments/tc/tc.xml
index 2f4b86531..826358dbc 100644
--- a/Aircraft/c172p/Models/Interior/Panel/Instruments/tc/tc.xml
+++ b/Aircraft/c172p/Models/Interior/Panel/Instruments/tc/tc.xml
@@ -31,10 +31,9 @@
             </not>
         </condition>
         <emission>
-            <red>  1.0</red>
-            <green>0.8</green>
-            <blue> 0.5</blue>
-            <factor-prop>/sim/model/material/instruments/integral-factor</factor-prop>
+            <red-prop>/sim/model/material/instruments/default-red-combined-factor</red-prop>
+            <green-prop>/sim/model/material/instruments/default-green-combined-factor</green-prop>
+            <blue-prop>/sim/model/material/instruments/default-blue-combined-factor</blue-prop>
         </emission>
     </animation>
 
diff --git a/Aircraft/c172p/Models/Interior/Panel/Instruments/vac/vac.xml b/Aircraft/c172p/Models/Interior/Panel/Instruments/vac/vac.xml
index ca2175f14..1fa39295e 100644
--- a/Aircraft/c172p/Models/Interior/Panel/Instruments/vac/vac.xml
+++ b/Aircraft/c172p/Models/Interior/Panel/Instruments/vac/vac.xml
@@ -26,10 +26,9 @@
             </not>
         </condition>
         <emission>
-            <red>  1.0</red>
-            <green>0.8</green>
-            <blue> 0.5</blue>
-            <factor-prop>/sim/model/material/instruments/integral-factor</factor-prop>
+            <red-prop>/sim/model/material/instruments/default-red-combined-factor</red-prop>
+            <green-prop>/sim/model/material/instruments/default-green-combined-factor</green-prop>
+            <blue-prop>/sim/model/material/instruments/default-blue-combined-factor</blue-prop>
         </emission>
     </animation>
 
diff --git a/Aircraft/c172p/Models/Interior/Panel/Instruments/vor/vor.xml b/Aircraft/c172p/Models/Interior/Panel/Instruments/vor/vor.xml
index 9d09899d3..bc087063a 100644
--- a/Aircraft/c172p/Models/Interior/Panel/Instruments/vor/vor.xml
+++ b/Aircraft/c172p/Models/Interior/Panel/Instruments/vor/vor.xml
@@ -51,10 +51,24 @@
             </not>
         </condition>
         <emission>
-            <red>  1.0</red>
-            <green>0.8</green>
-            <blue> 0.5</blue>
-            <factor-prop>/sim/model/material/instruments/integral-factor</factor-prop>
+            <red-prop>/sim/model/material/instruments/default-red-combined-factor</red-prop>
+            <green-prop>/sim/model/material/instruments/default-green-combined-factor</green-prop>
+            <blue-prop>/sim/model/material/instruments/default-blue-combined-factor</blue-prop>
+        </emission>
+    </animation>
+
+    <animation>
+        <type>material</type>
+        <object-name>disk</object-name>
+        <condition>
+            <not>
+                <property>/sim/rendering/shaders/skydome</property>
+            </not>
+        </condition>
+        <emission>
+            <red-prop>/sim/model/c172p/lighting/rgb-ra-r-factor</red-prop>
+            <green-prop>/sim/model/c172p/lighting/rgb-ra-g-factor</green-prop>
+            <blue-prop>/sim/model/c172p/lighting/rgb-ra-b-factor</blue-prop>
         </emission>
     </animation>
 
diff --git a/Aircraft/c172p/Models/Interior/Panel/Instruments/vor/vor2.xml b/Aircraft/c172p/Models/Interior/Panel/Instruments/vor/vor2.xml
index 367d4fcdf..ab16a2092 100644
--- a/Aircraft/c172p/Models/Interior/Panel/Instruments/vor/vor2.xml
+++ b/Aircraft/c172p/Models/Interior/Panel/Instruments/vor/vor2.xml
@@ -51,10 +51,24 @@
             </not>
         </condition>
         <emission>
-            <red>  1.0</red>
-            <green>0.8</green>
-            <blue> 0.5</blue>
-            <factor-prop>/sim/model/material/instruments/integral-factor</factor-prop>
+            <red-prop>/sim/model/material/instruments/default-red-combined-factor</red-prop>
+            <green-prop>/sim/model/material/instruments/default-green-combined-factor</green-prop>
+            <blue-prop>/sim/model/material/instruments/default-blue-combined-factor</blue-prop>
+        </emission>
+    </animation>
+
+    <animation>
+        <type>material</type>
+        <object-name>disk</object-name>
+        <condition>
+            <not>
+                <property>/sim/rendering/shaders/skydome</property>
+            </not>
+        </condition>
+        <emission>
+            <red-prop>/sim/model/c172p/lighting/rgb-ra-r-factor</red-prop>
+            <green-prop>/sim/model/c172p/lighting/rgb-ra-g-factor</green-prop>
+            <blue-prop>/sim/model/c172p/lighting/rgb-ra-b-factor</blue-prop>
         </emission>
     </animation>
 
diff --git a/Aircraft/c172p/Models/Interior/Pedals/pedals-copilot.xml b/Aircraft/c172p/Models/Interior/Pedals/pedals-copilot.xml
index d32368441..2bdbbe191 100644
--- a/Aircraft/c172p/Models/Interior/Pedals/pedals-copilot.xml
+++ b/Aircraft/c172p/Models/Interior/Pedals/pedals-copilot.xml
@@ -16,6 +16,24 @@
         <object-name>pedal-rod-right</object-name>
     </effect>
 
+    <animation>
+        <type>material</type>
+        <object-name>RightPedal</object-name>
+        <object-name>LeftPedal</object-name>
+        <object-name>pedal-rod-left</object-name>
+        <object-name>pedal-rod-right</object-name>
+        <condition>
+            <not>
+                <property>/sim/rendering/shaders/skydome</property>
+            </not>
+        </condition>
+        <emission>
+            <red-prop>/sim/model/c172p/lighting/rgb-ra-r-factor</red-prop>
+            <green-prop>/sim/model/c172p/lighting/rgb-ra-g-factor</green-prop>
+            <blue-prop>/sim/model/c172p/lighting/rgb-ra-b-factor</blue-prop>
+        </emission>
+    </animation>
+
     <animation>
         <type>translate</type>
         <object-name>LeftPedal</object-name>
diff --git a/Aircraft/c172p/Models/Interior/Pedals/pedals-pilot.xml b/Aircraft/c172p/Models/Interior/Pedals/pedals-pilot.xml
index 437e9ecaf..849ee64bf 100644
--- a/Aircraft/c172p/Models/Interior/Pedals/pedals-pilot.xml
+++ b/Aircraft/c172p/Models/Interior/Pedals/pedals-pilot.xml
@@ -16,6 +16,24 @@
         <object-name>pedal-rod-right</object-name>
     </effect>
 
+    <animation>
+        <type>material</type>
+        <object-name>RightPedal</object-name>
+        <object-name>LeftPedal</object-name>
+        <object-name>pedal-rod-left</object-name>
+        <object-name>pedal-rod-right</object-name>
+        <condition>
+            <not>
+                <property>/sim/rendering/shaders/skydome</property>
+            </not>
+        </condition>
+        <emission>
+            <red-prop>/sim/model/c172p/lighting/rgb-ra-r-factor</red-prop>
+            <green-prop>/sim/model/c172p/lighting/rgb-ra-g-factor</green-prop>
+            <blue-prop>/sim/model/c172p/lighting/rgb-ra-b-factor</blue-prop>
+        </emission>
+    </animation>
+
     <animation>
         <type>translate</type>
         <object-name>LeftPedal</object-name>
diff --git a/Aircraft/c172p/Models/Interior/Yoke/yoke.xml b/Aircraft/c172p/Models/Interior/Yoke/yoke.xml
index 725b3562f..db0aa5442 100644
--- a/Aircraft/c172p/Models/Interior/Yoke/yoke.xml
+++ b/Aircraft/c172p/Models/Interior/Yoke/yoke.xml
@@ -31,6 +31,28 @@
         <object-name>RightYokeMount</object-name>
     </effect>
 
+    <animation>
+        <type>material</type>
+        <object-name>LeftYoke</object-name>
+        <object-name>LeftYokeMain</object-name>
+        <object-name>RightYoke</object-name>
+        <object-name>RightYokeMain</object-name>
+        <object-name>LeftYoke</object-name>
+        <object-name>LeftYokeMount</object-name>
+        <object-name>RightYoke</object-name>
+        <object-name>RightYokeMount</object-name>
+        <condition>
+            <not>
+                <property>/sim/rendering/shaders/skydome</property>
+            </not>
+        </condition>
+        <emission>
+            <red-prop>/sim/model/c172p/lighting/rgb-ra-r-factor</red-prop>
+            <green-prop>/sim/model/c172p/lighting/rgb-ra-g-factor</green-prop>
+            <blue-prop>/sim/model/c172p/lighting/rgb-ra-b-factor</blue-prop>
+        </emission>
+    </animation>
+
     <animation>
         <type>translate</type>
         <object-name>LeftYoke</object-name>
diff --git a/Aircraft/c172p/Models/Interior/control-lock/control-lock.xml b/Aircraft/c172p/Models/Interior/control-lock/control-lock.xml
index e7119c0b1..7fc1d82fd 100644
--- a/Aircraft/c172p/Models/Interior/control-lock/control-lock.xml
+++ b/Aircraft/c172p/Models/Interior/control-lock/control-lock.xml
@@ -11,6 +11,22 @@
         <object-name>ControlLock-yoke</object-name>
     </effect>
 
+    <animation>
+        <type>material</type>
+        <object-name>ControlLock-pocket</object-name>
+        <object-name>ControlLock-yoke</object-name>
+        <condition>
+            <not>
+                <property>/sim/rendering/shaders/skydome</property>
+            </not>
+        </condition>
+        <emission>
+            <red-prop>/sim/model/c172p/lighting/rgb-ra-r-factor</red-prop>
+            <green-prop>/sim/model/c172p/lighting/rgb-ra-g-factor</green-prop>
+            <blue-prop>/sim/model/c172p/lighting/rgb-ra-b-factor</blue-prop>
+        </emission>
+    </animation>
+
     <animation>
         <type>select</type>
         <object-name>ControlLock-yoke</object-name>
diff --git a/Aircraft/c172p/Models/c172p.xml b/Aircraft/c172p/Models/c172p.xml
index f2e6e13ae..0aea76494 100644
--- a/Aircraft/c172p/Models/c172p.xml
+++ b/Aircraft/c172p/Models/c172p.xml
@@ -936,6 +936,122 @@
         <object-name>glas_interior_back</object-name>
     </effect>
 
+    <animation>
+        <type>material</type>
+        <object-name>TrimWheel</object-name>
+        <object-name>AvionicsSwitch</object-name>
+        <object-name>radio-light-knob</object-name>
+        <object-name>panel-light-knob</object-name>
+        <object-name>gloveboxlock</object-name>
+        <object-name>Panel_0</object-name>
+        <object-name>ElevatorTrimPos</object-name>
+        <object-name>mike_mount</object-name>
+        <object-name>CabinAirMounts</object-name>
+        <object-name>CabinAir</object-name>
+        <object-name>CabinHeat</object-name>
+        <object-name>BeaconSwitch</object-name>
+        <object-name>CarbHeat</object-name>
+        <object-name>CarbHeatMount</object-name>
+        <object-name>GenSwitch</object-name>
+        <object-name>LandingLightSwitch</object-name>
+        <object-name>MasterSwitch</object-name>
+        <object-name>Mixture</object-name>
+        <object-name>MixtureMount</object-name>
+        <object-name>NavLightSwitch</object-name>
+        <object-name>PitotHeatSwitch</object-name>
+        <object-name>PrimerLeverMount</object-name>
+        <object-name>StrobeSwitch</object-name>
+        <object-name>TaxiLightSwitch</object-name>
+        <object-name>Throttle</object-name>
+        <object-name>ThrottleMount</object-name>
+        <object-name>mike</object-name>
+        <object-name>mike_chord</object-name>
+        <object-name>ParkingBrake</object-name>
+        <object-name>PrimerLever</object-name>
+        <object-name>LeftBag</object-name>
+        <object-name>bolts</object-name>
+        <object-name>accport</object-name>
+        <object-name>autopilot_breaker</object-name>
+        <object-name>radio5_breaker</object-name>
+        <object-name>radio4_breaker</object-name>
+        <object-name>radio3_breaker</object-name>
+        <object-name>radio2_breaker</object-name>
+        <object-name>radio1_breaker</object-name>
+        <object-name>turn-coordinator_breaker</object-name>
+        <object-name>strobe_breaker</object-name>
+        <object-name>bcnlt_breaker</object-name>
+        <object-name>landing_breaker</object-name>
+        <object-name>navlt_breaker</object-name>
+        <object-name>intlt_breaker</object-name>
+        <object-name>instr_breaker</object-name>
+        <object-name>pitot-heat_breaker</object-name>
+        <object-name>master_breaker</object-name>
+        <object-name>flaps_breaker</object-name>
+        <object-name>BreakersBase</object-name>
+        <object-name>AvionicsSwitchBase</object-name>
+        <object-name>windlocket_right</object-name>
+        <object-name>windlocket_left</object-name>
+        <object-name>windlocketbak_right</object-name>
+        <object-name>windlocketbak_left</object-name>
+        <object-name>doorhandleint_right</object-name>
+        <object-name>doorhandleint_left</object-name>
+        <object-name>CeilingSpeaker</object-name>
+        <object-name>DomeSliderWhite</object-name>
+        <object-name>DomeSwitchWhite</object-name>
+        <object-name>DomeSwitchRed</object-name>
+        <object-name>light-knob-base</object-name>
+        <object-name>AltStaticAir</object-name>
+        <object-name>LowVoltageLed</object-name>
+        <object-name>LowVoltageLedBase</object-name>
+        <object-name>panel_1_gauges</object-name>
+        <object-name>Pedestal</object-name>
+        <object-name>InstrumentCover</object-name>
+        <object-name>panel_1_1.inf</object-name>
+        <object-name>panel_1_1_right</object-name>
+        <object-name>gloveboxdoor</object-name>
+        <object-name>glovebox</object-name>
+        <object-name>gloveboxfull</object-name>
+
+        <object-name>carpet</object-name>
+        <object-name>chassis</object-name>
+        <object-name>backseat_left</object-name>
+        <object-name>pilotseat_left</object-name>
+        <object-name>pilotseat_right</object-name>
+        <object-name>doorint_right</object-name>
+        <object-name>doorint_left</object-name>
+        <object-name>windowframeleftint</object-name>
+        <object-name>windowframerightint</object-name>
+        <object-name>baggagedoorinterior</object-name>
+        <object-name>AirVent_left</object-name>
+        <object-name>AirVent_right</object-name>
+        <object-name>wing_1L</object-name>
+        <object-name>wing_1R</object-name>
+        <object-name>visorleft</object-name>
+        <object-name>visorright</object-name>
+        <object-name>visorrodleft</object-name>
+        <object-name>visorrodright</object-name>
+        <object-name>visorbaseleft</object-name>
+        <object-name>visorbaseright</object-name>
+        <object-name>doorintstrapleft</object-name>
+        <object-name>doorintstrapright</object-name>
+
+        <object-name>FuelSelectorFace</object-name>
+        <object-name>FuelSelectorLeft</object-name>
+        <object-name>FuelSelectorRight</object-name>
+        <object-name>FuelSelectorBoth</object-name>
+        <object-name>FuelSelectorOff</object-name>
+        <condition>
+            <not>
+                <property>/sim/rendering/shaders/skydome</property>
+            </not>
+        </condition>
+        <emission>
+            <red-prop>/sim/model/c172p/lighting/rgb-ra-r-factor</red-prop>
+            <green-prop>/sim/model/c172p/lighting/rgb-ra-g-factor</green-prop>
+            <blue-prop>/sim/model/c172p/lighting/rgb-ra-b-factor</blue-prop>
+        </emission>
+    </animation>
+        
     <!-- Courtesy Light -->
     <animation>
         <type>material</type>
diff --git a/Aircraft/c172p/Nasal/engine.nas b/Aircraft/c172p/Nasal/engine.nas
index 1e24a3d0c..d8b0d3ca0 100644
--- a/Aircraft/c172p/Nasal/engine.nas
+++ b/Aircraft/c172p/Nasal/engine.nas
@@ -453,6 +453,18 @@ controls.mixtureAxis = func {
     setprop("/controls/engines/current-engine/mixture", new_value);
 };
 
+var _axisMode = {
+    0: controls.perIndexAxisHandler("/controls/engines/current-engine[",
+        "]/throttle"),
+    1: controls.perIndexAxisHandler("/controls/engines/current-engine[",
+        "]/mixture"),
+    2: controls.perIndexAxisHandler("/controls/engines/current-engine[",
+        "]/propeller-pitch")
+};
+controls.perEngineSelectedAxisHandler = func(mode) {
+    return _axisMode[mode];
+};
+
 controls.stepMagnetos = func {
     var old_value = getprop("/controls/switches/magnetos");
     var new_value = std.max(0, std.min(old_value + arg[0], 3));
diff --git a/Aircraft/c172p/Nasal/mooring.nas b/Aircraft/c172p/Nasal/mooring.nas
index 33c2e12c1..8eca68b43 100644
--- a/Aircraft/c172p/Nasal/mooring.nas
+++ b/Aircraft/c172p/Nasal/mooring.nas
@@ -74,15 +74,17 @@ Mooring.setmoorage = func( index, moorage ) {
     print (" LAT ",latitudedeg," LON ",longitudedeg," HEAD ",headingdeg);
 
     # overwrite the coordinates from the original airport
-    me.presets.getChild("airport-id").setValue("");
+    # forces the computation of ground
+    me.presets.getChild("altitude-ft").setValue(-9999);
+    me.presets.getChild("airspeed-kt").setValue(0);
     me.presets.getChild("latitude-deg").setValue(latitudedeg);
     me.presets.getChild("longitude-deg").setValue(longitudedeg);
     me.presets.getChild("heading-deg").setValue(headingdeg);
-    me.presets.getChild("roll-deg").setValue(0);
-    me.presets.getChild("pitch-deg").setValue(0);
-    me.presets.getChild("airspeed-kt").setValue(0);
-    # forces the computation of ground
-    me.presets.getChild("altitude-ft").setValue(-9999);
+    me.presets.getChild("offset-distance-nm").setValue(0);
+    me.presets.getChild("glideslope-deg").setValue(0);
+    me.presets.getChild("runway").setValue("");
+    me.presets.getChild("runway-requested").setValue(0);
+    me.presets.getChild("airport-id").setValue("");
 }
 
 Mooring.presetseaplane = func {
diff --git a/Aircraft/c172p/Nasal/save.nas b/Aircraft/c172p/Nasal/save.nas
index 686dbb8a8..df8d198a0 100644
--- a/Aircraft/c172p/Nasal/save.nas
+++ b/Aircraft/c172p/Nasal/save.nas
@@ -201,10 +201,7 @@ var save_state = func {
         setprop("/save/anchorlat", anchorlat);
     }
 
-    setprop("/save/valid-flag", 1);
-
     # the scenario description
-
     var timestring = getprop("/sim/time/real/year");
     timestring = timestring~ "-"~getprop("/sim/time/real/month");
     timestring = timestring~ "-"~getprop("/sim/time/real/day");
@@ -236,26 +233,17 @@ var read_state_from_file = func (filename) {
     var path = getprop("/sim/fg-home") ~ "/aircraft-data/c172pSave/"~filename;
     var readNode = props.globals.getNode("/save", 0);
 
-    var valid_flag = getprop("/save/valid-flag");
-    if (valid_flag) {
-        io.read_properties(path, readNode);
-    }
+    io.read_properties(path, readNode);
 
 }
 
 var resume_state = func {
 
-    var valid_flag = getprop("/save/valid-flag");
-
-    if (valid_flag) {
-        setprop("/fdm/jsbsim/settings/damage", 0);
-    } else {
-        gui.popupTip("Valid saved state file not found, reverting to automatic state!", 5.0);
-        return;
-    }
+    setprop("/fdm/jsbsim/settings/damage", 0);
 
     c172p.oil_consumption.stop();
 
+    setprop("/sim/presets/airport-id", "");
     var lat = getprop("/save/latitude-deg");
     setprop("/sim/presets/latitude-deg", lat);
     var lon = getprop("/save/longitude-deg");
@@ -270,9 +258,13 @@ var resume_state = func {
     setprop("/sim/presets/vBody-fps", vBody);
     var wBody = getprop("/save/wBody-fps");
     setprop("/sim/presets/wBody-fps", wBody);
-    setprop("/sim/presets/on-ground", 1);
     setprop("/sim/presets/altitude-ft", -9999);
     setprop("/sim/presets/airspeed-kt", 0);
+    setprop("/sim/presets/offset-distance-nm", 0);
+    setprop("/sim/presets/glideslope-deg", 0);
+    setprop("/sim/presets/runway", "");
+    setprop("/sim/presets/parkpos", "");
+    setprop("/sim/presets/runway-requested", 0);
 
     var heading = getprop("/save/heading-deg");
     var anchorconnect = getprop("/save/anchorconnect");
@@ -281,17 +273,6 @@ var resume_state = func {
         setprop("/sim/presets/heading-deg", heading);
     }
 
-    setprop("/sim/aircraft-state", "");
-    setprop("/sim/presets/onground", "");
-    setprop("/sim/presets/parkpos", "");
-    setprop("/sim/presets/runway", "");
-    setprop("/sim/presets/airport-requested", 1);
-    setprop("/sim/presets/runway-requested", 1);
-    setprop("/sim/presets/parking-requested", 1);
-    #airport-requested true
-    #runway-requested true
-    #parking-requested true
-
     fgcommand("reposition");
 
     var load_delay = 2.0;
diff --git a/Aircraft/c172p/Nasal/state-manager.nas b/Aircraft/c172p/Nasal/state-manager.nas
index d212473fd..6130b7cde 100644
--- a/Aircraft/c172p/Nasal/state-manager.nas
+++ b/Aircraft/c172p/Nasal/state-manager.nas
@@ -62,7 +62,7 @@ var state_manager = func {
     setprop("/sim/model/c172p/securing/cowl-plugs-visible", 0);
     setprop("/sim/model/c172p/cockpit/control-lock-placed", 0);
 
-    var distance_nm = getprop("/sim/presets/offset-distance-nm") or "";
+    var distance_nm = getprop("/sim/presets/offset-distance-nm") or 0;
 
     var engine_running_check_delay = 5.0;
     settimer(func {
diff --git a/Aircraft/c172p/README.md b/Aircraft/c172p/README.md
index acfbeb2a3..aeeed6418 100644
--- a/Aircraft/c172p/README.md
+++ b/Aircraft/c172p/README.md
@@ -27,6 +27,8 @@ This aircraft was modified and updated in a joint effort by the following people
 
 * Daniel Dubreuil (Dany93): [FDM] stall and spin + a few improvements, in-flight damages on wings, fuel float chamber
 
+* Jonathan Redpath (legoboyvdlp): bug tracking, testing, programming
+
 * Tuomas Kuosmanen (tigert): Reference photos of the aircraft and of the OH-CTL livery. Feedback and testing of the Aircraft Systems and operation
 
 * Anders Gidenstam (AndersG): Hydrodynamics for the pontoon/float and amphibious variants
diff --git a/Aircraft/c172p/Systems/als-lights.xml b/Aircraft/c172p/Systems/als-lights.xml
index 26a47b242..931202847 100644
--- a/Aircraft/c172p/Systems/als-lights.xml
+++ b/Aircraft/c172p/Systems/als-lights.xml
@@ -341,7 +341,7 @@
         </output>
     </logic>
 
-    <!--filter>
+    <filter>
         <name>Inst Red Factor</name>
         <type>gain</type>
         <gain>0.010</gain>
@@ -453,20 +453,20 @@
         <output>
             <property>/sim/model/c172p/lighting/inst-b-norm</property>
         </output>
-    </filter-->
+    </filter>
 
     <!-- Reduce the red glow from the digits of the radio stack
          if the instrument lighting is at 100 %.
     -->
-    <!--filter>
+    <filter>
         <name>Inst Gain As Function Of Instrument Lighting</name>
         <type>gain</type>
         <input>
             <expression>
                 <table>
-                    <property>/sim/model/material/instruments/factor</property>
+                    <property>/sim/model/material/instruments/integral-factor</property>
                     <entry><ind>0.0</ind><dep>1.0</dep></entry>
-                    <entry><ind>1.0</ind><dep>0.5</dep></entry>
+                    <entry><ind>1.0</ind><dep>0.9</dep></entry>
                 </table>
             </expression>
         </input>
@@ -476,12 +476,12 @@
     </filter>
 
     <filter>
-        <name>RGB Red Factor</name>
+        <name>RGB Red Factor from radio stack</name>
         <type>gain</type>
         <input>
-            <property>/sim/model/c172p/lighting/ra-r</property>
+            <property>/sim/model/c172p/lighting/ra-r-r</property>
             <scale>
-                <property>/sim/model/material/instruments/factor</property>
+                <property>/sim/model/material/instruments/integral-factor</property>
             </scale>
             <offset>
                 <property>/sim/model/c172p/lighting/inst-r-norm</property>
@@ -491,17 +491,16 @@
             </offset>
         </input>
         <output>
-            <property>/sim/model/c172p/lighting/rgb-ra-r-factor</property>
+            <property>/sim/model/c172p/lighting/rgb-ra-r-r-factor</property>
         </output>
     </filter>
-
     <filter>
-        <name>RGB Green Factor</name>
+        <name>RGB Green Factor from radio stack</name>
         <type>gain</type>
         <input>
-            <property>/sim/model/c172p/lighting/ra-g</property>
+            <property>/sim/model/c172p/lighting/ra-g-r</property>
             <scale>
-                <property>/sim/model/material/instruments/factor</property>
+                <property>/sim/model/material/instruments/integral-factor</property>
             </scale>
             <offset>
                 <property>/sim/model/c172p/lighting/inst-g-norm</property>
@@ -511,17 +510,16 @@
             </offset>
         </input>
         <output>
-            <property>/sim/model/c172p/lighting/rgb-ra-g-factor</property>
+            <property>/sim/model/c172p/lighting/rgb-ra-g-r-factor</property>
         </output>
     </filter>
-
     <filter>
-        <name>RGB Blue Factor</name>
+        <name>RGB Blue Factor from radio stack</name>
         <type>gain</type>
         <input>
-            <property>/sim/model/c172p/lighting/ra-b</property>
+            <property>/sim/model/c172p/lighting/ra-b-r</property>
             <scale>
-                <property>/sim/model/material/instruments/factor</property>
+                <property>/sim/model/material/instruments/integral-factor</property>
             </scale>
             <offset>
                 <property>/sim/model/c172p/lighting/inst-b-norm</property>
@@ -531,31 +529,324 @@
             </offset>
         </input>
         <output>
-            <property>/sim/model/c172p/lighting/rgb-ra-b-factor</property>
+            <property>/sim/model/c172p/lighting/rgb-ra-b-r-factor</property>
         </output>
-    </filter-->
+    </filter>
 
+    <filter>
+        <name>RGB Red Factor from post lights</name>
+        <type>gain</type>
+        <input>
+            <property>/sim/model/c172p/lighting/ra-r-p</property>
+            <scale>
+                <property>/sim/model/material/instruments/factor</property>
+            </scale>
+        </input>
+        <output>
+            <property>/sim/model/c172p/lighting/rgb-ra-r-p-factor</property>
+        </output>
+    </filter>
+    <filter>
+        <name>RGB Green Factor from post lights</name>
+        <type>gain</type>
+        <input>
+            <property>/sim/model/c172p/lighting/ra-g-p</property>
+            <scale>
+                <property>/sim/model/material/instruments/factor</property>
+            </scale>
+        </input>
+        <output>
+            <property>/sim/model/c172p/lighting/rgb-ra-g-p-factor</property>
+        </output>
+    </filter>
+    <filter>
+        <name>RGB Blue Factor from post lights</name>
+        <type>gain</type>
+        <input>
+            <property>/sim/model/c172p/lighting/ra-b-p</property>
+            <scale>
+                <property>/sim/model/material/instruments/factor</property>
+            </scale>
+        </input>
+        <output>
+            <property>/sim/model/c172p/lighting/rgb-ra-b-p-factor</property>
+        </output>
+    </filter>
+
+    <filter>
+        <name>RGB Red Factor from flood lights</name>
+        <type>gain</type>
+        <input>
+            <property>/sim/model/c172p/lighting/flood-red</property>
+            <scale>
+                <property>/sim/model/c172p/lighting/flood-default</property>
+            </scale>
+        </input>
+        <output>
+            <property>/sim/model/c172p/lighting/flood-proc-red-factor</property>
+        </output>
+    </filter>
+    <filter>
+        <name>RGB Green Factor flood lights</name>
+        <type>gain</type>
+        <input>
+            <property>/sim/model/c172p/lighting/flood-green</property>
+            <scale>
+                <property>/sim/model/c172p/lighting/flood-default</property>
+            </scale>
+        </input>
+        <output>
+            <property>/sim/model/c172p/lighting/flood-proc-green-factor</property>
+        </output>
+    </filter>
+    <filter>
+        <name>RGB Blue Factor flood lights</name>
+        <type>gain</type>
+        <input>
+            <property>/sim/model/c172p/lighting/flood-blue</property>
+            <scale>
+                <property>/sim/model/c172p/lighting/flood-default</property>
+            </scale>
+        </input>
+        <output>
+            <property>/sim/model/c172p/lighting/flood-proc-blue-factor</property>
+        </output>
+    </filter>
+
+    <!-- Output used for ALS residual-ambience and default renderer ambience (material animations) cabin only -->
+    <filter>
+        <name>RGB Red Factor combined</name>
+        <type>gain</type>
+        <input>
+            <expression>
+                <sum>
+                    <!-- simulates radio ambient lighting -->
+                    <property>/sim/model/c172p/lighting/rgb-ra-r-r-factor</property>
+                    <!-- simulates post ambient lighting -->
+                    <property>/sim/model/c172p/lighting/rgb-ra-r-p-factor</property>
+                    <!-- simulates dome lighting -->
+                    <property>/sim/model/c172p/lighting/dome-default</property>
+                    <!-- simulates flood lighting -->
+                    <property>/sim/model/c172p/lighting/flood-proc-red-factor</property>
+                </sum>
+            </expression>
+        </input>
+        <output>
+            <property>/sim/model/c172p/lighting/rgb-ra-r-factor</property>
+        </output>
+    </filter>
+    <filter>
+        <name>RGB Green Factor combined</name>
+        <type>gain</type>
+        <input>
+            <expression>
+                <sum>
+                    <property>/sim/model/c172p/lighting/rgb-ra-g-r-factor</property>
+                    <property>/sim/model/c172p/lighting/rgb-ra-g-p-factor</property>
+                    <property>/sim/model/c172p/lighting/dome-default</property>
+                    <property>/sim/model/c172p/lighting/flood-proc-green-factor</property>
+                </sum>
+            </expression>
+        </input>
+        <output>
+             <property>/sim/model/c172p/lighting/rgb-ra-g-factor</property>
+        </output>
+    </filter>
+    <filter>
+        <name>RGB Blue Factor combined</name>
+        <type>gain</type>
+        <input>
+            <expression>
+                <sum>
+                    <property>/sim/model/c172p/lighting/rgb-ra-b-r-factor</property>
+                    <property>/sim/model/c172p/lighting/rgb-ra-b-p-factor</property>
+                    <property>/sim/model/c172p/lighting/dome-default</property>
+                    <property>/sim/model/c172p/lighting/flood-proc-blue-factor</property>
+                </sum>
+            </expression>
+        </input>
+        <output>
+             <property>/sim/model/c172p/lighting/rgb-ra-b-factor</property>
+        </output>
+    </filter>
+
+    <!-- Output used for default renderer overhead lighting (material animations) on panel guages only -->
+    <filter>
+        <name>RGB Red Factor default renderer guages combined</name>
+        <type>gain</type>
+        <input>
+            <condition>
+                <not>
+                    <property>/sim/rendering/shaders/skydome</property>
+                </not>
+                <greater-than-equals>
+                    <property>/sim/model/c172p/lighting/dome-proc</property>
+                    <property>/sim/model/material/instruments/factor</property>
+                </greater-than-equals>
+            </condition>
+            <expression>
+                <sum>
+                    <product>
+                        <property>/sim/model/c172p/lighting/dome-proc</property>
+                        <value>1.0</value>
+                    </product>
+                    <property>/sim/model/c172p/lighting/flood-proc-red-factor</property>
+                </sum>
+            </expression>
+        </input>
+        <input>
+            <condition>
+                <not>
+                    <property>/sim/rendering/shaders/skydome</property>
+                </not>
+                <greater-than>
+                    <property>/sim/model/material/instruments/factor</property>
+                    <property>/sim/model/c172p/lighting/dome-proc</property>
+                </greater-than>
+            </condition>
+            <expression>
+                <sum>
+                    <product>
+                        <property>/sim/model/material/instruments/factor</property>
+                        <value>1.0</value>
+                    </product>
+                    <property>/sim/model/c172p/lighting/flood-proc-red-factor</property>
+                </sum>
+            </expression>
+        </input>
+        <output>
+            <property>/sim/model/material/instruments/default-red-combined-factor</property>
+        </output>
+    </filter>
+    <filter>
+        <name>RGB Green Factor default renderer guages combined</name>
+        <type>gain</type>
+        <input>
+            <condition>
+                <not>
+                    <property>/sim/rendering/shaders/skydome</property>
+                </not>
+                <greater-than-equals>
+                    <property>/sim/model/c172p/lighting/dome-proc</property>
+                    <property>/sim/model/material/instruments/factor</property>
+                </greater-than-equals>
+            </condition>
+            <expression>
+                <sum>
+                    <product>
+                        <property>/sim/model/c172p/lighting/dome-proc</property>
+                        <value>0.8</value>
+                    </product>
+                    <property>/sim/model/c172p/lighting/flood-proc-green-factor</property>
+                </sum>
+            </expression>
+        </input>
+        <input>
+            <condition>
+                <not>
+                    <property>/sim/rendering/shaders/skydome</property>
+                </not>
+                <greater-than>
+                    <property>/sim/model/material/instruments/factor</property>
+                    <property>/sim/model/c172p/lighting/dome-proc</property>
+                </greater-than>
+            </condition>
+            <expression>
+                <sum>
+                    <product>
+                        <property>/sim/model/material/instruments/factor</property>
+                        <value>0.8</value>
+                    </product>
+                    <property>/sim/model/c172p/lighting/flood-proc-green-factor</property>
+                </sum>
+            </expression>
+        </input>
+        <output>
+             <property>/sim/model/material/instruments/default-green-combined-factor</property>
+        </output>
+    </filter>
+    <filter>
+        <name>RGB Blue Factor default renderer guages combined</name>
+        <type>gain</type>
+        <input>
+            <condition>
+                <not>
+                    <property>/sim/rendering/shaders/skydome</property>
+                </not>
+                <greater-than-equals>
+                    <property>/sim/model/c172p/lighting/dome-proc</property>
+                    <property>/sim/model/material/instruments/factor</property>
+                </greater-than-equals>
+            </condition>
+            <expression>
+                <sum>
+                    <product>
+                        <property>/sim/model/c172p/lighting/dome-proc</property>
+                        <value>0.5</value>
+                    </product>
+                    <property>/sim/model/c172p/lighting/flood-proc-blue-factor</property>
+                </sum>
+            </expression>
+        </input>
+        <input>
+            <condition>
+                <not>
+                    <property>/sim/rendering/shaders/skydome</property>
+                </not>
+                <greater-than>
+                    <property>/sim/model/material/instruments/factor</property>
+                    <property>/sim/model/c172p/lighting/dome-proc</property>
+                </greater-than>
+            </condition>
+            <expression>
+                <sum>
+                    <product>
+                        <property>/sim/model/material/instruments/factor</property>
+                        <value>0.5</value>
+                    </product>
+                    <property>/sim/model/c172p/lighting/flood-proc-blue-factor</property>
+                </sum>
+            </expression>
+        </input>
+        <output>
+             <property>/sim/model/material/instruments/default-blue-combined-factor</property>
+        </output>
+    </filter>
+
+    <!-- Used for default renderer overhead lighting (material animations) -->
+    <filter>
+        <type>gain</type>
+        <gain>.125</gain>
+        <input>/sim/model/lightmap/dome/factor</input>
+        <output>/sim/model/c172p/lighting/dome-default</output>
+    </filter>
+
+    <filter>
+        <type>gain</type>
+        <gain>.175</gain>
+        <input>/sim/model/lightmap/flood/factor</input>
+        <output>/sim/model/c172p/lighting/flood-default</output>
+    </filter>
+
+    <!-- Used for ALS procedural lights -->
     <filter>
         <type>gain</type>
         <gain>.25</gain>
         <input>/sim/model/lightmap/dome/factor</input>
         <output>/sim/model/c172p/lighting/dome-proc</output>
     </filter>
-
     <filter>
         <type>gain</type>
         <gain>.2</gain>
         <input>/sim/model/lightmap/flood/factor</input>
         <output>/sim/model/c172p/lighting/flood-proc</output>
     </filter>
-
     <filter>
         <type>gain</type>
         <gain>.25</gain>
         <input>/sim/model/lighting/courtesy/factor</input>
         <output>/sim/model/c172p/lighting/courtesy-proc</output>
     </filter>
-
     <filter>
         <type>gain</type>
         <gain>.35</gain>
@@ -579,6 +870,7 @@
         </input>
         <output>/sim/model/c172p/lighting/instrument-proc</output>
     </filter>
+
     <filter>
         <name>Interior Glass Glare Factor Dome</name>
         <type>gain</type>
diff --git a/Aircraft/c172p/c172p-set.xml b/Aircraft/c172p/c172p-set.xml
index b48b26988..8beff3bd9 100644
--- a/Aircraft/c172p/c172p-set.xml
+++ b/Aircraft/c172p/c172p-set.xml
@@ -43,7 +43,7 @@ http://forum.flightgear.org/viewtopic.php?f=4&t=25157
             <tag>fixed-gear</tag>
         </tags>
 
-        <author>Original by David Megginson, gsagostinho (Gilberto Agostinho), wlbragg (Wayne Bragg), Juanvvc (Juan Vera del Campo), onox, thevirtualfer, Dany93 (Daniel Dubreuil), dg-505 (Jonathan Schellhase), tigert (Tuomas Kuosmanen), AndersG (Anders Gidenstam), wkitty42 (Waldo Kitty), algefaen, Horacio, D-ECHO, Jarl Arntzen (jarlarntzen)</author>
+        <author>Original by David Megginson, gsagostinho (Gilberto Agostinho), wlbragg (Wayne Bragg), Juanvvc (Juan Vera del Campo), onox, thevirtualfer, Dany93 (Daniel Dubreuil), legoboyvdlp (Jonathan Redpath), dg-505 (Jonathan Schellhase), tigert (Tuomas Kuosmanen), AndersG (Anders Gidenstam), wkitty42 (Waldo Kitty), algefaen, Horacio, D-ECHO, Jarl Arntzen (jarlarntzen)</author>
 
         <status>advanced production</status>
         <aircraft-version>2018.3</aircraft-version>
@@ -143,17 +143,24 @@ http://forum.flightgear.org/viewtopic.php?f=4&t=25157
                 <lighting>
                     <taxi type="bool">false</taxi>
                     <landing type="bool">false</landing>
-                    <ra-r type="double">.05</ra-r>
-                    <ra-g type="double">.05</ra-g>
-                    <ra-b type="double">.03</ra-b>
+                    <ra-r-p type="double">.05</ra-r-p>
+                    <ra-g-p type="double">.05</ra-g-p>
+                    <ra-b-p type="double">.03</ra-b-p>
+                    <ra-r-r type="double">0.05</ra-r-r>
+                    <ra-g-r type="double">0.025</ra-g-r>
+                    <ra-b-r type="double">0.025</ra-b-r>
+                    <ra-r type="double">0.0</ra-r>
+                    <ra-g type="double">0.0</ra-g>
+                    <ra-b type="double">0.0</ra-b>
                     <dome-norm type="float">0</dome-norm>
                     <gps-norm type="float">0</gps-norm>
-                    <!--ra-r type="double">0.05</ra-r>
-                    <ra-g type="double">0.025</ra-g>
-                    <ra-b type="double">0.025</ra-b-->
                     <courtesy-lights>
                          <courtesy-on type="bool">false</courtesy-on>
                     </courtesy-lights>
+                    <!-- default renderer flood lighting-->
+                    <flood-red>  0.7</flood-red>
+                    <flood-green>0.3</flood-green>
+                    <flood-blue> 0.3</flood-blue>
                 </lighting>
 
                 <!-- Damage type (0 = normal, 1 = broken, 2 = damaged) used by model -->
@@ -305,7 +312,6 @@ http://forum.flightgear.org/viewtopic.php?f=4&t=25157
             <path>/engines/active-engine/complex-engine-procedures</path>
             <path>/sim/model/immat</path>
             <path>/controls/mooring/automatic</path>
-            <path>/save/valid-flag</path>
         </aircraft-data>
 
         <current-view>
@@ -726,6 +732,8 @@ http://forum.flightgear.org/viewtopic.php?f=4&t=25157
             <frequencies>
                 <dial-1-khz type="int">0</dial-1-khz>
                 <dial-100-khz type="int">0</dial-100-khz>
+                <standby-khz type="double">200.0</standby-khz>
+                <selected-khz type="double">200.0</selected-khz>
             </frequencies>
         </adf>
         <comm n="0">
@@ -733,6 +741,8 @@ http://forum.flightgear.org/viewtopic.php?f=4&t=25157
             <frequencies>
                 <dial-khz type="int">0</dial-khz>
                 <dial-mhz type="int">0</dial-mhz>
+                <standby-mhz type="double">118.0</standby-mhz>
+                <selected-mhz type="double">118.0</selected-mhz>
             </frequencies>
             <volume-selected type="double">0.7</volume-selected>
         </comm>
@@ -741,6 +751,8 @@ http://forum.flightgear.org/viewtopic.php?f=4&t=25157
             <frequencies>
                 <dial-khz type="int">0</dial-khz>
                 <dial-mhz type="int">0</dial-mhz>
+                <standby-mhz type="double">118.0</standby-mhz>
+                <selected-mhz type="double">118.0</selected-mhz>
             </frequencies>
             <volume-selected type="double">0.7</volume-selected>
         </comm>
@@ -749,6 +761,8 @@ http://forum.flightgear.org/viewtopic.php?f=4&t=25157
             <frequencies>
                 <dial-khz type="int">0</dial-khz>
                 <dial-mhz type="int">0</dial-mhz>
+                <standby-mhz type="double">108.0</standby-mhz>
+                <selected-mhz type="double">108.0</selected-mhz>
             </frequencies>
             <ident-audible type="bool">false</ident-audible>
         </nav>
@@ -757,6 +771,8 @@ http://forum.flightgear.org/viewtopic.php?f=4&t=25157
             <frequencies>
                 <dial-khz type="int">0</dial-khz>
                 <dial-mhz type="int">0</dial-mhz>
+                <standby-mhz type="double">108.0</standby-mhz>
+                <selected-mhz type="double">108.0</selected-mhz>
             </frequencies>
             <ident-audible type="bool">false</ident-audible>
         </nav>
@@ -1133,7 +1149,6 @@ http://forum.flightgear.org/viewtopic.php?f=4&t=25157
     <!-- End Damage Mod -->
 
     <save>
-        <valid-flag type="bool">false</valid-flag>
         <latitude-deg type="double">0.0</latitude-deg>
         <longitude-deg type="double">0.0</longitude-deg>
         <altitude-ft type="double">0.0</altitude-ft>
diff --git a/Aircraft/c172p/c172p.xml b/Aircraft/c172p/c172p.xml
index b7848e0c5..f487bfa47 100644
--- a/Aircraft/c172p/c172p.xml
+++ b/Aircraft/c172p/c172p.xml
@@ -976,7 +976,7 @@
                 <!-- Route back the (normalized) output of the <kinematic>
                      to its input in order to disable it.
                 -->
-                <test logic="or" value="gear/gear-pos-norm">
+                <test logic="OR" value="gear/gear-pos-norm">
                     /systems/electrical/outputs/instrument-lights le 20.0
                     /controls/switches/master-avionics eq 0
                 </test>