From 68a10483f66c9df514b7e95ade657b30f8ae51ff Mon Sep 17 00:00:00 2001
From: Joshua Davidson <joshuadavidson2000@gmail.com>
Date: Wed, 21 Jun 2017 16:52:34 -0400
Subject: [PATCH] A3XX: Improve ECAM during startup

---
 .../Upper-ECAM-EIS2/Upper-ECAM-CFM.xml        |  72 ++++++++--
 .../Upper-ECAM-EIS2/Upper-ECAM-IAE.xml        | 136 ++++++++++++------
 .../Instruments/Upper-ECAM/Upper-ECAM-CFM.xml |  72 ++++++++--
 .../Instruments/Upper-ECAM/Upper-ECAM-IAE.xml | 136 ++++++++++++------
 4 files changed, 304 insertions(+), 112 deletions(-)

diff --git a/Models/Instruments/Upper-ECAM-EIS2/Upper-ECAM-CFM.xml b/Models/Instruments/Upper-ECAM-EIS2/Upper-ECAM-CFM.xml
index 08eec1c9..61d11909 100644
--- a/Models/Instruments/Upper-ECAM-EIS2/Upper-ECAM-CFM.xml
+++ b/Models/Instruments/Upper-ECAM-EIS2/Upper-ECAM-CFM.xml
@@ -20,7 +20,7 @@
 				</not-equals>
 				<less-than>
 					<property>/engines/engine[0]/n2</property>
-					<value>5</value>
+					<value>2</value>
 				</less-than>
 			</and>
 		</condition>
@@ -38,12 +38,34 @@
 				</not-equals>
 				<less-than>
 					<property>/engines/engine[1]/n2</property>
-					<value>5</value>
+					<value>2</value>
 				</less-than>
 			</and>
 		</condition>
 	</animation>
 	
+	<animation>
+		<type>select</type>
+		<object-name>XX.3</object-name>
+		<condition>
+			<less-than>
+				<property>/engines/engine[0]/n2</property>
+				<value>2</value>
+			</less-than>
+		</condition>
+	</animation>
+	
+	<animation>
+		<type>select</type>
+		<object-name>XX.4</object-name>
+		<condition>
+			<less-than>
+				<property>/engines/engine[1]/n2</property>
+				<value>2</value>
+			</less-than>
+		</condition>
+	</animation>
+	
 	<animation>
 		<type>select</type>
 		<object-name>osgtext-green1</object-name>
@@ -61,7 +83,7 @@
 				</equals>
 				<greater-than-equals>
 					<property>/engines/engine[0]/n2</property>
-					<value>5</value>
+					<value>2</value>
 				</greater-than-equals>
 			</or>
 		</condition>
@@ -84,12 +106,34 @@
 				</equals>
 				<greater-than-equals>
 					<property>/engines/engine[1]/n2</property>
-					<value>5</value>
+					<value>2</value>
 				</greater-than-equals>
 			</or>
 		</condition>
 	</animation>
 	
+	<animation>
+		<type>select</type>
+		<object-name>osgtext-green3</object-name>
+		<condition>
+			<greater-than-equals>
+				<property>/engines/engine[0]/n2</property>
+				<value>2</value>
+			</greater-than-equals>
+		</condition>
+	</animation>
+	
+	<animation>
+		<type>select</type>
+		<object-name>osgtext-green4</object-name>
+		<condition>
+			<greater-than-equals>
+				<property>/engines/engine[1]/n2</property>
+				<value>2</value>
+			</greater-than-equals>
+		</condition>
+	</animation>
+	
 	<animation>
 		<type>select</type>
 		<object-name>thrpos1</object-name>
@@ -173,6 +217,8 @@
 		<object-name>osgtext-green</object-name>
 		<object-name>osgtext-green1</object-name>
 		<object-name>osgtext-green2</object-name>
+		<object-name>osgtext-green3</object-name>
+		<object-name>osgtext-green4</object-name>
 		<object-name>rev1.g</object-name>
 		<object-name>rev2.g</object-name>
 		<diffuse>
@@ -201,6 +247,8 @@
 		<type>material</type> <!-- Amber -->
 		<object-name>XX.1</object-name>
 		<object-name>XX.2</object-name>
+		<object-name>XX.3</object-name>
+		<object-name>XX.4</object-name>
         <diffuse>
             <red>1</red>
             <green>0.4</green>
@@ -571,7 +619,7 @@
 	<!-- N2 -->
 	
 	<text>
-		<name>osgtext-green1</name>
+		<name>osgtext-green3</name>
 		<offsets>
 			<x-m>0.0004</x-m>
 			<y-m>-0.0349</y-m>
@@ -595,7 +643,7 @@
 	</text>
 	
 	<text>
-		<name>osgtext-green2</name>
+		<name>osgtext-green4</name>
 		<offsets>
 			<x-m>0.0004</x-m>
 			<y-m>0.0336</y-m>
@@ -619,7 +667,7 @@
 	</text>
 	
 	<text>
-		<name>XX.1</name>
+		<name>XX.3</name>
 		<offsets>
 			<x-m>0.0004</x-m>
 			<y-m>-0.0349</y-m>
@@ -643,7 +691,7 @@
 	</text>
 	
 	<text>
-		<name>XX.2</name>
+		<name>XX.4</name>
 		<offsets>
 			<x-m>0.0004</x-m>
 			<y-m>0.0336</y-m>
@@ -719,7 +767,7 @@
 	<!-- FF -->
 	
 	<text>
-		<name>osgtext-green1</name>
+		<name>osgtext-green3</name>
 		<offsets>
 			<x-m>0.0004</x-m>
 			<y-m>-0.0349</y-m>
@@ -743,7 +791,7 @@
 	</text>
 	
 	<text>
-		<name>osgtext-green2</name>
+		<name>osgtext-green4</name>
 		<offsets>
 			<x-m>0.0004</x-m>
 			<y-m>0.0336</y-m>
@@ -767,7 +815,7 @@
 	</text>
 	
 	<text>
-		<name>XX.1</name>
+		<name>XX.3</name>
 		<offsets>
 			<x-m>0.0004</x-m>
 			<y-m>-0.0349</y-m>
@@ -791,7 +839,7 @@
 	</text>
 	
 	<text>
-		<name>XX.2</name>
+		<name>XX.4</name>
 		<offsets>
 			<x-m>0.0004</x-m>
 			<y-m>0.0336</y-m>
diff --git a/Models/Instruments/Upper-ECAM-EIS2/Upper-ECAM-IAE.xml b/Models/Instruments/Upper-ECAM-EIS2/Upper-ECAM-IAE.xml
index e88c2e28..240f5085 100644
--- a/Models/Instruments/Upper-ECAM-EIS2/Upper-ECAM-IAE.xml
+++ b/Models/Instruments/Upper-ECAM-EIS2/Upper-ECAM-IAE.xml
@@ -20,7 +20,7 @@
 				</not-equals>
 				<less-than>
 					<property>/engines/engine[0]/n2</property>
-					<value>5</value>
+					<value>2</value>
 				</less-than>
 			</and>
 		</condition>
@@ -38,7 +38,7 @@
 				</not-equals>
 				<less-than>
 					<property>/engines/engine[1]/n2</property>
-					<value>5</value>
+					<value>2</value>
 				</less-than>
 			</and>
 		</condition>
@@ -68,6 +68,74 @@
 		</condition>
 	</animation>
 	
+	<animation>
+		<type>select</type>
+		<object-name>XX.5</object-name>
+		<condition>
+			<less-than>
+				<property>/engines/engine[0]/n2</property>
+				<value>2</value>
+			</less-than>
+		</condition>
+	</animation>
+	
+	<animation>
+		<type>select</type>
+		<object-name>XX.6</object-name>
+		<condition>
+			<less-than>
+				<property>/engines/engine[1]/n2</property>
+				<value>2</value>
+			</less-than>
+		</condition>
+	</animation>
+	
+	<animation>
+		<type>select</type>
+		<object-name>osgtext-green1</object-name>
+		<object-name>epr1</object-name>
+		<object-name>egt1</object-name>
+		<object-name>eprlimy1</object-name>
+		<object-name>thrpos1</object-name>
+		<object-name>rev1.g</object-name>
+		<object-name>rev1.y</object-name>
+		<condition>
+			<or>
+				<equals>
+					<property>/controls/engines/engine-start-switch</property>
+					<value>2</value>
+				</equals>
+				<greater-than-equals>
+					<property>/engines/engine[0]/n2</property>
+					<value>2</value>
+				</greater-than-equals>
+			</or>
+		</condition>
+	</animation>
+	
+	<animation>
+		<type>select</type>
+		<object-name>osgtext-green2</object-name>
+		<object-name>epr2</object-name>
+		<object-name>egt2</object-name>
+		<object-name>eprlimy2</object-name>
+		<object-name>thrpos2</object-name>
+		<object-name>rev2.g</object-name>
+		<object-name>rev2.y</object-name>
+		<condition>
+			<or>
+				<equals>
+					<property>/controls/engines/engine-start-switch</property>
+					<value>2</value>
+				</equals>
+				<greater-than-equals>
+					<property>/engines/engine[1]/n2</property>
+					<value>2</value>
+				</greater-than-equals>
+			</or>
+		</condition>
+	</animation>
+	
 	<animation>
 		<type>select</type>
 		<object-name>osgtext-green3</object-name>
@@ -94,47 +162,23 @@
 	
 	<animation>
 		<type>select</type>
-		<object-name>osgtext-green1</object-name>
-		<object-name>epr1</object-name>
-		<object-name>egt1</object-name>
-		<object-name>eprlimy1</object-name>
-		<object-name>thrpos1</object-name>
-		<object-name>rev1.g</object-name>
-		<object-name>rev1.y</object-name>
+		<object-name>osgtext-green5</object-name>
 		<condition>
-			<or>
-				<equals>
-					<property>/controls/engines/engine-start-switch</property>
-					<value>2</value>
-				</equals>
-				<greater-than-equals>
-					<property>/engines/engine[0]/n2</property>
-					<value>5</value>
-				</greater-than-equals>
-			</or>
+			<greater-than-equals>
+				<property>/engines/engine[0]/n2</property>
+				<value>2</value>
+			</greater-than-equals>
 		</condition>
 	</animation>
 	
 	<animation>
 		<type>select</type>
-		<object-name>osgtext-green2</object-name>
-		<object-name>epr2</object-name>
-		<object-name>egt2</object-name>
-		<object-name>eprlimy2</object-name>
-		<object-name>thrpos2</object-name>
-		<object-name>rev2.g</object-name>
-		<object-name>rev2.y</object-name>
+		<object-name>osgtext-green6</object-name>
 		<condition>
-			<or>
-				<equals>
-					<property>/controls/engines/engine-start-switch</property>
-					<value>2</value>
-				</equals>
-				<greater-than-equals>
-					<property>/engines/engine[1]/n2</property>
-					<value>5</value>
-				</greater-than-equals>
-			</or>
+			<greater-than-equals>
+				<property>/engines/engine[1]/n2</property>
+				<value>2</value>
+			</greater-than-equals>
 		</condition>
 	</animation>
 	
@@ -223,6 +267,8 @@
 		<object-name>osgtext-green2</object-name>
 		<object-name>osgtext-green3</object-name>
 		<object-name>osgtext-green4</object-name>
+		<object-name>osgtext-green5</object-name>
+		<object-name>osgtext-green6</object-name>
 		<object-name>rev1.g</object-name>
 		<object-name>rev2.g</object-name>
 		<diffuse>
@@ -253,6 +299,8 @@
 		<object-name>XX.2</object-name>
 		<object-name>XX.3</object-name>
 		<object-name>XX.4</object-name>
+		<object-name>XX.5</object-name>
+		<object-name>XX.6</object-name>
         <diffuse>
             <red>1</red>
             <green>0.4</green>
@@ -769,7 +817,7 @@
 	<!-- N2 -->
 	
 	<text>
-		<name>osgtext-green1</name>
+		<name>osgtext-green5</name>
 		<offsets>
 			<x-m>0.0004</x-m>
 			<y-m>-0.069</y-m>
@@ -793,7 +841,7 @@
 	</text>
 	
 	<text>
-		<name>osgtext-green2</name>
+		<name>osgtext-green6</name>
 		<offsets>
 			<x-m>0.0004</x-m>
 			<y-m>0.069</y-m>
@@ -817,7 +865,7 @@
 	</text>
 	
 	<text>
-		<name>XX.1</name>
+		<name>XX.5</name>
 		<offsets>
 			<x-m>0.0004</x-m>
 			<y-m>-0.069</y-m>
@@ -841,7 +889,7 @@
 	</text>
 	
 	<text>
-		<name>XX.2</name>
+		<name>XX.6</name>
 		<offsets>
 			<x-m>0.0004</x-m>
 			<y-m>0.069</y-m>
@@ -917,7 +965,7 @@
 	<!-- FF -->
 	
 	<text>
-		<name>osgtext-green1</name>
+		<name>osgtext-green5</name>
 		<offsets>
 			<x-m>0.0004</x-m>
 			<y-m>-0.069</y-m>
@@ -941,7 +989,7 @@
 	</text>
 	
 	<text>
-		<name>osgtext-green2</name>
+		<name>osgtext-green6</name>
 		<offsets>
 			<x-m>0.0004</x-m>
 			<y-m>0.069</y-m>
@@ -965,7 +1013,7 @@
 	</text>
 	
 	<text>
-		<name>XX.1</name>
+		<name>XX.5</name>
 		<offsets>
 			<x-m>0.0004</x-m>
 			<y-m>-0.069</y-m>
@@ -989,7 +1037,7 @@
 	</text>
 	
 	<text>
-		<name>XX.2</name>
+		<name>XX.6</name>
 		<offsets>
 			<x-m>0.0004</x-m>
 			<y-m>0.069</y-m>
diff --git a/Models/Instruments/Upper-ECAM/Upper-ECAM-CFM.xml b/Models/Instruments/Upper-ECAM/Upper-ECAM-CFM.xml
index 11dae266..04aba019 100644
--- a/Models/Instruments/Upper-ECAM/Upper-ECAM-CFM.xml
+++ b/Models/Instruments/Upper-ECAM/Upper-ECAM-CFM.xml
@@ -20,7 +20,7 @@
 				</not-equals>
 				<less-than>
 					<property>/engines/engine[0]/n2</property>
-					<value>5</value>
+					<value>2</value>
 				</less-than>
 			</and>
 		</condition>
@@ -38,12 +38,34 @@
 				</not-equals>
 				<less-than>
 					<property>/engines/engine[1]/n2</property>
-					<value>5</value>
+					<value>2</value>
 				</less-than>
 			</and>
 		</condition>
 	</animation>
 	
+	<animation>
+		<type>select</type>
+		<object-name>XX.3</object-name>
+		<condition>
+			<less-than>
+				<property>/engines/engine[0]/n2</property>
+				<value>2</value>
+			</less-than>
+		</condition>
+	</animation>
+	
+	<animation>
+		<type>select</type>
+		<object-name>XX.4</object-name>
+		<condition>
+			<less-than>
+				<property>/engines/engine[1]/n2</property>
+				<value>2</value>
+			</less-than>
+		</condition>
+	</animation>
+	
 	<animation>
 		<type>select</type>
 		<object-name>osgtext-green1</object-name>
@@ -61,7 +83,7 @@
 				</equals>
 				<greater-than-equals>
 					<property>/engines/engine[0]/n2</property>
-					<value>5</value>
+					<value>2</value>
 				</greater-than-equals>
 			</or>
 		</condition>
@@ -84,12 +106,34 @@
 				</equals>
 				<greater-than-equals>
 					<property>/engines/engine[1]/n2</property>
-					<value>5</value>
+					<value>2</value>
 				</greater-than-equals>
 			</or>
 		</condition>
 	</animation>
 	
+	<animation>
+		<type>select</type>
+		<object-name>osgtext-green3</object-name>
+		<condition>
+			<greater-than-equals>
+				<property>/engines/engine[0]/n2</property>
+				<value>2</value>
+			</greater-than-equals>
+		</condition>
+	</animation>
+	
+	<animation>
+		<type>select</type>
+		<object-name>osgtext-green4</object-name>
+		<condition>
+			<greater-than-equals>
+				<property>/engines/engine[1]/n2</property>
+				<value>2</value>
+			</greater-than-equals>
+		</condition>
+	</animation>
+	
 	<animation>
 		<type>select</type>
 		<object-name>thrpos1</object-name>
@@ -173,6 +217,8 @@
 		<object-name>osgtext-green</object-name>
 		<object-name>osgtext-green1</object-name>
 		<object-name>osgtext-green2</object-name>
+		<object-name>osgtext-green3</object-name>
+		<object-name>osgtext-green4</object-name>
 		<object-name>rev1.g</object-name>
 		<object-name>rev2.g</object-name>
 		<diffuse>
@@ -201,6 +247,8 @@
 		<type>material</type> <!-- Amber -->
 		<object-name>XX.1</object-name>
 		<object-name>XX.2</object-name>
+		<object-name>XX.3</object-name>
+		<object-name>XX.4</object-name>
         <diffuse>
             <red>1</red>
             <green>0.4</green>
@@ -571,7 +619,7 @@
 	<!-- N2 -->
 	
 	<text>
-		<name>osgtext-green1</name>
+		<name>osgtext-green3</name>
 		<offsets>
 			<x-m>0.0004</x-m>
 			<y-m>-0.066</y-m>
@@ -595,7 +643,7 @@
 	</text>
 	
 	<text>
-		<name>osgtext-green2</name>
+		<name>osgtext-green4</name>
 		<offsets>
 			<x-m>0.0004</x-m>
 			<y-m>0.00</y-m>
@@ -619,7 +667,7 @@
 	</text>
 	
 	<text>
-		<name>XX.1</name>
+		<name>XX.3</name>
 		<offsets>
 			<x-m>0.0004</x-m>
 			<y-m>-0.066</y-m>
@@ -643,7 +691,7 @@
 	</text>
 	
 	<text>
-		<name>XX.2</name>
+		<name>XX.4</name>
 		<offsets>
 			<x-m>0.0004</x-m>
 			<y-m>0.00</y-m>
@@ -719,7 +767,7 @@
 	<!-- FF -->
 	
 	<text>
-		<name>osgtext-green1</name>
+		<name>osgtext-green3</name>
 		<offsets>
 			<x-m>0.0004</x-m>
 			<y-m>-0.066</y-m>
@@ -743,7 +791,7 @@
 	</text>
 	
 	<text>
-		<name>osgtext-green2</name>
+		<name>osgtext-green4</name>
 		<offsets>
 			<x-m>0.0004</x-m>
 			<y-m>0.00</y-m>
@@ -767,7 +815,7 @@
 	</text>
 	
 	<text>
-		<name>XX.1</name>
+		<name>XX.3</name>
 		<offsets>
 			<x-m>0.0004</x-m>
 			<y-m>-0.066</y-m>
@@ -791,7 +839,7 @@
 	</text>
 	
 	<text>
-		<name>XX.2</name>
+		<name>XX.4</name>
 		<offsets>
 			<x-m>0.0004</x-m>
 			<y-m>0.00</y-m>
diff --git a/Models/Instruments/Upper-ECAM/Upper-ECAM-IAE.xml b/Models/Instruments/Upper-ECAM/Upper-ECAM-IAE.xml
index 857f2159..702c83da 100644
--- a/Models/Instruments/Upper-ECAM/Upper-ECAM-IAE.xml
+++ b/Models/Instruments/Upper-ECAM/Upper-ECAM-IAE.xml
@@ -20,7 +20,7 @@
 				</not-equals>
 				<less-than>
 					<property>/engines/engine[0]/n2</property>
-					<value>5</value>
+					<value>2</value>
 				</less-than>
 			</and>
 		</condition>
@@ -38,7 +38,7 @@
 				</not-equals>
 				<less-than>
 					<property>/engines/engine[1]/n2</property>
-					<value>5</value>
+					<value>2</value>
 				</less-than>
 			</and>
 		</condition>
@@ -68,6 +68,74 @@
 		</condition>
 	</animation>
 	
+	<animation>
+		<type>select</type>
+		<object-name>XX.5</object-name>
+		<condition>
+			<less-than>
+				<property>/engines/engine[0]/n2</property>
+				<value>2</value>
+			</less-than>
+		</condition>
+	</animation>
+	
+	<animation>
+		<type>select</type>
+		<object-name>XX.6</object-name>
+		<condition>
+			<less-than>
+				<property>/engines/engine[1]/n2</property>
+				<value>2</value>
+			</less-than>
+		</condition>
+	</animation>
+	
+	<animation>
+		<type>select</type>
+		<object-name>osgtext-green1</object-name>
+		<object-name>epr1</object-name>
+		<object-name>egt1</object-name>
+		<object-name>eprlimy1</object-name>
+		<object-name>thrpos1</object-name>
+		<object-name>rev1.g</object-name>
+		<object-name>rev1.y</object-name>
+		<condition>
+			<or>
+				<equals>
+					<property>/controls/engines/engine-start-switch</property>
+					<value>2</value>
+				</equals>
+				<greater-than-equals>
+					<property>/engines/engine[0]/n2</property>
+					<value>2</value>
+				</greater-than-equals>
+			</or>
+		</condition>
+	</animation>
+	
+	<animation>
+		<type>select</type>
+		<object-name>osgtext-green2</object-name>
+		<object-name>epr2</object-name>
+		<object-name>egt2</object-name>
+		<object-name>eprlimy2</object-name>
+		<object-name>thrpos2</object-name>
+		<object-name>rev2.g</object-name>
+		<object-name>rev2.y</object-name>
+		<condition>
+			<or>
+				<equals>
+					<property>/controls/engines/engine-start-switch</property>
+					<value>2</value>
+				</equals>
+				<greater-than-equals>
+					<property>/engines/engine[1]/n2</property>
+					<value>2</value>
+				</greater-than-equals>
+			</or>
+		</condition>
+	</animation>
+	
 	<animation>
 		<type>select</type>
 		<object-name>osgtext-green3</object-name>
@@ -94,47 +162,23 @@
 	
 	<animation>
 		<type>select</type>
-		<object-name>osgtext-green1</object-name>
-		<object-name>epr1</object-name>
-		<object-name>egt1</object-name>
-		<object-name>eprlimy1</object-name>
-		<object-name>thrpos1</object-name>
-		<object-name>rev1.g</object-name>
-		<object-name>rev1.y</object-name>
+		<object-name>osgtext-green5</object-name>
 		<condition>
-			<or>
-				<equals>
-					<property>/controls/engines/engine-start-switch</property>
-					<value>2</value>
-				</equals>
-				<greater-than-equals>
-					<property>/engines/engine[0]/n2</property>
-					<value>5</value>
-				</greater-than-equals>
-			</or>
+			<greater-than-equals>
+				<property>/engines/engine[0]/n2</property>
+				<value>2</value>
+			</greater-than-equals>
 		</condition>
 	</animation>
 	
 	<animation>
 		<type>select</type>
-		<object-name>osgtext-green2</object-name>
-		<object-name>epr2</object-name>
-		<object-name>egt2</object-name>
-		<object-name>eprlimy2</object-name>
-		<object-name>thrpos2</object-name>
-		<object-name>rev2.g</object-name>
-		<object-name>rev2.y</object-name>
+		<object-name>osgtext-green6</object-name>
 		<condition>
-			<or>
-				<equals>
-					<property>/controls/engines/engine-start-switch</property>
-					<value>2</value>
-				</equals>
-				<greater-than-equals>
-					<property>/engines/engine[1]/n2</property>
-					<value>5</value>
-				</greater-than-equals>
-			</or>
+			<greater-than-equals>
+				<property>/engines/engine[1]/n2</property>
+				<value>2</value>
+			</greater-than-equals>
 		</condition>
 	</animation>
 	
@@ -223,6 +267,8 @@
 		<object-name>osgtext-green2</object-name>
 		<object-name>osgtext-green3</object-name>
 		<object-name>osgtext-green4</object-name>
+		<object-name>osgtext-green5</object-name>
+		<object-name>osgtext-green6</object-name>
 		<object-name>rev1.g</object-name>
 		<object-name>rev2.g</object-name>
 		<diffuse>
@@ -253,6 +299,8 @@
 		<object-name>XX.2</object-name>
 		<object-name>XX.3</object-name>
 		<object-name>XX.4</object-name>
+		<object-name>XX.5</object-name>
+		<object-name>XX.6</object-name>
         <diffuse>
             <red>1</red>
             <green>0.4</green>
@@ -769,7 +817,7 @@
 	<!-- N2 -->
 	
 	<text>
-		<name>osgtext-green1</name>
+		<name>osgtext-green5</name>
 		<offsets>
 			<x-m>0.0004</x-m>
 			<y-m>-0.066</y-m>
@@ -793,7 +841,7 @@
 	</text>
 	
 	<text>
-		<name>osgtext-green2</name>
+		<name>osgtext-green6</name>
 		<offsets>
 			<x-m>0.0004</x-m>
 			<y-m>0.00</y-m>
@@ -817,7 +865,7 @@
 	</text>
 	
 	<text>
-		<name>XX.1</name>
+		<name>XX.5</name>
 		<offsets>
 			<x-m>0.0004</x-m>
 			<y-m>-0.066</y-m>
@@ -841,7 +889,7 @@
 	</text>
 	
 	<text>
-		<name>XX.2</name>
+		<name>XX.6</name>
 		<offsets>
 			<x-m>0.0004</x-m>
 			<y-m>0.00</y-m>
@@ -917,7 +965,7 @@
 	<!-- FF -->
 	
 	<text>
-		<name>osgtext-green1</name>
+		<name>osgtext-green5</name>
 		<offsets>
 			<x-m>0.0004</x-m>
 			<y-m>0.0395</y-m>
@@ -941,7 +989,7 @@
 	</text>
 	
 	<text>
-		<name>osgtext-green2</name>
+		<name>osgtext-green6</name>
 		<offsets>
 			<x-m>0.0004</x-m>
 			<y-m>0.0605</y-m>
@@ -965,7 +1013,7 @@
 	</text>
 	
 	<text>
-		<name>XX.1</name>
+		<name>XX.5</name>
 		<offsets>
 			<x-m>0.0004</x-m>
 			<y-m>0.0395</y-m>
@@ -989,7 +1037,7 @@
 	</text>
 	
 	<text>
-		<name>XX.2</name>
+		<name>XX.6</name>
 		<offsets>
 			<x-m>0.0004</x-m>
 			<y-m>0.0605</y-m>