diff --git a/BAv_Model_Matching.xml b/BAv_Model_Matching.xml
index efa1394..a367eed 100644
--- a/BAv_Model_Matching.xml
+++ b/BAv_Model_Matching.xml
@@ -3,6 +3,10 @@
 <!-- Gary Oliver B747-400 AI -->
 <ModelMatchRule CallsignPrefix="BAW" FlightNumberRange="47-48" TypeCode="B744" ModelName="BAvMM_B744_BAW_G-BNLL" />
 
+<!-- BA Charter AI -->
+<ModelMatchRule CallsignPrefix="TOM" FlightNumberRange="8632-8633" TypeCode="A320" ModelName="BAvMM_A320_BAW_G-GATJ" />
+<ModelMatchRule CallsignPrefix="BAW" FlightNumberRange="154-155" TypeCode="A321" ModelName="BAvMM_A321_AWC_G-POWU" />
+
 <!-- BA World Cargo AI -->
 <ModelMatchRule CallsignPrefix="GSS" TypeCode="B748" ModelName="BAvMM_B748_GSS-Jetlift" />
 <ModelMatchRule CallsignPrefix="BAW" FlightNumberRange="3000-3599" TypeCode="B748" ModelName="BAvMM_B748_GSS-Jetlift" />
@@ -105,10 +109,6 @@
 <!-- BA Leased AI -->
 <ModelMatchRule CallsignPrefix="BAW" TypeCode="A333" ModelName="BAvMM_A333_BAW_EC-NBP" />
 
-<!-- BA Charter AI -->
-<ModelMatchRule CallsignPrefix="TOM" FlightNumberRange="8632-8633" TypeCode="A320" ModelName="BAvMM_A320_BAW_G-GATJ" />
-<ModelMatchRule CallsignPrefix="BAW" FlightNumberRange="154-155" TypeCode="A320" ModelName="BAvMM_A321_AWC_G-POWU" />
-
 <!-- Misc -->
 <ModelMatchRule CallsignPrefix="ABD" TypeCode="B744" ModelName="BAvMM_B744_ABD-IronMaiden" />
 <ModelMatchRule CallsignPrefix="AFR" TypeCode="CONC" ModelName="BAvMM_CONC_AFR-2000//BAvMM_CONC_AFR-1977" />
diff --git a/Effects/FSPXAI_B773_FootLight.fx b/Effects/fx_GEN_AI_B773_FootLight.fx
similarity index 94%
rename from Effects/FSPXAI_B773_FootLight.fx
rename to Effects/fx_GEN_AI_B773_FootLight.fx
index ef96f88..bda9865 100644
--- a/Effects/FSPXAI_B773_FootLight.fx
+++ b/Effects/fx_GEN_AI_B773_FootLight.fx
@@ -1,175 +1,175 @@
-[Library Effect]
-Lifetime=5
-Version=2.00
-Radius=-1
-Priority=0
-
-[Properties]
-
-[Emitter.0]
-Lifetime=1.00, 1.00
-Delay=0.00, 0.00
-Bounce=0.00
-Rate=1.00, 1.00
-X Emitter Velocity=0.00, 0.00
-Y Emitter Velocity=0.00, 0.00
-Z Emitter Velocity=0.00, 0.00
-Drag=0.00, 0.00
-X Particle Velocity=0.00, 0.00
-Y Particle Velocity=0.00, 0.00
-Z Particle Velocity=0.00, 0.00
-X Rotation=0.00, 0.00
-Y Rotation=0.00, 0.00
-Z Rotation=0.00, 0.00
-X Offset=18.70, 18.70
-Y Offset=0.00, 0.00
-Z Offset=5.00, 5.00
-Pitch=15.00, 15.00
-Bank=0.00, 0.00
-Heading=-66.00, -66.00
-
-[Particle.0]
-Lifetime=0.00, 0.00
-Type=28
-X Scale=15.80, 15.80
-Y Scale=15.80, 15.80
-Z Scale=0.00, 0.00
-X Scale Rate=0.00, 0.00
-Y Scale Rate=0.00, 0.00
-Z Scale Rate=0.00, 0.00
-Drag=0.00, 0.00
-Color Rate=0.00, 0.00
-X Offset=0.00, 0.00
-Y Offset=0.00, 0.00
-Z Offset=0.00, 0.00
-Fade In=0.00, 0.00
-Fade Out=0.00, 0.00
-Static=1
-Face=0, 0, 0
-
-[ParticleAttributes.0]
-Color Start=18, 18, 17, 0
-Color End=18, 18, 17, 255
-Bounce=0.00
-X Scale Goal=0.00
-Y Scale Goal=0.00
-Z Scale Goal=0.00
-Falloff Exponent=2.00
-Inner Cone Angle=0.00
-Outer Cone Angle=50.00
-
-
-
-
-[Emitter.1]
-Lifetime=1.00, 1.00
-Delay=0.00, 0.00
-Bounce=0.00
-Rate=1.00, 1.00
-X Emitter Velocity=0.00, 0.00
-Y Emitter Velocity=0.00, 0.00
-Z Emitter Velocity=0.00, 0.00
-Drag=0.00, 0.00
-X Particle Velocity=0.00, 0.00
-Y Particle Velocity=0.00, 0.00
-Z Particle Velocity=0.00, 0.00
-X Rotation=0.00, 0.00
-Y Rotation=0.00, 0.00
-Z Rotation=0.00, 0.00
-X Offset=-18.70, -18.70
-Y Offset=0.00, 0.00
-Z Offset=5.00, 5.00
-Pitch=15.00, 15.00
-Bank=0.00, 0.00
-Heading=66.00, 66.00
-
-[Particle.1]
-Lifetime=0.00, 0.00
-Type=28
-X Scale=15.80, 15.80
-Y Scale=15.80, 15.80
-Z Scale=0.00, 0.00
-X Scale Rate=0.00, 0.00
-Y Scale Rate=0.00, 0.00
-Z Scale Rate=0.00, 0.00
-Drag=0.00, 0.00
-Color Rate=0.00, 0.00
-X Offset=0.00, 0.00
-Y Offset=0.00, 0.00
-Z Offset=0.00, 0.00
-Fade In=0.00, 0.00
-Fade Out=0.00, 0.00
-Static=1
-Face=0, 0, 0
-
-[ParticleAttributes.1]
-Color Start=18, 18, 17, 0
-Color End=18, 18, 17, 255
-Bounce=0.00
-X Scale Goal=0.00
-Y Scale Goal=0.00
-Z Scale Goal=0.00
-Falloff Exponent=2.00
-Inner Cone Angle=0.00
-Outer Cone Angle=50.00
-
-
-
-
-
-
-[Emitter.2]
-Lifetime=1.00, 1.00
-Delay=0.00, 0.00
-Bounce=0.00
-Rate=1.00, 1.00
-X Emitter Velocity=0.00, 0.00
-Y Emitter Velocity=0.00, 0.00
-Z Emitter Velocity=0.00, 0.00
-Drag=0.00, 0.00
-X Particle Velocity=0.00, 0.00
-Y Particle Velocity=0.00, 0.00
-Z Particle Velocity=0.00, 0.00
-X Rotation=0.00, 0.00
-Y Rotation=0.00, 0.00
-Z Rotation=0.00, 0.00
-X Offset=0.00, 0.00
-Y Offset=0.00, 0.00
-Z Offset=40.00, 40.00
-Pitch=30.00, 30.00
-Bank=0.00, 0.00
-Heading=180.00, 180.00
-
-[Particle.2]
-Lifetime=0.00, 0.00
-Type=28
-X Scale=8.00, 8.00
-Y Scale=0.00, 0.00
-Z Scale=0.00, 0.00
-X Scale Rate=0.00, 0.00
-Y Scale Rate=0.00, 0.00
-Z Scale Rate=0.00, 0.00
-Drag=0.00, 0.00
-Color Rate=0.00, 0.00
-X Offset=0.00, 0.00
-Y Offset=0.00, 0.00
-Z Offset=0.00, 0.00
-Fade In=0.00, 0.00
-Fade Out=0.00, 0.00
-Static=1
-Face=0, 0, 0
-
-[ParticleAttributes.2]
-Color Start=8, 8, 8, 0
-Color End=8, 8, 8, 200
-Bounce=0.00
-X Scale Goal=0.00
-Y Scale Goal=0.00
-Z Scale Goal=0.00
-Falloff Exponent=2.00
-Inner Cone Angle=0.00
-Outer Cone Angle=180.00
-
-
-
-
+[Library Effect]
+Lifetime=5
+Version=2.00
+Radius=-1
+Priority=0
+
+[Properties]
+
+[Emitter.0]
+Lifetime=1.00, 1.00
+Delay=0.00, 0.00
+Bounce=0.00
+Rate=1.00, 1.00
+X Emitter Velocity=0.00, 0.00
+Y Emitter Velocity=0.00, 0.00
+Z Emitter Velocity=0.00, 0.00
+Drag=0.00, 0.00
+X Particle Velocity=0.00, 0.00
+Y Particle Velocity=0.00, 0.00
+Z Particle Velocity=0.00, 0.00
+X Rotation=0.00, 0.00
+Y Rotation=0.00, 0.00
+Z Rotation=0.00, 0.00
+X Offset=18.70, 18.70
+Y Offset=0.00, 0.00
+Z Offset=5.00, 5.00
+Pitch=15.00, 15.00
+Bank=0.00, 0.00
+Heading=-66.00, -66.00
+
+[Particle.0]
+Lifetime=0.00, 0.00
+Type=28
+X Scale=15.80, 15.80
+Y Scale=15.80, 15.80
+Z Scale=0.00, 0.00
+X Scale Rate=0.00, 0.00
+Y Scale Rate=0.00, 0.00
+Z Scale Rate=0.00, 0.00
+Drag=0.00, 0.00
+Color Rate=0.00, 0.00
+X Offset=0.00, 0.00
+Y Offset=0.00, 0.00
+Z Offset=0.00, 0.00
+Fade In=0.00, 0.00
+Fade Out=0.00, 0.00
+Static=1
+Face=0, 0, 0
+
+[ParticleAttributes.0]
+Color Start=18, 18, 17, 0
+Color End=18, 18, 17, 255
+Bounce=0.00
+X Scale Goal=0.00
+Y Scale Goal=0.00
+Z Scale Goal=0.00
+Falloff Exponent=2.00
+Inner Cone Angle=0.00
+Outer Cone Angle=50.00
+
+
+
+
+[Emitter.1]
+Lifetime=1.00, 1.00
+Delay=0.00, 0.00
+Bounce=0.00
+Rate=1.00, 1.00
+X Emitter Velocity=0.00, 0.00
+Y Emitter Velocity=0.00, 0.00
+Z Emitter Velocity=0.00, 0.00
+Drag=0.00, 0.00
+X Particle Velocity=0.00, 0.00
+Y Particle Velocity=0.00, 0.00
+Z Particle Velocity=0.00, 0.00
+X Rotation=0.00, 0.00
+Y Rotation=0.00, 0.00
+Z Rotation=0.00, 0.00
+X Offset=-18.70, -18.70
+Y Offset=0.00, 0.00
+Z Offset=5.00, 5.00
+Pitch=15.00, 15.00
+Bank=0.00, 0.00
+Heading=66.00, 66.00
+
+[Particle.1]
+Lifetime=0.00, 0.00
+Type=28
+X Scale=15.80, 15.80
+Y Scale=15.80, 15.80
+Z Scale=0.00, 0.00
+X Scale Rate=0.00, 0.00
+Y Scale Rate=0.00, 0.00
+Z Scale Rate=0.00, 0.00
+Drag=0.00, 0.00
+Color Rate=0.00, 0.00
+X Offset=0.00, 0.00
+Y Offset=0.00, 0.00
+Z Offset=0.00, 0.00
+Fade In=0.00, 0.00
+Fade Out=0.00, 0.00
+Static=1
+Face=0, 0, 0
+
+[ParticleAttributes.1]
+Color Start=18, 18, 17, 0
+Color End=18, 18, 17, 255
+Bounce=0.00
+X Scale Goal=0.00
+Y Scale Goal=0.00
+Z Scale Goal=0.00
+Falloff Exponent=2.00
+Inner Cone Angle=0.00
+Outer Cone Angle=50.00
+
+
+
+
+
+
+[Emitter.2]
+Lifetime=1.00, 1.00
+Delay=0.00, 0.00
+Bounce=0.00
+Rate=1.00, 1.00
+X Emitter Velocity=0.00, 0.00
+Y Emitter Velocity=0.00, 0.00
+Z Emitter Velocity=0.00, 0.00
+Drag=0.00, 0.00
+X Particle Velocity=0.00, 0.00
+Y Particle Velocity=0.00, 0.00
+Z Particle Velocity=0.00, 0.00
+X Rotation=0.00, 0.00
+Y Rotation=0.00, 0.00
+Z Rotation=0.00, 0.00
+X Offset=0.00, 0.00
+Y Offset=0.00, 0.00
+Z Offset=40.00, 40.00
+Pitch=30.00, 30.00
+Bank=0.00, 0.00
+Heading=180.00, 180.00
+
+[Particle.2]
+Lifetime=0.00, 0.00
+Type=28
+X Scale=8.00, 8.00
+Y Scale=0.00, 0.00
+Z Scale=0.00, 0.00
+X Scale Rate=0.00, 0.00
+Y Scale Rate=0.00, 0.00
+Z Scale Rate=0.00, 0.00
+Drag=0.00, 0.00
+Color Rate=0.00, 0.00
+X Offset=0.00, 0.00
+Y Offset=0.00, 0.00
+Z Offset=0.00, 0.00
+Fade In=0.00, 0.00
+Fade Out=0.00, 0.00
+Static=1
+Face=0, 0, 0
+
+[ParticleAttributes.2]
+Color Start=8, 8, 8, 0
+Color End=8, 8, 8, 200
+Bounce=0.00
+X Scale Goal=0.00
+Y Scale Goal=0.00
+Z Scale Goal=0.00
+Falloff Exponent=2.00
+Inner Cone Angle=0.00
+Outer Cone Angle=180.00
+
+
+
+
diff --git a/Effects/FSPXAI_B787WhiteWingTip.fx b/Effects/fx_GEN_AI_B787WhiteWingTip.fx
similarity index 92%
rename from Effects/FSPXAI_B787WhiteWingTip.fx
rename to Effects/fx_GEN_AI_B787WhiteWingTip.fx
index 0c25efe..883d869 100644
--- a/Effects/FSPXAI_B787WhiteWingTip.fx
+++ b/Effects/fx_GEN_AI_B787WhiteWingTip.fx
@@ -1,86 +1,86 @@
-[Library Effect]
-Lifetime=5
-Version=2.00
-Radius=-1
-Priority=0
-
-[Properties]
-
-//---------------------------------------------------------------------------
-
-
-[Emitter.0]
-Lifetime=0.50, 0.50
-No Interpolate=1
-Rate=1.00, 1.00
-
-[Particle.0]
-Lifetime=0.00, 0.00
-Type=19
-X Scale=0.50, 0.50
-Y Scale=0.50, 0.50
-Static=1
-Face=1, 1, 1
-
-[ParticleAttributes.0]
-Blend Mode=2
-Texture=FSPX_AIlights.bmp
-Color Start=100, 100, 100, 10
-uv1=0.00, 0.00
-uv2=1.00, 1.00
-
-//----------------------------------
-
-[Emitter.1]
-Lifetime=0.50, 0.50
-No Interpolate=1
-Rate=1.00, 1.00
-
-[Particle.1]
-Lifetime=0.00, 0.00
-Type=19
-X Scale=0.30, 0.30
-Y Scale=0.30, 0.30
-Static=1
-Face=1, 1, 1
-
-[ParticleAttributes.1]
-Blend Mode=2
-Texture=FSPX_AIlights.bmp
-Color Start=160, 160, 160, 20
-uv1=0.00, 0.00
-uv2=1.00, 1.00
-
-//----------------------------------
-
-[Emitter.2]
-Lifetime=0.50, 0.50
-No Interpolate=1
-Rate=1.00, 1.00
-
-[Particle.2]
-Lifetime=0.00, 0.00
-Type=19
-X Scale=0.10, 0.10
-Y Scale=0.10, 0.10
-Static=1
-Face=1, 1, 1
-
-[ParticleAttributes.2]
-Blend Mode=2
-Texture=FSPX_AIlights.bmp
-Color Start=160, 160, 160, 255
-uv1=0.00, 0.00
-uv2=1.00, 1.00
-
-
-
-
-
-
-
-
-
-
-
-
+[Library Effect]
+Lifetime=5
+Version=2.00
+Radius=-1
+Priority=0
+
+[Properties]
+
+//---------------------------------------------------------------------------
+
+
+[Emitter.0]
+Lifetime=0.50, 0.50
+No Interpolate=1
+Rate=1.00, 1.00
+
+[Particle.0]
+Lifetime=0.00, 0.00
+Type=19
+X Scale=0.50, 0.50
+Y Scale=0.50, 0.50
+Static=1
+Face=1, 1, 1
+
+[ParticleAttributes.0]
+Blend Mode=2
+Texture=FSPX_AIlights.bmp
+Color Start=100, 100, 100, 10
+uv1=0.00, 0.00
+uv2=1.00, 1.00
+
+//----------------------------------
+
+[Emitter.1]
+Lifetime=0.50, 0.50
+No Interpolate=1
+Rate=1.00, 1.00
+
+[Particle.1]
+Lifetime=0.00, 0.00
+Type=19
+X Scale=0.30, 0.30
+Y Scale=0.30, 0.30
+Static=1
+Face=1, 1, 1
+
+[ParticleAttributes.1]
+Blend Mode=2
+Texture=FSPX_AIlights.bmp
+Color Start=160, 160, 160, 20
+uv1=0.00, 0.00
+uv2=1.00, 1.00
+
+//----------------------------------
+
+[Emitter.2]
+Lifetime=0.50, 0.50
+No Interpolate=1
+Rate=1.00, 1.00
+
+[Particle.2]
+Lifetime=0.00, 0.00
+Type=19
+X Scale=0.10, 0.10
+Y Scale=0.10, 0.10
+Static=1
+Face=1, 1, 1
+
+[ParticleAttributes.2]
+Blend Mode=2
+Texture=FSPX_AIlights.bmp
+Color Start=160, 160, 160, 255
+uv1=0.00, 0.00
+uv2=1.00, 1.00
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Effects/FSPXAI_BeaconLarge.fx b/Effects/fx_GEN_AI_BeaconLarge.fx
similarity index 94%
rename from Effects/FSPXAI_BeaconLarge.fx
rename to Effects/fx_GEN_AI_BeaconLarge.fx
index 733fb6b..2e0e058 100644
--- a/Effects/FSPXAI_BeaconLarge.fx
+++ b/Effects/fx_GEN_AI_BeaconLarge.fx
@@ -1,62 +1,62 @@
-[Library Effect]
-Lifetime=5
-Version=2.00
-Radius=-1
-Priority=0
-
-[Properties]
-
-
-
-[Emitter.0]
-Lifetime=0.00, 0.00
-Delay=0.00, 0.00
-Bounce=0.00
-Rate=1.00, 1.00
-X Emitter Velocity=0.00, 0.00
-Y Emitter Velocity=0.00, 0.00
-Z Emitter Velocity=0.00, 0.00
-Drag=0.00, 0.00
-X Particle Velocity=0.00, 0.00
-Y Particle Velocity=0.00, 0.00
-Z Particle Velocity=0.00, 0.00
-X Rotation=0.00, 0.00
-Y Rotation=0.00, 0.00
-Z Rotation=0.00, 0.00
-X Offset=0.00, 0.00
-Y Offset=0.00, 0.00
-Z Offset=0.00, 0.00
-Pitch=0.00, 0.00
-Bank=0.00, 0.00
-Heading=0.00, 0.00
-r;
-[Particle.0]
-Lifetime=0.00, 0.00
-Type=27
-X Scale=24.00, 24.00
-Y Scale=0.00, 0.00
-Z Scale=0.00, 0.00
-X Scale Rate=0.00, 0.00
-Y Scale Rate=0.00, 0.00
-Z Scale Rate=0.00, 0.00
-Drag=0.00, 0.00
-Color Rate=0.00, 0.00
-X Offset=0.00, 0.00
-Y Offset=0.00, 0.00
-Z Offset=0.00, 0.00
-Fade In=0.00, 0.00
-Fade Out=0.00, 0.00
-Static=1
-Face=0, 0, 0
-
-[ParticleAttributes.0]
-Color Start=50, 10, 0, 140
-Color End=50, 10, 0, 140
-Bounce=0.00
-X Scale Goal=0.00
-Y Scale Goal=0.00
-Z Scale Goal=0.00
-Falloff Exponent=2.00
-Inner Cone Angle=0.00
-Outer Cone Angle=0.00
-
+[Library Effect]
+Lifetime=5
+Version=2.00
+Radius=-1
+Priority=0
+
+[Properties]
+
+
+
+[Emitter.0]
+Lifetime=0.00, 0.00
+Delay=0.00, 0.00
+Bounce=0.00
+Rate=1.00, 1.00
+X Emitter Velocity=0.00, 0.00
+Y Emitter Velocity=0.00, 0.00
+Z Emitter Velocity=0.00, 0.00
+Drag=0.00, 0.00
+X Particle Velocity=0.00, 0.00
+Y Particle Velocity=0.00, 0.00
+Z Particle Velocity=0.00, 0.00
+X Rotation=0.00, 0.00
+Y Rotation=0.00, 0.00
+Z Rotation=0.00, 0.00
+X Offset=0.00, 0.00
+Y Offset=0.00, 0.00
+Z Offset=0.00, 0.00
+Pitch=0.00, 0.00
+Bank=0.00, 0.00
+Heading=0.00, 0.00
+r;
+[Particle.0]
+Lifetime=0.00, 0.00
+Type=27
+X Scale=24.00, 24.00
+Y Scale=0.00, 0.00
+Z Scale=0.00, 0.00
+X Scale Rate=0.00, 0.00
+Y Scale Rate=0.00, 0.00
+Z Scale Rate=0.00, 0.00
+Drag=0.00, 0.00
+Color Rate=0.00, 0.00
+X Offset=0.00, 0.00
+Y Offset=0.00, 0.00
+Z Offset=0.00, 0.00
+Fade In=0.00, 0.00
+Fade Out=0.00, 0.00
+Static=1
+Face=0, 0, 0
+
+[ParticleAttributes.0]
+Color Start=50, 10, 0, 140
+Color End=50, 10, 0, 140
+Bounce=0.00
+X Scale Goal=0.00
+Y Scale Goal=0.00
+Z Scale Goal=0.00
+Falloff Exponent=2.00
+Inner Cone Angle=0.00
+Outer Cone Angle=0.00
+
diff --git a/Effects/FSPXAI_Beaconsmall.fx b/Effects/fx_GEN_AI_Beaconsmall.fx
similarity index 94%
rename from Effects/FSPXAI_Beaconsmall.fx
rename to Effects/fx_GEN_AI_Beaconsmall.fx
index b59806a..2e16754 100644
--- a/Effects/FSPXAI_Beaconsmall.fx
+++ b/Effects/fx_GEN_AI_Beaconsmall.fx
@@ -1,62 +1,62 @@
-[Library Effect]
-Lifetime=5
-Version=2.00
-Radius=-1
-Priority=0
-
-[Properties]
-
-
-
-[Emitter.0]
-Lifetime=0.50, 0.50
-Delay=0.00, 0.00
-Bounce=0.00
-Rate=1.00, 1.00
-X Emitter Velocity=0.00, 0.00
-Y Emitter Velocity=0.00, 0.00
-Z Emitter Velocity=0.00, 0.00
-Drag=0.00, 0.00
-X Particle Velocity=0.00, 0.00
-Y Particle Velocity=0.00, 0.00
-Z Particle Velocity=0.00, 0.00
-X Rotation=0.00, 0.00
-Y Rotation=0.00, 0.00
-Z Rotation=0.00, 0.00
-X Offset=0.00, 0.00
-Y Offset=0.00, 0.00
-Z Offset=0.00, 0.00
-Pitch=0.00, 0.00
-Bank=0.00, 0.00
-Heading=0.00, 0.00
-
-[Particle.0]
-Lifetime=0.00, 0.00
-Type=27
-X Scale=5.00, 5.00
-Y Scale=0.00, 0.00
-Z Scale=0.00, 0.00
-X Scale Rate=0.00, 0.00
-Y Scale Rate=0.00, 0.00
-Z Scale Rate=0.00, 0.00
-Drag=0.00, 0.00
-Color Rate=0.00, 0.00
-X Offset=0.00, 0.00
-Y Offset=0.00, 0.00
-Z Offset=0.00, 0.00
-Fade In=0.00, 0.00
-Fade Out=0.00, 0.00
-Static=1
-Face=0, 0, 0
-
-[ParticleAttributes.0]
-Color Start=100, 10, 0, 100
-Color End=100, 10, 0, 100
-Bounce=0.00
-X Scale Goal=0.00
-Y Scale Goal=0.00
-Z Scale Goal=0.00
-Falloff Exponent=2.00
-Inner Cone Angle=0.00
-Outer Cone Angle=0.00
-
+[Library Effect]
+Lifetime=5
+Version=2.00
+Radius=-1
+Priority=0
+
+[Properties]
+
+
+
+[Emitter.0]
+Lifetime=0.50, 0.50
+Delay=0.00, 0.00
+Bounce=0.00
+Rate=1.00, 1.00
+X Emitter Velocity=0.00, 0.00
+Y Emitter Velocity=0.00, 0.00
+Z Emitter Velocity=0.00, 0.00
+Drag=0.00, 0.00
+X Particle Velocity=0.00, 0.00
+Y Particle Velocity=0.00, 0.00
+Z Particle Velocity=0.00, 0.00
+X Rotation=0.00, 0.00
+Y Rotation=0.00, 0.00
+Z Rotation=0.00, 0.00
+X Offset=0.00, 0.00
+Y Offset=0.00, 0.00
+Z Offset=0.00, 0.00
+Pitch=0.00, 0.00
+Bank=0.00, 0.00
+Heading=0.00, 0.00
+
+[Particle.0]
+Lifetime=0.00, 0.00
+Type=27
+X Scale=5.00, 5.00
+Y Scale=0.00, 0.00
+Z Scale=0.00, 0.00
+X Scale Rate=0.00, 0.00
+Y Scale Rate=0.00, 0.00
+Z Scale Rate=0.00, 0.00
+Drag=0.00, 0.00
+Color Rate=0.00, 0.00
+X Offset=0.00, 0.00
+Y Offset=0.00, 0.00
+Z Offset=0.00, 0.00
+Fade In=0.00, 0.00
+Fade Out=0.00, 0.00
+Static=1
+Face=0, 0, 0
+
+[ParticleAttributes.0]
+Color Start=100, 10, 0, 100
+Color End=100, 10, 0, 100
+Bounce=0.00
+X Scale Goal=0.00
+Y Scale Goal=0.00
+Z Scale Goal=0.00
+Falloff Exponent=2.00
+Inner Cone Angle=0.00
+Outer Cone Angle=0.00
+
diff --git a/Effects/FSPXAI_BoeingBeacon7_HS.fx b/Effects/fx_GEN_AI_BoeingBeacon7_HS.fx
similarity index 93%
rename from Effects/FSPXAI_BoeingBeacon7_HS.fx
rename to Effects/fx_GEN_AI_BoeingBeacon7_HS.fx
index c592e94..db40b4f 100644
--- a/Effects/FSPXAI_BoeingBeacon7_HS.fx
+++ b/Effects/fx_GEN_AI_BoeingBeacon7_HS.fx
@@ -1,72 +1,72 @@
-[Library Effect]
-Lifetime=5
-Version=2.00
-Radius=-1
-Priority=0
-
-//----------------------------------
-
-[Emitter.0]
-Delay=0.50, 0.50
-No Interpolate=1
-Rate=0.95, 0.95
-
-[Particle.0]
-Lifetime=0.10, 0.10
-Type=19
-X Scale=1.60, 1.60
-Y Scale=1.60, 1.60
-Static=1
-Face=1, 1, 1
-
-[ParticleAttributes.0]
-Blend Mode=2
-Texture=FSPX_AIlights.bmp
-Color Start=150, 10, 5, 10
-uv1=0.00, 0.00
-uv2=1.00, 1.00
-
-//----------------------------------
-
-[Emitter.1]
-Delay=0.50, 0.50
-No Interpolate=1
-Rate=0.95, 0.95
-
-[Particle.1]
-Lifetime=0.10, 0.10
-Type=19
-X Scale=0.80, 0.80
-Y Scale=0.80, 0.80
-Static=1
-Face=1, 1, 1
-
-[ParticleAttributes.1]
-Blend Mode=2
-Texture=FSPX_AIlights.bmp
-Color Start=150, 20, 5, 50
-uv1=0.00, 0.00
-uv2=1.00, 1.00
-
-//----------------------------------
-
-[Emitter.2]
-Delay=0.50, 0.50
-No Interpolate=1
-Rate=0.95, 0.95
-
-[Particle.2]
-Lifetime=0.10, 0.10
-Type=19
-X Scale=0.30, 0.30
-Y Scale=0.30, 0.30
-Static=1
-Face=1, 1, 1
-
-[ParticleAttributes.2]
-Blend Mode=2
-Texture=FSPX_AIlights.bmp
-Color Start=190, 100, 5, 200
-uv1=0.00, 0.00
-uv2=1.00, 1.00
-
+[Library Effect]
+Lifetime=5
+Version=2.00
+Radius=-1
+Priority=0
+
+//----------------------------------
+
+[Emitter.0]
+Delay=0.50, 0.50
+No Interpolate=1
+Rate=0.95, 0.95
+
+[Particle.0]
+Lifetime=0.10, 0.10
+Type=19
+X Scale=1.60, 1.60
+Y Scale=1.60, 1.60
+Static=1
+Face=1, 1, 1
+
+[ParticleAttributes.0]
+Blend Mode=2
+Texture=FSPX_AIlights.bmp
+Color Start=150, 10, 5, 10
+uv1=0.00, 0.00
+uv2=1.00, 1.00
+
+//----------------------------------
+
+[Emitter.1]
+Delay=0.50, 0.50
+No Interpolate=1
+Rate=0.95, 0.95
+
+[Particle.1]
+Lifetime=0.10, 0.10
+Type=19
+X Scale=0.80, 0.80
+Y Scale=0.80, 0.80
+Static=1
+Face=1, 1, 1
+
+[ParticleAttributes.1]
+Blend Mode=2
+Texture=FSPX_AIlights.bmp
+Color Start=150, 20, 5, 50
+uv1=0.00, 0.00
+uv2=1.00, 1.00
+
+//----------------------------------
+
+[Emitter.2]
+Delay=0.50, 0.50
+No Interpolate=1
+Rate=0.95, 0.95
+
+[Particle.2]
+Lifetime=0.10, 0.10
+Type=19
+X Scale=0.30, 0.30
+Y Scale=0.30, 0.30
+Static=1
+Face=1, 1, 1
+
+[ParticleAttributes.2]
+Blend Mode=2
+Texture=FSPX_AIlights.bmp
+Color Start=190, 100, 5, 200
+uv1=0.00, 0.00
+uv2=1.00, 1.00
+
diff --git a/Effects/FSPXAI_BoeingBeacon7_RW.fx b/Effects/fx_GEN_AI_BoeingBeacon7_RW.fx
similarity index 93%
rename from Effects/FSPXAI_BoeingBeacon7_RW.fx
rename to Effects/fx_GEN_AI_BoeingBeacon7_RW.fx
index 6dcd4ec..6c7c181 100644
--- a/Effects/FSPXAI_BoeingBeacon7_RW.fx
+++ b/Effects/fx_GEN_AI_BoeingBeacon7_RW.fx
@@ -1,93 +1,93 @@
-[Library Effect]
-Lifetime=5
-Version=2.00
-Radius=-1
-Priority=0
-
-//----------------------------------
-
-[Emitter.0]
-Delay=0.50, 0.50
-No Interpolate=1
-Rate=0.95, 0.95
-
-[Particle.0]
-Lifetime=0.10, 0.10
-Type=19
-X Scale=1.60, 1.60
-Y Scale=1.60, 1.60
-Static=1
-Face=1, 1, 1
-
-[ParticleAttributes.0]
-Blend Mode=2
-Texture=FSPX_AIlights.bmp
-Color Start=150, 10, 5, 10
-uv1=0.00, 0.00
-uv2=1.00, 1.00
-
-//----------------------------------
-
-[Emitter.1]
-Delay=0.50, 0.50
-No Interpolate=1
-Rate=0.95, 0.95
-
-[Particle.1]
-Lifetime=0.10, 0.10
-Type=19
-X Scale=0.80, 0.80
-Y Scale=0.80, 0.80
-Static=1
-Face=1, 1, 1
-
-[ParticleAttributes.1]
-Blend Mode=2
-Texture=FSPX_AIlights.bmp
-Color Start=150, 20, 5, 50
-uv1=0.00, 0.00
-uv2=1.00, 1.00
-
-//----------------------------------
-
-[Emitter.2]
-Delay=0.50, 0.50
-No Interpolate=1
-Rate=0.95, 0.95
-
-[Particle.2]
-Lifetime=0.10, 0.10
-Type=19
-X Scale=0.30, 0.30
-Y Scale=0.30, 0.30
-Static=1
-Face=1, 1, 1
-
-[ParticleAttributes.2]
-Blend Mode=2
-Texture=FSPX_AIlights.bmp
-Color Start=190, 100, 5, 200
-uv1=0.00, 0.00
-uv2=1.00, 1.00
-
-
-//----------------------
-
-[Emitter.3]
-Lifetime=0.00, 0.00
-Delay=0.525, 0.525
-Rate=0.95, 0.95
-Z Offset=0.80, 0.80
-
-[Particle.3]
-Lifetime=0.10, 0.10
-Type=28
-X Scale=11.30, 11.30
-Static=1
-
-[ParticleAttributes.3]
-Color Start=60, 10, 0, 0
-Color End=60, 10, 0, 170
-Falloff Exponent=2.00
-Outer Cone Angle=130.00
-
+[Library Effect]
+Lifetime=5
+Version=2.00
+Radius=-1
+Priority=0
+
+//----------------------------------
+
+[Emitter.0]
+Delay=0.50, 0.50
+No Interpolate=1
+Rate=0.95, 0.95
+
+[Particle.0]
+Lifetime=0.10, 0.10
+Type=19
+X Scale=1.60, 1.60
+Y Scale=1.60, 1.60
+Static=1
+Face=1, 1, 1
+
+[ParticleAttributes.0]
+Blend Mode=2
+Texture=FSPX_AIlights.bmp
+Color Start=150, 10, 5, 10
+uv1=0.00, 0.00
+uv2=1.00, 1.00
+
+//----------------------------------
+
+[Emitter.1]
+Delay=0.50, 0.50
+No Interpolate=1
+Rate=0.95, 0.95
+
+[Particle.1]
+Lifetime=0.10, 0.10
+Type=19
+X Scale=0.80, 0.80
+Y Scale=0.80, 0.80
+Static=1
+Face=1, 1, 1
+
+[ParticleAttributes.1]
+Blend Mode=2
+Texture=FSPX_AIlights.bmp
+Color Start=150, 20, 5, 50
+uv1=0.00, 0.00
+uv2=1.00, 1.00
+
+//----------------------------------
+
+[Emitter.2]
+Delay=0.50, 0.50
+No Interpolate=1
+Rate=0.95, 0.95
+
+[Particle.2]
+Lifetime=0.10, 0.10
+Type=19
+X Scale=0.30, 0.30
+Y Scale=0.30, 0.30
+Static=1
+Face=1, 1, 1
+
+[ParticleAttributes.2]
+Blend Mode=2
+Texture=FSPX_AIlights.bmp
+Color Start=190, 100, 5, 200
+uv1=0.00, 0.00
+uv2=1.00, 1.00
+
+
+//----------------------
+
+[Emitter.3]
+Lifetime=0.00, 0.00
+Delay=0.525, 0.525
+Rate=0.95, 0.95
+Z Offset=0.80, 0.80
+
+[Particle.3]
+Lifetime=0.10, 0.10
+Type=28
+X Scale=11.30, 11.30
+Static=1
+
+[ParticleAttributes.3]
+Color Start=60, 10, 0, 0
+Color End=60, 10, 0, 170
+Falloff Exponent=2.00
+Outer Cone Angle=130.00
+
diff --git a/Effects/FSPXAI_BoeingStrobe7_HS.fx b/Effects/fx_GEN_AI_BoeingStrobe7_HS.fx
similarity index 93%
rename from Effects/FSPXAI_BoeingStrobe7_HS.fx
rename to Effects/fx_GEN_AI_BoeingStrobe7_HS.fx
index e1fa054..ffe60cf 100644
--- a/Effects/FSPXAI_BoeingStrobe7_HS.fx
+++ b/Effects/fx_GEN_AI_BoeingStrobe7_HS.fx
@@ -1,103 +1,103 @@
-[Library Effect]
-Lifetime=5
-Version=2.00
-Radius=-1
-
-[Properties]
-Spot=1
-Tower=1
-Map=1
-
-//----------------------------------
-
-[Emitter.0]
-Lifetime=0.00, 0.00
-Light=1
-No Interpolate=1
-Rate=0.95, 0.95
-Delay=0.16, 0.16
-
-[Particle.0]
-Lifetime=0.0001, 0.0001
-Type=19
-X Scale=2.50, 2.50
-Y Scale=2.50, 2.50
-Static=1
-Face=1, 1, 1
-
-[ParticleAttributes.0]
-Blend Mode=2
-Texture=FSPX_AIlights.bmp
-Color Start=150, 150, 150, 5
-uv1=0.00, 0.00
-uv2=1.00, 1.00
-
-//----------------------------------
-
-[Emitter.1]
-Lifetime=0.00, 0.00
-No Interpolate=1
-Rate=0.95, 0.95
-Delay=0.16, 0.16
-
-[Particle.1]
-Lifetime=0.0001, 0.0001
-Type=19
-X Scale=1.60, 1.60
-Y Scale=1.60, 1.60
-Static=1
-Face=1, 1, 1
-
-[ParticleAttributes.1]
-Blend Mode=2
-Texture=FSPX_AIlights.bmp
-Color Start=160, 160, 160, 10
-uv1=0.00, 0.00
-uv2=1.00, 1.00
-
-//----------------------------------
-
-[Emitter.2]
-Lifetime=0.00, 0.00
-No Interpolate=1
-Rate=0.95, 0.95
-Delay=0.16, 0.16
-
-[Particle.2]
-Lifetime=0.0001, 0.0001
-Type=19
-X Scale=0.70, 0.70
-Y Scale=0.70, 0.70
-Static=1
-Face=1, 1, 1
-
-[ParticleAttributes.2]
-Blend Mode=2
-Texture=FSPX_AIlights.bmp
-Color Start=160, 160, 160, 20
-uv1=0.00, 0.00
-uv2=1.00, 1.00
-
-//----------------------------------
-
-[Emitter.3]
-Lifetime=0.00, 0.00
-No Interpolate=1
-Rate=0.95, 0.95
-Delay=0.16, 0.16
-
-[Particle.3]
-Lifetime=0.0001, 0.0001
-Type=19
-X Scale=0.24, 0.24
-Y Scale=0.24, 0.24
-Static=1
-Face=1, 1, 1
-
-[ParticleAttributes.3]
-Blend Mode=2
-Texture=FSPX_AIlights.bmp
-Color Start=160, 160, 160, 160
-uv1=0.00, 0.00
-uv2=0.50, 0.50
-
+[Library Effect]
+Lifetime=5
+Version=2.00
+Radius=-1
+
+[Properties]
+Spot=1
+Tower=1
+Map=1
+
+//----------------------------------
+
+[Emitter.0]
+Lifetime=0.00, 0.00
+Light=1
+No Interpolate=1
+Rate=0.95, 0.95
+Delay=0.16, 0.16
+
+[Particle.0]
+Lifetime=0.0001, 0.0001
+Type=19
+X Scale=2.50, 2.50
+Y Scale=2.50, 2.50
+Static=1
+Face=1, 1, 1
+
+[ParticleAttributes.0]
+Blend Mode=2
+Texture=FSPX_AIlights.bmp
+Color Start=150, 150, 150, 5
+uv1=0.00, 0.00
+uv2=1.00, 1.00
+
+//----------------------------------
+
+[Emitter.1]
+Lifetime=0.00, 0.00
+No Interpolate=1
+Rate=0.95, 0.95
+Delay=0.16, 0.16
+
+[Particle.1]
+Lifetime=0.0001, 0.0001
+Type=19
+X Scale=1.60, 1.60
+Y Scale=1.60, 1.60
+Static=1
+Face=1, 1, 1
+
+[ParticleAttributes.1]
+Blend Mode=2
+Texture=FSPX_AIlights.bmp
+Color Start=160, 160, 160, 10
+uv1=0.00, 0.00
+uv2=1.00, 1.00
+
+//----------------------------------
+
+[Emitter.2]
+Lifetime=0.00, 0.00
+No Interpolate=1
+Rate=0.95, 0.95
+Delay=0.16, 0.16
+
+[Particle.2]
+Lifetime=0.0001, 0.0001
+Type=19
+X Scale=0.70, 0.70
+Y Scale=0.70, 0.70
+Static=1
+Face=1, 1, 1
+
+[ParticleAttributes.2]
+Blend Mode=2
+Texture=FSPX_AIlights.bmp
+Color Start=160, 160, 160, 20
+uv1=0.00, 0.00
+uv2=1.00, 1.00
+
+//----------------------------------
+
+[Emitter.3]
+Lifetime=0.00, 0.00
+No Interpolate=1
+Rate=0.95, 0.95
+Delay=0.16, 0.16
+
+[Particle.3]
+Lifetime=0.0001, 0.0001
+Type=19
+X Scale=0.24, 0.24
+Y Scale=0.24, 0.24
+Static=1
+Face=1, 1, 1
+
+[ParticleAttributes.3]
+Blend Mode=2
+Texture=FSPX_AIlights.bmp
+Color Start=160, 160, 160, 160
+uv1=0.00, 0.00
+uv2=0.50, 0.50
+
diff --git a/Effects/FSPXAI_BoeingStrobe7_RW.fx b/Effects/fx_GEN_AI_BoeingStrobe7_RW.fx
similarity index 93%
rename from Effects/FSPXAI_BoeingStrobe7_RW.fx
rename to Effects/fx_GEN_AI_BoeingStrobe7_RW.fx
index 4020a48..9afbd5c 100644
--- a/Effects/FSPXAI_BoeingStrobe7_RW.fx
+++ b/Effects/fx_GEN_AI_BoeingStrobe7_RW.fx
@@ -1,125 +1,125 @@
-[Library Effect]
-Lifetime=5
-Version=2.00
-Radius=-1
-
-[Properties]
-Spot=1
-Tower=1
-Map=1
-
-//----------------------------------
-
-[Emitter.0]
-Lifetime=0.00, 0.00
-Light=1
-No Interpolate=1
-Rate=0.95, 0.95
-Delay=0.16, 0.16
-
-[Particle.0]
-Lifetime=0.0001, 0.0001
-Type=19
-X Scale=2.50, 2.50
-Y Scale=2.50, 2.50
-Static=1
-Face=1, 1, 1
-
-[ParticleAttributes.0]
-Blend Mode=2
-Texture=FSPX_AIlights.bmp
-Color Start=150, 150, 150, 5
-uv1=0.00, 0.00
-uv2=1.00, 1.00
-
-//----------------------------------
-
-[Emitter.1]
-Lifetime=0.00, 0.00
-No Interpolate=1
-Rate=0.95, 0.95
-Delay=0.16, 0.16
-
-[Particle.1]
-Lifetime=0.0001, 0.0001
-Type=19
-X Scale=1.60, 1.60
-Y Scale=1.60, 1.60
-Static=1
-Face=1, 1, 1
-
-[ParticleAttributes.1]
-Blend Mode=2
-Texture=FSPX_AIlights.bmp
-Color Start=160, 160, 160, 10
-uv1=0.00, 0.00
-uv2=1.00, 1.00
-
-//----------------------------------
-
-[Emitter.2]
-Lifetime=0.00, 0.00
-No Interpolate=1
-Rate=0.95, 0.95
-Delay=0.16, 0.16
-
-[Particle.2]
-Lifetime=0.0001, 0.0001
-Type=19
-X Scale=0.70, 0.70
-Y Scale=0.70, 0.70
-Static=1
-Face=1, 1, 1
-
-[ParticleAttributes.2]
-Blend Mode=2
-Texture=FSPX_AIlights.bmp
-Color Start=160, 160, 160, 20
-uv1=0.00, 0.00
-uv2=1.00, 1.00
-
-//----------------------------------
-
-[Emitter.3]
-Lifetime=0.00, 0.00
-No Interpolate=1
-Rate=0.95, 0.95
-Delay=0.16, 0.16
-
-[Particle.3]
-Lifetime=0.0001, 0.0001
-Type=19
-X Scale=0.24, 0.24
-Y Scale=0.24, 0.24
-Static=1
-Face=1, 1, 1
-
-[ParticleAttributes.3]
-Blend Mode=2
-Texture=FSPX_AIlights.bmp
-Color Start=160, 160, 160, 160
-uv1=0.00, 0.00
-uv2=0.50, 0.50
-
-
-//------------------------------------
-
-
-[Emitter.4]
-Lifetime=0.00, 0.00
-Rate=0.95, 0.95
-Delay=0.26, 0.26
-
-[Particle.4]
-Lifetime=0.003, 0.003
-Type=28
-X Scale=20.00, 20.00
-Static=1
-
-[ParticleAttributes.4]
-Color Start=70, 70, 70, 0
-Color End=70, 70, 70, 120
-Bounce=0.00
-Falloff Exponent=2.00
-Inner Cone Angle=70.00
-Outer Cone Angle=100.00
+[Library Effect]
+Lifetime=5
+Version=2.00
+Radius=-1
+
+[Properties]
+Spot=1
+Tower=1
+Map=1
+
+//----------------------------------
+
+[Emitter.0]
+Lifetime=0.00, 0.00
+Light=1
+No Interpolate=1
+Rate=0.95, 0.95
+Delay=0.16, 0.16
+
+[Particle.0]
+Lifetime=0.0001, 0.0001
+Type=19
+X Scale=2.50, 2.50
+Y Scale=2.50, 2.50
+Static=1
+Face=1, 1, 1
+
+[ParticleAttributes.0]
+Blend Mode=2
+Texture=FSPX_AIlights.bmp
+Color Start=150, 150, 150, 5
+uv1=0.00, 0.00
+uv2=1.00, 1.00
+
+//----------------------------------
+
+[Emitter.1]
+Lifetime=0.00, 0.00
+No Interpolate=1
+Rate=0.95, 0.95
+Delay=0.16, 0.16
+
+[Particle.1]
+Lifetime=0.0001, 0.0001
+Type=19
+X Scale=1.60, 1.60
+Y Scale=1.60, 1.60
+Static=1
+Face=1, 1, 1
+
+[ParticleAttributes.1]
+Blend Mode=2
+Texture=FSPX_AIlights.bmp
+Color Start=160, 160, 160, 10
+uv1=0.00, 0.00
+uv2=1.00, 1.00
+
+//----------------------------------
+
+[Emitter.2]
+Lifetime=0.00, 0.00
+No Interpolate=1
+Rate=0.95, 0.95
+Delay=0.16, 0.16
+
+[Particle.2]
+Lifetime=0.0001, 0.0001
+Type=19
+X Scale=0.70, 0.70
+Y Scale=0.70, 0.70
+Static=1
+Face=1, 1, 1
+
+[ParticleAttributes.2]
+Blend Mode=2
+Texture=FSPX_AIlights.bmp
+Color Start=160, 160, 160, 20
+uv1=0.00, 0.00
+uv2=1.00, 1.00
+
+//----------------------------------
+
+[Emitter.3]
+Lifetime=0.00, 0.00
+No Interpolate=1
+Rate=0.95, 0.95
+Delay=0.16, 0.16
+
+[Particle.3]
+Lifetime=0.0001, 0.0001
+Type=19
+X Scale=0.24, 0.24
+Y Scale=0.24, 0.24
+Static=1
+Face=1, 1, 1
+
+[ParticleAttributes.3]
+Blend Mode=2
+Texture=FSPX_AIlights.bmp
+Color Start=160, 160, 160, 160
+uv1=0.00, 0.00
+uv2=0.50, 0.50
+
+
+//------------------------------------
+
+
+[Emitter.4]
+Lifetime=0.00, 0.00
+Rate=0.95, 0.95
+Delay=0.26, 0.26
+
+[Particle.4]
+Lifetime=0.003, 0.003
+Type=28
+X Scale=20.00, 20.00
+Static=1
+
+[ParticleAttributes.4]
+Color Start=70, 70, 70, 0
+Color End=70, 70, 70, 120
+Bounce=0.00
+Falloff Exponent=2.00
+Inner Cone Angle=70.00
+Outer Cone Angle=100.00
diff --git a/Effects/FSPXAI_LandingLarge.fx b/Effects/fx_GEN_AI_LandingLarge.fx
similarity index 93%
rename from Effects/FSPXAI_LandingLarge.fx
rename to Effects/fx_GEN_AI_LandingLarge.fx
index b5697b8..82b306c 100644
--- a/Effects/FSPXAI_LandingLarge.fx
+++ b/Effects/fx_GEN_AI_LandingLarge.fx
@@ -1,26 +1,26 @@
-[Library Effect]
-Lifetime=5
-Version=1.00
-
-//-------------------------------------
-
-[Emitter.0]
-Lifetime=1.00, 1.00
-Rate=1.00, 1.00
-
-[Particle.0]
-Lifetime=0.00, 0.00
-Type=28
-X Scale=70, 70
-Y Scale=0, 0
-Static=1
-
-[ParticleAttributes.0]
-Color Start=220, 220, 200, 0
-Color End=220, 220, 200, 40
-Bounce=0.00
-Falloff Exponent=2.00
-Inner Cone Angle=12.00
-Outer Cone Angle=18.00
-
-
+[Library Effect]
+Lifetime=5
+Version=1.00
+
+//-------------------------------------
+
+[Emitter.0]
+Lifetime=1.00, 1.00
+Rate=1.00, 1.00
+
+[Particle.0]
+Lifetime=0.00, 0.00
+Type=28
+X Scale=70, 70
+Y Scale=0, 0
+Static=1
+
+[ParticleAttributes.0]
+Color Start=220, 220, 200, 0
+Color End=220, 220, 200, 40
+Bounce=0.00
+Falloff Exponent=2.00
+Inner Cone Angle=12.00
+Outer Cone Angle=18.00
+
+
diff --git a/Effects/FSPXAI_NavBlueLargex_HS.fx b/Effects/fx_GEN_AI_NavBlueLargex_HS.fx
similarity index 93%
rename from Effects/FSPXAI_NavBlueLargex_HS.fx
rename to Effects/fx_GEN_AI_NavBlueLargex_HS.fx
index e1c5427..1adf83d 100644
--- a/Effects/FSPXAI_NavBlueLargex_HS.fx
+++ b/Effects/fx_GEN_AI_NavBlueLargex_HS.fx
@@ -1,73 +1,73 @@
-[Library Effect]
-Lifetime=5
-Version=2.00
-Radius=-1
-Priority=0
-
-[Properties]
-
-//----------------------------------
-
-[Emitter.0]
-Lifetime=0.50, 0.50
-No Interpolate=1
-Rate=1.10, 1.10
-
-[Particle.0]
-Lifetime=0.00, 0.00
-Type=19
-X Scale=0.70, 0.70
-Y Scale=0.70, 0.700
-Static=1
-Face=1, 1, 1
-
-[ParticleAttributes.0]
-Blend Mode=2
-Texture=FSPX_AIlights.bmp
-Color Start=10, 150, 70, 80
-uv1=0.00, 0.00
-uv2=1.00, 1.00
-
-//----------------------------------
-
-[Emitter.1]
-Lifetime=0.50, 0.50
-No Interpolate=1
-Rate=1.10, 1.10
-
-[Particle.1]
-Lifetime=0.00, 0.00
-Type=19
-X Scale=0.25, 0.25
-Y Scale=0.25, 0.25
-Static=1
-Face=1, 1, 1
-
-[ParticleAttributes.1]
-Blend Mode=2
-Texture=FSPX_AIlights.bmp
-Color Start=10, 100, 160, 100
-uv1=0.00, 0.00
-uv2=1.00, 1.00
-
-//----------------------------------
-
-[Emitter.2]
-Lifetime=0.50, 0.50
-No Interpolate=1
-Rate=1.10, 1.10
-
-[Particle.2]
-Lifetime=0.00, 0.00
-Type=19
-X Scale=0.13, 0.13
-Y Scale=0.13, 0.13
-Static=1
-Face=1, 1, 1
-
-[ParticleAttributes.2]
-Blend Mode=2
-Texture=FSPX_AIlights.bmp
-Color Start=160, 170, 220, 240
-uv1=0.00, 0.00
-uv2=1.00, 1.00
+[Library Effect]
+Lifetime=5
+Version=2.00
+Radius=-1
+Priority=0
+
+[Properties]
+
+//----------------------------------
+
+[Emitter.0]
+Lifetime=0.50, 0.50
+No Interpolate=1
+Rate=1.10, 1.10
+
+[Particle.0]
+Lifetime=0.00, 0.00
+Type=19
+X Scale=0.70, 0.70
+Y Scale=0.70, 0.700
+Static=1
+Face=1, 1, 1
+
+[ParticleAttributes.0]
+Blend Mode=2
+Texture=FSPX_AIlights.bmp
+Color Start=10, 150, 70, 80
+uv1=0.00, 0.00
+uv2=1.00, 1.00
+
+//----------------------------------
+
+[Emitter.1]
+Lifetime=0.50, 0.50
+No Interpolate=1
+Rate=1.10, 1.10
+
+[Particle.1]
+Lifetime=0.00, 0.00
+Type=19
+X Scale=0.25, 0.25
+Y Scale=0.25, 0.25
+Static=1
+Face=1, 1, 1
+
+[ParticleAttributes.1]
+Blend Mode=2
+Texture=FSPX_AIlights.bmp
+Color Start=10, 100, 160, 100
+uv1=0.00, 0.00
+uv2=1.00, 1.00
+
+//----------------------------------
+
+[Emitter.2]
+Lifetime=0.50, 0.50
+No Interpolate=1
+Rate=1.10, 1.10
+
+[Particle.2]
+Lifetime=0.00, 0.00
+Type=19
+X Scale=0.13, 0.13
+Y Scale=0.13, 0.13
+Static=1
+Face=1, 1, 1
+
+[ParticleAttributes.2]
+Blend Mode=2
+Texture=FSPX_AIlights.bmp
+Color Start=160, 170, 220, 240
+uv1=0.00, 0.00
+uv2=1.00, 1.00
diff --git a/Effects/FSPXAI_NavBlueLargex_RW.fx b/Effects/fx_GEN_AI_NavBlueLargex_RW.fx
similarity index 93%
rename from Effects/FSPXAI_NavBlueLargex_RW.fx
rename to Effects/fx_GEN_AI_NavBlueLargex_RW.fx
index 2123fff..d552520 100644
--- a/Effects/FSPXAI_NavBlueLargex_RW.fx
+++ b/Effects/fx_GEN_AI_NavBlueLargex_RW.fx
@@ -1,94 +1,94 @@
-[Library Effect]
-Lifetime=5
-Version=2.00
-Radius=-1
-Priority=0
-
-[Properties]
-
-//----------------------------------
-
-[Emitter.0]
-Lifetime=0.50, 0.50
-No Interpolate=1
-Rate=1.10, 1.10
-
-[Particle.0]
-Lifetime=0.00, 0.00
-Type=19
-X Scale=0.70, 0.70
-Y Scale=0.70, 0.700
-Static=1
-Face=1, 1, 1
-
-[ParticleAttributes.0]
-Blend Mode=2
-Texture=FSPX_AIlights.bmp
-Color Start=10, 150, 70, 80
-uv1=0.00, 0.00
-uv2=1.00, 1.00
-
-//----------------------------------
-
-[Emitter.1]
-Lifetime=0.50, 0.50
-No Interpolate=1
-Rate=1.10, 1.10
-
-[Particle.1]
-Lifetime=0.00, 0.00
-Type=19
-X Scale=0.25, 0.25
-Y Scale=0.25, 0.25
-Static=1
-Face=1, 1, 1
-
-[ParticleAttributes.1]
-Blend Mode=2
-Texture=FSPX_AIlights.bmp
-Color Start=10, 100, 160, 100
-uv1=0.00, 0.00
-uv2=1.00, 1.00
-
-//----------------------------------
-
-[Emitter.2]
-Lifetime=0.50, 0.50
-No Interpolate=1
-Rate=1.10, 1.10
-
-[Particle.2]
-Lifetime=0.00, 0.00
-Type=19
-X Scale=0.13, 0.13
-Y Scale=0.13, 0.13
-Static=1
-Face=1, 1, 1
-
-[ParticleAttributes.2]
-Blend Mode=2
-Texture=FSPX_AIlights.bmp
-Color Start=160, 170, 220, 240
-uv1=0.00, 0.00
-uv2=1.00, 1.00
-
-
-//----------------------
-
-
-[Emitter.3]
-Lifetime=1.00, 1.00
-Rate=1.00, 1.00
-
-[Particle.3]
-Lifetime=0.00, 0.00
-Type=28
-X Scale=15.00, 15.00
-Static=1
-
-[ParticleAttributes.3]
-Color Start=10, 80, 50, 00
-Color End=10, 80, 50, 40
-Falloff Exponent=2.00
-Inner Cone Angle=60.00
-Outer Cone Angle=100.00
+[Library Effect]
+Lifetime=5
+Version=2.00
+Radius=-1
+Priority=0
+
+[Properties]
+
+//----------------------------------
+
+[Emitter.0]
+Lifetime=0.50, 0.50
+No Interpolate=1
+Rate=1.10, 1.10
+
+[Particle.0]
+Lifetime=0.00, 0.00
+Type=19
+X Scale=0.70, 0.70
+Y Scale=0.70, 0.700
+Static=1
+Face=1, 1, 1
+
+[ParticleAttributes.0]
+Blend Mode=2
+Texture=FSPX_AIlights.bmp
+Color Start=10, 150, 70, 80
+uv1=0.00, 0.00
+uv2=1.00, 1.00
+
+//----------------------------------
+
+[Emitter.1]
+Lifetime=0.50, 0.50
+No Interpolate=1
+Rate=1.10, 1.10
+
+[Particle.1]
+Lifetime=0.00, 0.00
+Type=19
+X Scale=0.25, 0.25
+Y Scale=0.25, 0.25
+Static=1
+Face=1, 1, 1
+
+[ParticleAttributes.1]
+Blend Mode=2
+Texture=FSPX_AIlights.bmp
+Color Start=10, 100, 160, 100
+uv1=0.00, 0.00
+uv2=1.00, 1.00
+
+//----------------------------------
+
+[Emitter.2]
+Lifetime=0.50, 0.50
+No Interpolate=1
+Rate=1.10, 1.10
+
+[Particle.2]
+Lifetime=0.00, 0.00
+Type=19
+X Scale=0.13, 0.13
+Y Scale=0.13, 0.13
+Static=1
+Face=1, 1, 1
+
+[ParticleAttributes.2]
+Blend Mode=2
+Texture=FSPX_AIlights.bmp
+Color Start=160, 170, 220, 240
+uv1=0.00, 0.00
+uv2=1.00, 1.00
+
+
+//----------------------
+
+
+[Emitter.3]
+Lifetime=1.00, 1.00
+Rate=1.00, 1.00
+
+[Particle.3]
+Lifetime=0.00, 0.00
+Type=28
+X Scale=15.00, 15.00
+Static=1
+
+[ParticleAttributes.3]
+Color Start=10, 80, 50, 00
+Color End=10, 80, 50, 40
+Falloff Exponent=2.00
+Inner Cone Angle=60.00
+Outer Cone Angle=100.00
diff --git a/Effects/FSPXAI_NavBlueMiddle.fx b/Effects/fx_GEN_AI_NavBlueMiddle.fx
similarity index 94%
rename from Effects/FSPXAI_NavBlueMiddle.fx
rename to Effects/fx_GEN_AI_NavBlueMiddle.fx
index 7278258..f8880f6 100644
--- a/Effects/FSPXAI_NavBlueMiddle.fx
+++ b/Effects/fx_GEN_AI_NavBlueMiddle.fx
@@ -1,62 +1,62 @@
-[Library Effect]
-Lifetime=5
-Version=2.00
-Radius=-1
-Priority=0
-
-[Properties]
-
-
-
-[Emitter.0]
-Lifetime=0.50, 0.50
-Delay=0.00, 0.00
-Bounce=0.00
-Rate=1.00, 1.00
-X Emitter Velocity=0.00, 0.00
-Y Emitter Velocity=0.00, 0.00
-Z Emitter Velocity=0.00, 0.00
-Drag=0.00, 0.00
-X Particle Velocity=0.00, 0.00
-Y Particle Velocity=0.00, 0.00
-Z Particle Velocity=0.00, 0.00
-X Rotation=0.00, 0.00
-Y Rotation=0.00, 0.00
-Z Rotation=0.00, 0.00
-X Offset=0.00, 0.00
-Y Offset=0.00, 0.00
-Z Offset=0.00, 0.00
-Pitch=0.00, 0.00
-Bank=0.00, 0.00
-Heading=0.00, 0.00
-
-[Particle.0]
-Lifetime=0.00, 0.00
-Type=27
-X Scale=10.00, 10.00
-Y Scale=0.00, 0.00
-Z Scale=0.00, 0.00
-X Scale Rate=0.00, 0.00
-Y Scale Rate=0.00, 0.00
-Z Scale Rate=0.00, 0.00
-Drag=0.00, 0.00
-Color Rate=0.00, 0.00
-X Offset=0.00, 0.00
-Y Offset=0.00, 0.00
-Z Offset=0.00, 0.00
-Fade In=0.00, 0.00
-Fade Out=0.00, 0.00
-Static=1
-Face=0, 0, 0
-
-[ParticleAttributes.0]
-Color Start=10, 80, 50, 40
-Color End=10, 80, 50, 40
-Bounce=0.00
-X Scale Goal=0.00
-Y Scale Goal=0.00
-Z Scale Goal=0.00
-Falloff Exponent=2.00
-Inner Cone Angle=0.00
-Outer Cone Angle=0.00
-
+[Library Effect]
+Lifetime=5
+Version=2.00
+Radius=-1
+Priority=0
+
+[Properties]
+
+
+
+[Emitter.0]
+Lifetime=0.50, 0.50
+Delay=0.00, 0.00
+Bounce=0.00
+Rate=1.00, 1.00
+X Emitter Velocity=0.00, 0.00
+Y Emitter Velocity=0.00, 0.00
+Z Emitter Velocity=0.00, 0.00
+Drag=0.00, 0.00
+X Particle Velocity=0.00, 0.00
+Y Particle Velocity=0.00, 0.00
+Z Particle Velocity=0.00, 0.00
+X Rotation=0.00, 0.00
+Y Rotation=0.00, 0.00
+Z Rotation=0.00, 0.00
+X Offset=0.00, 0.00
+Y Offset=0.00, 0.00
+Z Offset=0.00, 0.00
+Pitch=0.00, 0.00
+Bank=0.00, 0.00
+Heading=0.00, 0.00
+
+[Particle.0]
+Lifetime=0.00, 0.00
+Type=27
+X Scale=10.00, 10.00
+Y Scale=0.00, 0.00
+Z Scale=0.00, 0.00
+X Scale Rate=0.00, 0.00
+Y Scale Rate=0.00, 0.00
+Z Scale Rate=0.00, 0.00
+Drag=0.00, 0.00
+Color Rate=0.00, 0.00
+X Offset=0.00, 0.00
+Y Offset=0.00, 0.00
+Z Offset=0.00, 0.00
+Fade In=0.00, 0.00
+Fade Out=0.00, 0.00
+Static=1
+Face=0, 0, 0
+
+[ParticleAttributes.0]
+Color Start=10, 80, 50, 40
+Color End=10, 80, 50, 40
+Bounce=0.00
+X Scale Goal=0.00
+Y Scale Goal=0.00
+Z Scale Goal=0.00
+Falloff Exponent=2.00
+Inner Cone Angle=0.00
+Outer Cone Angle=0.00
+
diff --git a/Effects/FSPXAI_NavRedLargex_HS.fx b/Effects/fx_GEN_AI_NavRedLargex_HS.fx
similarity index 93%
rename from Effects/FSPXAI_NavRedLargex_HS.fx
rename to Effects/fx_GEN_AI_NavRedLargex_HS.fx
index 04d2b58..55bf7c6 100644
--- a/Effects/FSPXAI_NavRedLargex_HS.fx
+++ b/Effects/fx_GEN_AI_NavRedLargex_HS.fx
@@ -1,74 +1,74 @@
-[Library Effect]
-Lifetime=5
-Version=2.00
-Radius=-1
-Priority=0
-
-[Properties]
-
-//----------------------------------
-
-[Emitter.0]
-Lifetime=0.50, 0.50
-No Interpolate=1
-Rate=1.10, 1.10
-
-[Particle.0]
-Lifetime=0.00, 0.00
-Type=19
-X Scale=0.70, 0.70
-Y Scale=0.70, 0.70
-Static=1
-Face=1, 1, 1
-
-[ParticleAttributes.0]
-Blend Mode=2
-Texture=FSPX_AIlights.bmp
-Color Start=220, 30, 5, 200
-uv1=0.00, 0.00
-uv2=1.00, 1.00
-
-//----------------------------------
-
-[Emitter.1]
-Lifetime=0.50, 0.50
-No Interpolate=1
-Rate=1.10, 1.10
-
-[Particle.1]
-Lifetime=0.00, 0.00
-Type=19
-X Scale=0.25, 0.25
-Y Scale=0.25, 0.25
-Static=1
-Face=1, 1, 1
-
-[ParticleAttributes.1]
-Blend Mode=2
-Texture=FSPX_AIlights.bmp
-Color Start=170, 60, 5, 200
-uv1=0.00, 0.00
-uv2=1.00, 1.00
-
-//----------------------------------
-
-[Emitter.2]
-Lifetime=0.50, 0.50
-No Interpolate=1
-Rate=1.10, 1.10
-
-[Particle.2]
-Lifetime=0.00, 0.00
-Type=19
-X Scale=0.15, 0.15
-Y Scale=0.15, 0.15
-Static=1
-Face=1, 1, 1
-
-[ParticleAttributes.2]
-Blend Mode=2
-Texture=FSPX_AIlights.bmp
-Color Start=200, 130, 5, 200
-uv1=0.00, 0.00
-uv2=1.00, 1.00
-
+[Library Effect]
+Lifetime=5
+Version=2.00
+Radius=-1
+Priority=0
+
+[Properties]
+
+//----------------------------------
+
+[Emitter.0]
+Lifetime=0.50, 0.50
+No Interpolate=1
+Rate=1.10, 1.10
+
+[Particle.0]
+Lifetime=0.00, 0.00
+Type=19
+X Scale=0.70, 0.70
+Y Scale=0.70, 0.70
+Static=1
+Face=1, 1, 1
+
+[ParticleAttributes.0]
+Blend Mode=2
+Texture=FSPX_AIlights.bmp
+Color Start=220, 30, 5, 200
+uv1=0.00, 0.00
+uv2=1.00, 1.00
+
+//----------------------------------
+
+[Emitter.1]
+Lifetime=0.50, 0.50
+No Interpolate=1
+Rate=1.10, 1.10
+
+[Particle.1]
+Lifetime=0.00, 0.00
+Type=19
+X Scale=0.25, 0.25
+Y Scale=0.25, 0.25
+Static=1
+Face=1, 1, 1
+
+[ParticleAttributes.1]
+Blend Mode=2
+Texture=FSPX_AIlights.bmp
+Color Start=170, 60, 5, 200
+uv1=0.00, 0.00
+uv2=1.00, 1.00
+
+//----------------------------------
+
+[Emitter.2]
+Lifetime=0.50, 0.50
+No Interpolate=1
+Rate=1.10, 1.10
+
+[Particle.2]
+Lifetime=0.00, 0.00
+Type=19
+X Scale=0.15, 0.15
+Y Scale=0.15, 0.15
+Static=1
+Face=1, 1, 1
+
+[ParticleAttributes.2]
+Blend Mode=2
+Texture=FSPX_AIlights.bmp
+Color Start=200, 130, 5, 200
+uv1=0.00, 0.00
+uv2=1.00, 1.00
+
diff --git a/Effects/FSPXAI_NavRedLargex_RW.fx b/Effects/fx_GEN_AI_NavRedLargex_RW.fx
similarity index 93%
rename from Effects/FSPXAI_NavRedLargex_RW.fx
rename to Effects/fx_GEN_AI_NavRedLargex_RW.fx
index 5103315..2eaf04e 100644
--- a/Effects/FSPXAI_NavRedLargex_RW.fx
+++ b/Effects/fx_GEN_AI_NavRedLargex_RW.fx
@@ -1,94 +1,94 @@
-[Library Effect]
-Lifetime=5
-Version=2.00
-Radius=-1
-Priority=0
-
-[Properties]
-
-//----------------------------------
-
-[Emitter.0]
-Lifetime=0.50, 0.50
-No Interpolate=1
-Rate=1.10, 1.10
-
-[Particle.0]
-Lifetime=0.00, 0.00
-Type=19
-X Scale=0.70, 0.70
-Y Scale=0.70, 0.70
-Static=1
-Face=1, 1, 1
-
-[ParticleAttributes.0]
-Blend Mode=2
-Texture=FSPX_AIlights.bmp
-Color Start=220, 30, 5, 200
-uv1=0.00, 0.00
-uv2=1.00, 1.00
-
-//----------------------------------
-
-[Emitter.1]
-Lifetime=0.50, 0.50
-No Interpolate=1
-Rate=1.10, 1.10
-
-[Particle.1]
-Lifetime=0.00, 0.00
-Type=19
-X Scale=0.25, 0.25
-Y Scale=0.25, 0.25
-Static=1
-Face=1, 1, 1
-
-[ParticleAttributes.1]
-Blend Mode=2
-Texture=FSPX_AIlights.bmp
-Color Start=170, 60, 5, 200
-uv1=0.00, 0.00
-uv2=1.00, 1.00
-
-//----------------------------------
-
-[Emitter.2]
-Lifetime=0.50, 0.50
-No Interpolate=1
-Rate=1.10, 1.10
-
-[Particle.2]
-Lifetime=0.00, 0.00
-Type=19
-X Scale=0.15, 0.15
-Y Scale=0.15, 0.15
-Static=1
-Face=1, 1, 1
-
-[ParticleAttributes.2]
-Blend Mode=2
-Texture=FSPX_AIlights.bmp
-Color Start=200, 130, 5, 200
-uv1=0.00, 0.00
-uv2=1.00, 1.00
-
-
-//----------------------
-
-[Emitter.3]
-Lifetime=1.00, 1.00
-Rate=1.00, 1.00
-
-[Particle.3]
-Lifetime=0.00, 0.00
-Type=28
-X Scale=20.00, 20.00
-Static=1
-
-[ParticleAttributes.3]
-Color Start=0, 0, 0, 0
-Color End=180, 40, 10, 24
-Falloff Exponent=2.00
-Inner Cone Angle=60.00
-Outer Cone Angle=100.00
-
+[Library Effect]
+Lifetime=5
+Version=2.00
+Radius=-1
+Priority=0
+
+[Properties]
+
+//----------------------------------
+
+[Emitter.0]
+Lifetime=0.50, 0.50
+No Interpolate=1
+Rate=1.10, 1.10
+
+[Particle.0]
+Lifetime=0.00, 0.00
+Type=19
+X Scale=0.70, 0.70
+Y Scale=0.70, 0.70
+Static=1
+Face=1, 1, 1
+
+[ParticleAttributes.0]
+Blend Mode=2
+Texture=FSPX_AIlights.bmp
+Color Start=220, 30, 5, 200
+uv1=0.00, 0.00
+uv2=1.00, 1.00
+
+//----------------------------------
+
+[Emitter.1]
+Lifetime=0.50, 0.50
+No Interpolate=1
+Rate=1.10, 1.10
+
+[Particle.1]
+Lifetime=0.00, 0.00
+Type=19
+X Scale=0.25, 0.25
+Y Scale=0.25, 0.25
+Static=1
+Face=1, 1, 1
+
+[ParticleAttributes.1]
+Blend Mode=2
+Texture=FSPX_AIlights.bmp
+Color Start=170, 60, 5, 200
+uv1=0.00, 0.00
+uv2=1.00, 1.00
+
+//----------------------------------
+
+[Emitter.2]
+Lifetime=0.50, 0.50
+No Interpolate=1
+Rate=1.10, 1.10
+
+[Particle.2]
+Lifetime=0.00, 0.00
+Type=19
+X Scale=0.15, 0.15
+Y Scale=0.15, 0.15
+Static=1
+Face=1, 1, 1
+
+[ParticleAttributes.2]
+Blend Mode=2
+Texture=FSPX_AIlights.bmp
+Color Start=200, 130, 5, 200
+uv1=0.00, 0.00
+uv2=1.00, 1.00
+
+
+//----------------------
+
+[Emitter.3]
+Lifetime=1.00, 1.00
+Rate=1.00, 1.00
+
+[Particle.3]
+Lifetime=0.00, 0.00
+Type=28
+X Scale=20.00, 20.00
+Static=1
+
+[ParticleAttributes.3]
+Color Start=0, 0, 0, 0
+Color End=180, 40, 10, 24
+Falloff Exponent=2.00
+Inner Cone Angle=60.00
+Outer Cone Angle=100.00
+
diff --git a/Effects/FSPXAI_NavRedMiddle.fx b/Effects/fx_GEN_AI_NavRedMiddle.fx
similarity index 94%
rename from Effects/FSPXAI_NavRedMiddle.fx
rename to Effects/fx_GEN_AI_NavRedMiddle.fx
index f7db912..aa5d1bb 100644
--- a/Effects/FSPXAI_NavRedMiddle.fx
+++ b/Effects/fx_GEN_AI_NavRedMiddle.fx
@@ -1,62 +1,62 @@
-[Library Effect]
-Lifetime=5
-Version=2.00
-Radius=-1
-Priority=0
-
-[Properties]
-
-
-
-[Emitter.0]
-Lifetime=0.50, 0.50
-Delay=0.00, 0.00
-Bounce=0.00
-Rate=1.00, 1.00
-X Emitter Velocity=0.00, 0.00
-Y Emitter Velocity=0.00, 0.00
-Z Emitter Velocity=0.00, 0.00
-Drag=0.00, 0.00
-X Particle Velocity=0.00, 0.00
-Y Particle Velocity=0.00, 0.00
-Z Particle Velocity=0.00, 0.00
-X Rotation=0.00, 0.00
-Y Rotation=0.00, 0.00
-Z Rotation=0.00, 0.00
-X Offset=0.00, 0.00
-Y Offset=0.00, 0.00
-Z Offset=0.00, 0.00
-Pitch=0.00, 0.00
-Bank=0.00, 0.00
-Heading=0.00, 0.00
-
-[Particle.0]
-Lifetime=0.00, 0.00
-Type=27
-X Scale=9.00, 9.00
-Y Scale=0.00, 0.00
-Z Scale=0.00, 0.00
-X Scale Rate=0.00, 0.00
-Y Scale Rate=0.00, 0.00
-Z Scale Rate=0.00, 0.00
-Drag=0.00, 0.00
-Color Rate=0.00, 0.00
-X Offset=0.00, 0.00
-Y Offset=0.00, 0.00
-Z Offset=0.00, 0.00
-Fade In=0.00, 0.00
-Fade Out=0.00, 0.00
-Static=1
-Face=0, 0, 0
-
-[ParticleAttributes.0]
-Color Start=60, 10, 0, 60
-Color End=60, 10, 0, 60
-Bounce=0.00
-X Scale Goal=0.00
-Y Scale Goal=0.00
-Z Scale Goal=0.00
-Falloff Exponent=2.00
-Inner Cone Angle=0.00
-Outer Cone Angle=0.00
-
+[Library Effect]
+Lifetime=5
+Version=2.00
+Radius=-1
+Priority=0
+
+[Properties]
+
+
+
+[Emitter.0]
+Lifetime=0.50, 0.50
+Delay=0.00, 0.00
+Bounce=0.00
+Rate=1.00, 1.00
+X Emitter Velocity=0.00, 0.00
+Y Emitter Velocity=0.00, 0.00
+Z Emitter Velocity=0.00, 0.00
+Drag=0.00, 0.00
+X Particle Velocity=0.00, 0.00
+Y Particle Velocity=0.00, 0.00
+Z Particle Velocity=0.00, 0.00
+X Rotation=0.00, 0.00
+Y Rotation=0.00, 0.00
+Z Rotation=0.00, 0.00
+X Offset=0.00, 0.00
+Y Offset=0.00, 0.00
+Z Offset=0.00, 0.00
+Pitch=0.00, 0.00
+Bank=0.00, 0.00
+Heading=0.00, 0.00
+
+[Particle.0]
+Lifetime=0.00, 0.00
+Type=27
+X Scale=9.00, 9.00
+Y Scale=0.00, 0.00
+Z Scale=0.00, 0.00
+X Scale Rate=0.00, 0.00
+Y Scale Rate=0.00, 0.00
+Z Scale Rate=0.00, 0.00
+Drag=0.00, 0.00
+Color Rate=0.00, 0.00
+X Offset=0.00, 0.00
+Y Offset=0.00, 0.00
+Z Offset=0.00, 0.00
+Fade In=0.00, 0.00
+Fade Out=0.00, 0.00
+Static=1
+Face=0, 0, 0
+
+[ParticleAttributes.0]
+Color Start=60, 10, 0, 60
+Color End=60, 10, 0, 60
+Bounce=0.00
+X Scale Goal=0.00
+Y Scale Goal=0.00
+Z Scale Goal=0.00
+Falloff Exponent=2.00
+Inner Cone Angle=0.00
+Outer Cone Angle=0.00
+
diff --git a/Effects/FSPXAI_NavWhiteLargex_HS.fx b/Effects/fx_GEN_AI_NavWhiteLargex_HS.fx
similarity index 93%
rename from Effects/FSPXAI_NavWhiteLargex_HS.fx
rename to Effects/fx_GEN_AI_NavWhiteLargex_HS.fx
index 4ee42df..012327e 100644
--- a/Effects/FSPXAI_NavWhiteLargex_HS.fx
+++ b/Effects/fx_GEN_AI_NavWhiteLargex_HS.fx
@@ -1,74 +1,74 @@
-[Library Effect]
-Lifetime=5
-Version=2.00
-Radius=-1
-Priority=0
-
-[Properties]
-
-//----------------------------------
-
-[Emitter.0]
-Lifetime=0.50, 0.50
-No Interpolate=1
-Rate=1.10, 1.10
-
-[Particle.0]
-Lifetime=0.00, 0.00
-Type=19
-X Scale=1.00, 1.00
-Y Scale=1.00, 1.00
-Static=1
-Face=1, 1, 1
-
-[ParticleAttributes.0]
-Blend Mode=2
-Texture=FSPX_AIlights.bmp
-Color Start=100, 100, 100, 10
-uv1=0.00, 0.00
-uv2=1.00, 1.00
-
-//----------------------------------
-
-[Emitter.1]
-Lifetime=0.50, 0.50
-No Interpolate=1
-Rate=1.10, 1.10
-
-[Particle.1]
-Lifetime=0.00, 0.00
-Type=19
-X Scale=0.45, 0.45
-Y Scale=0.45, 0.45
-Static=1
-Face=1, 1, 1
-
-[ParticleAttributes.1]
-Blend Mode=2
-Texture=FSPX_AIlights.bmp
-Color Start=160, 160, 160, 20
-uv1=0.00, 0.00
-uv2=1.00, 1.00
-
-//----------------------------------
-
-[Emitter.2]
-Lifetime=0.50, 0.50
-No Interpolate=1
-Rate=1.10, 1.10
-
-[Particle.2]
-Lifetime=0.00, 0.00
-Type=19
-X Scale=0.12, 0.12
-Y Scale=0.12, 0.12
-Static=1
-Face=1, 1, 1
-
-[ParticleAttributes.2]
-Blend Mode=2
-Texture=FSPX_AIlights.bmp
-Color Start=160, 160, 160, 255
-uv1=0.00, 0.00
-uv2=1.00, 1.00
-
+[Library Effect]
+Lifetime=5
+Version=2.00
+Radius=-1
+Priority=0
+
+[Properties]
+
+//----------------------------------
+
+[Emitter.0]
+Lifetime=0.50, 0.50
+No Interpolate=1
+Rate=1.10, 1.10
+
+[Particle.0]
+Lifetime=0.00, 0.00
+Type=19
+X Scale=1.00, 1.00
+Y Scale=1.00, 1.00
+Static=1
+Face=1, 1, 1
+
+[ParticleAttributes.0]
+Blend Mode=2
+Texture=FSPX_AIlights.bmp
+Color Start=100, 100, 100, 10
+uv1=0.00, 0.00
+uv2=1.00, 1.00
+
+//----------------------------------
+
+[Emitter.1]
+Lifetime=0.50, 0.50
+No Interpolate=1
+Rate=1.10, 1.10
+
+[Particle.1]
+Lifetime=0.00, 0.00
+Type=19
+X Scale=0.45, 0.45
+Y Scale=0.45, 0.45
+Static=1
+Face=1, 1, 1
+
+[ParticleAttributes.1]
+Blend Mode=2
+Texture=FSPX_AIlights.bmp
+Color Start=160, 160, 160, 20
+uv1=0.00, 0.00
+uv2=1.00, 1.00
+
+//----------------------------------
+
+[Emitter.2]
+Lifetime=0.50, 0.50
+No Interpolate=1
+Rate=1.10, 1.10
+
+[Particle.2]
+Lifetime=0.00, 0.00
+Type=19
+X Scale=0.12, 0.12
+Y Scale=0.12, 0.12
+Static=1
+Face=1, 1, 1
+
+[ParticleAttributes.2]
+Blend Mode=2
+Texture=FSPX_AIlights.bmp
+Color Start=160, 160, 160, 255
+uv1=0.00, 0.00
+uv2=1.00, 1.00
+
diff --git a/Effects/FSPXAI_NavWhiteLargex_RW.fx b/Effects/fx_GEN_AI_NavWhiteLargex_RW.fx
similarity index 93%
rename from Effects/FSPXAI_NavWhiteLargex_RW.fx
rename to Effects/fx_GEN_AI_NavWhiteLargex_RW.fx
index ac44566..fb0e2a6 100644
--- a/Effects/FSPXAI_NavWhiteLargex_RW.fx
+++ b/Effects/fx_GEN_AI_NavWhiteLargex_RW.fx
@@ -1,92 +1,92 @@
-[Library Effect]
-Lifetime=5
-Version=2.00
-Radius=-1
-Priority=0
-
-[Properties]
-
-//----------------------------------
-
-[Emitter.0]
-Lifetime=0.50, 0.50
-No Interpolate=1
-Rate=1.10, 1.10
-
-[Particle.0]
-Lifetime=0.00, 0.00
-Type=19
-X Scale=1.00, 1.00
-Y Scale=1.00, 1.00
-Static=1
-Face=1, 1, 1
-
-[ParticleAttributes.0]
-Blend Mode=2
-Texture=FSPX_AIlights.bmp
-Color Start=100, 100, 100, 10
-uv1=0.00, 0.00
-uv2=1.00, 1.00
-
-//----------------------------------
-
-[Emitter.1]
-Lifetime=0.50, 0.50
-No Interpolate=1
-Rate=1.10, 1.10
-
-[Particle.1]
-Lifetime=0.00, 0.00
-Type=19
-X Scale=0.45, 0.45
-Y Scale=0.45, 0.45
-Static=1
-Face=1, 1, 1
-
-[ParticleAttributes.1]
-Blend Mode=2
-Texture=FSPX_AIlights.bmp
-Color Start=160, 160, 160, 20
-uv1=0.00, 0.00
-uv2=1.00, 1.00
-
-//----------------------------------
-
-[Emitter.2]
-Lifetime=0.50, 0.50
-No Interpolate=1
-Rate=1.10, 1.10
-
-[Particle.2]
-Lifetime=0.00, 0.00
-Type=19
-X Scale=0.12, 0.12
-Y Scale=0.12, 0.12
-Static=1
-Face=1, 1, 1
-
-[ParticleAttributes.2]
-Blend Mode=2
-Texture=FSPX_AIlights.bmp
-Color Start=160, 160, 160, 255
-uv1=0.00, 0.00
-uv2=1.00, 1.00
-
-//----------------------
-
-[Emitter.3]
-Lifetime=1.00, 1.00
-Rate=1.00, 1.00
-
-[Particle.3]
-Lifetime=0.00, 0.00
-Type=28
-X Scale=20.00, 20.00
-Static=1
-
-[ParticleAttributes.3]
-Color Start=0, 0, 0, 0
-Color End=50, 50, 50, 40
-Falloff Exponent=2.00
-Inner Cone Angle=65.00
-Outer Cone Angle=100.00
+[Library Effect]
+Lifetime=5
+Version=2.00
+Radius=-1
+Priority=0
+
+[Properties]
+
+//----------------------------------
+
+[Emitter.0]
+Lifetime=0.50, 0.50
+No Interpolate=1
+Rate=1.10, 1.10
+
+[Particle.0]
+Lifetime=0.00, 0.00
+Type=19
+X Scale=1.00, 1.00
+Y Scale=1.00, 1.00
+Static=1
+Face=1, 1, 1
+
+[ParticleAttributes.0]
+Blend Mode=2
+Texture=FSPX_AIlights.bmp
+Color Start=100, 100, 100, 10
+uv1=0.00, 0.00
+uv2=1.00, 1.00
+
+//----------------------------------
+
+[Emitter.1]
+Lifetime=0.50, 0.50
+No Interpolate=1
+Rate=1.10, 1.10
+
+[Particle.1]
+Lifetime=0.00, 0.00
+Type=19
+X Scale=0.45, 0.45
+Y Scale=0.45, 0.45
+Static=1
+Face=1, 1, 1
+
+[ParticleAttributes.1]
+Blend Mode=2
+Texture=FSPX_AIlights.bmp
+Color Start=160, 160, 160, 20
+uv1=0.00, 0.00
+uv2=1.00, 1.00
+
+//----------------------------------
+
+[Emitter.2]
+Lifetime=0.50, 0.50
+No Interpolate=1
+Rate=1.10, 1.10
+
+[Particle.2]
+Lifetime=0.00, 0.00
+Type=19
+X Scale=0.12, 0.12
+Y Scale=0.12, 0.12
+Static=1
+Face=1, 1, 1
+
+[ParticleAttributes.2]
+Blend Mode=2
+Texture=FSPX_AIlights.bmp
+Color Start=160, 160, 160, 255
+uv1=0.00, 0.00
+uv2=1.00, 1.00
+
+//----------------------
+
+[Emitter.3]
+Lifetime=1.00, 1.00
+Rate=1.00, 1.00
+
+[Particle.3]
+Lifetime=0.00, 0.00
+Type=28
+X Scale=20.00, 20.00
+Static=1
+
+[ParticleAttributes.3]
+Color Start=0, 0, 0, 0
+Color End=50, 50, 50, 40
+Falloff Exponent=2.00
+Inner Cone Angle=65.00
+Outer Cone Angle=100.00
diff --git a/Effects/FSPXAI_StrobeLarge.fx b/Effects/fx_GEN_AI_StrobeLarge.fx
similarity index 94%
rename from Effects/FSPXAI_StrobeLarge.fx
rename to Effects/fx_GEN_AI_StrobeLarge.fx
index 312af48..2571688 100644
--- a/Effects/FSPXAI_StrobeLarge.fx
+++ b/Effects/fx_GEN_AI_StrobeLarge.fx
@@ -1,62 +1,62 @@
-[Library Effect]
-Lifetime=5
-Version=2.00
-Radius=-1
-Priority=0
-
-[Properties]
-
-
-
-[Emitter.0]
-Lifetime=0.00, 0.00
-Delay=0.00, 0.00
-Bounce=0.00
-Rate=1.00, 1.00
-X Emitter Velocity=0.00, 0.00
-Y Emitter Velocity=0.00, 0.00
-Z Emitter Velocity=0.00, 0.00
-Drag=0.00, 0.00
-X Particle Velocity=0.00, 0.00
-Y Particle Velocity=0.00, 0.00
-Z Particle Velocity=0.00, 0.00
-X Rotation=0.00, 0.00
-Y Rotation=0.00, 0.00
-Z Rotation=0.00, 0.00
-X Offset=0.00, 0.00
-Y Offset=0.00, 0.00
-Z Offset=0.00, 0.00
-Pitch=0.00, 0.00
-Bank=0.00, 0.00
-Heading=0.00, 0.00
-
-[Particle.0]
-Lifetime=0.00, 0.00
-Type=27
-X Scale=18.00, 18.00
-Y Scale=0.00, 0.00
-Z Scale=0.00, 0.00
-X Scale Rate=0.00, 0.00
-Y Scale Rate=0.00, 0.00
-Z Scale Rate=0.00, 0.00
-Drag=0.00, 0.00
-Color Rate=0.00, 0.00
-X Offset=0.00, 0.00
-Y Offset=0.00, 0.00
-Z Offset=0.00, 0.00
-Fade In=0.00, 0.00
-Fade Out=0.00, 0.00
-Static=1
-Face=0, 0, 0
-
-[ParticleAttributes.0]
-Color Start=60, 60, 60, 90
-Color End=60, 60, 60, 90
-Bounce=0.00
-X Scale Goal=0.00
-Y Scale Goal=0.00
-Z Scale Goal=0.00
-Falloff Exponent=2.00
-Inner Cone Angle=0.00
-Outer Cone Angle=0.00
-
+[Library Effect]
+Lifetime=5
+Version=2.00
+Radius=-1
+Priority=0
+
+[Properties]
+
+
+
+[Emitter.0]
+Lifetime=0.00, 0.00
+Delay=0.00, 0.00
+Bounce=0.00
+Rate=1.00, 1.00
+X Emitter Velocity=0.00, 0.00
+Y Emitter Velocity=0.00, 0.00
+Z Emitter Velocity=0.00, 0.00
+Drag=0.00, 0.00
+X Particle Velocity=0.00, 0.00
+Y Particle Velocity=0.00, 0.00
+Z Particle Velocity=0.00, 0.00
+X Rotation=0.00, 0.00
+Y Rotation=0.00, 0.00
+Z Rotation=0.00, 0.00
+X Offset=0.00, 0.00
+Y Offset=0.00, 0.00
+Z Offset=0.00, 0.00
+Pitch=0.00, 0.00
+Bank=0.00, 0.00
+Heading=0.00, 0.00
+
+[Particle.0]
+Lifetime=0.00, 0.00
+Type=27
+X Scale=18.00, 18.00
+Y Scale=0.00, 0.00
+Z Scale=0.00, 0.00
+X Scale Rate=0.00, 0.00
+Y Scale Rate=0.00, 0.00
+Z Scale Rate=0.00, 0.00
+Drag=0.00, 0.00
+Color Rate=0.00, 0.00
+X Offset=0.00, 0.00
+Y Offset=0.00, 0.00
+Z Offset=0.00, 0.00
+Fade In=0.00, 0.00
+Fade Out=0.00, 0.00
+Static=1
+Face=0, 0, 0
+
+[ParticleAttributes.0]
+Color Start=60, 60, 60, 90
+Color End=60, 60, 60, 90
+Bounce=0.00
+X Scale Goal=0.00
+Y Scale Goal=0.00
+Z Scale Goal=0.00
+Falloff Exponent=2.00
+Inner Cone Angle=0.00
+Outer Cone Angle=0.00
+
diff --git a/Effects/FSPXAI_TaxiLarge.fx b/Effects/fx_GEN_AI_TaxiLarge.fx
similarity index 93%
rename from Effects/FSPXAI_TaxiLarge.fx
rename to Effects/fx_GEN_AI_TaxiLarge.fx
index 41b24f5..97c3b7c 100644
--- a/Effects/FSPXAI_TaxiLarge.fx
+++ b/Effects/fx_GEN_AI_TaxiLarge.fx
@@ -1,26 +1,26 @@
-[Library Effect]
-Lifetime=5
-Version=1.00
-
-//-------------------------------------
-
-[Emitter.0]
-Lifetime=1.00, 1.00
-Rate=1.00, 1.00
-
-[Particle.0]
-Lifetime=0.00, 0.00
-Type=28
-X Scale=100, 100
-Y Scale=0, 0
-Static=1
-
-[ParticleAttributes.0]
-Color Start=220, 220, 200, 0
-Color End=220, 220, 200, 125
-Bounce=0.00
-Falloff Exponent=2.00
-Inner Cone Angle=18.00
-Outer Cone Angle=36.00
-
-
+[Library Effect]
+Lifetime=5
+Version=1.00
+
+//-------------------------------------
+
+[Emitter.0]
+Lifetime=1.00, 1.00
+Rate=1.00, 1.00
+
+[Particle.0]
+Lifetime=0.00, 0.00
+Type=28
+X Scale=100, 100
+Y Scale=0, 0
+Static=1
+
+[ParticleAttributes.0]
+Color Start=220, 220, 200, 0
+Color End=220, 220, 200, 125
+Bounce=0.00
+Falloff Exponent=2.00
+Inner Cone Angle=18.00
+Outer Cone Angle=36.00
+
+
diff --git a/Effects/texture/FSPX_AIlights.bmp b/Effects/texture/GEN_AIlights.bmp
similarity index 100%
rename from Effects/texture/FSPX_AIlights.bmp
rename to Effects/texture/GEN_AIlights.bmp
diff --git a/Simobjects/Airplanes/A20N/PSD/FAIB_A320_CFML_T.psd b/Simobjects/Airplanes/A20N/PSD/FAIB_A320_CFML_T.psd
deleted file mode 100644
index 7eb348c..0000000
Binary files a/Simobjects/Airplanes/A20N/PSD/FAIB_A320_CFML_T.psd and /dev/null differ
diff --git a/Simobjects/Airplanes/A21N/psd/FAIB_A321_CFML_T.psd b/Simobjects/Airplanes/A21N/psd/FAIB_A321_CFML_T.psd
deleted file mode 100644
index 6f5680a..0000000
Binary files a/Simobjects/Airplanes/A21N/psd/FAIB_A321_CFML_T.psd and /dev/null differ
diff --git a/Simobjects/Airplanes/A319/PSD/FAIB_A319_IAE_T.psd b/Simobjects/Airplanes/A319/PSD/FAIB_A319_IAE_T.psd
deleted file mode 100644
index 065b187..0000000
Binary files a/Simobjects/Airplanes/A319/PSD/FAIB_A319_IAE_T.psd and /dev/null differ
diff --git a/Simobjects/Airplanes/A35K/A35K.air b/Simobjects/Airplanes/A35K/GEN_A35K.air
similarity index 100%
rename from Simobjects/Airplanes/A35K/A35K.air
rename to Simobjects/Airplanes/A35K/GEN_A35K.air
diff --git a/Simobjects/Airplanes/A35K/aircraft.cfg b/Simobjects/Airplanes/A35K/aircraft.cfg
index 0831728..f7e7113 100644
--- a/Simobjects/Airplanes/A35K/aircraft.cfg
+++ b/Simobjects/Airplanes/A35K/aircraft.cfg
@@ -1,6 +1,6 @@
 [fltsim.0]
 title=BAvMM_A35K_BAW-BritishAirways
-sim=A35K
+sim=GEN_A35K
 model=
 texture=BAW-BritishAirways
 atc_airline=Speedbird
@@ -14,22 +14,9 @@ ui_type=A350-1000
 ui_variation=Airbus
 visual_damage=1
 
-[fuel]
-Center1     =  0.0,      0, -3.0, 2000, 3.0
-LeftMain    =  0.0, -29.83,  1.0, 4000, 3.0
-RightMain   =  0.0,  29.83,  1.0, 4000, 3.0
-
-external1   =  0, 0, 0, 0, 0                   //   0, 0, 0, 1, 0 is for logo and cabin light always ON state.   0, 0, 0, 0, 0 is default.
-external2   =  0, 0, 0, 0, 0
-
-fuel_type = 2
-number_of_tank_selectors = 1                    
-electric_pump=0
-
-
 [General]
 atc_type=AIRBUS
-atc_model=A359
+atc_model=A35K
 editable=0
 performance=
 Category=airplane
@@ -40,8 +27,23 @@ empty_weight =     385000                                 // (pounds)365000
 reference_datum_position     =        0, 0, 0             // (feet) distance from FlightSim Reference position: (1/4 chord, centerline, waterline)
 empty_weight_CG_position     =        3, 0, 0             // (feet) longitudinal, lateral, vertical distance from specified datum
 max_number_of_stations = 5
+empty_weight_roll_MOI=0.000000
+empty_weight_pitch_MOI=0.000000
+empty_weight_yaw_MOI=0.000000
+empty_weight_coupled_MOI=0.000000
+
+
+[fuel]
+Center1     =  0.0,      0, -3.0, 2000, 3.0
+LeftMain    =  0.0, -29.83,  1.0, 4000, 3.0
+RightMain   =  0.0,  29.83,  1.0, 4000, 3.0
 
+external1   =  0, 0, 0, 0, 0                   //   0, 0, 0, 1, 0 is for logo and cabin light always ON state.   0, 0, 0, 0, 0 is default.
+external2   =  0, 0, 0, 0, 0
 
+fuel_type = 2
+number_of_tank_selectors = 1                    
+electric_pump=0
 
 
 //Moments of Inertia
@@ -50,13 +52,6 @@ empty_weight_roll_MOI    =  34435000
 empty_weight_yaw_MOI     =  11332000
 empty_weight_coupled_MOI = 0
 
-[Reference Speeds]
-flaps_up_stall_speed    = 140.0                 //(IAS)   For AI = Take off VR speed
-full_flaps_stall_speed  = 117.0                  //(IAS)   For AI = Air brake and Toe brake transition speed after touch down landing
-cruise_speed            = 600.0                 //(TAS)   For AI =
-max_indicated_speed=370.000000                  //(IAS)   For AI = Cruse speed
-max_mach=1.00
-
 [brakes]
 parking_brake = 1         // Parking brake available
 toe_brakes_scale = 0.18    //Brake scalar
@@ -77,6 +72,13 @@ elevator_trim_effectiveness = 1.0
 aileron_trim_effectiveness  = 1.0
 rudder_trim_effectiveness   = 1.0
 
+[Reference Speeds]
+flaps_up_stall_speed    = 140.0                 //(IAS)   For AI = Take off VR speed
+full_flaps_stall_speed  = 117.0                  //(IAS)   For AI = Air brake and Toe brake transition speed after touch down landing
+cruise_speed            = 600.0                 //(TAS)   For AI =
+max_indicated_speed=370.000000                  //(IAS)   For AI = Cruse speed
+max_mach=1.00
+
 [GeneralEngineData]
 engine_type= 1
 Engine.0=  25.000,-28.035, -7.110
diff --git a/Simobjects/Airplanes/A35K/model/FSPX_A350-1000.MDL b/Simobjects/Airplanes/A35K/model/FSPX_A350-1000.MDL
deleted file mode 100644
index b7a7fae..0000000
Binary files a/Simobjects/Airplanes/A35K/model/FSPX_A350-1000.MDL and /dev/null differ
diff --git a/Simobjects/Airplanes/A35K/model/A35K.MDL b/Simobjects/Airplanes/A35K/model/GEN_AI_A350K.mdl
similarity index 83%
rename from Simobjects/Airplanes/A35K/model/A35K.MDL
rename to Simobjects/Airplanes/A35K/model/GEN_AI_A350K.mdl
index b7a7fae..e4a0059 100644
Binary files a/Simobjects/Airplanes/A35K/model/A35K.MDL and b/Simobjects/Airplanes/A35K/model/GEN_AI_A350K.mdl differ
diff --git a/Simobjects/Airplanes/A35K/model/model.cfg b/Simobjects/Airplanes/A35K/model/model.cfg
index 23327fe..0c6688f 100644
--- a/Simobjects/Airplanes/A35K/model/model.cfg
+++ b/Simobjects/Airplanes/A35K/model/model.cfg
@@ -1,2 +1,2 @@
 [models]
-normal=FSPX_A350-1000
\ No newline at end of file
+normal=GEN_AI_A350K
\ No newline at end of file
diff --git a/Simobjects/Airplanes/A35K/texture.BAW-BritishAirways/A35K_T.dds b/Simobjects/Airplanes/A35K/texture.BAW-BritishAirways/A35K_T.dds
deleted file mode 100644
index 10f9506..0000000
Binary files a/Simobjects/Airplanes/A35K/texture.BAW-BritishAirways/A35K_T.dds and /dev/null differ
diff --git a/Simobjects/Airplanes/A35K/texture.BAW-BritishAirways/FSPXA351000_L.dds b/Simobjects/Airplanes/A35K/texture.BAW-BritishAirways/GEN_A351000_L.dds
similarity index 100%
rename from Simobjects/Airplanes/A35K/texture.BAW-BritishAirways/FSPXA351000_L.dds
rename to Simobjects/Airplanes/A35K/texture.BAW-BritishAirways/GEN_A351000_L.dds
diff --git a/Simobjects/Airplanes/A35K/texture.BAW-BritishAirways/FSPXA351000_T.dds b/Simobjects/Airplanes/A35K/texture.BAW-BritishAirways/GEN_A351000_T.dds
similarity index 100%
rename from Simobjects/Airplanes/A35K/texture.BAW-BritishAirways/FSPXA351000_T.dds
rename to Simobjects/Airplanes/A35K/texture.BAW-BritishAirways/GEN_A351000_T.dds
diff --git a/Simobjects/Airplanes/B742/aircraft.cfg b/Simobjects/Airplanes/B742/aircraft.cfg
index c30cb91..73eb621 100644
--- a/Simobjects/Airplanes/B742/aircraft.cfg
+++ b/Simobjects/Airplanes/B742/aircraft.cfg
@@ -1,6 +1,3 @@
-//// FAIB 747-200 GE FSX Aircraft.cfg version 1.0  FDE: Erez Werber////
-//// FLTSIM Sections go here ////
-
 [fltsim.0]
 title=BAvMM_B742_BAW_Landor_1976_G-BDXA
 sim=FAIB_7472
diff --git a/Simobjects/Airplanes/B744/model.FGE/FAIB_B7474F_GE.MDL b/Simobjects/Airplanes/B744/model.FGE/FAIB_B7474F_GE.MDL
deleted file mode 100644
index 0c7e8af..0000000
Binary files a/Simobjects/Airplanes/B744/model.FGE/FAIB_B7474F_GE.MDL and /dev/null differ
diff --git a/Simobjects/Airplanes/B744/model.FGE/model.cfg b/Simobjects/Airplanes/B744/model.FGE/model.cfg
deleted file mode 100644
index 1219b91..0000000
--- a/Simobjects/Airplanes/B744/model.FGE/model.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-[models]
-normal=FAIB_B7474F_GE
diff --git a/Simobjects/Airplanes/B744/model.FPW/FAIB_B7474F_PW.MDL b/Simobjects/Airplanes/B744/model.FPW/FAIB_B7474F_PW.MDL
deleted file mode 100644
index 836d89f..0000000
Binary files a/Simobjects/Airplanes/B744/model.FPW/FAIB_B7474F_PW.MDL and /dev/null differ
diff --git a/Simobjects/Airplanes/B744/model.FPW/model.cfg b/Simobjects/Airplanes/B744/model.FPW/model.cfg
deleted file mode 100644
index e90b8f0..0000000
--- a/Simobjects/Airplanes/B744/model.FPW/model.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-[models]
-normal=FAIB_B7474F_PW
diff --git a/Simobjects/Airplanes/B744/model.FRR/FAIB_B7474F_RR.MDL b/Simobjects/Airplanes/B744/model.FRR/FAIB_B7474F_RR.MDL
deleted file mode 100644
index 4517314..0000000
Binary files a/Simobjects/Airplanes/B744/model.FRR/FAIB_B7474F_RR.MDL and /dev/null differ
diff --git a/Simobjects/Airplanes/B744/model.FRR/model.cfg b/Simobjects/Airplanes/B744/model.FRR/model.cfg
deleted file mode 100644
index b7a5fea..0000000
--- a/Simobjects/Airplanes/B744/model.FRR/model.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-[models]
-normal=FAIB_B7474F_RR
diff --git a/Simobjects/Airplanes/B744/model.PW/FAIB_B7474_PW.MDL b/Simobjects/Airplanes/B744/model.PW/FAIB_B7474_PW.MDL
deleted file mode 100644
index 47d7548..0000000
Binary files a/Simobjects/Airplanes/B744/model.PW/FAIB_B7474_PW.MDL and /dev/null differ
diff --git a/Simobjects/Airplanes/B744/model.PW/model.cfg b/Simobjects/Airplanes/B744/model.PW/model.cfg
deleted file mode 100644
index c5f7a7d..0000000
--- a/Simobjects/Airplanes/B744/model.PW/model.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-[models]
-normal=FAIB_B7474_PW
\ No newline at end of file
diff --git a/Simobjects/Airplanes/B744/psd/FAIB_B7474_RR_T (Union Flag).psd b/Simobjects/Airplanes/B744/psd/FAIB_B7474_RR_T (Union Flag).psd
deleted file mode 100644
index 5477f50..0000000
Binary files a/Simobjects/Airplanes/B744/psd/FAIB_B7474_RR_T (Union Flag).psd and /dev/null differ
diff --git a/Simobjects/Airplanes/B744/psd/FAIB_B7474_RR_T.psd b/Simobjects/Airplanes/B744/psd/FAIB_B7474_RR_T.psd
deleted file mode 100644
index a43ad22..0000000
Binary files a/Simobjects/Airplanes/B744/psd/FAIB_B7474_RR_T.psd and /dev/null differ
diff --git a/Simobjects/Airplanes/B748/FAIB_7478.air b/Simobjects/Airplanes/B748/FAIB_7478.air
deleted file mode 100644
index bb66b49..0000000
Binary files a/Simobjects/Airplanes/B748/FAIB_7478.air and /dev/null differ
diff --git a/Simobjects/Airplanes/B748/model.NWF/FAIB_B7478_NWF.MDL b/Simobjects/Airplanes/B748/model.NWF/FAIB_B7478_NWF.MDL
deleted file mode 100644
index 3b77ada..0000000
Binary files a/Simobjects/Airplanes/B748/model.NWF/FAIB_B7478_NWF.MDL and /dev/null differ
diff --git a/Simobjects/Airplanes/B748/model.NWF/model.cfg b/Simobjects/Airplanes/B748/model.NWF/model.cfg
deleted file mode 100644
index 469c571..0000000
--- a/Simobjects/Airplanes/B748/model.NWF/model.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-[models]
-normal=FAIB_B7478_NWF
diff --git a/Simobjects/Airplanes/B748/model.fNWF/FAIB_B7478F_NWF.MDL b/Simobjects/Airplanes/B748/model.fNWF/FAIB_B7478F_NWF.MDL
deleted file mode 100644
index afcca66..0000000
Binary files a/Simobjects/Airplanes/B748/model.fNWF/FAIB_B7478F_NWF.MDL and /dev/null differ
diff --git a/Simobjects/Airplanes/B748/model.fNWF/model.cfg b/Simobjects/Airplanes/B748/model.fNWF/model.cfg
deleted file mode 100644
index fb5458f..0000000
--- a/Simobjects/Airplanes/B748/model.fNWF/model.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-[models]
-normal=FAIB_B7478F_NWF
\ No newline at end of file
diff --git a/Simobjects/Airplanes/B748/model/FAIB_B7478.MDL b/Simobjects/Airplanes/B748/model/FAIB_B7478.MDL
deleted file mode 100644
index 6e4ca93..0000000
Binary files a/Simobjects/Airplanes/B748/model/FAIB_B7478.MDL and /dev/null differ
diff --git a/Simobjects/Airplanes/B748/model/model.cfg b/Simobjects/Airplanes/B748/model/model.cfg
deleted file mode 100644
index 4b12d1a..0000000
--- a/Simobjects/Airplanes/B748/model/model.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-[models]
-normal=FAIB_B7478
diff --git a/Simobjects/Airplanes/B772/FSPXAI_B772v1.air b/Simobjects/Airplanes/B772/GEN_AI_B772.air
similarity index 100%
rename from Simobjects/Airplanes/B772/FSPXAI_B772v1.air
rename to Simobjects/Airplanes/B772/GEN_AI_B772.air
diff --git a/Simobjects/Airplanes/B772/Model.GE_M/FSPX_B777-200GE.mdl b/Simobjects/Airplanes/B772/Model.GE/GEN_AI_B772GE.mdl
similarity index 87%
rename from Simobjects/Airplanes/B772/Model.GE_M/FSPX_B777-200GE.mdl
rename to Simobjects/Airplanes/B772/Model.GE/GEN_AI_B772GE.mdl
index 60f28db..9db6899 100644
Binary files a/Simobjects/Airplanes/B772/Model.GE_M/FSPX_B777-200GE.mdl and b/Simobjects/Airplanes/B772/Model.GE/GEN_AI_B772GE.mdl differ
diff --git a/Simobjects/Airplanes/B772/Model.GE/model.cfg b/Simobjects/Airplanes/B772/Model.GE/model.cfg
new file mode 100644
index 0000000..bf3c218
--- /dev/null
+++ b/Simobjects/Airplanes/B772/Model.GE/model.cfg
@@ -0,0 +1,2 @@
+[models]
+normal=GEN_AI_B772GE
\ No newline at end of file
diff --git a/Simobjects/Airplanes/B772/Model.GE_M/model.cfg b/Simobjects/Airplanes/B772/Model.GE_M/model.cfg
deleted file mode 100644
index fc8f049..0000000
--- a/Simobjects/Airplanes/B772/Model.GE_M/model.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-[models]
-normal=FSPX_B777-200GE
\ No newline at end of file
diff --git a/Simobjects/Airplanes/B772/Model.GE_M_Xcon/FSPX_B777-200GE_Xcon.mdl b/Simobjects/Airplanes/B772/Model.GE_M_Xcon/FSPX_B777-200GE_Xcon.mdl
deleted file mode 100644
index de7b4ed..0000000
Binary files a/Simobjects/Airplanes/B772/Model.GE_M_Xcon/FSPX_B777-200GE_Xcon.mdl and /dev/null differ
diff --git a/Simobjects/Airplanes/B772/Model.GE_M_Xcon/model.cfg b/Simobjects/Airplanes/B772/Model.GE_M_Xcon/model.cfg
deleted file mode 100644
index dbb4fc3..0000000
--- a/Simobjects/Airplanes/B772/Model.GE_M_Xcon/model.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-[models]
-normal=FSPX_B777-200GE_Xcon
\ No newline at end of file
diff --git a/Simobjects/Airplanes/B772/Model.RR_M/FSPX_B777-200RR.mdl b/Simobjects/Airplanes/B772/Model.RR/GEN_AI_B772RR.mdl
similarity index 87%
rename from Simobjects/Airplanes/B772/Model.RR_M/FSPX_B777-200RR.mdl
rename to Simobjects/Airplanes/B772/Model.RR/GEN_AI_B772RR.mdl
index 464f30a..335b40e 100644
Binary files a/Simobjects/Airplanes/B772/Model.RR_M/FSPX_B777-200RR.mdl and b/Simobjects/Airplanes/B772/Model.RR/GEN_AI_B772RR.mdl differ
diff --git a/Simobjects/Airplanes/B772/Model.RR/model.cfg b/Simobjects/Airplanes/B772/Model.RR/model.cfg
new file mode 100644
index 0000000..d612760
--- /dev/null
+++ b/Simobjects/Airplanes/B772/Model.RR/model.cfg
@@ -0,0 +1,2 @@
+[models]
+normal=GEN_AI_B772RR
\ No newline at end of file
diff --git a/Simobjects/Airplanes/B772/Model.RR_M/model.cfg b/Simobjects/Airplanes/B772/Model.RR_M/model.cfg
deleted file mode 100644
index 68c71ce..0000000
--- a/Simobjects/Airplanes/B772/Model.RR_M/model.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-[models]
-normal=FSPX_B777-200RR
\ No newline at end of file
diff --git a/Simobjects/Airplanes/B772/Model.RR_M_Xcon/FSPX_B777-200RR_Xcon.mdl b/Simobjects/Airplanes/B772/Model.RR_M_Xcon/FSPX_B777-200RR_Xcon.mdl
deleted file mode 100644
index 0365247..0000000
Binary files a/Simobjects/Airplanes/B772/Model.RR_M_Xcon/FSPX_B777-200RR_Xcon.mdl and /dev/null differ
diff --git a/Simobjects/Airplanes/B772/Model.RR_M_Xcon/model.cfg b/Simobjects/Airplanes/B772/Model.RR_M_Xcon/model.cfg
deleted file mode 100644
index 18faf1f..0000000
--- a/Simobjects/Airplanes/B772/Model.RR_M_Xcon/model.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-[models]
-normal=FSPX_B777-200RR_Xcon
\ No newline at end of file
diff --git a/Simobjects/Airplanes/B772/aircraft.cfg b/Simobjects/Airplanes/B772/aircraft.cfg
index a8878c5..3134985 100644
--- a/Simobjects/Airplanes/B772/aircraft.cfg
+++ b/Simobjects/Airplanes/B772/aircraft.cfg
@@ -1,7 +1,7 @@
 [fltsim.0]
 title=BAvMM_B772_BAW_G-VIIY
-sim=FSPXAI_B772v1
-model=GE_M
+sim=GEN_AI_B772
+model=GE
 texture=BAW_VIIY
 atc_airline=Speedbird
 atc_heavy=1
@@ -13,8 +13,8 @@ atc_parking_types=GATE
 
 [fltsim.1]
 title=BAvMM_B772_BAW_G-VIIL
-sim=FSPXAI_B772v1
-model=GE_M
+sim=GEN_AI_B772
+model=GE
 texture=BAW_VIIL
 atc_airline=Speedbird
 atc_heavy=1
@@ -26,8 +26,8 @@ atc_parking_types=GATE
 
 [fltsim.2]
 title=BAvMM_B772_BAW_G-VIIM
-sim=FSPXAI_B772v1
-model=GE_M
+sim=GEN_AI_B772
+model=GE
 texture=BAW_VIIM
 atc_airline=Speedbird
 atc_heavy=1
@@ -39,8 +39,8 @@ atc_parking_types=GATE
 
 [fltsim.3]
 title=BAvMM_B772_BAW_G-VIIT
-sim=FSPXAI_B772v1
-model=GE_M
+sim=GEN_AI_B772
+model=GE
 texture=BAW_VIIT
 atc_airline=Speedbird
 atc_heavy=1
@@ -52,8 +52,8 @@ atc_parking_types=GATE
 
 [fltsim.4]
 title=BAvMM_B772_BAW_G-VIIO
-sim=FSPXAI_B772v1
-model=GE_M
+sim=GEN_AI_B772
+model=GE
 texture=BAW_VIIO
 atc_airline=Speedbird
 atc_heavy=1
@@ -65,8 +65,8 @@ atc_parking_types=GATE
 
 [fltsim.5]
 title=BAvMM_B772_BAW_G-VIIR
-sim=FSPXAI_B772v1
-model=GE_M
+sim=GEN_AI_B772
+model=GE
 texture=BAW_VIIR
 atc_airline=Speedbird
 atc_heavy=1
@@ -78,8 +78,8 @@ atc_parking_types=GATE
 
 [fltsim.6]
 title=BAvMM_B772_BAW_G-YMMG
-sim=FSPXAI_B772v1
-model=RR_M
+sim=GEN_AI_B772
+model=RR
 texture=BAW_YMMG
 atc_airline=Speedbird
 atc_heavy=1
@@ -91,8 +91,8 @@ atc_parking_types=GATE
 
 [fltsim.7]
 title=BAvMM_B772_BAW_G-YMMB
-sim=FSPXAI_B772v1
-model=RR_M
+sim=GEN_AI_B772
+model=RR
 texture=BAW_YMMB
 atc_airline=Speedbird
 atc_heavy=1
@@ -104,8 +104,8 @@ atc_parking_types=GATE
 
 [fltsim.8]
 title=BAvMM_B772_BAW_G-YMMI
-sim=FSPXAI_B772v1
-model=RR_M
+sim=GEN_AI_B772
+model=RR
 texture=BAW_YMMC
 atc_airline=Speedbird
 atc_heavy=1
@@ -117,8 +117,8 @@ atc_parking_types=GATE
 
 [fltsim.9]
 title=BAvMM_B772_BAW_G-YMML
-sim=FSPXAI_B772v1
-model=RR_M
+sim=GEN_AI_B772
+model=RR
 texture=BAW_YMML
 atc_airline=Speedbird
 atc_heavy=1
@@ -130,8 +130,8 @@ atc_parking_types=GATE
 
 [fltsim.10]
 title=BAvMM_B772_BAW_G-YMMD
-sim=FSPXAI_B772v1
-model=RR_M
+sim=GEN_AI_B772
+model=RR
 texture=BAW_YMMD
 atc_airline=Speedbird
 atc_heavy=1
@@ -143,8 +143,8 @@ atc_parking_types=GATE
 
 [fltsim.11]
 title=BAvMM_B772_BAW_G-YMMF
-sim=FSPXAI_B772v1
-model=RR_M
+sim=GEN_AI_B772
+model=RR
 texture=BAW_YMMF
 atc_airline=Speedbird
 atc_heavy=1
@@ -156,8 +156,8 @@ atc_parking_types=GATE
 
 [fltsim.12]
 title=BAvMM_B772_BAW_G-YMMC
-sim=FSPXAI_B772v1
-model=RR_M
+sim=GEN_AI_B772
+model=RR
 texture=BAW_YMMC
 atc_airline=Speedbird
 atc_heavy=1
diff --git a/Simobjects/Airplanes/B772/texture.BAW_VIIL/FSPXAI_B77200_ANTENNAS.dds b/Simobjects/Airplanes/B772/texture.BAW_VIIL/GEN_AI_B77200_ANTENNAS.dds
similarity index 100%
rename from Simobjects/Airplanes/B772/texture.BAW_VIIL/FSPXAI_B77200_ANTENNAS.dds
rename to Simobjects/Airplanes/B772/texture.BAW_VIIL/GEN_AI_B77200_ANTENNAS.dds
diff --git a/Simobjects/Airplanes/B772/texture.BAW_VIIL/FSPXAI_B77200_X.dds b/Simobjects/Airplanes/B772/texture.BAW_VIIL/GEN_AI_B77200_X.dds
similarity index 100%
rename from Simobjects/Airplanes/B772/texture.BAW_VIIL/FSPXAI_B77200_X.dds
rename to Simobjects/Airplanes/B772/texture.BAW_VIIL/GEN_AI_B77200_X.dds
diff --git a/Simobjects/Airplanes/B772/texture.BAW_VIIL/FSPXAI_B772GE.dds b/Simobjects/Airplanes/B772/texture.BAW_VIIL/GEN_AI_B772GE.dds
similarity index 100%
rename from Simobjects/Airplanes/B772/texture.BAW_VIIL/FSPXAI_B772GE.dds
rename to Simobjects/Airplanes/B772/texture.BAW_VIIL/GEN_AI_B772GE.dds
diff --git a/Simobjects/Airplanes/B772/texture.BAW_VIIL/FSPXAI_B772GE_L.dds b/Simobjects/Airplanes/B772/texture.BAW_VIIL/GEN_AI_B772GE_L.dds
similarity index 100%
rename from Simobjects/Airplanes/B772/texture.BAW_VIIL/FSPXAI_B772GE_L.dds
rename to Simobjects/Airplanes/B772/texture.BAW_VIIL/GEN_AI_B772GE_L.dds
diff --git a/Simobjects/Airplanes/B772/texture.BAW_VIIL/texture.cfg b/Simobjects/Airplanes/B772/texture.BAW_VIIL/texture.cfg
deleted file mode 100644
index 164bbd6..0000000
--- a/Simobjects/Airplanes/B772/texture.BAW_VIIL/texture.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-[fltsim]
-fallback.1=..\..\AI_FSPX_Textures
-fallback.2=..\..\..\AI_FSPX_Textures
-fallback.3=..\..\..\..\AI_FSPX_Textures
\ No newline at end of file
diff --git a/Simobjects/Airplanes/B772/texture.BAW_VIIM/FSPXAI_B77200_ANTENNAS.dds b/Simobjects/Airplanes/B772/texture.BAW_VIIM/GEN_AI_B77200_ANTENNAS.dds
similarity index 100%
rename from Simobjects/Airplanes/B772/texture.BAW_VIIM/FSPXAI_B77200_ANTENNAS.dds
rename to Simobjects/Airplanes/B772/texture.BAW_VIIM/GEN_AI_B77200_ANTENNAS.dds
diff --git a/Simobjects/Airplanes/B772/texture.BAW_VIIM/FSPXAI_B77200_X.dds b/Simobjects/Airplanes/B772/texture.BAW_VIIM/GEN_AI_B77200_X.dds
similarity index 100%
rename from Simobjects/Airplanes/B772/texture.BAW_VIIM/FSPXAI_B77200_X.dds
rename to Simobjects/Airplanes/B772/texture.BAW_VIIM/GEN_AI_B77200_X.dds
diff --git a/Simobjects/Airplanes/B772/texture.BAW_VIIM/FSPXAI_B772GE.dds b/Simobjects/Airplanes/B772/texture.BAW_VIIM/GEN_AI_B772GE.dds
similarity index 100%
rename from Simobjects/Airplanes/B772/texture.BAW_VIIM/FSPXAI_B772GE.dds
rename to Simobjects/Airplanes/B772/texture.BAW_VIIM/GEN_AI_B772GE.dds
diff --git a/Simobjects/Airplanes/B772/texture.BAW_VIIM/FSPXAI_B772GE_L.dds b/Simobjects/Airplanes/B772/texture.BAW_VIIM/GEN_AI_B772GE_L.dds
similarity index 100%
rename from Simobjects/Airplanes/B772/texture.BAW_VIIM/FSPXAI_B772GE_L.dds
rename to Simobjects/Airplanes/B772/texture.BAW_VIIM/GEN_AI_B772GE_L.dds
diff --git a/Simobjects/Airplanes/B772/texture.BAW_VIIM/texture.cfg b/Simobjects/Airplanes/B772/texture.BAW_VIIM/texture.cfg
deleted file mode 100644
index 164bbd6..0000000
--- a/Simobjects/Airplanes/B772/texture.BAW_VIIM/texture.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-[fltsim]
-fallback.1=..\..\AI_FSPX_Textures
-fallback.2=..\..\..\AI_FSPX_Textures
-fallback.3=..\..\..\..\AI_FSPX_Textures
\ No newline at end of file
diff --git a/Simobjects/Airplanes/B772/texture.BAW_VIIO/FSPXAI_B77200_ANTENNAS.dds b/Simobjects/Airplanes/B772/texture.BAW_VIIO/GEN_AI_B77200_ANTENNAS.dds
similarity index 100%
rename from Simobjects/Airplanes/B772/texture.BAW_VIIO/FSPXAI_B77200_ANTENNAS.dds
rename to Simobjects/Airplanes/B772/texture.BAW_VIIO/GEN_AI_B77200_ANTENNAS.dds
diff --git a/Simobjects/Airplanes/B772/texture.BAW_VIIO/FSPXAI_B77200_X.dds b/Simobjects/Airplanes/B772/texture.BAW_VIIO/GEN_AI_B77200_X.dds
similarity index 100%
rename from Simobjects/Airplanes/B772/texture.BAW_VIIO/FSPXAI_B77200_X.dds
rename to Simobjects/Airplanes/B772/texture.BAW_VIIO/GEN_AI_B77200_X.dds
diff --git a/Simobjects/Airplanes/B772/texture.BAW_VIIO/FSPXAI_B772GE.dds b/Simobjects/Airplanes/B772/texture.BAW_VIIO/GEN_AI_B772GE.dds
similarity index 100%
rename from Simobjects/Airplanes/B772/texture.BAW_VIIO/FSPXAI_B772GE.dds
rename to Simobjects/Airplanes/B772/texture.BAW_VIIO/GEN_AI_B772GE.dds
diff --git a/Simobjects/Airplanes/B772/texture.BAW_VIIO/FSPXAI_B772GE_L.dds b/Simobjects/Airplanes/B772/texture.BAW_VIIO/GEN_AI_B772GE_L.dds
similarity index 100%
rename from Simobjects/Airplanes/B772/texture.BAW_VIIO/FSPXAI_B772GE_L.dds
rename to Simobjects/Airplanes/B772/texture.BAW_VIIO/GEN_AI_B772GE_L.dds
diff --git a/Simobjects/Airplanes/B772/texture.BAW_VIIO/texture.cfg b/Simobjects/Airplanes/B772/texture.BAW_VIIO/texture.cfg
deleted file mode 100644
index 164bbd6..0000000
--- a/Simobjects/Airplanes/B772/texture.BAW_VIIO/texture.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-[fltsim]
-fallback.1=..\..\AI_FSPX_Textures
-fallback.2=..\..\..\AI_FSPX_Textures
-fallback.3=..\..\..\..\AI_FSPX_Textures
\ No newline at end of file
diff --git a/Simobjects/Airplanes/B772/texture.BAW_VIIR/FSPXAI_B77200_ANTENNAS.dds b/Simobjects/Airplanes/B772/texture.BAW_VIIR/GEN_AI_B77200_ANTENNAS.dds
similarity index 100%
rename from Simobjects/Airplanes/B772/texture.BAW_VIIR/FSPXAI_B77200_ANTENNAS.dds
rename to Simobjects/Airplanes/B772/texture.BAW_VIIR/GEN_AI_B77200_ANTENNAS.dds
diff --git a/Simobjects/Airplanes/B772/texture.BAW_VIIR/FSPXAI_B77200_X.dds b/Simobjects/Airplanes/B772/texture.BAW_VIIR/GEN_AI_B77200_X.dds
similarity index 100%
rename from Simobjects/Airplanes/B772/texture.BAW_VIIR/FSPXAI_B77200_X.dds
rename to Simobjects/Airplanes/B772/texture.BAW_VIIR/GEN_AI_B77200_X.dds
diff --git a/Simobjects/Airplanes/B772/texture.BAW_VIIR/FSPXAI_B772GE.dds b/Simobjects/Airplanes/B772/texture.BAW_VIIR/GEN_AI_B772GE.dds
similarity index 100%
rename from Simobjects/Airplanes/B772/texture.BAW_VIIR/FSPXAI_B772GE.dds
rename to Simobjects/Airplanes/B772/texture.BAW_VIIR/GEN_AI_B772GE.dds
diff --git a/Simobjects/Airplanes/B772/texture.BAW_VIIR/FSPXAI_B772GE_L.dds b/Simobjects/Airplanes/B772/texture.BAW_VIIR/GEN_AI_B772GE_L.dds
similarity index 100%
rename from Simobjects/Airplanes/B772/texture.BAW_VIIR/FSPXAI_B772GE_L.dds
rename to Simobjects/Airplanes/B772/texture.BAW_VIIR/GEN_AI_B772GE_L.dds
diff --git a/Simobjects/Airplanes/B772/texture.BAW_VIIR/texture.cfg b/Simobjects/Airplanes/B772/texture.BAW_VIIR/texture.cfg
deleted file mode 100644
index 164bbd6..0000000
--- a/Simobjects/Airplanes/B772/texture.BAW_VIIR/texture.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-[fltsim]
-fallback.1=..\..\AI_FSPX_Textures
-fallback.2=..\..\..\AI_FSPX_Textures
-fallback.3=..\..\..\..\AI_FSPX_Textures
\ No newline at end of file
diff --git a/Simobjects/Airplanes/B772/texture.BAW_VIIT/FSPXAI_B77200_ANTENNAS.dds b/Simobjects/Airplanes/B772/texture.BAW_VIIT/GEN_AI_B77200_ANTENNAS.dds
similarity index 100%
rename from Simobjects/Airplanes/B772/texture.BAW_VIIT/FSPXAI_B77200_ANTENNAS.dds
rename to Simobjects/Airplanes/B772/texture.BAW_VIIT/GEN_AI_B77200_ANTENNAS.dds
diff --git a/Simobjects/Airplanes/B772/texture.BAW_VIIT/FSPXAI_B77200_X.dds b/Simobjects/Airplanes/B772/texture.BAW_VIIT/GEN_AI_B77200_X.dds
similarity index 100%
rename from Simobjects/Airplanes/B772/texture.BAW_VIIT/FSPXAI_B77200_X.dds
rename to Simobjects/Airplanes/B772/texture.BAW_VIIT/GEN_AI_B77200_X.dds
diff --git a/Simobjects/Airplanes/B772/texture.BAW_VIIT/FSPXAI_B772GE.dds b/Simobjects/Airplanes/B772/texture.BAW_VIIT/GEN_AI_B772GE.dds
similarity index 100%
rename from Simobjects/Airplanes/B772/texture.BAW_VIIT/FSPXAI_B772GE.dds
rename to Simobjects/Airplanes/B772/texture.BAW_VIIT/GEN_AI_B772GE.dds
diff --git a/Simobjects/Airplanes/B772/texture.BAW_VIIT/FSPXAI_B772GE_L.dds b/Simobjects/Airplanes/B772/texture.BAW_VIIT/GEN_AI_B772GE_L.dds
similarity index 100%
rename from Simobjects/Airplanes/B772/texture.BAW_VIIT/FSPXAI_B772GE_L.dds
rename to Simobjects/Airplanes/B772/texture.BAW_VIIT/GEN_AI_B772GE_L.dds
diff --git a/Simobjects/Airplanes/B772/texture.BAW_VIIT/texture.cfg b/Simobjects/Airplanes/B772/texture.BAW_VIIT/texture.cfg
deleted file mode 100644
index 164bbd6..0000000
--- a/Simobjects/Airplanes/B772/texture.BAW_VIIT/texture.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-[fltsim]
-fallback.1=..\..\AI_FSPX_Textures
-fallback.2=..\..\..\AI_FSPX_Textures
-fallback.3=..\..\..\..\AI_FSPX_Textures
\ No newline at end of file
diff --git a/Simobjects/Airplanes/B772/texture.BAW_VIIY/FSPXAI_B77200_ANTENNAS.dds b/Simobjects/Airplanes/B772/texture.BAW_VIIY/GEN_AI_B77200_ANTENNAS.dds
similarity index 100%
rename from Simobjects/Airplanes/B772/texture.BAW_VIIY/FSPXAI_B77200_ANTENNAS.dds
rename to Simobjects/Airplanes/B772/texture.BAW_VIIY/GEN_AI_B77200_ANTENNAS.dds
diff --git a/Simobjects/Airplanes/B772/texture.BAW_VIIY/FSPXAI_B77200_X.dds b/Simobjects/Airplanes/B772/texture.BAW_VIIY/GEN_AI_B77200_X.dds
similarity index 100%
rename from Simobjects/Airplanes/B772/texture.BAW_VIIY/FSPXAI_B77200_X.dds
rename to Simobjects/Airplanes/B772/texture.BAW_VIIY/GEN_AI_B77200_X.dds
diff --git a/Simobjects/Airplanes/B772/texture.BAW_VIIY/FSPXAI_B772GE.dds b/Simobjects/Airplanes/B772/texture.BAW_VIIY/GEN_AI_B772GE.dds
similarity index 100%
rename from Simobjects/Airplanes/B772/texture.BAW_VIIY/FSPXAI_B772GE.dds
rename to Simobjects/Airplanes/B772/texture.BAW_VIIY/GEN_AI_B772GE.dds
diff --git a/Simobjects/Airplanes/B772/texture.BAW_VIIY/FSPXAI_B772GE_L.dds b/Simobjects/Airplanes/B772/texture.BAW_VIIY/GEN_AI_B772GE_L.dds
similarity index 100%
rename from Simobjects/Airplanes/B772/texture.BAW_VIIY/FSPXAI_B772GE_L.dds
rename to Simobjects/Airplanes/B772/texture.BAW_VIIY/GEN_AI_B772GE_L.dds
diff --git a/Simobjects/Airplanes/B772/texture.BAW_VIIY/texture.cfg b/Simobjects/Airplanes/B772/texture.BAW_VIIY/texture.cfg
deleted file mode 100644
index 164bbd6..0000000
--- a/Simobjects/Airplanes/B772/texture.BAW_VIIY/texture.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-[fltsim]
-fallback.1=..\..\AI_FSPX_Textures
-fallback.2=..\..\..\AI_FSPX_Textures
-fallback.3=..\..\..\..\AI_FSPX_Textures
\ No newline at end of file
diff --git a/Simobjects/Airplanes/B772/texture.BAW_YMMB/FSPXAI_B77200_ANTENNAS.dds b/Simobjects/Airplanes/B772/texture.BAW_YMMB/GEN_AI_B77200_ANTENNAS.dds
similarity index 100%
rename from Simobjects/Airplanes/B772/texture.BAW_YMMB/FSPXAI_B77200_ANTENNAS.dds
rename to Simobjects/Airplanes/B772/texture.BAW_YMMB/GEN_AI_B77200_ANTENNAS.dds
diff --git a/Simobjects/Airplanes/B772/texture.BAW_YMMB/FSPXAI_B77200_X.dds b/Simobjects/Airplanes/B772/texture.BAW_YMMB/GEN_AI_B77200_X.dds
similarity index 100%
rename from Simobjects/Airplanes/B772/texture.BAW_YMMB/FSPXAI_B77200_X.dds
rename to Simobjects/Airplanes/B772/texture.BAW_YMMB/GEN_AI_B77200_X.dds
diff --git a/Simobjects/Airplanes/B772/texture.BAW_YMMB/FSPXAI_B772RR.dds b/Simobjects/Airplanes/B772/texture.BAW_YMMB/GEN_AI_B772RR.dds
similarity index 100%
rename from Simobjects/Airplanes/B772/texture.BAW_YMMB/FSPXAI_B772RR.dds
rename to Simobjects/Airplanes/B772/texture.BAW_YMMB/GEN_AI_B772RR.dds
diff --git a/Simobjects/Airplanes/B772/texture.BAW_YMMB/FSPXAI_B772RR_L.dds b/Simobjects/Airplanes/B772/texture.BAW_YMMB/GEN_AI_B772RR_L.dds
similarity index 100%
rename from Simobjects/Airplanes/B772/texture.BAW_YMMB/FSPXAI_B772RR_L.dds
rename to Simobjects/Airplanes/B772/texture.BAW_YMMB/GEN_AI_B772RR_L.dds
diff --git a/Simobjects/Airplanes/B772/texture.BAW_YMMB/texture.cfg b/Simobjects/Airplanes/B772/texture.BAW_YMMB/texture.cfg
deleted file mode 100644
index 164bbd6..0000000
--- a/Simobjects/Airplanes/B772/texture.BAW_YMMB/texture.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-[fltsim]
-fallback.1=..\..\AI_FSPX_Textures
-fallback.2=..\..\..\AI_FSPX_Textures
-fallback.3=..\..\..\..\AI_FSPX_Textures
\ No newline at end of file
diff --git a/Simobjects/Airplanes/B772/texture.BAW_YMMC/FSPXAI_B77200_ANTENNAS.dds b/Simobjects/Airplanes/B772/texture.BAW_YMMC/GEN_AI_B77200_ANTENNAS.dds
similarity index 100%
rename from Simobjects/Airplanes/B772/texture.BAW_YMMC/FSPXAI_B77200_ANTENNAS.dds
rename to Simobjects/Airplanes/B772/texture.BAW_YMMC/GEN_AI_B77200_ANTENNAS.dds
diff --git a/Simobjects/Airplanes/B772/texture.BAW_YMMC/FSPXAI_B77200_X.dds b/Simobjects/Airplanes/B772/texture.BAW_YMMC/GEN_AI_B77200_X.dds
similarity index 100%
rename from Simobjects/Airplanes/B772/texture.BAW_YMMC/FSPXAI_B77200_X.dds
rename to Simobjects/Airplanes/B772/texture.BAW_YMMC/GEN_AI_B77200_X.dds
diff --git a/Simobjects/Airplanes/B772/texture.BAW_YMMC/FSPXAI_B772RR.dds b/Simobjects/Airplanes/B772/texture.BAW_YMMC/GEN_AI_B772RR.dds
similarity index 100%
rename from Simobjects/Airplanes/B772/texture.BAW_YMMC/FSPXAI_B772RR.dds
rename to Simobjects/Airplanes/B772/texture.BAW_YMMC/GEN_AI_B772RR.dds
diff --git a/Simobjects/Airplanes/B772/texture.BAW_YMMC/FSPXAI_B772RR_L.dds b/Simobjects/Airplanes/B772/texture.BAW_YMMC/GEN_AI_B772RR_L.dds
similarity index 100%
rename from Simobjects/Airplanes/B772/texture.BAW_YMMC/FSPXAI_B772RR_L.dds
rename to Simobjects/Airplanes/B772/texture.BAW_YMMC/GEN_AI_B772RR_L.dds
diff --git a/Simobjects/Airplanes/B772/texture.BAW_YMMC/texture.cfg b/Simobjects/Airplanes/B772/texture.BAW_YMMC/texture.cfg
deleted file mode 100644
index 164bbd6..0000000
--- a/Simobjects/Airplanes/B772/texture.BAW_YMMC/texture.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-[fltsim]
-fallback.1=..\..\AI_FSPX_Textures
-fallback.2=..\..\..\AI_FSPX_Textures
-fallback.3=..\..\..\..\AI_FSPX_Textures
\ No newline at end of file
diff --git a/Simobjects/Airplanes/B772/texture.BAW_YMMD/FSPXAI_B77200_ANTENNAS.dds b/Simobjects/Airplanes/B772/texture.BAW_YMMD/GEN_AI_B77200_ANTENNAS.dds
similarity index 100%
rename from Simobjects/Airplanes/B772/texture.BAW_YMMD/FSPXAI_B77200_ANTENNAS.dds
rename to Simobjects/Airplanes/B772/texture.BAW_YMMD/GEN_AI_B77200_ANTENNAS.dds
diff --git a/Simobjects/Airplanes/B772/texture.BAW_YMMD/FSPXAI_B77200_X.dds b/Simobjects/Airplanes/B772/texture.BAW_YMMD/GEN_AI_B77200_X.dds
similarity index 100%
rename from Simobjects/Airplanes/B772/texture.BAW_YMMD/FSPXAI_B77200_X.dds
rename to Simobjects/Airplanes/B772/texture.BAW_YMMD/GEN_AI_B77200_X.dds
diff --git a/Simobjects/Airplanes/B772/texture.BAW_YMMD/FSPXAI_B772RR.dds b/Simobjects/Airplanes/B772/texture.BAW_YMMD/GEN_AI_B772RR.dds
similarity index 100%
rename from Simobjects/Airplanes/B772/texture.BAW_YMMD/FSPXAI_B772RR.dds
rename to Simobjects/Airplanes/B772/texture.BAW_YMMD/GEN_AI_B772RR.dds
diff --git a/Simobjects/Airplanes/B772/texture.BAW_YMMD/FSPXAI_B772RR_L.dds b/Simobjects/Airplanes/B772/texture.BAW_YMMD/GEN_AI_B772RR_L.dds
similarity index 100%
rename from Simobjects/Airplanes/B772/texture.BAW_YMMD/FSPXAI_B772RR_L.dds
rename to Simobjects/Airplanes/B772/texture.BAW_YMMD/GEN_AI_B772RR_L.dds
diff --git a/Simobjects/Airplanes/B772/texture.BAW_YMMD/texture.cfg b/Simobjects/Airplanes/B772/texture.BAW_YMMD/texture.cfg
deleted file mode 100644
index 164bbd6..0000000
--- a/Simobjects/Airplanes/B772/texture.BAW_YMMD/texture.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-[fltsim]
-fallback.1=..\..\AI_FSPX_Textures
-fallback.2=..\..\..\AI_FSPX_Textures
-fallback.3=..\..\..\..\AI_FSPX_Textures
\ No newline at end of file
diff --git a/Simobjects/Airplanes/B772/texture.BAW_YMMF/FSPXAI_B77200_ANTENNAS.dds b/Simobjects/Airplanes/B772/texture.BAW_YMMF/GEN_AI_B77200_ANTENNAS.dds
similarity index 100%
rename from Simobjects/Airplanes/B772/texture.BAW_YMMF/FSPXAI_B77200_ANTENNAS.dds
rename to Simobjects/Airplanes/B772/texture.BAW_YMMF/GEN_AI_B77200_ANTENNAS.dds
diff --git a/Simobjects/Airplanes/B772/texture.BAW_YMMF/FSPXAI_B77200_X.dds b/Simobjects/Airplanes/B772/texture.BAW_YMMF/GEN_AI_B77200_X.dds
similarity index 100%
rename from Simobjects/Airplanes/B772/texture.BAW_YMMF/FSPXAI_B77200_X.dds
rename to Simobjects/Airplanes/B772/texture.BAW_YMMF/GEN_AI_B77200_X.dds
diff --git a/Simobjects/Airplanes/B772/texture.BAW_YMMF/FSPXAI_B772RR.dds b/Simobjects/Airplanes/B772/texture.BAW_YMMF/GEN_AI_B772RR.dds
similarity index 100%
rename from Simobjects/Airplanes/B772/texture.BAW_YMMF/FSPXAI_B772RR.dds
rename to Simobjects/Airplanes/B772/texture.BAW_YMMF/GEN_AI_B772RR.dds
diff --git a/Simobjects/Airplanes/B772/texture.BAW_YMMF/FSPXAI_B772RR_L.dds b/Simobjects/Airplanes/B772/texture.BAW_YMMF/GEN_AI_B772RR_L.dds
similarity index 100%
rename from Simobjects/Airplanes/B772/texture.BAW_YMMF/FSPXAI_B772RR_L.dds
rename to Simobjects/Airplanes/B772/texture.BAW_YMMF/GEN_AI_B772RR_L.dds
diff --git a/Simobjects/Airplanes/B772/texture.BAW_YMMF/texture.cfg b/Simobjects/Airplanes/B772/texture.BAW_YMMF/texture.cfg
deleted file mode 100644
index 164bbd6..0000000
--- a/Simobjects/Airplanes/B772/texture.BAW_YMMF/texture.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-[fltsim]
-fallback.1=..\..\AI_FSPX_Textures
-fallback.2=..\..\..\AI_FSPX_Textures
-fallback.3=..\..\..\..\AI_FSPX_Textures
\ No newline at end of file
diff --git a/Simobjects/Airplanes/B772/texture.BAW_YMMG/FSPXAI_B77200_ANTENNAS.dds b/Simobjects/Airplanes/B772/texture.BAW_YMMG/GEN_AI_B77200_ANTENNAS.dds
similarity index 100%
rename from Simobjects/Airplanes/B772/texture.BAW_YMMG/FSPXAI_B77200_ANTENNAS.dds
rename to Simobjects/Airplanes/B772/texture.BAW_YMMG/GEN_AI_B77200_ANTENNAS.dds
diff --git a/Simobjects/Airplanes/B772/texture.BAW_YMMG/FSPXAI_B77200_X.dds b/Simobjects/Airplanes/B772/texture.BAW_YMMG/GEN_AI_B77200_X.dds
similarity index 100%
rename from Simobjects/Airplanes/B772/texture.BAW_YMMG/FSPXAI_B77200_X.dds
rename to Simobjects/Airplanes/B772/texture.BAW_YMMG/GEN_AI_B77200_X.dds
diff --git a/Simobjects/Airplanes/B772/texture.BAW_YMMG/FSPXAI_B772RR.dds b/Simobjects/Airplanes/B772/texture.BAW_YMMG/GEN_AI_B772RR.dds
similarity index 100%
rename from Simobjects/Airplanes/B772/texture.BAW_YMMG/FSPXAI_B772RR.dds
rename to Simobjects/Airplanes/B772/texture.BAW_YMMG/GEN_AI_B772RR.dds
diff --git a/Simobjects/Airplanes/B772/texture.BAW_YMMG/FSPXAI_B772RR_L.dds b/Simobjects/Airplanes/B772/texture.BAW_YMMG/GEN_AI_B772RR_L.dds
similarity index 100%
rename from Simobjects/Airplanes/B772/texture.BAW_YMMG/FSPXAI_B772RR_L.dds
rename to Simobjects/Airplanes/B772/texture.BAW_YMMG/GEN_AI_B772RR_L.dds
diff --git a/Simobjects/Airplanes/B772/texture.BAW_YMMG/texture.cfg b/Simobjects/Airplanes/B772/texture.BAW_YMMG/texture.cfg
deleted file mode 100644
index 164bbd6..0000000
--- a/Simobjects/Airplanes/B772/texture.BAW_YMMG/texture.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-[fltsim]
-fallback.1=..\..\AI_FSPX_Textures
-fallback.2=..\..\..\AI_FSPX_Textures
-fallback.3=..\..\..\..\AI_FSPX_Textures
\ No newline at end of file
diff --git a/Simobjects/Airplanes/B772/texture.BAW_YMML/FSPXAI_B77200_ANTENNAS.dds b/Simobjects/Airplanes/B772/texture.BAW_YMML/GEN_AI_B77200_ANTENNAS.dds
similarity index 100%
rename from Simobjects/Airplanes/B772/texture.BAW_YMML/FSPXAI_B77200_ANTENNAS.dds
rename to Simobjects/Airplanes/B772/texture.BAW_YMML/GEN_AI_B77200_ANTENNAS.dds
diff --git a/Simobjects/Airplanes/B772/texture.BAW_YMML/FSPXAI_B77200_X.dds b/Simobjects/Airplanes/B772/texture.BAW_YMML/GEN_AI_B77200_X.dds
similarity index 100%
rename from Simobjects/Airplanes/B772/texture.BAW_YMML/FSPXAI_B77200_X.dds
rename to Simobjects/Airplanes/B772/texture.BAW_YMML/GEN_AI_B77200_X.dds
diff --git a/Simobjects/Airplanes/B772/texture.BAW_YMML/FSPXAI_B772RR.dds b/Simobjects/Airplanes/B772/texture.BAW_YMML/GEN_AI_B772RR.dds
similarity index 100%
rename from Simobjects/Airplanes/B772/texture.BAW_YMML/FSPXAI_B772RR.dds
rename to Simobjects/Airplanes/B772/texture.BAW_YMML/GEN_AI_B772RR.dds
diff --git a/Simobjects/Airplanes/B772/texture.BAW_YMML/FSPXAI_B772RR_L.dds b/Simobjects/Airplanes/B772/texture.BAW_YMML/GEN_AI_B772RR_L.dds
similarity index 100%
rename from Simobjects/Airplanes/B772/texture.BAW_YMML/FSPXAI_B772RR_L.dds
rename to Simobjects/Airplanes/B772/texture.BAW_YMML/GEN_AI_B772RR_L.dds
diff --git a/Simobjects/Airplanes/B772/texture.BAW_YMML/texture.cfg b/Simobjects/Airplanes/B772/texture.BAW_YMML/texture.cfg
deleted file mode 100644
index 164bbd6..0000000
--- a/Simobjects/Airplanes/B772/texture.BAW_YMML/texture.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-[fltsim]
-fallback.1=..\..\AI_FSPX_Textures
-fallback.2=..\..\..\AI_FSPX_Textures
-fallback.3=..\..\..\..\AI_FSPX_Textures
\ No newline at end of file
diff --git a/Simobjects/Airplanes/B77W/FSPXAI_B773v1.air b/Simobjects/Airplanes/B77W/GEN_AI_B773.air
similarity index 100%
rename from Simobjects/Airplanes/B77W/FSPXAI_B773v1.air
rename to Simobjects/Airplanes/B77W/GEN_AI_B773.air
diff --git a/Simobjects/Airplanes/B77W/Model.Xcon/FSPX_B777-300ER_Xcon.mdl b/Simobjects/Airplanes/B77W/Model.Xcon/FSPX_B777-300ER_Xcon.mdl
deleted file mode 100644
index 04c0521..0000000
Binary files a/Simobjects/Airplanes/B77W/Model.Xcon/FSPX_B777-300ER_Xcon.mdl and /dev/null differ
diff --git a/Simobjects/Airplanes/B77W/Model.Xcon/model.cfg b/Simobjects/Airplanes/B77W/Model.Xcon/model.cfg
deleted file mode 100644
index 23dc0d0..0000000
--- a/Simobjects/Airplanes/B77W/Model.Xcon/model.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-[models]
-normal=FSPX_B777-300ER_Xcon
\ No newline at end of file
diff --git a/Simobjects/Airplanes/B77W/Model/FSPX_B777-300ER.mdl b/Simobjects/Airplanes/B77W/Model/GEN_AI_B773ER.mdl
similarity index 85%
rename from Simobjects/Airplanes/B77W/Model/FSPX_B777-300ER.mdl
rename to Simobjects/Airplanes/B77W/Model/GEN_AI_B773ER.mdl
index 7a67635..f875bde 100644
Binary files a/Simobjects/Airplanes/B77W/Model/FSPX_B777-300ER.mdl and b/Simobjects/Airplanes/B77W/Model/GEN_AI_B773ER.mdl differ
diff --git a/Simobjects/Airplanes/B77W/Model/model.cfg b/Simobjects/Airplanes/B77W/Model/model.cfg
index 4ea1823..b17800e 100644
--- a/Simobjects/Airplanes/B77W/Model/model.cfg
+++ b/Simobjects/Airplanes/B77W/Model/model.cfg
@@ -1,2 +1,2 @@
 [models]
-normal=FSPX_B777-300ER
\ No newline at end of file
+normal=GEN_AI_B773ER
\ No newline at end of file
diff --git a/Simobjects/Airplanes/B77W/PSD/FSPXAI_B773ER.psd b/Simobjects/Airplanes/B77W/PSD/FSPXAI_B773ER.psd
deleted file mode 100644
index cc46a07..0000000
Binary files a/Simobjects/Airplanes/B77W/PSD/FSPXAI_B773ER.psd and /dev/null differ
diff --git a/Simobjects/Airplanes/B77W/aircraft.cfg b/Simobjects/Airplanes/B77W/aircraft.cfg
index 9767ac1..02112dd 100644
--- a/Simobjects/Airplanes/B77W/aircraft.cfg
+++ b/Simobjects/Airplanes/B77W/aircraft.cfg
@@ -1,6 +1,6 @@
 [fltsim.0]
 title=BAvMM_B77W_BAW_G-STBA
-sim=FSPXAI_B773v1
+sim=GEN_AI_B773
 model=
 texture=BAW_G-STBA_NC
 atc_airline=BAW
@@ -12,7 +12,7 @@ ui_type=B777-300ER
 
 [fltsim.1]
 title=BAvMM_B77W_BAW_G-STBB
-sim=FSPXAI_B773v1
+sim=GEN_AI_B773
 model=
 texture=BAW_G-STBB_NC
 atc_airline=BAW
@@ -24,7 +24,7 @@ ui_type=B777-300ER
 
 [fltsim.2]
 title=BAvMM_B77W_BAW_G-STBC
-sim=FSPXAI_B773v1
+sim=GEN_AI_B773
 model=
 texture=BAW_G-STBC_NC
 atc_airline=BAW
@@ -36,7 +36,7 @@ ui_type=B777-300ER
 
 [fltsim.3]
 title=BAvMM_B77W_BAW_G-STBD
-sim=FSPXAI_B773v1
+sim=GEN_AI_B773
 model=
 texture=BAW_G-STBD_NC
 atc_airline=BAW
@@ -48,7 +48,7 @@ ui_type=B777-300ER
 
 [fltsim.4]
 title=BAvMM_B77W_BAW_G-STBE
-sim=FSPXAI_B773v1
+sim=GEN_AI_B773
 model=
 texture=BAW_G-STBE_NC
 atc_airline=BAW
@@ -60,7 +60,7 @@ ui_type=B777-300ER
 
 [fltsim.5]
 title=BAvMM_B77W_BAW_G-STBF
-sim=FSPXAI_B773v1
+sim=GEN_AI_B773
 model=
 texture=BAW_G-STBF_NC
 atc_airline=BAW
@@ -72,7 +72,7 @@ ui_type=B777-300ER
 
 [fltsim.6]
 title=BAvMM_B77W_BAW_G-STBG
-sim=FSPXAI_B773v1
+sim=GEN_AI_B773
 model=
 texture=BAW_G-STBG
 atc_airline=BAW
@@ -84,7 +84,7 @@ ui_type=B777-300ER
 
 [fltsim.7]
 title=BAvMM_B77W_BAW_G-STBH
-sim=FSPXAI_B773v1
+sim=GEN_AI_B773
 model=
 texture=BAW_G-STBH
 atc_airline=BAW
@@ -96,7 +96,7 @@ ui_type=B777-300ER
 
 [fltsim.8]
 title=BAvMM_B77W_BAW_G-STBI
-sim=FSPXAI_B773v1
+sim=GEN_AI_B773
 model=
 texture=BAW_G-STBI
 atc_airline=BAW
@@ -108,7 +108,7 @@ ui_type=B777-300ER
 
 [fltsim.9]
 title=BAvMM_B77W_BAW_G-STBJ
-sim=FSPXAI_B773v1
+sim=GEN_AI_B773
 model=
 texture=BAW_G-STBJ
 atc_airline=BAW
@@ -120,7 +120,7 @@ ui_type=B777-300ER
 
 [fltsim.10]
 title=BAvMM_B77W_BAW_G-STBK
-sim=FSPXAI_B773v1
+sim=GEN_AI_B773
 model=
 texture=BAW_G-STBK_NEW
 atc_airline=BAW
@@ -132,7 +132,7 @@ ui_type=B777-300ER
 
 [fltsim.11]
 title=BAvMM_B77W_BAW_G-STBL
-sim=FSPXAI_B773v1
+sim=GEN_AI_B773
 model=
 texture=BAW_G-STBL_NEW
 atc_airline=BAW
@@ -158,7 +158,7 @@ electric_pump=0
 
 [General]
 atc_type=BOEING
-atc_model=B773
+atc_model=B77W
 editable=0
 performance=
 Category=airplane
diff --git a/Simobjects/Airplanes/B77W/texture.BAW_G-STBA_NC/FSPXAI_B77300_ANTENNAS.dds b/Simobjects/Airplanes/B77W/texture.BAW_G-STBA_NC/GEN_AI_B77300_ANTENNAS.dds
similarity index 100%
rename from Simobjects/Airplanes/B77W/texture.BAW_G-STBA_NC/FSPXAI_B77300_ANTENNAS.dds
rename to Simobjects/Airplanes/B77W/texture.BAW_G-STBA_NC/GEN_AI_B77300_ANTENNAS.dds
diff --git a/Simobjects/Airplanes/B77W/texture.BAW_G-STBA_NC/FSPXAI_B773ER.dds b/Simobjects/Airplanes/B77W/texture.BAW_G-STBA_NC/GEN_AI_B773ER.dds
similarity index 100%
rename from Simobjects/Airplanes/B77W/texture.BAW_G-STBA_NC/FSPXAI_B773ER.dds
rename to Simobjects/Airplanes/B77W/texture.BAW_G-STBA_NC/GEN_AI_B773ER.dds
diff --git a/Simobjects/Airplanes/B77W/texture.BAW_G-STBA_NC/FSPXAI_B773ER_L.dds b/Simobjects/Airplanes/B77W/texture.BAW_G-STBA_NC/GEN_AI_B773ER_L.dds
similarity index 100%
rename from Simobjects/Airplanes/B77W/texture.BAW_G-STBA_NC/FSPXAI_B773ER_L.dds
rename to Simobjects/Airplanes/B77W/texture.BAW_G-STBA_NC/GEN_AI_B773ER_L.dds
diff --git a/Simobjects/Airplanes/B77W/texture.BAW_G-STBA_NC/FSPXAI_B773ER_X.dds b/Simobjects/Airplanes/B77W/texture.BAW_G-STBA_NC/GEN_AI_B773ER_X.dds
similarity index 100%
rename from Simobjects/Airplanes/B77W/texture.BAW_G-STBA_NC/FSPXAI_B773ER_X.dds
rename to Simobjects/Airplanes/B77W/texture.BAW_G-STBA_NC/GEN_AI_B773ER_X.dds
diff --git a/Simobjects/Airplanes/B77W/texture.BAW_G-STBA_NC/texture.cfg b/Simobjects/Airplanes/B77W/texture.BAW_G-STBA_NC/texture.cfg
deleted file mode 100644
index 164bbd6..0000000
--- a/Simobjects/Airplanes/B77W/texture.BAW_G-STBA_NC/texture.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-[fltsim]
-fallback.1=..\..\AI_FSPX_Textures
-fallback.2=..\..\..\AI_FSPX_Textures
-fallback.3=..\..\..\..\AI_FSPX_Textures
\ No newline at end of file
diff --git a/Simobjects/Airplanes/B77W/texture.BAW_G-STBB_NC/FSPXAI_B77300_ANTENNAS.dds b/Simobjects/Airplanes/B77W/texture.BAW_G-STBB_NC/GEN_AI_B77300_ANTENNAS.dds
similarity index 100%
rename from Simobjects/Airplanes/B77W/texture.BAW_G-STBB_NC/FSPXAI_B77300_ANTENNAS.dds
rename to Simobjects/Airplanes/B77W/texture.BAW_G-STBB_NC/GEN_AI_B77300_ANTENNAS.dds
diff --git a/Simobjects/Airplanes/B77W/texture.BAW_G-STBB_NC/FSPXAI_B773ER.dds b/Simobjects/Airplanes/B77W/texture.BAW_G-STBB_NC/GEN_AI_B773ER.dds
similarity index 100%
rename from Simobjects/Airplanes/B77W/texture.BAW_G-STBB_NC/FSPXAI_B773ER.dds
rename to Simobjects/Airplanes/B77W/texture.BAW_G-STBB_NC/GEN_AI_B773ER.dds
diff --git a/Simobjects/Airplanes/B77W/texture.BAW_G-STBB_NC/FSPXAI_B773ER_L.dds b/Simobjects/Airplanes/B77W/texture.BAW_G-STBB_NC/GEN_AI_B773ER_L.dds
similarity index 100%
rename from Simobjects/Airplanes/B77W/texture.BAW_G-STBB_NC/FSPXAI_B773ER_L.dds
rename to Simobjects/Airplanes/B77W/texture.BAW_G-STBB_NC/GEN_AI_B773ER_L.dds
diff --git a/Simobjects/Airplanes/B77W/texture.BAW_G-STBB_NC/FSPXAI_B773ER_X.dds b/Simobjects/Airplanes/B77W/texture.BAW_G-STBB_NC/GEN_AI_B773ER_X.dds
similarity index 100%
rename from Simobjects/Airplanes/B77W/texture.BAW_G-STBB_NC/FSPXAI_B773ER_X.dds
rename to Simobjects/Airplanes/B77W/texture.BAW_G-STBB_NC/GEN_AI_B773ER_X.dds
diff --git a/Simobjects/Airplanes/B77W/texture.BAW_G-STBB_NC/texture.cfg b/Simobjects/Airplanes/B77W/texture.BAW_G-STBB_NC/texture.cfg
deleted file mode 100644
index 164bbd6..0000000
--- a/Simobjects/Airplanes/B77W/texture.BAW_G-STBB_NC/texture.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-[fltsim]
-fallback.1=..\..\AI_FSPX_Textures
-fallback.2=..\..\..\AI_FSPX_Textures
-fallback.3=..\..\..\..\AI_FSPX_Textures
\ No newline at end of file
diff --git a/Simobjects/Airplanes/B77W/texture.BAW_G-STBC_NC/FSPXAI_B77300_ANTENNAS.dds b/Simobjects/Airplanes/B77W/texture.BAW_G-STBC_NC/GEN_AI_B77300_ANTENNAS.dds
similarity index 100%
rename from Simobjects/Airplanes/B77W/texture.BAW_G-STBC_NC/FSPXAI_B77300_ANTENNAS.dds
rename to Simobjects/Airplanes/B77W/texture.BAW_G-STBC_NC/GEN_AI_B77300_ANTENNAS.dds
diff --git a/Simobjects/Airplanes/B77W/texture.BAW_G-STBC_NC/FSPXAI_B773ER.dds b/Simobjects/Airplanes/B77W/texture.BAW_G-STBC_NC/GEN_AI_B773ER.dds
similarity index 100%
rename from Simobjects/Airplanes/B77W/texture.BAW_G-STBC_NC/FSPXAI_B773ER.dds
rename to Simobjects/Airplanes/B77W/texture.BAW_G-STBC_NC/GEN_AI_B773ER.dds
diff --git a/Simobjects/Airplanes/B77W/texture.BAW_G-STBC_NC/FSPXAI_B773ER_L.dds b/Simobjects/Airplanes/B77W/texture.BAW_G-STBC_NC/GEN_AI_B773ER_L.dds
similarity index 100%
rename from Simobjects/Airplanes/B77W/texture.BAW_G-STBC_NC/FSPXAI_B773ER_L.dds
rename to Simobjects/Airplanes/B77W/texture.BAW_G-STBC_NC/GEN_AI_B773ER_L.dds
diff --git a/Simobjects/Airplanes/B77W/texture.BAW_G-STBC_NC/FSPXAI_B773ER_X.dds b/Simobjects/Airplanes/B77W/texture.BAW_G-STBC_NC/GEN_AI_B773ER_X.dds
similarity index 100%
rename from Simobjects/Airplanes/B77W/texture.BAW_G-STBC_NC/FSPXAI_B773ER_X.dds
rename to Simobjects/Airplanes/B77W/texture.BAW_G-STBC_NC/GEN_AI_B773ER_X.dds
diff --git a/Simobjects/Airplanes/B77W/texture.BAW_G-STBC_NC/texture.cfg b/Simobjects/Airplanes/B77W/texture.BAW_G-STBC_NC/texture.cfg
deleted file mode 100644
index 164bbd6..0000000
--- a/Simobjects/Airplanes/B77W/texture.BAW_G-STBC_NC/texture.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-[fltsim]
-fallback.1=..\..\AI_FSPX_Textures
-fallback.2=..\..\..\AI_FSPX_Textures
-fallback.3=..\..\..\..\AI_FSPX_Textures
\ No newline at end of file
diff --git a/Simobjects/Airplanes/B77W/texture.BAW_G-STBD_NC/FSPXAI_B77300_ANTENNAS.dds b/Simobjects/Airplanes/B77W/texture.BAW_G-STBD_NC/GEN_AI_B77300_ANTENNAS.dds
similarity index 100%
rename from Simobjects/Airplanes/B77W/texture.BAW_G-STBD_NC/FSPXAI_B77300_ANTENNAS.dds
rename to Simobjects/Airplanes/B77W/texture.BAW_G-STBD_NC/GEN_AI_B77300_ANTENNAS.dds
diff --git a/Simobjects/Airplanes/B77W/texture.BAW_G-STBD_NC/FSPXAI_B773ER.dds b/Simobjects/Airplanes/B77W/texture.BAW_G-STBD_NC/GEN_AI_B773ER.dds
similarity index 100%
rename from Simobjects/Airplanes/B77W/texture.BAW_G-STBD_NC/FSPXAI_B773ER.dds
rename to Simobjects/Airplanes/B77W/texture.BAW_G-STBD_NC/GEN_AI_B773ER.dds
diff --git a/Simobjects/Airplanes/B77W/texture.BAW_G-STBD_NC/FSPXAI_B773ER_L.dds b/Simobjects/Airplanes/B77W/texture.BAW_G-STBD_NC/GEN_AI_B773ER_L.dds
similarity index 100%
rename from Simobjects/Airplanes/B77W/texture.BAW_G-STBD_NC/FSPXAI_B773ER_L.dds
rename to Simobjects/Airplanes/B77W/texture.BAW_G-STBD_NC/GEN_AI_B773ER_L.dds
diff --git a/Simobjects/Airplanes/B77W/texture.BAW_G-STBD_NC/FSPXAI_B773ER_X.dds b/Simobjects/Airplanes/B77W/texture.BAW_G-STBD_NC/GEN_AI_B773ER_X.dds
similarity index 100%
rename from Simobjects/Airplanes/B77W/texture.BAW_G-STBD_NC/FSPXAI_B773ER_X.dds
rename to Simobjects/Airplanes/B77W/texture.BAW_G-STBD_NC/GEN_AI_B773ER_X.dds
diff --git a/Simobjects/Airplanes/B77W/texture.BAW_G-STBD_NC/texture.cfg b/Simobjects/Airplanes/B77W/texture.BAW_G-STBD_NC/texture.cfg
deleted file mode 100644
index 164bbd6..0000000
--- a/Simobjects/Airplanes/B77W/texture.BAW_G-STBD_NC/texture.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-[fltsim]
-fallback.1=..\..\AI_FSPX_Textures
-fallback.2=..\..\..\AI_FSPX_Textures
-fallback.3=..\..\..\..\AI_FSPX_Textures
\ No newline at end of file
diff --git a/Simobjects/Airplanes/B77W/texture.BAW_G-STBE_NC/FSPXAI_B77300_ANTENNAS.dds b/Simobjects/Airplanes/B77W/texture.BAW_G-STBE_NC/GEN_AI_B77300_ANTENNAS.dds
similarity index 100%
rename from Simobjects/Airplanes/B77W/texture.BAW_G-STBE_NC/FSPXAI_B77300_ANTENNAS.dds
rename to Simobjects/Airplanes/B77W/texture.BAW_G-STBE_NC/GEN_AI_B77300_ANTENNAS.dds
diff --git a/Simobjects/Airplanes/B77W/texture.BAW_G-STBE_NC/FSPXAI_B773ER.dds b/Simobjects/Airplanes/B77W/texture.BAW_G-STBE_NC/GEN_AI_B773ER.dds
similarity index 100%
rename from Simobjects/Airplanes/B77W/texture.BAW_G-STBE_NC/FSPXAI_B773ER.dds
rename to Simobjects/Airplanes/B77W/texture.BAW_G-STBE_NC/GEN_AI_B773ER.dds
diff --git a/Simobjects/Airplanes/B77W/texture.BAW_G-STBE_NC/FSPXAI_B773ER_L.dds b/Simobjects/Airplanes/B77W/texture.BAW_G-STBE_NC/GEN_AI_B773ER_L.dds
similarity index 100%
rename from Simobjects/Airplanes/B77W/texture.BAW_G-STBE_NC/FSPXAI_B773ER_L.dds
rename to Simobjects/Airplanes/B77W/texture.BAW_G-STBE_NC/GEN_AI_B773ER_L.dds
diff --git a/Simobjects/Airplanes/B77W/texture.BAW_G-STBE_NC/FSPXAI_B773ER_X.dds b/Simobjects/Airplanes/B77W/texture.BAW_G-STBE_NC/GEN_AI_B773ER_X.dds
similarity index 100%
rename from Simobjects/Airplanes/B77W/texture.BAW_G-STBE_NC/FSPXAI_B773ER_X.dds
rename to Simobjects/Airplanes/B77W/texture.BAW_G-STBE_NC/GEN_AI_B773ER_X.dds
diff --git a/Simobjects/Airplanes/B77W/texture.BAW_G-STBE_NC/texture.cfg b/Simobjects/Airplanes/B77W/texture.BAW_G-STBE_NC/texture.cfg
deleted file mode 100644
index 164bbd6..0000000
--- a/Simobjects/Airplanes/B77W/texture.BAW_G-STBE_NC/texture.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-[fltsim]
-fallback.1=..\..\AI_FSPX_Textures
-fallback.2=..\..\..\AI_FSPX_Textures
-fallback.3=..\..\..\..\AI_FSPX_Textures
\ No newline at end of file
diff --git a/Simobjects/Airplanes/B77W/texture.BAW_G-STBF_NC/FSPXAI_B77300_ANTENNAS.dds b/Simobjects/Airplanes/B77W/texture.BAW_G-STBF_NC/GEN_AI_B77300_ANTENNAS.dds
similarity index 100%
rename from Simobjects/Airplanes/B77W/texture.BAW_G-STBF_NC/FSPXAI_B77300_ANTENNAS.dds
rename to Simobjects/Airplanes/B77W/texture.BAW_G-STBF_NC/GEN_AI_B77300_ANTENNAS.dds
diff --git a/Simobjects/Airplanes/B77W/texture.BAW_G-STBF_NC/FSPXAI_B773ER.dds b/Simobjects/Airplanes/B77W/texture.BAW_G-STBF_NC/GEN_AI_B773ER.dds
similarity index 100%
rename from Simobjects/Airplanes/B77W/texture.BAW_G-STBF_NC/FSPXAI_B773ER.dds
rename to Simobjects/Airplanes/B77W/texture.BAW_G-STBF_NC/GEN_AI_B773ER.dds
diff --git a/Simobjects/Airplanes/B77W/texture.BAW_G-STBF_NC/FSPXAI_B773ER_L.dds b/Simobjects/Airplanes/B77W/texture.BAW_G-STBF_NC/GEN_AI_B773ER_L.dds
similarity index 100%
rename from Simobjects/Airplanes/B77W/texture.BAW_G-STBF_NC/FSPXAI_B773ER_L.dds
rename to Simobjects/Airplanes/B77W/texture.BAW_G-STBF_NC/GEN_AI_B773ER_L.dds
diff --git a/Simobjects/Airplanes/B77W/texture.BAW_G-STBF_NC/FSPXAI_B773ER_X.dds b/Simobjects/Airplanes/B77W/texture.BAW_G-STBF_NC/GEN_AI_B773ER_X.dds
similarity index 100%
rename from Simobjects/Airplanes/B77W/texture.BAW_G-STBF_NC/FSPXAI_B773ER_X.dds
rename to Simobjects/Airplanes/B77W/texture.BAW_G-STBF_NC/GEN_AI_B773ER_X.dds
diff --git a/Simobjects/Airplanes/B77W/texture.BAW_G-STBF_NC/texture.cfg b/Simobjects/Airplanes/B77W/texture.BAW_G-STBF_NC/texture.cfg
deleted file mode 100644
index 164bbd6..0000000
--- a/Simobjects/Airplanes/B77W/texture.BAW_G-STBF_NC/texture.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-[fltsim]
-fallback.1=..\..\AI_FSPX_Textures
-fallback.2=..\..\..\AI_FSPX_Textures
-fallback.3=..\..\..\..\AI_FSPX_Textures
\ No newline at end of file
diff --git a/Simobjects/Airplanes/B77W/texture.BAW_G-STBG/FSPXAI_B77300_ANTENNAS.dds b/Simobjects/Airplanes/B77W/texture.BAW_G-STBG/GEN_AI_B77300_ANTENNAS.dds
similarity index 100%
rename from Simobjects/Airplanes/B77W/texture.BAW_G-STBG/FSPXAI_B77300_ANTENNAS.dds
rename to Simobjects/Airplanes/B77W/texture.BAW_G-STBG/GEN_AI_B77300_ANTENNAS.dds
diff --git a/Simobjects/Airplanes/B77W/texture.BAW_G-STBG/FSPXAI_B773ER.dds b/Simobjects/Airplanes/B77W/texture.BAW_G-STBG/GEN_AI_B773ER.dds
similarity index 100%
rename from Simobjects/Airplanes/B77W/texture.BAW_G-STBG/FSPXAI_B773ER.dds
rename to Simobjects/Airplanes/B77W/texture.BAW_G-STBG/GEN_AI_B773ER.dds
diff --git a/Simobjects/Airplanes/B77W/texture.BAW_G-STBG/FSPXAI_B773ER_L.dds b/Simobjects/Airplanes/B77W/texture.BAW_G-STBG/GEN_AI_B773ER_L.dds
similarity index 100%
rename from Simobjects/Airplanes/B77W/texture.BAW_G-STBG/FSPXAI_B773ER_L.dds
rename to Simobjects/Airplanes/B77W/texture.BAW_G-STBG/GEN_AI_B773ER_L.dds
diff --git a/Simobjects/Airplanes/B77W/texture.BAW_G-STBG/FSPXAI_B773ER_X.dds b/Simobjects/Airplanes/B77W/texture.BAW_G-STBG/GEN_AI_B773ER_X.dds
similarity index 100%
rename from Simobjects/Airplanes/B77W/texture.BAW_G-STBG/FSPXAI_B773ER_X.dds
rename to Simobjects/Airplanes/B77W/texture.BAW_G-STBG/GEN_AI_B773ER_X.dds
diff --git a/Simobjects/Airplanes/B77W/texture.BAW_G-STBG/texture.cfg b/Simobjects/Airplanes/B77W/texture.BAW_G-STBG/texture.cfg
deleted file mode 100644
index 164bbd6..0000000
--- a/Simobjects/Airplanes/B77W/texture.BAW_G-STBG/texture.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-[fltsim]
-fallback.1=..\..\AI_FSPX_Textures
-fallback.2=..\..\..\AI_FSPX_Textures
-fallback.3=..\..\..\..\AI_FSPX_Textures
\ No newline at end of file
diff --git a/Simobjects/Airplanes/B77W/texture.BAW_G-STBH/FSPXAI_B77300_ANTENNAS.dds b/Simobjects/Airplanes/B77W/texture.BAW_G-STBH/GEN_AI_B77300_ANTENNAS.dds
similarity index 100%
rename from Simobjects/Airplanes/B77W/texture.BAW_G-STBH/FSPXAI_B77300_ANTENNAS.dds
rename to Simobjects/Airplanes/B77W/texture.BAW_G-STBH/GEN_AI_B77300_ANTENNAS.dds
diff --git a/Simobjects/Airplanes/B77W/texture.BAW_G-STBH/FSPXAI_B773ER.dds b/Simobjects/Airplanes/B77W/texture.BAW_G-STBH/GEN_AI_B773ER.dds
similarity index 100%
rename from Simobjects/Airplanes/B77W/texture.BAW_G-STBH/FSPXAI_B773ER.dds
rename to Simobjects/Airplanes/B77W/texture.BAW_G-STBH/GEN_AI_B773ER.dds
diff --git a/Simobjects/Airplanes/B77W/texture.BAW_G-STBH/FSPXAI_B773ER_L.dds b/Simobjects/Airplanes/B77W/texture.BAW_G-STBH/GEN_AI_B773ER_L.dds
similarity index 100%
rename from Simobjects/Airplanes/B77W/texture.BAW_G-STBH/FSPXAI_B773ER_L.dds
rename to Simobjects/Airplanes/B77W/texture.BAW_G-STBH/GEN_AI_B773ER_L.dds
diff --git a/Simobjects/Airplanes/B77W/texture.BAW_G-STBH/FSPXAI_B773ER_X.dds b/Simobjects/Airplanes/B77W/texture.BAW_G-STBH/GEN_AI_B773ER_X.dds
similarity index 100%
rename from Simobjects/Airplanes/B77W/texture.BAW_G-STBH/FSPXAI_B773ER_X.dds
rename to Simobjects/Airplanes/B77W/texture.BAW_G-STBH/GEN_AI_B773ER_X.dds
diff --git a/Simobjects/Airplanes/B77W/texture.BAW_G-STBH/texture.cfg b/Simobjects/Airplanes/B77W/texture.BAW_G-STBH/texture.cfg
deleted file mode 100644
index 164bbd6..0000000
--- a/Simobjects/Airplanes/B77W/texture.BAW_G-STBH/texture.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-[fltsim]
-fallback.1=..\..\AI_FSPX_Textures
-fallback.2=..\..\..\AI_FSPX_Textures
-fallback.3=..\..\..\..\AI_FSPX_Textures
\ No newline at end of file
diff --git a/Simobjects/Airplanes/B77W/texture.BAW_G-STBI/FSPXAI_B77300_ANTENNAS.dds b/Simobjects/Airplanes/B77W/texture.BAW_G-STBI/GEN_AI_B77300_ANTENNAS.dds
similarity index 100%
rename from Simobjects/Airplanes/B77W/texture.BAW_G-STBI/FSPXAI_B77300_ANTENNAS.dds
rename to Simobjects/Airplanes/B77W/texture.BAW_G-STBI/GEN_AI_B77300_ANTENNAS.dds
diff --git a/Simobjects/Airplanes/B77W/texture.BAW_G-STBI/FSPXAI_B773ER.dds b/Simobjects/Airplanes/B77W/texture.BAW_G-STBI/GEN_AI_B773ER.dds
similarity index 100%
rename from Simobjects/Airplanes/B77W/texture.BAW_G-STBI/FSPXAI_B773ER.dds
rename to Simobjects/Airplanes/B77W/texture.BAW_G-STBI/GEN_AI_B773ER.dds
diff --git a/Simobjects/Airplanes/B77W/texture.BAW_G-STBI/FSPXAI_B773ER_L.dds b/Simobjects/Airplanes/B77W/texture.BAW_G-STBI/GEN_AI_B773ER_L.dds
similarity index 100%
rename from Simobjects/Airplanes/B77W/texture.BAW_G-STBI/FSPXAI_B773ER_L.dds
rename to Simobjects/Airplanes/B77W/texture.BAW_G-STBI/GEN_AI_B773ER_L.dds
diff --git a/Simobjects/Airplanes/B77W/texture.BAW_G-STBI/FSPXAI_B773ER_X.dds b/Simobjects/Airplanes/B77W/texture.BAW_G-STBI/GEN_AI_B773ER_X.dds
similarity index 100%
rename from Simobjects/Airplanes/B77W/texture.BAW_G-STBI/FSPXAI_B773ER_X.dds
rename to Simobjects/Airplanes/B77W/texture.BAW_G-STBI/GEN_AI_B773ER_X.dds
diff --git a/Simobjects/Airplanes/B77W/texture.BAW_G-STBI/texture.cfg b/Simobjects/Airplanes/B77W/texture.BAW_G-STBI/texture.cfg
deleted file mode 100644
index 164bbd6..0000000
--- a/Simobjects/Airplanes/B77W/texture.BAW_G-STBI/texture.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-[fltsim]
-fallback.1=..\..\AI_FSPX_Textures
-fallback.2=..\..\..\AI_FSPX_Textures
-fallback.3=..\..\..\..\AI_FSPX_Textures
\ No newline at end of file
diff --git a/Simobjects/Airplanes/B77W/texture.BAW_G-STBJ/FSPXAI_B77300_ANTENNAS.dds b/Simobjects/Airplanes/B77W/texture.BAW_G-STBJ/GEN_AI_B77300_ANTENNAS.dds
similarity index 100%
rename from Simobjects/Airplanes/B77W/texture.BAW_G-STBJ/FSPXAI_B77300_ANTENNAS.dds
rename to Simobjects/Airplanes/B77W/texture.BAW_G-STBJ/GEN_AI_B77300_ANTENNAS.dds
diff --git a/Simobjects/Airplanes/B77W/texture.BAW_G-STBJ/FSPXAI_B773ER.dds b/Simobjects/Airplanes/B77W/texture.BAW_G-STBJ/GEN_AI_B773ER.dds
similarity index 100%
rename from Simobjects/Airplanes/B77W/texture.BAW_G-STBJ/FSPXAI_B773ER.dds
rename to Simobjects/Airplanes/B77W/texture.BAW_G-STBJ/GEN_AI_B773ER.dds
diff --git a/Simobjects/Airplanes/B77W/texture.BAW_G-STBJ/FSPXAI_B773ER_L.dds b/Simobjects/Airplanes/B77W/texture.BAW_G-STBJ/GEN_AI_B773ER_L.dds
similarity index 100%
rename from Simobjects/Airplanes/B77W/texture.BAW_G-STBJ/FSPXAI_B773ER_L.dds
rename to Simobjects/Airplanes/B77W/texture.BAW_G-STBJ/GEN_AI_B773ER_L.dds
diff --git a/Simobjects/Airplanes/B77W/texture.BAW_G-STBJ/FSPXAI_B773ER_X.dds b/Simobjects/Airplanes/B77W/texture.BAW_G-STBJ/GEN_AI_B773ER_X.dds
similarity index 100%
rename from Simobjects/Airplanes/B77W/texture.BAW_G-STBJ/FSPXAI_B773ER_X.dds
rename to Simobjects/Airplanes/B77W/texture.BAW_G-STBJ/GEN_AI_B773ER_X.dds
diff --git a/Simobjects/Airplanes/B77W/texture.BAW_G-STBJ/texture.cfg b/Simobjects/Airplanes/B77W/texture.BAW_G-STBJ/texture.cfg
deleted file mode 100644
index 164bbd6..0000000
--- a/Simobjects/Airplanes/B77W/texture.BAW_G-STBJ/texture.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-[fltsim]
-fallback.1=..\..\AI_FSPX_Textures
-fallback.2=..\..\..\AI_FSPX_Textures
-fallback.3=..\..\..\..\AI_FSPX_Textures
\ No newline at end of file
diff --git a/Simobjects/Airplanes/B77W/texture.BAW_G-STBK_NEW/FSPXAI_B77300_ANTENNAS.dds b/Simobjects/Airplanes/B77W/texture.BAW_G-STBK_NEW/GEN_AI_B77300_ANTENNAS.dds
similarity index 100%
rename from Simobjects/Airplanes/B77W/texture.BAW_G-STBK_NEW/FSPXAI_B77300_ANTENNAS.dds
rename to Simobjects/Airplanes/B77W/texture.BAW_G-STBK_NEW/GEN_AI_B77300_ANTENNAS.dds
diff --git a/Simobjects/Airplanes/B77W/texture.BAW_G-STBK_NEW/FSPXAI_B773ER.dds b/Simobjects/Airplanes/B77W/texture.BAW_G-STBK_NEW/GEN_AI_B773ER.dds
similarity index 100%
rename from Simobjects/Airplanes/B77W/texture.BAW_G-STBK_NEW/FSPXAI_B773ER.dds
rename to Simobjects/Airplanes/B77W/texture.BAW_G-STBK_NEW/GEN_AI_B773ER.dds
diff --git a/Simobjects/Airplanes/B77W/texture.BAW_G-STBK_NEW/FSPXAI_B773ER_L.dds b/Simobjects/Airplanes/B77W/texture.BAW_G-STBK_NEW/GEN_AI_B773ER_L.dds
similarity index 100%
rename from Simobjects/Airplanes/B77W/texture.BAW_G-STBK_NEW/FSPXAI_B773ER_L.dds
rename to Simobjects/Airplanes/B77W/texture.BAW_G-STBK_NEW/GEN_AI_B773ER_L.dds
diff --git a/Simobjects/Airplanes/B77W/texture.BAW_G-STBK_NEW/FSPXAI_B773ER_X.dds b/Simobjects/Airplanes/B77W/texture.BAW_G-STBK_NEW/GEN_AI_B773ER_X.dds
similarity index 100%
rename from Simobjects/Airplanes/B77W/texture.BAW_G-STBK_NEW/FSPXAI_B773ER_X.dds
rename to Simobjects/Airplanes/B77W/texture.BAW_G-STBK_NEW/GEN_AI_B773ER_X.dds
diff --git a/Simobjects/Airplanes/B77W/texture.BAW_G-STBK_NEW/texture.cfg b/Simobjects/Airplanes/B77W/texture.BAW_G-STBK_NEW/texture.cfg
deleted file mode 100644
index 164bbd6..0000000
--- a/Simobjects/Airplanes/B77W/texture.BAW_G-STBK_NEW/texture.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-[fltsim]
-fallback.1=..\..\AI_FSPX_Textures
-fallback.2=..\..\..\AI_FSPX_Textures
-fallback.3=..\..\..\..\AI_FSPX_Textures
\ No newline at end of file
diff --git a/Simobjects/Airplanes/B77W/texture.BAW_G-STBL_NEW/FSPXAI_B77300_ANTENNAS.dds b/Simobjects/Airplanes/B77W/texture.BAW_G-STBL_NEW/GEN_AI_B77300_ANTENNAS.dds
similarity index 100%
rename from Simobjects/Airplanes/B77W/texture.BAW_G-STBL_NEW/FSPXAI_B77300_ANTENNAS.dds
rename to Simobjects/Airplanes/B77W/texture.BAW_G-STBL_NEW/GEN_AI_B77300_ANTENNAS.dds
diff --git a/Simobjects/Airplanes/B77W/texture.BAW_G-STBL_NEW/FSPXAI_B773ER.dds b/Simobjects/Airplanes/B77W/texture.BAW_G-STBL_NEW/GEN_AI_B773ER.dds
similarity index 100%
rename from Simobjects/Airplanes/B77W/texture.BAW_G-STBL_NEW/FSPXAI_B773ER.dds
rename to Simobjects/Airplanes/B77W/texture.BAW_G-STBL_NEW/GEN_AI_B773ER.dds
diff --git a/Simobjects/Airplanes/B77W/texture.BAW_G-STBL_NEW/FSPXAI_B773ER_L.dds b/Simobjects/Airplanes/B77W/texture.BAW_G-STBL_NEW/GEN_AI_B773ER_L.dds
similarity index 100%
rename from Simobjects/Airplanes/B77W/texture.BAW_G-STBL_NEW/FSPXAI_B773ER_L.dds
rename to Simobjects/Airplanes/B77W/texture.BAW_G-STBL_NEW/GEN_AI_B773ER_L.dds
diff --git a/Simobjects/Airplanes/B77W/texture.BAW_G-STBL_NEW/FSPXAI_B773ER_X.dds b/Simobjects/Airplanes/B77W/texture.BAW_G-STBL_NEW/GEN_AI_B773ER_X.dds
similarity index 100%
rename from Simobjects/Airplanes/B77W/texture.BAW_G-STBL_NEW/FSPXAI_B773ER_X.dds
rename to Simobjects/Airplanes/B77W/texture.BAW_G-STBL_NEW/GEN_AI_B773ER_X.dds
diff --git a/Simobjects/Airplanes/B77W/texture.BAW_G-STBL_NEW/texture.cfg b/Simobjects/Airplanes/B77W/texture.BAW_G-STBL_NEW/texture.cfg
deleted file mode 100644
index 164bbd6..0000000
--- a/Simobjects/Airplanes/B77W/texture.BAW_G-STBL_NEW/texture.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-[fltsim]
-fallback.1=..\..\AI_FSPX_Textures
-fallback.2=..\..\..\AI_FSPX_Textures
-fallback.3=..\..\..\..\AI_FSPX_Textures
\ No newline at end of file
diff --git a/Simobjects/Airplanes/B788/Model.RR/model.cfg b/Simobjects/Airplanes/B788/Model.RR/model.cfg
index c484f62..7868507 100644
--- a/Simobjects/Airplanes/B788/Model.RR/model.cfg
+++ b/Simobjects/Airplanes/B788/Model.RR/model.cfg
@@ -1,2 +1,2 @@
-[models]
+[models]
 normal=FSPX_B787-8_RR_ver1_1
\ No newline at end of file
diff --git a/Simobjects/Airplanes/B788/aircraft.cfg b/Simobjects/Airplanes/B788/aircraft.cfg
index 5057902..e0ebb50 100644
--- a/Simobjects/Airplanes/B788/aircraft.cfg
+++ b/Simobjects/Airplanes/B788/aircraft.cfg
@@ -1,4 +1,4 @@
-[fltsim.0]
+ [fltsim.0]
 title=BAvMM_B788_BAW_G-ZBJA
 sim=FSPXAI_B788v1
 model=RR
@@ -65,7 +65,7 @@ atc_parking_types=GATE
 
 [General]
 atc_type=Boeing
-atc_model=B787
+atc_model=B788
 editable=0
 performance=
 Category=airplane
diff --git a/Simobjects/Airplanes/B788/fspxai_788_baw.zip b/Simobjects/Airplanes/B788/fspxai_788_baw.zip
deleted file mode 100644
index 9e5b628..0000000
Binary files a/Simobjects/Airplanes/B788/fspxai_788_baw.zip and /dev/null differ
diff --git a/Simobjects/Airplanes/B788/fspxai_b788_v1_1.zip b/Simobjects/Airplanes/B788/fspxai_b788_v1_1.zip
deleted file mode 100644
index a5b811e..0000000
Binary files a/Simobjects/Airplanes/B788/fspxai_b788_v1_1.zip and /dev/null differ
diff --git a/Simobjects/Airplanes/B789/Model.RR/model.cfg b/Simobjects/Airplanes/B789/Model.RR/model.cfg
index 5302d8c..5293cf8 100644
--- a/Simobjects/Airplanes/B789/Model.RR/model.cfg
+++ b/Simobjects/Airplanes/B789/Model.RR/model.cfg
@@ -1,2 +1,2 @@
-[models]
+[models]
 normal=FSPX_B787-9_RR_Ver1_3
\ No newline at end of file
diff --git a/Simobjects/Airplanes/B789/aircraft.cfg b/Simobjects/Airplanes/B789/aircraft.cfg
index 7c78cc6..8a4800c 100644
--- a/Simobjects/Airplanes/B789/aircraft.cfg
+++ b/Simobjects/Airplanes/B789/aircraft.cfg
@@ -39,7 +39,7 @@ atc_parking_types=GATE
 
 [General]
 atc_type=Boeing
-atc_model=B787
+atc_model=B789
 editable=0
 performance=
 Category=airplane
diff --git a/Texture/FSPXB787_9RR_L2.dds b/Simobjects/Airplanes/B789/texture.BAW_ZBKA/FSPXB787_9RR_L2.dds
similarity index 100%
rename from Texture/FSPXB787_9RR_L2.dds
rename to Simobjects/Airplanes/B789/texture.BAW_ZBKA/FSPXB787_9RR_L2.dds
diff --git a/Simobjects/Airplanes/B789/texture.BAW_ZBKA/texture.cfg b/Simobjects/Airplanes/B789/texture.BAW_ZBKA/texture.cfg
deleted file mode 100644
index 9e66d46..0000000
--- a/Simobjects/Airplanes/B789/texture.BAW_ZBKA/texture.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-[fltsim]
-fallback.1=..\..\AI_FSPX_Textures
diff --git a/Texture/FSPXB787_9GE_L2.dds b/Simobjects/Airplanes/B789/texture.BAW_ZBKF/FSPXB787_9RR_L2.dds
similarity index 100%
rename from Texture/FSPXB787_9GE_L2.dds
rename to Simobjects/Airplanes/B789/texture.BAW_ZBKF/FSPXB787_9RR_L2.dds
diff --git a/Simobjects/Airplanes/B789/texture.BAW_ZBKF/texture.cfg b/Simobjects/Airplanes/B789/texture.BAW_ZBKF/texture.cfg
deleted file mode 100644
index 9e66d46..0000000
--- a/Simobjects/Airplanes/B789/texture.BAW_ZBKF/texture.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-[fltsim]
-fallback.1=..\..\AI_FSPX_Textures
diff --git a/Texture/FSPXB787_9RR_L.dds b/Simobjects/Airplanes/B789/texture.BAW_ZBKH/FSPXB787_9RR_L2.dds
similarity index 74%
rename from Texture/FSPXB787_9RR_L.dds
rename to Simobjects/Airplanes/B789/texture.BAW_ZBKH/FSPXB787_9RR_L2.dds
index e2779fb..a1b1e73 100644
Binary files a/Texture/FSPXB787_9RR_L.dds and b/Simobjects/Airplanes/B789/texture.BAW_ZBKH/FSPXB787_9RR_L2.dds differ
diff --git a/Simobjects/Airplanes/B789/texture.BAW_ZBKH/texture.cfg b/Simobjects/Airplanes/B789/texture.BAW_ZBKH/texture.cfg
deleted file mode 100644
index 9e66d46..0000000
--- a/Simobjects/Airplanes/B789/texture.BAW_ZBKH/texture.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-[fltsim]
-fallback.1=..\..\AI_FSPX_Textures
diff --git a/Simobjects/Airplanes/B78X/FSPXAI_B78710.air b/Simobjects/Airplanes/B78X/GEN_AI_B78710.air
similarity index 100%
rename from Simobjects/Airplanes/B78X/FSPXAI_B78710.air
rename to Simobjects/Airplanes/B78X/GEN_AI_B78710.air
diff --git a/Simobjects/Airplanes/B78X/Model.RR/FSPX_B787-10_RR.mdl b/Simobjects/Airplanes/B78X/Model.RR/GEN_AI_B787-10_RR.mdl
similarity index 90%
rename from Simobjects/Airplanes/B78X/Model.RR/FSPX_B787-10_RR.mdl
rename to Simobjects/Airplanes/B78X/Model.RR/GEN_AI_B787-10_RR.mdl
index 65cb0e1..07e25b9 100644
Binary files a/Simobjects/Airplanes/B78X/Model.RR/FSPX_B787-10_RR.mdl and b/Simobjects/Airplanes/B78X/Model.RR/GEN_AI_B787-10_RR.mdl differ
diff --git a/Simobjects/Airplanes/B78X/Model.RR/model.cfg b/Simobjects/Airplanes/B78X/Model.RR/model.cfg
index 90c9dd7..45cbf5d 100644
--- a/Simobjects/Airplanes/B78X/Model.RR/model.cfg
+++ b/Simobjects/Airplanes/B78X/Model.RR/model.cfg
@@ -1,2 +1,2 @@
 [models]
-normal=FSPX_B787-10_RR
\ No newline at end of file
+normal=GEN_AI_B787-10_RR
\ No newline at end of file
diff --git a/Simobjects/Airplanes/B78X/Model.RR_Xcon/FSPX_B787-10_RR_Xcon.mdl b/Simobjects/Airplanes/B78X/Model.RR_Xcon/FSPX_B787-10_RR_Xcon.mdl
deleted file mode 100644
index 4749371..0000000
Binary files a/Simobjects/Airplanes/B78X/Model.RR_Xcon/FSPX_B787-10_RR_Xcon.mdl and /dev/null differ
diff --git a/Simobjects/Airplanes/B78X/Model.RR_Xcon/model.cfg b/Simobjects/Airplanes/B78X/Model.RR_Xcon/model.cfg
deleted file mode 100644
index c509bec..0000000
--- a/Simobjects/Airplanes/B78X/Model.RR_Xcon/model.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-[models]
-normal=FSPX_B787-10_RR_Xcon
\ No newline at end of file
diff --git a/Simobjects/Airplanes/B78X/aircraft.cfg b/Simobjects/Airplanes/B78X/aircraft.cfg
index 632f68f..ea9455c 100644
--- a/Simobjects/Airplanes/B78X/aircraft.cfg
+++ b/Simobjects/Airplanes/B78X/aircraft.cfg
@@ -1,6 +1,6 @@
 [fltsim.0]
 title=BAvMM_B78X_BAW
-sim=FSPXAI_B78710
+sim=GEN_AI_B78710
 model=RR
 texture=BAW
 atc_airline=BAW
diff --git a/Simobjects/Airplanes/B78X/texture.BAW/FSPXB787_10RR_L.dds b/Simobjects/Airplanes/B78X/texture.BAW/GEN_B787_10RR_L.dds
similarity index 100%
rename from Simobjects/Airplanes/B78X/texture.BAW/FSPXB787_10RR_L.dds
rename to Simobjects/Airplanes/B78X/texture.BAW/GEN_B787_10RR_L.dds
diff --git a/Simobjects/Airplanes/B78X/texture.BAW/FSPXB787_10RR_T.dds b/Simobjects/Airplanes/B78X/texture.BAW/GEN_B787_10RR_T.dds
similarity index 100%
rename from Simobjects/Airplanes/B78X/texture.BAW/FSPXB787_10RR_T.dds
rename to Simobjects/Airplanes/B78X/texture.BAW/GEN_B787_10RR_T.dds
diff --git a/Simobjects/Airplanes/E190/aia_e190_cfe.zip b/Simobjects/Airplanes/E190/aia_e190_cfe.zip
deleted file mode 100644
index e2ac04b..0000000
Binary files a/Simobjects/Airplanes/E190/aia_e190_cfe.zip and /dev/null differ
diff --git a/Texture/FSPXB787_10_XX.dds b/Texture/FSPXB787_10_XX.dds
deleted file mode 100644
index c098e6a..0000000
Binary files a/Texture/FSPXB787_10_XX.dds and /dev/null differ
diff --git a/Texture/FSPXB787_10_XX_L.dds b/Texture/FSPXB787_10_XX_L.dds
deleted file mode 100644
index 8dc3283..0000000
Binary files a/Texture/FSPXB787_10_XX_L.dds and /dev/null differ
diff --git a/Texture/FSPXB787_8RR_L.dds b/Texture/FSPXB787_8RR_L.dds
deleted file mode 100644
index 1f7ab3c..0000000
Binary files a/Texture/FSPXB787_8RR_L.dds and /dev/null differ
diff --git a/Texture/FSPXB787_8RR_L2.dds b/Texture/FSPXB787_8RR_L2.dds
deleted file mode 100644
index 56e4304..0000000
Binary files a/Texture/FSPXB787_8RR_L2.dds and /dev/null differ
diff --git a/Texture/FSPX_AIlights3.dds b/Texture/FSPX_AIlights3.dds
new file mode 100644
index 0000000..ce1090c
Binary files /dev/null and b/Texture/FSPX_AIlights3.dds differ
diff --git a/Texture/A350A351000_X.dds b/Texture/GEN_AI_000.dds
similarity index 100%
rename from Texture/A350A351000_X.dds
rename to Texture/GEN_AI_000.dds
diff --git a/Texture/FSPXB787_8_X.dds b/Texture/GEN_AI_B77200_ANTENNAS.dds
similarity index 100%
rename from Texture/FSPXB787_8_X.dds
rename to Texture/GEN_AI_B77200_ANTENNAS.dds
diff --git a/Texture/FSPXB787_9_X.dds b/Texture/GEN_AI_B77200_X.dds
similarity index 100%
rename from Texture/FSPXB787_9_X.dds
rename to Texture/GEN_AI_B77200_X.dds
diff --git a/Texture/GEN_AI_B772GE_L2.dds b/Texture/GEN_AI_B772GE_L2.dds
new file mode 100644
index 0000000..4716cd8
Binary files /dev/null and b/Texture/GEN_AI_B772GE_L2.dds differ
diff --git a/Texture/GEN_AI_B772LR_L2.dds b/Texture/GEN_AI_B772LR_L2.dds
new file mode 100644
index 0000000..0967283
Binary files /dev/null and b/Texture/GEN_AI_B772LR_L2.dds differ
diff --git a/Texture/FSPXB787_10RR_L2.dds b/Texture/GEN_AI_B772RR_L2.dds
similarity index 82%
rename from Texture/FSPXB787_10RR_L2.dds
rename to Texture/GEN_AI_B772RR_L2.dds
index 4d1f0ff..0528d86 100644
Binary files a/Texture/FSPXB787_10RR_L2.dds and b/Texture/GEN_AI_B772RR_L2.dds differ
diff --git a/Texture/GEN_AI_B77300_ANTENNAS.dds b/Texture/GEN_AI_B77300_ANTENNAS.dds
new file mode 100644
index 0000000..87d7d83
Binary files /dev/null and b/Texture/GEN_AI_B77300_ANTENNAS.dds differ
diff --git a/Texture/GEN_AI_B77300_X.dds b/Texture/GEN_AI_B77300_X.dds
new file mode 100644
index 0000000..87d7d83
Binary files /dev/null and b/Texture/GEN_AI_B77300_X.dds differ
diff --git a/Texture/GEN_AI_B773ER_L2.dds b/Texture/GEN_AI_B773ER_L2.dds
new file mode 100644
index 0000000..dc16262
Binary files /dev/null and b/Texture/GEN_AI_B773ER_L2.dds differ
diff --git a/Texture/GEN_AI_B773RR_L2.dds b/Texture/GEN_AI_B773RR_L2.dds
new file mode 100644
index 0000000..13da6c4
Binary files /dev/null and b/Texture/GEN_AI_B773RR_L2.dds differ
diff --git a/Texture/GEN_AIlights1.dds b/Texture/GEN_AIlights1.dds
new file mode 100644
index 0000000..845da86
Binary files /dev/null and b/Texture/GEN_AIlights1.dds differ
diff --git a/Texture/GEN_AIlights2.dds b/Texture/GEN_AIlights2.dds
new file mode 100644
index 0000000..07b9493
Binary files /dev/null and b/Texture/GEN_AIlights2.dds differ
diff --git a/Texture/GEN_AIlights2_L.dds b/Texture/GEN_AIlights2_L.dds
new file mode 100644
index 0000000..f26e4e1
Binary files /dev/null and b/Texture/GEN_AIlights2_L.dds differ
diff --git a/Texture/FSPXB787_10GE_L2.dds b/Texture/GEN_B787_10RR_L2.dds
similarity index 100%
rename from Texture/FSPXB787_10GE_L2.dds
rename to Texture/GEN_B787_10RR_L2.dds
diff --git a/Texture/FSPXAI_000.dds b/Texture/GEN_B787_10_X.dds
similarity index 100%
rename from Texture/FSPXAI_000.dds
rename to Texture/GEN_B787_10_X.dds
diff --git a/Texture/FSPXB787_8GE_L.dds b/Texture/GEN_B787_8RR_L.dds
similarity index 100%
rename from Texture/FSPXB787_8GE_L.dds
rename to Texture/GEN_B787_8RR_L.dds
diff --git a/Texture/FSPXB787_8GE_L2.dds b/Texture/GEN_B787_8RR_L2.dds
similarity index 100%
rename from Texture/FSPXB787_8GE_L2.dds
rename to Texture/GEN_B787_8RR_L2.dds
diff --git a/Texture/GEN_B787_8_X.dds b/Texture/GEN_B787_8_X.dds
new file mode 100644
index 0000000..87d7d83
Binary files /dev/null and b/Texture/GEN_B787_8_X.dds differ
diff --git a/Texture/FSPXB787_9GE_L.dds b/Texture/GEN_B787_9RR_L.dds
similarity index 100%
rename from Texture/FSPXB787_9GE_L.dds
rename to Texture/GEN_B787_9RR_L.dds
diff --git a/Simobjects/Airplanes/A35K/texture.BAW-BritishAirways/A35K_L.dds b/Texture/GEN_B787_9RR_L2.dds
similarity index 57%
rename from Simobjects/Airplanes/A35K/texture.BAW-BritishAirways/A35K_L.dds
rename to Texture/GEN_B787_9RR_L2.dds
index 7a4013b..a1b1e73 100644
Binary files a/Simobjects/Airplanes/A35K/texture.BAW-BritishAirways/A35K_L.dds and b/Texture/GEN_B787_9RR_L2.dds differ
diff --git a/Texture/GEN_B787_9_X.dds b/Texture/GEN_B787_9_X.dds
new file mode 100644
index 0000000..87d7d83
Binary files /dev/null and b/Texture/GEN_B787_9_X.dds differ
diff --git a/Texture/FSPXB787_10_X.dds b/Texture/fx_A351000_X.dds
similarity index 100%
rename from Texture/FSPXB787_10_X.dds
rename to Texture/fx_A351000_X.dds