diff --git a/Models/A320neo-CFM.xml b/Models/A320neo-CFM.xml
index 0598bc2a..06c1f42c 100644
--- a/Models/A320neo-CFM.xml
+++ b/Models/A320neo-CFM.xml
@@ -18,9 +18,14 @@
 	
 	<!-- Nasal code -->
 	<nasal>
-		<load>
-			var livery_update = aircraft.livery_update.new("Aircraft/A320-family/Models/Liveries/A320/CFM-NEO");
-		</load>
+		<load><![CDATA[
+			var livery_update = aircraft.canvas_livery_update.init("Models/Liveries/A320/CFM-NEO", _module_id);
+			var elements = ["AileronL","AileronR","Antenna1","Antenna2","ApuFlap","AvionicsVentDoor","Cargo1","Cargo2","Cargo3","DoorL1","DoorL4","DoorR1","DoorR4","ElevatorL","ElevatorR","EngineFairingL","EngineFairingR","FairingL1","FairingL2","FairingL3","FairingR1","FairingR2","FairingR3","FlapL1","FlapL2","FlapR1","FlapR2","Fuselage","GPUServiceDoor","Hstabs","MLGGearDoorL","MLGGearDoorR","MLGWingDoorL1","MLGWingDoorL2","MLGWingDoorR1","MLGWingDoorR2","NLGAftDoorL","NLGAftDoorR","NLGFittingPanel","NLGForewardDoorL","NLGForewardDoorR","OutflowValveDoor1","OutflowValveDoor2","RatDoorL","RatDoorR","Rudder","Sharklet","SlatL1","SlatL2","SlatR1","SlatR2","SpoilerL1","SpoilerL2","SpoilerL3","SpoilerL4","SpoilerL5","SpoilerR1","SpoilerR2","SpoilerR3","SpoilerR4","SpoilerR5","Wings","WingtipFence"];
+			livery_update.createTarget("fuselage", elements, "sim/model/livery/texture-fuselage", resolution=8192);
+
+			elements = ["EngineLEAPL", "EngineLEAPL.007", "EngineLEAPL.Inner", "EngineLEAPR", "EngineLEAPR.Inner", "Exhaust2LEAPL", "Exhaust2LEAPR", "Exhaust3LEAPL", "Exhaust3LEAPR", "IntakeLEAPL", "IntakeLEAPR", "PylonLEAPL", "PylonLEAPR", "ReverserLDoorLEAP", "ReverserRDoorLEAP"];
+			livery_update.createTarget("engines", elements, "sim/model/livery/texture-engine");
+		]]></load>
 		<unload>
 			livery_update.stop();
 		</unload>
diff --git a/Models/A320neo-PW.xml b/Models/A320neo-PW.xml
index ec49b350..bfd251d5 100644
--- a/Models/A320neo-PW.xml
+++ b/Models/A320neo-PW.xml
@@ -18,9 +18,14 @@
 	
 	<!-- Nasal code -->
 	<nasal>
-		<load>
-			var livery_update = aircraft.livery_update.new("Aircraft/A320-family/Models/Liveries/A320/PW-NEO");
-		</load>
+		<load><![CDATA[
+			var livery_update = aircraft.canvas_livery_update.init("Models/Liveries/A320/PW-NEO", _module_id);
+			var elements = ["AileronL","AileronR","Antenna1","Antenna2","ApuFlap","AvionicsVentDoor","Cargo1","Cargo2","Cargo3","DoorL1","DoorL4","DoorR1","DoorR4","ElevatorL","ElevatorR","EngineFairingL","EngineFairingR","FairingL1","FairingL2","FairingL3","FairingR1","FairingR2","FairingR3","FlapL1","FlapL2","FlapR1","FlapR2","Fuselage","GPUServiceDoor","Hstabs","MLGGearDoorL","MLGGearDoorR","MLGWingDoorL1","MLGWingDoorL2","MLGWingDoorR1","MLGWingDoorR2","NLGAftDoorL","NLGAftDoorR","NLGFittingPanel","NLGForewardDoorL","NLGForewardDoorR","OutflowValveDoor1","OutflowValveDoor2","RatDoorL","RatDoorR","Rudder","Sharklet","SlatL1","SlatL2","SlatR1","SlatR2","SpoilerL1","SpoilerL2","SpoilerL3","SpoilerL4","SpoilerL5","SpoilerR1","SpoilerR2","SpoilerR3","SpoilerR4","SpoilerR5","Wings","WingtipFence"];
+			livery_update.createTarget("fuselage", elements, "sim/model/livery/texture-fuselage", resolution=8192);
+
+			elements = ["EnginePWPP", "EnginePWPPL.Inner", "EnginePWPPR", "EnginePWPPR.Inner", "Exhaust3PWPPL", "Exhaust3PWPPR", "Exxhaust2PWPPL", "Exxhaust2PWPPR", "IntakePWPPL", "IntakePWPPR", "PylonPWPPL", "PylonPWPPR", "ReverserLDoorLPWPP", "ReverserLDoorRPWPP"];
+			livery_update.createTarget("engines", elements, "sim/model/livery/texture-engine");
+		]]></load>
 		<unload>
 			livery_update.stop();
 		</unload>
diff --git a/Nasal/Libraries/libraries.nas b/Nasal/Libraries/libraries.nas
index 9e343e8d..4e50653a 100644
--- a/Nasal/Libraries/libraries.nas
+++ b/Nasal/Libraries/libraries.nas
@@ -47,6 +47,16 @@ if (aero == "A320-200-CFM") {
 	elements = ["EngineIAEV2500L","EngineIAEV2500R","ReverserLDoor","ReverserRDoor","PylonIAEV2500L","PylonIAEV2500R","IntakeIAEV2500L","IntakeIAEV2500R"];
 	livery.createTarget("engines", elements, "sim/model/livery/texture-engine");
 	livery.addLayer("engines", "dirt", "Aircraft/A320-family/Models/Liveries/A320/IAE/engine-dirt.png");
+} else if (aero == "A320neo-CFM") {
+	var livery = aircraft.canvas_livery.init("Models/Liveries/A320/CFM-NEO");
+	elements = ["EngineLEAPL", "EngineLEAPL.007", "EngineLEAPL.Inner", "EngineLEAPR", "EngineLEAPR.Inner", "Exhaust2LEAPL", "Exhaust2LEAPR", "Exhaust3LEAPL", "Exhaust3LEAPR", "IntakeLEAPL", "IntakeLEAPR", "PylonLEAPL", "PylonLEAPR", "ReverserLDoorLEAP", "ReverserRDoorLEAP"];
+	livery.createTarget("engines", elements, "sim/model/livery/texture-engine");
+#	livery.addLayer("engines", "dirt", "Aircraft/A320-family/Models/Liveries/A320/CFM-NEO/engine-dirt.png");
+} else if (aero == "A320neo-PW") {
+	var livery = aircraft.canvas_livery.init("Models/Liveries/A320/PW-NEO");
+	elements = ["EnginePWPP", "EnginePWPPL.Inner", "EnginePWPPR", "EnginePWPPR.Inner", "Exhaust3PWPPL", "Exhaust3PWPPR", "Exxhaust2PWPPL", "Exxhaust2PWPPR", "IntakePWPPL", "IntakePWPPR", "PylonPWPPL", "PylonPWPPR", "ReverserLDoorLPWPP", "ReverserLDoorRPWPP"];
+	livery.createTarget("engines", elements, "sim/model/livery/texture-engine");
+#	livery.addLayer("engines", "dirt", "Aircraft/A320-family/Models/Liveries/A320/PW-NEO/engine-dirt.png");
 }
 
 var elements = ["AileronL","AileronR","Antenna1","Antenna2","ApuFlap","AvionicsVentDoor","Cargo1","Cargo2","Cargo3","DoorL1","DoorL4","DoorR1","DoorR4","ElevatorL","ElevatorR","EngineFairingL","EngineFairingR","FairingL1","FairingL2","FairingL3","FairingR1","FairingR2","FairingR3","FlapL1","FlapL2","FlapR1","FlapR2","Fuselage","GPUServiceDoor","Hstabs","MLGGearDoorL","MLGGearDoorR","MLGWingDoorL1","MLGWingDoorL2","MLGWingDoorR1","MLGWingDoorR2","NLGAftDoorL","NLGAftDoorR","NLGFittingPanel","NLGForewardDoorL","NLGForewardDoorR","OutflowValveDoor1","OutflowValveDoor2","RatDoorL","RatDoorR","Rudder","Sharklet","SlatL1","SlatL2","SlatR1","SlatR2","SpoilerL1","SpoilerL2","SpoilerL3","SpoilerL4","SpoilerL5","SpoilerR1","SpoilerR2","SpoilerR3","SpoilerR4","SpoilerR5","Wings","WingtipFence"];