diff --git a/AI/Aircraft/733/733-main.xml b/AI/Aircraft/733/733-main.xml
index f9ed750fe..38bdfe926 100644
--- a/AI/Aircraft/733/733-main.xml
+++ b/AI/Aircraft/733/733-main.xml
@@ -1,18 +1,21 @@
 <?xml version="1.0"?>
-
 <PropertyList>
- <description>Boeing 737-300</description>
- <author>Ian(Yves) Tolosa, Original Model Innis Cunningham</author> 
- <path>Models/733.ac</path>
-  
-     <animation>
-		<type>select</type>
-		<object-name>Gear_Down</object-name>
-		<condition>
-			<less-than>
-				<property>velocities/true-airspeed-kt</property>
-				<value>150</value>
-			</less-than>
-		</condition>
-	</animation>
+  <description>Boeing 737-300</description>
+  <author>Ian(Yves) Tolosa, Original Model Innis Cunningham</author>
+  <path>Models/733.ac</path>
+  <!-- Gear Showed only < 150 knotspeed -->
+  <animation>
+    <type>select</type>
+    <object-name>Gear_Down</object-name>
+    <condition>
+      <less-than>
+        <property>velocities/true-airspeed-kt</property>
+        <value>150</value>
+      </less-than>
+    </condition>
+  </animation>
+  <!-- Add Navigation Lights Objects -->
+  <model>
+    <path>Lights/733-NavLights.xml</path>
+  </model>
 </PropertyList>
\ No newline at end of file
diff --git a/AI/Aircraft/733/73C-main.xml b/AI/Aircraft/733/73C-main.xml
index 9dc387bc0..160367e6a 100644
--- a/AI/Aircraft/733/73C-main.xml
+++ b/AI/Aircraft/733/73C-main.xml
@@ -1,18 +1,21 @@
 <?xml version="1.0"?>
-
 <PropertyList>
- <description>Boeing 737-300 Winglets</description>
- <author>Ian(Yves) Tolosa, Original Model Innis Cunningham</author> 
- <path>Models/73C.ac</path>
-  
-     <animation>
-		<type>select</type>
-		<object-name>Gear_Down</object-name>
-		<condition>
-			<less-than>
-				<property>velocities/true-airspeed-kt</property>
-				<value>150</value>
-			</less-than>
-		</condition>
-	</animation>
+  <description>Boeing 737-300 Winglets</description>
+  <author>Ian(Yves) Tolosa, Original Model Innis Cunningham</author>
+  <path>Models/73C.ac</path>
+  <!-- Gear Showed only < 150 knotspeed -->
+  <animation>
+    <type>select</type>
+    <object-name>Gear_Down</object-name>
+    <condition>
+      <less-than>
+        <property>velocities/true-airspeed-kt</property>
+        <value>150</value>
+      </less-than>
+    </condition>
+  </animation>
+  <!-- Add Navigation Lights Objects -->
+  <model>
+    <path>Lights/733-NavLights.xml</path>
+  </model>
 </PropertyList>
\ No newline at end of file
diff --git a/AI/Aircraft/733/73F-main.xml b/AI/Aircraft/733/73F-main.xml
index c29c852c3..e3acb69a4 100644
--- a/AI/Aircraft/733/73F-main.xml
+++ b/AI/Aircraft/733/73F-main.xml
@@ -1,18 +1,21 @@
 <?xml version="1.0"?>
-
 <PropertyList>
- <description>Boeing 737-300 Freighter</description>
- <author>Ian(Yves) Tolosa, Original Model Innis Cunningham</author> 
- <path>Models/73F.ac</path>
-  
-     <animation>
-		<type>select</type>
-		<object-name>Gear_Down</object-name>
-		<condition>
-			<less-than>
-				<property>velocities/true-airspeed-kt</property>
-				<value>150</value>
-			</less-than>
-		</condition>
-	</animation>
+  <description>Boeing 737-300 Freighter</description>
+  <author>Ian(Yves) Tolosa, Original Model Innis Cunningham</author>
+  <path>Models/73F.ac</path>
+  <!-- Gear Showed only < 150 knotspeed -->
+  <animation>
+    <type>select</type>
+    <object-name>Gear_Down</object-name>
+    <condition>
+      <less-than>
+        <property>velocities/true-airspeed-kt</property>
+        <value>150</value>
+      </less-than>
+    </condition>
+  </animation>
+  <!-- Add Navigation Lights Objects -->
+  <model>
+    <path>Lights/733-NavLights.xml</path>
+  </model>
 </PropertyList>
\ No newline at end of file
diff --git a/AI/Aircraft/733/Lights/733-NavLights.xml b/AI/Aircraft/733/Lights/733-NavLights.xml
new file mode 100644
index 000000000..d72134958
--- /dev/null
+++ b/AI/Aircraft/733/Lights/733-NavLights.xml
@@ -0,0 +1,122 @@
+<?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>2.4967</x-m>
+      <y-m>14.1861</y-m>
+      <z-m>3.18973</z-m>
+    </offsets>
+  </model>
+  <model>
+    <name>nav-left</name>
+    <path>AI/Lights/procedural_light_nav_left.xml</path>
+    <offsets>
+      <x-m>2.4967</x-m>
+      <y-m>-14.1861</y-m>
+      <z-m>3.18973</z-m>
+    </offsets>
+  </model>
+  <model>
+    <name>nav-tail</name>
+    <path>AI/Lights/procedural_light_nav_tail.xml</path>
+    <offsets>
+      <x-m>15.6817</x-m>
+      <y-m>0</y-m>
+      <z-m>4.39652</z-m>
+    </offsets>
+  </model>
+  <!-- Position ALS Strobes -->
+  <model>
+    <name>strobe-right</name>
+    <path>AI/Lights/procedural_light_strobe_right.xml</path>
+    <offsets>
+      <x-m>2.4967</x-m>
+      <y-m>14.5</y-m>
+      <z-m>3.18973</z-m>
+    </offsets>
+  </model>
+  <model>
+    <name>strobe-left</name>
+    <path>AI/Lights/procedural_light_strobe_left.xml</path>
+    <offsets>
+      <x-m>2.4967</x-m>
+      <y-m>-14.5</y-m>
+      <z-m>3.18973</z-m>
+    </offsets>
+  </model>
+  <model>
+    <name>strobe-tail</name>
+    <path>AI/Lights/procedural_light_strobe_tail.xml</path>
+    <offsets>
+      <x-m>16</x-m>
+      <y-m>0</y-m>
+      <z-m>4.39652</z-m>
+    </offsets>
+  </model>
+  <!-- Position Beacons -->
+  <model>
+    <name>beacon-top</name>
+    <path>AI/Lights/procedural_light_beacon_top.xml</path>
+    <offsets>
+      <x-m>-3.28937</x-m>
+      <y-m>0</y-m>
+      <z-m>5.20955</z-m>
+    </offsets>
+  </model>
+  <model>
+    <name>beacon-bottom</name>
+    <path>AI/Lights/procedural_light_beacon_bottom.xml</path>
+    <offsets>
+      <x-m>-0.867658</x-m>
+      <y-m>0</y-m>
+      <z-m>1.07969</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-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>
+    <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
diff --git a/AI/Aircraft/735/735-main-winglets.xml b/AI/Aircraft/735/735-main-winglets.xml
index c3bc3b333..32926dd2e 100644
--- a/AI/Aircraft/735/735-main-winglets.xml
+++ b/AI/Aircraft/735/735-main-winglets.xml
@@ -26,14 +26,4 @@
   <model>
     <path>Lights/735-NavLights.xml</path>
   </model>
-  <!-- Enable Beacons and Strobes Pulse Behaviour -->
-  <nasal>
-    <load><![CDATA[
-        aircraft.light.new("/sim/model/Boeing/lighting/beacon", [0.7, 1.3]);
-        aircraft.light.new("/sim/model/Boeing/lighting/strobes", [0.02, 0.1, 0.02, 1.86]);
-        setprop("/sim/model/Boeing/lighting/beacon/enabled", 1);
-        setprop("/sim/model/Boeing/lighting/strobes/enabled", 1);
-      ]]></load>
-    <unload></unload>
-  </nasal>
 </PropertyList>
\ No newline at end of file
diff --git a/AI/Aircraft/735/735-main.xml b/AI/Aircraft/735/735-main.xml
index e1deaefbe..e96029ccf 100644
--- a/AI/Aircraft/735/735-main.xml
+++ b/AI/Aircraft/735/735-main.xml
@@ -37,14 +37,4 @@
   <model>
     <path>Lights/735-NavLights.xml</path>
   </model>
-  <!-- Enable Beacons and Strobes Pulse Behaviour -->
-  <nasal>
-    <load><![CDATA[
-        aircraft.light.new("/sim/model/Boeing/lighting/beacon", [0.7, 1.3]);
-        aircraft.light.new("/sim/model/Boeing/lighting/strobes", [0.02, 0.1, 0.02, 1.86]);
-        setprop("/sim/model/Boeing/lighting/beacon/enabled", 1);
-        setprop("/sim/model/Boeing/lighting/strobes/enabled", 1);
-      ]]></load>
-    <unload></unload>
-  </nasal>
 </PropertyList>
\ No newline at end of file
diff --git a/AI/Aircraft/735/Lights/735-NavLights.xml b/AI/Aircraft/735/Lights/735-NavLights.xml
index 28d68f5f3..49f061525 100644
--- a/AI/Aircraft/735/Lights/735-NavLights.xml
+++ b/AI/Aircraft/735/Lights/735-NavLights.xml
@@ -1,218 +1,104 @@
 <?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>15.00</offset-m>
-    <axis>
-      <x> 2.5721</x>
-      <y> -14.4267</y>
-      <z> 3.1406</z>
-    </axis>
-  </animation>
-  <animation>
-    <type>translate</type>
-    <object-name>Right_Wing_Static_Green</object-name>
-    <offset-m>15.00</offset-m>
-    <axis>
-      <x> 2.5721</x>
-      <y> 14.4267</y>
-      <z> 3.1406</z>
-    </axis>
-  </animation>
-  <animation>
-    <type>translate</type>
-    <object-name>Tail_Static_White</object-name>
-    <offset-m>15.35</offset-m>
-    <axis>
-      <x> 14.6817</x>
-      <y> 0</y>
-      <z> 4.34742</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>15.50</offset-m>
-    <axis>
-      <x> 2.5721</x>
-      <y> -14.4267</y>
-      <z> 3.1406</z>
-    </axis>
-  </animation>
-  <animation>
-    <type>translate</type>
-    <object-name>Right_Wing_Strobe</object-name>
-    <offset-m>15.50</offset-m>
-    <axis>
-      <x> 2.5721</x>
-      <y> 14.4267</y>
-      <z> 3.1406</z>
-    </axis>
-  </animation>
-  <animation>
-    <type>translate</type>
-    <object-name>Tail_Strobe</object-name>
-    <offset-m>15.40</offset-m>
-    <axis>
-      <x> 14.6817</x>
-      <y> 0</y>
-      <z> 4.34742</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>9.16</offset-m>
-    <axis>
-      <x> -7.52612</x>
-      <y> 0</y>
-      <z> 5.22802</z>
-    </axis>
-  </animation>
-  <animation>
-    <type>translate</type>
-    <object-name>Bottom_Beacon_Red</object-name>
-    <offset-m>1.10</offset-m>
-    <axis>
-      <x> -0.802873</x>
-      <y> 0</y>
-      <z> 0.750672</z>
-    </axis>
-  </animation>
+  <!-- Position ALS Navigation Lights -->
+  <model>
+    <name>nav-right</name>
+    <path>AI/Lights/procedural_light_nav_right.xml</path>
+    <offsets>
+      <x-m>2.57209</x-m>
+      <y-m>14.4267</y-m>
+      <z-m>3.14062</z-m>
+    </offsets>
+  </model>
+  <model>
+    <name>nav-left</name>
+    <path>AI/Lights/procedural_light_nav_left.xml</path>
+    <offsets>
+      <x-m>2.57209</x-m>
+      <y-m>-14.4267</y-m>
+      <z-m>3.14062</z-m>
+    </offsets>
+  </model>
+  <model>
+    <name>nav-tail</name>
+    <path>AI/Lights/procedural_light_nav_tail.xml</path>
+    <offsets>
+      <x-m>14.6817</x-m>
+      <y-m>0</y-m>
+      <z-m>4.34742</z-m>
+    </offsets>
+  </model>
+  <!-- Position ALS Strobes -->
+  <model>
+    <name>strobe-right</name>
+    <path>AI/Lights/procedural_light_strobe_right.xml</path>
+    <offsets>
+      <x-m>2.57209</x-m>
+      <y-m>15</y-m>
+      <z-m>3.14062</z-m>
+    </offsets>
+  </model>
+  <model>
+    <name>strobe-left</name>
+    <path>AI/Lights/procedural_light_strobe_left.xml</path>
+    <offsets>
+      <x-m>2.57209</x-m>
+      <y-m>-15</y-m>
+      <z-m>3.14062</z-m>
+    </offsets>
+  </model>
+  <model>
+    <name>strobe-tail</name>
+    <path>AI/Lights/procedural_light_strobe_tail.xml</path>
+    <offsets>
+      <x-m>15</x-m>
+      <y-m>0</y-m>
+      <z-m>4.34742</z-m>
+    </offsets>
+  </model>
+  <!-- Position Beacons -->
+  <model>
+    <name>beacon-top</name>
+    <path>AI/Lights/procedural_light_beacon_top.xml</path>
+    <offsets>
+      <x-m>-7.52612</x-m>
+      <y-m>0</y-m>
+      <z-m> 5.22802</z-m>
+    </offsets>
+  </model>
+  <model>
+    <name>beacon-bottom</name>
+    <path>AI/Lights/procedural_light_beacon_bottom.xml</path>
+    <offsets>
+      <x-m>-0.802873</x-m>
+      <y-m>0</y-m>
+      <z-m>0.750672</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-top</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/Boeing/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/Boeing/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 +107,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/736/736-main.xml b/AI/Aircraft/736/736-main.xml
index 458565721..414f8f246 100644
--- a/AI/Aircraft/736/736-main.xml
+++ b/AI/Aircraft/736/736-main.xml
@@ -24,14 +24,4 @@
   <model>
     <path>Lights/736-NavLights.xml</path>
   </model>
-  <!-- Enable Beacons and Strobes Pulse Behaviour -->
-  <nasal>
-    <load><![CDATA[
-        aircraft.light.new("/sim/model/Boeing/lighting/beacon", [0.7, 1.3]);
-        aircraft.light.new("/sim/model/Boeing/lighting/strobes", [0.02, 0.1, 0.02, 1.86]);
-        setprop("/sim/model/Boeing/lighting/beacon/enabled", 1);
-        setprop("/sim/model/Boeing/lighting/strobes/enabled", 1);
-      ]]></load>
-    <unload></unload>
-  </nasal>
 </PropertyList>
\ No newline at end of file
diff --git a/AI/Aircraft/736/Lights/736-NavLights.xml b/AI/Aircraft/736/Lights/736-NavLights.xml
index 152e8bb49..9401bc658 100644
--- a/AI/Aircraft/736/Lights/736-NavLights.xml
+++ b/AI/Aircraft/736/Lights/736-NavLights.xml
@@ -1,218 +1,104 @@
 <?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>17.85</offset-m>
-    <axis>
-      <x> 4.1072</x>
-      <y> -16.9736</y>
-      <z> 3.5104</z>
-    </axis>
-  </animation>
-  <animation>
-    <type>translate</type>
-    <object-name>Right_Wing_Static_Green</object-name>
-    <offset-m>17.85</offset-m>
-    <axis>
-      <x> 4.1072</x>
-      <y> 16.9736</y>
-      <z> 3.5104</z>
-    </axis>
-  </animation>
-  <animation>
-    <type>translate</type>
-    <object-name>Tail_Static_White</object-name>
-    <offset-m>15.35</offset-m>
-    <axis>
-      <x> 14.6817</x>
-      <y> 0</y>
-      <z> 4.34742</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>18.00</offset-m>
-    <axis>
-      <x> 4.1072</x>
-      <y> -16.9736</y>
-      <z> 3.5104</z>
-    </axis>
-  </animation>
-  <animation>
-    <type>translate</type>
-    <object-name>Right_Wing_Strobe</object-name>
-    <offset-m>18.00</offset-m>
-    <axis>
-      <x> 4.1072</x>
-      <y> 16.9736</y>
-      <z> 3.5104</z>
-    </axis>
-  </animation>
-  <animation>
-    <type>translate</type>
-    <object-name>Tail_Strobe</object-name>
-    <offset-m>15.40</offset-m>
-    <axis>
-      <x> 14.6817</x>
-      <y> 0</y>
-      <z> 4.34742</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>6.35</offset-m>
-    <axis>
-      <x> -3.21458</x>
-      <y> 0</y>
-      <z> 5.47977</z>
-    </axis>
-  </animation>
-  <animation>
-    <type>translate</type>
-    <object-name>Bottom_Beacon_Red</object-name>
-    <offset-m>1.59</offset-m>
-    <axis>
-      <x> -1.35342</x>
-      <y> 0</y>
-      <z> 0.826404</z>
-    </axis>
-  </animation>
+  <!-- Position ALS Navigation Lights -->
+  <model>
+    <name>nav-right</name>
+    <path>AI/Lights/procedural_light_nav_right.xml</path>
+    <offsets>
+      <x-m>3.85107</x-m>
+      <y-m>16.7725</y-m>
+      <z-m>3.50005</z-m>
+    </offsets>
+  </model>
+  <model>
+    <name>nav-left</name>
+    <path>AI/Lights/procedural_light_nav_left.xml</path>
+    <offsets>
+      <x-m>3.85107</x-m>
+      <y-m>-16.7725</y-m>
+      <z-m>3.50005</z-m>
+    </offsets>
+  </model>
+  <model>
+    <name>nav-tail</name>
+    <path>AI/Lights/procedural_light_nav_tail.xml</path>
+    <offsets>
+      <x-m>15</x-m>
+      <y-m>0</y-m>
+      <z-m>4.34742</z-m>
+    </offsets>
+  </model>
+  <!-- Position ALS Strobes -->
+  <model>
+    <name>strobe-right</name>
+    <path>AI/Lights/procedural_light_strobe_right.xml</path>
+    <offsets>
+      <x-m>4</x-m>
+      <y-m>16.7725</y-m>
+      <z-m>3.50005</z-m>
+    </offsets>
+  </model>
+  <model>
+    <name>strobe-left</name>
+    <path>AI/Lights/procedural_light_strobe_left.xml</path>
+    <offsets>
+      <x-m>4</x-m>
+      <y-m>-16.7725</y-m>
+      <z-m>3.50005</z-m>
+    </offsets>
+  </model>
+  <model>
+    <name>strobe-tail</name>
+    <path>AI/Lights/procedural_light_strobe_tail.xml</path>
+    <offsets>
+      <x-m>15.5</x-m>
+      <y-m>0</y-m>
+      <z-m>4.34742</z-m>
+    </offsets>
+  </model>
+  <!-- Position Beacons -->
+  <model>
+    <name>beacon-top</name>
+    <path>AI/Lights/procedural_light_beacon_top.xml</path>
+    <offsets>
+      <x-m>-3.27408</x-m>
+      <y-m>0</y-m>
+      <z-m>5.16311</z-m>
+    </offsets>
+  </model>
+  <model>
+    <name>beacon-bottom</name>
+    <path>AI/Lights/procedural_light_beacon_bottom.xml</path>
+    <offsets>
+      <x-m>-1.32544</x-m>
+      <y-m>0</y-m>
+      <z-m>1.00504</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-top</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/Boeing/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/Boeing/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 +107,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/738/738-main-nowinglets.xml b/AI/Aircraft/738/738-main-nowinglets.xml
index e5676c1ff..3f8b65c39 100755
--- a/AI/Aircraft/738/738-main-nowinglets.xml
+++ b/AI/Aircraft/738/738-main-nowinglets.xml
@@ -1,65 +1,65 @@
 <?xml version="1.0"?>
 <PropertyList>
-    <description>Boeing737-800</description>
-    <author>Brett Harrison</author>
-    <path>Models/737-800.ac</path>
-	
-    <offsets>
-        <pitch-deg>-0.95</pitch-deg>
-    </offsets>
-	
-    <animation>
-        <type>rotate</type>
+  <description>Boeing737-800</description>
+  <author>Brett Harrison</author>
+  <path>Models/737-800.ac</path>
+  <offsets>
+    <pitch-deg>-0.95</pitch-deg>
+  </offsets>
+  <animation>
+    <type>rotate</type>
+    <property>velocities/true-airspeed-kt</property>
+    <interpolation>
+      <entry>
+        <ind>0.0</ind>
+        <dep>0.0</dep>
+      </entry>
+      <entry>
+        <ind>70.0</ind>
+        <dep>0.0</dep>
+      </entry>
+      <entry>
+        <ind>90</ind>
+        <dep>0.95</dep>
+      </entry>
+      <entry>
+        <ind>100</ind>
+        <dep>0.95</dep>
+      </entry>
+    </interpolation>
+    <center>
+      <x-m>0.0</x-m>
+      <y-m>0.0</y-m>
+      <z-m>0.0</z-m>
+    </center>
+    <axis>
+      <x>0.0</x>
+      <y>1.0</y>
+      <z>0.0</z>
+    </axis>
+  </animation>
+  <animation>
+    <type>select</type>
+    <object-name>winglets</object-name>
+    <condition>
+      <equals>
+        <property>/sim/signals/fdm-initialized</property>
+        <value>0</value>
+      </equals>
+    </condition>
+  </animation>
+  <animation>
+    <type>select</type>
+    <object-name>gear</object-name>
+    <condition>
+      <less-than>
         <property>velocities/true-airspeed-kt</property>
-        <interpolation>
-            <entry>
-                <ind>0.0</ind>
-                <dep>0.0</dep>
-            </entry>
-            <entry>
-                <ind>70.0</ind>
-                <dep>0.0</dep>
-            </entry>
-            <entry>
-                <ind>90</ind>
-                <dep>0.95</dep>
-            </entry>
-            <entry>
-                <ind>100</ind>
-                <dep>0.95</dep>
-            </entry>
-        </interpolation>
-        <center>
-            <x-m>0.0</x-m>
-            <y-m>0.0</y-m>
-            <z-m>0.0</z-m>
-        </center>
-        <axis>
-            <x>0.0</x>
-            <y>1.0</y>
-            <z>0.0</z>
-        </axis>
-    </animation>
-	
-    <animation>
-        <type>select</type>
-        <object-name>winglets</object-name>
-        <condition>
-            <equals>
-                <property>/sim/signals/fdm-initialized</property>
-                <value>0</value>
-            </equals>
-        </condition>
-    </animation>
-	
-    <animation>
-        <type>select</type>
-        <object-name>gear</object-name>
-        <condition>
-            <less-than>
-                <property>velocities/true-airspeed-kt</property>
-                <value>180</value>
-            </less-than>
-        </condition>
-    </animation>
+        <value>180</value>
+      </less-than>
+    </condition>
+  </animation>
+  <!-- Add Navigation Lights Objects -->
+  <model>
+    <path>Lights/738-NavLights.xml</path>
+  </model>
 </PropertyList>
\ No newline at end of file
diff --git a/AI/Aircraft/738/738-main.xml b/AI/Aircraft/738/738-main.xml
index 710c4ee60..385672152 100755
--- a/AI/Aircraft/738/738-main.xml
+++ b/AI/Aircraft/738/738-main.xml
@@ -1,54 +1,55 @@
 <?xml version="1.0"?>
 <PropertyList>
-    <description>Boeing737-800</description>
-    <author>Brett Harrison</author>
-    <path>Models/737-800.ac</path>
-	
-    <offsets>
-        <pitch-deg>-0.95</pitch-deg>
-    </offsets>
-	
-    <animation>
-        <type>rotate</type>
+  <description>Boeing737-800</description>
+  <author>Brett Harrison</author>
+  <path>Models/737-800.ac</path>
+  <offsets>
+    <pitch-deg>-0.95</pitch-deg>
+  </offsets>
+  <animation>
+    <type>rotate</type>
+    <property>velocities/true-airspeed-kt</property>
+    <interpolation>
+      <entry>
+        <ind>0.0</ind>
+        <dep>0.0</dep>
+      </entry>
+      <entry>
+        <ind>70.0</ind>
+        <dep>0.0</dep>
+      </entry>
+      <entry>
+        <ind>90</ind>
+        <dep>0.95</dep>
+      </entry>
+      <entry>
+        <ind>100</ind>
+        <dep>0.95</dep>
+      </entry>
+    </interpolation>
+    <center>
+      <x-m>0.0</x-m>
+      <y-m>0.0</y-m>
+      <z-m>0.0</z-m>
+    </center>
+    <axis>
+      <x>0.0</x>
+      <y>1.0</y>
+      <z>0.0</z>
+    </axis>
+  </animation>
+  <animation>
+    <type>select</type>
+    <object-name>gear</object-name>
+    <condition>
+      <less-than>
         <property>velocities/true-airspeed-kt</property>
-        <interpolation>
-            <entry>
-                <ind>0.0</ind>
-                <dep>0.0</dep>
-            </entry>
-            <entry>
-                <ind>70.0</ind>
-                <dep>0.0</dep>
-            </entry>
-            <entry>
-                <ind>90</ind>
-                <dep>0.95</dep>
-            </entry>
-            <entry>
-                <ind>100</ind>
-                <dep>0.95</dep>
-            </entry>
-        </interpolation>
-        <center>
-            <x-m>0.0</x-m>
-            <y-m>0.0</y-m>
-            <z-m>0.0</z-m>
-        </center>
-        <axis>
-            <x>0.0</x>
-            <y>1.0</y>
-            <z>0.0</z>
-        </axis>
-    </animation>
-	
-    <animation>
-        <type>select</type>
-        <object-name>gear</object-name>
-        <condition>
-            <less-than>
-                <property>velocities/true-airspeed-kt</property>
-                <value>180</value>
-            </less-than>
-        </condition>
-    </animation>
+        <value>180</value>
+      </less-than>
+    </condition>
+  </animation>
+  <!-- Add Navigation Lights Objects -->
+  <model>
+    <path>Lights/738-NavLights.xml</path>
+  </model>
 </PropertyList>
\ No newline at end of file
diff --git a/AI/Aircraft/738/Lights/738-NavLights.xml b/AI/Aircraft/738/Lights/738-NavLights.xml
new file mode 100644
index 000000000..bc609ef2a
--- /dev/null
+++ b/AI/Aircraft/738/Lights/738-NavLights.xml
@@ -0,0 +1,122 @@
+<?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>3.30045</x-m>
+      <y-m>16.5332</y-m>
+      <z-m>3.89217</z-m>
+    </offsets>
+  </model>
+  <model>
+    <name>nav-left</name>
+    <path>AI/Lights/procedural_light_nav_left.xml</path>
+    <offsets>
+      <x-m>3.30045</x-m>
+      <y-m>-16.5332</y-m>
+      <z-m>3.89217</z-m>
+    </offsets>
+  </model>
+  <model>
+    <name>nav-tail</name>
+    <path>AI/Lights/procedural_light_nav_tail.xml</path>
+    <offsets>
+      <x-m>18.5</x-m>
+      <y-m>0</y-m>
+      <z-m>4.48507</z-m>
+    </offsets>
+  </model>
+  <!-- Position ALS Strobes -->
+  <model>
+    <name>strobe-right</name>
+    <path>AI/Lights/procedural_light_strobe_right.xml</path>
+    <offsets>
+      <x-m>6.7</x-m>
+      <y-m>18.4456</y-m>
+      <z-m>6.68392</z-m>
+    </offsets>
+  </model>
+  <model>
+    <name>strobe-left</name>
+    <path>AI/Lights/procedural_light_strobe_left.xml</path>
+    <offsets>
+      <x-m>6.7</x-m>
+      <y-m>-18.4456</y-m>
+      <z-m>6.68392</z-m>
+    </offsets>
+  </model>
+  <model>
+    <name>strobe-tail</name>
+    <path>AI/Lights/procedural_light_strobe_tail.xml</path>
+    <offsets>
+      <x-m>19</x-m>
+      <y-m>0</y-m>
+      <z-m>4.48507</z-m>
+    </offsets>
+  </model>
+  <!-- Position Beacons -->
+  <model>
+    <name>beacon-top</name>
+    <path>AI/Lights/procedural_light_beacon_top.xml</path>
+    <offsets>
+      <x-m>-3.48385</x-m>
+      <y-m>0</y-m>
+      <z-m>5.45686</z-m>
+    </offsets>
+  </model>
+  <model>
+    <name>beacon-bottom</name>
+    <path>AI/Lights/procedural_light_beacon_bottom.xml</path>
+    <offsets>
+      <x-m>-1.32544</x-m>
+      <y-m>0</y-m>
+      <z-m>1.00504</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-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>
+    <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
diff --git a/AI/Aircraft/739/73J-main.xml b/AI/Aircraft/739/73J-main.xml
index 88800d1ff..a3fcf1188 100644
--- a/AI/Aircraft/739/73J-main.xml
+++ b/AI/Aircraft/739/73J-main.xml
@@ -3,12 +3,10 @@
   <description>Boeing 737-900ER</description>
   <author>Ian(Yves) Tolosa. July 2017</author>
   <path>Models/73J.ac</path>
-  
   <offsets>
-	<pitch-deg>-0.7</pitch-deg>   
+    <pitch-deg>-0.7</pitch-deg>
   </offsets>
-  
-    <animation>
+  <animation>
     <type>select</type>
     <object-name>Gear_Down</object-name>
     <condition>
@@ -18,17 +16,8 @@
       </less-than>
     </condition>
   </animation>
-  
-    <nasal>
-  <load>
-   var model = cmdarg();
-   model.getNode("door[0]/position-x-m", 1).setValue(-16.1147);
-   model.getNode("door[0]/position-y-m", 1).setValue(3.27307);
-   model.getNode("door[0]/position-z-m", 1).setValue(1.485112);
-   model.getNode("door[0]/jetway-hood-deg", 1).setValue(10.6);
-  </load>
-  
-   
- </nasal>
-   
+  <!-- Add Navigation Lights Objects -->
+  <model>
+    <path>Lights/739-NavLights.xml</path>
+  </model>
 </PropertyList>
\ No newline at end of file
diff --git a/AI/Aircraft/739/Lights/739-NavLights.xml b/AI/Aircraft/739/Lights/739-NavLights.xml
new file mode 100644
index 000000000..e8c2d8776
--- /dev/null
+++ b/AI/Aircraft/739/Lights/739-NavLights.xml
@@ -0,0 +1,122 @@
+<?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>3.52747</x-m>
+      <y-m>16.358</y-m>
+      <z-m>3.52238</z-m>
+    </offsets>
+  </model>
+  <model>
+    <name>nav-left</name>
+    <path>AI/Lights/procedural_light_nav_left.xml</path>
+    <offsets>
+      <x-m>3.52747</x-m>
+      <y-m>-16.358</y-m>
+      <z-m>3.52238</z-m>
+    </offsets>
+  </model>
+  <model>
+    <name>nav-tail</name>
+    <path>AI/Lights/procedural_light_nav_tail.xml</path>
+    <offsets>
+      <x-m>19.7</x-m>
+      <y-m>0</y-m>
+      <z-m>4.53256</z-m>
+    </offsets>
+  </model>
+  <!-- Position ALS Strobes -->
+  <model>
+    <name>strobe-right</name>
+    <path>AI/Lights/procedural_light_strobe_right.xml</path>
+    <offsets>
+      <x-m>6.31937</x-m>
+      <y-m>17.8463</y-m>
+      <z-m>6.4351</z-m>
+    </offsets>
+  </model>
+  <model>
+    <name>strobe-left</name>
+    <path>AI/Lights/procedural_light_strobe_left.xml</path>
+    <offsets>
+      <x-m>6.31937</x-m>
+      <y-m>-17.8463</y-m>
+      <z-m>6.4351</z-m>
+    </offsets>
+  </model>
+  <model>
+    <name>strobe-tail</name>
+    <path>AI/Lights/procedural_light_strobe_tail.xml</path>
+    <offsets>
+      <x-m>20</x-m>
+      <y-m>0</y-m>
+      <z-m>4.53256</z-m>
+    </offsets>
+  </model>
+  <!-- Position Beacons -->
+  <model>
+    <name>beacon-top</name>
+    <path>AI/Lights/procedural_light_beacon_top.xml</path>
+    <offsets>
+      <x-m>-3.48385</x-m>
+      <y-m>0</y-m>
+      <z-m>5.45686</z-m>
+    </offsets>
+  </model>
+  <model>
+    <name>beacon-bottom</name>
+    <path>AI/Lights/procedural_light_beacon_bottom.xml</path>
+    <offsets>
+      <x-m>-1.32544</x-m>
+      <y-m>0</y-m>
+      <z-m>1.00504</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-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>
+    <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
diff --git a/AI/Aircraft/747/744-main.xml b/AI/Aircraft/747/744-main.xml
index be74826a9..599092786 100644
--- a/AI/Aircraft/747/744-main.xml
+++ b/AI/Aircraft/747/744-main.xml
@@ -24,14 +24,4 @@
   <model>
     <path>Lights/744-NavLights.xml</path>
   </model>
-  <!-- Enable Beacons and Strobes Pulse Behaviour -->
-  <nasal>
-    <load><![CDATA[
-        aircraft.light.new("/sim/model/B777/lighting/beacon", [0.7, 1.3]);
-        aircraft.light.new("/sim/model/B777/lighting/strobes", [0.02, 1.98]);
-        setprop("/sim/model/B777/lighting/beacon/enabled", 1);
-        setprop("/sim/model/B777/lighting/strobes/enabled", 1);
-      ]]></load>
-    <unload></unload>
-  </nasal>
 </PropertyList>
\ No newline at end of file
diff --git a/AI/Aircraft/747/74F-main.xml b/AI/Aircraft/747/74F-main.xml
index 4cc729364..4fe0d27fd 100644
--- a/AI/Aircraft/747/74F-main.xml
+++ b/AI/Aircraft/747/74F-main.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0"?>
 <PropertyList>
-  <description>Boeing 747-400 Freighter Converted</description>
+  <description>Boeing 747-400 Freighter (Converted)</description>
   <author>Ian(Yves) Tolosa. Apr 2016 </author>
   <path>Models/74F.ac</path>
-   <!-- Gear Showed only < 180 knotspeed --> 
-    <animation>
+  <!-- Gear Showed only < 180 knotspeed -->
+  <animation>
     <type>select</type>
     <object-name>Gear</object-name>
     <condition>
@@ -14,26 +14,14 @@
       </less-than>
     </condition>
   </animation>
- <!-- Tail and Windows Lightmap Effect -->
+  <!-- Tail and Windows Lightmap Effect -->
   <effect>
     <inherits-from>AI/Aircraft/747/Effects/74F-LightMap</inherits-from>
     <object-name>74F</object-name>
-	<object-name>Gear</object-name>
+    <object-name>Gear</object-name>
   </effect>
   <!-- Add Navigation Lights Objects -->
   <model>
     <path>Lights/74F-NavLights.xml</path>
   </model>
-  <!-- Enable Beacons and Strobes Pulse Behaviour -->
-  <nasal>
-    <load><![CDATA[
-        aircraft.light.new("/sim/model/B777/lighting/beacon", [0.7, 1.3]);
-        aircraft.light.new("/sim/model/B777/lighting/strobes", [0.02, 1.98]);
-        setprop("/sim/model/B777/lighting/beacon/enabled", 1);
-        setprop("/sim/model/B777/lighting/strobes/enabled", 1);
-      ]]></load>
-    <unload></unload>
-  </nasal> 
- 
-   
 </PropertyList>
\ No newline at end of file
diff --git a/AI/Aircraft/747/74Y-main.xml b/AI/Aircraft/747/74Y-main.xml
index a16f0e932..8b3728b3b 100644
--- a/AI/Aircraft/747/74Y-main.xml
+++ b/AI/Aircraft/747/74Y-main.xml
@@ -3,8 +3,8 @@
   <description>Boeing 747-400 Freighter</description>
   <author>Ian(Yves) Tolosa. Apr 2016 </author>
   <path>Models/74Y.ac</path>
-    <!-- Gear Showed only < 180 knotspeed --> 
-    <animation>
+  <!-- Gear Showed only < 180 knotspeed -->
+  <animation>
     <type>select</type>
     <object-name>Gear</object-name>
     <condition>
@@ -14,25 +14,14 @@
       </less-than>
     </condition>
   </animation>
- <!-- Tail and Windows Lightmap Effect -->
+  <!-- Tail and Windows Lightmap Effect -->
   <effect>
     <inherits-from>AI/Aircraft/747/Effects/74Y-LightMap</inherits-from>
     <object-name>74Y</object-name>
-	<object-name>Gear</object-name>
+    <object-name>Gear</object-name>
   </effect>
   <!-- Add Navigation Lights Objects -->
   <model>
-    <path>Lights/74F-NavLights.xml</path>
+    <path>Lights/74Y-NavLights.xml</path>
   </model>
-  <!-- Enable Beacons and Strobes Pulse Behaviour -->
-  <nasal>
-    <load><![CDATA[
-        aircraft.light.new("/sim/model/B777/lighting/beacon", [0.7, 1.3]);
-        aircraft.light.new("/sim/model/B777/lighting/strobes", [0.02, 1.98]);
-        setprop("/sim/model/B777/lighting/beacon/enabled", 1);
-        setprop("/sim/model/B777/lighting/strobes/enabled", 1);
-      ]]></load>
-    <unload></unload>
-  </nasal> 
-   
 </PropertyList>
\ No newline at end of file
diff --git a/AI/Aircraft/747/Lights/744-NavLights.xml b/AI/Aircraft/747/Lights/744-NavLights.xml
index a00e66965..9bfb3e3d3 100644
--- a/AI/Aircraft/747/Lights/744-NavLights.xml
+++ b/AI/Aircraft/747/Lights/744-NavLights.xml
@@ -1,218 +1,104 @@
 <?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>34.47</offset-m>
-    <axis>
-      <x> 12.5824</x>
-      <y> -31.5082</y>
-      <z> 6.11767</z>
-    </axis>
-  </animation>
-  <animation>
-    <type>translate</type>
-    <object-name>Right_Wing_Static_Green</object-name>
-    <offset-m>34.47</offset-m>
-    <axis>
-      <x> 12.5824</x>
-      <y> 31.5082</y>
-      <z> 6.11767</z>
-    </axis>
-  </animation>
-  <animation>
-    <type>translate</type>
-    <object-name>Tail_Static_White</object-name>
-    <offset-m>36.28</offset-m>
-    <axis>
-      <x> 35.3813</x>
-      <y> 0</y>
-      <z> 8.03405</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>36</offset-m>
-    <axis>
-      <x> 12.5824</x>
-      <y> -31.5082</y>
-      <z> 6.11767</z>
-    </axis>
-  </animation>
-  <animation>
-    <type>translate</type>
-    <object-name>Right_Wing_Strobe</object-name>
-    <offset-m>36</offset-m>
-    <axis>
-      <x> 12.5824</x>
-      <y> 31.5082</y>
-      <z> 6.11767</z>
-    </axis>
-  </animation>
-  <animation>
-    <type>translate</type>
-    <object-name>Tail_Strobe</object-name>
-    <offset-m>37</offset-m>
-    <axis>
-      <x> 35.3813</x>
-      <y> 0</y>
-      <z> 8.03405</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>23.56</offset-m>
-    <axis>
-      <x> -21.2737</x>
-      <y> 0</y>
-      <z> 10.1308</z>
-    </axis>
-  </animation>
-  <animation>
-    <type>translate</type>
-    <object-name>Bottom_Beacon_Red</object-name>
-    <offset-m>7.09</offset-m>
-    <axis>
-      <x> -6.90486</x>
-      <y> 0</y>
-      <z> 1.59196</z>
-    </axis>
-  </animation>
+  <!-- Position ALS Navigation Lights -->
+  <model>
+    <name>nav-right</name>
+    <path>AI/Lights/procedural_light_nav_right.xml</path>
+    <offsets>
+      <x-m>12.5824</x-m>
+      <y-m>31.5082</y-m>
+      <z-m>6.11767</z-m>
+    </offsets>
+  </model>
+  <model>
+    <name>nav-left</name>
+    <path>AI/Lights/procedural_light_nav_left.xml</path>
+    <offsets>
+      <x-m>12.5824</x-m>
+      <y-m>-31.5082</y-m>
+      <z-m>6.11767</z-m>
+    </offsets>
+  </model>
+  <model>
+    <name>nav-tail</name>
+    <path>AI/Lights/procedural_light_nav_tail.xml</path>
+    <offsets>
+      <x-m>35.5</x-m>
+      <y-m>0</y-m>
+      <z-m>8.03405</z-m>
+    </offsets>
+  </model>
+  <!-- Position ALS Strobes -->
+  <model>
+    <name>strobe-right</name>
+    <path>AI/Lights/procedural_light_strobe_right.xml</path>
+    <offsets>
+      <x-m>17.5487</x-m>
+      <y-m>32.4764</y-m>
+      <z-m>7.45557</z-m>
+    </offsets>
+  </model>
+  <model>
+    <name>strobe-left</name>
+    <path>AI/Lights/procedural_light_strobe_left.xml</path>
+    <offsets>
+      <x-m>17.5487</x-m>
+      <y-m>-32.4764</y-m>
+      <z-m>7.45557</z-m>
+    </offsets>
+  </model>
+  <model>
+    <name>strobe-tail</name>
+    <path>AI/Lights/procedural_light_strobe_tail.xml</path>
+    <offsets>
+      <x-m>36</x-m>
+      <y-m>0</y-m>
+      <z-m>8.03405</z-m>
+    </offsets>
+  </model>
+  <!-- Position Beacons -->
+  <model>
+    <name>beacon-top</name>
+    <path>AI/Lights/procedural_light_beacon_top.xml</path>
+    <offsets>
+      <x-m>-21.2737</x-m>
+      <y-m>0</y-m>
+      <z-m>10.1308</z-m>
+    </offsets>
+  </model>
+  <model>
+    <name>beacon-bottom</name>
+    <path>AI/Lights/procedural_light_beacon_bottom.xml</path>
+    <offsets>
+      <x-m>-6.90486</x-m>
+      <y-m>0</y-m>
+      <z-m>1.59196</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-top</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/B777/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/B777/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 +107,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/747/Lights/74F-NavLights.xml b/AI/Aircraft/747/Lights/74F-NavLights.xml
index a00e66965..9bfb3e3d3 100644
--- a/AI/Aircraft/747/Lights/74F-NavLights.xml
+++ b/AI/Aircraft/747/Lights/74F-NavLights.xml
@@ -1,218 +1,104 @@
 <?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>34.47</offset-m>
-    <axis>
-      <x> 12.5824</x>
-      <y> -31.5082</y>
-      <z> 6.11767</z>
-    </axis>
-  </animation>
-  <animation>
-    <type>translate</type>
-    <object-name>Right_Wing_Static_Green</object-name>
-    <offset-m>34.47</offset-m>
-    <axis>
-      <x> 12.5824</x>
-      <y> 31.5082</y>
-      <z> 6.11767</z>
-    </axis>
-  </animation>
-  <animation>
-    <type>translate</type>
-    <object-name>Tail_Static_White</object-name>
-    <offset-m>36.28</offset-m>
-    <axis>
-      <x> 35.3813</x>
-      <y> 0</y>
-      <z> 8.03405</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>36</offset-m>
-    <axis>
-      <x> 12.5824</x>
-      <y> -31.5082</y>
-      <z> 6.11767</z>
-    </axis>
-  </animation>
-  <animation>
-    <type>translate</type>
-    <object-name>Right_Wing_Strobe</object-name>
-    <offset-m>36</offset-m>
-    <axis>
-      <x> 12.5824</x>
-      <y> 31.5082</y>
-      <z> 6.11767</z>
-    </axis>
-  </animation>
-  <animation>
-    <type>translate</type>
-    <object-name>Tail_Strobe</object-name>
-    <offset-m>37</offset-m>
-    <axis>
-      <x> 35.3813</x>
-      <y> 0</y>
-      <z> 8.03405</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>23.56</offset-m>
-    <axis>
-      <x> -21.2737</x>
-      <y> 0</y>
-      <z> 10.1308</z>
-    </axis>
-  </animation>
-  <animation>
-    <type>translate</type>
-    <object-name>Bottom_Beacon_Red</object-name>
-    <offset-m>7.09</offset-m>
-    <axis>
-      <x> -6.90486</x>
-      <y> 0</y>
-      <z> 1.59196</z>
-    </axis>
-  </animation>
+  <!-- Position ALS Navigation Lights -->
+  <model>
+    <name>nav-right</name>
+    <path>AI/Lights/procedural_light_nav_right.xml</path>
+    <offsets>
+      <x-m>12.5824</x-m>
+      <y-m>31.5082</y-m>
+      <z-m>6.11767</z-m>
+    </offsets>
+  </model>
+  <model>
+    <name>nav-left</name>
+    <path>AI/Lights/procedural_light_nav_left.xml</path>
+    <offsets>
+      <x-m>12.5824</x-m>
+      <y-m>-31.5082</y-m>
+      <z-m>6.11767</z-m>
+    </offsets>
+  </model>
+  <model>
+    <name>nav-tail</name>
+    <path>AI/Lights/procedural_light_nav_tail.xml</path>
+    <offsets>
+      <x-m>35.5</x-m>
+      <y-m>0</y-m>
+      <z-m>8.03405</z-m>
+    </offsets>
+  </model>
+  <!-- Position ALS Strobes -->
+  <model>
+    <name>strobe-right</name>
+    <path>AI/Lights/procedural_light_strobe_right.xml</path>
+    <offsets>
+      <x-m>17.5487</x-m>
+      <y-m>32.4764</y-m>
+      <z-m>7.45557</z-m>
+    </offsets>
+  </model>
+  <model>
+    <name>strobe-left</name>
+    <path>AI/Lights/procedural_light_strobe_left.xml</path>
+    <offsets>
+      <x-m>17.5487</x-m>
+      <y-m>-32.4764</y-m>
+      <z-m>7.45557</z-m>
+    </offsets>
+  </model>
+  <model>
+    <name>strobe-tail</name>
+    <path>AI/Lights/procedural_light_strobe_tail.xml</path>
+    <offsets>
+      <x-m>36</x-m>
+      <y-m>0</y-m>
+      <z-m>8.03405</z-m>
+    </offsets>
+  </model>
+  <!-- Position Beacons -->
+  <model>
+    <name>beacon-top</name>
+    <path>AI/Lights/procedural_light_beacon_top.xml</path>
+    <offsets>
+      <x-m>-21.2737</x-m>
+      <y-m>0</y-m>
+      <z-m>10.1308</z-m>
+    </offsets>
+  </model>
+  <model>
+    <name>beacon-bottom</name>
+    <path>AI/Lights/procedural_light_beacon_bottom.xml</path>
+    <offsets>
+      <x-m>-6.90486</x-m>
+      <y-m>0</y-m>
+      <z-m>1.59196</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-top</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/B777/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/B777/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 +107,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/747/Lights/74Y-NavLights.xml b/AI/Aircraft/747/Lights/74Y-NavLights.xml
index a00e66965..9bfb3e3d3 100644
--- a/AI/Aircraft/747/Lights/74Y-NavLights.xml
+++ b/AI/Aircraft/747/Lights/74Y-NavLights.xml
@@ -1,218 +1,104 @@
 <?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>34.47</offset-m>
-    <axis>
-      <x> 12.5824</x>
-      <y> -31.5082</y>
-      <z> 6.11767</z>
-    </axis>
-  </animation>
-  <animation>
-    <type>translate</type>
-    <object-name>Right_Wing_Static_Green</object-name>
-    <offset-m>34.47</offset-m>
-    <axis>
-      <x> 12.5824</x>
-      <y> 31.5082</y>
-      <z> 6.11767</z>
-    </axis>
-  </animation>
-  <animation>
-    <type>translate</type>
-    <object-name>Tail_Static_White</object-name>
-    <offset-m>36.28</offset-m>
-    <axis>
-      <x> 35.3813</x>
-      <y> 0</y>
-      <z> 8.03405</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>36</offset-m>
-    <axis>
-      <x> 12.5824</x>
-      <y> -31.5082</y>
-      <z> 6.11767</z>
-    </axis>
-  </animation>
-  <animation>
-    <type>translate</type>
-    <object-name>Right_Wing_Strobe</object-name>
-    <offset-m>36</offset-m>
-    <axis>
-      <x> 12.5824</x>
-      <y> 31.5082</y>
-      <z> 6.11767</z>
-    </axis>
-  </animation>
-  <animation>
-    <type>translate</type>
-    <object-name>Tail_Strobe</object-name>
-    <offset-m>37</offset-m>
-    <axis>
-      <x> 35.3813</x>
-      <y> 0</y>
-      <z> 8.03405</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>23.56</offset-m>
-    <axis>
-      <x> -21.2737</x>
-      <y> 0</y>
-      <z> 10.1308</z>
-    </axis>
-  </animation>
-  <animation>
-    <type>translate</type>
-    <object-name>Bottom_Beacon_Red</object-name>
-    <offset-m>7.09</offset-m>
-    <axis>
-      <x> -6.90486</x>
-      <y> 0</y>
-      <z> 1.59196</z>
-    </axis>
-  </animation>
+  <!-- Position ALS Navigation Lights -->
+  <model>
+    <name>nav-right</name>
+    <path>AI/Lights/procedural_light_nav_right.xml</path>
+    <offsets>
+      <x-m>12.5824</x-m>
+      <y-m>31.5082</y-m>
+      <z-m>6.11767</z-m>
+    </offsets>
+  </model>
+  <model>
+    <name>nav-left</name>
+    <path>AI/Lights/procedural_light_nav_left.xml</path>
+    <offsets>
+      <x-m>12.5824</x-m>
+      <y-m>-31.5082</y-m>
+      <z-m>6.11767</z-m>
+    </offsets>
+  </model>
+  <model>
+    <name>nav-tail</name>
+    <path>AI/Lights/procedural_light_nav_tail.xml</path>
+    <offsets>
+      <x-m>35.5</x-m>
+      <y-m>0</y-m>
+      <z-m>8.03405</z-m>
+    </offsets>
+  </model>
+  <!-- Position ALS Strobes -->
+  <model>
+    <name>strobe-right</name>
+    <path>AI/Lights/procedural_light_strobe_right.xml</path>
+    <offsets>
+      <x-m>17.5487</x-m>
+      <y-m>32.4764</y-m>
+      <z-m>7.45557</z-m>
+    </offsets>
+  </model>
+  <model>
+    <name>strobe-left</name>
+    <path>AI/Lights/procedural_light_strobe_left.xml</path>
+    <offsets>
+      <x-m>17.5487</x-m>
+      <y-m>-32.4764</y-m>
+      <z-m>7.45557</z-m>
+    </offsets>
+  </model>
+  <model>
+    <name>strobe-tail</name>
+    <path>AI/Lights/procedural_light_strobe_tail.xml</path>
+    <offsets>
+      <x-m>36</x-m>
+      <y-m>0</y-m>
+      <z-m>8.03405</z-m>
+    </offsets>
+  </model>
+  <!-- Position Beacons -->
+  <model>
+    <name>beacon-top</name>
+    <path>AI/Lights/procedural_light_beacon_top.xml</path>
+    <offsets>
+      <x-m>-21.2737</x-m>
+      <y-m>0</y-m>
+      <z-m>10.1308</z-m>
+    </offsets>
+  </model>
+  <model>
+    <name>beacon-bottom</name>
+    <path>AI/Lights/procedural_light_beacon_bottom.xml</path>
+    <offsets>
+      <x-m>-6.90486</x-m>
+      <y-m>0</y-m>
+      <z-m>1.59196</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-top</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/B777/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/B777/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 +107,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/767/763-main.xml b/AI/Aircraft/767/763-main.xml
index 91e0a4612..36c0e9940 100644
--- a/AI/Aircraft/767/763-main.xml
+++ b/AI/Aircraft/767/763-main.xml
@@ -3,6 +3,7 @@
   <description>Boeing 767-300 ER </description>
   <author>Ian(Yves) Tolosa. Mar 2016 </author>
   <path>Models/763.ac</path>
+  <!-- Pitch Forward so nosewheel on ground -->
   <offsets>
     <pitch-deg>-0.3</pitch-deg>
   </offsets>
@@ -17,24 +18,14 @@
       </less-than>
     </condition>
   </animation>
-   <!-- Tail and Windows Lightmap Effect -->
+  <!-- Tail and Windows Lightmap Effect -->
   <effect>
     <inherits-from>AI/Aircraft/767/Effects/763-LightMap</inherits-from>
     <object-name>763</object-name>
-	<object-name>Gear</object-name>
+    <object-name>Gear</object-name>
   </effect>
   <!-- Add Navigation Lights Objects -->
   <model>
     <path>Lights/763-NavLights.xml</path>
   </model>
-  <!-- Enable Beacons and Strobes Pulse Behaviour -->
-  <nasal>
-    <load><![CDATA[
-        aircraft.light.new("/sim/model/B777/lighting/beacon", [0.7, 1.3]);
-        aircraft.light.new("/sim/model/B777/lighting/strobes", [0.02, 1.98]);
-        setprop("/sim/model/B777/lighting/beacon/enabled", 1);
-        setprop("/sim/model/B777/lighting/strobes/enabled", 1);
-      ]]></load>
-    <unload></unload>
-  </nasal>
 </PropertyList>
\ No newline at end of file
diff --git a/AI/Aircraft/767/76W-main.xml b/AI/Aircraft/767/76W-main.xml
index 023dfb72d..d06b57848 100644
--- a/AI/Aircraft/767/76W-main.xml
+++ b/AI/Aircraft/767/76W-main.xml
@@ -18,24 +18,14 @@
       </less-than>
     </condition>
   </animation>
-   <!-- Tail and Windows Lightmap Effect -->
+  <!-- Tail and Windows Lightmap Effect -->
   <effect>
     <inherits-from>AI/Aircraft/767/Effects/76W-LightMap</inherits-from>
     <object-name>76W</object-name>
-	<object-name>Gear</object-name>
+    <object-name>Gear</object-name>
   </effect>
   <!-- Add Navigation Lights Objects -->
   <model>
     <path>Lights/76W-NavLights.xml</path>
   </model>
-  <!-- Enable Beacons and Strobes Pulse Behaviour -->
-  <nasal>
-    <load><![CDATA[
-        aircraft.light.new("/sim/model/B777/lighting/beacon", [0.7, 1.3]);
-        aircraft.light.new("/sim/model/B777/lighting/strobes", [0.02, 1.98]);
-        setprop("/sim/model/B777/lighting/beacon/enabled", 1);
-        setprop("/sim/model/B777/lighting/strobes/enabled", 1);
-      ]]></load>
-    <unload></unload>
-  </nasal>
 </PropertyList>
\ No newline at end of file
diff --git a/AI/Aircraft/767/76Y-main.xml b/AI/Aircraft/767/76Y-main.xml
index 574ad06c6..b136748ee 100644
--- a/AI/Aircraft/767/76Y-main.xml
+++ b/AI/Aircraft/767/76Y-main.xml
@@ -18,24 +18,14 @@
       </less-than>
     </condition>
   </animation>
-   <!-- Tail and Windows Lightmap Effect -->
+  <!-- Tail and Windows Lightmap Effect -->
   <effect>
     <inherits-from>AI/Aircraft/767/Effects/76Y-LightMap</inherits-from>
     <object-name>76Y</object-name>
-	<object-name>Gear</object-name>
+    <object-name>Gear</object-name>
   </effect>
   <!-- Add Navigation Lights Objects -->
   <model>
-    <path>Lights/763-NavLights.xml</path>
+    <path>Lights/76Y-NavLights.xml</path>
   </model>
-  <!-- Enable Beacons and Strobes Pulse Behaviour -->
-  <nasal>
-    <load><![CDATA[
-        aircraft.light.new("/sim/model/B777/lighting/beacon", [0.7, 1.3]);
-        aircraft.light.new("/sim/model/B777/lighting/strobes", [0.02, 1.98]);
-        setprop("/sim/model/B777/lighting/beacon/enabled", 1);
-        setprop("/sim/model/B777/lighting/strobes/enabled", 1);
-      ]]></load>
-    <unload></unload>
-  </nasal>
 </PropertyList>
\ No newline at end of file
diff --git a/AI/Aircraft/767/Lights/763-NavLights.xml b/AI/Aircraft/767/Lights/763-NavLights.xml
index 0d4c45104..ee6569089 100644
--- a/AI/Aircraft/767/Lights/763-NavLights.xml
+++ b/AI/Aircraft/767/Lights/763-NavLights.xml
@@ -1,218 +1,104 @@
 <?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>25.31</offset-m>
-    <axis>
-      <x> 6.08992</x>
-      <y> -23.9213</y>
-      <z> 5.61157</z>
-    </axis>
-  </animation>
-  <animation>
-    <type>translate</type>
-    <object-name>Right_Wing_Static_Green</object-name>
-    <offset-m>25.31</offset-m>
-    <axis>
-      <x> 6.08992</x>
-      <y> 23.9213</y>
-      <z> 5.61157</z>
-    </axis>
-  </animation>
-  <animation>
-    <type>translate</type>
-    <object-name>Tail_Static_White</object-name>
-    <offset-m>27.15</offset-m>
-    <axis>
-      <x> 26.6414</x>
-      <y> 0</y>
-      <z> 5.14825</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>25.5</offset-m>
-    <axis>
-      <x> 6.08992</x>
-      <y> -23.9213</y>
-      <z> 5.61157</z>
-    </axis>
-  </animation>
-  <animation>
-    <type>translate</type>
-    <object-name>Right_Wing_Strobe</object-name>
-    <offset-m>25.50</offset-m>
-    <axis>
-      <x> 6.08992</x>
-      <y> 23.9213</y>
-      <z> 5.61157</z>
-    </axis>
-  </animation>
-  <animation>
-    <type>translate</type>
-    <object-name>Tail_Strobe</object-name>
-    <offset-m>27.50</offset-m>
-    <axis>
-      <x> 6.08992</x>
-      <y> -23.9213</y>
-      <z> 5.61157</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>16.22</offset-m>
-    <axis>
-      <x> -14.3938</x>
-      <y> 0</y>
-      <z> 7.48714</z>
-    </axis>
-  </animation>
-  <animation>
-    <type>translate</type>
-    <object-name>Bottom_Beacon_Red</object-name>
-    <offset-m>5.32</offset-m>
-    <axis>
-      <x> -5.05014</x>
-      <y> 0</y>
-      <z> 1.66921</z>
-    </axis>
-  </animation>
+  <!-- Position ALS Navigation Lights -->
+  <model>
+    <name>nav-right</name>
+    <path>AI/Lights/procedural_light_nav_right.xml</path>
+    <offsets>
+      <x-m>6</x-m>
+      <y-m>23.8526</y-m>
+      <z-m>5.60614</z-m>
+    </offsets>
+  </model>
+  <model>
+    <name>nav-left</name>
+    <path>AI/Lights/procedural_light_nav_left.xml</path>
+    <offsets>
+      <x-m>6</x-m>
+      <y-m>-23.8526</y-m>
+      <z-m>5.60614</z-m>
+    </offsets>
+  </model>
+  <model>
+    <name>nav-tail</name>
+    <path>AI/Lights/procedural_light_nav_tail.xml</path>
+    <offsets>
+      <x-m>26.7</x-m>
+      <y-m>0</y-m>
+      <z-m>5.14825</z-m>
+    </offsets>
+  </model>
+  <!-- Position ALS Strobes -->
+  <model>
+    <name>strobe-right</name>
+    <path>AI/Lights/procedural_light_strobe_right.xml</path>
+    <offsets>
+      <x-m>8.32604</x-m>
+      <y-m>23.8526</y-m>
+      <z-m>5.60614</z-m>
+    </offsets>
+  </model>
+  <model>
+    <name>strobe-left</name>
+    <path>AI/Lights/procedural_light_strobe_left.xml</path>
+    <offsets>
+      <x-m>8.32604</x-m>
+      <y-m>-23.8526</y-m>
+      <z-m>5.60614</z-m>
+    </offsets>
+  </model>
+  <model>
+    <name>strobe-tail</name>
+    <path>AI/Lights/procedural_light_strobe_tail.xml</path>
+    <offsets>
+      <x-m>27</x-m>
+      <y-m>0</y-m>
+      <z-m>5.14825</z-m>
+    </offsets>
+  </model>
+  <!-- Position Beacons -->
+  <model>
+    <name>beacon-top</name>
+    <path>AI/Lights/procedural_light_beacon_top.xml</path>
+    <offsets>
+      <x-m>-14.3938</x-m>
+      <y-m>0</y-m>
+      <z-m>7.48714</z-m>
+    </offsets>
+  </model>
+  <model>
+    <name>beacon-bottom</name>
+    <path>AI/Lights/procedural_light_beacon_bottom.xml</path>
+    <offsets>
+      <x-m>-5.05014</x-m>
+      <y-m>0</y-m>
+      <z-m>1.66921</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-top</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/B777/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/B777/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 +107,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/767/Lights/76W-NavLights.xml b/AI/Aircraft/767/Lights/76W-NavLights.xml
index ec8ae0754..3b2e74f55 100644
--- a/AI/Aircraft/767/Lights/76W-NavLights.xml
+++ b/AI/Aircraft/767/Lights/76W-NavLights.xml
@@ -1,218 +1,104 @@
 <?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>24.84</offset-m>
-    <axis>
-      <x> 6.37725</x>
-      <y> -23.3846</y>
-      <z> 5.43277</z>
-    </axis>
-  </animation>
-  <animation>
-    <type>translate</type>
-    <object-name>Right_Wing_Static_Green</object-name>
-    <offset-m>24.84</offset-m>
-    <axis>
-      <x> 6.37725</x>
-      <y> 23.3846</y>
-      <z> 5.43277</z>
-    </axis>
-  </animation>
-  <animation>
-    <type>translate</type>
-    <object-name>Tail_Static_White</object-name>
-    <offset-m>27.15</offset-m>
-    <axis>
-      <x> 26.6414</x>
-      <y> 0</y>
-      <z> 5.14825</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>25</offset-m>
-    <axis>
-      <x> 6.37725</x>
-      <y> -23.3846</y>
-      <z> 5.43277</z>
-    </axis>
-  </animation>
-  <animation>
-    <type>translate</type>
-    <object-name>Right_Wing_Strobe</object-name>
-    <offset-m>25</offset-m>
-    <axis>
-      <x> 6.37725</x>
-      <y> 23.3846</y>
-      <z> 5.43277</z>
-    </axis>
-  </animation>
-  <animation>
-    <type>translate</type>
-    <object-name>Tail_Strobe</object-name>
-    <offset-m>27.50</offset-m>
-    <axis>
-      <x> 6.08992</x>
-      <y> -23.9213</y>
-      <z> 5.61157</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>16.22</offset-m>
-    <axis>
-      <x> -14.3938</x>
-      <y> 0</y>
-      <z> 7.48714</z>
-    </axis>
-  </animation>
-  <animation>
-    <type>translate</type>
-    <object-name>Bottom_Beacon_Red</object-name>
-    <offset-m>5.32</offset-m>
-    <axis>
-      <x> -5.05014</x>
-      <y> 0</y>
-      <z> 1.66921</z>
-    </axis>
-  </animation>
+  <!-- Position ALS Navigation Lights -->
+  <model>
+    <name>nav-right</name>
+    <path>AI/Lights/procedural_light_nav_right.xml</path>
+    <offsets>
+      <x-m>6</x-m>
+      <y-m>23.8526</y-m>
+      <z-m>5.60614</z-m>
+    </offsets>
+  </model>
+  <model>
+    <name>nav-left</name>
+    <path>AI/Lights/procedural_light_nav_left.xml</path>
+    <offsets>
+      <x-m>6</x-m>
+      <y-m>-23.8526</y-m>
+      <z-m>5.60614</z-m>
+    </offsets>
+  </model>
+  <model>
+    <name>nav-tail</name>
+    <path>AI/Lights/procedural_light_nav_tail.xml</path>
+    <offsets>
+      <x-m>26.7</x-m>
+      <y-m>0</y-m>
+      <z-m>5.14825</z-m>
+    </offsets>
+  </model>
+  <!-- Position ALS Strobes -->
+  <model>
+    <name>strobe-right</name>
+    <path>AI/Lights/procedural_light_strobe_right.xml</path>
+    <offsets>
+      <x-m>11.0013</x-m>
+      <y-m>25.3513</y-m>
+      <z-m>8.97</z-m>
+    </offsets>
+  </model>
+  <model>
+    <name>strobe-left</name>
+    <path>AI/Lights/procedural_light_strobe_left.xml</path>
+    <offsets>
+      <x-m>11.0013</x-m>
+      <y-m>-25.3513</y-m>
+      <z-m>8.97</z-m>
+    </offsets>
+  </model>
+  <model>
+    <name>strobe-tail</name>
+    <path>AI/Lights/procedural_light_strobe_tail.xml</path>
+    <offsets>
+      <x-m>27</x-m>
+      <y-m>0</y-m>
+      <z-m>5.14825</z-m>
+    </offsets>
+  </model>
+  <!-- Position Beacons -->
+  <model>
+    <name>beacon-top</name>
+    <path>AI/Lights/procedural_light_beacon_top.xml</path>
+    <offsets>
+      <x-m>-14.3938</x-m>
+      <y-m>0</y-m>
+      <z-m>7.48714</z-m>
+    </offsets>
+  </model>
+  <model>
+    <name>beacon-bottom</name>
+    <path>AI/Lights/procedural_light_beacon_bottom.xml</path>
+    <offsets>
+      <x-m>-5.05014</x-m>
+      <y-m>0</y-m>
+      <z-m>1.66921</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-top</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/B777/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/B777/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 +107,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/767/Lights/76Y-NavLights.xml b/AI/Aircraft/767/Lights/76Y-NavLights.xml
new file mode 100644
index 000000000..ee6569089
--- /dev/null
+++ b/AI/Aircraft/767/Lights/76Y-NavLights.xml
@@ -0,0 +1,122 @@
+<?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>6</x-m>
+      <y-m>23.8526</y-m>
+      <z-m>5.60614</z-m>
+    </offsets>
+  </model>
+  <model>
+    <name>nav-left</name>
+    <path>AI/Lights/procedural_light_nav_left.xml</path>
+    <offsets>
+      <x-m>6</x-m>
+      <y-m>-23.8526</y-m>
+      <z-m>5.60614</z-m>
+    </offsets>
+  </model>
+  <model>
+    <name>nav-tail</name>
+    <path>AI/Lights/procedural_light_nav_tail.xml</path>
+    <offsets>
+      <x-m>26.7</x-m>
+      <y-m>0</y-m>
+      <z-m>5.14825</z-m>
+    </offsets>
+  </model>
+  <!-- Position ALS Strobes -->
+  <model>
+    <name>strobe-right</name>
+    <path>AI/Lights/procedural_light_strobe_right.xml</path>
+    <offsets>
+      <x-m>8.32604</x-m>
+      <y-m>23.8526</y-m>
+      <z-m>5.60614</z-m>
+    </offsets>
+  </model>
+  <model>
+    <name>strobe-left</name>
+    <path>AI/Lights/procedural_light_strobe_left.xml</path>
+    <offsets>
+      <x-m>8.32604</x-m>
+      <y-m>-23.8526</y-m>
+      <z-m>5.60614</z-m>
+    </offsets>
+  </model>
+  <model>
+    <name>strobe-tail</name>
+    <path>AI/Lights/procedural_light_strobe_tail.xml</path>
+    <offsets>
+      <x-m>27</x-m>
+      <y-m>0</y-m>
+      <z-m>5.14825</z-m>
+    </offsets>
+  </model>
+  <!-- Position Beacons -->
+  <model>
+    <name>beacon-top</name>
+    <path>AI/Lights/procedural_light_beacon_top.xml</path>
+    <offsets>
+      <x-m>-14.3938</x-m>
+      <y-m>0</y-m>
+      <z-m>7.48714</z-m>
+    </offsets>
+  </model>
+  <model>
+    <name>beacon-bottom</name>
+    <path>AI/Lights/procedural_light_beacon_bottom.xml</path>
+    <offsets>
+      <x-m>-5.05014</x-m>
+      <y-m>0</y-m>
+      <z-m>1.66921</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-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>
+    <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
diff --git a/AI/Aircraft/777/77F-main.xml b/AI/Aircraft/777/77F-main.xml
index 45e2273e7..a8c3a0acf 100644
--- a/AI/Aircraft/777/77F-main.xml
+++ b/AI/Aircraft/777/77F-main.xml
@@ -22,21 +22,10 @@
   <effect>
     <inherits-from>AI/Aircraft/777/Effects/77F-LightMap</inherits-from>
     <object-name>77F</object-name>
-	<object-name>Gear</object-name>
+    <object-name>Gear</object-name>
   </effect>
   <!-- Add Navigation Lights Objects -->
   <model>
     <path>Lights/77F-NavLights.xml</path>
   </model>
-  <!-- Enable Beacons and Strobes Pulse Behaviour -->
-  <nasal>
-    <load><![CDATA[
-        aircraft.light.new("/sim/model/B777/lighting/beacon", [0.7, 1.3]);
-        aircraft.light.new("/sim/model/B777/lighting/strobes", [0.02, 1.98]);
-        setprop("/sim/model/B777/lighting/beacon/enabled", 1);
-        setprop("/sim/model/B777/lighting/strobes/enabled", 1);
-      ]]></load>
-    <unload></unload>
-  </nasal>
-  
 </PropertyList>
\ No newline at end of file
diff --git a/AI/Aircraft/777/77L-main.xml b/AI/Aircraft/777/77L-main.xml
index 3d9456e57..c38f6937e 100644
--- a/AI/Aircraft/777/77L-main.xml
+++ b/AI/Aircraft/777/77L-main.xml
@@ -3,7 +3,7 @@
   <description>Boeing 777-200 LR</description>
   <author>Ian(Yves) Tolosa. September 2016</author>
   <path>Models/77L.ac</path>
-   <!-- Pitch Forward so nosewheel on ground -->
+  <!-- Pitch Forward so nosewheel on ground -->
   <offsets>
     <pitch-deg>-0.95</pitch-deg>
   </offsets>
@@ -22,21 +22,10 @@
   <effect>
     <inherits-from>AI/Aircraft/777/Effects/77L-LightMap</inherits-from>
     <object-name>77L</object-name>
-	<object-name>Gear</object-name>
+    <object-name>Gear</object-name>
   </effect>
   <!-- Add Navigation Lights Objects -->
   <model>
     <path>Lights/77L-NavLights.xml</path>
   </model>
-  <!-- Enable Beacons and Strobes Pulse Behaviour -->
-  <nasal>
-    <load><![CDATA[
-        aircraft.light.new("/sim/model/B777/lighting/beacon", [0.7, 1.3]);
-        aircraft.light.new("/sim/model/B777/lighting/strobes", [0.02, 1.98]);
-        setprop("/sim/model/B777/lighting/beacon/enabled", 1);
-        setprop("/sim/model/B777/lighting/strobes/enabled", 1);
-      ]]></load>
-    <unload></unload>
-  </nasal>
-  
 </PropertyList>
\ No newline at end of file
diff --git a/AI/Aircraft/777/77W-main.xml b/AI/Aircraft/777/77W-main.xml
index 9fea12a1c..6a77067bd 100644
--- a/AI/Aircraft/777/77W-main.xml
+++ b/AI/Aircraft/777/77W-main.xml
@@ -22,20 +22,10 @@
   <effect>
     <inherits-from>AI/Aircraft/777/Effects/77W-LightMap</inherits-from>
     <object-name>77W</object-name>
-	<object-name>Gear</object-name>
+    <object-name>Gear</object-name>
   </effect>
   <!-- Add Navigation Lights Objects -->
   <model>
     <path>Lights/77W-NavLights.xml</path>
   </model>
-  <!-- Enable Beacons and Strobes Pulse Behaviour -->
-  <nasal>
-    <load><![CDATA[
-        aircraft.light.new("/sim/model/B777/lighting/beacon", [0.7, 1.3]);
-        aircraft.light.new("/sim/model/B777/lighting/strobes", [0.02, 1.98]);
-        setprop("/sim/model/B777/lighting/beacon/enabled", 1);
-        setprop("/sim/model/B777/lighting/strobes/enabled", 1);
-      ]]></load>
-    <unload></unload>
-  </nasal>
 </PropertyList>
\ No newline at end of file
diff --git a/AI/Aircraft/777/Lights/77F-NavLights.xml b/AI/Aircraft/777/Lights/77F-NavLights.xml
index a03766e0d..f4921340b 100644
--- a/AI/Aircraft/777/Lights/77F-NavLights.xml
+++ b/AI/Aircraft/777/Lights/77F-NavLights.xml
@@ -1,218 +1,104 @@
 <?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>35.25</offset-m>
-    <axis>
-      <x> 11.6649</x>
-      <y> -32.4</y>
-      <z> 7.69404</z>
-    </axis>
-  </animation>
-  <animation>
-    <type>translate</type>
-    <object-name>Right_Wing_Static_Green</object-name>
-    <offset-m>35.25</offset-m>
-    <axis>
-      <x> 11.6649</x>
-      <y>  32.4</y>
-      <z> 7.69404</z>
-    </axis>
-  </animation>
-  <animation>
-    <type>translate</type>
-    <object-name>Tail_Static_White</object-name>
-    <offset-m>31.75</offset-m>
-    <axis>
-      <x> 30.96</x>
-      <y> 0</y>
-      <z> 6.91182</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>36</offset-m>
-    <axis>
-      <x> 11.6649</x>
-      <y> -32.4</y>
-      <z> 7.69404</z>
-    </axis>
-  </animation>
-  <animation>
-    <type>translate</type>
-    <object-name>Right_Wing_Strobe</object-name>
-    <offset-m>36</offset-m>
-    <axis>
-      <x> 11.6649</x>
-      <y>  32.4</y>
-      <z> 7.69404</z>
-    </axis>
-  </animation>
-  <animation>
-    <type>translate</type>
-    <object-name>Tail_Strobe</object-name>
-    <offset-m>32.5</offset-m>
-    <axis>
-      <x> 30.96</x>
-      <y> 0</y>
-      <z> 6.91182</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>14.90</offset-m>
-    <axis>
-      <x> -11.7655</x>
-      <y> 0</y>
-      <z> 9.13623</z>
-    </axis>
-  </animation>
-  <animation>
-    <type>translate</type>
-    <object-name>Bottom_Beacon_Red</object-name>
-    <offset-m>4.15</offset-m>
-    <axis>
-      <x> -3.48822</x>
-      <y> 0</y>
-      <z> 2.24884</z>
-    </axis>
-  </animation>
+  <!-- Position ALS Navigation Lights -->
+  <model>
+    <name>nav-right</name>
+    <path>AI/Lights/procedural_light_nav_right.xml</path>
+    <offsets>
+      <x-m>9.06877</x-m>
+      <y-m>31.1613</y-m>
+      <z-m>7.54863</z-m>
+    </offsets>
+  </model>
+  <model>
+    <name>nav-left</name>
+    <path>AI/Lights/procedural_light_nav_left.xml</path>
+    <offsets>
+      <x-m>9.06877</x-m>
+      <y-m>-31.1613</y-m>
+      <z-m>7.54863</z-m>
+    </offsets>
+  </model>
+  <model>
+    <name>nav-tail</name>
+    <path>AI/Lights/procedural_light_nav_tail.xml</path>
+    <offsets>
+      <x-m>31</x-m>
+      <y-m>0</y-m>
+      <z-m>6.88292</z-m>
+    </offsets>
+  </model>
+  <!-- Position ALS Strobes -->
+  <model>
+    <name>strobe-right</name>
+    <path>AI/Lights/procedural_light_strobe_right.xml</path>
+    <offsets>
+      <x-m>12.1498</x-m>
+      <y-m>32.4</y-m>
+      <z-m>7.66516</z-m>
+    </offsets>
+  </model>
+  <model>
+    <name>strobe-left</name>
+    <path>AI/Lights/procedural_light_strobe_left.xml</path>
+    <offsets>
+      <x-m>12.1498</x-m>
+      <y-m>-32.4</y-m>
+      <z-m>7.66516</z-m>
+    </offsets>
+  </model>
+  <model>
+    <name>strobe-tail</name>
+    <path>AI/Lights/procedural_light_strobe_tail.xml</path>
+    <offsets>
+      <x-m>31.5</x-m>
+      <y-m>0</y-m>
+      <z-m>6.88292</z-m>
+    </offsets>
+  </model>
+  <!-- Position Beacons -->
+  <model>
+    <name>beacon-top</name>
+    <path>AI/Lights/procedural_light_beacon_top.xml</path>
+    <offsets>
+      <x-m>-11.7655</x-m>
+      <y-m>0</y-m>
+      <z-m>9.13623</z-m>
+    </offsets>
+  </model>
+  <model>
+    <name>beacon-bottom</name>
+    <path>AI/Lights/procedural_light_beacon_bottom.xml</path>
+    <offsets>
+      <x-m>-3.48822</x-m>
+      <y-m>0</y-m>
+      <z-m>2.24884</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-top</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/B777/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/B777/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 +107,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/777/Lights/77L-NavLights.xml b/AI/Aircraft/777/Lights/77L-NavLights.xml
index a03766e0d..f4921340b 100644
--- a/AI/Aircraft/777/Lights/77L-NavLights.xml
+++ b/AI/Aircraft/777/Lights/77L-NavLights.xml
@@ -1,218 +1,104 @@
 <?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>35.25</offset-m>
-    <axis>
-      <x> 11.6649</x>
-      <y> -32.4</y>
-      <z> 7.69404</z>
-    </axis>
-  </animation>
-  <animation>
-    <type>translate</type>
-    <object-name>Right_Wing_Static_Green</object-name>
-    <offset-m>35.25</offset-m>
-    <axis>
-      <x> 11.6649</x>
-      <y>  32.4</y>
-      <z> 7.69404</z>
-    </axis>
-  </animation>
-  <animation>
-    <type>translate</type>
-    <object-name>Tail_Static_White</object-name>
-    <offset-m>31.75</offset-m>
-    <axis>
-      <x> 30.96</x>
-      <y> 0</y>
-      <z> 6.91182</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>36</offset-m>
-    <axis>
-      <x> 11.6649</x>
-      <y> -32.4</y>
-      <z> 7.69404</z>
-    </axis>
-  </animation>
-  <animation>
-    <type>translate</type>
-    <object-name>Right_Wing_Strobe</object-name>
-    <offset-m>36</offset-m>
-    <axis>
-      <x> 11.6649</x>
-      <y>  32.4</y>
-      <z> 7.69404</z>
-    </axis>
-  </animation>
-  <animation>
-    <type>translate</type>
-    <object-name>Tail_Strobe</object-name>
-    <offset-m>32.5</offset-m>
-    <axis>
-      <x> 30.96</x>
-      <y> 0</y>
-      <z> 6.91182</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>14.90</offset-m>
-    <axis>
-      <x> -11.7655</x>
-      <y> 0</y>
-      <z> 9.13623</z>
-    </axis>
-  </animation>
-  <animation>
-    <type>translate</type>
-    <object-name>Bottom_Beacon_Red</object-name>
-    <offset-m>4.15</offset-m>
-    <axis>
-      <x> -3.48822</x>
-      <y> 0</y>
-      <z> 2.24884</z>
-    </axis>
-  </animation>
+  <!-- Position ALS Navigation Lights -->
+  <model>
+    <name>nav-right</name>
+    <path>AI/Lights/procedural_light_nav_right.xml</path>
+    <offsets>
+      <x-m>9.06877</x-m>
+      <y-m>31.1613</y-m>
+      <z-m>7.54863</z-m>
+    </offsets>
+  </model>
+  <model>
+    <name>nav-left</name>
+    <path>AI/Lights/procedural_light_nav_left.xml</path>
+    <offsets>
+      <x-m>9.06877</x-m>
+      <y-m>-31.1613</y-m>
+      <z-m>7.54863</z-m>
+    </offsets>
+  </model>
+  <model>
+    <name>nav-tail</name>
+    <path>AI/Lights/procedural_light_nav_tail.xml</path>
+    <offsets>
+      <x-m>31</x-m>
+      <y-m>0</y-m>
+      <z-m>6.88292</z-m>
+    </offsets>
+  </model>
+  <!-- Position ALS Strobes -->
+  <model>
+    <name>strobe-right</name>
+    <path>AI/Lights/procedural_light_strobe_right.xml</path>
+    <offsets>
+      <x-m>12.1498</x-m>
+      <y-m>32.4</y-m>
+      <z-m>7.66516</z-m>
+    </offsets>
+  </model>
+  <model>
+    <name>strobe-left</name>
+    <path>AI/Lights/procedural_light_strobe_left.xml</path>
+    <offsets>
+      <x-m>12.1498</x-m>
+      <y-m>-32.4</y-m>
+      <z-m>7.66516</z-m>
+    </offsets>
+  </model>
+  <model>
+    <name>strobe-tail</name>
+    <path>AI/Lights/procedural_light_strobe_tail.xml</path>
+    <offsets>
+      <x-m>31.5</x-m>
+      <y-m>0</y-m>
+      <z-m>6.88292</z-m>
+    </offsets>
+  </model>
+  <!-- Position Beacons -->
+  <model>
+    <name>beacon-top</name>
+    <path>AI/Lights/procedural_light_beacon_top.xml</path>
+    <offsets>
+      <x-m>-11.7655</x-m>
+      <y-m>0</y-m>
+      <z-m>9.13623</z-m>
+    </offsets>
+  </model>
+  <model>
+    <name>beacon-bottom</name>
+    <path>AI/Lights/procedural_light_beacon_bottom.xml</path>
+    <offsets>
+      <x-m>-3.48822</x-m>
+      <y-m>0</y-m>
+      <z-m>2.24884</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-top</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/B777/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/B777/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 +107,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/777/Lights/77W-NavLights.xml b/AI/Aircraft/777/Lights/77W-NavLights.xml
index 6ef7064c3..7db8165b4 100644
--- a/AI/Aircraft/777/Lights/77W-NavLights.xml
+++ b/AI/Aircraft/777/Lights/77W-NavLights.xml
@@ -1,218 +1,104 @@
 <?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>35.28</offset-m>
-    <axis>
-      <x> 11.6665</x>
-      <y> -32.4</y>
-      <z> 7.66221</z>
-    </axis>
-  </animation>
-  <animation>
-    <type>translate</type>
-    <object-name>Right_Wing_Static_Green</object-name>
-    <offset-m>35.28</offset-m>
-    <axis>
-      <x> 11.6665</x>
-      <y>  32.4</y>
-      <z> 7.66221</z>
-    </axis>
-  </animation>
-  <animation>
-    <type>translate</type>
-    <object-name>Tail_Static_White</object-name>
-    <offset-m>36.4</offset-m>
-    <axis>
-      <x> 35.7006</x>
-      <y> 0</y>
-      <z> 6.88</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>36</offset-m>
-    <axis>
-      <x> 11.6665</x>
-      <y> -32.4</y>
-      <z> 7.66221</z>
-    </axis>
-  </animation>
-  <animation>
-    <type>translate</type>
-    <object-name>Right_Wing_Strobe</object-name>
-    <offset-m>36</offset-m>
-    <axis>
-      <x> 11.6665</x>
-      <y>  32.4</y>
-      <z> 7.66221</z>
-    </axis>
-  </animation>
-  <animation>
-    <type>translate</type>
-    <object-name>Tail_Strobe</object-name>
-    <offset-m>37</offset-m>
-    <axis>
-      <x> 35.7006</x>
-      <y> 0</y>
-      <z> 6.88</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>14.90</offset-m>
-    <axis>
-      <x> -11.7655</x>
-      <y> 0</y>
-      <z> 9.13623</z>
-    </axis>
-  </animation>
-  <animation>
-    <type>translate</type>
-    <object-name>Bottom_Beacon_Red</object-name>
-    <offset-m>4.15</offset-m>
-    <axis>
-      <x> -3.48822</x>
-      <y> 0</y>
-      <z> 2.24884</z>
-    </axis>
-  </animation>
+  <!-- Position ALS Navigation Lights -->
+  <model>
+    <name>nav-right</name>
+    <path>AI/Lights/procedural_light_nav_right.xml</path>
+    <offsets>
+      <x-m>9.06877</x-m>
+      <y-m>31.1613</y-m>
+      <z-m>7.54863</z-m>
+    </offsets>
+  </model>
+  <model>
+    <name>nav-left</name>
+    <path>AI/Lights/procedural_light_nav_left.xml</path>
+    <offsets>
+      <x-m>9.06877</x-m>
+      <y-m>-31.1613</y-m>
+      <z-m>7.54863</z-m>
+    </offsets>
+  </model>
+  <model>
+    <name>nav-tail</name>
+    <path>AI/Lights/procedural_light_nav_tail.xml</path>
+    <offsets>
+      <x-m>35.75</x-m>
+      <y-m>0</y-m>
+      <z-m>6.88</z-m>
+    </offsets>
+  </model>
+  <!-- Position ALS Strobes -->
+  <model>
+    <name>strobe-right</name>
+    <path>AI/Lights/procedural_light_strobe_right.xml</path>
+    <offsets>
+      <x-m>12.1603</x-m>
+      <y-m>32.4</y-m>
+      <z-m>7.6622</z-m>
+    </offsets>
+  </model>
+  <model>
+    <name>strobe-left</name>
+    <path>AI/Lights/procedural_light_strobe_left.xml</path>
+    <offsets>
+      <x-m>12.1603</x-m>
+      <y-m>-32.4</y-m>
+      <z-m>7.6622</z-m>
+    </offsets>
+  </model>
+  <model>
+    <name>strobe-tail</name>
+    <path>AI/Lights/procedural_light_strobe_tail.xml</path>
+    <offsets>
+      <x-m>35.95</x-m>
+      <y-m>0</y-m>
+      <z-m>6.88</z-m>
+    </offsets>
+  </model>
+  <!-- Position Beacons -->
+  <model>
+    <name>beacon-top</name>
+    <path>AI/Lights/procedural_light_beacon_top.xml</path>
+    <offsets>
+      <x-m>-11.7655</x-m>
+      <y-m>0</y-m>
+      <z-m>9.13623</z-m>
+    </offsets>
+  </model>
+  <model>
+    <name>beacon-bottom</name>
+    <path>AI/Lights/procedural_light_beacon_bottom.xml</path>
+    <offsets>
+      <x-m>-3.48822</x-m>
+      <y-m>0</y-m>
+      <z-m>2.24884</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-top</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/B777/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/B777/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 +107,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/787/788-main.xml b/AI/Aircraft/787/788-main.xml
index bd7399fce..3417f745e 100644
--- a/AI/Aircraft/787/788-main.xml
+++ b/AI/Aircraft/787/788-main.xml
@@ -22,20 +22,10 @@
   <effect>
     <inherits-from>AI/Aircraft/787/Effects/788-LightMap</inherits-from>
     <object-name>788</object-name>
-	<object-name>Gear</object-name>
+    <object-name>Gear</object-name>
   </effect>
   <!-- Add Navigation Lights Objects -->
   <model>
     <path>Lights/788-NavLights.xml</path>
   </model>
-  <!-- Enable Beacons and Strobes Pulse Behaviour -->
-  <nasal>
-    <load><![CDATA[
-        aircraft.light.new("/sim/model/B777/lighting/beacon", [0.7, 1.3]);
-        aircraft.light.new("/sim/model/B777/lighting/strobes", [0.02, 1.98]);
-        setprop("/sim/model/B777/lighting/beacon/enabled", 1);
-        setprop("/sim/model/B777/lighting/strobes/enabled", 1);
-      ]]></load>
-    <unload></unload>
-  </nasal>
 </PropertyList>
\ No newline at end of file
diff --git a/AI/Aircraft/787/789-main.xml b/AI/Aircraft/787/789-main.xml
index a774a1428..ff25cb01e 100644
--- a/AI/Aircraft/787/789-main.xml
+++ b/AI/Aircraft/787/789-main.xml
@@ -22,20 +22,10 @@
   <effect>
     <inherits-from>AI/Aircraft/787/Effects/789-LightMap</inherits-from>
     <object-name>789</object-name>
-	<object-name>Gear</object-name>
+    <object-name>Gear</object-name>
   </effect>
   <!-- Add Navigation Lights Objects -->
   <model>
     <path>Lights/789-NavLights.xml</path>
   </model>
-  <!-- Enable Beacons and Strobes Pulse Behaviour -->
-  <nasal>
-    <load><![CDATA[
-        aircraft.light.new("/sim/model/B777/lighting/beacon", [0.7, 1.3]);
-        aircraft.light.new("/sim/model/B777/lighting/strobes", [0.02, 1.98]);
-        setprop("/sim/model/B777/lighting/beacon/enabled", 1);
-        setprop("/sim/model/B777/lighting/strobes/enabled", 1);
-      ]]></load>
-    <unload></unload>
-  </nasal>
 </PropertyList>
\ No newline at end of file
diff --git a/AI/Aircraft/787/Lights/788-NavLights.xml b/AI/Aircraft/787/Lights/788-NavLights.xml
index 82fd94973..d99cd2f65 100644
--- a/AI/Aircraft/787/Lights/788-NavLights.xml
+++ b/AI/Aircraft/787/Lights/788-NavLights.xml
@@ -1,218 +1,104 @@
 <?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>31.30</offset-m>
-    <axis>
-      <x> 9.43435</x>
-      <y> -28.9047</y>
-      <z> 7.21402</z>
-    </axis>
-  </animation>
-  <animation>
-    <type>translate</type>
-    <object-name>Right_Wing_Static_Green</object-name>
-    <offset-m>31.30</offset-m>
-    <axis>
-      <x> 9.43435</x>
-      <y> 28.9047</y>
-      <z> 7.21402</z>
-    </axis>
-  </animation>
-  <animation>
-    <type>translate</type>
-    <object-name>Tail_Static_White</object-name>
-    <offset-m>28.10</offset-m>
-    <axis>
-      <x> 27.4923</x>
-      <y> 0</y>
-      <z> 5.77517</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>32</offset-m>
-    <axis>
-      <x> 9.43435</x>
-      <y> -28.9047</y>
-      <z> 7.21402</z>
-    </axis>
-  </animation>
-  <animation>
-    <type>translate</type>
-    <object-name>Right_Wing_Strobe</object-name>
-    <offset-m>32</offset-m>
-    <axis>
-      <x> 9.43435</x>
-      <y> 28.9047</y>
-      <z> 7.21402</z>
-    </axis>
-  </animation>
-  <animation>
-    <type>translate</type>
-    <object-name>Tail_Strobe</object-name>
-    <offset-m>29</offset-m>
-    <axis>
-      <x> 27.4923</x>
-      <y> 0</y>
-      <z> 5.77517</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>18.28</offset-m>
-    <axis>
-      <x> -16.2973</x>
-      <y> 0</y>
-      <z> 8.27991</z>
-    </axis>
-  </animation>
-  <animation>
-    <type>translate</type>
-    <object-name>Bottom_Beacon_Red</object-name>
-    <offset-m>8.22</offset-m>
-    <axis>
-      <x> -8.07238</x>
-      <y> 0</y>
-      <z> 1.56435</z>
-    </axis>
-  </animation>
+  <!-- Position ALS Navigation Lights -->
+  <model>
+    <name>nav-right</name>
+    <path>AI/Lights/procedural_light_nav_right.xml</path>
+    <offsets>
+      <x-m>6.5</x-m>
+      <y-m>25.8903</y-m>
+      <z-m>6.82874</z-m>
+    </offsets>
+  </model>
+  <model>
+    <name>nav-left</name>
+    <path>AI/Lights/procedural_light_nav_left.xml</path>
+    <offsets>
+      <x-m>6.5</x-m>
+      <y-m>-25.8903</y-m>
+      <z-m>6.82874</z-m>
+    </offsets>
+  </model>
+  <model>
+    <name>nav-tail</name>
+    <path>AI/Lights/procedural_light_nav_tail.xml</path>
+    <offsets>
+      <x-m>27.7</x-m>
+      <y-m>0</y-m>
+      <z-m>5.82911</z-m>
+    </offsets>
+  </model>
+  <!-- Position ALS Strobes -->
+  <model>
+    <name>strobe-right</name>
+    <path>AI/Lights/procedural_light_strobe_right.xml</path>
+    <offsets>
+      <x-m>12.5</x-m>
+      <y-m>30.0217</y-m>
+      <z-m>7.65783</z-m>
+    </offsets>
+  </model>
+  <model>
+    <name>strobe-left</name>
+    <path>AI/Lights/procedural_light_strobe_left.xml</path>
+    <offsets>
+      <x-m>12.5</x-m>
+      <y-m>-30.0217</y-m>
+      <z-m>7.65783</z-m>
+    </offsets>
+  </model>
+  <model>
+    <name>strobe-tail</name>
+    <path>AI/Lights/procedural_light_strobe_tail.xml</path>
+    <offsets>
+      <x-m>28.5</x-m>
+      <y-m>0</y-m>
+      <z-m>5.82911</z-m>
+    </offsets>
+  </model>
+  <!-- Position Beacons -->
+  <model>
+    <name>beacon-top</name>
+    <path>AI/Lights/procedural_light_beacon_top.xml</path>
+    <offsets>
+      <x-m>-16.2973</x-m>
+      <y-m>0</y-m>
+      <z-m>8.27991</z-m>
+    </offsets>
+  </model>
+  <model>
+    <name>beacon-bottom</name>
+    <path>AI/Lights/procedural_light_beacon_bottom.xml</path>
+    <offsets>
+      <x-m>-8.07238</x-m>
+      <y-m>0</y-m>
+      <z-m>1.56435</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-top</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/B777/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/B777/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 +107,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/787/Lights/789-NavLights.xml b/AI/Aircraft/787/Lights/789-NavLights.xml
index 22c69fdd4..f4f04b200 100644
--- a/AI/Aircraft/787/Lights/789-NavLights.xml
+++ b/AI/Aircraft/787/Lights/789-NavLights.xml
@@ -1,218 +1,104 @@
 <?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>31.25</offset-m>
-    <axis>
-      <x> 9.43435</x>
-      <y>-28.9047</y>
-      <z> 7.21402</z>
-    </axis>
-  </animation>
-  <animation>
-    <type>translate</type>
-    <object-name>Right_Wing_Static_Green</object-name>
-    <offset-m>31.25</offset-m>
-    <axis>
-      <x> 9.43435</x>
-      <y> 28.9047</y>
-      <z> 7.21402</z>
-    </axis>
-  </animation>
-  <animation>
-    <type>translate</type>
-    <object-name>Tail_Static_White</object-name>
-    <offset-m>31.20</offset-m>
-    <axis>
-      <x> 30.5772</x>
-      <y> 0</y>
-      <z> 5.77517</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>33</offset-m>
-    <axis>
-      <x> 9.43435</x>
-      <y> -28.9047</y>
-      <z> 7.21402</z>
-    </axis>
-  </animation>
-  <animation>
-    <type>translate</type>
-    <object-name>Right_Wing_Strobe</object-name>
-    <offset-m>33</offset-m>
-    <axis>
-      <x> 9.43435</x>
-      <y> 28.9047</y>
-      <z> 7.21402</z>
-    </axis>
-  </animation>
-  <animation>
-    <type>translate</type>
-    <object-name>Tail_Strobe</object-name>
-    <offset-m>32</offset-m>
-    <axis>
-      <x> 30.5772</x>
-      <y> 0</y>
-      <z> 5.77517</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>20.55</offset-m>
-    <axis>
-      <x> -18.799</x>
-      <y> 0</y>
-      <z> 8.25449</z>
-    </axis>
-  </animation>
-  <animation>
-    <type>translate</type>
-    <object-name>Bottom_Beacon_Red</object-name>
-    <offset-m>6.17</offset-m>
-    <axis>
-      <x> -5.97862</x>
-      <y> 0</y>
-      <z> 1.50692</z>
-    </axis>
-  </animation>
+  <!-- Position ALS Navigation Lights -->
+  <model>
+    <name>nav-right</name>
+    <path>AI/Lights/procedural_light_nav_right.xml</path>
+    <offsets>
+      <x-m>6.4</x-m>
+      <y-m>25.8903</y-m>
+      <z-m>6.7748</z-m>
+    </offsets>
+  </model>
+  <model>
+    <name>nav-left</name>
+    <path>AI/Lights/procedural_light_nav_left.xml</path>
+    <offsets>
+      <x-m>6.4</x-m>
+      <y-m>-25.8903</y-m>
+      <z-m>6.7748</z-m>
+    </offsets>
+  </model>
+  <model>
+    <name>nav-tail</name>
+    <path>AI/Lights/procedural_light_nav_tail.xml</path>
+    <offsets>
+      <x-m>30.6</x-m>
+      <y-m>0</y-m>
+      <z-m>5.77517</z-m>
+    </offsets>
+  </model>
+  <!-- Position ALS Strobes -->
+  <model>
+    <name>strobe-right</name>
+    <path>AI/Lights/procedural_light_strobe_right.xml</path>
+    <offsets>
+      <x-m>12.5</x-m>
+      <y-m>30.0217</y-m>
+      <z-m>7.60389</z-m>
+    </offsets>
+  </model>
+  <model>
+    <name>strobe-left</name>
+    <path>AI/Lights/procedural_light_strobe_left.xml</path>
+    <offsets>
+      <x-m>12.5</x-m>
+      <y-m>-30.0217</y-m>
+      <z-m>7.60389</z-m>
+    </offsets>
+  </model>
+  <model>
+    <name>strobe-tail</name>
+    <path>AI/Lights/procedural_light_strobe_tail.xml</path>
+    <offsets>
+      <x-m>31</x-m>
+      <y-m>0</y-m>
+      <z-m>5.77517</z-m>
+    </offsets>
+  </model>
+  <!-- Position Beacons -->
+  <model>
+    <name>beacon-top</name>
+    <path>AI/Lights/procedural_light_beacon_top.xml</path>
+    <offsets>
+      <x-m>-18.799</x-m>
+      <y-m>0</y-m>
+      <z-m>8.25449</z-m>
+    </offsets>
+  </model>
+  <model>
+    <name>beacon-bottom</name>
+    <path>AI/Lights/procedural_light_beacon_bottom.xml</path>
+    <offsets>
+      <x-m>-5.97862</x-m>
+      <y-m>0</y-m>
+      <z-m>1.50592</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-top</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/B777/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/B777/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 +107,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