diff --git a/AI/Aircraft/AT5/AT5-main.xml b/AI/Aircraft/AT5/AT5-main.xml
index 27cbeeadd..137ef0dee 100644
--- a/AI/Aircraft/AT5/AT5-main.xml
+++ b/AI/Aircraft/AT5/AT5-main.xml
@@ -92,14 +92,4 @@
   <model>
     <path>Lights/AT5-NavLights.xml</path>
   </model>
-  <!-- Enable Beacons and Strobes Pulse Behaviour -->
-  <nasal>
-    <load><![CDATA[
-        aircraft.light.new("/sim/model/ATR/lighting/beacon", [0.7, 1.3]);
-        aircraft.light.new("/sim/model/ATR/lighting/strobes", [0.02, 1.98]);
-        setprop("/sim/model/ATR/lighting/beacon/enabled", 1);
-        setprop("/sim/model/ATR/lighting/strobes/enabled", 1);
-      ]]></load>
-    <unload></unload>
-  </nasal>
 </PropertyList>
\ No newline at end of file
diff --git a/AI/Aircraft/AT5/Lights/AT5-NavLights.xml b/AI/Aircraft/AT5/Lights/AT5-NavLights.xml
index 55805fbb7..5cb86c9b2 100644
--- a/AI/Aircraft/AT5/Lights/AT5-NavLights.xml
+++ b/AI/Aircraft/AT5/Lights/AT5-NavLights.xml
@@ -1,218 +1,94 @@
 <?xml version="1.0"?>
+<!-- Author Ian (Yves Tolosa) - AUG 2018 -->
 <PropertyList>
-  <!-- Load Lights Models -->
-  <path>../../../Lights/NavLights.xml</path>
-  <!-- Re-Position Static Light from 0,0,0 onto their final Position -->
-  <animation>
-    <type>translate</type>
-    <object-name>Left_Wing_Static_Red</object-name>
-    <offset-m>12.85</offset-m>
-    <axis>
-      <x>-0.4322</x>
-      <y>-12.2028</y>
-      <z>3.84551</z>
-    </axis>
-  </animation>
-  <animation>
-    <type>translate</type>
-    <object-name>Right_Wing_Static_Green</object-name>
-    <offset-m>12.85</offset-m>
-    <axis>
-      <x>-0.4322</x>
-      <y>12.2028</y>
-      <z>3.84551</z>
-    </axis>
-  </animation>
-  <animation>
-    <type>translate</type>
-    <object-name>Tail_Static_White</object-name>
-    <offset-m>12.80</offset-m>
-    <axis>
-      <x>12.5202</x>
-      <y> 0</y>
-      <z>2.61542</z>
-    </axis>
-  </animation>
-  <!-- Re-Position Strobe Light from 0,0,0 onto their final Position -->
-  <animation>
-    <type>translate</type>
-    <object-name>Left_Wing_Strobe</object-name>
-    <offset-m>12.55</offset-m>
-    <axis>
-      <x>-0.80016</x>
-      <y>-11.9058</y>
-      <z>3.83404</z>
-    </axis>
-  </animation>
-  <animation>
-    <type>translate</type>
-    <object-name>Right_Wing_Strobe</object-name>
-    <offset-m>12.55</offset-m>
-    <axis>
-      <x>-0.80016</x>
-      <y>11.9058</y>
-      <z>3.83404</z>
-    </axis>
-  </animation>
-  <animation>
-    <type>translate</type>
-    <object-name>Tail_Strobe</object-name>
-    <offset-m>12.85</offset-m>
-    <axis>
-      <x>12.5202</x>
-      <y> 0</y>
-      <z>2.61542</z>
-    </axis>
-  </animation>
-  <!-- Re-Position Beacons from 0,0,0 onto their final Position -->
-  <animation>
-    <type>translate</type>
-    <object-name>Top_Beacon_Red</object-name>
-    <offset-m>13.30</offset-m>
-    <axis>
-      <x>10.9969</x>
-      <y> 0</y>
-      <z>7.38903</z>
-    </axis>
-  </animation>
-  <animation>
-    <type>translate</type>
-    <object-name>Bottom_Beacon_Red</object-name>
-    <offset-m>0.4</offset-m>
-    <axis>
-      <x>-0.09764</x>
-      <y> 0</y>
-      <z>0.41179</z>
-    </axis>
-  </animation>
+  <!-- Position ALS Navigation Lights -->
+  <model>
+    <name>nav-right</name>
+    <path>AI/Lights/procedural_light_nav_right.xml</path>
+    <offsets>
+      <x-m>-0.54813</x-m>
+      <y-m>12.0663</y-m>
+      <z-m>3.84024</z-m>
+    </offsets>
+  </model>
+  <model>
+    <name>nav-left</name>
+    <path>AI/Lights/procedural_light_nav_left.xml</path>
+    <offsets>
+      <x-m>-0.54813</x-m>
+      <y-m>-12.0663</y-m>
+      <z-m>3.84024</z-m>
+    </offsets>
+  </model>
+  <model>
+    <name>nav-tail</name>
+    <path>AI/Lights/procedural_light_nav_tail.xml</path>
+    <offsets>
+      <x-m>12.6</x-m>
+      <y-m>0</y-m>
+      <z-m>2.61542</z-m>
+    </offsets>
+  </model>
+  <!-- Position ALS Strobes -->
+  <model>
+    <name>strobe-right</name>
+    <path>AI/Lights/procedural_light_strobe_right.xml</path>
+    <offsets>
+      <x-m>-0.30779</x-m>
+      <y-m>12.233</y-m>
+      <z-m>3.9</z-m>
+    </offsets>
+  </model>
+  <model>
+    <name>strobe-left</name>
+    <path>AI/Lights/procedural_light_strobe_left.xml</path>
+    <offsets>
+      <x-m>-0.30779</x-m>
+      <y-m>-12.233</y-m>
+      <z-m>3.9</z-m>
+    </offsets>
+  </model>
+  <model>
+    <name>strobe-tail</name>
+    <path>AI/Lights/procedural_light_strobe_tail.xml</path>
+    <offsets>
+      <x-m>11.3423</x-m>
+      <y-m>0</y-m>
+      <z-m>7.35764</z-m>
+    </offsets>
+  </model>
+  <!-- Position Beacons -->
+   <model>
+    <name>beacon-bottom</name>
+    <path>AI/Lights/procedural_light_beacon_bottom.xml</path>
+    <offsets>
+      <x-m>-0.99501</x-m>
+      <y-m>0</y-m>
+      <z-m>0.41179</z-m>
+    </offsets>
+  </model>
   <!-- Group Lights for Shared Animations -->
   <animation>
     <name>StaticGrouped</name>
-    <object-name>Left_Wing_Static_Red</object-name>
-    <object-name>Right_Wing_Static_Green</object-name>
-    <object-name>Tail_Static_White</object-name>
+    <object-name>nav-right</object-name>
+    <object-name>nav-left</object-name>
+    <object-name>nav-tail</object-name>
   </animation>
   <animation>
     <name>StrobeGrouped</name>
-    <object-name>Left_Wing_Strobe</object-name>
-    <object-name>Right_Wing_Strobe</object-name>
-    <object-name>Tail_Strobe</object-name>
+    <object-name>strobe-right</object-name>
+    <object-name>strobe-left</object-name>
+    <object-name>strobe-tail</object-name>
   </animation>
   <animation>
     <name>BeaconGrouped</name>
-    <object-name>Top_Beacon_Red</object-name>
-    <object-name>Bottom_Beacon_Red</object-name>
+    <object-name>beacon-bottom</object-name>
   </animation>
-  <!-- Do not compute or show transparent pixels when Rembrand is disabled -->
-  <animation>
-    <type>alpha-test</type>
-    <object-name>StaticGrouped</object-name>
-    <object-name>StrobeGrouped</object-name>
-    <object-name>BeaconGrouped</object-name>
-    <alpha-factor>0.4</alpha-factor>
-  </animation>
-  <!-- Make Navigation lights transparent when Rembrandt is enabled -->
-  <effect>
-    <inherits-from>Effects/model-transparent</inherits-from>
-    <condition>
-      <property>sim/rendering/rembrandt/enabled</property>
-    </condition>
-    <object-name>Left_Wing_Static_Red</object-name>
-    <object-name>Right_Wing_Static_Green</object-name>
-    <object-name>Tail_Static_White</object-name>
-  </effect>
-  <!-- Lights are Emissive -->
-  <animation>
-    <type>material</type>
-    <object-name>StaticGrouped</object-name>
-    <object-name>StrobeGrouped</object-name>
-    <object-name>BeaconGrouped</object-name>
-    <emission>
-      <red>1</red>
-      <green>1</green>
-      <blue>1</blue>
-    </emission>
-  </animation>
-  <!-- Lights always face viewer -->
-  <animation>
-    <type>billboard</type>
-    <object-name>StaticGrouped</object-name>
-    <object-name>StrobeGrouped</object-name>
-    <object-name>BeaconGrouped</object-name>
-    <spherical type="bool">true</spherical>
-  </animation>
-  <!-- Lights do not cast shadows -->
-  <animation>
-    <type>noshadow</type>
-    <object-name>StaticGrouped</object-name>
-    <object-name>StrobeGrouped</object-name>
-    <object-name>BeaconGrouped</object-name>
-  </animation>
-  <!-- Scale Static Lights based on Distance from Viewer -->
-  <animation>
-    <type>dist-scale</type>
-    <object-name>StaticGrouped</object-name>
-    <factor>0.0002</factor>
-    <offset>0.0</offset>
-    <min>0.1</min>
-    <max>40</max>
-  </animation>
-  <!-- Scale Beacon Lights based on Distance from Viewer -->
-  <animation>
-    <type>dist-scale</type>
-    <object-name>BeaconGrouped</object-name>
-    <factor>0.0002</factor>
-    <offset>0.0</offset>
-    <min>0.1</min>
-    <max>40</max>
-  </animation>
-  <!-- Scale Strobe Lights based on Distance from Viewer -->
-  <animation>
-    <type>dist-scale</type>
-    <object-name>StrobeGrouped</object-name>
-    <factor>0.0004</factor>
-    <offset>0.0</offset>
-    <min>0.1</min>
-    <max>40</max>
-  </animation>
-  <!-- Show Beacons when Aircraft is moving -->
-  <animation>
-    <type>select</type>
-    <object-name>BeaconGrouped</object-name>
-    <nopreview />
-    <condition>
-      <and>
-        <property>/sim/model/ATR/lighting/beacon/state</property>
-        <greater-than>
-          <property>transponder-id</property>
-          <value type="string">0</value>
-        </greater-than>
-        <equals>
-          <property>valid</property>
-          <value type="bool">true</value>
-        </equals>
-      </and>
-    </condition>
-  </animation>
-  <!-- Show Strobes when Aircraft on runway or airborne -->
-  <animation>
-    <type>select</type>
-    <object-name>StrobeGrouped</object-name>
-    <nopreview />
-    <condition>
-      <and>
-        <property>/sim/model/ATR/lighting/strobes/state</property>
-        <greater-than>
-          <property>velocities/true-airspeed-kt</property>
-          <value>40</value>
-        </greater-than>
-      </and>
-    </condition>
-  </animation>
-  <!-- Show Static Lights when aircraft is moving -->
+   <!-- Show Static Lights & Beacons when aircraft is moving -->
   <animation>
     <type>select</type>
     <object-name>StaticGrouped</object-name>
+    <object-name>BeaconGrouped</object-name>
     <nopreview />
     <condition>
       <greater-than>
@@ -221,4 +97,16 @@
       </greater-than>
     </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>
+    </condition>
+  </animation>
 </PropertyList>
\ No newline at end of file
diff --git a/AI/Aircraft/AT7/AT7-main.xml b/AI/Aircraft/AT7/AT7-main.xml
index 1e1fbcd74..491c306e9 100644
--- a/AI/Aircraft/AT7/AT7-main.xml
+++ b/AI/Aircraft/AT7/AT7-main.xml
@@ -1,63 +1,52 @@
 <?xml version="1.0"?>
 <PropertyList>
- <description>ATR 72-500</description>
- <author>Ian Tolosa</author>
- <path>Models/AT7.ac</path>
-  
+  <description>ATR 72-500</description>
+  <author>Ian Tolosa</author>
+  <path>Models/AT7.ac</path>
   <offsets>
-	<pitch-deg>-0.75</pitch-deg>   
+    <pitch-deg>-0.75</pitch-deg>
   </offsets>
- 
-  
- <animation>
-	<type>select</type>
-		<object-name>Gear_Open</object-name>
-		<condition>
-			<less-than>
-				<property>velocities/true-airspeed-kt</property>
-				<value>120</value>
-			</less-than>
-		</condition>
-	</animation>
-	
-	 <animation>
-	<type>select</type>
-		<object-name>Gear_Closed</object-name>
-		<condition>
-			<greater-than-equals>
-				<property>velocities/true-airspeed-kt</property>
-				<value>120</value>
-			</greater-than-equals>
-		</condition>
-	</animation>
-	
-	
-	
-	<animation>
-	<type>select</type>
-		<object-name>Prop_Blur_L</object-name>
-		<condition>
-			<greater-than-equals>
-				<property>velocities/true-airspeed-kt</property>
-				<value>15</value>
-			</greater-than-equals>
-		</condition>
-	</animation>
-	
-	<animation>
-	<type>select</type>
-		<object-name>Prop_Blur_R</object-name>
-		<condition>
-			<greater-than-equals>
-				<property>velocities/true-airspeed-kt</property>
-				<value>15</value>
-			</greater-than-equals>
-		</condition>
-	</animation>
-	
-
-	
-	<animation>
+  <animation>
+    <type>select</type>
+    <object-name>Gear_Open</object-name>
+    <condition>
+      <less-than>
+        <property>velocities/true-airspeed-kt</property>
+        <value>120</value>
+      </less-than>
+    </condition>
+  </animation>
+  <animation>
+    <type>select</type>
+    <object-name>Gear_Closed</object-name>
+    <condition>
+      <greater-than-equals>
+        <property>velocities/true-airspeed-kt</property>
+        <value>120</value>
+      </greater-than-equals>
+    </condition>
+  </animation>
+  <animation>
+    <type>select</type>
+    <object-name>Prop_Blur_L</object-name>
+    <condition>
+      <greater-than-equals>
+        <property>velocities/true-airspeed-kt</property>
+        <value>15</value>
+      </greater-than-equals>
+    </condition>
+  </animation>
+  <animation>
+    <type>select</type>
+    <object-name>Prop_Blur_R</object-name>
+    <condition>
+      <greater-than-equals>
+        <property>velocities/true-airspeed-kt</property>
+        <value>15</value>
+      </greater-than-equals>
+    </condition>
+  </animation>
+  <animation>
     <type>spin</type>
     <object-name>Prop_L</object-name>
     <property>velocities/true-airspeed-kt</property>
@@ -72,9 +61,8 @@
       <y>0.000</y>
       <z>0.000</z>
     </axis>
-  </animation> 
-	
-<animation>
+  </animation>
+  <animation>
     <type>spin</type>
     <object-name>Prop_R</object-name>
     <property>velocities/true-airspeed-kt</property>
@@ -89,8 +77,9 @@
       <y>0.000</y>
       <z>0.000</z>
     </axis>
-  </animation> 
-	
-	
-	
-</PropertyList>
+  </animation>
+    <!-- Add Navigation Lights Objects -->
+  <model>
+    <path>Lights/AT7-NavLights.xml</path>
+  </model>
+</PropertyList>
\ No newline at end of file
diff --git a/AI/Aircraft/AT7/Lights/AT7-NavLights.xml b/AI/Aircraft/AT7/Lights/AT7-NavLights.xml
new file mode 100644
index 000000000..dc4b7e128
--- /dev/null
+++ b/AI/Aircraft/AT7/Lights/AT7-NavLights.xml
@@ -0,0 +1,112 @@
+<?xml version="1.0"?>
+<!-- Author Ian (Yves Tolosa) - AUG 2018 -->
+<PropertyList>
+  <!-- Position ALS Navigation Lights -->
+  <model>
+    <name>nav-right</name>
+    <path>AI/Lights/procedural_light_nav_right.xml</path>
+    <offsets>
+      <x-m>-0.8767</x-m>
+      <y-m>12.8882</y-m>
+      <z-m>3.77984</z-m>
+    </offsets>
+  </model>
+  <model>
+    <name>nav-left</name>
+    <path>AI/Lights/procedural_light_nav_left.xml</path>
+    <offsets>
+      <x-m>-0.8767</x-m>
+      <y-m>-12.8882</y-m>
+      <z-m>3.77984</z-m>
+    </offsets>
+  </model>
+  <model>
+    <name>nav-tail</name>
+    <path>AI/Lights/procedural_light_nav_tail.xml</path>
+    <offsets>
+      <x-m>14.7</x-m>
+      <y-m>0</y-m>
+      <z-m>2.60845</z-m>
+    </offsets>
+  </model>
+  <!-- Position ALS Strobes -->
+  <model>
+    <name>strobe-right</name>
+    <path>AI/Lights/procedural_light_strobe_right.xml</path>
+    <offsets>
+      <x-m>-0.28345</x-m>
+      <y-m>13.5226</y-m>
+      <z-m>3.80199</z-m>
+    </offsets>
+  </model>
+  <model>
+    <name>strobe-left</name>
+    <path>AI/Lights/procedural_light_strobe_left.xml</path>
+    <offsets>
+      <x-m>-0.28345</x-m>
+      <y-m>-13.5226</y-m>
+      <z-m>3.80199</z-m>
+    </offsets>
+  </model>
+  <model>
+    <name>strobe-tail</name>
+    <path>AI/Lights/procedural_light_strobe_tail.xml</path>
+    <offsets>
+      <x-m>13.4779</x-m>
+      <y-m>0</y-m>
+      <z-m>7.4</z-m>
+    </offsets>
+  </model>
+  <!-- Position Beacons -->
+  <model>
+    <name>beacon-bottom</name>
+    <path>AI/Lights/procedural_light_beacon_bottom.xml</path>
+    <offsets>
+      <x-m>-1.133941</x-m>
+      <y-m>0</y-m>
+      <z-m>0.4</z-m>
+    </offsets>
+  </model>
+  <!-- Group Lights for Shared Animations -->
+  <animation>
+    <name>StaticGrouped</name>
+    <object-name>nav-right</object-name>
+    <object-name>nav-left</object-name>
+    <object-name>nav-tail</object-name>
+  </animation>
+  <animation>
+    <name>StrobeGrouped</name>
+    <object-name>strobe-right</object-name>
+    <object-name>strobe-left</object-name>
+    <object-name>strobe-tail</object-name>
+  </animation>
+  <animation>
+    <name>BeaconGrouped</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>
+    <nopreview />
+    <condition>
+      <greater-than>
+        <property>transponder-id</property>
+        <value type="string">0</value>
+      </greater-than>
+    </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>
+    </condition>
+  </animation>
+</PropertyList>
\ No newline at end of file