@cruglobal/godtools-shared 1.1.3-SNAPSHOT.1725 → 1.1.3-SNAPSHOT.1728

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

@@ -259,13 +259,13 @@
     return distinctUntilChanged(state.y1m(tmp, Visibility$isGoneFlow$lambda(this)));
   }
   function watchIsGone(state, block) {
-    return Companion_instance_58.v3s(this.isGoneFlow(state), block);
+    return Companion_instance_59.v3s(this.isGoneFlow(state), block);
   }
   function watchIsInvisible(state, block) {
-    return Companion_instance_58.v3s(this.isInvisibleFlow(state), block);
+    return Companion_instance_59.v3s(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));
@@ -457,43 +457,45 @@
   initMetadataForClass(LessonPage, 'LessonPage', VOID, Page, [Page, Parent]);
   initMetadataForCompanion(Companion_42);
   initMetadataForCompanion(Companion_43);
+  initMetadataForCompanion(Companion_44);
+  initMetadataForClass(Header, 'Header', VOID, BaseModel, [BaseModel, Parent, Styles]);
   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);
@@ -4218,7 +4220,7 @@
         switch (tmp) {
           case 0:
             this.w8_1 = 3;
-            this.i3m_1 = Companion_getInstance_48();
+            this.i3m_1 = Companion_getInstance_49();
             this.v8_1 = 1;
             suspendResult = this.f3m_1(this.g3m_1, this);
             if (suspendResult === get_COROUTINE_SUSPENDED()) {
@@ -4845,7 +4847,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.p3p(parser, $this);
+          var elements_3 = Companion_instance_49.p3p(parser, $this);
           addAll(shareables, elements_3);
         }
       }
@@ -5797,7 +5799,7 @@
     return distinctUntilChanged(state.y1m(tmp, Multiselect$Option$isSelectedFlow$lambda(this)));
   };
   protoOf(Option).watchIsSelected = function (state, block) {
-    return Companion_instance_58.v3s(this.isSelectedFlow(state), block);
+    return Companion_instance_59.v3s(this.isSelectedFlow(state), block);
   };
   protoOf(Option).toggleSelected = function (state) {
     var current = state.z1m(this.multiselect.n3s_1);
@@ -7402,29 +7404,91 @@
   function LessonPage() {
   }
   function Companion_42() {
-    this.m3y_1 = 'card';
-    this.n3y_1 = 'id';
-    this.o3y_1 = 'content';
+    Companion_instance_43 = this;
+    this.m3y_1 = 'header';
+    this.n3y_1 = Align_CENTER_getInstance();
   }
   var Companion_instance_43;
   function Companion_getInstance_45() {
+    if (Companion_instance_43 == null)
+      new Companion_42();
     return Companion_instance_43;
   }
+  function Header_init_$Init$(page, parser, $this) {
+    BaseModel.call($this, page);
+    Header.call($this);
+    parser.o3b(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.o3b(2, null, null);
+    // Inline function 'org.cru.godtools.shared.tool.parser.xml.parseChildren' call
+    $l$loop_0: while (!(parser.l() === 3)) {
+      if (!(parser.p3b() === 2))
+        continue $l$loop_0;
+      $l$block: {
+        if (parser.p3b() === 3) {
+          break $l$block;
+        }
+        var tmp0_safe_receiver = Companion_instance_12.t3b(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.a3c()) {
+            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.p3b() === 3)
+        continue $l$loop_0;
+      skipTag(parser);
+    }
+    tmp.q3y_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.r3y_1 = 'card';
+    this.s3y_1 = 'id';
+    this.t3y_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.o3b(2, 'https://mobile-content-api.cru.org/xmlns/page', 'card');
-    $this.q3y_1 = parser.d3d('id');
+    $this.v3y_1 = parser.d3d('id');
     var tmp = $this;
     var tmp0_safe_receiver = parser.d3d('background-color');
-    tmp.r3y_1 = tmp0_safe_receiver == null ? null : toColorOrNull(tmp0_safe_receiver);
+    tmp.w3y_1 = tmp0_safe_receiver == null ? null : toColorOrNull(tmp0_safe_receiver);
     var tmp_0 = $this;
     // Inline function 'kotlin.collections.mutableListOf' call
-    tmp_0.s3y_1 = ArrayList_init_$Create$();
+    tmp_0.x3y_1 = ArrayList_init_$Create$();
     var tmp_1 = $this;
     // Inline function 'kotlin.collections.mutableListOf' call
-    tmp_1.t3y_1 = ArrayList_init_$Create$();
+    tmp_1.y3y_1 = ArrayList_init_$Create$();
     // Inline function 'org.cru.godtools.shared.tool.parser.xml.parseChildren' call
     $l$loop_2: while (!(parser.l() === 3)) {
       if (!(parser.p3b() === 2))
@@ -7432,14 +7496,14 @@
       var tmp0_subject = parser.q3b();
       if (tmp0_subject === 'https://mobile-content-api.cru.org/xmlns/analytics') {
         if (parser.l2() === 'events') {
-          var tmp0 = $this.s3y_1;
+          var tmp0 = $this.x3y_1;
           // Inline function 'kotlin.collections.plusAssign' call
           var elements = Companion_instance_4.s3b(parser, $this);
           addAll(tmp0, elements);
         }
       } else if (tmp0_subject === 'https://mobile-content-api.cru.org/xmlns/page') {
         if (parser.l2() === 'content') {
-          var tmp4 = $this.t3y_1;
+          var tmp4 = $this.y3y_1;
           // Inline function 'org.cru.godtools.shared.tool.parser.model.parseContent' call
           // Inline function 'kotlin.collections.buildList' call
           // Inline function 'kotlin.collections.buildListInternal' call
@@ -7494,21 +7558,22 @@
   function Card_init_$Create$_0(page, parser) {
     return Card_init_$Init$_0(page, parser, objectCreate(protoOf(Card_0)));
   }
-  function Companion_43() {
-    this.u3y_1 = 'cardcollection';
+  function Companion_44() {
+    this.z3y_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.o3b(2, 'https://mobile-content-api.cru.org/xmlns/page', 'page');
-    Companion_getInstance_48().v3y(parser, 'cardcollection');
+    Companion_getInstance_49().a3z(parser, 'cardcollection');
     var tmp = $this;
     // Inline function 'kotlin.collections.mutableListOf' call
-    tmp.o3z_1 = ArrayList_init_$Create$();
+    tmp.t3z_1 = ArrayList_init_$Create$();
+    var header = null;
     var tmp_0 = $this;
     // Inline function 'kotlin.collections.mutableListOf' call
     tmp_0._cards = ArrayList_init_$Create$();
@@ -7519,13 +7584,16 @@
       var tmp0_subject = parser.q3b();
       if (tmp0_subject === 'https://mobile-content-api.cru.org/xmlns/analytics') {
         if (parser.l2() === 'events') {
-          var tmp0 = $this.o3z_1;
+          var tmp0 = $this.t3z_1;
           // Inline function 'kotlin.collections.plusAssign' call
           var elements = Companion_instance_4.s3b(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);
@@ -7536,6 +7604,7 @@
         continue $l$loop_0;
       skipTag(parser);
     }
+    $this.header = header;
     return $this;
   }
   function CardCollectionPage_init_$Create$(container, fileName, parser) {
@@ -7559,22 +7628,32 @@
     }
     return this_0.k3();
   }
-  protoOf(Card_0).p3z = function () {
+  protoOf(Header).x3h = function () {
+    return this.p3y_1;
+  };
+  protoOf(Header).k3c = function () {
+    return this.q3y_1;
+  };
+  function Header() {
+    Companion_getInstance_45();
+    this.p3y_1 = Companion_getInstance_45().n3y_1;
+  }
+  protoOf(Card_0).u3z = function () {
     return this.page;
   };
   protoOf(Card_0).i3c = function () {
-    var tmp0_elvis_lhs = this.q3y_1;
+    var tmp0_elvis_lhs = this.v3y_1;
     return tmp0_elvis_lhs == null ? this.page.id + '-' + this.position : tmp0_elvis_lhs;
   };
   protoOf(Card_0).p3u = function () {
     return this.page._cards.w1(this);
   };
   protoOf(Card_0).i3q = function () {
-    var tmp0_elvis_lhs = this.r3y_1;
+    var tmp0_elvis_lhs = this.w3y_1;
     return tmp0_elvis_lhs == null ? this.page.t3h() : tmp0_elvis_lhs;
   };
   protoOf(Card_0).k3c = function () {
-    return this.t3y_1;
+    return this.y3y_1;
   };
   protoOf(Card_0).u3c = function () {
     // Inline function 'org.cru.godtools.shared.tool.parser.model.contentTips' call
@@ -7596,7 +7675,7 @@
       case 0:
         // Inline function 'kotlin.collections.filter' call
 
-        var tmp0 = this.s3y_1;
+        var tmp0 = this.x3y_1;
         // Inline function 'kotlin.collections.filterTo' call
 
         var destination = ArrayList_init_$Create$();
@@ -7613,7 +7692,7 @@
       case 1:
         // Inline function 'kotlin.collections.filter' call
 
-        var tmp0_0 = this.s3y_1;
+        var tmp0_0 = this.x3y_1;
         // Inline function 'kotlin.collections.filterTo' call
 
         var destination_0 = ArrayList_init_$Create$();
@@ -7639,12 +7718,15 @@
   function Card_0() {
   }
   protoOf(CardCollectionPage).v3g = function () {
-    return this.o3z_1;
+    return this.t3z_1;
+  };
+  protoOf(CardCollectionPage).j3c = function () {
+    return this.header;
   };
-  protoOf(CardCollectionPage).q3z = function () {
+  protoOf(CardCollectionPage).v3z = function () {
     return this._cards;
   };
-  protoOf(CardCollectionPage).r3z = function () {
+  protoOf(CardCollectionPage).w3z = function () {
     // Inline function 'kotlin.collections.toTypedArray' call
     var this_0 = this._cards;
     return copyToArray(this_0);
@@ -7663,24 +7745,24 @@
       DEFAULT_CONTROL_COLOR = color(225, 225, 225, 1.0);
     }
   }
-  function Companion_44() {
-    this.s3z_1 = 'content';
+  function Companion_45() {
+    this.x3z_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.o3b(2, 'https://mobile-content-api.cru.org/xmlns/page', 'page');
-    Companion_getInstance_48().v3y(parser, 'content');
+    Companion_getInstance_49().a3z(parser, 'content');
     var tmp = $this;
     // Inline function 'kotlin.collections.mutableListOf' call
-    tmp.l40_1 = ArrayList_init_$Create$();
+    tmp.q40_1 = ArrayList_init_$Create$();
     var tmp_0 = $this;
     // Inline function 'kotlin.collections.mutableListOf' call
-    tmp_0.m40_1 = ArrayList_init_$Create$();
+    tmp_0.r40_1 = ArrayList_init_$Create$();
     // Inline function 'org.cru.godtools.shared.tool.parser.xml.parseChildren' call
     $l$loop_2: while (!(parser.l() === 3)) {
       if (!(parser.p3b() === 2))
@@ -7688,14 +7770,14 @@
       var tmp0_subject = parser.q3b();
       if (tmp0_subject === 'https://mobile-content-api.cru.org/xmlns/analytics') {
         if (parser.l2() === 'events') {
-          var tmp0 = $this.l40_1;
+          var tmp0 = $this.q40_1;
           // Inline function 'kotlin.collections.plusAssign' call
           var elements = Companion_instance_4.s3b(parser, $this);
           addAll(tmp0, elements);
         }
       } else if (tmp0_subject === 'https://mobile-content-api.cru.org/xmlns/page') {
         if (parser.l2() === 'content') {
-          var tmp4 = $this.m40_1;
+          var tmp4 = $this.r40_1;
           // Inline function 'org.cru.godtools.shared.tool.parser.model.parseContent' call
           // Inline function 'kotlin.collections.buildList' call
           // Inline function 'kotlin.collections.buildListInternal' call
@@ -7751,20 +7833,20 @@
     return ContentPage_init_$Init$(container, fileName, parser, objectCreate(protoOf(ContentPage)));
   }
   protoOf(ContentPage).v3g = function () {
-    return this.l40_1;
+    return this.q40_1;
   };
   protoOf(ContentPage).k3c = function () {
-    return this.m40_1;
+    return this.r40_1;
   };
   function ContentPage() {
   }
   function $parseCOROUTINE$1(_this__u8e3s4, container, fileName, parser, parseFile, resultContinuation) {
     CoroutineImpl.call(this, resultContinuation);
-    this.v40_1 = _this__u8e3s4;
-    this.w40_1 = container;
-    this.x40_1 = fileName;
-    this.y40_1 = parser;
-    this.z40_1 = parseFile;
+    this.a41_1 = _this__u8e3s4;
+    this.b41_1 = container;
+    this.c41_1 = fileName;
+    this.d41_1 = parser;
+    this.e41_1 = parseFile;
   }
   protoOf($parseCOROUTINE$1).d9 = function () {
     var suspendResult = this.x8_1;
@@ -7774,35 +7856,35 @@
         switch (tmp) {
           case 0:
             this.w8_1 = 3;
-            this.y40_1.o3b(2, null, 'page');
-            this.a41_1 = to(this.y40_1.q3b(), this.y40_1.n3p('http://www.w3.org/2001/XMLSchema-instance', 'type'));
-            if (this.a41_1.equals(to('https://mobile-content-api.cru.org/xmlns/page', 'page-collection'))) {
-              if (!this.w40_1.h3k(getKClass(PageCollectionPage)))
+            this.d41_1.o3b(2, null, 'page');
+            this.f41_1 = to(this.d41_1.q3b(), this.d41_1.n3p('http://www.w3.org/2001/XMLSchema-instance', 'type'));
+            if (this.f41_1.equals(to('https://mobile-content-api.cru.org/xmlns/page', 'page-collection'))) {
+              if (!this.b41_1.h3k(getKClass(PageCollectionPage)))
                 return null;
               this.v8_1 = 1;
-              suspendResult = Companion_instance_47.h41(this.w40_1, this.x40_1, this.y40_1, this.z40_1, this);
+              suspendResult = Companion_instance_48.m41(this.b41_1, this.c41_1, this.d41_1, this.e41_1, this);
               if (suspendResult === get_COROUTINE_SUSPENDED()) {
                 return suspendResult;
               }
               continue $sm;
             } else {
-              this.b41_1 = this.v40_1.c41(this.w40_1, this.x40_1, this.y40_1);
+              this.g41_1 = this.a41_1.h41(this.b41_1, this.c41_1, this.d41_1);
               this.v8_1 = 2;
               continue $sm;
             }
 
           case 1:
-            this.b41_1 = suspendResult;
+            this.g41_1 = suspendResult;
             this.v8_1 = 2;
             continue $sm;
           case 2:
-            var tmp1_safe_receiver = this.b41_1;
+            var tmp1_safe_receiver = this.g41_1;
             var tmp_0;
             if (tmp1_safe_receiver == null) {
               tmp_0 = null;
             } else {
               var tmp_1;
-              if (this.w40_1.h3k(getKClassFromExpression(tmp1_safe_receiver))) {
+              if (this.b41_1.h3k(getKClassFromExpression(tmp1_safe_receiver))) {
                 tmp_1 = tmp1_safe_receiver;
               } else {
                 tmp_1 = null;
@@ -7825,21 +7907,21 @@
       }
      while (true);
   };
-  function Companion_45() {
-    Companion_instance_46 = this;
+  function Companion_46() {
+    Companion_instance_47 = this;
     this.l3m_1 = 'page';
     this.m3m_1 = 'parent_override_page-collection';
     this.n3m_1 = color(0, 0, 0, 0.0);
     this.o3m_1 = Companion_getInstance_22().CENTER;
     this.p3m_1 = ImageScaleType_FILL_X_getInstance();
   }
-  protoOf(Companion_45).q3m = function (container, fileName, parser, parseFile, $completion) {
+  protoOf(Companion_46).q3m = 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).c41 = function (container, fileName, parser) {
+  protoOf(Companion_46).h41 = function (container, fileName, parser) {
     parser.o3b(2, null, 'page');
     var tmp;
     switch (parser.q3b()) {
@@ -7910,16 +7992,16 @@
     }
     return tmp_1;
   };
-  protoOf(Companion_45).v3y = function (_this__u8e3s4, type) {
+  protoOf(Companion_46).a3z = function (_this__u8e3s4, type) {
     var actual = _this__u8e3s4.n3p('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();
@@ -7974,16 +8056,16 @@
     var tmp_5 = $this;
     var tmp6_safe_receiver = parser.d3d('background-color');
     var tmp7_elvis_lhs = tmp6_safe_receiver == null ? null : toColorOrNull(tmp6_safe_receiver);
-    tmp_5.v3x_1 = tmp7_elvis_lhs == null ? Companion_getInstance_48().n3m_1 : tmp7_elvis_lhs;
+    tmp_5.v3x_1 = tmp7_elvis_lhs == null ? Companion_getInstance_49().n3m_1 : tmp7_elvis_lhs;
     $this.w3x_1 = parser.d3d('background-image');
     var tmp_6 = $this;
     var tmp8_safe_receiver = parser.d3d('background-image-align');
     var tmp9_elvis_lhs = tmp8_safe_receiver == null ? null : Companion_getInstance_22().k3g(tmp8_safe_receiver);
-    tmp_6.x3x_1 = tmp9_elvis_lhs == null ? Companion_getInstance_48().o3m_1 : tmp9_elvis_lhs;
+    tmp_6.x3x_1 = tmp9_elvis_lhs == null ? Companion_getInstance_49().o3m_1 : tmp9_elvis_lhs;
     var tmp_7 = $this;
     var tmp10_safe_receiver = parser.d3d('background-image-scale-type');
     var tmp11_elvis_lhs = tmp10_safe_receiver == null ? null : Companion_instance_22.v3k(tmp10_safe_receiver);
-    tmp_7.y3x_1 = tmp11_elvis_lhs == null ? Companion_getInstance_48().p3m_1 : tmp11_elvis_lhs;
+    tmp_7.y3x_1 = tmp11_elvis_lhs == null ? Companion_getInstance_49().p3m_1 : tmp11_elvis_lhs;
     var tmp_8 = $this;
     var tmp12_safe_receiver = parser.d3d('control-color');
     tmp_8.z3x_1 = tmp12_safe_receiver == null ? null : toColorOrNull(tmp12_safe_receiver);
@@ -8011,10 +8093,10 @@
     fileName = fileName === VOID ? null : fileName;
     parentPage = parentPage === VOID ? null : parentPage;
     primaryColor = primaryColor === VOID ? null : primaryColor;
-    backgroundColor = backgroundColor === VOID ? Companion_getInstance_48().n3m_1 : backgroundColor;
+    backgroundColor = backgroundColor === VOID ? Companion_getInstance_49().n3m_1 : backgroundColor;
     backgroundImage = backgroundImage === VOID ? null : backgroundImage;
-    backgroundImageGravity = backgroundImageGravity === VOID ? Companion_getInstance_48().o3m_1 : backgroundImageGravity;
-    backgroundImageScaleType = backgroundImageScaleType === VOID ? Companion_getInstance_48().p3m_1 : backgroundImageScaleType;
+    backgroundImageGravity = backgroundImageGravity === VOID ? Companion_getInstance_49().o3m_1 : backgroundImageGravity;
+    backgroundImageScaleType = backgroundImageScaleType === VOID ? Companion_getInstance_49().p3m_1 : backgroundImageScaleType;
     controlColor = controlColor === VOID ? null : controlColor;
     cardBackgroundColor = cardBackgroundColor === VOID ? null : cardBackgroundColor;
     multiselectOptionBackgroundColor = multiselectOptionBackgroundColor === VOID ? null : multiselectOptionBackgroundColor;
@@ -8250,7 +8332,7 @@
     return copyToArray(this_0);
   };
   function Page() {
-    Companion_getInstance_48();
+    Companion_getInstance_49();
     var tmp = this;
     tmp.o3x_1 = lazy(Page$id$delegate$lambda(this));
     var tmp_0 = this;
@@ -8268,11 +8350,11 @@
   }
   function $parseCOROUTINE$2(_this__u8e3s4, container, fileName, parser, parseFile, resultContinuation) {
     CoroutineImpl.call(this, resultContinuation);
-    this.q41_1 = _this__u8e3s4;
-    this.r41_1 = container;
-    this.s41_1 = fileName;
-    this.t41_1 = parser;
-    this.u41_1 = parseFile;
+    this.v41_1 = _this__u8e3s4;
+    this.w41_1 = container;
+    this.x41_1 = fileName;
+    this.y41_1 = parser;
+    this.z41_1 = parseFile;
   }
   protoOf($parseCOROUTINE$2).d9 = function () {
     var suspendResult = this.x8_1;
@@ -8283,20 +8365,20 @@
           case 0:
             this.w8_1 = 2;
             var tmp_0 = this;
-            tmp_0.v41_1 = PageCollectionPage_init_$Create$(this.r41_1, this.s41_1, this.t41_1);
-            this.w41_1 = this.v41_1;
+            tmp_0.a42_1 = PageCollectionPage_init_$Create$(this.w41_1, this.x41_1, this.y41_1);
+            this.b42_1 = this.a42_1;
             var tmp_1 = this;
-            tmp_1.x41_1 = this.w41_1;
-            this.y41_1 = this.x41_1;
+            tmp_1.c42_1 = this.b42_1;
+            this.d42_1 = this.c42_1;
             this.v8_1 = 1;
-            suspendResult = buildPagesFromParsedPages(this.y41_1, this.u41_1, this);
+            suspendResult = buildPagesFromParsedPages(this.d42_1, this.z41_1, this);
             if (suspendResult === get_COROUTINE_SUSPENDED()) {
               return suspendResult;
             }
 
             continue $sm;
           case 1:
-            return this.w41_1;
+            return this.b42_1;
           case 2:
             throw this.y8_1;
         }
@@ -8312,10 +8394,10 @@
      while (true);
   };
   function PageCollectionPage$buildPagesFromParsedPages$slambda$slambda($it, this$0, $parseFile, $pageIndex$delegate, resultContinuation) {
-    this.h42_1 = $it;
-    this.i42_1 = this$0;
-    this.j42_1 = $parseFile;
-    this.k42_1 = $pageIndex$delegate;
+    this.m42_1 = $it;
+    this.n42_1 = this$0;
+    this.o42_1 = $parseFile;
+    this.p42_1 = $pageIndex$delegate;
     CoroutineImpl.call(this, resultContinuation);
   }
   protoOf(PageCollectionPage$buildPagesFromParsedPages$slambda$slambda).k3m = function ($this$async, $completion) {
@@ -8336,12 +8418,12 @@
           case 0:
             this.w8_1 = 3;
             var tmp_0 = this;
-            var tmp0_safe_receiver = this.h42_1.r42_1;
+            var tmp0_safe_receiver = this.m42_1.w42_1;
             var tmp_1;
             if (tmp0_safe_receiver == null) {
               tmp_1 = null;
             } else {
-              tmp_1 = buildPagesFromParsedPages$lambda(this.k42_1).f2(tmp0_safe_receiver);
+              tmp_1 = buildPagesFromParsedPages$lambda(this.p42_1).f2(tmp0_safe_receiver);
             }
 
             var tmp1_elvis_lhs = tmp_1;
@@ -8352,20 +8434,20 @@
               tmp_2 = tmp1_elvis_lhs;
             }
 
-            tmp_0.m42_1 = tmp_2;
-            this.n42_1 = Companion_getInstance_48();
-            this.o42_1 = this.h42_1.r42_1;
+            tmp_0.r42_1 = tmp_2;
+            this.s42_1 = Companion_getInstance_49();
+            this.t42_1 = this.m42_1.w42_1;
             this.v8_1 = 1;
-            suspendResult = this.j42_1(this.m42_1, this);
+            suspendResult = this.o42_1(this.r42_1, this);
             if (suspendResult === get_COROUTINE_SUSPENDED()) {
               return suspendResult;
             }
 
             continue $sm;
           case 1:
-            this.p42_1 = suspendResult;
+            this.u42_1 = suspendResult;
             this.v8_1 = 2;
-            suspendResult = this.n42_1.q3m(this.i42_1, this.o42_1, this.p42_1, this.j42_1, this);
+            suspendResult = this.s42_1.q3m(this.n42_1, this.t42_1, this.u42_1, this.o42_1, this);
             if (suspendResult === get_COROUTINE_SUSPENDED()) {
               return suspendResult;
             }
@@ -8388,8 +8470,8 @@
      while (true);
   };
   protoOf(PageCollectionPage$buildPagesFromParsedPages$slambda$slambda).b19 = function ($this$async, completion) {
-    var i = new PageCollectionPage$buildPagesFromParsedPages$slambda$slambda(this.h42_1, this.i42_1, this.j42_1, this.k42_1, completion);
-    i.l42_1 = $this$async;
+    var i = new PageCollectionPage$buildPagesFromParsedPages$slambda$slambda(this.m42_1, this.n42_1, this.o42_1, this.p42_1, completion);
+    i.q42_1 = $this$async;
     return i;
   };
   function PageCollectionPage$buildPagesFromParsedPages$slambda$slambda_0($it, this$0, $parseFile, $pageIndex$delegate, resultContinuation) {
@@ -8400,43 +8482,43 @@
     l.$arity = 1;
     return l;
   }
-  function Companion_46() {
-    this.d41_1 = 'page-collection';
-    this.e41_1 = 'pages';
-    this.f41_1 = 'import';
-    this.g41_1 = 'filename';
+  function Companion_47() {
+    this.i41_1 = 'page-collection';
+    this.j41_1 = 'pages';
+    this.k41_1 = 'import';
+    this.l41_1 = 'filename';
     this.PARENT_PARAM_ACTIVE_PAGE = 'active-page';
   }
-  protoOf(Companion_46).s42 = function () {
-    return this.d41_1;
+  protoOf(Companion_47).x42 = function () {
+    return this.i41_1;
   };
-  protoOf(Companion_46).t42 = function () {
+  protoOf(Companion_47).y42 = function () {
     return this.PARENT_PARAM_ACTIVE_PAGE;
   };
-  protoOf(Companion_46).h41 = function (container, fileName, parser, parseFile, $completion) {
+  protoOf(Companion_47).m41 = 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.o43_1.m3p($this, pages$factory_1(), _set____db54di);
+    return $this.t43_1.m3p($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.o3b(2, 'https://mobile-content-api.cru.org/xmlns/page', 'page');
-    Companion_getInstance_48().v3y(parser, 'page-collection');
+    Companion_getInstance_49().a3z(parser, 'page-collection');
     var tmp = $this;
     // Inline function 'kotlin.collections.mutableListOf' call
-    tmp.m43_1 = ArrayList_init_$Create$();
+    tmp.r43_1 = ArrayList_init_$Create$();
     var tmp_0 = $this;
     // Inline function 'kotlin.collections.mutableListOf' call
-    tmp_0.n43_1 = ArrayList_init_$Create$();
+    tmp_0.s43_1 = ArrayList_init_$Create$();
     // Inline function 'org.cru.godtools.shared.tool.parser.xml.parseChildren' call
     $l$loop_0: while (!(parser.l() === 3)) {
       if (!(parser.p3b() === 2))
@@ -8444,14 +8526,14 @@
       var tmp0_subject = parser.q3b();
       if (tmp0_subject === 'https://mobile-content-api.cru.org/xmlns/analytics') {
         if (parser.l2() === 'events') {
-          var tmp0 = $this.m43_1;
+          var tmp0 = $this.r43_1;
           // Inline function 'kotlin.collections.plusAssign' call
           var elements = Companion_instance_4.s3b(parser, $this);
           addAll(tmp0, elements);
         }
       } else if (tmp0_subject === 'https://mobile-content-api.cru.org/xmlns/page') {
         if (parser.l2() === 'pages') {
-          var tmp2 = $this.n43_1;
+          var tmp2 = $this.s43_1;
           // Inline function 'kotlin.collections.plusAssign' call
           var elements_0 = parsePages_0($this, parser);
           addAll(tmp2, elements_0);
@@ -8479,7 +8561,7 @@
       if (_this__u8e3s4.q3b() === '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().c41($this, null, _this__u8e3s4);
+          var tmp2_safe_receiver = Companion_getInstance_49().h41($this, null, _this__u8e3s4);
           if (tmp2_safe_receiver == null)
             null;
           else {
@@ -8505,8 +8587,8 @@
   function PageOrImport(page, ref) {
     page = page === VOID ? null : page;
     ref = ref === VOID ? null : ref;
-    this.q42_1 = page;
-    this.r42_1 = ref;
+    this.v42_1 = page;
+    this.w42_1 = ref;
   }
   function buildPagesFromParsedPages$lambda($pageIndex$delegate) {
     // Inline function 'kotlin.getValue' call
@@ -8533,19 +8615,19 @@
     };
   }
   function PageCollectionPage$buildPagesFromParsedPages$slambda(this$0, $parseFile, $pageIndex$delegate, resultContinuation) {
-    this.i44_1 = this$0;
-    this.j44_1 = $parseFile;
-    this.k44_1 = $pageIndex$delegate;
+    this.n44_1 = this$0;
+    this.o44_1 = $parseFile;
+    this.p44_1 = $pageIndex$delegate;
     CoroutineImpl.call(this, resultContinuation);
   }
-  protoOf(PageCollectionPage$buildPagesFromParsedPages$slambda).m44 = function ($this$coroutineScope, $completion) {
+  protoOf(PageCollectionPage$buildPagesFromParsedPages$slambda).r44 = 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.m44((!(p1 == null) ? isInterface(p1, CoroutineScope) : false) ? p1 : THROW_CCE(), $completion);
+    return this.r44((!(p1 == null) ? isInterface(p1, CoroutineScope) : false) ? p1 : THROW_CCE(), $completion);
   };
   protoOf(PageCollectionPage$buildPagesFromParsedPages$slambda).d9 = function () {
     var suspendResult = this.x8_1;
@@ -8556,12 +8638,12 @@
           case 0:
             this.w8_1 = 2;
             this.v8_1 = 1;
-            var this_0 = this.i44_1.n43_1;
+            var this_0 = this.n44_1.s43_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.q42_1;
+              var tmp0_safe_receiver = item.v42_1;
               var tmp_0;
               if (tmp0_safe_receiver == null) {
                 tmp_0 = null;
@@ -8571,7 +8653,7 @@
               var tmp1_elvis_lhs = tmp_0;
               var tmp_1;
               if (tmp1_elvis_lhs == null) {
-                tmp_1 = async(this.l44_1, VOID, VOID, PageCollectionPage$buildPagesFromParsedPages$slambda$slambda_0(item, this.i44_1, this.j44_1, this.k44_1, null));
+                tmp_1 = async(this.q44_1, VOID, VOID, PageCollectionPage$buildPagesFromParsedPages$slambda$slambda_0(item, this.n44_1, this.o44_1, this.p44_1, null));
               } else {
                 tmp_1 = tmp1_elvis_lhs;
               }
@@ -8602,22 +8684,22 @@
      while (true);
   };
   protoOf(PageCollectionPage$buildPagesFromParsedPages$slambda).b19 = function ($this$coroutineScope, completion) {
-    var i = new PageCollectionPage$buildPagesFromParsedPages$slambda(this.i44_1, this.j44_1, this.k44_1, completion);
-    i.l44_1 = $this$coroutineScope;
+    var i = new PageCollectionPage$buildPagesFromParsedPages$slambda(this.n44_1, this.o44_1, this.p44_1, completion);
+    i.q44_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.m44($this$coroutineScope, $completion);
+      return i.r44($this$coroutineScope, $completion);
     };
     l.$arity = 1;
     return l;
   }
   function $buildPagesFromParsedPagesCOROUTINE$3(_this__u8e3s4, parseFile, resultContinuation) {
     CoroutineImpl.call(this, resultContinuation);
-    this.x43_1 = _this__u8e3s4;
-    this.y43_1 = parseFile;
+    this.c44_1 = _this__u8e3s4;
+    this.d44_1 = parseFile;
   }
   protoOf($buildPagesFromParsedPagesCOROUTINE$3).d9 = function () {
     var suspendResult = this.x8_1;
@@ -8628,9 +8710,9 @@
           case 0:
             this.w8_1 = 2;
             var tmp_0 = this;
-            tmp_0.z43_1 = lazy(PageCollectionPage$buildPagesFromParsedPages$lambda(this.x43_1));
+            tmp_0.e44_1 = lazy(PageCollectionPage$buildPagesFromParsedPages$lambda(this.c44_1));
             this.v8_1 = 1;
-            suspendResult = coroutineScope(PageCollectionPage$buildPagesFromParsedPages$slambda_0(this.x43_1, this.y43_1, this.z43_1, null), this);
+            suspendResult = coroutineScope(PageCollectionPage$buildPagesFromParsedPages$slambda_0(this.c44_1, this.d44_1, this.e44_1, null), this);
             if (suspendResult === get_COROUTINE_SUSPENDED()) {
               return suspendResult;
             }
@@ -8638,7 +8720,7 @@
             continue $sm;
           case 1:
             var ARGUMENT = suspendResult;
-            _set_pages__j2nojl_0(this.x43_1, ARGUMENT);
+            _set_pages__j2nojl_0(this.c44_1, ARGUMENT);
             return Unit_instance;
           case 2:
             throw this.y8_1;
@@ -8655,16 +8737,16 @@
      while (true);
   };
   protoOf(PageCollectionPage).v3g = function () {
-    return this.m43_1;
+    return this.r43_1;
   };
   protoOf(PageCollectionPage).g3k = function () {
-    return this.o43_1.b3r(this, pages$factory_2());
+    return this.t43_1.b3r(this, pages$factory_2());
   };
   protoOf(PageCollectionPage).h3k = function (type) {
     return type.equals(getKClass(ContentPage));
   };
   function PageCollectionPage() {
-    this.o43_1 = setOnce();
+    this.t43_1 = setOnce();
   }
   function pages$factory_1() {
     return getPropertyCallableRef('pages', 1, KMutableProperty1, function (receiver) {
@@ -8680,10 +8762,10 @@
       return _set_pages__j2nojl_0(receiver, value);
     });
   }
-  function Companion_47() {
+  function Companion_48() {
     this.o3p_1 = 'items';
   }
-  protoOf(Companion_47).p3p = function (_this__u8e3s4, manifest) {
+  protoOf(Companion_48).p3p = function (_this__u8e3s4, manifest) {
     // Inline function 'kotlin.collections.buildList' call
     // Inline function 'kotlin.collections.buildListInternal' call
     // Inline function 'kotlin.apply' call
@@ -8694,7 +8776,7 @@
       if (!(_this__u8e3s4.p3b() === 2))
         continue $l$loop_0;
       if (_this__u8e3s4.q3b() === 'https://mobile-content-api.cru.org/xmlns/shareable') {
-        var tmp1_safe_receiver = Companion_instance_48.n44(manifest, _this__u8e3s4);
+        var tmp1_safe_receiver = Companion_instance_49.s44(manifest, _this__u8e3s4);
         if (tmp1_safe_receiver == null)
           null;
         else {
@@ -8708,8 +8790,8 @@
     }
     return this_0.k3();
   };
-  protoOf(Companion_47).n44 = function (manifest, parser) {
-    parser.o44(2, 'https://mobile-content-api.cru.org/xmlns/shareable');
+  protoOf(Companion_48).s44 = function (manifest, parser) {
+    parser.t44(2, 'https://mobile-content-api.cru.org/xmlns/shareable');
     var tmp;
     if (parser.q3b() === 'https://mobile-content-api.cru.org/xmlns/shareable') {
       tmp = parser.l2() === 'image' ? ShareableImage_init_$Create$(manifest, parser) : null;
@@ -8718,14 +8800,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.o44(2, 'https://mobile-content-api.cru.org/xmlns/shareable');
+    parser.t44(2, 'https://mobile-content-api.cru.org/xmlns/shareable');
     $this.u3p_1 = parser.d3d('id');
     var tmp = $this;
     var tmp0_safe_receiver = parser.d3d('order');
@@ -8738,18 +8820,18 @@
   };
   function Shareable() {
   }
-  function Companion_48() {
-    this.p44_1 = 'image';
+  function Companion_49() {
+    this.u44_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.o3b(2, 'https://mobile-content-api.cru.org/xmlns/shareable', 'image');
-    $this.t44_1 = parser.d3d('resource');
+    $this.y44_1 = parser.d3d('resource');
     var description = null;
     // Inline function 'org.cru.godtools.shared.tool.parser.xml.parseChildren' call
     $l$loop_0: while (!(parser.l() === 3)) {
@@ -8763,7 +8845,7 @@
         continue $l$loop_0;
       skipTag(parser);
     }
-    $this.u44_1 = description;
+    $this.z44_1 = description;
     return $this;
   }
   function ShareableImage_init_$Create$(manifest, parser) {
@@ -8771,16 +8853,16 @@
   }
   protoOf(ShareableImage).i3c = function () {
     var tmp0_elvis_lhs = protoOf(Shareable).i3c.call(this);
-    return tmp0_elvis_lhs == null ? this.t44_1 : tmp0_elvis_lhs;
+    return tmp0_elvis_lhs == null ? this.y44_1 : tmp0_elvis_lhs;
   };
   function ShareableImage() {
   }
-  function Companion_49() {
-    this.v44_1 = 'tip';
+  function Companion_50() {
+    this.a45_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);
@@ -8806,7 +8888,7 @@
   protoOf(InlineTip).i3c = function () {
     return this.id;
   };
-  protoOf(InlineTip).c45 = function () {
+  protoOf(InlineTip).h45 = function () {
     return this.s38().k3r(this.id);
   };
   protoOf(InlineTip).u3c = function () {
@@ -8819,11 +8901,11 @@
   var Type_TIP_instance;
   var Type_PREPARE_instance;
   var Type_QUOTE_instance;
-  function Companion_50() {
-    Companion_instance_51 = this;
-    this.d45_1 = Type_TIP_getInstance();
+  function Companion_51() {
+    Companion_instance_52 = this;
+    this.i45_1 = Type_TIP_getInstance();
   }
-  protoOf(Companion_50).x3k = function (_this__u8e3s4) {
+  protoOf(Companion_51).x3k = function (_this__u8e3s4) {
     switch (_this__u8e3s4) {
       case 'tip':
         return Type_TIP_getInstance();
@@ -8839,12 +8921,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() {
@@ -8856,7 +8938,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);
@@ -8865,8 +8947,8 @@
     $this.g3o_1 = id;
     var tmp = $this;
     var tmp0_safe_receiver = parser.d3d('type');
-    var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : Companion_getInstance_53().x3k(tmp0_safe_receiver);
-    tmp.h3o_1 = tmp1_elvis_lhs == null ? Companion_getInstance_53().d45_1 : tmp1_elvis_lhs;
+    var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : Companion_getInstance_54().x3k(tmp0_safe_receiver);
+    tmp.h3o_1 = tmp1_elvis_lhs == null ? Companion_getInstance_54().i45_1 : tmp1_elvis_lhs;
     var tmp_0 = $this;
     // Inline function 'kotlin.collections.buildList' call
     // Inline function 'kotlin.collections.buildListInternal' call
@@ -8894,7 +8976,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().d45_1 : type;
+    type = type === VOID ? Companion_getInstance_54().i45_1 : type;
     BaseModel.call($this, manifest);
     Tip.call($this);
     $this.g3o_1 = id;
@@ -8960,19 +9042,19 @@
   };
   function Tip() {
   }
-  function Companion_51() {
-    this.e45_1 = 'page';
+  function Companion_52() {
+    this.j45_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.o3b(2, 'https://mobile-content-api.cru.org/xmlns/training', 'page');
-    $this.g45_1 = tip;
-    $this.h45_1 = position;
+    $this.l45_1 = tip;
+    $this.m45_1 = position;
     var tmp = $this;
     // Inline function 'org.cru.godtools.shared.tool.parser.model.parseContent' call
     // Inline function 'kotlin.collections.buildList' call
@@ -9014,31 +9096,31 @@
         continue $l$loop_0;
       skipTag(parser);
     }
-    tmp.i45_1 = this_0.k3();
+    tmp.n45_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).k3c = function () {
-    return this.i45_1;
+    return this.n45_1;
   };
   function TipPage() {
   }
-  function Companion_52() {
-    this.j45_1 = 'call-to-action';
+  function Companion_53() {
+    this.o45_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.l45_1 = parent;
+    $this.q45_1 = parent;
     $this.label = null;
-    $this.m45_1 = null;
-    $this.n45_1 = null;
+    $this.r45_1 = null;
+    $this.s45_1 = null;
     return $this;
   }
   function CallToAction_init_$Create$(parent) {
@@ -9048,11 +9130,11 @@
     BaseModel.call($this, page);
     CallToAction.call($this);
     parser.o3b(2, 'https://mobile-content-api.cru.org/xmlns/tract', 'call-to-action');
-    $this.l45_1 = page;
+    $this.q45_1 = page;
     var tmp = $this;
     var tmp0_safe_receiver = parser.d3d('control-color');
-    tmp.m45_1 = tmp0_safe_receiver == null ? null : toColorOrNull(tmp0_safe_receiver);
-    $this.n45_1 = parser.n3p('https://mobile-content-api.cru.org/xmlns/training', 'tip');
+    tmp.r45_1 = tmp0_safe_receiver == null ? null : toColorOrNull(tmp0_safe_receiver);
+    $this.s45_1 = parser.n3p('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;
   }
@@ -9066,11 +9148,11 @@
     tip = tip === VOID ? null : tip;
     BaseModel.call($this, page);
     CallToAction.call($this);
-    $this.l45_1 = page;
+    $this.q45_1 = page;
     var tmp = $this;
     tmp.label = label == null ? null : label($this);
-    $this.m45_1 = controlColor;
-    $this.n45_1 = tip;
+    $this.r45_1 = controlColor;
+    $this.s45_1 = tip;
     return $this;
   }
   function createTestCallToAction(page, label, controlColor, tip) {
@@ -9079,33 +9161,33 @@
   protoOf(CallToAction).i3l = function () {
     return this.label;
   };
-  protoOf(CallToAction).o45 = function () {
-    var tmp0_elvis_lhs = this.m45_1;
+  protoOf(CallToAction).t45 = function () {
+    var tmp0_elvis_lhs = this.r45_1;
     return tmp0_elvis_lhs == null ? get_primaryColor_0(get_stylesParent(this)) : tmp0_elvis_lhs;
   };
-  protoOf(CallToAction).p45 = function () {
-    return this.n45_1;
+  protoOf(CallToAction).u45 = function () {
+    return this.s45_1;
   };
-  protoOf(CallToAction).c45 = function () {
-    return this.s38().k3r(this.n45_1);
+  protoOf(CallToAction).h45 = function () {
+    return this.s38().k3r(this.s45_1);
   };
   function CallToAction() {
   }
-  function Companion_53() {
-    this.q45_1 = 'header';
+  function Companion_54() {
+    this.v45_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.o3b(2, 'https://mobile-content-api.cru.org/xmlns/tract', 'header');
     var tmp = $this;
     var tmp0_safe_receiver = parser.d3d('background-color');
-    tmp.s45_1 = tmp0_safe_receiver == null ? null : toColorOrNull(tmp0_safe_receiver);
-    $this.t45_1 = parser.n3p('https://mobile-content-api.cru.org/xmlns/training', 'tip');
+    tmp.x45_1 = tmp0_safe_receiver == null ? null : toColorOrNull(tmp0_safe_receiver);
+    $this.y45_1 = parser.n3p('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
@@ -9127,39 +9209,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).i3q = function () {
-    var tmp0_elvis_lhs = this.s45_1;
+  protoOf(Header_0).i3q = function () {
+    var tmp0_elvis_lhs = this.x45_1;
     return tmp0_elvis_lhs == null ? this.q3h() : tmp0_elvis_lhs;
   };
-  protoOf(Header).o3h = function () {
+  protoOf(Header_0).o3h = function () {
     return this.r3h();
   };
-  protoOf(Header).ji = function () {
+  protoOf(Header_0).ji = function () {
     return this.number;
   };
-  protoOf(Header).n3q = function () {
+  protoOf(Header_0).n3q = function () {
     return this.title;
   };
-  protoOf(Header).p45 = function () {
-    return this.t45_1;
+  protoOf(Header_0).u45 = function () {
+    return this.y45_1;
   };
-  protoOf(Header).c45 = function () {
-    return this.s38().k3r(this.t45_1);
+  protoOf(Header_0).h45 = function () {
+    return this.s38().k3r(this.y45_1);
   };
-  function Header() {
+  function Header_0() {
   }
-  function Companion_54() {
-    this.u45_1 = 'hero';
+  function Companion_55() {
+    this.z45_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.w45_1;
+    var tmp0 = $this.b46_1;
     // Inline function 'kotlin.getValue' call
     headingParent$factory();
     return tmp0.c2();
@@ -9170,7 +9252,7 @@
     parser.o3b(2, 'https://mobile-content-api.cru.org/xmlns/tract', 'hero');
     var tmp = $this;
     // Inline function 'kotlin.collections.mutableListOf' call
-    tmp.y45_1 = ArrayList_init_$Create$();
+    tmp.d46_1 = ArrayList_init_$Create$();
     var heading = null;
     var tmp_0 = $this;
     // Inline function 'org.cru.godtools.shared.tool.parser.model.parseContent' call
@@ -9187,7 +9269,7 @@
         var tmp0_subject = parser.q3b();
         if (tmp0_subject === 'https://mobile-content-api.cru.org/xmlns/analytics') {
           if (parser.l2() === 'events') {
-            var tmp0 = $this.y45_1;
+            var tmp0 = $this.d46_1;
             // Inline function 'kotlin.collections.plusAssign' call
             var elements = Companion_instance_4.s3b(parser, $this);
             addAll(tmp0, elements);
@@ -9225,7 +9307,7 @@
         continue $l$loop_0;
       skipTag(parser);
     }
-    tmp_0.x45_1 = this_0.k3();
+    tmp_0.c46_1 = this_0.k3();
     $this.heading = heading;
     return $this;
   }
@@ -9238,10 +9320,10 @@
     heading = heading === VOID ? null : heading;
     BaseModel.call($this, page);
     Hero.call($this);
-    $this.y45_1 = analyticsEvents;
+    $this.d46_1 = analyticsEvents;
     var tmp = $this;
     tmp.heading = heading == null ? null : heading(_get_headingParent__2ts5bv($this));
-    $this.x45_1 = emptyList();
+    $this.c46_1 = emptyList();
     return $this;
   }
   function createTestHero(page, analyticsEvents, heading) {
@@ -9257,14 +9339,14 @@
       return stylesOverride(this$0, VOID, Hero$headingParent$delegate$lambda$lambda(this$0));
     };
   }
-  protoOf(Hero).z45 = function () {
+  protoOf(Hero).e46 = function () {
     return this.heading;
   };
   protoOf(Hero).k3c = function () {
-    return this.x45_1;
+    return this.c46_1;
   };
   protoOf(Hero).v3g = function () {
-    return this.y45_1;
+    return this.d46_1;
   };
   protoOf(Hero).l3c = function (type) {
     var tmp;
@@ -9272,7 +9354,7 @@
       case 0:
         // Inline function 'kotlin.collections.filter' call
 
-        var tmp0 = this.y45_1;
+        var tmp0 = this.d46_1;
         // Inline function 'kotlin.collections.filterTo' call
 
         var destination = ArrayList_init_$Create$();
@@ -9289,7 +9371,7 @@
       case 1:
         // Inline function 'kotlin.collections.filter' call
 
-        var tmp0_0 = this.y45_1;
+        var tmp0_0 = this.d46_1;
         // Inline function 'kotlin.collections.filterTo' call
 
         var destination_0 = ArrayList_init_$Create$();
@@ -9314,19 +9396,19 @@
   };
   function Hero() {
     var tmp = this;
-    tmp.w45_1 = lazy(Hero$headingParent$delegate$lambda(this));
+    tmp.b46_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.a46_1 = 'modal';
+  function Companion_56() {
+    this.f46_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);
@@ -9384,14 +9466,14 @@
         continue $l$loop_0;
       skipTag(parser);
     }
-    tmp.w46_1 = this_0.k3();
+    tmp.b47_1 = this_0.k3();
     $this.title = title;
     return $this;
   }
   function Modal_init_$Create$(parent, parser) {
     return Modal_init_$Init$(parent, parser, objectCreate(protoOf(Modal)));
   }
-  protoOf(Modal).p3z = function () {
+  protoOf(Modal).u3z = function () {
     return this.page;
   };
   protoOf(Modal).i3c = function () {
@@ -9401,7 +9483,7 @@
     return this.title;
   };
   protoOf(Modal).k3c = function () {
-    return this.w46_1;
+    return this.b47_1;
   };
   protoOf(Modal).q3u = function () {
     return this._listeners;
@@ -9439,22 +9521,22 @@
   };
   function Modal() {
   }
-  function Companion_56() {
-    Companion_instance_57 = this;
-    this.x46_1 = 'card';
-    this.y46_1 = 'label';
-    this.z46_1 = 'hidden';
-    this.a47_1 = ImageScaleType_FILL_X_getInstance();
-    this.b47_1 = Companion_getInstance_22().CENTER;
+  function Companion_57() {
+    Companion_instance_58 = this;
+    this.c47_1 = 'card';
+    this.d47_1 = 'label';
+    this.e47_1 = 'hidden';
+    this.f47_1 = ImageScaleType_FILL_X_getInstance();
+    this.g47_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.i47_1;
+    var tmp0 = $this.n47_1;
     // Inline function 'kotlin.getValue' call
     labelParent$factory();
     return tmp0.c2();
@@ -9473,22 +9555,22 @@
     $this._dismissListeners = toSet_0(toEventIds(parser.d3d('dismiss-listeners')));
     var tmp_0 = $this;
     var tmp2_safe_receiver = parser.d3d('background-color');
-    tmp_0.d47_1 = tmp2_safe_receiver == null ? null : toColorOrNull(tmp2_safe_receiver);
-    $this.e47_1 = parser.d3d('background-image');
+    tmp_0.i47_1 = tmp2_safe_receiver == null ? null : toColorOrNull(tmp2_safe_receiver);
+    $this.j47_1 = parser.d3d('background-image');
     var tmp_1 = $this;
     var tmp3_safe_receiver = parser.d3d('background-image-align');
     var tmp4_elvis_lhs = tmp3_safe_receiver == null ? null : Companion_getInstance_22().k3g(tmp3_safe_receiver);
-    tmp_1.f47_1 = tmp4_elvis_lhs == null ? Companion_getInstance_59().b47_1 : tmp4_elvis_lhs;
+    tmp_1.k47_1 = tmp4_elvis_lhs == null ? Companion_getInstance_60().g47_1 : tmp4_elvis_lhs;
     var tmp_2 = $this;
     var tmp5_safe_receiver = parser.d3d('background-image-scale-type');
     var tmp6_elvis_lhs = tmp5_safe_receiver == null ? null : Companion_instance_22.v3k(tmp5_safe_receiver);
-    tmp_2.g47_1 = tmp6_elvis_lhs == null ? Companion_getInstance_59().a47_1 : tmp6_elvis_lhs;
+    tmp_2.l47_1 = tmp6_elvis_lhs == null ? Companion_getInstance_60().f47_1 : tmp6_elvis_lhs;
     var tmp_3 = $this;
     var tmp7_safe_receiver = parser.d3d('text-color');
-    tmp_3.h47_1 = tmp7_safe_receiver == null ? null : toColorOrNull(tmp7_safe_receiver);
+    tmp_3.m47_1 = tmp7_safe_receiver == null ? null : toColorOrNull(tmp7_safe_receiver);
     var tmp_4 = $this;
     // Inline function 'kotlin.collections.mutableListOf' call
-    tmp_4.k47_1 = ArrayList_init_$Create$();
+    tmp_4.p47_1 = ArrayList_init_$Create$();
     var label = null;
     var tmp_5 = $this;
     // Inline function 'org.cru.godtools.shared.tool.parser.model.parseContent' call
@@ -9505,7 +9587,7 @@
         var tmp0_subject = parser.q3b();
         if (tmp0_subject === 'https://mobile-content-api.cru.org/xmlns/analytics') {
           if (parser.l2() === 'events') {
-            var tmp0 = $this.k47_1;
+            var tmp0 = $this.p47_1;
             // Inline function 'kotlin.collections.plusAssign' call
             var elements = Companion_instance_4.s3b(parser, $this);
             addAll(tmp0, elements);
@@ -9543,7 +9625,7 @@
         continue $l$loop_0;
       skipTag(parser);
     }
-    tmp_5.j47_1 = this_0.k3();
+    tmp_5.o47_1 = this_0.k3();
     $this.label = label;
     return $this;
   }
@@ -9555,8 +9637,8 @@
     position = position === VOID ? 0 : position;
     backgroundColor = backgroundColor === VOID ? null : backgroundColor;
     backgroundImage = backgroundImage === VOID ? null : backgroundImage;
-    backgroundImageGravity = backgroundImageGravity === VOID ? Companion_getInstance_59().b47_1 : backgroundImageGravity;
-    backgroundImageScaleType = backgroundImageScaleType === VOID ? Companion_getInstance_59().a47_1 : backgroundImageScaleType;
+    backgroundImageGravity = backgroundImageGravity === VOID ? Companion_getInstance_60().g47_1 : backgroundImageGravity;
+    backgroundImageScaleType = backgroundImageScaleType === VOID ? Companion_getInstance_60().f47_1 : backgroundImageScaleType;
     isHidden = isHidden === VOID ? false : isHidden;
     analyticsEvents = analyticsEvents === VOID ? emptyList() : analyticsEvents;
     label = label === VOID ? null : label;
@@ -9568,18 +9650,18 @@
     $this.isHidden = isHidden;
     $this._listeners = emptySet();
     $this._dismissListeners = emptySet();
-    $this.k47_1 = analyticsEvents;
-    $this.d47_1 = backgroundColor;
-    $this.e47_1 = backgroundImage;
-    $this.f47_1 = backgroundImageGravity;
-    $this.g47_1 = backgroundImageScaleType;
-    $this.h47_1 = null;
+    $this.p47_1 = analyticsEvents;
+    $this.i47_1 = backgroundColor;
+    $this.j47_1 = backgroundImage;
+    $this.k47_1 = backgroundImageGravity;
+    $this.l47_1 = backgroundImageScaleType;
+    $this.m47_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.j47_1 = tmp0_elvis_lhs == null ? emptyList() : tmp0_elvis_lhs;
+    tmp_0.o47_1 = tmp0_elvis_lhs == null ? emptyList() : tmp0_elvis_lhs;
     return $this;
   }
   function createTestCard(page, position, backgroundColor, backgroundImage, backgroundImageGravity, backgroundImageScaleType, isHidden, analyticsEvents, label, content) {
@@ -9601,7 +9683,7 @@
     parser.o3b(2, 'https://mobile-content-api.cru.org/xmlns/tract', 'page');
     var tmp = $this;
     var tmp0_safe_receiver = parser.d3d('card-text-color');
-    tmp.u46_1 = tmp0_safe_receiver == null ? null : toColorOrNull(tmp0_safe_receiver);
+    tmp.z46_1 = tmp0_safe_receiver == null ? null : toColorOrNull(tmp0_safe_receiver);
     var header = null;
     var hero = null;
     var tmp_0 = $this;
@@ -9618,7 +9700,7 @@
       if (parser.q3b() === '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);
@@ -9659,11 +9741,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().n3m_1 : backgroundColor;
+    backgroundColor = backgroundColor === VOID ? Companion_getInstance_49().n3m_1 : backgroundColor;
     backgroundImage = backgroundImage === VOID ? null : backgroundImage;
     primaryColor = primaryColor === VOID ? null : primaryColor;
-    backgroundImageGravity = backgroundImageGravity === VOID ? Companion_getInstance_48().o3m_1 : backgroundImageGravity;
-    backgroundImageScaleType = backgroundImageScaleType === VOID ? Companion_getInstance_48().p3m_1 : backgroundImageScaleType;
+    backgroundImageGravity = backgroundImageGravity === VOID ? Companion_getInstance_49().o3m_1 : backgroundImageGravity;
+    backgroundImageScaleType = backgroundImageScaleType === VOID ? Companion_getInstance_49().p3m_1 : backgroundImageScaleType;
     textColor = textColor === VOID ? null : textColor;
     textScale = textScale === VOID ? 1.0 : textScale;
     cardBackgroundColor = cardBackgroundColor === VOID ? null : cardBackgroundColor;
@@ -9672,7 +9754,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.u46_1 = cardTextColor;
+    $this.z46_1 = cardTextColor;
     $this.header = null;
     $this.hero = null;
     var tmp = $this;
@@ -9688,7 +9770,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).p3z = function () {
+  protoOf(Card_1).u3z = function () {
     return this.page;
   };
   protoOf(Card_1).i3c = function () {
@@ -9697,7 +9779,7 @@
   protoOf(Card_1).p3u = function () {
     return this.position;
   };
-  protoOf(Card_1).l47 = function () {
+  protoOf(Card_1).q47 = function () {
     // Inline function 'kotlin.takeUnless' call
     var this_0 = this.page.visibleCards.w1(this);
     var tmp;
@@ -9708,7 +9790,7 @@
     }
     return tmp;
   };
-  protoOf(Card_1).m47 = function () {
+  protoOf(Card_1).r47 = function () {
     return equals(this, lastOrNull(this.page.visibleCards));
   };
   protoOf(Card_1).k3y = function () {
@@ -9721,27 +9803,27 @@
     return this._dismissListeners;
   };
   protoOf(Card_1).i3q = function () {
-    var tmp0_elvis_lhs = this.d47_1;
+    var tmp0_elvis_lhs = this.i47_1;
     return tmp0_elvis_lhs == null ? this.page.t3h() : tmp0_elvis_lhs;
   };
   protoOf(Card_1).j3q = function () {
-    return getResource(this, this.e47_1);
+    return getResource(this, this.j47_1);
   };
   protoOf(Card_1).k3q = function () {
-    return this.f47_1;
+    return this.k47_1;
   };
   protoOf(Card_1).l3q = function () {
-    return this.g47_1;
+    return this.l47_1;
   };
   protoOf(Card_1).o3h = function () {
-    var tmp0_elvis_lhs = this.h47_1;
+    var tmp0_elvis_lhs = this.m47_1;
     return tmp0_elvis_lhs == null ? this.page.cardTextColor : tmp0_elvis_lhs;
   };
   protoOf(Card_1).i3l = function () {
     return this.label;
   };
   protoOf(Card_1).k3c = function () {
-    return this.j47_1;
+    return this.o47_1;
   };
   protoOf(Card_1).u3c = function () {
     // Inline function 'org.cru.godtools.shared.tool.parser.model.contentTips' call
@@ -9758,7 +9840,7 @@
     return destination;
   };
   protoOf(Card_1).v3g = function () {
-    return this.k47_1;
+    return this.p47_1;
   };
   protoOf(Card_1).l3c = function (type) {
     var tmp;
@@ -9766,7 +9848,7 @@
       case 0:
         // Inline function 'kotlin.collections.filter' call
 
-        var tmp0 = this.k47_1;
+        var tmp0 = this.p47_1;
         // Inline function 'kotlin.collections.filterTo' call
 
         var destination = ArrayList_init_$Create$();
@@ -9783,7 +9865,7 @@
       case 1:
         // Inline function 'kotlin.collections.filter' call
 
-        var tmp0_0 = this.k47_1;
+        var tmp0_0 = this.p47_1;
         // Inline function 'kotlin.collections.filterTo' call
 
         var destination_0 = ArrayList_init_$Create$();
@@ -9817,9 +9899,9 @@
     return copyToArray(this_0);
   };
   function Card_1() {
-    Companion_getInstance_59();
+    Companion_getInstance_60();
     var tmp = this;
-    tmp.i47_1 = lazy(TractPage$Card$labelParent$delegate$lambda(this));
+    tmp.n47_1 = lazy(TractPage$Card$labelParent$delegate$lambda(this));
   }
   function parseCardsXml($this, _this__u8e3s4) {
     // Inline function 'kotlin.collections.buildList' call
@@ -9863,22 +9945,22 @@
     }
     return this_0.k3();
   }
-  protoOf(TractPage).n47 = function () {
+  protoOf(TractPage).s47 = function () {
     return equals(lastOrNull(this.s38().g3k()), this);
   };
   protoOf(TractPage).v3g = function () {
-    return this.t46_1;
+    return this.y46_1;
   };
   protoOf(TractPage).j3c = function () {
     return this.header;
   };
-  protoOf(TractPage).o47 = function () {
+  protoOf(TractPage).t47 = function () {
     return this.hero;
   };
-  protoOf(TractPage).p47 = function () {
+  protoOf(TractPage).u47 = function () {
     return this._modals;
   };
-  protoOf(TractPage).q47 = function () {
+  protoOf(TractPage).v47 = function () {
     return this.callToAction;
   };
   protoOf(TractPage).findModal = function (id) {
@@ -9898,10 +9980,10 @@
     }
     return tmp$ret$1;
   };
-  protoOf(TractPage).q3z = function () {
+  protoOf(TractPage).v3z = function () {
     return this._cards;
   };
-  protoOf(TractPage).r47 = function () {
+  protoOf(TractPage).w47 = function () {
     // Inline function 'kotlin.collections.filter' call
     var tmp0 = this._cards;
     // Inline function 'kotlin.collections.filterTo' call
@@ -9915,22 +9997,22 @@
     }
     return destination;
   };
-  protoOf(TractPage).s47 = function () {
-    var tmp0_elvis_lhs = this.u46_1;
+  protoOf(TractPage).x47 = function () {
+    var tmp0_elvis_lhs = this.z46_1;
     return tmp0_elvis_lhs == null ? this.o3h() : tmp0_elvis_lhs;
   };
-  protoOf(TractPage).r3z = function () {
+  protoOf(TractPage).w3z = function () {
     // Inline function 'kotlin.collections.toTypedArray' call
     var this_0 = this._cards;
     return copyToArray(this_0);
   };
-  protoOf(TractPage).t47 = function () {
+  protoOf(TractPage).y47 = function () {
     // Inline function 'kotlin.collections.toTypedArray' call
     var this_0 = this._modals;
     return copyToArray(this_0);
   };
   function TractPage() {
-    this.t46_1 = emptyList();
+    this.y46_1 = emptyList();
   }
   function labelParent$factory() {
     return getPropertyCallableRef('labelParent', 1, KProperty1, function (receiver) {
@@ -9941,7 +10023,7 @@
     return new FlowWatcher(launchIn(onEach(_this__u8e3s4, FlowWatcher$Companion$watchIn$slambda_0(block, null)), scope));
   }
   function FlowWatcher$Companion$watchIn$slambda($block, resultContinuation) {
-    this.c48_1 = $block;
+    this.h48_1 = $block;
     CoroutineImpl.call(this, resultContinuation);
   }
   protoOf(FlowWatcher$Companion$watchIn$slambda).m19 = function (it, $completion) {
@@ -9960,7 +10042,7 @@
         var tmp = this.v8_1;
         if (tmp === 0) {
           this.w8_1 = 1;
-          this.c48_1(this.d48_1);
+          this.h48_1(this.i48_1);
           return Unit_instance;
         } else if (tmp === 1) {
           throw this.y8_1;
@@ -9972,8 +10054,8 @@
      while (true);
   };
   protoOf(FlowWatcher$Companion$watchIn$slambda).n19 = function (it, completion) {
-    var i = new FlowWatcher$Companion$watchIn$slambda(this.c48_1, completion);
-    i.d48_1 = it;
+    var i = new FlowWatcher$Companion$watchIn$slambda(this.h48_1, completion);
+    i.i48_1 = it;
     return i;
   };
   function FlowWatcher$Companion$watchIn$slambda_0($block, resultContinuation) {
@@ -9984,20 +10066,20 @@
     l.$arity = 1;
     return l;
   }
-  function Companion_57() {
+  function Companion_58() {
   }
-  protoOf(Companion_57).v3s = function (_this__u8e3s4, block) {
+  protoOf(Companion_58).v3s = 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.e48_1 = job;
+    this.j48_1 = job;
   }
   protoOf(FlowWatcher).close = function () {
-    return this.e48_1.vl();
+    return this.j48_1.vl();
   };
   function get_REGEX_SEQUENCE_SEPARATOR() {
     _init_properties_Regex_kt__v9a4ph();
@@ -10025,31 +10107,31 @@
     return EMPTY_instance;
   }
   function SetOnceProperty() {
-    this.f48_1 = EMPTY_instance;
+    this.k48_1 = EMPTY_instance;
   }
-  protoOf(SetOnceProperty).g48 = function (thisRef, property) {
+  protoOf(SetOnceProperty).l48 = function (thisRef, property) {
     // Inline function 'kotlin.check' call
-    if (!!(this.f48_1 === EMPTY_instance)) {
+    if (!!(this.k48_1 === EMPTY_instance)) {
       var message = "Value isn't initialized";
       throw IllegalStateException_init_$Create$(toString_0(message));
     }
-    var tmp = this.f48_1;
+    var tmp = this.k48_1;
     return (tmp == null ? true : !(tmp == null)) ? tmp : THROW_CCE();
   };
   protoOf(SetOnceProperty).b3r = function (thisRef, property) {
-    return this.g48(!(thisRef == null) ? thisRef : THROW_CCE(), property);
+    return this.l48(!(thisRef == null) ? thisRef : THROW_CCE(), property);
   };
-  protoOf(SetOnceProperty).h48 = function (thisRef, property, value) {
+  protoOf(SetOnceProperty).m48 = function (thisRef, property, value) {
     // Inline function 'kotlin.check' call
-    if (!(this.f48_1 === EMPTY_instance)) {
+    if (!(this.k48_1 === EMPTY_instance)) {
       var message = 'Value is initialized';
       throw IllegalStateException_init_$Create$(toString_0(message));
     }
-    this.f48_1 = value;
+    this.k48_1 = value;
   };
   protoOf(SetOnceProperty).m3p = function (thisRef, property, value) {
     var tmp = !(thisRef == null) ? thisRef : THROW_CCE();
-    return this.h48(tmp, property, (value == null ? true : !(value == null)) ? value : THROW_CCE());
+    return this.m48(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));
@@ -10064,9 +10146,9 @@
   }
   function getAttributeValueInt($this, namespace, name) {
     // Inline function 'kotlin.takeIf' call
-    var this_0 = $this.i48_1;
+    var this_0 = $this.n48_1;
     var tmp;
-    if (this_0.l48_1 === 2) {
+    if (this_0.q48_1 === 2) {
       tmp = this_0;
     } else {
       tmp = null;
@@ -10079,20 +10161,20 @@
       tmp_0 = tmp0_elvis_lhs;
     }
     var event = tmp_0;
-    var tmp1_safe_receiver = event.o48_1;
+    var tmp1_safe_receiver = event.t48_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.p48_1 = uri;
-    this.q48_1 = local;
+    this.u48_1 = uri;
+    this.v48_1 = local;
   }
   protoOf(QName).toString = function () {
-    return 'QName(uri=' + this.p48_1 + ', local=' + this.q48_1 + ')';
+    return 'QName(uri=' + this.u48_1 + ', local=' + this.v48_1 + ')';
   };
   protoOf(QName).hashCode = function () {
-    var result = this.p48_1 == null ? 0 : getStringHashCode(this.p48_1);
-    result = imul(result, 31) + getStringHashCode(this.q48_1) | 0;
+    var result = this.u48_1 == null ? 0 : getStringHashCode(this.u48_1);
+    result = imul(result, 31) + getStringHashCode(this.v48_1) | 0;
     return result;
   };
   protoOf(QName).equals = function (other) {
@@ -10101,9 +10183,9 @@
     if (!(other instanceof QName))
       return false;
     var tmp0_other_with_cast = other instanceof QName ? other : THROW_CCE();
-    if (!(this.p48_1 == tmp0_other_with_cast.p48_1))
+    if (!(this.u48_1 == tmp0_other_with_cast.u48_1))
       return false;
-    if (!(this.q48_1 === tmp0_other_with_cast.q48_1))
+    if (!(this.v48_1 === tmp0_other_with_cast.v48_1))
       return false;
     return true;
   };
@@ -10111,51 +10193,51 @@
     qname = qname === VOID ? null : qname;
     content = content === VOID ? null : content;
     attrs = attrs === VOID ? null : attrs;
-    this.l48_1 = type;
-    this.m48_1 = qname;
-    this.n48_1 = content;
-    this.o48_1 = attrs;
+    this.q48_1 = type;
+    this.r48_1 = qname;
+    this.s48_1 = content;
+    this.t48_1 = attrs;
   }
   function enqueueEvent($this, event) {
     // Inline function 'kotlin.text.isNotEmpty' call
-    var this_0 = $this.k48_1;
+    var this_0 = $this.p48_1;
     if (charSequenceLength(this_0) > 0) {
-      var tmp1 = $this.j48_1;
+      var tmp1 = $this.o48_1;
       // Inline function 'kotlin.collections.plusAssign' call
-      var element = new ParserEvent(4, VOID, $this.k48_1.toString());
+      var element = new ParserEvent(4, VOID, $this.p48_1.toString());
       tmp1.e(element);
-      $this.k48_1.nb();
+      $this.p48_1.nb();
     }
     // Inline function 'kotlin.collections.plusAssign' call
-    $this.j48_1.e(event);
+    $this.o48_1.e(event);
   }
   function SaxXmlPullParser() {
-    this.i48_1 = new ParserEvent(0);
+    this.n48_1 = new ParserEvent(0);
     var tmp = this;
     // Inline function 'kotlin.collections.mutableListOf' call
-    tmp.j48_1 = ArrayList_init_$Create$();
-    this.k48_1 = StringBuilder_init_$Create$();
+    tmp.o48_1 = ArrayList_init_$Create$();
+    this.p48_1 = StringBuilder_init_$Create$();
   }
   protoOf(SaxXmlPullParser).p3b = function () {
-    return this.i48_1.l48_1;
+    return this.n48_1.q48_1;
   };
   protoOf(SaxXmlPullParser).q3b = function () {
-    var tmp0_safe_receiver = this.i48_1.m48_1;
-    return tmp0_safe_receiver == null ? null : tmp0_safe_receiver.p48_1;
+    var tmp0_safe_receiver = this.n48_1.r48_1;
+    return tmp0_safe_receiver == null ? null : tmp0_safe_receiver.u48_1;
   };
   protoOf(SaxXmlPullParser).l2 = function () {
-    var tmp0_safe_receiver = this.i48_1.m48_1;
-    return tmp0_safe_receiver == null ? null : tmp0_safe_receiver.q48_1;
+    var tmp0_safe_receiver = this.n48_1.r48_1;
+    return tmp0_safe_receiver == null ? null : tmp0_safe_receiver.v48_1;
   };
   protoOf(SaxXmlPullParser).o3b = function (type, namespace, name) {
     // Inline function 'kotlin.with' call
-    var $this$with = this.i48_1;
-    if (!($this$with.l48_1 === type))
+    var $this$with = this.n48_1;
+    if (!($this$with.q48_1 === type))
       throw new XmlPullParserException('expected ' + type);
     var tmp;
     if (!(namespace == null)) {
-      var tmp0_safe_receiver = $this$with.m48_1;
-      tmp = !(namespace == (tmp0_safe_receiver == null ? null : tmp0_safe_receiver.p48_1));
+      var tmp0_safe_receiver = $this$with.r48_1;
+      tmp = !(namespace == (tmp0_safe_receiver == null ? null : tmp0_safe_receiver.u48_1));
     } else {
       tmp = false;
     }
@@ -10163,8 +10245,8 @@
       throw new XmlPullParserException('expected ' + namespace);
     var tmp_0;
     if (!(name == null)) {
-      var tmp1_safe_receiver = $this$with.m48_1;
-      tmp_0 = !((tmp1_safe_receiver == null ? null : tmp1_safe_receiver.q48_1) == name);
+      var tmp1_safe_receiver = $this$with.r48_1;
+      tmp_0 = !((tmp1_safe_receiver == null ? null : tmp1_safe_receiver.v48_1) == name);
     } else {
       tmp_0 = false;
     }
@@ -10174,15 +10256,15 @@
   };
   protoOf(SaxXmlPullParser).l = function () {
     // Inline function 'kotlin.also' call
-    var this_0 = removeFirst(this.j48_1);
-    this.i48_1 = this_0;
-    return this_0.l48_1;
+    var this_0 = removeFirst(this.o48_1);
+    this.n48_1 = this_0;
+    return this_0.q48_1;
   };
   protoOf(SaxXmlPullParser).h39 = function () {
     var tmp;
     if (this.l() === 4) {
       // Inline function 'kotlin.text.isNullOrBlank' call
-      var this_0 = this.i48_1.n48_1;
+      var this_0 = this.n48_1.s48_1;
       tmp = this_0 == null || isBlank(this_0);
     } else {
       tmp = false;
@@ -10190,20 +10272,20 @@
     if (tmp) {
       this.l();
     }
-    var event = this.i48_1;
-    if (!(event.l48_1 === 2) && !(event.l48_1 === 3)) {
-      throw new XmlPullParserException('Expected start or end tag. Found: ' + event.l48_1);
+    var event = this.n48_1;
+    if (!(event.q48_1 === 2) && !(event.q48_1 === 3)) {
+      throw new XmlPullParserException('Expected start or end tag. Found: ' + event.q48_1);
     }
-    return event.l48_1;
+    return event.q48_1;
   };
   protoOf(SaxXmlPullParser).b3v = function () {
-    this.o44(2);
+    this.t44(2);
     var tmp;
     switch (this.l()) {
       case 4:
         // Inline function 'kotlin.text.orEmpty' call
 
-        var tmp0_elvis_lhs = this.i48_1.n48_1;
+        var tmp0_elvis_lhs = this.n48_1.s48_1;
         // Inline function 'kotlin.also' call
 
         var this_0 = tmp0_elvis_lhs == null ? '' : tmp0_elvis_lhs;
@@ -10229,13 +10311,13 @@
   protoOf(SaxXmlPullParser).n3p = function (namespace, name) {
     return getAttributeValueInt(this, namespace, name);
   };
-  protoOf(SaxXmlPullParser).r48 = function (qname, attrs) {
+  protoOf(SaxXmlPullParser).w48 = function (qname, attrs) {
     enqueueEvent(this, new ParserEvent(2, qname, VOID, attrs));
   };
-  protoOf(SaxXmlPullParser).s48 = function (text) {
-    this.k48_1.g8(text);
+  protoOf(SaxXmlPullParser).x48 = function (text) {
+    this.p48_1.g8(text);
   };
-  protoOf(SaxXmlPullParser).t48 = function (qname) {
+  protoOf(SaxXmlPullParser).y48 = function (qname) {
     enqueueEvent(this, new ParserEvent(3, qname));
   };
   function XmlPullParser() {
@@ -10282,26 +10364,26 @@
   }
   var SAX_OPTIONS;
   function InternalSAXParser($outer) {
-    this.u48_1 = $outer;
+    this.z48_1 = $outer;
     SAXParser.call(this, true, get_SAX_OPTIONS());
   }
-  protoOf(InternalSAXParser).v48 = function (tag) {
-    return this.u48_1.r48(new QName(tag.uri, tag.local), convert(this.u48_1, tag.attributes));
+  protoOf(InternalSAXParser).a49 = function (tag) {
+    return this.z48_1.w48(new QName(tag.uri, tag.local), convert(this.z48_1, tag.attributes));
   };
   protoOf(InternalSAXParser).onopentag = function (tag) {
-    return this.v48(tag);
+    return this.a49(tag);
   };
-  protoOf(InternalSAXParser).w48 = function (tagName) {
-    return this.u48_1.t48(new QName(VOID, tagName));
+  protoOf(InternalSAXParser).b49 = function (tagName) {
+    return this.z48_1.y48(new QName(VOID, tagName));
   };
   protoOf(InternalSAXParser).onclosetag = function (tagName) {
-    return this.w48(tagName);
+    return this.b49(tagName);
   };
-  protoOf(InternalSAXParser).x48 = function (t) {
-    return this.u48_1.s48(t);
+  protoOf(InternalSAXParser).c49 = function (t) {
+    return this.z48_1.x48(t);
   };
   protoOf(InternalSAXParser).ontext = function (t) {
-    return this.x48(t);
+    return this.c49(t);
   };
   function convert($this, _this__u8e3s4) {
     var tmp = Object.values;
@@ -10345,13 +10427,13 @@
     var this_0 = new InternalSAXParser(this);
     this_0.write(xml);
     this_0.close();
-    tmp.b49_1 = this_0;
+    tmp.g49_1 = this_0;
   }
   function SAX_OPTIONS$1() {
-    this.c49_1 = true;
+    this.h49_1 = true;
   }
-  protoOf(SAX_OPTIONS$1).d49 = function () {
-    return this.c49_1;
+  protoOf(SAX_OPTIONS$1).i49 = function () {
+    return this.h49_1;
   };
   var properties_initialized_JsXmlPullParser_kt_u4cdem;
   function _init_properties_JsXmlPullParser_kt__2zt5j4() {
@@ -10362,8 +10444,8 @@
   }
   function $getXmlParserCOROUTINE$4(_this__u8e3s4, fileName, resultContinuation) {
     CoroutineImpl.call(this, resultContinuation);
-    this.m49_1 = _this__u8e3s4;
-    this.n49_1 = fileName;
+    this.r49_1 = _this__u8e3s4;
+    this.s49_1 = fileName;
   }
   protoOf($getXmlParserCOROUTINE$4).d9 = function () {
     var suspendResult = this.x8_1;
@@ -10374,7 +10456,7 @@
           case 0:
             this.w8_1 = 2;
             this.v8_1 = 1;
-            suspendResult = await_0(this.m49_1.readFile(this.n49_1), this);
+            suspendResult = await_0(this.r49_1.readFile(this.s49_1), this);
             if (suspendResult === get_COROUTINE_SUSPENDED()) {
               return suspendResult;
             }
@@ -10407,14 +10489,14 @@
   function JsXmlPullParserFactory() {
     XmlPullParserFactory.call(this);
   }
-  protoOf(JsXmlPullParserFactory).o49 = function (fileName, $completion) {
+  protoOf(JsXmlPullParserFactory).t49 = 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.o49(fileName, $completion);
+    return this.t49(fileName, $completion);
   };
   function XmlPullParserException(s) {
     Exception_init_$Init$(s, this);
@@ -10643,6 +10725,19 @@
   defineProp(protoOf(LessonPage), 'content', function () {
     return this.s3c();
   });
+  protoOf(Header).s3c = get_content;
+  protoOf(Header).q3h = get_primaryColor;
+  protoOf(Header).r3h = get_primaryTextColor;
+  protoOf(Header).s3h = get_buttonStyle;
+  protoOf(Header).q3g = get_buttonColor;
+  protoOf(Header).t3h = get_cardBackgroundColor;
+  protoOf(Header).u3h = get_multiselectOptionBackgroundColor;
+  protoOf(Header).v3h = get_multiselectOptionSelectedColor;
+  protoOf(Header).o3h = get_textColor;
+  protoOf(Header).w3h = get_textScale;
+  defineProp(protoOf(Header), 'content', function () {
+    return this.s3c();
+  });
   protoOf(Card_0).s3c = get_content;
   protoOf(Card_0).getAnalyticsEvents = getAnalyticsEvents;
   defineProp(protoOf(Card_0), 'id', protoOf(Card_0).i3c);
@@ -10650,7 +10745,7 @@
   defineProp(protoOf(Card_0), 'content', function () {
     return this.s3c();
   });
-  defineProp(protoOf(CardCollectionPage), 'cards', protoOf(CardCollectionPage).r3z);
+  defineProp(protoOf(CardCollectionPage), 'cards', protoOf(CardCollectionPage).w3z);
   protoOf(ContentPage).s3c = get_content;
   defineProp(protoOf(ContentPage), 'content', function () {
     return this.s3c();
@@ -10663,7 +10758,7 @@
   defineProp(protoOf(PageCollectionPage), 'pages', function () {
     return this.i3k();
   });
-  defineProp(protoOf(InlineTip), 'tip', protoOf(InlineTip).c45);
+  defineProp(protoOf(InlineTip), 'tip', protoOf(InlineTip).h45);
   protoOf(Tip).s3h = get_buttonStyle;
   protoOf(Tip).q3g = get_buttonColor;
   protoOf(Tip).t3h = get_cardBackgroundColor;
@@ -10675,17 +10770,17 @@
   defineProp(protoOf(TipPage), 'content', function () {
     return this.s3c();
   });
-  defineProp(protoOf(CallToAction), 'tip', protoOf(CallToAction).c45);
-  protoOf(Header).q3h = get_primaryColor;
-  protoOf(Header).r3h = get_primaryTextColor;
-  protoOf(Header).s3h = get_buttonStyle;
-  protoOf(Header).q3g = get_buttonColor;
-  protoOf(Header).t3h = get_cardBackgroundColor;
-  protoOf(Header).u3h = get_multiselectOptionBackgroundColor;
-  protoOf(Header).v3h = get_multiselectOptionSelectedColor;
-  protoOf(Header).w3h = get_textScale;
-  protoOf(Header).x3h = get_textAlign;
-  defineProp(protoOf(Header), 'tip', protoOf(Header).c45);
+  defineProp(protoOf(CallToAction), 'tip', protoOf(CallToAction).h45);
+  protoOf(Header_0).q3h = get_primaryColor;
+  protoOf(Header_0).r3h = get_primaryTextColor;
+  protoOf(Header_0).s3h = get_buttonStyle;
+  protoOf(Header_0).q3g = get_buttonColor;
+  protoOf(Header_0).t3h = get_cardBackgroundColor;
+  protoOf(Header_0).u3h = get_multiselectOptionBackgroundColor;
+  protoOf(Header_0).v3h = get_multiselectOptionSelectedColor;
+  protoOf(Header_0).w3h = get_textScale;
+  protoOf(Header_0).x3h = get_textAlign;
+  defineProp(protoOf(Header_0), 'tip', protoOf(Header_0).h45);
   protoOf(Hero).s3c = get_content;
   protoOf(Hero).getAnalyticsEvents = getAnalyticsEvents;
   defineProp(protoOf(Hero), 'content', function () {
@@ -10714,8 +10809,8 @@
   protoOf(Card_1).s3c = get_content;
   protoOf(Card_1).getAnalyticsEvents = getAnalyticsEvents;
   defineProp(protoOf(Card_1), 'id', protoOf(Card_1).i3c);
-  defineProp(protoOf(Card_1), 'visiblePosition', protoOf(Card_1).l47);
-  defineProp(protoOf(Card_1), 'isLastVisibleCard', protoOf(Card_1).m47);
+  defineProp(protoOf(Card_1), 'visiblePosition', protoOf(Card_1).q47);
+  defineProp(protoOf(Card_1), 'isLastVisibleCard', protoOf(Card_1).r47);
   defineProp(protoOf(Card_1), 'backgroundImage', protoOf(Card_1).j3q);
   defineProp(protoOf(Card_1), 'tips', protoOf(Card_1).u3c);
   defineProp(protoOf(Card_1), 'dismissListeners', protoOf(Card_1).l3r);
@@ -10723,14 +10818,14 @@
   defineProp(protoOf(Card_1), 'content', function () {
     return this.s3c();
   });
-  defineProp(protoOf(TractPage), 'isLastPage', protoOf(TractPage).n47);
-  defineProp(protoOf(TractPage), 'visibleCards', protoOf(TractPage).r47);
-  defineProp(protoOf(TractPage), 'cardTextColor', protoOf(TractPage).s47);
-  defineProp(protoOf(TractPage), 'cards', protoOf(TractPage).r3z);
-  defineProp(protoOf(TractPage), 'modals', protoOf(TractPage).t47);
-  protoOf(SaxXmlPullParser).o44 = require$default;
+  defineProp(protoOf(TractPage), 'isLastPage', protoOf(TractPage).s47);
+  defineProp(protoOf(TractPage), 'visibleCards', protoOf(TractPage).w47);
+  defineProp(protoOf(TractPage), 'cardTextColor', protoOf(TractPage).x47);
+  defineProp(protoOf(TractPage), 'cards', protoOf(TractPage).w3z);
+  defineProp(protoOf(TractPage), 'modals', protoOf(TractPage).y47);
+  protoOf(SaxXmlPullParser).t44 = require$default;
   defineProp(protoOf(SAX_OPTIONS$1), 'xmlns', function () {
-    return this.d49();
+    return this.i49();
   });
   //endregion
   //region block: init
@@ -10761,19 +10856,19 @@
   Companion_instance_37 = new Companion_36();
   Companion_instance_38 = new Companion_37();
   Companion_instance_39 = new Companion_38();
-  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
@@ -11121,6 +11216,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 = {});
@@ -11149,7 +11245,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 = {});
@@ -11178,7 +11274,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 = {});