npm - @cruglobal/godtools-shared - Versions diffs - 0.9.0-PR424-SNAPSHOT.1190 → 0.9.0-PR424-SNAPSHOT.1192 - Mend

@cruglobal/godtools-shared 0.9.0-PR424-SNAPSHOT.1190 → 0.9.0-PR424-SNAPSHOT.1192

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

Files changed (4) hide show

package/kotlin-mpp-godtools-tool-parser-npm.d.ts +1 -0
package/kotlin-mpp-godtools-tool-parser-parser.js +412 -404
package/kotlin-mpp-godtools-tool-parser-parser.js.map +1 -1
package/package.json +1 -1

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

@@ -6265,6 +6265,13 @@
     tmp$ret$0 = copyToArray(tmp0_toTypedArray);
     return tmp$ret$0;
   };
+  protoOf(Manifest).x37 = function () {
+    var tmp$ret$0;
+    // Inline function 'kotlin.collections.toTypedArray' call
+    var tmp0_toTypedArray = this.resources.d2();
+    tmp$ret$0 = copyToArray(tmp0_toTypedArray);
+    return tmp$ret$0;
+  };
   function Manifest() {
     Companion_getInstance_29();
     this.h2u_1 = setOnce();
@@ -6279,6 +6286,7 @@
   });
   defineProp(protoOf(Manifest), 'hasTips', protoOf(Manifest).s37);
   defineProp(protoOf(Manifest), 'pages', protoOf(Manifest).w37);
+  defineProp(protoOf(Manifest), 'jsResources', protoOf(Manifest).x37);
   defineProp(protoOf(Manifest), 'stylesParent', function () {
     return this.a2t();
   });
@@ -6320,7 +6328,7 @@
   function Companion_27() {
     Companion_instance_27 = this;
   }
-  protoOf(Companion_27).x37 = function (_this__u8e3s4) {
+  protoOf(Companion_27).y37 = function (_this__u8e3s4) {
     var tmp0_subject = _this__u8e3s4;
     var tmp;
     Companion_getInstance_31();
@@ -6354,12 +6362,12 @@
   }
   function Companion_28() {
     Companion_instance_28 = this;
-    this.y37_1 = 'selected-color';
-    this.z37_1 = 'value';
-    this.a38_1 = 'style';
-    this.b38_1 = 'card';
-    this.c38_1 = 'flat';
-    this.d38_1 = Style_CARD_getInstance();
+    this.z37_1 = 'selected-color';
+    this.a38_1 = 'value';
+    this.b38_1 = 'style';
+    this.c38_1 = 'card';
+    this.d38_1 = 'flat';
+    this.e38_1 = Style_CARD_getInstance();
   }
   var Companion_instance_28;
   function Companion_getInstance_31() {
@@ -6370,20 +6378,20 @@
   function Option_init_$Init$(multiselect, parser, $this) {
     Content_init_$Init$(multiselect, parser, $this);
     Option.call($this);
-    $this.m38_1 = multiselect;
+    $this.n38_1 = multiselect;
     Companion_getInstance_59();
     parser.u2r(2, get_XMLNS_CONTENT(), 'option');
     var tmp = $this;
     var tmp_0 = Companion_getInstance_30();
     Companion_getInstance_31();
-    tmp.n38_1 = tmp_0.x37(parser.o2t('style'));
+    tmp.o38_1 = tmp_0.y37(parser.o2t('style'));
     var tmp_1 = $this;
     var tmp0_safe_receiver = parser.o2t(get_XML_BACKGROUND_COLOR());
-    tmp_1.o38_1 = tmp0_safe_receiver == null ? null : toColorOrNull(tmp0_safe_receiver);
+    tmp_1.p38_1 = tmp0_safe_receiver == null ? null : toColorOrNull(tmp0_safe_receiver);
     var tmp_2 = $this;
     Companion_getInstance_31();
     var tmp1_safe_receiver = parser.o2t('selected-color');
-    tmp_2.p38_1 = tmp1_safe_receiver == null ? null : toColorOrNull(tmp1_safe_receiver);
+    tmp_2.q38_1 = tmp1_safe_receiver == null ? null : toColorOrNull(tmp1_safe_receiver);
     var tmp_3 = $this;
     var tmp$ret$0;
     // Inline function 'kotlin.text.orEmpty' call
@@ -6391,12 +6399,12 @@
     var tmp0_orEmpty = parser.o2t('value');
     var tmp0_elvis_lhs = tmp0_orEmpty;
     tmp$ret$0 = tmp0_elvis_lhs == null ? '' : tmp0_elvis_lhs;
-    tmp_3.q38_1 = tmp$ret$0;
+    tmp_3.r38_1 = tmp$ret$0;
     var tmp_4 = $this;
     var tmp$ret$1;
     // Inline function 'kotlin.collections.mutableListOf' call
     tmp$ret$1 = ArrayList_init_$Create$();
-    tmp_4.r38_1 = tmp$ret$1;
+    tmp_4.s38_1 = tmp$ret$1;
     var tmp_5 = $this;
     var tmp$ret$9;
     // Inline function 'org.cru.godtools.shared.tool.parser.model.parseContent' call
@@ -6434,7 +6442,7 @@
           if (tmp1_subject === 'events') {
             var tmp2_this = $this;
             // Inline function 'kotlin.collections.plusAssign' call
-            var tmp0_plusAssign = tmp2_this.r38_1;
+            var tmp0_plusAssign = tmp2_this.s38_1;
             var tmp1_plusAssign = Companion_getInstance_6().y2r(parser, $this);
             addAll(tmp0_plusAssign, tmp1_plusAssign);
           }
@@ -6486,7 +6494,7 @@
     tmp$ret$7 = tmp$ret$6.u7();
     tmp$ret$8 = tmp$ret$7;
     tmp$ret$9 = tmp$ret$8;
-    tmp_5.s38_1 = tmp$ret$9;
+    tmp_5.t38_1 = tmp$ret$9;
     return $this;
   }
   function Option_init_$Create$(multiselect, parser) {
@@ -6505,11 +6513,11 @@
   }
   function Companion_29() {
     Companion_instance_29 = this;
-    this.t38_1 = 'multiselect';
-    this.u38_1 = 'multiselect-option-background-color';
-    this.v38_1 = 'multiselect-option-selected-color';
-    this.w38_1 = 'option-background-color';
-    this.x38_1 = 'option-selected-color';
+    this.u38_1 = 'multiselect';
+    this.v38_1 = 'multiselect-option-background-color';
+    this.w38_1 = 'multiselect-option-selected-color';
+    this.x38_1 = 'option-background-color';
+    this.y38_1 = 'option-selected-color';
   }
   var Companion_instance_29;
   function Companion_getInstance_32() {
@@ -6530,31 +6538,31 @@
     var tmp0_orEmpty = parser.o2t('state');
     var tmp0_elvis_lhs = tmp0_orEmpty;
     tmp$ret$0 = tmp0_elvis_lhs == null ? '' : tmp0_elvis_lhs;
-    tmp_0.g39_1 = tmp$ret$0;
+    tmp_0.h39_1 = tmp$ret$0;
     var tmp_1 = $this;
     var tmp0_safe_receiver = parser.o2t('columns');
     var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : toIntOrNull(tmp0_safe_receiver);
-    tmp_1.h39_1 = tmp1_elvis_lhs == null ? 1 : tmp1_elvis_lhs;
+    tmp_1.i39_1 = tmp1_elvis_lhs == null ? 1 : tmp1_elvis_lhs;
     var tmp_2 = $this;
     var tmp2_safe_receiver = parser.o2t('selection-limit');
     var tmp3_elvis_lhs = tmp2_safe_receiver == null ? null : toIntOrNull(tmp2_safe_receiver);
-    tmp_2.i39_1 = coerceAtLeast(tmp3_elvis_lhs == null ? 1 : tmp3_elvis_lhs, 1);
+    tmp_2.j39_1 = coerceAtLeast(tmp3_elvis_lhs == null ? 1 : tmp3_elvis_lhs, 1);
     var tmp_3 = $this;
-    var tmp4_elvis_lhs = Companion_getInstance_30().x37(parser.o2t('option-style'));
-    tmp_3.j39_1 = tmp4_elvis_lhs == null ? Companion_getInstance_31().d38_1 : tmp4_elvis_lhs;
+    var tmp4_elvis_lhs = Companion_getInstance_30().y37(parser.o2t('option-style'));
+    tmp_3.k39_1 = tmp4_elvis_lhs == null ? Companion_getInstance_31().e38_1 : tmp4_elvis_lhs;
     var tmp_4 = $this;
     Companion_getInstance_32();
     var tmp5_safe_receiver = parser.o2t('option-background-color');
-    tmp_4.k39_1 = tmp5_safe_receiver == null ? null : toColorOrNull(tmp5_safe_receiver);
+    tmp_4.l39_1 = tmp5_safe_receiver == null ? null : toColorOrNull(tmp5_safe_receiver);
     var tmp_5 = $this;
     Companion_getInstance_32();
     var tmp6_safe_receiver = parser.o2t('option-selected-color');
-    tmp_5.l39_1 = tmp6_safe_receiver == null ? null : toColorOrNull(tmp6_safe_receiver);
+    tmp_5.m39_1 = tmp6_safe_receiver == null ? null : toColorOrNull(tmp6_safe_receiver);
     var tmp_6 = $this;
     var tmp$ret$1;
     // Inline function 'kotlin.collections.mutableListOf' call
     tmp$ret$1 = ArrayList_init_$Create$();
-    tmp_6.m39_1 = tmp$ret$1;
+    tmp_6.n39_1 = tmp$ret$1;
     // Inline function 'org.cru.godtools.shared.tool.parser.xml.parseChildren' call
     $l$loop_1: while (true) {
       var tmp_7 = parser.h();
@@ -6573,7 +6581,7 @@
         if (tmp1_subject === 'option') {
           var tmp2_this = $this;
           // Inline function 'kotlin.collections.plusAssign' call
-          var tmp0_plusAssign = tmp2_this.m39_1;
+          var tmp0_plusAssign = tmp2_this.n39_1;
           var tmp1_plusAssign = Option_init_$Create$($this, parser);
           tmp0_plusAssign.b(tmp1_plusAssign);
         }
@@ -6590,7 +6598,7 @@
     return Multiselect_init_$Init$(parent, parser, objectCreate(protoOf(Multiselect)));
   }
   protoOf(Option).t2s = function () {
-    return this.s38_1;
+    return this.t38_1;
   };
   protoOf(Option)._getAnalyticsEvents = function (type) {
     var tmp0_subject = type;
@@ -6599,7 +6607,7 @@
     if (tmp0 === 3) {
       var tmp$ret$2;
       // Inline function 'kotlin.collections.filter' call
-      var tmp1_filter = this.r38_1;
+      var tmp1_filter = this.s38_1;
       var tmp$ret$1;
       // Inline function 'kotlin.collections.filterTo' call
       var tmp0_filterTo = ArrayList_init_$Create$();
@@ -6647,8 +6655,8 @@
   }
   function Companion_30() {
     Companion_instance_30 = this;
-    this.n39_1 = 'paragraph';
-    this.o39_1 = 'fallback';
+    this.o39_1 = 'paragraph';
+    this.p39_1 = 'fallback';
   }
   var Companion_instance_30;
   function Companion_getInstance_33() {
@@ -6742,14 +6750,14 @@
     tmp$ret$6 = tmp$ret$5.u7();
     tmp$ret$7 = tmp$ret$6;
     tmp$ret$8 = tmp$ret$7;
-    tmp_0.x39_1 = tmp$ret$8;
+    tmp_0.y39_1 = tmp$ret$8;
     return $this;
   }
   function Paragraph_init_$Create$(parent, parser) {
     return Paragraph_init_$Init$(parent, parser, objectCreate(protoOf(Paragraph)));
   }
   protoOf(Paragraph).t2s = function () {
-    return this.x39_1;
+    return this.y39_1;
   };
   protoOf(Paragraph).c2t = function () {
     var tmp$ret$3;
@@ -6942,7 +6950,7 @@
   }
   function Companion_31() {
     Companion_instance_31 = this;
-    this.y39_1 = 'resource';
+    this.z39_1 = 'resource';
   }
   var Companion_instance_31;
   function Companion_getInstance_34() {
@@ -6968,7 +6976,7 @@
   protoOf(Resource).id = function () {
     return this.name;
   };
-  protoOf(Resource).z39 = function () {
+  protoOf(Resource).a3a = function () {
     return this.localName;
   };
   function Resource() {
@@ -6984,9 +6992,9 @@
   var Mode_FIXED_instance;
   function Companion_32() {
     Companion_instance_32 = this;
-    this.a3a_1 = Mode_AUTO_getInstance();
+    this.b3a_1 = Mode_AUTO_getInstance();
   }
-  protoOf(Companion_32).b3a = function (_this__u8e3s4) {
+  protoOf(Companion_32).c3a = function (_this__u8e3s4) {
     var tmp0_subject = _this__u8e3s4;
     switch (tmp0_subject) {
       case 'auto':
@@ -7015,7 +7023,7 @@
   }
   function Companion_33() {
     Companion_instance_33 = this;
-    this.c3a_1 = 'spacer';
+    this.d3a_1 = 'spacer';
   }
   var Companion_instance_33;
   function Companion_getInstance_36() {
@@ -7032,13 +7040,13 @@
     parser.u2r(2, tmp, 'spacer');
     var tmp_0 = $this;
     var tmp0_safe_receiver = parser.o2t('mode');
-    var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : Companion_getInstance_35().b3a(tmp0_safe_receiver);
-    tmp_0.l3a_1 = tmp1_elvis_lhs == null ? Companion_getInstance_35().a3a_1 : tmp1_elvis_lhs;
+    var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : Companion_getInstance_35().c3a(tmp0_safe_receiver);
+    tmp_0.m3a_1 = tmp1_elvis_lhs == null ? Companion_getInstance_35().b3a_1 : tmp1_elvis_lhs;
     var tmp_1 = $this;
     var tmp2_safe_receiver = parser.o2t('height');
     var tmp3_safe_receiver = tmp2_safe_receiver == null ? null : toIntOrNull(tmp2_safe_receiver);
     var tmp4_elvis_lhs = tmp3_safe_receiver == null ? null : coerceAtLeast(tmp3_safe_receiver, 0);
-    tmp_1.m3a_1 = tmp4_elvis_lhs == null ? 0 : tmp4_elvis_lhs;
+    tmp_1.n3a_1 = tmp4_elvis_lhs == null ? 0 : tmp4_elvis_lhs;
     skipTag(parser);
     return $this;
   }
@@ -7061,7 +7069,7 @@
   }
   function Companion_34() {
     Companion_instance_34 = this;
-    this.n3a_1 = 1.0;
+    this.o3a_1 = 1.0;
   }
   var Companion_instance_34;
   function Companion_getInstance_37() {
@@ -7133,22 +7141,22 @@
   }
   function StylesOverride(parent, _textAlign, _textColor, _textScale) {
     BaseModel.call(this, parent);
-    this.p3a_1 = _textAlign;
-    this.q3a_1 = _textColor;
-    this.r3a_1 = _textScale;
+    this.q3a_1 = _textAlign;
+    this.r3a_1 = _textColor;
+    this.s3a_1 = _textScale;
   }
   protoOf(StylesOverride).g2y = function () {
-    var tmp0_safe_receiver = this.p3a_1;
+    var tmp0_safe_receiver = this.q3a_1;
     var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : tmp0_safe_receiver();
     return tmp1_elvis_lhs == null ? get_textAlign.call(this) : tmp1_elvis_lhs;
   };
   protoOf(StylesOverride).x2x = function () {
-    var tmp0_safe_receiver = this.q3a_1;
+    var tmp0_safe_receiver = this.r3a_1;
     var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : tmp0_safe_receiver();
     return tmp1_elvis_lhs == null ? get_textColor.call(this) : tmp1_elvis_lhs;
   };
   protoOf(StylesOverride).f2y = function () {
-    return get_textScale.call(this) * this.r3a_1;
+    return get_textScale.call(this) * this.s3a_1;
   };
   defineProp(protoOf(StylesOverride), 'stylesParent', function () {
     return this.a2t();
@@ -7159,7 +7167,7 @@
   function Tab_init_$Init$(parent, parser, $this) {
     BaseModel.call($this, parent);
     Tab.call($this);
-    $this.t3a_1 = parent;
+    $this.u3a_1 = parent;
     Companion_getInstance_59();
     parser.u2r(2, get_XMLNS_CONTENT(), 'tab');
     var tmp = $this;
@@ -7179,12 +7187,12 @@
     var tmp0_orEmpty = tmp1_safe_receiver == null ? null : toSet_0(tmp1_safe_receiver);
     var tmp0_elvis_lhs = tmp0_orEmpty;
     tmp$ret$1 = tmp0_elvis_lhs == null ? emptySet() : tmp0_elvis_lhs;
-    tmp.u3a_1 = tmp$ret$1;
+    tmp.v3a_1 = tmp$ret$1;
     var tmp_1 = $this;
     var tmp$ret$2;
     // Inline function 'kotlin.collections.mutableListOf' call
     tmp$ret$2 = ArrayList_init_$Create$();
-    tmp_1.x3a_1 = tmp$ret$2;
+    tmp_1.y3a_1 = tmp$ret$2;
     var label = null;
     var tmp_2 = $this;
     var tmp$ret$10;
@@ -7223,7 +7231,7 @@
           if (tmp1_subject === 'events') {
             var tmp2_this = $this;
             // Inline function 'kotlin.collections.plusAssign' call
-            var tmp0_plusAssign = tmp2_this.x3a_1;
+            var tmp0_plusAssign = tmp2_this.y3a_1;
             var tmp1_plusAssign = Companion_getInstance_6().y2r(parser, $this);
             addAll(tmp0_plusAssign, tmp1_plusAssign);
           }
@@ -7279,8 +7287,8 @@
     tmp$ret$8 = tmp$ret$7.u7();
     tmp$ret$9 = tmp$ret$8;
     tmp$ret$10 = tmp$ret$9;
-    tmp_2.w3a_1 = tmp$ret$10;
-    $this.v3a_1 = label;
+    tmp_2.x3a_1 = tmp$ret$10;
+    $this.w3a_1 = label;
     return $this;
   }
   function Tab_init_$Create$(parent, parser) {
@@ -7288,7 +7296,7 @@
   }
   function Companion_35() {
     Companion_instance_35 = this;
-    this.y3a_1 = 'tabs';
+    this.z3a_1 = 'tabs';
   }
   var Companion_instance_35;
   function Companion_getInstance_38() {
@@ -7342,14 +7350,14 @@
     tmp$ret$0 = tmp0_apply;
     tmp$ret$1 = tmp$ret$0.u7();
     tmp$ret$2 = tmp$ret$1;
-    tmp_0.h3b_1 = tmp$ret$2;
+    tmp_0.i3b_1 = tmp$ret$2;
     return $this;
   }
   function Tabs_init_$Create$(parent, parser) {
     return Tabs_init_$Init$(parent, parser, objectCreate(protoOf(Tabs)));
   }
   protoOf(Tab).t2s = function () {
-    return this.w3a_1;
+    return this.x3a_1;
   };
   protoOf(Tab)._getAnalyticsEvents = function (type) {
     var tmp0_subject = type;
@@ -7358,7 +7366,7 @@
     if (tmp0 === 3) {
       var tmp$ret$2;
       // Inline function 'kotlin.collections.filter' call
-      var tmp1_filter = this.x3a_1;
+      var tmp1_filter = this.y3a_1;
       var tmp$ret$1;
       // Inline function 'kotlin.collections.filterTo' call
       var tmp0_filterTo = ArrayList_init_$Create$();
@@ -7398,7 +7406,7 @@
   protoOf(Tabs).c2t = function () {
     var tmp$ret$6;
     // Inline function 'kotlin.collections.flatMap' call
-    var tmp1_flatMap = this.h3b_1;
+    var tmp1_flatMap = this.i3b_1;
     var tmp$ret$5;
     // Inline function 'kotlin.collections.flatMapTo' call
     var tmp0_flatMapTo = ArrayList_init_$Create$();
@@ -7444,7 +7452,7 @@
   function Companion_36() {
     Companion_instance_36 = this;
   }
-  protoOf(Companion_36).i3b = function (_this__u8e3s4) {
+  protoOf(Companion_36).j3b = function (_this__u8e3s4) {
     var tmp0_subject = _this__u8e3s4;
     switch (tmp0_subject) {
       case 'start':
@@ -7510,7 +7518,7 @@
   function Companion_37() {
     Companion_instance_37 = this;
   }
-  protoOf(Companion_37).j3b = function (_this__u8e3s4) {
+  protoOf(Companion_37).k3b = function (_this__u8e3s4) {
     var tmp$ret$3;
     // Inline function 'kotlin.collections.mapNotNullTo' call
     var tmp0_mapNotNullTo = get_REGEX_SEQUENCE_SEPARATOR().ec(_this__u8e3s4);
@@ -7576,9 +7584,9 @@
   }
   function Companion_38() {
     Companion_instance_38 = this;
-    this.k3b_1 = 'text';
-    this.l3b_1 = 40;
-    this.m3b_1 = 0;
+    this.l3b_1 = 'text';
+    this.m3b_1 = 40;
+    this.n3b_1 = 0;
   }
   var Companion_instance_38;
   function Companion_getInstance_41() {
@@ -7595,7 +7603,7 @@
     parser.u2r(2, tmp, 'text');
     var tmp_0 = $this;
     var tmp0_safe_receiver = parser.o2t('text-align');
-    tmp_0.g37_1 = tmp0_safe_receiver == null ? null : Companion_getInstance_39().i3b(tmp0_safe_receiver);
+    tmp_0.g37_1 = tmp0_safe_receiver == null ? null : Companion_getInstance_39().j3b(tmp0_safe_receiver);
     var tmp_1 = $this;
     var tmp1_safe_receiver = parser.o2t(get_XML_TEXT_COLOR());
     tmp_1.h37_1 = tmp1_safe_receiver == null ? null : toColorOrNull(tmp1_safe_receiver);
@@ -7614,7 +7622,7 @@
     var tmp$ret$0;
     // Inline function 'kotlin.collections.orEmpty' call
     var tmp4_safe_receiver = parser.o2t('text-style');
-    var tmp0_orEmpty = tmp4_safe_receiver == null ? null : Companion_getInstance_40().j3b(tmp4_safe_receiver);
+    var tmp0_orEmpty = tmp4_safe_receiver == null ? null : Companion_getInstance_40().k3b(tmp4_safe_receiver);
     var tmp0_elvis_lhs = tmp0_orEmpty;
     tmp$ret$0 = tmp0_elvis_lhs == null ? emptySet() : tmp0_elvis_lhs;
     tmp_4.textStyles = tmp$ret$0;
@@ -7673,7 +7681,7 @@
       tmp_12 = tmp11_elvis_lhs;
     }
     tmp_11.endImageSize = tmp_12;
-    $this.text = parser.n3b();
+    $this.text = parser.o3b();
     return $this;
   }
   function Text_init_$Create$(parent, parser) {
@@ -7766,35 +7774,35 @@
   protoOf(Text).f2y = function () {
     return this.i37_1 * get_textScale_0(this.a2t());
   };
-  protoOf(Text).s3b = function () {
+  protoOf(Text).t3b = function () {
     return this.textStyles;
   };
-  protoOf(Text).t3b = function () {
+  protoOf(Text).u3b = function () {
     return this.minimumLines;
   };
-  protoOf(Text).u3b = function () {
+  protoOf(Text).v3b = function () {
     return this.j37_1;
   };
-  protoOf(Text).v3b = function () {
+  protoOf(Text).w3b = function () {
     return getResource(this, this.j37_1);
   };
-  protoOf(Text).w3b = function () {
+  protoOf(Text).x3b = function () {
     return this.startImageSize;
   };
-  protoOf(Text).x3b = function () {
+  protoOf(Text).y3b = function () {
     return this.k37_1;
   };
-  protoOf(Text).y3b = function () {
+  protoOf(Text).z3b = function () {
     return getResource(this, this.k37_1);
   };
-  protoOf(Text).z3b = function () {
+  protoOf(Text).a3c = function () {
     return this.endImageSize;
   };
   function Text() {
     Companion_getInstance_41();
   }
-  defineProp(protoOf(Text), 'startImage', protoOf(Text).v3b);
-  defineProp(protoOf(Text), 'endImage', protoOf(Text).y3b);
+  defineProp(protoOf(Text), 'startImage', protoOf(Text).w3b);
+  defineProp(protoOf(Text), 'endImage', protoOf(Text).z3b);
   defineProp(protoOf(Text), 'stylesParent', function () {
     return this.a2t();
   });
@@ -8006,8 +8014,8 @@
     return tmp0_elvis_lhs == null ? compareTo(_Version___get_version__impl__iv3bqm($this).i(), _Version___get_version__impl__iv3bqm(other).i()) : tmp0_elvis_lhs;
   }
   function Version__compareTo_impl_crux23_0($this, other) {
-    var tmp = $this.a3c_1;
-    return Version__compareTo_impl_crux23(tmp, other instanceof Version ? other.a3c_1 : THROW_CCE());
+    var tmp = $this.b3c_1;
+    return Version__compareTo_impl_crux23(tmp, other instanceof Version ? other.b3c_1 : THROW_CCE());
   }
   function Version__toString_impl_cjmhtj($this) {
     return joinToString(_Version___get_version__impl__iv3bqm($this), '.');
@@ -8018,35 +8026,35 @@
   function Version__equals_impl_tebety($this, other) {
     if (!(other instanceof Version))
       return false;
-    var tmp0_other_with_cast = other instanceof Version ? other.a3c_1 : THROW_CCE();
+    var tmp0_other_with_cast = other instanceof Version ? other.b3c_1 : THROW_CCE();
     if (!equals($this, tmp0_other_with_cast))
       return false;
     return true;
   }
   function Version(version) {
     Companion_getInstance_42();
-    this.a3c_1 = version;
+    this.b3c_1 = version;
   }
-  protoOf(Version).b3c = function (other) {
-    return Version__compareTo_impl_crux23(this.a3c_1, other);
+  protoOf(Version).c3c = function (other) {
+    return Version__compareTo_impl_crux23(this.b3c_1, other);
   };
   protoOf(Version).a6 = function (other) {
     return Version__compareTo_impl_crux23_0(this, other);
   };
   protoOf(Version).toString = function () {
-    return Version__toString_impl_cjmhtj(this.a3c_1);
+    return Version__toString_impl_cjmhtj(this.b3c_1);
   };
   protoOf(Version).hashCode = function () {
-    return Version__hashCode_impl_yaseme(this.a3c_1);
+    return Version__hashCode_impl_yaseme(this.b3c_1);
   };
   protoOf(Version).equals = function (other) {
-    return Version__equals_impl_tebety(this.a3c_1, other);
+    return Version__equals_impl_tebety(this.b3c_1, other);
   };
   var Provider_YOUTUBE_instance;
   var Provider_UNKNOWN_instance;
   function Companion_40() {
     Companion_instance_40 = this;
-    this.c3c_1 = Provider_UNKNOWN_getInstance();
+    this.d3c_1 = Provider_UNKNOWN_getInstance();
   }
   protoOf(Companion_40).z35 = function (value) {
     var tmp0_subject = value;
@@ -8070,10 +8078,10 @@
   }
   function Companion_41() {
     Companion_instance_41 = this;
-    this.d3c_1 = 'video';
-    this.e3c_1 = new AspectRatio(16, 9);
-    this.f3c_1 = Horizontal_CENTER_getInstance();
-    this.g3c_1 = new Percent(1.0);
+    this.e3c_1 = 'video';
+    this.f3c_1 = new AspectRatio(16, 9);
+    this.g3c_1 = Horizontal_CENTER_getInstance();
+    this.h3c_1 = new Percent(1.0);
   }
   var Companion_instance_41;
   function Companion_getInstance_44() {
@@ -8093,15 +8101,15 @@
     parser.u2r(2, tmp, 'video');
     var tmp_0 = $this;
     var tmp0_elvis_lhs = Companion_getInstance_43().z35(parser.o2t('provider'));
-    tmp_0.p3c_1 = tmp0_elvis_lhs == null ? Companion_getInstance_43().c3c_1 : tmp0_elvis_lhs;
-    $this.q3c_1 = parser.o2t('video-id');
+    tmp_0.q3c_1 = tmp0_elvis_lhs == null ? Companion_getInstance_43().d3c_1 : tmp0_elvis_lhs;
+    $this.r3c_1 = parser.o2t('video-id');
     var tmp_1 = $this;
     var tmp1_elvis_lhs = Companion_getInstance_8().q2v(parser.o2t('aspect-ratio'));
-    tmp_1.r3c_1 = tmp1_elvis_lhs == null ? Companion_getInstance_44().e3c_1 : tmp1_elvis_lhs;
+    tmp_1.s3c_1 = tmp1_elvis_lhs == null ? Companion_getInstance_44().f3c_1 : tmp1_elvis_lhs;
     var tmp_2 = $this;
     var tmp2_safe_receiver = Companion_getInstance_22().y2w(parser.o2t('gravity'));
     var tmp3_elvis_lhs = tmp2_safe_receiver == null ? null : tmp2_safe_receiver.horizontal;
-    tmp_2.s3c_1 = tmp3_elvis_lhs == null ? Companion_getInstance_44().f3c_1 : tmp3_elvis_lhs;
+    tmp_2.t3c_1 = tmp3_elvis_lhs == null ? Companion_getInstance_44().g3c_1 : tmp3_elvis_lhs;
     var tmp_3 = $this;
     var tmp4_safe_receiver = Companion_getInstance_16().z2w(parser.o2t('width'));
     var tmp_4;
@@ -8124,7 +8132,7 @@
       tmp_4 = tmp$ret$1;
     }
     var tmp5_elvis_lhs = tmp_4;
-    tmp_3.t3c_1 = tmp5_elvis_lhs == null ? Companion_getInstance_44().g3c_1 : tmp5_elvis_lhs;
+    tmp_3.u3c_1 = tmp5_elvis_lhs == null ? Companion_getInstance_44().h3c_1 : tmp5_elvis_lhs;
     skipTag(parser);
     return $this;
   }
@@ -8140,7 +8148,7 @@
     return Provider_UNKNOWN_instance;
   }
   protoOf(Video).i2s = function () {
-    return (protoOf(Content).i2s.call(this) ? true : this.p3c_1.equals(Provider_UNKNOWN_getInstance())) ? true : this.q3c_1 == null;
+    return (protoOf(Content).i2s.call(this) ? true : this.q3c_1.equals(Provider_UNKNOWN_getInstance())) ? true : this.r3c_1 == null;
   };
   function Video() {
     Companion_getInstance_44();
@@ -8194,12 +8202,12 @@
     var tmp$ret$0;
     // Inline function 'kotlin.collections.mutableListOf' call
     tmp$ret$0 = ArrayList_init_$Create$();
-    tmp_0.m3d_1 = tmp$ret$0;
+    tmp_0.n3d_1 = tmp$ret$0;
     var tmp_1 = $this;
     var tmp$ret$1;
     // Inline function 'kotlin.collections.mutableListOf' call
     tmp$ret$1 = ArrayList_init_$Create$();
-    tmp_1.n3d_1 = tmp$ret$1;
+    tmp_1.o3d_1 = tmp$ret$1;
     // Inline function 'org.cru.godtools.shared.tool.parser.xml.parseChildren' call
     $l$loop_4: while (true) {
       var tmp_2 = parser.h();
@@ -8219,7 +8227,7 @@
         if (tmp1_subject === 'events') {
           var tmp2_this = $this;
           // Inline function 'kotlin.collections.plusAssign' call
-          var tmp0_plusAssign = tmp2_this.m3d_1;
+          var tmp0_plusAssign = tmp2_this.n3d_1;
           var tmp1_plusAssign = Companion_getInstance_6().y2r(parser, $this);
           addAll(tmp0_plusAssign, tmp1_plusAssign);
         }
@@ -8228,7 +8236,7 @@
         if (tmp3_subject === 'content') {
           var tmp4_this = $this;
           // Inline function 'kotlin.collections.plusAssign' call
-          var tmp3_plusAssign = tmp4_this.n3d_1;
+          var tmp3_plusAssign = tmp4_this.o3d_1;
           var tmp$ret$10;
           // Inline function 'org.cru.godtools.shared.tool.parser.model.parseContent' call
           var tmp$ret$9;
@@ -8322,13 +8330,13 @@
   function LessonPage_init_$Create$(manifest, fileName, parser) {
     return LessonPage_init_$Init$(manifest, fileName, parser, objectCreate(protoOf(LessonPage)));
   }
-  protoOf(LessonPage).o3d = function () {
-    return this.m3d_1;
+  protoOf(LessonPage).p3d = function () {
+    return this.n3d_1;
   };
   protoOf(LessonPage).t2s = function () {
-    return this.n3d_1;
+    return this.o3d_1;
   };
-  protoOf(LessonPage).p3d = function (type) {
+  protoOf(LessonPage).q3d = function (type) {
     return type.equals(Type_LESSON_getInstance());
   };
   function LessonPage() {
@@ -8341,9 +8349,9 @@
   });
   function Companion_42() {
     Companion_instance_42 = this;
-    this.p3e_1 = 'card';
-    this.q3e_1 = 'id';
-    this.r3e_1 = 'content';
+    this.q3e_1 = 'card';
+    this.r3e_1 = 'id';
+    this.s3e_1 = 'content';
   }
   var Companion_instance_42;
   function Companion_getInstance_45() {
@@ -8354,27 +8362,27 @@
   function Card_init_$Init$_0(page, parser, $this) {
     BaseModel.call($this, page);
     Card_0.call($this);
-    $this.t3e_1 = page;
+    $this.u3e_1 = page;
     Companion_getInstance_59();
     var tmp = get_XMLNS_PAGE();
     Companion_getInstance_45();
     parser.u2r(2, tmp, 'card');
     var tmp_0 = $this;
     Companion_getInstance_45();
-    tmp_0.u3e_1 = parser.o2t('id');
+    tmp_0.v3e_1 = parser.o2t('id');
     var tmp_1 = $this;
     var tmp0_safe_receiver = parser.o2t(get_XML_BACKGROUND_COLOR());
-    tmp_1.v3e_1 = tmp0_safe_receiver == null ? null : toColorOrNull(tmp0_safe_receiver);
+    tmp_1.w3e_1 = tmp0_safe_receiver == null ? null : toColorOrNull(tmp0_safe_receiver);
     var tmp_2 = $this;
     var tmp$ret$0;
     // Inline function 'kotlin.collections.mutableListOf' call
     tmp$ret$0 = ArrayList_init_$Create$();
-    tmp_2.w3e_1 = tmp$ret$0;
+    tmp_2.x3e_1 = tmp$ret$0;
     var tmp_3 = $this;
     var tmp$ret$1;
     // Inline function 'kotlin.collections.mutableListOf' call
     tmp$ret$1 = ArrayList_init_$Create$();
-    tmp_3.x3e_1 = tmp$ret$1;
+    tmp_3.y3e_1 = tmp$ret$1;
     // Inline function 'org.cru.godtools.shared.tool.parser.xml.parseChildren' call
     $l$loop_4: while (true) {
       var tmp_4 = parser.h();
@@ -8394,7 +8402,7 @@
         if (tmp1_subject === 'events') {
           var tmp2_this = $this;
           // Inline function 'kotlin.collections.plusAssign' call
-          var tmp0_plusAssign = tmp2_this.w3e_1;
+          var tmp0_plusAssign = tmp2_this.x3e_1;
           var tmp1_plusAssign = Companion_getInstance_6().y2r(parser, $this);
           addAll(tmp0_plusAssign, tmp1_plusAssign);
         }
@@ -8404,7 +8412,7 @@
         if (tmp3_subject === 'content') {
           var tmp4_this = $this;
           // Inline function 'kotlin.collections.plusAssign' call
-          var tmp3_plusAssign = tmp4_this.x3e_1;
+          var tmp3_plusAssign = tmp4_this.y3e_1;
           var tmp$ret$10;
           // Inline function 'org.cru.godtools.shared.tool.parser.model.parseContent' call
           var tmp$ret$9;
@@ -8500,7 +8508,7 @@
   }
   function Companion_43() {
     Companion_instance_43 = this;
-    this.y3e_1 = 'cardcollection';
+    this.z3e_1 = 'cardcollection';
   }
   var Companion_instance_43;
   function Companion_getInstance_46() {
@@ -8517,17 +8525,17 @@
     parser.u2r(2, tmp, 'page');
     var tmp_0 = Companion_getInstance_48();
     Companion_getInstance_46();
-    tmp_0.z3e(parser, 'cardcollection');
+    tmp_0.a3f(parser, 'cardcollection');
     var tmp_1 = $this;
     var tmp$ret$0;
     // Inline function 'kotlin.collections.mutableListOf' call
     tmp$ret$0 = ArrayList_init_$Create$();
-    tmp_1.s3f_1 = tmp$ret$0;
+    tmp_1.t3f_1 = tmp$ret$0;
     var tmp_2 = $this;
     var tmp$ret$1;
     // Inline function 'kotlin.collections.mutableListOf' call
     tmp$ret$1 = ArrayList_init_$Create$();
-    tmp_2.t3f_1 = tmp$ret$1;
+    tmp_2.u3f_1 = tmp$ret$1;
     // Inline function 'org.cru.godtools.shared.tool.parser.xml.parseChildren' call
     $l$loop_1: while (true) {
       var tmp_3 = parser.h();
@@ -8547,7 +8555,7 @@
         if (tmp1_subject === 'events') {
           var tmp2_this = $this;
           // Inline function 'kotlin.collections.plusAssign' call
-          var tmp0_plusAssign = tmp2_this.s3f_1;
+          var tmp0_plusAssign = tmp2_this.t3f_1;
           var tmp1_plusAssign = Companion_getInstance_6().y2r(parser, $this);
           addAll(tmp0_plusAssign, tmp1_plusAssign);
         }
@@ -8556,7 +8564,7 @@
         if (tmp3_subject === 'cards') {
           var tmp4_this = $this;
           // Inline function 'kotlin.collections.plusAssign' call
-          var tmp2_plusAssign = tmp4_this.t3f_1;
+          var tmp2_plusAssign = tmp4_this.u3f_1;
           var tmp3_plusAssign = parseCards($this, parser);
           addAll(tmp2_plusAssign, tmp3_plusAssign);
         }
@@ -8618,7 +8626,7 @@
     return tmp$ret$2;
   }
   protoOf(Card_0).t2s = function () {
-    return this.x3e_1;
+    return this.y3e_1;
   };
   protoOf(Card_0)._getAnalyticsEvents = function (type) {
     var tmp0_subject = type;
@@ -8628,7 +8636,7 @@
       case 1:
         var tmp$ret$2;
         // Inline function 'kotlin.collections.filter' call
-        var tmp1_filter = this.w3e_1;
+        var tmp1_filter = this.x3e_1;
         var tmp$ret$1;
         // Inline function 'kotlin.collections.filterTo' call
         var tmp0_filterTo = ArrayList_init_$Create$();
@@ -8650,7 +8658,7 @@
       case 2:
         var tmp$ret$5;
         // Inline function 'kotlin.collections.filter' call
-        var tmp3_filter = this.w3e_1;
+        var tmp3_filter = this.x3e_1;
         var tmp$ret$4;
         // Inline function 'kotlin.collections.filterTo' call
         var tmp2_filterTo = ArrayList_init_$Create$();
@@ -8690,10 +8698,10 @@
   defineProp(protoOf(Card_0), 'content', function () {
     return this.b2t();
   });
-  protoOf(CardCollectionPage).o3d = function () {
-    return this.s3f_1;
+  protoOf(CardCollectionPage).p3d = function () {
+    return this.t3f_1;
   };
-  protoOf(CardCollectionPage).p3d = function (type) {
+  protoOf(CardCollectionPage).q3d = function (type) {
     return type.equals(Type_CYOA_getInstance());
   };
   function CardCollectionPage() {
@@ -8729,7 +8737,7 @@
   }
   function Companion_44() {
     Companion_instance_44 = this;
-    this.u3f_1 = 'content';
+    this.v3f_1 = 'content';
   }
   var Companion_instance_44;
   function Companion_getInstance_47() {
@@ -8746,17 +8754,17 @@
     parser.u2r(2, tmp, 'page');
     var tmp_0 = Companion_getInstance_48();
     Companion_getInstance_47();
-    tmp_0.z3e(parser, 'content');
+    tmp_0.a3f(parser, 'content');
     var tmp_1 = $this;
     var tmp$ret$0;
     // Inline function 'kotlin.collections.mutableListOf' call
     tmp$ret$0 = ArrayList_init_$Create$();
-    tmp_1.n3g_1 = tmp$ret$0;
+    tmp_1.o3g_1 = tmp$ret$0;
     var tmp_2 = $this;
     var tmp$ret$1;
     // Inline function 'kotlin.collections.mutableListOf' call
     tmp$ret$1 = ArrayList_init_$Create$();
-    tmp_2.o3g_1 = tmp$ret$1;
+    tmp_2.p3g_1 = tmp$ret$1;
     // Inline function 'org.cru.godtools.shared.tool.parser.xml.parseChildren' call
     $l$loop_4: while (true) {
       var tmp_3 = parser.h();
@@ -8776,7 +8784,7 @@
         if (tmp1_subject === 'events') {
           var tmp2_this = $this;
           // Inline function 'kotlin.collections.plusAssign' call
-          var tmp0_plusAssign = tmp2_this.n3g_1;
+          var tmp0_plusAssign = tmp2_this.o3g_1;
           var tmp1_plusAssign = Companion_getInstance_6().y2r(parser, $this);
           addAll(tmp0_plusAssign, tmp1_plusAssign);
         }
@@ -8785,7 +8793,7 @@
         if (tmp3_subject === 'content') {
           var tmp4_this = $this;
           // Inline function 'kotlin.collections.plusAssign' call
-          var tmp3_plusAssign = tmp4_this.o3g_1;
+          var tmp3_plusAssign = tmp4_this.p3g_1;
           var tmp$ret$10;
           // Inline function 'org.cru.godtools.shared.tool.parser.model.parseContent' call
           var tmp$ret$9;
@@ -8879,13 +8887,13 @@
   function ContentPage_init_$Create$(manifest, fileName, parser) {
     return ContentPage_init_$Init$(manifest, fileName, parser, objectCreate(protoOf(ContentPage)));
   }
-  protoOf(ContentPage).o3d = function () {
-    return this.n3g_1;
+  protoOf(ContentPage).p3d = function () {
+    return this.o3g_1;
   };
   protoOf(ContentPage).t2s = function () {
-    return this.o3g_1;
+    return this.p3g_1;
   };
-  protoOf(ContentPage).p3d = function (type) {
+  protoOf(ContentPage).q3d = function (type) {
     return type.equals(Type_CYOA_getInstance());
   };
   function ContentPage() {
@@ -8950,7 +8958,7 @@
       var tmp_2;
       var tmp$ret$0;
       // Inline function 'org.cru.godtools.shared.tool.parser.model.page.Companion.parse.<anonymous>' call
-      tmp$ret$0 = tmp1_safe_receiver.p3d(manifest.type);
+      tmp$ret$0 = tmp1_safe_receiver.q3d(manifest.type);
       if (tmp$ret$0) {
         tmp_2 = tmp1_safe_receiver;
       } else {
@@ -8961,7 +8969,7 @@
     }
     return tmp_1;
   };
-  protoOf(Companion_45).z3e = function (_this__u8e3s4, type) {
+  protoOf(Companion_45).a3f = function (_this__u8e3s4, type) {
     var actual = _this__u8e3s4.m2v(get_XMLNS_XSI(), 'type');
     if (!(type === actual))
       throw new XmlPullParserException('expected ' + type + ' not ' + actual);
@@ -8978,9 +8986,9 @@
     Companion_getInstance_59();
     Companion_getInstance_48();
     parser.u2r(2, null, 'page');
-    $this.t3d_1 = parser.o2t('id');
-    $this.u3d_1 = fileName;
-    $this.v3d_1 = parser.m2v(get_XMLNS_CYOA(), 'parent');
+    $this.u3d_1 = parser.o2t('id');
+    $this.v3d_1 = fileName;
+    $this.w3d_1 = parser.m2v(get_XMLNS_CYOA(), 'parent');
     var tmp = $this;
     var tmp0_safe_receiver = parser.o2t('hidden');
     var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : toBoolean(tmp0_safe_receiver);
@@ -8999,44 +9007,44 @@
     tmp_1.dismissListeners = toSet_0(tmp$ret$1);
     var tmp_2 = $this;
     var tmp2_safe_receiver = parser.o2t(get_XML_PRIMARY_COLOR());
-    tmp_2.w3d_1 = tmp2_safe_receiver == null ? null : toColorOrNull(tmp2_safe_receiver);
+    tmp_2.x3d_1 = tmp2_safe_receiver == null ? null : toColorOrNull(tmp2_safe_receiver);
     var tmp_3 = $this;
     var tmp3_safe_receiver = parser.o2t(get_XML_PRIMARY_TEXT_COLOR());
-    tmp_3.x3d_1 = tmp3_safe_receiver == null ? null : toColorOrNull(tmp3_safe_receiver);
+    tmp_3.y3d_1 = tmp3_safe_receiver == null ? null : toColorOrNull(tmp3_safe_receiver);
     var tmp_4 = $this;
     var tmp4_safe_receiver = parser.o2t(get_XML_BACKGROUND_COLOR());
     var tmp5_elvis_lhs = tmp4_safe_receiver == null ? null : toColorOrNull(tmp4_safe_receiver);
-    tmp_4.y3d_1 = tmp5_elvis_lhs == null ? Companion_getInstance_48().f33_1 : tmp5_elvis_lhs;
-    $this.z3d_1 = parser.o2t(get_XML_BACKGROUND_IMAGE());
+    tmp_4.z3d_1 = tmp5_elvis_lhs == null ? Companion_getInstance_48().f33_1 : tmp5_elvis_lhs;
+    $this.a3e_1 = parser.o2t(get_XML_BACKGROUND_IMAGE());
     var tmp_5 = $this;
     var tmp6_safe_receiver = parser.o2t(get_XML_BACKGROUND_IMAGE_GRAVITY());
     var tmp7_elvis_lhs = tmp6_safe_receiver == null ? null : Companion_getInstance_22().y2w(tmp6_safe_receiver);
-    tmp_5.a3e_1 = tmp7_elvis_lhs == null ? Companion_getInstance_48().g33_1 : tmp7_elvis_lhs;
+    tmp_5.b3e_1 = tmp7_elvis_lhs == null ? Companion_getInstance_48().g33_1 : tmp7_elvis_lhs;
     var tmp_6 = $this;
     var tmp8_safe_receiver = parser.o2t(get_XML_BACKGROUND_IMAGE_SCALE_TYPE());
     var tmp9_elvis_lhs = tmp8_safe_receiver == null ? null : Companion_getInstance_24().j31(tmp8_safe_receiver);
-    tmp_6.b3e_1 = tmp9_elvis_lhs == null ? Companion_getInstance_48().h33_1 : tmp9_elvis_lhs;
+    tmp_6.c3e_1 = tmp9_elvis_lhs == null ? Companion_getInstance_48().h33_1 : tmp9_elvis_lhs;
     var tmp_7 = $this;
     var tmp10_safe_receiver = parser.o2t(get_XML_CONTROL_COLOR());
-    tmp_7.c3e_1 = tmp10_safe_receiver == null ? null : toColorOrNull(tmp10_safe_receiver);
+    tmp_7.d3e_1 = tmp10_safe_receiver == null ? null : toColorOrNull(tmp10_safe_receiver);
     var tmp_8 = $this;
     var tmp_9 = get_XMLNS_CONTENT();
     Companion_getInstance_12();
     var tmp11_safe_receiver = parser.m2v(tmp_9, 'card-background-color');
-    tmp_8.d3e_1 = tmp11_safe_receiver == null ? null : toColorOrNull(tmp11_safe_receiver);
+    tmp_8.e3e_1 = tmp11_safe_receiver == null ? null : toColorOrNull(tmp11_safe_receiver);
     var tmp_10 = $this;
     var tmp_11 = get_XMLNS_CONTENT();
     Companion_getInstance_32();
     var tmp12_safe_receiver = parser.m2v(tmp_11, 'multiselect-option-background-color');
-    tmp_10.e3e_1 = tmp12_safe_receiver == null ? null : toColorOrNull(tmp12_safe_receiver);
+    tmp_10.f3e_1 = tmp12_safe_receiver == null ? null : toColorOrNull(tmp12_safe_receiver);
     var tmp_12 = $this;
     var tmp_13 = get_XMLNS_CONTENT();
     Companion_getInstance_32();
     var tmp13_safe_receiver = parser.m2v(tmp_13, 'multiselect-option-selected-color');
-    tmp_12.f3e_1 = tmp13_safe_receiver == null ? null : toColorOrNull(tmp13_safe_receiver);
+    tmp_12.g3e_1 = tmp13_safe_receiver == null ? null : toColorOrNull(tmp13_safe_receiver);
     var tmp_14 = $this;
     var tmp14_safe_receiver = parser.o2t(get_XML_TEXT_COLOR());
-    tmp_14.g3e_1 = tmp14_safe_receiver == null ? null : toColorOrNull(tmp14_safe_receiver);
+    tmp_14.h3e_1 = tmp14_safe_receiver == null ? null : toColorOrNull(tmp14_safe_receiver);
     var tmp_15 = $this;
     var tmp15_safe_receiver = parser.o2t(get_XML_TEXT_SCALE());
     var tmp16_elvis_lhs = tmp15_safe_receiver == null ? null : toDoubleOrNull(tmp15_safe_receiver);
@@ -9047,7 +9055,7 @@
     } else {
       tmp_16 = tmp16_elvis_lhs;
     }
-    tmp_15.h3e_1 = tmp_16;
+    tmp_15.i3e_1 = tmp_16;
     return $this;
   }
   function Page_init_$Init$_0(manifest, id, fileName, parentPage, primaryColor, backgroundColor, backgroundImage, backgroundImageGravity, backgroundImageScaleType, controlColor, cardBackgroundColor, textColor, textScale, $this) {
@@ -9073,30 +9081,30 @@
     textScale = tmp;
     BaseModel.call($this, manifest);
     Page.call($this);
-    $this.t3d_1 = id;
-    $this.u3d_1 = fileName;
-    $this.v3d_1 = parentPage;
+    $this.u3d_1 = id;
+    $this.v3d_1 = fileName;
+    $this.w3d_1 = parentPage;
     $this.isHidden = false;
     $this.listeners = emptySet();
     $this.dismissListeners = emptySet();
-    $this.w3d_1 = primaryColor;
-    $this.x3d_1 = null;
-    $this.y3d_1 = backgroundColor;
-    $this.z3d_1 = backgroundImage;
-    $this.a3e_1 = backgroundImageGravity;
-    $this.b3e_1 = backgroundImageScaleType;
-    $this.c3e_1 = controlColor;
-    $this.d3e_1 = cardBackgroundColor;
-    $this.e3e_1 = null;
+    $this.x3d_1 = primaryColor;
+    $this.y3d_1 = null;
+    $this.z3d_1 = backgroundColor;
+    $this.a3e_1 = backgroundImage;
+    $this.b3e_1 = backgroundImageGravity;
+    $this.c3e_1 = backgroundImageScaleType;
+    $this.d3e_1 = controlColor;
+    $this.e3e_1 = cardBackgroundColor;
     $this.f3e_1 = null;
-    $this.g3e_1 = textColor;
-    $this.h3e_1 = textScale;
+    $this.g3e_1 = null;
+    $this.h3e_1 = textColor;
+    $this.i3e_1 = textScale;
     return $this;
   }
   function Page$id$delegate$lambda(this$0) {
     return function () {
-      var tmp0_elvis_lhs = this$0.t3d_1;
-      var tmp1_elvis_lhs = tmp0_elvis_lhs == null ? this$0.u3d_1 : tmp0_elvis_lhs;
+      var tmp0_elvis_lhs = this$0.u3d_1;
+      var tmp1_elvis_lhs = tmp0_elvis_lhs == null ? this$0.v3d_1 : tmp0_elvis_lhs;
       return tmp1_elvis_lhs == null ? '' + this$0.a2p().code + '-' + this$0.position : tmp1_elvis_lhs;
     };
   }
@@ -9109,76 +9117,76 @@
     var tmp$ret$0;
     // Inline function 'kotlin.getValue' call
     var tmp0_getValue = id$factory();
-    tmp$ret$0 = this.r3d_1.o1();
+    tmp$ret$0 = this.s3d_1.o1();
     return tmp$ret$0;
   };
-  protoOf(Page).i3e = function () {
+  protoOf(Page).j3e = function () {
     var tmp$ret$0;
     // Inline function 'kotlin.getValue' call
     var tmp0_getValue = position$factory();
-    tmp$ret$0 = this.s3d_1.o1();
+    tmp$ret$0 = this.t3d_1.o1();
     return tmp$ret$0;
   };
-  protoOf(Page).j3e = function () {
-    return this.u3d_1;
-  };
   protoOf(Page).k3e = function () {
-    return this.a2p().findPage(this.v3d_1);
+    return this.v3d_1;
   };
   protoOf(Page).l3e = function () {
-    return this.isHidden;
+    return this.a2p().findPage(this.w3d_1);
   };
   protoOf(Page).m3e = function () {
+    return this.isHidden;
+  };
+  protoOf(Page).n3e = function () {
     return this.listeners;
   };
   protoOf(Page).p36 = function () {
     return this.dismissListeners;
   };
   protoOf(Page).z2x = function () {
-    var tmp0_elvis_lhs = this.w3d_1;
+    var tmp0_elvis_lhs = this.x3d_1;
     return tmp0_elvis_lhs == null ? get_primaryColor_0(this.a2t()) : tmp0_elvis_lhs;
   };
   protoOf(Page).a2y = function () {
-    var tmp0_elvis_lhs = this.x3d_1;
+    var tmp0_elvis_lhs = this.y3d_1;
     return tmp0_elvis_lhs == null ? get_primaryTextColor_0(this.a2t()) : tmp0_elvis_lhs;
   };
   protoOf(Page).s36 = function () {
-    return this.y3d_1;
-  };
-  protoOf(Page).n3e = function () {
     return this.z3d_1;
   };
+  protoOf(Page).o3e = function () {
+    return this.a3e_1;
+  };
   protoOf(Page).t36 = function () {
-    return getResource(this, this.z3d_1);
+    return getResource(this, this.a3e_1);
   };
   protoOf(Page).u36 = function () {
-    return this.a3e_1;
+    return this.b3e_1;
   };
   protoOf(Page).v36 = function () {
-    return this.b3e_1;
+    return this.c3e_1;
   };
-  protoOf(Page).o3e = function () {
-    var tmp0_elvis_lhs = this.c3e_1;
+  protoOf(Page).p3e = function () {
+    var tmp0_elvis_lhs = this.d3e_1;
     return tmp0_elvis_lhs == null ? this.a2p().b2u_1 : tmp0_elvis_lhs;
   };
   protoOf(Page).c2y = function () {
-    var tmp0_elvis_lhs = this.d3e_1;
+    var tmp0_elvis_lhs = this.e3e_1;
     return tmp0_elvis_lhs == null ? this.a2p().c2y() : tmp0_elvis_lhs;
   };
   protoOf(Page).d2y = function () {
-    var tmp0_elvis_lhs = this.e3e_1;
+    var tmp0_elvis_lhs = this.f3e_1;
     return tmp0_elvis_lhs == null ? get_multiselectOptionBackgroundColor.call(this) : tmp0_elvis_lhs;
   };
   protoOf(Page).e2y = function () {
-    var tmp0_elvis_lhs = this.f3e_1;
+    var tmp0_elvis_lhs = this.g3e_1;
     return tmp0_elvis_lhs == null ? get_multiselectOptionSelectedColor.call(this) : tmp0_elvis_lhs;
   };
   protoOf(Page).x2x = function () {
-    var tmp0_elvis_lhs = this.g3e_1;
+    var tmp0_elvis_lhs = this.h3e_1;
     return tmp0_elvis_lhs == null ? get_textColor_0(this.a2t()) : tmp0_elvis_lhs;
   };
   protoOf(Page).f2y = function () {
-    return this.h3e_1 * get_textScale_0(this.a2t());
+    return this.i3e_1 * get_textScale_0(this.a2t());
   };
   protoOf(Page)._getAnalyticsEvents = function (type) {
     var tmp0_subject = type;
@@ -9188,7 +9196,7 @@
       case 1:
         var tmp$ret$2;
         // Inline function 'kotlin.collections.filter' call
-        var tmp1_filter = this.o3d();
+        var tmp1_filter = this.p3d();
         var tmp$ret$1;
         // Inline function 'kotlin.collections.filterTo' call
         var tmp0_filterTo = ArrayList_init_$Create$();
@@ -9210,7 +9218,7 @@
       case 2:
         var tmp$ret$5;
         // Inline function 'kotlin.collections.filter' call
-        var tmp3_filter = this.o3d();
+        var tmp3_filter = this.p3d();
         var tmp$ret$4;
         // Inline function 'kotlin.collections.filterTo' call
         var tmp2_filterTo = ArrayList_init_$Create$();
@@ -9238,13 +9246,13 @@
   function Page() {
     Companion_getInstance_48();
     var tmp = this;
-    tmp.r3d_1 = lazy(Page$id$delegate$lambda(this));
+    tmp.s3d_1 = lazy(Page$id$delegate$lambda(this));
     var tmp_0 = this;
-    tmp_0.s3d_1 = lazy(Page$position$delegate$lambda(this));
+    tmp_0.t3d_1 = lazy(Page$position$delegate$lambda(this));
   }
   defineProp(protoOf(Page), 'id', protoOf(Page).p2u);
-  defineProp(protoOf(Page), 'position', protoOf(Page).i3e);
-  defineProp(protoOf(Page), 'parentPage', protoOf(Page).k3e);
+  defineProp(protoOf(Page), 'position', protoOf(Page).j3e);
+  defineProp(protoOf(Page), 'parentPage', protoOf(Page).l3e);
   defineProp(protoOf(Page), 'backgroundImage', protoOf(Page).t36);
   defineProp(protoOf(Page), 'stylesParent', function () {
     return this.a2t();
@@ -9299,7 +9307,7 @@
       // Inline function 'org.cru.godtools.shared.tool.parser.model.shareable.Companion.parseShareableItems.<anonymous>.<anonymous>' call
       var tmp0_subject = _this__u8e3s4.w2r();
       if (tmp0_subject === get_XMLNS_SHAREABLE()) {
-        var tmp1_safe_receiver = Companion_getInstance_49().p3g(manifest, _this__u8e3s4);
+        var tmp1_safe_receiver = Companion_getInstance_49().q3g(manifest, _this__u8e3s4);
         if (tmp1_safe_receiver == null)
           null;
         else {
@@ -9323,9 +9331,9 @@
     tmp$ret$4 = tmp$ret$3;
     return tmp$ret$4;
   };
-  protoOf(Companion_46).p3g = function (manifest, parser) {
+  protoOf(Companion_46).q3g = function (manifest, parser) {
     Companion_getInstance_59();
-    parser.q3g(2, get_XMLNS_SHAREABLE());
+    parser.r3g(2, get_XMLNS_SHAREABLE());
     var tmp0_subject = parser.w2r();
     var tmp;
     if (tmp0_subject === get_XMLNS_SHAREABLE()) {
@@ -9353,7 +9361,7 @@
     BaseModel.call($this, parent);
     Shareable.call($this);
     Companion_getInstance_59();
-    parser.q3g(2, get_XMLNS_SHAREABLE());
+    parser.r3g(2, get_XMLNS_SHAREABLE());
     $this.h36_1 = parser.o2t('id');
     var tmp = $this;
     var tmp0_safe_receiver = parser.o2t('order');
@@ -9375,7 +9383,7 @@
   });
   function Companion_47() {
     Companion_instance_47 = this;
-    this.r3g_1 = 'image';
+    this.s3g_1 = 'image';
   }
   var Companion_instance_47;
   function Companion_getInstance_50() {
@@ -9390,7 +9398,7 @@
     var tmp = get_XMLNS_SHAREABLE();
     Companion_getInstance_50();
     parser.u2r(2, tmp, 'image');
-    $this.v3g_1 = parser.o2t('resource');
+    $this.w3g_1 = parser.o2t('resource');
     var description = null;
     // Inline function 'org.cru.godtools.shared.tool.parser.xml.parseChildren' call
     $l$loop_1: while (true) {
@@ -9416,7 +9424,7 @@
         continue $l$loop_1;
       skipTag(parser);
     }
-    $this.w3g_1 = description;
+    $this.x3g_1 = description;
     return $this;
   }
   function ShareableImage_init_$Create$(manifest, parser) {
@@ -9424,7 +9432,7 @@
   }
   protoOf(ShareableImage).p2u = function () {
     var tmp0_elvis_lhs = protoOf(Shareable).p2u.call(this);
-    return tmp0_elvis_lhs == null ? this.v3g_1 : tmp0_elvis_lhs;
+    return tmp0_elvis_lhs == null ? this.w3g_1 : tmp0_elvis_lhs;
   };
   function ShareableImage() {
     Companion_getInstance_50();
@@ -9441,7 +9449,7 @@
   var XMLNS_TRAINING;
   function Companion_48() {
     Companion_instance_48 = this;
-    this.x3g_1 = 'tip';
+    this.y3g_1 = 'tip';
   }
   var Companion_instance_48;
   function Companion_getInstance_51() {
@@ -9456,18 +9464,18 @@
     var tmp = get_XMLNS_TRAINING();
     Companion_getInstance_51();
     parser.u2r(2, tmp, 'tip');
-    $this.g3h_1 = parser.m2v(null, 'id');
+    $this.h3h_1 = parser.m2v(null, 'id');
     skipTag(parser);
     return $this;
   }
   function InlineTip_init_$Create$(parent, parser) {
     return InlineTip_init_$Init$(parent, parser, objectCreate(protoOf(InlineTip)));
   }
-  protoOf(InlineTip).h3h = function () {
-    return this.a2p().v37(this.g3h_1);
+  protoOf(InlineTip).i3h = function () {
+    return this.a2p().v37(this.h3h_1);
   };
   protoOf(InlineTip).c2t = function () {
-    return listOfNotNull(this.h3h());
+    return listOfNotNull(this.i3h());
   };
   function InlineTip() {
     Companion_getInstance_51();
@@ -9479,7 +9487,7 @@
   var Type_QUOTE_instance;
   function Companion_49() {
     Companion_instance_49 = this;
-    this.i3h_1 = Type_TIP_getInstance();
+    this.j3h_1 = Type_TIP_getInstance();
   }
   protoOf(Companion_49).l31 = function (_this__u8e3s4) {
     var tmp0_subject = _this__u8e3s4;
@@ -9526,7 +9534,7 @@
     var tmp = $this;
     var tmp0_safe_receiver = parser.m2v(null, 'type');
     var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : Companion_getInstance_52().l31(tmp0_safe_receiver);
-    tmp.v34_1 = tmp1_elvis_lhs == null ? Companion_getInstance_52().i3h_1 : tmp1_elvis_lhs;
+    tmp.v34_1 = tmp1_elvis_lhs == null ? Companion_getInstance_52().j3h_1 : tmp1_elvis_lhs;
     var tmp_0 = $this;
     var tmp$ret$2;
     // Inline function 'kotlin.collections.buildList' call
@@ -9658,7 +9666,7 @@
   });
   function Companion_50() {
     Companion_instance_50 = this;
-    this.j3h_1 = 'page';
+    this.k3h_1 = 'page';
   }
   var Companion_instance_50;
   function Companion_getInstance_53() {
@@ -9673,8 +9681,8 @@
     var tmp = get_XMLNS_TRAINING();
     Companion_getInstance_53();
     parser.u2r(2, tmp, 'page');
-    $this.l3h_1 = tip;
-    $this.m3h_1 = position;
+    $this.m3h_1 = tip;
+    $this.n3h_1 = position;
     var tmp_0 = $this;
     var tmp$ret$8;
     // Inline function 'org.cru.godtools.shared.tool.parser.model.parseContent' call
@@ -9754,14 +9762,14 @@
     tmp$ret$6 = tmp$ret$5.u7();
     tmp$ret$7 = tmp$ret$6;
     tmp$ret$8 = tmp$ret$7;
-    tmp_0.n3h_1 = tmp$ret$8;
+    tmp_0.o3h_1 = tmp$ret$8;
     return $this;
   }
   function TipPage_init_$Create$(tip, position, parser) {
     return TipPage_init_$Init$(tip, position, parser, objectCreate(protoOf(TipPage)));
   }
   protoOf(TipPage).t2s = function () {
-    return this.n3h_1;
+    return this.o3h_1;
   };
   function TipPage() {
     Companion_getInstance_53();
@@ -9780,7 +9788,7 @@
   });
   function Companion_51() {
     Companion_instance_51 = this;
-    this.o3h_1 = 'call-to-action';
+    this.p3h_1 = 'call-to-action';
   }
   var Companion_instance_51;
   function Companion_getInstance_54() {
@@ -9791,10 +9799,10 @@
   function CallToAction_init_$Init$(parent, $this) {
     BaseModel.call($this, parent);
     CallToAction.call($this);
-    $this.q3h_1 = parent;
+    $this.r3h_1 = parent;
     $this.label = null;
-    $this.r3h_1 = null;
     $this.s3h_1 = null;
+    $this.t3h_1 = null;
     return $this;
   }
   function CallToAction_init_$Create$(parent) {
@@ -9807,11 +9815,11 @@
     var tmp = get_XMLNS_TRACT();
     Companion_getInstance_54();
     parser.u2r(2, tmp, 'call-to-action');
-    $this.q3h_1 = page;
+    $this.r3h_1 = page;
     var tmp_0 = $this;
     var tmp0_safe_receiver = parser.o2t('control-color');
-    tmp_0.r3h_1 = tmp0_safe_receiver == null ? null : toColorOrNull(tmp0_safe_receiver);
-    $this.s3h_1 = parser.m2v(get_XMLNS_TRAINING(), 'tip');
+    tmp_0.s3h_1 = tmp0_safe_receiver == null ? null : toColorOrNull(tmp0_safe_receiver);
+    $this.t3h_1 = parser.m2v(get_XMLNS_TRAINING(), 'tip');
     var tmp_1 = $this;
     var tmp_2 = get_XMLNS_TRACT();
     Companion_getInstance_54();
@@ -9828,34 +9836,34 @@
     tip = tip === VOID ? null : tip;
     BaseModel.call($this, page);
     CallToAction.call($this);
-    $this.q3h_1 = page;
+    $this.r3h_1 = page;
     var tmp = $this;
     var tmp0_safe_receiver = label;
     tmp.label = tmp0_safe_receiver == null ? null : tmp0_safe_receiver($this);
-    $this.r3h_1 = controlColor;
-    $this.s3h_1 = tip;
+    $this.s3h_1 = controlColor;
+    $this.t3h_1 = tip;
     return $this;
   }
   function createTestCallToAction(page, label, controlColor, tip) {
     return CallToAction_init_$Init$_1(page, label, controlColor, tip, objectCreate(protoOf(CallToAction)));
   }
-  protoOf(CallToAction).t3h = function () {
+  protoOf(CallToAction).u3h = function () {
     return this.label;
   };
-  protoOf(CallToAction).o3e = function () {
-    var tmp0_elvis_lhs = this.r3h_1;
+  protoOf(CallToAction).p3e = function () {
+    var tmp0_elvis_lhs = this.s3h_1;
     return tmp0_elvis_lhs == null ? get_primaryColor_0(this.a2t()) : tmp0_elvis_lhs;
   };
-  protoOf(CallToAction).u3h = function () {
-    return this.s3h_1;
+  protoOf(CallToAction).v3h = function () {
+    return this.t3h_1;
   };
-  protoOf(CallToAction).h3h = function () {
-    return this.a2p().v37(this.s3h_1);
+  protoOf(CallToAction).i3h = function () {
+    return this.a2p().v37(this.t3h_1);
   };
   function CallToAction() {
     Companion_getInstance_54();
   }
-  defineProp(protoOf(CallToAction), 'tip', protoOf(CallToAction).h3h);
+  defineProp(protoOf(CallToAction), 'tip', protoOf(CallToAction).i3h);
   defineProp(protoOf(CallToAction), 'stylesParent', function () {
     return this.a2t();
   });
@@ -9868,7 +9876,7 @@
   var XMLNS_TRACT;
   function Companion_52() {
     Companion_instance_52 = this;
-    this.v3h_1 = 'header';
+    this.w3h_1 = 'header';
   }
   var Companion_instance_52;
   function Companion_getInstance_55() {
@@ -9885,8 +9893,8 @@
     parser.u2r(2, tmp, 'header');
     var tmp_0 = $this;
     var tmp0_safe_receiver = parser.o2t(get_XML_BACKGROUND_COLOR());
-    tmp_0.x3h_1 = tmp0_safe_receiver == null ? null : toColorOrNull(tmp0_safe_receiver);
-    $this.y3h_1 = parser.m2v(get_XMLNS_TRAINING(), 'tip');
+    tmp_0.y3h_1 = tmp0_safe_receiver == null ? null : toColorOrNull(tmp0_safe_receiver);
+    $this.z3h_1 = parser.m2v(get_XMLNS_TRAINING(), 'tip');
     var number = null;
     var title = null;
     // Inline function 'org.cru.godtools.shared.tool.parser.xml.parseChildren' call
@@ -9923,28 +9931,28 @@
     return Header_init_$Init$(page, parser, objectCreate(protoOf(Header)));
   }
   protoOf(Header).s36 = function () {
-    var tmp0_elvis_lhs = this.x3h_1;
+    var tmp0_elvis_lhs = this.y3h_1;
     return tmp0_elvis_lhs == null ? this.z2x() : tmp0_elvis_lhs;
   };
   protoOf(Header).x2x = function () {
     return this.a2y();
   };
-  protoOf(Header).z3h = function () {
+  protoOf(Header).a3i = function () {
     return this.number;
   };
   protoOf(Header).x36 = function () {
     return this.title;
   };
-  protoOf(Header).u3h = function () {
-    return this.y3h_1;
+  protoOf(Header).v3h = function () {
+    return this.z3h_1;
   };
-  protoOf(Header).h3h = function () {
-    return this.a2p().v37(this.y3h_1);
+  protoOf(Header).i3h = function () {
+    return this.a2p().v37(this.z3h_1);
   };
   function Header() {
     Companion_getInstance_55();
   }
-  defineProp(protoOf(Header), 'tip', protoOf(Header).h3h);
+  defineProp(protoOf(Header), 'tip', protoOf(Header).i3h);
   defineProp(protoOf(Header), 'stylesParent', function () {
     return this.a2t();
   });
@@ -9953,7 +9961,7 @@
   });
   function Companion_53() {
     Companion_instance_53 = this;
-    this.a3i_1 = 'hero';
+    this.b3i_1 = 'hero';
   }
   var Companion_instance_53;
   function Companion_getInstance_56() {
@@ -9965,7 +9973,7 @@
     var tmp$ret$0;
     // Inline function 'kotlin.getValue' call
     var tmp0_getValue = headingParent$factory();
-    tmp$ret$0 = $this.c3i_1.o1();
+    tmp$ret$0 = $this.d3i_1.o1();
     return tmp$ret$0;
   }
   function Hero_init_$Init$(page, parser, $this) {
@@ -9979,7 +9987,7 @@
     var tmp$ret$0;
     // Inline function 'kotlin.collections.mutableListOf' call
     tmp$ret$0 = ArrayList_init_$Create$();
-    tmp_0.e3i_1 = tmp$ret$0;
+    tmp_0.f3i_1 = tmp$ret$0;
     var heading = null;
     var tmp_1 = $this;
     var tmp$ret$8;
@@ -10018,7 +10026,7 @@
           if (tmp1_subject === 'events') {
             var tmp2_this = $this;
             // Inline function 'kotlin.collections.plusAssign' call
-            var tmp0_plusAssign = tmp2_this.e3i_1;
+            var tmp0_plusAssign = tmp2_this.f3i_1;
             var tmp1_plusAssign = Companion_getInstance_6().y2r(parser, $this);
             addAll(tmp0_plusAssign, tmp1_plusAssign);
           }
@@ -10074,7 +10082,7 @@
     tmp$ret$6 = tmp$ret$5.u7();
     tmp$ret$7 = tmp$ret$6;
     tmp$ret$8 = tmp$ret$7;
-    tmp_1.d3i_1 = tmp$ret$8;
+    tmp_1.e3i_1 = tmp$ret$8;
     $this.heading = heading;
     return $this;
   }
@@ -10087,11 +10095,11 @@
     heading = heading === VOID ? null : heading;
     BaseModel.call($this, page);
     Hero.call($this);
-    $this.e3i_1 = analyticsEvents;
+    $this.f3i_1 = analyticsEvents;
     var tmp = $this;
     var tmp0_safe_receiver = heading;
     tmp.heading = tmp0_safe_receiver == null ? null : tmp0_safe_receiver(_get_headingParent__2ts5bv($this));
-    $this.d3i_1 = emptyList();
+    $this.e3i_1 = emptyList();
     return $this;
   }
   function createTestHero(page, analyticsEvents, heading) {
@@ -10107,15 +10115,15 @@
       return stylesOverride(this$0, VOID, Hero$headingParent$delegate$lambda$lambda(this$0));
     };
   }
-  protoOf(Hero).f3i = function () {
+  protoOf(Hero).g3i = function () {
     return this.heading;
   };
   protoOf(Hero).t2s = function () {
-    return this.d3i_1;
-  };
-  protoOf(Hero).o3d = function () {
     return this.e3i_1;
   };
+  protoOf(Hero).p3d = function () {
+    return this.f3i_1;
+  };
   protoOf(Hero)._getAnalyticsEvents = function (type) {
     var tmp0_subject = type;
     var tmp0 = tmp0_subject.d4_1;
@@ -10124,7 +10132,7 @@
       case 1:
         var tmp$ret$2;
         // Inline function 'kotlin.collections.filter' call
-        var tmp1_filter = this.e3i_1;
+        var tmp1_filter = this.f3i_1;
         var tmp$ret$1;
         // Inline function 'kotlin.collections.filterTo' call
         var tmp0_filterTo = ArrayList_init_$Create$();
@@ -10146,7 +10154,7 @@
       case 2:
         var tmp$ret$5;
         // Inline function 'kotlin.collections.filter' call
-        var tmp3_filter = this.e3i_1;
+        var tmp3_filter = this.f3i_1;
         var tmp$ret$4;
         // Inline function 'kotlin.collections.filterTo' call
         var tmp2_filterTo = ArrayList_init_$Create$();
@@ -10174,7 +10182,7 @@
   function Hero() {
     Companion_getInstance_56();
     var tmp = this;
-    tmp.c3i_1 = lazy(Hero$headingParent$delegate$lambda(this));
+    tmp.d3i_1 = lazy(Hero$headingParent$delegate$lambda(this));
   }
   defineProp(protoOf(Hero), '_content', function () {
     return this.t2s();
@@ -10195,7 +10203,7 @@
   }
   function Companion_54() {
     Companion_instance_54 = this;
-    this.g3i_1 = 'modal';
+    this.h3i_1 = 'modal';
   }
   var Companion_instance_54;
   function Companion_getInstance_57() {
@@ -10310,14 +10318,14 @@
     tmp$ret$7 = tmp$ret$6.u7();
     tmp$ret$8 = tmp$ret$7;
     tmp$ret$9 = tmp$ret$8;
-    tmp_2.c3j_1 = tmp$ret$9;
+    tmp_2.d3j_1 = tmp$ret$9;
     $this.title = title;
     return $this;
   }
   function Modal_init_$Create$(parent, parser) {
     return Modal_init_$Init$(parent, parser, objectCreate(protoOf(Modal)));
   }
-  protoOf(Modal).d3j = function () {
+  protoOf(Modal).e3j = function () {
     return this.page;
   };
   protoOf(Modal).p2u = function () {
@@ -10327,9 +10335,9 @@
     return this.title;
   };
   protoOf(Modal).t2s = function () {
-    return this.c3j_1;
+    return this.d3j_1;
   };
-  protoOf(Modal).m3e = function () {
+  protoOf(Modal).n3e = function () {
     return this.listeners;
   };
   protoOf(Modal).p36 = function () {
@@ -10371,11 +10379,11 @@
   });
   function Companion_55() {
     Companion_instance_55 = this;
-    this.e3j_1 = 'card';
-    this.f3j_1 = 'label';
-    this.g3j_1 = 'hidden';
-    this.h3j_1 = ImageScaleType_FILL_X_getInstance();
-    this.i3j_1 = Companion_getInstance_22().CENTER;
+    this.f3j_1 = 'card';
+    this.g3j_1 = 'label';
+    this.h3j_1 = 'hidden';
+    this.i3j_1 = ImageScaleType_FILL_X_getInstance();
+    this.j3j_1 = Companion_getInstance_22().CENTER;
   }
   var Companion_instance_55;
   function Companion_getInstance_58() {
@@ -10387,7 +10395,7 @@
     var tmp$ret$0;
     // Inline function 'kotlin.getValue' call
     var tmp0_getValue = labelParent$factory();
-    tmp$ret$0 = $this.p3j_1.o1();
+    tmp$ret$0 = $this.q3j_1.o1();
     return tmp$ret$0;
   }
   function Card_init_$Init$_1(page, position, parser, $this) {
@@ -10418,24 +10426,24 @@
     tmp_2.dismissListeners = toSet_0(tmp$ret$1);
     var tmp_3 = $this;
     var tmp2_safe_receiver = parser.o2t(get_XML_BACKGROUND_COLOR());
-    tmp_3.k3j_1 = tmp2_safe_receiver == null ? null : toColorOrNull(tmp2_safe_receiver);
-    $this.l3j_1 = parser.o2t(get_XML_BACKGROUND_IMAGE());
+    tmp_3.l3j_1 = tmp2_safe_receiver == null ? null : toColorOrNull(tmp2_safe_receiver);
+    $this.m3j_1 = parser.o2t(get_XML_BACKGROUND_IMAGE());
     var tmp_4 = $this;
     var tmp3_safe_receiver = parser.o2t(get_XML_BACKGROUND_IMAGE_GRAVITY());
     var tmp4_elvis_lhs = tmp3_safe_receiver == null ? null : Companion_getInstance_22().y2w(tmp3_safe_receiver);
-    tmp_4.m3j_1 = tmp4_elvis_lhs == null ? Companion_getInstance_58().i3j_1 : tmp4_elvis_lhs;
+    tmp_4.n3j_1 = tmp4_elvis_lhs == null ? Companion_getInstance_58().j3j_1 : tmp4_elvis_lhs;
     var tmp_5 = $this;
     var tmp5_safe_receiver = parser.o2t(get_XML_BACKGROUND_IMAGE_SCALE_TYPE());
     var tmp6_elvis_lhs = tmp5_safe_receiver == null ? null : Companion_getInstance_24().j31(tmp5_safe_receiver);
-    tmp_5.n3j_1 = tmp6_elvis_lhs == null ? Companion_getInstance_58().h3j_1 : tmp6_elvis_lhs;
+    tmp_5.o3j_1 = tmp6_elvis_lhs == null ? Companion_getInstance_58().i3j_1 : tmp6_elvis_lhs;
     var tmp_6 = $this;
     var tmp7_safe_receiver = parser.o2t(get_XML_TEXT_COLOR());
-    tmp_6.o3j_1 = tmp7_safe_receiver == null ? null : toColorOrNull(tmp7_safe_receiver);
+    tmp_6.p3j_1 = tmp7_safe_receiver == null ? null : toColorOrNull(tmp7_safe_receiver);
     var tmp_7 = $this;
     var tmp$ret$2;
     // Inline function 'kotlin.collections.mutableListOf' call
     tmp$ret$2 = ArrayList_init_$Create$();
-    tmp_7.r3j_1 = tmp$ret$2;
+    tmp_7.s3j_1 = tmp$ret$2;
     var label = null;
     var tmp_8 = $this;
     var tmp$ret$10;
@@ -10474,7 +10482,7 @@
           if (tmp1_subject === 'events') {
             var tmp2_this = $this;
             // Inline function 'kotlin.collections.plusAssign' call
-            var tmp0_plusAssign = tmp2_this.r3j_1;
+            var tmp0_plusAssign = tmp2_this.s3j_1;
             var tmp1_plusAssign = Companion_getInstance_6().y2r(parser, $this);
             addAll(tmp0_plusAssign, tmp1_plusAssign);
           }
@@ -10535,7 +10543,7 @@
     tmp$ret$8 = tmp$ret$7.u7();
     tmp$ret$9 = tmp$ret$8;
     tmp$ret$10 = tmp$ret$9;
-    tmp_8.q3j_1 = tmp$ret$10;
+    tmp_8.r3j_1 = tmp$ret$10;
     $this.label = label;
     return $this;
   }
@@ -10561,7 +10569,7 @@
     parser.u2r(2, tmp, 'page');
     var tmp_0 = $this;
     var tmp0_safe_receiver = parser.o2t('card-text-color');
-    tmp_0.a3j_1 = tmp0_safe_receiver == null ? null : toColorOrNull(tmp0_safe_receiver);
+    tmp_0.b3j_1 = tmp0_safe_receiver == null ? null : toColorOrNull(tmp0_safe_receiver);
     var header = null;
     var hero = null;
     var tmp_1 = $this;
@@ -10659,7 +10667,7 @@
     callToAction = callToAction === VOID ? null : callToAction;
     Page_init_$Init$_0(manifest, VOID, fileName, VOID, primaryColor, backgroundColor, backgroundImage, backgroundImageGravity, backgroundImageScaleType, VOID, cardBackgroundColor, textColor, textScale, $this);
     TractPage.call($this);
-    $this.a3j_1 = cardTextColor;
+    $this.b3j_1 = cardTextColor;
     $this.header = null;
     $this.hero = null;
     var tmp_0 = $this;
@@ -10680,16 +10688,16 @@
   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).d3j = function () {
+  protoOf(Card_1).e3j = function () {
     return this.page;
   };
   protoOf(Card_1).p2u = function () {
     return this.page.id + '-' + this.position;
   };
-  protoOf(Card_1).i3e = function () {
+  protoOf(Card_1).j3e = function () {
     return this.position;
   };
-  protoOf(Card_1).s3j = function () {
+  protoOf(Card_1).t3j = function () {
     var tmp$ret$1;
     // Inline function 'kotlin.takeUnless' call
     var tmp0_takeUnless = this.page.visibleCards.l1(this);
@@ -10706,40 +10714,40 @@
     tmp$ret$1 = tmp;
     return tmp$ret$1;
   };
-  protoOf(Card_1).t3j = function () {
+  protoOf(Card_1).u3j = function () {
     return equals(this, lastOrNull(this.page.visibleCards));
   };
-  protoOf(Card_1).l3e = function () {
+  protoOf(Card_1).m3e = function () {
     return this.isHidden;
   };
-  protoOf(Card_1).m3e = function () {
+  protoOf(Card_1).n3e = function () {
     return this.listeners;
   };
   protoOf(Card_1).p36 = function () {
     return this.dismissListeners;
   };
   protoOf(Card_1).s36 = function () {
-    var tmp0_elvis_lhs = this.k3j_1;
+    var tmp0_elvis_lhs = this.l3j_1;
     return tmp0_elvis_lhs == null ? this.page.c2y() : tmp0_elvis_lhs;
   };
   protoOf(Card_1).t36 = function () {
-    return getResource(this, this.l3j_1);
+    return getResource(this, this.m3j_1);
   };
   protoOf(Card_1).u36 = function () {
-    return this.m3j_1;
+    return this.n3j_1;
   };
   protoOf(Card_1).v36 = function () {
-    return this.n3j_1;
+    return this.o3j_1;
   };
   protoOf(Card_1).x2x = function () {
-    var tmp0_elvis_lhs = this.o3j_1;
+    var tmp0_elvis_lhs = this.p3j_1;
     return tmp0_elvis_lhs == null ? this.page.cardTextColor : tmp0_elvis_lhs;
   };
-  protoOf(Card_1).t3h = function () {
+  protoOf(Card_1).u3h = function () {
     return this.label;
   };
   protoOf(Card_1).t2s = function () {
-    return this.q3j_1;
+    return this.r3j_1;
   };
   protoOf(Card_1).c2t = function () {
     var tmp$ret$3;
@@ -10764,8 +10772,8 @@
     tmp$ret$3 = tmp$ret$2;
     return tmp$ret$3;
   };
-  protoOf(Card_1).o3d = function () {
-    return this.r3j_1;
+  protoOf(Card_1).p3d = function () {
+    return this.s3j_1;
   };
   protoOf(Card_1)._getAnalyticsEvents = function (type) {
     var tmp0_subject = type;
@@ -10775,7 +10783,7 @@
       case 1:
         var tmp$ret$2;
         // Inline function 'kotlin.collections.filter' call
-        var tmp1_filter = this.r3j_1;
+        var tmp1_filter = this.s3j_1;
         var tmp$ret$1;
         // Inline function 'kotlin.collections.filterTo' call
         var tmp0_filterTo = ArrayList_init_$Create$();
@@ -10797,7 +10805,7 @@
       case 2:
         var tmp$ret$5;
         // Inline function 'kotlin.collections.filter' call
-        var tmp3_filter = this.r3j_1;
+        var tmp3_filter = this.s3j_1;
         var tmp$ret$4;
         // Inline function 'kotlin.collections.filterTo' call
         var tmp2_filterTo = ArrayList_init_$Create$();
@@ -10825,11 +10833,11 @@
   function Card_1() {
     Companion_getInstance_58();
     var tmp = this;
-    tmp.p3j_1 = lazy(TractPage$Card$labelParent$delegate$lambda(this));
+    tmp.q3j_1 = lazy(TractPage$Card$labelParent$delegate$lambda(this));
   }
   defineProp(protoOf(Card_1), 'id', protoOf(Card_1).p2u);
-  defineProp(protoOf(Card_1), 'visiblePosition', protoOf(Card_1).s3j);
-  defineProp(protoOf(Card_1), 'isLastVisibleCard', protoOf(Card_1).t3j);
+  defineProp(protoOf(Card_1), 'visiblePosition', protoOf(Card_1).t3j);
+  defineProp(protoOf(Card_1), 'isLastVisibleCard', protoOf(Card_1).u3j);
   defineProp(protoOf(Card_1), 'backgroundImage', protoOf(Card_1).t36);
   defineProp(protoOf(Card_1), '_content', function () {
     return this.t2s();
@@ -10932,25 +10940,25 @@
     tmp$ret$2 = tmp$ret$1;
     return tmp$ret$2;
   }
-  protoOf(TractPage).u3j = function () {
+  protoOf(TractPage).v3j = function () {
     return equals(lastOrNull(this.a2p()._pages), this);
   };
-  protoOf(TractPage).o3d = function () {
-    return this.z3i_1;
+  protoOf(TractPage).p3d = function () {
+    return this.a3j_1;
   };
-  protoOf(TractPage).v3j = function () {
+  protoOf(TractPage).w3j = function () {
     return this.header;
   };
-  protoOf(TractPage).w3j = function () {
+  protoOf(TractPage).x3j = function () {
     return this.hero;
   };
-  protoOf(TractPage).x3j = function () {
+  protoOf(TractPage).y3j = function () {
     return this.modals;
   };
-  protoOf(TractPage).y3j = function () {
+  protoOf(TractPage).z3j = function () {
     return this.callToAction;
   };
-  protoOf(TractPage).p3d = function (type) {
+  protoOf(TractPage).q3d = function (type) {
     return type.equals(Type_TRACT_getInstance());
   };
   protoOf(TractPage).findModal = function (id) {
@@ -10973,10 +10981,10 @@
     }
     return tmp$ret$1;
   };
-  protoOf(TractPage).z3j = function () {
+  protoOf(TractPage).a3k = function () {
     return this.cards;
   };
-  protoOf(TractPage).a3k = function () {
+  protoOf(TractPage).b3k = function () {
     var tmp$ret$2;
     // Inline function 'kotlin.collections.filter' call
     var tmp1_filter = this.cards;
@@ -10997,16 +11005,16 @@
     tmp$ret$2 = tmp$ret$1;
     return tmp$ret$2;
   };
-  protoOf(TractPage).b3k = function () {
-    var tmp0_elvis_lhs = this.a3j_1;
+  protoOf(TractPage).c3k = function () {
+    var tmp0_elvis_lhs = this.b3j_1;
     return tmp0_elvis_lhs == null ? this.x2x() : tmp0_elvis_lhs;
   };
   function TractPage() {
-    this.z3i_1 = emptyList();
+    this.a3j_1 = emptyList();
   }
-  defineProp(protoOf(TractPage), 'isLastPage', protoOf(TractPage).u3j);
-  defineProp(protoOf(TractPage), 'visibleCards', protoOf(TractPage).a3k);
-  defineProp(protoOf(TractPage), 'cardTextColor', protoOf(TractPage).b3k);
+  defineProp(protoOf(TractPage), 'isLastPage', protoOf(TractPage).v3j);
+  defineProp(protoOf(TractPage), 'visibleCards', protoOf(TractPage).b3k);
+  defineProp(protoOf(TractPage), 'cardTextColor', protoOf(TractPage).c3k);
   defineProp(protoOf(TractPage), 'stylesParent', function () {
     return this.a2t();
   });
@@ -11048,11 +11056,11 @@
     return EMPTY_instance;
   }
   function SetOnceProperty() {
-    this.c3k_1 = EMPTY_getInstance();
+    this.d3k_1 = EMPTY_getInstance();
   }
-  protoOf(SetOnceProperty).d3k = function (thisRef, property) {
+  protoOf(SetOnceProperty).e3k = function (thisRef, property) {
     // Inline function 'kotlin.check' call
-    var tmp0_check = !(this.c3k_1 === EMPTY_getInstance());
+    var tmp0_check = !(this.d3k_1 === EMPTY_getInstance());
     // Inline function 'kotlin.contracts.contract' call
     if (!tmp0_check) {
       var tmp$ret$0;
@@ -11061,15 +11069,15 @@
       var message = tmp$ret$0;
       throw IllegalStateException_init_$Create$(toString(message));
     }
-    var tmp = this.c3k_1;
+    var tmp = this.d3k_1;
     return (tmp == null ? true : isObject(tmp)) ? tmp : THROW_CCE();
   };
   protoOf(SetOnceProperty).o37 = function (thisRef, property) {
-    return this.d3k(isObject(thisRef) ? thisRef : THROW_CCE(), property);
+    return this.e3k(isObject(thisRef) ? thisRef : THROW_CCE(), property);
   };
-  protoOf(SetOnceProperty).e3k = function (thisRef, property, value) {
+  protoOf(SetOnceProperty).f3k = function (thisRef, property, value) {
     // Inline function 'kotlin.check' call
-    var tmp0_check = this.c3k_1 === EMPTY_getInstance();
+    var tmp0_check = this.d3k_1 === EMPTY_getInstance();
     // Inline function 'kotlin.contracts.contract' call
     if (!tmp0_check) {
       var tmp$ret$0;
@@ -11078,11 +11086,11 @@
       var message = tmp$ret$0;
       throw IllegalStateException_init_$Create$(toString(message));
     }
-    this.c3k_1 = value;
+    this.d3k_1 = value;
   };
   protoOf(SetOnceProperty).a36 = function (thisRef, property, value) {
     var tmp = isObject(thisRef) ? thisRef : THROW_CCE();
-    return this.e3k(tmp, property, (value == null ? true : isObject(value)) ? value : THROW_CCE());
+    return this.f3k(tmp, property, (value == null ? true : isObject(value)) ? value : THROW_CCE());
   };
   function get_isHttpUrl(_this__u8e3s4) {
     var tmp$ret$0;
@@ -11114,15 +11122,15 @@
   }
   function QName(uri, local) {
     uri = uri === VOID ? null : uri;
-    this.f3k_1 = uri;
-    this.g3k_1 = local;
+    this.g3k_1 = uri;
+    this.h3k_1 = local;
   }
   protoOf(QName).toString = function () {
-    return 'QName(uri=' + this.f3k_1 + ', local=' + this.g3k_1 + ')';
+    return 'QName(uri=' + this.g3k_1 + ', local=' + this.h3k_1 + ')';
   };
   protoOf(QName).hashCode = function () {
-    var result = this.f3k_1 == null ? 0 : getStringHashCode(this.f3k_1);
-    result = imul(result, 31) + getStringHashCode(this.g3k_1) | 0;
+    var result = this.g3k_1 == null ? 0 : getStringHashCode(this.g3k_1);
+    result = imul(result, 31) + getStringHashCode(this.h3k_1) | 0;
     return result;
   };
   protoOf(QName).equals = function (other) {
@@ -11131,9 +11139,9 @@
     if (!(other instanceof QName))
       return false;
     var tmp0_other_with_cast = other instanceof QName ? other : THROW_CCE();
-    if (!(this.f3k_1 == tmp0_other_with_cast.f3k_1))
+    if (!(this.g3k_1 == tmp0_other_with_cast.g3k_1))
       return false;
-    if (!(this.g3k_1 === tmp0_other_with_cast.g3k_1))
+    if (!(this.h3k_1 === tmp0_other_with_cast.h3k_1))
       return false;
     return true;
   };
@@ -11141,63 +11149,63 @@
     qname = qname === VOID ? null : qname;
     content = content === VOID ? null : content;
     attrs = attrs === VOID ? null : attrs;
-    this.h3k_1 = type;
-    this.i3k_1 = qname;
-    this.j3k_1 = content;
-    this.k3k_1 = attrs;
+    this.i3k_1 = type;
+    this.j3k_1 = qname;
+    this.k3k_1 = content;
+    this.l3k_1 = attrs;
   }
   function enqueueEvent($this, event) {
     var tmp$ret$0;
     // Inline function 'kotlin.text.isNotEmpty' call
-    var tmp0_isNotEmpty = $this.n3k_1;
+    var tmp0_isNotEmpty = $this.o3k_1;
     tmp$ret$0 = charSequenceLength(tmp0_isNotEmpty) > 0;
     if (tmp$ret$0) {
       var tmp0_this = $this;
       // Inline function 'kotlin.collections.plusAssign' call
-      var tmp1_plusAssign = tmp0_this.m3k_1;
+      var tmp1_plusAssign = tmp0_this.n3k_1;
       Companion_getInstance_59();
-      var tmp2_plusAssign = new ParserEvent(4, VOID, $this.n3k_1.toString());
+      var tmp2_plusAssign = new ParserEvent(4, VOID, $this.o3k_1.toString());
       tmp1_plusAssign.b(tmp2_plusAssign);
-      $this.n3k_1.jb();
+      $this.o3k_1.jb();
     }
     var tmp1_this = $this;
     // Inline function 'kotlin.collections.plusAssign' call
-    var tmp3_plusAssign = tmp1_this.m3k_1;
+    var tmp3_plusAssign = tmp1_this.n3k_1;
     tmp3_plusAssign.b(event);
   }
   function SaxXmlPullParser() {
     var tmp = this;
     Companion_getInstance_59();
-    tmp.l3k_1 = new ParserEvent(0);
+    tmp.m3k_1 = new ParserEvent(0);
     var tmp_0 = this;
     var tmp$ret$0;
     // Inline function 'kotlin.collections.mutableListOf' call
     tmp$ret$0 = ArrayList_init_$Create$();
-    tmp_0.m3k_1 = tmp$ret$0;
-    this.n3k_1 = StringBuilder_init_$Create$();
+    tmp_0.n3k_1 = tmp$ret$0;
+    this.o3k_1 = StringBuilder_init_$Create$();
   }
   protoOf(SaxXmlPullParser).v2r = function () {
-    return this.l3k_1.h3k_1;
+    return this.m3k_1.i3k_1;
   };
   protoOf(SaxXmlPullParser).w2r = function () {
-    var tmp0_safe_receiver = this.l3k_1.i3k_1;
-    return tmp0_safe_receiver == null ? null : tmp0_safe_receiver.f3k_1;
+    var tmp0_safe_receiver = this.m3k_1.j3k_1;
+    return tmp0_safe_receiver == null ? null : tmp0_safe_receiver.g3k_1;
   };
   protoOf(SaxXmlPullParser).id = function () {
-    var tmp0_safe_receiver = this.l3k_1.i3k_1;
-    return tmp0_safe_receiver == null ? null : tmp0_safe_receiver.g3k_1;
+    var tmp0_safe_receiver = this.m3k_1.j3k_1;
+    return tmp0_safe_receiver == null ? null : tmp0_safe_receiver.h3k_1;
   };
   protoOf(SaxXmlPullParser).u2r = function (type, namespace, name) {
     var tmp$ret$0;
     // Inline function 'kotlin.with' call
-    var tmp0_with = this.l3k_1;
+    var tmp0_with = this.m3k_1;
     // Inline function 'kotlin.contracts.contract' call
-    if (!(tmp0_with.h3k_1 === type))
+    if (!(tmp0_with.i3k_1 === type))
       throw new XmlPullParserException('expected ' + type);
     var tmp;
     if (!(namespace == null)) {
-      var tmp0_safe_receiver = tmp0_with.i3k_1;
-      tmp = !(namespace == (tmp0_safe_receiver == null ? null : tmp0_safe_receiver.f3k_1));
+      var tmp0_safe_receiver = tmp0_with.j3k_1;
+      tmp = !(namespace == (tmp0_safe_receiver == null ? null : tmp0_safe_receiver.g3k_1));
     } else {
       tmp = false;
     }
@@ -11206,8 +11214,8 @@
     var tmp_0;
     var tmp_1;
     if (!(name == null)) {
-      var tmp1_safe_receiver = tmp0_with.i3k_1;
-      tmp_1 = !((tmp1_safe_receiver == null ? null : tmp1_safe_receiver.g3k_1) == name);
+      var tmp1_safe_receiver = tmp0_with.j3k_1;
+      tmp_1 = !((tmp1_safe_receiver == null ? null : tmp1_safe_receiver.h3k_1) == name);
     } else {
       tmp_1 = false;
     }
@@ -11220,12 +11228,12 @@
   protoOf(SaxXmlPullParser).h = function () {
     var tmp$ret$0;
     // Inline function 'kotlin.also' call
-    var tmp0_also = removeFirst(this.m3k_1);
+    var tmp0_also = removeFirst(this.n3k_1);
     // Inline function 'kotlin.contracts.contract' call
     // Inline function 'org.cru.godtools.shared.tool.parser.xml.SaxXmlPullParser.next.<anonymous>' call
-    this.l3k_1 = tmp0_also;
+    this.m3k_1 = tmp0_also;
     tmp$ret$0 = tmp0_also;
-    return tmp$ret$0.h3k_1;
+    return tmp$ret$0.i3k_1;
   };
   protoOf(SaxXmlPullParser).o2p = function () {
     var tmp;
@@ -11234,7 +11242,7 @@
     if (tmp_0 === 4) {
       var tmp$ret$0;
       // Inline function 'kotlin.text.isNullOrBlank' call
-      var tmp0_isNullOrBlank = this.l3k_1.j3k_1;
+      var tmp0_isNullOrBlank = this.m3k_1.k3k_1;
       // Inline function 'kotlin.contracts.contract' call
       tmp$ret$0 = tmp0_isNullOrBlank == null ? true : isBlank(tmp0_isNullOrBlank);
       tmp = tmp$ret$0;
@@ -11244,23 +11252,23 @@
     if (tmp) {
       this.h();
     }
-    var event = this.l3k_1;
+    var event = this.m3k_1;
     var tmp_1;
     Companion_getInstance_59();
-    if (!(event.h3k_1 === 2)) {
+    if (!(event.i3k_1 === 2)) {
       Companion_getInstance_59();
-      tmp_1 = !(event.h3k_1 === 3);
+      tmp_1 = !(event.i3k_1 === 3);
     } else {
       tmp_1 = false;
     }
     if (tmp_1) {
-      throw new XmlPullParserException('Expected start or end tag. Found: ' + event.h3k_1);
+      throw new XmlPullParserException('Expected start or end tag. Found: ' + event.i3k_1);
     }
-    return event.h3k_1;
+    return event.i3k_1;
   };
-  protoOf(SaxXmlPullParser).n3b = function () {
+  protoOf(SaxXmlPullParser).o3b = function () {
     Companion_getInstance_59();
-    this.q3g(2);
+    this.r3g(2);
     var tmp0_subject = this.h();
     var tmp;
     Companion_getInstance_59();
@@ -11269,7 +11277,7 @@
       // Inline function 'kotlin.also' call
       var tmp$ret$0;
       // Inline function 'kotlin.text.orEmpty' call
-      var tmp0_orEmpty = this.l3k_1.j3k_1;
+      var tmp0_orEmpty = this.m3k_1.k3k_1;
       var tmp0_elvis_lhs = tmp0_orEmpty;
       tmp$ret$0 = tmp0_elvis_lhs == null ? '' : tmp0_elvis_lhs;
       var tmp1_also = tmp$ret$0;
@@ -11304,13 +11312,13 @@
   protoOf(SaxXmlPullParser).m2v = function (namespace, name) {
     var tmp$ret$1;
     // Inline function 'kotlin.takeIf' call
-    var tmp0_takeIf = this.l3k_1;
+    var tmp0_takeIf = this.m3k_1;
     // Inline function 'kotlin.contracts.contract' call
     var tmp;
     var tmp$ret$0;
     // Inline function 'org.cru.godtools.shared.tool.parser.xml.SaxXmlPullParser.getAttributeValue.<anonymous>' call
     Companion_getInstance_59();
-    tmp$ret$0 = tmp0_takeIf.h3k_1 === 2;
+    tmp$ret$0 = tmp0_takeIf.i3k_1 === 2;
     if (tmp$ret$0) {
       tmp = tmp0_takeIf;
     } else {
@@ -11325,27 +11333,27 @@
       tmp_0 = tmp0_elvis_lhs;
     }
     var event = tmp_0;
-    var tmp1_safe_receiver = event.k3k_1;
+    var tmp1_safe_receiver = event.l3k_1;
     return tmp1_safe_receiver == null ? null : tmp1_safe_receiver.c2(new QName(namespace, name));
   };
-  protoOf(SaxXmlPullParser).o3k = function (qname, attrs) {
+  protoOf(SaxXmlPullParser).p3k = function (qname, attrs) {
     Companion_getInstance_59();
     enqueueEvent(this, new ParserEvent(2, qname, VOID, attrs));
   };
-  protoOf(SaxXmlPullParser).p3k = function (text) {
-    this.n3k_1.ib(text);
+  protoOf(SaxXmlPullParser).q3k = function (text) {
+    this.o3k_1.ib(text);
   };
-  protoOf(SaxXmlPullParser).q3k = function (qname) {
+  protoOf(SaxXmlPullParser).r3k = function (qname) {
     Companion_getInstance_59();
     enqueueEvent(this, new ParserEvent(3, qname));
   };
   function Companion_56() {
     Companion_instance_56 = this;
-    this.r3k_1 = 0;
-    this.s3k_1 = 1;
-    this.t3k_1 = 2;
-    this.u3k_1 = 3;
-    this.v3k_1 = 4;
+    this.s3k_1 = 0;
+    this.t3k_1 = 1;
+    this.u3k_1 = 2;
+    this.v3k_1 = 3;
+    this.w3k_1 = 4;
   }
   var Companion_instance_56;
   function Companion_getInstance_59() {
@@ -11399,26 +11407,26 @@
   }
   var SAX_OPTIONS;
   function InternalSAXParser($outer) {
-    this.w3k_1 = $outer;
+    this.x3k_1 = $outer;
     SAXParser.call(this, true, get_SAX_OPTIONS());
   }
-  protoOf(InternalSAXParser).x3k = function (tag) {
-    return this.w3k_1.o3k(new QName(tag.uri, tag.local), convert(tag.attributes, this.w3k_1));
+  protoOf(InternalSAXParser).y3k = function (tag) {
+    return this.x3k_1.p3k(new QName(tag.uri, tag.local), convert(tag.attributes, this.x3k_1));
   };
   protoOf(InternalSAXParser).onopentag = function (tag) {
-    return this.x3k(tag);
+    return this.y3k(tag);
   };
-  protoOf(InternalSAXParser).y3k = function (tagName) {
-    return this.w3k_1.q3k(new QName(VOID, tagName));
+  protoOf(InternalSAXParser).z3k = function (tagName) {
+    return this.x3k_1.r3k(new QName(VOID, tagName));
   };
   protoOf(InternalSAXParser).onclosetag = function (tagName) {
-    return this.y3k(tagName);
+    return this.z3k(tagName);
   };
-  protoOf(InternalSAXParser).z3k = function (t) {
-    return this.w3k_1.p3k(t);
+  protoOf(InternalSAXParser).a3l = function (t) {
+    return this.x3k_1.q3k(t);
   };
   protoOf(InternalSAXParser).ontext = function (t) {
-    return this.z3k(t);
+    return this.a3l(t);
   };
   function convert(_this__u8e3s4, $this) {
     var tmp$ret$7;
@@ -11486,16 +11494,16 @@
     tmp0_apply.write(xml);
     tmp0_apply.close();
     tmp$ret$0 = tmp0_apply;
-    tmp.d3l_1 = tmp$ret$0;
+    tmp.e3l_1 = tmp$ret$0;
   }
   function SAX_OPTIONS$1() {
-    this.e3l_1 = true;
+    this.f3l_1 = true;
   }
-  protoOf(SAX_OPTIONS$1).f3l = function () {
-    return this.e3l_1;
+  protoOf(SAX_OPTIONS$1).g3l = function () {
+    return this.f3l_1;
   };
   defineProp(protoOf(SAX_OPTIONS$1), 'xmlns', function () {
-    return this.f3l();
+    return this.g3l();
   });
   var properties_initialized_JsXmlPullParser_kt_u4cdem;
   function _init_properties_JsXmlPullParser_kt__2zt5j4() {
@@ -11507,8 +11515,8 @@
   }
   function $getXmlParserCOROUTINE$1(_this__u8e3s4, fileName, resultContinuation) {
     CoroutineImpl.call(this, resultContinuation);
-    this.o3l_1 = _this__u8e3s4;
-    this.p3l_1 = fileName;
+    this.p3l_1 = _this__u8e3s4;
+    this.q3l_1 = fileName;
   }
   protoOf($getXmlParserCOROUTINE$1).ue = function () {
     var suspendResult = this.de_1;
@@ -11519,7 +11527,7 @@
           case 0:
             this.ce_1 = 2;
             this.be_1 = 1;
-            suspendResult = await_0(this.o3l_1.readFile(this.p3l_1), this);
+            suspendResult = await_0(this.p3l_1.readFile(this.q3l_1), this);
             if (suspendResult === get_COROUTINE_SUSPENDED()) {
               return suspendResult;
             }
@@ -11552,14 +11560,14 @@
   function JsXmlPullParserFactory() {
     XmlPullParserFactory.call(this);
   }
-  protoOf(JsXmlPullParserFactory).q3l = function (fileName, $completion) {
+  protoOf(JsXmlPullParserFactory).r3l = function (fileName, $completion) {
     var tmp = new $getXmlParserCOROUTINE$1(this, fileName, $completion);
     tmp.de_1 = Unit_getInstance();
     tmp.ee_1 = null;
     return tmp.ue();
   };
   protoOf(JsXmlPullParserFactory).n2p = function (fileName, $completion) {
-    return this.q3l(fileName, $completion);
+    return this.r3l(fileName, $completion);
   };
   function XmlPullParserException(s) {
     Exception_init_$Init$(s, this);
@@ -11737,9 +11745,9 @@
   protoOf(TractPage).b2x = get_buttonColor;
   protoOf(TractPage).g2y = get_textAlign;
   protoOf(TractPage).getAnalyticsEvents = getAnalyticsEvents;
-  protoOf(SaxXmlPullParser).q3g = require$default;
+  protoOf(SaxXmlPullParser).r3g = require$default;
   protoOf(SaxXmlPullParser).o2t = getAttributeValue;
-  protoOf(JsXmlPullParser).q3g = require$default;
+  protoOf(JsXmlPullParser).r3g = require$default;
   protoOf(JsXmlPullParser).o2t = getAttributeValue;
   //endregion
   //region block: init