diff --git a/Models/A318-100-CFM.xml b/Models/A318-100-CFM.xml
index 09ca0f6f..1d9a95c1 100644
--- a/Models/A318-100-CFM.xml
+++ b/Models/A318-100-CFM.xml
@@ -233,7 +233,7 @@
 		<name>Nosegear landing light ALS</name>
 		<path>Aircraft/A320Family/Models/Lights/ALS/taxilight.xml</path>
 		<offsets>
-			<x-m>3.08</x-m>
+			<x-m>9.9</x-m>
 			<y-m>0</y-m>
 			<z-m>-2.5</z-m>
 		</offsets>
diff --git a/Models/A319-100-CFM.xml b/Models/A319-100-CFM.xml
index 6ede2c98..358e7e6b 100644
--- a/Models/A319-100-CFM.xml
+++ b/Models/A319-100-CFM.xml
@@ -254,7 +254,7 @@
 		<name>Nosegear landing light ALS</name>
 		<path>Aircraft/A320Family/Models/Lights/ALS/taxilight.xml</path>
 		<offsets>
-			<x-m>3.08</x-m>
+			<x-m>9.41</x-m>
 			<y-m>0</y-m>
 			<z-m>-2.5</z-m>
 		</offsets>
diff --git a/Models/A319-100-IAE.xml b/Models/A319-100-IAE.xml
index 7359d088..fdbe10ee 100644
--- a/Models/A319-100-IAE.xml
+++ b/Models/A319-100-IAE.xml
@@ -256,7 +256,7 @@
 		<name>Nosegear landing light ALS</name>
 		<path>Aircraft/A320Family/Models/Lights/ALS/taxilight.xml</path>
 		<offsets>
-			<x-m>3.08</x-m>
+			<x-m>9.41</x-m>
 			<y-m>0</y-m>
 			<z-m>-2.5</z-m>
 		</offsets>
diff --git a/Models/A320-100-CFM.xml b/Models/A320-100-CFM.xml
index e3cb243a..abccf768 100644
--- a/Models/A320-100-CFM.xml
+++ b/Models/A320-100-CFM.xml
@@ -226,7 +226,7 @@
 		<name>Nosegear landing light ALS</name>
 		<path>Aircraft/A320Family/Models/Lights/ALS/taxilight.xml</path>
 		<offsets>
-			<x-m>7.35</x-m>
+			<x-m>7.81</x-m>
 			<y-m>0</y-m>
 			<z-m>-2.5</z-m>
 		</offsets>
diff --git a/Models/A320-200-CFM.xml b/Models/A320-200-CFM.xml
index 1b4af4a1..df66091e 100644
--- a/Models/A320-200-CFM.xml
+++ b/Models/A320-200-CFM.xml
@@ -256,7 +256,7 @@
 		<name>Nosegear landing light ALS</name>
 		<path>Aircraft/A320Family/Models/Lights/ALS/taxilight.xml</path>
 		<offsets>
-			<x-m>7.35</x-m>
+			<x-m>7.81</x-m>
 			<y-m>0</y-m>
 			<z-m>-2.5</z-m>
 		</offsets>
diff --git a/Models/A320-200-IAE.xml b/Models/A320-200-IAE.xml
index b6eef382..dc79d8bd 100644
--- a/Models/A320-200-IAE.xml
+++ b/Models/A320-200-IAE.xml
@@ -256,7 +256,7 @@
 		<name>Nosegear landing light ALS</name>
 		<path>Aircraft/A320Family/Models/Lights/ALS/taxilight.xml</path>
 		<offsets>
-			<x-m>7.35</x-m>
+			<x-m>7.81</x-m>
 			<y-m>0</y-m>
 			<z-m>-2.5</z-m>
 		</offsets>
diff --git a/Models/A320neo-CFM.xml b/Models/A320neo-CFM.xml
index b6bb1ef5..1c55b7fe 100644
--- a/Models/A320neo-CFM.xml
+++ b/Models/A320neo-CFM.xml
@@ -235,7 +235,7 @@
 		<name>Nosegear landing light ALS</name>
 		<path>Aircraft/A320Family/Models/Lights/ALS/taxilight.xml</path>
 		<offsets>
-			<x-m>7.35</x-m>
+			<x-m>7.81</x-m>
 			<y-m>0</y-m>
 			<z-m>-2.5</z-m>
 		</offsets>
diff --git a/Models/A320neo-PW.xml b/Models/A320neo-PW.xml
index 6675dcc2..bd53ed78 100644
--- a/Models/A320neo-PW.xml
+++ b/Models/A320neo-PW.xml
@@ -235,7 +235,7 @@
 		<name>Nosegear landing light ALS</name>
 		<path>Aircraft/A320Family/Models/Lights/ALS/taxilight.xml</path>
 		<offsets>
-			<x-m>7.35</x-m>
+			<x-m>7.81</x-m>
 			<y-m>0</y-m>
 			<z-m>-2.5</z-m>
 		</offsets>
diff --git a/Models/A321-200-CFM.xml b/Models/A321-200-CFM.xml
index a483438b..88db2f1d 100644
--- a/Models/A321-200-CFM.xml
+++ b/Models/A321-200-CFM.xml
@@ -255,7 +255,7 @@
 		<name>Nosegear landing light ALS</name>
 		<path>Aircraft/A320Family/Models/Lights/ALS/taxilight.xml</path>
 		<offsets>
-			<x-m>3.08</x-m>
+			<x-m>3.54</x-m>
 			<y-m>0</y-m>
 			<z-m>-2.5</z-m>
 		</offsets>
diff --git a/Models/A321-200-IAE.xml b/Models/A321-200-IAE.xml
index 46df5cee..c8832ca3 100644
--- a/Models/A321-200-IAE.xml
+++ b/Models/A321-200-IAE.xml
@@ -255,7 +255,7 @@
 		<name>Nosegear landing light ALS</name>
 		<path>Aircraft/A320Family/Models/Lights/ALS/taxilight.xml</path>
 		<offsets>
-			<x-m>3.08</x-m>
+			<x-m>3.54</x-m>
 			<y-m>0</y-m>
 			<z-m>-2.5</z-m>
 		</offsets>
diff --git a/Models/A321neo-CFM.xml b/Models/A321neo-CFM.xml
index 2cc4140b..c93932f6 100644
--- a/Models/A321neo-CFM.xml
+++ b/Models/A321neo-CFM.xml
@@ -234,7 +234,7 @@
 		<name>Nosegear landing light ALS</name>
 		<path>Aircraft/A320Family/Models/Lights/ALS/taxilight.xml</path>
 		<offsets>
-			<x-m>3.08</x-m>
+			<x-m>3.54</x-m>
 			<y-m>0</y-m>
 			<z-m>-2.5</z-m>
 		</offsets>
diff --git a/Models/A321neo-PW.xml b/Models/A321neo-PW.xml
index 2224c1dd..62095a63 100644
--- a/Models/A321neo-PW.xml
+++ b/Models/A321neo-PW.xml
@@ -234,7 +234,7 @@
 		<name>Nosegear landing light ALS</name>
 		<path>Aircraft/A320Family/Models/Lights/ALS/taxilight.xml</path>
 		<offsets>
-			<x-m>3.08</x-m>
+			<x-m>3.54</x-m>
 			<y-m>0</y-m>
 			<z-m>-2.5</z-m>
 		</offsets>
diff --git a/Models/Effects/LEAPl.png b/Models/Effects/LEAPl.png
new file mode 100644
index 00000000..fd9a8cab
Binary files /dev/null and b/Models/Effects/LEAPl.png differ
diff --git a/Models/Effects/LEAPr.png b/Models/Effects/LEAPr.png
new file mode 100644
index 00000000..cb995477
Binary files /dev/null and b/Models/Effects/LEAPr.png differ
diff --git a/Models/Effects/LightMappedWing.png b/Models/Effects/LightMappedWing.png
new file mode 100644
index 00000000..1d948f4a
Binary files /dev/null and b/Models/Effects/LightMappedWing.png differ
diff --git a/Models/Effects/PW1100G-l.png b/Models/Effects/PW1100G-l.png
new file mode 100644
index 00000000..584877ca
Binary files /dev/null and b/Models/Effects/PW1100G-l.png differ
diff --git a/Models/Effects/PW1100G-r.png b/Models/Effects/PW1100G-r.png
new file mode 100644
index 00000000..d10ca957
Binary files /dev/null and b/Models/Effects/PW1100G-r.png differ
diff --git a/Models/Effects/SlatL1.png b/Models/Effects/SlatL1.png
new file mode 100644
index 00000000..141697dd
Binary files /dev/null and b/Models/Effects/SlatL1.png differ
diff --git a/Models/Effects/SlatL2.png b/Models/Effects/SlatL2.png
new file mode 100644
index 00000000..88c4af28
Binary files /dev/null and b/Models/Effects/SlatL2.png differ
diff --git a/Models/Effects/SlatR1.png b/Models/Effects/SlatR1.png
new file mode 100644
index 00000000..d20a9e06
Binary files /dev/null and b/Models/Effects/SlatR1.png differ
diff --git a/Models/Effects/SlatR2.png b/Models/Effects/SlatR2.png
new file mode 100644
index 00000000..8b62eb44
Binary files /dev/null and b/Models/Effects/SlatR2.png differ
diff --git a/Models/Effects/engineLEAPl.eff b/Models/Effects/engineLEAPl.eff
new file mode 100644
index 00000000..fb51edd2
--- /dev/null
+++ b/Models/Effects/engineLEAPl.eff
@@ -0,0 +1,22 @@
+<PropertyList>
+    <name>leapl</name>
+    <inherits-from>Effects/model-combined-deferred</inherits-from>
+    <parameters>
+        <normalmap-enabled type="int">0</normalmap-enabled>
+        <reflection-enabled type="int">1</reflection-enabled>
+        <reflection-dynamic type="int">0</reflection-dynamic>
+        <reflect_map-enabled type="int">0</reflect_map-enabled>
+        <reflection-correction type="float">0.1</reflection-correction>
+        <lightmap-enabled type="int">1</lightmap-enabled>
+        <lightmap-multi type="int">0</lightmap-multi>
+        <lightmap-factor type="float" n="0"><use>controls/lighting/wing-lights</use></lightmap-factor>
+        <lightmap-color type="vec3d" n="0">1.0 1.0 1.0</lightmap-color>
+        <texture n="3">
+            <image>Aircraft/A320Family/Models/Effects/LEAPl.png</image>
+            <filter>linear-mipmap-linear</filter>
+            <wrap-s>clamp</wrap-s>
+            <wrap-t>clamp</wrap-t>
+            <internal-format>normalized</internal-format>
+        </texture>
+    </parameters>
+</PropertyList>
diff --git a/Models/Effects/engineLEAPr.eff b/Models/Effects/engineLEAPr.eff
new file mode 100644
index 00000000..51a5039e
--- /dev/null
+++ b/Models/Effects/engineLEAPr.eff
@@ -0,0 +1,22 @@
+<PropertyList>
+    <name>leapr</name>
+    <inherits-from>Effects/model-combined-deferred</inherits-from>
+    <parameters>
+        <normalmap-enabled type="int">0</normalmap-enabled>
+        <reflection-enabled type="int">1</reflection-enabled>
+        <reflection-dynamic type="int">0</reflection-dynamic>
+        <reflect_map-enabled type="int">0</reflect_map-enabled>
+        <reflection-correction type="float">0.1</reflection-correction>
+        <lightmap-enabled type="int">1</lightmap-enabled>
+        <lightmap-multi type="int">0</lightmap-multi>
+        <lightmap-factor type="float" n="0"><use>controls/lighting/wing-lights</use></lightmap-factor>
+        <lightmap-color type="vec3d" n="0">1.0 1.0 1.0</lightmap-color>
+        <texture n="3">
+            <image>Aircraft/A320Family/Models/Effects/LEAPr.png</image>
+            <filter>linear-mipmap-linear</filter>
+            <wrap-s>clamp</wrap-s>
+            <wrap-t>clamp</wrap-t>
+            <internal-format>normalized</internal-format>
+        </texture>
+    </parameters>
+</PropertyList>
diff --git a/Models/Effects/enginePW1100L.eff b/Models/Effects/enginePW1100L.eff
new file mode 100644
index 00000000..2a59a7d0
--- /dev/null
+++ b/Models/Effects/enginePW1100L.eff
@@ -0,0 +1,22 @@
+<PropertyList>
+    <name>pwlightmap</name>
+    <inherits-from>Effects/model-combined-deferred</inherits-from>
+    <parameters>
+        <normalmap-enabled type="int">0</normalmap-enabled>
+        <reflection-enabled type="int">1</reflection-enabled>
+        <reflection-dynamic type="int">0</reflection-dynamic>
+        <reflect_map-enabled type="int">0</reflect_map-enabled>
+        <reflection-correction type="float">0.1</reflection-correction>
+        <lightmap-enabled type="int">1</lightmap-enabled>
+        <lightmap-multi type="int">0</lightmap-multi>
+        <lightmap-factor type="float" n="0"><use>controls/lighting/wing-lights</use></lightmap-factor>
+        <lightmap-color type="vec3d" n="0">1.0 1.0 1.0</lightmap-color>
+        <texture n="3">
+            <image>Aircraft/A320Family/Models/Effects/PW1100G-l.png</image>
+            <filter>linear-mipmap-linear</filter>
+            <wrap-s>clamp</wrap-s>
+            <wrap-t>clamp</wrap-t>
+            <internal-format>normalized</internal-format>
+        </texture>
+    </parameters>
+</PropertyList>
diff --git a/Models/Effects/enginePW1100R.eff b/Models/Effects/enginePW1100R.eff
new file mode 100644
index 00000000..e96ead70
--- /dev/null
+++ b/Models/Effects/enginePW1100R.eff
@@ -0,0 +1,22 @@
+<PropertyList>
+    <name>pwlightmap</name>
+    <inherits-from>Effects/model-combined-deferred</inherits-from>
+    <parameters>
+        <normalmap-enabled type="int">0</normalmap-enabled>
+        <reflection-enabled type="int">1</reflection-enabled>
+        <reflection-dynamic type="int">0</reflection-dynamic>
+        <reflect_map-enabled type="int">0</reflect_map-enabled>
+        <reflection-correction type="float">0.1</reflection-correction>
+        <lightmap-enabled type="int">1</lightmap-enabled>
+        <lightmap-multi type="int">0</lightmap-multi>
+        <lightmap-factor type="float" n="0"><use>controls/lighting/wing-lights</use></lightmap-factor>
+        <lightmap-color type="vec3d" n="0">1.0 1.0 1.0</lightmap-color>
+        <texture n="3">
+            <image>Aircraft/A320Family/Models/Effects/PW1100G-r.png</image>
+            <filter>linear-mipmap-linear</filter>
+            <wrap-s>clamp</wrap-s>
+            <wrap-t>clamp</wrap-t>
+            <internal-format>normalized</internal-format>
+        </texture>
+    </parameters>
+</PropertyList>
diff --git a/Models/Effects/logo.eff b/Models/Effects/logo.eff
new file mode 100644
index 00000000..0f3bcf45
--- /dev/null
+++ b/Models/Effects/logo.eff
@@ -0,0 +1,22 @@
+<PropertyList>
+    <name>logo</name>
+    <inherits-from>Effects/model-combined-deferred</inherits-from>
+    <parameters>
+        <normalmap-enabled type="int">0</normalmap-enabled>
+        <reflection-enabled type="int">0</reflection-enabled>
+        <reflection-dynamic type="int">0</reflection-dynamic>
+        <reflect_map-enabled type="int">0</reflect_map-enabled>
+        <reflection-correction type="float">0.1</reflection-correction>
+        <lightmap-enabled type="int">1</lightmap-enabled>
+        <lightmap-multi type="int">0</lightmap-multi>
+        <lightmap-factor type="float" n="0"><use>/sim/model/lights/logo-lights</use></lightmap-factor>
+        <lightmap-color type="vec3d" n="0">1.0 1.0 1.0</lightmap-color>
+        <texture n="3">
+            <image>Aircraft/A320Family/Models/Effects/logo.png</image>
+            <filter>linear-mipmap-linear</filter>
+            <wrap-s>clamp</wrap-s>
+            <wrap-t>clamp</wrap-t>
+            <internal-format>normalized</internal-format>
+        </texture>
+    </parameters>
+</PropertyList>
diff --git a/Models/Effects/logo.png b/Models/Effects/logo.png
new file mode 100644
index 00000000..dd1c2ec6
Binary files /dev/null and b/Models/Effects/logo.png differ
diff --git a/Models/Effects/slatL1.eff b/Models/Effects/slatL1.eff
new file mode 100644
index 00000000..d267fdff
--- /dev/null
+++ b/Models/Effects/slatL1.eff
@@ -0,0 +1,22 @@
+<PropertyList>
+    <name>slatl1</name>
+    <inherits-from>Effects/model-combined-deferred</inherits-from>
+    <parameters>
+        <normalmap-enabled type="int">0</normalmap-enabled>
+        <reflection-enabled type="int">1</reflection-enabled>
+        <reflection-dynamic type="int">0</reflection-dynamic>
+        <reflect_map-enabled type="int">0</reflect_map-enabled>
+        <reflection-correction type="float">0.1</reflection-correction>
+        <lightmap-enabled type="int">1</lightmap-enabled>
+        <lightmap-multi type="int">0</lightmap-multi>
+        <lightmap-factor type="float" n="0"><use>controls/lighting/wing-lights</use></lightmap-factor>
+        <lightmap-color type="vec3d" n="0">1.0 1.0 1.0</lightmap-color>
+        <texture n="3">
+            <image>Aircraft/A320Family/Models/Effects/SlatL1.png</image>
+            <filter>linear-mipmap-linear</filter>
+            <wrap-s>clamp</wrap-s>
+            <wrap-t>clamp</wrap-t>
+            <internal-format>normalized</internal-format>
+        </texture>
+    </parameters>
+</PropertyList>
diff --git a/Models/Effects/slatL2.eff b/Models/Effects/slatL2.eff
new file mode 100644
index 00000000..fca1b684
--- /dev/null
+++ b/Models/Effects/slatL2.eff
@@ -0,0 +1,22 @@
+<PropertyList>
+    <name>slatl2</name>
+    <inherits-from>Effects/model-combined-deferred</inherits-from>
+    <parameters>
+        <normalmap-enabled type="int">0</normalmap-enabled>
+        <reflection-enabled type="int">1</reflection-enabled>
+        <reflection-dynamic type="int">0</reflection-dynamic>
+        <reflect_map-enabled type="int">0</reflect_map-enabled>
+        <reflection-correction type="float">0.1</reflection-correction>
+        <lightmap-enabled type="int">1</lightmap-enabled>
+        <lightmap-multi type="int">0</lightmap-multi>
+        <lightmap-factor type="float" n="0"><use>controls/lighting/wing-lights</use></lightmap-factor>
+        <lightmap-color type="vec3d" n="0">1.0 1.0 1.0</lightmap-color>
+        <texture n="3">
+            <image>Aircraft/A320Family/Models/Effects/SlatL2.png</image>
+            <filter>linear-mipmap-linear</filter>
+            <wrap-s>clamp</wrap-s>
+            <wrap-t>clamp</wrap-t>
+            <internal-format>normalized</internal-format>
+        </texture>
+    </parameters>
+</PropertyList>
diff --git a/Models/Effects/slatR1.eff b/Models/Effects/slatR1.eff
new file mode 100644
index 00000000..d9a55cc4
--- /dev/null
+++ b/Models/Effects/slatR1.eff
@@ -0,0 +1,22 @@
+<PropertyList>
+    <name>slatr1</name>
+    <inherits-from>Effects/model-combined-deferred</inherits-from>
+    <parameters>
+        <normalmap-enabled type="int">0</normalmap-enabled>
+        <reflection-enabled type="int">1</reflection-enabled>
+        <reflection-dynamic type="int">0</reflection-dynamic>
+        <reflect_map-enabled type="int">0</reflect_map-enabled>
+        <reflection-correction type="float">0.1</reflection-correction>
+        <lightmap-enabled type="int">1</lightmap-enabled>
+        <lightmap-multi type="int">0</lightmap-multi>
+        <lightmap-factor type="float" n="0"><use>controls/lighting/wing-lights</use></lightmap-factor>
+        <lightmap-color type="vec3d" n="0">1.0 1.0 1.0</lightmap-color>
+        <texture n="3">
+            <image>Aircraft/A320Family/Models/Effects/SlatR1.png</image>
+            <filter>linear-mipmap-linear</filter>
+            <wrap-s>clamp</wrap-s>
+            <wrap-t>clamp</wrap-t>
+            <internal-format>normalized</internal-format>
+        </texture>
+    </parameters>
+</PropertyList>
diff --git a/Models/Effects/slatR2.eff b/Models/Effects/slatR2.eff
new file mode 100644
index 00000000..ab10a644
--- /dev/null
+++ b/Models/Effects/slatR2.eff
@@ -0,0 +1,22 @@
+<PropertyList>
+    <name>slatr2</name>
+    <inherits-from>Effects/model-combined-deferred</inherits-from>
+    <parameters>
+        <normalmap-enabled type="int">0</normalmap-enabled>
+        <reflection-enabled type="int">1</reflection-enabled>
+        <reflection-dynamic type="int">0</reflection-dynamic>
+        <reflect_map-enabled type="int">0</reflect_map-enabled>
+        <reflection-correction type="float">0.1</reflection-correction>
+        <lightmap-enabled type="int">1</lightmap-enabled>
+        <lightmap-multi type="int">0</lightmap-multi>
+        <lightmap-factor type="float" n="0"><use>controls/lighting/wing-lights</use></lightmap-factor>
+        <lightmap-color type="vec3d" n="0">1.0 1.0 1.0</lightmap-color>
+        <texture n="3">
+            <image>Aircraft/A320Family/Models/Effects/SlatR2.png</image>
+            <filter>linear-mipmap-linear</filter>
+            <wrap-s>clamp</wrap-s>
+            <wrap-t>clamp</wrap-t>
+            <internal-format>normalized</internal-format>
+        </texture>
+    </parameters>
+</PropertyList>
diff --git a/Models/Effects/winglightmap.eff b/Models/Effects/winglightmap.eff
new file mode 100644
index 00000000..2dfd467d
--- /dev/null
+++ b/Models/Effects/winglightmap.eff
@@ -0,0 +1,33 @@
+<PropertyList>
+    <name>winglightmap</name>
+    <inherits-from>Effects/model-combined-deferred</inherits-from>
+    <parameters>
+        <normalmap-enabled type="int">0</normalmap-enabled>
+        <reflection-enabled type="int">1</reflection-enabled>
+        <reflection-dynamic type="int">1</reflection-dynamic>
+        <reflect_map-enabled type="int">0</reflect_map-enabled>
+        <reflection-correction type="float">0.1</reflection-correction>
+        <lightmap-enabled type="int">1</lightmap-enabled>
+        <lightmap-multi type="int">0</lightmap-multi>
+        <lightmap-factor type="float" n="0"><use>controls/lighting/wing-lights</use></lightmap-factor>
+        <lightmap-color type="vec3d" n="0">1.0 1.0 1.0</lightmap-color>
+        <texture n="3">
+            <image>Aircraft/A320Family/Models/Effects/LightMappedWing.png</image>
+            <filter>linear-mipmap-linear</filter>
+            <wrap-s>clamp</wrap-s>
+            <wrap-t>clamp</wrap-t>
+            <internal-format>normalized</internal-format>
+        </texture>
+        <texture n="5">
+            <type>cubemap</type>
+            <images>
+                <positive-x>Aircraft/Generic/Effects/fgfs-sky2/1.png</positive-x>
+                <negative-x>Aircraft/Generic/Effects/fgfs-sky2/4.png</negative-x>
+                <positive-y>Aircraft/Generic/Effects/fgfs-sky2/2.png</positive-y>
+                <negative-y>Aircraft/Generic/Effects/fgfs-sky2/3.png</negative-y>
+                <positive-z>Aircraft/Generic/Effects/fgfs-sky2/6.png</positive-z>
+                <negative-z>Aircraft/Generic/Effects/fgfs-sky2/5.png</negative-z>
+            </images>
+        </texture>
+    </parameters>
+</PropertyList>
diff --git a/Models/Engines/NEO/LeapXLeft.xml b/Models/Engines/NEO/LeapXLeft.xml
index 1664ab24..60b2e01d 100644
--- a/Models/Engines/NEO/LeapXLeft.xml
+++ b/Models/Engines/NEO/LeapXLeft.xml
@@ -92,5 +92,11 @@
 			<z>0</z>
 		</axis>
 	</animation>
+	
+	<effect>
+        <inherits-from>Aircraft/A320Family/Models/Effects/engineLEAPl</inherits-from>
+        <object-name>Nacelle</object-name>
+        <object-name>Reverser</object-name>
+	</effect>
 
 </PropertyList>
diff --git a/Models/Engines/NEO/LeapXRight.xml b/Models/Engines/NEO/LeapXRight.xml
index 735136b7..fdb0d60b 100644
--- a/Models/Engines/NEO/LeapXRight.xml
+++ b/Models/Engines/NEO/LeapXRight.xml
@@ -92,5 +92,11 @@
 			<z>0</z>
 		</axis>
 	</animation>
+	
+	<effect>
+        <inherits-from>Aircraft/A320Family/Models/Effects/engineLEAPr</inherits-from>
+        <object-name>Nacelle</object-name>
+        <object-name>Reverser</object-name>
+	</effect>
 
 </PropertyList>
diff --git a/Models/Engines/NEO/PW1100GLeft.xml b/Models/Engines/NEO/PW1100GLeft.xml
index 6c81d032..bb74a2a4 100644
--- a/Models/Engines/NEO/PW1100GLeft.xml
+++ b/Models/Engines/NEO/PW1100GLeft.xml
@@ -79,5 +79,12 @@
 			<z>0</z>
 		</axis>
 	</animation>
+	
+	<effect>
+        <inherits-from>Aircraft/A320Family/Models/Effects/enginePW1100L</inherits-from>
+        <object-name>NacellePW1100G</object-name>
+        <object-name>ReverserPW1100G</object-name>
+        <object-name>SpoilersPW1100G</object-name>
+	</effect>
 
 </PropertyList>
diff --git a/Models/Engines/NEO/PW1100GRight.xml b/Models/Engines/NEO/PW1100GRight.xml
index ec8a8d29..ba535548 100644
--- a/Models/Engines/NEO/PW1100GRight.xml
+++ b/Models/Engines/NEO/PW1100GRight.xml
@@ -79,5 +79,12 @@
 			<z>0</z>
 		</axis>
 	</animation>
+	
+	<effect>
+        <inherits-from>Aircraft/A320Family/Models/Effects/enginePW1100R</inherits-from>
+        <object-name>NacellePW1100G</object-name>
+        <object-name>ReverserPW1100G</object-name>
+        <object-name>SpoilersPW1100G</object-name>
+	</effect>
 
 </PropertyList>
diff --git a/Models/Fuselages/A318/vstab.xml b/Models/Fuselages/A318/vstab.xml
index 9d644280..12bd75f5 100644
--- a/Models/Fuselages/A318/vstab.xml
+++ b/Models/Fuselages/A318/vstab.xml
@@ -33,7 +33,7 @@
 		</axis>
 	</animation>
 
-	<!-- Animation for the logo light -->
+	<!-- Animation for the logo light
 	<animation>
 		<name>Logo light illumination</name>
 		<type>material</type>
@@ -41,8 +41,8 @@
 		<object-name>Rudder</object-name>
 		<condition>
 			<equals>
-				<property>controls/lighting/nav-lights-switch</property>
-				<value>2</value>
+				<property>/sim/model/lights/logo-lights</property>
+				<value>1</value>
 			</equals>
 		</condition>
 		<emission>
@@ -50,6 +50,12 @@
 			<green>0.25</green>
 			<blue>0.25</blue>
 		</emission>
-	</animation>
+	</animation> -->
+	
+	<effect>
+        <inherits-from>Aircraft/A320Family/Models/Effects/logo</inherits-from>
+		<object-name>Vstab</object-name>
+		<object-name>Rudder</object-name>
+	</effect>
 
 </PropertyList>
diff --git a/Models/Fuselages/A319/vstab.xml b/Models/Fuselages/A319/vstab.xml
index 9d644280..12bd75f5 100644
--- a/Models/Fuselages/A319/vstab.xml
+++ b/Models/Fuselages/A319/vstab.xml
@@ -33,7 +33,7 @@
 		</axis>
 	</animation>
 
-	<!-- Animation for the logo light -->
+	<!-- Animation for the logo light
 	<animation>
 		<name>Logo light illumination</name>
 		<type>material</type>
@@ -41,8 +41,8 @@
 		<object-name>Rudder</object-name>
 		<condition>
 			<equals>
-				<property>controls/lighting/nav-lights-switch</property>
-				<value>2</value>
+				<property>/sim/model/lights/logo-lights</property>
+				<value>1</value>
 			</equals>
 		</condition>
 		<emission>
@@ -50,6 +50,12 @@
 			<green>0.25</green>
 			<blue>0.25</blue>
 		</emission>
-	</animation>
+	</animation> -->
+	
+	<effect>
+        <inherits-from>Aircraft/A320Family/Models/Effects/logo</inherits-from>
+		<object-name>Vstab</object-name>
+		<object-name>Rudder</object-name>
+	</effect>
 
 </PropertyList>
diff --git a/Models/Fuselages/A320-100/vstab.xml b/Models/Fuselages/A320-100/vstab.xml
index 9d644280..12bd75f5 100644
--- a/Models/Fuselages/A320-100/vstab.xml
+++ b/Models/Fuselages/A320-100/vstab.xml
@@ -33,7 +33,7 @@
 		</axis>
 	</animation>
 
-	<!-- Animation for the logo light -->
+	<!-- Animation for the logo light
 	<animation>
 		<name>Logo light illumination</name>
 		<type>material</type>
@@ -41,8 +41,8 @@
 		<object-name>Rudder</object-name>
 		<condition>
 			<equals>
-				<property>controls/lighting/nav-lights-switch</property>
-				<value>2</value>
+				<property>/sim/model/lights/logo-lights</property>
+				<value>1</value>
 			</equals>
 		</condition>
 		<emission>
@@ -50,6 +50,12 @@
 			<green>0.25</green>
 			<blue>0.25</blue>
 		</emission>
-	</animation>
+	</animation> -->
+	
+	<effect>
+        <inherits-from>Aircraft/A320Family/Models/Effects/logo</inherits-from>
+		<object-name>Vstab</object-name>
+		<object-name>Rudder</object-name>
+	</effect>
 
 </PropertyList>
diff --git a/Models/Fuselages/A320/vstab.xml b/Models/Fuselages/A320/vstab.xml
index 9d644280..12bd75f5 100644
--- a/Models/Fuselages/A320/vstab.xml
+++ b/Models/Fuselages/A320/vstab.xml
@@ -33,7 +33,7 @@
 		</axis>
 	</animation>
 
-	<!-- Animation for the logo light -->
+	<!-- Animation for the logo light
 	<animation>
 		<name>Logo light illumination</name>
 		<type>material</type>
@@ -41,8 +41,8 @@
 		<object-name>Rudder</object-name>
 		<condition>
 			<equals>
-				<property>controls/lighting/nav-lights-switch</property>
-				<value>2</value>
+				<property>/sim/model/lights/logo-lights</property>
+				<value>1</value>
 			</equals>
 		</condition>
 		<emission>
@@ -50,6 +50,12 @@
 			<green>0.25</green>
 			<blue>0.25</blue>
 		</emission>
-	</animation>
+	</animation> -->
+	
+	<effect>
+        <inherits-from>Aircraft/A320Family/Models/Effects/logo</inherits-from>
+		<object-name>Vstab</object-name>
+		<object-name>Rudder</object-name>
+	</effect>
 
 </PropertyList>
diff --git a/Models/Fuselages/A320neo/vstab.xml b/Models/Fuselages/A320neo/vstab.xml
index 9d644280..12bd75f5 100644
--- a/Models/Fuselages/A320neo/vstab.xml
+++ b/Models/Fuselages/A320neo/vstab.xml
@@ -33,7 +33,7 @@
 		</axis>
 	</animation>
 
-	<!-- Animation for the logo light -->
+	<!-- Animation for the logo light
 	<animation>
 		<name>Logo light illumination</name>
 		<type>material</type>
@@ -41,8 +41,8 @@
 		<object-name>Rudder</object-name>
 		<condition>
 			<equals>
-				<property>controls/lighting/nav-lights-switch</property>
-				<value>2</value>
+				<property>/sim/model/lights/logo-lights</property>
+				<value>1</value>
 			</equals>
 		</condition>
 		<emission>
@@ -50,6 +50,12 @@
 			<green>0.25</green>
 			<blue>0.25</blue>
 		</emission>
-	</animation>
+	</animation> -->
+	
+	<effect>
+        <inherits-from>Aircraft/A320Family/Models/Effects/logo</inherits-from>
+		<object-name>Vstab</object-name>
+		<object-name>Rudder</object-name>
+	</effect>
 
 </PropertyList>
diff --git a/Models/Fuselages/A321/vstab.xml b/Models/Fuselages/A321/vstab.xml
index 9d644280..12bd75f5 100644
--- a/Models/Fuselages/A321/vstab.xml
+++ b/Models/Fuselages/A321/vstab.xml
@@ -33,7 +33,7 @@
 		</axis>
 	</animation>
 
-	<!-- Animation for the logo light -->
+	<!-- Animation for the logo light
 	<animation>
 		<name>Logo light illumination</name>
 		<type>material</type>
@@ -41,8 +41,8 @@
 		<object-name>Rudder</object-name>
 		<condition>
 			<equals>
-				<property>controls/lighting/nav-lights-switch</property>
-				<value>2</value>
+				<property>/sim/model/lights/logo-lights</property>
+				<value>1</value>
 			</equals>
 		</condition>
 		<emission>
@@ -50,6 +50,12 @@
 			<green>0.25</green>
 			<blue>0.25</blue>
 		</emission>
-	</animation>
+	</animation> -->
+	
+	<effect>
+        <inherits-from>Aircraft/A320Family/Models/Effects/logo</inherits-from>
+		<object-name>Vstab</object-name>
+		<object-name>Rudder</object-name>
+	</effect>
 
 </PropertyList>
diff --git a/Models/Fuselages/A321neo/vstab.xml b/Models/Fuselages/A321neo/vstab.xml
index 9d644280..12bd75f5 100644
--- a/Models/Fuselages/A321neo/vstab.xml
+++ b/Models/Fuselages/A321neo/vstab.xml
@@ -33,7 +33,7 @@
 		</axis>
 	</animation>
 
-	<!-- Animation for the logo light -->
+	<!-- Animation for the logo light
 	<animation>
 		<name>Logo light illumination</name>
 		<type>material</type>
@@ -41,8 +41,8 @@
 		<object-name>Rudder</object-name>
 		<condition>
 			<equals>
-				<property>controls/lighting/nav-lights-switch</property>
-				<value>2</value>
+				<property>/sim/model/lights/logo-lights</property>
+				<value>1</value>
 			</equals>
 		</condition>
 		<emission>
@@ -50,6 +50,12 @@
 			<green>0.25</green>
 			<blue>0.25</blue>
 		</emission>
-	</animation>
+	</animation> -->
+	
+	<effect>
+        <inherits-from>Aircraft/A320Family/Models/Effects/logo</inherits-from>
+		<object-name>Vstab</object-name>
+		<object-name>Rudder</object-name>
+	</effect>
 
 </PropertyList>
diff --git a/Models/Lights/ALS/beacon.xml b/Models/Lights/ALS/beacon.xml
index 6ae79744..09346a45 100644
--- a/Models/Lights/ALS/beacon.xml
+++ b/Models/Lights/ALS/beacon.xml
@@ -14,9 +14,9 @@
 
  <animation>
   <type>scale</type>
-  <x-offset>0.5</x-offset>
-  <y-offset>0.5</y-offset>
-  <z-offset>0.5</z-offset>
+  <x-offset>1</x-offset>
+  <y-offset>1</y-offset>
+  <z-offset>1</z-offset>
  </animation>
  
 
diff --git a/Models/Wings/a320.wings.cfm.xml b/Models/Wings/a320.wings.cfm.xml
index 486461c4..9018b2ff 100644
--- a/Models/Wings/a320.wings.cfm.xml
+++ b/Models/Wings/a320.wings.cfm.xml
@@ -825,4 +825,29 @@
 			<z>-1</z>
 		</axis>
 	</animation>
+	
+	<effect>
+        <inherits-from>Aircraft/A320Family/Models/Effects/winglightmap</inherits-from>
+		<object-name>Wings</object-name>
+	</effect>
+	
+	<effect>
+        <inherits-from>Aircraft/A320Family/Models/Effects/slatL1</inherits-from>
+		<object-name>SlatL1</object-name>
+	</effect>
+	
+	<effect>
+        <inherits-from>Aircraft/A320Family/Models/Effects/slatL2</inherits-from>
+		<object-name>SlatL2</object-name>
+	</effect>
+	
+	<effect>
+        <inherits-from>Aircraft/A320Family/Models/Effects/slatR1</inherits-from>
+		<object-name>SlatR1</object-name>
+	</effect>
+	
+	<effect>
+        <inherits-from>Aircraft/A320Family/Models/Effects/slatR2</inherits-from>
+		<object-name>SlatR2</object-name>
+	</effect>
 </PropertyList>
diff --git a/Models/Wings/a320.wings.iae.xml b/Models/Wings/a320.wings.iae.xml
index 7b9be577..c53e79ad 100644
--- a/Models/Wings/a320.wings.iae.xml
+++ b/Models/Wings/a320.wings.iae.xml
@@ -825,4 +825,29 @@
 			<z>-1</z>
 		</axis>
 	</animation>
+	
+	<effect>
+        <inherits-from>Aircraft/A320Family/Models/Effects/winglightmap</inherits-from>
+		<object-name>Wings</object-name>
+	</effect>
+	
+	<effect>
+        <inherits-from>Aircraft/A320Family/Models/Effects/slatL1</inherits-from>
+		<object-name>SlatL1</object-name>
+	</effect>
+	
+	<effect>
+        <inherits-from>Aircraft/A320Family/Models/Effects/slatL2</inherits-from>
+		<object-name>SlatL2</object-name>
+	</effect>
+	
+	<effect>
+        <inherits-from>Aircraft/A320Family/Models/Effects/slatR1</inherits-from>
+		<object-name>SlatR1</object-name>
+	</effect>
+	
+	<effect>
+        <inherits-from>Aircraft/A320Family/Models/Effects/slatR2</inherits-from>
+		<object-name>SlatR2</object-name>
+	</effect>
 </PropertyList>
diff --git a/Models/Wings/a320.wings.neocfm.xml b/Models/Wings/a320.wings.neocfm.xml
index 67c7b323..ef36ea4d 100644
--- a/Models/Wings/a320.wings.neocfm.xml
+++ b/Models/Wings/a320.wings.neocfm.xml
@@ -825,4 +825,28 @@
 			<z>-1</z>
 		</axis>
 	</animation>
+	<effect>
+        <inherits-from>Aircraft/A320Family/Models/Effects/winglightmap</inherits-from>
+		<object-name>Wings</object-name>
+	</effect>
+	
+	<effect>
+        <inherits-from>Aircraft/A320Family/Models/Effects/slatL1</inherits-from>
+		<object-name>SlatL1</object-name>
+	</effect>
+	
+	<effect>
+        <inherits-from>Aircraft/A320Family/Models/Effects/slatL2</inherits-from>
+		<object-name>SlatL2</object-name>
+	</effect>
+	
+	<effect>
+        <inherits-from>Aircraft/A320Family/Models/Effects/slatR1</inherits-from>
+		<object-name>SlatR1</object-name>
+	</effect>
+	
+	<effect>
+        <inherits-from>Aircraft/A320Family/Models/Effects/slatR2</inherits-from>
+		<object-name>SlatR2</object-name>
+	</effect>
 </PropertyList>
diff --git a/Models/Wings/a320.wings.neopw.xml b/Models/Wings/a320.wings.neopw.xml
index 8b1b0c8e..f4a1ee49 100644
--- a/Models/Wings/a320.wings.neopw.xml
+++ b/Models/Wings/a320.wings.neopw.xml
@@ -825,4 +825,30 @@
 			<z>-1</z>
 		</axis>
 	</animation>
+	
+	<effect>
+        <inherits-from>Aircraft/A320Family/Models/Effects/winglightmap</inherits-from>
+		<object-name>Wings</object-name>
+	</effect>
+	
+	<effect>
+        <inherits-from>Aircraft/A320Family/Models/Effects/slatL1</inherits-from>
+		<object-name>SlatL1</object-name>
+	</effect>
+	
+	<effect>
+        <inherits-from>Aircraft/A320Family/Models/Effects/slatL2</inherits-from>
+		<object-name>SlatL2</object-name>
+	</effect>
+	
+	<effect>
+        <inherits-from>Aircraft/A320Family/Models/Effects/slatR1</inherits-from>
+		<object-name>SlatR1</object-name>
+	</effect>
+	
+	<effect>
+        <inherits-from>Aircraft/A320Family/Models/Effects/slatR2</inherits-from>
+		<object-name>SlatR2</object-name>
+	</effect>
+
 </PropertyList>
diff --git a/Nasal/libraries.nas b/Nasal/libraries.nas
index 2c95256a..af7193bc 100644
--- a/Nasal/libraries.nas
+++ b/Nasal/libraries.nas
@@ -20,12 +20,13 @@ print("-------------------------------------------------------------------------
 print(" ");
 
 # Dimmers
-setprop("/controls/lighting/ndl-norm", 0);
-setprop("/controls/lighting/ndr-norm", 0);
-setprop("/controls/lighting/upper-norm", 0);
+setprop("/controls/lighting/ndl-norm", 1);
+setprop("/controls/lighting/ndr-norm", 1);
+setprop("/controls/lighting/upper-norm", 1);
 
 # Lights
-setprop("/sim/model/lights/nose-lights", 1);
+setprop("/sim/model/lights/nose-lights", 0);
+setprop("/sim/model/lights/turnoffsw", 0);
 
 # Oil Qty
 var qty1 = math.round((rand() * 5 ) + 20, 0.1);
@@ -43,38 +44,35 @@ var strobe = aircraft.light.new("/sim/model/lights/strobe", [0.025, 1.5], "/cont
 
 setlistener("controls/lighting/nav-lights-switch", func {
 	var nav_lights = props.globals.getNode("/sim/model/lights/nav-lights");
-	var logo_lights = props.globals.getNode("/sim/model/lights/logo-lights");
 	var setting = getprop("/controls/lighting/nav-lights-switch");
 	if (setting == 1) {
 		nav_lights.setBoolValue(1);
-		logo_lights.setBoolValue(0);
 	} else if (setting == 2) {
 		nav_lights.setBoolValue(1);
-		logo_lights.setBoolValue(1);
 	} else {
 		nav_lights.setBoolValue(0);
-		logo_lights.setBoolValue(0);
 	}
 });
 
 setlistener("controls/lighting/taxi-light-switch", func {
 	var nose_lights = getprop("/sim/model/lights/nose-lights");
 	var settingT = getprop("/controls/lighting/taxi-light-switch");
+	var gear = getprop("/gear/gear[0]/position-norm");
 	if (settingT == 0) {
 		setprop("/sim/model/lights/nose-lights", 0);
-	} else if (settingT == 0.5) {
+	} else if (settingT == 0.5 and gear > 0.9) {
 		setprop("/sim/model/lights/nose-lights", 0.85);
-	} else if (settingT == 1) {
+	} else if (settingT == 1 and gear > 0.9) {
 		setprop("/sim/model/lights/nose-lights", 1);
 	}
 }, 1, 0);
- 
+
 setlistener("controls/lighting/landing-lights[1]", func {
 	var landl = getprop("/controls/lighting/landing-lights[1]");
 	if (landl == 1) {
-		setprop("/sim/rendering/als-secondary-lights/alt-landing-light",1);
+		setprop("/sim/rendering/als-secondary-lights/use-landing-light",1);
 	} else {
-		setprop("/sim/rendering/als-secondary-lights/alt-landing-light",0);
+		setprop("/sim/rendering/als-secondary-lights/use-landing-light",0);
 	}
 });
 
@@ -223,6 +221,8 @@ setlistener("/sim/signals/fdm-initialized", func {
 	setprop("/it-autoflight/input/fd2", 1);
 	libraries.ECAMinit();
 	libraries.variousReset();
+	logoTimer.start();
+	noseLoop.start();
 });
 
 var librariesLoop = maketimer(0.1, func {
@@ -372,3 +372,38 @@ var flaptimer = maketimer(0.5, func {
 		flaptimer.stop();
 	}
 });
+
+var logoTimer = maketimer(0.1, func {
+	var logo_lights = props.globals.getNode("/sim/model/lights/logo-lights");
+	var setting = getprop("/controls/lighting/nav-lights-switch");
+	var wow = getprop("/gear/gear[2]/wow");
+	var slats = getprop("/controls/flight/slats");
+	if (setting == 2) {
+		if (wow or slats == 1) {
+			logo_lights.setBoolValue(1);
+		} else if (!wow and slats < 1) {
+			logo_lights.setBoolValue(0);
+		} else {
+			logo_lights.setBoolValue(0);
+			print("Logo Lights: Unknown Condition"); # this is important for debugging
+		}
+	}
+});
+
+var noseLoop = maketimer(0.1, func {
+	var gear = getprop("/gear/gear[0]/position-norm");
+	var nose_lights = getprop("/sim/model/lights/nose-lights");
+	var settingT = getprop("/controls/lighting/taxi-light-switch");
+	if (gear < 1) { 
+		setprop("/sim/model/lights/nose-lights", 0);
+	} else if (settingT == 0) {
+		setprop("/sim/model/lights/nose-lights", 0);
+	} else if (settingT == 0.5 and gear > 0.9) {
+		setprop("/sim/model/lights/nose-lights", 0.85);
+	} else if (settingT == 1 and gear > 0.9) {
+		setprop("/sim/model/lights/nose-lights", 1);
+	} else {
+		setprop("/sim/model/lights/nose-lights", 0);
+		print("Nose Lights: Unknown Condition"); # this is important for debugging
+	}
+});