From 44d592ca18e9b9fde465427c42ba7168d95c79c2 Mon Sep 17 00:00:00 2001
From: Joshua Davidson <joshuadavidson2000@gmail.com>
Date: Mon, 20 Nov 2017 19:45:12 -0500
Subject: [PATCH] A3XX: Major Canvas ND Improvements and Fixes, #97

---
 Models/Instruments/ND/canvas/ND_config.nas    |   8 +-
 .../ND/canvas/framework/navdisplay.nas        |  45 ++--
 Models/Instruments/ND/canvas/res/airbusND.svg | 222 +++++++++---------
 Models/Instruments/ND/canvas/style.nas        |  32 +--
 revision.txt                                  |   2 +-
 5 files changed, 158 insertions(+), 151 deletions(-)

diff --git a/Models/Instruments/ND/canvas/ND_config.nas b/Models/Instruments/ND/canvas/ND_config.nas
index 79c20cb9..7b76636a 100644
--- a/Models/Instruments/ND/canvas/ND_config.nas
+++ b/Models/Instruments/ND/canvas/ND_config.nas
@@ -11,11 +11,11 @@ canvas.NDConfig = {
         spd_node: "/autopilot/route-manager/spd/",
         holding: "/flight-management/hold",
         holding_points: "/flight-management/hold/points",
-        adf1_frq: "instrumentation/adf/frequencies/selected-khz",
+        adf1_frq: "instrumentation/adf[0]/frequencies/selected-khz",
         adf2_frq: "instrumentation/adf[1]/frequencies/selected-khz",
-        nav1_frq: "instrumentation/nav/frequencies/selected-mhz",
+        nav1_frq: "instrumentation/nav[0]/frequencies/selected-mhz",
         nav2_frq: "instrumentation/nav[1]/frequencies/selected-mhz",
-        lat_ctrl: "flight-management/control/lat-ctrl",
-        ver_ctrl: "flight-management/control/ver-ctrl",
+        lat_ctrl: "/it-autoflight/output/lat",
+        ver_ctrl: "/it-autoflight/output/vert",
     }
 };
diff --git a/Models/Instruments/ND/canvas/framework/navdisplay.nas b/Models/Instruments/ND/canvas/framework/navdisplay.nas
index 9c232cf5..1beca82d 100644
--- a/Models/Instruments/ND/canvas/framework/navdisplay.nas
+++ b/Models/Instruments/ND/canvas/framework/navdisplay.nas
@@ -401,8 +401,8 @@ canvas.NavDisplay.update = func() # FIXME: This stuff is still too aircraft spec
 	}
 
 	# Hide heading bug 10 secs after change
-	var vhdg_bug = getprop("autopilot/settings/heading-bug-deg") or 0;
-	var hdg_bug_active = getprop("autopilot/settings/heading-bug-active");
+	var vhdg_bug = getprop("/it-autoflight/input/hdg") or 0;
+	var hdg_bug_active = getprop("/it-autoflight/custom/show-hdg");
 	if (hdg_bug_active == nil)
 		hdg_bug_active = 1;
 
@@ -419,8 +419,7 @@ canvas.NavDisplay.update = func() # FIXME: This stuff is still too aircraft spec
 		me.symbols.curHdgPtr.setRotation(0);
 		me.symbols.curHdgPtr2.setRotation(0);
 	}
-	if(!me.in_mode("toggle_display_mode", ["PLAN"]))
-	{
+	if(!me.in_mode("toggle_display_mode", ["PLAN"])) {
 		var hdgBugRot = (vhdg_bug-userHdgTrk)*D2R;
 		me.symbols.selHdgLine.setRotation(hdgBugRot);
 		me.symbols.hdgBug.setRotation(hdgBugRot);
@@ -498,15 +497,20 @@ canvas.NavDisplay.update = func() # FIXME: This stuff is still too aircraft spec
 		me.symbols.selHdgLine2.hide();
 		me.symbols.curHdgPtr.setVisible(staPtrVis);
 		me.symbols.HdgBugCRT.setVisible(staPtrVis and !dispLCD);
-		if(me.get_switch("toggle_track_heading"))
-		{
+		if (me.get_switch("toggle_track_heading")) {
 			me.symbols.HdgBugLCD.hide();
-			me.symbols.TrkBugLCD.setVisible(staPtrVis and dispLCD);
-		}
-		else
-		{
+			if (hdg_bug_active) {
+				me.symbols.TrkBugLCD.setVisible(staPtrVis and dispLCD);
+			} else {
+				me.symbols.TrkBugLCD.hide();
+			}
+		} else {
 			me.symbols.TrkBugLCD.hide();
-			me.symbols.HdgBugLCD.setVisible(staPtrVis and dispLCD);
+			if (hdg_bug_active) {
+				me.symbols.HdgBugLCD.setVisible(staPtrVis and dispLCD);
+			} else {
+				me.symbols.HdgBugLCD.hide();
+			}
 		}
 		me.symbols.selHdgLine.setVisible(staPtrVis and hdg_bug_active);
 	} else {
@@ -546,15 +550,20 @@ canvas.NavDisplay.update = func() # FIXME: This stuff is still too aircraft spec
 		me.symbols.selHdgLine.hide();
 		me.symbols.curHdgPtr2.setVisible(staPtrVis);
 		me.symbols.HdgBugCRT2.setVisible(staPtrVis and !dispLCD);
-		if(me.get_switch("toggle_track_heading"))
-		{
+		if (me.get_switch("toggle_track_heading")) {
 			me.symbols.HdgBugLCD2.hide();
-			me.symbols.TrkBugLCD2.setVisible(staPtrVis and dispLCD);
-		}
-		else
-		{
+			if (hdg_bug_active) {
+				me.symbols.TrkBugLCD2.setVisible(staPtrVis and dispLCD);
+			} else {
+				me.symbols.TrkBugLCD2.hide();
+			}
+		} else {
 			me.symbols.TrkBugLCD2.hide();
-			me.symbols.HdgBugLCD2.setVisible(staPtrVis and dispLCD);
+			if (hdg_bug_active) {
+				me.symbols.HdgBugLCD2.setVisible(staPtrVis and dispLCD);
+			} else {
+				me.symbols.HdgBugLCD2.hide();
+			}
 		}
 		me.symbols.selHdgLine2.setVisible(staPtrVis and hdg_bug_active);
 	}
diff --git a/Models/Instruments/ND/canvas/res/airbusND.svg b/Models/Instruments/ND/canvas/res/airbusND.svg
index 841a1e68..7e534f2d 100644
--- a/Models/Instruments/ND/canvas/res/airbusND.svg
+++ b/Models/Instruments/ND/canvas/res/airbusND.svg
@@ -10,7 +10,7 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    sodipodi:docname="airbusND.svg"
-   inkscape:version="0.48.5 r10040"
+   inkscape:version="0.91 r13725"
    xml:space="preserve"
    id="svg5180"
    height="1024"
@@ -24,16 +24,16 @@
      guidetolerance="10"
      inkscape:pageopacity="1"
      inkscape:pageshadow="2"
-     inkscape:window-width="1280"
-     inkscape:window-height="706"
+     inkscape:window-width="1920"
+     inkscape:window-height="1030"
      id="namedview102"
      showgrid="false"
-     inkscape:zoom="0.90028971"
-     inkscape:cx="343.47355"
-     inkscape:cy="747.36265"
-     inkscape:window-x="12"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
+     inkscape:zoom="1.8005794"
+     inkscape:cx="539.20762"
+     inkscape:cy="835.10473"
+     inkscape:window-x="1592"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
      inkscape:current-layer="layer3"
      inkscape:object-nodes="true"
      inkscape:snap-smooth-nodes="true"
@@ -251,7 +251,7 @@
        id="wpActiveId"
        y="54.099972"
        x="766.04407"
-       style="font-size:36px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;display:inline;font-family:Liberation Sans;-inkscape-font-specification:Liberation Sans"
+       style="font-size:36px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#cecdce;fill-opacity:1;stroke:none;display:inline;font-family:Liberation Sans;-inkscape-font-specification:Liberation Sans"
        xml:space="preserve"><tspan
          y="54.099972"
          x="766.04407"
@@ -259,7 +259,7 @@
          sodipodi:role="line">ABCD</tspan></text>
 <text
        xml:space="preserve"
-       style="font-size:36px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#32f519;fill-opacity:1;stroke:none;display:inline;font-family:Liberation Sans;-inkscape-font-specification:Liberation Sans"
+       style="font-size:36px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#0dc04b;fill-opacity:1;stroke:none;display:inline;font-family:Liberation Sans;-inkscape-font-specification:Liberation Sans"
        x="844.04407"
        y="88.124893"
        id="wpActiveDist"
@@ -281,19 +281,16 @@
        inkscape:connector-curvature="0"
        id="windArrow"
        d="m 75.2914,119.519 -2e-4,65.158 m 0,0 7.0125,-12.145 -14.8092,0 7.7967,12.146"
-       style="fill:#32f519;stroke:#32f519;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /><g
+       style="fill:#0dc04b;stroke:#0dc04b;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /><g
        inkscape:label="#g3124"
        id="compass"
        transform="matrix(0.99998134,0.00610861,-0.00610861,0.99998134,5.0542122,-3.1396688)"><path
-         sodipodi:type="arc"
-         style="fill:none;stroke:#ededed;stroke-width:3.03545403;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+         transform="matrix(1.6472,0,0,1.6472,-186.413,-200.559)"
+         style="fill:none;stroke:#ededed;stroke-width:3.03545403;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         d="M 850,622 C 850,734.98222 805.11799,843.33699 725.22749,923.22749 645.33699,1003.118 536.98222,1048 424,1048 311.01778,1048 202.66301,1003.118 122.77251,923.22749 42.882014,843.33699 -2,734.98222 -2,622 -2,509.01778 42.882014,400.66301 122.77251,320.77251 202.66301,240.88201 311.01778,196 424,196 536.98222,196 645.33699,240.88201 725.22749,320.77251 805.11799,400.66301 850,509.01778 850,622 Z"
          id="path3845"
-         sodipodi:cx="424"
-         sodipodi:cy="622"
-         sodipodi:rx="426"
-         sodipodi:ry="426"
-         d="M 850,622 C 850,857.2733 659.2733,1048 424,1048 188.7267,1048 -2,857.2733 -2,622 -2,386.7267 188.7267,196 424,196 c 235.2733,0 426,190.7267 426,426 z"
-         transform="matrix(1.6472,0,0,1.6472,-186.413,-200.559)" /><text
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="zzzzzzzzz" /><text
          xml:space="preserve"
          style="font-size:36px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ededed;fill-opacity:1;stroke:none;font-family:Liberation Sans;-inkscape-font-specification:Liberation Sans"
          x="500.44846"
@@ -831,7 +828,7 @@
            style="font-size:40px">35</tspan></text>
 </g><text
        xml:space="preserve"
-       style="font-size:36px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#32f519;fill-opacity:1;stroke:none;display:inline;font-family:Liberation Sans;-inkscape-font-specification:Liberation Sans"
+       style="font-size:36px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#0dc04b;fill-opacity:1;stroke:none;display:inline;font-family:Liberation Sans;-inkscape-font-specification:Liberation Sans"
        x="36.862175"
        y="92.904839"
        id="wind"
@@ -847,7 +844,7 @@
        id="gs"
        y="53.306854"
        x="101.87437"
-       style="font-size:36px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#32f519;fill-opacity:1;stroke:none;display:inline;font-family:Liberation Sans;-inkscape-font-specification:Liberation Sans"
+       style="font-size:36px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#0dc04b;fill-opacity:1;stroke:none;display:inline;font-family:Liberation Sans;-inkscape-font-specification:Liberation Sans"
        xml:space="preserve"><tspan
          y="53.306854"
          x="101.87437"
@@ -855,7 +852,7 @@
          sodipodi:role="line">999</tspan></text>
 <text
        xml:space="preserve"
-       style="font-size:36px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#32f519;fill-opacity:1;stroke:none;display:inline;font-family:Liberation Sans;-inkscape-font-specification:Liberation Sans"
+       style="font-size:36px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#0dc04b;fill-opacity:1;stroke:none;display:inline;font-family:Liberation Sans;-inkscape-font-specification:Liberation Sans"
        x="248.49673"
        y="53.306854"
        id="tas"
@@ -917,35 +914,35 @@
          id="hdgTrk"
          y="67.549522"
          x="373.44498"
-         style="font-size:36px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#32f519;fill-opacity:1;stroke:none;display:inline;font-family:Liberation Sans;-inkscape-font-specification:Liberation Sans"
+         style="font-size:36px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#0dc04b;fill-opacity:1;stroke:none;display:inline;font-family:Liberation Sans;-inkscape-font-specification:Liberation Sans"
          xml:space="preserve"><tspan
            y="67.549522"
            x="373.44498"
            id="tspan3849"
            sodipodi:role="line"
-           style="font-size:32px;fill:#32f519">HDG</tspan></text>
+           style="font-size:32px;fill:#0dc04b">HDG</tspan></text>
 <text
          xml:space="preserve"
-         style="font-size:36px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#32f519;fill-opacity:1;stroke:none;display:inline;font-family:Liberation Sans;-inkscape-font-specification:Liberation Sans"
+         style="font-size:36px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#0dc04b;fill-opacity:1;stroke:none;display:inline;font-family:Liberation Sans;-inkscape-font-specification:Liberation Sans"
          x="578.66278"
          y="67.549522"
          id="truMag"
          sodipodi:linespacing="125%"
          inkscape:label="#text7243"><tspan
-           style="font-size:32px;fill:#32f519"
+           style="font-size:32px;fill:#0dc04b"
            sodipodi:role="line"
            id="tspan3853"
            x="578.66278"
            y="67.549522">MAG</tspan></text>
 </g><text
        xml:space="preserve"
-       style="font-size:36px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#32f519;fill-opacity:1;stroke:none;display:inline;font-family:Liberation Sans;-inkscape-font-specification:Liberation Sans"
+       style="font-size:36px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#0dc04b;fill-opacity:1;stroke:none;display:inline;font-family:Liberation Sans;-inkscape-font-specification:Liberation Sans"
        x="71.73262"
        y="913.5495"
        id="vorL"
        sodipodi:linespacing="125%"
        inkscape:label="#text7243"><tspan
-         style="font-size:32px;fill:#32f519;fill-opacity:1"
+         style="font-size:32px;fill:#0dc04b;fill-opacity:1"
          sodipodi:role="line"
          id="tspan3056"
          x="71.73262"
@@ -956,7 +953,7 @@
        id="dmeL"
        y="993.85461"
        x="151.73262"
-       style="font-size:36px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#0096ce;fill-opacity:1;stroke:none;display:inline;font-family:Liberation Sans;-inkscape-font-specification:Liberation Sans"
+       style="font-size:36px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#1684a5;fill-opacity:1;stroke:none;display:inline;font-family:Liberation Sans;-inkscape-font-specification:Liberation Sans"
        xml:space="preserve"><tspan
          y="993.85461"
          x="151.73262"
@@ -965,26 +962,26 @@
          style="font-size:24px">NM</tspan></text>
 <text
        xml:space="preserve"
-       style="font-size:36px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#32f519;fill-opacity:1;stroke:none;display:inline;font-family:Liberation Sans;-inkscape-font-specification:Liberation Sans"
+       style="font-size:36px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#0dc04b;fill-opacity:1;stroke:none;display:inline;font-family:Liberation Sans;-inkscape-font-specification:Liberation Sans"
        x="71.129601"
        y="993.85461"
        id="dmeLDist"
        sodipodi:linespacing="125%"
        inkscape:label="#text7243"><tspan
-         style="font-size:32px;fill:#32f519"
+         style="font-size:32px;fill:#0dc04b"
          sodipodi:role="line"
          id="tspan3068"
          x="71.129601"
          y="993.85461">99.9</tspan></text>
 <text
        xml:space="preserve"
-       style="font-size:36px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#32f519;fill-opacity:1;stroke:none;display:inline;font-family:Liberation Sans;-inkscape-font-specification:Liberation Sans"
+       style="font-size:36px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#0dc04b;fill-opacity:1;stroke:none;display:inline;font-family:Liberation Sans;-inkscape-font-specification:Liberation Sans"
        x="71.73262"
        y="954.56171"
        id="vorLId"
        sodipodi:linespacing="125%"
        inkscape:label="#text7243"><tspan
-         style="font-size:32px;fill:#32f519"
+         style="font-size:32px;fill:#0dc04b"
          sodipodi:role="line"
          id="tspan3072"
          x="71.73262"
@@ -995,16 +992,16 @@
        id="vorR"
        y="913.5495"
        x="859.7326"
-       style="font-size:36px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#32f519;fill-opacity:1;stroke:none;display:inline;font-family:Liberation Sans;-inkscape-font-specification:Liberation Sans"
+       style="font-size:36px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#0dc04b;fill-opacity:1;stroke:none;display:inline;font-family:Liberation Sans;-inkscape-font-specification:Liberation Sans"
        xml:space="preserve"><tspan
          y="913.5495"
          x="859.7326"
          id="tspan3076"
          sodipodi:role="line"
-         style="font-size:32px;fill:#32f519">VOR 2</tspan></text>
+         style="font-size:32px;fill:#0dc04b">VOR 2</tspan></text>
 <text
        xml:space="preserve"
-       style="font-size:36px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#0096ce;fill-opacity:1;stroke:none;display:inline;font-family:Liberation Sans;-inkscape-font-specification:Liberation Sans"
+       style="font-size:36px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#1684a5;fill-opacity:1;stroke:none;display:inline;font-family:Liberation Sans;-inkscape-font-specification:Liberation Sans"
        x="931.7326"
        y="993.85461"
        id="dmeR"
@@ -1021,33 +1018,33 @@
        id="dmeRDist"
        y="993.85461"
        x="859.12958"
-       style="font-size:36px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#32f519;fill-opacity:1;stroke:none;display:inline;font-family:Liberation Sans;-inkscape-font-specification:Liberation Sans"
+       style="font-size:36px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#0dc04b;fill-opacity:1;stroke:none;display:inline;font-family:Liberation Sans;-inkscape-font-specification:Liberation Sans"
        xml:space="preserve"><tspan
          y="993.85461"
          x="859.12958"
          id="tspan3084"
          sodipodi:role="line"
-         style="font-size:32px;fill:#32f519">99.9</tspan></text>
+         style="font-size:32px;fill:#0dc04b">99.9</tspan></text>
 <text
        inkscape:label="#text7243"
        sodipodi:linespacing="125%"
        id="vorRId"
        y="954.56171"
        x="859.7326"
-       style="font-size:36px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#32f519;fill-opacity:1;stroke:none;display:inline;font-family:Liberation Sans;-inkscape-font-specification:Liberation Sans"
+       style="font-size:36px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#0dc04b;fill-opacity:1;stroke:none;display:inline;font-family:Liberation Sans;-inkscape-font-specification:Liberation Sans"
        xml:space="preserve"><tspan
          y="954.56171"
          x="859.7326"
          id="tspan3088"
          sodipodi:role="line"
-         style="font-size:32px;fill:#32f519">ABC</tspan></text>
+         style="font-size:32px;fill:#0dc04b">ABC</tspan></text>
 <text
        inkscape:label="#text7243"
        sodipodi:linespacing="125%"
        id="eta"
        y="126.06245"
        x="892.04407"
-       style="font-size:36px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#32f519;fill-opacity:1;stroke:none;display:inline;font-family:Liberation Sans;-inkscape-font-specification:Liberation Sans"
+       style="font-size:36px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#0dc04b;fill-opacity:1;stroke:none;display:inline;font-family:Liberation Sans;-inkscape-font-specification:Liberation Sans"
        xml:space="preserve"><tspan
          style="font-size:36px"
          y="126.06245"
@@ -1060,7 +1057,7 @@
        d="m 434.872,733.378 44.548,53.034"
        style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /><text
        xml:space="preserve"
-       style="font-size:36px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#0096ce;fill-opacity:1;stroke:none;font-family:Liberation Sans;-inkscape-font-specification:Liberation Sans"
+       style="font-size:36px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#1684a5;fill-opacity:1;stroke:none;font-family:Liberation Sans;-inkscape-font-specification:Liberation Sans"
        x="198.86594"
        y="648.10144"
        id="range"
@@ -1082,7 +1079,7 @@
          inkscape:connector-curvature="0"
          id="curTrkPtr"
          d="M 494.187,150.9257 512.25,179.3894 530.312,150.9257 512.25,122.462 z"
-         style="fill:none;stroke:#32f519;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" /><path
+         style="fill:none;stroke:#0dc04b;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" /><path
          inkscape:label="#path6714"
          inkscape:transform-center-y="-436.38973"
          style="fill:none;stroke:#66b266;stroke-width:5.12175798;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
@@ -1125,9 +1122,9 @@
        inkscape:transform-center-y="4.4952743"
        inkscape:label="#g4072"
        id="staArrowL"
-       style="stroke:#ffffff;display:inline"
+       style="stroke:#cecdce;display:inline"
        transform="matrix(1,0,0,1.1805235,0.174175,-281.5729)"><path
-         style="fill:none;stroke:#ffffff;stroke-width:4.64066076;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         style="fill:none;stroke:#cecdce;stroke-width:4.64066076;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
          d="m 512,1388.5461 0,66.6874 0,66.687 0,10.2596 m 28.274,-52.6926 -28.274,0.1098 -28.274,-0.1098 c 29.31822,-25.365 28.16879,-25.365 28.16879,-25.365 z"
          id="staFromL"
          inkscape:connector-curvature="0"
@@ -1135,7 +1132,7 @@
          inkscape:label="#path3100"
          inkscape:transform-center-y="571.75564"
          inkscape:transform-center-x="-1.011" /><path
-         style="fill:none;stroke:#ffffff;stroke-width:4.74698162;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         style="fill:none;stroke:#cecdce;stroke-width:4.74698162;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
          d="m 512.25,342.12988 -0.5,155.57181 M 524.774,386.32287 512.25,375.72476 499.726,385.93078 484,398.79256 l 27.75,0 26.25,0.25507 z"
          id="staToL"
          inkscape:connector-curvature="0"
@@ -1146,16 +1143,16 @@
        id="staArrowR"
        inkscape:label="#g4076"
        inkscape:transform-center-y="5.897192"
-       style="stroke:#ffffff;display:inline"
+       style="stroke:#cecdce;display:inline"
        transform="matrix(1,0,0,1.1276599,0,-314.13231)"><path
-         style="fill:none;stroke:#ffffff;stroke-width:4.42658234;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         style="fill:none;stroke:#cecdce;stroke-width:4.42658234;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
          d="m 490,1622.1206 0,-12.5406 0,-129.19 m 43.25,0 0,141.7306 -21.25,0 m 0,0 z m -22,0 22,0 -0.15789,9.7217 0,0"
          id="staFromR"
          inkscape:connector-curvature="0"
          sodipodi:nodetypes="cccccccccccc"
          inkscape:label="#path3100"
          inkscape:transform-center-y="519.14566" /><path
-         style="fill:none;stroke:#ffffff;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         style="fill:none;stroke:#cecdce;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
          d="m 490,548.84661 0,-80.27651 -30.5,0 52.5,-62.44 m 21.25,142.71651 0,-80.27651 31.25,0 -52.5,-62.44 0.5,-15.28745 -0.5,-2.4e-4"
          id="staToR"
          inkscape:connector-curvature="0"
@@ -1216,30 +1213,31 @@
 <g
        id="hdgBug"
        inkscape:label="#g3190"
-       inkscape:transform-center-y="-698.613"><path
+       inkscape:transform-center-y="-698.613"
+       transform="translate(0,-19.021655)"><path
          inkscape:transform-center-y="-692.145"
          inkscape:label="#path4994"
-         style="fill:none;stroke:#ff00ff;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0;stroke-dasharray:none"
+         style="fill:none;stroke:#ff00ff;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0"
          d="m 512,141.262 0,-18.8 m 20,0 0,18.8 -20,0 -20,0 0,-18.8 z"
          id="HdgBugCRT"
          inkscape:connector-curvature="0"
          sodipodi:nodetypes="cccccccc" /><path
          inkscape:transform-center-y="-686.245"
          inkscape:label="#path4994"
-         style="fill:none;stroke:#ff00ff;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0;stroke-dasharray:none;display:inline"
+         style="display:inline;fill:none;stroke:#ff00ff;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0"
          d="M 512.25,148.787 512,126.737 m 20,0 -0.25,13.55 -19.5,8.5 -19.75,-8.75 -0.5,-13.3 z"
          id="TrkBugLCD"
          inkscape:connector-curvature="0"
          sodipodi:nodetypes="cccccccc" /><path
          inkscape:transform-center-y="-711.514"
          inkscape:label="#path4994"
-         style="fill:none;stroke:#0093ff;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-         d="M 494.187,93.9983 512.25,122.462 530.312,93.9983 z"
+         style="display:inline;fill:none;stroke:#0093ff;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 494.187,93.9983 512.25,122.462 530.312,93.9983 Z"
          id="HdgBugLCD"
          inkscape:connector-curvature="0"
          sodipodi:nodetypes="ccccccccc" /></g><text
        xml:space="preserve"
-       style="font-size:36px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#0096ce;fill-opacity:1;stroke:none;display:inline;font-family:Liberation Sans;-inkscape-font-specification:Liberation Sans"
+       style="font-size:36px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#1684a5;fill-opacity:1;stroke:none;display:inline;font-family:Liberation Sans;-inkscape-font-specification:Liberation Sans"
        x="945.04547"
        y="87.431412"
        id="wpActiveDistLbl"
@@ -1252,13 +1250,13 @@
          y="87.431412">NM</tspan></text>
 <text
        xml:space="preserve"
-       style="font-size:36px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;display:inline;font-family:Liberation Sans;-inkscape-font-specification:Liberation Sans"
+       style="font-size:36px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#cecdce;fill-opacity:1;stroke:none;display:inline;font-family:Liberation Sans;-inkscape-font-specification:Liberation Sans"
        x="785.289"
        y="53.929054"
        id="ilsLbl"
        sodipodi:linespacing="125%"
        inkscape:label="#text7243"><tspan
-         style="font-size:32px;fill:#ffffff"
+         style="font-size:32px;fill:#cecdce"
          sodipodi:role="line"
          id="tspan4172"
          x="785.289"
@@ -1277,7 +1275,7 @@
          sodipodi:role="line"
          style="font-size:32px;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#af0063;fill-opacity:1">999.99</tspan></text>
 <path
-       style="fill:none;stroke:#ffffff;stroke-width:2.46109653;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       style="fill:none;stroke:#cecdce;stroke-width:2.46109653;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
        d="m 20.951614,914.85538 0,82.41763 m 4.201291,-92.8082 -4.04,-8.83104 -4.040001,8.50433 L 12,914.85538 l 8.951614,0 8.467743,0.21255 z"
        id="vorLSym"
        inkscape:connector-curvature="0"
@@ -1285,7 +1283,7 @@
        inkscape:label="#path3100"
        inkscape:transform-center-y="-498.20098"
        inkscape:transform-center-x="-0.080644898" /><path
-       style="fill:none;stroke:#ffffff;stroke-width:2.38918257;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       style="fill:none;stroke:#cecdce;stroke-width:2.38918257;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
        d="m 997.8036,974.07643 0,-54.25734 -10.3036,0 17.7357,-42.20198 m 7.1787,96.45932 0,-54.25734 10.557,0 -17.7357,-42.20198"
        id="vorRSym"
        inkscape:connector-curvature="0"
@@ -1293,7 +1291,7 @@
        inkscape:label="#path3100"
        inkscape:transform-center-y="-715.12894" /><text
        xml:space="preserve"
-       style="font-size:36px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#32f519;fill-opacity:1;stroke:none;display:inline;font-family:Liberation Sans;-inkscape-font-specification:Liberation Sans"
+       style="font-size:36px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#0dc04b;fill-opacity:1;stroke:none;display:inline;font-family:Liberation Sans;-inkscape-font-specification:Liberation Sans"
        x="926.04407"
        y="54.099972"
        id="wpActiveCrs"
@@ -1317,10 +1315,10 @@
          id="chrono_text"
          y="859.17078"
          x="6.5224471"
-         style="font-size:36px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#32f519;fill-opacity:1;stroke:none;font-family:Liberation Sans;-inkscape-font-specification:Sans"
+         style="font-size:36px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#0dc04b;fill-opacity:1;stroke:none;font-family:Liberation Sans;-inkscape-font-specification:Sans"
          xml:space="preserve"
          inkscape:label="#text3299"><tspan
-           style="font-size:36px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#32f519;fill-opacity:1;font-family:Sans;-inkscape-font-specification:Sans"
+           style="font-size:36px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#0dc04b;fill-opacity:1;font-family:Sans;-inkscape-font-specification:Sans"
            y="859.17078"
            x="6.5224471"
            id="tspan3301"
@@ -1331,7 +1329,7 @@
        id="range_r"
        y="648.10156"
        x="863.21796"
-       style="font-size:36px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#0096ce;fill-opacity:1;stroke:none;font-family:Liberation Sans;-inkscape-font-specification:Liberation Sans"
+       style="font-size:36px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#1684a5;fill-opacity:1;stroke:none;font-family:Liberation Sans;-inkscape-font-specification:Liberation Sans"
        xml:space="preserve"><tspan
          y="648.10156"
          x="863.21796"
@@ -1340,7 +1338,7 @@
          style="text-align:end;text-anchor:end">99</tspan></text>
 <text
        xml:space="preserve"
-       style="font-size:40px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:end;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:end;fill:#32f519;fill-opacity:0.98823529;stroke:none;font-family:Liberation Sans;-inkscape-font-specification:Sans"
+       style="font-size:40px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:end;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:end;fill:#0dc04b;fill-opacity:0.98823529;stroke:none;font-family:Liberation Sans;-inkscape-font-specification:Sans"
        x="445.28204"
        y="833.28204"
        id="legDistL"
@@ -1355,7 +1353,7 @@
        id="legDistR"
        y="833.28204"
        x="555.28204"
-       style="font-size:40px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#32f519;fill-opacity:0.98823529;stroke:none;font-family:Liberation Sans;-inkscape-font-specification:Sans"
+       style="font-size:40px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#0dc04b;fill-opacity:0.98823529;stroke:none;font-family:Liberation Sans;-inkscape-font-specification:Sans"
        xml:space="preserve"
        inkscape:label="#leg_dist_r"><tspan
          y="833.28204"
@@ -1368,7 +1366,7 @@
        id="offsetLbl"
        y="739.28204"
        x="13.282043"
-       style="font-size:40px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#32f519;fill-opacity:0.98823529;stroke:none;font-family:Liberation Sans;-inkscape-font-specification:Sans"
+       style="font-size:40px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#0dc04b;fill-opacity:0.98823529;stroke:none;font-family:Liberation Sans;-inkscape-font-specification:Sans"
        xml:space="preserve"><tspan
          sodipodi:role="line"
          id="tspan3721"
@@ -1380,7 +1378,7 @@
      inkscape:label="CTR"
      style="display:inline"><text
        xml:space="preserve"
-       style="font-size:36px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:end;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:end;fill:#32f519;fill-opacity:1;stroke:none;font-family:Liberation Sans;-inkscape-font-specification:Sans"
+       style="font-size:36px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:end;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:end;fill:#0dc04b;fill-opacity:1;stroke:none;font-family:Liberation Sans;-inkscape-font-specification:Sans"
        x="442.35898"
        y="527.74359"
        id="legDistCtrL"
@@ -1396,7 +1394,7 @@
        id="legDistCtrR"
        y="527.74359"
        x="552.35901"
-       style="font-size:36px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#32f519;fill-opacity:1;stroke:none;font-family:Liberation Sans;-inkscape-font-specification:Sans"
+       style="font-size:36px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#0dc04b;fill-opacity:1;stroke:none;font-family:Liberation Sans;-inkscape-font-specification:Sans"
        xml:space="preserve"><tspan
          y="527.74359"
          x="552.35901"
@@ -1419,7 +1417,7 @@
        inkscape:transform-center-y="-221.51123"><path
          id="curTrkPtr2"
          d="M 494.187,114.9257 512.25,143.3894 530.312,114.9257 512.25,86.462 z"
-         style="fill:none;stroke:#32f519;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+         style="fill:none;stroke:#0dc04b;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
          inkscape:connector-curvature="0"
          sodipodi:nodetypes="cccccccc"
          inkscape:label="#path3998" /><path
@@ -1466,7 +1464,7 @@
            d="m 512.69442,437.35427 -9.615,5.69 35.22401,17.6614 9.615,-5.69 c 0,0 -29.42519,-14.6957 -35.22387,-17.66133 -5.79867,-2.96563 -1.4e-4,-7e-5 -1.4e-4,-7e-5 z"
            style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#009fd6;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.02563763;marker:none;visibility:visible;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" /></g><path
          transform="matrix(0.968853,0.690717,-0.690717,0.968853,437.361,-328.129)"
-         d="m 386.78752,643.92999 c 0,3.70998 -3.00753,6.71751 -6.71751,6.71751 -3.70998,0 -6.71751,-3.00753 -6.71751,-6.71751 0,-3.70998 3.00753,-6.71751 6.71751,-6.71751 3.70998,0 6.71751,3.00753 6.71751,6.71751 z"
+         d="m 386.78752,643.92999 a 6.7175102,6.7175102 0 0 1 -6.71751,6.71751 6.7175102,6.7175102 0 0 1 -6.71751,-6.71751 6.7175102,6.7175102 0 0 1 6.71751,-6.71751 6.7175102,6.7175102 0 0 1 6.71751,6.71751 z"
          sodipodi:ry="6.7175102"
          sodipodi:rx="6.7175102"
          sodipodi:cy="643.92999"
@@ -1481,10 +1479,10 @@
          sodipodi:cy="643.92999"
          sodipodi:rx="6.7175102"
          sodipodi:ry="6.7175102"
-         d="m 386.78752,643.92999 c 0,3.70998 -3.00753,6.71751 -6.71751,6.71751 -3.70998,0 -6.71751,-3.00753 -6.71751,-6.71751 0,-3.70998 3.00753,-6.71751 6.71751,-6.71751 3.70998,0 6.71751,3.00753 6.71751,6.71751 z"
+         d="m 386.78752,643.92999 a 6.7175102,6.7175102 0 0 1 -6.71751,6.71751 6.7175102,6.7175102 0 0 1 -6.71751,-6.71751 6.7175102,6.7175102 0 0 1 6.71751,-6.71751 6.7175102,6.7175102 0 0 1 6.71751,6.71751 z"
          transform="matrix(0.968853,0.690717,-0.690717,0.968853,512.923,-328.129)" /><path
          transform="matrix(0.968853,0.690717,-0.690717,0.968853,663.814,-328.129)"
-         d="m 386.78752,643.92999 c 0,3.70998 -3.00753,6.71751 -6.71751,6.71751 -3.70998,0 -6.71751,-3.00753 -6.71751,-6.71751 0,-3.70998 3.00753,-6.71751 6.71751,-6.71751 3.70998,0 6.71751,3.00753 6.71751,6.71751 z"
+         d="m 386.78752,643.92999 a 6.7175102,6.7175102 0 0 1 -6.71751,6.71751 6.7175102,6.7175102 0 0 1 -6.71751,-6.71751 6.7175102,6.7175102 0 0 1 6.71751,-6.71751 6.7175102,6.7175102 0 0 1 6.71751,6.71751 z"
          sodipodi:ry="6.7175102"
          sodipodi:rx="6.7175102"
          sodipodi:cy="643.92999"
@@ -1499,7 +1497,7 @@
          sodipodi:cy="643.92999"
          sodipodi:rx="6.7175102"
          sodipodi:ry="6.7175102"
-         d="m 386.78752,643.92999 c 0,3.70998 -3.00753,6.71751 -6.71751,6.71751 -3.70998,0 -6.71751,-3.00753 -6.71751,-6.71751 0,-3.70998 3.00753,-6.71751 6.71751,-6.71751 3.70998,0 6.71751,3.00753 6.71751,6.71751 z"
+         d="m 386.78752,643.92999 a 6.7175102,6.7175102 0 0 1 -6.71751,6.71751 6.7175102,6.7175102 0 0 1 -6.71751,-6.71751 6.7175102,6.7175102 0 0 1 6.71751,-6.71751 6.7175102,6.7175102 0 0 1 6.71751,6.71751 z"
          transform="matrix(0.968853,0.690717,-0.690717,0.968853,739.667,-328.128)" /></g><path
        inkscape:label="#path7253"
        style="fill:none;stroke:#f2f235;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
@@ -1742,7 +1740,7 @@
        id="crsLbl"
        y="90.379868"
        x="812.72168"
-       style="font-size:36px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;display:inline;font-family:Liberation Sans;-inkscape-font-specification:Liberation Sans"
+       style="font-size:36px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#cecdce;fill-opacity:1;stroke:none;display:inline;font-family:Liberation Sans;-inkscape-font-specification:Liberation Sans"
        xml:space="preserve"><tspan
          y="90.379868"
          x="812.72168"
@@ -1768,7 +1766,7 @@
        id="crs"
        y="90.062439"
        x="913.95801"
-       style="font-size:36px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#0096ce;fill-opacity:1;stroke:none;display:inline;font-family:Liberation Sans;-inkscape-font-specification:Liberation Sans"
+       style="font-size:36px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#1684a5;fill-opacity:1;stroke:none;display:inline;font-family:Liberation Sans;-inkscape-font-specification:Liberation Sans"
        xml:space="preserve"><tspan
          y="90.062439"
          x="913.95801"
@@ -1797,10 +1795,10 @@
          sodipodi:cy="643.92999"
          sodipodi:rx="6.7175102"
          sodipodi:ry="6.7175102"
-         d="m 386.78752,643.92999 c 0,3.70998 -3.00753,6.71751 -6.71751,6.71751 -3.70998,0 -6.71751,-3.00753 -6.71751,-6.71751 0,-3.70998 3.00753,-6.71751 6.71751,-6.71751 3.70998,0 6.71751,3.00753 6.71751,6.71751 z"
+         d="m 386.78752,643.92999 a 6.7175102,6.7175102 0 0 1 -6.71751,6.71751 6.7175102,6.7175102 0 0 1 -6.71751,-6.71751 6.7175102,6.7175102 0 0 1 6.71751,-6.71751 6.7175102,6.7175102 0 0 1 6.71751,6.71751 z"
          transform="matrix(0.968853,0.690717,-0.690717,0.968853,1048.27,-640.211)" /><path
          transform="matrix(0.968853,0.690717,-0.690717,0.968853,1123.83,-640.211)"
-         d="m 386.78752,643.92999 c 0,3.70998 -3.00753,6.71751 -6.71751,6.71751 -3.70998,0 -6.71751,-3.00753 -6.71751,-6.71751 0,-3.70998 3.00753,-6.71751 6.71751,-6.71751 3.70998,0 6.71751,3.00753 6.71751,6.71751 z"
+         d="m 386.78752,643.92999 a 6.7175102,6.7175102 0 0 1 -6.71751,6.71751 6.7175102,6.7175102 0 0 1 -6.71751,-6.71751 6.7175102,6.7175102 0 0 1 6.71751,-6.71751 6.7175102,6.7175102 0 0 1 6.71751,6.71751 z"
          sodipodi:ry="6.7175102"
          sodipodi:rx="6.7175102"
          sodipodi:cy="643.92999"
@@ -1815,10 +1813,10 @@
          sodipodi:cy="643.92999"
          sodipodi:rx="6.7175102"
          sodipodi:ry="6.7175102"
-         d="m 386.78752,643.92999 c 0,3.70998 -3.00753,6.71751 -6.71751,6.71751 -3.70998,0 -6.71751,-3.00753 -6.71751,-6.71751 0,-3.70998 3.00753,-6.71751 6.71751,-6.71751 3.70998,0 6.71751,3.00753 6.71751,6.71751 z"
+         d="m 386.78752,643.92999 a 6.7175102,6.7175102 0 0 1 -6.71751,6.71751 6.7175102,6.7175102 0 0 1 -6.71751,-6.71751 6.7175102,6.7175102 0 0 1 6.71751,-6.71751 6.7175102,6.7175102 0 0 1 6.71751,6.71751 z"
          transform="matrix(0.968853,0.690717,-0.690717,0.968853,1274.73,-640.211)" /><path
          transform="matrix(0.968853,0.690717,-0.690717,0.968853,1350.58,-640.21)"
-         d="m 386.78752,643.92999 c 0,3.70998 -3.00753,6.71751 -6.71751,6.71751 -3.70998,0 -6.71751,-3.00753 -6.71751,-6.71751 0,-3.70998 3.00753,-6.71751 6.71751,-6.71751 3.70998,0 6.71751,3.00753 6.71751,6.71751 z"
+         d="m 386.78752,643.92999 a 6.7175102,6.7175102 0 0 1 -6.71751,6.71751 6.7175102,6.7175102 0 0 1 -6.71751,-6.71751 6.7175102,6.7175102 0 0 1 6.71751,-6.71751 6.7175102,6.7175102 0 0 1 6.71751,6.71751 z"
          sodipodi:ry="6.7175102"
          sodipodi:rx="6.7175102"
          sodipodi:cy="643.92999"
@@ -1838,7 +1836,7 @@
          sodipodi:nodetypes="ccccc"
          inkscape:label="#path4168" /></g><g
        transform="matrix(1,0,0,1.1276599,0,-314.13231)"
-       style="stroke:#ffffff;display:inline"
+       style="stroke:#cecdce;display:inline"
        inkscape:transform-center-y="5.897192"
        inkscape:label="#g4076"
        id="staArrowR2"><path
@@ -1848,16 +1846,16 @@
          inkscape:connector-curvature="0"
          id="staFromR2"
          d="m 490,1114.15 0,-16 0,-164.82754 m 43.25,0 0,180.82754 -21.25,0 m 0,0 z m -22,0 22,0 -0.15789,12.4035 0,0"
-         style="fill:none;stroke:#ffffff;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /><path
+         style="fill:none;stroke:#cecdce;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /><path
          inkscape:transform-center-y="-1058.07"
          inkscape:label="#path3100"
          sodipodi:nodetypes="cccccccccc"
          inkscape:connector-curvature="0"
          id="staToR2"
          d="m 490,550.62019 0,-80.27651 -30.5,0 52.5,-62.44 m 21.25,142.71651 0,-80.27651 31.25,0 -52.5,-62.44 0.5,-15.28745 -0.5,-37.24551"
-         style="fill:none;stroke:#ffffff;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /></g><g
+         style="fill:none;stroke:#cecdce;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /></g><g
        transform="matrix(1,0,0,1.1805235,0.174175,-281.5729)"
-       style="stroke:#ffffff;display:inline"
+       style="stroke:#cecdce;display:inline"
        id="staArrowL2"
        inkscape:label="#g4072"
        inkscape:transform-center-y="4.4952743"
@@ -1869,7 +1867,7 @@
          inkscape:connector-curvature="0"
          id="staFromL2"
          d="m 512,870.12402 0,77.41299 0,77.41299 0,11.91 m 28.274,-61.16822 -28.274,0.12747 -28.274,-0.12747 c 29.31822,-29.4445 28.16879,-29.4445 28.16879,-29.4445 z"
-         style="fill:none;stroke:#ffffff;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /><path
+         style="fill:none;stroke:#cecdce;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /><path
          inkscape:transform-center-x="-0.25"
          inkscape:transform-center-y="-663.324"
          inkscape:label="#path3100"
@@ -1877,9 +1875,9 @@
          inkscape:connector-curvature="0"
          id="staToL2"
          d="m 512.25,316.675 -0.5,172.59801 M 524.774,365.7046 512.25,353.9466 499.726,365.2696 484,379.539 l 27.75,0 26.25,0.283 z"
-         style="fill:none;stroke:#ffffff;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /></g><text
+         style="fill:none;stroke:#cecdce;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /></g><text
        xml:space="preserve"
-       style="font-size:36px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#32f519;fill-opacity:1;stroke:none;font-family:Liberation Sans"
+       style="font-size:36px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#0dc04b;fill-opacity:1;stroke:none;font-family:Liberation Sans"
        x="515.13123"
        y="30.118813"
        id="appMode"
@@ -1916,12 +1914,12 @@
            inkscape:connector-curvature="0"
            id="path4916"
            d="m 493.74318,98.010924 13.00536,-20.493842 13.00464,20.493842 z"
-           style="fill:#ffffff;stroke:none;display:inline"
+           style="fill:#cecdce;stroke:none;display:inline"
            inkscape:label="#path4994"
            inkscape:transform-center-y="711.514" /><path
            inkscape:transform-center-y="503.11656"
            inkscape:label="#path4994"
-           style="fill:#ffffff;stroke:none;display:inline"
+           style="fill:#cecdce;stroke:none;display:inline"
            d="m 178.48466,-42.036802 23.72083,-5.31625 -5.32898,23.66591 z"
            id="path5967"
            inkscape:connector-curvature="0"
@@ -1932,10 +1930,10 @@
            inkscape:connector-curvature="0"
            id="path5969"
            d="m 55.220843,-360.15781 20.541,12.97556 -20.54099,12.97482 z"
-           style="fill:#ffffff;stroke:none;display:inline"
+           style="fill:#cecdce;stroke:none;display:inline"
            inkscape:label="#path4994" /><path
            inkscape:label="#path4994"
-           style="fill:#ffffff;stroke:none;display:inline"
+           style="fill:#cecdce;stroke:none;display:inline"
            d="m 193.96601,-671.33654 5.32846,23.66644 -23.72033,-5.31674 z"
            id="path5971"
            inkscape:connector-curvature="0"
@@ -1947,10 +1945,10 @@
            inkscape:connector-curvature="0"
            id="path5973"
            d="m 514.86346,-791.61765 -13.00538,20.49384 -13.00466,-20.49383 z"
-           style="fill:#ffffff;stroke:none;display:inline"
+           style="fill:#cecdce;stroke:none;display:inline"
            inkscape:label="#path4994" /><path
            inkscape:label="#path4994"
-           style="fill:#ffffff;stroke:none;display:inline"
+           style="fill:#cecdce;stroke:none;display:inline"
            d="m 828.8622,-650.35903 -23.72085,5.31623 5.32896,-23.66591 z"
            id="path5975"
            inkscape:connector-curvature="0"
@@ -1962,7 +1960,7 @@
            inkscape:connector-curvature="0"
            id="path5977"
            d="m 945.54578,-335.84406 -20.54096,-12.97556 20.54094,-12.97482 z"
-           style="fill:#ffffff;stroke:none;display:inline"
+           style="fill:#cecdce;stroke:none;display:inline"
            inkscape:label="#path4994" /></g></g><g
        style="display:inline"
        id="northUp"
@@ -1971,9 +1969,9 @@
          id="text3176"
          y="142.50098"
          x="502.03751"
-         style="font-size:22px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Liberation Sans;-inkscape-font-specification:Liberation Sans"
+         style="font-size:22px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#cecdce;fill-opacity:1;stroke:none;font-family:Liberation Sans;-inkscape-font-specification:Liberation Sans"
          xml:space="preserve"><tspan
-           style="font-size:32px;fill:#ffffff"
+           style="font-size:32px;fill:#cecdce"
            y="142.50098"
            x="502.03751"
            id="tspan3178"
@@ -1983,7 +1981,7 @@
          inkscape:connector-curvature="0"
          id="path3576"
          d="M 499.2445,114.47708 512.24986,93.983218 525.2545,114.47708 z"
-         style="fill:#ffffff;stroke:none;display:inline"
+         style="fill:#cecdce;stroke:none;display:inline"
          inkscape:label="#path4994"
          inkscape:transform-center-y="711.514" /><path
          inkscape:label="#path3017"
@@ -1993,7 +1991,7 @@
          d="m 522.504,63.7561 0,-24.042 m 0,0 -2.588,4.481 5.465,0 -2.877,-4.481"
          style="fill:none;stroke:none" /><text
          xml:space="preserve"
-         style="font-size:22px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Liberation Sans;-inkscape-font-specification:Liberation Sans"
+         style="font-size:22px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#cecdce;fill-opacity:1;stroke:none;font-family:Liberation Sans;-inkscape-font-specification:Liberation Sans"
          x="109.51917"
          y="530.25165"
          id="text3205"
@@ -2002,22 +2000,22 @@
            id="tspan3207"
            x="109.51917"
            y="530.25165"
-           style="font-size:32px;fill:#ffffff">W</tspan></text>
+           style="font-size:32px;fill:#cecdce">W</tspan></text>
 <text
          sodipodi:linespacing="125%"
          id="text3209"
          y="530.25165"
          x="894.65656"
-         style="font-size:22px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Liberation Sans;-inkscape-font-specification:Liberation Sans"
+         style="font-size:22px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#cecdce;fill-opacity:1;stroke:none;font-family:Liberation Sans;-inkscape-font-specification:Liberation Sans"
          xml:space="preserve"><tspan
-           style="font-size:32px;fill:#ffffff"
+           style="font-size:32px;fill:#cecdce"
            y="530.25165"
            x="894.65656"
            id="tspan3211"
            sodipodi:role="line">E</tspan></text>
 <text
          xml:space="preserve"
-         style="font-size:22px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Liberation Sans;-inkscape-font-specification:Liberation Sans"
+         style="font-size:22px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#cecdce;fill-opacity:1;stroke:none;font-family:Liberation Sans;-inkscape-font-specification:Liberation Sans"
          x="501.9375"
          y="922.25531"
          id="text3213"
@@ -2026,10 +2024,10 @@
            id="tspan3215"
            x="501.9375"
            y="922.25531"
-           style="font-size:32px;fill:#ffffff">S</tspan></text>
+           style="font-size:32px;fill:#cecdce">S</tspan></text>
 <path
          inkscape:label="#path4994"
-         style="fill:#ffffff;stroke:none;display:inline"
+         style="fill:#cecdce;stroke:none;display:inline"
          d="M 105.51917,531.817 85.025313,518.81164 105.51917,505.807 z"
          id="path3863"
          inkscape:connector-curvature="0"
@@ -2040,23 +2038,23 @@
          inkscape:connector-curvature="0"
          id="path3865"
          d="M 921.72497,531.81746 942.21883,518.8121 921.72497,505.80746 z"
-         style="fill:#ffffff;stroke:none;display:inline"
+         style="fill:#cecdce;stroke:none;display:inline"
          inkscape:label="#path4994" /><path
          inkscape:transform-center-y="-711.514"
          inkscape:label="#path4994"
-         style="fill:#ffffff;stroke:none;display:inline"
+         style="fill:#cecdce;stroke:none;display:inline"
          d="m 499.205,927.64772 13.00536,20.49387 13.00464,-20.49387 z"
          id="path3867"
          inkscape:connector-curvature="0"
          sodipodi:nodetypes="ccccccccc" /></g><text
        xml:space="preserve"
-       style="font-size:36px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#0096ce;fill-opacity:1;stroke:none;display:inline;font-family:Liberation Sans;-inkscape-font-specification:Liberation Sans"
+       style="font-size:36px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#1684a5;fill-opacity:1;stroke:none;display:inline;font-family:Liberation Sans;-inkscape-font-specification:Liberation Sans"
        x="33.747993"
        y="560.56116"
        id="rangePln2"
        sodipodi:linespacing="125%"
        inkscape:label="#text7243"><tspan
-         style="text-align:center;text-anchor:middle;fill:#0096ce;fill-opacity:1"
+         style="text-align:center;text-anchor:middle;fill:#1684a5;fill-opacity:1"
          sodipodi:role="line"
          id="tspan5002-7"
          x="33.747993"
@@ -2076,7 +2074,7 @@
          style="text-align:center;text-anchor:middle">99</tspan></text>
 <text
        xml:space="preserve"
-       style="font-size:36px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#0096ce;fill-opacity:1;stroke:none;display:inline;font-family:Liberation Sans;-inkscape-font-specification:Liberation Sans"
+       style="font-size:36px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#1684a5;fill-opacity:1;stroke:none;display:inline;font-family:Liberation Sans;-inkscape-font-specification:Liberation Sans"
        x="374.21063"
        y="666.73596"
        id="rangePln3"
@@ -2093,7 +2091,7 @@
        id="rangePln4"
        y="818.55823"
        x="231.77499"
-       style="font-size:36px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#0096ce;fill-opacity:1;stroke:none;display:inline;font-family:Liberation Sans;-inkscape-font-specification:Liberation Sans"
+       style="font-size:36px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#1684a5;fill-opacity:1;stroke:none;display:inline;font-family:Liberation Sans;-inkscape-font-specification:Liberation Sans"
        xml:space="preserve"><tspan
          y="818.55823"
          x="231.77499"
@@ -2106,13 +2104,13 @@
        id="rangePln5"
        y="560.56152"
        x="993.04187"
-       style="font-size:36px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#0096ce;fill-opacity:1;stroke:none;display:inline;font-family:Liberation Sans;-inkscape-font-specification:Liberation Sans"
+       style="font-size:36px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#1684a5;fill-opacity:1;stroke:none;display:inline;font-family:Liberation Sans;-inkscape-font-specification:Liberation Sans"
        xml:space="preserve"><tspan
          y="560.56152"
          x="993.04187"
          id="tspan4742"
          sodipodi:role="line"
-         style="text-align:center;text-anchor:middle;fill:#0096ce;fill-opacity:1">99</tspan></text>
+         style="text-align:center;text-anchor:middle;fill:#1684a5;fill-opacity:1">99</tspan></text>
 <g
        transform="matrix(1.02827,0,0,1.02827,9.2744,-29.1838)"
        inkscape:label="#g3956"
diff --git a/Models/Instruments/ND/canvas/style.nas b/Models/Instruments/ND/canvas/style.nas
index 8fadcba3..95d41166 100644
--- a/Models/Instruments/ND/canvas/style.nas
+++ b/Models/Instruments/ND/canvas/style.nas
@@ -60,28 +60,28 @@ canvas.NDStyles["Airbus"] = {
 			# You can easily override these options before creating the ND, example:
 			#	canvas.NDStyles["Airbus"].options.defaults.fplan_active = "my/autpilot/f-plan/active"
 			fplan_active: "autopilot/route-manager/active",
-			lat_ctrl: "flight-management/control/lat-ctrl",
-			managed_val: "fmgc",
-			ver_ctrl: "flight-management/control/ver-ctrl",
+			lat_ctrl: "/it-autoflight/output/lat",
+			managed_val: 1,
+			ver_ctrl: "/it-autoflight/output/vert",
 			spd_ctrl: "/flight-management/control/spd-ctrl",
 			current_wp: "/autopilot/route-manager/current-wp",
-			ap1: "/flight-management/control/ap1-master",
-			ap2: "/flight-management/control/ap2-master",
-			nav1_frq: "instrumentation/nav/frequencies/selected-mhz",
-			nav2_frq: "instrumentation/nav[1]/frequencies/selected-mhz",
-			vor1_frq: "instrumentation/nav[2]/frequencies/selected-mhz",
-			vor2_frq: "instrumentation/nav[3]/frequencies/selected-mhz",
-			adf1_frq: "instrumentation/adf/frequencies/selected-khz",
-			adf2_frq: "instrumentation/adf[1]/frequencies/selected-khz",
+			ap1: "/it-autoflight/output/ap1",
+			ap2: "/it-autoflight/output/ap2",
+			nav1_frq: "/instrumentation/nav[0]/frequencies/selected-mhz",
+			nav2_frq: "/instrumentation/nav[1]/frequencies/selected-mhz",
+			vor1_frq: "/instrumentation/nav[2]/frequencies/selected-mhz",
+			vor2_frq: "/instrumentation/nav[3]/frequencies/selected-mhz",
+			adf1_frq: "/instrumentation/adf[0]/frequencies/selected-khz",
+			adf2_frq: "/instrumentation/adf[1]/frequencies/selected-khz",
 			dep_rwy: "/autopilot/route-manager/departure/runway",
 			dest_rwy: "/autopilot/route-manager/destination/runway",
 			wp_count: "autopilot/route-manager/route/num",
 			level_off_alt: "/autopilot/route-manager/vnav/level-off-alt",
-			athr: "/flight-management/control/a-thrust",
-			app_mode: "instrumentation/nd/app-mode",
-			chrono_node: "instrumentation/chrono",
-			fpln_offset: "autopilot/route-manager/offset",
-			active_route_color: [0.4,0.7,0.4],
+			athr: "/it-autoflight/output/athr",
+			app_mode: "/instrumentation/nd/app-mode",
+			chrono_node: "/instrumentation/chrono",
+			fpln_offset: "/autopilot/route-manager/offset",
+			active_route_color: [0.0509,0.7529,0.2941],
 			inactive_route_color: [0.95,0.95,0.21]
 		},
 		radio: {
diff --git a/revision.txt b/revision.txt
index 4323a87a..050e0b7f 100644
--- a/revision.txt
+++ b/revision.txt
@@ -1 +1 @@
-4022
\ No newline at end of file
+4023
\ No newline at end of file