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

@cruglobal/godtools-shared 0.9.0-PR424-SNAPSHOT.1189 → 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 +2 -0
package/kotlin-mpp-godtools-tool-parser-parser.js +573 -565
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

@@ -234,12 +234,12 @@
   setMetadataFor(Companion_4, 'Companion', objectMeta);
   function get_isClickable() {
     var tmp;
-    if (!(this.q2v() == null)) {
+    if (!(this.p2v() == null)) {
       tmp = true;
     } else {
       var tmp$ret$0;
       // Inline function 'kotlin.collections.isNotEmpty' call
-      var tmp0_isNotEmpty = this.p2v();
+      var tmp0_isNotEmpty = this.o2v();
       tmp$ret$0 = !tmp0_isNotEmpty.m();
       tmp = tmp$ret$0;
     }
@@ -269,7 +269,7 @@
   }
   function get_buttonColor() {
     var tmp0_safe_receiver = this.stylesParent;
-    return tmp0_safe_receiver == null ? null : tmp0_safe_receiver.c2x();
+    return tmp0_safe_receiver == null ? null : tmp0_safe_receiver.b2x();
   }
   function get_cardBackgroundColor() {
     return get_cardBackgroundColor_0(this.stylesParent);
@@ -279,7 +279,7 @@
   }
   function get_multiselectOptionSelectedColor() {
     var tmp0_safe_receiver = this.stylesParent;
-    return tmp0_safe_receiver == null ? null : tmp0_safe_receiver.f2y();
+    return tmp0_safe_receiver == null ? null : tmp0_safe_receiver.e2y();
   }
   function get_textColor() {
     return get_textColor_0(this.stylesParent);
@@ -414,7 +414,7 @@
     return tmp;
   }
   function getAttributeValue(name) {
-    return this.n2v(null, name);
+    return this.m2v(null, name);
   }
   setMetadataFor(XmlPullParser, 'XmlPullParser', interfaceMeta);
   setMetadataFor(SaxXmlPullParser, 'SaxXmlPullParser', classMeta, VOID, [XmlPullParser]);
@@ -1700,26 +1700,26 @@
     Trigger_initEntries();
     return Trigger_UNKNOWN_instance;
   }
-  protoOf(AnalyticsEvent).q2u = function () {
+  protoOf(AnalyticsEvent).p2u = function () {
     var tmp0_elvis_lhs = this.v2s_1;
     return tmp0_elvis_lhs == null ? this.action : tmp0_elvis_lhs;
   };
-  protoOf(AnalyticsEvent).r2u = function () {
+  protoOf(AnalyticsEvent).q2u = function () {
     return this.action;
   };
-  protoOf(AnalyticsEvent).s2u = function () {
+  protoOf(AnalyticsEvent).r2u = function () {
     return this.delay;
   };
-  protoOf(AnalyticsEvent).t2u = function () {
+  protoOf(AnalyticsEvent).s2u = function () {
     return this.systems;
   };
-  protoOf(AnalyticsEvent).u2u = function () {
+  protoOf(AnalyticsEvent).t2u = function () {
     return this.w2s_1;
   };
-  protoOf(AnalyticsEvent).v2u = function () {
+  protoOf(AnalyticsEvent).u2u = function () {
     return this.x2s_1;
   };
-  protoOf(AnalyticsEvent).w2u = function () {
+  protoOf(AnalyticsEvent).v2u = function () {
     return this.attributes;
   };
   protoOf(AnalyticsEvent).y2s = function (types) {
@@ -1729,10 +1729,10 @@
     return this.systems.v(system);
   };
   protoOf(AnalyticsEvent).shouldTrigger = function (state) {
-    return this.x2s_1 == null ? true : state.x18(this.q2u()) < this.x2s_1;
+    return this.x2s_1 == null ? true : state.x18(this.p2u()) < this.x2s_1;
   };
   protoOf(AnalyticsEvent).recordTriggered = function (state) {
-    return state.y18(this.q2u());
+    return state.y18(this.p2u());
   };
   function AnalyticsEvent() {
     Companion_getInstance_6();
@@ -1745,7 +1745,7 @@
   });
   function Companion_4() {
     Companion_instance_4 = this;
-    this.x2u_1 = 'animation';
+    this.w2u_1 = 'animation';
   }
   var Companion_instance_4;
   function Companion_getInstance_7() {
@@ -1760,27 +1760,27 @@
     var tmp = get_XMLNS_CONTENT();
     Companion_getInstance_7();
     parser.u2r(2, tmp, 'animation');
-    $this.g2v_1 = parser.n2v(null, 'resource');
+    $this.f2v_1 = parser.m2v(null, 'resource');
     var tmp_0 = $this;
-    var tmp0_safe_receiver = parser.n2v(null, 'loop');
+    var tmp0_safe_receiver = parser.m2v(null, 'loop');
     var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : toBoolean(tmp0_safe_receiver);
-    tmp_0.h2v_1 = tmp1_elvis_lhs == null ? true : tmp1_elvis_lhs;
+    tmp_0.g2v_1 = tmp1_elvis_lhs == null ? true : tmp1_elvis_lhs;
     var tmp_1 = $this;
-    var tmp2_safe_receiver = parser.n2v(null, 'autoplay');
+    var tmp2_safe_receiver = parser.m2v(null, 'autoplay');
     var tmp3_elvis_lhs = tmp2_safe_receiver == null ? null : toBoolean(tmp2_safe_receiver);
-    tmp_1.i2v_1 = tmp3_elvis_lhs == null ? true : tmp3_elvis_lhs;
+    tmp_1.h2v_1 = tmp3_elvis_lhs == null ? true : tmp3_elvis_lhs;
     var tmp_2 = $this;
     var tmp$ret$0;
     // Inline function 'org.cru.godtools.shared.tool.parser.model.toEventIds' call
     var tmp0_toEventIds = parser.o2t('play-listeners');
-    tmp$ret$0 = Companion_getInstance_17().o2v(tmp0_toEventIds);
-    tmp_2.j2v_1 = toSet_0(tmp$ret$0);
+    tmp$ret$0 = Companion_getInstance_17().n2v(tmp0_toEventIds);
+    tmp_2.i2v_1 = toSet_0(tmp$ret$0);
     var tmp_3 = $this;
     var tmp$ret$1;
     // Inline function 'org.cru.godtools.shared.tool.parser.model.toEventIds' call
     var tmp1_toEventIds = parser.o2t('stop-listeners');
-    tmp$ret$1 = Companion_getInstance_17().o2v(tmp1_toEventIds);
-    tmp_3.k2v_1 = toSet_0(tmp$ret$1);
+    tmp$ret$1 = Companion_getInstance_17().n2v(tmp1_toEventIds);
+    tmp_3.j2v_1 = toSet_0(tmp$ret$1);
     // Inline function 'org.cru.godtools.shared.tool.parser.model.parseClickableAttrs' call
     // Inline function 'kotlin.contracts.contract' call
     var rawUrl = parser.o2t(_get_XML_URL_$accessor$11tx9p3_lkk5sb());
@@ -1798,22 +1798,22 @@
     var tmp$ret$2;
     // Inline function 'org.cru.godtools.shared.tool.parser.model.toEventIds' call
     var tmp2_toEventIds = parser.o2t(_get_XML_EVENTS_$accessor$11tx9p3_otmgk5());
-    tmp$ret$2 = Companion_getInstance_17().o2v(tmp2_toEventIds);
+    tmp$ret$2 = Companion_getInstance_17().n2v(tmp2_toEventIds);
     var tmp3__anonymous__ufb84q = tmp$ret$2;
-    $this.l2v_1 = tmp3__anonymous__ufb84q;
-    $this.m2v_1 = uri;
+    $this.k2v_1 = tmp3__anonymous__ufb84q;
+    $this.l2v_1 = uri;
     skipTag(parser);
     return $this;
   }
   function Animation_init_$Create$(parent, parser) {
     return Animation_init_$Init$(parent, parser, objectCreate(protoOf(Animation)));
   }
+  protoOf(Animation).o2v = function () {
+    return this.k2v_1;
+  };
   protoOf(Animation).p2v = function () {
     return this.l2v_1;
   };
-  protoOf(Animation).q2v = function () {
-    return this.m2v_1;
-  };
   protoOf(Animation).i2s = function () {
     var tmp;
     var tmp_0 = this.a2p().q2t_1;
@@ -1831,7 +1831,7 @@
   function Companion_5() {
     Companion_instance_5 = this;
   }
-  protoOf(Companion_5).r2v = function (_this__u8e3s4) {
+  protoOf(Companion_5).q2v = function (_this__u8e3s4) {
     var tmp0_safe_receiver = _this__u8e3s4;
     var tmp1_safe_receiver = tmp0_safe_receiver == null ? null : split(tmp0_safe_receiver, charArrayOf([_Char___init__impl__6a9atx(58)]));
     var tmp;
@@ -1890,15 +1890,15 @@
   }
   function AspectRatio(width, height) {
     Companion_getInstance_8();
-    this.s2v_1 = width;
-    this.t2v_1 = height;
+    this.r2v_1 = width;
+    this.s2v_1 = height;
   }
   protoOf(AspectRatio).toString = function () {
-    return 'AspectRatio(width=' + this.s2v_1 + ', height=' + this.t2v_1 + ')';
+    return 'AspectRatio(width=' + this.r2v_1 + ', height=' + this.s2v_1 + ')';
   };
   protoOf(AspectRatio).hashCode = function () {
-    var result = this.s2v_1;
-    result = imul(result, 31) + this.t2v_1 | 0;
+    var result = this.r2v_1;
+    result = imul(result, 31) + this.s2v_1 | 0;
     return result;
   };
   protoOf(AspectRatio).equals = function (other) {
@@ -1907,16 +1907,16 @@
     if (!(other instanceof AspectRatio))
       return false;
     var tmp0_other_with_cast = other instanceof AspectRatio ? other : THROW_CCE();
-    if (!(this.s2v_1 === tmp0_other_with_cast.s2v_1))
+    if (!(this.r2v_1 === tmp0_other_with_cast.r2v_1))
       return false;
-    if (!(this.t2v_1 === tmp0_other_with_cast.t2v_1))
+    if (!(this.s2v_1 === tmp0_other_with_cast.s2v_1))
       return false;
     return true;
   };
   function Base() {
   }
   function getResource(_this__u8e3s4, name) {
-    return _this__u8e3s4.manifest.u2v(name);
+    return _this__u8e3s4.manifest.t2v(name);
   }
   function get_manifest(_this__u8e3s4) {
     var tmp0_safe_receiver = _this__u8e3s4;
@@ -1969,9 +1969,9 @@
   var Type_UNKNOWN_instance;
   function Companion_6() {
     Companion_instance_6 = this;
-    this.v2v_1 = Type_UNKNOWN_getInstance();
+    this.u2v_1 = Type_UNKNOWN_getInstance();
   }
-  protoOf(Companion_6).w2v = function (_this__u8e3s4) {
+  protoOf(Companion_6).v2v = function (_this__u8e3s4) {
     var tmp0_subject = _this__u8e3s4;
     switch (tmp0_subject) {
       case 'event':
@@ -2005,7 +2005,7 @@
   function Companion_7() {
     Companion_instance_7 = this;
   }
-  protoOf(Companion_7).x2v = function (_this__u8e3s4) {
+  protoOf(Companion_7).w2v = function (_this__u8e3s4) {
     var tmp0_subject = _this__u8e3s4;
     switch (tmp0_subject) {
       case 'contained':
@@ -2035,12 +2035,12 @@
   }
   function Companion_8() {
     Companion_instance_8 = this;
-    this.y2v_1 = 'button';
-    this.z2v_1 = Horizontal_CENTER_getInstance();
-    this.a2w_1 = new Percent(1.0);
-    this.b2w_1 = get_TRANSPARENT();
-    this.c2w_1 = Horizontal_START_getInstance();
-    this.d2w_1 = 18;
+    this.x2v_1 = 'button';
+    this.y2v_1 = Horizontal_CENTER_getInstance();
+    this.z2v_1 = new Percent(1.0);
+    this.a2w_1 = get_TRANSPARENT();
+    this.b2w_1 = Horizontal_START_getInstance();
+    this.c2w_1 = 18;
   }
   var Companion_instance_8;
   function Companion_getInstance_11() {
@@ -2052,7 +2052,7 @@
     var tmp$ret$0;
     // Inline function 'kotlin.getValue' call
     var tmp0_getValue = defaultTextStyles$factory();
-    tmp$ret$0 = $this.w2w_1.o1();
+    tmp$ret$0 = $this.v2w_1.o1();
     return tmp$ret$0;
   }
   function Button_init_$Init$(parent, parser, $this) {
@@ -2062,7 +2062,7 @@
     var tmp = get_XMLNS_CONTENT();
     Companion_getInstance_11();
     parser.u2r(2, tmp, 'button');
-    var type = Companion_getInstance_9().w2v(parser.o2t('type'));
+    var type = Companion_getInstance_9().v2v(parser.o2t('type'));
     // Inline function 'org.cru.godtools.shared.tool.parser.model.parseClickableAttrs' call
     // Inline function 'kotlin.contracts.contract' call
     var rawUrl = parser.o2t(_get_XML_URL_$accessor$11tx9p3_lkk5sb());
@@ -2080,19 +2080,19 @@
     var tmp$ret$0;
     // Inline function 'org.cru.godtools.shared.tool.parser.model.toEventIds' call
     var tmp0_toEventIds = parser.o2t(_get_XML_EVENTS_$accessor$11tx9p3_otmgk5());
-    tmp$ret$0 = Companion_getInstance_17().o2v(tmp0_toEventIds);
+    tmp$ret$0 = Companion_getInstance_17().n2v(tmp0_toEventIds);
     var tmp1__anonymous__uwfjfc = tmp$ret$0;
-    $this.m2w_1 = (type == null ? true : equals(type, Type_EVENT_getInstance())) ? tmp1__anonymous__uwfjfc : emptyList();
-    $this.n2w_1 = (type == null ? true : equals(type, Type_URL_getInstance())) ? uri : null;
+    $this.l2w_1 = (type == null ? true : equals(type, Type_EVENT_getInstance())) ? tmp1__anonymous__uwfjfc : emptyList();
+    $this.m2w_1 = (type == null ? true : equals(type, Type_URL_getInstance())) ? uri : null;
     var tmp_1 = $this;
     var tmp0_safe_receiver_0 = parser.o2t('style');
-    tmp_1.o2w_1 = tmp0_safe_receiver_0 == null ? null : Companion_getInstance_10().x2v(tmp0_safe_receiver_0);
+    tmp_1.n2w_1 = tmp0_safe_receiver_0 == null ? null : Companion_getInstance_10().w2v(tmp0_safe_receiver_0);
     var tmp_2 = $this;
-    var tmp1_safe_receiver = Companion_getInstance_22().z2w(parser.o2t('gravity'));
+    var tmp1_safe_receiver = Companion_getInstance_22().y2w(parser.o2t('gravity'));
     var tmp2_elvis_lhs = tmp1_safe_receiver == null ? null : tmp1_safe_receiver.horizontal;
-    tmp_2.p2w_1 = tmp2_elvis_lhs == null ? Companion_getInstance_11().z2v_1 : tmp2_elvis_lhs;
+    tmp_2.o2w_1 = tmp2_elvis_lhs == null ? Companion_getInstance_11().y2v_1 : tmp2_elvis_lhs;
     var tmp_3 = $this;
-    var tmp3_safe_receiver = Companion_getInstance_16().a2x(parser.o2t('width'));
+    var tmp3_safe_receiver = Companion_getInstance_16().z2w(parser.o2t('width'));
     var tmp_4;
     if (tmp3_safe_receiver == null) {
       tmp_4 = null;
@@ -2113,19 +2113,19 @@
       tmp_4 = tmp$ret$2;
     }
     var tmp4_elvis_lhs = tmp_4;
-    tmp_3.q2w_1 = tmp4_elvis_lhs == null ? Companion_getInstance_11().a2w_1 : tmp4_elvis_lhs;
+    tmp_3.p2w_1 = tmp4_elvis_lhs == null ? Companion_getInstance_11().z2v_1 : tmp4_elvis_lhs;
     var tmp_6 = $this;
     var tmp5_safe_receiver = parser.o2t('color');
-    tmp_6.r2w_1 = tmp5_safe_receiver == null ? null : toColorOrNull(tmp5_safe_receiver);
+    tmp_6.q2w_1 = tmp5_safe_receiver == null ? null : toColorOrNull(tmp5_safe_receiver);
     var tmp_7 = $this;
     var tmp6_safe_receiver = parser.o2t(get_XML_BACKGROUND_COLOR());
     var tmp7_elvis_lhs = tmp6_safe_receiver == null ? null : toColorOrNull(tmp6_safe_receiver);
-    tmp_7.s2w_1 = tmp7_elvis_lhs == null ? Companion_getInstance_11().b2w_1 : tmp7_elvis_lhs;
-    $this.t2w_1 = parser.o2t('icon');
+    tmp_7.r2w_1 = tmp7_elvis_lhs == null ? Companion_getInstance_11().a2w_1 : tmp7_elvis_lhs;
+    $this.s2w_1 = parser.o2t('icon');
     var tmp_8 = $this;
-    var tmp8_safe_receiver = Companion_getInstance_22().z2w(parser.o2t('icon-gravity'));
+    var tmp8_safe_receiver = Companion_getInstance_22().y2w(parser.o2t('icon-gravity'));
     var tmp9_elvis_lhs = tmp8_safe_receiver == null ? null : tmp8_safe_receiver.horizontal;
-    tmp_8.v2w_1 = tmp9_elvis_lhs == null ? Companion_getInstance_11().c2w_1 : tmp9_elvis_lhs;
+    tmp_8.u2w_1 = tmp9_elvis_lhs == null ? Companion_getInstance_11().b2w_1 : tmp9_elvis_lhs;
     var tmp_9 = $this;
     var tmp10_safe_receiver = parser.o2t('icon-size');
     var tmp11_elvis_lhs = tmp10_safe_receiver == null ? null : toIntOrNull(tmp10_safe_receiver);
@@ -2136,20 +2136,20 @@
     } else {
       tmp_10 = tmp11_elvis_lhs;
     }
-    tmp_9.u2w_1 = tmp_10;
+    tmp_9.t2w_1 = tmp_10;
     var tmp_11 = $this;
     var tmp$ret$3;
     // Inline function 'kotlin.collections.mutableListOf' call
     tmp$ret$3 = ArrayList_init_$Create$();
-    tmp_11.y2w_1 = tmp$ret$3;
+    tmp_11.x2w_1 = tmp$ret$3;
     var tmp_12 = $this;
     var tmp_13 = _get_defaultTextStyles__fjozb5($this);
     var tmp_14 = get_XMLNS_CONTENT();
     Companion_getInstance_11();
     var tmp12_elvis_lhs = parseTextChild(parser, tmp_13, tmp_14, 'button', Button$_init_$lambda_iw8cbr(parser, $this));
-    tmp_12.x2w_1 = tmp12_elvis_lhs == null ? createTestText(_get_defaultTextStyles__fjozb5($this)) : tmp12_elvis_lhs;
+    tmp_12.w2w_1 = tmp12_elvis_lhs == null ? createTestText(_get_defaultTextStyles__fjozb5($this)) : tmp12_elvis_lhs;
     // Inline function 'kotlin.collections.forEach' call
-    var tmp2_forEach = $this.y2w_1;
+    var tmp2_forEach = $this.x2w_1;
     var tmp0_iterator = tmp2_forEach.f();
     while (tmp0_iterator.g()) {
       var element = tmp0_iterator.h();
@@ -2175,7 +2175,7 @@
   }
   function Button$defaultTextStyles$delegate$lambda$lambda_0(this$0) {
     return function () {
-      var tmp0_subject = this$0.b2x();
+      var tmp0_subject = this$0.a2x();
       var tmp0 = tmp0_subject.d4_1;
       var tmp;
       switch (tmp0) {
@@ -2184,7 +2184,7 @@
           tmp = get_primaryTextColor_0(this$0.a2t());
           break;
         case 1:
-          tmp = this$0.c2x();
+          tmp = this$0.b2x();
           break;
         default:
           noWhenBranchMatchedException();
@@ -2209,7 +2209,7 @@
         Companion_getInstance_6();
         if (tmp1_subject === 'events') {
           var tmp2_this = this$0;
-          var tmp0_plusAssign = tmp2_this.y2w_1;
+          var tmp0_plusAssign = tmp2_this.x2w_1;
           var tmp1_plusAssign = Companion_getInstance_6().y2r($parser, this$0);
           addAll(tmp0_plusAssign, tmp1_plusAssign);
           tmp_0 = Unit_getInstance();
@@ -2243,18 +2243,18 @@
     Style_initEntries();
     return Style_UNKNOWN_instance;
   }
+  protoOf(Button).o2v = function () {
+    return this.l2w_1;
+  };
   protoOf(Button).p2v = function () {
     return this.m2w_1;
   };
-  protoOf(Button).q2v = function () {
-    return this.n2w_1;
-  };
-  protoOf(Button).b2x = function () {
-    var tmp0_elvis_lhs = this.o2w_1;
+  protoOf(Button).a2x = function () {
+    var tmp0_elvis_lhs = this.n2w_1;
     return tmp0_elvis_lhs == null ? get_buttonStyle_0(this.a2t()) : tmp0_elvis_lhs;
   };
-  protoOf(Button).c2x = function () {
-    var tmp0_elvis_lhs = this.r2w_1;
+  protoOf(Button).b2x = function () {
+    var tmp0_elvis_lhs = this.q2w_1;
     var tmp;
     if (tmp0_elvis_lhs == null) {
       var tmp$ret$1;
@@ -2264,7 +2264,7 @@
       var tmp$ret$0;
       // Inline function 'org.cru.godtools.shared.tool.parser.model.Button.<get-buttonColor>.<anonymous>' call
       var tmp0_safe_receiver = tmp0_let;
-      var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.c2x();
+      var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.b2x();
       tmp$ret$0 = tmp1_elvis_lhs == null ? get_primaryColor_0(tmp0_let) : tmp1_elvis_lhs;
       tmp$ret$1 = tmp$ret$0;
       tmp = tmp$ret$1;
@@ -2274,7 +2274,7 @@
     return tmp;
   };
   protoOf(Button).i2s = function () {
-    return (protoOf(Content).i2s.call(this) ? true : !this.d2x()) ? true : this.b2x().equals(Style_UNKNOWN_getInstance());
+    return (protoOf(Content).i2s.call(this) ? true : !this.c2x()) ? true : this.a2x().equals(Style_UNKNOWN_getInstance());
   };
   protoOf(Button)._getAnalyticsEvents = function (type) {
     var tmp0_subject = type;
@@ -2283,7 +2283,7 @@
     if (tmp0 === 3) {
       var tmp$ret$2;
       // Inline function 'kotlin.collections.filter' call
-      var tmp1_filter = this.y2w_1;
+      var tmp1_filter = this.x2w_1;
       var tmp$ret$1;
       // Inline function 'kotlin.collections.filterTo' call
       var tmp0_filterTo = ArrayList_init_$Create$();
@@ -2309,7 +2309,7 @@
   function Button() {
     Companion_getInstance_11();
     var tmp = this;
-    tmp.w2w_1 = lazy(Button$defaultTextStyles$delegate$lambda(this));
+    tmp.v2w_1 = lazy(Button$defaultTextStyles$delegate$lambda(this));
   }
   function defaultTextStyles$factory() {
     return getPropertyCallableRef('defaultTextStyles', 1, KProperty1, function (receiver) {
@@ -2318,8 +2318,8 @@
   }
   function Companion_9() {
     Companion_instance_9 = this;
-    this.e2x_1 = 'card';
-    this.f2x_1 = 'card-background-color';
+    this.d2x_1 = 'card';
+    this.e2x_1 = 'card-background-color';
   }
   var Companion_instance_9;
   function Companion_getInstance_12() {
@@ -2334,7 +2334,7 @@
     var tmp = get_XMLNS_CONTENT();
     Companion_getInstance_12();
     parser.u2r(2, tmp, 'card');
-    $this.o2x_1 = toColorOrNull(parser.o2t(get_XML_BACKGROUND_COLOR()));
+    $this.n2x_1 = toColorOrNull(parser.o2t(get_XML_BACKGROUND_COLOR()));
     // Inline function 'org.cru.godtools.shared.tool.parser.model.parseClickableAttrs' call
     // Inline function 'kotlin.contracts.contract' call
     var rawUrl = parser.o2t(_get_XML_URL_$accessor$11tx9p3_lkk5sb());
@@ -2352,10 +2352,10 @@
     var tmp$ret$0;
     // Inline function 'org.cru.godtools.shared.tool.parser.model.toEventIds' call
     var tmp0_toEventIds = parser.o2t(_get_XML_EVENTS_$accessor$11tx9p3_otmgk5());
-    tmp$ret$0 = Companion_getInstance_17().o2v(tmp0_toEventIds);
+    tmp$ret$0 = Companion_getInstance_17().n2v(tmp0_toEventIds);
     var tmp1__anonymous__uwfjfc = tmp$ret$0;
-    $this.q2x_1 = tmp1__anonymous__uwfjfc;
-    $this.r2x_1 = uri;
+    $this.p2x_1 = tmp1__anonymous__uwfjfc;
+    $this.q2x_1 = uri;
     var tmp_1 = $this;
     var tmp$ret$9;
     // Inline function 'org.cru.godtools.shared.tool.parser.model.parseContent' call
@@ -2435,21 +2435,21 @@
     tmp$ret$7 = tmp$ret$6.u7();
     tmp$ret$8 = tmp$ret$7;
     tmp$ret$9 = tmp$ret$8;
-    tmp_1.p2x_1 = tmp$ret$9;
+    tmp_1.o2x_1 = tmp$ret$9;
     return $this;
   }
   function Card_init_$Create$(parent, parser) {
     return Card_init_$Init$(parent, parser, objectCreate(protoOf(Card)));
   }
   protoOf(Card).t2s = function () {
+    return this.o2x_1;
+  };
+  protoOf(Card).o2v = function () {
     return this.p2x_1;
   };
   protoOf(Card).p2v = function () {
     return this.q2x_1;
   };
-  protoOf(Card).q2v = function () {
-    return this.r2x_1;
-  };
   protoOf(Card).i2s = function () {
     var tmp;
     var tmp_0 = this.a2p().q2t_1;
@@ -2472,7 +2472,7 @@
   });
   function Companion_10() {
     Companion_instance_10 = this;
-    this.s2x_1 = 'category';
+    this.r2x_1 = 'category';
   }
   var Companion_instance_10;
   function Companion_getInstance_13() {
@@ -2487,8 +2487,8 @@
     var tmp = get_XMLNS_MANIFEST();
     Companion_getInstance_13();
     parser.u2r(2, tmp, 'category');
-    $this.u2x_1 = parser.o2t('id');
-    $this.x2x_1 = parser.o2t('banner');
+    $this.t2x_1 = parser.o2t('id');
+    $this.w2x_1 = parser.o2t('banner');
     var label = null;
     var tmp_0 = $this;
     var tmp$ret$4;
@@ -2544,15 +2544,15 @@
     tmp$ret$2 = tmp0_apply;
     tmp$ret$3 = tmp$ret$2.u7();
     tmp$ret$4 = tmp$ret$3;
-    tmp_0.w2x_1 = tmp$ret$4;
-    $this.v2x_1 = label;
+    tmp_0.v2x_1 = tmp$ret$4;
+    $this.u2x_1 = label;
     return $this;
   }
   function Category_init_$Create$(manifest, parser) {
     return Category_init_$Init$(manifest, parser, objectCreate(protoOf(Category)));
   }
-  protoOf(Category).y2x = function () {
-    return this.a2p().z2x();
+  protoOf(Category).x2x = function () {
+    return this.a2p().y2x();
   };
   function Category() {
     Companion_getInstance_13();
@@ -2664,7 +2664,7 @@
     BaseModel.call($this, parent);
     Content.call($this);
     var tmp = $this;
-    var tmp0_safe_receiver = parser.n2v(null, 'version');
+    var tmp0_safe_receiver = parser.m2v(null, 'version');
     var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : toIntOrNull(tmp0_safe_receiver);
     tmp.b2s_1 = tmp1_elvis_lhs == null ? get_SCHEMA_VERSION() : tmp1_elvis_lhs;
     var tmp_0 = $this;
@@ -2714,16 +2714,16 @@
     tmp_0.c2s_1 = tmp$ret$5;
     var tmp_3 = $this;
     var tmp4_safe_receiver = parser.o2t('required-device-type');
-    var tmp6_elvis_lhs = tmp4_safe_receiver == null ? null : Companion_getInstance_15().j2y(tmp4_safe_receiver);
+    var tmp6_elvis_lhs = tmp4_safe_receiver == null ? null : Companion_getInstance_15().i2y(tmp4_safe_receiver);
     var tmp_4;
     if (tmp6_elvis_lhs == null) {
       var tmp5_safe_receiver = parser.o2t('restrictTo');
-      tmp_4 = tmp5_safe_receiver == null ? null : Companion_getInstance_15().j2y(tmp5_safe_receiver);
+      tmp_4 = tmp5_safe_receiver == null ? null : Companion_getInstance_15().i2y(tmp5_safe_receiver);
     } else {
       tmp_4 = tmp6_elvis_lhs;
     }
     var tmp7_elvis_lhs = tmp_4;
-    tmp_3.d2s_1 = tmp7_elvis_lhs == null ? Companion_getInstance_15().i2y_1 : tmp7_elvis_lhs;
+    tmp_3.d2s_1 = tmp7_elvis_lhs == null ? Companion_getInstance_15().h2y_1 : tmp7_elvis_lhs;
     var tmp_5 = $this;
     var tmp8_safe_receiver = parser.o2t('required-android-version');
     var tmp_6;
@@ -2735,7 +2735,7 @@
       // Inline function 'kotlin.contracts.contract' call
       var tmp$ret$6;
       // Inline function 'org.cru.godtools.shared.tool.parser.model.Content.<init>.<anonymous>' call
-      var tmp0_elvis_lhs_0 = Companion_getInstance_42().k2y(tmp8_safe_receiver);
+      var tmp0_elvis_lhs_0 = Companion_getInstance_42().j2y(tmp8_safe_receiver);
       var tmp_7;
       var tmp_8 = tmp0_elvis_lhs_0;
       if ((tmp_8 == null ? null : new Version(tmp_8)) == null) {
@@ -2759,7 +2759,7 @@
       // Inline function 'kotlin.contracts.contract' call
       var tmp$ret$8;
       // Inline function 'org.cru.godtools.shared.tool.parser.model.Content.<init>.<anonymous>' call
-      var tmp0_elvis_lhs_1 = Companion_getInstance_42().k2y(tmp9_safe_receiver);
+      var tmp0_elvis_lhs_1 = Companion_getInstance_42().j2y(tmp9_safe_receiver);
       var tmp_11;
       var tmp_12 = tmp0_elvis_lhs_1;
       if ((tmp_12 == null ? null : new Version(tmp_12)) == null) {
@@ -2785,7 +2785,7 @@
     parent = parent === VOID ? createTestManifest() : parent;
     version = version === VOID ? get_SCHEMA_VERSION() : version;
     requiredFeatures = requiredFeatures === VOID ? emptySet() : requiredFeatures;
-    requiredDeviceType = requiredDeviceType === VOID ? Companion_getInstance_15().i2y_1 : requiredDeviceType;
+    requiredDeviceType = requiredDeviceType === VOID ? Companion_getInstance_15().h2y_1 : requiredDeviceType;
     requiredAndroidVersion = requiredAndroidVersion === VOID ? null : requiredAndroidVersion;
     requiredIosVersion = requiredIosVersion === VOID ? null : requiredIosVersion;
     invisibleIf = invisibleIf === VOID ? null : invisibleIf;
@@ -3093,9 +3093,9 @@
   var DeviceType_UNKNOWN_instance;
   function Companion_12() {
     Companion_instance_12 = this;
-    this.i2y_1 = toSet(values_1());
+    this.h2y_1 = toSet(values_1());
   }
-  protoOf(Companion_12).j2y = function (_this__u8e3s4) {
+  protoOf(Companion_12).i2y = function (_this__u8e3s4) {
     var tmp$ret$2;
     // Inline function 'kotlin.collections.mapTo' call
     var tmp0_mapTo = get_REGEX_SEQUENCE_SEPARATOR().ec(_this__u8e3s4);
@@ -3172,7 +3172,7 @@
   function Companion_13() {
     Companion_instance_13 = this;
   }
-  protoOf(Companion_13).a2x = function (_this__u8e3s4) {
+  protoOf(Companion_13).z2w = function (_this__u8e3s4) {
     var tmp0_safe_receiver = _this__u8e3s4;
     var tmp;
     if (tmp0_safe_receiver == null) {
@@ -3251,12 +3251,12 @@
   protoOf(Percent).s2 = function () {
     return this.value;
   };
-  protoOf(Percent).u2y = function (value) {
+  protoOf(Percent).t2y = function (value) {
     return new Percent(value);
   };
   protoOf(Percent).copy = function (value, $super) {
     value = value === VOID ? this.value : value;
-    return this.u2y(value);
+    return this.t2y(value);
   };
   protoOf(Percent).toString = function () {
     return 'Percent(value=' + this.value + ')';
@@ -3284,12 +3284,12 @@
   protoOf(Pixels).s2 = function () {
     return this.value;
   };
-  protoOf(Pixels).v2y = function (value) {
+  protoOf(Pixels).u2y = function (value) {
     return new Pixels(value);
   };
   protoOf(Pixels).copy = function (value, $super) {
     value = value === VOID ? this.value : value;
-    return this.v2y(value);
+    return this.u2y(value);
   };
   protoOf(Pixels).toString = function () {
     return 'Pixels(value=' + this.value + ')';
@@ -3323,10 +3323,10 @@
     Companion_instance_14 = this;
     this.FOLLOWUP = new EventId('followup', 'send');
   }
-  protoOf(Companion_14).w2y = function () {
+  protoOf(Companion_14).v2y = function () {
     return this.FOLLOWUP;
   };
-  protoOf(Companion_14).o2v = function (raw) {
+  protoOf(Companion_14).n2v = function (raw) {
     var tmp$ret$6;
     // Inline function 'kotlin.collections.orEmpty' call
     var tmp0_safe_receiver = raw;
@@ -3469,7 +3469,7 @@
   };
   function Companion_15() {
     Companion_instance_15 = this;
-    this.x2y_1 = 'fallback';
+    this.w2y_1 = 'fallback';
   }
   var Companion_instance_15;
   function Companion_getInstance_18() {
@@ -3577,14 +3577,14 @@
     tmp$ret$6 = tmp$ret$5.u7();
     tmp$ret$7 = tmp$ret$6;
     tmp$ret$8 = tmp$ret$7;
-    tmp_1.t2y_1 = tmp$ret$8;
+    tmp_1.s2y_1 = tmp$ret$8;
     return $this;
   }
   function Fallback_init_$Create$(parent, parser) {
     return Fallback_init_$Init$(parent, parser, objectCreate(protoOf(Fallback)));
   }
   protoOf(Fallback).t2s = function () {
-    return take(this.t2y_1, 1);
+    return take(this.s2y_1, 1);
   };
   protoOf(Fallback).c2t = function () {
     var tmp$ret$3;
@@ -3620,7 +3620,7 @@
   });
   function Companion_16() {
     Companion_instance_16 = this;
-    this.y2y_1 = 'width';
+    this.x2y_1 = 'width';
   }
   var Companion_instance_16;
   function Companion_getInstance_19() {
@@ -3633,11 +3633,11 @@
     Item.call($this);
     Companion_getInstance_59();
     parser.u2r(2, get_XMLNS_CONTENT(), 'item');
-    $this.a2z_1 = flow;
+    $this.z2y_1 = flow;
     var tmp = $this;
     var tmp_0 = Companion_getInstance_16();
     Companion_getInstance_19();
-    tmp.b2z_1 = tmp_0.a2x(parser.o2t('width'));
+    tmp.a2z_1 = tmp_0.z2w(parser.o2t('width'));
     // Inline function 'org.cru.godtools.shared.tool.parser.model.parseVisibilityAttrs' call
     // Inline function 'kotlin.contracts.contract' call
     // Inline function 'org.cru.godtools.shared.tool.parser.model.Item.<init>.<anonymous>' call
@@ -3664,7 +3664,7 @@
       tmp$ret$1 = tmp_3;
       tmp_2 = tmp$ret$1;
     }
-    tmp_1.c2z_1 = tmp_2;
+    tmp_1.b2z_1 = tmp_2;
     var tmp_4 = $this;
     var tmp1_safe_receiver = tmp1__anonymous__uwfjfc;
     var tmp_5;
@@ -3686,7 +3686,7 @@
       tmp$ret$3 = tmp_6;
       tmp_5 = tmp$ret$3;
     }
-    tmp_4.d2z_1 = tmp_5;
+    tmp_4.c2z_1 = tmp_5;
     var tmp_7 = $this;
     var tmp$ret$12;
     // Inline function 'org.cru.godtools.shared.tool.parser.model.parseContent' call
@@ -3766,7 +3766,7 @@
     tmp$ret$10 = tmp$ret$9.u7();
     tmp$ret$11 = tmp$ret$10;
     tmp$ret$12 = tmp$ret$11;
-    tmp_7.e2z_1 = tmp$ret$12;
+    tmp_7.d2z_1 = tmp$ret$12;
     return $this;
   }
   function Item_init_$Create$(flow, parser) {
@@ -3775,11 +3775,11 @@
   function Item_init_$Init$_0(flow, content, $this) {
     BaseModel.call($this, flow);
     Item.call($this);
-    $this.a2z_1 = flow;
+    $this.z2y_1 = flow;
+    $this.a2z_1 = null;
     $this.b2z_1 = null;
     $this.c2z_1 = null;
-    $this.d2z_1 = null;
-    $this.e2z_1 = listOfNotNull(content($this));
+    $this.d2z_1 = listOfNotNull(content($this));
     return $this;
   }
   function Item_init_$Create$_0(flow, content) {
@@ -3787,10 +3787,10 @@
   }
   function Companion_17() {
     Companion_instance_17 = this;
-    this.f2z_1 = 'flow';
-    this.g2z_1 = 'item-width';
-    this.h2z_1 = new Percent(1.0);
-    this.i2z_1 = Horizontal_START_getInstance();
+    this.e2z_1 = 'flow';
+    this.f2z_1 = 'item-width';
+    this.g2z_1 = new Percent(1.0);
+    this.h2z_1 = Horizontal_START_getInstance();
   }
   var Companion_instance_17;
   function Companion_getInstance_20() {
@@ -3808,18 +3808,18 @@
     var tmp_0 = $this;
     var tmp_1 = Companion_getInstance_16();
     Companion_getInstance_20();
-    var tmp0_elvis_lhs = tmp_1.a2x(parser.o2t('item-width'));
-    tmp_0.r2z_1 = tmp0_elvis_lhs == null ? Companion_getInstance_20().h2z_1 : tmp0_elvis_lhs;
+    var tmp0_elvis_lhs = tmp_1.z2w(parser.o2t('item-width'));
+    tmp_0.q2z_1 = tmp0_elvis_lhs == null ? Companion_getInstance_20().g2z_1 : tmp0_elvis_lhs;
     var tmp_2 = $this;
     var tmp1_safe_receiver = parser.o2t('row-gravity');
-    var tmp2_safe_receiver = tmp1_safe_receiver == null ? null : Companion_getInstance_22().z2w(tmp1_safe_receiver);
+    var tmp2_safe_receiver = tmp1_safe_receiver == null ? null : Companion_getInstance_22().y2w(tmp1_safe_receiver);
     var tmp3_elvis_lhs = tmp2_safe_receiver == null ? null : tmp2_safe_receiver.horizontal;
-    tmp_2.s2z_1 = tmp3_elvis_lhs == null ? Companion_getInstance_20().i2z_1 : tmp3_elvis_lhs;
+    tmp_2.r2z_1 = tmp3_elvis_lhs == null ? Companion_getInstance_20().h2z_1 : tmp3_elvis_lhs;
     var tmp_3 = $this;
     var tmp$ret$0;
     // Inline function 'kotlin.collections.mutableListOf' call
     tmp$ret$0 = ArrayList_init_$Create$();
-    tmp_3.t2z_1 = tmp$ret$0;
+    tmp_3.s2z_1 = tmp$ret$0;
     // Inline function 'org.cru.godtools.shared.tool.parser.xml.parseChildren' call
     $l$loop_1: while (true) {
       var tmp_4 = parser.h();
@@ -3838,7 +3838,7 @@
         if (tmp1_subject === 'item') {
           var tmp2_this = $this;
           // Inline function 'kotlin.collections.plusAssign' call
-          var tmp0_plusAssign = tmp2_this.t2z_1;
+          var tmp0_plusAssign = tmp2_this.s2z_1;
           var tmp1_plusAssign = Item_init_$Create$($this, parser);
           tmp0_plusAssign.b(tmp1_plusAssign);
         }
@@ -3849,12 +3849,12 @@
         var item = Item_init_$Create$_0($this, Flow$_init_$lambda_98n0kd(parser));
         var tmp$ret$1;
         // Inline function 'kotlin.collections.isNotEmpty' call
-        var tmp2_isNotEmpty = item.e2z_1;
+        var tmp2_isNotEmpty = item.d2z_1;
         tmp$ret$1 = !tmp2_isNotEmpty.m();
         if (tmp$ret$1) {
           var tmp3_this = $this;
           // Inline function 'kotlin.collections.plusAssign' call
-          var tmp3_plusAssign = tmp3_this.t2z_1;
+          var tmp3_plusAssign = tmp3_this.s2z_1;
           tmp3_plusAssign.b(item);
         }
       }
@@ -3870,13 +3870,13 @@
     return Flow_init_$Init$(parent, parser, objectCreate(protoOf(Flow)));
   }
   protoOf(Item).g2t = function () {
-    return this.c2z_1;
+    return this.b2z_1;
   };
   protoOf(Item).h2t = function () {
-    return this.d2z_1;
+    return this.c2z_1;
   };
   protoOf(Item).t2s = function () {
-    return this.e2z_1;
+    return this.d2z_1;
   };
   function Item() {
     Companion_getInstance_19();
@@ -3934,7 +3934,7 @@
   }
   function Companion_18() {
     Companion_instance_18 = this;
-    this.u2z_1 = 'form';
+    this.t2z_1 = 'form';
   }
   var Companion_instance_18;
   function Companion_getInstance_21() {
@@ -4028,14 +4028,14 @@
     tmp$ret$6 = tmp$ret$5.u7();
     tmp$ret$7 = tmp$ret$6;
     tmp$ret$8 = tmp$ret$7;
-    tmp_0.d30_1 = tmp$ret$8;
+    tmp_0.c30_1 = tmp$ret$8;
     return $this;
   }
   function Form_init_$Create$(parent, parser) {
     return Form_init_$Init$(parent, parser, objectCreate(protoOf(Form)));
   }
   protoOf(Form).t2s = function () {
-    return this.d30_1;
+    return this.c30_1;
   };
   protoOf(Form).c2t = function () {
     var tmp$ret$3;
@@ -4136,10 +4136,10 @@
     Companion_instance_19 = this;
     this.CENTER = new Gravity(Horizontal_CENTER_getInstance(), Vertical_CENTER_getInstance());
   }
-  protoOf(Companion_19).e30 = function () {
+  protoOf(Companion_19).d30 = function () {
     return this.CENTER;
   };
-  protoOf(Companion_19).z2w = function (_this__u8e3s4) {
+  protoOf(Companion_19).y2w = function (_this__u8e3s4) {
     if (_this__u8e3s4 == null)
       return null;
     var tmp;
@@ -4278,47 +4278,47 @@
     this.horizontal = horizontal;
     this.vertical = vertical;
   }
-  protoOf(Gravity).j30 = function () {
+  protoOf(Gravity).i30 = function () {
     return this.horizontal;
   };
-  protoOf(Gravity).k30 = function () {
+  protoOf(Gravity).j30 = function () {
     return this.vertical;
   };
-  protoOf(Gravity).l30 = function () {
+  protoOf(Gravity).k30 = function () {
     return this.horizontal.equals(Horizontal_START_getInstance());
   };
-  protoOf(Gravity).m30 = function () {
+  protoOf(Gravity).l30 = function () {
     return this.horizontal.equals(Horizontal_END_getInstance());
   };
-  protoOf(Gravity).n30 = function () {
+  protoOf(Gravity).m30 = function () {
     return this.horizontal.equals(Horizontal_CENTER_getInstance());
   };
-  protoOf(Gravity).o30 = function () {
+  protoOf(Gravity).n30 = function () {
     return this.vertical.equals(Vertical_TOP_getInstance());
   };
-  protoOf(Gravity).p30 = function () {
+  protoOf(Gravity).o30 = function () {
     return this.vertical.equals(Vertical_BOTTOM_getInstance());
   };
-  protoOf(Gravity).q30 = function () {
+  protoOf(Gravity).p30 = function () {
     return this.vertical.equals(Vertical_CENTER_getInstance());
   };
-  protoOf(Gravity).r30 = function () {
+  protoOf(Gravity).q30 = function () {
     return this.isCenterX ? this.isCenterY : false;
   };
-  defineProp(protoOf(Gravity), 'isStart', protoOf(Gravity).l30);
-  defineProp(protoOf(Gravity), 'isEnd', protoOf(Gravity).m30);
-  defineProp(protoOf(Gravity), 'isCenterX', protoOf(Gravity).n30);
-  defineProp(protoOf(Gravity), 'isTop', protoOf(Gravity).o30);
-  defineProp(protoOf(Gravity), 'isBottom', protoOf(Gravity).p30);
-  defineProp(protoOf(Gravity), 'isCenterY', protoOf(Gravity).q30);
-  defineProp(protoOf(Gravity), 'isCenter', protoOf(Gravity).r30);
+  defineProp(protoOf(Gravity), 'isStart', protoOf(Gravity).k30);
+  defineProp(protoOf(Gravity), 'isEnd', protoOf(Gravity).l30);
+  defineProp(protoOf(Gravity), 'isCenterX', protoOf(Gravity).m30);
+  defineProp(protoOf(Gravity), 'isTop', protoOf(Gravity).n30);
+  defineProp(protoOf(Gravity), 'isBottom', protoOf(Gravity).o30);
+  defineProp(protoOf(Gravity), 'isCenterY', protoOf(Gravity).p30);
+  defineProp(protoOf(Gravity), 'isCenter', protoOf(Gravity).q30);
   function HasAnalyticsEvents() {
   }
   function Companion_20() {
     Companion_instance_20 = this;
-    this.s30_1 = 'image';
-    this.t30_1 = Horizontal_CENTER_getInstance();
-    this.u30_1 = new Percent(1.0);
+    this.r30_1 = 'image';
+    this.s30_1 = Horizontal_CENTER_getInstance();
+    this.t30_1 = new Percent(1.0);
   }
   var Companion_instance_20;
   function Companion_getInstance_23() {
@@ -4333,7 +4333,7 @@
     var tmp = get_XMLNS_CONTENT();
     Companion_getInstance_23();
     parser.u2r(2, tmp, 'image');
-    $this.f31_1 = parser.o2t('resource');
+    $this.e31_1 = parser.o2t('resource');
     // Inline function 'org.cru.godtools.shared.tool.parser.model.parseClickableAttrs' call
     // Inline function 'kotlin.contracts.contract' call
     var rawUrl = parser.o2t(_get_XML_URL_$accessor$11tx9p3_lkk5sb());
@@ -4351,16 +4351,16 @@
     var tmp$ret$0;
     // Inline function 'org.cru.godtools.shared.tool.parser.model.toEventIds' call
     var tmp0_toEventIds = parser.o2t(_get_XML_EVENTS_$accessor$11tx9p3_otmgk5());
-    tmp$ret$0 = Companion_getInstance_17().o2v(tmp0_toEventIds);
+    tmp$ret$0 = Companion_getInstance_17().n2v(tmp0_toEventIds);
     var tmp1__anonymous__uwfjfc = tmp$ret$0;
-    $this.d31_1 = tmp1__anonymous__uwfjfc;
-    $this.e31_1 = uri;
+    $this.c31_1 = tmp1__anonymous__uwfjfc;
+    $this.d31_1 = uri;
     var tmp_1 = $this;
-    var tmp0_safe_receiver_0 = Companion_getInstance_22().z2w(parser.o2t('gravity'));
+    var tmp0_safe_receiver_0 = Companion_getInstance_22().y2w(parser.o2t('gravity'));
     var tmp1_elvis_lhs = tmp0_safe_receiver_0 == null ? null : tmp0_safe_receiver_0.horizontal;
-    tmp_1.gravity = tmp1_elvis_lhs == null ? Companion_getInstance_23().t30_1 : tmp1_elvis_lhs;
+    tmp_1.gravity = tmp1_elvis_lhs == null ? Companion_getInstance_23().s30_1 : tmp1_elvis_lhs;
     var tmp_2 = $this;
-    var tmp2_safe_receiver = Companion_getInstance_16().a2x(parser.o2t('width'));
+    var tmp2_safe_receiver = Companion_getInstance_16().z2w(parser.o2t('width'));
     var tmp_3;
     if (tmp2_safe_receiver == null) {
       tmp_3 = null;
@@ -4381,7 +4381,7 @@
       tmp_3 = tmp$ret$2;
     }
     var tmp3_elvis_lhs = tmp_3;
-    tmp_2.width = tmp3_elvis_lhs == null ? Companion_getInstance_23().u30_1 : tmp3_elvis_lhs;
+    tmp_2.width = tmp3_elvis_lhs == null ? Companion_getInstance_23().t30_1 : tmp3_elvis_lhs;
     skipTag(parser);
     return $this;
   }
@@ -4391,36 +4391,36 @@
   function Image_init_$Init$_0(parent, resource, gravity, width, $this) {
     parent = parent === VOID ? createTestManifest() : parent;
     resource = resource === VOID ? null : resource;
-    gravity = gravity === VOID ? Companion_getInstance_23().t30_1 : gravity;
-    width = width === VOID ? Companion_getInstance_23().u30_1 : width;
+    gravity = gravity === VOID ? Companion_getInstance_23().s30_1 : gravity;
+    width = width === VOID ? Companion_getInstance_23().t30_1 : width;
     Content_init_$Init$_0(parent, VOID, VOID, VOID, VOID, VOID, VOID, VOID, $this);
     Image.call($this);
-    $this.f31_1 = resource;
+    $this.e31_1 = resource;
     $this.gravity = gravity;
     $this.width = width;
-    $this.d31_1 = emptyList();
-    $this.e31_1 = null;
+    $this.c31_1 = emptyList();
+    $this.d31_1 = null;
     return $this;
   }
   function createTestImage(parent, resource, gravity, width) {
     return Image_init_$Init$_0(parent, resource, gravity, width, objectCreate(protoOf(Image)));
   }
+  protoOf(Image).o2v = function () {
+    return this.c31_1;
+  };
   protoOf(Image).p2v = function () {
     return this.d31_1;
   };
-  protoOf(Image).q2v = function () {
+  protoOf(Image).f31 = function () {
     return this.e31_1;
   };
   protoOf(Image).g31 = function () {
-    return this.f31_1;
+    return getResource(this, this.e31_1);
   };
   protoOf(Image).h31 = function () {
-    return getResource(this, this.f31_1);
-  };
-  protoOf(Image).i31 = function () {
     return this.gravity;
   };
-  protoOf(Image).j31 = function () {
+  protoOf(Image).i31 = function () {
     return this.width;
   };
   protoOf(Image).i2s = function () {
@@ -4430,7 +4430,7 @@
     } else {
       var tmp$ret$0;
       // Inline function 'kotlin.text.isNullOrEmpty' call
-      var tmp0_isNullOrEmpty = this.f31_1;
+      var tmp0_isNullOrEmpty = this.e31_1;
       // Inline function 'kotlin.contracts.contract' call
       tmp$ret$0 = tmp0_isNullOrEmpty == null ? true : charSequenceLength(tmp0_isNullOrEmpty) === 0;
       tmp = tmp$ret$0;
@@ -4440,7 +4440,7 @@
   function Image() {
     Companion_getInstance_23();
   }
-  defineProp(protoOf(Image), 'resource', protoOf(Image).h31);
+  defineProp(protoOf(Image), 'resource', protoOf(Image).g31);
   defineProp(protoOf(Image), 'stylesParent', function () {
     return this.a2t();
   });
@@ -4454,7 +4454,7 @@
   function Companion_21() {
     Companion_instance_21 = this;
   }
-  protoOf(Companion_21).k31 = function (_this__u8e3s4) {
+  protoOf(Companion_21).j31 = function (_this__u8e3s4) {
     var tmp0_subject = _this__u8e3s4;
     switch (tmp0_subject) {
       case 'fit':
@@ -4512,9 +4512,9 @@
   var Type_HIDDEN_instance;
   function Companion_22() {
     Companion_instance_22 = this;
-    this.l31_1 = Type_TEXT_getInstance();
+    this.k31_1 = Type_TEXT_getInstance();
   }
-  protoOf(Companion_22).m31 = function (_this__u8e3s4) {
+  protoOf(Companion_22).l31 = function (_this__u8e3s4) {
     var tmp0_subject = _this__u8e3s4;
     switch (tmp0_subject) {
       case 'email':
@@ -4549,7 +4549,7 @@
   }
   function Companion_23() {
     Companion_instance_23 = this;
-    this.n31_1 = 'input';
+    this.m31_1 = 'input';
   }
   var Companion_instance_23;
   function Companion_getInstance_26() {
@@ -4566,14 +4566,14 @@
     parser.u2r(2, tmp, 'input');
     var tmp_0 = $this;
     var tmp0_safe_receiver = parser.o2t('type');
-    var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : Companion_getInstance_25().m31(tmp0_safe_receiver);
-    tmp_0.w31_1 = tmp1_elvis_lhs == null ? Companion_getInstance_25().l31_1 : tmp1_elvis_lhs;
-    $this.x31_1 = parser.o2t('name');
-    $this.y31_1 = parser.o2t('value');
+    var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : Companion_getInstance_25().l31(tmp0_safe_receiver);
+    tmp_0.v31_1 = tmp1_elvis_lhs == null ? Companion_getInstance_25().k31_1 : tmp1_elvis_lhs;
+    $this.w31_1 = parser.o2t('name');
+    $this.x31_1 = parser.o2t('value');
     var tmp_1 = $this;
     var tmp2_safe_receiver = parser.o2t('required');
     var tmp3_elvis_lhs = tmp2_safe_receiver == null ? null : toBoolean(tmp2_safe_receiver);
-    tmp_1.z31_1 = tmp3_elvis_lhs == null ? false : tmp3_elvis_lhs;
+    tmp_1.y31_1 = tmp3_elvis_lhs == null ? false : tmp3_elvis_lhs;
     var label = null;
     var placeholder = null;
     // Inline function 'org.cru.godtools.shared.tool.parser.xml.parseChildren' call
@@ -4602,8 +4602,8 @@
         continue $l$loop_1;
       skipTag(parser);
     }
-    $this.a32_1 = label;
-    $this.b32_1 = placeholder;
+    $this.z31_1 = label;
+    $this.a32_1 = placeholder;
     return $this;
   }
   function Input_init_$Create$(parent, parser) {
@@ -4633,7 +4633,7 @@
   }
   function Companion_24() {
     Companion_instance_24 = this;
-    this.c32_1 = 'link';
+    this.b32_1 = 'link';
   }
   var Companion_instance_24;
   function Companion_getInstance_27() {
@@ -4645,7 +4645,7 @@
     var tmp$ret$0;
     // Inline function 'kotlin.getValue' call
     var tmp0_getValue = defaultTextStyles$factory_0();
-    tmp$ret$0 = $this.n32_1.o1();
+    tmp$ret$0 = $this.m32_1.o1();
     return tmp$ret$0;
   }
   function Link_init_$Init$(parent, parser, $this) {
@@ -4672,21 +4672,21 @@
     var tmp$ret$0;
     // Inline function 'org.cru.godtools.shared.tool.parser.model.toEventIds' call
     var tmp0_toEventIds = parser.o2t(_get_XML_EVENTS_$accessor$11tx9p3_otmgk5());
-    tmp$ret$0 = Companion_getInstance_17().o2v(tmp0_toEventIds);
+    tmp$ret$0 = Companion_getInstance_17().n2v(tmp0_toEventIds);
     var tmp1__anonymous__uwfjfc = tmp$ret$0;
-    $this.l32_1 = tmp1__anonymous__uwfjfc;
-    $this.m32_1 = uri;
+    $this.k32_1 = tmp1__anonymous__uwfjfc;
+    $this.l32_1 = uri;
     var tmp_1 = $this;
     var tmp$ret$1;
     // Inline function 'kotlin.collections.mutableListOf' call
     tmp$ret$1 = ArrayList_init_$Create$();
-    tmp_1.p32_1 = tmp$ret$1;
+    tmp_1.o32_1 = tmp$ret$1;
     var tmp_2 = $this;
     var tmp_3 = _get_defaultTextStyles__fjozb5_0($this);
     var tmp_4 = get_XMLNS_CONTENT();
     Companion_getInstance_27();
     var tmp0_elvis_lhs = parseTextChild(parser, tmp_3, tmp_4, 'link', Link$_init_$lambda_v5gdv3(parser, $this));
-    tmp_2.o32_1 = tmp0_elvis_lhs == null ? createTestText(_get_defaultTextStyles__fjozb5_0($this)) : tmp0_elvis_lhs;
+    tmp_2.n32_1 = tmp0_elvis_lhs == null ? createTestText(_get_defaultTextStyles__fjozb5_0($this)) : tmp0_elvis_lhs;
     return $this;
   }
   function Link_init_$Create$(parent, parser) {
@@ -4712,7 +4712,7 @@
         Companion_getInstance_6();
         if (tmp1_subject === 'events') {
           var tmp2_this = this$0;
-          var tmp0_plusAssign = tmp2_this.p32_1;
+          var tmp0_plusAssign = tmp2_this.o32_1;
           var tmp1_plusAssign = Companion_getInstance_6().y2r($parser, this$0);
           addAll(tmp0_plusAssign, tmp1_plusAssign);
           tmp_0 = Unit_getInstance();
@@ -4722,14 +4722,14 @@
       return Unit_getInstance();
     };
   }
+  protoOf(Link).o2v = function () {
+    return this.k32_1;
+  };
   protoOf(Link).p2v = function () {
     return this.l32_1;
   };
-  protoOf(Link).q2v = function () {
-    return this.m32_1;
-  };
   protoOf(Link).i2s = function () {
-    return protoOf(Content).i2s.call(this) ? true : !this.d2x();
+    return protoOf(Content).i2s.call(this) ? true : !this.c2x();
   };
   protoOf(Link)._getAnalyticsEvents = function (type) {
     var tmp0_subject = type;
@@ -4738,7 +4738,7 @@
     if (tmp0 === 3) {
       var tmp$ret$2;
       // Inline function 'kotlin.collections.filter' call
-      var tmp1_filter = this.p32_1;
+      var tmp1_filter = this.o32_1;
       var tmp$ret$1;
       // Inline function 'kotlin.collections.filterTo' call
       var tmp0_filterTo = ArrayList_init_$Create$();
@@ -4764,7 +4764,7 @@
   function Link() {
     Companion_getInstance_27();
     var tmp = this;
-    tmp.n32_1 = lazy(Link$defaultTextStyles$delegate$lambda(this));
+    tmp.m32_1 = lazy(Link$defaultTextStyles$delegate$lambda(this));
   }
   function defaultTextStyles$factory_0() {
     return getPropertyCallableRef('defaultTextStyles', 1, KProperty1, function (receiver) {
@@ -4772,20 +4772,20 @@
     }, null);
   }
   function Manifest$Companion$parse$slambda$slambda$slambda($manifest, $fileName, $parseFile, $src, resultContinuation) {
-    this.y32_1 = $manifest;
-    this.z32_1 = $fileName;
-    this.a33_1 = $parseFile;
-    this.b33_1 = $src;
+    this.x32_1 = $manifest;
+    this.y32_1 = $fileName;
+    this.z32_1 = $parseFile;
+    this.a33_1 = $src;
     CoroutineImpl.call(this, resultContinuation);
   }
-  protoOf(Manifest$Companion$parse$slambda$slambda$slambda).e33 = function ($this$async, $completion) {
+  protoOf(Manifest$Companion$parse$slambda$slambda$slambda).d33 = function ($this$async, $completion) {
     var tmp = this.a11($this$async, $completion);
     tmp.de_1 = Unit_getInstance();
     tmp.ee_1 = null;
     return tmp.ue();
   };
   protoOf(Manifest$Companion$parse$slambda$slambda$slambda).if = function (p1, $completion) {
-    return this.e33((!(p1 == null) ? isInterface(p1, CoroutineScope) : false) ? p1 : THROW_CCE(), $completion);
+    return this.d33((!(p1 == null) ? isInterface(p1, CoroutineScope) : false) ? p1 : THROW_CCE(), $completion);
   };
   protoOf(Manifest$Companion$parse$slambda$slambda$slambda).ue = function () {
     var suspendResult = this.de_1;
@@ -4795,9 +4795,9 @@
         switch (tmp) {
           case 0:
             this.ce_1 = 2;
-            this.d33_1 = Companion_getInstance_48();
+            this.c33_1 = Companion_getInstance_48();
             this.be_1 = 1;
-            suspendResult = this.a33_1(this.b33_1, this);
+            suspendResult = this.z32_1(this.a33_1, this);
             if (suspendResult === get_COROUTINE_SUSPENDED()) {
               return suspendResult;
             }
@@ -4805,7 +4805,7 @@
             continue $sm;
           case 1:
             var ARGUMENT = suspendResult;
-            return this.d33_1.j33(this.y32_1, this.z32_1, ARGUMENT);
+            return this.c33_1.i33(this.x32_1, this.y32_1, ARGUMENT);
           case 2:
             throw this.ee_1;
         }
@@ -4821,33 +4821,33 @@
      while (true);
   };
   protoOf(Manifest$Companion$parse$slambda$slambda$slambda).a11 = function ($this$async, completion) {
-    var i = new Manifest$Companion$parse$slambda$slambda$slambda(this.y32_1, this.z32_1, this.a33_1, this.b33_1, completion);
-    i.c33_1 = $this$async;
+    var i = new Manifest$Companion$parse$slambda$slambda$slambda(this.x32_1, this.y32_1, this.z32_1, this.a33_1, completion);
+    i.b33_1 = $this$async;
     return i;
   };
   function Manifest$Companion$parse$slambda$slambda$slambda_0($manifest, $fileName, $parseFile, $src, resultContinuation) {
     var i = new Manifest$Companion$parse$slambda$slambda$slambda($manifest, $fileName, $parseFile, $src, resultContinuation);
     var l = function ($this$async, $completion) {
-      return i.e33($this$async, $completion);
+      return i.d33($this$async, $completion);
     };
     l.$arity = 1;
     return l;
   }
   function Manifest$Companion$parse$slambda$slambda$slambda_1($manifest, $id, $parseFile, $src, resultContinuation) {
-    this.s33_1 = $manifest;
-    this.t33_1 = $id;
-    this.u33_1 = $parseFile;
-    this.v33_1 = $src;
+    this.r33_1 = $manifest;
+    this.s33_1 = $id;
+    this.t33_1 = $parseFile;
+    this.u33_1 = $src;
     CoroutineImpl.call(this, resultContinuation);
   }
-  protoOf(Manifest$Companion$parse$slambda$slambda$slambda_1).x33 = function ($this$async, $completion) {
+  protoOf(Manifest$Companion$parse$slambda$slambda$slambda_1).w33 = function ($this$async, $completion) {
     var tmp = this.a11($this$async, $completion);
     tmp.de_1 = Unit_getInstance();
     tmp.ee_1 = null;
     return tmp.ue();
   };
   protoOf(Manifest$Companion$parse$slambda$slambda$slambda_1).if = function (p1, $completion) {
-    return this.x33((!(p1 == null) ? isInterface(p1, CoroutineScope) : false) ? p1 : THROW_CCE(), $completion);
+    return this.w33((!(p1 == null) ? isInterface(p1, CoroutineScope) : false) ? p1 : THROW_CCE(), $completion);
   };
   protoOf(Manifest$Companion$parse$slambda$slambda$slambda_1).ue = function () {
     var suspendResult = this.de_1;
@@ -4858,7 +4858,7 @@
           case 0:
             this.ce_1 = 2;
             this.be_1 = 1;
-            suspendResult = this.u33_1(this.v33_1, this);
+            suspendResult = this.t33_1(this.u33_1, this);
             if (suspendResult === get_COROUTINE_SUSPENDED()) {
               return suspendResult;
             }
@@ -4866,7 +4866,7 @@
             continue $sm;
           case 1:
             var ARGUMENT = suspendResult;
-            return Tip_init_$Create$(this.s33_1, this.t33_1, ARGUMENT);
+            return Tip_init_$Create$(this.r33_1, this.s33_1, ARGUMENT);
           case 2:
             throw this.ee_1;
         }
@@ -4882,21 +4882,21 @@
      while (true);
   };
   protoOf(Manifest$Companion$parse$slambda$slambda$slambda_1).a11 = function ($this$async, completion) {
-    var i = new Manifest$Companion$parse$slambda$slambda$slambda_1(this.s33_1, this.t33_1, this.u33_1, this.v33_1, completion);
-    i.w33_1 = $this$async;
+    var i = new Manifest$Companion$parse$slambda$slambda$slambda_1(this.r33_1, this.s33_1, this.t33_1, this.u33_1, completion);
+    i.v33_1 = $this$async;
     return i;
   };
   function Manifest$Companion$parse$slambda$slambda$slambda_2($manifest, $id, $parseFile, $src, resultContinuation) {
     var i = new Manifest$Companion$parse$slambda$slambda$slambda_1($manifest, $id, $parseFile, $src, resultContinuation);
     var l = function ($this$async, $completion) {
-      return i.x33($this$async, $completion);
+      return i.w33($this$async, $completion);
     };
     l.$arity = 1;
     return l;
   }
   function Manifest$Companion$parse$slambda$slambda($manifest, $parseFile, resultContinuation) {
-    this.g34_1 = $manifest;
-    this.h34_1 = $parseFile;
+    this.f34_1 = $manifest;
+    this.g34_1 = $parseFile;
     CoroutineImpl.call(this, resultContinuation);
   }
   protoOf(Manifest$Companion$parse$slambda$slambda).z10 = function ($this$launch, $completion) {
@@ -4917,14 +4917,14 @@
           case 0:
             this.ce_1 = 2;
             this.be_1 = 1;
-            var tmp1_map = this.g34_1.k2u_1;
+            var tmp1_map = this.f34_1.j2u_1;
             var tmp0_mapTo = ArrayList_init_$Create$_0(collectionSizeOrDefault(tmp1_map, 10));
             var tmp0_iterator = tmp1_map.f();
             while (tmp0_iterator.g()) {
               var item = tmp0_iterator.h();
               var fileName = item.s2();
               var src = item.t2();
-              tmp0_mapTo.b(async(this.i34_1, VOID, VOID, Manifest$Companion$parse$slambda$slambda$slambda_0(this.g34_1, fileName, this.h34_1, src, null)));
+              tmp0_mapTo.b(async(this.h34_1, VOID, VOID, Manifest$Companion$parse$slambda$slambda$slambda_0(this.f34_1, fileName, this.g34_1, src, null)));
             }
             suspendResult = awaitAll(tmp0_mapTo, this);
@@ -4936,7 +4936,7 @@
           case 1:
             var ARGUMENT = suspendResult;
             var ARGUMENT_0 = filterNotNull(ARGUMENT);
-            _set_pages__j2nojl(this.g34_1, ARGUMENT_0);
+            _set_pages__j2nojl(this.f34_1, ARGUMENT_0);
             return Unit_getInstance();
           case 2:
             throw this.ee_1;
@@ -4953,8 +4953,8 @@
      while (true);
   };
   protoOf(Manifest$Companion$parse$slambda$slambda).a11 = function ($this$launch, completion) {
-    var i = new Manifest$Companion$parse$slambda$slambda(this.g34_1, this.h34_1, completion);
-    i.i34_1 = $this$launch;
+    var i = new Manifest$Companion$parse$slambda$slambda(this.f34_1, this.g34_1, completion);
+    i.h34_1 = $this$launch;
     return i;
   };
   function Manifest$Companion$parse$slambda$slambda_0($manifest, $parseFile, resultContinuation) {
@@ -4966,8 +4966,8 @@
     return l;
   }
   function Manifest$Companion$parse$slambda$slambda_1($manifest, $parseFile, resultContinuation) {
-    this.r34_1 = $manifest;
-    this.s34_1 = $parseFile;
+    this.q34_1 = $manifest;
+    this.r34_1 = $parseFile;
     CoroutineImpl.call(this, resultContinuation);
   }
   protoOf(Manifest$Companion$parse$slambda$slambda_1).z10 = function ($this$launch, $completion) {
@@ -4988,14 +4988,14 @@
           case 0:
             this.ce_1 = 2;
             this.be_1 = 1;
-            var tmp1_map = this.r34_1.l2u_1;
+            var tmp1_map = this.q34_1.k2u_1;
             var tmp0_mapTo = ArrayList_init_$Create$_0(collectionSizeOrDefault(tmp1_map, 10));
             var tmp0_iterator = tmp1_map.f();
             while (tmp0_iterator.g()) {
               var item = tmp0_iterator.h();
               var id = item.s2();
               var src = item.t2();
-              tmp0_mapTo.b(async(this.t34_1, VOID, VOID, Manifest$Companion$parse$slambda$slambda$slambda_2(this.r34_1, id, this.s34_1, src, null)));
+              tmp0_mapTo.b(async(this.s34_1, VOID, VOID, Manifest$Companion$parse$slambda$slambda$slambda_2(this.q34_1, id, this.r34_1, src, null)));
             }
             suspendResult = awaitAll(tmp0_mapTo, this);
@@ -5011,11 +5011,11 @@
             var tmp0_iterator_0 = tmp3_associateBy.f();
             while (tmp0_iterator_0.g()) {
               var element = tmp0_iterator_0.h();
-              tmp2_associateByTo.u2(element.v34_1, element);
+              tmp2_associateByTo.u2(element.u34_1, element);
             }
             var ARGUMENT = tmp2_associateByTo;
-            _set_tips__9ug36n(this.r34_1, ARGUMENT);
+            _set_tips__9ug36n(this.q34_1, ARGUMENT);
             return Unit_getInstance();
           case 2:
             throw this.ee_1;
@@ -5032,8 +5032,8 @@
      while (true);
   };
   protoOf(Manifest$Companion$parse$slambda$slambda_1).a11 = function ($this$launch, completion) {
-    var i = new Manifest$Companion$parse$slambda$slambda_1(this.r34_1, this.s34_1, completion);
-    i.t34_1 = $this$launch;
+    var i = new Manifest$Companion$parse$slambda$slambda_1(this.q34_1, this.r34_1, completion);
+    i.s34_1 = $this$launch;
     return i;
   };
   function Manifest$Companion$parse$slambda$slambda_2($manifest, $parseFile, resultContinuation) {
@@ -5045,19 +5045,19 @@
     return l;
   }
   function Manifest$Companion$parse$slambda($config, $manifest, $parseFile, resultContinuation) {
-    this.g35_1 = $config;
-    this.h35_1 = $manifest;
-    this.i35_1 = $parseFile;
+    this.f35_1 = $config;
+    this.g35_1 = $manifest;
+    this.h35_1 = $parseFile;
     CoroutineImpl.call(this, resultContinuation);
   }
-  protoOf(Manifest$Companion$parse$slambda).k35 = function ($this$coroutineScope, $completion) {
+  protoOf(Manifest$Companion$parse$slambda).j35 = function ($this$coroutineScope, $completion) {
     var tmp = this.a11($this$coroutineScope, $completion);
     tmp.de_1 = Unit_getInstance();
     tmp.ee_1 = null;
     return tmp.ue();
   };
   protoOf(Manifest$Companion$parse$slambda).if = function (p1, $completion) {
-    return this.k35((!(p1 == null) ? isInterface(p1, CoroutineScope) : false) ? p1 : THROW_CCE(), $completion);
+    return this.j35((!(p1 == null) ? isInterface(p1, CoroutineScope) : false) ? p1 : THROW_CCE(), $completion);
   };
   protoOf(Manifest$Companion$parse$slambda).ue = function () {
     var suspendResult = this.de_1;
@@ -5066,16 +5066,16 @@
         var tmp = this.be_1;
         if (tmp === 0) {
           this.ce_1 = 1;
-          if (this.g35_1.o2q_1) {
-            launch(this.j35_1, VOID, VOID, Manifest$Companion$parse$slambda$slambda_0(this.h35_1, this.i35_1, null));
+          if (this.f35_1.o2q_1) {
+            launch(this.i35_1, VOID, VOID, Manifest$Companion$parse$slambda$slambda_0(this.g35_1, this.h35_1, null));
           } else {
-            _set_pages__j2nojl(this.h35_1, emptyList());
+            _set_pages__j2nojl(this.g35_1, emptyList());
           }
           var tmp_0;
-          if (this.g35_1.p2q_1) {
-            tmp_0 = launch(this.j35_1, VOID, VOID, Manifest$Companion$parse$slambda$slambda_2(this.h35_1, this.i35_1, null));
+          if (this.f35_1.p2q_1) {
+            tmp_0 = launch(this.i35_1, VOID, VOID, Manifest$Companion$parse$slambda$slambda_2(this.g35_1, this.h35_1, null));
           } else {
-            _set_tips__9ug36n(this.h35_1, emptyMap());
+            _set_tips__9ug36n(this.g35_1, emptyMap());
             tmp_0 = Unit_getInstance();
           }
           return tmp_0;
@@ -5089,24 +5089,24 @@
      while (true);
   };
   protoOf(Manifest$Companion$parse$slambda).a11 = function ($this$coroutineScope, completion) {
-    var i = new Manifest$Companion$parse$slambda(this.g35_1, this.h35_1, this.i35_1, completion);
-    i.j35_1 = $this$coroutineScope;
+    var i = new Manifest$Companion$parse$slambda(this.f35_1, this.g35_1, this.h35_1, completion);
+    i.i35_1 = $this$coroutineScope;
     return i;
   };
   function Manifest$Companion$parse$slambda_0($config, $manifest, $parseFile, resultContinuation) {
     var i = new Manifest$Companion$parse$slambda($config, $manifest, $parseFile, resultContinuation);
     var l = function ($this$coroutineScope, $completion) {
-      return i.k35($this$coroutineScope, $completion);
+      return i.j35($this$coroutineScope, $completion);
     };
     l.$arity = 1;
     return l;
   }
   function $parseCOROUTINE$0(_this__u8e3s4, fileName, config, parseFile, resultContinuation) {
     CoroutineImpl.call(this, resultContinuation);
-    this.t35_1 = _this__u8e3s4;
-    this.u35_1 = fileName;
-    this.v35_1 = config;
-    this.w35_1 = parseFile;
+    this.s35_1 = _this__u8e3s4;
+    this.t35_1 = fileName;
+    this.u35_1 = config;
+    this.v35_1 = parseFile;
   }
   protoOf($parseCOROUTINE$0).ue = function () {
     var suspendResult = this.de_1;
@@ -5117,17 +5117,17 @@
           case 0:
             this.ce_1 = 3;
             this.be_1 = 1;
-            suspendResult = this.w35_1(this.u35_1, this);
+            suspendResult = this.v35_1(this.t35_1, this);
             if (suspendResult === get_COROUTINE_SUSPENDED()) {
               return suspendResult;
             }
             continue $sm;
           case 1:
-            this.x35_1 = suspendResult;
-            this.y35_1 = Manifest_init_$Create$(this.x35_1, this.v35_1);
+            this.w35_1 = suspendResult;
+            this.x35_1 = Manifest_init_$Create$(this.w35_1, this.u35_1);
             this.be_1 = 2;
-            suspendResult = coroutineScope(Manifest$Companion$parse$slambda_0(this.v35_1, this.y35_1, this.w35_1, null), this);
+            suspendResult = coroutineScope(Manifest$Companion$parse$slambda_0(this.u35_1, this.x35_1, this.v35_1, null), this);
             if (suspendResult === get_COROUTINE_SUSPENDED()) {
               return suspendResult;
             }
@@ -5135,7 +5135,7 @@
             continue $sm;
           case 2:
             ;
-            return this.y35_1;
+            return this.x35_1;
           case 3:
             throw this.ee_1;
         }
@@ -5157,9 +5157,9 @@
   var Type_UNKNOWN_instance_0;
   function Companion_25() {
     Companion_instance_25 = this;
-    this.z35_1 = Type_TRACT_getInstance();
+    this.y35_1 = Type_TRACT_getInstance();
   }
-  protoOf(Companion_25).a36 = function (value) {
+  protoOf(Companion_25).z35 = function (value) {
     var tmp0_subject = value;
     switch (tmp0_subject) {
       case 'article':
@@ -5256,10 +5256,10 @@
     return Companion_instance_26;
   }
   function _set_pages__j2nojl($this, _set____db54di) {
-    return $this.h2u_1.b36($this, pages$factory(), _set____db54di);
+    return $this.h2u_1.a36($this, pages$factory(), _set____db54di);
   }
   function _set_tips__9ug36n($this, _set____db54di) {
-    return $this.j2u_1.b36($this, tips$factory(), _set____db54di);
+    return $this.i2u_1.a36($this, tips$factory(), _set____db54di);
   }
   function Manifest_init_$Init$(parser, config, $this) {
     BaseModel.call($this);
@@ -5272,13 +5272,13 @@
     var tmp0_safe_receiver = parser.o2t('locale');
     tmp.locale = tmp0_safe_receiver == null ? null : toLocaleOrNull(tmp0_safe_receiver);
     var tmp_0 = $this;
-    var tmp1_elvis_lhs = Companion_getInstance_28().a36(parser.o2t('type'));
-    tmp_0.type = tmp1_elvis_lhs == null ? Companion_getInstance_28().z35_1 : tmp1_elvis_lhs;
+    var tmp1_elvis_lhs = Companion_getInstance_28().z35(parser.o2t('type'));
+    tmp_0.type = tmp1_elvis_lhs == null ? Companion_getInstance_28().y35_1 : tmp1_elvis_lhs;
     var tmp_1 = $this;
     var tmp$ret$0;
     // Inline function 'org.cru.godtools.shared.tool.parser.model.toEventIds' call
     var tmp0_toEventIds = parser.o2t(get_XML_DISMISS_LISTENERS());
-    tmp$ret$0 = Companion_getInstance_17().o2v(tmp0_toEventIds);
+    tmp$ret$0 = Companion_getInstance_17().n2v(tmp0_toEventIds);
     tmp_1.dismissListeners = toSet_0(tmp$ret$0);
     var tmp_2 = $this;
     var tmp2_safe_receiver = parser.o2t(get_XML_PRIMARY_COLOR());
@@ -5298,29 +5298,29 @@
     var tmp8_safe_receiver = parser.o2t(get_XML_BACKGROUND_COLOR());
     var tmp9_elvis_lhs = tmp8_safe_receiver == null ? null : toColorOrNull(tmp8_safe_receiver);
     tmp_6.v2t_1 = tmp9_elvis_lhs == null ? Companion_getInstance_29().e2q_1 : tmp9_elvis_lhs;
-    $this.w2t_1 = parser.n2v(null, get_XML_BACKGROUND_IMAGE());
+    $this.w2t_1 = parser.m2v(null, get_XML_BACKGROUND_IMAGE());
     var tmp_7 = $this;
     var tmp10_safe_receiver = parser.o2t(get_XML_BACKGROUND_IMAGE_GRAVITY());
-    var tmp11_elvis_lhs = tmp10_safe_receiver == null ? null : Companion_getInstance_22().z2w(tmp10_safe_receiver);
+    var tmp11_elvis_lhs = tmp10_safe_receiver == null ? null : Companion_getInstance_22().y2w(tmp10_safe_receiver);
     tmp_7.x2t_1 = tmp11_elvis_lhs == null ? Companion_getInstance_29().f2q_1 : tmp11_elvis_lhs;
     var tmp_8 = $this;
     var tmp12_safe_receiver = parser.o2t(get_XML_BACKGROUND_IMAGE_SCALE_TYPE());
-    var tmp13_elvis_lhs = tmp12_safe_receiver == null ? null : Companion_getInstance_24().k31(tmp12_safe_receiver);
+    var tmp13_elvis_lhs = tmp12_safe_receiver == null ? null : Companion_getInstance_24().j31(tmp12_safe_receiver);
     tmp_8.y2t_1 = tmp13_elvis_lhs == null ? Companion_getInstance_29().g2q_1 : tmp13_elvis_lhs;
     var tmp_9 = $this;
     var tmp_10 = get_XMLNS_CONTENT();
     Companion_getInstance_12();
-    var tmp14_safe_receiver = parser.n2v(tmp_10, 'card-background-color');
+    var tmp14_safe_receiver = parser.m2v(tmp_10, 'card-background-color');
     tmp_9.z2t_1 = tmp14_safe_receiver == null ? null : toColorOrNull(tmp14_safe_receiver);
     var tmp_11 = $this;
     var tmp15_safe_receiver = parser.o2t('category-label-color');
     tmp_11.a2u_1 = tmp15_safe_receiver == null ? null : toColorOrNull(tmp15_safe_receiver);
     var tmp_12 = $this;
-    var tmp16_safe_receiver = parser.n2v(get_XMLNS_PAGE(), get_XML_CONTROL_COLOR());
+    var tmp16_safe_receiver = parser.m2v(get_XMLNS_PAGE(), get_XML_CONTROL_COLOR());
     var tmp19_elvis_lhs = tmp16_safe_receiver == null ? null : toColorOrNull(tmp16_safe_receiver);
     var tmp_13;
     if (tmp19_elvis_lhs == null) {
-      var tmp17_safe_receiver = parser.n2v(get_XMLNS_LESSON(), get_XML_CONTROL_COLOR());
+      var tmp17_safe_receiver = parser.m2v(get_XMLNS_LESSON(), get_XML_CONTROL_COLOR());
       var tmp18_safe_receiver = tmp17_safe_receiver == null ? null : toColorOrNull(tmp17_safe_receiver);
       var tmp_14;
       if (tmp18_safe_receiver == null) {
@@ -5344,12 +5344,12 @@
     var tmp_15 = $this;
     var tmp_16 = get_XMLNS_CONTENT();
     Companion_getInstance_32();
-    var tmp21_safe_receiver = parser.n2v(tmp_16, 'multiselect-option-background-color');
+    var tmp21_safe_receiver = parser.m2v(tmp_16, 'multiselect-option-background-color');
     tmp_15.c2u_1 = tmp21_safe_receiver == null ? null : toColorOrNull(tmp21_safe_receiver);
     var tmp_17 = $this;
     var tmp_18 = get_XMLNS_CONTENT();
     Companion_getInstance_32();
-    var tmp22_safe_receiver = parser.n2v(tmp_18, 'multiselect-option-selected-color');
+    var tmp22_safe_receiver = parser.m2v(tmp_18, 'multiselect-option-selected-color');
     tmp_17.d2u_1 = tmp22_safe_receiver == null ? null : toColorOrNull(tmp22_safe_receiver);
     var tmp_19 = $this;
     var tmp23_safe_receiver = parser.o2t(get_XML_TEXT_COLOR());
@@ -5381,7 +5381,7 @@
     var tmp$ret$4;
     // Inline function 'kotlin.collections.mutableMapOf' call
     tmp$ret$4 = LinkedHashMap_init_$Create$();
-    tmp_24.i2u_1 = tmp$ret$4;
+    tmp_24.resources = tmp$ret$4;
     var tmp$ret$5;
     // Inline function 'kotlin.collections.mutableListOf' call
     tmp$ret$5 = ArrayList_init_$Create$();
@@ -5390,12 +5390,12 @@
     var tmp$ret$6;
     // Inline function 'kotlin.collections.mutableListOf' call
     tmp$ret$6 = ArrayList_init_$Create$();
-    tmp_25.k2u_1 = tmp$ret$6;
+    tmp_25.j2u_1 = tmp$ret$6;
     var tmp_26 = $this;
     var tmp$ret$7;
     // Inline function 'kotlin.collections.mutableListOf' call
     tmp$ret$7 = ArrayList_init_$Create$();
-    tmp_26.l2u_1 = tmp$ret$7;
+    tmp_26.k2u_1 = tmp$ret$7;
     // Inline function 'org.cru.godtools.shared.tool.parser.xml.parseChildren' call
     $l$loop_1: while (true) {
       var tmp_27 = parser.h();
@@ -5428,20 +5428,20 @@
             var tmp3_this = $this;
             // Inline function 'kotlin.collections.plusAssign' call
             var tmp2_plusAssign = tmp3_this.aemImports;
-            var tmp3_plusAssign = result.e36_1;
+            var tmp3_plusAssign = result.d36_1;
             addAll(tmp2_plusAssign, tmp3_plusAssign);
             var tmp4_this = $this;
             // Inline function 'kotlin.collections.plusAssign' call
-            var tmp4_plusAssign = tmp4_this.k2u_1;
-            var tmp5_plusAssign = result.f36_1;
+            var tmp4_plusAssign = tmp4_this.j2u_1;
+            var tmp5_plusAssign = result.e36_1;
             addAll(tmp4_plusAssign, tmp5_plusAssign);
             break;
           case 'resources':
             var tmp5_this = $this;
             // Inline function 'kotlin.collections.plusAssign' call
-            var tmp8_plusAssign = tmp5_this.i2u_1;
+            var tmp8_plusAssign = tmp5_this.resources;
             var tmp$ret$10;
             // Inline function 'kotlin.collections.associateBy' call
             var tmp7_associateBy = parseResources(parser, $this);
@@ -5466,7 +5466,7 @@
           case 'tips':
             var tmp6_this = $this;
             // Inline function 'kotlin.collections.plusAssign' call
-            var tmp10_plusAssign = tmp6_this.l2u_1;
+            var tmp10_plusAssign = tmp6_this.k2u_1;
             var tmp11_plusAssign = parseTips(parser, $this);
             addAll(tmp10_plusAssign, tmp11_plusAssign);
@@ -5477,7 +5477,7 @@
         Companion_getInstance_49();
         if (tmp7_subject === 'items') {
           // Inline function 'kotlin.collections.plusAssign' call
-          var tmp12_plusAssign = Companion_getInstance_49().d36(parser, $this);
+          var tmp12_plusAssign = Companion_getInstance_49().c36(parser, $this);
           addAll(shareables, tmp12_plusAssign);
         }
       }
@@ -5499,7 +5499,7 @@
       var e = tmp0_iterator_0.h();
       var tmp$ret$11;
       // Inline function 'org.cru.godtools.shared.tool.parser.model.Manifest.<init>.<anonymous>' call
-      tmp$ret$11 = e.q2u();
+      tmp$ret$11 = e.p2u();
       var key = tmp$ret$11;
       if (set.b(key)) {
         list.b(e);
@@ -5521,7 +5521,7 @@
   }
   function Manifest_init_$Init$_0(config, type, code, locale, primaryColor, primaryTextColor, navBarColor, navBarControlColor, backgroundColor, cardBackgroundColor, categoryLabelColor, pageControlColor, multiselectOptionSelectedColor, textColor, textScale, resources, shareables, tips, pages, $this) {
     config = config === VOID ? createParserConfig() : config;
-    type = type === VOID ? Companion_getInstance_28().z35_1 : type;
+    type = type === VOID ? Companion_getInstance_28().y35_1 : type;
     code = code === VOID ? null : code;
     locale = locale === VOID ? null : locale;
     primaryColor = primaryColor === VOID ? Companion_getInstance_29().c2q_1 : primaryColor;
@@ -5608,7 +5608,7 @@
     var tmp2_orEmpty = tmp_1;
     var tmp0_elvis_lhs_0 = tmp2_orEmpty;
     tmp$ret$4 = tmp0_elvis_lhs_0 == null ? emptyMap() : tmp0_elvis_lhs_0;
-    tmp_0.i2u_1 = tmp$ret$4;
+    tmp_0.resources = tmp$ret$4;
     var tmp_2 = $this;
     var tmp$ret$5;
     // Inline function 'kotlin.collections.orEmpty' call
@@ -5636,7 +5636,7 @@
         var element_0 = tmp0_iterator_0.h();
         var tmp$ret$6;
         // Inline function 'org.cru.godtools.shared.tool.parser.model.Manifest.<init>.<anonymous>' call
-        tmp$ret$6 = element_0.v34_1;
+        tmp$ret$6 = element_0.u34_1;
         tmp4_associateByTo.u2(tmp$ret$6, element_0);
       }
       tmp$ret$7 = tmp4_associateByTo;
@@ -5647,8 +5647,8 @@
     var tmp0_elvis_lhs_2 = tmp5_orEmpty;
     tmp$ret$9 = tmp0_elvis_lhs_2 == null ? emptyMap() : tmp0_elvis_lhs_2;
     _set_tips__9ug36n($this, tmp$ret$9);
+    $this.j2u_1 = emptyList();
     $this.k2u_1 = emptyList();
-    $this.l2u_1 = emptyList();
     return $this;
   }
   function createTestManifest(config, type, code, locale, primaryColor, primaryTextColor, navBarColor, navBarControlColor, backgroundColor, cardBackgroundColor, categoryLabelColor, pageControlColor, multiselectOptionSelectedColor, textColor, textScale, resources, shareables, tips, pages) {
@@ -5703,12 +5703,12 @@
     var tmp$ret$0;
     // Inline function 'kotlin.collections.mutableListOf' call
     tmp$ret$0 = ArrayList_init_$Create$();
-    tmp.e36_1 = tmp$ret$0;
+    tmp.d36_1 = tmp$ret$0;
     var tmp_0 = this;
     var tmp$ret$1;
     // Inline function 'kotlin.collections.mutableListOf' call
     tmp$ret$1 = ArrayList_init_$Create$();
-    tmp_0.f36_1 = tmp$ret$1;
+    tmp_0.e36_1 = tmp$ret$1;
   }
   function parsePages(_this__u8e3s4, $this) {
     var tmp$ret$4;
@@ -5748,7 +5748,7 @@
             var fileName = _this__u8e3s4.o2t('filename');
             var tmp3_this = tmp0_also;
             // Inline function 'kotlin.collections.plusAssign' call
-            var tmp0_plusAssign = tmp3_this.f36_1;
+            var tmp0_plusAssign = tmp3_this.e36_1;
             var tmp1_plusAssign = to(fileName, src);
             tmp0_plusAssign.b(tmp1_plusAssign);
           }
@@ -5783,7 +5783,7 @@
               // Inline function 'kotlin.let' call
               // Inline function 'kotlin.contracts.contract' call
               var tmp0_this = tmp0_also;
-              var tmp0_plusAssign_0 = tmp0_this.e36_1;
+              var tmp0_plusAssign_0 = tmp0_this.d36_1;
               tmp0_plusAssign_0.b(tmp6_safe_receiver);
               tmp$ret$3 = Unit_getInstance();
             }
@@ -5911,10 +5911,10 @@
   defineProp(protoOf(Type_1), 'name', protoOf(Type_1).id);
   defineProp(protoOf(Type_1), 'ordinal', protoOf(Type_1).jd);
   function sam$kotlin_Comparator$0(function_0) {
-    this.m36_1 = function_0;
+    this.l36_1 = function_0;
   }
   protoOf(sam$kotlin_Comparator$0).wc = function (a, b) {
-    return this.m36_1(a, b);
+    return this.l36_1(a, b);
   };
   protoOf(sam$kotlin_Comparator$0).compare = function (a, b) {
     return this.wc(a, b);
@@ -5924,11 +5924,11 @@
     // Inline function 'kotlin.comparisons.compareValuesBy' call
     var tmp$ret$0;
     // Inline function 'org.cru.godtools.shared.tool.parser.model.Manifest.<init>.<anonymous>' call
-    tmp$ret$0 = a.j36_1;
+    tmp$ret$0 = a.i36_1;
     var tmp = tmp$ret$0;
     var tmp$ret$1;
     // Inline function 'org.cru.godtools.shared.tool.parser.model.Manifest.<init>.<anonymous>' call
-    tmp$ret$1 = b.j36_1;
+    tmp$ret$1 = b.i36_1;
     tmp$ret$2 = compareValues(tmp, tmp$ret$1);
     return tmp$ret$2;
   }
@@ -5952,97 +5952,97 @@
     Type_initEntries_1();
     return Type_UNKNOWN_instance_0;
   }
-  protoOf(Manifest).n36 = function () {
+  protoOf(Manifest).m36 = function () {
     return this.q2t_1;
   };
-  protoOf(Manifest).o36 = function () {
+  protoOf(Manifest).n36 = function () {
     return this.code;
   };
-  protoOf(Manifest).p36 = function () {
+  protoOf(Manifest).o36 = function () {
     return this.locale;
   };
   protoOf(Manifest).k1c = function () {
     return this.type;
   };
-  protoOf(Manifest).q36 = function () {
+  protoOf(Manifest).p36 = function () {
     return this.dismissListeners;
   };
-  protoOf(Manifest).a2y = function () {
+  protoOf(Manifest).z2x = function () {
     return this.r2t_1;
   };
-  protoOf(Manifest).b2y = function () {
+  protoOf(Manifest).a2y = function () {
     return this.s2t_1;
   };
-  protoOf(Manifest).r36 = function () {
+  protoOf(Manifest).q36 = function () {
     var tmp0_elvis_lhs = this.t2t_1;
     return tmp0_elvis_lhs == null ? this.type.equals(Type_LESSON_getInstance()) ? get_DEFAULT_LESSON_NAV_BAR_COLOR() : this.r2t_1 : tmp0_elvis_lhs;
   };
-  protoOf(Manifest).s36 = function () {
+  protoOf(Manifest).r36 = function () {
     var tmp0_elvis_lhs = this.u2t_1;
     return tmp0_elvis_lhs == null ? this.type.equals(Type_LESSON_getInstance()) ? this.r2t_1 : this.s2t_1 : tmp0_elvis_lhs;
   };
-  protoOf(Manifest).t36 = function () {
+  protoOf(Manifest).s36 = function () {
     return this.v2t_1;
   };
-  protoOf(Manifest).u36 = function () {
-    return this.u2v(this.w2t_1);
+  protoOf(Manifest).t36 = function () {
+    return this.t2v(this.w2t_1);
   };
-  protoOf(Manifest).v36 = function () {
+  protoOf(Manifest).u36 = function () {
     return this.x2t_1;
   };
-  protoOf(Manifest).w36 = function () {
+  protoOf(Manifest).v36 = function () {
     return this.y2t_1;
   };
-  protoOf(Manifest).d2y = function () {
+  protoOf(Manifest).c2y = function () {
     var tmp0_elvis_lhs = this.z2t_1;
     return tmp0_elvis_lhs == null ? this.v2t_1 : tmp0_elvis_lhs;
   };
-  protoOf(Manifest).z2x = function () {
+  protoOf(Manifest).y2x = function () {
     var tmp0_elvis_lhs = this.a2u_1;
     return tmp0_elvis_lhs == null ? this.e2u_1 : tmp0_elvis_lhs;
   };
-  protoOf(Manifest).x36 = function () {
+  protoOf(Manifest).w36 = function () {
     return this.b2u_1;
   };
-  protoOf(Manifest).c2y = function () {
+  protoOf(Manifest).b2y = function () {
     return Companion_getInstance_29().h2q_1;
   };
-  protoOf(Manifest).e2y = function () {
+  protoOf(Manifest).d2y = function () {
     var tmp0_elvis_lhs = this.c2u_1;
     return tmp0_elvis_lhs == null ? get_multiselectOptionBackgroundColor.call(this) : tmp0_elvis_lhs;
   };
-  protoOf(Manifest).f2y = function () {
+  protoOf(Manifest).e2y = function () {
     return this.d2u_1;
   };
-  protoOf(Manifest).y2x = function () {
+  protoOf(Manifest).x2x = function () {
     return this.e2u_1;
   };
-  protoOf(Manifest).g2y = function () {
+  protoOf(Manifest).f2y = function () {
     return this.f2u_1;
   };
-  protoOf(Manifest).y36 = function () {
+  protoOf(Manifest).x36 = function () {
     var tmp0_safe_receiver = this.g2u_1;
     return tmp0_safe_receiver == null ? null : tmp0_safe_receiver.text;
   };
-  protoOf(Manifest).m37 = function () {
+  protoOf(Manifest).l37 = function () {
     return this.aemImports;
   };
-  protoOf(Manifest).n37 = function () {
+  protoOf(Manifest).m37 = function () {
     return this.categories;
   };
-  protoOf(Manifest).o37 = function () {
-    return this.h2u_1.p37(this, pages$factory_0());
+  protoOf(Manifest).n37 = function () {
+    return this.h2u_1.o37(this, pages$factory_0());
   };
-  protoOf(Manifest).q37 = function () {
-    return this.i2u_1;
+  protoOf(Manifest).p37 = function () {
+    return this.resources;
   };
-  protoOf(Manifest).r37 = function () {
+  protoOf(Manifest).q37 = function () {
     return this.shareables;
   };
   protoOf(Manifest).c2t = function () {
-    return this.j2u_1.p37(this, tips$factory_0());
+    return this.i2u_1.o37(this, tips$factory_0());
   };
-  protoOf(Manifest).s37 = function () {
+  protoOf(Manifest).r37 = function () {
     var tmp$ret$12;
     // Inline function 'kotlin.collections.buildSet' call
     // Inline function 'kotlin.contracts.contract' call
@@ -6055,7 +6055,7 @@
     // Inline function 'org.cru.godtools.shared.tool.parser.model.Manifest.<get-relatedFiles>.<anonymous>' call
     var tmp$ret$2;
     // Inline function 'kotlin.collections.map' call
-    var tmp1_map = this.k2u_1;
+    var tmp1_map = this.j2u_1;
     var tmp$ret$1;
     // Inline function 'kotlin.collections.mapTo' call
     var tmp0_mapTo = ArrayList_init_$Create$_0(collectionSizeOrDefault(tmp1_map, 10));
@@ -6072,7 +6072,7 @@
     tmp0_apply.k(tmp$ret$2);
     var tmp$ret$5;
     // Inline function 'kotlin.collections.map' call
-    var tmp3_map = this.l2u_1;
+    var tmp3_map = this.k2u_1;
     var tmp$ret$4;
     // Inline function 'kotlin.collections.mapTo' call
     var tmp2_mapTo = ArrayList_init_$Create$_0(collectionSizeOrDefault(tmp3_map, 10));
@@ -6089,7 +6089,7 @@
     tmp0_apply.k(tmp$ret$5);
     var tmp$ret$9;
     // Inline function 'kotlin.collections.mapNotNull' call
-    var tmp5_mapNotNull = this.i2u_1.d2();
+    var tmp5_mapNotNull = this.resources.d2();
     var tmp$ret$8;
     // Inline function 'kotlin.collections.mapNotNullTo' call
     var tmp4_mapNotNullTo = ArrayList_init_$Create$();
@@ -6123,7 +6123,7 @@
   protoOf(Manifest).a2p = function () {
     return this;
   };
-  protoOf(Manifest).t37 = function () {
+  protoOf(Manifest).s37 = function () {
     var tmp;
     var tmp$ret$0;
     // Inline function 'kotlin.collections.isNotEmpty' call
@@ -6136,7 +6136,7 @@
       if (!this.q2t_1.p2q_1) {
         var tmp$ret$1;
         // Inline function 'kotlin.collections.isNotEmpty' call
-        var tmp1_isNotEmpty = this.l2u_1;
+        var tmp1_isNotEmpty = this.k2u_1;
         tmp$ret$1 = !tmp1_isNotEmpty.m();
         tmp_0 = tmp$ret$1;
       } else {
@@ -6146,7 +6146,7 @@
     }
     return tmp;
   };
-  protoOf(Manifest).u2v = function (name) {
+  protoOf(Manifest).t2v = function (name) {
     var tmp0_safe_receiver = name;
     var tmp;
     if (tmp0_safe_receiver == null) {
@@ -6157,13 +6157,13 @@
       // Inline function 'kotlin.contracts.contract' call
       var tmp$ret$0;
       // Inline function 'org.cru.godtools.shared.tool.parser.model.Manifest.getResource.<anonymous>' call
-      tmp$ret$0 = this.i2u_1.c2(name);
+      tmp$ret$0 = this.resources.c2(name);
       tmp$ret$1 = tmp$ret$0;
       tmp = tmp$ret$1;
     }
     return tmp;
   };
-  protoOf(Manifest).u37 = function (category) {
+  protoOf(Manifest).t37 = function (category) {
     var tmp$ret$1;
     $l$block: {
       // Inline function 'kotlin.collections.firstOrNull' call
@@ -6173,7 +6173,7 @@
         var element = tmp0_iterator.h();
         var tmp$ret$0;
         // Inline function 'org.cru.godtools.shared.tool.parser.model.Manifest.findCategory.<anonymous>' call
-        tmp$ret$0 = element.u2x_1 == category;
+        tmp$ret$0 = element.t2x_1 == category;
         if (tmp$ret$0) {
           tmp$ret$1 = element;
           break $l$block;
@@ -6217,7 +6217,7 @@
     }
     return tmp;
   };
-  protoOf(Manifest).v37 = function (id) {
+  protoOf(Manifest).u37 = function (id) {
     var tmp0_safe_receiver = id;
     var tmp;
     if (tmp0_safe_receiver == null) {
@@ -6237,7 +6237,7 @@
           var element = tmp0_iterator.h();
           var tmp$ret$0;
           // Inline function 'org.cru.godtools.shared.tool.parser.model.Manifest.findShareable.<anonymous>.<anonymous>' call
-          tmp$ret$0 = element.q2u() == id;
+          tmp$ret$0 = element.p2u() == id;
           if (tmp$ret$0) {
             tmp$ret$1 = element;
             break $l$block;
@@ -6251,34 +6251,42 @@
     }
     return tmp;
   };
-  protoOf(Manifest).w37 = function (id) {
+  protoOf(Manifest).v37 = function (id) {
     var tmp$ret$0;
     // Inline function 'kotlin.collections.get' call
     var tmp0_get = this.c2t();
     tmp$ret$0 = (isInterface(tmp0_get, Map) ? tmp0_get : THROW_CCE()).c2(id);
     return tmp$ret$0;
   };
-  protoOf(Manifest).x37 = function () {
+  protoOf(Manifest).w37 = function () {
     var tmp$ret$0;
     // Inline function 'kotlin.collections.toTypedArray' call
     var tmp0_toTypedArray = this._pages;
     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();
-    this.j2u_1 = setOnce();
+    this.i2u_1 = setOnce();
   }
-  defineProp(protoOf(Manifest), 'backgroundImage', protoOf(Manifest).u36);
-  defineProp(protoOf(Manifest), 'title', protoOf(Manifest).y36);
-  defineProp(protoOf(Manifest), '_pages', protoOf(Manifest).o37);
-  defineProp(protoOf(Manifest), 'relatedFiles', protoOf(Manifest).s37);
+  defineProp(protoOf(Manifest), 'backgroundImage', protoOf(Manifest).t36);
+  defineProp(protoOf(Manifest), 'title', protoOf(Manifest).x36);
+  defineProp(protoOf(Manifest), '_pages', protoOf(Manifest).n37);
+  defineProp(protoOf(Manifest), 'relatedFiles', protoOf(Manifest).r37);
   defineProp(protoOf(Manifest), 'manifest', function () {
     return this.a2p();
   });
-  defineProp(protoOf(Manifest), 'hasTips', protoOf(Manifest).t37);
-  defineProp(protoOf(Manifest), 'pages', protoOf(Manifest).x37);
+  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();
   });
@@ -6957,8 +6965,8 @@
     var tmp = get_XMLNS_MANIFEST();
     Companion_getInstance_34();
     parser.u2r(2, tmp, 'resource');
-    $this.name = parser.n2v(null, 'filename');
-    $this.localName = parser.n2v(null, 'src');
+    $this.name = parser.m2v(null, 'filename');
+    $this.localName = parser.m2v(null, 'src');
     skipTag(parser);
     return $this;
   }
@@ -7073,37 +7081,37 @@
   }
   function get_primaryColor_0(_this__u8e3s4) {
     var tmp0_safe_receiver = _this__u8e3s4;
-    var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.a2y();
+    var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.z2x();
     return tmp1_elvis_lhs == null ? Companion_getInstance_29().c2q_1 : tmp1_elvis_lhs;
   }
   function get_multiselectOptionBackgroundColor_0(_this__u8e3s4) {
     var tmp0_safe_receiver = _this__u8e3s4;
-    var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.e2y();
+    var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.d2y();
     return tmp1_elvis_lhs == null ? get_backgroundColor(get_manifest(_this__u8e3s4)) : tmp1_elvis_lhs;
   }
   function get_primaryTextColor_0(_this__u8e3s4) {
     var tmp0_safe_receiver = _this__u8e3s4;
-    var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.b2y();
+    var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.a2y();
     return tmp1_elvis_lhs == null ? Companion_getInstance_29().d2q_1 : tmp1_elvis_lhs;
   }
   function get_buttonStyle_0(_this__u8e3s4) {
     var tmp0_safe_receiver = _this__u8e3s4;
-    var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.c2y();
+    var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.b2y();
     return tmp1_elvis_lhs == null ? Companion_getInstance_29().h2q_1 : tmp1_elvis_lhs;
   }
   function get_cardBackgroundColor_0(_this__u8e3s4) {
     var tmp0_safe_receiver = _this__u8e3s4;
-    var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.d2y();
+    var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.c2y();
     return tmp1_elvis_lhs == null ? Companion_getInstance_29().e2q_1 : tmp1_elvis_lhs;
   }
   function get_textColor_0(_this__u8e3s4) {
     var tmp0_safe_receiver = _this__u8e3s4;
-    var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.y2x();
+    var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.x2x();
     return tmp1_elvis_lhs == null ? Companion_getInstance_29().i2q_1 : tmp1_elvis_lhs;
   }
   function get_textScale_0(_this__u8e3s4) {
     var tmp0_safe_receiver = _this__u8e3s4;
-    var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.g2y();
+    var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.f2y();
     var tmp;
     if (tmp1_elvis_lhs == null) {
       Companion_getInstance_37();
@@ -7115,7 +7123,7 @@
   }
   function get_textAlign_0(_this__u8e3s4) {
     var tmp0_safe_receiver = _this__u8e3s4;
-    var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.h2y();
+    var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.g2y();
     return tmp1_elvis_lhs == null ? Companion_getInstance_29().j2q_1 : tmp1_elvis_lhs;
   }
   function stylesOverride(_this__u8e3s4, textAlign, textColor, textScale) {
@@ -7137,17 +7145,17 @@
     this.r3a_1 = _textColor;
     this.s3a_1 = _textScale;
   }
-  protoOf(StylesOverride).h2y = function () {
+  protoOf(StylesOverride).g2y = function () {
     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).y2x = function () {
+  protoOf(StylesOverride).x2x = function () {
     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).g2y = function () {
+  protoOf(StylesOverride).f2y = function () {
     return get_textScale.call(this) * this.s3a_1;
   };
   defineProp(protoOf(StylesOverride), 'stylesParent', function () {
@@ -7172,7 +7180,7 @@
     } else {
       var tmp$ret$0;
       // Inline function 'org.cru.godtools.shared.tool.parser.model.toEventIds' call
-      tmp$ret$0 = Companion_getInstance_17().o2v(tmp0_safe_receiver);
+      tmp$ret$0 = Companion_getInstance_17().n2v(tmp0_safe_receiver);
       tmp_0 = tmp$ret$0;
     }
     var tmp1_safe_receiver = tmp_0;
@@ -7595,10 +7603,10 @@
     parser.u2r(2, tmp, 'text');
     var tmp_0 = $this;
     var tmp0_safe_receiver = parser.o2t('text-align');
-    tmp_0.h37_1 = tmp0_safe_receiver == null ? null : Companion_getInstance_39().j3b(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.i37_1 = tmp1_safe_receiver == null ? null : toColorOrNull(tmp1_safe_receiver);
+    tmp_1.h37_1 = tmp1_safe_receiver == null ? null : toColorOrNull(tmp1_safe_receiver);
     var tmp_2 = $this;
     var tmp2_safe_receiver = parser.o2t(get_XML_TEXT_SCALE());
     var tmp3_elvis_lhs = tmp2_safe_receiver == null ? null : toDoubleOrNull(tmp2_safe_receiver);
@@ -7609,7 +7617,7 @@
     } else {
       tmp_3 = tmp3_elvis_lhs;
     }
-    tmp_2.j37_1 = tmp_3;
+    tmp_2.i37_1 = tmp_3;
     var tmp_4 = $this;
     var tmp$ret$0;
     // Inline function 'kotlin.collections.orEmpty' call
@@ -7649,7 +7657,7 @@
       tmp_8 = tmp7_elvis_lhs;
     }
     tmp_5.minimumLines = tmp_8;
-    $this.k37_1 = parser.o2t('start-image');
+    $this.j37_1 = parser.o2t('start-image');
     var tmp_9 = $this;
     var tmp8_safe_receiver = parser.o2t('start-image-size');
     var tmp9_elvis_lhs = tmp8_safe_receiver == null ? null : toIntOrNull(tmp8_safe_receiver);
@@ -7661,7 +7669,7 @@
       tmp_10 = tmp9_elvis_lhs;
     }
     tmp_9.startImageSize = tmp_10;
-    $this.l37_1 = parser.o2t('end-image');
+    $this.k37_1 = parser.o2t('end-image');
     var tmp_11 = $this;
     var tmp10_safe_receiver = parser.o2t('end-image-size');
     var tmp11_elvis_lhs = tmp10_safe_receiver == null ? null : toIntOrNull(tmp10_safe_receiver);
@@ -7698,18 +7706,18 @@
     Content_init_$Init$_0(parent, VOID, VOID, VOID, VOID, VOID, VOID, VOID, $this);
     Text.call($this);
     $this.text = text;
-    $this.h37_1 = textAlign;
-    $this.i37_1 = textColor;
-    $this.j37_1 = textScale;
+    $this.g37_1 = textAlign;
+    $this.h37_1 = textColor;
+    $this.i37_1 = textScale;
     $this.textStyles = textStyles;
     var tmp_0 = $this;
     Companion_getInstance_41();
     tmp_0.minimumLines = 0;
-    $this.k37_1 = startImage;
+    $this.j37_1 = startImage;
     var tmp_1 = $this;
     Companion_getInstance_41();
     tmp_1.startImageSize = 40;
-    $this.l37_1 = endImage;
+    $this.k37_1 = endImage;
     var tmp_2 = $this;
     Companion_getInstance_41();
     tmp_2.endImageSize = 40;
@@ -7755,16 +7763,16 @@
   protoOf(Text).c1d = function () {
     return this.text;
   };
-  protoOf(Text).h2y = function () {
-    var tmp0_elvis_lhs = this.h37_1;
+  protoOf(Text).g2y = function () {
+    var tmp0_elvis_lhs = this.g37_1;
     return tmp0_elvis_lhs == null ? get_textAlign_0(this.a2t()) : tmp0_elvis_lhs;
   };
-  protoOf(Text).y2x = function () {
-    var tmp0_elvis_lhs = this.i37_1;
+  protoOf(Text).x2x = function () {
+    var tmp0_elvis_lhs = this.h37_1;
     return tmp0_elvis_lhs == null ? get_textColor_0(this.a2t()) : tmp0_elvis_lhs;
   };
-  protoOf(Text).g2y = function () {
-    return this.j37_1 * get_textScale_0(this.a2t());
+  protoOf(Text).f2y = function () {
+    return this.i37_1 * get_textScale_0(this.a2t());
   };
   protoOf(Text).t3b = function () {
     return this.textStyles;
@@ -7773,19 +7781,19 @@
     return this.minimumLines;
   };
   protoOf(Text).v3b = function () {
-    return this.k37_1;
+    return this.j37_1;
   };
   protoOf(Text).w3b = function () {
-    return getResource(this, this.k37_1);
+    return getResource(this, this.j37_1);
   };
   protoOf(Text).x3b = function () {
     return this.startImageSize;
   };
   protoOf(Text).y3b = function () {
-    return this.l37_1;
+    return this.k37_1;
   };
   protoOf(Text).z3b = function () {
-    return getResource(this, this.l37_1);
+    return getResource(this, this.k37_1);
   };
   protoOf(Text).a3c = function () {
     return this.endImageSize;
@@ -7937,7 +7945,7 @@
     }
     return tmp;
   };
-  protoOf(Companion_39).k2y = function (_this__u8e3s4) {
+  protoOf(Companion_39).j2y = function (_this__u8e3s4) {
     var tmp;
     try {
       tmp = this.f2r(_this__u8e3s4);
@@ -8048,7 +8056,7 @@
     Companion_instance_40 = this;
     this.d3c_1 = Provider_UNKNOWN_getInstance();
   }
-  protoOf(Companion_40).a36 = function (value) {
+  protoOf(Companion_40).z35 = function (value) {
     var tmp0_subject = value;
     return tmp0_subject === 'youtube' ? Provider_YOUTUBE_getInstance() : null;
   };
@@ -8092,18 +8100,18 @@
     Companion_getInstance_44();
     parser.u2r(2, tmp, 'video');
     var tmp_0 = $this;
-    var tmp0_elvis_lhs = Companion_getInstance_43().a36(parser.o2t('provider'));
+    var tmp0_elvis_lhs = Companion_getInstance_43().z35(parser.o2t('provider'));
     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().r2v(parser.o2t('aspect-ratio'));
+    var tmp1_elvis_lhs = Companion_getInstance_8().q2v(parser.o2t('aspect-ratio'));
     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().z2w(parser.o2t('gravity'));
+    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.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().a2x(parser.o2t('width'));
+    var tmp4_safe_receiver = Companion_getInstance_16().z2w(parser.o2t('width'));
     var tmp_4;
     if (tmp4_safe_receiver == null) {
       tmp_4 = null;
@@ -8899,16 +8907,16 @@
   });
   function Companion_45() {
     Companion_instance_45 = this;
-    this.f33_1 = 'page';
+    this.e33_1 = 'page';
     var tmp = this;
     var tmp$ret$0;
     // Inline function 'org.cru.godtools.shared.tool.parser.model.color' call
     tmp$ret$0 = toPlatformColor(Companion_getInstance_0().k2j(0 / 255.0, 0 / 255.0, 0 / 255.0, 0.0));
-    tmp.g33_1 = tmp$ret$0;
-    this.h33_1 = Companion_getInstance_22().CENTER;
-    this.i33_1 = ImageScaleType_FILL_X_getInstance();
+    tmp.f33_1 = tmp$ret$0;
+    this.g33_1 = Companion_getInstance_22().CENTER;
+    this.h33_1 = ImageScaleType_FILL_X_getInstance();
   }
-  protoOf(Companion_45).j33 = function (manifest, fileName, parser) {
+  protoOf(Companion_45).i33 = function (manifest, fileName, parser) {
     Companion_getInstance_59();
     parser.u2r(2, null, 'page');
     var tmp0_subject = parser.w2r();
@@ -8918,7 +8926,7 @@
     } else if (tmp0_subject === get_XMLNS_TRACT()) {
       tmp = TractPage_init_$Create$(manifest, fileName, parser);
     } else if (tmp0_subject === get_XMLNS_PAGE()) {
-      var type = parser.n2v(get_XMLNS_XSI(), 'type');
+      var type = parser.m2v(get_XMLNS_XSI(), 'type');
       var tmp_0;
       Companion_getInstance_46();
       if (type === 'cardcollection') {
@@ -8962,7 +8970,7 @@
     return tmp_1;
   };
   protoOf(Companion_45).a3f = function (_this__u8e3s4, type) {
-    var actual = _this__u8e3s4.n2v(get_XMLNS_XSI(), 'type');
+    var actual = _this__u8e3s4.m2v(get_XMLNS_XSI(), 'type');
     if (!(type === actual))
       throw new XmlPullParserException('expected ' + type + ' not ' + actual);
   };
@@ -8980,7 +8988,7 @@
     parser.u2r(2, null, 'page');
     $this.u3d_1 = parser.o2t('id');
     $this.v3d_1 = fileName;
-    $this.w3d_1 = parser.n2v(get_XMLNS_CYOA(), 'parent');
+    $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);
@@ -8989,13 +8997,13 @@
     var tmp$ret$0;
     // Inline function 'org.cru.godtools.shared.tool.parser.model.toEventIds' call
     var tmp0_toEventIds = parser.o2t(get_XML_LISTENERS());
-    tmp$ret$0 = Companion_getInstance_17().o2v(tmp0_toEventIds);
+    tmp$ret$0 = Companion_getInstance_17().n2v(tmp0_toEventIds);
     tmp_0.listeners = toSet_0(tmp$ret$0);
     var tmp_1 = $this;
     var tmp$ret$1;
     // Inline function 'org.cru.godtools.shared.tool.parser.model.toEventIds' call
     var tmp1_toEventIds = parser.o2t(get_XML_DISMISS_LISTENERS());
-    tmp$ret$1 = Companion_getInstance_17().o2v(tmp1_toEventIds);
+    tmp$ret$1 = Companion_getInstance_17().n2v(tmp1_toEventIds);
     tmp_1.dismissListeners = toSet_0(tmp$ret$1);
     var tmp_2 = $this;
     var tmp2_safe_receiver = parser.o2t(get_XML_PRIMARY_COLOR());
@@ -9006,33 +9014,33 @@
     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.z3d_1 = tmp5_elvis_lhs == null ? Companion_getInstance_48().g33_1 : tmp5_elvis_lhs;
+    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().z2w(tmp6_safe_receiver);
-    tmp_5.b3e_1 = tmp7_elvis_lhs == null ? Companion_getInstance_48().h33_1 : tmp7_elvis_lhs;
+    var tmp7_elvis_lhs = tmp6_safe_receiver == null ? null : Companion_getInstance_22().y2w(tmp6_safe_receiver);
+    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().k31(tmp8_safe_receiver);
-    tmp_6.c3e_1 = tmp9_elvis_lhs == null ? Companion_getInstance_48().i33_1 : tmp9_elvis_lhs;
+    var tmp9_elvis_lhs = tmp8_safe_receiver == null ? null : Companion_getInstance_24().j31(tmp8_safe_receiver);
+    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.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.n2v(tmp_9, 'card-background-color');
+    var tmp11_safe_receiver = parser.m2v(tmp_9, 'card-background-color');
     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.n2v(tmp_11, 'multiselect-option-background-color');
+    var tmp12_safe_receiver = parser.m2v(tmp_11, 'multiselect-option-background-color');
     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.n2v(tmp_13, 'multiselect-option-selected-color');
+    var tmp13_safe_receiver = parser.m2v(tmp_13, 'multiselect-option-selected-color');
     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());
@@ -9056,10 +9064,10 @@
     fileName = fileName === VOID ? null : fileName;
     parentPage = parentPage === VOID ? null : parentPage;
     primaryColor = primaryColor === VOID ? null : primaryColor;
-    backgroundColor = backgroundColor === VOID ? Companion_getInstance_48().g33_1 : backgroundColor;
+    backgroundColor = backgroundColor === VOID ? Companion_getInstance_48().f33_1 : backgroundColor;
     backgroundImage = backgroundImage === VOID ? null : backgroundImage;
-    backgroundImageGravity = backgroundImageGravity === VOID ? Companion_getInstance_48().h33_1 : backgroundImageGravity;
-    backgroundImageScaleType = backgroundImageScaleType === VOID ? Companion_getInstance_48().i33_1 : backgroundImageScaleType;
+    backgroundImageGravity = backgroundImageGravity === VOID ? Companion_getInstance_48().g33_1 : backgroundImageGravity;
+    backgroundImageScaleType = backgroundImageScaleType === VOID ? Companion_getInstance_48().h33_1 : backgroundImageScaleType;
     controlColor = controlColor === VOID ? null : controlColor;
     cardBackgroundColor = cardBackgroundColor === VOID ? null : cardBackgroundColor;
     textColor = textColor === VOID ? null : textColor;
@@ -9105,7 +9113,7 @@
       return this$0.a2p()._pages.l1(this$0);
     };
   }
-  protoOf(Page).q2u = function () {
+  protoOf(Page).p2u = function () {
     var tmp$ret$0;
     // Inline function 'kotlin.getValue' call
     var tmp0_getValue = id$factory();
@@ -9131,53 +9139,53 @@
   protoOf(Page).n3e = function () {
     return this.listeners;
   };
-  protoOf(Page).q36 = function () {
+  protoOf(Page).p36 = function () {
     return this.dismissListeners;
   };
-  protoOf(Page).a2y = function () {
+  protoOf(Page).z2x = function () {
     var tmp0_elvis_lhs = this.x3d_1;
     return tmp0_elvis_lhs == null ? get_primaryColor_0(this.a2t()) : tmp0_elvis_lhs;
   };
-  protoOf(Page).b2y = function () {
+  protoOf(Page).a2y = function () {
     var tmp0_elvis_lhs = this.y3d_1;
     return tmp0_elvis_lhs == null ? get_primaryTextColor_0(this.a2t()) : tmp0_elvis_lhs;
   };
-  protoOf(Page).t36 = function () {
+  protoOf(Page).s36 = function () {
     return this.z3d_1;
   };
   protoOf(Page).o3e = function () {
     return this.a3e_1;
   };
-  protoOf(Page).u36 = function () {
+  protoOf(Page).t36 = function () {
     return getResource(this, this.a3e_1);
   };
-  protoOf(Page).v36 = function () {
+  protoOf(Page).u36 = function () {
     return this.b3e_1;
   };
-  protoOf(Page).w36 = function () {
+  protoOf(Page).v36 = function () {
     return 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).d2y = function () {
+  protoOf(Page).c2y = function () {
     var tmp0_elvis_lhs = this.e3e_1;
-    return tmp0_elvis_lhs == null ? this.a2p().d2y() : tmp0_elvis_lhs;
+    return tmp0_elvis_lhs == null ? this.a2p().c2y() : tmp0_elvis_lhs;
   };
-  protoOf(Page).e2y = function () {
+  protoOf(Page).d2y = function () {
     var tmp0_elvis_lhs = this.f3e_1;
     return tmp0_elvis_lhs == null ? get_multiselectOptionBackgroundColor.call(this) : tmp0_elvis_lhs;
   };
-  protoOf(Page).f2y = function () {
+  protoOf(Page).e2y = function () {
     var tmp0_elvis_lhs = this.g3e_1;
     return tmp0_elvis_lhs == null ? get_multiselectOptionSelectedColor.call(this) : tmp0_elvis_lhs;
   };
-  protoOf(Page).y2x = function () {
+  protoOf(Page).x2x = function () {
     var tmp0_elvis_lhs = this.h3e_1;
     return tmp0_elvis_lhs == null ? get_textColor_0(this.a2t()) : tmp0_elvis_lhs;
   };
-  protoOf(Page).g2y = function () {
+  protoOf(Page).f2y = function () {
     return this.i3e_1 * get_textScale_0(this.a2t());
   };
   protoOf(Page)._getAnalyticsEvents = function (type) {
@@ -9242,10 +9250,10 @@
     var tmp_0 = this;
     tmp_0.t3d_1 = lazy(Page$position$delegate$lambda(this));
   }
-  defineProp(protoOf(Page), 'id', protoOf(Page).q2u);
+  defineProp(protoOf(Page), 'id', protoOf(Page).p2u);
   defineProp(protoOf(Page), 'position', protoOf(Page).j3e);
   defineProp(protoOf(Page), 'parentPage', protoOf(Page).l3e);
-  defineProp(protoOf(Page), 'backgroundImage', protoOf(Page).u36);
+  defineProp(protoOf(Page), 'backgroundImage', protoOf(Page).t36);
   defineProp(protoOf(Page), 'stylesParent', function () {
     return this.a2t();
   });
@@ -9268,9 +9276,9 @@
   var XMLNS_SHAREABLE;
   function Companion_46() {
     Companion_instance_46 = this;
-    this.c36_1 = 'items';
+    this.b36_1 = 'items';
   }
-  protoOf(Companion_46).d36 = function (_this__u8e3s4, manifest) {
+  protoOf(Companion_46).c36 = function (_this__u8e3s4, manifest) {
     var tmp$ret$4;
     // Inline function 'kotlin.collections.buildList' call
     // Inline function 'kotlin.contracts.contract' call
@@ -9354,15 +9362,15 @@
     Shareable.call($this);
     Companion_getInstance_59();
     parser.r3g(2, get_XMLNS_SHAREABLE());
-    $this.i36_1 = parser.o2t('id');
+    $this.h36_1 = parser.o2t('id');
     var tmp = $this;
     var tmp0_safe_receiver = parser.o2t('order');
     var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : toIntOrNull(tmp0_safe_receiver);
-    tmp.j36_1 = tmp1_elvis_lhs == null ? 2147483647 : tmp1_elvis_lhs;
+    tmp.i36_1 = tmp1_elvis_lhs == null ? 2147483647 : tmp1_elvis_lhs;
     return $this;
   }
-  protoOf(Shareable).q2u = function () {
-    return this.i36_1;
+  protoOf(Shareable).p2u = function () {
+    return this.h36_1;
   };
   function Shareable() {
     Companion_getInstance_49();
@@ -9422,8 +9430,8 @@
   function ShareableImage_init_$Create$(manifest, parser) {
     return ShareableImage_init_$Init$(manifest, parser, objectCreate(protoOf(ShareableImage)));
   }
-  protoOf(ShareableImage).q2u = function () {
-    var tmp0_elvis_lhs = protoOf(Shareable).q2u.call(this);
+  protoOf(ShareableImage).p2u = function () {
+    var tmp0_elvis_lhs = protoOf(Shareable).p2u.call(this);
     return tmp0_elvis_lhs == null ? this.w3g_1 : tmp0_elvis_lhs;
   };
   function ShareableImage() {
@@ -9456,7 +9464,7 @@
     var tmp = get_XMLNS_TRAINING();
     Companion_getInstance_51();
     parser.u2r(2, tmp, 'tip');
-    $this.h3h_1 = parser.n2v(null, 'id');
+    $this.h3h_1 = parser.m2v(null, 'id');
     skipTag(parser);
     return $this;
   }
@@ -9464,7 +9472,7 @@
     return InlineTip_init_$Init$(parent, parser, objectCreate(protoOf(InlineTip)));
   }
   protoOf(InlineTip).i3h = function () {
-    return this.a2p().w37(this.h3h_1);
+    return this.a2p().v37(this.h3h_1);
   };
   protoOf(InlineTip).c2t = function () {
     return listOfNotNull(this.i3h());
@@ -9481,7 +9489,7 @@
     Companion_instance_49 = this;
     this.j3h_1 = Type_TIP_getInstance();
   }
-  protoOf(Companion_49).m31 = function (_this__u8e3s4) {
+  protoOf(Companion_49).l31 = function (_this__u8e3s4) {
     var tmp0_subject = _this__u8e3s4;
     switch (tmp0_subject) {
       case 'tip':
@@ -9522,11 +9530,11 @@
     Tip.call($this);
     Companion_getInstance_59();
     parser.u2r(2, get_XMLNS_TRAINING(), 'tip');
-    $this.v34_1 = id;
+    $this.u34_1 = id;
     var tmp = $this;
-    var tmp0_safe_receiver = parser.n2v(null, 'type');
-    var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : Companion_getInstance_52().m31(tmp0_safe_receiver);
-    tmp.w34_1 = tmp1_elvis_lhs == null ? Companion_getInstance_52().j3h_1 : tmp1_elvis_lhs;
+    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().j3h_1 : tmp1_elvis_lhs;
     var tmp_0 = $this;
     var tmp$ret$2;
     // Inline function 'kotlin.collections.buildList' call
@@ -9566,7 +9574,7 @@
     tmp$ret$0 = tmp0_apply;
     tmp$ret$1 = tmp$ret$0.u7();
     tmp$ret$2 = tmp$ret$1;
-    tmp_0.x34_1 = tmp$ret$2;
+    tmp_0.w34_1 = tmp$ret$2;
     return $this;
   }
   function Tip_init_$Create$(manifest, id, parser) {
@@ -9639,13 +9647,13 @@
     Type_initEntries_2();
     return Type_QUOTE_instance;
   }
-  protoOf(Tip).a2y = function () {
+  protoOf(Tip).z2x = function () {
     return Companion_getInstance_29().c2q_1;
   };
-  protoOf(Tip).b2y = function () {
+  protoOf(Tip).a2y = function () {
     return Companion_getInstance_29().d2q_1;
   };
-  protoOf(Tip).y2x = function () {
+  protoOf(Tip).x2x = function () {
     return Companion_getInstance_29().i2q_1;
   };
   function Tip() {
@@ -9811,7 +9819,7 @@
     var tmp_0 = $this;
     var tmp0_safe_receiver = parser.o2t('control-color');
     tmp_0.s3h_1 = tmp0_safe_receiver == null ? null : toColorOrNull(tmp0_safe_receiver);
-    $this.t3h_1 = parser.n2v(get_XMLNS_TRAINING(), 'tip');
+    $this.t3h_1 = parser.m2v(get_XMLNS_TRAINING(), 'tip');
     var tmp_1 = $this;
     var tmp_2 = get_XMLNS_TRACT();
     Companion_getInstance_54();
@@ -9850,7 +9858,7 @@
     return this.t3h_1;
   };
   protoOf(CallToAction).i3h = function () {
-    return this.a2p().w37(this.t3h_1);
+    return this.a2p().v37(this.t3h_1);
   };
   function CallToAction() {
     Companion_getInstance_54();
@@ -9886,7 +9894,7 @@
     var tmp_0 = $this;
     var tmp0_safe_receiver = parser.o2t(get_XML_BACKGROUND_COLOR());
     tmp_0.y3h_1 = tmp0_safe_receiver == null ? null : toColorOrNull(tmp0_safe_receiver);
-    $this.z3h_1 = parser.n2v(get_XMLNS_TRAINING(), 'tip');
+    $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
@@ -9922,24 +9930,24 @@
   function Header_init_$Create$(page, parser) {
     return Header_init_$Init$(page, parser, objectCreate(protoOf(Header)));
   }
-  protoOf(Header).t36 = function () {
+  protoOf(Header).s36 = function () {
     var tmp0_elvis_lhs = this.y3h_1;
-    return tmp0_elvis_lhs == null ? this.a2y() : tmp0_elvis_lhs;
+    return tmp0_elvis_lhs == null ? this.z2x() : tmp0_elvis_lhs;
   };
-  protoOf(Header).y2x = function () {
-    return this.b2y();
+  protoOf(Header).x2x = function () {
+    return this.a2y();
   };
   protoOf(Header).a3i = function () {
     return this.number;
   };
-  protoOf(Header).y36 = function () {
+  protoOf(Header).x36 = function () {
     return this.title;
   };
   protoOf(Header).v3h = function () {
     return this.z3h_1;
   };
   protoOf(Header).i3h = function () {
-    return this.a2p().w37(this.z3h_1);
+    return this.a2p().v37(this.z3h_1);
   };
   function Header() {
     Companion_getInstance_55();
@@ -10218,13 +10226,13 @@
     var tmp$ret$0;
     // Inline function 'org.cru.godtools.shared.tool.parser.model.toEventIds' call
     var tmp0_toEventIds = parser.o2t(get_XML_LISTENERS());
-    tmp$ret$0 = Companion_getInstance_17().o2v(tmp0_toEventIds);
+    tmp$ret$0 = Companion_getInstance_17().n2v(tmp0_toEventIds);
     tmp_0.listeners = toSet_0(tmp$ret$0);
     var tmp_1 = $this;
     var tmp$ret$1;
     // Inline function 'org.cru.godtools.shared.tool.parser.model.toEventIds' call
     var tmp1_toEventIds = parser.o2t(get_XML_DISMISS_LISTENERS());
-    tmp$ret$1 = Companion_getInstance_17().o2v(tmp1_toEventIds);
+    tmp$ret$1 = Companion_getInstance_17().n2v(tmp1_toEventIds);
     tmp_1.dismissListeners = toSet_0(tmp$ret$1);
     var title = null;
     var tmp_2 = $this;
@@ -10320,10 +10328,10 @@
   protoOf(Modal).e3j = function () {
     return this.page;
   };
-  protoOf(Modal).q2u = function () {
+  protoOf(Modal).p2u = function () {
     return this.page.id + '-' + _get_position__iahqv2(this);
   };
-  protoOf(Modal).y36 = function () {
+  protoOf(Modal).x36 = function () {
     return this.title;
   };
   protoOf(Modal).t2s = function () {
@@ -10332,31 +10340,31 @@
   protoOf(Modal).n3e = function () {
     return this.listeners;
   };
-  protoOf(Modal).q36 = function () {
+  protoOf(Modal).p36 = function () {
     return this.dismissListeners;
   };
-  protoOf(Modal).a2y = function () {
+  protoOf(Modal).z2x = function () {
     return get_TRANSPARENT();
   };
-  protoOf(Modal).b2y = function () {
+  protoOf(Modal).a2y = function () {
     return get_WHITE();
   };
-  protoOf(Modal).c2x = function () {
+  protoOf(Modal).b2x = function () {
     return get_WHITE();
   };
-  protoOf(Modal).c2y = function () {
+  protoOf(Modal).b2y = function () {
     return Style_OUTLINED_getInstance();
   };
-  protoOf(Modal).h2y = function () {
+  protoOf(Modal).g2y = function () {
     return Align_CENTER_getInstance();
   };
-  protoOf(Modal).y2x = function () {
+  protoOf(Modal).x2x = function () {
     return get_WHITE();
   };
   function Modal() {
     Companion_getInstance_57();
   }
-  defineProp(protoOf(Modal), 'id', protoOf(Modal).q2u);
+  defineProp(protoOf(Modal), 'id', protoOf(Modal).p2u);
   defineProp(protoOf(Modal), '_content', function () {
     return this.t2s();
   });
@@ -10401,20 +10409,20 @@
     parser.u2r(2, tmp, 'card');
     var tmp_0 = $this;
     Companion_getInstance_58();
-    var tmp0_safe_receiver = parser.n2v(null, 'hidden');
+    var tmp0_safe_receiver = parser.m2v(null, 'hidden');
     var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : toBoolean(tmp0_safe_receiver);
     tmp_0.isHidden = tmp1_elvis_lhs == null ? false : tmp1_elvis_lhs;
     var tmp_1 = $this;
     var tmp$ret$0;
     // Inline function 'org.cru.godtools.shared.tool.parser.model.toEventIds' call
     var tmp0_toEventIds = parser.o2t(get_XML_LISTENERS());
-    tmp$ret$0 = Companion_getInstance_17().o2v(tmp0_toEventIds);
+    tmp$ret$0 = Companion_getInstance_17().n2v(tmp0_toEventIds);
     tmp_1.listeners = toSet_0(tmp$ret$0);
     var tmp_2 = $this;
     var tmp$ret$1;
     // Inline function 'org.cru.godtools.shared.tool.parser.model.toEventIds' call
     var tmp1_toEventIds = parser.o2t(get_XML_DISMISS_LISTENERS());
-    tmp$ret$1 = Companion_getInstance_17().o2v(tmp1_toEventIds);
+    tmp$ret$1 = Companion_getInstance_17().n2v(tmp1_toEventIds);
     tmp_2.dismissListeners = toSet_0(tmp$ret$1);
     var tmp_3 = $this;
     var tmp2_safe_receiver = parser.o2t(get_XML_BACKGROUND_COLOR());
@@ -10422,11 +10430,11 @@
     $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().z2w(tmp3_safe_receiver);
+    var tmp4_elvis_lhs = tmp3_safe_receiver == null ? null : Companion_getInstance_22().y2w(tmp3_safe_receiver);
     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().k31(tmp5_safe_receiver);
+    var tmp6_elvis_lhs = tmp5_safe_receiver == null ? null : Companion_getInstance_24().j31(tmp5_safe_receiver);
     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());
@@ -10544,7 +10552,7 @@
   }
   function TractPage$Card$labelParent$delegate$lambda$lambda(this$0) {
     return function () {
-      return this$0.a2y();
+      return this$0.z2x();
     };
   }
   function TractPage$Card$labelParent$delegate$lambda(this$0) {
@@ -10639,11 +10647,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().g33_1 : backgroundColor;
+    backgroundColor = backgroundColor === VOID ? Companion_getInstance_48().f33_1 : backgroundColor;
     backgroundImage = backgroundImage === VOID ? null : backgroundImage;
     primaryColor = primaryColor === VOID ? null : primaryColor;
-    backgroundImageGravity = backgroundImageGravity === VOID ? Companion_getInstance_48().h33_1 : backgroundImageGravity;
-    backgroundImageScaleType = backgroundImageScaleType === VOID ? Companion_getInstance_48().i33_1 : backgroundImageScaleType;
+    backgroundImageGravity = backgroundImageGravity === VOID ? Companion_getInstance_48().g33_1 : backgroundImageGravity;
+    backgroundImageScaleType = backgroundImageScaleType === VOID ? Companion_getInstance_48().h33_1 : backgroundImageScaleType;
     textColor = textColor === VOID ? null : textColor;
     var tmp;
     if (textScale === VOID) {
@@ -10683,7 +10691,7 @@
   protoOf(Card_1).e3j = function () {
     return this.page;
   };
-  protoOf(Card_1).q2u = function () {
+  protoOf(Card_1).p2u = function () {
     return this.page.id + '-' + this.position;
   };
   protoOf(Card_1).j3e = function () {
@@ -10715,23 +10723,23 @@
   protoOf(Card_1).n3e = function () {
     return this.listeners;
   };
-  protoOf(Card_1).q36 = function () {
+  protoOf(Card_1).p36 = function () {
     return this.dismissListeners;
   };
-  protoOf(Card_1).t36 = function () {
+  protoOf(Card_1).s36 = function () {
     var tmp0_elvis_lhs = this.l3j_1;
-    return tmp0_elvis_lhs == null ? this.page.d2y() : tmp0_elvis_lhs;
+    return tmp0_elvis_lhs == null ? this.page.c2y() : tmp0_elvis_lhs;
   };
-  protoOf(Card_1).u36 = function () {
+  protoOf(Card_1).t36 = function () {
     return getResource(this, this.m3j_1);
   };
-  protoOf(Card_1).v36 = function () {
+  protoOf(Card_1).u36 = function () {
     return this.n3j_1;
   };
-  protoOf(Card_1).w36 = function () {
+  protoOf(Card_1).v36 = function () {
     return this.o3j_1;
   };
-  protoOf(Card_1).y2x = function () {
+  protoOf(Card_1).x2x = function () {
     var tmp0_elvis_lhs = this.p3j_1;
     return tmp0_elvis_lhs == null ? this.page.cardTextColor : tmp0_elvis_lhs;
   };
@@ -10827,10 +10835,10 @@
     var tmp = this;
     tmp.q3j_1 = lazy(TractPage$Card$labelParent$delegate$lambda(this));
   }
-  defineProp(protoOf(Card_1), 'id', protoOf(Card_1).q2u);
+  defineProp(protoOf(Card_1), 'id', protoOf(Card_1).p2u);
   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).u36);
+  defineProp(protoOf(Card_1), 'backgroundImage', protoOf(Card_1).t36);
   defineProp(protoOf(Card_1), '_content', function () {
     return this.t2s();
   });
@@ -10999,7 +11007,7 @@
   };
   protoOf(TractPage).c3k = function () {
     var tmp0_elvis_lhs = this.b3j_1;
-    return tmp0_elvis_lhs == null ? this.y2x() : tmp0_elvis_lhs;
+    return tmp0_elvis_lhs == null ? this.x2x() : tmp0_elvis_lhs;
   };
   function TractPage() {
     this.a3j_1 = emptyList();
@@ -11064,7 +11072,7 @@
     var tmp = this.d3k_1;
     return (tmp == null ? true : isObject(tmp)) ? tmp : THROW_CCE();
   };
-  protoOf(SetOnceProperty).p37 = function (thisRef, property) {
+  protoOf(SetOnceProperty).o37 = function (thisRef, property) {
     return this.e3k(isObject(thisRef) ? thisRef : THROW_CCE(), property);
   };
   protoOf(SetOnceProperty).f3k = function (thisRef, property, value) {
@@ -11080,7 +11088,7 @@
     }
     this.d3k_1 = value;
   };
-  protoOf(SetOnceProperty).b36 = function (thisRef, property, value) {
+  protoOf(SetOnceProperty).a36 = function (thisRef, property, value) {
     var tmp = isObject(thisRef) ? thisRef : THROW_CCE();
     return this.f3k(tmp, property, (value == null ? true : isObject(value)) ? value : THROW_CCE());
   };
@@ -11301,7 +11309,7 @@
     }
     return tmp;
   };
-  protoOf(SaxXmlPullParser).n2v = function (namespace, name) {
+  protoOf(SaxXmlPullParser).m2v = function (namespace, name) {
     var tmp$ret$1;
     // Inline function 'kotlin.takeIf' call
     var tmp0_takeIf = this.m3k_1;
@@ -11585,21 +11593,21 @@
   protoOf(Button).k2t = isGone;
   protoOf(Button).l2t = isGoneFlow;
   protoOf(Button).getAnalyticsEvents = getAnalyticsEvents;
-  protoOf(Button).d2x = get_isClickable;
+  protoOf(Button).c2x = get_isClickable;
   protoOf(Card).i2t = isInvisible;
   protoOf(Card).j2t = isInvisibleFlow;
   protoOf(Card).k2t = isGone;
   protoOf(Card).l2t = isGoneFlow;
   protoOf(Card).b2t = get_content;
-  protoOf(Category).a2y = get_primaryColor;
-  protoOf(Category).b2y = get_primaryTextColor;
-  protoOf(Category).c2y = get_buttonStyle;
-  protoOf(Category).c2x = get_buttonColor;
-  protoOf(Category).d2y = get_cardBackgroundColor;
-  protoOf(Category).e2y = get_multiselectOptionBackgroundColor;
-  protoOf(Category).f2y = get_multiselectOptionSelectedColor;
-  protoOf(Category).g2y = get_textScale;
-  protoOf(Category).h2y = get_textAlign;
+  protoOf(Category).z2x = get_primaryColor;
+  protoOf(Category).a2y = get_primaryTextColor;
+  protoOf(Category).b2y = get_buttonStyle;
+  protoOf(Category).b2x = get_buttonColor;
+  protoOf(Category).c2y = get_cardBackgroundColor;
+  protoOf(Category).d2y = get_multiselectOptionBackgroundColor;
+  protoOf(Category).e2y = get_multiselectOptionSelectedColor;
+  protoOf(Category).f2y = get_textScale;
+  protoOf(Category).g2y = get_textAlign;
   protoOf(Fallback).i2t = isInvisible;
   protoOf(Fallback).j2t = isInvisibleFlow;
   protoOf(Fallback).k2t = isGone;
@@ -11621,7 +11629,7 @@
   protoOf(Image).j2t = isInvisibleFlow;
   protoOf(Image).k2t = isGone;
   protoOf(Image).l2t = isGoneFlow;
-  protoOf(Image).d2x = get_isClickable;
+  protoOf(Image).c2x = get_isClickable;
   protoOf(Input).i2t = isInvisible;
   protoOf(Input).j2t = isInvisibleFlow;
   protoOf(Input).k2t = isGone;
@@ -11631,9 +11639,9 @@
   protoOf(Link).k2t = isGone;
   protoOf(Link).l2t = isGoneFlow;
   protoOf(Link).getAnalyticsEvents = getAnalyticsEvents;
-  protoOf(Link).d2x = get_isClickable;
-  protoOf(Manifest).c2x = get_buttonColor;
-  protoOf(Manifest).h2y = get_textAlign;
+  protoOf(Link).c2x = get_isClickable;
+  protoOf(Manifest).b2x = get_buttonColor;
+  protoOf(Manifest).g2y = get_textAlign;
   protoOf(Option).i2t = isInvisible;
   protoOf(Option).j2t = isInvisibleFlow;
   protoOf(Option).k2t = isGone;
@@ -11653,13 +11661,13 @@
   protoOf(Spacer).j2t = isInvisibleFlow;
   protoOf(Spacer).k2t = isGone;
   protoOf(Spacer).l2t = isGoneFlow;
-  protoOf(StylesOverride).a2y = get_primaryColor;
-  protoOf(StylesOverride).b2y = get_primaryTextColor;
-  protoOf(StylesOverride).c2y = get_buttonStyle;
-  protoOf(StylesOverride).c2x = get_buttonColor;
-  protoOf(StylesOverride).d2y = get_cardBackgroundColor;
-  protoOf(StylesOverride).e2y = get_multiselectOptionBackgroundColor;
-  protoOf(StylesOverride).f2y = get_multiselectOptionSelectedColor;
+  protoOf(StylesOverride).z2x = get_primaryColor;
+  protoOf(StylesOverride).a2y = get_primaryTextColor;
+  protoOf(StylesOverride).b2y = get_buttonStyle;
+  protoOf(StylesOverride).b2x = get_buttonColor;
+  protoOf(StylesOverride).c2y = get_cardBackgroundColor;
+  protoOf(StylesOverride).d2y = get_multiselectOptionBackgroundColor;
+  protoOf(StylesOverride).e2y = get_multiselectOptionSelectedColor;
   protoOf(Tab).b2t = get_content;
   protoOf(Tab).getAnalyticsEvents = getAnalyticsEvents;
   protoOf(Tabs).i2t = isInvisible;
@@ -11674,68 +11682,68 @@
   protoOf(Video).j2t = isInvisibleFlow;
   protoOf(Video).k2t = isGone;
   protoOf(Video).l2t = isGoneFlow;
-  protoOf(Page).c2y = get_buttonStyle;
-  protoOf(Page).c2x = get_buttonColor;
-  protoOf(Page).h2y = get_textAlign;
+  protoOf(Page).b2y = get_buttonStyle;
+  protoOf(Page).b2x = get_buttonColor;
+  protoOf(Page).g2y = get_textAlign;
   protoOf(Page).getAnalyticsEvents = getAnalyticsEvents;
-  protoOf(LessonPage).c2y = get_buttonStyle;
-  protoOf(LessonPage).c2x = get_buttonColor;
-  protoOf(LessonPage).h2y = get_textAlign;
+  protoOf(LessonPage).b2y = get_buttonStyle;
+  protoOf(LessonPage).b2x = get_buttonColor;
+  protoOf(LessonPage).g2y = get_textAlign;
   protoOf(LessonPage).getAnalyticsEvents = getAnalyticsEvents;
   protoOf(LessonPage).b2t = get_content;
   protoOf(Card_0).b2t = get_content;
   protoOf(Card_0).getAnalyticsEvents = getAnalyticsEvents;
-  protoOf(CardCollectionPage).c2y = get_buttonStyle;
-  protoOf(CardCollectionPage).c2x = get_buttonColor;
-  protoOf(CardCollectionPage).h2y = get_textAlign;
+  protoOf(CardCollectionPage).b2y = get_buttonStyle;
+  protoOf(CardCollectionPage).b2x = get_buttonColor;
+  protoOf(CardCollectionPage).g2y = get_textAlign;
   protoOf(CardCollectionPage).getAnalyticsEvents = getAnalyticsEvents;
-  protoOf(ContentPage).c2y = get_buttonStyle;
-  protoOf(ContentPage).c2x = get_buttonColor;
-  protoOf(ContentPage).h2y = get_textAlign;
+  protoOf(ContentPage).b2y = get_buttonStyle;
+  protoOf(ContentPage).b2x = get_buttonColor;
+  protoOf(ContentPage).g2y = get_textAlign;
   protoOf(ContentPage).getAnalyticsEvents = getAnalyticsEvents;
   protoOf(ContentPage).b2t = get_content;
   protoOf(InlineTip).i2t = isInvisible;
   protoOf(InlineTip).j2t = isInvisibleFlow;
   protoOf(InlineTip).k2t = isGone;
   protoOf(InlineTip).l2t = isGoneFlow;
-  protoOf(Tip).c2y = get_buttonStyle;
-  protoOf(Tip).c2x = get_buttonColor;
-  protoOf(Tip).d2y = get_cardBackgroundColor;
-  protoOf(Tip).e2y = get_multiselectOptionBackgroundColor;
-  protoOf(Tip).f2y = get_multiselectOptionSelectedColor;
-  protoOf(Tip).g2y = get_textScale;
-  protoOf(Tip).h2y = get_textAlign;
+  protoOf(Tip).b2y = get_buttonStyle;
+  protoOf(Tip).b2x = get_buttonColor;
+  protoOf(Tip).c2y = get_cardBackgroundColor;
+  protoOf(Tip).d2y = get_multiselectOptionBackgroundColor;
+  protoOf(Tip).e2y = get_multiselectOptionSelectedColor;
+  protoOf(Tip).f2y = get_textScale;
+  protoOf(Tip).g2y = get_textAlign;
   protoOf(TipPage).b2t = get_content;
-  protoOf(Header).a2y = get_primaryColor;
-  protoOf(Header).b2y = get_primaryTextColor;
-  protoOf(Header).c2y = get_buttonStyle;
-  protoOf(Header).c2x = get_buttonColor;
-  protoOf(Header).d2y = get_cardBackgroundColor;
-  protoOf(Header).e2y = get_multiselectOptionBackgroundColor;
-  protoOf(Header).f2y = get_multiselectOptionSelectedColor;
-  protoOf(Header).g2y = get_textScale;
-  protoOf(Header).h2y = get_textAlign;
+  protoOf(Header).z2x = get_primaryColor;
+  protoOf(Header).a2y = get_primaryTextColor;
+  protoOf(Header).b2y = get_buttonStyle;
+  protoOf(Header).b2x = get_buttonColor;
+  protoOf(Header).c2y = get_cardBackgroundColor;
+  protoOf(Header).d2y = get_multiselectOptionBackgroundColor;
+  protoOf(Header).e2y = get_multiselectOptionSelectedColor;
+  protoOf(Header).f2y = get_textScale;
+  protoOf(Header).g2y = get_textAlign;
   protoOf(Hero).b2t = get_content;
   protoOf(Hero).getAnalyticsEvents = getAnalyticsEvents;
   protoOf(Modal).b2t = get_content;
-  protoOf(Modal).d2y = get_cardBackgroundColor;
-  protoOf(Modal).e2y = get_multiselectOptionBackgroundColor;
-  protoOf(Modal).f2y = get_multiselectOptionSelectedColor;
-  protoOf(Modal).g2y = get_textScale;
-  protoOf(Card_1).a2y = get_primaryColor;
-  protoOf(Card_1).b2y = get_primaryTextColor;
-  protoOf(Card_1).c2y = get_buttonStyle;
-  protoOf(Card_1).c2x = get_buttonColor;
-  protoOf(Card_1).d2y = get_cardBackgroundColor;
-  protoOf(Card_1).e2y = get_multiselectOptionBackgroundColor;
-  protoOf(Card_1).f2y = get_multiselectOptionSelectedColor;
-  protoOf(Card_1).g2y = get_textScale;
-  protoOf(Card_1).h2y = get_textAlign;
+  protoOf(Modal).c2y = get_cardBackgroundColor;
+  protoOf(Modal).d2y = get_multiselectOptionBackgroundColor;
+  protoOf(Modal).e2y = get_multiselectOptionSelectedColor;
+  protoOf(Modal).f2y = get_textScale;
+  protoOf(Card_1).z2x = get_primaryColor;
+  protoOf(Card_1).a2y = get_primaryTextColor;
+  protoOf(Card_1).b2y = get_buttonStyle;
+  protoOf(Card_1).b2x = get_buttonColor;
+  protoOf(Card_1).c2y = get_cardBackgroundColor;
+  protoOf(Card_1).d2y = get_multiselectOptionBackgroundColor;
+  protoOf(Card_1).e2y = get_multiselectOptionSelectedColor;
+  protoOf(Card_1).f2y = get_textScale;
+  protoOf(Card_1).g2y = get_textAlign;
   protoOf(Card_1).b2t = get_content;
   protoOf(Card_1).getAnalyticsEvents = getAnalyticsEvents;
-  protoOf(TractPage).c2y = get_buttonStyle;
-  protoOf(TractPage).c2x = get_buttonColor;
-  protoOf(TractPage).h2y = get_textAlign;
+  protoOf(TractPage).b2y = get_buttonStyle;
+  protoOf(TractPage).b2x = get_buttonColor;
+  protoOf(TractPage).g2y = get_textAlign;
   protoOf(TractPage).getAnalyticsEvents = getAnalyticsEvents;
   protoOf(SaxXmlPullParser).r3g = require$default;
   protoOf(SaxXmlPullParser).o2t = getAttributeValue;