npm - @cruglobal/godtools-shared - Versions diffs - 0.9.0-PR398-SNAPSHOT.1155 → 0.9.0-PR407-SNAPSHOT.1161 - Mend

@cruglobal/godtools-shared 0.9.0-PR398-SNAPSHOT.1155 → 0.9.0-PR407-SNAPSHOT.1161

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

package/88b0986a7186d029-atomicfu-js-ir.js +6 -6
package/Napier-napier-js-ir.js +10 -10
package/antlr-kotlin-antlr-kotlin-runtime-js-ir.js +50 -50
package/colormath-root-colormath-js-ir.js +34 -34
package/fluid-locale-js-ir.js +20 -20
package/kotlin-kotlin-stdlib-js-ir.js +191 -190
package/kotlin-kotlin-stdlib-js-ir.js.map +1 -1
package/kotlin-mpp-godtools-tool-parser-npm.d.ts +24 -3
package/kotlin-mpp-godtools-tool-parser-parser-expressions.js +18 -18
package/kotlin-mpp-godtools-tool-parser-parser.js +992 -933
package/kotlin-mpp-godtools-tool-parser-parser.js.map +1 -1
package/kotlin-mpp-godtools-tool-parser-state.js +12 -12
package/kotlinx.coroutines-kotlinx-coroutines-core-js-ir.js +51 -51
package/package.json +2 -1

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

@@ -44,121 +44,122 @@
   var SAXOptions = $module$sax.SAXOptions;
   var get_job = kotlin_org_jetbrains_kotlinx_kotlinx_coroutines_core.$_$.n;
   var Unit_getInstance = kotlin_kotlin.$_$.i2;
-  var CoroutineImpl = kotlin_kotlin.$_$.c5;
-  var protoOf = kotlin_kotlin.$_$.g6;
-  var THROW_CCE = kotlin_kotlin.$_$.n8;
+  var CoroutineImpl = kotlin_kotlin.$_$.d5;
+  var protoOf = kotlin_kotlin.$_$.h6;
+  var THROW_CCE = kotlin_kotlin.$_$.o8;
   var CoroutineScope = kotlin_org_jetbrains_kotlinx_kotlinx_coroutines_core.$_$.l;
-  var isInterface = kotlin_kotlin.$_$.x5;
-  var get_COROUTINE_SUSPENDED = kotlin_kotlin.$_$.o4;
-  var classMeta = kotlin_kotlin.$_$.l5;
-  var VOID = kotlin_kotlin.$_$.d9;
-  var setMetadataFor = kotlin_kotlin.$_$.h6;
+  var isInterface = kotlin_kotlin.$_$.y5;
+  var get_COROUTINE_SUSPENDED = kotlin_kotlin.$_$.p4;
+  var classMeta = kotlin_kotlin.$_$.m5;
+  var VOID = kotlin_kotlin.$_$.e9;
+  var setMetadataFor = kotlin_kotlin.$_$.i6;
   var get_dynamicNull = kotlin_deezer_kustomexport_lib.$_$.a;
-  var equals = kotlin_kotlin.$_$.o5;
-  var throwUninitializedPropertyAccessException = kotlin_kotlin.$_$.z8;
+  var equals = kotlin_kotlin.$_$.p5;
+  var throwUninitializedPropertyAccessException = kotlin_kotlin.$_$.a9;
   var GlobalScope_getInstance = kotlin_org_jetbrains_kotlinx_kotlinx_coroutines_core.$_$.f;
   var promise = kotlin_org_jetbrains_kotlinx_kotlinx_coroutines_core.$_$.p;
-  var defineProp = kotlin_kotlin.$_$.n5;
+  var defineProp = kotlin_kotlin.$_$.o5;
   var Napier_getInstance = kotlin_io_github_aakira_napier.$_$.a;
-  var Exception = kotlin_kotlin.$_$.e8;
-  var CancellationException = kotlin_kotlin.$_$.n4;
+  var Exception = kotlin_kotlin.$_$.f8;
+  var CancellationException = kotlin_kotlin.$_$.o4;
   var withContext = kotlin_org_jetbrains_kotlinx_kotlinx_coroutines_core.$_$.d;
   var emptySet = kotlin_kotlin.$_$.e3;
-  var objectCreate = kotlin_kotlin.$_$.e6;
-  var objectMeta = kotlin_kotlin.$_$.f6;
+  var objectCreate = kotlin_kotlin.$_$.f6;
+  var objectMeta = kotlin_kotlin.$_$.g6;
   var Dispatchers_getInstance = kotlin_org_jetbrains_kotlinx_kotlinx_coroutines_core.$_$.e;
-  var toSet = kotlin_kotlin.$_$.k4;
-  var hashCode = kotlin_kotlin.$_$.t5;
+  var toSet = kotlin_kotlin.$_$.l4;
+  var hashCode = kotlin_kotlin.$_$.u5;
   var Exception_init_$Init$ = kotlin_kotlin.$_$.t;
-  var captureStack = kotlin_kotlin.$_$.h5;
+  var captureStack = kotlin_kotlin.$_$.i5;
   var Companion_getInstance = kotlin_io_fluidsonic_locale_fluid_locale.$_$.a;
   var toPlatform = kotlin_org_ccci_gto_android_gto_support_fluidsonic_locale.$_$.a;
   var ArrayList_init_$Create$ = kotlin_kotlin.$_$.d;
   var addAll = kotlin_kotlin.$_$.p2;
   var LinkedHashSet_init_$Create$ = kotlin_kotlin.$_$.k;
-  var toIntOrNull = kotlin_kotlin.$_$.s7;
+  var toIntOrNull = kotlin_kotlin.$_$.t7;
   var LinkedHashMap_init_$Create$ = kotlin_kotlin.$_$.j;
-  var Enum = kotlin_kotlin.$_$.c8;
+  var Enum = kotlin_kotlin.$_$.d8;
   var contains = kotlin_kotlin.$_$.u2;
-  var toBoolean = kotlin_kotlin.$_$.o7;
-  var toSet_0 = kotlin_kotlin.$_$.j4;
+  var toBoolean = kotlin_kotlin.$_$.p7;
+  var toSet_0 = kotlin_kotlin.$_$.k4;
   var toUriOrNull = kotlin_org_cru_godtools_kotlin_common.$_$.a;
   var _Char___init__impl__6a9atx = kotlin_kotlin.$_$.o1;
-  var charArrayOf = kotlin_kotlin.$_$.i5;
-  var split = kotlin_kotlin.$_$.j7;
-  var toInt = kotlin_kotlin.$_$.t7;
-  var NumberFormatException = kotlin_kotlin.$_$.k8;
-  var toString = kotlin_kotlin.$_$.k6;
+  var charArrayOf = kotlin_kotlin.$_$.j5;
+  var split = kotlin_kotlin.$_$.k7;
+  var toInt = kotlin_kotlin.$_$.u7;
+  var NumberFormatException = kotlin_kotlin.$_$.l8;
+  var toString = kotlin_kotlin.$_$.l6;
   var IllegalStateException_init_$Create$ = kotlin_kotlin.$_$.z;
   var emptyList = kotlin_kotlin.$_$.c3;
-  var noWhenBranchMatchedException = kotlin_kotlin.$_$.x8;
-  var lazy = kotlin_kotlin.$_$.w8;
-  var KProperty1 = kotlin_kotlin.$_$.w6;
-  var getPropertyCallableRef = kotlin_kotlin.$_$.r5;
-  var interfaceMeta = kotlin_kotlin.$_$.u5;
+  var noWhenBranchMatchedException = kotlin_kotlin.$_$.y8;
+  var lazy = kotlin_kotlin.$_$.x8;
+  var KProperty1 = kotlin_kotlin.$_$.x6;
+  var getPropertyCallableRef = kotlin_kotlin.$_$.s5;
+  var interfaceMeta = kotlin_kotlin.$_$.v5;
   var Companion_getInstance_0 = kotlin_com_github_ajalt_colormath_colormath.$_$.c;
-  var isBlank = kotlin_kotlin.$_$.f7;
+  var isBlank = kotlin_kotlin.$_$.g7;
   var toExpressionOrNull = kotlin_org_cru_godtools_kotlin_parser_expressions.$_$.a;
   var Collection = kotlin_kotlin.$_$.l2;
   var firstOrNull = kotlin_kotlin.$_$.i3;
-  var isCharSequence = kotlin_kotlin.$_$.w5;
-  var trim = kotlin_kotlin.$_$.y7;
-  var trimEnd = kotlin_kotlin.$_$.x7;
-  var toDoubleOrNull = kotlin_kotlin.$_$.q7;
-  var getNumberHashCode = kotlin_kotlin.$_$.q5;
+  var isCharSequence = kotlin_kotlin.$_$.x5;
+  var trim = kotlin_kotlin.$_$.z7;
+  var trimEnd = kotlin_kotlin.$_$.y7;
+  var toDoubleOrNull = kotlin_kotlin.$_$.r7;
+  var getNumberHashCode = kotlin_kotlin.$_$.r5;
   var Regex_init_$Create$ = kotlin_kotlin.$_$.o;
-  var charSequenceLength = kotlin_kotlin.$_$.k5;
-  var equals_0 = kotlin_kotlin.$_$.b7;
-  var getStringHashCode = kotlin_kotlin.$_$.s5;
-  var take = kotlin_kotlin.$_$.c4;
-  var listOfNotNull = kotlin_kotlin.$_$.s3;
-  var IllegalArgumentException_init_$Create$ = kotlin_kotlin.$_$.v;
-  var IllegalArgumentException = kotlin_kotlin.$_$.f8;
+  var charSequenceLength = kotlin_kotlin.$_$.l5;
+  var listOf = kotlin_kotlin.$_$.t3;
   var collectionSizeOrDefault = kotlin_kotlin.$_$.t2;
   var ArrayList_init_$Create$_0 = kotlin_kotlin.$_$.c;
+  var equals_0 = kotlin_kotlin.$_$.c7;
+  var getStringHashCode = kotlin_kotlin.$_$.t5;
+  var take = kotlin_kotlin.$_$.d4;
+  var listOfNotNull = kotlin_kotlin.$_$.s3;
+  var IllegalArgumentException_init_$Create$ = kotlin_kotlin.$_$.v;
+  var IllegalArgumentException = kotlin_kotlin.$_$.g8;
   var async = kotlin_org_jetbrains_kotlinx_kotlinx_coroutines_core.$_$.m;
   var awaitAll = kotlin_org_jetbrains_kotlinx_kotlinx_coroutines_core.$_$.a;
   var filterNotNull = kotlin_kotlin.$_$.h3;
-  var mapCapacity = kotlin_kotlin.$_$.u3;
-  var coerceAtLeast = kotlin_kotlin.$_$.p6;
+  var mapCapacity = kotlin_kotlin.$_$.v3;
+  var coerceAtLeast = kotlin_kotlin.$_$.q6;
   var LinkedHashMap_init_$Create$_0 = kotlin_kotlin.$_$.i;
   var launch = kotlin_org_jetbrains_kotlinx_kotlinx_coroutines_core.$_$.o;
   var emptyMap = kotlin_kotlin.$_$.d3;
   var coroutineScope = kotlin_org_jetbrains_kotlinx_kotlinx_coroutines_core.$_$.c;
-  var THROW_ISE = kotlin_kotlin.$_$.o8;
+  var THROW_ISE = kotlin_kotlin.$_$.p8;
   var HashSet_init_$Create$ = kotlin_kotlin.$_$.h;
-  var sortedWith = kotlin_kotlin.$_$.a4;
-  var to = kotlin_kotlin.$_$.b9;
-  var Comparator = kotlin_kotlin.$_$.b8;
-  var compareValues = kotlin_kotlin.$_$.m4;
+  var sortedWith = kotlin_kotlin.$_$.b4;
+  var to = kotlin_kotlin.$_$.c9;
+  var Comparator = kotlin_kotlin.$_$.c8;
+  var compareValues = kotlin_kotlin.$_$.n4;
   var Map = kotlin_kotlin.$_$.n2;
   var copyToArray = kotlin_kotlin.$_$.a3;
-  var KMutableProperty1 = kotlin_kotlin.$_$.v6;
-  var toDouble = kotlin_kotlin.$_$.r7;
-  var contains_0 = kotlin_kotlin.$_$.s6;
-  var numberRangeToNumber = kotlin_kotlin.$_$.a6;
-  var rangeTo = kotlin_kotlin.$_$.t6;
+  var KMutableProperty1 = kotlin_kotlin.$_$.w6;
+  var toDouble = kotlin_kotlin.$_$.s7;
+  var contains_0 = kotlin_kotlin.$_$.t6;
+  var numberRangeToNumber = kotlin_kotlin.$_$.b6;
+  var rangeTo = kotlin_kotlin.$_$.u6;
   var Companion_getInstance_1 = kotlin_kotlin.$_$.h2;
   var _UInt___init__impl__l7qpdl = kotlin_kotlin.$_$.y1;
-  var UInt = kotlin_kotlin.$_$.p8;
-  var split_0 = kotlin_kotlin.$_$.k7;
-  var toUInt = kotlin_kotlin.$_$.w7;
+  var UInt = kotlin_kotlin.$_$.q8;
+  var split_0 = kotlin_kotlin.$_$.l7;
+  var toUInt = kotlin_kotlin.$_$.x7;
   var IllegalArgumentException_init_$Create$_0 = kotlin_kotlin.$_$.w;
   var _UInt___get_data__impl__f0vqqw = kotlin_kotlin.$_$.z1;
-  var uintCompare = kotlin_kotlin.$_$.c9;
-  var compareTo = kotlin_kotlin.$_$.m5;
+  var uintCompare = kotlin_kotlin.$_$.d9;
+  var compareTo = kotlin_kotlin.$_$.n5;
   var joinToString = kotlin_kotlin.$_$.m3;
-  var Comparable = kotlin_kotlin.$_$.a8;
+  var Comparable = kotlin_kotlin.$_$.b8;
   var UnsupportedOperationException_init_$Create$ = kotlin_kotlin.$_$.n1;
   var lastOrNull = kotlin_kotlin.$_$.r3;
-  var isObject = kotlin_kotlin.$_$.z5;
-  var substringBefore = kotlin_kotlin.$_$.m7;
-  var contains_1 = kotlin_kotlin.$_$.z6;
+  var isObject = kotlin_kotlin.$_$.a6;
+  var substringBefore = kotlin_kotlin.$_$.n7;
+  var contains_1 = kotlin_kotlin.$_$.a7;
   var RegexOption_IGNORE_CASE_getInstance = kotlin_kotlin.$_$.b;
   var Regex_init_$Create$_0 = kotlin_kotlin.$_$.p;
-  var contains_2 = kotlin_kotlin.$_$.a7;
+  var contains_2 = kotlin_kotlin.$_$.b7;
   var StringBuilder_init_$Create$ = kotlin_kotlin.$_$.q;
-  var removeFirst = kotlin_kotlin.$_$.y3;
+  var removeFirst = kotlin_kotlin.$_$.z3;
   var IndexOutOfBoundsException_init_$Create$ = kotlin_kotlin.$_$.b1;
   var Exception_init_$Init$_0 = kotlin_kotlin.$_$.s;
   var RenderCondition_ALWAYS_getInstance = kotlin_com_github_ajalt_colormath_colormath.$_$.b;
@@ -194,12 +195,12 @@
   setMetadataFor(Companion_4, 'Companion', objectMeta);
   function get_isClickable() {
     var tmp;
-    if (!(this.h2t() == null)) {
+    if (!(this.g2t() == null)) {
       tmp = true;
     } else {
       var tmp$ret$0;
       // Inline function 'kotlin.collections.isNotEmpty' call
-      var tmp0_isNotEmpty = this.g2t();
+      var tmp0_isNotEmpty = this.f2t();
       tmp$ret$0 = !tmp0_isNotEmpty.m();
       tmp = tmp$ret$0;
     }
@@ -229,7 +230,7 @@
   }
   function get_buttonColor() {
     var tmp0_safe_receiver = this.c2r();
-    return tmp0_safe_receiver == null ? null : tmp0_safe_receiver.w2u();
+    return tmp0_safe_receiver == null ? null : tmp0_safe_receiver.v2u();
   }
   function get_cardBackgroundColor() {
     return get_cardBackgroundColor_0(this.c2r());
@@ -239,7 +240,7 @@
   }
   function get_multiselectOptionSelectedColor() {
     var tmp0_safe_receiver = this.c2r();
-    return tmp0_safe_receiver == null ? null : tmp0_safe_receiver.z2v();
+    return tmp0_safe_receiver == null ? null : tmp0_safe_receiver.y2v();
   }
   function get_textColor() {
     return get_textColor_0(this.c2r());
@@ -1556,13 +1557,13 @@
     var tmp$ret$0;
     // Inline function 'org.cru.godtools.shared.tool.parser.model.toEventIds' call
     var tmp0_toEventIds = parser.o2r('play-listeners');
-    tmp$ret$0 = Companion_getInstance_17().f2t(tmp0_toEventIds);
+    tmp$ret$0 = Companion_getInstance_17().e2t(tmp0_toEventIds);
     tmp_2.z2s_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.o2r('stop-listeners');
-    tmp$ret$1 = Companion_getInstance_17().f2t(tmp1_toEventIds);
+    tmp$ret$1 = Companion_getInstance_17().e2t(tmp1_toEventIds);
     tmp_3.a2t_1 = toSet_0(tmp$ret$1);
     // Inline function 'org.cru.godtools.shared.tool.parser.model.parseClickableAttrs' call
     // Inline function 'kotlin.contracts.contract' call
@@ -1581,7 +1582,7 @@
     var tmp$ret$2;
     // Inline function 'org.cru.godtools.shared.tool.parser.model.toEventIds' call
     var tmp2_toEventIds = parser.o2r(_get_XML_EVENTS_$accessor$11tx9p3_otmgk5());
-    tmp$ret$2 = Companion_getInstance_17().f2t(tmp2_toEventIds);
+    tmp$ret$2 = Companion_getInstance_17().e2t(tmp2_toEventIds);
     var tmp3__anonymous__ufb84q = tmp$ret$2;
     $this.b2t_1 = tmp3__anonymous__ufb84q;
     $this.c2t_1 = uri;
@@ -1591,10 +1592,10 @@
   function Animation_init_$Create$(parent, parser) {
     return Animation_init_$Init$(parent, parser, objectCreate(protoOf(Animation)));
   }
-  protoOf(Animation).g2t = function () {
+  protoOf(Animation).f2t = function () {
     return this.b2t_1;
   };
-  protoOf(Animation).h2t = function () {
+  protoOf(Animation).g2t = function () {
     return this.c2t_1;
   };
   protoOf(Animation).p2q = function () {
@@ -1614,7 +1615,7 @@
   function Companion_5() {
     Companion_instance_5 = this;
   }
-  protoOf(Companion_5).i2t = function (_this__u8e3s4) {
+  protoOf(Companion_5).h2t = 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;
@@ -1673,15 +1674,15 @@
   }
   function AspectRatio(width, height) {
     Companion_getInstance_8();
-    this.j2t_1 = width;
-    this.k2t_1 = height;
+    this.i2t_1 = width;
+    this.j2t_1 = height;
   }
   protoOf(AspectRatio).toString = function () {
-    return 'AspectRatio(width=' + this.j2t_1 + ', height=' + this.k2t_1 + ')';
+    return 'AspectRatio(width=' + this.i2t_1 + ', height=' + this.j2t_1 + ')';
   };
   protoOf(AspectRatio).hashCode = function () {
-    var result = this.j2t_1;
-    result = imul(result, 31) + this.k2t_1 | 0;
+    var result = this.i2t_1;
+    result = imul(result, 31) + this.j2t_1 | 0;
     return result;
   };
   protoOf(AspectRatio).equals = function (other) {
@@ -1690,9 +1691,9 @@
     if (!(other instanceof AspectRatio))
       return false;
     var tmp0_other_with_cast = other instanceof AspectRatio ? other : THROW_CCE();
-    if (!(this.j2t_1 === tmp0_other_with_cast.j2t_1))
+    if (!(this.i2t_1 === tmp0_other_with_cast.i2t_1))
       return false;
-    if (!(this.k2t_1 === tmp0_other_with_cast.k2t_1))
+    if (!(this.j2t_1 === tmp0_other_with_cast.j2t_1))
       return false;
     return true;
   };
@@ -1701,7 +1702,7 @@
     return tmp0_safe_receiver == null ? null : tmp0_safe_receiver.h2n();
   }
   function getResource(_this__u8e3s4, name) {
-    return _this__u8e3s4.h2n().l2t(name);
+    return _this__u8e3s4.h2n().k2t(name);
   }
   function BaseModel(parent) {
     parent = parent === VOID ? null : parent;
@@ -1744,9 +1745,9 @@
   var Type_UNKNOWN_instance;
   function Companion_6() {
     Companion_instance_6 = this;
-    this.m2t_1 = Type_UNKNOWN_getInstance();
+    this.l2t_1 = Type_UNKNOWN_getInstance();
   }
-  protoOf(Companion_6).n2t = function (_this__u8e3s4) {
+  protoOf(Companion_6).m2t = function (_this__u8e3s4) {
     var tmp0_subject = _this__u8e3s4;
     switch (tmp0_subject) {
       case 'event':
@@ -1780,7 +1781,7 @@
   function Companion_7() {
     Companion_instance_7 = this;
   }
-  protoOf(Companion_7).o2t = function (_this__u8e3s4) {
+  protoOf(Companion_7).n2t = function (_this__u8e3s4) {
     var tmp0_subject = _this__u8e3s4;
     switch (tmp0_subject) {
       case 'contained':
@@ -1810,12 +1811,12 @@
   }
   function Companion_8() {
     Companion_instance_8 = this;
-    this.p2t_1 = 'button';
-    this.q2t_1 = Horizontal_CENTER_getInstance();
-    this.r2t_1 = new Percent(1.0);
-    this.s2t_1 = get_TRANSPARENT();
-    this.t2t_1 = Horizontal_START_getInstance();
-    this.u2t_1 = 18;
+    this.o2t_1 = 'button';
+    this.p2t_1 = Horizontal_CENTER_getInstance();
+    this.q2t_1 = new Percent(1.0);
+    this.r2t_1 = get_TRANSPARENT();
+    this.s2t_1 = Horizontal_START_getInstance();
+    this.t2t_1 = 18;
   }
   var Companion_instance_8;
   function Companion_getInstance_11() {
@@ -1827,7 +1828,7 @@
     var tmp$ret$0;
     // Inline function 'kotlin.getValue' call
     var tmp0_getValue = defaultTextStyles$factory();
-    tmp$ret$0 = $this.n2u_1.o1();
+    tmp$ret$0 = $this.m2u_1.o1();
     return tmp$ret$0;
   }
   function Button_init_$Init$(parent, parser, $this) {
@@ -1837,7 +1838,7 @@
     var tmp = get_XMLNS_CONTENT();
     Companion_getInstance_11();
     parser.b2q(2, tmp, 'button');
-    var type = Companion_getInstance_9().n2t(parser.o2r('type'));
+    var type = Companion_getInstance_9().m2t(parser.o2r('type'));
     // Inline function 'org.cru.godtools.shared.tool.parser.model.parseClickableAttrs' call
     // Inline function 'kotlin.contracts.contract' call
     var rawUrl = parser.o2r(_get_XML_URL_$accessor$11tx9p3_lkk5sb());
@@ -1855,19 +1856,19 @@
     var tmp$ret$0;
     // Inline function 'org.cru.godtools.shared.tool.parser.model.toEventIds' call
     var tmp0_toEventIds = parser.o2r(_get_XML_EVENTS_$accessor$11tx9p3_otmgk5());
-    tmp$ret$0 = Companion_getInstance_17().f2t(tmp0_toEventIds);
+    tmp$ret$0 = Companion_getInstance_17().e2t(tmp0_toEventIds);
     var tmp1__anonymous__uwfjfc = tmp$ret$0;
-    $this.d2u_1 = (type == null ? true : equals(type, Type_EVENT_getInstance())) ? tmp1__anonymous__uwfjfc : emptyList();
-    $this.e2u_1 = (type == null ? true : equals(type, Type_URL_getInstance())) ? uri : null;
+    $this.c2u_1 = (type == null ? true : equals(type, Type_EVENT_getInstance())) ? tmp1__anonymous__uwfjfc : emptyList();
+    $this.d2u_1 = (type == null ? true : equals(type, Type_URL_getInstance())) ? uri : null;
     var tmp_1 = $this;
     var tmp0_safe_receiver_0 = parser.o2r('style');
-    tmp_1.f2u_1 = tmp0_safe_receiver_0 == null ? null : Companion_getInstance_10().o2t(tmp0_safe_receiver_0);
+    tmp_1.e2u_1 = tmp0_safe_receiver_0 == null ? null : Companion_getInstance_10().n2t(tmp0_safe_receiver_0);
     var tmp_2 = $this;
-    var tmp1_safe_receiver = Companion_getInstance_22().r2u(parser.o2r('gravity'));
-    var tmp2_elvis_lhs = tmp1_safe_receiver == null ? null : tmp1_safe_receiver.s2u_1;
-    tmp_2.g2u_1 = tmp2_elvis_lhs == null ? Companion_getInstance_11().q2t_1 : tmp2_elvis_lhs;
+    var tmp1_safe_receiver = Companion_getInstance_22().q2u(parser.o2r('gravity'));
+    var tmp2_elvis_lhs = tmp1_safe_receiver == null ? null : tmp1_safe_receiver.r2u_1;
+    tmp_2.f2u_1 = tmp2_elvis_lhs == null ? Companion_getInstance_11().p2t_1 : tmp2_elvis_lhs;
     var tmp_3 = $this;
-    var tmp3_safe_receiver = Companion_getInstance_16().u2u(parser.o2r('width'));
+    var tmp3_safe_receiver = Companion_getInstance_16().t2u(parser.o2r('width'));
     var tmp_4;
     if (tmp3_safe_receiver == null) {
       tmp_4 = null;
@@ -1888,19 +1889,19 @@
       tmp_4 = tmp$ret$2;
     }
     var tmp4_elvis_lhs = tmp_4;
-    tmp_3.h2u_1 = tmp4_elvis_lhs == null ? Companion_getInstance_11().r2t_1 : tmp4_elvis_lhs;
+    tmp_3.g2u_1 = tmp4_elvis_lhs == null ? Companion_getInstance_11().q2t_1 : tmp4_elvis_lhs;
     var tmp_6 = $this;
     var tmp5_safe_receiver = parser.o2r('color');
-    tmp_6.i2u_1 = tmp5_safe_receiver == null ? null : toColorOrNull(tmp5_safe_receiver);
+    tmp_6.h2u_1 = tmp5_safe_receiver == null ? null : toColorOrNull(tmp5_safe_receiver);
     var tmp_7 = $this;
     var tmp6_safe_receiver = parser.o2r(get_XML_BACKGROUND_COLOR());
     var tmp7_elvis_lhs = tmp6_safe_receiver == null ? null : toColorOrNull(tmp6_safe_receiver);
-    tmp_7.j2u_1 = tmp7_elvis_lhs == null ? Companion_getInstance_11().s2t_1 : tmp7_elvis_lhs;
-    $this.k2u_1 = parser.o2r('icon');
+    tmp_7.i2u_1 = tmp7_elvis_lhs == null ? Companion_getInstance_11().r2t_1 : tmp7_elvis_lhs;
+    $this.j2u_1 = parser.o2r('icon');
     var tmp_8 = $this;
-    var tmp8_safe_receiver = Companion_getInstance_22().r2u(parser.o2r('icon-gravity'));
-    var tmp9_elvis_lhs = tmp8_safe_receiver == null ? null : tmp8_safe_receiver.s2u_1;
-    tmp_8.m2u_1 = tmp9_elvis_lhs == null ? Companion_getInstance_11().t2t_1 : tmp9_elvis_lhs;
+    var tmp8_safe_receiver = Companion_getInstance_22().q2u(parser.o2r('icon-gravity'));
+    var tmp9_elvis_lhs = tmp8_safe_receiver == null ? null : tmp8_safe_receiver.r2u_1;
+    tmp_8.l2u_1 = tmp9_elvis_lhs == null ? Companion_getInstance_11().s2t_1 : tmp9_elvis_lhs;
     var tmp_9 = $this;
     var tmp10_safe_receiver = parser.o2r('icon-size');
     var tmp11_elvis_lhs = tmp10_safe_receiver == null ? null : toIntOrNull(tmp10_safe_receiver);
@@ -1911,20 +1912,20 @@
     } else {
       tmp_10 = tmp11_elvis_lhs;
     }
-    tmp_9.l2u_1 = tmp_10;
+    tmp_9.k2u_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.p2u_1 = tmp$ret$3;
+    tmp_11.o2u_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.o2u_1 = tmp12_elvis_lhs == null ? Text_init_$Create$_0(_get_defaultTextStyles__fjozb5($this)) : tmp12_elvis_lhs;
+    tmp_12.n2u_1 = tmp12_elvis_lhs == null ? Text_init_$Create$_0(_get_defaultTextStyles__fjozb5($this)) : tmp12_elvis_lhs;
     // Inline function 'kotlin.collections.forEach' call
-    var tmp2_forEach = $this.p2u_1;
+    var tmp2_forEach = $this.o2u_1;
     var tmp0_iterator = tmp2_forEach.f();
     while (tmp0_iterator.g()) {
       var element = tmp0_iterator.h();
@@ -1950,7 +1951,7 @@
   }
   function Button$defaultTextStyles$delegate$lambda$lambda_0(this$0) {
     return function () {
-      var tmp0_subject = this$0.v2u();
+      var tmp0_subject = this$0.u2u();
       var tmp0 = tmp0_subject.d4_1;
       var tmp;
       switch (tmp0) {
@@ -1959,7 +1960,7 @@
           tmp = get_primaryTextColor_0(this$0.c2r());
           break;
         case 1:
-          tmp = this$0.w2u();
+          tmp = this$0.v2u();
           break;
         default:
           noWhenBranchMatchedException();
@@ -1984,7 +1985,7 @@
         Companion_getInstance_6();
         if (tmp1_subject === 'events') {
           var tmp2_this = this$0;
-          var tmp0_plusAssign = tmp2_this.p2u_1;
+          var tmp0_plusAssign = tmp2_this.o2u_1;
           var tmp1_plusAssign = Companion_getInstance_6().f2q($parser, this$0);
           addAll(tmp0_plusAssign, tmp1_plusAssign);
           tmp_0 = Unit_getInstance();
@@ -2018,18 +2019,18 @@
     Style_initEntries();
     return Style_UNKNOWN_instance;
   }
+  protoOf(Button).f2t = function () {
+    return this.c2u_1;
+  };
   protoOf(Button).g2t = function () {
     return this.d2u_1;
   };
-  protoOf(Button).h2t = function () {
-    return this.e2u_1;
-  };
-  protoOf(Button).v2u = function () {
-    var tmp0_elvis_lhs = this.f2u_1;
+  protoOf(Button).u2u = function () {
+    var tmp0_elvis_lhs = this.e2u_1;
     return tmp0_elvis_lhs == null ? get_buttonStyle_0(this.c2r()) : tmp0_elvis_lhs;
   };
-  protoOf(Button).w2u = function () {
-    var tmp0_elvis_lhs = this.i2u_1;
+  protoOf(Button).v2u = function () {
+    var tmp0_elvis_lhs = this.h2u_1;
     var tmp;
     if (tmp0_elvis_lhs == null) {
       var tmp$ret$1;
@@ -2039,7 +2040,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.w2u();
+      var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.v2u();
       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;
@@ -2049,12 +2050,12 @@
     return tmp;
   };
   protoOf(Button).p2q = function () {
-    return (protoOf(Content).p2q.call(this) ? true : !this.x2u()) ? true : this.v2u().equals(Style_UNKNOWN_getInstance());
+    return (protoOf(Content).p2q.call(this) ? true : !this.w2u()) ? true : this.u2u().equals(Style_UNKNOWN_getInstance());
   };
   function Button() {
     Companion_getInstance_11();
     var tmp = this;
-    tmp.n2u_1 = lazy(Button$defaultTextStyles$delegate$lambda(this));
+    tmp.m2u_1 = lazy(Button$defaultTextStyles$delegate$lambda(this));
   }
   function defaultTextStyles$factory() {
     return getPropertyCallableRef('defaultTextStyles', 1, KProperty1, function (receiver) {
@@ -2063,8 +2064,8 @@
   }
   function Companion_9() {
     Companion_instance_9 = this;
-    this.y2u_1 = 'card';
-    this.z2u_1 = 'card-background-color';
+    this.x2u_1 = 'card';
+    this.y2u_1 = 'card-background-color';
   }
   var Companion_instance_9;
   function Companion_getInstance_12() {
@@ -2079,7 +2080,7 @@
     var tmp = get_XMLNS_CONTENT();
     Companion_getInstance_12();
     parser.b2q(2, tmp, 'card');
-    $this.i2v_1 = toColorOrNull(parser.o2r(get_XML_BACKGROUND_COLOR()));
+    $this.h2v_1 = toColorOrNull(parser.o2r(get_XML_BACKGROUND_COLOR()));
     // Inline function 'org.cru.godtools.shared.tool.parser.model.parseClickableAttrs' call
     // Inline function 'kotlin.contracts.contract' call
     var rawUrl = parser.o2r(_get_XML_URL_$accessor$11tx9p3_lkk5sb());
@@ -2097,10 +2098,10 @@
     var tmp$ret$0;
     // Inline function 'org.cru.godtools.shared.tool.parser.model.toEventIds' call
     var tmp0_toEventIds = parser.o2r(_get_XML_EVENTS_$accessor$11tx9p3_otmgk5());
-    tmp$ret$0 = Companion_getInstance_17().f2t(tmp0_toEventIds);
+    tmp$ret$0 = Companion_getInstance_17().e2t(tmp0_toEventIds);
     var tmp1__anonymous__uwfjfc = tmp$ret$0;
-    $this.k2v_1 = tmp1__anonymous__uwfjfc;
-    $this.l2v_1 = uri;
+    $this.j2v_1 = tmp1__anonymous__uwfjfc;
+    $this.k2v_1 = uri;
     var tmp_1 = $this;
     var tmp$ret$9;
     // Inline function 'org.cru.godtools.shared.tool.parser.model.parseContent' call
@@ -2180,21 +2181,21 @@
     tmp$ret$7 = tmp$ret$6.u7();
     tmp$ret$8 = tmp$ret$7;
     tmp$ret$9 = tmp$ret$8;
-    tmp_1.j2v_1 = tmp$ret$9;
+    tmp_1.i2v_1 = tmp$ret$9;
     return $this;
   }
   function Card_init_$Create$(parent, parser) {
     return Card_init_$Init$(parent, parser, objectCreate(protoOf(Card)));
   }
   protoOf(Card).a2r = function () {
+    return this.i2v_1;
+  };
+  protoOf(Card).f2t = function () {
     return this.j2v_1;
   };
   protoOf(Card).g2t = function () {
     return this.k2v_1;
   };
-  protoOf(Card).h2t = function () {
-    return this.l2v_1;
-  };
   protoOf(Card).p2q = function () {
     var tmp;
     var tmp_0 = this.h2n().q2r_1;
@@ -2211,7 +2212,7 @@
   }
   function Companion_10() {
     Companion_instance_10 = this;
-    this.m2v_1 = 'category';
+    this.l2v_1 = 'category';
   }
   var Companion_instance_10;
   function Companion_getInstance_13() {
@@ -2226,8 +2227,8 @@
     var tmp = get_XMLNS_MANIFEST();
     Companion_getInstance_13();
     parser.b2q(2, tmp, 'category');
-    $this.o2v_1 = parser.o2r('id');
-    $this.r2v_1 = parser.o2r('banner');
+    $this.n2v_1 = parser.o2r('id');
+    $this.q2v_1 = parser.o2r('banner');
     var label = null;
     var tmp_0 = $this;
     var tmp$ret$4;
@@ -2283,15 +2284,15 @@
     tmp$ret$2 = tmp0_apply;
     tmp$ret$3 = tmp$ret$2.u7();
     tmp$ret$4 = tmp$ret$3;
-    tmp_0.q2v_1 = tmp$ret$4;
-    $this.p2v_1 = label;
+    tmp_0.p2v_1 = tmp$ret$4;
+    $this.o2v_1 = label;
     return $this;
   }
   function Category_init_$Create$(manifest, parser) {
     return Category_init_$Init$(manifest, parser, objectCreate(protoOf(Category)));
   }
-  protoOf(Category).s2v = function () {
-    return this.h2n().t2v();
+  protoOf(Category).r2v = function () {
+    return this.h2n().s2v();
   };
   function Category() {
     Companion_getInstance_13();
@@ -2447,16 +2448,16 @@
     tmp_0.j2q_1 = tmp$ret$5;
     var tmp_3 = $this;
     var tmp4_safe_receiver = parser.o2r('required-device-type');
-    var tmp6_elvis_lhs = tmp4_safe_receiver == null ? null : Companion_getInstance_15().d2w(tmp4_safe_receiver);
+    var tmp6_elvis_lhs = tmp4_safe_receiver == null ? null : Companion_getInstance_15().c2w(tmp4_safe_receiver);
     var tmp_4;
     if (tmp6_elvis_lhs == null) {
       var tmp5_safe_receiver = parser.o2r('restrictTo');
-      tmp_4 = tmp5_safe_receiver == null ? null : Companion_getInstance_15().d2w(tmp5_safe_receiver);
+      tmp_4 = tmp5_safe_receiver == null ? null : Companion_getInstance_15().c2w(tmp5_safe_receiver);
     } else {
       tmp_4 = tmp6_elvis_lhs;
     }
     var tmp7_elvis_lhs = tmp_4;
-    tmp_3.k2q_1 = tmp7_elvis_lhs == null ? Companion_getInstance_15().c2w_1 : tmp7_elvis_lhs;
+    tmp_3.k2q_1 = tmp7_elvis_lhs == null ? Companion_getInstance_15().b2w_1 : tmp7_elvis_lhs;
     var tmp_5 = $this;
     var tmp8_safe_receiver = parser.o2r('required-android-version');
     var tmp_6;
@@ -2468,7 +2469,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().e2w(tmp8_safe_receiver);
+      var tmp0_elvis_lhs_0 = Companion_getInstance_42().d2w(tmp8_safe_receiver);
       var tmp_7;
       var tmp_8 = tmp0_elvis_lhs_0;
       if ((tmp_8 == null ? null : new Version(tmp_8)) == null) {
@@ -2492,7 +2493,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().e2w(tmp9_safe_receiver);
+      var tmp0_elvis_lhs_1 = Companion_getInstance_42().d2w(tmp9_safe_receiver);
       var tmp_11;
       var tmp_12 = tmp0_elvis_lhs_1;
       if ((tmp_12 == null ? null : new Version(tmp_12)) == null) {
@@ -2518,7 +2519,7 @@
     parent = parent === VOID ? createTestManifest() : parent;
     version = version === VOID ? get_SCHEMA_VERSION() : version;
     requiredFeatures = requiredFeatures === VOID ? emptySet() : requiredFeatures;
-    requiredDeviceType = requiredDeviceType === VOID ? Companion_getInstance_15().c2w_1 : requiredDeviceType;
+    requiredDeviceType = requiredDeviceType === VOID ? Companion_getInstance_15().b2w_1 : requiredDeviceType;
     requiredAndroidVersion = requiredAndroidVersion === VOID ? null : requiredAndroidVersion;
     requiredIosVersion = requiredIosVersion === VOID ? null : requiredIosVersion;
     invisibleIf = invisibleIf === VOID ? null : invisibleIf;
@@ -2802,9 +2803,9 @@
   var DeviceType_UNKNOWN_instance;
   function Companion_12() {
     Companion_instance_12 = this;
-    this.c2w_1 = toSet(values());
+    this.b2w_1 = toSet(values());
   }
-  protoOf(Companion_12).d2w = function (_this__u8e3s4) {
+  protoOf(Companion_12).c2w = function (_this__u8e3s4) {
     var tmp$ret$2;
     // Inline function 'kotlin.collections.mapTo' call
     var tmp0_mapTo = get_REGEX_SEQUENCE_SEPARATOR().ec(_this__u8e3s4);
@@ -2881,7 +2882,7 @@
   function Companion_13() {
     Companion_instance_13 = this;
   }
-  protoOf(Companion_13).u2u = function (_this__u8e3s4) {
+  protoOf(Companion_13).t2u = function (_this__u8e3s4) {
     var tmp0_safe_receiver = _this__u8e3s4;
     var tmp;
     if (tmp0_safe_receiver == null) {
@@ -2952,13 +2953,13 @@
   }
   function Percent(value) {
     Dimension.call(this);
-    this.o2w_1 = value;
+    this.n2w_1 = value;
   }
   protoOf(Percent).toString = function () {
-    return 'Percent(value=' + this.o2w_1 + ')';
+    return 'Percent(value=' + this.n2w_1 + ')';
   };
   protoOf(Percent).hashCode = function () {
-    return getNumberHashCode(this.o2w_1);
+    return getNumberHashCode(this.n2w_1);
   };
   protoOf(Percent).equals = function (other) {
     if (this === other)
@@ -2966,19 +2967,19 @@
     if (!(other instanceof Percent))
       return false;
     var tmp0_other_with_cast = other instanceof Percent ? other : THROW_CCE();
-    if (!equals(this.o2w_1, tmp0_other_with_cast.o2w_1))
+    if (!equals(this.n2w_1, tmp0_other_with_cast.n2w_1))
       return false;
     return true;
   };
   function Pixels(value) {
     Dimension.call(this);
-    this.p2w_1 = value;
+    this.o2w_1 = value;
   }
   protoOf(Pixels).toString = function () {
-    return 'Pixels(value=' + this.p2w_1 + ')';
+    return 'Pixels(value=' + this.o2w_1 + ')';
   };
   protoOf(Pixels).hashCode = function () {
-    return this.p2w_1;
+    return this.o2w_1;
   };
   protoOf(Pixels).equals = function (other) {
     if (this === other)
@@ -2986,7 +2987,7 @@
     if (!(other instanceof Pixels))
       return false;
     var tmp0_other_with_cast = other instanceof Pixels ? other : THROW_CCE();
-    if (!(this.p2w_1 === tmp0_other_with_cast.p2w_1))
+    if (!(this.o2w_1 === tmp0_other_with_cast.o2w_1))
       return false;
     return true;
   };
@@ -3004,9 +3005,12 @@
   }
   function Companion_14() {
     Companion_instance_14 = this;
-    this.e2t_1 = new EventId('followup', 'send');
+    this.FOLLOWUP = new EventId('followup', 'send');
   }
-  protoOf(Companion_14).f2t = function (raw) {
+  protoOf(Companion_14).p2w = function () {
+    return this.FOLLOWUP;
+  };
+  protoOf(Companion_14).e2t = function (raw) {
     var tmp$ret$6;
     // Inline function 'kotlin.collections.orEmpty' call
     var tmp0_safe_receiver = raw;
@@ -3081,31 +3085,63 @@
   function EventId(namespace, name) {
     Companion_getInstance_17();
     namespace = namespace === VOID ? null : namespace;
-    this.q2w_1 = namespace;
-    this.r2w_1 = name;
+    this.namespace = namespace;
+    this.name = name;
   }
+  protoOf(EventId).d2q = function () {
+    return this.namespace;
+  };
+  protoOf(EventId).id = function () {
+    return this.name;
+  };
+  protoOf(EventId).resolve = function (state) {
+    var tmp0_subject = this.namespace;
+    var tmp;
+    if (tmp0_subject === 'state') {
+      var tmp$ret$2;
+      // Inline function 'kotlin.collections.map' call
+      var tmp1_map = state.k18(this.name);
+      var tmp$ret$1;
+      // Inline function 'kotlin.collections.mapTo' call
+      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 tmp$ret$0;
+        // Inline function 'org.cru.godtools.shared.tool.parser.model.EventId.resolve.<anonymous>' call
+        tmp$ret$0 = new EventId(VOID, item);
+        tmp0_mapTo.b(tmp$ret$0);
+      }
+      tmp$ret$1 = tmp0_mapTo;
+      tmp$ret$2 = tmp$ret$1;
+      tmp = tmp$ret$2;
+    } else {
+      tmp = listOf(this);
+    }
+    return tmp;
+  };
   protoOf(EventId).equals = function (other) {
     var tmp;
     var tmp_0;
     if (other instanceof EventId) {
-      tmp_0 = this.q2w_1 == other.q2w_1;
+      tmp_0 = this.namespace == other.namespace;
     } else {
       tmp_0 = false;
     }
     if (tmp_0) {
-      tmp = equals_0(this.r2w_1, other.r2w_1, true);
+      tmp = equals_0(this.name, other.name, true);
     } else {
       tmp = false;
     }
     return tmp;
   };
   protoOf(EventId).hashCode = function () {
-    var tmp0_safe_receiver = this.q2w_1;
+    var tmp0_safe_receiver = this.namespace;
     var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : getStringHashCode(tmp0_safe_receiver);
     var tmp = imul(tmp1_elvis_lhs == null ? 0 : tmp1_elvis_lhs, 31);
     var tmp$ret$1;
     // Inline function 'kotlin.text.lowercase' call
-    var tmp0_lowercase = this.r2w_1;
+    var tmp0_lowercase = this.name;
     var tmp$ret$0;
     // Inline function 'kotlin.js.asDynamic' call
     tmp$ret$0 = tmp0_lowercase;
@@ -3113,11 +3149,11 @@
     return tmp + getStringHashCode(tmp$ret$1) | 0;
   };
   protoOf(EventId).toString = function () {
-    return !(this.q2w_1 == null) ? '' + this.q2w_1 + ':' + this.r2w_1 : this.r2w_1;
+    return !(this.namespace == null) ? '' + this.namespace + ':' + this.name : this.name;
   };
   function Companion_15() {
     Companion_instance_15 = this;
-    this.s2w_1 = 'fallback';
+    this.q2w_1 = 'fallback';
   }
   var Companion_instance_15;
   function Companion_getInstance_18() {
@@ -3225,14 +3261,14 @@
     tmp$ret$6 = tmp$ret$5.u7();
     tmp$ret$7 = tmp$ret$6;
     tmp$ret$8 = tmp$ret$7;
-    tmp_1.n2w_1 = tmp$ret$8;
+    tmp_1.m2w_1 = tmp$ret$8;
     return $this;
   }
   function Fallback_init_$Create$(parent, parser) {
     return Fallback_init_$Init$(parent, parser, objectCreate(protoOf(Fallback)));
   }
   protoOf(Fallback).a2r = function () {
-    return take(this.n2w_1, 1);
+    return take(this.m2w_1, 1);
   };
   protoOf(Fallback).d2r = function () {
     var tmp$ret$3;
@@ -3262,7 +3298,7 @@
   }
   function Companion_16() {
     Companion_instance_16 = this;
-    this.t2w_1 = 'width';
+    this.r2w_1 = 'width';
   }
   var Companion_instance_16;
   function Companion_getInstance_19() {
@@ -3275,11 +3311,11 @@
     Item.call($this);
     Companion_getInstance_59();
     parser.b2q(2, get_XMLNS_CONTENT(), 'item');
-    $this.v2w_1 = flow;
+    $this.t2w_1 = flow;
     var tmp = $this;
     var tmp_0 = Companion_getInstance_16();
     Companion_getInstance_19();
-    tmp.w2w_1 = tmp_0.u2u(parser.o2r('width'));
+    tmp.u2w_1 = tmp_0.t2u(parser.o2r('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
@@ -3306,7 +3342,7 @@
       tmp$ret$1 = tmp_3;
       tmp_2 = tmp$ret$1;
     }
-    tmp_1.x2w_1 = tmp_2;
+    tmp_1.v2w_1 = tmp_2;
     var tmp_4 = $this;
     var tmp1_safe_receiver = tmp1__anonymous__uwfjfc;
     var tmp_5;
@@ -3328,7 +3364,7 @@
       tmp$ret$3 = tmp_6;
       tmp_5 = tmp$ret$3;
     }
-    tmp_4.y2w_1 = tmp_5;
+    tmp_4.w2w_1 = tmp_5;
     var tmp_7 = $this;
     var tmp$ret$12;
     // Inline function 'org.cru.godtools.shared.tool.parser.model.parseContent' call
@@ -3408,7 +3444,7 @@
     tmp$ret$10 = tmp$ret$9.u7();
     tmp$ret$11 = tmp$ret$10;
     tmp$ret$12 = tmp$ret$11;
-    tmp_7.z2w_1 = tmp$ret$12;
+    tmp_7.x2w_1 = tmp$ret$12;
     return $this;
   }
   function Item_init_$Create$(flow, parser) {
@@ -3417,11 +3453,11 @@
   function Item_init_$Init$_0(flow, content, $this) {
     BaseModel.call($this, flow);
     Item.call($this);
-    $this.v2w_1 = flow;
+    $this.t2w_1 = flow;
+    $this.u2w_1 = null;
+    $this.v2w_1 = null;
     $this.w2w_1 = null;
-    $this.x2w_1 = null;
-    $this.y2w_1 = null;
-    $this.z2w_1 = listOfNotNull(content($this));
+    $this.x2w_1 = listOfNotNull(content($this));
     return $this;
   }
   function Item_init_$Create$_0(flow, content) {
@@ -3429,10 +3465,10 @@
   }
   function Companion_17() {
     Companion_instance_17 = this;
-    this.a2x_1 = 'flow';
-    this.b2x_1 = 'item-width';
-    this.c2x_1 = new Percent(1.0);
-    this.d2x_1 = Horizontal_START_getInstance();
+    this.y2w_1 = 'flow';
+    this.z2w_1 = 'item-width';
+    this.a2x_1 = new Percent(1.0);
+    this.b2x_1 = Horizontal_START_getInstance();
   }
   var Companion_instance_17;
   function Companion_getInstance_20() {
@@ -3450,18 +3486,18 @@
     var tmp_0 = $this;
     var tmp_1 = Companion_getInstance_16();
     Companion_getInstance_20();
-    var tmp0_elvis_lhs = tmp_1.u2u(parser.o2r('item-width'));
-    tmp_0.m2x_1 = tmp0_elvis_lhs == null ? Companion_getInstance_20().c2x_1 : tmp0_elvis_lhs;
+    var tmp0_elvis_lhs = tmp_1.t2u(parser.o2r('item-width'));
+    tmp_0.k2x_1 = tmp0_elvis_lhs == null ? Companion_getInstance_20().a2x_1 : tmp0_elvis_lhs;
     var tmp_2 = $this;
     var tmp1_safe_receiver = parser.o2r('row-gravity');
-    var tmp2_safe_receiver = tmp1_safe_receiver == null ? null : Companion_getInstance_22().r2u(tmp1_safe_receiver);
-    var tmp3_elvis_lhs = tmp2_safe_receiver == null ? null : tmp2_safe_receiver.s2u_1;
-    tmp_2.n2x_1 = tmp3_elvis_lhs == null ? Companion_getInstance_20().d2x_1 : tmp3_elvis_lhs;
+    var tmp2_safe_receiver = tmp1_safe_receiver == null ? null : Companion_getInstance_22().q2u(tmp1_safe_receiver);
+    var tmp3_elvis_lhs = tmp2_safe_receiver == null ? null : tmp2_safe_receiver.r2u_1;
+    tmp_2.l2x_1 = tmp3_elvis_lhs == null ? Companion_getInstance_20().b2x_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.o2x_1 = tmp$ret$0;
+    tmp_3.m2x_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();
@@ -3480,7 +3516,7 @@
         if (tmp1_subject === 'item') {
           var tmp2_this = $this;
           // Inline function 'kotlin.collections.plusAssign' call
-          var tmp0_plusAssign = tmp2_this.o2x_1;
+          var tmp0_plusAssign = tmp2_this.m2x_1;
           var tmp1_plusAssign = Item_init_$Create$($this, parser);
           tmp0_plusAssign.b(tmp1_plusAssign);
         }
@@ -3491,12 +3527,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.z2w_1;
+        var tmp2_isNotEmpty = item.x2w_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.o2x_1;
+          var tmp3_plusAssign = tmp3_this.m2x_1;
           tmp3_plusAssign.b(item);
         }
       }
@@ -3512,7 +3548,7 @@
     return Flow_init_$Init$(parent, parser, objectCreate(protoOf(Flow)));
   }
   protoOf(Item).a2r = function () {
-    return this.z2w_1;
+    return this.x2w_1;
   };
   function Item() {
     Companion_getInstance_19();
@@ -3558,7 +3594,7 @@
   }
   function Companion_18() {
     Companion_instance_18 = this;
-    this.p2x_1 = 'form';
+    this.n2x_1 = 'form';
   }
   var Companion_instance_18;
   function Companion_getInstance_21() {
@@ -3652,14 +3688,14 @@
     tmp$ret$6 = tmp$ret$5.u7();
     tmp$ret$7 = tmp$ret$6;
     tmp$ret$8 = tmp$ret$7;
-    tmp_0.y2x_1 = tmp$ret$8;
+    tmp_0.w2x_1 = tmp$ret$8;
     return $this;
   }
   function Form_init_$Create$(parent, parser) {
     return Form_init_$Init$(parent, parser, objectCreate(protoOf(Form)));
   }
   protoOf(Form).a2r = function () {
-    return this.y2x_1;
+    return this.w2x_1;
   };
   protoOf(Form).d2r = function () {
     var tmp$ret$3;
@@ -3718,9 +3754,9 @@
   }
   function Companion_19() {
     Companion_instance_19 = this;
-    this.q2u_1 = new Gravity(Horizontal_CENTER_getInstance(), Vertical_CENTER_getInstance());
+    this.p2u_1 = new Gravity(Horizontal_CENTER_getInstance(), Vertical_CENTER_getInstance());
   }
-  protoOf(Companion_19).r2u = function (_this__u8e3s4) {
+  protoOf(Companion_19).q2u = function (_this__u8e3s4) {
     if (_this__u8e3s4 == null)
       return null;
     var tmp;
@@ -3852,14 +3888,14 @@
   }
   function Gravity(horizontal, vertical) {
     Companion_getInstance_22();
-    this.s2u_1 = horizontal;
-    this.t2u_1 = vertical;
+    this.r2u_1 = horizontal;
+    this.s2u_1 = vertical;
   }
   function Companion_20() {
     Companion_instance_20 = this;
-    this.z2x_1 = 'image';
-    this.a2y_1 = Horizontal_CENTER_getInstance();
-    this.b2y_1 = new Percent(1.0);
+    this.x2x_1 = 'image';
+    this.y2x_1 = Horizontal_CENTER_getInstance();
+    this.z2x_1 = new Percent(1.0);
   }
   var Companion_instance_20;
   function Companion_getInstance_23() {
@@ -3874,7 +3910,7 @@
     var tmp = get_XMLNS_CONTENT();
     Companion_getInstance_23();
     parser.b2q(2, tmp, 'image');
-    $this.m2y_1 = parser.o2r('resource');
+    $this.k2y_1 = parser.o2r('resource');
     // Inline function 'org.cru.godtools.shared.tool.parser.model.parseClickableAttrs' call
     // Inline function 'kotlin.contracts.contract' call
     var rawUrl = parser.o2r(_get_XML_URL_$accessor$11tx9p3_lkk5sb());
@@ -3892,16 +3928,16 @@
     var tmp$ret$0;
     // Inline function 'org.cru.godtools.shared.tool.parser.model.toEventIds' call
     var tmp0_toEventIds = parser.o2r(_get_XML_EVENTS_$accessor$11tx9p3_otmgk5());
-    tmp$ret$0 = Companion_getInstance_17().f2t(tmp0_toEventIds);
+    tmp$ret$0 = Companion_getInstance_17().e2t(tmp0_toEventIds);
     var tmp1__anonymous__uwfjfc = tmp$ret$0;
-    $this.k2y_1 = tmp1__anonymous__uwfjfc;
-    $this.l2y_1 = uri;
+    $this.i2y_1 = tmp1__anonymous__uwfjfc;
+    $this.j2y_1 = uri;
     var tmp_1 = $this;
-    var tmp0_safe_receiver_0 = Companion_getInstance_22().r2u(parser.o2r('gravity'));
-    var tmp1_elvis_lhs = tmp0_safe_receiver_0 == null ? null : tmp0_safe_receiver_0.s2u_1;
-    tmp_1.n2y_1 = tmp1_elvis_lhs == null ? Companion_getInstance_23().a2y_1 : tmp1_elvis_lhs;
+    var tmp0_safe_receiver_0 = Companion_getInstance_22().q2u(parser.o2r('gravity'));
+    var tmp1_elvis_lhs = tmp0_safe_receiver_0 == null ? null : tmp0_safe_receiver_0.r2u_1;
+    tmp_1.l2y_1 = tmp1_elvis_lhs == null ? Companion_getInstance_23().y2x_1 : tmp1_elvis_lhs;
     var tmp_2 = $this;
-    var tmp2_safe_receiver = Companion_getInstance_16().u2u(parser.o2r('width'));
+    var tmp2_safe_receiver = Companion_getInstance_16().t2u(parser.o2r('width'));
     var tmp_3;
     if (tmp2_safe_receiver == null) {
       tmp_3 = null;
@@ -3922,18 +3958,18 @@
       tmp_3 = tmp$ret$2;
     }
     var tmp3_elvis_lhs = tmp_3;
-    tmp_2.o2y_1 = tmp3_elvis_lhs == null ? Companion_getInstance_23().b2y_1 : tmp3_elvis_lhs;
+    tmp_2.m2y_1 = tmp3_elvis_lhs == null ? Companion_getInstance_23().z2x_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).g2t = function () {
-    return this.k2y_1;
+  protoOf(Image).f2t = function () {
+    return this.i2y_1;
   };
-  protoOf(Image).h2t = function () {
-    return this.l2y_1;
+  protoOf(Image).g2t = function () {
+    return this.j2y_1;
   };
   protoOf(Image).p2q = function () {
     var tmp;
@@ -3942,7 +3978,7 @@
     } else {
       var tmp$ret$0;
       // Inline function 'kotlin.text.isNullOrEmpty' call
-      var tmp0_isNullOrEmpty = this.m2y_1;
+      var tmp0_isNullOrEmpty = this.k2y_1;
       // Inline function 'kotlin.contracts.contract' call
       tmp$ret$0 = tmp0_isNullOrEmpty == null ? true : charSequenceLength(tmp0_isNullOrEmpty) === 0;
       tmp = tmp$ret$0;
@@ -3959,7 +3995,7 @@
   function Companion_21() {
     Companion_instance_21 = this;
   }
-  protoOf(Companion_21).p2y = function (_this__u8e3s4) {
+  protoOf(Companion_21).n2y = function (_this__u8e3s4) {
     var tmp0_subject = _this__u8e3s4;
     switch (tmp0_subject) {
       case 'fit':
@@ -4017,9 +4053,9 @@
   var Type_HIDDEN_instance;
   function Companion_22() {
     Companion_instance_22 = this;
-    this.q2y_1 = Type_TEXT_getInstance();
+    this.o2y_1 = Type_TEXT_getInstance();
   }
-  protoOf(Companion_22).r2y = function (_this__u8e3s4) {
+  protoOf(Companion_22).p2y = function (_this__u8e3s4) {
     var tmp0_subject = _this__u8e3s4;
     switch (tmp0_subject) {
       case 'email':
@@ -4054,7 +4090,7 @@
   }
   function Companion_23() {
     Companion_instance_23 = this;
-    this.s2y_1 = 'input';
+    this.q2y_1 = 'input';
   }
   var Companion_instance_23;
   function Companion_getInstance_26() {
@@ -4071,14 +4107,14 @@
     parser.b2q(2, tmp, 'input');
     var tmp_0 = $this;
     var tmp0_safe_receiver = parser.o2r('type');
-    var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : Companion_getInstance_25().r2y(tmp0_safe_receiver);
-    tmp_0.b2z_1 = tmp1_elvis_lhs == null ? Companion_getInstance_25().q2y_1 : tmp1_elvis_lhs;
-    $this.c2z_1 = parser.o2r('name');
-    $this.d2z_1 = parser.o2r('value');
+    var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : Companion_getInstance_25().p2y(tmp0_safe_receiver);
+    tmp_0.z2y_1 = tmp1_elvis_lhs == null ? Companion_getInstance_25().o2y_1 : tmp1_elvis_lhs;
+    $this.a2z_1 = parser.o2r('name');
+    $this.b2z_1 = parser.o2r('value');
     var tmp_1 = $this;
     var tmp2_safe_receiver = parser.o2r('required');
     var tmp3_elvis_lhs = tmp2_safe_receiver == null ? null : toBoolean(tmp2_safe_receiver);
-    tmp_1.e2z_1 = tmp3_elvis_lhs == null ? false : tmp3_elvis_lhs;
+    tmp_1.c2z_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
@@ -4107,8 +4143,8 @@
         continue $l$loop_1;
       skipTag(parser);
     }
-    $this.f2z_1 = label;
-    $this.g2z_1 = placeholder;
+    $this.d2z_1 = label;
+    $this.e2z_1 = placeholder;
     return $this;
   }
   function Input_init_$Create$(parent, parser) {
@@ -4138,7 +4174,7 @@
   }
   function Companion_24() {
     Companion_instance_24 = this;
-    this.h2z_1 = 'link';
+    this.f2z_1 = 'link';
   }
   var Companion_instance_24;
   function Companion_getInstance_27() {
@@ -4150,7 +4186,7 @@
     var tmp$ret$0;
     // Inline function 'kotlin.getValue' call
     var tmp0_getValue = defaultTextStyles$factory_0();
-    tmp$ret$0 = $this.t2z_1.o1();
+    tmp$ret$0 = $this.r2z_1.o1();
     return tmp$ret$0;
   }
   function Link_init_$Init$(parent, parser, $this) {
@@ -4177,21 +4213,21 @@
     var tmp$ret$0;
     // Inline function 'org.cru.godtools.shared.tool.parser.model.toEventIds' call
     var tmp0_toEventIds = parser.o2r(_get_XML_EVENTS_$accessor$11tx9p3_otmgk5());
-    tmp$ret$0 = Companion_getInstance_17().f2t(tmp0_toEventIds);
+    tmp$ret$0 = Companion_getInstance_17().e2t(tmp0_toEventIds);
     var tmp1__anonymous__uwfjfc = tmp$ret$0;
-    $this.r2z_1 = tmp1__anonymous__uwfjfc;
-    $this.s2z_1 = uri;
+    $this.p2z_1 = tmp1__anonymous__uwfjfc;
+    $this.q2z_1 = uri;
     var tmp_1 = $this;
     var tmp$ret$1;
     // Inline function 'kotlin.collections.mutableListOf' call
     tmp$ret$1 = ArrayList_init_$Create$();
-    tmp_1.q2z_1 = tmp$ret$1;
+    tmp_1.o2z_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.u2z_1 = tmp0_elvis_lhs == null ? Text_init_$Create$_0(_get_defaultTextStyles__fjozb5_0($this)) : tmp0_elvis_lhs;
+    tmp_2.s2z_1 = tmp0_elvis_lhs == null ? Text_init_$Create$_0(_get_defaultTextStyles__fjozb5_0($this)) : tmp0_elvis_lhs;
     return $this;
   }
   function Link_init_$Create$(parent, parser) {
@@ -4217,7 +4253,7 @@
         Companion_getInstance_6();
         if (tmp1_subject === 'events') {
           var tmp2_this = this$0;
-          var tmp0_plusAssign = tmp2_this.q2z_1;
+          var tmp0_plusAssign = tmp2_this.o2z_1;
           var tmp1_plusAssign = Companion_getInstance_6().f2q($parser, this$0);
           addAll(tmp0_plusAssign, tmp1_plusAssign);
           tmp_0 = Unit_getInstance();
@@ -4227,19 +4263,19 @@
       return Unit_getInstance();
     };
   }
-  protoOf(Link).g2t = function () {
-    return this.r2z_1;
+  protoOf(Link).f2t = function () {
+    return this.p2z_1;
   };
-  protoOf(Link).h2t = function () {
-    return this.s2z_1;
+  protoOf(Link).g2t = function () {
+    return this.q2z_1;
   };
   protoOf(Link).p2q = function () {
-    return protoOf(Content).p2q.call(this) ? true : !this.x2u();
+    return protoOf(Content).p2q.call(this) ? true : !this.w2u();
   };
   function Link() {
     Companion_getInstance_27();
     var tmp = this;
-    tmp.t2z_1 = lazy(Link$defaultTextStyles$delegate$lambda(this));
+    tmp.r2z_1 = lazy(Link$defaultTextStyles$delegate$lambda(this));
   }
   function defaultTextStyles$factory_0() {
     return getPropertyCallableRef('defaultTextStyles', 1, KProperty1, function (receiver) {
@@ -4247,20 +4283,20 @@
     }, null);
   }
   function Manifest$Companion$parse$slambda$slambda$slambda($manifest, $fileName, $parseFile, $src, resultContinuation) {
-    this.d30_1 = $manifest;
-    this.e30_1 = $fileName;
-    this.f30_1 = $parseFile;
-    this.g30_1 = $src;
+    this.b30_1 = $manifest;
+    this.c30_1 = $fileName;
+    this.d30_1 = $parseFile;
+    this.e30_1 = $src;
     CoroutineImpl.call(this, resultContinuation);
   }
-  protoOf(Manifest$Companion$parse$slambda$slambda$slambda).j30 = function ($this$async, $completion) {
+  protoOf(Manifest$Companion$parse$slambda$slambda$slambda).h30 = 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.j30((!(p1 == null) ? isInterface(p1, CoroutineScope) : false) ? p1 : THROW_CCE(), $completion);
+    return this.h30((!(p1 == null) ? isInterface(p1, CoroutineScope) : false) ? p1 : THROW_CCE(), $completion);
   };
   protoOf(Manifest$Companion$parse$slambda$slambda$slambda).ue = function () {
     var suspendResult = this.de_1;
@@ -4270,9 +4306,9 @@
         switch (tmp) {
           case 0:
             this.ce_1 = 2;
-            this.i30_1 = Companion_getInstance_48();
+            this.g30_1 = Companion_getInstance_48();
             this.be_1 = 1;
-            suspendResult = this.f30_1(this.g30_1, this);
+            suspendResult = this.d30_1(this.e30_1, this);
             if (suspendResult === get_COROUTINE_SUSPENDED()) {
               return suspendResult;
             }
@@ -4280,7 +4316,7 @@
             continue $sm;
           case 1:
             var ARGUMENT = suspendResult;
-            return this.i30_1.o30(this.d30_1, this.e30_1, ARGUMENT);
+            return this.g30_1.m30(this.b30_1, this.c30_1, ARGUMENT);
           case 2:
             throw this.ee_1;
         }
@@ -4296,33 +4332,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.d30_1, this.e30_1, this.f30_1, this.g30_1, completion);
-    i.h30_1 = $this$async;
+    var i = new Manifest$Companion$parse$slambda$slambda$slambda(this.b30_1, this.c30_1, this.d30_1, this.e30_1, completion);
+    i.f30_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.j30($this$async, $completion);
+      return i.h30($this$async, $completion);
     };
     l.$arity = 1;
     return l;
   }
   function Manifest$Companion$parse$slambda$slambda$slambda_1($manifest, $id, $parseFile, $src, resultContinuation) {
-    this.x30_1 = $manifest;
-    this.y30_1 = $id;
-    this.z30_1 = $parseFile;
-    this.a31_1 = $src;
+    this.v30_1 = $manifest;
+    this.w30_1 = $id;
+    this.x30_1 = $parseFile;
+    this.y30_1 = $src;
     CoroutineImpl.call(this, resultContinuation);
   }
-  protoOf(Manifest$Companion$parse$slambda$slambda$slambda_1).c31 = function ($this$async, $completion) {
+  protoOf(Manifest$Companion$parse$slambda$slambda$slambda_1).a31 = 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.c31((!(p1 == null) ? isInterface(p1, CoroutineScope) : false) ? p1 : THROW_CCE(), $completion);
+    return this.a31((!(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;
@@ -4333,7 +4369,7 @@
           case 0:
             this.ce_1 = 2;
             this.be_1 = 1;
-            suspendResult = this.z30_1(this.a31_1, this);
+            suspendResult = this.x30_1(this.y30_1, this);
             if (suspendResult === get_COROUTINE_SUSPENDED()) {
               return suspendResult;
             }
@@ -4341,7 +4377,7 @@
             continue $sm;
           case 1:
             var ARGUMENT = suspendResult;
-            return Tip_init_$Create$(this.x30_1, this.y30_1, ARGUMENT);
+            return Tip_init_$Create$(this.v30_1, this.w30_1, ARGUMENT);
           case 2:
             throw this.ee_1;
         }
@@ -4357,21 +4393,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.x30_1, this.y30_1, this.z30_1, this.a31_1, completion);
-    i.b31_1 = $this$async;
+    var i = new Manifest$Companion$parse$slambda$slambda$slambda_1(this.v30_1, this.w30_1, this.x30_1, this.y30_1, completion);
+    i.z30_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.c31($this$async, $completion);
+      return i.a31($this$async, $completion);
     };
     l.$arity = 1;
     return l;
   }
   function Manifest$Companion$parse$slambda$slambda($manifest, $parseFile, resultContinuation) {
-    this.l31_1 = $manifest;
-    this.m31_1 = $parseFile;
+    this.j31_1 = $manifest;
+    this.k31_1 = $parseFile;
     CoroutineImpl.call(this, resultContinuation);
   }
   protoOf(Manifest$Companion$parse$slambda$slambda).z10 = function ($this$launch, $completion) {
@@ -4392,14 +4428,14 @@
           case 0:
             this.ce_1 = 2;
             this.be_1 = 1;
-            var tmp1_map = this.l31_1.k2s_1;
+            var tmp1_map = this.j31_1.k2s_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.n31_1, VOID, VOID, Manifest$Companion$parse$slambda$slambda$slambda_0(this.l31_1, fileName, this.m31_1, src, null)));
+              tmp0_mapTo.b(async(this.l31_1, VOID, VOID, Manifest$Companion$parse$slambda$slambda$slambda_0(this.j31_1, fileName, this.k31_1, src, null)));
             }
             suspendResult = awaitAll(tmp0_mapTo, this);
@@ -4411,7 +4447,7 @@
           case 1:
             var ARGUMENT = suspendResult;
             var ARGUMENT_0 = filterNotNull(ARGUMENT);
-            _set_pages__j2nojl(this.l31_1, ARGUMENT_0);
+            _set_pages__j2nojl(this.j31_1, ARGUMENT_0);
             return Unit_getInstance();
           case 2:
             throw this.ee_1;
@@ -4428,8 +4464,8 @@
      while (true);
   };
   protoOf(Manifest$Companion$parse$slambda$slambda).a11 = function ($this$launch, completion) {
-    var i = new Manifest$Companion$parse$slambda$slambda(this.l31_1, this.m31_1, completion);
-    i.n31_1 = $this$launch;
+    var i = new Manifest$Companion$parse$slambda$slambda(this.j31_1, this.k31_1, completion);
+    i.l31_1 = $this$launch;
     return i;
   };
   function Manifest$Companion$parse$slambda$slambda_0($manifest, $parseFile, resultContinuation) {
@@ -4441,8 +4477,8 @@
     return l;
   }
   function Manifest$Companion$parse$slambda$slambda_1($manifest, $parseFile, resultContinuation) {
-    this.w31_1 = $manifest;
-    this.x31_1 = $parseFile;
+    this.u31_1 = $manifest;
+    this.v31_1 = $parseFile;
     CoroutineImpl.call(this, resultContinuation);
   }
   protoOf(Manifest$Companion$parse$slambda$slambda_1).z10 = function ($this$launch, $completion) {
@@ -4463,14 +4499,14 @@
           case 0:
             this.ce_1 = 2;
             this.be_1 = 1;
-            var tmp1_map = this.w31_1.l2s_1;
+            var tmp1_map = this.u31_1.l2s_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.y31_1, VOID, VOID, Manifest$Companion$parse$slambda$slambda$slambda_2(this.w31_1, id, this.x31_1, src, null)));
+              tmp0_mapTo.b(async(this.w31_1, VOID, VOID, Manifest$Companion$parse$slambda$slambda$slambda_2(this.u31_1, id, this.v31_1, src, null)));
             }
             suspendResult = awaitAll(tmp0_mapTo, this);
@@ -4486,11 +4522,11 @@
             var tmp0_iterator_0 = tmp3_associateBy.f();
             while (tmp0_iterator_0.g()) {
               var element = tmp0_iterator_0.h();
-              tmp2_associateByTo.u2(element.a32_1, element);
+              tmp2_associateByTo.u2(element.y31_1, element);
             }
             var ARGUMENT = tmp2_associateByTo;
-            _set_tips__9ug36n(this.w31_1, ARGUMENT);
+            _set_tips__9ug36n(this.u31_1, ARGUMENT);
             return Unit_getInstance();
           case 2:
             throw this.ee_1;
@@ -4507,8 +4543,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.w31_1, this.x31_1, completion);
-    i.y31_1 = $this$launch;
+    var i = new Manifest$Companion$parse$slambda$slambda_1(this.u31_1, this.v31_1, completion);
+    i.w31_1 = $this$launch;
     return i;
   };
   function Manifest$Companion$parse$slambda$slambda_2($manifest, $parseFile, resultContinuation) {
@@ -4520,19 +4556,19 @@
     return l;
   }
   function Manifest$Companion$parse$slambda($config, $manifest, $parseFile, resultContinuation) {
-    this.l32_1 = $config;
-    this.m32_1 = $manifest;
-    this.n32_1 = $parseFile;
+    this.j32_1 = $config;
+    this.k32_1 = $manifest;
+    this.l32_1 = $parseFile;
     CoroutineImpl.call(this, resultContinuation);
   }
-  protoOf(Manifest$Companion$parse$slambda).p32 = function ($this$coroutineScope, $completion) {
+  protoOf(Manifest$Companion$parse$slambda).n32 = 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.p32((!(p1 == null) ? isInterface(p1, CoroutineScope) : false) ? p1 : THROW_CCE(), $completion);
+    return this.n32((!(p1 == null) ? isInterface(p1, CoroutineScope) : false) ? p1 : THROW_CCE(), $completion);
   };
   protoOf(Manifest$Companion$parse$slambda).ue = function () {
     var suspendResult = this.de_1;
@@ -4541,16 +4577,16 @@
         var tmp = this.be_1;
         if (tmp === 0) {
           this.ce_1 = 1;
-          if (this.l32_1.v2o_1) {
-            launch(this.o32_1, VOID, VOID, Manifest$Companion$parse$slambda$slambda_0(this.m32_1, this.n32_1, null));
+          if (this.j32_1.v2o_1) {
+            launch(this.m32_1, VOID, VOID, Manifest$Companion$parse$slambda$slambda_0(this.k32_1, this.l32_1, null));
           } else {
-            _set_pages__j2nojl(this.m32_1, emptyList());
+            _set_pages__j2nojl(this.k32_1, emptyList());
           }
           var tmp_0;
-          if (this.l32_1.w2o_1) {
-            tmp_0 = launch(this.o32_1, VOID, VOID, Manifest$Companion$parse$slambda$slambda_2(this.m32_1, this.n32_1, null));
+          if (this.j32_1.w2o_1) {
+            tmp_0 = launch(this.m32_1, VOID, VOID, Manifest$Companion$parse$slambda$slambda_2(this.k32_1, this.l32_1, null));
           } else {
-            _set_tips__9ug36n(this.m32_1, emptyMap());
+            _set_tips__9ug36n(this.k32_1, emptyMap());
             tmp_0 = Unit_getInstance();
           }
           return tmp_0;
@@ -4564,24 +4600,24 @@
      while (true);
   };
   protoOf(Manifest$Companion$parse$slambda).a11 = function ($this$coroutineScope, completion) {
-    var i = new Manifest$Companion$parse$slambda(this.l32_1, this.m32_1, this.n32_1, completion);
-    i.o32_1 = $this$coroutineScope;
+    var i = new Manifest$Companion$parse$slambda(this.j32_1, this.k32_1, this.l32_1, completion);
+    i.m32_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.p32($this$coroutineScope, $completion);
+      return i.n32($this$coroutineScope, $completion);
     };
     l.$arity = 1;
     return l;
   }
   function $parseCOROUTINE$0(_this__u8e3s4, fileName, config, parseFile, resultContinuation) {
     CoroutineImpl.call(this, resultContinuation);
-    this.y32_1 = _this__u8e3s4;
-    this.z32_1 = fileName;
-    this.a33_1 = config;
-    this.b33_1 = parseFile;
+    this.w32_1 = _this__u8e3s4;
+    this.x32_1 = fileName;
+    this.y32_1 = config;
+    this.z32_1 = parseFile;
   }
   protoOf($parseCOROUTINE$0).ue = function () {
     var suspendResult = this.de_1;
@@ -4592,17 +4628,17 @@
           case 0:
             this.ce_1 = 3;
             this.be_1 = 1;
-            suspendResult = this.b33_1(this.z32_1, this);
+            suspendResult = this.z32_1(this.x32_1, this);
             if (suspendResult === get_COROUTINE_SUSPENDED()) {
               return suspendResult;
             }
             continue $sm;
           case 1:
-            this.c33_1 = suspendResult;
-            this.d33_1 = Manifest_init_$Create$(this.c33_1, this.a33_1);
+            this.a33_1 = suspendResult;
+            this.b33_1 = Manifest_init_$Create$(this.a33_1, this.y32_1);
             this.be_1 = 2;
-            suspendResult = coroutineScope(Manifest$Companion$parse$slambda_0(this.a33_1, this.d33_1, this.b33_1, null), this);
+            suspendResult = coroutineScope(Manifest$Companion$parse$slambda_0(this.y32_1, this.b33_1, this.z32_1, null), this);
             if (suspendResult === get_COROUTINE_SUSPENDED()) {
               return suspendResult;
             }
@@ -4610,7 +4646,7 @@
             continue $sm;
           case 2:
             ;
-            return this.d33_1;
+            return this.b33_1;
           case 3:
             throw this.ee_1;
         }
@@ -4632,9 +4668,9 @@
   var Type_UNKNOWN_instance_0;
   function Companion_25() {
     Companion_instance_25 = this;
-    this.e33_1 = Type_TRACT_getInstance();
+    this.c33_1 = Type_TRACT_getInstance();
   }
-  protoOf(Companion_25).f33 = function (value) {
+  protoOf(Companion_25).d33 = function (value) {
     var tmp0_subject = value;
     switch (tmp0_subject) {
       case 'article':
@@ -4708,7 +4744,7 @@
     // Inline function 'org.cru.godtools.shared.tool.parser.model.color' call
     tmp$ret$2 = toPlatformColor(Companion_getInstance_0().q2h(255 / 255.0, 255 / 255.0, 255 / 255.0, 1.0));
     tmp_1.l2o_1 = tmp$ret$2;
-    this.m2o_1 = Companion_getInstance_22().q2u_1;
+    this.m2o_1 = Companion_getInstance_22().p2u_1;
     this.n2o_1 = ImageScaleType_FILL_getInstance();
     this.o2o_1 = Style_CONTAINED_getInstance();
     var tmp_2 = this;
@@ -4731,10 +4767,10 @@
     return Companion_instance_26;
   }
   function _set_pages__j2nojl($this, _set____db54di) {
-    return $this.h2s_1.g33($this, pages$factory(), _set____db54di);
+    return $this.h2s_1.e33($this, pages$factory(), _set____db54di);
   }
   function _set_tips__9ug36n($this, _set____db54di) {
-    return $this.j2s_1.g33($this, tips$factory(), _set____db54di);
+    return $this.j2s_1.e33($this, tips$factory(), _set____db54di);
   }
   function Manifest_init_$Init$(parser, config, $this) {
     BaseModel.call($this);
@@ -4747,13 +4783,13 @@
     var tmp0_safe_receiver = parser.o2r('locale');
     tmp.locale = tmp0_safe_receiver == null ? null : toLocaleOrNull(tmp0_safe_receiver);
     var tmp_0 = $this;
-    var tmp1_elvis_lhs = Companion_getInstance_28().f33(parser.o2r('type'));
-    tmp_0.type = tmp1_elvis_lhs == null ? Companion_getInstance_28().e33_1 : tmp1_elvis_lhs;
+    var tmp1_elvis_lhs = Companion_getInstance_28().d33(parser.o2r('type'));
+    tmp_0.type = tmp1_elvis_lhs == null ? Companion_getInstance_28().c33_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.o2r(get_XML_DISMISS_LISTENERS());
-    tmp$ret$0 = Companion_getInstance_17().f2t(tmp0_toEventIds);
+    tmp$ret$0 = Companion_getInstance_17().e2t(tmp0_toEventIds);
     tmp_1.dismissListeners = toSet_0(tmp$ret$0);
     var tmp_2 = $this;
     var tmp2_safe_receiver = parser.o2r(get_XML_PRIMARY_COLOR());
@@ -4776,11 +4812,11 @@
     $this.w2r_1 = parser.d2t(null, get_XML_BACKGROUND_IMAGE());
     var tmp_7 = $this;
     var tmp10_safe_receiver = parser.o2r(get_XML_BACKGROUND_IMAGE_GRAVITY());
-    var tmp11_elvis_lhs = tmp10_safe_receiver == null ? null : Companion_getInstance_22().r2u(tmp10_safe_receiver);
+    var tmp11_elvis_lhs = tmp10_safe_receiver == null ? null : Companion_getInstance_22().q2u(tmp10_safe_receiver);
     tmp_7.x2r_1 = tmp11_elvis_lhs == null ? Companion_getInstance_29().m2o_1 : tmp11_elvis_lhs;
     var tmp_8 = $this;
     var tmp12_safe_receiver = parser.o2r(get_XML_BACKGROUND_IMAGE_SCALE_TYPE());
-    var tmp13_elvis_lhs = tmp12_safe_receiver == null ? null : Companion_getInstance_24().p2y(tmp12_safe_receiver);
+    var tmp13_elvis_lhs = tmp12_safe_receiver == null ? null : Companion_getInstance_24().n2y(tmp12_safe_receiver);
     tmp_8.y2r_1 = tmp13_elvis_lhs == null ? Companion_getInstance_29().n2o_1 : tmp13_elvis_lhs;
     var tmp_9 = $this;
     var tmp_10 = get_XMLNS_CONTENT();
@@ -4903,13 +4939,13 @@
             var tmp3_this = $this;
             // Inline function 'kotlin.collections.plusAssign' call
             var tmp2_plusAssign = tmp3_this.aemImports;
-            var tmp3_plusAssign = result.j33_1;
+            var tmp3_plusAssign = result.h33_1;
             addAll(tmp2_plusAssign, tmp3_plusAssign);
             var tmp4_this = $this;
             // Inline function 'kotlin.collections.plusAssign' call
             var tmp4_plusAssign = tmp4_this.k2s_1;
-            var tmp5_plusAssign = result.k33_1;
+            var tmp5_plusAssign = result.i33_1;
             addAll(tmp4_plusAssign, tmp5_plusAssign);
             break;
@@ -4929,7 +4965,7 @@
               var element = tmp0_iterator.h();
               var tmp$ret$8;
               // Inline function 'org.cru.godtools.shared.tool.parser.model.Manifest.<init>.<anonymous>.<anonymous>' call
-              tmp$ret$8 = element.m33_1;
+              tmp$ret$8 = element.name;
               tmp6_associateByTo.u2(tmp$ret$8, element);
             }
             tmp$ret$9 = tmp6_associateByTo;
@@ -4952,7 +4988,7 @@
         Companion_getInstance_49();
         if (tmp7_subject === 'items') {
           // Inline function 'kotlin.collections.plusAssign' call
-          var tmp12_plusAssign = Companion_getInstance_49().i33(parser, $this);
+          var tmp12_plusAssign = Companion_getInstance_49().g33(parser, $this);
           addAll(shareables, tmp12_plusAssign);
         }
       }
@@ -4974,7 +5010,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.r33();
+      tmp$ret$11 = e.n33();
       var key = tmp$ret$11;
       if (set.b(key)) {
         list.b(e);
@@ -4996,7 +5032,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().e33_1 : type;
+    type = type === VOID ? Companion_getInstance_28().c33_1 : type;
     code = code === VOID ? null : code;
     locale = locale === VOID ? null : locale;
     primaryColor = primaryColor === VOID ? Companion_getInstance_29().j2o_1 : primaryColor;
@@ -5073,7 +5109,7 @@
         var element = tmp0_iterator.h();
         var tmp$ret$1;
         // Inline function 'org.cru.godtools.shared.tool.parser.model.Manifest.<init>.<anonymous>' call
-        tmp$ret$1 = element.m33_1;
+        tmp$ret$1 = element.name;
         tmp1_associateByTo.u2(tmp$ret$1, element);
       }
       tmp$ret$2 = tmp1_associateByTo;
@@ -5111,7 +5147,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.a32_1;
+        tmp$ret$6 = element_0.y31_1;
         tmp4_associateByTo.u2(tmp$ret$6, element_0);
       }
       tmp$ret$7 = tmp4_associateByTo;
@@ -5178,12 +5214,12 @@
     var tmp$ret$0;
     // Inline function 'kotlin.collections.mutableListOf' call
     tmp$ret$0 = ArrayList_init_$Create$();
-    tmp.j33_1 = tmp$ret$0;
+    tmp.h33_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.k33_1 = tmp$ret$1;
+    tmp_0.i33_1 = tmp$ret$1;
   }
   function parsePages(_this__u8e3s4, $this) {
     var tmp$ret$4;
@@ -5223,7 +5259,7 @@
             var fileName = _this__u8e3s4.o2r('filename');
             var tmp3_this = tmp0_also;
             // Inline function 'kotlin.collections.plusAssign' call
-            var tmp0_plusAssign = tmp3_this.k33_1;
+            var tmp0_plusAssign = tmp3_this.i33_1;
             var tmp1_plusAssign = to(fileName, src);
             tmp0_plusAssign.b(tmp1_plusAssign);
           }
@@ -5258,7 +5294,7 @@
               // Inline function 'kotlin.let' call
               // Inline function 'kotlin.contracts.contract' call
               var tmp0_this = tmp0_also;
-              var tmp0_plusAssign_0 = tmp0_this.j33_1;
+              var tmp0_plusAssign_0 = tmp0_this.h33_1;
               tmp0_plusAssign_0.b(tmp6_safe_receiver);
               tmp$ret$3 = Unit_getInstance();
             }
@@ -5386,10 +5422,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.u33_1 = function_0;
+    this.q33_1 = function_0;
   }
   protoOf(sam$kotlin_Comparator$0).wc = function (a, b) {
-    return this.u33_1(a, b);
+    return this.q33_1(a, b);
   };
   protoOf(sam$kotlin_Comparator$0).compare = function (a, b) {
     return this.wc(a, b);
@@ -5399,11 +5435,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.q33_1;
+    tmp$ret$0 = a.m33_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.q33_1;
+    tmp$ret$1 = b.m33_1;
     tmp$ret$2 = compareValues(tmp, tmp$ret$1);
     return tmp$ret$2;
   }
@@ -5427,97 +5463,97 @@
     Type_initEntries_1();
     return Type_UNKNOWN_instance_0;
   }
-  protoOf(Manifest).v33 = function () {
+  protoOf(Manifest).r33 = function () {
     return this.q2r_1;
   };
-  protoOf(Manifest).w33 = function () {
+  protoOf(Manifest).s33 = function () {
     return this.code;
   };
-  protoOf(Manifest).x33 = function () {
+  protoOf(Manifest).t33 = function () {
     return this.locale;
   };
   protoOf(Manifest).t1b = function () {
     return this.type;
   };
-  protoOf(Manifest).y33 = function () {
+  protoOf(Manifest).u33 = function () {
     return this.dismissListeners;
   };
-  protoOf(Manifest).u2v = function () {
+  protoOf(Manifest).t2v = function () {
     return this.r2r_1;
   };
-  protoOf(Manifest).v2v = function () {
+  protoOf(Manifest).u2v = function () {
     return this.s2r_1;
   };
-  protoOf(Manifest).z33 = function () {
+  protoOf(Manifest).v33 = function () {
     var tmp0_elvis_lhs = this.t2r_1;
     return tmp0_elvis_lhs == null ? this.type.equals(Type_LESSON_getInstance()) ? get_DEFAULT_LESSON_NAV_BAR_COLOR() : this.r2r_1 : tmp0_elvis_lhs;
   };
-  protoOf(Manifest).a34 = function () {
+  protoOf(Manifest).w33 = function () {
     var tmp0_elvis_lhs = this.u2r_1;
     return tmp0_elvis_lhs == null ? this.type.equals(Type_LESSON_getInstance()) ? this.r2r_1 : this.s2r_1 : tmp0_elvis_lhs;
   };
-  protoOf(Manifest).b34 = function () {
+  protoOf(Manifest).x33 = function () {
     return this.v2r_1;
   };
-  protoOf(Manifest).c34 = function () {
-    return this.l2t(this.w2r_1);
+  protoOf(Manifest).y33 = function () {
+    return this.k2t(this.w2r_1);
   };
-  protoOf(Manifest).d34 = function () {
+  protoOf(Manifest).z33 = function () {
     return this.x2r_1;
   };
-  protoOf(Manifest).e34 = function () {
+  protoOf(Manifest).a34 = function () {
     return this.y2r_1;
   };
-  protoOf(Manifest).x2v = function () {
+  protoOf(Manifest).w2v = function () {
     var tmp0_elvis_lhs = this.z2r_1;
     return tmp0_elvis_lhs == null ? this.v2r_1 : tmp0_elvis_lhs;
   };
-  protoOf(Manifest).t2v = function () {
+  protoOf(Manifest).s2v = function () {
     var tmp0_elvis_lhs = this.a2s_1;
     return tmp0_elvis_lhs == null ? this.e2s_1 : tmp0_elvis_lhs;
   };
-  protoOf(Manifest).f34 = function () {
+  protoOf(Manifest).b34 = function () {
     return this.b2s_1;
   };
-  protoOf(Manifest).w2v = function () {
+  protoOf(Manifest).v2v = function () {
     return Companion_getInstance_29().o2o_1;
   };
-  protoOf(Manifest).y2v = function () {
+  protoOf(Manifest).x2v = function () {
     var tmp0_elvis_lhs = this.c2s_1;
     return tmp0_elvis_lhs == null ? get_multiselectOptionBackgroundColor.call(this) : tmp0_elvis_lhs;
   };
-  protoOf(Manifest).z2v = function () {
+  protoOf(Manifest).y2v = function () {
     return this.d2s_1;
   };
-  protoOf(Manifest).s2v = function () {
+  protoOf(Manifest).r2v = function () {
     return this.e2s_1;
   };
-  protoOf(Manifest).a2w = function () {
+  protoOf(Manifest).z2v = function () {
     return this.f2s_1;
   };
-  protoOf(Manifest).g34 = function () {
+  protoOf(Manifest).c34 = function () {
     var tmp0_safe_receiver = this.g2s_1;
-    return tmp0_safe_receiver == null ? null : tmp0_safe_receiver.p34_1;
+    return tmp0_safe_receiver == null ? null : tmp0_safe_receiver.l34_1;
   };
-  protoOf(Manifest).z34 = function () {
+  protoOf(Manifest).v34 = function () {
     return this.aemImports;
   };
-  protoOf(Manifest).a35 = function () {
+  protoOf(Manifest).w34 = function () {
     return this.categories;
   };
-  protoOf(Manifest).b35 = function () {
-    return this.h2s_1.c35(this, pages$factory_0());
+  protoOf(Manifest).x34 = function () {
+    return this.h2s_1.y34(this, pages$factory_0());
   };
-  protoOf(Manifest).d35 = function () {
+  protoOf(Manifest).z34 = function () {
     return this.i2s_1;
   };
-  protoOf(Manifest).e35 = function () {
+  protoOf(Manifest).a35 = function () {
     return this.shareables;
   };
   protoOf(Manifest).d2r = function () {
-    return this.j2s_1.c35(this, tips$factory_0());
+    return this.j2s_1.y34(this, tips$factory_0());
   };
-  protoOf(Manifest).f35 = function () {
+  protoOf(Manifest).b35 = function () {
     var tmp$ret$12;
     // Inline function 'kotlin.collections.buildSet' call
     // Inline function 'kotlin.contracts.contract' call
@@ -5575,7 +5611,7 @@
       // Inline function 'kotlin.collections.mapNotNullTo.<anonymous>' call
       var tmp$ret$6;
       // Inline function 'org.cru.godtools.shared.tool.parser.model.Manifest.<get-relatedFiles>.<anonymous>.<anonymous>' call
-      tmp$ret$6 = element.n33_1;
+      tmp$ret$6 = element.localName;
       var tmp0_safe_receiver = tmp$ret$6;
       if (tmp0_safe_receiver == null)
         null;
@@ -5598,7 +5634,7 @@
   protoOf(Manifest).h2n = function () {
     return this;
   };
-  protoOf(Manifest).g35 = function () {
+  protoOf(Manifest).c35 = function () {
     var tmp;
     var tmp$ret$0;
     // Inline function 'kotlin.collections.isNotEmpty' call
@@ -5621,7 +5657,7 @@
     }
     return tmp;
   };
-  protoOf(Manifest).l2t = function (name) {
+  protoOf(Manifest).k2t = function (name) {
     var tmp0_safe_receiver = name;
     var tmp;
     if (tmp0_safe_receiver == null) {
@@ -5638,7 +5674,7 @@
     }
     return tmp;
   };
-  protoOf(Manifest).h35 = function (category) {
+  protoOf(Manifest).d35 = function (category) {
     var tmp$ret$1;
     $l$block: {
       // Inline function 'kotlin.collections.firstOrNull' call
@@ -5648,7 +5684,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.o2v_1 == category;
+        tmp$ret$0 = element.n2v_1 == category;
         if (tmp$ret$0) {
           tmp$ret$1 = element;
           break $l$block;
@@ -5692,7 +5728,7 @@
     }
     return tmp;
   };
-  protoOf(Manifest).i35 = function (id) {
+  protoOf(Manifest).e35 = function (id) {
     var tmp0_safe_receiver = id;
     var tmp;
     if (tmp0_safe_receiver == null) {
@@ -5712,7 +5748,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.r33() == id;
+          tmp$ret$0 = element.n33() == id;
           if (tmp$ret$0) {
             tmp$ret$1 = element;
             break $l$block;
@@ -5726,14 +5762,14 @@
     }
     return tmp;
   };
-  protoOf(Manifest).j35 = function (id) {
+  protoOf(Manifest).f35 = function (id) {
     var tmp$ret$0;
     // Inline function 'kotlin.collections.get' call
     var tmp0_get = this.d2r();
     tmp$ret$0 = (isInterface(tmp0_get, Map) ? tmp0_get : THROW_CCE()).c2(id);
     return tmp$ret$0;
   };
-  protoOf(Manifest).k35 = function () {
+  protoOf(Manifest).g35 = function () {
     var tmp$ret$0;
     // Inline function 'kotlin.collections.toTypedArray' call
     var tmp0_toTypedArray = this._pages;
@@ -5745,12 +5781,12 @@
     this.h2s_1 = setOnce();
     this.j2s_1 = setOnce();
   }
-  defineProp(protoOf(Manifest), 'backgroundImage', protoOf(Manifest).c34);
-  defineProp(protoOf(Manifest), 'title', protoOf(Manifest).g34);
-  defineProp(protoOf(Manifest), '_pages', protoOf(Manifest).b35);
-  defineProp(protoOf(Manifest), 'relatedFiles', protoOf(Manifest).f35);
-  defineProp(protoOf(Manifest), 'hasTips', protoOf(Manifest).g35);
-  defineProp(protoOf(Manifest), 'pages', protoOf(Manifest).k35);
+  defineProp(protoOf(Manifest), 'backgroundImage', protoOf(Manifest).y33);
+  defineProp(protoOf(Manifest), 'title', protoOf(Manifest).c34);
+  defineProp(protoOf(Manifest), '_pages', protoOf(Manifest).x34);
+  defineProp(protoOf(Manifest), 'relatedFiles', protoOf(Manifest).b35);
+  defineProp(protoOf(Manifest), 'hasTips', protoOf(Manifest).c35);
+  defineProp(protoOf(Manifest), 'pages', protoOf(Manifest).g35);
   function get_backgroundColor(_this__u8e3s4) {
     var tmp0_safe_receiver = _this__u8e3s4;
     var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.v2r_1;
@@ -5789,7 +5825,7 @@
   function Companion_27() {
     Companion_instance_27 = this;
   }
-  protoOf(Companion_27).l35 = function (_this__u8e3s4) {
+  protoOf(Companion_27).h35 = function (_this__u8e3s4) {
     var tmp0_subject = _this__u8e3s4;
     var tmp;
     Companion_getInstance_31();
@@ -5823,12 +5859,12 @@
   }
   function Companion_28() {
     Companion_instance_28 = this;
-    this.m35_1 = 'selected-color';
-    this.n35_1 = 'value';
-    this.o35_1 = 'style';
-    this.p35_1 = 'card';
-    this.q35_1 = 'flat';
-    this.r35_1 = Style_CARD_getInstance();
+    this.i35_1 = 'selected-color';
+    this.j35_1 = 'value';
+    this.k35_1 = 'style';
+    this.l35_1 = 'card';
+    this.m35_1 = 'flat';
+    this.n35_1 = Style_CARD_getInstance();
   }
   var Companion_instance_28;
   function Companion_getInstance_31() {
@@ -5839,20 +5875,20 @@
   function Option_init_$Init$(multiselect, parser, $this) {
     Content_init_$Init$(multiselect, parser, $this);
     Option.call($this);
-    $this.a36_1 = multiselect;
+    $this.w35_1 = multiselect;
     Companion_getInstance_59();
     parser.b2q(2, get_XMLNS_CONTENT(), 'option');
     var tmp = $this;
     var tmp_0 = Companion_getInstance_30();
     Companion_getInstance_31();
-    tmp.b36_1 = tmp_0.l35(parser.o2r('style'));
+    tmp.x35_1 = tmp_0.h35(parser.o2r('style'));
     var tmp_1 = $this;
     var tmp0_safe_receiver = parser.o2r(get_XML_BACKGROUND_COLOR());
-    tmp_1.c36_1 = tmp0_safe_receiver == null ? null : toColorOrNull(tmp0_safe_receiver);
+    tmp_1.y35_1 = tmp0_safe_receiver == null ? null : toColorOrNull(tmp0_safe_receiver);
     var tmp_2 = $this;
     Companion_getInstance_31();
     var tmp1_safe_receiver = parser.o2r('selected-color');
-    tmp_2.d36_1 = tmp1_safe_receiver == null ? null : toColorOrNull(tmp1_safe_receiver);
+    tmp_2.z35_1 = tmp1_safe_receiver == null ? null : toColorOrNull(tmp1_safe_receiver);
     var tmp_3 = $this;
     var tmp$ret$0;
     // Inline function 'kotlin.text.orEmpty' call
@@ -5860,12 +5896,12 @@
     var tmp0_orEmpty = parser.o2r('value');
     var tmp0_elvis_lhs = tmp0_orEmpty;
     tmp$ret$0 = tmp0_elvis_lhs == null ? '' : tmp0_elvis_lhs;
-    tmp_3.e36_1 = tmp$ret$0;
+    tmp_3.a36_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.f36_1 = tmp$ret$1;
+    tmp_4.b36_1 = tmp$ret$1;
     var tmp_5 = $this;
     var tmp$ret$9;
     // Inline function 'org.cru.godtools.shared.tool.parser.model.parseContent' call
@@ -5903,7 +5939,7 @@
           if (tmp1_subject === 'events') {
             var tmp2_this = $this;
             // Inline function 'kotlin.collections.plusAssign' call
-            var tmp0_plusAssign = tmp2_this.f36_1;
+            var tmp0_plusAssign = tmp2_this.b36_1;
             var tmp1_plusAssign = Companion_getInstance_6().f2q(parser, $this);
             addAll(tmp0_plusAssign, tmp1_plusAssign);
           }
@@ -5955,7 +5991,7 @@
     tmp$ret$7 = tmp$ret$6.u7();
     tmp$ret$8 = tmp$ret$7;
     tmp$ret$9 = tmp$ret$8;
-    tmp_5.g36_1 = tmp$ret$9;
+    tmp_5.c36_1 = tmp$ret$9;
     return $this;
   }
   function Option_init_$Create$(multiselect, parser) {
@@ -5974,11 +6010,11 @@
   }
   function Companion_29() {
     Companion_instance_29 = this;
-    this.h36_1 = 'multiselect';
-    this.i36_1 = 'multiselect-option-background-color';
-    this.j36_1 = 'multiselect-option-selected-color';
-    this.k36_1 = 'option-background-color';
-    this.l36_1 = 'option-selected-color';
+    this.d36_1 = 'multiselect';
+    this.e36_1 = 'multiselect-option-background-color';
+    this.f36_1 = 'multiselect-option-selected-color';
+    this.g36_1 = 'option-background-color';
+    this.h36_1 = 'option-selected-color';
   }
   var Companion_instance_29;
   function Companion_getInstance_32() {
@@ -5999,31 +6035,31 @@
     var tmp0_orEmpty = parser.o2r('state');
     var tmp0_elvis_lhs = tmp0_orEmpty;
     tmp$ret$0 = tmp0_elvis_lhs == null ? '' : tmp0_elvis_lhs;
-    tmp_0.u36_1 = tmp$ret$0;
+    tmp_0.q36_1 = tmp$ret$0;
     var tmp_1 = $this;
     var tmp0_safe_receiver = parser.o2r('columns');
     var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : toIntOrNull(tmp0_safe_receiver);
-    tmp_1.v36_1 = tmp1_elvis_lhs == null ? 1 : tmp1_elvis_lhs;
+    tmp_1.r36_1 = tmp1_elvis_lhs == null ? 1 : tmp1_elvis_lhs;
     var tmp_2 = $this;
     var tmp2_safe_receiver = parser.o2r('selection-limit');
     var tmp3_elvis_lhs = tmp2_safe_receiver == null ? null : toIntOrNull(tmp2_safe_receiver);
-    tmp_2.w36_1 = coerceAtLeast(tmp3_elvis_lhs == null ? 1 : tmp3_elvis_lhs, 1);
+    tmp_2.s36_1 = coerceAtLeast(tmp3_elvis_lhs == null ? 1 : tmp3_elvis_lhs, 1);
     var tmp_3 = $this;
-    var tmp4_elvis_lhs = Companion_getInstance_30().l35(parser.o2r('option-style'));
-    tmp_3.x36_1 = tmp4_elvis_lhs == null ? Companion_getInstance_31().r35_1 : tmp4_elvis_lhs;
+    var tmp4_elvis_lhs = Companion_getInstance_30().h35(parser.o2r('option-style'));
+    tmp_3.t36_1 = tmp4_elvis_lhs == null ? Companion_getInstance_31().n35_1 : tmp4_elvis_lhs;
     var tmp_4 = $this;
     Companion_getInstance_32();
     var tmp5_safe_receiver = parser.o2r('option-background-color');
-    tmp_4.y36_1 = tmp5_safe_receiver == null ? null : toColorOrNull(tmp5_safe_receiver);
+    tmp_4.u36_1 = tmp5_safe_receiver == null ? null : toColorOrNull(tmp5_safe_receiver);
     var tmp_5 = $this;
     Companion_getInstance_32();
     var tmp6_safe_receiver = parser.o2r('option-selected-color');
-    tmp_5.z36_1 = tmp6_safe_receiver == null ? null : toColorOrNull(tmp6_safe_receiver);
+    tmp_5.v36_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.a37_1 = tmp$ret$1;
+    tmp_6.w36_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();
@@ -6042,7 +6078,7 @@
         if (tmp1_subject === 'option') {
           var tmp2_this = $this;
           // Inline function 'kotlin.collections.plusAssign' call
-          var tmp0_plusAssign = tmp2_this.a37_1;
+          var tmp0_plusAssign = tmp2_this.w36_1;
           var tmp1_plusAssign = Option_init_$Create$($this, parser);
           tmp0_plusAssign.b(tmp1_plusAssign);
         }
@@ -6059,7 +6095,7 @@
     return Multiselect_init_$Init$(parent, parser, objectCreate(protoOf(Multiselect)));
   }
   protoOf(Option).a2r = function () {
-    return this.g36_1;
+    return this.c36_1;
   };
   function Option() {
     Companion_getInstance_31();
@@ -6080,8 +6116,8 @@
   }
   function Companion_30() {
     Companion_instance_30 = this;
-    this.b37_1 = 'paragraph';
-    this.c37_1 = 'fallback';
+    this.x36_1 = 'paragraph';
+    this.y36_1 = 'fallback';
   }
   var Companion_instance_30;
   function Companion_getInstance_33() {
@@ -6175,14 +6211,14 @@
     tmp$ret$6 = tmp$ret$5.u7();
     tmp$ret$7 = tmp$ret$6;
     tmp$ret$8 = tmp$ret$7;
-    tmp_0.l37_1 = tmp$ret$8;
+    tmp_0.h37_1 = tmp$ret$8;
     return $this;
   }
   function Paragraph_init_$Create$(parent, parser) {
     return Paragraph_init_$Init$(parent, parser, objectCreate(protoOf(Paragraph)));
   }
   protoOf(Paragraph).a2r = function () {
-    return this.l37_1;
+    return this.h37_1;
   };
   protoOf(Paragraph).d2r = function () {
     var tmp$ret$3;
@@ -6367,7 +6403,7 @@
   }
   function Companion_31() {
     Companion_instance_31 = this;
-    this.m37_1 = 'resource';
+    this.i37_1 = 'resource';
   }
   var Companion_instance_31;
   function Companion_getInstance_34() {
@@ -6382,14 +6418,20 @@
     var tmp = get_XMLNS_MANIFEST();
     Companion_getInstance_34();
     parser.b2q(2, tmp, 'resource');
-    $this.m33_1 = parser.d2t(null, 'filename');
-    $this.n33_1 = parser.d2t(null, 'src');
+    $this.name = parser.d2t(null, 'filename');
+    $this.localName = parser.d2t(null, 'src');
     skipTag(parser);
     return $this;
   }
   function Resource_init_$Create$(manifest, parser) {
     return Resource_init_$Init$(manifest, parser, objectCreate(protoOf(Resource)));
   }
+  protoOf(Resource).id = function () {
+    return this.name;
+  };
+  protoOf(Resource).j37 = function () {
+    return this.localName;
+  };
   function Resource() {
     Companion_getInstance_34();
   }
@@ -6397,9 +6439,9 @@
   var Mode_FIXED_instance;
   function Companion_32() {
     Companion_instance_32 = this;
-    this.n37_1 = Mode_AUTO_getInstance();
+    this.k37_1 = Mode_AUTO_getInstance();
   }
-  protoOf(Companion_32).o37 = function (_this__u8e3s4) {
+  protoOf(Companion_32).l37 = function (_this__u8e3s4) {
     var tmp0_subject = _this__u8e3s4;
     switch (tmp0_subject) {
       case 'auto':
@@ -6428,7 +6470,7 @@
   }
   function Companion_33() {
     Companion_instance_33 = this;
-    this.p37_1 = 'spacer';
+    this.m37_1 = 'spacer';
   }
   var Companion_instance_33;
   function Companion_getInstance_36() {
@@ -6445,13 +6487,13 @@
     parser.b2q(2, tmp, 'spacer');
     var tmp_0 = $this;
     var tmp0_safe_receiver = parser.o2r('mode');
-    var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : Companion_getInstance_35().o37(tmp0_safe_receiver);
-    tmp_0.y37_1 = tmp1_elvis_lhs == null ? Companion_getInstance_35().n37_1 : tmp1_elvis_lhs;
+    var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : Companion_getInstance_35().l37(tmp0_safe_receiver);
+    tmp_0.v37_1 = tmp1_elvis_lhs == null ? Companion_getInstance_35().k37_1 : tmp1_elvis_lhs;
     var tmp_1 = $this;
     var tmp2_safe_receiver = parser.o2r('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.z37_1 = tmp4_elvis_lhs == null ? 0 : tmp4_elvis_lhs;
+    tmp_1.w37_1 = tmp4_elvis_lhs == null ? 0 : tmp4_elvis_lhs;
     skipTag(parser);
     return $this;
   }
@@ -6474,7 +6516,7 @@
   }
   function Companion_34() {
     Companion_instance_34 = this;
-    this.a38_1 = 1.0;
+    this.x37_1 = 1.0;
   }
   var Companion_instance_34;
   function Companion_getInstance_37() {
@@ -6486,37 +6528,37 @@
   }
   function get_multiselectOptionBackgroundColor_0(_this__u8e3s4) {
     var tmp0_safe_receiver = _this__u8e3s4;
-    var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.y2v();
+    var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.x2v();
     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.u2v();
+    var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.t2v();
     return tmp1_elvis_lhs == null ? Companion_getInstance_29().j2o_1 : 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.v2v();
+    var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.u2v();
     return tmp1_elvis_lhs == null ? Companion_getInstance_29().k2o_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.w2v();
+    var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.v2v();
     return tmp1_elvis_lhs == null ? Companion_getInstance_29().o2o_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.x2v();
+    var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.w2v();
     return tmp1_elvis_lhs == null ? Companion_getInstance_29().l2o_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.s2v();
+    var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.r2v();
     return tmp1_elvis_lhs == null ? Companion_getInstance_29().p2o_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.a2w();
+    var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.z2v();
     var tmp;
     if (tmp1_elvis_lhs == null) {
       Companion_getInstance_37();
@@ -6528,7 +6570,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.b2w();
+    var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.a2w();
     return tmp1_elvis_lhs == null ? Companion_getInstance_29().q2o_1 : tmp1_elvis_lhs;
   }
   function stylesOverride(_this__u8e3s4, textAlign, textColor, textScale) {
@@ -6546,27 +6588,27 @@
   }
   function StylesOverride(parent, _textAlign, _textColor, _textScale) {
     BaseModel.call(this, parent);
-    this.c38_1 = _textAlign;
-    this.d38_1 = _textColor;
-    this.e38_1 = _textScale;
+    this.z37_1 = _textAlign;
+    this.a38_1 = _textColor;
+    this.b38_1 = _textScale;
   }
-  protoOf(StylesOverride).b2w = function () {
-    var tmp0_safe_receiver = this.c38_1;
+  protoOf(StylesOverride).a2w = function () {
+    var tmp0_safe_receiver = this.z37_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).s2v = function () {
-    var tmp0_safe_receiver = this.d38_1;
+  protoOf(StylesOverride).r2v = function () {
+    var tmp0_safe_receiver = this.a38_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).a2w = function () {
-    return get_textScale.call(this) * this.e38_1;
+  protoOf(StylesOverride).z2v = function () {
+    return get_textScale.call(this) * this.b38_1;
   };
   function Tab_init_$Init$(parent, parser, $this) {
     BaseModel.call($this, parent);
     Tab.call($this);
-    $this.g38_1 = parent;
+    $this.d38_1 = parent;
     Companion_getInstance_59();
     parser.b2q(2, get_XMLNS_CONTENT(), 'tab');
     var tmp = $this;
@@ -6579,19 +6621,19 @@
     } else {
       var tmp$ret$0;
       // Inline function 'org.cru.godtools.shared.tool.parser.model.toEventIds' call
-      tmp$ret$0 = Companion_getInstance_17().f2t(tmp0_safe_receiver);
+      tmp$ret$0 = Companion_getInstance_17().e2t(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.i38_1 = tmp$ret$1;
+    tmp.f38_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.h38_1 = tmp$ret$2;
+    tmp_1.e38_1 = tmp$ret$2;
     var label = null;
     var tmp_2 = $this;
     var tmp$ret$10;
@@ -6630,7 +6672,7 @@
           if (tmp1_subject === 'events') {
             var tmp2_this = $this;
             // Inline function 'kotlin.collections.plusAssign' call
-            var tmp0_plusAssign = tmp2_this.h38_1;
+            var tmp0_plusAssign = tmp2_this.e38_1;
             var tmp1_plusAssign = Companion_getInstance_6().f2q(parser, $this);
             addAll(tmp0_plusAssign, tmp1_plusAssign);
           }
@@ -6686,8 +6728,8 @@
     tmp$ret$8 = tmp$ret$7.u7();
     tmp$ret$9 = tmp$ret$8;
     tmp$ret$10 = tmp$ret$9;
-    tmp_2.k38_1 = tmp$ret$10;
-    $this.j38_1 = label;
+    tmp_2.h38_1 = tmp$ret$10;
+    $this.g38_1 = label;
     return $this;
   }
   function Tab_init_$Create$(parent, parser) {
@@ -6695,7 +6737,7 @@
   }
   function Companion_35() {
     Companion_instance_35 = this;
-    this.l38_1 = 'tabs';
+    this.i38_1 = 'tabs';
   }
   var Companion_instance_35;
   function Companion_getInstance_38() {
@@ -6749,21 +6791,21 @@
     tmp$ret$0 = tmp0_apply;
     tmp$ret$1 = tmp$ret$0.u7();
     tmp$ret$2 = tmp$ret$1;
-    tmp_0.u38_1 = tmp$ret$2;
+    tmp_0.r38_1 = tmp$ret$2;
     return $this;
   }
   function Tabs_init_$Create$(parent, parser) {
     return Tabs_init_$Init$(parent, parser, objectCreate(protoOf(Tabs)));
   }
   protoOf(Tab).a2r = function () {
-    return this.k38_1;
+    return this.h38_1;
   };
   function Tab() {
   }
   protoOf(Tabs).d2r = function () {
     var tmp$ret$6;
     // Inline function 'kotlin.collections.flatMap' call
-    var tmp1_flatMap = this.u38_1;
+    var tmp1_flatMap = this.r38_1;
     var tmp$ret$5;
     // Inline function 'kotlin.collections.flatMapTo' call
     var tmp0_flatMapTo = ArrayList_init_$Create$();
@@ -6809,7 +6851,7 @@
   function Companion_36() {
     Companion_instance_36 = this;
   }
-  protoOf(Companion_36).v38 = function (_this__u8e3s4) {
+  protoOf(Companion_36).s38 = function (_this__u8e3s4) {
     var tmp0_subject = _this__u8e3s4;
     switch (tmp0_subject) {
       case 'start':
@@ -6858,7 +6900,7 @@
   function Companion_37() {
     Companion_instance_37 = this;
   }
-  protoOf(Companion_37).w38 = function (_this__u8e3s4) {
+  protoOf(Companion_37).t38 = function (_this__u8e3s4) {
     var tmp$ret$3;
     // Inline function 'kotlin.collections.mapNotNullTo' call
     var tmp0_mapNotNullTo = get_REGEX_SEQUENCE_SEPARATOR().ec(_this__u8e3s4);
@@ -6907,9 +6949,9 @@
   }
   function Companion_38() {
     Companion_instance_38 = this;
-    this.x38_1 = 'text';
-    this.y38_1 = 40;
-    this.z38_1 = 0;
+    this.u38_1 = 'text';
+    this.v38_1 = 40;
+    this.w38_1 = 0;
   }
   var Companion_instance_38;
   function Companion_getInstance_41() {
@@ -6926,10 +6968,10 @@
     parser.b2q(2, tmp, 'text');
     var tmp_0 = $this;
     var tmp0_safe_receiver = parser.o2r('text-align');
-    tmp_0.q34_1 = tmp0_safe_receiver == null ? null : Companion_getInstance_39().v38(tmp0_safe_receiver);
+    tmp_0.m34_1 = tmp0_safe_receiver == null ? null : Companion_getInstance_39().s38(tmp0_safe_receiver);
     var tmp_1 = $this;
     var tmp1_safe_receiver = parser.o2r(get_XML_TEXT_COLOR());
-    tmp_1.r34_1 = tmp1_safe_receiver == null ? null : toColorOrNull(tmp1_safe_receiver);
+    tmp_1.n34_1 = tmp1_safe_receiver == null ? null : toColorOrNull(tmp1_safe_receiver);
     var tmp_2 = $this;
     var tmp2_safe_receiver = parser.o2r(get_XML_TEXT_SCALE());
     var tmp3_elvis_lhs = tmp2_safe_receiver == null ? null : toDoubleOrNull(tmp2_safe_receiver);
@@ -6940,15 +6982,15 @@
     } else {
       tmp_3 = tmp3_elvis_lhs;
     }
-    tmp_2.s34_1 = tmp_3;
+    tmp_2.o34_1 = tmp_3;
     var tmp_4 = $this;
     var tmp$ret$0;
     // Inline function 'kotlin.collections.orEmpty' call
     var tmp4_safe_receiver = parser.o2r('text-style');
-    var tmp0_orEmpty = tmp4_safe_receiver == null ? null : Companion_getInstance_40().w38(tmp4_safe_receiver);
+    var tmp0_orEmpty = tmp4_safe_receiver == null ? null : Companion_getInstance_40().t38(tmp4_safe_receiver);
     var tmp0_elvis_lhs = tmp0_orEmpty;
     tmp$ret$0 = tmp0_elvis_lhs == null ? emptySet() : tmp0_elvis_lhs;
-    tmp_4.t34_1 = tmp$ret$0;
+    tmp_4.p34_1 = tmp$ret$0;
     var tmp_5 = $this;
     var tmp5_safe_receiver = parser.o2r('minimum-lines');
     var tmp6_safe_receiver = tmp5_safe_receiver == null ? null : toIntOrNull(tmp5_safe_receiver);
@@ -6979,8 +7021,8 @@
     } else {
       tmp_8 = tmp7_elvis_lhs;
     }
-    tmp_5.u34_1 = tmp_8;
-    $this.v34_1 = parser.o2r('start-image');
+    tmp_5.q34_1 = tmp_8;
+    $this.r34_1 = parser.o2r('start-image');
     var tmp_9 = $this;
     var tmp8_safe_receiver = parser.o2r('start-image-size');
     var tmp9_elvis_lhs = tmp8_safe_receiver == null ? null : toIntOrNull(tmp8_safe_receiver);
@@ -6991,8 +7033,8 @@
     } else {
       tmp_10 = tmp9_elvis_lhs;
     }
-    tmp_9.w34_1 = tmp_10;
-    $this.x34_1 = parser.o2r('end-image');
+    tmp_9.s34_1 = tmp_10;
+    $this.t34_1 = parser.o2r('end-image');
     var tmp_11 = $this;
     var tmp10_safe_receiver = parser.o2r('end-image-size');
     var tmp11_elvis_lhs = tmp10_safe_receiver == null ? null : toIntOrNull(tmp10_safe_receiver);
@@ -7003,8 +7045,8 @@
     } else {
       tmp_12 = tmp11_elvis_lhs;
     }
-    tmp_11.y34_1 = tmp_12;
-    $this.p34_1 = parser.a39();
+    tmp_11.u34_1 = tmp_12;
+    $this.l34_1 = parser.x38();
     return $this;
   }
   function Text_init_$Create$(parent, parser) {
@@ -7027,22 +7069,22 @@
     endImage = endImage === VOID ? null : endImage;
     Content_init_$Init$_0(parent, VOID, VOID, VOID, VOID, VOID, VOID, VOID, $this);
     Text.call($this);
-    $this.p34_1 = text;
-    $this.q34_1 = textAlign;
-    $this.r34_1 = textColor;
-    $this.s34_1 = textScale;
-    $this.t34_1 = textStyles;
+    $this.l34_1 = text;
+    $this.m34_1 = textAlign;
+    $this.n34_1 = textColor;
+    $this.o34_1 = textScale;
+    $this.p34_1 = textStyles;
     var tmp_0 = $this;
     Companion_getInstance_41();
-    tmp_0.u34_1 = 0;
-    $this.v34_1 = startImage;
+    tmp_0.q34_1 = 0;
+    $this.r34_1 = startImage;
     var tmp_1 = $this;
     Companion_getInstance_41();
-    tmp_1.w34_1 = 40;
-    $this.x34_1 = endImage;
+    tmp_1.s34_1 = 40;
+    $this.t34_1 = endImage;
     var tmp_2 = $this;
     Companion_getInstance_41();
-    tmp_2.y34_1 = 40;
+    tmp_2.u34_1 = 40;
     return $this;
   }
   function Text_init_$Create$_0(parent, text, textScale, textColor, textAlign, textStyles, startImage, endImage) {
@@ -7217,7 +7259,7 @@
     }
     return tmp;
   };
-  protoOf(Companion_39).e2w = function (_this__u8e3s4) {
+  protoOf(Companion_39).d2w = function (_this__u8e3s4) {
     var tmp;
     try {
       tmp = this.m2p(_this__u8e3s4);
@@ -7286,8 +7328,8 @@
     return tmp0_elvis_lhs == null ? compareTo(_Version___get_version__impl__iv3bqm($this).i(), _Version___get_version__impl__iv3bqm(other).i()) : tmp0_elvis_lhs;
   }
   function Version__compareTo_impl_crux23_0($this, other) {
-    var tmp = $this.b39_1;
-    return Version__compareTo_impl_crux23(tmp, other instanceof Version ? other.b39_1 : THROW_CCE());
+    var tmp = $this.y38_1;
+    return Version__compareTo_impl_crux23(tmp, other instanceof Version ? other.y38_1 : THROW_CCE());
   }
   function Version__toString_impl_cjmhtj($this) {
     return joinToString(_Version___get_version__impl__iv3bqm($this), '.');
@@ -7298,37 +7340,37 @@
   function Version__equals_impl_tebety($this, other) {
     if (!(other instanceof Version))
       return false;
-    var tmp0_other_with_cast = other instanceof Version ? other.b39_1 : THROW_CCE();
+    var tmp0_other_with_cast = other instanceof Version ? other.y38_1 : THROW_CCE();
     if (!equals($this, tmp0_other_with_cast))
       return false;
     return true;
   }
   function Version(version) {
     Companion_getInstance_42();
-    this.b39_1 = version;
+    this.y38_1 = version;
   }
-  protoOf(Version).c39 = function (other) {
-    return Version__compareTo_impl_crux23(this.b39_1, other);
+  protoOf(Version).z38 = function (other) {
+    return Version__compareTo_impl_crux23(this.y38_1, other);
   };
   protoOf(Version).a6 = function (other) {
     return Version__compareTo_impl_crux23_0(this, other);
   };
   protoOf(Version).toString = function () {
-    return Version__toString_impl_cjmhtj(this.b39_1);
+    return Version__toString_impl_cjmhtj(this.y38_1);
   };
   protoOf(Version).hashCode = function () {
-    return Version__hashCode_impl_yaseme(this.b39_1);
+    return Version__hashCode_impl_yaseme(this.y38_1);
   };
   protoOf(Version).equals = function (other) {
-    return Version__equals_impl_tebety(this.b39_1, other);
+    return Version__equals_impl_tebety(this.y38_1, other);
   };
   var Provider_YOUTUBE_instance;
   var Provider_UNKNOWN_instance;
   function Companion_40() {
     Companion_instance_40 = this;
-    this.d39_1 = Provider_UNKNOWN_getInstance();
+    this.a39_1 = Provider_UNKNOWN_getInstance();
   }
-  protoOf(Companion_40).f33 = function (value) {
+  protoOf(Companion_40).d33 = function (value) {
     var tmp0_subject = value;
     return tmp0_subject === 'youtube' ? Provider_YOUTUBE_getInstance() : null;
   };
@@ -7350,10 +7392,10 @@
   }
   function Companion_41() {
     Companion_instance_41 = this;
-    this.e39_1 = 'video';
-    this.f39_1 = new AspectRatio(16, 9);
-    this.g39_1 = Horizontal_CENTER_getInstance();
-    this.h39_1 = new Percent(1.0);
+    this.b39_1 = 'video';
+    this.c39_1 = new AspectRatio(16, 9);
+    this.d39_1 = Horizontal_CENTER_getInstance();
+    this.e39_1 = new Percent(1.0);
   }
   var Companion_instance_41;
   function Companion_getInstance_44() {
@@ -7372,18 +7414,18 @@
     Companion_getInstance_44();
     parser.b2q(2, tmp, 'video');
     var tmp_0 = $this;
-    var tmp0_elvis_lhs = Companion_getInstance_43().f33(parser.o2r('provider'));
-    tmp_0.q39_1 = tmp0_elvis_lhs == null ? Companion_getInstance_43().d39_1 : tmp0_elvis_lhs;
-    $this.r39_1 = parser.o2r('video-id');
+    var tmp0_elvis_lhs = Companion_getInstance_43().d33(parser.o2r('provider'));
+    tmp_0.n39_1 = tmp0_elvis_lhs == null ? Companion_getInstance_43().a39_1 : tmp0_elvis_lhs;
+    $this.o39_1 = parser.o2r('video-id');
     var tmp_1 = $this;
-    var tmp1_elvis_lhs = Companion_getInstance_8().i2t(parser.o2r('aspect-ratio'));
-    tmp_1.s39_1 = tmp1_elvis_lhs == null ? Companion_getInstance_44().f39_1 : tmp1_elvis_lhs;
+    var tmp1_elvis_lhs = Companion_getInstance_8().h2t(parser.o2r('aspect-ratio'));
+    tmp_1.p39_1 = tmp1_elvis_lhs == null ? Companion_getInstance_44().c39_1 : tmp1_elvis_lhs;
     var tmp_2 = $this;
-    var tmp2_safe_receiver = Companion_getInstance_22().r2u(parser.o2r('gravity'));
-    var tmp3_elvis_lhs = tmp2_safe_receiver == null ? null : tmp2_safe_receiver.s2u_1;
-    tmp_2.t39_1 = tmp3_elvis_lhs == null ? Companion_getInstance_44().g39_1 : tmp3_elvis_lhs;
+    var tmp2_safe_receiver = Companion_getInstance_22().q2u(parser.o2r('gravity'));
+    var tmp3_elvis_lhs = tmp2_safe_receiver == null ? null : tmp2_safe_receiver.r2u_1;
+    tmp_2.q39_1 = tmp3_elvis_lhs == null ? Companion_getInstance_44().d39_1 : tmp3_elvis_lhs;
     var tmp_3 = $this;
-    var tmp4_safe_receiver = Companion_getInstance_16().u2u(parser.o2r('width'));
+    var tmp4_safe_receiver = Companion_getInstance_16().t2u(parser.o2r('width'));
     var tmp_4;
     if (tmp4_safe_receiver == null) {
       tmp_4 = null;
@@ -7404,7 +7446,7 @@
       tmp_4 = tmp$ret$1;
     }
     var tmp5_elvis_lhs = tmp_4;
-    tmp_3.u39_1 = tmp5_elvis_lhs == null ? Companion_getInstance_44().h39_1 : tmp5_elvis_lhs;
+    tmp_3.r39_1 = tmp5_elvis_lhs == null ? Companion_getInstance_44().e39_1 : tmp5_elvis_lhs;
     skipTag(parser);
     return $this;
   }
@@ -7420,7 +7462,7 @@
     return Provider_UNKNOWN_instance;
   }
   protoOf(Video).p2q = function () {
-    return (protoOf(Content).p2q.call(this) ? true : this.q39_1.equals(Provider_UNKNOWN_getInstance())) ? true : this.r39_1 == null;
+    return (protoOf(Content).p2q.call(this) ? true : this.n39_1.equals(Provider_UNKNOWN_getInstance())) ? true : this.o39_1 == null;
   };
   function Video() {
     Companion_getInstance_44();
@@ -7462,12 +7504,12 @@
     var tmp$ret$0;
     // Inline function 'kotlin.collections.mutableListOf' call
     tmp$ret$0 = ArrayList_init_$Create$();
-    tmp_0.n3a_1 = tmp$ret$0;
+    tmp_0.k3a_1 = tmp$ret$0;
     var tmp_1 = $this;
     var tmp$ret$1;
     // Inline function 'kotlin.collections.mutableListOf' call
     tmp$ret$1 = ArrayList_init_$Create$();
-    tmp_1.o3a_1 = tmp$ret$1;
+    tmp_1.l3a_1 = tmp$ret$1;
     // Inline function 'org.cru.godtools.shared.tool.parser.xml.parseChildren' call
     $l$loop_4: while (true) {
       var tmp_2 = parser.h();
@@ -7487,7 +7529,7 @@
         if (tmp1_subject === 'events') {
           var tmp2_this = $this;
           // Inline function 'kotlin.collections.plusAssign' call
-          var tmp0_plusAssign = tmp2_this.n3a_1;
+          var tmp0_plusAssign = tmp2_this.k3a_1;
           var tmp1_plusAssign = Companion_getInstance_6().f2q(parser, $this);
           addAll(tmp0_plusAssign, tmp1_plusAssign);
         }
@@ -7496,7 +7538,7 @@
         if (tmp3_subject === 'content') {
           var tmp4_this = $this;
           // Inline function 'kotlin.collections.plusAssign' call
-          var tmp3_plusAssign = tmp4_this.o3a_1;
+          var tmp3_plusAssign = tmp4_this.l3a_1;
           var tmp$ret$10;
           // Inline function 'org.cru.godtools.shared.tool.parser.model.parseContent' call
           var tmp$ret$9;
@@ -7590,22 +7632,22 @@
   function LessonPage_init_$Create$(manifest, fileName, parser) {
     return LessonPage_init_$Init$(manifest, fileName, parser, objectCreate(protoOf(LessonPage)));
   }
-  protoOf(LessonPage).p3a = function () {
-    return this.n3a_1;
+  protoOf(LessonPage).m3a = function () {
+    return this.k3a_1;
   };
   protoOf(LessonPage).a2r = function () {
-    return this.o3a_1;
+    return this.l3a_1;
   };
-  protoOf(LessonPage).q3a = function (type) {
+  protoOf(LessonPage).n3a = function (type) {
     return type.equals(Type_LESSON_getInstance());
   };
   function LessonPage() {
   }
   function Companion_42() {
     Companion_instance_42 = this;
-    this.r3b_1 = 'card';
-    this.s3b_1 = 'id';
-    this.t3b_1 = 'content';
+    this.o3b_1 = 'card';
+    this.p3b_1 = 'id';
+    this.q3b_1 = 'content';
   }
   var Companion_instance_42;
   function Companion_getInstance_45() {
@@ -7616,27 +7658,27 @@
   function Card_init_$Init$_0(page, parser, $this) {
     BaseModel.call($this, page);
     Card_0.call($this);
-    $this.v3b_1 = page;
+    $this.s3b_1 = page;
     Companion_getInstance_59();
     var tmp = get_XMLNS_PAGE();
     Companion_getInstance_45();
     parser.b2q(2, tmp, 'card');
     var tmp_0 = $this;
     Companion_getInstance_45();
-    tmp_0.w3b_1 = parser.o2r('id');
+    tmp_0.t3b_1 = parser.o2r('id');
     var tmp_1 = $this;
     var tmp0_safe_receiver = parser.o2r(get_XML_BACKGROUND_COLOR());
-    tmp_1.x3b_1 = tmp0_safe_receiver == null ? null : toColorOrNull(tmp0_safe_receiver);
+    tmp_1.u3b_1 = tmp0_safe_receiver == null ? null : toColorOrNull(tmp0_safe_receiver);
     var tmp_2 = $this;
     var tmp$ret$0;
     // Inline function 'kotlin.collections.mutableListOf' call
     tmp$ret$0 = ArrayList_init_$Create$();
-    tmp_2.y3b_1 = tmp$ret$0;
+    tmp_2.v3b_1 = tmp$ret$0;
     var tmp_3 = $this;
     var tmp$ret$1;
     // Inline function 'kotlin.collections.mutableListOf' call
     tmp$ret$1 = ArrayList_init_$Create$();
-    tmp_3.z3b_1 = tmp$ret$1;
+    tmp_3.w3b_1 = tmp$ret$1;
     // Inline function 'org.cru.godtools.shared.tool.parser.xml.parseChildren' call
     $l$loop_4: while (true) {
       var tmp_4 = parser.h();
@@ -7656,7 +7698,7 @@
         if (tmp1_subject === 'events') {
           var tmp2_this = $this;
           // Inline function 'kotlin.collections.plusAssign' call
-          var tmp0_plusAssign = tmp2_this.y3b_1;
+          var tmp0_plusAssign = tmp2_this.v3b_1;
           var tmp1_plusAssign = Companion_getInstance_6().f2q(parser, $this);
           addAll(tmp0_plusAssign, tmp1_plusAssign);
         }
@@ -7666,7 +7708,7 @@
         if (tmp3_subject === 'content') {
           var tmp4_this = $this;
           // Inline function 'kotlin.collections.plusAssign' call
-          var tmp3_plusAssign = tmp4_this.z3b_1;
+          var tmp3_plusAssign = tmp4_this.w3b_1;
           var tmp$ret$10;
           // Inline function 'org.cru.godtools.shared.tool.parser.model.parseContent' call
           var tmp$ret$9;
@@ -7762,7 +7804,7 @@
   }
   function Companion_43() {
     Companion_instance_43 = this;
-    this.a3c_1 = 'cardcollection';
+    this.x3b_1 = 'cardcollection';
   }
   var Companion_instance_43;
   function Companion_getInstance_46() {
@@ -7779,17 +7821,17 @@
     parser.b2q(2, tmp, 'page');
     var tmp_0 = Companion_getInstance_48();
     Companion_getInstance_46();
-    tmp_0.b3c(parser, 'cardcollection');
+    tmp_0.y3b(parser, 'cardcollection');
     var tmp_1 = $this;
     var tmp$ret$0;
     // Inline function 'kotlin.collections.mutableListOf' call
     tmp$ret$0 = ArrayList_init_$Create$();
-    tmp_1.u3c_1 = tmp$ret$0;
+    tmp_1.r3c_1 = tmp$ret$0;
     var tmp_2 = $this;
     var tmp$ret$1;
     // Inline function 'kotlin.collections.mutableListOf' call
     tmp$ret$1 = ArrayList_init_$Create$();
-    tmp_2.v3c_1 = tmp$ret$1;
+    tmp_2.s3c_1 = tmp$ret$1;
     // Inline function 'org.cru.godtools.shared.tool.parser.xml.parseChildren' call
     $l$loop_1: while (true) {
       var tmp_3 = parser.h();
@@ -7809,7 +7851,7 @@
         if (tmp1_subject === 'events') {
           var tmp2_this = $this;
           // Inline function 'kotlin.collections.plusAssign' call
-          var tmp0_plusAssign = tmp2_this.u3c_1;
+          var tmp0_plusAssign = tmp2_this.r3c_1;
           var tmp1_plusAssign = Companion_getInstance_6().f2q(parser, $this);
           addAll(tmp0_plusAssign, tmp1_plusAssign);
         }
@@ -7818,7 +7860,7 @@
         if (tmp3_subject === 'cards') {
           var tmp4_this = $this;
           // Inline function 'kotlin.collections.plusAssign' call
-          var tmp2_plusAssign = tmp4_this.v3c_1;
+          var tmp2_plusAssign = tmp4_this.s3c_1;
           var tmp3_plusAssign = parseCards($this, parser);
           addAll(tmp2_plusAssign, tmp3_plusAssign);
         }
@@ -7880,15 +7922,15 @@
     return tmp$ret$2;
   }
   protoOf(Card_0).a2r = function () {
-    return this.z3b_1;
+    return this.w3b_1;
   };
   function Card_0() {
     Companion_getInstance_45();
   }
-  protoOf(CardCollectionPage).p3a = function () {
-    return this.u3c_1;
+  protoOf(CardCollectionPage).m3a = function () {
+    return this.r3c_1;
   };
-  protoOf(CardCollectionPage).q3a = function (type) {
+  protoOf(CardCollectionPage).n3a = function (type) {
     return type.equals(Type_CYOA_getInstance());
   };
   function CardCollectionPage() {
@@ -7924,7 +7966,7 @@
   }
   function Companion_44() {
     Companion_instance_44 = this;
-    this.w3c_1 = 'content';
+    this.t3c_1 = 'content';
   }
   var Companion_instance_44;
   function Companion_getInstance_47() {
@@ -7941,17 +7983,17 @@
     parser.b2q(2, tmp, 'page');
     var tmp_0 = Companion_getInstance_48();
     Companion_getInstance_47();
-    tmp_0.b3c(parser, 'content');
+    tmp_0.y3b(parser, 'content');
     var tmp_1 = $this;
     var tmp$ret$0;
     // Inline function 'kotlin.collections.mutableListOf' call
     tmp$ret$0 = ArrayList_init_$Create$();
-    tmp_1.p3d_1 = tmp$ret$0;
+    tmp_1.m3d_1 = tmp$ret$0;
     var tmp_2 = $this;
     var tmp$ret$1;
     // Inline function 'kotlin.collections.mutableListOf' call
     tmp$ret$1 = ArrayList_init_$Create$();
-    tmp_2.q3d_1 = tmp$ret$1;
+    tmp_2.n3d_1 = tmp$ret$1;
     // Inline function 'org.cru.godtools.shared.tool.parser.xml.parseChildren' call
     $l$loop_4: while (true) {
       var tmp_3 = parser.h();
@@ -7971,7 +8013,7 @@
         if (tmp1_subject === 'events') {
           var tmp2_this = $this;
           // Inline function 'kotlin.collections.plusAssign' call
-          var tmp0_plusAssign = tmp2_this.p3d_1;
+          var tmp0_plusAssign = tmp2_this.m3d_1;
           var tmp1_plusAssign = Companion_getInstance_6().f2q(parser, $this);
           addAll(tmp0_plusAssign, tmp1_plusAssign);
         }
@@ -7980,7 +8022,7 @@
         if (tmp3_subject === 'content') {
           var tmp4_this = $this;
           // Inline function 'kotlin.collections.plusAssign' call
-          var tmp3_plusAssign = tmp4_this.q3d_1;
+          var tmp3_plusAssign = tmp4_this.n3d_1;
           var tmp$ret$10;
           // Inline function 'org.cru.godtools.shared.tool.parser.model.parseContent' call
           var tmp$ret$9;
@@ -8074,13 +8116,13 @@
   function ContentPage_init_$Create$(manifest, fileName, parser) {
     return ContentPage_init_$Init$(manifest, fileName, parser, objectCreate(protoOf(ContentPage)));
   }
-  protoOf(ContentPage).p3a = function () {
-    return this.p3d_1;
+  protoOf(ContentPage).m3a = function () {
+    return this.m3d_1;
   };
   protoOf(ContentPage).a2r = function () {
-    return this.q3d_1;
+    return this.n3d_1;
   };
-  protoOf(ContentPage).q3a = function (type) {
+  protoOf(ContentPage).n3a = function (type) {
     return type.equals(Type_CYOA_getInstance());
   };
   function ContentPage() {
@@ -8088,16 +8130,16 @@
   }
   function Companion_45() {
     Companion_instance_45 = this;
-    this.k30_1 = 'page';
+    this.i30_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().q2h(0 / 255.0, 0 / 255.0, 0 / 255.0, 0.0));
-    tmp.l30_1 = tmp$ret$0;
-    this.m30_1 = Companion_getInstance_22().q2u_1;
-    this.n30_1 = ImageScaleType_FILL_X_getInstance();
+    tmp.j30_1 = tmp$ret$0;
+    this.k30_1 = Companion_getInstance_22().p2u_1;
+    this.l30_1 = ImageScaleType_FILL_X_getInstance();
   }
-  protoOf(Companion_45).o30 = function (manifest, fileName, parser) {
+  protoOf(Companion_45).m30 = function (manifest, fileName, parser) {
     Companion_getInstance_59();
     parser.b2q(2, null, 'page');
     var tmp0_subject = parser.d2q();
@@ -8139,7 +8181,7 @@
       var tmp_2;
       var tmp$ret$0;
       // Inline function 'org.cru.godtools.shared.tool.parser.model.page.Companion.parse.<anonymous>' call
-      tmp$ret$0 = tmp1_safe_receiver.q3a(manifest.type);
+      tmp$ret$0 = tmp1_safe_receiver.n3a(manifest.type);
       if (tmp$ret$0) {
         tmp_2 = tmp1_safe_receiver;
       } else {
@@ -8150,7 +8192,7 @@
     }
     return tmp_1;
   };
-  protoOf(Companion_45).b3c = function (_this__u8e3s4, type) {
+  protoOf(Companion_45).y3b = function (_this__u8e3s4, type) {
     var actual = _this__u8e3s4.d2t(get_XMLNS_XSI(), 'type');
     if (!(type === actual))
       throw new XmlPullParserException('expected ' + type + ' not ' + actual);
@@ -8167,9 +8209,9 @@
     Companion_getInstance_59();
     Companion_getInstance_48();
     parser.b2q(2, null, 'page');
-    $this.u3a_1 = parser.o2r('id');
-    $this.v3a_1 = fileName;
-    $this.w3a_1 = parser.d2t(get_XMLNS_CYOA(), 'parent');
+    $this.r3a_1 = parser.o2r('id');
+    $this.s3a_1 = fileName;
+    $this.t3a_1 = parser.d2t(get_XMLNS_CYOA(), 'parent');
     var tmp = $this;
     var tmp0_safe_receiver = parser.o2r('hidden');
     var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : toBoolean(tmp0_safe_receiver);
@@ -8178,54 +8220,54 @@
     var tmp$ret$0;
     // Inline function 'org.cru.godtools.shared.tool.parser.model.toEventIds' call
     var tmp0_toEventIds = parser.o2r(get_XML_LISTENERS());
-    tmp$ret$0 = Companion_getInstance_17().f2t(tmp0_toEventIds);
+    tmp$ret$0 = Companion_getInstance_17().e2t(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.o2r(get_XML_DISMISS_LISTENERS());
-    tmp$ret$1 = Companion_getInstance_17().f2t(tmp1_toEventIds);
+    tmp$ret$1 = Companion_getInstance_17().e2t(tmp1_toEventIds);
     tmp_1.dismissListeners = toSet_0(tmp$ret$1);
     var tmp_2 = $this;
     var tmp2_safe_receiver = parser.o2r(get_XML_PRIMARY_COLOR());
-    tmp_2.x3a_1 = tmp2_safe_receiver == null ? null : toColorOrNull(tmp2_safe_receiver);
+    tmp_2.u3a_1 = tmp2_safe_receiver == null ? null : toColorOrNull(tmp2_safe_receiver);
     var tmp_3 = $this;
     var tmp3_safe_receiver = parser.o2r(get_XML_PRIMARY_TEXT_COLOR());
-    tmp_3.y3a_1 = tmp3_safe_receiver == null ? null : toColorOrNull(tmp3_safe_receiver);
+    tmp_3.v3a_1 = tmp3_safe_receiver == null ? null : toColorOrNull(tmp3_safe_receiver);
     var tmp_4 = $this;
     var tmp4_safe_receiver = parser.o2r(get_XML_BACKGROUND_COLOR());
     var tmp5_elvis_lhs = tmp4_safe_receiver == null ? null : toColorOrNull(tmp4_safe_receiver);
-    tmp_4.z3a_1 = tmp5_elvis_lhs == null ? Companion_getInstance_48().l30_1 : tmp5_elvis_lhs;
-    $this.a3b_1 = parser.o2r(get_XML_BACKGROUND_IMAGE());
+    tmp_4.w3a_1 = tmp5_elvis_lhs == null ? Companion_getInstance_48().j30_1 : tmp5_elvis_lhs;
+    $this.x3a_1 = parser.o2r(get_XML_BACKGROUND_IMAGE());
     var tmp_5 = $this;
     var tmp6_safe_receiver = parser.o2r(get_XML_BACKGROUND_IMAGE_GRAVITY());
-    var tmp7_elvis_lhs = tmp6_safe_receiver == null ? null : Companion_getInstance_22().r2u(tmp6_safe_receiver);
-    tmp_5.b3b_1 = tmp7_elvis_lhs == null ? Companion_getInstance_48().m30_1 : tmp7_elvis_lhs;
+    var tmp7_elvis_lhs = tmp6_safe_receiver == null ? null : Companion_getInstance_22().q2u(tmp6_safe_receiver);
+    tmp_5.y3a_1 = tmp7_elvis_lhs == null ? Companion_getInstance_48().k30_1 : tmp7_elvis_lhs;
     var tmp_6 = $this;
     var tmp8_safe_receiver = parser.o2r(get_XML_BACKGROUND_IMAGE_SCALE_TYPE());
-    var tmp9_elvis_lhs = tmp8_safe_receiver == null ? null : Companion_getInstance_24().p2y(tmp8_safe_receiver);
-    tmp_6.c3b_1 = tmp9_elvis_lhs == null ? Companion_getInstance_48().n30_1 : tmp9_elvis_lhs;
+    var tmp9_elvis_lhs = tmp8_safe_receiver == null ? null : Companion_getInstance_24().n2y(tmp8_safe_receiver);
+    tmp_6.z3a_1 = tmp9_elvis_lhs == null ? Companion_getInstance_48().l30_1 : tmp9_elvis_lhs;
     var tmp_7 = $this;
     var tmp10_safe_receiver = parser.o2r(get_XML_CONTROL_COLOR());
-    tmp_7.d3b_1 = tmp10_safe_receiver == null ? null : toColorOrNull(tmp10_safe_receiver);
+    tmp_7.a3b_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.d2t(tmp_9, 'card-background-color');
-    tmp_8.e3b_1 = tmp11_safe_receiver == null ? null : toColorOrNull(tmp11_safe_receiver);
+    tmp_8.b3b_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.d2t(tmp_11, 'multiselect-option-background-color');
-    tmp_10.f3b_1 = tmp12_safe_receiver == null ? null : toColorOrNull(tmp12_safe_receiver);
+    tmp_10.c3b_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.d2t(tmp_13, 'multiselect-option-selected-color');
-    tmp_12.g3b_1 = tmp13_safe_receiver == null ? null : toColorOrNull(tmp13_safe_receiver);
+    tmp_12.d3b_1 = tmp13_safe_receiver == null ? null : toColorOrNull(tmp13_safe_receiver);
     var tmp_14 = $this;
     var tmp14_safe_receiver = parser.o2r(get_XML_TEXT_COLOR());
-    tmp_14.h3b_1 = tmp14_safe_receiver == null ? null : toColorOrNull(tmp14_safe_receiver);
+    tmp_14.e3b_1 = tmp14_safe_receiver == null ? null : toColorOrNull(tmp14_safe_receiver);
     var tmp_15 = $this;
     var tmp15_safe_receiver = parser.o2r(get_XML_TEXT_SCALE());
     var tmp16_elvis_lhs = tmp15_safe_receiver == null ? null : toDoubleOrNull(tmp15_safe_receiver);
@@ -8236,7 +8278,7 @@
     } else {
       tmp_16 = tmp16_elvis_lhs;
     }
-    tmp_15.i3b_1 = tmp_16;
+    tmp_15.f3b_1 = tmp_16;
     return $this;
   }
   function Page_init_$Init$_0(manifest, id, fileName, parentPage, primaryColor, backgroundColor, backgroundImage, backgroundImageGravity, backgroundImageScaleType, controlColor, cardBackgroundColor, textColor, textScale, $this) {
@@ -8245,10 +8287,10 @@
     fileName = fileName === VOID ? null : fileName;
     parentPage = parentPage === VOID ? null : parentPage;
     primaryColor = primaryColor === VOID ? null : primaryColor;
-    backgroundColor = backgroundColor === VOID ? Companion_getInstance_48().l30_1 : backgroundColor;
+    backgroundColor = backgroundColor === VOID ? Companion_getInstance_48().j30_1 : backgroundColor;
     backgroundImage = backgroundImage === VOID ? null : backgroundImage;
-    backgroundImageGravity = backgroundImageGravity === VOID ? Companion_getInstance_48().m30_1 : backgroundImageGravity;
-    backgroundImageScaleType = backgroundImageScaleType === VOID ? Companion_getInstance_48().n30_1 : backgroundImageScaleType;
+    backgroundImageGravity = backgroundImageGravity === VOID ? Companion_getInstance_48().k30_1 : backgroundImageGravity;
+    backgroundImageScaleType = backgroundImageScaleType === VOID ? Companion_getInstance_48().l30_1 : backgroundImageScaleType;
     controlColor = controlColor === VOID ? null : controlColor;
     cardBackgroundColor = cardBackgroundColor === VOID ? null : cardBackgroundColor;
     textColor = textColor === VOID ? null : textColor;
@@ -8262,30 +8304,30 @@
     textScale = tmp;
     BaseModel.call($this, manifest);
     Page.call($this);
-    $this.u3a_1 = id;
-    $this.v3a_1 = fileName;
-    $this.w3a_1 = parentPage;
+    $this.r3a_1 = id;
+    $this.s3a_1 = fileName;
+    $this.t3a_1 = parentPage;
     $this.isHidden = false;
     $this.listeners = emptySet();
     $this.dismissListeners = emptySet();
-    $this.x3a_1 = primaryColor;
-    $this.y3a_1 = null;
-    $this.z3a_1 = backgroundColor;
-    $this.a3b_1 = backgroundImage;
-    $this.b3b_1 = backgroundImageGravity;
-    $this.c3b_1 = backgroundImageScaleType;
-    $this.d3b_1 = controlColor;
-    $this.e3b_1 = cardBackgroundColor;
-    $this.f3b_1 = null;
-    $this.g3b_1 = null;
-    $this.h3b_1 = textColor;
-    $this.i3b_1 = textScale;
+    $this.u3a_1 = primaryColor;
+    $this.v3a_1 = null;
+    $this.w3a_1 = backgroundColor;
+    $this.x3a_1 = backgroundImage;
+    $this.y3a_1 = backgroundImageGravity;
+    $this.z3a_1 = backgroundImageScaleType;
+    $this.a3b_1 = controlColor;
+    $this.b3b_1 = cardBackgroundColor;
+    $this.c3b_1 = null;
+    $this.d3b_1 = null;
+    $this.e3b_1 = textColor;
+    $this.f3b_1 = textScale;
     return $this;
   }
   function Page$id$delegate$lambda(this$0) {
     return function () {
-      var tmp0_elvis_lhs = this$0.u3a_1;
-      var tmp1_elvis_lhs = tmp0_elvis_lhs == null ? this$0.v3a_1 : tmp0_elvis_lhs;
+      var tmp0_elvis_lhs = this$0.r3a_1;
+      var tmp1_elvis_lhs = tmp0_elvis_lhs == null ? this$0.s3a_1 : tmp0_elvis_lhs;
       return tmp1_elvis_lhs == null ? '' + this$0.h2n().code + '-' + this$0.position : tmp1_elvis_lhs;
     };
   }
@@ -8294,82 +8336,82 @@
       return this$0.h2n()._pages.l1(this$0);
     };
   }
-  protoOf(Page).r33 = function () {
+  protoOf(Page).n33 = function () {
     var tmp$ret$0;
     // Inline function 'kotlin.getValue' call
     var tmp0_getValue = id$factory();
-    tmp$ret$0 = this.s3a_1.o1();
+    tmp$ret$0 = this.p3a_1.o1();
     return tmp$ret$0;
   };
-  protoOf(Page).j3b = function () {
+  protoOf(Page).g3b = function () {
     var tmp$ret$0;
     // Inline function 'kotlin.getValue' call
     var tmp0_getValue = position$factory();
-    tmp$ret$0 = this.t3a_1.o1();
+    tmp$ret$0 = this.q3a_1.o1();
     return tmp$ret$0;
   };
-  protoOf(Page).k3b = function () {
-    return this.v3a_1;
+  protoOf(Page).h3b = function () {
+    return this.s3a_1;
   };
-  protoOf(Page).l3b = function () {
-    return this.h2n().findPage(this.w3a_1);
+  protoOf(Page).i3b = function () {
+    return this.h2n().findPage(this.t3a_1);
   };
-  protoOf(Page).m3b = function () {
+  protoOf(Page).j3b = function () {
     return this.isHidden;
   };
-  protoOf(Page).n3b = function () {
+  protoOf(Page).k3b = function () {
     return this.listeners;
   };
-  protoOf(Page).y33 = function () {
+  protoOf(Page).u33 = function () {
     return this.dismissListeners;
   };
-  protoOf(Page).u2v = function () {
-    var tmp0_elvis_lhs = this.x3a_1;
+  protoOf(Page).t2v = function () {
+    var tmp0_elvis_lhs = this.u3a_1;
     return tmp0_elvis_lhs == null ? get_primaryColor_0(this.c2r()) : tmp0_elvis_lhs;
   };
-  protoOf(Page).v2v = function () {
-    var tmp0_elvis_lhs = this.y3a_1;
+  protoOf(Page).u2v = function () {
+    var tmp0_elvis_lhs = this.v3a_1;
     return tmp0_elvis_lhs == null ? get_primaryTextColor_0(this.c2r()) : tmp0_elvis_lhs;
   };
-  protoOf(Page).b34 = function () {
-    return this.z3a_1;
+  protoOf(Page).x33 = function () {
+    return this.w3a_1;
   };
-  protoOf(Page).o3b = function () {
-    return this.a3b_1;
+  protoOf(Page).l3b = function () {
+    return this.x3a_1;
   };
-  protoOf(Page).c34 = function () {
-    return getResource(this, this.a3b_1);
+  protoOf(Page).y33 = function () {
+    return getResource(this, this.x3a_1);
   };
-  protoOf(Page).d34 = function () {
-    return this.b3b_1;
+  protoOf(Page).z33 = function () {
+    return this.y3a_1;
   };
-  protoOf(Page).e34 = function () {
-    return this.c3b_1;
+  protoOf(Page).a34 = function () {
+    return this.z3a_1;
   };
-  protoOf(Page).p3b = function () {
-    var tmp0_elvis_lhs = this.d3b_1;
+  protoOf(Page).m3b = function () {
+    var tmp0_elvis_lhs = this.a3b_1;
     return tmp0_elvis_lhs == null ? this.h2n().b2s_1 : tmp0_elvis_lhs;
   };
-  protoOf(Page).x2v = function () {
-    var tmp0_elvis_lhs = this.e3b_1;
-    return tmp0_elvis_lhs == null ? this.h2n().x2v() : tmp0_elvis_lhs;
+  protoOf(Page).w2v = function () {
+    var tmp0_elvis_lhs = this.b3b_1;
+    return tmp0_elvis_lhs == null ? this.h2n().w2v() : tmp0_elvis_lhs;
   };
-  protoOf(Page).y2v = function () {
-    var tmp0_elvis_lhs = this.f3b_1;
+  protoOf(Page).x2v = function () {
+    var tmp0_elvis_lhs = this.c3b_1;
     return tmp0_elvis_lhs == null ? get_multiselectOptionBackgroundColor.call(this) : tmp0_elvis_lhs;
   };
-  protoOf(Page).z2v = function () {
-    var tmp0_elvis_lhs = this.g3b_1;
+  protoOf(Page).y2v = function () {
+    var tmp0_elvis_lhs = this.d3b_1;
     return tmp0_elvis_lhs == null ? get_multiselectOptionSelectedColor.call(this) : tmp0_elvis_lhs;
   };
-  protoOf(Page).s2v = function () {
-    var tmp0_elvis_lhs = this.h3b_1;
+  protoOf(Page).r2v = function () {
+    var tmp0_elvis_lhs = this.e3b_1;
     return tmp0_elvis_lhs == null ? get_textColor_0(this.c2r()) : tmp0_elvis_lhs;
   };
-  protoOf(Page).a2w = function () {
-    return this.i3b_1 * get_textScale_0(this.c2r());
+  protoOf(Page).z2v = function () {
+    return this.f3b_1 * get_textScale_0(this.c2r());
   };
-  protoOf(Page).q3b = function (type) {
+  protoOf(Page).n3b = function (type) {
     var tmp0_subject = type;
     var tmp0 = tmp0_subject.d4_1;
     var tmp;
@@ -8377,7 +8419,7 @@
       case 1:
         var tmp$ret$2;
         // Inline function 'kotlin.collections.filter' call
-        var tmp1_filter = this.p3a();
+        var tmp1_filter = this.m3a();
         var tmp$ret$1;
         // Inline function 'kotlin.collections.filterTo' call
         var tmp0_filterTo = ArrayList_init_$Create$();
@@ -8399,7 +8441,7 @@
       case 2:
         var tmp$ret$5;
         // Inline function 'kotlin.collections.filter' call
-        var tmp3_filter = this.p3a();
+        var tmp3_filter = this.m3a();
         var tmp$ret$4;
         // Inline function 'kotlin.collections.filterTo' call
         var tmp2_filterTo = ArrayList_init_$Create$();
@@ -8427,14 +8469,14 @@
   function Page() {
     Companion_getInstance_48();
     var tmp = this;
-    tmp.s3a_1 = lazy(Page$id$delegate$lambda(this));
+    tmp.p3a_1 = lazy(Page$id$delegate$lambda(this));
     var tmp_0 = this;
-    tmp_0.t3a_1 = lazy(Page$position$delegate$lambda(this));
+    tmp_0.q3a_1 = lazy(Page$position$delegate$lambda(this));
   }
-  defineProp(protoOf(Page), 'id', protoOf(Page).r33);
-  defineProp(protoOf(Page), 'position', protoOf(Page).j3b);
-  defineProp(protoOf(Page), 'parentPage', protoOf(Page).l3b);
-  defineProp(protoOf(Page), 'backgroundImage', protoOf(Page).c34);
+  defineProp(protoOf(Page), 'id', protoOf(Page).n33);
+  defineProp(protoOf(Page), 'position', protoOf(Page).g3b);
+  defineProp(protoOf(Page), 'parentPage', protoOf(Page).i3b);
+  defineProp(protoOf(Page), 'backgroundImage', protoOf(Page).y33);
   function id$factory() {
     return getPropertyCallableRef('id', 1, KProperty1, function (receiver) {
       return receiver.id;
@@ -8451,9 +8493,9 @@
   var XMLNS_SHAREABLE;
   function Companion_46() {
     Companion_instance_46 = this;
-    this.h33_1 = 'items';
+    this.f33_1 = 'items';
   }
-  protoOf(Companion_46).i33 = function (_this__u8e3s4, manifest) {
+  protoOf(Companion_46).g33 = function (_this__u8e3s4, manifest) {
     var tmp$ret$4;
     // Inline function 'kotlin.collections.buildList' call
     // Inline function 'kotlin.contracts.contract' call
@@ -8482,7 +8524,7 @@
       // Inline function 'org.cru.godtools.shared.tool.parser.model.shareable.Companion.parseShareableItems.<anonymous>.<anonymous>' call
       var tmp0_subject = _this__u8e3s4.d2q();
       if (tmp0_subject === get_XMLNS_SHAREABLE()) {
-        var tmp1_safe_receiver = Companion_getInstance_49().r3d(manifest, _this__u8e3s4);
+        var tmp1_safe_receiver = Companion_getInstance_49().o3d(manifest, _this__u8e3s4);
         if (tmp1_safe_receiver == null)
           null;
         else {
@@ -8506,9 +8548,9 @@
     tmp$ret$4 = tmp$ret$3;
     return tmp$ret$4;
   };
-  protoOf(Companion_46).r3d = function (manifest, parser) {
+  protoOf(Companion_46).o3d = function (manifest, parser) {
     Companion_getInstance_59();
-    parser.s3d(2, get_XMLNS_SHAREABLE());
+    parser.p3d(2, get_XMLNS_SHAREABLE());
     var tmp0_subject = parser.d2q();
     var tmp;
     if (tmp0_subject === get_XMLNS_SHAREABLE()) {
@@ -8536,23 +8578,23 @@
     BaseModel.call($this, parent);
     Shareable.call($this);
     Companion_getInstance_59();
-    parser.s3d(2, get_XMLNS_SHAREABLE());
-    $this.p33_1 = parser.o2r('id');
+    parser.p3d(2, get_XMLNS_SHAREABLE());
+    $this.l33_1 = parser.o2r('id');
     var tmp = $this;
     var tmp0_safe_receiver = parser.o2r('order');
     var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : toIntOrNull(tmp0_safe_receiver);
-    tmp.q33_1 = tmp1_elvis_lhs == null ? 2147483647 : tmp1_elvis_lhs;
+    tmp.m33_1 = tmp1_elvis_lhs == null ? 2147483647 : tmp1_elvis_lhs;
     return $this;
   }
-  protoOf(Shareable).r33 = function () {
-    return this.p33_1;
+  protoOf(Shareable).n33 = function () {
+    return this.l33_1;
   };
   function Shareable() {
     Companion_getInstance_49();
   }
   function Companion_47() {
     Companion_instance_47 = this;
-    this.t3d_1 = 'image';
+    this.q3d_1 = 'image';
   }
   var Companion_instance_47;
   function Companion_getInstance_50() {
@@ -8567,7 +8609,7 @@
     var tmp = get_XMLNS_SHAREABLE();
     Companion_getInstance_50();
     parser.b2q(2, tmp, 'image');
-    $this.x3d_1 = parser.o2r('resource');
+    $this.u3d_1 = parser.o2r('resource');
     var description = null;
     // Inline function 'org.cru.godtools.shared.tool.parser.xml.parseChildren' call
     $l$loop_1: while (true) {
@@ -8593,15 +8635,15 @@
         continue $l$loop_1;
       skipTag(parser);
     }
-    $this.y3d_1 = description;
+    $this.v3d_1 = description;
     return $this;
   }
   function ShareableImage_init_$Create$(manifest, parser) {
     return ShareableImage_init_$Init$(manifest, parser, objectCreate(protoOf(ShareableImage)));
   }
-  protoOf(ShareableImage).r33 = function () {
-    var tmp0_elvis_lhs = protoOf(Shareable).r33.call(this);
-    return tmp0_elvis_lhs == null ? this.x3d_1 : tmp0_elvis_lhs;
+  protoOf(ShareableImage).n33 = function () {
+    var tmp0_elvis_lhs = protoOf(Shareable).n33.call(this);
+    return tmp0_elvis_lhs == null ? this.u3d_1 : tmp0_elvis_lhs;
   };
   function ShareableImage() {
     Companion_getInstance_50();
@@ -8612,7 +8654,7 @@
   var XMLNS_TRAINING;
   function Companion_48() {
     Companion_instance_48 = this;
-    this.z3d_1 = 'tip';
+    this.w3d_1 = 'tip';
   }
   var Companion_instance_48;
   function Companion_getInstance_51() {
@@ -8627,18 +8669,18 @@
     var tmp = get_XMLNS_TRAINING();
     Companion_getInstance_51();
     parser.b2q(2, tmp, 'tip');
-    $this.i3e_1 = parser.d2t(null, 'id');
+    $this.f3e_1 = parser.d2t(null, 'id');
     skipTag(parser);
     return $this;
   }
   function InlineTip_init_$Create$(parent, parser) {
     return InlineTip_init_$Init$(parent, parser, objectCreate(protoOf(InlineTip)));
   }
-  protoOf(InlineTip).j3e = function () {
-    return this.h2n().j35(this.i3e_1);
+  protoOf(InlineTip).g3e = function () {
+    return this.h2n().f35(this.f3e_1);
   };
   protoOf(InlineTip).d2r = function () {
-    return listOfNotNull(this.j3e());
+    return listOfNotNull(this.g3e());
   };
   function InlineTip() {
     Companion_getInstance_51();
@@ -8650,9 +8692,9 @@
   var Type_QUOTE_instance;
   function Companion_49() {
     Companion_instance_49 = this;
-    this.k3e_1 = Type_TIP_getInstance();
+    this.h3e_1 = Type_TIP_getInstance();
   }
-  protoOf(Companion_49).r2y = function (_this__u8e3s4) {
+  protoOf(Companion_49).p2y = function (_this__u8e3s4) {
     var tmp0_subject = _this__u8e3s4;
     switch (tmp0_subject) {
       case 'tip':
@@ -8693,11 +8735,11 @@
     Tip.call($this);
     Companion_getInstance_59();
     parser.b2q(2, get_XMLNS_TRAINING(), 'tip');
-    $this.a32_1 = id;
+    $this.y31_1 = id;
     var tmp = $this;
     var tmp0_safe_receiver = parser.d2t(null, 'type');
-    var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : Companion_getInstance_52().r2y(tmp0_safe_receiver);
-    tmp.b32_1 = tmp1_elvis_lhs == null ? Companion_getInstance_52().k3e_1 : tmp1_elvis_lhs;
+    var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : Companion_getInstance_52().p2y(tmp0_safe_receiver);
+    tmp.z31_1 = tmp1_elvis_lhs == null ? Companion_getInstance_52().h3e_1 : tmp1_elvis_lhs;
     var tmp_0 = $this;
     var tmp$ret$2;
     // Inline function 'kotlin.collections.buildList' call
@@ -8737,7 +8779,7 @@
     tmp$ret$0 = tmp0_apply;
     tmp$ret$1 = tmp$ret$0.u7();
     tmp$ret$2 = tmp$ret$1;
-    tmp_0.c32_1 = tmp$ret$2;
+    tmp_0.a32_1 = tmp$ret$2;
     return $this;
   }
   function Tip_init_$Create$(manifest, id, parser) {
@@ -8810,20 +8852,20 @@
     Type_initEntries_2();
     return Type_QUOTE_instance;
   }
-  protoOf(Tip).u2v = function () {
+  protoOf(Tip).t2v = function () {
     return Companion_getInstance_29().j2o_1;
   };
-  protoOf(Tip).v2v = function () {
+  protoOf(Tip).u2v = function () {
     return Companion_getInstance_29().k2o_1;
   };
-  protoOf(Tip).s2v = function () {
+  protoOf(Tip).r2v = function () {
     return Companion_getInstance_29().p2o_1;
   };
   function Tip() {
   }
   function Companion_50() {
     Companion_instance_50 = this;
-    this.l3e_1 = 'page';
+    this.i3e_1 = 'page';
   }
   var Companion_instance_50;
   function Companion_getInstance_53() {
@@ -8838,8 +8880,8 @@
     var tmp = get_XMLNS_TRAINING();
     Companion_getInstance_53();
     parser.b2q(2, tmp, 'page');
-    $this.n3e_1 = tip;
-    $this.o3e_1 = position;
+    $this.k3e_1 = tip;
+    $this.l3e_1 = position;
     var tmp_0 = $this;
     var tmp$ret$8;
     // Inline function 'org.cru.godtools.shared.tool.parser.model.parseContent' call
@@ -8919,21 +8961,21 @@
     tmp$ret$6 = tmp$ret$5.u7();
     tmp$ret$7 = tmp$ret$6;
     tmp$ret$8 = tmp$ret$7;
-    tmp_0.p3e_1 = tmp$ret$8;
+    tmp_0.m3e_1 = tmp$ret$8;
     return $this;
   }
   function TipPage_init_$Create$(tip, position, parser) {
     return TipPage_init_$Init$(tip, position, parser, objectCreate(protoOf(TipPage)));
   }
   protoOf(TipPage).a2r = function () {
-    return this.p3e_1;
+    return this.m3e_1;
   };
   function TipPage() {
     Companion_getInstance_53();
   }
   function Companion_51() {
     Companion_instance_51 = this;
-    this.q3e_1 = 'call-to-action';
+    this.n3e_1 = 'call-to-action';
   }
   var Companion_instance_51;
   function Companion_getInstance_54() {
@@ -8944,10 +8986,10 @@
   function CallToAction_init_$Init$(parent, $this) {
     BaseModel.call($this, parent);
     CallToAction.call($this);
-    $this.s3e_1 = parent;
-    $this.t3e_1 = null;
-    $this.u3e_1 = null;
-    $this.v3e_1 = null;
+    $this.p3e_1 = parent;
+    $this.q3e_1 = null;
+    $this.r3e_1 = null;
+    $this.s3e_1 = null;
     return $this;
   }
   function CallToAction_init_$Create$(parent) {
@@ -8960,15 +9002,15 @@
     var tmp = get_XMLNS_TRACT();
     Companion_getInstance_54();
     parser.b2q(2, tmp, 'call-to-action');
-    $this.s3e_1 = page;
+    $this.p3e_1 = page;
     var tmp_0 = $this;
     var tmp0_safe_receiver = parser.o2r('control-color');
-    tmp_0.u3e_1 = tmp0_safe_receiver == null ? null : toColorOrNull(tmp0_safe_receiver);
-    $this.v3e_1 = parser.d2t(get_XMLNS_TRAINING(), 'tip');
+    tmp_0.r3e_1 = tmp0_safe_receiver == null ? null : toColorOrNull(tmp0_safe_receiver);
+    $this.s3e_1 = parser.d2t(get_XMLNS_TRAINING(), 'tip');
     var tmp_1 = $this;
     var tmp_2 = get_XMLNS_TRACT();
     Companion_getInstance_54();
-    tmp_1.t3e_1 = parseTextChild(parser, $this, tmp_2, 'call-to-action');
+    tmp_1.q3e_1 = parseTextChild(parser, $this, tmp_2, 'call-to-action');
     return $this;
   }
   function CallToAction_init_$Create$_0(page, parser) {
@@ -8983,7 +9025,7 @@
   var XMLNS_TRACT;
   function Companion_52() {
     Companion_instance_52 = this;
-    this.w3e_1 = 'header';
+    this.t3e_1 = 'header';
   }
   var Companion_instance_52;
   function Companion_getInstance_55() {
@@ -9000,8 +9042,8 @@
     parser.b2q(2, tmp, 'header');
     var tmp_0 = $this;
     var tmp0_safe_receiver = parser.o2r(get_XML_BACKGROUND_COLOR());
-    tmp_0.y3e_1 = tmp0_safe_receiver == null ? null : toColorOrNull(tmp0_safe_receiver);
-    $this.b3f_1 = parser.d2t(get_XMLNS_TRAINING(), 'tip');
+    tmp_0.v3e_1 = tmp0_safe_receiver == null ? null : toColorOrNull(tmp0_safe_receiver);
+    $this.y3e_1 = parser.d2t(get_XMLNS_TRAINING(), 'tip');
     var number = null;
     var title = null;
     // Inline function 'org.cru.godtools.shared.tool.parser.xml.parseChildren' call
@@ -9030,22 +9072,22 @@
         continue $l$loop_1;
       skipTag(parser);
     }
-    $this.z3e_1 = number;
-    $this.a3f_1 = title;
+    $this.w3e_1 = number;
+    $this.x3e_1 = title;
     return $this;
   }
   function Header_init_$Create$(page, parser) {
     return Header_init_$Init$(page, parser, objectCreate(protoOf(Header)));
   }
-  protoOf(Header).s2v = function () {
-    return this.v2v();
+  protoOf(Header).r2v = function () {
+    return this.u2v();
   };
   function Header() {
     Companion_getInstance_55();
   }
   function Companion_53() {
     Companion_instance_53 = this;
-    this.c3f_1 = 'hero';
+    this.z3e_1 = 'hero';
   }
   var Companion_instance_53;
   function Companion_getInstance_56() {
@@ -9057,7 +9099,7 @@
     var tmp$ret$0;
     // Inline function 'kotlin.getValue' call
     var tmp0_getValue = headingParent$factory();
-    tmp$ret$0 = $this.f3f_1.o1();
+    tmp$ret$0 = $this.c3f_1.o1();
     return tmp$ret$0;
   }
   function Hero_init_$Init$(page, parser, $this) {
@@ -9071,7 +9113,7 @@
     var tmp$ret$0;
     // Inline function 'kotlin.collections.mutableListOf' call
     tmp$ret$0 = ArrayList_init_$Create$();
-    tmp_0.e3f_1 = tmp$ret$0;
+    tmp_0.b3f_1 = tmp$ret$0;
     var heading = null;
     var tmp_1 = $this;
     var tmp$ret$8;
@@ -9110,7 +9152,7 @@
           if (tmp1_subject === 'events') {
             var tmp2_this = $this;
             // Inline function 'kotlin.collections.plusAssign' call
-            var tmp0_plusAssign = tmp2_this.e3f_1;
+            var tmp0_plusAssign = tmp2_this.b3f_1;
             var tmp1_plusAssign = Companion_getInstance_6().f2q(parser, $this);
             addAll(tmp0_plusAssign, tmp1_plusAssign);
           }
@@ -9166,8 +9208,8 @@
     tmp$ret$6 = tmp$ret$5.u7();
     tmp$ret$7 = tmp$ret$6;
     tmp$ret$8 = tmp$ret$7;
-    tmp_1.h3f_1 = tmp$ret$8;
-    $this.g3f_1 = heading;
+    tmp_1.e3f_1 = tmp$ret$8;
+    $this.d3f_1 = heading;
     return $this;
   }
   function Hero_init_$Create$(page, parser) {
@@ -9184,12 +9226,12 @@
     };
   }
   protoOf(Hero).a2r = function () {
-    return this.h3f_1;
+    return this.e3f_1;
   };
   function Hero() {
     Companion_getInstance_56();
     var tmp = this;
-    tmp.f3f_1 = lazy(Hero$headingParent$delegate$lambda(this));
+    tmp.c3f_1 = lazy(Hero$headingParent$delegate$lambda(this));
   }
   function headingParent$factory() {
     return getPropertyCallableRef('headingParent', 1, KProperty1, function (receiver) {
@@ -9198,7 +9240,7 @@
   }
   function Companion_54() {
     Companion_instance_54 = this;
-    this.i3f_1 = 'modal';
+    this.f3f_1 = 'modal';
   }
   var Companion_instance_54;
   function Companion_getInstance_57() {
@@ -9207,12 +9249,12 @@
     return Companion_instance_54;
   }
   function _get_position__iahqv2($this) {
-    return $this.e3g_1.modals.l1($this);
+    return $this.b3g_1.modals.l1($this);
   }
   function Modal_init_$Init$(parent, parser, $this) {
     BaseModel.call($this, parent);
     Modal.call($this);
-    $this.e3g_1 = parent;
+    $this.b3g_1 = parent;
     Companion_getInstance_59();
     var tmp = get_XMLNS_TRACT();
     Companion_getInstance_57();
@@ -9221,14 +9263,14 @@
     var tmp$ret$0;
     // Inline function 'org.cru.godtools.shared.tool.parser.model.toEventIds' call
     var tmp0_toEventIds = parser.o2r(get_XML_LISTENERS());
-    tmp$ret$0 = Companion_getInstance_17().f2t(tmp0_toEventIds);
-    tmp_0.h3g_1 = toSet_0(tmp$ret$0);
+    tmp$ret$0 = Companion_getInstance_17().e2t(tmp0_toEventIds);
+    tmp_0.e3g_1 = 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.o2r(get_XML_DISMISS_LISTENERS());
-    tmp$ret$1 = Companion_getInstance_17().f2t(tmp1_toEventIds);
-    tmp_1.i3g_1 = toSet_0(tmp$ret$1);
+    tmp$ret$1 = Companion_getInstance_17().e2t(tmp1_toEventIds);
+    tmp_1.f3g_1 = toSet_0(tmp$ret$1);
     var title = null;
     var tmp_2 = $this;
     var tmp$ret$9;
@@ -9313,35 +9355,35 @@
     tmp$ret$7 = tmp$ret$6.u7();
     tmp$ret$8 = tmp$ret$7;
     tmp$ret$9 = tmp$ret$8;
-    tmp_2.g3g_1 = tmp$ret$9;
-    $this.f3g_1 = title;
+    tmp_2.d3g_1 = tmp$ret$9;
+    $this.c3g_1 = title;
     return $this;
   }
   function Modal_init_$Create$(parent, parser) {
     return Modal_init_$Init$(parent, parser, objectCreate(protoOf(Modal)));
   }
-  protoOf(Modal).r33 = function () {
-    return this.e3g_1.id + '-' + _get_position__iahqv2(this);
+  protoOf(Modal).n33 = function () {
+    return this.b3g_1.id + '-' + _get_position__iahqv2(this);
   };
   protoOf(Modal).a2r = function () {
-    return this.g3g_1;
+    return this.d3g_1;
   };
-  protoOf(Modal).u2v = function () {
+  protoOf(Modal).t2v = function () {
     return get_TRANSPARENT();
   };
-  protoOf(Modal).v2v = function () {
+  protoOf(Modal).u2v = function () {
     return get_WHITE();
   };
-  protoOf(Modal).w2u = function () {
+  protoOf(Modal).v2u = function () {
     return get_WHITE();
   };
-  protoOf(Modal).w2v = function () {
+  protoOf(Modal).v2v = function () {
     return Style_OUTLINED_getInstance();
   };
-  protoOf(Modal).b2w = function () {
+  protoOf(Modal).a2w = function () {
     return Align_CENTER_getInstance();
   };
-  protoOf(Modal).s2v = function () {
+  protoOf(Modal).r2v = function () {
     return get_WHITE();
   };
   function Modal() {
@@ -9349,11 +9391,11 @@
   }
   function Companion_55() {
     Companion_instance_55 = this;
-    this.j3g_1 = 'card';
-    this.k3g_1 = 'label';
-    this.l3g_1 = 'hidden';
-    this.m3g_1 = ImageScaleType_FILL_X_getInstance();
-    this.n3g_1 = Companion_getInstance_22().q2u_1;
+    this.g3g_1 = 'card';
+    this.h3g_1 = 'label';
+    this.i3g_1 = 'hidden';
+    this.j3g_1 = ImageScaleType_FILL_X_getInstance();
+    this.k3g_1 = Companion_getInstance_22().p2u_1;
   }
   var Companion_instance_55;
   function Companion_getInstance_58() {
@@ -9365,7 +9407,7 @@
     var tmp$ret$0;
     // Inline function 'kotlin.getValue' call
     var tmp0_getValue = labelParent$factory();
-    tmp$ret$0 = $this.u3g_1.o1();
+    tmp$ret$0 = $this.r3g_1.o1();
     return tmp$ret$0;
   }
   function Card_init_$Init$_1(page, position, parser, $this) {
@@ -9386,29 +9428,29 @@
     var tmp$ret$0;
     // Inline function 'org.cru.godtools.shared.tool.parser.model.toEventIds' call
     var tmp0_toEventIds = parser.o2r(get_XML_LISTENERS());
-    tmp$ret$0 = Companion_getInstance_17().f2t(tmp0_toEventIds);
+    tmp$ret$0 = Companion_getInstance_17().e2t(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.o2r(get_XML_DISMISS_LISTENERS());
-    tmp$ret$1 = Companion_getInstance_17().f2t(tmp1_toEventIds);
+    tmp$ret$1 = Companion_getInstance_17().e2t(tmp1_toEventIds);
     tmp_2.dismissListeners = toSet_0(tmp$ret$1);
     var tmp_3 = $this;
     var tmp2_safe_receiver = parser.o2r(get_XML_BACKGROUND_COLOR());
-    tmp_3.p3g_1 = tmp2_safe_receiver == null ? null : toColorOrNull(tmp2_safe_receiver);
-    $this.q3g_1 = parser.o2r(get_XML_BACKGROUND_IMAGE());
+    tmp_3.m3g_1 = tmp2_safe_receiver == null ? null : toColorOrNull(tmp2_safe_receiver);
+    $this.n3g_1 = parser.o2r(get_XML_BACKGROUND_IMAGE());
     var tmp_4 = $this;
     var tmp3_safe_receiver = parser.o2r(get_XML_BACKGROUND_IMAGE_GRAVITY());
-    var tmp4_elvis_lhs = tmp3_safe_receiver == null ? null : Companion_getInstance_22().r2u(tmp3_safe_receiver);
-    tmp_4.r3g_1 = tmp4_elvis_lhs == null ? Companion_getInstance_58().n3g_1 : tmp4_elvis_lhs;
+    var tmp4_elvis_lhs = tmp3_safe_receiver == null ? null : Companion_getInstance_22().q2u(tmp3_safe_receiver);
+    tmp_4.o3g_1 = tmp4_elvis_lhs == null ? Companion_getInstance_58().k3g_1 : tmp4_elvis_lhs;
     var tmp_5 = $this;
     var tmp5_safe_receiver = parser.o2r(get_XML_BACKGROUND_IMAGE_SCALE_TYPE());
-    var tmp6_elvis_lhs = tmp5_safe_receiver == null ? null : Companion_getInstance_24().p2y(tmp5_safe_receiver);
-    tmp_5.s3g_1 = tmp6_elvis_lhs == null ? Companion_getInstance_58().m3g_1 : tmp6_elvis_lhs;
+    var tmp6_elvis_lhs = tmp5_safe_receiver == null ? null : Companion_getInstance_24().n2y(tmp5_safe_receiver);
+    tmp_5.p3g_1 = tmp6_elvis_lhs == null ? Companion_getInstance_58().j3g_1 : tmp6_elvis_lhs;
     var tmp_6 = $this;
     var tmp7_safe_receiver = parser.o2r(get_XML_TEXT_COLOR());
-    tmp_6.t3g_1 = tmp7_safe_receiver == null ? null : toColorOrNull(tmp7_safe_receiver);
+    tmp_6.q3g_1 = tmp7_safe_receiver == null ? null : toColorOrNull(tmp7_safe_receiver);
     var tmp_7 = $this;
     var tmp$ret$2;
     // Inline function 'kotlin.collections.mutableListOf' call
@@ -9513,7 +9555,7 @@
     tmp$ret$8 = tmp$ret$7.u7();
     tmp$ret$9 = tmp$ret$8;
     tmp$ret$10 = tmp$ret$9;
-    tmp_8.v3g_1 = tmp$ret$10;
+    tmp_8.s3g_1 = tmp$ret$10;
     $this.label = label;
     return $this;
   }
@@ -9522,7 +9564,7 @@
   }
   function TractPage$Card$labelParent$delegate$lambda$lambda(this$0) {
     return function () {
-      return this$0.u2v();
+      return this$0.t2v();
     };
   }
   function TractPage$Card$labelParent$delegate$lambda(this$0) {
@@ -9539,7 +9581,7 @@
     parser.b2q(2, tmp, 'page');
     var tmp_0 = $this;
     var tmp0_safe_receiver = parser.o2r('card-text-color');
-    tmp_0.c3g_1 = tmp0_safe_receiver == null ? null : toColorOrNull(tmp0_safe_receiver);
+    tmp_0.z3f_1 = tmp0_safe_receiver == null ? null : toColorOrNull(tmp0_safe_receiver);
     var header = null;
     var hero = null;
     var tmp_1 = $this;
@@ -9617,11 +9659,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().l30_1 : backgroundColor;
+    backgroundColor = backgroundColor === VOID ? Companion_getInstance_48().j30_1 : backgroundColor;
     backgroundImage = backgroundImage === VOID ? null : backgroundImage;
     primaryColor = primaryColor === VOID ? null : primaryColor;
-    backgroundImageGravity = backgroundImageGravity === VOID ? Companion_getInstance_48().m30_1 : backgroundImageGravity;
-    backgroundImageScaleType = backgroundImageScaleType === VOID ? Companion_getInstance_48().n30_1 : backgroundImageScaleType;
+    backgroundImageGravity = backgroundImageGravity === VOID ? Companion_getInstance_48().k30_1 : backgroundImageGravity;
+    backgroundImageScaleType = backgroundImageScaleType === VOID ? Companion_getInstance_48().l30_1 : backgroundImageScaleType;
     textColor = textColor === VOID ? null : textColor;
     var tmp;
     if (textScale === VOID) {
@@ -9637,7 +9679,7 @@
     callToAction = callToAction === VOID ? null : callToAction;
     Page_init_$Init$_0(manifest, VOID, fileName, VOID, primaryColor, backgroundColor, backgroundImage, backgroundImageGravity, backgroundImageScaleType, VOID, cardBackgroundColor, textColor, textScale, $this);
     TractPage.call($this);
-    $this.c3g_1 = cardTextColor;
+    $this.z3f_1 = cardTextColor;
     $this.header = null;
     $this.hero = null;
     var tmp_0 = $this;
@@ -9658,16 +9700,16 @@
   function createTestTractPage(manifest, fileName, backgroundColor, backgroundImage, primaryColor, backgroundImageGravity, backgroundImageScaleType, textColor, textScale, cardBackgroundColor, cardTextColor, cards, callToAction) {
     return TractPage_init_$Init$_0(manifest, fileName, backgroundColor, backgroundImage, primaryColor, backgroundImageGravity, backgroundImageScaleType, textColor, textScale, cardBackgroundColor, cardTextColor, cards, callToAction, objectCreate(protoOf(TractPage)));
   }
-  protoOf(Card_1).w3g = function () {
+  protoOf(Card_1).t3g = function () {
     return this.page;
   };
-  protoOf(Card_1).r33 = function () {
+  protoOf(Card_1).n33 = function () {
     return this.page.id + '-' + this.position;
   };
-  protoOf(Card_1).j3b = function () {
+  protoOf(Card_1).g3b = function () {
     return this.position;
   };
-  protoOf(Card_1).x3g = function () {
+  protoOf(Card_1).u3g = function () {
     var tmp$ret$1;
     // Inline function 'kotlin.takeUnless' call
     var tmp0_takeUnless = this.page.visibleCards.l1(this);
@@ -9684,43 +9726,43 @@
     tmp$ret$1 = tmp;
     return tmp$ret$1;
   };
-  protoOf(Card_1).y3g = function () {
+  protoOf(Card_1).v3g = function () {
     return equals(this, lastOrNull(this.page.visibleCards));
   };
-  protoOf(Card_1).m3b = function () {
+  protoOf(Card_1).j3b = function () {
     return this.isHidden;
   };
-  protoOf(Card_1).n3b = function () {
+  protoOf(Card_1).k3b = function () {
     return this.listeners;
   };
-  protoOf(Card_1).y33 = function () {
+  protoOf(Card_1).u33 = function () {
     return this.dismissListeners;
   };
-  protoOf(Card_1).p3a = function () {
+  protoOf(Card_1).m3a = function () {
     return this.analyticsEvents;
   };
-  protoOf(Card_1).b34 = function () {
-    var tmp0_elvis_lhs = this.p3g_1;
-    return tmp0_elvis_lhs == null ? this.page.x2v() : tmp0_elvis_lhs;
+  protoOf(Card_1).x33 = function () {
+    var tmp0_elvis_lhs = this.m3g_1;
+    return tmp0_elvis_lhs == null ? this.page.w2v() : tmp0_elvis_lhs;
   };
-  protoOf(Card_1).c34 = function () {
-    return getResource(this, this.q3g_1);
+  protoOf(Card_1).y33 = function () {
+    return getResource(this, this.n3g_1);
   };
-  protoOf(Card_1).d34 = function () {
-    return this.r3g_1;
+  protoOf(Card_1).z33 = function () {
+    return this.o3g_1;
   };
-  protoOf(Card_1).e34 = function () {
-    return this.s3g_1;
+  protoOf(Card_1).a34 = function () {
+    return this.p3g_1;
   };
-  protoOf(Card_1).s2v = function () {
-    var tmp0_elvis_lhs = this.t3g_1;
+  protoOf(Card_1).r2v = function () {
+    var tmp0_elvis_lhs = this.q3g_1;
     return tmp0_elvis_lhs == null ? this.page.cardTextColor : tmp0_elvis_lhs;
   };
-  protoOf(Card_1).z3g = function () {
+  protoOf(Card_1).w3g = function () {
     return this.label;
   };
   protoOf(Card_1).a2r = function () {
-    return this.v3g_1;
+    return this.s3g_1;
   };
   protoOf(Card_1).d2r = function () {
     var tmp$ret$3;
@@ -9745,7 +9787,7 @@
     tmp$ret$3 = tmp$ret$2;
     return tmp$ret$3;
   };
-  protoOf(Card_1).q3b = function (type) {
+  protoOf(Card_1).n3b = function (type) {
     var tmp0_subject = type;
     var tmp0 = tmp0_subject.d4_1;
     var tmp;
@@ -9803,12 +9845,12 @@
   function Card_1() {
     Companion_getInstance_58();
     var tmp = this;
-    tmp.u3g_1 = lazy(TractPage$Card$labelParent$delegate$lambda(this));
+    tmp.r3g_1 = lazy(TractPage$Card$labelParent$delegate$lambda(this));
   }
-  defineProp(protoOf(Card_1), 'id', protoOf(Card_1).r33);
-  defineProp(protoOf(Card_1), 'visiblePosition', protoOf(Card_1).x3g);
-  defineProp(protoOf(Card_1), 'isLastVisibleCard', protoOf(Card_1).y3g);
-  defineProp(protoOf(Card_1), 'backgroundImage', protoOf(Card_1).c34);
+  defineProp(protoOf(Card_1), 'id', protoOf(Card_1).n33);
+  defineProp(protoOf(Card_1), 'visiblePosition', protoOf(Card_1).u3g);
+  defineProp(protoOf(Card_1), 'isLastVisibleCard', protoOf(Card_1).v3g);
+  defineProp(protoOf(Card_1), 'backgroundImage', protoOf(Card_1).y33);
   defineProp(protoOf(Card_1), 'tips', protoOf(Card_1).d2r);
   function parseCardsXml(_this__u8e3s4, $this) {
     var tmp$ret$2;
@@ -9898,25 +9940,25 @@
     tmp$ret$2 = tmp$ret$1;
     return tmp$ret$2;
   }
-  protoOf(TractPage).a3h = function () {
+  protoOf(TractPage).x3g = function () {
     return equals(lastOrNull(this.h2n()._pages), this);
   };
-  protoOf(TractPage).p3a = function () {
-    return this.b3g_1;
+  protoOf(TractPage).m3a = function () {
+    return this.y3f_1;
   };
-  protoOf(TractPage).b3h = function () {
+  protoOf(TractPage).y3g = function () {
     return this.header;
   };
-  protoOf(TractPage).c3h = function () {
+  protoOf(TractPage).z3g = function () {
     return this.hero;
   };
-  protoOf(TractPage).d3h = function () {
+  protoOf(TractPage).a3h = function () {
     return this.modals;
   };
-  protoOf(TractPage).e3h = function () {
+  protoOf(TractPage).b3h = function () {
     return this.callToAction;
   };
-  protoOf(TractPage).q3a = function (type) {
+  protoOf(TractPage).n3a = function (type) {
     return type.equals(Type_TRACT_getInstance());
   };
   protoOf(TractPage).findModal = function (id) {
@@ -9929,7 +9971,7 @@
         var element = tmp0_iterator.h();
         var tmp$ret$0;
         // Inline function 'org.cru.godtools.shared.tool.parser.model.tract.TractPage.findModal.<anonymous>' call
-        tmp$ret$0 = equals_0(element.r33(), id, true);
+        tmp$ret$0 = equals_0(element.n33(), id, true);
         if (tmp$ret$0) {
           tmp$ret$1 = element;
           break $l$block;
@@ -9939,10 +9981,10 @@
     }
     return tmp$ret$1;
   };
-  protoOf(TractPage).f3h = function () {
+  protoOf(TractPage).c3h = function () {
     return this.cards;
   };
-  protoOf(TractPage).g3h = function () {
+  protoOf(TractPage).d3h = function () {
     var tmp$ret$2;
     // Inline function 'kotlin.collections.filter' call
     var tmp1_filter = this.cards;
@@ -9963,16 +10005,16 @@
     tmp$ret$2 = tmp$ret$1;
     return tmp$ret$2;
   };
-  protoOf(TractPage).h3h = function () {
-    var tmp0_elvis_lhs = this.c3g_1;
-    return tmp0_elvis_lhs == null ? this.s2v() : tmp0_elvis_lhs;
+  protoOf(TractPage).e3h = function () {
+    var tmp0_elvis_lhs = this.z3f_1;
+    return tmp0_elvis_lhs == null ? this.r2v() : tmp0_elvis_lhs;
   };
   function TractPage() {
-    this.b3g_1 = emptyList();
+    this.y3f_1 = emptyList();
   }
-  defineProp(protoOf(TractPage), 'isLastPage', protoOf(TractPage).a3h);
-  defineProp(protoOf(TractPage), 'visibleCards', protoOf(TractPage).g3h);
-  defineProp(protoOf(TractPage), 'cardTextColor', protoOf(TractPage).h3h);
+  defineProp(protoOf(TractPage), 'isLastPage', protoOf(TractPage).x3g);
+  defineProp(protoOf(TractPage), 'visibleCards', protoOf(TractPage).d3h);
+  defineProp(protoOf(TractPage), 'cardTextColor', protoOf(TractPage).e3h);
   function labelParent$factory() {
     return getPropertyCallableRef('labelParent', 1, KProperty1, function (receiver) {
       return _get_labelParent__664ln7(receiver);
@@ -10008,11 +10050,11 @@
     return EMPTY_instance;
   }
   function SetOnceProperty() {
-    this.i3h_1 = EMPTY_getInstance();
+    this.f3h_1 = EMPTY_getInstance();
   }
-  protoOf(SetOnceProperty).j3h = function (thisRef, property) {
+  protoOf(SetOnceProperty).g3h = function (thisRef, property) {
     // Inline function 'kotlin.check' call
-    var tmp0_check = !(this.i3h_1 === EMPTY_getInstance());
+    var tmp0_check = !(this.f3h_1 === EMPTY_getInstance());
     // Inline function 'kotlin.contracts.contract' call
     if (!tmp0_check) {
       var tmp$ret$0;
@@ -10021,15 +10063,15 @@
       var message = tmp$ret$0;
       throw IllegalStateException_init_$Create$(toString(message));
     }
-    var tmp = this.i3h_1;
+    var tmp = this.f3h_1;
     return (tmp == null ? true : isObject(tmp)) ? tmp : THROW_CCE();
   };
-  protoOf(SetOnceProperty).c35 = function (thisRef, property) {
-    return this.j3h(isObject(thisRef) ? thisRef : THROW_CCE(), property);
+  protoOf(SetOnceProperty).y34 = function (thisRef, property) {
+    return this.g3h(isObject(thisRef) ? thisRef : THROW_CCE(), property);
   };
-  protoOf(SetOnceProperty).k3h = function (thisRef, property, value) {
+  protoOf(SetOnceProperty).h3h = function (thisRef, property, value) {
     // Inline function 'kotlin.check' call
-    var tmp0_check = this.i3h_1 === EMPTY_getInstance();
+    var tmp0_check = this.f3h_1 === EMPTY_getInstance();
     // Inline function 'kotlin.contracts.contract' call
     if (!tmp0_check) {
       var tmp$ret$0;
@@ -10038,11 +10080,11 @@
       var message = tmp$ret$0;
       throw IllegalStateException_init_$Create$(toString(message));
     }
-    this.i3h_1 = value;
+    this.f3h_1 = value;
   };
-  protoOf(SetOnceProperty).g33 = function (thisRef, property, value) {
+  protoOf(SetOnceProperty).e33 = function (thisRef, property, value) {
     var tmp = isObject(thisRef) ? thisRef : THROW_CCE();
-    return this.k3h(tmp, property, (value == null ? true : isObject(value)) ? value : THROW_CCE());
+    return this.h3h(tmp, property, (value == null ? true : isObject(value)) ? value : THROW_CCE());
   };
   function get_isHttpUrl(_this__u8e3s4) {
     var tmp$ret$0;
@@ -10074,15 +10116,15 @@
   }
   function QName(uri, local) {
     uri = uri === VOID ? null : uri;
-    this.l3h_1 = uri;
-    this.m3h_1 = local;
+    this.i3h_1 = uri;
+    this.j3h_1 = local;
   }
   protoOf(QName).toString = function () {
-    return 'QName(uri=' + this.l3h_1 + ', local=' + this.m3h_1 + ')';
+    return 'QName(uri=' + this.i3h_1 + ', local=' + this.j3h_1 + ')';
   };
   protoOf(QName).hashCode = function () {
-    var result = this.l3h_1 == null ? 0 : getStringHashCode(this.l3h_1);
-    result = imul(result, 31) + getStringHashCode(this.m3h_1) | 0;
+    var result = this.i3h_1 == null ? 0 : getStringHashCode(this.i3h_1);
+    result = imul(result, 31) + getStringHashCode(this.j3h_1) | 0;
     return result;
   };
   protoOf(QName).equals = function (other) {
@@ -10091,9 +10133,9 @@
     if (!(other instanceof QName))
       return false;
     var tmp0_other_with_cast = other instanceof QName ? other : THROW_CCE();
-    if (!(this.l3h_1 == tmp0_other_with_cast.l3h_1))
+    if (!(this.i3h_1 == tmp0_other_with_cast.i3h_1))
       return false;
-    if (!(this.m3h_1 === tmp0_other_with_cast.m3h_1))
+    if (!(this.j3h_1 === tmp0_other_with_cast.j3h_1))
       return false;
     return true;
   };
@@ -10101,63 +10143,63 @@
     qname = qname === VOID ? null : qname;
     content = content === VOID ? null : content;
     attrs = attrs === VOID ? null : attrs;
-    this.n3h_1 = type;
-    this.o3h_1 = qname;
-    this.p3h_1 = content;
-    this.q3h_1 = attrs;
+    this.k3h_1 = type;
+    this.l3h_1 = qname;
+    this.m3h_1 = content;
+    this.n3h_1 = attrs;
   }
   function enqueueEvent($this, event) {
     var tmp$ret$0;
     // Inline function 'kotlin.text.isNotEmpty' call
-    var tmp0_isNotEmpty = $this.t3h_1;
+    var tmp0_isNotEmpty = $this.q3h_1;
     tmp$ret$0 = charSequenceLength(tmp0_isNotEmpty) > 0;
     if (tmp$ret$0) {
       var tmp0_this = $this;
       // Inline function 'kotlin.collections.plusAssign' call
-      var tmp1_plusAssign = tmp0_this.s3h_1;
+      var tmp1_plusAssign = tmp0_this.p3h_1;
       Companion_getInstance_59();
-      var tmp2_plusAssign = new ParserEvent(4, VOID, $this.t3h_1.toString());
+      var tmp2_plusAssign = new ParserEvent(4, VOID, $this.q3h_1.toString());
       tmp1_plusAssign.b(tmp2_plusAssign);
-      $this.t3h_1.jb();
+      $this.q3h_1.jb();
     }
     var tmp1_this = $this;
     // Inline function 'kotlin.collections.plusAssign' call
-    var tmp3_plusAssign = tmp1_this.s3h_1;
+    var tmp3_plusAssign = tmp1_this.p3h_1;
     tmp3_plusAssign.b(event);
   }
   function SaxXmlPullParser() {
     var tmp = this;
     Companion_getInstance_59();
-    tmp.r3h_1 = new ParserEvent(0);
+    tmp.o3h_1 = new ParserEvent(0);
     var tmp_0 = this;
     var tmp$ret$0;
     // Inline function 'kotlin.collections.mutableListOf' call
     tmp$ret$0 = ArrayList_init_$Create$();
-    tmp_0.s3h_1 = tmp$ret$0;
-    this.t3h_1 = StringBuilder_init_$Create$();
+    tmp_0.p3h_1 = tmp$ret$0;
+    this.q3h_1 = StringBuilder_init_$Create$();
   }
   protoOf(SaxXmlPullParser).c2q = function () {
-    return this.r3h_1.n3h_1;
+    return this.o3h_1.k3h_1;
   };
   protoOf(SaxXmlPullParser).d2q = function () {
-    var tmp0_safe_receiver = this.r3h_1.o3h_1;
-    return tmp0_safe_receiver == null ? null : tmp0_safe_receiver.l3h_1;
+    var tmp0_safe_receiver = this.o3h_1.l3h_1;
+    return tmp0_safe_receiver == null ? null : tmp0_safe_receiver.i3h_1;
   };
   protoOf(SaxXmlPullParser).id = function () {
-    var tmp0_safe_receiver = this.r3h_1.o3h_1;
-    return tmp0_safe_receiver == null ? null : tmp0_safe_receiver.m3h_1;
+    var tmp0_safe_receiver = this.o3h_1.l3h_1;
+    return tmp0_safe_receiver == null ? null : tmp0_safe_receiver.j3h_1;
   };
   protoOf(SaxXmlPullParser).b2q = function (type, namespace, name) {
     var tmp$ret$0;
     // Inline function 'kotlin.with' call
-    var tmp0_with = this.r3h_1;
+    var tmp0_with = this.o3h_1;
     // Inline function 'kotlin.contracts.contract' call
-    if (!(tmp0_with.n3h_1 === type))
+    if (!(tmp0_with.k3h_1 === type))
       throw new XmlPullParserException('expected ' + type);
     var tmp;
     if (!(namespace == null)) {
-      var tmp0_safe_receiver = tmp0_with.o3h_1;
-      tmp = !(namespace == (tmp0_safe_receiver == null ? null : tmp0_safe_receiver.l3h_1));
+      var tmp0_safe_receiver = tmp0_with.l3h_1;
+      tmp = !(namespace == (tmp0_safe_receiver == null ? null : tmp0_safe_receiver.i3h_1));
     } else {
       tmp = false;
     }
@@ -10166,8 +10208,8 @@
     var tmp_0;
     var tmp_1;
     if (!(name == null)) {
-      var tmp1_safe_receiver = tmp0_with.o3h_1;
-      tmp_1 = !((tmp1_safe_receiver == null ? null : tmp1_safe_receiver.m3h_1) == name);
+      var tmp1_safe_receiver = tmp0_with.l3h_1;
+      tmp_1 = !((tmp1_safe_receiver == null ? null : tmp1_safe_receiver.j3h_1) == name);
     } else {
       tmp_1 = false;
     }
@@ -10180,12 +10222,12 @@
   protoOf(SaxXmlPullParser).h = function () {
     var tmp$ret$0;
     // Inline function 'kotlin.also' call
-    var tmp0_also = removeFirst(this.s3h_1);
+    var tmp0_also = removeFirst(this.p3h_1);
     // Inline function 'kotlin.contracts.contract' call
     // Inline function 'org.cru.godtools.shared.tool.parser.xml.SaxXmlPullParser.next.<anonymous>' call
-    this.r3h_1 = tmp0_also;
+    this.o3h_1 = tmp0_also;
     tmp$ret$0 = tmp0_also;
-    return tmp$ret$0.n3h_1;
+    return tmp$ret$0.k3h_1;
   };
   protoOf(SaxXmlPullParser).v2n = function () {
     var tmp;
@@ -10194,7 +10236,7 @@
     if (tmp_0 === 4) {
       var tmp$ret$0;
       // Inline function 'kotlin.text.isNullOrBlank' call
-      var tmp0_isNullOrBlank = this.r3h_1.p3h_1;
+      var tmp0_isNullOrBlank = this.o3h_1.m3h_1;
       // Inline function 'kotlin.contracts.contract' call
       tmp$ret$0 = tmp0_isNullOrBlank == null ? true : isBlank(tmp0_isNullOrBlank);
       tmp = tmp$ret$0;
@@ -10204,23 +10246,23 @@
     if (tmp) {
       this.h();
     }
-    var event = this.r3h_1;
+    var event = this.o3h_1;
     var tmp_1;
     Companion_getInstance_59();
-    if (!(event.n3h_1 === 2)) {
+    if (!(event.k3h_1 === 2)) {
       Companion_getInstance_59();
-      tmp_1 = !(event.n3h_1 === 3);
+      tmp_1 = !(event.k3h_1 === 3);
     } else {
       tmp_1 = false;
     }
     if (tmp_1) {
-      throw new XmlPullParserException('Expected start or end tag. Found: ' + event.n3h_1);
+      throw new XmlPullParserException('Expected start or end tag. Found: ' + event.k3h_1);
     }
-    return event.n3h_1;
+    return event.k3h_1;
   };
-  protoOf(SaxXmlPullParser).a39 = function () {
+  protoOf(SaxXmlPullParser).x38 = function () {
     Companion_getInstance_59();
-    this.s3d(2);
+    this.p3d(2);
     var tmp0_subject = this.h();
     var tmp;
     Companion_getInstance_59();
@@ -10229,7 +10271,7 @@
       // Inline function 'kotlin.also' call
       var tmp$ret$0;
       // Inline function 'kotlin.text.orEmpty' call
-      var tmp0_orEmpty = this.r3h_1.p3h_1;
+      var tmp0_orEmpty = this.o3h_1.m3h_1;
       var tmp0_elvis_lhs = tmp0_orEmpty;
       tmp$ret$0 = tmp0_elvis_lhs == null ? '' : tmp0_elvis_lhs;
       var tmp1_also = tmp$ret$0;
@@ -10264,13 +10306,13 @@
   protoOf(SaxXmlPullParser).d2t = function (namespace, name) {
     var tmp$ret$1;
     // Inline function 'kotlin.takeIf' call
-    var tmp0_takeIf = this.r3h_1;
+    var tmp0_takeIf = this.o3h_1;
     // Inline function 'kotlin.contracts.contract' call
     var tmp;
     var tmp$ret$0;
     // Inline function 'org.cru.godtools.shared.tool.parser.xml.SaxXmlPullParser.getAttributeValue.<anonymous>' call
     Companion_getInstance_59();
-    tmp$ret$0 = tmp0_takeIf.n3h_1 === 2;
+    tmp$ret$0 = tmp0_takeIf.k3h_1 === 2;
     if (tmp$ret$0) {
       tmp = tmp0_takeIf;
     } else {
@@ -10285,27 +10327,27 @@
       tmp_0 = tmp0_elvis_lhs;
     }
     var event = tmp_0;
-    var tmp1_safe_receiver = event.q3h_1;
+    var tmp1_safe_receiver = event.n3h_1;
     return tmp1_safe_receiver == null ? null : tmp1_safe_receiver.c2(new QName(namespace, name));
   };
-  protoOf(SaxXmlPullParser).u3h = function (qname, attrs) {
+  protoOf(SaxXmlPullParser).r3h = function (qname, attrs) {
     Companion_getInstance_59();
     enqueueEvent(this, new ParserEvent(2, qname, VOID, attrs));
   };
-  protoOf(SaxXmlPullParser).v3h = function (text) {
-    this.t3h_1.ib(text);
+  protoOf(SaxXmlPullParser).s3h = function (text) {
+    this.q3h_1.ib(text);
   };
-  protoOf(SaxXmlPullParser).w3h = function (qname) {
+  protoOf(SaxXmlPullParser).t3h = function (qname) {
     Companion_getInstance_59();
     enqueueEvent(this, new ParserEvent(3, qname));
   };
   function Companion_56() {
     Companion_instance_56 = this;
-    this.x3h_1 = 0;
-    this.y3h_1 = 1;
-    this.z3h_1 = 2;
-    this.a3i_1 = 3;
-    this.b3i_1 = 4;
+    this.u3h_1 = 0;
+    this.v3h_1 = 1;
+    this.w3h_1 = 2;
+    this.x3h_1 = 3;
+    this.y3h_1 = 4;
   }
   var Companion_instance_56;
   function Companion_getInstance_59() {
@@ -10359,26 +10401,26 @@
   }
   var SAX_OPTIONS;
   function InternalSAXParser($outer) {
-    this.c3i_1 = $outer;
+    this.z3h_1 = $outer;
     SAXParser.call(this, true, get_SAX_OPTIONS());
   }
-  protoOf(InternalSAXParser).d3i = function (tag) {
-    return this.c3i_1.u3h(new QName(tag.uri, tag.local), convert(tag.attributes, this.c3i_1));
+  protoOf(InternalSAXParser).a3i = function (tag) {
+    return this.z3h_1.r3h(new QName(tag.uri, tag.local), convert(tag.attributes, this.z3h_1));
   };
   protoOf(InternalSAXParser).onopentag = function (tag) {
-    return this.d3i(tag);
+    return this.a3i(tag);
   };
-  protoOf(InternalSAXParser).e3i = function (tagName) {
-    return this.c3i_1.w3h(new QName(VOID, tagName));
+  protoOf(InternalSAXParser).b3i = function (tagName) {
+    return this.z3h_1.t3h(new QName(VOID, tagName));
   };
   protoOf(InternalSAXParser).onclosetag = function (tagName) {
-    return this.e3i(tagName);
+    return this.b3i(tagName);
   };
-  protoOf(InternalSAXParser).f3i = function (t) {
-    return this.c3i_1.v3h(t);
+  protoOf(InternalSAXParser).c3i = function (t) {
+    return this.z3h_1.s3h(t);
   };
   protoOf(InternalSAXParser).ontext = function (t) {
-    return this.f3i(t);
+    return this.c3i(t);
   };
   function convert(_this__u8e3s4, $this) {
     var tmp$ret$7;
@@ -10446,16 +10488,16 @@
     tmp0_apply.write(xml);
     tmp0_apply.close();
     tmp$ret$0 = tmp0_apply;
-    tmp.j3i_1 = tmp$ret$0;
+    tmp.g3i_1 = tmp$ret$0;
   }
   function SAX_OPTIONS$1() {
-    this.k3i_1 = true;
+    this.h3i_1 = true;
   }
-  protoOf(SAX_OPTIONS$1).l3i = function () {
-    return this.k3i_1;
+  protoOf(SAX_OPTIONS$1).i3i = function () {
+    return this.h3i_1;
   };
   defineProp(protoOf(SAX_OPTIONS$1), 'xmlns', function () {
-    return this.l3i();
+    return this.i3i();
   });
   var properties_initialized_JsXmlPullParser_kt_u4cdem;
   function _init_properties_JsXmlPullParser_kt__2zt5j4() {
@@ -10467,8 +10509,8 @@
   }
   function $getXmlParserCOROUTINE$1(_this__u8e3s4, fileName, resultContinuation) {
     CoroutineImpl.call(this, resultContinuation);
-    this.u3i_1 = _this__u8e3s4;
-    this.v3i_1 = fileName;
+    this.r3i_1 = _this__u8e3s4;
+    this.s3i_1 = fileName;
   }
   protoOf($getXmlParserCOROUTINE$1).ue = function () {
     var suspendResult = this.de_1;
@@ -10479,7 +10521,7 @@
           case 0:
             this.ce_1 = 2;
             this.be_1 = 1;
-            suspendResult = await_0(this.u3i_1.readFile(this.v3i_1), this);
+            suspendResult = await_0(this.r3i_1.readFile(this.s3i_1), this);
             if (suspendResult === get_COROUTINE_SUSPENDED()) {
               return suspendResult;
             }
@@ -10512,87 +10554,87 @@
   function JsXmlPullParserFactory() {
     XmlPullParserFactory.call(this);
   }
-  protoOf(JsXmlPullParserFactory).w3i = function (fileName, $completion) {
+  protoOf(JsXmlPullParserFactory).t3i = function (fileName, $completion) {
     var tmp = new $getXmlParserCOROUTINE$1(this, fileName, $completion);
     tmp.de_1 = Unit_getInstance();
     tmp.ee_1 = null;
     return tmp.ue();
   };
   protoOf(JsXmlPullParserFactory).u2n = function (fileName, $completion) {
-    return this.w3i(fileName, $completion);
+    return this.t3i(fileName, $completion);
   };
   function XmlPullParserException(s) {
     Exception_init_$Init$(s, this);
     captureStack(this, XmlPullParserException);
   }
   //region block: post-declaration
-  protoOf(Button).x2u = get_isClickable;
-  protoOf(Category).u2v = get_primaryColor;
-  protoOf(Category).v2v = get_primaryTextColor;
-  protoOf(Category).w2v = get_buttonStyle;
-  protoOf(Category).w2u = get_buttonColor;
-  protoOf(Category).x2v = get_cardBackgroundColor;
-  protoOf(Category).y2v = get_multiselectOptionBackgroundColor;
-  protoOf(Category).z2v = get_multiselectOptionSelectedColor;
-  protoOf(Category).a2w = get_textScale;
-  protoOf(Category).b2w = get_textAlign;
-  protoOf(Link).x2u = get_isClickable;
-  protoOf(Manifest).w2u = get_buttonColor;
-  protoOf(Manifest).b2w = get_textAlign;
-  protoOf(StylesOverride).u2v = get_primaryColor;
-  protoOf(StylesOverride).v2v = get_primaryTextColor;
-  protoOf(StylesOverride).w2v = get_buttonStyle;
-  protoOf(StylesOverride).w2u = get_buttonColor;
-  protoOf(StylesOverride).x2v = get_cardBackgroundColor;
-  protoOf(StylesOverride).y2v = get_multiselectOptionBackgroundColor;
-  protoOf(StylesOverride).z2v = get_multiselectOptionSelectedColor;
-  protoOf(Page).w2v = get_buttonStyle;
-  protoOf(Page).w2u = get_buttonColor;
-  protoOf(Page).b2w = get_textAlign;
-  protoOf(LessonPage).w2v = get_buttonStyle;
-  protoOf(LessonPage).w2u = get_buttonColor;
-  protoOf(LessonPage).b2w = get_textAlign;
-  protoOf(CardCollectionPage).w2v = get_buttonStyle;
-  protoOf(CardCollectionPage).w2u = get_buttonColor;
-  protoOf(CardCollectionPage).b2w = get_textAlign;
-  protoOf(ContentPage).w2v = get_buttonStyle;
-  protoOf(ContentPage).w2u = get_buttonColor;
-  protoOf(ContentPage).b2w = get_textAlign;
-  protoOf(Tip).w2v = get_buttonStyle;
-  protoOf(Tip).w2u = get_buttonColor;
-  protoOf(Tip).x2v = get_cardBackgroundColor;
-  protoOf(Tip).y2v = get_multiselectOptionBackgroundColor;
-  protoOf(Tip).z2v = get_multiselectOptionSelectedColor;
-  protoOf(Tip).a2w = get_textScale;
-  protoOf(Tip).b2w = get_textAlign;
-  protoOf(Header).u2v = get_primaryColor;
-  protoOf(Header).v2v = get_primaryTextColor;
-  protoOf(Header).w2v = get_buttonStyle;
-  protoOf(Header).w2u = get_buttonColor;
-  protoOf(Header).x2v = get_cardBackgroundColor;
-  protoOf(Header).y2v = get_multiselectOptionBackgroundColor;
-  protoOf(Header).z2v = get_multiselectOptionSelectedColor;
-  protoOf(Header).a2w = get_textScale;
-  protoOf(Header).b2w = get_textAlign;
-  protoOf(Modal).x2v = get_cardBackgroundColor;
-  protoOf(Modal).y2v = get_multiselectOptionBackgroundColor;
-  protoOf(Modal).z2v = get_multiselectOptionSelectedColor;
-  protoOf(Modal).a2w = get_textScale;
-  protoOf(Card_1).u2v = get_primaryColor;
-  protoOf(Card_1).v2v = get_primaryTextColor;
-  protoOf(Card_1).w2v = get_buttonStyle;
-  protoOf(Card_1).w2u = get_buttonColor;
-  protoOf(Card_1).x2v = get_cardBackgroundColor;
-  protoOf(Card_1).y2v = get_multiselectOptionBackgroundColor;
-  protoOf(Card_1).z2v = get_multiselectOptionSelectedColor;
-  protoOf(Card_1).a2w = get_textScale;
-  protoOf(Card_1).b2w = get_textAlign;
-  protoOf(TractPage).w2v = get_buttonStyle;
-  protoOf(TractPage).w2u = get_buttonColor;
-  protoOf(TractPage).b2w = get_textAlign;
-  protoOf(SaxXmlPullParser).s3d = require$default;
+  protoOf(Button).w2u = get_isClickable;
+  protoOf(Category).t2v = get_primaryColor;
+  protoOf(Category).u2v = get_primaryTextColor;
+  protoOf(Category).v2v = get_buttonStyle;
+  protoOf(Category).v2u = get_buttonColor;
+  protoOf(Category).w2v = get_cardBackgroundColor;
+  protoOf(Category).x2v = get_multiselectOptionBackgroundColor;
+  protoOf(Category).y2v = get_multiselectOptionSelectedColor;
+  protoOf(Category).z2v = get_textScale;
+  protoOf(Category).a2w = get_textAlign;
+  protoOf(Link).w2u = get_isClickable;
+  protoOf(Manifest).v2u = get_buttonColor;
+  protoOf(Manifest).a2w = get_textAlign;
+  protoOf(StylesOverride).t2v = get_primaryColor;
+  protoOf(StylesOverride).u2v = get_primaryTextColor;
+  protoOf(StylesOverride).v2v = get_buttonStyle;
+  protoOf(StylesOverride).v2u = get_buttonColor;
+  protoOf(StylesOverride).w2v = get_cardBackgroundColor;
+  protoOf(StylesOverride).x2v = get_multiselectOptionBackgroundColor;
+  protoOf(StylesOverride).y2v = get_multiselectOptionSelectedColor;
+  protoOf(Page).v2v = get_buttonStyle;
+  protoOf(Page).v2u = get_buttonColor;
+  protoOf(Page).a2w = get_textAlign;
+  protoOf(LessonPage).v2v = get_buttonStyle;
+  protoOf(LessonPage).v2u = get_buttonColor;
+  protoOf(LessonPage).a2w = get_textAlign;
+  protoOf(CardCollectionPage).v2v = get_buttonStyle;
+  protoOf(CardCollectionPage).v2u = get_buttonColor;
+  protoOf(CardCollectionPage).a2w = get_textAlign;
+  protoOf(ContentPage).v2v = get_buttonStyle;
+  protoOf(ContentPage).v2u = get_buttonColor;
+  protoOf(ContentPage).a2w = get_textAlign;
+  protoOf(Tip).v2v = get_buttonStyle;
+  protoOf(Tip).v2u = get_buttonColor;
+  protoOf(Tip).w2v = get_cardBackgroundColor;
+  protoOf(Tip).x2v = get_multiselectOptionBackgroundColor;
+  protoOf(Tip).y2v = get_multiselectOptionSelectedColor;
+  protoOf(Tip).z2v = get_textScale;
+  protoOf(Tip).a2w = get_textAlign;
+  protoOf(Header).t2v = get_primaryColor;
+  protoOf(Header).u2v = get_primaryTextColor;
+  protoOf(Header).v2v = get_buttonStyle;
+  protoOf(Header).v2u = get_buttonColor;
+  protoOf(Header).w2v = get_cardBackgroundColor;
+  protoOf(Header).x2v = get_multiselectOptionBackgroundColor;
+  protoOf(Header).y2v = get_multiselectOptionSelectedColor;
+  protoOf(Header).z2v = get_textScale;
+  protoOf(Header).a2w = get_textAlign;
+  protoOf(Modal).w2v = get_cardBackgroundColor;
+  protoOf(Modal).x2v = get_multiselectOptionBackgroundColor;
+  protoOf(Modal).y2v = get_multiselectOptionSelectedColor;
+  protoOf(Modal).z2v = get_textScale;
+  protoOf(Card_1).t2v = get_primaryColor;
+  protoOf(Card_1).u2v = get_primaryTextColor;
+  protoOf(Card_1).v2v = get_buttonStyle;
+  protoOf(Card_1).v2u = get_buttonColor;
+  protoOf(Card_1).w2v = get_cardBackgroundColor;
+  protoOf(Card_1).x2v = get_multiselectOptionBackgroundColor;
+  protoOf(Card_1).y2v = get_multiselectOptionSelectedColor;
+  protoOf(Card_1).z2v = get_textScale;
+  protoOf(Card_1).a2w = get_textAlign;
+  protoOf(TractPage).v2v = get_buttonStyle;
+  protoOf(TractPage).v2u = get_buttonColor;
+  protoOf(TractPage).a2w = get_textAlign;
+  protoOf(SaxXmlPullParser).p3d = require$default;
   protoOf(SaxXmlPullParser).o2r = getAttributeValue;
-  protoOf(JsXmlPullParser).s3d = require$default;
+  protoOf(JsXmlPullParser).p3d = require$default;
   protoOf(JsXmlPullParser).o2r = getAttributeValue;
   //endregion
   //region block: init
@@ -10650,6 +10692,15 @@
     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 = {});
+    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.Manifest = Manifest;
     $org$cru$godtools$shared$tool$parser$model.Manifest.createTestManifest = createTestManifest;
     $org$cru$godtools$shared$tool$parser$model.Manifest.Type = Type_1;
@@ -10667,6 +10718,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.Resource = Resource;
+    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 = {});
     var $org$cru$godtools$shared$tool$parser$model$page = $org$cru$godtools$shared$tool$parser$model.page || ($org$cru$godtools$shared$tool$parser$model.page = {});
     $org$cru$godtools$shared$tool$parser$model$page.Page = Page;
     var $org = _.org || (_.org = {});