npm - @cruglobal/godtools-shared - Versions diffs - 1.1.3-PR783-SNAPSHOT.1710 → 1.1.3-PR790-SNAPSHOT.1717 - Mend

@cruglobal/godtools-shared 1.1.3-PR783-SNAPSHOT.1710 → 1.1.3-PR790-SNAPSHOT.1717

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (11) hide show

package/antlr-kotlin-antlr-kotlin-runtime.js +3 -3
package/kotlin-kotlin-stdlib.js +17 -17
package/kotlin-kotlin-stdlib.js.map +1 -1
package/kotlin-mpp-godtools-tool-parser-module-parser-expressions.js +3 -3
package/kotlin-mpp-godtools-tool-parser-module-parser-expressions.js.map +1 -1
package/kotlin-mpp-godtools-tool-parser-module-parser.js +520 -441
package/kotlin-mpp-godtools-tool-parser-module-parser.js.map +1 -1
package/kotlin-mpp-godtools-tool-parser-publishing-npm.d.ts +6 -0
package/kotlinx-coroutines-core.js +8 -8
package/kotlinx-coroutines-core.js.map +1 -1
package/package.json +1 -1

package/kotlin-mpp-godtools-tool-parser-module-parser.js CHANGED Viewed

@@ -261,13 +261,13 @@
     return distinctUntilChanged(state.y1m(tmp, Visibility$isGoneFlow$lambda(this)));
   }
   function watchIsGone(state, block) {
-    return Companion_instance_58.w3s(this.isGoneFlow(state), block);
+    return Companion_instance_59.w3s(this.isGoneFlow(state), block);
   }
   function watchIsInvisible(state, block) {
-    return Companion_instance_58.w3s(this.isInvisibleFlow(state), block);
+    return Companion_instance_59.w3s(this.isInvisibleFlow(state), block);
   }
   function watchVisibility(state, block) {
-    var tmp = Companion_instance_58;
+    var tmp = Companion_instance_59;
     var tmp_0 = this.isInvisibleFlow(state);
     var tmp_1 = this.isGoneFlow(state);
     var tmp_2 = combine(tmp_0, tmp_1, Visibility$watchVisibility$slambda_0(null));
@@ -459,43 +459,45 @@
   initMetadataForClass(LessonPage, 'LessonPage', VOID, Page, [Page, Parent]);
   initMetadataForCompanion(Companion_42);
   initMetadataForCompanion(Companion_43);
+  initMetadataForCompanion(Companion_44);
+  initMetadataForClass(Header, 'Header', VOID, BaseModel, [BaseModel, Parent]);
   initMetadataForClass(Card_0, 'Card', VOID, BaseModel, [BaseModel, Parent, HasAnalyticsEvents]);
   initMetadataForClass(CardCollectionPage, 'CardCollectionPage', VOID, Page);
-  initMetadataForCompanion(Companion_44);
+  initMetadataForCompanion(Companion_45);
   initMetadataForClass(ContentPage, 'ContentPage', VOID, Page, [Page, Parent]);
   initMetadataForCoroutine($parseCOROUTINE$1, CoroutineImpl);
-  initMetadataForCompanion(Companion_45, VOID, VOID, [4]);
+  initMetadataForCompanion(Companion_46, VOID, VOID, [4]);
   initMetadataForCoroutine($parseCOROUTINE$2, CoroutineImpl);
   initMetadataForLambda(PageCollectionPage$buildPagesFromParsedPages$slambda$slambda, CoroutineImpl, VOID, [1]);
-  initMetadataForCompanion(Companion_46, VOID, VOID, [4]);
+  initMetadataForCompanion(Companion_47, VOID, VOID, [4]);
   initMetadataForClass(PageOrImport, 'PageOrImport', PageOrImport);
   initMetadataForLambda(PageCollectionPage$buildPagesFromParsedPages$slambda, CoroutineImpl, VOID, [1]);
   initMetadataForCoroutine($buildPagesFromParsedPagesCOROUTINE$3, CoroutineImpl);
   initMetadataForClass(PageCollectionPage, 'PageCollectionPage', VOID, Page, [Page, HasPages], [1]);
-  initMetadataForCompanion(Companion_47);
-  initMetadataForClass(Shareable, 'Shareable', VOID, BaseModel);
   initMetadataForCompanion(Companion_48);
-  initMetadataForClass(ShareableImage, 'ShareableImage', VOID, Shareable);
+  initMetadataForClass(Shareable, 'Shareable', VOID, BaseModel);
   initMetadataForCompanion(Companion_49);
-  initMetadataForClass(InlineTip, 'InlineTip', VOID, Content);
+  initMetadataForClass(ShareableImage, 'ShareableImage', VOID, Shareable);
   initMetadataForCompanion(Companion_50);
+  initMetadataForClass(InlineTip, 'InlineTip', VOID, Content);
+  initMetadataForCompanion(Companion_51);
   initMetadataForClass(Type_2, 'Type', VOID, Enum);
   initMetadataForClass(Tip, 'Tip', Tip_init_$Create$_0, BaseModel, [BaseModel, Styles]);
-  initMetadataForCompanion(Companion_51);
-  initMetadataForClass(TipPage, 'TipPage', VOID, BaseModel, [BaseModel, Parent]);
   initMetadataForCompanion(Companion_52);
-  initMetadataForClass(CallToAction, 'CallToAction', createTestCallToAction, BaseModel);
+  initMetadataForClass(TipPage, 'TipPage', VOID, BaseModel, [BaseModel, Parent]);
   initMetadataForCompanion(Companion_53);
-  initMetadataForClass(Header, 'Header', VOID, BaseModel, [BaseModel, Styles]);
+  initMetadataForClass(CallToAction, 'CallToAction', createTestCallToAction, BaseModel);
   initMetadataForCompanion(Companion_54);
-  initMetadataForClass(Hero, 'Hero', createTestHero, BaseModel, [BaseModel, Parent, HasAnalyticsEvents]);
+  initMetadataForClass(Header_0, 'Header', VOID, BaseModel, [BaseModel, Styles]);
   initMetadataForCompanion(Companion_55);
-  initMetadataForClass(Modal, 'Modal', VOID, BaseModel, [BaseModel, Parent, Styles]);
+  initMetadataForClass(Hero, 'Hero', createTestHero, BaseModel, [BaseModel, Parent, HasAnalyticsEvents]);
   initMetadataForCompanion(Companion_56);
+  initMetadataForClass(Modal, 'Modal', VOID, BaseModel, [BaseModel, Parent, Styles]);
+  initMetadataForCompanion(Companion_57);
   initMetadataForClass(Card_1, 'Card', createTestCard, BaseModel, [BaseModel, Styles, Parent, HasAnalyticsEvents]);
   initMetadataForClass(TractPage, 'TractPage', createTestTractPage, Page);
   initMetadataForLambda(FlowWatcher$Companion$watchIn$slambda, CoroutineImpl, VOID, [1]);
-  initMetadataForCompanion(Companion_57);
+  initMetadataForCompanion(Companion_58);
   initMetadataForClass(FlowWatcher, 'FlowWatcher');
   initMetadataForObject(EMPTY, 'EMPTY');
   initMetadataForClass(SetOnceProperty, 'SetOnceProperty', SetOnceProperty);
@@ -4261,7 +4263,7 @@
         switch (tmp) {
           case 0:
             this.w8_1 = 3;
-            this.j3m_1 = Companion_getInstance_48();
+            this.j3m_1 = Companion_getInstance_49();
             this.v8_1 = 1;
             suspendResult = this.g3m_1(this.h3m_1, this);
             if (suspendResult === get_COROUTINE_SUSPENDED()) {
@@ -4900,7 +4902,7 @@
       } else if (tmp0_subject === 'https://mobile-content-api.cru.org/xmlns/shareable') {
         if (parser.l2() === 'items') {
           // Inline function 'kotlin.collections.plusAssign' call
-          var elements_3 = Companion_instance_48.q3p(parser, $this);
+          var elements_3 = Companion_instance_49.q3p(parser, $this);
           addAll(shareables, elements_3);
         }
       }
@@ -5852,7 +5854,7 @@
     return distinctUntilChanged(state.y1m(tmp, Multiselect$Option$isSelectedFlow$lambda(this)));
   };
   protoOf(Option).watchIsSelected = function (state, block) {
-    return Companion_instance_58.w3s(this.isSelectedFlow(state), block);
+    return Companion_instance_59.w3s(this.isSelectedFlow(state), block);
   };
   protoOf(Option).toggleSelected = function (state) {
     var current = state.z1m(this.multiselect.o3s_1);
@@ -7462,29 +7464,87 @@
   function LessonPage() {
   }
   function Companion_42() {
-    this.n3y_1 = 'card';
-    this.o3y_1 = 'id';
-    this.p3y_1 = 'content';
+    this.n3y_1 = 'header';
   }
   var Companion_instance_43;
   function Companion_getInstance_45() {
     return Companion_instance_43;
   }
+  function Header_init_$Init$(page, parser, $this) {
+    BaseModel.call($this, page);
+    Header.call($this);
+    parser.p3b(2, 'https://mobile-content-api.cru.org/xmlns/page', 'header');
+    var tmp = $this;
+    // Inline function 'org.cru.godtools.shared.tool.parser.model.parseContent' call
+    // Inline function 'kotlin.collections.buildList' call
+    // Inline function 'kotlin.collections.buildListInternal' call
+    // Inline function 'kotlin.apply' call
+    var this_0 = ArrayList_init_$Create$();
+    parser.p3b(2, null, null);
+    // Inline function 'org.cru.godtools.shared.tool.parser.xml.parseChildren' call
+    $l$loop_0: while (!(parser.l() === 3)) {
+      if (!(parser.q3b() === 2))
+        continue $l$loop_0;
+      $l$block: {
+        if (parser.q3b() === 3) {
+          break $l$block;
+        }
+        var tmp0_safe_receiver = Companion_instance_12.u3b(parser, $this);
+        var tmp_0;
+        if (tmp0_safe_receiver == null) {
+          tmp_0 = null;
+        } else {
+          // Inline function 'kotlin.takeUnless' call
+          var tmp_1;
+          if (!tmp0_safe_receiver.b3c()) {
+            tmp_1 = tmp0_safe_receiver;
+          } else {
+            tmp_1 = null;
+          }
+          tmp_0 = tmp_1;
+        }
+        var tmp1_safe_receiver = tmp_0;
+        if (tmp1_safe_receiver == null)
+          null;
+        else {
+          // Inline function 'kotlin.let' call
+          this_0.e(tmp1_safe_receiver);
+        }
+      }
+      if (parser.q3b() === 3)
+        continue $l$loop_0;
+      skipTag(parser);
+    }
+    tmp.p3y_1 = this_0.k3();
+    return $this;
+  }
+  function Header_init_$Create$(page, parser) {
+    return Header_init_$Init$(page, parser, objectCreate(protoOf(Header)));
+  }
+  function Companion_43() {
+    this.q3y_1 = 'card';
+    this.r3y_1 = 'id';
+    this.s3y_1 = 'content';
+  }
+  var Companion_instance_44;
+  function Companion_getInstance_46() {
+    return Companion_instance_44;
+  }
   function Card_init_$Init$_0(page, parser, $this) {
     BaseModel.call($this, page);
     Card_0.call($this);
     $this.page = page;
     parser.p3b(2, 'https://mobile-content-api.cru.org/xmlns/page', 'card');
-    $this.r3y_1 = parser.e3d('id');
+    $this.u3y_1 = parser.e3d('id');
     var tmp = $this;
     var tmp0_safe_receiver = parser.e3d('background-color');
-    tmp.s3y_1 = tmp0_safe_receiver == null ? null : toColorOrNull(tmp0_safe_receiver);
+    tmp.v3y_1 = tmp0_safe_receiver == null ? null : toColorOrNull(tmp0_safe_receiver);
     var tmp_0 = $this;
     // Inline function 'kotlin.collections.mutableListOf' call
-    tmp_0.t3y_1 = ArrayList_init_$Create$();
+    tmp_0.w3y_1 = ArrayList_init_$Create$();
     var tmp_1 = $this;
     // Inline function 'kotlin.collections.mutableListOf' call
-    tmp_1.u3y_1 = ArrayList_init_$Create$();
+    tmp_1.x3y_1 = ArrayList_init_$Create$();
     // Inline function 'org.cru.godtools.shared.tool.parser.xml.parseChildren' call
     $l$loop_2: while (!(parser.l() === 3)) {
       if (!(parser.q3b() === 2))
@@ -7492,14 +7552,14 @@
       var tmp0_subject = parser.r3b();
       if (tmp0_subject === 'https://mobile-content-api.cru.org/xmlns/analytics') {
         if (parser.l2() === 'events') {
-          var tmp0 = $this.t3y_1;
+          var tmp0 = $this.w3y_1;
           // Inline function 'kotlin.collections.plusAssign' call
           var elements = Companion_instance_4.t3b(parser, $this);
           addAll(tmp0, elements);
         }
       } else if (tmp0_subject === 'https://mobile-content-api.cru.org/xmlns/page') {
         if (parser.l2() === 'content') {
-          var tmp4 = $this.u3y_1;
+          var tmp4 = $this.x3y_1;
           // Inline function 'org.cru.godtools.shared.tool.parser.model.parseContent' call
           // Inline function 'kotlin.collections.buildList' call
           // Inline function 'kotlin.collections.buildListInternal' call
@@ -7554,21 +7614,22 @@
   function Card_init_$Create$_0(page, parser) {
     return Card_init_$Init$_0(page, parser, objectCreate(protoOf(Card_0)));
   }
-  function Companion_43() {
-    this.v3y_1 = 'cardcollection';
+  function Companion_44() {
+    this.y3y_1 = 'cardcollection';
   }
-  var Companion_instance_44;
-  function Companion_getInstance_46() {
-    return Companion_instance_44;
+  var Companion_instance_45;
+  function Companion_getInstance_47() {
+    return Companion_instance_45;
   }
   function CardCollectionPage_init_$Init$(container, fileName, parser, $this) {
     Page_init_$Init$(container, fileName, parser, $this);
     CardCollectionPage.call($this);
     parser.p3b(2, 'https://mobile-content-api.cru.org/xmlns/page', 'page');
-    Companion_getInstance_48().w3y(parser, 'cardcollection');
+    Companion_getInstance_49().z3y(parser, 'cardcollection');
     var tmp = $this;
     // Inline function 'kotlin.collections.mutableListOf' call
-    tmp.p3z_1 = ArrayList_init_$Create$();
+    tmp.s3z_1 = ArrayList_init_$Create$();
+    var header = null;
     var tmp_0 = $this;
     // Inline function 'kotlin.collections.mutableListOf' call
     tmp_0._cards = ArrayList_init_$Create$();
@@ -7579,13 +7640,16 @@
       var tmp0_subject = parser.r3b();
       if (tmp0_subject === 'https://mobile-content-api.cru.org/xmlns/analytics') {
         if (parser.l2() === 'events') {
-          var tmp0 = $this.p3z_1;
+          var tmp0 = $this.s3z_1;
           // Inline function 'kotlin.collections.plusAssign' call
           var elements = Companion_instance_4.t3b(parser, $this);
           addAll(tmp0, elements);
         }
       } else if (tmp0_subject === 'https://mobile-content-api.cru.org/xmlns/page') {
-        if (parser.l2() === 'cards') {
+        var tmp2_subject = parser.l2();
+        if (tmp2_subject === 'header')
+          header = Header_init_$Create$($this, parser);
+        else if (tmp2_subject === 'cards') {
           var tmp2 = $this._cards;
           // Inline function 'kotlin.collections.plusAssign' call
           var elements_0 = parseCards($this, parser);
@@ -7596,6 +7660,7 @@
         continue $l$loop_0;
       skipTag(parser);
     }
+    $this.header = header;
     return $this;
   }
   function CardCollectionPage_init_$Create$(container, fileName, parser) {
@@ -7619,22 +7684,27 @@
     }
     return this_0.k3();
   }
-  protoOf(Card_0).q3z = function () {
+  protoOf(Header).l3c = function () {
+    return this.p3y_1;
+  };
+  function Header() {
+  }
+  protoOf(Card_0).t3z = function () {
     return this.page;
   };
   protoOf(Card_0).j3c = function () {
-    var tmp0_elvis_lhs = this.r3y_1;
+    var tmp0_elvis_lhs = this.u3y_1;
     return tmp0_elvis_lhs == null ? this.page.id + '-' + this.position : tmp0_elvis_lhs;
   };
   protoOf(Card_0).q3u = function () {
     return this.page._cards.w1(this);
   };
   protoOf(Card_0).j3q = function () {
-    var tmp0_elvis_lhs = this.s3y_1;
+    var tmp0_elvis_lhs = this.v3y_1;
     return tmp0_elvis_lhs == null ? this.page.v3h() : tmp0_elvis_lhs;
   };
   protoOf(Card_0).l3c = function () {
-    return this.u3y_1;
+    return this.x3y_1;
   };
   protoOf(Card_0).v3c = function () {
     // Inline function 'org.cru.godtools.shared.tool.parser.model.contentTips' call
@@ -7656,7 +7726,7 @@
       case 0:
         // Inline function 'kotlin.collections.filter' call
-        var tmp0 = this.t3y_1;
+        var tmp0 = this.w3y_1;
         // Inline function 'kotlin.collections.filterTo' call
         var destination = ArrayList_init_$Create$();
@@ -7673,7 +7743,7 @@
       case 1:
         // Inline function 'kotlin.collections.filter' call
-        var tmp0_0 = this.t3y_1;
+        var tmp0_0 = this.w3y_1;
         // Inline function 'kotlin.collections.filterTo' call
         var destination_0 = ArrayList_init_$Create$();
@@ -7699,12 +7769,15 @@
   function Card_0() {
   }
   protoOf(CardCollectionPage).x3g = function () {
-    return this.p3z_1;
+    return this.s3z_1;
   };
-  protoOf(CardCollectionPage).r3z = function () {
+  protoOf(CardCollectionPage).k3c = function () {
+    return this.header;
+  };
+  protoOf(CardCollectionPage).u3z = function () {
     return this._cards;
   };
-  protoOf(CardCollectionPage).s3z = function () {
+  protoOf(CardCollectionPage).v3z = function () {
     // Inline function 'kotlin.collections.toTypedArray' call
     var this_0 = this._cards;
     return copyToArray(this_0);
@@ -7724,24 +7797,24 @@
       DEFAULT_CONTROL_COLOR = toPlatformColor_0(Companion_getInstance_1().g1s(225 / 255.0, 225 / 255.0, 225 / 255.0, 1.0));
     }
   }
-  function Companion_44() {
-    this.t3z_1 = 'content';
+  function Companion_45() {
+    this.w3z_1 = 'content';
   }
-  var Companion_instance_45;
-  function Companion_getInstance_47() {
-    return Companion_instance_45;
+  var Companion_instance_46;
+  function Companion_getInstance_48() {
+    return Companion_instance_46;
   }
   function ContentPage_init_$Init$(container, fileName, parser, $this) {
     Page_init_$Init$(container, fileName, parser, $this);
     ContentPage.call($this);
     parser.p3b(2, 'https://mobile-content-api.cru.org/xmlns/page', 'page');
-    Companion_getInstance_48().w3y(parser, 'content');
+    Companion_getInstance_49().z3y(parser, 'content');
     var tmp = $this;
     // Inline function 'kotlin.collections.mutableListOf' call
-    tmp.m40_1 = ArrayList_init_$Create$();
+    tmp.p40_1 = ArrayList_init_$Create$();
     var tmp_0 = $this;
     // Inline function 'kotlin.collections.mutableListOf' call
-    tmp_0.n40_1 = ArrayList_init_$Create$();
+    tmp_0.q40_1 = ArrayList_init_$Create$();
     // Inline function 'org.cru.godtools.shared.tool.parser.xml.parseChildren' call
     $l$loop_2: while (!(parser.l() === 3)) {
       if (!(parser.q3b() === 2))
@@ -7749,14 +7822,14 @@
       var tmp0_subject = parser.r3b();
       if (tmp0_subject === 'https://mobile-content-api.cru.org/xmlns/analytics') {
         if (parser.l2() === 'events') {
-          var tmp0 = $this.m40_1;
+          var tmp0 = $this.p40_1;
           // Inline function 'kotlin.collections.plusAssign' call
           var elements = Companion_instance_4.t3b(parser, $this);
           addAll(tmp0, elements);
         }
       } else if (tmp0_subject === 'https://mobile-content-api.cru.org/xmlns/page') {
         if (parser.l2() === 'content') {
-          var tmp4 = $this.n40_1;
+          var tmp4 = $this.q40_1;
           // Inline function 'org.cru.godtools.shared.tool.parser.model.parseContent' call
           // Inline function 'kotlin.collections.buildList' call
           // Inline function 'kotlin.collections.buildListInternal' call
@@ -7812,20 +7885,20 @@
     return ContentPage_init_$Init$(container, fileName, parser, objectCreate(protoOf(ContentPage)));
   }
   protoOf(ContentPage).x3g = function () {
-    return this.m40_1;
+    return this.p40_1;
   };
   protoOf(ContentPage).l3c = function () {
-    return this.n40_1;
+    return this.q40_1;
   };
   function ContentPage() {
   }
   function $parseCOROUTINE$1(_this__u8e3s4, container, fileName, parser, parseFile, resultContinuation) {
     CoroutineImpl.call(this, resultContinuation);
-    this.w40_1 = _this__u8e3s4;
-    this.x40_1 = container;
-    this.y40_1 = fileName;
-    this.z40_1 = parser;
-    this.a41_1 = parseFile;
+    this.z40_1 = _this__u8e3s4;
+    this.a41_1 = container;
+    this.b41_1 = fileName;
+    this.c41_1 = parser;
+    this.d41_1 = parseFile;
   }
   protoOf($parseCOROUTINE$1).d9 = function () {
     var suspendResult = this.x8_1;
@@ -7835,35 +7908,35 @@
         switch (tmp) {
           case 0:
             this.w8_1 = 3;
-            this.z40_1.p3b(2, null, 'page');
-            this.b41_1 = to(this.z40_1.r3b(), this.z40_1.o3p('http://www.w3.org/2001/XMLSchema-instance', 'type'));
-            if (this.b41_1.equals(to('https://mobile-content-api.cru.org/xmlns/page', 'page-collection'))) {
-              if (!this.x40_1.i3k(getKClass(PageCollectionPage)))
+            this.c41_1.p3b(2, null, 'page');
+            this.e41_1 = to(this.c41_1.r3b(), this.c41_1.o3p('http://www.w3.org/2001/XMLSchema-instance', 'type'));
+            if (this.e41_1.equals(to('https://mobile-content-api.cru.org/xmlns/page', 'page-collection'))) {
+              if (!this.a41_1.i3k(getKClass(PageCollectionPage)))
                 return null;
               this.v8_1 = 1;
-              suspendResult = Companion_instance_47.i41(this.x40_1, this.y40_1, this.z40_1, this.a41_1, this);
+              suspendResult = Companion_instance_48.l41(this.a41_1, this.b41_1, this.c41_1, this.d41_1, this);
               if (suspendResult === get_COROUTINE_SUSPENDED()) {
                 return suspendResult;
               }
               continue $sm;
             } else {
-              this.c41_1 = this.w40_1.d41(this.x40_1, this.y40_1, this.z40_1);
+              this.f41_1 = this.z40_1.g41(this.a41_1, this.b41_1, this.c41_1);
               this.v8_1 = 2;
               continue $sm;
             }
           case 1:
-            this.c41_1 = suspendResult;
+            this.f41_1 = suspendResult;
             this.v8_1 = 2;
             continue $sm;
           case 2:
-            var tmp1_safe_receiver = this.c41_1;
+            var tmp1_safe_receiver = this.f41_1;
             var tmp_0;
             if (tmp1_safe_receiver == null) {
               tmp_0 = null;
             } else {
               var tmp_1;
-              if (this.x40_1.i3k(getKClassFromExpression(tmp1_safe_receiver))) {
+              if (this.a41_1.i3k(getKClassFromExpression(tmp1_safe_receiver))) {
                 tmp_1 = tmp1_safe_receiver;
               } else {
                 tmp_1 = null;
@@ -7886,8 +7959,8 @@
       }
      while (true);
   };
-  function Companion_45() {
-    Companion_instance_46 = this;
+  function Companion_46() {
+    Companion_instance_47 = this;
     this.m3m_1 = 'page';
     this.n3m_1 = 'parent_override_page-collection';
     var tmp = this;
@@ -7896,13 +7969,13 @@
     this.p3m_1 = Companion_getInstance_22().CENTER;
     this.q3m_1 = ImageScaleType_FILL_X_getInstance();
   }
-  protoOf(Companion_45).r3m = function (container, fileName, parser, parseFile, $completion) {
+  protoOf(Companion_46).r3m = function (container, fileName, parser, parseFile, $completion) {
     var tmp = new $parseCOROUTINE$1(this, container, fileName, parser, parseFile, $completion);
     tmp.x8_1 = Unit_instance;
     tmp.y8_1 = null;
     return tmp.d9();
   };
-  protoOf(Companion_45).d41 = function (container, fileName, parser) {
+  protoOf(Companion_46).g41 = function (container, fileName, parser) {
     parser.p3b(2, null, 'page');
     var tmp;
     switch (parser.r3b()) {
@@ -7973,16 +8046,16 @@
     }
     return tmp_1;
   };
-  protoOf(Companion_45).w3y = function (_this__u8e3s4, type) {
+  protoOf(Companion_46).z3y = function (_this__u8e3s4, type) {
     var actual = _this__u8e3s4.o3p('http://www.w3.org/2001/XMLSchema-instance', 'type');
     if (!(type === actual))
       throw new XmlPullParserException('expected ' + type + ' not ' + actual);
   };
-  var Companion_instance_46;
-  function Companion_getInstance_48() {
-    if (Companion_instance_46 == null)
-      new Companion_45();
-    return Companion_instance_46;
+  var Companion_instance_47;
+  function Companion_getInstance_49() {
+    if (Companion_instance_47 == null)
+      new Companion_46();
+    return Companion_instance_47;
   }
   function _get_parentPageContainer__qsoup5($this) {
     var parent = $this.gl();
@@ -8045,16 +8118,16 @@
     var tmp_7 = $this;
     var tmp6_safe_receiver = parser.e3d('background-color');
     var tmp7_elvis_lhs = tmp6_safe_receiver == null ? null : toColorOrNull(tmp6_safe_receiver);
-    tmp_7.w3x_1 = tmp7_elvis_lhs == null ? Companion_getInstance_48().o3m_1 : tmp7_elvis_lhs;
+    tmp_7.w3x_1 = tmp7_elvis_lhs == null ? Companion_getInstance_49().o3m_1 : tmp7_elvis_lhs;
     $this.x3x_1 = parser.e3d('background-image');
     var tmp_8 = $this;
     var tmp8_safe_receiver = parser.e3d('background-image-align');
     var tmp9_elvis_lhs = tmp8_safe_receiver == null ? null : Companion_getInstance_22().m3g(tmp8_safe_receiver);
-    tmp_8.y3x_1 = tmp9_elvis_lhs == null ? Companion_getInstance_48().p3m_1 : tmp9_elvis_lhs;
+    tmp_8.y3x_1 = tmp9_elvis_lhs == null ? Companion_getInstance_49().p3m_1 : tmp9_elvis_lhs;
     var tmp_9 = $this;
     var tmp10_safe_receiver = parser.e3d('background-image-scale-type');
     var tmp11_elvis_lhs = tmp10_safe_receiver == null ? null : Companion_instance_22.w3k(tmp10_safe_receiver);
-    tmp_9.z3x_1 = tmp11_elvis_lhs == null ? Companion_getInstance_48().q3m_1 : tmp11_elvis_lhs;
+    tmp_9.z3x_1 = tmp11_elvis_lhs == null ? Companion_getInstance_49().q3m_1 : tmp11_elvis_lhs;
     var tmp_10 = $this;
     var tmp12_safe_receiver = parser.e3d('control-color');
     tmp_10.a3y_1 = tmp12_safe_receiver == null ? null : toColorOrNull(tmp12_safe_receiver);
@@ -8082,10 +8155,10 @@
     fileName = fileName === VOID ? null : fileName;
     parentPage = parentPage === VOID ? null : parentPage;
     primaryColor = primaryColor === VOID ? null : primaryColor;
-    backgroundColor = backgroundColor === VOID ? Companion_getInstance_48().o3m_1 : backgroundColor;
+    backgroundColor = backgroundColor === VOID ? Companion_getInstance_49().o3m_1 : backgroundColor;
     backgroundImage = backgroundImage === VOID ? null : backgroundImage;
-    backgroundImageGravity = backgroundImageGravity === VOID ? Companion_getInstance_48().p3m_1 : backgroundImageGravity;
-    backgroundImageScaleType = backgroundImageScaleType === VOID ? Companion_getInstance_48().q3m_1 : backgroundImageScaleType;
+    backgroundImageGravity = backgroundImageGravity === VOID ? Companion_getInstance_49().p3m_1 : backgroundImageGravity;
+    backgroundImageScaleType = backgroundImageScaleType === VOID ? Companion_getInstance_49().q3m_1 : backgroundImageScaleType;
     controlColor = controlColor === VOID ? null : controlColor;
     cardBackgroundColor = cardBackgroundColor === VOID ? null : cardBackgroundColor;
     multiselectOptionBackgroundColor = multiselectOptionBackgroundColor === VOID ? null : multiselectOptionBackgroundColor;
@@ -8321,7 +8394,7 @@
     return copyToArray(this_0);
   };
   function Page() {
-    Companion_getInstance_48();
+    Companion_getInstance_49();
     var tmp = this;
     tmp.p3x_1 = lazy(Page$id$delegate$lambda(this));
     var tmp_0 = this;
@@ -8339,11 +8412,11 @@
   }
   function $parseCOROUTINE$2(_this__u8e3s4, container, fileName, parser, parseFile, resultContinuation) {
     CoroutineImpl.call(this, resultContinuation);
-    this.r41_1 = _this__u8e3s4;
-    this.s41_1 = container;
-    this.t41_1 = fileName;
-    this.u41_1 = parser;
-    this.v41_1 = parseFile;
+    this.u41_1 = _this__u8e3s4;
+    this.v41_1 = container;
+    this.w41_1 = fileName;
+    this.x41_1 = parser;
+    this.y41_1 = parseFile;
   }
   protoOf($parseCOROUTINE$2).d9 = function () {
     var suspendResult = this.x8_1;
@@ -8354,20 +8427,20 @@
           case 0:
             this.w8_1 = 2;
             var tmp_0 = this;
-            tmp_0.w41_1 = PageCollectionPage_init_$Create$(this.s41_1, this.t41_1, this.u41_1);
-            this.x41_1 = this.w41_1;
+            tmp_0.z41_1 = PageCollectionPage_init_$Create$(this.v41_1, this.w41_1, this.x41_1);
+            this.a42_1 = this.z41_1;
             var tmp_1 = this;
-            tmp_1.y41_1 = this.x41_1;
-            this.z41_1 = this.y41_1;
+            tmp_1.b42_1 = this.a42_1;
+            this.c42_1 = this.b42_1;
             this.v8_1 = 1;
-            suspendResult = buildPagesFromParsedPages(this.z41_1, this.v41_1, this);
+            suspendResult = buildPagesFromParsedPages(this.c42_1, this.y41_1, this);
             if (suspendResult === get_COROUTINE_SUSPENDED()) {
               return suspendResult;
             }
             continue $sm;
           case 1:
-            return this.x41_1;
+            return this.a42_1;
           case 2:
             throw this.y8_1;
         }
@@ -8383,10 +8456,10 @@
      while (true);
   };
   function PageCollectionPage$buildPagesFromParsedPages$slambda$slambda($it, this$0, $parseFile, $pageIndex$delegate, resultContinuation) {
-    this.i42_1 = $it;
-    this.j42_1 = this$0;
-    this.k42_1 = $parseFile;
-    this.l42_1 = $pageIndex$delegate;
+    this.l42_1 = $it;
+    this.m42_1 = this$0;
+    this.n42_1 = $parseFile;
+    this.o42_1 = $pageIndex$delegate;
     CoroutineImpl.call(this, resultContinuation);
   }
   protoOf(PageCollectionPage$buildPagesFromParsedPages$slambda$slambda).l3m = function ($this$async, $completion) {
@@ -8407,12 +8480,12 @@
           case 0:
             this.w8_1 = 3;
             var tmp_0 = this;
-            var tmp0_safe_receiver = this.i42_1.s42_1;
+            var tmp0_safe_receiver = this.l42_1.v42_1;
             var tmp_1;
             if (tmp0_safe_receiver == null) {
               tmp_1 = null;
             } else {
-              tmp_1 = buildPagesFromParsedPages$lambda(this.l42_1).f2(tmp0_safe_receiver);
+              tmp_1 = buildPagesFromParsedPages$lambda(this.o42_1).f2(tmp0_safe_receiver);
             }
             var tmp1_elvis_lhs = tmp_1;
@@ -8423,20 +8496,20 @@
               tmp_2 = tmp1_elvis_lhs;
             }
-            tmp_0.n42_1 = tmp_2;
-            this.o42_1 = Companion_getInstance_48();
-            this.p42_1 = this.i42_1.s42_1;
+            tmp_0.q42_1 = tmp_2;
+            this.r42_1 = Companion_getInstance_49();
+            this.s42_1 = this.l42_1.v42_1;
             this.v8_1 = 1;
-            suspendResult = this.k42_1(this.n42_1, this);
+            suspendResult = this.n42_1(this.q42_1, this);
             if (suspendResult === get_COROUTINE_SUSPENDED()) {
               return suspendResult;
             }
             continue $sm;
           case 1:
-            this.q42_1 = suspendResult;
+            this.t42_1 = suspendResult;
             this.v8_1 = 2;
-            suspendResult = this.o42_1.r3m(this.j42_1, this.p42_1, this.q42_1, this.k42_1, this);
+            suspendResult = this.r42_1.r3m(this.m42_1, this.s42_1, this.t42_1, this.n42_1, this);
             if (suspendResult === get_COROUTINE_SUSPENDED()) {
               return suspendResult;
             }
@@ -8459,8 +8532,8 @@
      while (true);
   };
   protoOf(PageCollectionPage$buildPagesFromParsedPages$slambda$slambda).b19 = function ($this$async, completion) {
-    var i = new PageCollectionPage$buildPagesFromParsedPages$slambda$slambda(this.i42_1, this.j42_1, this.k42_1, this.l42_1, completion);
-    i.m42_1 = $this$async;
+    var i = new PageCollectionPage$buildPagesFromParsedPages$slambda$slambda(this.l42_1, this.m42_1, this.n42_1, this.o42_1, completion);
+    i.p42_1 = $this$async;
     return i;
   };
   function PageCollectionPage$buildPagesFromParsedPages$slambda$slambda_0($it, this$0, $parseFile, $pageIndex$delegate, resultContinuation) {
@@ -8471,43 +8544,43 @@
     l.$arity = 1;
     return l;
   }
-  function Companion_46() {
-    this.e41_1 = 'page-collection';
-    this.f41_1 = 'pages';
-    this.g41_1 = 'import';
-    this.h41_1 = 'filename';
+  function Companion_47() {
+    this.h41_1 = 'page-collection';
+    this.i41_1 = 'pages';
+    this.j41_1 = 'import';
+    this.k41_1 = 'filename';
     this.PARENT_PARAM_ACTIVE_PAGE = 'active-page';
   }
-  protoOf(Companion_46).t42 = function () {
-    return this.e41_1;
+  protoOf(Companion_47).w42 = function () {
+    return this.h41_1;
   };
-  protoOf(Companion_46).u42 = function () {
+  protoOf(Companion_47).x42 = function () {
     return this.PARENT_PARAM_ACTIVE_PAGE;
   };
-  protoOf(Companion_46).i41 = function (container, fileName, parser, parseFile, $completion) {
+  protoOf(Companion_47).l41 = function (container, fileName, parser, parseFile, $completion) {
     var tmp = new $parseCOROUTINE$2(this, container, fileName, parser, parseFile, $completion);
     tmp.x8_1 = Unit_instance;
     tmp.y8_1 = null;
     return tmp.d9();
   };
-  var Companion_instance_47;
-  function Companion_getInstance_49() {
-    return Companion_instance_47;
+  var Companion_instance_48;
+  function Companion_getInstance_50() {
+    return Companion_instance_48;
   }
   function _set_pages__j2nojl_0($this, _set____db54di) {
-    return $this.p43_1.n3p($this, pages$factory_1(), _set____db54di);
+    return $this.s43_1.n3p($this, pages$factory_1(), _set____db54di);
   }
   function PageCollectionPage_init_$Init$(container, fileName, parser, $this) {
     Page_init_$Init$(container, fileName, parser, $this);
     PageCollectionPage.call($this);
     parser.p3b(2, 'https://mobile-content-api.cru.org/xmlns/page', 'page');
-    Companion_getInstance_48().w3y(parser, 'page-collection');
+    Companion_getInstance_49().z3y(parser, 'page-collection');
     var tmp = $this;
     // Inline function 'kotlin.collections.mutableListOf' call
-    tmp.n43_1 = ArrayList_init_$Create$();
+    tmp.q43_1 = ArrayList_init_$Create$();
     var tmp_0 = $this;
     // Inline function 'kotlin.collections.mutableListOf' call
-    tmp_0.o43_1 = ArrayList_init_$Create$();
+    tmp_0.r43_1 = ArrayList_init_$Create$();
     // Inline function 'org.cru.godtools.shared.tool.parser.xml.parseChildren' call
     $l$loop_0: while (!(parser.l() === 3)) {
       if (!(parser.q3b() === 2))
@@ -8515,14 +8588,14 @@
       var tmp0_subject = parser.r3b();
       if (tmp0_subject === 'https://mobile-content-api.cru.org/xmlns/analytics') {
         if (parser.l2() === 'events') {
-          var tmp0 = $this.n43_1;
+          var tmp0 = $this.q43_1;
           // Inline function 'kotlin.collections.plusAssign' call
           var elements = Companion_instance_4.t3b(parser, $this);
           addAll(tmp0, elements);
         }
       } else if (tmp0_subject === 'https://mobile-content-api.cru.org/xmlns/page') {
         if (parser.l2() === 'pages') {
-          var tmp2 = $this.o43_1;
+          var tmp2 = $this.r43_1;
           // Inline function 'kotlin.collections.plusAssign' call
           var elements_0 = parsePages_0($this, parser);
           addAll(tmp2, elements_0);
@@ -8550,7 +8623,7 @@
       if (_this__u8e3s4.r3b() === 'https://mobile-content-api.cru.org/xmlns/page') {
         var tmp1_subject = _this__u8e3s4.l2();
         if (tmp1_subject === 'page') {
-          var tmp2_safe_receiver = Companion_getInstance_48().d41($this, null, _this__u8e3s4);
+          var tmp2_safe_receiver = Companion_getInstance_49().g41($this, null, _this__u8e3s4);
           if (tmp2_safe_receiver == null)
             null;
           else {
@@ -8576,8 +8649,8 @@
   function PageOrImport(page, ref) {
     page = page === VOID ? null : page;
     ref = ref === VOID ? null : ref;
-    this.r42_1 = page;
-    this.s42_1 = ref;
+    this.u42_1 = page;
+    this.v42_1 = ref;
   }
   function buildPagesFromParsedPages$lambda($pageIndex$delegate) {
     // Inline function 'kotlin.getValue' call
@@ -8604,19 +8677,19 @@
     };
   }
   function PageCollectionPage$buildPagesFromParsedPages$slambda(this$0, $parseFile, $pageIndex$delegate, resultContinuation) {
-    this.j44_1 = this$0;
-    this.k44_1 = $parseFile;
-    this.l44_1 = $pageIndex$delegate;
+    this.m44_1 = this$0;
+    this.n44_1 = $parseFile;
+    this.o44_1 = $pageIndex$delegate;
     CoroutineImpl.call(this, resultContinuation);
   }
-  protoOf(PageCollectionPage$buildPagesFromParsedPages$slambda).n44 = function ($this$coroutineScope, $completion) {
+  protoOf(PageCollectionPage$buildPagesFromParsedPages$slambda).q44 = function ($this$coroutineScope, $completion) {
     var tmp = this.b19($this$coroutineScope, $completion);
     tmp.x8_1 = Unit_instance;
     tmp.y8_1 = null;
     return tmp.d9();
   };
   protoOf(PageCollectionPage$buildPagesFromParsedPages$slambda).l9 = function (p1, $completion) {
-    return this.n44((!(p1 == null) ? isInterface(p1, CoroutineScope) : false) ? p1 : THROW_CCE(), $completion);
+    return this.q44((!(p1 == null) ? isInterface(p1, CoroutineScope) : false) ? p1 : THROW_CCE(), $completion);
   };
   protoOf(PageCollectionPage$buildPagesFromParsedPages$slambda).d9 = function () {
     var suspendResult = this.x8_1;
@@ -8627,12 +8700,12 @@
           case 0:
             this.w8_1 = 2;
             this.v8_1 = 1;
-            var this_0 = this.j44_1.o43_1;
+            var this_0 = this.m44_1.r43_1;
             var destination = ArrayList_init_$Create$_0(collectionSizeOrDefault(this_0, 10));
             var _iterator__ex2g4s = this_0.j();
             while (_iterator__ex2g4s.k()) {
               var item = _iterator__ex2g4s.l();
-              var tmp0_safe_receiver = item.r42_1;
+              var tmp0_safe_receiver = item.u42_1;
               var tmp_0;
               if (tmp0_safe_receiver == null) {
                 tmp_0 = null;
@@ -8642,7 +8715,7 @@
               var tmp1_elvis_lhs = tmp_0;
               var tmp_1;
               if (tmp1_elvis_lhs == null) {
-                tmp_1 = async(this.m44_1, VOID, VOID, PageCollectionPage$buildPagesFromParsedPages$slambda$slambda_0(item, this.j44_1, this.k44_1, this.l44_1, null));
+                tmp_1 = async(this.p44_1, VOID, VOID, PageCollectionPage$buildPagesFromParsedPages$slambda$slambda_0(item, this.m44_1, this.n44_1, this.o44_1, null));
               } else {
                 tmp_1 = tmp1_elvis_lhs;
               }
@@ -8673,22 +8746,22 @@
      while (true);
   };
   protoOf(PageCollectionPage$buildPagesFromParsedPages$slambda).b19 = function ($this$coroutineScope, completion) {
-    var i = new PageCollectionPage$buildPagesFromParsedPages$slambda(this.j44_1, this.k44_1, this.l44_1, completion);
-    i.m44_1 = $this$coroutineScope;
+    var i = new PageCollectionPage$buildPagesFromParsedPages$slambda(this.m44_1, this.n44_1, this.o44_1, completion);
+    i.p44_1 = $this$coroutineScope;
     return i;
   };
   function PageCollectionPage$buildPagesFromParsedPages$slambda_0(this$0, $parseFile, $pageIndex$delegate, resultContinuation) {
     var i = new PageCollectionPage$buildPagesFromParsedPages$slambda(this$0, $parseFile, $pageIndex$delegate, resultContinuation);
     var l = function ($this$coroutineScope, $completion) {
-      return i.n44($this$coroutineScope, $completion);
+      return i.q44($this$coroutineScope, $completion);
     };
     l.$arity = 1;
     return l;
   }
   function $buildPagesFromParsedPagesCOROUTINE$3(_this__u8e3s4, parseFile, resultContinuation) {
     CoroutineImpl.call(this, resultContinuation);
-    this.y43_1 = _this__u8e3s4;
-    this.z43_1 = parseFile;
+    this.b44_1 = _this__u8e3s4;
+    this.c44_1 = parseFile;
   }
   protoOf($buildPagesFromParsedPagesCOROUTINE$3).d9 = function () {
     var suspendResult = this.x8_1;
@@ -8699,9 +8772,9 @@
           case 0:
             this.w8_1 = 2;
             var tmp_0 = this;
-            tmp_0.a44_1 = lazy(PageCollectionPage$buildPagesFromParsedPages$lambda(this.y43_1));
+            tmp_0.d44_1 = lazy(PageCollectionPage$buildPagesFromParsedPages$lambda(this.b44_1));
             this.v8_1 = 1;
-            suspendResult = coroutineScope(PageCollectionPage$buildPagesFromParsedPages$slambda_0(this.y43_1, this.z43_1, this.a44_1, null), this);
+            suspendResult = coroutineScope(PageCollectionPage$buildPagesFromParsedPages$slambda_0(this.b44_1, this.c44_1, this.d44_1, null), this);
             if (suspendResult === get_COROUTINE_SUSPENDED()) {
               return suspendResult;
             }
@@ -8709,7 +8782,7 @@
             continue $sm;
           case 1:
             var ARGUMENT = suspendResult;
-            _set_pages__j2nojl_0(this.y43_1, ARGUMENT);
+            _set_pages__j2nojl_0(this.b44_1, ARGUMENT);
             return Unit_instance;
           case 2:
             throw this.y8_1;
@@ -8726,16 +8799,16 @@
      while (true);
   };
   protoOf(PageCollectionPage).x3g = function () {
-    return this.n43_1;
+    return this.q43_1;
   };
   protoOf(PageCollectionPage).h3k = function () {
-    return this.p43_1.c3r(this, pages$factory_2());
+    return this.s43_1.c3r(this, pages$factory_2());
   };
   protoOf(PageCollectionPage).i3k = function (type) {
     return type.equals(getKClass(ContentPage));
   };
   function PageCollectionPage() {
-    this.p43_1 = setOnce();
+    this.s43_1 = setOnce();
   }
   function pages$factory_1() {
     return getPropertyCallableRef('pages', 1, KMutableProperty1, function (receiver) {
@@ -8751,10 +8824,10 @@
       return _set_pages__j2nojl_0(receiver, value);
     });
   }
-  function Companion_47() {
+  function Companion_48() {
     this.p3p_1 = 'items';
   }
-  protoOf(Companion_47).q3p = function (_this__u8e3s4, manifest) {
+  protoOf(Companion_48).q3p = function (_this__u8e3s4, manifest) {
     // Inline function 'kotlin.collections.buildList' call
     // Inline function 'kotlin.collections.buildListInternal' call
     // Inline function 'kotlin.apply' call
@@ -8765,7 +8838,7 @@
       if (!(_this__u8e3s4.q3b() === 2))
         continue $l$loop_0;
       if (_this__u8e3s4.r3b() === 'https://mobile-content-api.cru.org/xmlns/shareable') {
-        var tmp1_safe_receiver = Companion_instance_48.o44(manifest, _this__u8e3s4);
+        var tmp1_safe_receiver = Companion_instance_49.r44(manifest, _this__u8e3s4);
         if (tmp1_safe_receiver == null)
           null;
         else {
@@ -8779,8 +8852,8 @@
     }
     return this_0.k3();
   };
-  protoOf(Companion_47).o44 = function (manifest, parser) {
-    parser.p44(2, 'https://mobile-content-api.cru.org/xmlns/shareable');
+  protoOf(Companion_48).r44 = function (manifest, parser) {
+    parser.s44(2, 'https://mobile-content-api.cru.org/xmlns/shareable');
     var tmp;
     if (parser.r3b() === 'https://mobile-content-api.cru.org/xmlns/shareable') {
       tmp = parser.l2() === 'image' ? ShareableImage_init_$Create$(manifest, parser) : null;
@@ -8789,14 +8862,14 @@
     }
     return tmp;
   };
-  var Companion_instance_48;
-  function Companion_getInstance_50() {
-    return Companion_instance_48;
+  var Companion_instance_49;
+  function Companion_getInstance_51() {
+    return Companion_instance_49;
   }
   function Shareable_init_$Init$(parent, parser, $this) {
     BaseModel.call($this, parent);
     Shareable.call($this);
-    parser.p44(2, 'https://mobile-content-api.cru.org/xmlns/shareable');
+    parser.s44(2, 'https://mobile-content-api.cru.org/xmlns/shareable');
     $this.v3p_1 = parser.e3d('id');
     var tmp = $this;
     var tmp0_safe_receiver = parser.e3d('order');
@@ -8809,18 +8882,18 @@
   };
   function Shareable() {
   }
-  function Companion_48() {
-    this.q44_1 = 'image';
+  function Companion_49() {
+    this.t44_1 = 'image';
   }
-  var Companion_instance_49;
-  function Companion_getInstance_51() {
-    return Companion_instance_49;
+  var Companion_instance_50;
+  function Companion_getInstance_52() {
+    return Companion_instance_50;
   }
   function ShareableImage_init_$Init$(manifest, parser, $this) {
     Shareable_init_$Init$(manifest, parser, $this);
     ShareableImage.call($this);
     parser.p3b(2, 'https://mobile-content-api.cru.org/xmlns/shareable', 'image');
-    $this.u44_1 = parser.e3d('resource');
+    $this.x44_1 = parser.e3d('resource');
     var description = null;
     // Inline function 'org.cru.godtools.shared.tool.parser.xml.parseChildren' call
     $l$loop_0: while (!(parser.l() === 3)) {
@@ -8834,7 +8907,7 @@
         continue $l$loop_0;
       skipTag(parser);
     }
-    $this.v44_1 = description;
+    $this.y44_1 = description;
     return $this;
   }
   function ShareableImage_init_$Create$(manifest, parser) {
@@ -8842,16 +8915,16 @@
   }
   protoOf(ShareableImage).j3c = function () {
     var tmp0_elvis_lhs = protoOf(Shareable).j3c.call(this);
-    return tmp0_elvis_lhs == null ? this.u44_1 : tmp0_elvis_lhs;
+    return tmp0_elvis_lhs == null ? this.x44_1 : tmp0_elvis_lhs;
   };
   function ShareableImage() {
   }
-  function Companion_49() {
-    this.w44_1 = 'tip';
+  function Companion_50() {
+    this.z44_1 = 'tip';
   }
-  var Companion_instance_50;
-  function Companion_getInstance_52() {
-    return Companion_instance_50;
+  var Companion_instance_51;
+  function Companion_getInstance_53() {
+    return Companion_instance_51;
   }
   function InlineTip_init_$Init$(parent, parser, $this) {
     Content_init_$Init$(parent, parser, $this);
@@ -8877,7 +8950,7 @@
   protoOf(InlineTip).j3c = function () {
     return this.id;
   };
-  protoOf(InlineTip).d45 = function () {
+  protoOf(InlineTip).g45 = function () {
     return this.s38().l3r(this.id);
   };
   protoOf(InlineTip).v3c = function () {
@@ -8890,11 +8963,11 @@
   var Type_TIP_instance;
   var Type_PREPARE_instance;
   var Type_QUOTE_instance;
-  function Companion_50() {
-    Companion_instance_51 = this;
-    this.e45_1 = Type_TIP_getInstance();
+  function Companion_51() {
+    Companion_instance_52 = this;
+    this.h45_1 = Type_TIP_getInstance();
   }
-  protoOf(Companion_50).y3k = function (_this__u8e3s4) {
+  protoOf(Companion_51).y3k = function (_this__u8e3s4) {
     switch (_this__u8e3s4) {
       case 'tip':
         return Type_TIP_getInstance();
@@ -8910,12 +8983,12 @@
         return null;
     }
   };
-  var Companion_instance_51;
-  function Companion_getInstance_53() {
+  var Companion_instance_52;
+  function Companion_getInstance_54() {
     Type_initEntries_2();
-    if (Companion_instance_51 == null)
-      new Companion_50();
-    return Companion_instance_51;
+    if (Companion_instance_52 == null)
+      new Companion_51();
+    return Companion_instance_52;
   }
   var Type_entriesInitialized_2;
   function Type_initEntries_2() {
@@ -8927,7 +9000,7 @@
     Type_TIP_instance = new Type_2('TIP', 2);
     Type_PREPARE_instance = new Type_2('PREPARE', 3);
     Type_QUOTE_instance = new Type_2('QUOTE', 4);
-    Companion_getInstance_53();
+    Companion_getInstance_54();
   }
   function Tip_init_$Init$(manifest, id, parser, $this) {
     BaseModel.call($this, manifest);
@@ -8936,8 +9009,8 @@
     $this.h3o_1 = id;
     var tmp = $this;
     var tmp0_safe_receiver = parser.e3d('type');
-    var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : Companion_getInstance_53().y3k(tmp0_safe_receiver);
-    tmp.i3o_1 = tmp1_elvis_lhs == null ? Companion_getInstance_53().e45_1 : tmp1_elvis_lhs;
+    var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : Companion_getInstance_54().y3k(tmp0_safe_receiver);
+    tmp.i3o_1 = tmp1_elvis_lhs == null ? Companion_getInstance_54().h45_1 : tmp1_elvis_lhs;
     var tmp_0 = $this;
     // Inline function 'kotlin.collections.buildList' call
     // Inline function 'kotlin.collections.buildListInternal' call
@@ -8965,7 +9038,7 @@
   function Tip_init_$Init$_0(manifest, id, type, $this) {
     manifest = manifest === VOID ? null : manifest;
     id = id === VOID ? '' : id;
-    type = type === VOID ? Companion_getInstance_53().e45_1 : type;
+    type = type === VOID ? Companion_getInstance_54().h45_1 : type;
     BaseModel.call($this, manifest);
     Tip.call($this);
     $this.h3o_1 = id;
@@ -9031,19 +9104,19 @@
   };
   function Tip() {
   }
-  function Companion_51() {
-    this.f45_1 = 'page';
+  function Companion_52() {
+    this.i45_1 = 'page';
   }
-  var Companion_instance_52;
-  function Companion_getInstance_54() {
-    return Companion_instance_52;
+  var Companion_instance_53;
+  function Companion_getInstance_55() {
+    return Companion_instance_53;
   }
   function TipPage_init_$Init$(tip, position, parser, $this) {
     BaseModel.call($this, tip);
     TipPage.call($this);
     parser.p3b(2, 'https://mobile-content-api.cru.org/xmlns/training', 'page');
-    $this.h45_1 = tip;
-    $this.i45_1 = position;
+    $this.k45_1 = tip;
+    $this.l45_1 = position;
     var tmp = $this;
     // Inline function 'org.cru.godtools.shared.tool.parser.model.parseContent' call
     // Inline function 'kotlin.collections.buildList' call
@@ -9085,31 +9158,31 @@
         continue $l$loop_0;
       skipTag(parser);
     }
-    tmp.j45_1 = this_0.k3();
+    tmp.m45_1 = this_0.k3();
     return $this;
   }
   function TipPage_init_$Create$(tip, position, parser) {
     return TipPage_init_$Init$(tip, position, parser, objectCreate(protoOf(TipPage)));
   }
   protoOf(TipPage).l3c = function () {
-    return this.j45_1;
+    return this.m45_1;
   };
   function TipPage() {
   }
-  function Companion_52() {
-    this.k45_1 = 'call-to-action';
+  function Companion_53() {
+    this.n45_1 = 'call-to-action';
   }
-  var Companion_instance_53;
-  function Companion_getInstance_55() {
-    return Companion_instance_53;
+  var Companion_instance_54;
+  function Companion_getInstance_56() {
+    return Companion_instance_54;
   }
   function CallToAction_init_$Init$(parent, $this) {
     BaseModel.call($this, parent);
     CallToAction.call($this);
-    $this.m45_1 = parent;
+    $this.p45_1 = parent;
     $this.label = null;
-    $this.n45_1 = null;
-    $this.o45_1 = null;
+    $this.q45_1 = null;
+    $this.r45_1 = null;
     return $this;
   }
   function CallToAction_init_$Create$(parent) {
@@ -9119,11 +9192,11 @@
     BaseModel.call($this, page);
     CallToAction.call($this);
     parser.p3b(2, 'https://mobile-content-api.cru.org/xmlns/tract', 'call-to-action');
-    $this.m45_1 = page;
+    $this.p45_1 = page;
     var tmp = $this;
     var tmp0_safe_receiver = parser.e3d('control-color');
-    tmp.n45_1 = tmp0_safe_receiver == null ? null : toColorOrNull(tmp0_safe_receiver);
-    $this.o45_1 = parser.o3p('https://mobile-content-api.cru.org/xmlns/training', 'tip');
+    tmp.q45_1 = tmp0_safe_receiver == null ? null : toColorOrNull(tmp0_safe_receiver);
+    $this.r45_1 = parser.o3p('https://mobile-content-api.cru.org/xmlns/training', 'tip');
     $this.label = parseTextChild(parser, $this, 'https://mobile-content-api.cru.org/xmlns/tract', 'call-to-action');
     return $this;
   }
@@ -9137,11 +9210,11 @@
     tip = tip === VOID ? null : tip;
     BaseModel.call($this, page);
     CallToAction.call($this);
-    $this.m45_1 = page;
+    $this.p45_1 = page;
     var tmp = $this;
     tmp.label = label == null ? null : label($this);
-    $this.n45_1 = controlColor;
-    $this.o45_1 = tip;
+    $this.q45_1 = controlColor;
+    $this.r45_1 = tip;
     return $this;
   }
   function createTestCallToAction(page, label, controlColor, tip) {
@@ -9150,33 +9223,33 @@
   protoOf(CallToAction).j3l = function () {
     return this.label;
   };
-  protoOf(CallToAction).p45 = function () {
-    var tmp0_elvis_lhs = this.n45_1;
+  protoOf(CallToAction).s45 = function () {
+    var tmp0_elvis_lhs = this.q45_1;
     return tmp0_elvis_lhs == null ? get_primaryColor_0(get_stylesParent(this)) : tmp0_elvis_lhs;
   };
-  protoOf(CallToAction).q45 = function () {
-    return this.o45_1;
+  protoOf(CallToAction).t45 = function () {
+    return this.r45_1;
   };
-  protoOf(CallToAction).d45 = function () {
-    return this.s38().l3r(this.o45_1);
+  protoOf(CallToAction).g45 = function () {
+    return this.s38().l3r(this.r45_1);
   };
   function CallToAction() {
   }
-  function Companion_53() {
-    this.r45_1 = 'header';
+  function Companion_54() {
+    this.u45_1 = 'header';
   }
-  var Companion_instance_54;
-  function Companion_getInstance_56() {
-    return Companion_instance_54;
+  var Companion_instance_55;
+  function Companion_getInstance_57() {
+    return Companion_instance_55;
   }
-  function Header_init_$Init$(page, parser, $this) {
+  function Header_init_$Init$_0(page, parser, $this) {
     BaseModel.call($this, page);
-    Header.call($this);
+    Header_0.call($this);
     parser.p3b(2, 'https://mobile-content-api.cru.org/xmlns/tract', 'header');
     var tmp = $this;
     var tmp0_safe_receiver = parser.e3d('background-color');
-    tmp.t45_1 = tmp0_safe_receiver == null ? null : toColorOrNull(tmp0_safe_receiver);
-    $this.u45_1 = parser.o3p('https://mobile-content-api.cru.org/xmlns/training', 'tip');
+    tmp.w45_1 = tmp0_safe_receiver == null ? null : toColorOrNull(tmp0_safe_receiver);
+    $this.x45_1 = parser.o3p('https://mobile-content-api.cru.org/xmlns/training', 'tip');
     var number = null;
     var title = null;
     // Inline function 'org.cru.godtools.shared.tool.parser.xml.parseChildren' call
@@ -9198,39 +9271,39 @@
     $this.title = title;
     return $this;
   }
-  function Header_init_$Create$(page, parser) {
-    return Header_init_$Init$(page, parser, objectCreate(protoOf(Header)));
+  function Header_init_$Create$_0(page, parser) {
+    return Header_init_$Init$_0(page, parser, objectCreate(protoOf(Header_0)));
   }
-  protoOf(Header).j3q = function () {
-    var tmp0_elvis_lhs = this.t45_1;
+  protoOf(Header_0).j3q = function () {
+    var tmp0_elvis_lhs = this.w45_1;
     return tmp0_elvis_lhs == null ? this.s3h() : tmp0_elvis_lhs;
   };
-  protoOf(Header).q3h = function () {
+  protoOf(Header_0).q3h = function () {
     return this.t3h();
   };
-  protoOf(Header).ji = function () {
+  protoOf(Header_0).ji = function () {
     return this.number;
   };
-  protoOf(Header).o3q = function () {
+  protoOf(Header_0).o3q = function () {
     return this.title;
   };
-  protoOf(Header).q45 = function () {
-    return this.u45_1;
+  protoOf(Header_0).t45 = function () {
+    return this.x45_1;
   };
-  protoOf(Header).d45 = function () {
-    return this.s38().l3r(this.u45_1);
+  protoOf(Header_0).g45 = function () {
+    return this.s38().l3r(this.x45_1);
   };
-  function Header() {
+  function Header_0() {
   }
-  function Companion_54() {
-    this.v45_1 = 'hero';
+  function Companion_55() {
+    this.y45_1 = 'hero';
   }
-  var Companion_instance_55;
-  function Companion_getInstance_57() {
-    return Companion_instance_55;
+  var Companion_instance_56;
+  function Companion_getInstance_58() {
+    return Companion_instance_56;
   }
   function _get_headingParent__2ts5bv($this) {
-    var tmp0 = $this.x45_1;
+    var tmp0 = $this.a46_1;
     // Inline function 'kotlin.getValue' call
     headingParent$factory();
     return tmp0.c2();
@@ -9241,7 +9314,7 @@
     parser.p3b(2, 'https://mobile-content-api.cru.org/xmlns/tract', 'hero');
     var tmp = $this;
     // Inline function 'kotlin.collections.mutableListOf' call
-    tmp.z45_1 = ArrayList_init_$Create$();
+    tmp.c46_1 = ArrayList_init_$Create$();
     var heading = null;
     var tmp_0 = $this;
     // Inline function 'org.cru.godtools.shared.tool.parser.model.parseContent' call
@@ -9258,7 +9331,7 @@
         var tmp0_subject = parser.r3b();
         if (tmp0_subject === 'https://mobile-content-api.cru.org/xmlns/analytics') {
           if (parser.l2() === 'events') {
-            var tmp0 = $this.z45_1;
+            var tmp0 = $this.c46_1;
             // Inline function 'kotlin.collections.plusAssign' call
             var elements = Companion_instance_4.t3b(parser, $this);
             addAll(tmp0, elements);
@@ -9296,7 +9369,7 @@
         continue $l$loop_0;
       skipTag(parser);
     }
-    tmp_0.y45_1 = this_0.k3();
+    tmp_0.b46_1 = this_0.k3();
     $this.heading = heading;
     return $this;
   }
@@ -9309,10 +9382,10 @@
     heading = heading === VOID ? null : heading;
     BaseModel.call($this, page);
     Hero.call($this);
-    $this.z45_1 = analyticsEvents;
+    $this.c46_1 = analyticsEvents;
     var tmp = $this;
     tmp.heading = heading == null ? null : heading(_get_headingParent__2ts5bv($this));
-    $this.y45_1 = emptyList();
+    $this.b46_1 = emptyList();
     return $this;
   }
   function createTestHero(page, analyticsEvents, heading) {
@@ -9328,14 +9401,14 @@
       return stylesOverride(this$0, VOID, Hero$headingParent$delegate$lambda$lambda(this$0));
     };
   }
-  protoOf(Hero).a46 = function () {
+  protoOf(Hero).d46 = function () {
     return this.heading;
   };
   protoOf(Hero).l3c = function () {
-    return this.y45_1;
+    return this.b46_1;
   };
   protoOf(Hero).x3g = function () {
-    return this.z45_1;
+    return this.c46_1;
   };
   protoOf(Hero).m3c = function (type) {
     var tmp;
@@ -9343,7 +9416,7 @@
       case 0:
         // Inline function 'kotlin.collections.filter' call
-        var tmp0 = this.z45_1;
+        var tmp0 = this.c46_1;
         // Inline function 'kotlin.collections.filterTo' call
         var destination = ArrayList_init_$Create$();
@@ -9360,7 +9433,7 @@
       case 1:
         // Inline function 'kotlin.collections.filter' call
-        var tmp0_0 = this.z45_1;
+        var tmp0_0 = this.c46_1;
         // Inline function 'kotlin.collections.filterTo' call
         var destination_0 = ArrayList_init_$Create$();
@@ -9385,19 +9458,19 @@
   };
   function Hero() {
     var tmp = this;
-    tmp.x45_1 = lazy(Hero$headingParent$delegate$lambda(this));
+    tmp.a46_1 = lazy(Hero$headingParent$delegate$lambda(this));
   }
   function headingParent$factory() {
     return getPropertyCallableRef('headingParent', 1, KProperty1, function (receiver) {
       return _get_headingParent__2ts5bv(receiver);
     }, null);
   }
-  function Companion_55() {
-    this.b46_1 = 'modal';
+  function Companion_56() {
+    this.e46_1 = 'modal';
   }
-  var Companion_instance_56;
-  function Companion_getInstance_58() {
-    return Companion_instance_56;
+  var Companion_instance_57;
+  function Companion_getInstance_59() {
+    return Companion_instance_57;
   }
   function _get_position__iahqv2($this) {
     return $this.page._modals.w1($this);
@@ -9463,14 +9536,14 @@
         continue $l$loop_0;
       skipTag(parser);
     }
-    tmp_1.x46_1 = this_2.k3();
+    tmp_1.a47_1 = this_2.k3();
     $this.title = title;
     return $this;
   }
   function Modal_init_$Create$(parent, parser) {
     return Modal_init_$Init$(parent, parser, objectCreate(protoOf(Modal)));
   }
-  protoOf(Modal).q3z = function () {
+  protoOf(Modal).t3z = function () {
     return this.page;
   };
   protoOf(Modal).j3c = function () {
@@ -9480,7 +9553,7 @@
     return this.title;
   };
   protoOf(Modal).l3c = function () {
-    return this.x46_1;
+    return this.a47_1;
   };
   protoOf(Modal).r3u = function () {
     return this._listeners;
@@ -9518,22 +9591,22 @@
   };
   function Modal() {
   }
-  function Companion_56() {
-    Companion_instance_57 = this;
-    this.y46_1 = 'card';
-    this.z46_1 = 'label';
-    this.a47_1 = 'hidden';
-    this.b47_1 = ImageScaleType_FILL_X_getInstance();
-    this.c47_1 = Companion_getInstance_22().CENTER;
+  function Companion_57() {
+    Companion_instance_58 = this;
+    this.b47_1 = 'card';
+    this.c47_1 = 'label';
+    this.d47_1 = 'hidden';
+    this.e47_1 = ImageScaleType_FILL_X_getInstance();
+    this.f47_1 = Companion_getInstance_22().CENTER;
   }
-  var Companion_instance_57;
-  function Companion_getInstance_59() {
-    if (Companion_instance_57 == null)
-      new Companion_56();
-    return Companion_instance_57;
+  var Companion_instance_58;
+  function Companion_getInstance_60() {
+    if (Companion_instance_58 == null)
+      new Companion_57();
+    return Companion_instance_58;
   }
   function _get_labelParent__664ln7($this) {
-    var tmp0 = $this.j47_1;
+    var tmp0 = $this.m47_1;
     // Inline function 'kotlin.getValue' call
     labelParent$factory();
     return tmp0.c2();
@@ -9560,22 +9633,22 @@
     tmp_1._dismissListeners = toSet_0(tmp$ret$1);
     var tmp_2 = $this;
     var tmp2_safe_receiver = parser.e3d('background-color');
-    tmp_2.e47_1 = tmp2_safe_receiver == null ? null : toColorOrNull(tmp2_safe_receiver);
-    $this.f47_1 = parser.e3d('background-image');
+    tmp_2.h47_1 = tmp2_safe_receiver == null ? null : toColorOrNull(tmp2_safe_receiver);
+    $this.i47_1 = parser.e3d('background-image');
     var tmp_3 = $this;
     var tmp3_safe_receiver = parser.e3d('background-image-align');
     var tmp4_elvis_lhs = tmp3_safe_receiver == null ? null : Companion_getInstance_22().m3g(tmp3_safe_receiver);
-    tmp_3.g47_1 = tmp4_elvis_lhs == null ? Companion_getInstance_59().c47_1 : tmp4_elvis_lhs;
+    tmp_3.j47_1 = tmp4_elvis_lhs == null ? Companion_getInstance_60().f47_1 : tmp4_elvis_lhs;
     var tmp_4 = $this;
     var tmp5_safe_receiver = parser.e3d('background-image-scale-type');
     var tmp6_elvis_lhs = tmp5_safe_receiver == null ? null : Companion_instance_22.w3k(tmp5_safe_receiver);
-    tmp_4.h47_1 = tmp6_elvis_lhs == null ? Companion_getInstance_59().b47_1 : tmp6_elvis_lhs;
+    tmp_4.k47_1 = tmp6_elvis_lhs == null ? Companion_getInstance_60().e47_1 : tmp6_elvis_lhs;
     var tmp_5 = $this;
     var tmp7_safe_receiver = parser.e3d('text-color');
-    tmp_5.i47_1 = tmp7_safe_receiver == null ? null : toColorOrNull(tmp7_safe_receiver);
+    tmp_5.l47_1 = tmp7_safe_receiver == null ? null : toColorOrNull(tmp7_safe_receiver);
     var tmp_6 = $this;
     // Inline function 'kotlin.collections.mutableListOf' call
-    tmp_6.l47_1 = ArrayList_init_$Create$();
+    tmp_6.o47_1 = ArrayList_init_$Create$();
     var label = null;
     var tmp_7 = $this;
     // Inline function 'org.cru.godtools.shared.tool.parser.model.parseContent' call
@@ -9592,7 +9665,7 @@
         var tmp0_subject = parser.r3b();
         if (tmp0_subject === 'https://mobile-content-api.cru.org/xmlns/analytics') {
           if (parser.l2() === 'events') {
-            var tmp0 = $this.l47_1;
+            var tmp0 = $this.o47_1;
             // Inline function 'kotlin.collections.plusAssign' call
             var elements = Companion_instance_4.t3b(parser, $this);
             addAll(tmp0, elements);
@@ -9630,7 +9703,7 @@
         continue $l$loop_0;
       skipTag(parser);
     }
-    tmp_7.k47_1 = this_2.k3();
+    tmp_7.n47_1 = this_2.k3();
     $this.label = label;
     return $this;
   }
@@ -9642,8 +9715,8 @@
     position = position === VOID ? 0 : position;
     backgroundColor = backgroundColor === VOID ? null : backgroundColor;
     backgroundImage = backgroundImage === VOID ? null : backgroundImage;
-    backgroundImageGravity = backgroundImageGravity === VOID ? Companion_getInstance_59().c47_1 : backgroundImageGravity;
-    backgroundImageScaleType = backgroundImageScaleType === VOID ? Companion_getInstance_59().b47_1 : backgroundImageScaleType;
+    backgroundImageGravity = backgroundImageGravity === VOID ? Companion_getInstance_60().f47_1 : backgroundImageGravity;
+    backgroundImageScaleType = backgroundImageScaleType === VOID ? Companion_getInstance_60().e47_1 : backgroundImageScaleType;
     isHidden = isHidden === VOID ? false : isHidden;
     analyticsEvents = analyticsEvents === VOID ? emptyList() : analyticsEvents;
     label = label === VOID ? null : label;
@@ -9655,18 +9728,18 @@
     $this.isHidden = isHidden;
     $this._listeners = emptySet();
     $this._dismissListeners = emptySet();
-    $this.l47_1 = analyticsEvents;
-    $this.e47_1 = backgroundColor;
-    $this.f47_1 = backgroundImage;
-    $this.g47_1 = backgroundImageGravity;
-    $this.h47_1 = backgroundImageScaleType;
-    $this.i47_1 = null;
+    $this.o47_1 = analyticsEvents;
+    $this.h47_1 = backgroundColor;
+    $this.i47_1 = backgroundImage;
+    $this.j47_1 = backgroundImageGravity;
+    $this.k47_1 = backgroundImageScaleType;
+    $this.l47_1 = null;
     var tmp = $this;
     tmp.label = label == null ? null : label(_get_labelParent__664ln7($this));
     var tmp_0 = $this;
     // Inline function 'kotlin.collections.orEmpty' call
     var tmp0_elvis_lhs = content == null ? null : content($this);
-    tmp_0.k47_1 = tmp0_elvis_lhs == null ? emptyList() : tmp0_elvis_lhs;
+    tmp_0.n47_1 = tmp0_elvis_lhs == null ? emptyList() : tmp0_elvis_lhs;
     return $this;
   }
   function createTestCard(page, position, backgroundColor, backgroundImage, backgroundImageGravity, backgroundImageScaleType, isHidden, analyticsEvents, label, content) {
@@ -9688,7 +9761,7 @@
     parser.p3b(2, 'https://mobile-content-api.cru.org/xmlns/tract', 'page');
     var tmp = $this;
     var tmp0_safe_receiver = parser.e3d('card-text-color');
-    tmp.v46_1 = tmp0_safe_receiver == null ? null : toColorOrNull(tmp0_safe_receiver);
+    tmp.y46_1 = tmp0_safe_receiver == null ? null : toColorOrNull(tmp0_safe_receiver);
     var header = null;
     var hero = null;
     var tmp_0 = $this;
@@ -9705,7 +9778,7 @@
       if (parser.r3b() === 'https://mobile-content-api.cru.org/xmlns/tract') {
         switch (parser.l2()) {
           case 'header':
-            header = Header_init_$Create$($this, parser);
+            header = Header_init_$Create$_0($this, parser);
             break;
           case 'hero':
             hero = Hero_init_$Create$($this, parser);
@@ -9746,11 +9819,11 @@
   function TractPage_init_$Init$_0(manifest, fileName, backgroundColor, backgroundImage, primaryColor, backgroundImageGravity, backgroundImageScaleType, textColor, textScale, cardBackgroundColor, cardTextColor, cards, callToAction, $this) {
     manifest = manifest === VOID ? createTestManifest() : manifest;
     fileName = fileName === VOID ? null : fileName;
-    backgroundColor = backgroundColor === VOID ? Companion_getInstance_48().o3m_1 : backgroundColor;
+    backgroundColor = backgroundColor === VOID ? Companion_getInstance_49().o3m_1 : backgroundColor;
     backgroundImage = backgroundImage === VOID ? null : backgroundImage;
     primaryColor = primaryColor === VOID ? null : primaryColor;
-    backgroundImageGravity = backgroundImageGravity === VOID ? Companion_getInstance_48().p3m_1 : backgroundImageGravity;
-    backgroundImageScaleType = backgroundImageScaleType === VOID ? Companion_getInstance_48().q3m_1 : backgroundImageScaleType;
+    backgroundImageGravity = backgroundImageGravity === VOID ? Companion_getInstance_49().p3m_1 : backgroundImageGravity;
+    backgroundImageScaleType = backgroundImageScaleType === VOID ? Companion_getInstance_49().q3m_1 : backgroundImageScaleType;
     textColor = textColor === VOID ? null : textColor;
     textScale = textScale === VOID ? 1.0 : textScale;
     cardBackgroundColor = cardBackgroundColor === VOID ? null : cardBackgroundColor;
@@ -9759,7 +9832,7 @@
     callToAction = callToAction === VOID ? null : callToAction;
     Page_init_$Init$_0(manifest, VOID, fileName, VOID, primaryColor, backgroundColor, backgroundImage, backgroundImageGravity, backgroundImageScaleType, VOID, cardBackgroundColor, VOID, VOID, textColor, textScale, $this);
     TractPage.call($this);
-    $this.v46_1 = cardTextColor;
+    $this.y46_1 = cardTextColor;
     $this.header = null;
     $this.hero = null;
     var tmp = $this;
@@ -9775,7 +9848,7 @@
   function createTestTractPage(manifest, fileName, backgroundColor, backgroundImage, primaryColor, backgroundImageGravity, backgroundImageScaleType, textColor, textScale, cardBackgroundColor, cardTextColor, cards, callToAction) {
     return TractPage_init_$Init$_0(manifest, fileName, backgroundColor, backgroundImage, primaryColor, backgroundImageGravity, backgroundImageScaleType, textColor, textScale, cardBackgroundColor, cardTextColor, cards, callToAction, objectCreate(protoOf(TractPage)));
   }
-  protoOf(Card_1).q3z = function () {
+  protoOf(Card_1).t3z = function () {
     return this.page;
   };
   protoOf(Card_1).j3c = function () {
@@ -9784,7 +9857,7 @@
   protoOf(Card_1).q3u = function () {
     return this.position;
   };
-  protoOf(Card_1).m47 = function () {
+  protoOf(Card_1).p47 = function () {
     // Inline function 'kotlin.takeUnless' call
     var this_0 = this.page.visibleCards.w1(this);
     var tmp;
@@ -9795,7 +9868,7 @@
     }
     return tmp;
   };
-  protoOf(Card_1).n47 = function () {
+  protoOf(Card_1).q47 = function () {
     return equals(this, lastOrNull(this.page.visibleCards));
   };
   protoOf(Card_1).l3y = function () {
@@ -9808,27 +9881,27 @@
     return this._dismissListeners;
   };
   protoOf(Card_1).j3q = function () {
-    var tmp0_elvis_lhs = this.e47_1;
+    var tmp0_elvis_lhs = this.h47_1;
     return tmp0_elvis_lhs == null ? this.page.v3h() : tmp0_elvis_lhs;
   };
   protoOf(Card_1).k3q = function () {
-    return getResource(this, this.f47_1);
+    return getResource(this, this.i47_1);
   };
   protoOf(Card_1).l3q = function () {
-    return this.g47_1;
+    return this.j47_1;
   };
   protoOf(Card_1).m3q = function () {
-    return this.h47_1;
+    return this.k47_1;
   };
   protoOf(Card_1).q3h = function () {
-    var tmp0_elvis_lhs = this.i47_1;
+    var tmp0_elvis_lhs = this.l47_1;
     return tmp0_elvis_lhs == null ? this.page.cardTextColor : tmp0_elvis_lhs;
   };
   protoOf(Card_1).j3l = function () {
     return this.label;
   };
   protoOf(Card_1).l3c = function () {
-    return this.k47_1;
+    return this.n47_1;
   };
   protoOf(Card_1).v3c = function () {
     // Inline function 'org.cru.godtools.shared.tool.parser.model.contentTips' call
@@ -9845,7 +9918,7 @@
     return destination;
   };
   protoOf(Card_1).x3g = function () {
-    return this.l47_1;
+    return this.o47_1;
   };
   protoOf(Card_1).m3c = function (type) {
     var tmp;
@@ -9853,7 +9926,7 @@
       case 0:
         // Inline function 'kotlin.collections.filter' call
-        var tmp0 = this.l47_1;
+        var tmp0 = this.o47_1;
         // Inline function 'kotlin.collections.filterTo' call
         var destination = ArrayList_init_$Create$();
@@ -9870,7 +9943,7 @@
       case 1:
         // Inline function 'kotlin.collections.filter' call
-        var tmp0_0 = this.l47_1;
+        var tmp0_0 = this.o47_1;
         // Inline function 'kotlin.collections.filterTo' call
         var destination_0 = ArrayList_init_$Create$();
@@ -9904,9 +9977,9 @@
     return copyToArray(this_0);
   };
   function Card_1() {
-    Companion_getInstance_59();
+    Companion_getInstance_60();
     var tmp = this;
-    tmp.j47_1 = lazy(TractPage$Card$labelParent$delegate$lambda(this));
+    tmp.m47_1 = lazy(TractPage$Card$labelParent$delegate$lambda(this));
   }
   function parseCardsXml($this, _this__u8e3s4) {
     // Inline function 'kotlin.collections.buildList' call
@@ -9950,22 +10023,22 @@
     }
     return this_0.k3();
   }
-  protoOf(TractPage).o47 = function () {
+  protoOf(TractPage).r47 = function () {
     return equals(lastOrNull(this.s38().h3k()), this);
   };
   protoOf(TractPage).x3g = function () {
-    return this.u46_1;
+    return this.x46_1;
   };
   protoOf(TractPage).k3c = function () {
     return this.header;
   };
-  protoOf(TractPage).p47 = function () {
+  protoOf(TractPage).s47 = function () {
     return this.hero;
   };
-  protoOf(TractPage).q47 = function () {
+  protoOf(TractPage).t47 = function () {
     return this._modals;
   };
-  protoOf(TractPage).r47 = function () {
+  protoOf(TractPage).u47 = function () {
     return this.callToAction;
   };
   protoOf(TractPage).findModal = function (id) {
@@ -9985,10 +10058,10 @@
     }
     return tmp$ret$1;
   };
-  protoOf(TractPage).r3z = function () {
+  protoOf(TractPage).u3z = function () {
     return this._cards;
   };
-  protoOf(TractPage).s47 = function () {
+  protoOf(TractPage).v47 = function () {
     // Inline function 'kotlin.collections.filter' call
     var tmp0 = this._cards;
     // Inline function 'kotlin.collections.filterTo' call
@@ -10002,22 +10075,22 @@
     }
     return destination;
   };
-  protoOf(TractPage).t47 = function () {
-    var tmp0_elvis_lhs = this.v46_1;
+  protoOf(TractPage).w47 = function () {
+    var tmp0_elvis_lhs = this.y46_1;
     return tmp0_elvis_lhs == null ? this.q3h() : tmp0_elvis_lhs;
   };
-  protoOf(TractPage).s3z = function () {
+  protoOf(TractPage).v3z = function () {
     // Inline function 'kotlin.collections.toTypedArray' call
     var this_0 = this._cards;
     return copyToArray(this_0);
   };
-  protoOf(TractPage).u47 = function () {
+  protoOf(TractPage).x47 = function () {
     // Inline function 'kotlin.collections.toTypedArray' call
     var this_0 = this._modals;
     return copyToArray(this_0);
   };
   function TractPage() {
-    this.u46_1 = emptyList();
+    this.x46_1 = emptyList();
   }
   function labelParent$factory() {
     return getPropertyCallableRef('labelParent', 1, KProperty1, function (receiver) {
@@ -10028,7 +10101,7 @@
     return new FlowWatcher(launchIn(onEach(_this__u8e3s4, FlowWatcher$Companion$watchIn$slambda_0(block, null)), scope));
   }
   function FlowWatcher$Companion$watchIn$slambda($block, resultContinuation) {
-    this.d48_1 = $block;
+    this.g48_1 = $block;
     CoroutineImpl.call(this, resultContinuation);
   }
   protoOf(FlowWatcher$Companion$watchIn$slambda).m19 = function (it, $completion) {
@@ -10047,7 +10120,7 @@
         var tmp = this.v8_1;
         if (tmp === 0) {
           this.w8_1 = 1;
-          this.d48_1(this.e48_1);
+          this.g48_1(this.h48_1);
           return Unit_instance;
         } else if (tmp === 1) {
           throw this.y8_1;
@@ -10059,8 +10132,8 @@
      while (true);
   };
   protoOf(FlowWatcher$Companion$watchIn$slambda).n19 = function (it, completion) {
-    var i = new FlowWatcher$Companion$watchIn$slambda(this.d48_1, completion);
-    i.e48_1 = it;
+    var i = new FlowWatcher$Companion$watchIn$slambda(this.g48_1, completion);
+    i.h48_1 = it;
     return i;
   };
   function FlowWatcher$Companion$watchIn$slambda_0($block, resultContinuation) {
@@ -10071,20 +10144,20 @@
     l.$arity = 1;
     return l;
   }
-  function Companion_57() {
+  function Companion_58() {
   }
-  protoOf(Companion_57).w3s = function (_this__u8e3s4, block) {
+  protoOf(Companion_58).w3s = function (_this__u8e3s4, block) {
     return watchIn(this, _this__u8e3s4, CoroutineScope_0(Dispatchers_getInstance().qu()), block);
   };
-  var Companion_instance_58;
-  function Companion_getInstance_60() {
-    return Companion_instance_58;
+  var Companion_instance_59;
+  function Companion_getInstance_61() {
+    return Companion_instance_59;
   }
   function FlowWatcher(job) {
-    this.f48_1 = job;
+    this.i48_1 = job;
   }
   protoOf(FlowWatcher).close = function () {
-    return this.f48_1.vl();
+    return this.i48_1.vl();
   };
   function get_REGEX_SEQUENCE_SEPARATOR() {
     _init_properties_Regex_kt__v9a4ph();
@@ -10112,31 +10185,31 @@
     return EMPTY_instance;
   }
   function SetOnceProperty() {
-    this.g48_1 = EMPTY_instance;
+    this.j48_1 = EMPTY_instance;
   }
-  protoOf(SetOnceProperty).h48 = function (thisRef, property) {
+  protoOf(SetOnceProperty).k48 = function (thisRef, property) {
     // Inline function 'kotlin.check' call
-    if (!!(this.g48_1 === EMPTY_instance)) {
+    if (!!(this.j48_1 === EMPTY_instance)) {
       var message = "Value isn't initialized";
       throw IllegalStateException_init_$Create$(toString_0(message));
     }
-    var tmp = this.g48_1;
+    var tmp = this.j48_1;
     return (tmp == null ? true : !(tmp == null)) ? tmp : THROW_CCE();
   };
   protoOf(SetOnceProperty).c3r = function (thisRef, property) {
-    return this.h48(!(thisRef == null) ? thisRef : THROW_CCE(), property);
+    return this.k48(!(thisRef == null) ? thisRef : THROW_CCE(), property);
   };
-  protoOf(SetOnceProperty).i48 = function (thisRef, property, value) {
+  protoOf(SetOnceProperty).l48 = function (thisRef, property, value) {
     // Inline function 'kotlin.check' call
-    if (!(this.g48_1 === EMPTY_instance)) {
+    if (!(this.j48_1 === EMPTY_instance)) {
       var message = 'Value is initialized';
       throw IllegalStateException_init_$Create$(toString_0(message));
     }
-    this.g48_1 = value;
+    this.j48_1 = value;
   };
   protoOf(SetOnceProperty).n3p = function (thisRef, property, value) {
     var tmp = !(thisRef == null) ? thisRef : THROW_CCE();
-    return this.i48(tmp, property, (value == null ? true : !(value == null)) ? value : THROW_CCE());
+    return this.l48(tmp, property, (value == null ? true : !(value == null)) ? value : THROW_CCE());
   };
   function get_hasUriScheme(_this__u8e3s4) {
     return contains_1(_this__u8e3s4, _Char___init__impl__6a9atx(58));
@@ -10151,9 +10224,9 @@
   }
   function getAttributeValueInt($this, namespace, name) {
     // Inline function 'kotlin.takeIf' call
-    var this_0 = $this.j48_1;
+    var this_0 = $this.m48_1;
     var tmp;
-    if (this_0.m48_1 === 2) {
+    if (this_0.p48_1 === 2) {
       tmp = this_0;
     } else {
       tmp = null;
@@ -10166,20 +10239,20 @@
       tmp_0 = tmp0_elvis_lhs;
     }
     var event = tmp_0;
-    var tmp1_safe_receiver = event.p48_1;
+    var tmp1_safe_receiver = event.s48_1;
     return tmp1_safe_receiver == null ? null : tmp1_safe_receiver.f2(new QName(namespace, name));
   }
   function QName(uri, local) {
     uri = uri === VOID ? null : uri;
-    this.q48_1 = uri;
-    this.r48_1 = local;
+    this.t48_1 = uri;
+    this.u48_1 = local;
   }
   protoOf(QName).toString = function () {
-    return 'QName(uri=' + this.q48_1 + ', local=' + this.r48_1 + ')';
+    return 'QName(uri=' + this.t48_1 + ', local=' + this.u48_1 + ')';
   };
   protoOf(QName).hashCode = function () {
-    var result = this.q48_1 == null ? 0 : getStringHashCode(this.q48_1);
-    result = imul(result, 31) + getStringHashCode(this.r48_1) | 0;
+    var result = this.t48_1 == null ? 0 : getStringHashCode(this.t48_1);
+    result = imul(result, 31) + getStringHashCode(this.u48_1) | 0;
     return result;
   };
   protoOf(QName).equals = function (other) {
@@ -10188,9 +10261,9 @@
     if (!(other instanceof QName))
       return false;
     var tmp0_other_with_cast = other instanceof QName ? other : THROW_CCE();
-    if (!(this.q48_1 == tmp0_other_with_cast.q48_1))
+    if (!(this.t48_1 == tmp0_other_with_cast.t48_1))
       return false;
-    if (!(this.r48_1 === tmp0_other_with_cast.r48_1))
+    if (!(this.u48_1 === tmp0_other_with_cast.u48_1))
       return false;
     return true;
   };
@@ -10198,51 +10271,51 @@
     qname = qname === VOID ? null : qname;
     content = content === VOID ? null : content;
     attrs = attrs === VOID ? null : attrs;
-    this.m48_1 = type;
-    this.n48_1 = qname;
-    this.o48_1 = content;
-    this.p48_1 = attrs;
+    this.p48_1 = type;
+    this.q48_1 = qname;
+    this.r48_1 = content;
+    this.s48_1 = attrs;
   }
   function enqueueEvent($this, event) {
     // Inline function 'kotlin.text.isNotEmpty' call
-    var this_0 = $this.l48_1;
+    var this_0 = $this.o48_1;
     if (charSequenceLength(this_0) > 0) {
-      var tmp1 = $this.k48_1;
+      var tmp1 = $this.n48_1;
       // Inline function 'kotlin.collections.plusAssign' call
-      var element = new ParserEvent(4, VOID, $this.l48_1.toString());
+      var element = new ParserEvent(4, VOID, $this.o48_1.toString());
       tmp1.e(element);
-      $this.l48_1.nb();
+      $this.o48_1.nb();
     }
     // Inline function 'kotlin.collections.plusAssign' call
-    $this.k48_1.e(event);
+    $this.n48_1.e(event);
   }
   function SaxXmlPullParser() {
-    this.j48_1 = new ParserEvent(0);
+    this.m48_1 = new ParserEvent(0);
     var tmp = this;
     // Inline function 'kotlin.collections.mutableListOf' call
-    tmp.k48_1 = ArrayList_init_$Create$();
-    this.l48_1 = StringBuilder_init_$Create$();
+    tmp.n48_1 = ArrayList_init_$Create$();
+    this.o48_1 = StringBuilder_init_$Create$();
   }
   protoOf(SaxXmlPullParser).q3b = function () {
-    return this.j48_1.m48_1;
+    return this.m48_1.p48_1;
   };
   protoOf(SaxXmlPullParser).r3b = function () {
-    var tmp0_safe_receiver = this.j48_1.n48_1;
-    return tmp0_safe_receiver == null ? null : tmp0_safe_receiver.q48_1;
+    var tmp0_safe_receiver = this.m48_1.q48_1;
+    return tmp0_safe_receiver == null ? null : tmp0_safe_receiver.t48_1;
   };
   protoOf(SaxXmlPullParser).l2 = function () {
-    var tmp0_safe_receiver = this.j48_1.n48_1;
-    return tmp0_safe_receiver == null ? null : tmp0_safe_receiver.r48_1;
+    var tmp0_safe_receiver = this.m48_1.q48_1;
+    return tmp0_safe_receiver == null ? null : tmp0_safe_receiver.u48_1;
   };
   protoOf(SaxXmlPullParser).p3b = function (type, namespace, name) {
     // Inline function 'kotlin.with' call
-    var $this$with = this.j48_1;
-    if (!($this$with.m48_1 === type))
+    var $this$with = this.m48_1;
+    if (!($this$with.p48_1 === type))
       throw new XmlPullParserException('expected ' + type);
     var tmp;
     if (!(namespace == null)) {
-      var tmp0_safe_receiver = $this$with.n48_1;
-      tmp = !(namespace == (tmp0_safe_receiver == null ? null : tmp0_safe_receiver.q48_1));
+      var tmp0_safe_receiver = $this$with.q48_1;
+      tmp = !(namespace == (tmp0_safe_receiver == null ? null : tmp0_safe_receiver.t48_1));
     } else {
       tmp = false;
     }
@@ -10250,8 +10323,8 @@
       throw new XmlPullParserException('expected ' + namespace);
     var tmp_0;
     if (!(name == null)) {
-      var tmp1_safe_receiver = $this$with.n48_1;
-      tmp_0 = !((tmp1_safe_receiver == null ? null : tmp1_safe_receiver.r48_1) == name);
+      var tmp1_safe_receiver = $this$with.q48_1;
+      tmp_0 = !((tmp1_safe_receiver == null ? null : tmp1_safe_receiver.u48_1) == name);
     } else {
       tmp_0 = false;
     }
@@ -10261,15 +10334,15 @@
   };
   protoOf(SaxXmlPullParser).l = function () {
     // Inline function 'kotlin.also' call
-    var this_0 = removeFirst(this.k48_1);
-    this.j48_1 = this_0;
-    return this_0.m48_1;
+    var this_0 = removeFirst(this.n48_1);
+    this.m48_1 = this_0;
+    return this_0.p48_1;
   };
   protoOf(SaxXmlPullParser).h39 = function () {
     var tmp;
     if (this.l() === 4) {
       // Inline function 'kotlin.text.isNullOrBlank' call
-      var this_0 = this.j48_1.o48_1;
+      var this_0 = this.m48_1.r48_1;
       tmp = this_0 == null || isBlank(this_0);
     } else {
       tmp = false;
@@ -10277,20 +10350,20 @@
     if (tmp) {
       this.l();
     }
-    var event = this.j48_1;
-    if (!(event.m48_1 === 2) && !(event.m48_1 === 3)) {
-      throw new XmlPullParserException('Expected start or end tag. Found: ' + event.m48_1);
+    var event = this.m48_1;
+    if (!(event.p48_1 === 2) && !(event.p48_1 === 3)) {
+      throw new XmlPullParserException('Expected start or end tag. Found: ' + event.p48_1);
     }
-    return event.m48_1;
+    return event.p48_1;
   };
   protoOf(SaxXmlPullParser).c3v = function () {
-    this.p44(2);
+    this.s44(2);
     var tmp;
     switch (this.l()) {
       case 4:
         // Inline function 'kotlin.text.orEmpty' call
-        var tmp0_elvis_lhs = this.j48_1.o48_1;
+        var tmp0_elvis_lhs = this.m48_1.r48_1;
         // Inline function 'kotlin.also' call
         var this_0 = tmp0_elvis_lhs == null ? '' : tmp0_elvis_lhs;
@@ -10316,13 +10389,13 @@
   protoOf(SaxXmlPullParser).o3p = function (namespace, name) {
     return getAttributeValueInt(this, namespace, name);
   };
-  protoOf(SaxXmlPullParser).s48 = function (qname, attrs) {
+  protoOf(SaxXmlPullParser).v48 = function (qname, attrs) {
     enqueueEvent(this, new ParserEvent(2, qname, VOID, attrs));
   };
-  protoOf(SaxXmlPullParser).t48 = function (text) {
-    this.l48_1.g8(text);
+  protoOf(SaxXmlPullParser).w48 = function (text) {
+    this.o48_1.g8(text);
   };
-  protoOf(SaxXmlPullParser).u48 = function (qname) {
+  protoOf(SaxXmlPullParser).x48 = function (qname) {
     enqueueEvent(this, new ParserEvent(3, qname));
   };
   function XmlPullParser() {
@@ -10369,26 +10442,26 @@
   }
   var SAX_OPTIONS;
   function InternalSAXParser($outer) {
-    this.v48_1 = $outer;
+    this.y48_1 = $outer;
     SAXParser.call(this, true, get_SAX_OPTIONS());
   }
-  protoOf(InternalSAXParser).w48 = function (tag) {
-    return this.v48_1.s48(new QName(tag.uri, tag.local), convert(this.v48_1, tag.attributes));
+  protoOf(InternalSAXParser).z48 = function (tag) {
+    return this.y48_1.v48(new QName(tag.uri, tag.local), convert(this.y48_1, tag.attributes));
   };
   protoOf(InternalSAXParser).onopentag = function (tag) {
-    return this.w48(tag);
+    return this.z48(tag);
   };
-  protoOf(InternalSAXParser).x48 = function (tagName) {
-    return this.v48_1.u48(new QName(VOID, tagName));
+  protoOf(InternalSAXParser).a49 = function (tagName) {
+    return this.y48_1.x48(new QName(VOID, tagName));
   };
   protoOf(InternalSAXParser).onclosetag = function (tagName) {
-    return this.x48(tagName);
+    return this.a49(tagName);
   };
-  protoOf(InternalSAXParser).y48 = function (t) {
-    return this.v48_1.t48(t);
+  protoOf(InternalSAXParser).b49 = function (t) {
+    return this.y48_1.w48(t);
   };
   protoOf(InternalSAXParser).ontext = function (t) {
-    return this.y48(t);
+    return this.b49(t);
   };
   function convert($this, _this__u8e3s4) {
     var tmp = Object.values;
@@ -10432,13 +10505,13 @@
     var this_0 = new InternalSAXParser(this);
     this_0.write(xml);
     this_0.close();
-    tmp.c49_1 = this_0;
+    tmp.f49_1 = this_0;
   }
   function SAX_OPTIONS$1() {
-    this.d49_1 = true;
+    this.g49_1 = true;
   }
-  protoOf(SAX_OPTIONS$1).e49 = function () {
-    return this.d49_1;
+  protoOf(SAX_OPTIONS$1).h49 = function () {
+    return this.g49_1;
   };
   var properties_initialized_JsXmlPullParser_kt_u4cdem;
   function _init_properties_JsXmlPullParser_kt__2zt5j4() {
@@ -10449,8 +10522,8 @@
   }
   function $getXmlParserCOROUTINE$4(_this__u8e3s4, fileName, resultContinuation) {
     CoroutineImpl.call(this, resultContinuation);
-    this.n49_1 = _this__u8e3s4;
-    this.o49_1 = fileName;
+    this.q49_1 = _this__u8e3s4;
+    this.r49_1 = fileName;
   }
   protoOf($getXmlParserCOROUTINE$4).d9 = function () {
     var suspendResult = this.x8_1;
@@ -10461,7 +10534,7 @@
           case 0:
             this.w8_1 = 2;
             this.v8_1 = 1;
-            suspendResult = await_0(this.n49_1.readFile(this.o49_1), this);
+            suspendResult = await_0(this.q49_1.readFile(this.r49_1), this);
             if (suspendResult === get_COROUTINE_SUSPENDED()) {
               return suspendResult;
             }
@@ -10494,14 +10567,14 @@
   function JsXmlPullParserFactory() {
     XmlPullParserFactory.call(this);
   }
-  protoOf(JsXmlPullParserFactory).p49 = function (fileName, $completion) {
+  protoOf(JsXmlPullParserFactory).s49 = function (fileName, $completion) {
     var tmp = new $getXmlParserCOROUTINE$4(this, fileName, $completion);
     tmp.x8_1 = Unit_instance;
     tmp.y8_1 = null;
     return tmp.d9();
   };
   protoOf(JsXmlPullParserFactory).g39 = function (fileName, $completion) {
-    return this.p49(fileName, $completion);
+    return this.s49(fileName, $completion);
   };
   function XmlPullParserException(s) {
     Exception_init_$Init$(s, this);
@@ -10730,6 +10803,10 @@
   defineProp(protoOf(LessonPage), 'content', function () {
     return this.t3c();
   });
+  protoOf(Header).t3c = get_content;
+  defineProp(protoOf(Header), 'content', function () {
+    return this.t3c();
+  });
   protoOf(Card_0).t3c = get_content;
   protoOf(Card_0).getAnalyticsEvents = getAnalyticsEvents;
   defineProp(protoOf(Card_0), 'id', protoOf(Card_0).j3c);
@@ -10737,7 +10814,7 @@
   defineProp(protoOf(Card_0), 'content', function () {
     return this.t3c();
   });
-  defineProp(protoOf(CardCollectionPage), 'cards', protoOf(CardCollectionPage).s3z);
+  defineProp(protoOf(CardCollectionPage), 'cards', protoOf(CardCollectionPage).v3z);
   protoOf(ContentPage).t3c = get_content;
   defineProp(protoOf(ContentPage), 'content', function () {
     return this.t3c();
@@ -10750,7 +10827,7 @@
   defineProp(protoOf(PageCollectionPage), 'pages', function () {
     return this.j3k();
   });
-  defineProp(protoOf(InlineTip), 'tip', protoOf(InlineTip).d45);
+  defineProp(protoOf(InlineTip), 'tip', protoOf(InlineTip).g45);
   protoOf(Tip).u3h = get_buttonStyle;
   protoOf(Tip).s3g = get_buttonColor;
   protoOf(Tip).v3h = get_cardBackgroundColor;
@@ -10762,17 +10839,17 @@
   defineProp(protoOf(TipPage), 'content', function () {
     return this.t3c();
   });
-  defineProp(protoOf(CallToAction), 'tip', protoOf(CallToAction).d45);
-  protoOf(Header).s3h = get_primaryColor;
-  protoOf(Header).t3h = get_primaryTextColor;
-  protoOf(Header).u3h = get_buttonStyle;
-  protoOf(Header).s3g = get_buttonColor;
-  protoOf(Header).v3h = get_cardBackgroundColor;
-  protoOf(Header).w3h = get_multiselectOptionBackgroundColor;
-  protoOf(Header).x3h = get_multiselectOptionSelectedColor;
-  protoOf(Header).y3h = get_textScale;
-  protoOf(Header).z3h = get_textAlign;
-  defineProp(protoOf(Header), 'tip', protoOf(Header).d45);
+  defineProp(protoOf(CallToAction), 'tip', protoOf(CallToAction).g45);
+  protoOf(Header_0).s3h = get_primaryColor;
+  protoOf(Header_0).t3h = get_primaryTextColor;
+  protoOf(Header_0).u3h = get_buttonStyle;
+  protoOf(Header_0).s3g = get_buttonColor;
+  protoOf(Header_0).v3h = get_cardBackgroundColor;
+  protoOf(Header_0).w3h = get_multiselectOptionBackgroundColor;
+  protoOf(Header_0).x3h = get_multiselectOptionSelectedColor;
+  protoOf(Header_0).y3h = get_textScale;
+  protoOf(Header_0).z3h = get_textAlign;
+  defineProp(protoOf(Header_0), 'tip', protoOf(Header_0).g45);
   protoOf(Hero).t3c = get_content;
   protoOf(Hero).getAnalyticsEvents = getAnalyticsEvents;
   defineProp(protoOf(Hero), 'content', function () {
@@ -10801,8 +10878,8 @@
   protoOf(Card_1).t3c = get_content;
   protoOf(Card_1).getAnalyticsEvents = getAnalyticsEvents;
   defineProp(protoOf(Card_1), 'id', protoOf(Card_1).j3c);
-  defineProp(protoOf(Card_1), 'visiblePosition', protoOf(Card_1).m47);
-  defineProp(protoOf(Card_1), 'isLastVisibleCard', protoOf(Card_1).n47);
+  defineProp(protoOf(Card_1), 'visiblePosition', protoOf(Card_1).p47);
+  defineProp(protoOf(Card_1), 'isLastVisibleCard', protoOf(Card_1).q47);
   defineProp(protoOf(Card_1), 'backgroundImage', protoOf(Card_1).k3q);
   defineProp(protoOf(Card_1), 'tips', protoOf(Card_1).v3c);
   defineProp(protoOf(Card_1), 'dismissListeners', protoOf(Card_1).m3r);
@@ -10810,14 +10887,14 @@
   defineProp(protoOf(Card_1), 'content', function () {
     return this.t3c();
   });
-  defineProp(protoOf(TractPage), 'isLastPage', protoOf(TractPage).o47);
-  defineProp(protoOf(TractPage), 'visibleCards', protoOf(TractPage).s47);
-  defineProp(protoOf(TractPage), 'cardTextColor', protoOf(TractPage).t47);
-  defineProp(protoOf(TractPage), 'cards', protoOf(TractPage).s3z);
-  defineProp(protoOf(TractPage), 'modals', protoOf(TractPage).u47);
-  protoOf(SaxXmlPullParser).p44 = require$default;
+  defineProp(protoOf(TractPage), 'isLastPage', protoOf(TractPage).r47);
+  defineProp(protoOf(TractPage), 'visibleCards', protoOf(TractPage).v47);
+  defineProp(protoOf(TractPage), 'cardTextColor', protoOf(TractPage).w47);
+  defineProp(protoOf(TractPage), 'cards', protoOf(TractPage).v3z);
+  defineProp(protoOf(TractPage), 'modals', protoOf(TractPage).x47);
+  protoOf(SaxXmlPullParser).s44 = require$default;
   defineProp(protoOf(SAX_OPTIONS$1), 'xmlns', function () {
-    return this.e49();
+    return this.h49();
   });
   //endregion
   //region block: init
@@ -10851,16 +10928,17 @@
   Companion_instance_43 = new Companion_42();
   Companion_instance_44 = new Companion_43();
   Companion_instance_45 = new Companion_44();
-  Companion_instance_47 = new Companion_46();
+  Companion_instance_46 = new Companion_45();
   Companion_instance_48 = new Companion_47();
   Companion_instance_49 = new Companion_48();
   Companion_instance_50 = new Companion_49();
-  Companion_instance_52 = new Companion_51();
+  Companion_instance_51 = new Companion_50();
   Companion_instance_53 = new Companion_52();
   Companion_instance_54 = new Companion_53();
   Companion_instance_55 = new Companion_54();
   Companion_instance_56 = new Companion_55();
-  Companion_instance_58 = new Companion_57();
+  Companion_instance_57 = new Companion_56();
+  Companion_instance_59 = new Companion_58();
   EMPTY_instance = new EMPTY();
   //endregion
   //region block: exports
@@ -11209,6 +11287,7 @@
     var $org$cru$godtools$shared$tool$parser$model = $org$cru$godtools$shared$tool$parser.model || ($org$cru$godtools$shared$tool$parser.model = {});
     var $org$cru$godtools$shared$tool$parser$model$page = $org$cru$godtools$shared$tool$parser$model.page || ($org$cru$godtools$shared$tool$parser$model.page = {});
     $org$cru$godtools$shared$tool$parser$model$page.CardCollectionPage = CardCollectionPage;
+    $org$cru$godtools$shared$tool$parser$model$page.CardCollectionPage.Header = Header;
     $org$cru$godtools$shared$tool$parser$model$page.CardCollectionPage.Card = Card_0;
     var $org = _.org || (_.org = {});
     var $org$cru = $org.cru || ($org.cru = {});
@@ -11237,7 +11316,7 @@
     var $org$cru$godtools$shared$tool$parser$model = $org$cru$godtools$shared$tool$parser.model || ($org$cru$godtools$shared$tool$parser.model = {});
     var $org$cru$godtools$shared$tool$parser$model$page = $org$cru$godtools$shared$tool$parser$model.page || ($org$cru$godtools$shared$tool$parser$model.page = {});
     $org$cru$godtools$shared$tool$parser$model$page.PageCollectionPage = PageCollectionPage;
-    defineProp($org$cru$godtools$shared$tool$parser$model$page.PageCollectionPage, 'Companion', Companion_getInstance_49);
+    defineProp($org$cru$godtools$shared$tool$parser$model$page.PageCollectionPage, 'Companion', Companion_getInstance_50);
     var $org = _.org || (_.org = {});
     var $org$cru = $org.cru || ($org.cru = {});
     var $org$cru$godtools = $org$cru.godtools || ($org$cru.godtools = {});
@@ -11266,7 +11345,7 @@
     var $org$cru$godtools$shared$tool$parser = $org$cru$godtools$shared$tool.parser || ($org$cru$godtools$shared$tool.parser = {});
     var $org$cru$godtools$shared$tool$parser$model = $org$cru$godtools$shared$tool$parser.model || ($org$cru$godtools$shared$tool$parser.model = {});
     var $org$cru$godtools$shared$tool$parser$model$tract = $org$cru$godtools$shared$tool$parser$model.tract || ($org$cru$godtools$shared$tool$parser$model.tract = {});
-    $org$cru$godtools$shared$tool$parser$model$tract.Header = Header;
+    $org$cru$godtools$shared$tool$parser$model$tract.Header = Header_0;
     var $org = _.org || (_.org = {});
     var $org$cru = $org.cru || ($org.cru = {});
     var $org$cru$godtools = $org$cru.godtools || ($org$cru.godtools = {});