diff --git a/AI/Aircraft/A300/A300-main.xml b/AI/Aircraft/A300/A300-main.xml
index caa11b4e0..54f91bf91 100644
--- a/AI/Aircraft/A300/A300-main.xml
+++ b/AI/Aircraft/A300/A300-main.xml
@@ -42,10 +42,10 @@
     <type>select</type>
     <object-name>gear</object-name>
     <condition>
-      <less-than>
-        <property>velocities/true-airspeed-kt</property>
-        <value>190</value>
-      </less-than>
+      <greater-than>
+        <property>gear/gear[0]/position-norm</property>
+        <value>0.25</value>
+      </greater-than>
     </condition>
   </animation>
   <!-- Add Navigation Lights Objects -->
diff --git a/AI/Aircraft/A300/Lights/A300-NavLights.xml b/AI/Aircraft/A300/Lights/A300-NavLights.xml
index 1a783e139..b239a5d6d 100644
--- a/AI/Aircraft/A300/Lights/A300-NavLights.xml
+++ b/AI/Aircraft/A300/Lights/A300-NavLights.xml
@@ -78,7 +78,7 @@
   </model>
   <!-- Group Lights for Shared Animations -->
   <animation>
-    <name>StaticGrouped</name>
+    <name>NavGrouped</name>
     <object-name>nav-right</object-name>
     <object-name>nav-left</object-name>
     <object-name>nav-tail</object-name>
@@ -94,29 +94,28 @@
     <object-name>beacon-top</object-name>
     <object-name>beacon-bottom</object-name>
   </animation>
-  <!-- Show Static Lights & Beacons when aircraft is moving -->
   <animation>
     <type>select</type>
-    <object-name>StaticGrouped</object-name>
-    <object-name>BeaconGrouped</object-name>
+    <object-name>NavGrouped</object-name>
     <nopreview />
     <condition>
-      <greater-than>
-        <property>transponder-id</property>
-        <value type="string">0</value>
-      </greater-than>
+      <property>controls/lighting/nav</property>
     </condition>
   </animation>
-  <!-- Show Strobes when Aircraft on runway or airborne -->
   <animation>
     <type>select</type>
     <object-name>StrobeGrouped</object-name>
     <nopreview />
     <condition>
-      <greater-than>
-        <property>velocities/true-airspeed-kt</property>
-        <value>40</value>
-      </greater-than>
+      <property>controls/lighting/strobe</property>
+    </condition>
+  </animation>
+  <animation>
+    <type>select</type>
+    <object-name>BeaconGrouped</object-name>
+    <nopreview />
+    <condition>
+      <property>controls/lighting/beacon</property>
     </condition>
   </animation>
 </PropertyList>
\ No newline at end of file
diff --git a/AI/Aircraft/A300/Lights/AB6-NavLights.xml b/AI/Aircraft/A300/Lights/AB6-NavLights.xml
index 910da30db..78a40c31e 100644
--- a/AI/Aircraft/A300/Lights/AB6-NavLights.xml
+++ b/AI/Aircraft/A300/Lights/AB6-NavLights.xml
@@ -78,7 +78,7 @@
   </model>
   <!-- Group Lights for Shared Animations -->
   <animation>
-    <name>StaticGrouped</name>
+    <name>NavGrouped</name>
     <object-name>nav-right</object-name>
     <object-name>nav-left</object-name>
     <object-name>nav-tail</object-name>
@@ -94,29 +94,28 @@
     <object-name>beacon-top</object-name>
     <object-name>beacon-bottom</object-name>
   </animation>
-  <!-- Show Static Lights & Beacons when aircraft is moving -->
   <animation>
     <type>select</type>
-    <object-name>StaticGrouped</object-name>
-    <object-name>BeaconGrouped</object-name>
+    <object-name>NavGrouped</object-name>
     <nopreview />
     <condition>
-      <greater-than>
-        <property>transponder-id</property>
-        <value type="string">0</value>
-      </greater-than>
+      <property>controls/lighting/nav-lights</property>
     </condition>
   </animation>
-  <!-- Show Strobes when Aircraft on runway or airborne -->
   <animation>
     <type>select</type>
     <object-name>StrobeGrouped</object-name>
     <nopreview />
     <condition>
-      <greater-than>
-        <property>velocities/true-airspeed-kt</property>
-        <value>40</value>
-      </greater-than>
+      <property>controls/lighting/strobe</property>
+    </condition>
+  </animation>
+  <animation>
+    <type>select</type>
+    <object-name>BeaconGrouped</object-name>
+    <nopreview />
+    <condition>
+      <property>controls/lighting/beacon</property>
     </condition>
   </animation>
 </PropertyList>
\ No newline at end of file
diff --git a/AI/Aircraft/A319/A319-main.xml b/AI/Aircraft/A319/A319-main.xml
index 2a9e4cca7..3ceab344a 100644
--- a/AI/Aircraft/A319/A319-main.xml
+++ b/AI/Aircraft/A319/A319-main.xml
@@ -7,10 +7,10 @@
     <type>select</type>
     <object-name>gear</object-name>
     <condition>
-      <less-than>
-        <property>velocities/true-airspeed-kt</property>
-        <value>155</value>
-      </less-than>
+      <greater-than>
+        <property>gear/gear[0]/position-norm</property>
+        <value>0.25</value>
+      </greater-than>
     </condition>
   </animation>
   <!-- Add Navigation Lights Objects -->
diff --git a/AI/Aircraft/A319/Lights/A319-NavLights.xml b/AI/Aircraft/A319/Lights/A319-NavLights.xml
index 4b9cf6850..41f8e8f2f 100644
--- a/AI/Aircraft/A319/Lights/A319-NavLights.xml
+++ b/AI/Aircraft/A319/Lights/A319-NavLights.xml
@@ -78,7 +78,7 @@
   </model>
   <!-- Group Lights for Shared Animations -->
   <animation>
-    <name>StaticGrouped</name>
+    <name>NavGrouped</name>
     <object-name>nav-right</object-name>
     <object-name>nav-left</object-name>
     <object-name>nav-tail</object-name>
@@ -94,29 +94,28 @@
     <object-name>beacon-top</object-name>
     <object-name>beacon-bottom</object-name>
   </animation>
-  <!-- Show Static Lights & Beacons when aircraft is moving -->
   <animation>
     <type>select</type>
-    <object-name>StaticGrouped</object-name>
-    <object-name>BeaconGrouped</object-name>
+    <object-name>NavGrouped</object-name>
     <nopreview />
     <condition>
-      <greater-than>
-        <property>transponder-id</property>
-        <value type="string">0</value>
-      </greater-than>
+      <property>controls/lighting/nav-lights</property>
     </condition>
   </animation>
-  <!-- Show Strobes when Aircraft on runway or airborne -->
   <animation>
     <type>select</type>
     <object-name>StrobeGrouped</object-name>
     <nopreview />
     <condition>
-      <greater-than>
-        <property>velocities/true-airspeed-kt</property>
-        <value>40</value>
-      </greater-than>
+      <property>controls/lighting/strobe</property>
+    </condition>
+  </animation>
+  <animation>
+    <type>select</type>
+    <object-name>BeaconGrouped</object-name>
+    <nopreview />
+    <condition>
+      <property>controls/lighting/beacon</property>
     </condition>
   </animation>
 </PropertyList>
\ No newline at end of file
diff --git a/AI/Aircraft/A320/A320-main.xml b/AI/Aircraft/A320/A320-main.xml
index 6f78903f2..e1171fe2d 100644
--- a/AI/Aircraft/A320/A320-main.xml
+++ b/AI/Aircraft/A320/A320-main.xml
@@ -7,10 +7,10 @@
     <type>select</type>
     <object-name>320_gear</object-name>
     <condition>
-      <less-than>
-        <property>velocities/true-airspeed-kt</property>
-        <value>155</value>
-      </less-than>
+      <greater-than>
+        <property>gear/gear[0]/position-norm</property>
+        <value>0.25</value>
+      </greater-than>
     </condition>
   </animation>
   <!-- Add Navigation Lights Objects -->
diff --git a/AI/Aircraft/A320/Lights/A320-NavLights.xml b/AI/Aircraft/A320/Lights/A320-NavLights.xml
index d1e9ec672..11f2c6dfa 100644
--- a/AI/Aircraft/A320/Lights/A320-NavLights.xml
+++ b/AI/Aircraft/A320/Lights/A320-NavLights.xml
@@ -78,7 +78,7 @@
   </model>
   <!-- Group Lights for Shared Animations -->
   <animation>
-    <name>StaticGrouped</name>
+    <name>NavGrouped</name>
     <object-name>nav-right</object-name>
     <object-name>nav-left</object-name>
     <object-name>nav-tail</object-name>
@@ -94,29 +94,28 @@
     <object-name>beacon-top</object-name>
     <object-name>beacon-bottom</object-name>
   </animation>
-  <!-- Show Static Lights & Beacons when aircraft is moving -->
   <animation>
     <type>select</type>
-    <object-name>StaticGrouped</object-name>
-    <object-name>BeaconGrouped</object-name>
+    <object-name>NavGrouped</object-name>
     <nopreview />
     <condition>
-      <greater-than>
-        <property>transponder-id</property>
-        <value type="string">0</value>
-      </greater-than>
+      <property>controls/lighting/nav-lights</property>
     </condition>
   </animation>
-  <!-- Show Strobes when Aircraft on runway or airborne -->
   <animation>
     <type>select</type>
     <object-name>StrobeGrouped</object-name>
     <nopreview />
     <condition>
-      <greater-than>
-        <property>velocities/true-airspeed-kt</property>
-        <value>40</value>
-      </greater-than>
+      <property>controls/lighting/strobe</property>
+    </condition>
+  </animation>
+  <animation>
+    <type>select</type>
+    <object-name>BeaconGrouped</object-name>
+    <nopreview />
+    <condition>
+      <property>controls/lighting/beacon</property>
     </condition>
   </animation>
 </PropertyList>
\ No newline at end of file
diff --git a/AI/Aircraft/A321/A321-main.xml b/AI/Aircraft/A321/A321-main.xml
index a64e9a85b..9001ebe21 100644
--- a/AI/Aircraft/A321/A321-main.xml
+++ b/AI/Aircraft/A321/A321-main.xml
@@ -7,10 +7,10 @@
     <type>select</type>
     <object-name>gear</object-name>
     <condition>
-      <less-than>
-        <property>velocities/true-airspeed-kt</property>
-        <value>155</value>
-      </less-than>
+      <greater-than>
+        <property>gear/gear[0]/position-norm</property>
+        <value>0.25</value>
+      </greater-than>
     </condition>
   </animation>
   <!-- Add Navigation Lights Objects -->
diff --git a/AI/Aircraft/A321/Lights/A321-NavLights.xml b/AI/Aircraft/A321/Lights/A321-NavLights.xml
index 6db7c4e0a..0cbcde5d3 100644
--- a/AI/Aircraft/A321/Lights/A321-NavLights.xml
+++ b/AI/Aircraft/A321/Lights/A321-NavLights.xml
@@ -78,7 +78,7 @@
   </model>
   <!-- Group Lights for Shared Animations -->
   <animation>
-    <name>StaticGrouped</name>
+    <name>NavGrouped</name>
     <object-name>nav-right</object-name>
     <object-name>nav-left</object-name>
     <object-name>nav-tail</object-name>
@@ -94,29 +94,28 @@
     <object-name>beacon-top</object-name>
     <object-name>beacon-bottom</object-name>
   </animation>
-  <!-- Show Static Lights & Beacons when aircraft is moving -->
   <animation>
     <type>select</type>
-    <object-name>StaticGrouped</object-name>
-    <object-name>BeaconGrouped</object-name>
+    <object-name>NavGrouped</object-name>
     <nopreview />
     <condition>
-      <greater-than>
-        <property>transponder-id</property>
-        <value type="string">0</value>
-      </greater-than>
+      <property>controls/lighting/nav-lights</property>
     </condition>
   </animation>
-  <!-- Show Strobes when Aircraft on runway or airborne -->
   <animation>
     <type>select</type>
     <object-name>StrobeGrouped</object-name>
     <nopreview />
     <condition>
-      <greater-than>
-        <property>velocities/true-airspeed-kt</property>
-        <value>40</value>
-      </greater-than>
+      <property>controls/lighting/strobe</property>
+    </condition>
+  </animation>
+  <animation>
+    <type>select</type>
+    <object-name>BeaconGrouped</object-name>
+    <nopreview />
+    <condition>
+      <property>controls/lighting/beacon</property>
     </condition>
   </animation>
 </PropertyList>
\ No newline at end of file
diff --git a/AI/Aircraft/A332/A332-main.xml b/AI/Aircraft/A332/A332-main.xml
index fb4e732e5..cc8692fd7 100644
--- a/AI/Aircraft/A332/A332-main.xml
+++ b/AI/Aircraft/A332/A332-main.xml
@@ -8,10 +8,10 @@
     <type>select</type>
     <object-name>gear</object-name>
     <condition>
-      <less-than>
-        <property>velocities/true-airspeed-kt</property>
-        <value>165</value>
-      </less-than>
+      <greater-than>
+        <property>gear/gear[0]/position-norm</property>
+        <value>0.25</value>
+      </greater-than>
     </condition>
   </animation>
   <!-- Tail and Windows Lightmap Effect -->
diff --git a/AI/Aircraft/A332/A33X-main.xml b/AI/Aircraft/A332/A33X-main.xml
index 28abd7b0d..81f23a9d9 100644
--- a/AI/Aircraft/A332/A33X-main.xml
+++ b/AI/Aircraft/A332/A33X-main.xml
@@ -4,15 +4,14 @@
  <description>A330-200 Freighter</description>
  <author>3D Model Innis Cunningham, UV map liveries Brett Harrison</author> 
  <path>Models/A33X.ac</path>
-<!-- Show Gear only when speed under 200 knots for parking and taxi and take off phases -->
      <animation>
 		<type>select</type>
 		<object-name>gear</object-name>
 		<condition>
-			<less-than>
-				<property>velocities/true-airspeed-kt</property>
-				<value>165</value>
-			</less-than>
+			<greater-than>
+				<property>gear/gear[0]/position-norm</property>
+				<value>0.25</value>
+			</greater-than>
 		</condition>
 	</animation>
 <!-- Tail and Windows Lightmap Effect -->
diff --git a/AI/Aircraft/A332/Lights/332-NavLights.xml b/AI/Aircraft/A332/Lights/332-NavLights.xml
index ed0cfe8c7..1ee44cdc2 100644
--- a/AI/Aircraft/A332/Lights/332-NavLights.xml
+++ b/AI/Aircraft/A332/Lights/332-NavLights.xml
@@ -78,7 +78,7 @@
   </model>
   <!-- Group Lights for Shared Animations -->
   <animation>
-    <name>StaticGrouped</name>
+    <name>NavGrouped</name>
     <object-name>nav-right</object-name>
     <object-name>nav-left</object-name>
     <object-name>nav-tail</object-name>
@@ -94,29 +94,28 @@
     <object-name>beacon-top</object-name>
     <object-name>beacon-bottom</object-name>
   </animation>
-  <!-- Show Static Lights & Beacons when aircraft is moving -->
   <animation>
     <type>select</type>
-    <object-name>StaticGrouped</object-name>
-    <object-name>BeaconGrouped</object-name>
+    <object-name>NavGrouped</object-name>
     <nopreview />
     <condition>
-      <greater-than>
-        <property>transponder-id</property>
-        <value type="string">0</value>
-      </greater-than>
+      <property>controls/lighting/nav-lights</property>
     </condition>
   </animation>
-  <!-- Show Strobes when Aircraft on runway or airborne -->
   <animation>
     <type>select</type>
     <object-name>StrobeGrouped</object-name>
     <nopreview />
     <condition>
-      <greater-than>
-        <property>velocities/true-airspeed-kt</property>
-        <value>40</value>
-      </greater-than>
+      <property>controls/lighting/strobe</property>
+    </condition>
+  </animation>
+  <animation>
+    <type>select</type>
+    <object-name>BeaconGrouped</object-name>
+    <nopreview />
+    <condition>
+      <property>controls/lighting/beacon</property>
     </condition>
   </animation>
 </PropertyList>
\ No newline at end of file
diff --git a/AI/Aircraft/A333/A333-main.xml b/AI/Aircraft/A333/A333-main.xml
index b357bf499..990e79ebf 100644
--- a/AI/Aircraft/A333/A333-main.xml
+++ b/AI/Aircraft/A333/A333-main.xml
@@ -4,15 +4,14 @@
  <description>A330-300</description>
  <author>3D Model Innis Cunningham, UV map liveries Brett Harrison</author> 
  <path>Models/A333.ac</path>
-<!-- Show Gear only when speed under 200 knots for parking and taxi and take off phases -->  
      <animation>
 		<type>select</type>
 		<object-name>gear</object-name>
 		<condition>
-			<less-than>
-				<property>velocities/true-airspeed-kt</property>
-				<value>170</value>
-			</less-than>
+			<greater-than>
+				<property>gear/gear[0]/position-norm</property>
+				<value>0.25</value>
+			</greater-than>
 		</condition>
 	</animation>
 <!-- Tail and Windows Lightmap Effect -->
diff --git a/AI/Aircraft/A333/Lights/333-NavLights.xml b/AI/Aircraft/A333/Lights/333-NavLights.xml
index ebd6c8b0e..78edd039b 100644
--- a/AI/Aircraft/A333/Lights/333-NavLights.xml
+++ b/AI/Aircraft/A333/Lights/333-NavLights.xml
@@ -78,7 +78,7 @@
   </model>
   <!-- Group Lights for Shared Animations -->
   <animation>
-    <name>StaticGrouped</name>
+    <name>NavGrouped</name>
     <object-name>nav-right</object-name>
     <object-name>nav-left</object-name>
     <object-name>nav-tail</object-name>
@@ -94,46 +94,28 @@
     <object-name>beacon-top</object-name>
     <object-name>beacon-bottom</object-name>
   </animation>
-  <!-- Show Static Lights when aircraft is moving -->
   <animation>
     <type>select</type>
-    <object-name>StaticGrouped</object-name>
+    <object-name>NavGrouped</object-name>
     <nopreview />
     <condition>
-      <greater-than>
-        <property>transponder-id</property>
-        <value type="string">0</value>
-      </greater-than>
+      <property>controls/lighting/nav-lights</property>
     </condition>
   </animation>
-  <!-- Show Strobes when Aircraft on runway or airborne -->
   <animation>
     <type>select</type>
     <object-name>StrobeGrouped</object-name>
     <nopreview />
     <condition>
-      <greater-than>
-        <property>velocities/true-airspeed-kt</property>
-        <value>40</value>
-      </greater-than>
+      <property>controls/lighting/strobe</property>
     </condition>
   </animation>
-  <!-- Show Beacons when Transponder Active -->
   <animation>
     <type>select</type>
     <object-name>BeaconGrouped</object-name>
     <nopreview />
     <condition>
-      <and>
-        <greater-than>
-          <property>transponder-id</property>
-          <value type="string">0</value>
-        </greater-than>
-        <equals>
-          <property>valid</property>
-          <value type="bool">true</value>
-        </equals>
-      </and>
+      <property>controls/lighting/beacon</property>
     </condition>
   </animation>
 </PropertyList>
\ No newline at end of file
diff --git a/AI/Aircraft/A342/A342-main.xml b/AI/Aircraft/A342/A342-main.xml
index a3bca1413..443d5c219 100644
--- a/AI/Aircraft/A342/A342-main.xml
+++ b/AI/Aircraft/A342/A342-main.xml
@@ -4,15 +4,14 @@
  <description>A340-200</description>
  <author>3D Model Innis Cunningham, UV map liveries Brett Harrison</author> 
  <path>Models/A342.ac</path>
-<!-- Show Gear only when speed under 175 knots for parking and taxi and take off phases -->  
      <animation>
 		<type>select</type>
 		<object-name>gear</object-name>
 		<condition>
-			<less-than>
-				<property>velocities/true-airspeed-kt</property>
-				<value>175</value>
-			</less-than>
+			<greater-than>
+				<property>gear/gear[0]/position-norm</property>
+				<value>0.25</value>
+			</greater-than>
 		</condition>
 	</animation>
 <!-- Tail and Windows Lightmap Effect -->
diff --git a/AI/Aircraft/A342/Lights/342-NavLights.xml b/AI/Aircraft/A342/Lights/342-NavLights.xml
index a559c1f81..b3c31d560 100644
--- a/AI/Aircraft/A342/Lights/342-NavLights.xml
+++ b/AI/Aircraft/A342/Lights/342-NavLights.xml
@@ -78,7 +78,7 @@
   </model>
   <!-- Group Lights for Shared Animations -->
   <animation>
-    <name>StaticGrouped</name>
+    <name>NavGrouped</name>
     <object-name>nav-right</object-name>
     <object-name>nav-left</object-name>
     <object-name>nav-tail</object-name>
@@ -94,29 +94,28 @@
     <object-name>beacon-top</object-name>
     <object-name>beacon-bottom</object-name>
   </animation>
-   <!-- Show Static Lights & Beacons when aircraft is moving -->
   <animation>
     <type>select</type>
-    <object-name>StaticGrouped</object-name>
-    <object-name>BeaconGrouped</object-name>
+    <object-name>NavGrouped</object-name>
     <nopreview />
     <condition>
-      <greater-than>
-        <property>transponder-id</property>
-        <value type="string">0</value>
-      </greater-than>
+      <property>controls/lighting/nav-lights</property>
     </condition>
   </animation>
-  <!-- Show Strobes when Aircraft on runway or airborne -->
   <animation>
     <type>select</type>
     <object-name>StrobeGrouped</object-name>
     <nopreview />
     <condition>
-      <greater-than>
-        <property>velocities/true-airspeed-kt</property>
-        <value>40</value>
-      </greater-than>
+      <property>controls/lighting/strobe</property>
+    </condition>
+  </animation>
+  <animation>
+    <type>select</type>
+    <object-name>BeaconGrouped</object-name>
+    <nopreview />
+    <condition>
+      <property>controls/lighting/beacon</property>
     </condition>
   </animation>
 </PropertyList>
\ No newline at end of file
diff --git a/AI/Aircraft/A343/A343-main.xml b/AI/Aircraft/A343/A343-main.xml
index 26a7b85d8..2721215ff 100644
--- a/AI/Aircraft/A343/A343-main.xml
+++ b/AI/Aircraft/A343/A343-main.xml
@@ -3,15 +3,14 @@
   <description>A340-300</description>
   <author>3D Model Innis Cunningham, UV map liveries Brett Harrison</author>
   <path>Models/A343.ac</path>
-  <!-- Show Gear only when speed under 200 knots for parking and taxi and take off phases -->
   <animation>
     <type>select</type>
     <object-name>gear</object-name>
     <condition>
-      <less-than>
-        <property>velocities/true-airspeed-kt</property>
-        <value>175</value>
-      </less-than>
+      <greater-than>
+        <property>gear/gear[0]/position-norm</property>
+        <value>0.25</value>
+      </greater-than>
     </condition>
   </animation>
   <!-- Tail and Windows Lightmap Effect -->
diff --git a/AI/Aircraft/A343/Lights/343-NavLights.xml b/AI/Aircraft/A343/Lights/343-NavLights.xml
index 4abd98a86..5688f2d3b 100644
--- a/AI/Aircraft/A343/Lights/343-NavLights.xml
+++ b/AI/Aircraft/A343/Lights/343-NavLights.xml
@@ -78,7 +78,7 @@
   </model>
   <!-- Group Lights for Shared Animations -->
   <animation>
-    <name>StaticGrouped</name>
+    <name>NavGrouped</name>
     <object-name>nav-right</object-name>
     <object-name>nav-left</object-name>
     <object-name>nav-tail</object-name>
@@ -94,29 +94,28 @@
     <object-name>beacon-top</object-name>
     <object-name>beacon-bottom</object-name>
   </animation>
-   <!-- Show Static Lights & Beacons when aircraft is moving -->
   <animation>
     <type>select</type>
-    <object-name>StaticGrouped</object-name>
-    <object-name>BeaconGrouped</object-name>
+    <object-name>NavGrouped</object-name>
     <nopreview />
     <condition>
-      <greater-than>
-        <property>transponder-id</property>
-        <value type="string">0</value>
-      </greater-than>
+      <property>controls/lighting/nav-lights</property>
     </condition>
   </animation>
-  <!-- Show Strobes when Aircraft on runway or airborne -->
   <animation>
     <type>select</type>
     <object-name>StrobeGrouped</object-name>
     <nopreview />
     <condition>
-      <greater-than>
-        <property>velocities/true-airspeed-kt</property>
-        <value>40</value>
-      </greater-than>
+      <property>controls/lighting/strobe</property>
+    </condition>
+  </animation>
+  <animation>
+    <type>select</type>
+    <object-name>BeaconGrouped</object-name>
+    <nopreview />
+    <condition>
+      <property>controls/lighting/beacon</property>
     </condition>
   </animation>
 </PropertyList>
\ No newline at end of file
diff --git a/AI/Aircraft/A345/A345-main.xml b/AI/Aircraft/A345/A345-main.xml
index d083bde9a..7bcda266f 100644
--- a/AI/Aircraft/A345/A345-main.xml
+++ b/AI/Aircraft/A345/A345-main.xml
@@ -3,15 +3,14 @@
   <description>A340-500</description>
   <author>3D Model Innis Cunningham, UV map liveries Brett Harrison</author>
   <path>Models/A345.ac</path>
-  <!-- Show Gear only when speed under 175 knots for parking and taxi and take off phases -->
   <animation>
     <type>select</type>
     <object-name>gear</object-name>
     <condition>
-      <less-than>
-        <property>velocities/true-airspeed-kt</property>
-        <value>175</value>
-      </less-than>
+      <greater-than>
+        <property>gear/gear[0]/position-norm</property>
+        <value>0.25</value>
+      </greater-than>
     </condition>
   </animation>
   <!-- Tail and Windows Lightmap Effect -->
diff --git a/AI/Aircraft/A345/Lights/345-NavLights.xml b/AI/Aircraft/A345/Lights/345-NavLights.xml
index b2baf45b1..ba31352e8 100644
--- a/AI/Aircraft/A345/Lights/345-NavLights.xml
+++ b/AI/Aircraft/A345/Lights/345-NavLights.xml
@@ -78,7 +78,7 @@
   </model>
   <!-- Group Lights for Shared Animations -->
   <animation>
-    <name>StaticGrouped</name>
+    <name>NavGrouped</name>
     <object-name>nav-right</object-name>
     <object-name>nav-left</object-name>
     <object-name>nav-tail</object-name>
@@ -94,29 +94,28 @@
     <object-name>beacon-top</object-name>
     <object-name>beacon-bottom</object-name>
   </animation>
-   <!-- Show Static Lights & Beacons when aircraft is moving -->
   <animation>
     <type>select</type>
-    <object-name>StaticGrouped</object-name>
-    <object-name>BeaconGrouped</object-name>
+    <object-name>NavGrouped</object-name>
     <nopreview />
     <condition>
-      <greater-than>
-        <property>transponder-id</property>
-        <value type="string">0</value>
-      </greater-than>
+      <property>controls/lighting/nav-lights</property>
     </condition>
   </animation>
-  <!-- Show Strobes when Aircraft on runway or airborne -->
   <animation>
     <type>select</type>
     <object-name>StrobeGrouped</object-name>
     <nopreview />
     <condition>
-      <greater-than>
-        <property>velocities/true-airspeed-kt</property>
-        <value>40</value>
-      </greater-than>
+      <property>controls/lighting/strobe</property>
+    </condition>
+  </animation>
+  <animation>
+    <type>select</type>
+    <object-name>BeaconGrouped</object-name>
+    <nopreview />
+    <condition>
+      <property>controls/lighting/beacon</property>
     </condition>
   </animation>
 </PropertyList>
\ No newline at end of file
diff --git a/AI/Aircraft/A346/A346-main.xml b/AI/Aircraft/A346/A346-main.xml
index 1e4b4c63d..d0b69d163 100644
--- a/AI/Aircraft/A346/A346-main.xml
+++ b/AI/Aircraft/A346/A346-main.xml
@@ -3,15 +3,14 @@
   <description>A340-600</description>
   <author>3D Model Innis Cunningham, UV map liveries Brett Harrison</author>
   <path>Models/A346.ac</path>
-  <!-- Show Gear only when speed under 175 knots for parking and taxi and take off phases -->
   <animation>
     <type>select</type>
     <object-name>gear</object-name>
     <condition>
-      <less-than>
-        <property>velocities/true-airspeed-kt</property>
-        <value>175</value>
-      </less-than>
+      <greater-than>
+        <property>gear/gear[0]/position-norm</property>
+        <value>0.25</value>
+      </greater-than>
     </condition>
   </animation>
   <!-- Tail and Windows Lightmap Effect -->
diff --git a/AI/Aircraft/A346/Lights/346-NavLights.xml b/AI/Aircraft/A346/Lights/346-NavLights.xml
index e4c672290..a40926800 100644
--- a/AI/Aircraft/A346/Lights/346-NavLights.xml
+++ b/AI/Aircraft/A346/Lights/346-NavLights.xml
@@ -78,7 +78,7 @@
   </model>
   <!-- Group Lights for Shared Animations -->
   <animation>
-    <name>StaticGrouped</name>
+    <name>NavGrouped</name>
     <object-name>nav-right</object-name>
     <object-name>nav-left</object-name>
     <object-name>nav-tail</object-name>
@@ -94,29 +94,28 @@
     <object-name>beacon-top</object-name>
     <object-name>beacon-bottom</object-name>
   </animation>
-   <!-- Show Static Lights & Beacons when aircraft is moving -->
   <animation>
     <type>select</type>
-    <object-name>StaticGrouped</object-name>
-    <object-name>BeaconGrouped</object-name>
+    <object-name>NavGrouped</object-name>
     <nopreview />
     <condition>
-      <greater-than>
-        <property>transponder-id</property>
-        <value type="string">0</value>
-      </greater-than>
+      <property>controls/lighting/nav-lights</property>
     </condition>
   </animation>
-  <!-- Show Strobes when Aircraft on runway or airborne -->
   <animation>
     <type>select</type>
     <object-name>StrobeGrouped</object-name>
     <nopreview />
     <condition>
-      <greater-than>
-        <property>velocities/true-airspeed-kt</property>
-        <value>40</value>
-      </greater-than>
+      <property>controls/lighting/strobe</property>
+    </condition>
+  </animation>
+  <animation>
+    <type>select</type>
+    <object-name>BeaconGrouped</object-name>
+    <nopreview />
+    <condition>
+      <property>controls/lighting/beacon</property>
     </condition>
   </animation>
 </PropertyList>
\ No newline at end of file
diff --git a/AI/Aircraft/A350/Lights/359-NavLights.xml b/AI/Aircraft/A350/Lights/359-NavLights.xml
index 876ada1b0..496e13fd3 100644
--- a/AI/Aircraft/A350/Lights/359-NavLights.xml
+++ b/AI/Aircraft/A350/Lights/359-NavLights.xml
@@ -78,7 +78,7 @@
   </model>
   <!-- Group Lights for Shared Animations -->
   <animation>
-    <name>StaticGrouped</name>
+    <name>NavGrouped</name>
     <object-name>nav-right</object-name>
     <object-name>nav-left</object-name>
     <object-name>nav-tail</object-name>
@@ -94,29 +94,28 @@
     <object-name>beacon-top</object-name>
     <object-name>beacon-bottom</object-name>
   </animation>
-   <!-- Show Static Lights & Beacons when aircraft is moving -->
   <animation>
     <type>select</type>
-    <object-name>StaticGrouped</object-name>
-    <object-name>BeaconGrouped</object-name>
+    <object-name>NavGrouped</object-name>
     <nopreview />
     <condition>
-      <greater-than>
-        <property>transponder-id</property>
-        <value type="string">0</value>
-      </greater-than>
+      <property>controls/lighting/nav-lights</property>
     </condition>
   </animation>
-  <!-- Show Strobes when Aircraft on runway or airborne -->
   <animation>
     <type>select</type>
     <object-name>StrobeGrouped</object-name>
     <nopreview />
     <condition>
-      <greater-than>
-        <property>velocities/true-airspeed-kt</property>
-        <value>40</value>
-      </greater-than>
+      <property>controls/lighting/strobe</property>
+    </condition>
+  </animation>
+  <animation>
+    <type>select</type>
+    <object-name>BeaconGrouped</object-name>
+    <nopreview />
+    <condition>
+      <property>controls/lighting/beacon</property>
     </condition>
   </animation>
 </PropertyList>
\ No newline at end of file
diff --git a/AI/Aircraft/A380/Lights/388-NavLights.xml b/AI/Aircraft/A380/Lights/388-NavLights.xml
index 2225aa41d..ebbe2a65f 100644
--- a/AI/Aircraft/A380/Lights/388-NavLights.xml
+++ b/AI/Aircraft/A380/Lights/388-NavLights.xml
@@ -78,7 +78,7 @@
   </model>
   <!-- Group Lights for Shared Animations -->
   <animation>
-    <name>StaticGrouped</name>
+    <name>NavGrouped</name>
     <object-name>nav-right</object-name>
     <object-name>nav-left</object-name>
     <object-name>nav-tail</object-name>
@@ -94,29 +94,29 @@
     <object-name>beacon-top</object-name>
     <object-name>beacon-bottom</object-name>
   </animation>
-   <!-- Show Static Lights & Beacons when aircraft is moving -->
   <animation>
     <type>select</type>
-    <object-name>StaticGrouped</object-name>
-    <object-name>BeaconGrouped</object-name>
+    <object-name>NavGrouped</object-name>
     <nopreview />
     <condition>
-      <greater-than>
-        <property>transponder-id</property>
-        <value type="string">0</value>
-      </greater-than>
+      <property>controls/lighting/nav-lights</property>
     </condition>
   </animation>
-  <!-- Show Strobes when Aircraft on runway or airborne -->
   <animation>
     <type>select</type>
     <object-name>StrobeGrouped</object-name>
     <nopreview />
     <condition>
-      <greater-than>
-        <property>velocities/true-airspeed-kt</property>
-        <value>40</value>
-      </greater-than>
+      <property>controls/lighting/strobe</property>
     </condition>
   </animation>
+  <animation>
+    <type>select</type>
+    <object-name>BeaconGrouped</object-name>
+    <nopreview />
+    <condition>
+      <property>controls/lighting/beacon</property>
+    </condition>
+  </animation>
+
 </PropertyList>
\ No newline at end of file