npm - @cruglobal/godtools-shared - Versions diffs - 0.9.0-SNAPSHOT.1179 → 0.9.0-SNAPSHOT.1181 - Mend

@cruglobal/godtools-shared 0.9.0-SNAPSHOT.1179 → 0.9.0-SNAPSHOT.1181

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 (6) hide show

package/kotlin-kotlin-stdlib-js-ir.js +46 -46
package/kotlin-kotlin-stdlib-js-ir.js.map +1 -1
package/kotlin-mpp-godtools-tool-parser-npm.d.ts +11 -5
package/kotlin-mpp-godtools-tool-parser-parser.js +941 -894
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

@@ -202,22 +202,22 @@
   setMetadataFor(HasAnalyticsEvents, 'HasAnalyticsEvents', interfaceMeta);
   setMetadataFor(Section, 'Section', classMeta, BaseModel, [BaseModel, Parent, HasAnalyticsEvents]);
   function isInvisible(state) {
-    var tmp0_safe_receiver = this.d2t();
+    var tmp0_safe_receiver = this.g2t();
     var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.y2f(state);
     return tmp1_elvis_lhs == null ? false : tmp1_elvis_lhs;
   }
   function isInvisibleFlow(state) {
-    var tmp0_safe_receiver = this.d2t();
+    var tmp0_safe_receiver = this.g2t();
     var tmp = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.c2g();
     return distinctUntilChanged(state.z18(tmp, Visibility$isInvisibleFlow$lambda(this)));
   }
   function isGone(state) {
-    var tmp0_safe_receiver = this.e2t();
+    var tmp0_safe_receiver = this.h2t();
     var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.y2f(state);
     return tmp1_elvis_lhs == null ? false : tmp1_elvis_lhs;
   }
   function isGoneFlow(state) {
-    var tmp0_safe_receiver = this.e2t();
+    var tmp0_safe_receiver = this.h2t();
     var tmp = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.c2g();
     return distinctUntilChanged(state.z18(tmp, Visibility$isGoneFlow$lambda(this)));
   }
@@ -233,12 +233,12 @@
   setMetadataFor(Companion_4, 'Companion', objectMeta);
   function get_isClickable() {
     var tmp;
-    if (!(this.l2v() == null)) {
+    if (!(this.q2v() == null)) {
       tmp = true;
     } else {
       var tmp$ret$0;
       // Inline function 'kotlin.collections.isNotEmpty' call
-      var tmp0_isNotEmpty = this.k2v();
+      var tmp0_isNotEmpty = this.p2v();
       tmp$ret$0 = !tmp0_isNotEmpty.m();
       tmp = tmp$ret$0;
     }
@@ -268,7 +268,7 @@
   }
   function get_buttonColor() {
     var tmp0_safe_receiver = this.a2t();
-    return tmp0_safe_receiver == null ? null : tmp0_safe_receiver.a2x();
+    return tmp0_safe_receiver == null ? null : tmp0_safe_receiver.f2x();
   }
   function get_cardBackgroundColor() {
     return get_cardBackgroundColor_0(this.a2t());
@@ -278,7 +278,7 @@
   }
   function get_multiselectOptionSelectedColor() {
     var tmp0_safe_receiver = this.a2t();
-    return tmp0_safe_receiver == null ? null : tmp0_safe_receiver.d2y();
+    return tmp0_safe_receiver == null ? null : tmp0_safe_receiver.i2y();
   }
   function get_textColor() {
     return get_textColor_0(this.a2t());
@@ -413,7 +413,7 @@
     return tmp;
   }
   function getAttributeValue(name) {
-    return this.i2v(null, name);
+    return this.n2v(null, name);
   }
   setMetadataFor(XmlPullParser, 'XmlPullParser', interfaceMeta);
   setMetadataFor(SaxXmlPullParser, 'SaxXmlPullParser', classMeta, VOID, [XmlPullParser]);
@@ -1271,7 +1271,7 @@
         var element_0 = tmp0_iterator_0.h();
         var tmp$ret$0;
         // Inline function 'org.cru.godtools.shared.tool.parser.model.<get-contentTips>.<anonymous>' call
-        tmp$ret$0 = element_0.c2t();
+        tmp$ret$0 = element_0.tips;
         var list = tmp$ret$0;
         addAll(tmp0_flatMapTo_0, list);
       }
@@ -1298,7 +1298,7 @@
   function Companion_1() {
     Companion_instance_1 = this;
   }
-  protoOf(Companion_1).h2t = function (_this__u8e3s4) {
+  protoOf(Companion_1).m2t = function (_this__u8e3s4) {
     var tmp$ret$3;
     // Inline function 'kotlin.collections.mapNotNullTo' call
     var tmp0_mapNotNullTo = get_REGEX_SEQUENCE_SEPARATOR().ec(_this__u8e3s4);
@@ -1403,7 +1403,7 @@
   function Companion_2() {
     Companion_instance_2 = this;
   }
-  protoOf(Companion_2).i2t = function (_this__u8e3s4) {
+  protoOf(Companion_2).n2t = function (_this__u8e3s4) {
     var tmp0_subject = _this__u8e3s4;
     switch (tmp0_subject) {
       case 'clicked':
@@ -1521,32 +1521,32 @@
     AnalyticsEvent.call($this);
     Companion_getInstance_59();
     parser.u2r(2, get_XMLNS_ANALYTICS(), 'event');
-    $this.v2s_1 = parser.j2t('id');
+    $this.v2s_1 = parser.o2t('id');
     var tmp = $this;
     var tmp$ret$0;
     // Inline function 'kotlin.text.orEmpty' call
-    var tmp0_orEmpty = parser.j2t('action');
+    var tmp0_orEmpty = parser.o2t('action');
     var tmp0_elvis_lhs = tmp0_orEmpty;
     tmp$ret$0 = tmp0_elvis_lhs == null ? '' : tmp0_elvis_lhs;
     tmp.action = tmp$ret$0;
     var tmp_0 = $this;
-    var tmp0_safe_receiver = parser.j2t('delay');
+    var tmp0_safe_receiver = parser.o2t('delay');
     var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : toIntOrNull(tmp0_safe_receiver);
     tmp_0.delay = tmp1_elvis_lhs == null ? 0 : tmp1_elvis_lhs;
     var tmp_1 = $this;
     var tmp$ret$1;
     // Inline function 'kotlin.collections.orEmpty' call
-    var tmp2_safe_receiver = parser.j2t('system');
-    var tmp1_orEmpty = tmp2_safe_receiver == null ? null : Companion_getInstance_4().h2t(tmp2_safe_receiver);
+    var tmp2_safe_receiver = parser.o2t('system');
+    var tmp1_orEmpty = tmp2_safe_receiver == null ? null : Companion_getInstance_4().m2t(tmp2_safe_receiver);
     var tmp0_elvis_lhs_0 = tmp1_orEmpty;
     tmp$ret$1 = tmp0_elvis_lhs_0 == null ? emptySet() : tmp0_elvis_lhs_0;
     tmp_1.systems = tmp$ret$1;
     var tmp_2 = $this;
-    var tmp3_safe_receiver = parser.j2t('trigger');
-    var tmp4_elvis_lhs = tmp3_safe_receiver == null ? null : Companion_getInstance_5().i2t(tmp3_safe_receiver);
+    var tmp3_safe_receiver = parser.o2t('trigger');
+    var tmp4_elvis_lhs = tmp3_safe_receiver == null ? null : Companion_getInstance_5().n2t(tmp3_safe_receiver);
     tmp_2.w2s_1 = tmp4_elvis_lhs == null ? Trigger_DEFAULT_getInstance() : tmp4_elvis_lhs;
     var tmp_3 = $this;
-    var tmp5_safe_receiver = parser.j2t('limit');
+    var tmp5_safe_receiver = parser.o2t('limit');
     tmp_3.x2s_1 = tmp5_safe_receiver == null ? null : toIntOrNull(tmp5_safe_receiver);
     var tmp_4 = $this;
     var tmp$ret$6;
@@ -1577,13 +1577,13 @@
         if (tmp1_subject === 'attribute') {
           var tmp$ret$2;
           // Inline function 'kotlin.text.orEmpty' call
-          var tmp0_orEmpty_0 = parser.j2t('key');
+          var tmp0_orEmpty_0 = parser.o2t('key');
           var tmp0_elvis_lhs_1 = tmp0_orEmpty_0;
           tmp$ret$2 = tmp0_elvis_lhs_1 == null ? '' : tmp0_elvis_lhs_1;
           var tmp_7 = tmp$ret$2;
           var tmp$ret$3;
           // Inline function 'kotlin.text.orEmpty' call
-          var tmp1_orEmpty_0 = parser.j2t('value');
+          var tmp1_orEmpty_0 = parser.o2t('value');
           var tmp0_elvis_lhs_2 = tmp1_orEmpty_0;
           tmp$ret$3 = tmp0_elvis_lhs_2 == null ? '' : tmp0_elvis_lhs_2;
           tmp2_apply.u2(tmp_7, tmp$ret$3);
@@ -1693,26 +1693,26 @@
     Trigger_initEntries();
     return Trigger_UNKNOWN_instance;
   }
-  protoOf(AnalyticsEvent).l2u = function () {
+  protoOf(AnalyticsEvent).q2u = function () {
     var tmp0_elvis_lhs = this.v2s_1;
     return tmp0_elvis_lhs == null ? this.action : tmp0_elvis_lhs;
   };
-  protoOf(AnalyticsEvent).m2u = function () {
+  protoOf(AnalyticsEvent).r2u = function () {
     return this.action;
   };
-  protoOf(AnalyticsEvent).n2u = function () {
+  protoOf(AnalyticsEvent).s2u = function () {
     return this.delay;
   };
-  protoOf(AnalyticsEvent).o2u = function () {
+  protoOf(AnalyticsEvent).t2u = function () {
     return this.systems;
   };
-  protoOf(AnalyticsEvent).p2u = function () {
+  protoOf(AnalyticsEvent).u2u = function () {
     return this.w2s_1;
   };
-  protoOf(AnalyticsEvent).q2u = function () {
+  protoOf(AnalyticsEvent).v2u = function () {
     return this.x2s_1;
   };
-  protoOf(AnalyticsEvent).r2u = function () {
+  protoOf(AnalyticsEvent).w2u = function () {
     return this.attributes;
   };
   protoOf(AnalyticsEvent).y2s = function (types) {
@@ -1722,17 +1722,17 @@
     return this.systems.v(system);
   };
   protoOf(AnalyticsEvent).shouldTrigger = function (state) {
-    return this.x2s_1 == null ? true : state.x18(this.l2u()) < this.x2s_1;
+    return this.x2s_1 == null ? true : state.x18(this.q2u()) < this.x2s_1;
   };
   protoOf(AnalyticsEvent).recordTriggered = function (state) {
-    return state.y18(this.l2u());
+    return state.y18(this.q2u());
   };
   function AnalyticsEvent() {
     Companion_getInstance_6();
   }
   function Companion_4() {
     Companion_instance_4 = this;
-    this.s2u_1 = 'animation';
+    this.x2u_1 = 'animation';
   }
   var Companion_instance_4;
   function Companion_getInstance_7() {
@@ -1747,30 +1747,30 @@
     var tmp = get_XMLNS_CONTENT();
     Companion_getInstance_7();
     parser.u2r(2, tmp, 'animation');
-    $this.b2v_1 = parser.i2v(null, 'resource');
+    $this.g2v_1 = parser.n2v(null, 'resource');
     var tmp_0 = $this;
-    var tmp0_safe_receiver = parser.i2v(null, 'loop');
+    var tmp0_safe_receiver = parser.n2v(null, 'loop');
     var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : toBoolean(tmp0_safe_receiver);
-    tmp_0.c2v_1 = tmp1_elvis_lhs == null ? true : tmp1_elvis_lhs;
+    tmp_0.h2v_1 = tmp1_elvis_lhs == null ? true : tmp1_elvis_lhs;
     var tmp_1 = $this;
-    var tmp2_safe_receiver = parser.i2v(null, 'autoplay');
+    var tmp2_safe_receiver = parser.n2v(null, 'autoplay');
     var tmp3_elvis_lhs = tmp2_safe_receiver == null ? null : toBoolean(tmp2_safe_receiver);
-    tmp_1.d2v_1 = tmp3_elvis_lhs == null ? true : tmp3_elvis_lhs;
+    tmp_1.i2v_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.j2t('play-listeners');
-    tmp$ret$0 = Companion_getInstance_17().j2v(tmp0_toEventIds);
-    tmp_2.e2v_1 = toSet_0(tmp$ret$0);
+    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);
     var tmp_3 = $this;
     var tmp$ret$1;
     // Inline function 'org.cru.godtools.shared.tool.parser.model.toEventIds' call
-    var tmp1_toEventIds = parser.j2t('stop-listeners');
-    tmp$ret$1 = Companion_getInstance_17().j2v(tmp1_toEventIds);
-    tmp_3.f2v_1 = toSet_0(tmp$ret$1);
+    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);
     // Inline function 'org.cru.godtools.shared.tool.parser.model.parseClickableAttrs' call
     // Inline function 'kotlin.contracts.contract' call
-    var rawUrl = parser.j2t(_get_XML_URL_$accessor$11tx9p3_lkk5sb());
+    var rawUrl = parser.o2t(_get_XML_URL_$accessor$11tx9p3_lkk5sb());
     var tmp_4;
     var tmp0_safe_receiver_0 = rawUrl;
     if ((tmp0_safe_receiver_0 == null ? null : get_hasUriScheme(tmp0_safe_receiver_0)) === false) {
@@ -1784,26 +1784,26 @@
     // Inline function 'org.cru.godtools.shared.tool.parser.model.Animation.<init>.<anonymous>' call
     var tmp$ret$2;
     // Inline function 'org.cru.godtools.shared.tool.parser.model.toEventIds' call
-    var tmp2_toEventIds = parser.j2t(_get_XML_EVENTS_$accessor$11tx9p3_otmgk5());
-    tmp$ret$2 = Companion_getInstance_17().j2v(tmp2_toEventIds);
+    var tmp2_toEventIds = parser.o2t(_get_XML_EVENTS_$accessor$11tx9p3_otmgk5());
+    tmp$ret$2 = Companion_getInstance_17().o2v(tmp2_toEventIds);
     var tmp3__anonymous__ufb84q = tmp$ret$2;
-    $this.g2v_1 = tmp3__anonymous__ufb84q;
-    $this.h2v_1 = uri;
+    $this.l2v_1 = tmp3__anonymous__ufb84q;
+    $this.m2v_1 = uri;
     skipTag(parser);
     return $this;
   }
   function Animation_init_$Create$(parent, parser) {
     return Animation_init_$Init$(parent, parser, objectCreate(protoOf(Animation)));
   }
-  protoOf(Animation).k2v = function () {
-    return this.g2v_1;
+  protoOf(Animation).p2v = function () {
+    return this.l2v_1;
   };
-  protoOf(Animation).l2v = function () {
-    return this.h2v_1;
+  protoOf(Animation).q2v = function () {
+    return this.m2v_1;
   };
   protoOf(Animation).i2s = function () {
     var tmp;
-    var tmp_0 = this.a2p().l2t_1;
+    var tmp_0 = this.a2p().q2t_1;
     Companion_getInstance_2();
     if (!tmp_0.j2r('animation')) {
       tmp = true;
@@ -1818,7 +1818,7 @@
   function Companion_5() {
     Companion_instance_5 = this;
   }
-  protoOf(Companion_5).m2v = function (_this__u8e3s4) {
+  protoOf(Companion_5).r2v = 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;
@@ -1877,15 +1877,15 @@
   }
   function AspectRatio(width, height) {
     Companion_getInstance_8();
-    this.n2v_1 = width;
-    this.o2v_1 = height;
+    this.s2v_1 = width;
+    this.t2v_1 = height;
   }
   protoOf(AspectRatio).toString = function () {
-    return 'AspectRatio(width=' + this.n2v_1 + ', height=' + this.o2v_1 + ')';
+    return 'AspectRatio(width=' + this.s2v_1 + ', height=' + this.t2v_1 + ')';
   };
   protoOf(AspectRatio).hashCode = function () {
-    var result = this.n2v_1;
-    result = imul(result, 31) + this.o2v_1 | 0;
+    var result = this.s2v_1;
+    result = imul(result, 31) + this.t2v_1 | 0;
     return result;
   };
   protoOf(AspectRatio).equals = function (other) {
@@ -1894,19 +1894,19 @@
     if (!(other instanceof AspectRatio))
       return false;
     var tmp0_other_with_cast = other instanceof AspectRatio ? other : THROW_CCE();
-    if (!(this.n2v_1 === tmp0_other_with_cast.n2v_1))
+    if (!(this.s2v_1 === tmp0_other_with_cast.s2v_1))
       return false;
-    if (!(this.o2v_1 === tmp0_other_with_cast.o2v_1))
+    if (!(this.t2v_1 === tmp0_other_with_cast.t2v_1))
       return false;
     return true;
   };
+  function getResource(_this__u8e3s4, name) {
+    return _this__u8e3s4.a2p().u2v(name);
+  }
   function get_manifest(_this__u8e3s4) {
     var tmp0_safe_receiver = _this__u8e3s4;
     return tmp0_safe_receiver == null ? null : tmp0_safe_receiver.a2p();
   }
-  function getResource(_this__u8e3s4, name) {
-    return _this__u8e3s4.a2p().p2v(name);
-  }
   function BaseModel(parent) {
     parent = parent === VOID ? null : parent;
     this.z2s_1 = parent;
@@ -1948,9 +1948,9 @@
   var Type_UNKNOWN_instance;
   function Companion_6() {
     Companion_instance_6 = this;
-    this.q2v_1 = Type_UNKNOWN_getInstance();
+    this.v2v_1 = Type_UNKNOWN_getInstance();
   }
-  protoOf(Companion_6).r2v = function (_this__u8e3s4) {
+  protoOf(Companion_6).w2v = function (_this__u8e3s4) {
     var tmp0_subject = _this__u8e3s4;
     switch (tmp0_subject) {
       case 'event':
@@ -1984,7 +1984,7 @@
   function Companion_7() {
     Companion_instance_7 = this;
   }
-  protoOf(Companion_7).s2v = function (_this__u8e3s4) {
+  protoOf(Companion_7).x2v = function (_this__u8e3s4) {
     var tmp0_subject = _this__u8e3s4;
     switch (tmp0_subject) {
       case 'contained':
@@ -2014,12 +2014,12 @@
   }
   function Companion_8() {
     Companion_instance_8 = this;
-    this.t2v_1 = 'button';
-    this.u2v_1 = Horizontal_CENTER_getInstance();
-    this.v2v_1 = new Percent(1.0);
-    this.w2v_1 = get_TRANSPARENT();
-    this.x2v_1 = Horizontal_START_getInstance();
-    this.y2v_1 = 18;
+    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;
   }
   var Companion_instance_8;
   function Companion_getInstance_11() {
@@ -2031,7 +2031,7 @@
     var tmp$ret$0;
     // Inline function 'kotlin.getValue' call
     var tmp0_getValue = defaultTextStyles$factory();
-    tmp$ret$0 = $this.r2w_1.o1();
+    tmp$ret$0 = $this.w2w_1.o1();
     return tmp$ret$0;
   }
   function Button_init_$Init$(parent, parser, $this) {
@@ -2041,10 +2041,10 @@
     var tmp = get_XMLNS_CONTENT();
     Companion_getInstance_11();
     parser.u2r(2, tmp, 'button');
-    var type = Companion_getInstance_9().r2v(parser.j2t('type'));
+    var type = Companion_getInstance_9().w2v(parser.o2t('type'));
     // Inline function 'org.cru.godtools.shared.tool.parser.model.parseClickableAttrs' call
     // Inline function 'kotlin.contracts.contract' call
-    var rawUrl = parser.j2t(_get_XML_URL_$accessor$11tx9p3_lkk5sb());
+    var rawUrl = parser.o2t(_get_XML_URL_$accessor$11tx9p3_lkk5sb());
     var tmp_0;
     var tmp0_safe_receiver = rawUrl;
     if ((tmp0_safe_receiver == null ? null : get_hasUriScheme(tmp0_safe_receiver)) === false) {
@@ -2058,20 +2058,20 @@
     // Inline function 'org.cru.godtools.shared.tool.parser.model.Button.<init>.<anonymous>' call
     var tmp$ret$0;
     // Inline function 'org.cru.godtools.shared.tool.parser.model.toEventIds' call
-    var tmp0_toEventIds = parser.j2t(_get_XML_EVENTS_$accessor$11tx9p3_otmgk5());
-    tmp$ret$0 = Companion_getInstance_17().j2v(tmp0_toEventIds);
+    var tmp0_toEventIds = parser.o2t(_get_XML_EVENTS_$accessor$11tx9p3_otmgk5());
+    tmp$ret$0 = Companion_getInstance_17().o2v(tmp0_toEventIds);
     var tmp1__anonymous__uwfjfc = tmp$ret$0;
-    $this.h2w_1 = (type == null ? true : equals(type, Type_EVENT_getInstance())) ? tmp1__anonymous__uwfjfc : emptyList();
-    $this.i2w_1 = (type == null ? true : equals(type, Type_URL_getInstance())) ? uri : null;
+    $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;
     var tmp_1 = $this;
-    var tmp0_safe_receiver_0 = parser.j2t('style');
-    tmp_1.j2w_1 = tmp0_safe_receiver_0 == null ? null : Companion_getInstance_10().s2v(tmp0_safe_receiver_0);
+    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);
     var tmp_2 = $this;
-    var tmp1_safe_receiver = Companion_getInstance_22().v2w(parser.j2t('gravity'));
-    var tmp2_elvis_lhs = tmp1_safe_receiver == null ? null : tmp1_safe_receiver.w2w_1;
-    tmp_2.k2w_1 = tmp2_elvis_lhs == null ? Companion_getInstance_11().u2v_1 : tmp2_elvis_lhs;
+    var tmp1_safe_receiver = Companion_getInstance_22().a2x(parser.o2t('gravity'));
+    var tmp2_elvis_lhs = tmp1_safe_receiver == null ? null : tmp1_safe_receiver.b2x_1;
+    tmp_2.p2w_1 = tmp2_elvis_lhs == null ? Companion_getInstance_11().z2v_1 : tmp2_elvis_lhs;
     var tmp_3 = $this;
-    var tmp3_safe_receiver = Companion_getInstance_16().y2w(parser.j2t('width'));
+    var tmp3_safe_receiver = Companion_getInstance_16().d2x(parser.o2t('width'));
     var tmp_4;
     if (tmp3_safe_receiver == null) {
       tmp_4 = null;
@@ -2092,21 +2092,21 @@
       tmp_4 = tmp$ret$2;
     }
     var tmp4_elvis_lhs = tmp_4;
-    tmp_3.l2w_1 = tmp4_elvis_lhs == null ? Companion_getInstance_11().v2v_1 : tmp4_elvis_lhs;
+    tmp_3.q2w_1 = tmp4_elvis_lhs == null ? Companion_getInstance_11().a2w_1 : tmp4_elvis_lhs;
     var tmp_6 = $this;
-    var tmp5_safe_receiver = parser.j2t('color');
-    tmp_6.m2w_1 = tmp5_safe_receiver == null ? null : toColorOrNull(tmp5_safe_receiver);
+    var tmp5_safe_receiver = parser.o2t('color');
+    tmp_6.r2w_1 = tmp5_safe_receiver == null ? null : toColorOrNull(tmp5_safe_receiver);
     var tmp_7 = $this;
-    var tmp6_safe_receiver = parser.j2t(get_XML_BACKGROUND_COLOR());
+    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.n2w_1 = tmp7_elvis_lhs == null ? Companion_getInstance_11().w2v_1 : tmp7_elvis_lhs;
-    $this.o2w_1 = parser.j2t('icon');
+    tmp_7.s2w_1 = tmp7_elvis_lhs == null ? Companion_getInstance_11().b2w_1 : tmp7_elvis_lhs;
+    $this.t2w_1 = parser.o2t('icon');
     var tmp_8 = $this;
-    var tmp8_safe_receiver = Companion_getInstance_22().v2w(parser.j2t('icon-gravity'));
-    var tmp9_elvis_lhs = tmp8_safe_receiver == null ? null : tmp8_safe_receiver.w2w_1;
-    tmp_8.q2w_1 = tmp9_elvis_lhs == null ? Companion_getInstance_11().x2v_1 : tmp9_elvis_lhs;
+    var tmp8_safe_receiver = Companion_getInstance_22().a2x(parser.o2t('icon-gravity'));
+    var tmp9_elvis_lhs = tmp8_safe_receiver == null ? null : tmp8_safe_receiver.b2x_1;
+    tmp_8.v2w_1 = tmp9_elvis_lhs == null ? Companion_getInstance_11().c2w_1 : tmp9_elvis_lhs;
     var tmp_9 = $this;
-    var tmp10_safe_receiver = parser.j2t('icon-size');
+    var tmp10_safe_receiver = parser.o2t('icon-size');
     var tmp11_elvis_lhs = tmp10_safe_receiver == null ? null : toIntOrNull(tmp10_safe_receiver);
     var tmp_10;
     if (tmp11_elvis_lhs == null) {
@@ -2115,20 +2115,20 @@
     } else {
       tmp_10 = tmp11_elvis_lhs;
     }
-    tmp_9.p2w_1 = tmp_10;
+    tmp_9.u2w_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.t2w_1 = tmp$ret$3;
+    tmp_11.y2w_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.s2w_1 = tmp12_elvis_lhs == null ? createTestText(_get_defaultTextStyles__fjozb5($this)) : tmp12_elvis_lhs;
+    tmp_12.x2w_1 = tmp12_elvis_lhs == null ? createTestText(_get_defaultTextStyles__fjozb5($this)) : tmp12_elvis_lhs;
     // Inline function 'kotlin.collections.forEach' call
-    var tmp2_forEach = $this.t2w_1;
+    var tmp2_forEach = $this.y2w_1;
     var tmp0_iterator = tmp2_forEach.f();
     while (tmp0_iterator.g()) {
       var element = tmp0_iterator.h();
@@ -2154,7 +2154,7 @@
   }
   function Button$defaultTextStyles$delegate$lambda$lambda_0(this$0) {
     return function () {
-      var tmp0_subject = this$0.z2w();
+      var tmp0_subject = this$0.e2x();
       var tmp0 = tmp0_subject.d4_1;
       var tmp;
       switch (tmp0) {
@@ -2163,7 +2163,7 @@
           tmp = get_primaryTextColor_0(this$0.a2t());
           break;
         case 1:
-          tmp = this$0.a2x();
+          tmp = this$0.f2x();
           break;
         default:
           noWhenBranchMatchedException();
@@ -2188,7 +2188,7 @@
         Companion_getInstance_6();
         if (tmp1_subject === 'events') {
           var tmp2_this = this$0;
-          var tmp0_plusAssign = tmp2_this.t2w_1;
+          var tmp0_plusAssign = tmp2_this.y2w_1;
           var tmp1_plusAssign = Companion_getInstance_6().y2r($parser, this$0);
           addAll(tmp0_plusAssign, tmp1_plusAssign);
           tmp_0 = Unit_getInstance();
@@ -2222,18 +2222,18 @@
     Style_initEntries();
     return Style_UNKNOWN_instance;
   }
-  protoOf(Button).k2v = function () {
-    return this.h2w_1;
+  protoOf(Button).p2v = function () {
+    return this.m2w_1;
   };
-  protoOf(Button).l2v = function () {
-    return this.i2w_1;
+  protoOf(Button).q2v = function () {
+    return this.n2w_1;
   };
-  protoOf(Button).z2w = function () {
-    var tmp0_elvis_lhs = this.j2w_1;
+  protoOf(Button).e2x = function () {
+    var tmp0_elvis_lhs = this.o2w_1;
     return tmp0_elvis_lhs == null ? get_buttonStyle_0(this.a2t()) : tmp0_elvis_lhs;
   };
-  protoOf(Button).a2x = function () {
-    var tmp0_elvis_lhs = this.m2w_1;
+  protoOf(Button).f2x = function () {
+    var tmp0_elvis_lhs = this.r2w_1;
     var tmp;
     if (tmp0_elvis_lhs == null) {
       var tmp$ret$1;
@@ -2243,7 +2243,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.a2x();
+      var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.f2x();
       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;
@@ -2253,7 +2253,7 @@
     return tmp;
   };
   protoOf(Button).i2s = function () {
-    return (protoOf(Content).i2s.call(this) ? true : !this.b2x()) ? true : this.z2w().equals(Style_UNKNOWN_getInstance());
+    return (protoOf(Content).i2s.call(this) ? true : !this.g2x()) ? true : this.e2x().equals(Style_UNKNOWN_getInstance());
   };
   protoOf(Button)._getAnalyticsEvents = function (type) {
     var tmp0_subject = type;
@@ -2262,7 +2262,7 @@
     if (tmp0 === 3) {
       var tmp$ret$2;
       // Inline function 'kotlin.collections.filter' call
-      var tmp1_filter = this.t2w_1;
+      var tmp1_filter = this.y2w_1;
       var tmp$ret$1;
       // Inline function 'kotlin.collections.filterTo' call
       var tmp0_filterTo = ArrayList_init_$Create$();
@@ -2288,7 +2288,7 @@
   function Button() {
     Companion_getInstance_11();
     var tmp = this;
-    tmp.r2w_1 = lazy(Button$defaultTextStyles$delegate$lambda(this));
+    tmp.w2w_1 = lazy(Button$defaultTextStyles$delegate$lambda(this));
   }
   function defaultTextStyles$factory() {
     return getPropertyCallableRef('defaultTextStyles', 1, KProperty1, function (receiver) {
@@ -2297,8 +2297,8 @@
   }
   function Companion_9() {
     Companion_instance_9 = this;
-    this.c2x_1 = 'card';
-    this.d2x_1 = 'card-background-color';
+    this.h2x_1 = 'card';
+    this.i2x_1 = 'card-background-color';
   }
   var Companion_instance_9;
   function Companion_getInstance_12() {
@@ -2313,10 +2313,10 @@
     var tmp = get_XMLNS_CONTENT();
     Companion_getInstance_12();
     parser.u2r(2, tmp, 'card');
-    $this.m2x_1 = toColorOrNull(parser.j2t(get_XML_BACKGROUND_COLOR()));
+    $this.r2x_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.j2t(_get_XML_URL_$accessor$11tx9p3_lkk5sb());
+    var rawUrl = parser.o2t(_get_XML_URL_$accessor$11tx9p3_lkk5sb());
     var tmp_0;
     var tmp0_safe_receiver = rawUrl;
     if ((tmp0_safe_receiver == null ? null : get_hasUriScheme(tmp0_safe_receiver)) === false) {
@@ -2330,11 +2330,11 @@
     // Inline function 'org.cru.godtools.shared.tool.parser.model.Card.<init>.<anonymous>' call
     var tmp$ret$0;
     // Inline function 'org.cru.godtools.shared.tool.parser.model.toEventIds' call
-    var tmp0_toEventIds = parser.j2t(_get_XML_EVENTS_$accessor$11tx9p3_otmgk5());
-    tmp$ret$0 = Companion_getInstance_17().j2v(tmp0_toEventIds);
+    var tmp0_toEventIds = parser.o2t(_get_XML_EVENTS_$accessor$11tx9p3_otmgk5());
+    tmp$ret$0 = Companion_getInstance_17().o2v(tmp0_toEventIds);
     var tmp1__anonymous__uwfjfc = tmp$ret$0;
-    $this.o2x_1 = tmp1__anonymous__uwfjfc;
-    $this.p2x_1 = uri;
+    $this.t2x_1 = tmp1__anonymous__uwfjfc;
+    $this.u2x_1 = uri;
     var tmp_1 = $this;
     var tmp$ret$9;
     // Inline function 'org.cru.godtools.shared.tool.parser.model.parseContent' call
@@ -2414,24 +2414,24 @@
     tmp$ret$7 = tmp$ret$6.u7();
     tmp$ret$8 = tmp$ret$7;
     tmp$ret$9 = tmp$ret$8;
-    tmp_1.n2x_1 = tmp$ret$9;
+    tmp_1.s2x_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.n2x_1;
+    return this.s2x_1;
   };
-  protoOf(Card).k2v = function () {
-    return this.o2x_1;
+  protoOf(Card).p2v = function () {
+    return this.t2x_1;
   };
-  protoOf(Card).l2v = function () {
-    return this.p2x_1;
+  protoOf(Card).q2v = function () {
+    return this.u2x_1;
   };
   protoOf(Card).i2s = function () {
     var tmp;
-    var tmp_0 = this.a2p().l2t_1;
+    var tmp_0 = this.a2p().q2t_1;
     Companion_getInstance_2();
     if (!tmp_0.j2r('content_card')) {
       tmp = true;
@@ -2451,7 +2451,7 @@
   });
   function Companion_10() {
     Companion_instance_10 = this;
-    this.q2x_1 = 'category';
+    this.v2x_1 = 'category';
   }
   var Companion_instance_10;
   function Companion_getInstance_13() {
@@ -2466,8 +2466,8 @@
     var tmp = get_XMLNS_MANIFEST();
     Companion_getInstance_13();
     parser.u2r(2, tmp, 'category');
-    $this.s2x_1 = parser.j2t('id');
-    $this.v2x_1 = parser.j2t('banner');
+    $this.x2x_1 = parser.o2t('id');
+    $this.a2y_1 = parser.o2t('banner');
     var label = null;
     var tmp_0 = $this;
     var tmp$ret$4;
@@ -2500,7 +2500,7 @@
       } else if (tmp0_subject === get_XMLNS_ARTICLE()) {
         var tmp2_subject = parser.id();
         if (tmp2_subject === 'aem-tag') {
-          var tmp3_safe_receiver = parser.j2t('id');
+          var tmp3_safe_receiver = parser.o2t('id');
           if (tmp3_safe_receiver == null)
             null;
           else {
@@ -2523,15 +2523,15 @@
     tmp$ret$2 = tmp0_apply;
     tmp$ret$3 = tmp$ret$2.u7();
     tmp$ret$4 = tmp$ret$3;
-    tmp_0.u2x_1 = tmp$ret$4;
-    $this.t2x_1 = label;
+    tmp_0.z2x_1 = tmp$ret$4;
+    $this.y2x_1 = label;
     return $this;
   }
   function Category_init_$Create$(manifest, parser) {
     return Category_init_$Init$(manifest, parser, objectCreate(protoOf(Category)));
   }
-  protoOf(Category).w2x = function () {
-    return this.a2p().x2x();
+  protoOf(Category).b2y = function () {
+    return this.a2p().c2y();
   };
   function Category() {
     Companion_getInstance_13();
@@ -2558,6 +2558,14 @@
     return XMLNS_ANALYTICS;
   }
   var XMLNS_ANALYTICS;
+  function get_SCHEMA_VERSION() {
+    return SCHEMA_VERSION;
+  }
+  var SCHEMA_VERSION;
+  function get_XMLNS_CONTENT() {
+    return XMLNS_CONTENT;
+  }
+  var XMLNS_CONTENT;
   function get_XMLNS_MANIFEST() {
     return XMLNS_MANIFEST;
   }
@@ -2590,10 +2598,6 @@
     return XML_BACKGROUND_IMAGE_SCALE_TYPE;
   }
   var XML_BACKGROUND_IMAGE_SCALE_TYPE;
-  function get_XMLNS_CONTENT() {
-    return XMLNS_CONTENT;
-  }
-  var XMLNS_CONTENT;
   function get_XML_TEXT_COLOR() {
     return XML_TEXT_COLOR;
   }
@@ -2606,18 +2610,14 @@
     return XMLNS_ARTICLE;
   }
   var XMLNS_ARTICLE;
-  function get_XMLNS_CYOA() {
-    return XMLNS_CYOA;
-  }
-  var XMLNS_CYOA;
   function get_XML_LISTENERS() {
     return XML_LISTENERS;
   }
   var XML_LISTENERS;
-  function get_SCHEMA_VERSION() {
-    return SCHEMA_VERSION;
+  function get_XMLNS_CYOA() {
+    return XMLNS_CYOA;
   }
-  var SCHEMA_VERSION;
+  var XMLNS_CYOA;
   var properties_initialized_Constants_kt_w4w61t;
   function _init_properties_Constants_kt__atb1ur() {
     if (properties_initialized_Constants_kt_w4w61t) {
@@ -2637,13 +2637,13 @@
     BaseModel.call($this, parent);
     Content.call($this);
     var tmp = $this;
-    var tmp0_safe_receiver = parser.i2v(null, 'version');
+    var tmp0_safe_receiver = parser.n2v(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;
     var tmp$ret$5;
     // Inline function 'kotlin.collections.orEmpty' call
-    var tmp2_safe_receiver = parser.j2t('required-features');
+    var tmp2_safe_receiver = parser.o2t('required-features');
     var tmp_1;
     if (tmp2_safe_receiver == null) {
       tmp_1 = null;
@@ -2686,19 +2686,19 @@
     tmp$ret$5 = tmp0_elvis_lhs == null ? emptySet() : tmp0_elvis_lhs;
     tmp_0.c2s_1 = tmp$ret$5;
     var tmp_3 = $this;
-    var tmp4_safe_receiver = parser.j2t('required-device-type');
-    var tmp6_elvis_lhs = tmp4_safe_receiver == null ? null : Companion_getInstance_15().h2y(tmp4_safe_receiver);
+    var tmp4_safe_receiver = parser.o2t('required-device-type');
+    var tmp6_elvis_lhs = tmp4_safe_receiver == null ? null : Companion_getInstance_15().m2y(tmp4_safe_receiver);
     var tmp_4;
     if (tmp6_elvis_lhs == null) {
-      var tmp5_safe_receiver = parser.j2t('restrictTo');
-      tmp_4 = tmp5_safe_receiver == null ? null : Companion_getInstance_15().h2y(tmp5_safe_receiver);
+      var tmp5_safe_receiver = parser.o2t('restrictTo');
+      tmp_4 = tmp5_safe_receiver == null ? null : Companion_getInstance_15().m2y(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().g2y_1 : tmp7_elvis_lhs;
+    tmp_3.d2s_1 = tmp7_elvis_lhs == null ? Companion_getInstance_15().l2y_1 : tmp7_elvis_lhs;
     var tmp_5 = $this;
-    var tmp8_safe_receiver = parser.j2t('required-android-version');
+    var tmp8_safe_receiver = parser.o2t('required-android-version');
     var tmp_6;
     if (tmp8_safe_receiver == null) {
       tmp_6 = null;
@@ -2708,7 +2708,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().i2y(tmp8_safe_receiver);
+      var tmp0_elvis_lhs_0 = Companion_getInstance_42().n2y(tmp8_safe_receiver);
       var tmp_7;
       var tmp_8 = tmp0_elvis_lhs_0;
       if ((tmp_8 == null ? null : new Version(tmp_8)) == null) {
@@ -2722,7 +2722,7 @@
     }
     tmp_5.e2s_1 = tmp_6;
     var tmp_9 = $this;
-    var tmp9_safe_receiver = parser.j2t('required-ios-version');
+    var tmp9_safe_receiver = parser.o2t('required-ios-version');
     var tmp_10;
     if (tmp9_safe_receiver == null) {
       tmp_10 = null;
@@ -2732,7 +2732,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().i2y(tmp9_safe_receiver);
+      var tmp0_elvis_lhs_1 = Companion_getInstance_42().n2y(tmp9_safe_receiver);
       var tmp_11;
       var tmp_12 = tmp0_elvis_lhs_1;
       if ((tmp_12 == null ? null : new Version(tmp_12)) == null) {
@@ -2748,8 +2748,8 @@
     // 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.Content.<init>.<anonymous>' call
-    var tmp3__anonymous__ufb84q = toExpressionOrNull(parser.j2t(_get_XML_INVISIBLE_IF_$accessor$1h4qnj7_kw7x7q()));
-    var tmp4__anonymous__pkmkx7 = toExpressionOrNull(parser.j2t(_get_XML_GONE_IF_$accessor$1h4qnj7_ffmab6()));
+    var tmp3__anonymous__ufb84q = toExpressionOrNull(parser.o2t(_get_XML_INVISIBLE_IF_$accessor$1h4qnj7_kw7x7q()));
+    var tmp4__anonymous__pkmkx7 = toExpressionOrNull(parser.o2t(_get_XML_GONE_IF_$accessor$1h4qnj7_ffmab6()));
     $this.g2s_1 = tmp3__anonymous__ufb84q;
     $this.h2s_1 = tmp4__anonymous__pkmkx7;
     return $this;
@@ -2758,7 +2758,7 @@
     parent = parent === VOID ? createTestManifest() : parent;
     version = version === VOID ? get_SCHEMA_VERSION() : version;
     requiredFeatures = requiredFeatures === VOID ? emptySet() : requiredFeatures;
-    requiredDeviceType = requiredDeviceType === VOID ? Companion_getInstance_15().g2y_1 : requiredDeviceType;
+    requiredDeviceType = requiredDeviceType === VOID ? Companion_getInstance_15().l2y_1 : requiredDeviceType;
     requiredAndroidVersion = requiredAndroidVersion === VOID ? null : requiredAndroidVersion;
     requiredIosVersion = requiredIosVersion === VOID ? null : requiredIosVersion;
     invisibleIf = invisibleIf === VOID ? null : invisibleIf;
@@ -2796,7 +2796,7 @@
         var element = tmp0_iterator.h();
         var tmp$ret$1;
         // Inline function 'org.cru.godtools.shared.tool.parser.model.Content.<get-areContentRestrictionsSatisfied>.<anonymous>' call
-        tmp$ret$1 = $this.a2p().l2t_1.i2r(element);
+        tmp$ret$1 = $this.a2p().q2t_1.i2r(element);
         if (tmp$ret$1) {
           tmp$ret$0 = true;
           break $l$block_0;
@@ -2805,12 +2805,12 @@
       tmp$ret$0 = false;
     }
     if (tmp$ret$0) {
-      tmp_0 = isRequiredVersionSatisfied($this.a2p().l2t_1, DeviceType_ANDROID_getInstance(), $this.e2s_1);
+      tmp_0 = isRequiredVersionSatisfied($this.a2p().q2t_1, DeviceType_ANDROID_getInstance(), $this.e2s_1);
     } else {
       tmp_0 = false;
     }
     if (tmp_0) {
-      tmp = isRequiredVersionSatisfied($this.a2p().l2t_1, DeviceType_IOS_getInstance(), $this.f2s_1);
+      tmp = isRequiredVersionSatisfied($this.a2p().q2t_1, DeviceType_IOS_getInstance(), $this.f2s_1);
     } else {
       tmp = false;
     }
@@ -2874,7 +2874,7 @@
                             Companion_getInstance_33();
                             if (tmp1_subject === 'paragraph') {
                               Companion_getInstance_33();
-                              var tmp2_safe_receiver = _this__u8e3s4.j2t('fallback');
+                              var tmp2_safe_receiver = _this__u8e3s4.o2t('fallback');
                               var tmp3_subject = tmp2_safe_receiver == null ? null : toBoolean(tmp2_safe_receiver);
                               tmp_0 = tmp3_subject === true ? firstOrNull(Fallback_init_$Create$(parent, _this__u8e3s4).t2s()) : Paragraph_init_$Create$(parent, _this__u8e3s4);
                             } else {
@@ -2933,19 +2933,19 @@
       new Companion_11();
     return Companion_instance_11;
   }
-  protoOf(Content).s2y = function () {
+  protoOf(Content).d2t = function () {
     return this.d2s_1;
   };
-  protoOf(Content).t2y = function () {
+  protoOf(Content).e2t = function () {
     return this.e2s_1;
   };
-  protoOf(Content).u2y = function () {
+  protoOf(Content).f2t = function () {
     return this.f2s_1;
   };
-  protoOf(Content).d2t = function () {
+  protoOf(Content).g2t = function () {
     return this.g2s_1;
   };
-  protoOf(Content).e2t = function () {
+  protoOf(Content).h2t = function () {
     return this.h2s_1;
   };
   protoOf(Content).i2s = function () {
@@ -2974,7 +2974,7 @@
           var element = tmp0_iterator.h();
           var tmp$ret$1;
           // Inline function 'org.cru.godtools.shared.tool.parser.model.Content.<get-isIgnored>.<anonymous>' call
-          tmp$ret$1 = !this.a2p().l2t_1.j2r(element);
+          tmp$ret$1 = !this.a2p().q2t_1.j2r(element);
           if (tmp$ret$1) {
             tmp$ret$0 = true;
             break $l$block_0;
@@ -3004,6 +3004,9 @@
   function Content() {
     Companion_getInstance_14();
   }
+  defineProp(protoOf(Content), 'tips', function () {
+    return this.c2t();
+  });
   function isRequiredVersionSatisfied(_this__u8e3s4, deviceType, version) {
     var tmp;
     var tmp_0 = version;
@@ -3057,9 +3060,9 @@
   var DeviceType_UNKNOWN_instance;
   function Companion_12() {
     Companion_instance_12 = this;
-    this.g2y_1 = toSet(values_1());
+    this.l2y_1 = toSet(values_1());
   }
-  protoOf(Companion_12).h2y = function (_this__u8e3s4) {
+  protoOf(Companion_12).m2y = function (_this__u8e3s4) {
     var tmp$ret$2;
     // Inline function 'kotlin.collections.mapTo' call
     var tmp0_mapTo = get_REGEX_SEQUENCE_SEPARATOR().ec(_this__u8e3s4);
@@ -3136,7 +3139,7 @@
   function Companion_13() {
     Companion_instance_13 = this;
   }
-  protoOf(Companion_13).y2w = function (_this__u8e3s4) {
+  protoOf(Companion_13).d2x = function (_this__u8e3s4) {
     var tmp0_safe_receiver = _this__u8e3s4;
     var tmp;
     if (tmp0_safe_receiver == null) {
@@ -3207,13 +3210,13 @@
   }
   function Percent(value) {
     Dimension.call(this);
-    this.v2y_1 = value;
+    this.x2y_1 = value;
   }
   protoOf(Percent).toString = function () {
-    return 'Percent(value=' + this.v2y_1 + ')';
+    return 'Percent(value=' + this.x2y_1 + ')';
   };
   protoOf(Percent).hashCode = function () {
-    return getNumberHashCode(this.v2y_1);
+    return getNumberHashCode(this.x2y_1);
   };
   protoOf(Percent).equals = function (other) {
     if (this === other)
@@ -3221,19 +3224,19 @@
     if (!(other instanceof Percent))
       return false;
     var tmp0_other_with_cast = other instanceof Percent ? other : THROW_CCE();
-    if (!equals(this.v2y_1, tmp0_other_with_cast.v2y_1))
+    if (!equals(this.x2y_1, tmp0_other_with_cast.x2y_1))
       return false;
     return true;
   };
   function Pixels(value) {
     Dimension.call(this);
-    this.w2y_1 = value;
+    this.y2y_1 = value;
   }
   protoOf(Pixels).toString = function () {
-    return 'Pixels(value=' + this.w2y_1 + ')';
+    return 'Pixels(value=' + this.y2y_1 + ')';
   };
   protoOf(Pixels).hashCode = function () {
-    return this.w2y_1;
+    return this.y2y_1;
   };
   protoOf(Pixels).equals = function (other) {
     if (this === other)
@@ -3241,7 +3244,7 @@
     if (!(other instanceof Pixels))
       return false;
     var tmp0_other_with_cast = other instanceof Pixels ? other : THROW_CCE();
-    if (!(this.w2y_1 === tmp0_other_with_cast.w2y_1))
+    if (!(this.y2y_1 === tmp0_other_with_cast.y2y_1))
       return false;
     return true;
   };
@@ -3261,10 +3264,10 @@
     Companion_instance_14 = this;
     this.FOLLOWUP = new EventId('followup', 'send');
   }
-  protoOf(Companion_14).x2y = function () {
+  protoOf(Companion_14).z2y = function () {
     return this.FOLLOWUP;
   };
-  protoOf(Companion_14).j2v = function (raw) {
+  protoOf(Companion_14).o2v = function (raw) {
     var tmp$ret$6;
     // Inline function 'kotlin.collections.orEmpty' call
     var tmp0_safe_receiver = raw;
@@ -3407,7 +3410,7 @@
   };
   function Companion_15() {
     Companion_instance_15 = this;
-    this.y2y_1 = 'fallback';
+    this.a2z_1 = 'fallback';
   }
   var Companion_instance_15;
   function Companion_getInstance_18() {
@@ -3426,7 +3429,7 @@
       Companion_getInstance_33();
       parser.u2r(2, tmp, 'paragraph');
       Companion_getInstance_33();
-      var tmp1_safe_receiver = parser.j2t('fallback');
+      var tmp1_safe_receiver = parser.o2t('fallback');
       if (!((tmp1_safe_receiver == null ? null : toBoolean(tmp1_safe_receiver)) === true)) {
         throw new XmlPullParserException('expected fallback="true"');
       }
@@ -3515,14 +3518,14 @@
     tmp$ret$6 = tmp$ret$5.u7();
     tmp$ret$7 = tmp$ret$6;
     tmp$ret$8 = tmp$ret$7;
-    tmp_1.r2y_1 = tmp$ret$8;
+    tmp_1.w2y_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.r2y_1, 1);
+    return take(this.w2y_1, 1);
   };
   protoOf(Fallback).c2t = function () {
     var tmp$ret$3;
@@ -3538,7 +3541,7 @@
       var element = tmp0_iterator.h();
       var tmp$ret$0;
       // Inline function 'org.cru.godtools.shared.tool.parser.model.<get-contentTips>.<anonymous>' call
-      tmp$ret$0 = element.c2t();
+      tmp$ret$0 = element.tips;
       var list = tmp$ret$0;
       addAll(tmp0_flatMapTo, list);
     }
@@ -3558,7 +3561,7 @@
   });
   function Companion_16() {
     Companion_instance_16 = this;
-    this.z2y_1 = 'width';
+    this.b2z_1 = 'width';
   }
   var Companion_instance_16;
   function Companion_getInstance_19() {
@@ -3571,16 +3574,16 @@
     Item.call($this);
     Companion_getInstance_59();
     parser.u2r(2, get_XMLNS_CONTENT(), 'item');
-    $this.b2z_1 = flow;
+    $this.d2z_1 = flow;
     var tmp = $this;
     var tmp_0 = Companion_getInstance_16();
     Companion_getInstance_19();
-    tmp.c2z_1 = tmp_0.y2w(parser.j2t('width'));
+    tmp.e2z_1 = tmp_0.d2x(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
-    var tmp0__anonymous__q1qw7t = toExpressionOrNull(parser.j2t(_get_XML_INVISIBLE_IF_$accessor$1h4qnj7_kw7x7q()));
-    var tmp1__anonymous__uwfjfc = toExpressionOrNull(parser.j2t(_get_XML_GONE_IF_$accessor$1h4qnj7_ffmab6()));
+    var tmp0__anonymous__q1qw7t = toExpressionOrNull(parser.o2t(_get_XML_INVISIBLE_IF_$accessor$1h4qnj7_kw7x7q()));
+    var tmp1__anonymous__uwfjfc = toExpressionOrNull(parser.o2t(_get_XML_GONE_IF_$accessor$1h4qnj7_ffmab6()));
     var tmp_1 = $this;
     var tmp0_safe_receiver = tmp0__anonymous__q1qw7t;
     var tmp_2;
@@ -3602,7 +3605,7 @@
       tmp$ret$1 = tmp_3;
       tmp_2 = tmp$ret$1;
     }
-    tmp_1.d2z_1 = tmp_2;
+    tmp_1.f2z_1 = tmp_2;
     var tmp_4 = $this;
     var tmp1_safe_receiver = tmp1__anonymous__uwfjfc;
     var tmp_5;
@@ -3624,7 +3627,7 @@
       tmp$ret$3 = tmp_6;
       tmp_5 = tmp$ret$3;
     }
-    tmp_4.e2z_1 = tmp_5;
+    tmp_4.g2z_1 = tmp_5;
     var tmp_7 = $this;
     var tmp$ret$12;
     // Inline function 'org.cru.godtools.shared.tool.parser.model.parseContent' call
@@ -3704,7 +3707,7 @@
     tmp$ret$10 = tmp$ret$9.u7();
     tmp$ret$11 = tmp$ret$10;
     tmp$ret$12 = tmp$ret$11;
-    tmp_7.f2z_1 = tmp$ret$12;
+    tmp_7.h2z_1 = tmp$ret$12;
     return $this;
   }
   function Item_init_$Create$(flow, parser) {
@@ -3713,11 +3716,11 @@
   function Item_init_$Init$_0(flow, content, $this) {
     BaseModel.call($this, flow);
     Item.call($this);
-    $this.b2z_1 = flow;
-    $this.c2z_1 = null;
-    $this.d2z_1 = null;
+    $this.d2z_1 = flow;
     $this.e2z_1 = null;
-    $this.f2z_1 = listOfNotNull(content($this));
+    $this.f2z_1 = null;
+    $this.g2z_1 = null;
+    $this.h2z_1 = listOfNotNull(content($this));
     return $this;
   }
   function Item_init_$Create$_0(flow, content) {
@@ -3725,10 +3728,10 @@
   }
   function Companion_17() {
     Companion_instance_17 = this;
-    this.g2z_1 = 'flow';
-    this.h2z_1 = 'item-width';
-    this.i2z_1 = new Percent(1.0);
-    this.j2z_1 = Horizontal_START_getInstance();
+    this.i2z_1 = 'flow';
+    this.j2z_1 = 'item-width';
+    this.k2z_1 = new Percent(1.0);
+    this.l2z_1 = Horizontal_START_getInstance();
   }
   var Companion_instance_17;
   function Companion_getInstance_20() {
@@ -3746,18 +3749,18 @@
     var tmp_0 = $this;
     var tmp_1 = Companion_getInstance_16();
     Companion_getInstance_20();
-    var tmp0_elvis_lhs = tmp_1.y2w(parser.j2t('item-width'));
-    tmp_0.s2z_1 = tmp0_elvis_lhs == null ? Companion_getInstance_20().i2z_1 : tmp0_elvis_lhs;
+    var tmp0_elvis_lhs = tmp_1.d2x(parser.o2t('item-width'));
+    tmp_0.u2z_1 = tmp0_elvis_lhs == null ? Companion_getInstance_20().k2z_1 : tmp0_elvis_lhs;
     var tmp_2 = $this;
-    var tmp1_safe_receiver = parser.j2t('row-gravity');
-    var tmp2_safe_receiver = tmp1_safe_receiver == null ? null : Companion_getInstance_22().v2w(tmp1_safe_receiver);
-    var tmp3_elvis_lhs = tmp2_safe_receiver == null ? null : tmp2_safe_receiver.w2w_1;
-    tmp_2.t2z_1 = tmp3_elvis_lhs == null ? Companion_getInstance_20().j2z_1 : tmp3_elvis_lhs;
+    var tmp1_safe_receiver = parser.o2t('row-gravity');
+    var tmp2_safe_receiver = tmp1_safe_receiver == null ? null : Companion_getInstance_22().a2x(tmp1_safe_receiver);
+    var tmp3_elvis_lhs = tmp2_safe_receiver == null ? null : tmp2_safe_receiver.b2x_1;
+    tmp_2.v2z_1 = tmp3_elvis_lhs == null ? Companion_getInstance_20().l2z_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.u2z_1 = tmp$ret$0;
+    tmp_3.w2z_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();
@@ -3776,7 +3779,7 @@
         if (tmp1_subject === 'item') {
           var tmp2_this = $this;
           // Inline function 'kotlin.collections.plusAssign' call
-          var tmp0_plusAssign = tmp2_this.u2z_1;
+          var tmp0_plusAssign = tmp2_this.w2z_1;
           var tmp1_plusAssign = Item_init_$Create$($this, parser);
           tmp0_plusAssign.b(tmp1_plusAssign);
         }
@@ -3787,12 +3790,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.f2z_1;
+        var tmp2_isNotEmpty = item.h2z_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.u2z_1;
+          var tmp3_plusAssign = tmp3_this.w2z_1;
           tmp3_plusAssign.b(item);
         }
       }
@@ -3807,14 +3810,14 @@
   function Flow_init_$Create$(parent, parser) {
     return Flow_init_$Init$(parent, parser, objectCreate(protoOf(Flow)));
   }
-  protoOf(Item).d2t = function () {
-    return this.d2z_1;
+  protoOf(Item).g2t = function () {
+    return this.f2z_1;
   };
-  protoOf(Item).e2t = function () {
-    return this.e2z_1;
+  protoOf(Item).h2t = function () {
+    return this.g2z_1;
   };
   protoOf(Item).t2s = function () {
-    return this.f2z_1;
+    return this.h2z_1;
   };
   function Item() {
     Companion_getInstance_19();
@@ -3852,7 +3855,7 @@
   }
   protoOf(Flow).i2s = function () {
     var tmp;
-    var tmp_0 = this.a2p().l2t_1;
+    var tmp_0 = this.a2p().q2t_1;
     Companion_getInstance_2();
     if (!tmp_0.j2r('flow')) {
       tmp = true;
@@ -3866,7 +3869,7 @@
   }
   function Companion_18() {
     Companion_instance_18 = this;
-    this.v2z_1 = 'form';
+    this.x2z_1 = 'form';
   }
   var Companion_instance_18;
   function Companion_getInstance_21() {
@@ -3960,14 +3963,14 @@
     tmp$ret$6 = tmp$ret$5.u7();
     tmp$ret$7 = tmp$ret$6;
     tmp$ret$8 = tmp$ret$7;
-    tmp_0.e30_1 = tmp$ret$8;
+    tmp_0.g30_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.e30_1;
+    return this.g30_1;
   };
   protoOf(Form).c2t = function () {
     var tmp$ret$3;
@@ -3983,7 +3986,7 @@
       var element = tmp0_iterator.h();
       var tmp$ret$0;
       // Inline function 'org.cru.godtools.shared.tool.parser.model.<get-contentTips>.<anonymous>' call
-      tmp$ret$0 = element.c2t();
+      tmp$ret$0 = element.tips;
       var list = tmp$ret$0;
       addAll(tmp0_flatMapTo, list);
     }
@@ -4032,9 +4035,9 @@
   }
   function Companion_19() {
     Companion_instance_19 = this;
-    this.u2w_1 = new Gravity(Horizontal_CENTER_getInstance(), Vertical_CENTER_getInstance());
+    this.z2w_1 = new Gravity(Horizontal_CENTER_getInstance(), Vertical_CENTER_getInstance());
   }
-  protoOf(Companion_19).v2w = function (_this__u8e3s4) {
+  protoOf(Companion_19).a2x = function (_this__u8e3s4) {
     if (_this__u8e3s4 == null)
       return null;
     var tmp;
@@ -4166,16 +4169,16 @@
   }
   function Gravity(horizontal, vertical) {
     Companion_getInstance_22();
-    this.w2w_1 = horizontal;
-    this.x2w_1 = vertical;
+    this.b2x_1 = horizontal;
+    this.c2x_1 = vertical;
   }
   function HasAnalyticsEvents() {
   }
   function Companion_20() {
     Companion_instance_20 = this;
-    this.f30_1 = 'image';
-    this.g30_1 = Horizontal_CENTER_getInstance();
-    this.h30_1 = new Percent(1.0);
+    this.h30_1 = 'image';
+    this.i30_1 = Horizontal_CENTER_getInstance();
+    this.j30_1 = new Percent(1.0);
   }
   var Companion_instance_20;
   function Companion_getInstance_23() {
@@ -4190,10 +4193,10 @@
     var tmp = get_XMLNS_CONTENT();
     Companion_getInstance_23();
     parser.u2r(2, tmp, 'image');
-    $this.s30_1 = parser.j2t('resource');
+    $this.u30_1 = parser.o2t('resource');
     // Inline function 'org.cru.godtools.shared.tool.parser.model.parseClickableAttrs' call
     // Inline function 'kotlin.contracts.contract' call
-    var rawUrl = parser.j2t(_get_XML_URL_$accessor$11tx9p3_lkk5sb());
+    var rawUrl = parser.o2t(_get_XML_URL_$accessor$11tx9p3_lkk5sb());
     var tmp_0;
     var tmp0_safe_receiver = rawUrl;
     if ((tmp0_safe_receiver == null ? null : get_hasUriScheme(tmp0_safe_receiver)) === false) {
@@ -4207,17 +4210,17 @@
     // Inline function 'org.cru.godtools.shared.tool.parser.model.Image.<init>.<anonymous>' call
     var tmp$ret$0;
     // Inline function 'org.cru.godtools.shared.tool.parser.model.toEventIds' call
-    var tmp0_toEventIds = parser.j2t(_get_XML_EVENTS_$accessor$11tx9p3_otmgk5());
-    tmp$ret$0 = Companion_getInstance_17().j2v(tmp0_toEventIds);
+    var tmp0_toEventIds = parser.o2t(_get_XML_EVENTS_$accessor$11tx9p3_otmgk5());
+    tmp$ret$0 = Companion_getInstance_17().o2v(tmp0_toEventIds);
     var tmp1__anonymous__uwfjfc = tmp$ret$0;
-    $this.q30_1 = tmp1__anonymous__uwfjfc;
-    $this.r30_1 = uri;
+    $this.s30_1 = tmp1__anonymous__uwfjfc;
+    $this.t30_1 = uri;
     var tmp_1 = $this;
-    var tmp0_safe_receiver_0 = Companion_getInstance_22().v2w(parser.j2t('gravity'));
-    var tmp1_elvis_lhs = tmp0_safe_receiver_0 == null ? null : tmp0_safe_receiver_0.w2w_1;
-    tmp_1.t30_1 = tmp1_elvis_lhs == null ? Companion_getInstance_23().g30_1 : tmp1_elvis_lhs;
+    var tmp0_safe_receiver_0 = Companion_getInstance_22().a2x(parser.o2t('gravity'));
+    var tmp1_elvis_lhs = tmp0_safe_receiver_0 == null ? null : tmp0_safe_receiver_0.b2x_1;
+    tmp_1.v30_1 = tmp1_elvis_lhs == null ? Companion_getInstance_23().i30_1 : tmp1_elvis_lhs;
     var tmp_2 = $this;
-    var tmp2_safe_receiver = Companion_getInstance_16().y2w(parser.j2t('width'));
+    var tmp2_safe_receiver = Companion_getInstance_16().d2x(parser.o2t('width'));
     var tmp_3;
     if (tmp2_safe_receiver == null) {
       tmp_3 = null;
@@ -4238,18 +4241,18 @@
       tmp_3 = tmp$ret$2;
     }
     var tmp3_elvis_lhs = tmp_3;
-    tmp_2.u30_1 = tmp3_elvis_lhs == null ? Companion_getInstance_23().h30_1 : tmp3_elvis_lhs;
+    tmp_2.w30_1 = tmp3_elvis_lhs == null ? Companion_getInstance_23().j30_1 : tmp3_elvis_lhs;
     skipTag(parser);
     return $this;
   }
   function Image_init_$Create$(parent, parser) {
     return Image_init_$Init$(parent, parser, objectCreate(protoOf(Image)));
   }
-  protoOf(Image).k2v = function () {
-    return this.q30_1;
+  protoOf(Image).p2v = function () {
+    return this.s30_1;
   };
-  protoOf(Image).l2v = function () {
-    return this.r30_1;
+  protoOf(Image).q2v = function () {
+    return this.t30_1;
   };
   protoOf(Image).i2s = function () {
     var tmp;
@@ -4258,7 +4261,7 @@
     } else {
       var tmp$ret$0;
       // Inline function 'kotlin.text.isNullOrEmpty' call
-      var tmp0_isNullOrEmpty = this.s30_1;
+      var tmp0_isNullOrEmpty = this.u30_1;
       // Inline function 'kotlin.contracts.contract' call
       tmp$ret$0 = tmp0_isNullOrEmpty == null ? true : charSequenceLength(tmp0_isNullOrEmpty) === 0;
       tmp = tmp$ret$0;
@@ -4275,7 +4278,7 @@
   function Companion_21() {
     Companion_instance_21 = this;
   }
-  protoOf(Companion_21).v30 = function (_this__u8e3s4) {
+  protoOf(Companion_21).x30 = function (_this__u8e3s4) {
     var tmp0_subject = _this__u8e3s4;
     switch (tmp0_subject) {
       case 'fit':
@@ -4333,9 +4336,9 @@
   var Type_HIDDEN_instance;
   function Companion_22() {
     Companion_instance_22 = this;
-    this.w30_1 = Type_TEXT_getInstance();
+    this.y30_1 = Type_TEXT_getInstance();
   }
-  protoOf(Companion_22).x30 = function (_this__u8e3s4) {
+  protoOf(Companion_22).z30 = function (_this__u8e3s4) {
     var tmp0_subject = _this__u8e3s4;
     switch (tmp0_subject) {
       case 'email':
@@ -4370,7 +4373,7 @@
   }
   function Companion_23() {
     Companion_instance_23 = this;
-    this.y30_1 = 'input';
+    this.a31_1 = 'input';
   }
   var Companion_instance_23;
   function Companion_getInstance_26() {
@@ -4386,15 +4389,15 @@
     Companion_getInstance_26();
     parser.u2r(2, tmp, 'input');
     var tmp_0 = $this;
-    var tmp0_safe_receiver = parser.j2t('type');
-    var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : Companion_getInstance_25().x30(tmp0_safe_receiver);
-    tmp_0.h31_1 = tmp1_elvis_lhs == null ? Companion_getInstance_25().w30_1 : tmp1_elvis_lhs;
-    $this.i31_1 = parser.j2t('name');
-    $this.j31_1 = parser.j2t('value');
+    var tmp0_safe_receiver = parser.o2t('type');
+    var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : Companion_getInstance_25().z30(tmp0_safe_receiver);
+    tmp_0.j31_1 = tmp1_elvis_lhs == null ? Companion_getInstance_25().y30_1 : tmp1_elvis_lhs;
+    $this.k31_1 = parser.o2t('name');
+    $this.l31_1 = parser.o2t('value');
     var tmp_1 = $this;
-    var tmp2_safe_receiver = parser.j2t('required');
+    var tmp2_safe_receiver = parser.o2t('required');
     var tmp3_elvis_lhs = tmp2_safe_receiver == null ? null : toBoolean(tmp2_safe_receiver);
-    tmp_1.k31_1 = tmp3_elvis_lhs == null ? false : tmp3_elvis_lhs;
+    tmp_1.m31_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
@@ -4423,8 +4426,8 @@
         continue $l$loop_1;
       skipTag(parser);
     }
-    $this.l31_1 = label;
-    $this.m31_1 = placeholder;
+    $this.n31_1 = label;
+    $this.o31_1 = placeholder;
     return $this;
   }
   function Input_init_$Create$(parent, parser) {
@@ -4454,7 +4457,7 @@
   }
   function Companion_24() {
     Companion_instance_24 = this;
-    this.n31_1 = 'link';
+    this.p31_1 = 'link';
   }
   var Companion_instance_24;
   function Companion_getInstance_27() {
@@ -4466,7 +4469,7 @@
     var tmp$ret$0;
     // Inline function 'kotlin.getValue' call
     var tmp0_getValue = defaultTextStyles$factory_0();
-    tmp$ret$0 = $this.y31_1.o1();
+    tmp$ret$0 = $this.a32_1.o1();
     return tmp$ret$0;
   }
   function Link_init_$Init$(parent, parser, $this) {
@@ -4478,7 +4481,7 @@
     parser.u2r(2, tmp, 'link');
     // Inline function 'org.cru.godtools.shared.tool.parser.model.parseClickableAttrs' call
     // Inline function 'kotlin.contracts.contract' call
-    var rawUrl = parser.j2t(_get_XML_URL_$accessor$11tx9p3_lkk5sb());
+    var rawUrl = parser.o2t(_get_XML_URL_$accessor$11tx9p3_lkk5sb());
     var tmp_0;
     var tmp0_safe_receiver = rawUrl;
     if ((tmp0_safe_receiver == null ? null : get_hasUriScheme(tmp0_safe_receiver)) === false) {
@@ -4492,22 +4495,22 @@
     // Inline function 'org.cru.godtools.shared.tool.parser.model.Link.<init>.<anonymous>' call
     var tmp$ret$0;
     // Inline function 'org.cru.godtools.shared.tool.parser.model.toEventIds' call
-    var tmp0_toEventIds = parser.j2t(_get_XML_EVENTS_$accessor$11tx9p3_otmgk5());
-    tmp$ret$0 = Companion_getInstance_17().j2v(tmp0_toEventIds);
+    var tmp0_toEventIds = parser.o2t(_get_XML_EVENTS_$accessor$11tx9p3_otmgk5());
+    tmp$ret$0 = Companion_getInstance_17().o2v(tmp0_toEventIds);
     var tmp1__anonymous__uwfjfc = tmp$ret$0;
-    $this.w31_1 = tmp1__anonymous__uwfjfc;
-    $this.x31_1 = uri;
+    $this.y31_1 = tmp1__anonymous__uwfjfc;
+    $this.z31_1 = uri;
     var tmp_1 = $this;
     var tmp$ret$1;
     // Inline function 'kotlin.collections.mutableListOf' call
     tmp$ret$1 = ArrayList_init_$Create$();
-    tmp_1.a32_1 = tmp$ret$1;
+    tmp_1.c32_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.z31_1 = tmp0_elvis_lhs == null ? createTestText(_get_defaultTextStyles__fjozb5_0($this)) : tmp0_elvis_lhs;
+    tmp_2.b32_1 = tmp0_elvis_lhs == null ? createTestText(_get_defaultTextStyles__fjozb5_0($this)) : tmp0_elvis_lhs;
     return $this;
   }
   function Link_init_$Create$(parent, parser) {
@@ -4533,7 +4536,7 @@
         Companion_getInstance_6();
         if (tmp1_subject === 'events') {
           var tmp2_this = this$0;
-          var tmp0_plusAssign = tmp2_this.a32_1;
+          var tmp0_plusAssign = tmp2_this.c32_1;
           var tmp1_plusAssign = Companion_getInstance_6().y2r($parser, this$0);
           addAll(tmp0_plusAssign, tmp1_plusAssign);
           tmp_0 = Unit_getInstance();
@@ -4543,14 +4546,14 @@
       return Unit_getInstance();
     };
   }
-  protoOf(Link).k2v = function () {
-    return this.w31_1;
+  protoOf(Link).p2v = function () {
+    return this.y31_1;
   };
-  protoOf(Link).l2v = function () {
-    return this.x31_1;
+  protoOf(Link).q2v = function () {
+    return this.z31_1;
   };
   protoOf(Link).i2s = function () {
-    return protoOf(Content).i2s.call(this) ? true : !this.b2x();
+    return protoOf(Content).i2s.call(this) ? true : !this.g2x();
   };
   protoOf(Link)._getAnalyticsEvents = function (type) {
     var tmp0_subject = type;
@@ -4559,7 +4562,7 @@
     if (tmp0 === 3) {
       var tmp$ret$2;
       // Inline function 'kotlin.collections.filter' call
-      var tmp1_filter = this.a32_1;
+      var tmp1_filter = this.c32_1;
       var tmp$ret$1;
       // Inline function 'kotlin.collections.filterTo' call
       var tmp0_filterTo = ArrayList_init_$Create$();
@@ -4585,7 +4588,7 @@
   function Link() {
     Companion_getInstance_27();
     var tmp = this;
-    tmp.y31_1 = lazy(Link$defaultTextStyles$delegate$lambda(this));
+    tmp.a32_1 = lazy(Link$defaultTextStyles$delegate$lambda(this));
   }
   function defaultTextStyles$factory_0() {
     return getPropertyCallableRef('defaultTextStyles', 1, KProperty1, function (receiver) {
@@ -4593,20 +4596,20 @@
     }, null);
   }
   function Manifest$Companion$parse$slambda$slambda$slambda($manifest, $fileName, $parseFile, $src, resultContinuation) {
-    this.j32_1 = $manifest;
-    this.k32_1 = $fileName;
-    this.l32_1 = $parseFile;
-    this.m32_1 = $src;
+    this.l32_1 = $manifest;
+    this.m32_1 = $fileName;
+    this.n32_1 = $parseFile;
+    this.o32_1 = $src;
     CoroutineImpl.call(this, resultContinuation);
   }
-  protoOf(Manifest$Companion$parse$slambda$slambda$slambda).p32 = function ($this$async, $completion) {
+  protoOf(Manifest$Companion$parse$slambda$slambda$slambda).r32 = 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.p32((!(p1 == null) ? isInterface(p1, CoroutineScope) : false) ? p1 : THROW_CCE(), $completion);
+    return this.r32((!(p1 == null) ? isInterface(p1, CoroutineScope) : false) ? p1 : THROW_CCE(), $completion);
   };
   protoOf(Manifest$Companion$parse$slambda$slambda$slambda).ue = function () {
     var suspendResult = this.de_1;
@@ -4616,9 +4619,9 @@
         switch (tmp) {
           case 0:
             this.ce_1 = 2;
-            this.o32_1 = Companion_getInstance_48();
+            this.q32_1 = Companion_getInstance_48();
             this.be_1 = 1;
-            suspendResult = this.l32_1(this.m32_1, this);
+            suspendResult = this.n32_1(this.o32_1, this);
             if (suspendResult === get_COROUTINE_SUSPENDED()) {
               return suspendResult;
             }
@@ -4626,7 +4629,7 @@
             continue $sm;
           case 1:
             var ARGUMENT = suspendResult;
-            return this.o32_1.u32(this.j32_1, this.k32_1, ARGUMENT);
+            return this.q32_1.w32(this.l32_1, this.m32_1, ARGUMENT);
           case 2:
             throw this.ee_1;
         }
@@ -4642,33 +4645,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.j32_1, this.k32_1, this.l32_1, this.m32_1, completion);
-    i.n32_1 = $this$async;
+    var i = new Manifest$Companion$parse$slambda$slambda$slambda(this.l32_1, this.m32_1, this.n32_1, this.o32_1, completion);
+    i.p32_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.p32($this$async, $completion);
+      return i.r32($this$async, $completion);
     };
     l.$arity = 1;
     return l;
   }
   function Manifest$Companion$parse$slambda$slambda$slambda_1($manifest, $id, $parseFile, $src, resultContinuation) {
-    this.d33_1 = $manifest;
-    this.e33_1 = $id;
-    this.f33_1 = $parseFile;
-    this.g33_1 = $src;
+    this.f33_1 = $manifest;
+    this.g33_1 = $id;
+    this.h33_1 = $parseFile;
+    this.i33_1 = $src;
     CoroutineImpl.call(this, resultContinuation);
   }
-  protoOf(Manifest$Companion$parse$slambda$slambda$slambda_1).i33 = function ($this$async, $completion) {
+  protoOf(Manifest$Companion$parse$slambda$slambda$slambda_1).k33 = 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.i33((!(p1 == null) ? isInterface(p1, CoroutineScope) : false) ? p1 : THROW_CCE(), $completion);
+    return this.k33((!(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;
@@ -4679,7 +4682,7 @@
           case 0:
             this.ce_1 = 2;
             this.be_1 = 1;
-            suspendResult = this.f33_1(this.g33_1, this);
+            suspendResult = this.h33_1(this.i33_1, this);
             if (suspendResult === get_COROUTINE_SUSPENDED()) {
               return suspendResult;
             }
@@ -4687,7 +4690,7 @@
             continue $sm;
           case 1:
             var ARGUMENT = suspendResult;
-            return Tip_init_$Create$(this.d33_1, this.e33_1, ARGUMENT);
+            return Tip_init_$Create$(this.f33_1, this.g33_1, ARGUMENT);
           case 2:
             throw this.ee_1;
         }
@@ -4703,21 +4706,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.d33_1, this.e33_1, this.f33_1, this.g33_1, completion);
-    i.h33_1 = $this$async;
+    var i = new Manifest$Companion$parse$slambda$slambda$slambda_1(this.f33_1, this.g33_1, this.h33_1, this.i33_1, completion);
+    i.j33_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.i33($this$async, $completion);
+      return i.k33($this$async, $completion);
     };
     l.$arity = 1;
     return l;
   }
   function Manifest$Companion$parse$slambda$slambda($manifest, $parseFile, resultContinuation) {
-    this.r33_1 = $manifest;
-    this.s33_1 = $parseFile;
+    this.t33_1 = $manifest;
+    this.u33_1 = $parseFile;
     CoroutineImpl.call(this, resultContinuation);
   }
   protoOf(Manifest$Companion$parse$slambda$slambda).z10 = function ($this$launch, $completion) {
@@ -4738,14 +4741,14 @@
           case 0:
             this.ce_1 = 2;
             this.be_1 = 1;
-            var tmp1_map = this.r33_1.f2u_1;
+            var tmp1_map = this.t33_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 fileName = item.s2();
               var src = item.t2();
-              tmp0_mapTo.b(async(this.t33_1, VOID, VOID, Manifest$Companion$parse$slambda$slambda$slambda_0(this.r33_1, fileName, this.s33_1, src, null)));
+              tmp0_mapTo.b(async(this.v33_1, VOID, VOID, Manifest$Companion$parse$slambda$slambda$slambda_0(this.t33_1, fileName, this.u33_1, src, null)));
             }
             suspendResult = awaitAll(tmp0_mapTo, this);
@@ -4757,7 +4760,7 @@
           case 1:
             var ARGUMENT = suspendResult;
             var ARGUMENT_0 = filterNotNull(ARGUMENT);
-            _set_pages__j2nojl(this.r33_1, ARGUMENT_0);
+            _set_pages__j2nojl(this.t33_1, ARGUMENT_0);
             return Unit_getInstance();
           case 2:
             throw this.ee_1;
@@ -4774,8 +4777,8 @@
      while (true);
   };
   protoOf(Manifest$Companion$parse$slambda$slambda).a11 = function ($this$launch, completion) {
-    var i = new Manifest$Companion$parse$slambda$slambda(this.r33_1, this.s33_1, completion);
-    i.t33_1 = $this$launch;
+    var i = new Manifest$Companion$parse$slambda$slambda(this.t33_1, this.u33_1, completion);
+    i.v33_1 = $this$launch;
     return i;
   };
   function Manifest$Companion$parse$slambda$slambda_0($manifest, $parseFile, resultContinuation) {
@@ -4787,8 +4790,8 @@
     return l;
   }
   function Manifest$Companion$parse$slambda$slambda_1($manifest, $parseFile, resultContinuation) {
-    this.c34_1 = $manifest;
-    this.d34_1 = $parseFile;
+    this.e34_1 = $manifest;
+    this.f34_1 = $parseFile;
     CoroutineImpl.call(this, resultContinuation);
   }
   protoOf(Manifest$Companion$parse$slambda$slambda_1).z10 = function ($this$launch, $completion) {
@@ -4809,14 +4812,14 @@
           case 0:
             this.ce_1 = 2;
             this.be_1 = 1;
-            var tmp1_map = this.c34_1.g2u_1;
+            var tmp1_map = this.e34_1.l2u_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.e34_1, VOID, VOID, Manifest$Companion$parse$slambda$slambda$slambda_2(this.c34_1, id, this.d34_1, src, null)));
+              tmp0_mapTo.b(async(this.g34_1, VOID, VOID, Manifest$Companion$parse$slambda$slambda$slambda_2(this.e34_1, id, this.f34_1, src, null)));
             }
             suspendResult = awaitAll(tmp0_mapTo, this);
@@ -4832,11 +4835,11 @@
             var tmp0_iterator_0 = tmp3_associateBy.f();
             while (tmp0_iterator_0.g()) {
               var element = tmp0_iterator_0.h();
-              tmp2_associateByTo.u2(element.g34_1, element);
+              tmp2_associateByTo.u2(element.i34_1, element);
             }
             var ARGUMENT = tmp2_associateByTo;
-            _set_tips__9ug36n(this.c34_1, ARGUMENT);
+            _set_tips__9ug36n(this.e34_1, ARGUMENT);
             return Unit_getInstance();
           case 2:
             throw this.ee_1;
@@ -4853,8 +4856,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.c34_1, this.d34_1, completion);
-    i.e34_1 = $this$launch;
+    var i = new Manifest$Companion$parse$slambda$slambda_1(this.e34_1, this.f34_1, completion);
+    i.g34_1 = $this$launch;
     return i;
   };
   function Manifest$Companion$parse$slambda$slambda_2($manifest, $parseFile, resultContinuation) {
@@ -4866,19 +4869,19 @@
     return l;
   }
   function Manifest$Companion$parse$slambda($config, $manifest, $parseFile, resultContinuation) {
-    this.r34_1 = $config;
-    this.s34_1 = $manifest;
-    this.t34_1 = $parseFile;
+    this.t34_1 = $config;
+    this.u34_1 = $manifest;
+    this.v34_1 = $parseFile;
     CoroutineImpl.call(this, resultContinuation);
   }
-  protoOf(Manifest$Companion$parse$slambda).v34 = function ($this$coroutineScope, $completion) {
+  protoOf(Manifest$Companion$parse$slambda).x34 = 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.v34((!(p1 == null) ? isInterface(p1, CoroutineScope) : false) ? p1 : THROW_CCE(), $completion);
+    return this.x34((!(p1 == null) ? isInterface(p1, CoroutineScope) : false) ? p1 : THROW_CCE(), $completion);
   };
   protoOf(Manifest$Companion$parse$slambda).ue = function () {
     var suspendResult = this.de_1;
@@ -4887,16 +4890,16 @@
         var tmp = this.be_1;
         if (tmp === 0) {
           this.ce_1 = 1;
-          if (this.r34_1.o2q_1) {
-            launch(this.u34_1, VOID, VOID, Manifest$Companion$parse$slambda$slambda_0(this.s34_1, this.t34_1, null));
+          if (this.t34_1.o2q_1) {
+            launch(this.w34_1, VOID, VOID, Manifest$Companion$parse$slambda$slambda_0(this.u34_1, this.v34_1, null));
           } else {
-            _set_pages__j2nojl(this.s34_1, emptyList());
+            _set_pages__j2nojl(this.u34_1, emptyList());
           }
           var tmp_0;
-          if (this.r34_1.p2q_1) {
-            tmp_0 = launch(this.u34_1, VOID, VOID, Manifest$Companion$parse$slambda$slambda_2(this.s34_1, this.t34_1, null));
+          if (this.t34_1.p2q_1) {
+            tmp_0 = launch(this.w34_1, VOID, VOID, Manifest$Companion$parse$slambda$slambda_2(this.u34_1, this.v34_1, null));
           } else {
-            _set_tips__9ug36n(this.s34_1, emptyMap());
+            _set_tips__9ug36n(this.u34_1, emptyMap());
             tmp_0 = Unit_getInstance();
           }
           return tmp_0;
@@ -4910,24 +4913,24 @@
      while (true);
   };
   protoOf(Manifest$Companion$parse$slambda).a11 = function ($this$coroutineScope, completion) {
-    var i = new Manifest$Companion$parse$slambda(this.r34_1, this.s34_1, this.t34_1, completion);
-    i.u34_1 = $this$coroutineScope;
+    var i = new Manifest$Companion$parse$slambda(this.t34_1, this.u34_1, this.v34_1, completion);
+    i.w34_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.v34($this$coroutineScope, $completion);
+      return i.x34($this$coroutineScope, $completion);
     };
     l.$arity = 1;
     return l;
   }
   function $parseCOROUTINE$0(_this__u8e3s4, fileName, config, parseFile, resultContinuation) {
     CoroutineImpl.call(this, resultContinuation);
-    this.e35_1 = _this__u8e3s4;
-    this.f35_1 = fileName;
-    this.g35_1 = config;
-    this.h35_1 = parseFile;
+    this.g35_1 = _this__u8e3s4;
+    this.h35_1 = fileName;
+    this.i35_1 = config;
+    this.j35_1 = parseFile;
   }
   protoOf($parseCOROUTINE$0).ue = function () {
     var suspendResult = this.de_1;
@@ -4938,17 +4941,17 @@
           case 0:
             this.ce_1 = 3;
             this.be_1 = 1;
-            suspendResult = this.h35_1(this.f35_1, this);
+            suspendResult = this.j35_1(this.h35_1, this);
             if (suspendResult === get_COROUTINE_SUSPENDED()) {
               return suspendResult;
             }
             continue $sm;
           case 1:
-            this.i35_1 = suspendResult;
-            this.j35_1 = Manifest_init_$Create$(this.i35_1, this.g35_1);
+            this.k35_1 = suspendResult;
+            this.l35_1 = Manifest_init_$Create$(this.k35_1, this.i35_1);
             this.be_1 = 2;
-            suspendResult = coroutineScope(Manifest$Companion$parse$slambda_0(this.g35_1, this.j35_1, this.h35_1, null), this);
+            suspendResult = coroutineScope(Manifest$Companion$parse$slambda_0(this.i35_1, this.l35_1, this.j35_1, null), this);
             if (suspendResult === get_COROUTINE_SUSPENDED()) {
               return suspendResult;
             }
@@ -4956,7 +4959,7 @@
             continue $sm;
           case 2:
             ;
-            return this.j35_1;
+            return this.l35_1;
           case 3:
             throw this.ee_1;
         }
@@ -4978,9 +4981,9 @@
   var Type_UNKNOWN_instance_0;
   function Companion_25() {
     Companion_instance_25 = this;
-    this.k35_1 = Type_TRACT_getInstance();
+    this.m35_1 = Type_TRACT_getInstance();
   }
-  protoOf(Companion_25).l35 = function (value) {
+  protoOf(Companion_25).n35 = function (value) {
     var tmp0_subject = value;
     switch (tmp0_subject) {
       case 'article':
@@ -5054,7 +5057,7 @@
     // Inline function 'org.cru.godtools.shared.tool.parser.model.color' call
     tmp$ret$2 = toPlatformColor(Companion_getInstance_0().k2j(255 / 255.0, 255 / 255.0, 255 / 255.0, 1.0));
     tmp_1.e2q_1 = tmp$ret$2;
-    this.f2q_1 = Companion_getInstance_22().u2w_1;
+    this.f2q_1 = Companion_getInstance_22().z2w_1;
     this.g2q_1 = ImageScaleType_FILL_getInstance();
     this.h2q_1 = Style_CONTAINED_getInstance();
     var tmp_2 = this;
@@ -5077,71 +5080,71 @@
     return Companion_instance_26;
   }
   function _set_pages__j2nojl($this, _set____db54di) {
-    return $this.c2u_1.m35($this, pages$factory(), _set____db54di);
+    return $this.h2u_1.o35($this, pages$factory(), _set____db54di);
   }
   function _set_tips__9ug36n($this, _set____db54di) {
-    return $this.e2u_1.m35($this, tips$factory(), _set____db54di);
+    return $this.j2u_1.o35($this, tips$factory(), _set____db54di);
   }
   function Manifest_init_$Init$(parser, config, $this) {
     BaseModel.call($this);
     Manifest.call($this);
     Companion_getInstance_59();
     parser.u2r(2, get_XMLNS_MANIFEST(), 'manifest');
-    $this.l2t_1 = config;
-    $this.code = parser.j2t('tool');
+    $this.q2t_1 = config;
+    $this.code = parser.o2t('tool');
     var tmp = $this;
-    var tmp0_safe_receiver = parser.j2t('locale');
+    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().l35(parser.j2t('type'));
-    tmp_0.type = tmp1_elvis_lhs == null ? Companion_getInstance_28().k35_1 : tmp1_elvis_lhs;
+    var tmp1_elvis_lhs = Companion_getInstance_28().n35(parser.o2t('type'));
+    tmp_0.type = tmp1_elvis_lhs == null ? Companion_getInstance_28().m35_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.j2t(get_XML_DISMISS_LISTENERS());
-    tmp$ret$0 = Companion_getInstance_17().j2v(tmp0_toEventIds);
+    var tmp0_toEventIds = parser.o2t(get_XML_DISMISS_LISTENERS());
+    tmp$ret$0 = Companion_getInstance_17().o2v(tmp0_toEventIds);
     tmp_1.dismissListeners = toSet_0(tmp$ret$0);
     var tmp_2 = $this;
-    var tmp2_safe_receiver = parser.j2t(get_XML_PRIMARY_COLOR());
+    var tmp2_safe_receiver = parser.o2t(get_XML_PRIMARY_COLOR());
     var tmp3_elvis_lhs = tmp2_safe_receiver == null ? null : toColorOrNull(tmp2_safe_receiver);
-    tmp_2.m2t_1 = tmp3_elvis_lhs == null ? Companion_getInstance_29().c2q_1 : tmp3_elvis_lhs;
+    tmp_2.r2t_1 = tmp3_elvis_lhs == null ? Companion_getInstance_29().c2q_1 : tmp3_elvis_lhs;
     var tmp_3 = $this;
-    var tmp4_safe_receiver = parser.j2t(get_XML_PRIMARY_TEXT_COLOR());
+    var tmp4_safe_receiver = parser.o2t(get_XML_PRIMARY_TEXT_COLOR());
     var tmp5_elvis_lhs = tmp4_safe_receiver == null ? null : toColorOrNull(tmp4_safe_receiver);
-    tmp_3.n2t_1 = tmp5_elvis_lhs == null ? Companion_getInstance_29().d2q_1 : tmp5_elvis_lhs;
+    tmp_3.s2t_1 = tmp5_elvis_lhs == null ? Companion_getInstance_29().d2q_1 : tmp5_elvis_lhs;
     var tmp_4 = $this;
-    var tmp6_safe_receiver = parser.j2t('navbar-color');
-    tmp_4.o2t_1 = tmp6_safe_receiver == null ? null : toColorOrNull(tmp6_safe_receiver);
+    var tmp6_safe_receiver = parser.o2t('navbar-color');
+    tmp_4.t2t_1 = tmp6_safe_receiver == null ? null : toColorOrNull(tmp6_safe_receiver);
     var tmp_5 = $this;
-    var tmp7_safe_receiver = parser.j2t('navbar-control-color');
-    tmp_5.p2t_1 = tmp7_safe_receiver == null ? null : toColorOrNull(tmp7_safe_receiver);
+    var tmp7_safe_receiver = parser.o2t('navbar-control-color');
+    tmp_5.u2t_1 = tmp7_safe_receiver == null ? null : toColorOrNull(tmp7_safe_receiver);
     var tmp_6 = $this;
-    var tmp8_safe_receiver = parser.j2t(get_XML_BACKGROUND_COLOR());
+    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.q2t_1 = tmp9_elvis_lhs == null ? Companion_getInstance_29().e2q_1 : tmp9_elvis_lhs;
-    $this.r2t_1 = parser.i2v(null, get_XML_BACKGROUND_IMAGE());
+    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());
     var tmp_7 = $this;
-    var tmp10_safe_receiver = parser.j2t(get_XML_BACKGROUND_IMAGE_GRAVITY());
-    var tmp11_elvis_lhs = tmp10_safe_receiver == null ? null : Companion_getInstance_22().v2w(tmp10_safe_receiver);
-    tmp_7.s2t_1 = tmp11_elvis_lhs == null ? Companion_getInstance_29().f2q_1 : tmp11_elvis_lhs;
+    var tmp10_safe_receiver = parser.o2t(get_XML_BACKGROUND_IMAGE_GRAVITY());
+    var tmp11_elvis_lhs = tmp10_safe_receiver == null ? null : Companion_getInstance_22().a2x(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.j2t(get_XML_BACKGROUND_IMAGE_SCALE_TYPE());
-    var tmp13_elvis_lhs = tmp12_safe_receiver == null ? null : Companion_getInstance_24().v30(tmp12_safe_receiver);
-    tmp_8.t2t_1 = tmp13_elvis_lhs == null ? Companion_getInstance_29().g2q_1 : tmp13_elvis_lhs;
+    var tmp12_safe_receiver = parser.o2t(get_XML_BACKGROUND_IMAGE_SCALE_TYPE());
+    var tmp13_elvis_lhs = tmp12_safe_receiver == null ? null : Companion_getInstance_24().x30(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.i2v(tmp_10, 'card-background-color');
-    tmp_9.u2t_1 = tmp14_safe_receiver == null ? null : toColorOrNull(tmp14_safe_receiver);
+    var tmp14_safe_receiver = parser.n2v(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.j2t('category-label-color');
-    tmp_11.v2t_1 = tmp15_safe_receiver == null ? null : toColorOrNull(tmp15_safe_receiver);
+    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.i2v(get_XMLNS_PAGE(), get_XML_CONTROL_COLOR());
+    var tmp16_safe_receiver = parser.n2v(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.i2v(get_XMLNS_LESSON(), get_XML_CONTROL_COLOR());
+      var tmp17_safe_receiver = parser.n2v(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) {
@@ -5161,23 +5164,23 @@
       tmp_13 = tmp19_elvis_lhs;
     }
     var tmp20_elvis_lhs = tmp_13;
-    tmp_12.w2t_1 = tmp20_elvis_lhs == null ? get_DEFAULT_CONTROL_COLOR() : tmp20_elvis_lhs;
+    tmp_12.b2u_1 = tmp20_elvis_lhs == null ? get_DEFAULT_CONTROL_COLOR() : tmp20_elvis_lhs;
     var tmp_15 = $this;
     var tmp_16 = get_XMLNS_CONTENT();
     Companion_getInstance_32();
-    var tmp21_safe_receiver = parser.i2v(tmp_16, 'multiselect-option-background-color');
-    tmp_15.x2t_1 = tmp21_safe_receiver == null ? null : toColorOrNull(tmp21_safe_receiver);
+    var tmp21_safe_receiver = parser.n2v(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.i2v(tmp_18, 'multiselect-option-selected-color');
-    tmp_17.y2t_1 = tmp22_safe_receiver == null ? null : toColorOrNull(tmp22_safe_receiver);
+    var tmp22_safe_receiver = parser.n2v(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.j2t(get_XML_TEXT_COLOR());
+    var tmp23_safe_receiver = parser.o2t(get_XML_TEXT_COLOR());
     var tmp24_elvis_lhs = tmp23_safe_receiver == null ? null : toColorOrNull(tmp23_safe_receiver);
-    tmp_19.z2t_1 = tmp24_elvis_lhs == null ? Companion_getInstance_29().i2q_1 : tmp24_elvis_lhs;
+    tmp_19.e2u_1 = tmp24_elvis_lhs == null ? Companion_getInstance_29().i2q_1 : tmp24_elvis_lhs;
     var tmp_20 = $this;
-    var tmp25_safe_receiver = parser.j2t(get_XML_TEXT_SCALE());
+    var tmp25_safe_receiver = parser.o2t(get_XML_TEXT_SCALE());
     var tmp26_elvis_lhs = tmp25_safe_receiver == null ? null : toDoubleOrNull(tmp25_safe_receiver);
     var tmp_21;
     if (tmp26_elvis_lhs == null) {
@@ -5186,7 +5189,7 @@
     } else {
       tmp_21 = tmp26_elvis_lhs;
     }
-    tmp_20.a2u_1 = tmp_21;
+    tmp_20.f2u_1 = tmp_21;
     var title = null;
     var tmp_22 = $this;
     var tmp$ret$2;
@@ -5202,7 +5205,7 @@
     var tmp$ret$4;
     // Inline function 'kotlin.collections.mutableMapOf' call
     tmp$ret$4 = LinkedHashMap_init_$Create$();
-    tmp_24.d2u_1 = tmp$ret$4;
+    tmp_24.i2u_1 = tmp$ret$4;
     var tmp$ret$5;
     // Inline function 'kotlin.collections.mutableListOf' call
     tmp$ret$5 = ArrayList_init_$Create$();
@@ -5211,12 +5214,12 @@
     var tmp$ret$6;
     // Inline function 'kotlin.collections.mutableListOf' call
     tmp$ret$6 = ArrayList_init_$Create$();
-    tmp_25.f2u_1 = tmp$ret$6;
+    tmp_25.k2u_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.g2u_1 = tmp$ret$7;
+    tmp_26.l2u_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();
@@ -5249,20 +5252,20 @@
             var tmp3_this = $this;
             // Inline function 'kotlin.collections.plusAssign' call
             var tmp2_plusAssign = tmp3_this.aemImports;
-            var tmp3_plusAssign = result.p35_1;
+            var tmp3_plusAssign = result.r35_1;
             addAll(tmp2_plusAssign, tmp3_plusAssign);
             var tmp4_this = $this;
             // Inline function 'kotlin.collections.plusAssign' call
-            var tmp4_plusAssign = tmp4_this.f2u_1;
-            var tmp5_plusAssign = result.q35_1;
+            var tmp4_plusAssign = tmp4_this.k2u_1;
+            var tmp5_plusAssign = result.s35_1;
             addAll(tmp4_plusAssign, tmp5_plusAssign);
             break;
           case 'resources':
             var tmp5_this = $this;
             // Inline function 'kotlin.collections.plusAssign' call
-            var tmp8_plusAssign = tmp5_this.d2u_1;
+            var tmp8_plusAssign = tmp5_this.i2u_1;
             var tmp$ret$10;
             // Inline function 'kotlin.collections.associateBy' call
             var tmp7_associateBy = parseResources(parser, $this);
@@ -5287,7 +5290,7 @@
           case 'tips':
             var tmp6_this = $this;
             // Inline function 'kotlin.collections.plusAssign' call
-            var tmp10_plusAssign = tmp6_this.g2u_1;
+            var tmp10_plusAssign = tmp6_this.l2u_1;
             var tmp11_plusAssign = parseTips(parser, $this);
             addAll(tmp10_plusAssign, tmp11_plusAssign);
@@ -5298,7 +5301,7 @@
         Companion_getInstance_49();
         if (tmp7_subject === 'items') {
           // Inline function 'kotlin.collections.plusAssign' call
-          var tmp12_plusAssign = Companion_getInstance_49().o35(parser, $this);
+          var tmp12_plusAssign = Companion_getInstance_49().q35(parser, $this);
           addAll(shareables, tmp12_plusAssign);
         }
       }
@@ -5320,7 +5323,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.l2u();
+      tmp$ret$11 = e.q2u();
       var key = tmp$ret$11;
       if (set.b(key)) {
         list.b(e);
@@ -5334,7 +5337,7 @@
     tmp$ret$13 = new sam$kotlin_Comparator$0(tmp_31);
     tmp$ret$14 = sortedWith(tmp1_sortedBy, tmp$ret$13);
     tmp_30.shareables = tmp$ret$14;
-    $this.b2u_1 = title;
+    $this.g2u_1 = title;
     return $this;
   }
   function Manifest_init_$Create$(parser, config) {
@@ -5342,7 +5345,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().k35_1 : type;
+    type = type === VOID ? Companion_getInstance_28().m35_1 : type;
     code = code === VOID ? null : code;
     locale = locale === VOID ? null : locale;
     primaryColor = primaryColor === VOID ? Companion_getInstance_29().c2q_1 : primaryColor;
@@ -5369,27 +5372,27 @@
     pages = pages === VOID ? null : pages;
     BaseModel.call($this);
     Manifest.call($this);
-    $this.l2t_1 = config;
+    $this.q2t_1 = config;
     $this.code = code;
     $this.locale = locale;
     $this.type = type;
     $this.dismissListeners = emptySet();
-    $this.m2t_1 = primaryColor;
-    $this.n2t_1 = primaryTextColor;
-    $this.o2t_1 = navBarColor;
-    $this.p2t_1 = navBarControlColor;
-    $this.q2t_1 = backgroundColor;
-    $this.r2t_1 = null;
-    $this.s2t_1 = Companion_getInstance_29().f2q_1;
-    $this.t2t_1 = Companion_getInstance_29().g2q_1;
-    $this.u2t_1 = cardBackgroundColor;
-    $this.v2t_1 = categoryLabelColor;
-    $this.w2t_1 = pageControlColor;
-    $this.x2t_1 = null;
-    $this.y2t_1 = multiselectOptionSelectedColor;
-    $this.z2t_1 = textColor;
-    $this.a2u_1 = textScale;
-    $this.b2u_1 = null;
+    $this.r2t_1 = primaryColor;
+    $this.s2t_1 = primaryTextColor;
+    $this.t2t_1 = navBarColor;
+    $this.u2t_1 = navBarControlColor;
+    $this.v2t_1 = backgroundColor;
+    $this.w2t_1 = null;
+    $this.x2t_1 = Companion_getInstance_29().f2q_1;
+    $this.y2t_1 = Companion_getInstance_29().g2q_1;
+    $this.z2t_1 = cardBackgroundColor;
+    $this.a2u_1 = categoryLabelColor;
+    $this.b2u_1 = pageControlColor;
+    $this.c2u_1 = null;
+    $this.d2u_1 = multiselectOptionSelectedColor;
+    $this.e2u_1 = textColor;
+    $this.f2u_1 = textScale;
+    $this.g2u_1 = null;
     $this.aemImports = emptyList();
     $this.categories = emptyList();
     var tmp$ret$0;
@@ -5429,7 +5432,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.d2u_1 = tmp$ret$4;
+    tmp_0.i2u_1 = tmp$ret$4;
     var tmp_2 = $this;
     var tmp$ret$5;
     // Inline function 'kotlin.collections.orEmpty' call
@@ -5457,7 +5460,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.g34_1;
+        tmp$ret$6 = element_0.i34_1;
         tmp4_associateByTo.u2(tmp$ret$6, element_0);
       }
       tmp$ret$7 = tmp4_associateByTo;
@@ -5468,8 +5471,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.f2u_1 = emptyList();
-    $this.g2u_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) {
@@ -5524,12 +5527,12 @@
     var tmp$ret$0;
     // Inline function 'kotlin.collections.mutableListOf' call
     tmp$ret$0 = ArrayList_init_$Create$();
-    tmp.p35_1 = tmp$ret$0;
+    tmp.r35_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.q35_1 = tmp$ret$1;
+    tmp_0.s35_1 = tmp$ret$1;
   }
   function parsePages(_this__u8e3s4, $this) {
     var tmp$ret$4;
@@ -5557,7 +5560,7 @@
         if (tmp0_subject === get_XMLNS_MANIFEST()) {
           var tmp1_subject = _this__u8e3s4.id();
           if (tmp1_subject === 'page') {
-            var tmp2_elvis_lhs = _this__u8e3s4.j2t('src');
+            var tmp2_elvis_lhs = _this__u8e3s4.o2t('src');
             var tmp_1;
             if (tmp2_elvis_lhs == null) {
               tmp$ret$0 = Unit_getInstance();
@@ -5566,17 +5569,17 @@
               tmp_1 = tmp2_elvis_lhs;
             }
             var src = tmp_1;
-            var fileName = _this__u8e3s4.j2t('filename');
+            var fileName = _this__u8e3s4.o2t('filename');
             var tmp3_this = tmp0_also;
             // Inline function 'kotlin.collections.plusAssign' call
-            var tmp0_plusAssign = tmp3_this.q35_1;
+            var tmp0_plusAssign = tmp3_this.s35_1;
             var tmp1_plusAssign = to(fileName, src);
             tmp0_plusAssign.b(tmp1_plusAssign);
           }
         } else if (tmp0_subject === get_XMLNS_ARTICLE()) {
           var tmp4_subject = _this__u8e3s4.id();
           if (tmp4_subject === 'aem-import') {
-            var tmp5_safe_receiver = toUriOrNull(_this__u8e3s4.j2t('src'));
+            var tmp5_safe_receiver = toUriOrNull(_this__u8e3s4.o2t('src'));
             var tmp_2;
             if (tmp5_safe_receiver == null) {
               tmp_2 = null;
@@ -5604,7 +5607,7 @@
               // Inline function 'kotlin.let' call
               // Inline function 'kotlin.contracts.contract' call
               var tmp0_this = tmp0_also;
-              var tmp0_plusAssign_0 = tmp0_this.p35_1;
+              var tmp0_plusAssign_0 = tmp0_this.r35_1;
               tmp0_plusAssign_0.b(tmp6_safe_receiver);
               tmp$ret$3 = Unit_getInstance();
             }
@@ -5693,7 +5696,7 @@
         if (tmp0_subject === get_XMLNS_MANIFEST()) {
           var tmp1_subject = _this__u8e3s4.id();
           if (tmp1_subject === 'tip') {
-            var tmp2_elvis_lhs = _this__u8e3s4.j2t('id');
+            var tmp2_elvis_lhs = _this__u8e3s4.o2t('id');
             var tmp_1;
             if (tmp2_elvis_lhs == null) {
               tmp$ret$0 = Unit_getInstance();
@@ -5702,7 +5705,7 @@
               tmp_1 = tmp2_elvis_lhs;
             }
             var id = tmp_1;
-            var tmp3_elvis_lhs = _this__u8e3s4.j2t('src');
+            var tmp3_elvis_lhs = _this__u8e3s4.o2t('src');
             var tmp_2;
             if (tmp3_elvis_lhs == null) {
               tmp$ret$0 = Unit_getInstance();
@@ -5732,10 +5735,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.x35_1 = function_0;
+    this.z35_1 = function_0;
   }
   protoOf(sam$kotlin_Comparator$0).wc = function (a, b) {
-    return this.x35_1(a, b);
+    return this.z35_1(a, b);
   };
   protoOf(sam$kotlin_Comparator$0).compare = function (a, b) {
     return this.wc(a, b);
@@ -5745,11 +5748,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.u35_1;
+    tmp$ret$0 = a.w35_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.u35_1;
+    tmp$ret$1 = b.w35_1;
     tmp$ret$2 = compareValues(tmp, tmp$ret$1);
     return tmp$ret$2;
   }
@@ -5773,97 +5776,97 @@
     Type_initEntries_1();
     return Type_UNKNOWN_instance_0;
   }
-  protoOf(Manifest).y35 = function () {
-    return this.l2t_1;
+  protoOf(Manifest).a36 = function () {
+    return this.q2t_1;
   };
-  protoOf(Manifest).z35 = function () {
+  protoOf(Manifest).b36 = function () {
     return this.code;
   };
-  protoOf(Manifest).a36 = function () {
+  protoOf(Manifest).c36 = function () {
     return this.locale;
   };
   protoOf(Manifest).k1c = function () {
     return this.type;
   };
-  protoOf(Manifest).b36 = function () {
+  protoOf(Manifest).d36 = function () {
     return this.dismissListeners;
   };
-  protoOf(Manifest).y2x = function () {
-    return this.m2t_1;
-  };
-  protoOf(Manifest).z2x = function () {
-    return this.n2t_1;
-  };
-  protoOf(Manifest).c36 = function () {
-    var tmp0_elvis_lhs = this.o2t_1;
-    return tmp0_elvis_lhs == null ? this.type.equals(Type_LESSON_getInstance()) ? get_DEFAULT_LESSON_NAV_BAR_COLOR() : this.m2t_1 : tmp0_elvis_lhs;
+  protoOf(Manifest).d2y = function () {
+    return this.r2t_1;
   };
-  protoOf(Manifest).d36 = function () {
-    var tmp0_elvis_lhs = this.p2t_1;
-    return tmp0_elvis_lhs == null ? this.type.equals(Type_LESSON_getInstance()) ? this.m2t_1 : this.n2t_1 : tmp0_elvis_lhs;
+  protoOf(Manifest).e2y = function () {
+    return this.s2t_1;
   };
   protoOf(Manifest).e36 = function () {
-    return this.q2t_1;
+    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).f36 = function () {
-    return this.p2v(this.r2t_1);
+    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).g36 = function () {
-    return this.s2t_1;
+    return this.v2t_1;
   };
   protoOf(Manifest).h36 = function () {
-    return this.t2t_1;
+    return this.u2v(this.w2t_1);
   };
-  protoOf(Manifest).b2y = function () {
-    var tmp0_elvis_lhs = this.u2t_1;
-    return tmp0_elvis_lhs == null ? this.q2t_1 : tmp0_elvis_lhs;
+  protoOf(Manifest).i36 = function () {
+    return this.x2t_1;
+  };
+  protoOf(Manifest).j36 = function () {
+    return this.y2t_1;
   };
-  protoOf(Manifest).x2x = function () {
-    var tmp0_elvis_lhs = this.v2t_1;
-    return tmp0_elvis_lhs == null ? this.z2t_1 : tmp0_elvis_lhs;
+  protoOf(Manifest).g2y = function () {
+    var tmp0_elvis_lhs = this.z2t_1;
+    return tmp0_elvis_lhs == null ? this.v2t_1 : tmp0_elvis_lhs;
   };
-  protoOf(Manifest).i36 = function () {
-    return this.w2t_1;
+  protoOf(Manifest).c2y = function () {
+    var tmp0_elvis_lhs = this.a2u_1;
+    return tmp0_elvis_lhs == null ? this.e2u_1 : tmp0_elvis_lhs;
   };
-  protoOf(Manifest).a2y = function () {
+  protoOf(Manifest).k36 = function () {
+    return this.b2u_1;
+  };
+  protoOf(Manifest).f2y = function () {
     return Companion_getInstance_29().h2q_1;
   };
-  protoOf(Manifest).c2y = function () {
-    var tmp0_elvis_lhs = this.x2t_1;
+  protoOf(Manifest).h2y = function () {
+    var tmp0_elvis_lhs = this.c2u_1;
     return tmp0_elvis_lhs == null ? get_multiselectOptionBackgroundColor.call(this) : tmp0_elvis_lhs;
   };
-  protoOf(Manifest).d2y = function () {
-    return this.y2t_1;
+  protoOf(Manifest).i2y = function () {
+    return this.d2u_1;
   };
-  protoOf(Manifest).w2x = function () {
-    return this.z2t_1;
+  protoOf(Manifest).b2y = function () {
+    return this.e2u_1;
   };
-  protoOf(Manifest).e2y = function () {
-    return this.a2u_1;
+  protoOf(Manifest).j2y = function () {
+    return this.f2u_1;
   };
-  protoOf(Manifest).j36 = function () {
-    var tmp0_safe_receiver = this.b2u_1;
+  protoOf(Manifest).l36 = function () {
+    var tmp0_safe_receiver = this.g2u_1;
     return tmp0_safe_receiver == null ? null : tmp0_safe_receiver.text;
   };
-  protoOf(Manifest).x36 = function () {
+  protoOf(Manifest).z36 = function () {
     return this.aemImports;
   };
-  protoOf(Manifest).y36 = function () {
+  protoOf(Manifest).a37 = function () {
     return this.categories;
   };
-  protoOf(Manifest).z36 = function () {
-    return this.c2u_1.a37(this, pages$factory_0());
-  };
   protoOf(Manifest).b37 = function () {
-    return this.d2u_1;
+    return this.h2u_1.c37(this, pages$factory_0());
   };
-  protoOf(Manifest).c37 = function () {
+  protoOf(Manifest).d37 = function () {
+    return this.i2u_1;
+  };
+  protoOf(Manifest).e37 = function () {
     return this.shareables;
   };
   protoOf(Manifest).c2t = function () {
-    return this.e2u_1.a37(this, tips$factory_0());
+    return this.j2u_1.c37(this, tips$factory_0());
   };
-  protoOf(Manifest).d37 = function () {
+  protoOf(Manifest).f37 = function () {
     var tmp$ret$12;
     // Inline function 'kotlin.collections.buildSet' call
     // Inline function 'kotlin.contracts.contract' call
@@ -5876,7 +5879,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.f2u_1;
+    var tmp1_map = this.k2u_1;
     var tmp$ret$1;
     // Inline function 'kotlin.collections.mapTo' call
     var tmp0_mapTo = ArrayList_init_$Create$_0(collectionSizeOrDefault(tmp1_map, 10));
@@ -5893,7 +5896,7 @@
     tmp0_apply.k(tmp$ret$2);
     var tmp$ret$5;
     // Inline function 'kotlin.collections.map' call
-    var tmp3_map = this.g2u_1;
+    var tmp3_map = this.l2u_1;
     var tmp$ret$4;
     // Inline function 'kotlin.collections.mapTo' call
     var tmp2_mapTo = ArrayList_init_$Create$_0(collectionSizeOrDefault(tmp3_map, 10));
@@ -5910,7 +5913,7 @@
     tmp0_apply.k(tmp$ret$5);
     var tmp$ret$9;
     // Inline function 'kotlin.collections.mapNotNull' call
-    var tmp5_mapNotNull = this.d2u_1.d2();
+    var tmp5_mapNotNull = this.i2u_1.d2();
     var tmp$ret$8;
     // Inline function 'kotlin.collections.mapNotNullTo' call
     var tmp4_mapNotNullTo = ArrayList_init_$Create$();
@@ -5944,7 +5947,7 @@
   protoOf(Manifest).a2p = function () {
     return this;
   };
-  protoOf(Manifest).e37 = function () {
+  protoOf(Manifest).g37 = function () {
     var tmp;
     var tmp$ret$0;
     // Inline function 'kotlin.collections.isNotEmpty' call
@@ -5954,10 +5957,10 @@
       tmp = true;
     } else {
       var tmp_0;
-      if (!this.l2t_1.p2q_1) {
+      if (!this.q2t_1.p2q_1) {
         var tmp$ret$1;
         // Inline function 'kotlin.collections.isNotEmpty' call
-        var tmp1_isNotEmpty = this.g2u_1;
+        var tmp1_isNotEmpty = this.l2u_1;
         tmp$ret$1 = !tmp1_isNotEmpty.m();
         tmp_0 = tmp$ret$1;
       } else {
@@ -5967,7 +5970,7 @@
     }
     return tmp;
   };
-  protoOf(Manifest).p2v = function (name) {
+  protoOf(Manifest).u2v = function (name) {
     var tmp0_safe_receiver = name;
     var tmp;
     if (tmp0_safe_receiver == null) {
@@ -5978,13 +5981,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.d2u_1.c2(name);
+      tmp$ret$0 = this.i2u_1.c2(name);
       tmp$ret$1 = tmp$ret$0;
       tmp = tmp$ret$1;
     }
     return tmp;
   };
-  protoOf(Manifest).f37 = function (category) {
+  protoOf(Manifest).h37 = function (category) {
     var tmp$ret$1;
     $l$block: {
       // Inline function 'kotlin.collections.firstOrNull' call
@@ -5994,7 +5997,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.s2x_1 == category;
+        tmp$ret$0 = element.x2x_1 == category;
         if (tmp$ret$0) {
           tmp$ret$1 = element;
           break $l$block;
@@ -6038,7 +6041,7 @@
     }
     return tmp;
   };
-  protoOf(Manifest).g37 = function (id) {
+  protoOf(Manifest).i37 = function (id) {
     var tmp0_safe_receiver = id;
     var tmp;
     if (tmp0_safe_receiver == null) {
@@ -6058,7 +6061,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.l2u() == id;
+          tmp$ret$0 = element.q2u() == id;
           if (tmp$ret$0) {
             tmp$ret$1 = element;
             break $l$block;
@@ -6072,14 +6075,14 @@
     }
     return tmp;
   };
-  protoOf(Manifest).h37 = function (id) {
+  protoOf(Manifest).j37 = 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).i37 = function () {
+  protoOf(Manifest).k37 = function () {
     var tmp$ret$0;
     // Inline function 'kotlin.collections.toTypedArray' call
     var tmp0_toTypedArray = this._pages;
@@ -6088,18 +6091,18 @@
   };
   function Manifest() {
     Companion_getInstance_29();
-    this.c2u_1 = setOnce();
-    this.e2u_1 = setOnce();
-  }
-  defineProp(protoOf(Manifest), 'backgroundImage', protoOf(Manifest).f36);
-  defineProp(protoOf(Manifest), 'title', protoOf(Manifest).j36);
-  defineProp(protoOf(Manifest), '_pages', protoOf(Manifest).z36);
-  defineProp(protoOf(Manifest), 'relatedFiles', protoOf(Manifest).d37);
-  defineProp(protoOf(Manifest), 'hasTips', protoOf(Manifest).e37);
-  defineProp(protoOf(Manifest), 'pages', protoOf(Manifest).i37);
+    this.h2u_1 = setOnce();
+    this.j2u_1 = setOnce();
+  }
+  defineProp(protoOf(Manifest), 'backgroundImage', protoOf(Manifest).h36);
+  defineProp(protoOf(Manifest), 'title', protoOf(Manifest).l36);
+  defineProp(protoOf(Manifest), '_pages', protoOf(Manifest).b37);
+  defineProp(protoOf(Manifest), 'relatedFiles', protoOf(Manifest).f37);
+  defineProp(protoOf(Manifest), 'hasTips', protoOf(Manifest).g37);
+  defineProp(protoOf(Manifest), 'pages', protoOf(Manifest).k37);
   function get_backgroundColor(_this__u8e3s4) {
     var tmp0_safe_receiver = _this__u8e3s4;
-    var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.q2t_1;
+    var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.v2t_1;
     return tmp1_elvis_lhs == null ? Companion_getInstance_29().e2q_1 : tmp1_elvis_lhs;
   }
   function pages$factory() {
@@ -6135,7 +6138,7 @@
   function Companion_27() {
     Companion_instance_27 = this;
   }
-  protoOf(Companion_27).j37 = function (_this__u8e3s4) {
+  protoOf(Companion_27).l37 = function (_this__u8e3s4) {
     var tmp0_subject = _this__u8e3s4;
     var tmp;
     Companion_getInstance_31();
@@ -6169,12 +6172,12 @@
   }
   function Companion_28() {
     Companion_instance_28 = this;
-    this.k37_1 = 'selected-color';
-    this.l37_1 = 'value';
-    this.m37_1 = 'style';
-    this.n37_1 = 'card';
-    this.o37_1 = 'flat';
-    this.p37_1 = Style_CARD_getInstance();
+    this.m37_1 = 'selected-color';
+    this.n37_1 = 'value';
+    this.o37_1 = 'style';
+    this.p37_1 = 'card';
+    this.q37_1 = 'flat';
+    this.r37_1 = Style_CARD_getInstance();
   }
   var Companion_instance_28;
   function Companion_getInstance_31() {
@@ -6185,33 +6188,33 @@
   function Option_init_$Init$(multiselect, parser, $this) {
     Content_init_$Init$(multiselect, parser, $this);
     Option.call($this);
-    $this.y37_1 = multiselect;
+    $this.a38_1 = multiselect;
     Companion_getInstance_59();
     parser.u2r(2, get_XMLNS_CONTENT(), 'option');
     var tmp = $this;
     var tmp_0 = Companion_getInstance_30();
     Companion_getInstance_31();
-    tmp.z37_1 = tmp_0.j37(parser.j2t('style'));
+    tmp.b38_1 = tmp_0.l37(parser.o2t('style'));
     var tmp_1 = $this;
-    var tmp0_safe_receiver = parser.j2t(get_XML_BACKGROUND_COLOR());
-    tmp_1.a38_1 = tmp0_safe_receiver == null ? null : toColorOrNull(tmp0_safe_receiver);
+    var tmp0_safe_receiver = parser.o2t(get_XML_BACKGROUND_COLOR());
+    tmp_1.c38_1 = tmp0_safe_receiver == null ? null : toColorOrNull(tmp0_safe_receiver);
     var tmp_2 = $this;
     Companion_getInstance_31();
-    var tmp1_safe_receiver = parser.j2t('selected-color');
-    tmp_2.b38_1 = tmp1_safe_receiver == null ? null : toColorOrNull(tmp1_safe_receiver);
+    var tmp1_safe_receiver = parser.o2t('selected-color');
+    tmp_2.d38_1 = tmp1_safe_receiver == null ? null : toColorOrNull(tmp1_safe_receiver);
     var tmp_3 = $this;
     var tmp$ret$0;
     // Inline function 'kotlin.text.orEmpty' call
     Companion_getInstance_31();
-    var tmp0_orEmpty = parser.j2t('value');
+    var tmp0_orEmpty = parser.o2t('value');
     var tmp0_elvis_lhs = tmp0_orEmpty;
     tmp$ret$0 = tmp0_elvis_lhs == null ? '' : tmp0_elvis_lhs;
-    tmp_3.c38_1 = tmp$ret$0;
+    tmp_3.e38_1 = tmp$ret$0;
     var tmp_4 = $this;
     var tmp$ret$1;
     // Inline function 'kotlin.collections.mutableListOf' call
     tmp$ret$1 = ArrayList_init_$Create$();
-    tmp_4.d38_1 = tmp$ret$1;
+    tmp_4.f38_1 = tmp$ret$1;
     var tmp_5 = $this;
     var tmp$ret$9;
     // Inline function 'org.cru.godtools.shared.tool.parser.model.parseContent' call
@@ -6249,7 +6252,7 @@
           if (tmp1_subject === 'events') {
             var tmp2_this = $this;
             // Inline function 'kotlin.collections.plusAssign' call
-            var tmp0_plusAssign = tmp2_this.d38_1;
+            var tmp0_plusAssign = tmp2_this.f38_1;
             var tmp1_plusAssign = Companion_getInstance_6().y2r(parser, $this);
             addAll(tmp0_plusAssign, tmp1_plusAssign);
           }
@@ -6301,7 +6304,7 @@
     tmp$ret$7 = tmp$ret$6.u7();
     tmp$ret$8 = tmp$ret$7;
     tmp$ret$9 = tmp$ret$8;
-    tmp_5.e38_1 = tmp$ret$9;
+    tmp_5.g38_1 = tmp$ret$9;
     return $this;
   }
   function Option_init_$Create$(multiselect, parser) {
@@ -6320,11 +6323,11 @@
   }
   function Companion_29() {
     Companion_instance_29 = this;
-    this.f38_1 = 'multiselect';
-    this.g38_1 = 'multiselect-option-background-color';
-    this.h38_1 = 'multiselect-option-selected-color';
-    this.i38_1 = 'option-background-color';
-    this.j38_1 = 'option-selected-color';
+    this.h38_1 = 'multiselect';
+    this.i38_1 = 'multiselect-option-background-color';
+    this.j38_1 = 'multiselect-option-selected-color';
+    this.k38_1 = 'option-background-color';
+    this.l38_1 = 'option-selected-color';
   }
   var Companion_instance_29;
   function Companion_getInstance_32() {
@@ -6342,34 +6345,34 @@
     var tmp_0 = $this;
     var tmp$ret$0;
     // Inline function 'kotlin.text.orEmpty' call
-    var tmp0_orEmpty = parser.j2t('state');
+    var tmp0_orEmpty = parser.o2t('state');
     var tmp0_elvis_lhs = tmp0_orEmpty;
     tmp$ret$0 = tmp0_elvis_lhs == null ? '' : tmp0_elvis_lhs;
-    tmp_0.s38_1 = tmp$ret$0;
+    tmp_0.u38_1 = tmp$ret$0;
     var tmp_1 = $this;
-    var tmp0_safe_receiver = parser.j2t('columns');
+    var tmp0_safe_receiver = parser.o2t('columns');
     var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : toIntOrNull(tmp0_safe_receiver);
-    tmp_1.t38_1 = tmp1_elvis_lhs == null ? 1 : tmp1_elvis_lhs;
+    tmp_1.v38_1 = tmp1_elvis_lhs == null ? 1 : tmp1_elvis_lhs;
     var tmp_2 = $this;
-    var tmp2_safe_receiver = parser.j2t('selection-limit');
+    var tmp2_safe_receiver = parser.o2t('selection-limit');
     var tmp3_elvis_lhs = tmp2_safe_receiver == null ? null : toIntOrNull(tmp2_safe_receiver);
-    tmp_2.u38_1 = coerceAtLeast(tmp3_elvis_lhs == null ? 1 : tmp3_elvis_lhs, 1);
+    tmp_2.w38_1 = coerceAtLeast(tmp3_elvis_lhs == null ? 1 : tmp3_elvis_lhs, 1);
     var tmp_3 = $this;
-    var tmp4_elvis_lhs = Companion_getInstance_30().j37(parser.j2t('option-style'));
-    tmp_3.v38_1 = tmp4_elvis_lhs == null ? Companion_getInstance_31().p37_1 : tmp4_elvis_lhs;
+    var tmp4_elvis_lhs = Companion_getInstance_30().l37(parser.o2t('option-style'));
+    tmp_3.x38_1 = tmp4_elvis_lhs == null ? Companion_getInstance_31().r37_1 : tmp4_elvis_lhs;
     var tmp_4 = $this;
     Companion_getInstance_32();
-    var tmp5_safe_receiver = parser.j2t('option-background-color');
-    tmp_4.w38_1 = tmp5_safe_receiver == null ? null : toColorOrNull(tmp5_safe_receiver);
+    var tmp5_safe_receiver = parser.o2t('option-background-color');
+    tmp_4.y38_1 = tmp5_safe_receiver == null ? null : toColorOrNull(tmp5_safe_receiver);
     var tmp_5 = $this;
     Companion_getInstance_32();
-    var tmp6_safe_receiver = parser.j2t('option-selected-color');
-    tmp_5.x38_1 = tmp6_safe_receiver == null ? null : toColorOrNull(tmp6_safe_receiver);
+    var tmp6_safe_receiver = parser.o2t('option-selected-color');
+    tmp_5.z38_1 = tmp6_safe_receiver == null ? null : toColorOrNull(tmp6_safe_receiver);
     var tmp_6 = $this;
     var tmp$ret$1;
     // Inline function 'kotlin.collections.mutableListOf' call
     tmp$ret$1 = ArrayList_init_$Create$();
-    tmp_6.y38_1 = tmp$ret$1;
+    tmp_6.a39_1 = tmp$ret$1;
     // Inline function 'org.cru.godtools.shared.tool.parser.xml.parseChildren' call
     $l$loop_1: while (true) {
       var tmp_7 = parser.h();
@@ -6388,7 +6391,7 @@
         if (tmp1_subject === 'option') {
           var tmp2_this = $this;
           // Inline function 'kotlin.collections.plusAssign' call
-          var tmp0_plusAssign = tmp2_this.y38_1;
+          var tmp0_plusAssign = tmp2_this.a39_1;
           var tmp1_plusAssign = Option_init_$Create$($this, parser);
           tmp0_plusAssign.b(tmp1_plusAssign);
         }
@@ -6405,7 +6408,7 @@
     return Multiselect_init_$Init$(parent, parser, objectCreate(protoOf(Multiselect)));
   }
   protoOf(Option).t2s = function () {
-    return this.e38_1;
+    return this.g38_1;
   };
   protoOf(Option)._getAnalyticsEvents = function (type) {
     var tmp0_subject = type;
@@ -6414,7 +6417,7 @@
     if (tmp0 === 3) {
       var tmp$ret$2;
       // Inline function 'kotlin.collections.filter' call
-      var tmp1_filter = this.d38_1;
+      var tmp1_filter = this.f38_1;
       var tmp$ret$1;
       // Inline function 'kotlin.collections.filterTo' call
       var tmp0_filterTo = ArrayList_init_$Create$();
@@ -6448,7 +6451,7 @@
   });
   protoOf(Multiselect).i2s = function () {
     var tmp;
-    var tmp_0 = this.a2p().l2t_1;
+    var tmp_0 = this.a2p().q2t_1;
     Companion_getInstance_2();
     if (!tmp_0.j2r('multiselect')) {
       tmp = true;
@@ -6462,8 +6465,8 @@
   }
   function Companion_30() {
     Companion_instance_30 = this;
-    this.z38_1 = 'paragraph';
-    this.a39_1 = 'fallback';
+    this.b39_1 = 'paragraph';
+    this.c39_1 = 'fallback';
   }
   var Companion_instance_30;
   function Companion_getInstance_33() {
@@ -6557,14 +6560,14 @@
     tmp$ret$6 = tmp$ret$5.u7();
     tmp$ret$7 = tmp$ret$6;
     tmp$ret$8 = tmp$ret$7;
-    tmp_0.j39_1 = tmp$ret$8;
+    tmp_0.l39_1 = tmp$ret$8;
     return $this;
   }
   function Paragraph_init_$Create$(parent, parser) {
     return Paragraph_init_$Init$(parent, parser, objectCreate(protoOf(Paragraph)));
   }
   protoOf(Paragraph).t2s = function () {
-    return this.j39_1;
+    return this.l39_1;
   };
   protoOf(Paragraph).c2t = function () {
     var tmp$ret$3;
@@ -6580,7 +6583,7 @@
       var element = tmp0_iterator.h();
       var tmp$ret$0;
       // Inline function 'org.cru.godtools.shared.tool.parser.model.<get-contentTips>.<anonymous>' call
-      tmp$ret$0 = element.c2t();
+      tmp$ret$0 = element.tips;
       var list = tmp$ret$0;
       addAll(tmp0_flatMapTo, list);
     }
@@ -6757,7 +6760,7 @@
   }
   function Companion_31() {
     Companion_instance_31 = this;
-    this.k39_1 = 'resource';
+    this.m39_1 = 'resource';
   }
   var Companion_instance_31;
   function Companion_getInstance_34() {
@@ -6772,8 +6775,8 @@
     var tmp = get_XMLNS_MANIFEST();
     Companion_getInstance_34();
     parser.u2r(2, tmp, 'resource');
-    $this.name = parser.i2v(null, 'filename');
-    $this.localName = parser.i2v(null, 'src');
+    $this.name = parser.n2v(null, 'filename');
+    $this.localName = parser.n2v(null, 'src');
     skipTag(parser);
     return $this;
   }
@@ -6783,7 +6786,7 @@
   protoOf(Resource).id = function () {
     return this.name;
   };
-  protoOf(Resource).l39 = function () {
+  protoOf(Resource).n39 = function () {
     return this.localName;
   };
   function Resource() {
@@ -6793,9 +6796,9 @@
   var Mode_FIXED_instance;
   function Companion_32() {
     Companion_instance_32 = this;
-    this.m39_1 = Mode_AUTO_getInstance();
+    this.o39_1 = Mode_AUTO_getInstance();
   }
-  protoOf(Companion_32).n39 = function (_this__u8e3s4) {
+  protoOf(Companion_32).p39 = function (_this__u8e3s4) {
     var tmp0_subject = _this__u8e3s4;
     switch (tmp0_subject) {
       case 'auto':
@@ -6824,7 +6827,7 @@
   }
   function Companion_33() {
     Companion_instance_33 = this;
-    this.o39_1 = 'spacer';
+    this.q39_1 = 'spacer';
   }
   var Companion_instance_33;
   function Companion_getInstance_36() {
@@ -6840,14 +6843,14 @@
     Companion_getInstance_36();
     parser.u2r(2, tmp, 'spacer');
     var tmp_0 = $this;
-    var tmp0_safe_receiver = parser.j2t('mode');
-    var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : Companion_getInstance_35().n39(tmp0_safe_receiver);
-    tmp_0.x39_1 = tmp1_elvis_lhs == null ? Companion_getInstance_35().m39_1 : tmp1_elvis_lhs;
+    var tmp0_safe_receiver = parser.o2t('mode');
+    var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : Companion_getInstance_35().p39(tmp0_safe_receiver);
+    tmp_0.z39_1 = tmp1_elvis_lhs == null ? Companion_getInstance_35().o39_1 : tmp1_elvis_lhs;
     var tmp_1 = $this;
-    var tmp2_safe_receiver = parser.j2t('height');
+    var tmp2_safe_receiver = parser.o2t('height');
     var tmp3_safe_receiver = tmp2_safe_receiver == null ? null : toIntOrNull(tmp2_safe_receiver);
     var tmp4_elvis_lhs = tmp3_safe_receiver == null ? null : coerceAtLeast(tmp3_safe_receiver, 0);
-    tmp_1.y39_1 = tmp4_elvis_lhs == null ? 0 : tmp4_elvis_lhs;
+    tmp_1.a3a_1 = tmp4_elvis_lhs == null ? 0 : tmp4_elvis_lhs;
     skipTag(parser);
     return $this;
   }
@@ -6870,7 +6873,7 @@
   }
   function Companion_34() {
     Companion_instance_34 = this;
-    this.z39_1 = 1.0;
+    this.b3a_1 = 1.0;
   }
   var Companion_instance_34;
   function Companion_getInstance_37() {
@@ -6880,39 +6883,39 @@
   }
   function Styles() {
   }
-  function get_multiselectOptionBackgroundColor_0(_this__u8e3s4) {
-    var tmp0_safe_receiver = _this__u8e3s4;
-    var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.c2y();
-    return tmp1_elvis_lhs == null ? get_backgroundColor(get_manifest(_this__u8e3s4)) : tmp1_elvis_lhs;
-  }
   function get_primaryColor_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.d2y();
     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.h2y();
+    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.z2x();
+    var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.e2y();
     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.a2y();
+    var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.f2y();
     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.b2y();
+    var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.g2y();
     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.w2x();
+    var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.b2y();
     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.e2y();
+    var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.j2y();
     var tmp;
     if (tmp1_elvis_lhs == null) {
       Companion_getInstance_37();
@@ -6924,7 +6927,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.f2y();
+    var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.k2y();
     return tmp1_elvis_lhs == null ? Companion_getInstance_29().j2q_1 : tmp1_elvis_lhs;
   }
   function stylesOverride(_this__u8e3s4, textAlign, textColor, textScale) {
@@ -6942,52 +6945,52 @@
   }
   function StylesOverride(parent, _textAlign, _textColor, _textScale) {
     BaseModel.call(this, parent);
-    this.b3a_1 = _textAlign;
-    this.c3a_1 = _textColor;
-    this.d3a_1 = _textScale;
+    this.d3a_1 = _textAlign;
+    this.e3a_1 = _textColor;
+    this.f3a_1 = _textScale;
   }
-  protoOf(StylesOverride).f2y = function () {
-    var tmp0_safe_receiver = this.b3a_1;
+  protoOf(StylesOverride).k2y = function () {
+    var tmp0_safe_receiver = this.d3a_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).w2x = function () {
-    var tmp0_safe_receiver = this.c3a_1;
+  protoOf(StylesOverride).b2y = function () {
+    var tmp0_safe_receiver = this.e3a_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).e2y = function () {
-    return get_textScale.call(this) * this.d3a_1;
+  protoOf(StylesOverride).j2y = function () {
+    return get_textScale.call(this) * this.f3a_1;
   };
   function Tab_init_$Init$(parent, parser, $this) {
     BaseModel.call($this, parent);
     Tab.call($this);
-    $this.f3a_1 = parent;
+    $this.h3a_1 = parent;
     Companion_getInstance_59();
     parser.u2r(2, get_XMLNS_CONTENT(), 'tab');
     var tmp = $this;
     var tmp$ret$1;
     // Inline function 'kotlin.collections.orEmpty' call
-    var tmp0_safe_receiver = parser.j2t(get_XML_LISTENERS());
+    var tmp0_safe_receiver = parser.o2t(get_XML_LISTENERS());
     var tmp_0;
     if (tmp0_safe_receiver == null) {
       tmp_0 = null;
     } else {
       var tmp$ret$0;
       // Inline function 'org.cru.godtools.shared.tool.parser.model.toEventIds' call
-      tmp$ret$0 = Companion_getInstance_17().j2v(tmp0_safe_receiver);
+      tmp$ret$0 = Companion_getInstance_17().o2v(tmp0_safe_receiver);
       tmp_0 = tmp$ret$0;
     }
     var tmp1_safe_receiver = tmp_0;
     var tmp0_orEmpty = tmp1_safe_receiver == null ? null : toSet_0(tmp1_safe_receiver);
     var tmp0_elvis_lhs = tmp0_orEmpty;
     tmp$ret$1 = tmp0_elvis_lhs == null ? emptySet() : tmp0_elvis_lhs;
-    tmp.g3a_1 = tmp$ret$1;
+    tmp.i3a_1 = tmp$ret$1;
     var tmp_1 = $this;
     var tmp$ret$2;
     // Inline function 'kotlin.collections.mutableListOf' call
     tmp$ret$2 = ArrayList_init_$Create$();
-    tmp_1.j3a_1 = tmp$ret$2;
+    tmp_1.l3a_1 = tmp$ret$2;
     var label = null;
     var tmp_2 = $this;
     var tmp$ret$10;
@@ -7026,7 +7029,7 @@
           if (tmp1_subject === 'events') {
             var tmp2_this = $this;
             // Inline function 'kotlin.collections.plusAssign' call
-            var tmp0_plusAssign = tmp2_this.j3a_1;
+            var tmp0_plusAssign = tmp2_this.l3a_1;
             var tmp1_plusAssign = Companion_getInstance_6().y2r(parser, $this);
             addAll(tmp0_plusAssign, tmp1_plusAssign);
           }
@@ -7082,8 +7085,8 @@
     tmp$ret$8 = tmp$ret$7.u7();
     tmp$ret$9 = tmp$ret$8;
     tmp$ret$10 = tmp$ret$9;
-    tmp_2.i3a_1 = tmp$ret$10;
-    $this.h3a_1 = label;
+    tmp_2.k3a_1 = tmp$ret$10;
+    $this.j3a_1 = label;
     return $this;
   }
   function Tab_init_$Create$(parent, parser) {
@@ -7091,7 +7094,7 @@
   }
   function Companion_35() {
     Companion_instance_35 = this;
-    this.k3a_1 = 'tabs';
+    this.m3a_1 = 'tabs';
   }
   var Companion_instance_35;
   function Companion_getInstance_38() {
@@ -7145,14 +7148,14 @@
     tmp$ret$0 = tmp0_apply;
     tmp$ret$1 = tmp$ret$0.u7();
     tmp$ret$2 = tmp$ret$1;
-    tmp_0.t3a_1 = tmp$ret$2;
+    tmp_0.v3a_1 = tmp$ret$2;
     return $this;
   }
   function Tabs_init_$Create$(parent, parser) {
     return Tabs_init_$Init$(parent, parser, objectCreate(protoOf(Tabs)));
   }
   protoOf(Tab).t2s = function () {
-    return this.i3a_1;
+    return this.k3a_1;
   };
   protoOf(Tab)._getAnalyticsEvents = function (type) {
     var tmp0_subject = type;
@@ -7161,7 +7164,7 @@
     if (tmp0 === 3) {
       var tmp$ret$2;
       // Inline function 'kotlin.collections.filter' call
-      var tmp1_filter = this.j3a_1;
+      var tmp1_filter = this.l3a_1;
       var tmp$ret$1;
       // Inline function 'kotlin.collections.filterTo' call
       var tmp0_filterTo = ArrayList_init_$Create$();
@@ -7195,7 +7198,7 @@
   protoOf(Tabs).c2t = function () {
     var tmp$ret$6;
     // Inline function 'kotlin.collections.flatMap' call
-    var tmp1_flatMap = this.t3a_1;
+    var tmp1_flatMap = this.v3a_1;
     var tmp$ret$5;
     // Inline function 'kotlin.collections.flatMapTo' call
     var tmp0_flatMapTo = ArrayList_init_$Create$();
@@ -7217,7 +7220,7 @@
         var element_0 = tmp0_iterator_0.h();
         var tmp$ret$0;
         // Inline function 'org.cru.godtools.shared.tool.parser.model.<get-contentTips>.<anonymous>' call
-        tmp$ret$0 = element_0.c2t();
+        tmp$ret$0 = element_0.tips;
         var list = tmp$ret$0;
         addAll(tmp0_flatMapTo_0, list);
       }
@@ -7241,7 +7244,7 @@
   function Companion_36() {
     Companion_instance_36 = this;
   }
-  protoOf(Companion_36).u3a = function (_this__u8e3s4) {
+  protoOf(Companion_36).w3a = function (_this__u8e3s4) {
     var tmp0_subject = _this__u8e3s4;
     switch (tmp0_subject) {
       case 'start':
@@ -7307,7 +7310,7 @@
   function Companion_37() {
     Companion_instance_37 = this;
   }
-  protoOf(Companion_37).v3a = function (_this__u8e3s4) {
+  protoOf(Companion_37).x3a = function (_this__u8e3s4) {
     var tmp$ret$3;
     // Inline function 'kotlin.collections.mapNotNullTo' call
     var tmp0_mapNotNullTo = get_REGEX_SEQUENCE_SEPARATOR().ec(_this__u8e3s4);
@@ -7373,9 +7376,9 @@
   }
   function Companion_38() {
     Companion_instance_38 = this;
-    this.w3a_1 = 'text';
-    this.x3a_1 = 40;
-    this.y3a_1 = 0;
+    this.y3a_1 = 'text';
+    this.z3a_1 = 40;
+    this.a3b_1 = 0;
   }
   var Companion_instance_38;
   function Companion_getInstance_41() {
@@ -7391,13 +7394,13 @@
     Companion_getInstance_41();
     parser.u2r(2, tmp, 'text');
     var tmp_0 = $this;
-    var tmp0_safe_receiver = parser.j2t('text-align');
-    tmp_0.s36_1 = tmp0_safe_receiver == null ? null : Companion_getInstance_39().u3a(tmp0_safe_receiver);
+    var tmp0_safe_receiver = parser.o2t('text-align');
+    tmp_0.u36_1 = tmp0_safe_receiver == null ? null : Companion_getInstance_39().w3a(tmp0_safe_receiver);
     var tmp_1 = $this;
-    var tmp1_safe_receiver = parser.j2t(get_XML_TEXT_COLOR());
-    tmp_1.t36_1 = tmp1_safe_receiver == null ? null : toColorOrNull(tmp1_safe_receiver);
+    var tmp1_safe_receiver = parser.o2t(get_XML_TEXT_COLOR());
+    tmp_1.v36_1 = tmp1_safe_receiver == null ? null : toColorOrNull(tmp1_safe_receiver);
     var tmp_2 = $this;
-    var tmp2_safe_receiver = parser.j2t(get_XML_TEXT_SCALE());
+    var tmp2_safe_receiver = parser.o2t(get_XML_TEXT_SCALE());
     var tmp3_elvis_lhs = tmp2_safe_receiver == null ? null : toDoubleOrNull(tmp2_safe_receiver);
     var tmp_3;
     if (tmp3_elvis_lhs == null) {
@@ -7406,17 +7409,17 @@
     } else {
       tmp_3 = tmp3_elvis_lhs;
     }
-    tmp_2.u36_1 = tmp_3;
+    tmp_2.w36_1 = tmp_3;
     var tmp_4 = $this;
     var tmp$ret$0;
     // Inline function 'kotlin.collections.orEmpty' call
-    var tmp4_safe_receiver = parser.j2t('text-style');
-    var tmp0_orEmpty = tmp4_safe_receiver == null ? null : Companion_getInstance_40().v3a(tmp4_safe_receiver);
+    var tmp4_safe_receiver = parser.o2t('text-style');
+    var tmp0_orEmpty = tmp4_safe_receiver == null ? null : Companion_getInstance_40().x3a(tmp4_safe_receiver);
     var tmp0_elvis_lhs = tmp0_orEmpty;
     tmp$ret$0 = tmp0_elvis_lhs == null ? emptySet() : tmp0_elvis_lhs;
     tmp_4.textStyles = tmp$ret$0;
     var tmp_5 = $this;
-    var tmp5_safe_receiver = parser.j2t('minimum-lines');
+    var tmp5_safe_receiver = parser.o2t('minimum-lines');
     var tmp6_safe_receiver = tmp5_safe_receiver == null ? null : toIntOrNull(tmp5_safe_receiver);
     var tmp_6;
     if (tmp6_safe_receiver == null) {
@@ -7446,9 +7449,9 @@
       tmp_8 = tmp7_elvis_lhs;
     }
     tmp_5.minimumLines = tmp_8;
-    $this.v36_1 = parser.j2t('start-image');
+    $this.x36_1 = parser.o2t('start-image');
     var tmp_9 = $this;
-    var tmp8_safe_receiver = parser.j2t('start-image-size');
+    var tmp8_safe_receiver = parser.o2t('start-image-size');
     var tmp9_elvis_lhs = tmp8_safe_receiver == null ? null : toIntOrNull(tmp8_safe_receiver);
     var tmp_10;
     if (tmp9_elvis_lhs == null) {
@@ -7458,9 +7461,9 @@
       tmp_10 = tmp9_elvis_lhs;
     }
     tmp_9.startImageSize = tmp_10;
-    $this.w36_1 = parser.j2t('end-image');
+    $this.y36_1 = parser.o2t('end-image');
     var tmp_11 = $this;
-    var tmp10_safe_receiver = parser.j2t('end-image-size');
+    var tmp10_safe_receiver = parser.o2t('end-image-size');
     var tmp11_elvis_lhs = tmp10_safe_receiver == null ? null : toIntOrNull(tmp10_safe_receiver);
     var tmp_12;
     if (tmp11_elvis_lhs == null) {
@@ -7470,7 +7473,7 @@
       tmp_12 = tmp11_elvis_lhs;
     }
     tmp_11.endImageSize = tmp_12;
-    $this.text = parser.z3a();
+    $this.text = parser.b3b();
     return $this;
   }
   function Text_init_$Create$(parent, parser) {
@@ -7495,18 +7498,18 @@
     Content_init_$Init$_0(parent, VOID, VOID, VOID, VOID, VOID, VOID, VOID, $this);
     Text.call($this);
     $this.text = text;
-    $this.s36_1 = textAlign;
-    $this.t36_1 = textColor;
-    $this.u36_1 = textScale;
+    $this.u36_1 = textAlign;
+    $this.v36_1 = textColor;
+    $this.w36_1 = textScale;
     $this.textStyles = textStyles;
     var tmp_0 = $this;
     Companion_getInstance_41();
     tmp_0.minimumLines = 0;
-    $this.v36_1 = startImage;
+    $this.x36_1 = startImage;
     var tmp_1 = $this;
     Companion_getInstance_41();
     tmp_1.startImageSize = 40;
-    $this.w36_1 = endImage;
+    $this.y36_1 = endImage;
     var tmp_2 = $this;
     Companion_getInstance_41();
     tmp_2.endImageSize = 40;
@@ -7552,46 +7555,46 @@
   protoOf(Text).c1d = function () {
     return this.text;
   };
-  protoOf(Text).f2y = function () {
-    var tmp0_elvis_lhs = this.s36_1;
+  protoOf(Text).k2y = function () {
+    var tmp0_elvis_lhs = this.u36_1;
     return tmp0_elvis_lhs == null ? get_textAlign_0(this.a2t()) : tmp0_elvis_lhs;
   };
-  protoOf(Text).w2x = function () {
-    var tmp0_elvis_lhs = this.t36_1;
+  protoOf(Text).b2y = function () {
+    var tmp0_elvis_lhs = this.v36_1;
     return tmp0_elvis_lhs == null ? get_textColor_0(this.a2t()) : tmp0_elvis_lhs;
   };
-  protoOf(Text).e2y = function () {
-    return this.u36_1 * get_textScale_0(this.a2t());
-  };
-  protoOf(Text).e3b = function () {
-    return this.textStyles;
-  };
-  protoOf(Text).f3b = function () {
-    return this.minimumLines;
+  protoOf(Text).j2y = function () {
+    return this.w36_1 * get_textScale_0(this.a2t());
   };
   protoOf(Text).g3b = function () {
-    return this.v36_1;
+    return this.textStyles;
   };
   protoOf(Text).h3b = function () {
-    return getResource(this, this.v36_1);
+    return this.minimumLines;
   };
   protoOf(Text).i3b = function () {
-    return this.startImageSize;
+    return this.x36_1;
   };
   protoOf(Text).j3b = function () {
-    return this.w36_1;
+    return getResource(this, this.x36_1);
   };
   protoOf(Text).k3b = function () {
-    return getResource(this, this.w36_1);
+    return this.startImageSize;
   };
   protoOf(Text).l3b = function () {
+    return this.y36_1;
+  };
+  protoOf(Text).m3b = function () {
+    return getResource(this, this.y36_1);
+  };
+  protoOf(Text).n3b = function () {
     return this.endImageSize;
   };
   function Text() {
     Companion_getInstance_41();
   }
-  defineProp(protoOf(Text), 'startImage', protoOf(Text).h3b);
-  defineProp(protoOf(Text), 'endImage', protoOf(Text).k3b);
+  defineProp(protoOf(Text), 'startImage', protoOf(Text).j3b);
+  defineProp(protoOf(Text), 'endImage', protoOf(Text).m3b);
   function parseTextChild(_this__u8e3s4, parent, parentNamespace, parentName, block) {
     var tmp;
     if (block === VOID) {
@@ -7728,7 +7731,7 @@
     }
     return tmp;
   };
-  protoOf(Companion_39).i2y = function (_this__u8e3s4) {
+  protoOf(Companion_39).n2y = function (_this__u8e3s4) {
     var tmp;
     try {
       tmp = this.f2r(_this__u8e3s4);
@@ -7839,7 +7842,7 @@
     Companion_instance_40 = this;
     this.q3b_1 = Provider_UNKNOWN_getInstance();
   }
-  protoOf(Companion_40).l35 = function (value) {
+  protoOf(Companion_40).n35 = function (value) {
     var tmp0_subject = value;
     return tmp0_subject === 'youtube' ? Provider_YOUTUBE_getInstance() : null;
   };
@@ -7883,18 +7886,18 @@
     Companion_getInstance_44();
     parser.u2r(2, tmp, 'video');
     var tmp_0 = $this;
-    var tmp0_elvis_lhs = Companion_getInstance_43().l35(parser.j2t('provider'));
+    var tmp0_elvis_lhs = Companion_getInstance_43().n35(parser.o2t('provider'));
     tmp_0.d3c_1 = tmp0_elvis_lhs == null ? Companion_getInstance_43().q3b_1 : tmp0_elvis_lhs;
-    $this.e3c_1 = parser.j2t('video-id');
+    $this.e3c_1 = parser.o2t('video-id');
     var tmp_1 = $this;
-    var tmp1_elvis_lhs = Companion_getInstance_8().m2v(parser.j2t('aspect-ratio'));
+    var tmp1_elvis_lhs = Companion_getInstance_8().r2v(parser.o2t('aspect-ratio'));
     tmp_1.f3c_1 = tmp1_elvis_lhs == null ? Companion_getInstance_44().s3b_1 : tmp1_elvis_lhs;
     var tmp_2 = $this;
-    var tmp2_safe_receiver = Companion_getInstance_22().v2w(parser.j2t('gravity'));
-    var tmp3_elvis_lhs = tmp2_safe_receiver == null ? null : tmp2_safe_receiver.w2w_1;
+    var tmp2_safe_receiver = Companion_getInstance_22().a2x(parser.o2t('gravity'));
+    var tmp3_elvis_lhs = tmp2_safe_receiver == null ? null : tmp2_safe_receiver.b2x_1;
     tmp_2.g3c_1 = tmp3_elvis_lhs == null ? Companion_getInstance_44().t3b_1 : tmp3_elvis_lhs;
     var tmp_3 = $this;
-    var tmp4_safe_receiver = Companion_getInstance_16().y2w(parser.j2t('width'));
+    var tmp4_safe_receiver = Companion_getInstance_16().d2x(parser.o2t('width'));
     var tmp_4;
     if (tmp4_safe_receiver == null) {
       tmp_4 = null;
@@ -7938,12 +7941,12 @@
   }
   function Visibility$isInvisibleFlow$lambda(this$0) {
     return function (it) {
-      return this$0.f2t(it);
+      return this$0.i2t(it);
     };
   }
   function Visibility$isGoneFlow$lambda(this$0) {
     return function (it) {
-      return this$0.g2t(it);
+      return this$0.k2t(it);
     };
   }
   function Visibility() {
@@ -8152,9 +8155,9 @@
     parser.u2r(2, tmp, 'card');
     var tmp_0 = $this;
     Companion_getInstance_45();
-    tmp_0.i3e_1 = parser.j2t('id');
+    tmp_0.i3e_1 = parser.o2t('id');
     var tmp_1 = $this;
-    var tmp0_safe_receiver = parser.j2t(get_XML_BACKGROUND_COLOR());
+    var tmp0_safe_receiver = parser.o2t(get_XML_BACKGROUND_COLOR());
     tmp_1.j3e_1 = tmp0_safe_receiver == null ? null : toColorOrNull(tmp0_safe_receiver);
     var tmp_2 = $this;
     var tmp$ret$0;
@@ -8684,16 +8687,16 @@
   });
   function Companion_45() {
     Companion_instance_45 = this;
-    this.q32_1 = 'page';
+    this.s32_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.r32_1 = tmp$ret$0;
-    this.s32_1 = Companion_getInstance_22().u2w_1;
-    this.t32_1 = ImageScaleType_FILL_X_getInstance();
+    tmp.t32_1 = tmp$ret$0;
+    this.u32_1 = Companion_getInstance_22().z2w_1;
+    this.v32_1 = ImageScaleType_FILL_X_getInstance();
   }
-  protoOf(Companion_45).u32 = function (manifest, fileName, parser) {
+  protoOf(Companion_45).w32 = function (manifest, fileName, parser) {
     Companion_getInstance_59();
     parser.u2r(2, null, 'page');
     var tmp0_subject = parser.w2r();
@@ -8703,7 +8706,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.i2v(get_XMLNS_XSI(), 'type');
+      var type = parser.n2v(get_XMLNS_XSI(), 'type');
       var tmp_0;
       Companion_getInstance_46();
       if (type === 'cardcollection') {
@@ -8747,7 +8750,7 @@
     return tmp_1;
   };
   protoOf(Companion_45).n3e = function (_this__u8e3s4, type) {
-    var actual = _this__u8e3s4.i2v(get_XMLNS_XSI(), 'type');
+    var actual = _this__u8e3s4.n2v(get_XMLNS_XSI(), 'type');
     if (!(type === actual))
       throw new XmlPullParserException('expected ' + type + ' not ' + actual);
   };
@@ -8763,67 +8766,67 @@
     Companion_getInstance_59();
     Companion_getInstance_48();
     parser.u2r(2, null, 'page');
-    $this.h3d_1 = parser.j2t('id');
+    $this.h3d_1 = parser.o2t('id');
     $this.i3d_1 = fileName;
-    $this.j3d_1 = parser.i2v(get_XMLNS_CYOA(), 'parent');
+    $this.j3d_1 = parser.n2v(get_XMLNS_CYOA(), 'parent');
     var tmp = $this;
-    var tmp0_safe_receiver = parser.j2t('hidden');
+    var tmp0_safe_receiver = parser.o2t('hidden');
     var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : toBoolean(tmp0_safe_receiver);
     tmp.isHidden = tmp1_elvis_lhs == null ? false : tmp1_elvis_lhs;
     var tmp_0 = $this;
     var tmp$ret$0;
     // Inline function 'org.cru.godtools.shared.tool.parser.model.toEventIds' call
-    var tmp0_toEventIds = parser.j2t(get_XML_LISTENERS());
-    tmp$ret$0 = Companion_getInstance_17().j2v(tmp0_toEventIds);
+    var tmp0_toEventIds = parser.o2t(get_XML_LISTENERS());
+    tmp$ret$0 = Companion_getInstance_17().o2v(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.j2t(get_XML_DISMISS_LISTENERS());
-    tmp$ret$1 = Companion_getInstance_17().j2v(tmp1_toEventIds);
+    var tmp1_toEventIds = parser.o2t(get_XML_DISMISS_LISTENERS());
+    tmp$ret$1 = Companion_getInstance_17().o2v(tmp1_toEventIds);
     tmp_1.dismissListeners = toSet_0(tmp$ret$1);
     var tmp_2 = $this;
-    var tmp2_safe_receiver = parser.j2t(get_XML_PRIMARY_COLOR());
+    var tmp2_safe_receiver = parser.o2t(get_XML_PRIMARY_COLOR());
     tmp_2.k3d_1 = tmp2_safe_receiver == null ? null : toColorOrNull(tmp2_safe_receiver);
     var tmp_3 = $this;
-    var tmp3_safe_receiver = parser.j2t(get_XML_PRIMARY_TEXT_COLOR());
+    var tmp3_safe_receiver = parser.o2t(get_XML_PRIMARY_TEXT_COLOR());
     tmp_3.l3d_1 = tmp3_safe_receiver == null ? null : toColorOrNull(tmp3_safe_receiver);
     var tmp_4 = $this;
-    var tmp4_safe_receiver = parser.j2t(get_XML_BACKGROUND_COLOR());
+    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.m3d_1 = tmp5_elvis_lhs == null ? Companion_getInstance_48().r32_1 : tmp5_elvis_lhs;
-    $this.n3d_1 = parser.j2t(get_XML_BACKGROUND_IMAGE());
+    tmp_4.m3d_1 = tmp5_elvis_lhs == null ? Companion_getInstance_48().t32_1 : tmp5_elvis_lhs;
+    $this.n3d_1 = parser.o2t(get_XML_BACKGROUND_IMAGE());
     var tmp_5 = $this;
-    var tmp6_safe_receiver = parser.j2t(get_XML_BACKGROUND_IMAGE_GRAVITY());
-    var tmp7_elvis_lhs = tmp6_safe_receiver == null ? null : Companion_getInstance_22().v2w(tmp6_safe_receiver);
-    tmp_5.o3d_1 = tmp7_elvis_lhs == null ? Companion_getInstance_48().s32_1 : tmp7_elvis_lhs;
+    var tmp6_safe_receiver = parser.o2t(get_XML_BACKGROUND_IMAGE_GRAVITY());
+    var tmp7_elvis_lhs = tmp6_safe_receiver == null ? null : Companion_getInstance_22().a2x(tmp6_safe_receiver);
+    tmp_5.o3d_1 = tmp7_elvis_lhs == null ? Companion_getInstance_48().u32_1 : tmp7_elvis_lhs;
     var tmp_6 = $this;
-    var tmp8_safe_receiver = parser.j2t(get_XML_BACKGROUND_IMAGE_SCALE_TYPE());
-    var tmp9_elvis_lhs = tmp8_safe_receiver == null ? null : Companion_getInstance_24().v30(tmp8_safe_receiver);
-    tmp_6.p3d_1 = tmp9_elvis_lhs == null ? Companion_getInstance_48().t32_1 : tmp9_elvis_lhs;
+    var tmp8_safe_receiver = parser.o2t(get_XML_BACKGROUND_IMAGE_SCALE_TYPE());
+    var tmp9_elvis_lhs = tmp8_safe_receiver == null ? null : Companion_getInstance_24().x30(tmp8_safe_receiver);
+    tmp_6.p3d_1 = tmp9_elvis_lhs == null ? Companion_getInstance_48().v32_1 : tmp9_elvis_lhs;
     var tmp_7 = $this;
-    var tmp10_safe_receiver = parser.j2t(get_XML_CONTROL_COLOR());
+    var tmp10_safe_receiver = parser.o2t(get_XML_CONTROL_COLOR());
     tmp_7.q3d_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.i2v(tmp_9, 'card-background-color');
+    var tmp11_safe_receiver = parser.n2v(tmp_9, 'card-background-color');
     tmp_8.r3d_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.i2v(tmp_11, 'multiselect-option-background-color');
+    var tmp12_safe_receiver = parser.n2v(tmp_11, 'multiselect-option-background-color');
     tmp_10.s3d_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.i2v(tmp_13, 'multiselect-option-selected-color');
+    var tmp13_safe_receiver = parser.n2v(tmp_13, 'multiselect-option-selected-color');
     tmp_12.t3d_1 = tmp13_safe_receiver == null ? null : toColorOrNull(tmp13_safe_receiver);
     var tmp_14 = $this;
-    var tmp14_safe_receiver = parser.j2t(get_XML_TEXT_COLOR());
+    var tmp14_safe_receiver = parser.o2t(get_XML_TEXT_COLOR());
     tmp_14.u3d_1 = tmp14_safe_receiver == null ? null : toColorOrNull(tmp14_safe_receiver);
     var tmp_15 = $this;
-    var tmp15_safe_receiver = parser.j2t(get_XML_TEXT_SCALE());
+    var tmp15_safe_receiver = parser.o2t(get_XML_TEXT_SCALE());
     var tmp16_elvis_lhs = tmp15_safe_receiver == null ? null : toDoubleOrNull(tmp15_safe_receiver);
     var tmp_16;
     if (tmp16_elvis_lhs == null) {
@@ -8841,10 +8844,10 @@
     fileName = fileName === VOID ? null : fileName;
     parentPage = parentPage === VOID ? null : parentPage;
     primaryColor = primaryColor === VOID ? null : primaryColor;
-    backgroundColor = backgroundColor === VOID ? Companion_getInstance_48().r32_1 : backgroundColor;
+    backgroundColor = backgroundColor === VOID ? Companion_getInstance_48().t32_1 : backgroundColor;
     backgroundImage = backgroundImage === VOID ? null : backgroundImage;
-    backgroundImageGravity = backgroundImageGravity === VOID ? Companion_getInstance_48().s32_1 : backgroundImageGravity;
-    backgroundImageScaleType = backgroundImageScaleType === VOID ? Companion_getInstance_48().t32_1 : backgroundImageScaleType;
+    backgroundImageGravity = backgroundImageGravity === VOID ? Companion_getInstance_48().u32_1 : backgroundImageGravity;
+    backgroundImageScaleType = backgroundImageScaleType === VOID ? Companion_getInstance_48().v32_1 : backgroundImageScaleType;
     controlColor = controlColor === VOID ? null : controlColor;
     cardBackgroundColor = cardBackgroundColor === VOID ? null : cardBackgroundColor;
     textColor = textColor === VOID ? null : textColor;
@@ -8890,7 +8893,7 @@
       return this$0.a2p()._pages.l1(this$0);
     };
   }
-  protoOf(Page).l2u = function () {
+  protoOf(Page).q2u = function () {
     var tmp$ret$0;
     // Inline function 'kotlin.getValue' call
     var tmp0_getValue = id$factory();
@@ -8916,53 +8919,53 @@
   protoOf(Page).a3e = function () {
     return this.listeners;
   };
-  protoOf(Page).b36 = function () {
+  protoOf(Page).d36 = function () {
     return this.dismissListeners;
   };
-  protoOf(Page).y2x = function () {
+  protoOf(Page).d2y = function () {
     var tmp0_elvis_lhs = this.k3d_1;
     return tmp0_elvis_lhs == null ? get_primaryColor_0(this.a2t()) : tmp0_elvis_lhs;
   };
-  protoOf(Page).z2x = function () {
+  protoOf(Page).e2y = function () {
     var tmp0_elvis_lhs = this.l3d_1;
     return tmp0_elvis_lhs == null ? get_primaryTextColor_0(this.a2t()) : tmp0_elvis_lhs;
   };
-  protoOf(Page).e36 = function () {
+  protoOf(Page).g36 = function () {
     return this.m3d_1;
   };
   protoOf(Page).b3e = function () {
     return this.n3d_1;
   };
-  protoOf(Page).f36 = function () {
+  protoOf(Page).h36 = function () {
     return getResource(this, this.n3d_1);
   };
-  protoOf(Page).g36 = function () {
+  protoOf(Page).i36 = function () {
     return this.o3d_1;
   };
-  protoOf(Page).h36 = function () {
+  protoOf(Page).j36 = function () {
     return this.p3d_1;
   };
   protoOf(Page).c3e = function () {
     var tmp0_elvis_lhs = this.q3d_1;
-    return tmp0_elvis_lhs == null ? this.a2p().w2t_1 : tmp0_elvis_lhs;
+    return tmp0_elvis_lhs == null ? this.a2p().b2u_1 : tmp0_elvis_lhs;
   };
-  protoOf(Page).b2y = function () {
+  protoOf(Page).g2y = function () {
     var tmp0_elvis_lhs = this.r3d_1;
-    return tmp0_elvis_lhs == null ? this.a2p().b2y() : tmp0_elvis_lhs;
+    return tmp0_elvis_lhs == null ? this.a2p().g2y() : tmp0_elvis_lhs;
   };
-  protoOf(Page).c2y = function () {
+  protoOf(Page).h2y = function () {
     var tmp0_elvis_lhs = this.s3d_1;
     return tmp0_elvis_lhs == null ? get_multiselectOptionBackgroundColor.call(this) : tmp0_elvis_lhs;
   };
-  protoOf(Page).d2y = function () {
+  protoOf(Page).i2y = function () {
     var tmp0_elvis_lhs = this.t3d_1;
     return tmp0_elvis_lhs == null ? get_multiselectOptionSelectedColor.call(this) : tmp0_elvis_lhs;
   };
-  protoOf(Page).w2x = function () {
+  protoOf(Page).b2y = function () {
     var tmp0_elvis_lhs = this.u3d_1;
     return tmp0_elvis_lhs == null ? get_textColor_0(this.a2t()) : tmp0_elvis_lhs;
   };
-  protoOf(Page).e2y = function () {
+  protoOf(Page).j2y = function () {
     return this.v3d_1 * get_textScale_0(this.a2t());
   };
   protoOf(Page)._getAnalyticsEvents = function (type) {
@@ -9027,10 +9030,10 @@
     var tmp_0 = this;
     tmp_0.g3d_1 = lazy(Page$position$delegate$lambda(this));
   }
-  defineProp(protoOf(Page), 'id', protoOf(Page).l2u);
+  defineProp(protoOf(Page), 'id', protoOf(Page).q2u);
   defineProp(protoOf(Page), 'position', protoOf(Page).w3d);
   defineProp(protoOf(Page), 'parentPage', protoOf(Page).y3d);
-  defineProp(protoOf(Page), 'backgroundImage', protoOf(Page).f36);
+  defineProp(protoOf(Page), 'backgroundImage', protoOf(Page).h36);
   function id$factory() {
     return getPropertyCallableRef('id', 1, KProperty1, function (receiver) {
       return receiver.id;
@@ -9047,9 +9050,9 @@
   var XMLNS_SHAREABLE;
   function Companion_46() {
     Companion_instance_46 = this;
-    this.n35_1 = 'items';
+    this.p35_1 = 'items';
   }
-  protoOf(Companion_46).o35 = function (_this__u8e3s4, manifest) {
+  protoOf(Companion_46).q35 = function (_this__u8e3s4, manifest) {
     var tmp$ret$4;
     // Inline function 'kotlin.collections.buildList' call
     // Inline function 'kotlin.contracts.contract' call
@@ -9133,15 +9136,15 @@
     Shareable.call($this);
     Companion_getInstance_59();
     parser.e3g(2, get_XMLNS_SHAREABLE());
-    $this.t35_1 = parser.j2t('id');
+    $this.v35_1 = parser.o2t('id');
     var tmp = $this;
-    var tmp0_safe_receiver = parser.j2t('order');
+    var tmp0_safe_receiver = parser.o2t('order');
     var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : toIntOrNull(tmp0_safe_receiver);
-    tmp.u35_1 = tmp1_elvis_lhs == null ? 2147483647 : tmp1_elvis_lhs;
+    tmp.w35_1 = tmp1_elvis_lhs == null ? 2147483647 : tmp1_elvis_lhs;
     return $this;
   }
-  protoOf(Shareable).l2u = function () {
-    return this.t35_1;
+  protoOf(Shareable).q2u = function () {
+    return this.v35_1;
   };
   function Shareable() {
     Companion_getInstance_49();
@@ -9163,7 +9166,7 @@
     var tmp = get_XMLNS_SHAREABLE();
     Companion_getInstance_50();
     parser.u2r(2, tmp, 'image');
-    $this.j3g_1 = parser.j2t('resource');
+    $this.j3g_1 = parser.o2t('resource');
     var description = null;
     // Inline function 'org.cru.godtools.shared.tool.parser.xml.parseChildren' call
     $l$loop_1: while (true) {
@@ -9195,8 +9198,8 @@
   function ShareableImage_init_$Create$(manifest, parser) {
     return ShareableImage_init_$Init$(manifest, parser, objectCreate(protoOf(ShareableImage)));
   }
-  protoOf(ShareableImage).l2u = function () {
-    var tmp0_elvis_lhs = protoOf(Shareable).l2u.call(this);
+  protoOf(ShareableImage).q2u = function () {
+    var tmp0_elvis_lhs = protoOf(Shareable).q2u.call(this);
     return tmp0_elvis_lhs == null ? this.j3g_1 : tmp0_elvis_lhs;
   };
   function ShareableImage() {
@@ -9223,7 +9226,7 @@
     var tmp = get_XMLNS_TRAINING();
     Companion_getInstance_51();
     parser.u2r(2, tmp, 'tip');
-    $this.u3g_1 = parser.i2v(null, 'id');
+    $this.u3g_1 = parser.n2v(null, 'id');
     skipTag(parser);
     return $this;
   }
@@ -9231,7 +9234,7 @@
     return InlineTip_init_$Init$(parent, parser, objectCreate(protoOf(InlineTip)));
   }
   protoOf(InlineTip).v3g = function () {
-    return this.a2p().h37(this.u3g_1);
+    return this.a2p().j37(this.u3g_1);
   };
   protoOf(InlineTip).c2t = function () {
     return listOfNotNull(this.v3g());
@@ -9248,7 +9251,7 @@
     Companion_instance_49 = this;
     this.w3g_1 = Type_TIP_getInstance();
   }
-  protoOf(Companion_49).x30 = function (_this__u8e3s4) {
+  protoOf(Companion_49).z30 = function (_this__u8e3s4) {
     var tmp0_subject = _this__u8e3s4;
     switch (tmp0_subject) {
       case 'tip':
@@ -9289,11 +9292,11 @@
     Tip.call($this);
     Companion_getInstance_59();
     parser.u2r(2, get_XMLNS_TRAINING(), 'tip');
-    $this.g34_1 = id;
+    $this.i34_1 = id;
     var tmp = $this;
-    var tmp0_safe_receiver = parser.i2v(null, 'type');
-    var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : Companion_getInstance_52().x30(tmp0_safe_receiver);
-    tmp.h34_1 = tmp1_elvis_lhs == null ? Companion_getInstance_52().w3g_1 : tmp1_elvis_lhs;
+    var tmp0_safe_receiver = parser.n2v(null, 'type');
+    var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : Companion_getInstance_52().z30(tmp0_safe_receiver);
+    tmp.j34_1 = tmp1_elvis_lhs == null ? Companion_getInstance_52().w3g_1 : tmp1_elvis_lhs;
     var tmp_0 = $this;
     var tmp$ret$2;
     // Inline function 'kotlin.collections.buildList' call
@@ -9333,7 +9336,7 @@
     tmp$ret$0 = tmp0_apply;
     tmp$ret$1 = tmp$ret$0.u7();
     tmp$ret$2 = tmp$ret$1;
-    tmp_0.i34_1 = tmp$ret$2;
+    tmp_0.k34_1 = tmp$ret$2;
     return $this;
   }
   function Tip_init_$Create$(manifest, id, parser) {
@@ -9406,13 +9409,13 @@
     Type_initEntries_2();
     return Type_QUOTE_instance;
   }
-  protoOf(Tip).y2x = function () {
+  protoOf(Tip).d2y = function () {
     return Companion_getInstance_29().c2q_1;
   };
-  protoOf(Tip).z2x = function () {
+  protoOf(Tip).e2y = function () {
     return Companion_getInstance_29().d2q_1;
   };
-  protoOf(Tip).w2x = function () {
+  protoOf(Tip).b2y = function () {
     return Companion_getInstance_29().i2q_1;
   };
   function Tip() {
@@ -9564,9 +9567,9 @@
     parser.u2r(2, tmp, 'call-to-action');
     $this.e3h_1 = page;
     var tmp_0 = $this;
-    var tmp0_safe_receiver = parser.j2t('control-color');
+    var tmp0_safe_receiver = parser.o2t('control-color');
     tmp_0.f3h_1 = tmp0_safe_receiver == null ? null : toColorOrNull(tmp0_safe_receiver);
-    $this.g3h_1 = parser.i2v(get_XMLNS_TRAINING(), 'tip');
+    $this.g3h_1 = parser.n2v(get_XMLNS_TRAINING(), 'tip');
     var tmp_1 = $this;
     var tmp_2 = get_XMLNS_TRACT();
     Companion_getInstance_54();
@@ -9605,7 +9608,7 @@
     return this.g3h_1;
   };
   protoOf(CallToAction).v3g = function () {
-    return this.a2p().h37(this.g3h_1);
+    return this.a2p().j37(this.g3h_1);
   };
   function CallToAction() {
     Companion_getInstance_54();
@@ -9633,9 +9636,9 @@
     Companion_getInstance_55();
     parser.u2r(2, tmp, 'header');
     var tmp_0 = $this;
-    var tmp0_safe_receiver = parser.j2t(get_XML_BACKGROUND_COLOR());
+    var tmp0_safe_receiver = parser.o2t(get_XML_BACKGROUND_COLOR());
     tmp_0.l3h_1 = tmp0_safe_receiver == null ? null : toColorOrNull(tmp0_safe_receiver);
-    $this.m3h_1 = parser.i2v(get_XMLNS_TRAINING(), 'tip');
+    $this.m3h_1 = parser.n2v(get_XMLNS_TRAINING(), 'tip');
     var number = null;
     var title = null;
     // Inline function 'org.cru.godtools.shared.tool.parser.xml.parseChildren' call
@@ -9671,24 +9674,24 @@
   function Header_init_$Create$(page, parser) {
     return Header_init_$Init$(page, parser, objectCreate(protoOf(Header)));
   }
-  protoOf(Header).e36 = function () {
+  protoOf(Header).g36 = function () {
     var tmp0_elvis_lhs = this.l3h_1;
-    return tmp0_elvis_lhs == null ? this.y2x() : tmp0_elvis_lhs;
+    return tmp0_elvis_lhs == null ? this.d2y() : tmp0_elvis_lhs;
   };
-  protoOf(Header).w2x = function () {
-    return this.z2x();
+  protoOf(Header).b2y = function () {
+    return this.e2y();
   };
   protoOf(Header).n3h = function () {
     return this.number;
   };
-  protoOf(Header).j36 = function () {
+  protoOf(Header).l36 = function () {
     return this.title;
   };
   protoOf(Header).i3h = function () {
     return this.m3h_1;
   };
   protoOf(Header).v3g = function () {
-    return this.a2p().h37(this.m3h_1);
+    return this.a2p().j37(this.m3h_1);
   };
   function Header() {
     Companion_getInstance_55();
@@ -9954,14 +9957,14 @@
     var tmp_0 = $this;
     var tmp$ret$0;
     // Inline function 'org.cru.godtools.shared.tool.parser.model.toEventIds' call
-    var tmp0_toEventIds = parser.j2t(get_XML_LISTENERS());
-    tmp$ret$0 = Companion_getInstance_17().j2v(tmp0_toEventIds);
+    var tmp0_toEventIds = parser.o2t(get_XML_LISTENERS());
+    tmp$ret$0 = Companion_getInstance_17().o2v(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.j2t(get_XML_DISMISS_LISTENERS());
-    tmp$ret$1 = Companion_getInstance_17().j2v(tmp1_toEventIds);
+    var tmp1_toEventIds = parser.o2t(get_XML_DISMISS_LISTENERS());
+    tmp$ret$1 = Companion_getInstance_17().o2v(tmp1_toEventIds);
     tmp_1.dismissListeners = toSet_0(tmp$ret$1);
     var title = null;
     var tmp_2 = $this;
@@ -10057,10 +10060,10 @@
   protoOf(Modal).r3i = function () {
     return this.page;
   };
-  protoOf(Modal).l2u = function () {
+  protoOf(Modal).q2u = function () {
     return this.page.id + '-' + _get_position__iahqv2(this);
   };
-  protoOf(Modal).j36 = function () {
+  protoOf(Modal).l36 = function () {
     return this.title;
   };
   protoOf(Modal).t2s = function () {
@@ -10069,31 +10072,31 @@
   protoOf(Modal).a3e = function () {
     return this.listeners;
   };
-  protoOf(Modal).b36 = function () {
+  protoOf(Modal).d36 = function () {
     return this.dismissListeners;
   };
-  protoOf(Modal).y2x = function () {
+  protoOf(Modal).d2y = function () {
     return get_TRANSPARENT();
   };
-  protoOf(Modal).z2x = function () {
+  protoOf(Modal).e2y = function () {
     return get_WHITE();
   };
-  protoOf(Modal).a2x = function () {
+  protoOf(Modal).f2x = function () {
     return get_WHITE();
   };
-  protoOf(Modal).a2y = function () {
+  protoOf(Modal).f2y = function () {
     return Style_OUTLINED_getInstance();
   };
-  protoOf(Modal).f2y = function () {
+  protoOf(Modal).k2y = function () {
     return Align_CENTER_getInstance();
   };
-  protoOf(Modal).w2x = function () {
+  protoOf(Modal).b2y = function () {
     return get_WHITE();
   };
   function Modal() {
     Companion_getInstance_57();
   }
-  defineProp(protoOf(Modal), 'id', protoOf(Modal).l2u);
+  defineProp(protoOf(Modal), 'id', protoOf(Modal).q2u);
   defineProp(protoOf(Modal), '_content', function () {
     return this.t2s();
   });
@@ -10106,7 +10109,7 @@
     this.t3i_1 = 'label';
     this.u3i_1 = 'hidden';
     this.v3i_1 = ImageScaleType_FILL_X_getInstance();
-    this.w3i_1 = Companion_getInstance_22().u2w_1;
+    this.w3i_1 = Companion_getInstance_22().z2w_1;
   }
   var Companion_instance_55;
   function Companion_getInstance_58() {
@@ -10132,35 +10135,35 @@
     parser.u2r(2, tmp, 'card');
     var tmp_0 = $this;
     Companion_getInstance_58();
-    var tmp0_safe_receiver = parser.i2v(null, 'hidden');
+    var tmp0_safe_receiver = parser.n2v(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.j2t(get_XML_LISTENERS());
-    tmp$ret$0 = Companion_getInstance_17().j2v(tmp0_toEventIds);
+    var tmp0_toEventIds = parser.o2t(get_XML_LISTENERS());
+    tmp$ret$0 = Companion_getInstance_17().o2v(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.j2t(get_XML_DISMISS_LISTENERS());
-    tmp$ret$1 = Companion_getInstance_17().j2v(tmp1_toEventIds);
+    var tmp1_toEventIds = parser.o2t(get_XML_DISMISS_LISTENERS());
+    tmp$ret$1 = Companion_getInstance_17().o2v(tmp1_toEventIds);
     tmp_2.dismissListeners = toSet_0(tmp$ret$1);
     var tmp_3 = $this;
-    var tmp2_safe_receiver = parser.j2t(get_XML_BACKGROUND_COLOR());
+    var tmp2_safe_receiver = parser.o2t(get_XML_BACKGROUND_COLOR());
     tmp_3.y3i_1 = tmp2_safe_receiver == null ? null : toColorOrNull(tmp2_safe_receiver);
-    $this.z3i_1 = parser.j2t(get_XML_BACKGROUND_IMAGE());
+    $this.z3i_1 = parser.o2t(get_XML_BACKGROUND_IMAGE());
     var tmp_4 = $this;
-    var tmp3_safe_receiver = parser.j2t(get_XML_BACKGROUND_IMAGE_GRAVITY());
-    var tmp4_elvis_lhs = tmp3_safe_receiver == null ? null : Companion_getInstance_22().v2w(tmp3_safe_receiver);
+    var tmp3_safe_receiver = parser.o2t(get_XML_BACKGROUND_IMAGE_GRAVITY());
+    var tmp4_elvis_lhs = tmp3_safe_receiver == null ? null : Companion_getInstance_22().a2x(tmp3_safe_receiver);
     tmp_4.a3j_1 = tmp4_elvis_lhs == null ? Companion_getInstance_58().w3i_1 : tmp4_elvis_lhs;
     var tmp_5 = $this;
-    var tmp5_safe_receiver = parser.j2t(get_XML_BACKGROUND_IMAGE_SCALE_TYPE());
-    var tmp6_elvis_lhs = tmp5_safe_receiver == null ? null : Companion_getInstance_24().v30(tmp5_safe_receiver);
+    var tmp5_safe_receiver = parser.o2t(get_XML_BACKGROUND_IMAGE_SCALE_TYPE());
+    var tmp6_elvis_lhs = tmp5_safe_receiver == null ? null : Companion_getInstance_24().x30(tmp5_safe_receiver);
     tmp_5.b3j_1 = tmp6_elvis_lhs == null ? Companion_getInstance_58().v3i_1 : tmp6_elvis_lhs;
     var tmp_6 = $this;
-    var tmp7_safe_receiver = parser.j2t(get_XML_TEXT_COLOR());
+    var tmp7_safe_receiver = parser.o2t(get_XML_TEXT_COLOR());
     tmp_6.c3j_1 = tmp7_safe_receiver == null ? null : toColorOrNull(tmp7_safe_receiver);
     var tmp_7 = $this;
     var tmp$ret$2;
@@ -10275,7 +10278,7 @@
   }
   function TractPage$Card$labelParent$delegate$lambda$lambda(this$0) {
     return function () {
-      return this$0.y2x();
+      return this$0.d2y();
     };
   }
   function TractPage$Card$labelParent$delegate$lambda(this$0) {
@@ -10291,7 +10294,7 @@
     Companion_getInstance_48();
     parser.u2r(2, tmp, 'page');
     var tmp_0 = $this;
-    var tmp0_safe_receiver = parser.j2t('card-text-color');
+    var tmp0_safe_receiver = parser.o2t('card-text-color');
     tmp_0.o3i_1 = tmp0_safe_receiver == null ? null : toColorOrNull(tmp0_safe_receiver);
     var header = null;
     var hero = null;
@@ -10370,11 +10373,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().r32_1 : backgroundColor;
+    backgroundColor = backgroundColor === VOID ? Companion_getInstance_48().t32_1 : backgroundColor;
     backgroundImage = backgroundImage === VOID ? null : backgroundImage;
     primaryColor = primaryColor === VOID ? null : primaryColor;
-    backgroundImageGravity = backgroundImageGravity === VOID ? Companion_getInstance_48().s32_1 : backgroundImageGravity;
-    backgroundImageScaleType = backgroundImageScaleType === VOID ? Companion_getInstance_48().t32_1 : backgroundImageScaleType;
+    backgroundImageGravity = backgroundImageGravity === VOID ? Companion_getInstance_48().u32_1 : backgroundImageGravity;
+    backgroundImageScaleType = backgroundImageScaleType === VOID ? Companion_getInstance_48().v32_1 : backgroundImageScaleType;
     textColor = textColor === VOID ? null : textColor;
     var tmp;
     if (textScale === VOID) {
@@ -10414,7 +10417,7 @@
   protoOf(Card_1).r3i = function () {
     return this.page;
   };
-  protoOf(Card_1).l2u = function () {
+  protoOf(Card_1).q2u = function () {
     return this.page.id + '-' + this.position;
   };
   protoOf(Card_1).w3d = function () {
@@ -10446,23 +10449,23 @@
   protoOf(Card_1).a3e = function () {
     return this.listeners;
   };
-  protoOf(Card_1).b36 = function () {
+  protoOf(Card_1).d36 = function () {
     return this.dismissListeners;
   };
-  protoOf(Card_1).e36 = function () {
+  protoOf(Card_1).g36 = function () {
     var tmp0_elvis_lhs = this.y3i_1;
-    return tmp0_elvis_lhs == null ? this.page.b2y() : tmp0_elvis_lhs;
+    return tmp0_elvis_lhs == null ? this.page.g2y() : tmp0_elvis_lhs;
   };
-  protoOf(Card_1).f36 = function () {
+  protoOf(Card_1).h36 = function () {
     return getResource(this, this.z3i_1);
   };
-  protoOf(Card_1).g36 = function () {
+  protoOf(Card_1).i36 = function () {
     return this.a3j_1;
   };
-  protoOf(Card_1).h36 = function () {
+  protoOf(Card_1).j36 = function () {
     return this.b3j_1;
   };
-  protoOf(Card_1).w2x = function () {
+  protoOf(Card_1).b2y = function () {
     var tmp0_elvis_lhs = this.c3j_1;
     return tmp0_elvis_lhs == null ? this.page.cardTextColor : tmp0_elvis_lhs;
   };
@@ -10486,7 +10489,7 @@
       var element = tmp0_iterator.h();
       var tmp$ret$0;
       // Inline function 'org.cru.godtools.shared.tool.parser.model.<get-contentTips>.<anonymous>' call
-      tmp$ret$0 = element.c2t();
+      tmp$ret$0 = element.tips;
       var list = tmp$ret$0;
       addAll(tmp0_flatMapTo, list);
     }
@@ -10558,10 +10561,10 @@
     var tmp = this;
     tmp.d3j_1 = lazy(TractPage$Card$labelParent$delegate$lambda(this));
   }
-  defineProp(protoOf(Card_1), 'id', protoOf(Card_1).l2u);
+  defineProp(protoOf(Card_1), 'id', protoOf(Card_1).q2u);
   defineProp(protoOf(Card_1), 'visiblePosition', protoOf(Card_1).g3j);
   defineProp(protoOf(Card_1), 'isLastVisibleCard', protoOf(Card_1).h3j);
-  defineProp(protoOf(Card_1), 'backgroundImage', protoOf(Card_1).f36);
+  defineProp(protoOf(Card_1), 'backgroundImage', protoOf(Card_1).h36);
   defineProp(protoOf(Card_1), '_content', function () {
     return this.t2s();
   });
@@ -10724,7 +10727,7 @@
   };
   protoOf(TractPage).p3j = function () {
     var tmp0_elvis_lhs = this.o3i_1;
-    return tmp0_elvis_lhs == null ? this.w2x() : tmp0_elvis_lhs;
+    return tmp0_elvis_lhs == null ? this.b2y() : tmp0_elvis_lhs;
   };
   function TractPage() {
     this.n3i_1 = emptyList();
@@ -10783,7 +10786,7 @@
     var tmp = this.q3j_1;
     return (tmp == null ? true : isObject(tmp)) ? tmp : THROW_CCE();
   };
-  protoOf(SetOnceProperty).a37 = function (thisRef, property) {
+  protoOf(SetOnceProperty).c37 = function (thisRef, property) {
     return this.r3j(isObject(thisRef) ? thisRef : THROW_CCE(), property);
   };
   protoOf(SetOnceProperty).s3j = function (thisRef, property, value) {
@@ -10799,7 +10802,7 @@
     }
     this.q3j_1 = value;
   };
-  protoOf(SetOnceProperty).m35 = function (thisRef, property, value) {
+  protoOf(SetOnceProperty).o35 = function (thisRef, property, value) {
     var tmp = isObject(thisRef) ? thisRef : THROW_CCE();
     return this.s3j(tmp, property, (value == null ? true : isObject(value)) ? value : THROW_CCE());
   };
@@ -10977,7 +10980,7 @@
     }
     return event.v3j_1;
   };
-  protoOf(SaxXmlPullParser).z3a = function () {
+  protoOf(SaxXmlPullParser).b3b = function () {
     Companion_getInstance_59();
     this.e3g(2);
     var tmp0_subject = this.h();
@@ -11020,7 +11023,7 @@
     }
     return tmp;
   };
-  protoOf(SaxXmlPullParser).i2v = function (namespace, name) {
+  protoOf(SaxXmlPullParser).n2v = function (namespace, name) {
     var tmp$ret$1;
     // Inline function 'kotlin.takeIf' call
     var tmp0_takeIf = this.z3j_1;
@@ -11287,145 +11290,183 @@
   //region block: post-declaration
   protoOf(Section).b2t = get_content;
   protoOf(Section).getAnalyticsEvents = getAnalyticsEvents;
-  protoOf(Content).f2t = isInvisible;
-  protoOf(Content).g2t = isGone;
-  protoOf(Accordion).f2t = isInvisible;
-  protoOf(Accordion).g2t = isGone;
-  protoOf(Animation).f2t = isInvisible;
-  protoOf(Animation).g2t = isGone;
-  protoOf(Button).f2t = isInvisible;
-  protoOf(Button).g2t = isGone;
+  protoOf(Content).i2t = isInvisible;
+  protoOf(Content).j2t = isInvisibleFlow;
+  protoOf(Content).k2t = isGone;
+  protoOf(Content).l2t = isGoneFlow;
+  protoOf(Accordion).i2t = isInvisible;
+  protoOf(Accordion).j2t = isInvisibleFlow;
+  protoOf(Accordion).k2t = isGone;
+  protoOf(Accordion).l2t = isGoneFlow;
+  protoOf(Animation).i2t = isInvisible;
+  protoOf(Animation).j2t = isInvisibleFlow;
+  protoOf(Animation).k2t = isGone;
+  protoOf(Animation).l2t = isGoneFlow;
+  protoOf(Button).i2t = isInvisible;
+  protoOf(Button).j2t = isInvisibleFlow;
+  protoOf(Button).k2t = isGone;
+  protoOf(Button).l2t = isGoneFlow;
   protoOf(Button).getAnalyticsEvents = getAnalyticsEvents;
-  protoOf(Button).b2x = get_isClickable;
-  protoOf(Card).f2t = isInvisible;
-  protoOf(Card).g2t = isGone;
+  protoOf(Button).g2x = 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).y2x = get_primaryColor;
-  protoOf(Category).z2x = get_primaryTextColor;
-  protoOf(Category).a2y = get_buttonStyle;
-  protoOf(Category).a2x = get_buttonColor;
-  protoOf(Category).b2y = get_cardBackgroundColor;
-  protoOf(Category).c2y = get_multiselectOptionBackgroundColor;
-  protoOf(Category).d2y = get_multiselectOptionSelectedColor;
-  protoOf(Category).e2y = get_textScale;
-  protoOf(Category).f2y = get_textAlign;
-  protoOf(Fallback).f2t = isInvisible;
-  protoOf(Fallback).g2t = isGone;
+  protoOf(Category).d2y = get_primaryColor;
+  protoOf(Category).e2y = get_primaryTextColor;
+  protoOf(Category).f2y = get_buttonStyle;
+  protoOf(Category).f2x = get_buttonColor;
+  protoOf(Category).g2y = get_cardBackgroundColor;
+  protoOf(Category).h2y = get_multiselectOptionBackgroundColor;
+  protoOf(Category).i2y = get_multiselectOptionSelectedColor;
+  protoOf(Category).j2y = get_textScale;
+  protoOf(Category).k2y = get_textAlign;
+  protoOf(Fallback).i2t = isInvisible;
+  protoOf(Fallback).j2t = isInvisibleFlow;
+  protoOf(Fallback).k2t = isGone;
+  protoOf(Fallback).l2t = isGoneFlow;
   protoOf(Fallback).b2t = get_content;
   protoOf(Item).b2t = get_content;
-  protoOf(Item).f2t = isInvisible;
-  protoOf(Item).g2t = isGone;
-  protoOf(Flow).f2t = isInvisible;
-  protoOf(Flow).g2t = isGone;
-  protoOf(Form).f2t = isInvisible;
-  protoOf(Form).g2t = isGone;
+  protoOf(Item).i2t = isInvisible;
+  protoOf(Item).k2t = isGone;
+  protoOf(Flow).i2t = isInvisible;
+  protoOf(Flow).j2t = isInvisibleFlow;
+  protoOf(Flow).k2t = isGone;
+  protoOf(Flow).l2t = isGoneFlow;
+  protoOf(Form).i2t = isInvisible;
+  protoOf(Form).j2t = isInvisibleFlow;
+  protoOf(Form).k2t = isGone;
+  protoOf(Form).l2t = isGoneFlow;
   protoOf(Form).b2t = get_content;
-  protoOf(Image).f2t = isInvisible;
-  protoOf(Image).g2t = isGone;
-  protoOf(Input).f2t = isInvisible;
-  protoOf(Input).g2t = isGone;
-  protoOf(Link).f2t = isInvisible;
-  protoOf(Link).g2t = isGone;
+  protoOf(Image).i2t = isInvisible;
+  protoOf(Image).j2t = isInvisibleFlow;
+  protoOf(Image).k2t = isGone;
+  protoOf(Image).l2t = isGoneFlow;
+  protoOf(Input).i2t = isInvisible;
+  protoOf(Input).j2t = isInvisibleFlow;
+  protoOf(Input).k2t = isGone;
+  protoOf(Input).l2t = isGoneFlow;
+  protoOf(Link).i2t = isInvisible;
+  protoOf(Link).j2t = isInvisibleFlow;
+  protoOf(Link).k2t = isGone;
+  protoOf(Link).l2t = isGoneFlow;
   protoOf(Link).getAnalyticsEvents = getAnalyticsEvents;
-  protoOf(Link).b2x = get_isClickable;
-  protoOf(Manifest).a2x = get_buttonColor;
-  protoOf(Manifest).f2y = get_textAlign;
-  protoOf(Option).f2t = isInvisible;
-  protoOf(Option).g2t = isGone;
+  protoOf(Link).g2x = get_isClickable;
+  protoOf(Manifest).f2x = get_buttonColor;
+  protoOf(Manifest).k2y = get_textAlign;
+  protoOf(Option).i2t = isInvisible;
+  protoOf(Option).j2t = isInvisibleFlow;
+  protoOf(Option).k2t = isGone;
+  protoOf(Option).l2t = isGoneFlow;
   protoOf(Option).b2t = get_content;
   protoOf(Option).getAnalyticsEvents = getAnalyticsEvents;
-  protoOf(Multiselect).f2t = isInvisible;
-  protoOf(Multiselect).g2t = isGone;
-  protoOf(Paragraph).f2t = isInvisible;
-  protoOf(Paragraph).g2t = isGone;
+  protoOf(Multiselect).i2t = isInvisible;
+  protoOf(Multiselect).j2t = isInvisibleFlow;
+  protoOf(Multiselect).k2t = isGone;
+  protoOf(Multiselect).l2t = isGoneFlow;
+  protoOf(Paragraph).i2t = isInvisible;
+  protoOf(Paragraph).j2t = isInvisibleFlow;
+  protoOf(Paragraph).k2t = isGone;
+  protoOf(Paragraph).l2t = isGoneFlow;
   protoOf(Paragraph).b2t = get_content;
-  protoOf(Spacer).f2t = isInvisible;
-  protoOf(Spacer).g2t = isGone;
-  protoOf(StylesOverride).y2x = get_primaryColor;
-  protoOf(StylesOverride).z2x = get_primaryTextColor;
-  protoOf(StylesOverride).a2y = get_buttonStyle;
-  protoOf(StylesOverride).a2x = get_buttonColor;
-  protoOf(StylesOverride).b2y = get_cardBackgroundColor;
-  protoOf(StylesOverride).c2y = get_multiselectOptionBackgroundColor;
-  protoOf(StylesOverride).d2y = get_multiselectOptionSelectedColor;
+  protoOf(Spacer).i2t = isInvisible;
+  protoOf(Spacer).j2t = isInvisibleFlow;
+  protoOf(Spacer).k2t = isGone;
+  protoOf(Spacer).l2t = isGoneFlow;
+  protoOf(StylesOverride).d2y = get_primaryColor;
+  protoOf(StylesOverride).e2y = get_primaryTextColor;
+  protoOf(StylesOverride).f2y = get_buttonStyle;
+  protoOf(StylesOverride).f2x = get_buttonColor;
+  protoOf(StylesOverride).g2y = get_cardBackgroundColor;
+  protoOf(StylesOverride).h2y = get_multiselectOptionBackgroundColor;
+  protoOf(StylesOverride).i2y = get_multiselectOptionSelectedColor;
   protoOf(Tab).b2t = get_content;
   protoOf(Tab).getAnalyticsEvents = getAnalyticsEvents;
-  protoOf(Tabs).f2t = isInvisible;
-  protoOf(Tabs).g2t = isGone;
-  protoOf(Text).f2t = isInvisible;
-  protoOf(Text).m3b = isInvisibleFlow;
-  protoOf(Text).g2t = isGone;
-  protoOf(Text).n3b = isGoneFlow;
-  protoOf(Video).f2t = isInvisible;
-  protoOf(Video).g2t = isGone;
-  protoOf(Page).a2y = get_buttonStyle;
-  protoOf(Page).a2x = get_buttonColor;
-  protoOf(Page).f2y = get_textAlign;
+  protoOf(Tabs).i2t = isInvisible;
+  protoOf(Tabs).j2t = isInvisibleFlow;
+  protoOf(Tabs).k2t = isGone;
+  protoOf(Tabs).l2t = isGoneFlow;
+  protoOf(Text).i2t = isInvisible;
+  protoOf(Text).j2t = isInvisibleFlow;
+  protoOf(Text).k2t = isGone;
+  protoOf(Text).l2t = isGoneFlow;
+  protoOf(Video).i2t = isInvisible;
+  protoOf(Video).j2t = isInvisibleFlow;
+  protoOf(Video).k2t = isGone;
+  protoOf(Video).l2t = isGoneFlow;
+  protoOf(Page).f2y = get_buttonStyle;
+  protoOf(Page).f2x = get_buttonColor;
+  protoOf(Page).k2y = get_textAlign;
   protoOf(Page).getAnalyticsEvents = getAnalyticsEvents;
-  protoOf(LessonPage).a2y = get_buttonStyle;
-  protoOf(LessonPage).a2x = get_buttonColor;
-  protoOf(LessonPage).f2y = get_textAlign;
+  protoOf(LessonPage).f2y = get_buttonStyle;
+  protoOf(LessonPage).f2x = get_buttonColor;
+  protoOf(LessonPage).k2y = get_textAlign;
   protoOf(LessonPage).getAnalyticsEvents = getAnalyticsEvents;
   protoOf(LessonPage).b2t = get_content;
   protoOf(Card_0).b2t = get_content;
   protoOf(Card_0).getAnalyticsEvents = getAnalyticsEvents;
-  protoOf(CardCollectionPage).a2y = get_buttonStyle;
-  protoOf(CardCollectionPage).a2x = get_buttonColor;
-  protoOf(CardCollectionPage).f2y = get_textAlign;
+  protoOf(CardCollectionPage).f2y = get_buttonStyle;
+  protoOf(CardCollectionPage).f2x = get_buttonColor;
+  protoOf(CardCollectionPage).k2y = get_textAlign;
   protoOf(CardCollectionPage).getAnalyticsEvents = getAnalyticsEvents;
-  protoOf(ContentPage).a2y = get_buttonStyle;
-  protoOf(ContentPage).a2x = get_buttonColor;
-  protoOf(ContentPage).f2y = get_textAlign;
+  protoOf(ContentPage).f2y = get_buttonStyle;
+  protoOf(ContentPage).f2x = get_buttonColor;
+  protoOf(ContentPage).k2y = get_textAlign;
   protoOf(ContentPage).getAnalyticsEvents = getAnalyticsEvents;
   protoOf(ContentPage).b2t = get_content;
-  protoOf(InlineTip).f2t = isInvisible;
-  protoOf(InlineTip).g2t = isGone;
-  protoOf(Tip).a2y = get_buttonStyle;
-  protoOf(Tip).a2x = get_buttonColor;
-  protoOf(Tip).b2y = get_cardBackgroundColor;
-  protoOf(Tip).c2y = get_multiselectOptionBackgroundColor;
-  protoOf(Tip).d2y = get_multiselectOptionSelectedColor;
-  protoOf(Tip).e2y = get_textScale;
-  protoOf(Tip).f2y = get_textAlign;
+  protoOf(InlineTip).i2t = isInvisible;
+  protoOf(InlineTip).j2t = isInvisibleFlow;
+  protoOf(InlineTip).k2t = isGone;
+  protoOf(InlineTip).l2t = isGoneFlow;
+  protoOf(Tip).f2y = get_buttonStyle;
+  protoOf(Tip).f2x = get_buttonColor;
+  protoOf(Tip).g2y = get_cardBackgroundColor;
+  protoOf(Tip).h2y = get_multiselectOptionBackgroundColor;
+  protoOf(Tip).i2y = get_multiselectOptionSelectedColor;
+  protoOf(Tip).j2y = get_textScale;
+  protoOf(Tip).k2y = get_textAlign;
   protoOf(TipPage).b2t = get_content;
-  protoOf(Header).y2x = get_primaryColor;
-  protoOf(Header).z2x = get_primaryTextColor;
-  protoOf(Header).a2y = get_buttonStyle;
-  protoOf(Header).a2x = get_buttonColor;
-  protoOf(Header).b2y = get_cardBackgroundColor;
-  protoOf(Header).c2y = get_multiselectOptionBackgroundColor;
-  protoOf(Header).d2y = get_multiselectOptionSelectedColor;
-  protoOf(Header).e2y = get_textScale;
-  protoOf(Header).f2y = get_textAlign;
+  protoOf(Header).d2y = get_primaryColor;
+  protoOf(Header).e2y = get_primaryTextColor;
+  protoOf(Header).f2y = get_buttonStyle;
+  protoOf(Header).f2x = get_buttonColor;
+  protoOf(Header).g2y = get_cardBackgroundColor;
+  protoOf(Header).h2y = get_multiselectOptionBackgroundColor;
+  protoOf(Header).i2y = get_multiselectOptionSelectedColor;
+  protoOf(Header).j2y = get_textScale;
+  protoOf(Header).k2y = get_textAlign;
   protoOf(Hero).b2t = get_content;
   protoOf(Hero).getAnalyticsEvents = getAnalyticsEvents;
   protoOf(Modal).b2t = get_content;
-  protoOf(Modal).b2y = get_cardBackgroundColor;
-  protoOf(Modal).c2y = get_multiselectOptionBackgroundColor;
-  protoOf(Modal).d2y = get_multiselectOptionSelectedColor;
-  protoOf(Modal).e2y = get_textScale;
-  protoOf(Card_1).y2x = get_primaryColor;
-  protoOf(Card_1).z2x = get_primaryTextColor;
-  protoOf(Card_1).a2y = get_buttonStyle;
-  protoOf(Card_1).a2x = get_buttonColor;
-  protoOf(Card_1).b2y = get_cardBackgroundColor;
-  protoOf(Card_1).c2y = get_multiselectOptionBackgroundColor;
-  protoOf(Card_1).d2y = get_multiselectOptionSelectedColor;
-  protoOf(Card_1).e2y = get_textScale;
-  protoOf(Card_1).f2y = get_textAlign;
+  protoOf(Modal).g2y = get_cardBackgroundColor;
+  protoOf(Modal).h2y = get_multiselectOptionBackgroundColor;
+  protoOf(Modal).i2y = get_multiselectOptionSelectedColor;
+  protoOf(Modal).j2y = get_textScale;
+  protoOf(Card_1).d2y = get_primaryColor;
+  protoOf(Card_1).e2y = get_primaryTextColor;
+  protoOf(Card_1).f2y = get_buttonStyle;
+  protoOf(Card_1).f2x = get_buttonColor;
+  protoOf(Card_1).g2y = get_cardBackgroundColor;
+  protoOf(Card_1).h2y = get_multiselectOptionBackgroundColor;
+  protoOf(Card_1).i2y = get_multiselectOptionSelectedColor;
+  protoOf(Card_1).j2y = get_textScale;
+  protoOf(Card_1).k2y = get_textAlign;
   protoOf(Card_1).b2t = get_content;
   protoOf(Card_1).getAnalyticsEvents = getAnalyticsEvents;
-  protoOf(TractPage).a2y = get_buttonStyle;
-  protoOf(TractPage).a2x = get_buttonColor;
-  protoOf(TractPage).f2y = get_textAlign;
+  protoOf(TractPage).f2y = get_buttonStyle;
+  protoOf(TractPage).f2x = get_buttonColor;
+  protoOf(TractPage).k2y = get_textAlign;
   protoOf(TractPage).getAnalyticsEvents = getAnalyticsEvents;
   protoOf(SaxXmlPullParser).e3g = require$default;
-  protoOf(SaxXmlPullParser).j2t = getAttributeValue;
+  protoOf(SaxXmlPullParser).o2t = getAttributeValue;
   protoOf(JsXmlPullParser).e3g = require$default;
-  protoOf(JsXmlPullParser).j2t = getAttributeValue;
+  protoOf(JsXmlPullParser).o2t = getAttributeValue;
   //endregion
   //region block: init
   XMLNS_ANALYTICS = 'https://mobile-content-api.cru.org/xmlns/analytics';
+  SCHEMA_VERSION = 2;
+  XMLNS_CONTENT = 'https://mobile-content-api.cru.org/xmlns/content';
   XMLNS_MANIFEST = 'https://mobile-content-api.cru.org/xmlns/manifest';
   XML_DISMISS_LISTENERS = 'dismiss-listeners';
   XML_PRIMARY_COLOR = 'primary-color';
@@ -11434,13 +11475,11 @@
   XML_BACKGROUND_IMAGE = 'background-image';
   XML_BACKGROUND_IMAGE_GRAVITY = 'background-image-align';
   XML_BACKGROUND_IMAGE_SCALE_TYPE = 'background-image-scale-type';
-  XMLNS_CONTENT = 'https://mobile-content-api.cru.org/xmlns/content';
   XML_TEXT_COLOR = 'text-color';
   XML_TEXT_SCALE = 'text-scale';
   XMLNS_ARTICLE = 'https://mobile-content-api.cru.org/xmlns/article';
-  XMLNS_CYOA = 'https://mobile-content-api.cru.org/xmlns/cyoa';
   XML_LISTENERS = 'listeners';
-  SCHEMA_VERSION = 2;
+  XMLNS_CYOA = 'https://mobile-content-api.cru.org/xmlns/cyoa';
   XMLNS_LESSON = 'https://mobile-content-api.cru.org/xmlns/lesson';
   XMLNS_PAGE = 'https://mobile-content-api.cru.org/xmlns/page';
   XML_CONTROL_COLOR = 'control-color';
@@ -11506,6 +11545,14 @@
     var $org$cru$godtools$shared$tool = $org$cru$godtools$shared.tool || ($org$cru$godtools$shared.tool = {});
     var $org$cru$godtools$shared$tool$parser = $org$cru$godtools$shared$tool.parser || ($org$cru$godtools$shared$tool.parser = {});
     var $org$cru$godtools$shared$tool$parser$model = $org$cru$godtools$shared$tool$parser.model || ($org$cru$godtools$shared$tool$parser.model = {});
+    $org$cru$godtools$shared$tool$parser$model.Content = Content;
+    var $org = _.org || (_.org = {});
+    var $org$cru = $org.cru || ($org.cru = {});
+    var $org$cru$godtools = $org$cru.godtools || ($org$cru.godtools = {});
+    var $org$cru$godtools$shared = $org$cru$godtools.shared || ($org$cru$godtools.shared = {});
+    var $org$cru$godtools$shared$tool = $org$cru$godtools$shared.tool || ($org$cru$godtools$shared.tool = {});
+    var $org$cru$godtools$shared$tool$parser = $org$cru$godtools$shared$tool.parser || ($org$cru$godtools$shared$tool.parser = {});
+    var $org$cru$godtools$shared$tool$parser$model = $org$cru$godtools$shared$tool$parser.model || ($org$cru$godtools$shared$tool$parser.model = {});
     $org$cru$godtools$shared$tool$parser$model.EventId = EventId;
     defineProp($org$cru$godtools$shared$tool$parser$model.EventId, 'Companion', Companion_getInstance_17);
     var $org = _.org || (_.org = {});