npm - @cruglobal/godtools-shared - Versions diffs - 0.9.0-SNAPSHOT.1234 → 0.9.0-SNAPSHOT.1241 - Mend

@cruglobal/godtools-shared 0.9.0-SNAPSHOT.1234 → 0.9.0-SNAPSHOT.1241

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

Files changed (4) hide show

package/kotlin-mpp-godtools-tool-parser-npm.d.ts +43 -0
package/kotlin-mpp-godtools-tool-parser-parser.js +809 -732
package/kotlin-mpp-godtools-tool-parser-parser.js.map +1 -1
package/package.json +1 -1

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

@@ -275,7 +275,7 @@
   }
   function get_buttonColor() {
     var tmp0_safe_receiver = this.z2s();
-    return tmp0_safe_receiver == null ? null : tmp0_safe_receiver.j2x();
+    return tmp0_safe_receiver == null ? null : tmp0_safe_receiver.g2x();
   }
   function get_cardBackgroundColor() {
     return get_cardBackgroundColor_0(this.z2s());
@@ -285,7 +285,7 @@
   }
   function get_multiselectOptionSelectedColor() {
     var tmp0_safe_receiver = this.z2s();
-    return tmp0_safe_receiver == null ? null : tmp0_safe_receiver.l2y();
+    return tmp0_safe_receiver == null ? null : tmp0_safe_receiver.n2y();
   }
   function get_textColor() {
     return get_textColor_0(this.z2s());
@@ -2064,6 +2064,23 @@
       new Companion_6();
     return Companion_instance_6;
   }
+  function values_1() {
+    return [Type_EVENT_getInstance(), Type_URL_getInstance(), Type_UNKNOWN_getInstance()];
+  }
+  function valueOf_1(value) {
+    switch (value) {
+      case 'EVENT':
+        return Type_EVENT_getInstance();
+      case 'URL':
+        return Type_URL_getInstance();
+      case 'UNKNOWN':
+        return Type_UNKNOWN_getInstance();
+      default:
+        Type_initEntries();
+        THROW_ISE();
+        break;
+    }
+  }
   var Type_entriesInitialized;
   function Type_initEntries() {
     if (Type_entriesInitialized)
@@ -2098,6 +2115,23 @@
       new Companion_7();
     return Companion_instance_7;
   }
+  function values_2() {
+    return [Style_CONTAINED_getInstance(), Style_OUTLINED_getInstance(), Style_UNKNOWN_getInstance()];
+  }
+  function valueOf_2(value) {
+    switch (value) {
+      case 'CONTAINED':
+        return Style_CONTAINED_getInstance();
+      case 'OUTLINED':
+        return Style_OUTLINED_getInstance();
+      case 'UNKNOWN':
+        return Style_UNKNOWN_getInstance();
+      default:
+        Style_initEntries();
+        THROW_ISE();
+        break;
+    }
+  }
   var Style_entriesInitialized;
   function Style_initEntries() {
     if (Style_entriesInitialized)
@@ -2127,7 +2161,7 @@
     var tmp$ret$0;
     // Inline function 'kotlin.getValue' call
     var tmp0_getValue = defaultTextStyles$factory();
-    tmp$ret$0 = $this.d2x_1.o1();
+    tmp$ret$0 = $this.y2w_1.o1();
     return tmp$ret$0;
   }
   function Button_init_$Init$(parent, parser, $this) {
@@ -2163,11 +2197,11 @@
     var tmp0_safe_receiver_0 = parser.n2t('style');
     tmp_1.v2w_1 = tmp0_safe_receiver_0 == null ? null : Companion_getInstance_10().e2w(tmp0_safe_receiver_0);
     var tmp_2 = $this;
-    var tmp1_safe_receiver = Companion_getInstance_22().g2x(parser.n2t('gravity'));
+    var tmp1_safe_receiver = Companion_getInstance_22().a2x(parser.n2t('gravity'));
     var tmp2_elvis_lhs = tmp1_safe_receiver == null ? null : tmp1_safe_receiver.horizontal;
-    tmp_2.w2w_1 = tmp2_elvis_lhs == null ? Companion_getInstance_11().g2w_1 : tmp2_elvis_lhs;
+    tmp_2.gravity = tmp2_elvis_lhs == null ? Companion_getInstance_11().g2w_1 : tmp2_elvis_lhs;
     var tmp_3 = $this;
-    var tmp3_safe_receiver = Companion_getInstance_16().h2x(parser.n2t('width'));
+    var tmp3_safe_receiver = Companion_getInstance_16().b2x(parser.n2t('width'));
     var tmp_4;
     if (tmp3_safe_receiver == null) {
       tmp_4 = null;
@@ -2188,19 +2222,19 @@
       tmp_4 = tmp$ret$2;
     }
     var tmp4_elvis_lhs = tmp_4;
-    tmp_3.x2w_1 = tmp4_elvis_lhs == null ? Companion_getInstance_11().h2w_1 : tmp4_elvis_lhs;
+    tmp_3.width = tmp4_elvis_lhs == null ? Companion_getInstance_11().h2w_1 : tmp4_elvis_lhs;
     var tmp_6 = $this;
     var tmp5_safe_receiver = parser.n2t('color');
-    tmp_6.y2w_1 = tmp5_safe_receiver == null ? null : toColorOrNull(tmp5_safe_receiver);
+    tmp_6.w2w_1 = tmp5_safe_receiver == null ? null : toColorOrNull(tmp5_safe_receiver);
     var tmp_7 = $this;
     var tmp6_safe_receiver = parser.n2t(get_XML_BACKGROUND_COLOR());
     var tmp7_elvis_lhs = tmp6_safe_receiver == null ? null : toColorOrNull(tmp6_safe_receiver);
-    tmp_7.z2w_1 = tmp7_elvis_lhs == null ? Companion_getInstance_11().i2w_1 : tmp7_elvis_lhs;
-    $this.a2x_1 = parser.n2t('icon');
+    tmp_7.backgroundColor = tmp7_elvis_lhs == null ? Companion_getInstance_11().i2w_1 : tmp7_elvis_lhs;
+    $this.x2w_1 = parser.n2t('icon');
     var tmp_8 = $this;
-    var tmp8_safe_receiver = Companion_getInstance_22().g2x(parser.n2t('icon-gravity'));
+    var tmp8_safe_receiver = Companion_getInstance_22().a2x(parser.n2t('icon-gravity'));
     var tmp9_elvis_lhs = tmp8_safe_receiver == null ? null : tmp8_safe_receiver.horizontal;
-    tmp_8.c2x_1 = tmp9_elvis_lhs == null ? Companion_getInstance_11().j2w_1 : tmp9_elvis_lhs;
+    tmp_8.iconGravity = tmp9_elvis_lhs == null ? Companion_getInstance_11().j2w_1 : tmp9_elvis_lhs;
     var tmp_9 = $this;
     var tmp10_safe_receiver = parser.n2t('icon-size');
     var tmp11_elvis_lhs = tmp10_safe_receiver == null ? null : toIntOrNull(tmp10_safe_receiver);
@@ -2211,20 +2245,20 @@
     } else {
       tmp_10 = tmp11_elvis_lhs;
     }
-    tmp_9.b2x_1 = tmp_10;
+    tmp_9.iconSize = tmp_10;
     var tmp_11 = $this;
     var tmp$ret$3;
     // Inline function 'kotlin.collections.mutableListOf' call
     tmp$ret$3 = ArrayList_init_$Create$();
-    tmp_11.f2x_1 = tmp$ret$3;
+    tmp_11.z2w_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.e2x_1 = tmp12_elvis_lhs == null ? createTestText(_get_defaultTextStyles__fjozb5($this)) : tmp12_elvis_lhs;
+    tmp_12.text = tmp12_elvis_lhs == null ? createTestText(_get_defaultTextStyles__fjozb5($this)) : tmp12_elvis_lhs;
     // Inline function 'kotlin.collections.forEach' call
-    var tmp2_forEach = $this.f2x_1;
+    var tmp2_forEach = $this.z2w_1;
     var tmp0_iterator = tmp2_forEach.f();
     while (tmp0_iterator.g()) {
       var element = tmp0_iterator.h();
@@ -2245,12 +2279,14 @@
   function Style(name, ordinal) {
     Enum.call(this, name, ordinal);
   }
+  defineProp(protoOf(Style), 'name', protoOf(Style).id);
+  defineProp(protoOf(Style), 'ordinal', protoOf(Style).jd);
   function Button$defaultTextStyles$delegate$lambda$lambda() {
     return Align_CENTER_getInstance();
   }
   function Button$defaultTextStyles$delegate$lambda$lambda_0(this$0) {
     return function () {
-      var tmp0_subject = this$0.i2x();
+      var tmp0_subject = this$0.style;
       var tmp0 = tmp0_subject.d4_1;
       var tmp;
       switch (tmp0) {
@@ -2259,7 +2295,7 @@
           tmp = get_primaryTextColor_0(this$0.z2s());
           break;
         case 1:
-          tmp = this$0.j2x();
+          tmp = this$0.buttonColor;
           break;
         default:
           noWhenBranchMatchedException();
@@ -2284,7 +2320,7 @@
         Companion_getInstance_6();
         if (tmp1_subject === 'events') {
           var tmp2_this = this$0;
-          var tmp0_plusAssign = tmp2_this.f2x_1;
+          var tmp0_plusAssign = tmp2_this.z2w_1;
           var tmp1_plusAssign = Companion_getInstance_6().x2r($parser, this$0);
           addAll(tmp0_plusAssign, tmp1_plusAssign);
           tmp_0 = Unit_getInstance();
@@ -2324,12 +2360,18 @@
   protoOf(Button).r2v = function () {
     return this.u2w_1;
   };
-  protoOf(Button).i2x = function () {
+  protoOf(Button).e2x = function () {
     var tmp0_elvis_lhs = this.v2w_1;
     return tmp0_elvis_lhs == null ? get_buttonStyle_0(this.z2s()) : tmp0_elvis_lhs;
   };
-  protoOf(Button).j2x = function () {
-    var tmp0_elvis_lhs = this.y2w_1;
+  protoOf(Button).f2x = function () {
+    return this.gravity;
+  };
+  protoOf(Button).x2v = function () {
+    return this.width;
+  };
+  protoOf(Button).g2x = function () {
+    var tmp0_elvis_lhs = this.w2w_1;
     var tmp;
     if (tmp0_elvis_lhs == null) {
       var tmp$ret$1;
@@ -2339,7 +2381,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.j2x();
+      var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.g2x();
       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;
@@ -2348,8 +2390,26 @@
     }
     return tmp;
   };
+  protoOf(Button).h2x = function () {
+    return this.backgroundColor;
+  };
+  protoOf(Button).i2x = function () {
+    return getResource(this, this.x2w_1);
+  };
+  protoOf(Button).j2x = function () {
+    return this.iconGravity;
+  };
+  protoOf(Button).k2x = function () {
+    return this.iconSize;
+  };
+  protoOf(Button).z1c = function () {
+    return this.text;
+  };
   protoOf(Button).h2s = function () {
-    return (protoOf(Content).h2s.call(this) ? true : !this.isClickable) ? true : this.i2x().equals(Style_UNKNOWN_getInstance());
+    return (protoOf(Content).h2s.call(this) ? true : !this.isClickable) ? true : this.style.equals(Style_UNKNOWN_getInstance());
+  };
+  protoOf(Button).l2x = function () {
+    return this.z2w_1;
   };
   protoOf(Button)._getAnalyticsEvents = function (type) {
     var tmp0_subject = type;
@@ -2358,7 +2418,7 @@
     if (tmp0 === 3) {
       var tmp$ret$2;
       // Inline function 'kotlin.collections.filter' call
-      var tmp1_filter = this.f2x_1;
+      var tmp1_filter = this.z2w_1;
       var tmp$ret$1;
       // Inline function 'kotlin.collections.filterTo' call
       var tmp0_filterTo = ArrayList_init_$Create$();
@@ -2384,7 +2444,7 @@
   function Button() {
     Companion_getInstance_11();
     var tmp = this;
-    tmp.d2x_1 = lazy(Button$defaultTextStyles$delegate$lambda(this));
+    tmp.y2w_1 = lazy(Button$defaultTextStyles$delegate$lambda(this));
   }
   defineProp(protoOf(Button), '_events', function () {
     return this.q2v();
@@ -2392,6 +2452,9 @@
   defineProp(protoOf(Button), 'url', function () {
     return this.r2v();
   });
+  defineProp(protoOf(Button), 'style', protoOf(Button).e2x);
+  defineProp(protoOf(Button), 'buttonColor', protoOf(Button).g2x);
+  defineProp(protoOf(Button), 'icon', protoOf(Button).i2x);
   defineProp(protoOf(Button), 'isClickable', function () {
     return this.u2v();
   });
@@ -2405,8 +2468,8 @@
   }
   function Companion_9() {
     Companion_instance_9 = this;
-    this.k2x_1 = 'card';
-    this.l2x_1 = 'card-background-color';
+    this.m2x_1 = 'card';
+    this.n2x_1 = 'card-background-color';
   }
   var Companion_instance_9;
   function Companion_getInstance_12() {
@@ -2421,7 +2484,7 @@
     var tmp = get_XMLNS_CONTENT();
     Companion_getInstance_12();
     parser.t2r(2, tmp, 'card');
-    $this.u2x_1 = toColorOrNull(parser.n2t(get_XML_BACKGROUND_COLOR()));
+    $this.w2x_1 = toColorOrNull(parser.n2t(get_XML_BACKGROUND_COLOR()));
     // Inline function 'org.cru.godtools.shared.tool.parser.model.parseClickableAttrs' call
     // Inline function 'kotlin.contracts.contract' call
     var rawUrl = parser.n2t(_get_XML_URL_$accessor$11tx9p3_lkk5sb());
@@ -2441,8 +2504,8 @@
     var tmp0_toEventIds = parser.n2t(_get_XML_EVENTS_$accessor$11tx9p3_otmgk5());
     tmp$ret$0 = Companion_getInstance_17().j2v(tmp0_toEventIds);
     var tmp1__anonymous__uwfjfc = tmp$ret$0;
-    $this.w2x_1 = tmp1__anonymous__uwfjfc;
-    $this.x2x_1 = uri;
+    $this.y2x_1 = tmp1__anonymous__uwfjfc;
+    $this.z2x_1 = uri;
     var tmp_1 = $this;
     var tmp$ret$9;
     // Inline function 'org.cru.godtools.shared.tool.parser.model.parseContent' call
@@ -2522,20 +2585,20 @@
     tmp$ret$7 = tmp$ret$6.u7();
     tmp$ret$8 = tmp$ret$7;
     tmp$ret$9 = tmp$ret$8;
-    tmp_1.v2x_1 = tmp$ret$9;
+    tmp_1.x2x_1 = tmp$ret$9;
     return $this;
   }
   function Card_init_$Create$(parent, parser) {
     return Card_init_$Init$(parent, parser, objectCreate(protoOf(Card)));
   }
   protoOf(Card).s2s = function () {
-    return this.v2x_1;
+    return this.x2x_1;
   };
   protoOf(Card).q2v = function () {
-    return this.w2x_1;
+    return this.y2x_1;
   };
   protoOf(Card).r2v = function () {
-    return this.x2x_1;
+    return this.z2x_1;
   };
   protoOf(Card).h2s = function () {
     var tmp;
@@ -2571,7 +2634,7 @@
   });
   function Companion_10() {
     Companion_instance_10 = this;
-    this.y2x_1 = 'category';
+    this.a2y_1 = 'category';
   }
   var Companion_instance_10;
   function Companion_getInstance_13() {
@@ -2586,8 +2649,8 @@
     var tmp = get_XMLNS_MANIFEST();
     Companion_getInstance_13();
     parser.t2r(2, tmp, 'category');
-    $this.a2y_1 = parser.n2t('id');
-    $this.d2y_1 = parser.n2t('banner');
+    $this.c2y_1 = parser.n2t('id');
+    $this.f2y_1 = parser.n2t('banner');
     var label = null;
     var tmp_0 = $this;
     var tmp$ret$4;
@@ -2643,15 +2706,15 @@
     tmp$ret$2 = tmp0_apply;
     tmp$ret$3 = tmp$ret$2.u7();
     tmp$ret$4 = tmp$ret$3;
-    tmp_0.c2y_1 = tmp$ret$4;
-    $this.b2y_1 = label;
+    tmp_0.e2y_1 = tmp$ret$4;
+    $this.d2y_1 = label;
     return $this;
   }
   function Category_init_$Create$(manifest, parser) {
     return Category_init_$Init$(manifest, parser, objectCreate(protoOf(Category)));
   }
-  protoOf(Category).e2y = function () {
-    return this.x2o().f2y();
+  protoOf(Category).g2y = function () {
+    return this.x2o().h2y();
   };
   function Category() {
     Companion_getInstance_13();
@@ -2682,6 +2745,10 @@
     return XMLNS_CONTENT;
   }
   var XMLNS_CONTENT;
+  function get_XML_BACKGROUND_COLOR() {
+    return XML_BACKGROUND_COLOR;
+  }
+  var XML_BACKGROUND_COLOR;
   function get_SCHEMA_VERSION() {
     return SCHEMA_VERSION;
   }
@@ -2702,10 +2769,6 @@
     return XML_PRIMARY_TEXT_COLOR;
   }
   var XML_PRIMARY_TEXT_COLOR;
-  function get_XML_BACKGROUND_COLOR() {
-    return XML_BACKGROUND_COLOR;
-  }
-  var XML_BACKGROUND_COLOR;
   function get_XML_BACKGROUND_IMAGE() {
     return XML_BACKGROUND_IMAGE;
   }
@@ -2807,16 +2870,16 @@
     tmp_0.b2s_1 = tmp$ret$5;
     var tmp_3 = $this;
     var tmp4_safe_receiver = parser.n2t('required-device-type');
-    var tmp6_elvis_lhs = tmp4_safe_receiver == null ? null : Companion_getInstance_15().p2y(tmp4_safe_receiver);
+    var tmp6_elvis_lhs = tmp4_safe_receiver == null ? null : Companion_getInstance_15().r2y(tmp4_safe_receiver);
     var tmp_4;
     if (tmp6_elvis_lhs == null) {
       var tmp5_safe_receiver = parser.n2t('restrictTo');
-      tmp_4 = tmp5_safe_receiver == null ? null : Companion_getInstance_15().p2y(tmp5_safe_receiver);
+      tmp_4 = tmp5_safe_receiver == null ? null : Companion_getInstance_15().r2y(tmp5_safe_receiver);
     } else {
       tmp_4 = tmp6_elvis_lhs;
     }
     var tmp7_elvis_lhs = tmp_4;
-    tmp_3.c2s_1 = tmp7_elvis_lhs == null ? Companion_getInstance_15().o2y_1 : tmp7_elvis_lhs;
+    tmp_3.c2s_1 = tmp7_elvis_lhs == null ? Companion_getInstance_15().q2y_1 : tmp7_elvis_lhs;
     var tmp_5 = $this;
     var tmp8_safe_receiver = parser.n2t('required-android-version');
     var tmp_6;
@@ -2828,7 +2891,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().q2y(tmp8_safe_receiver);
+      var tmp0_elvis_lhs_0 = Companion_getInstance_42().s2y(tmp8_safe_receiver);
       var tmp_7;
       var tmp_8 = tmp0_elvis_lhs_0;
       if ((tmp_8 == null ? null : new Version(tmp_8)) == null) {
@@ -2852,7 +2915,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().q2y(tmp9_safe_receiver);
+      var tmp0_elvis_lhs_1 = Companion_getInstance_42().s2y(tmp9_safe_receiver);
       var tmp_11;
       var tmp_12 = tmp0_elvis_lhs_1;
       if ((tmp_12 == null ? null : new Version(tmp_12)) == null) {
@@ -2878,7 +2941,7 @@
     parent = parent === VOID ? createTestManifest() : parent;
     version = version === VOID ? get_SCHEMA_VERSION() : version;
     requiredFeatures = requiredFeatures === VOID ? emptySet() : requiredFeatures;
-    requiredDeviceType = requiredDeviceType === VOID ? Companion_getInstance_15().o2y_1 : requiredDeviceType;
+    requiredDeviceType = requiredDeviceType === VOID ? Companion_getInstance_15().q2y_1 : requiredDeviceType;
     requiredAndroidVersion = requiredAndroidVersion === VOID ? null : requiredAndroidVersion;
     requiredIosVersion = requiredIosVersion === VOID ? null : requiredIosVersion;
     invisibleIf = invisibleIf === VOID ? null : invisibleIf;
@@ -3180,9 +3243,9 @@
   var DeviceType_UNKNOWN_instance;
   function Companion_12() {
     Companion_instance_12 = this;
-    this.o2y_1 = toSet(values_1());
+    this.q2y_1 = toSet(values_3());
   }
-  protoOf(Companion_12).p2y = function (_this__u8e3s4) {
+  protoOf(Companion_12).r2y = function (_this__u8e3s4) {
     var tmp$ret$2;
     // Inline function 'kotlin.collections.mapTo' call
     var tmp0_mapTo = get_REGEX_SEQUENCE_SEPARATOR().ec(_this__u8e3s4);
@@ -3208,7 +3271,7 @@
       new Companion_12();
     return Companion_instance_12;
   }
-  function values_1() {
+  function values_3() {
     return [DeviceType_ANDROID_getInstance(), DeviceType_IOS_getInstance(), DeviceType_MOBILE_getInstance(), DeviceType_WEB_getInstance(), DeviceType_UNKNOWN_getInstance()];
   }
   var DeviceType_entriesInitialized;
@@ -3259,7 +3322,7 @@
   function Companion_13() {
     Companion_instance_13 = this;
   }
-  protoOf(Companion_13).h2x = function (_this__u8e3s4) {
+  protoOf(Companion_13).b2x = function (_this__u8e3s4) {
     var tmp0_safe_receiver = _this__u8e3s4;
     var tmp;
     if (tmp0_safe_receiver == null) {
@@ -3338,12 +3401,12 @@
   protoOf(Percent).s2 = function () {
     return this.value;
   };
-  protoOf(Percent).a2z = function (value) {
+  protoOf(Percent).c2z = function (value) {
     return new Percent(value);
   };
   protoOf(Percent).copy = function (value, $super) {
     value = value === VOID ? this.value : value;
-    return this.a2z(value);
+    return this.c2z(value);
   };
   protoOf(Percent).toString = function () {
     return 'Percent(value=' + this.value + ')';
@@ -3371,12 +3434,12 @@
   protoOf(Pixels).s2 = function () {
     return this.value;
   };
-  protoOf(Pixels).b2z = function (value) {
+  protoOf(Pixels).d2z = function (value) {
     return new Pixels(value);
   };
   protoOf(Pixels).copy = function (value, $super) {
     value = value === VOID ? this.value : value;
-    return this.b2z(value);
+    return this.d2z(value);
   };
   protoOf(Pixels).toString = function () {
     return 'Pixels(value=' + this.value + ')';
@@ -3410,7 +3473,7 @@
     Companion_instance_14 = this;
     this.FOLLOWUP = new EventId('followup', 'send');
   }
-  protoOf(Companion_14).c2z = function () {
+  protoOf(Companion_14).e2z = function () {
     return this.FOLLOWUP;
   };
   protoOf(Companion_14).j2v = function (raw) {
@@ -3556,7 +3619,7 @@
   };
   function Companion_15() {
     Companion_instance_15 = this;
-    this.d2z_1 = 'fallback';
+    this.f2z_1 = 'fallback';
   }
   var Companion_instance_15;
   function Companion_getInstance_18() {
@@ -3664,14 +3727,14 @@
     tmp$ret$6 = tmp$ret$5.u7();
     tmp$ret$7 = tmp$ret$6;
     tmp$ret$8 = tmp$ret$7;
-    tmp_1.z2y_1 = tmp$ret$8;
+    tmp_1.b2z_1 = tmp$ret$8;
     return $this;
   }
   function Fallback_init_$Create$(parent, parser) {
     return Fallback_init_$Init$(parent, parser, objectCreate(protoOf(Fallback)));
   }
   protoOf(Fallback).s2s = function () {
-    return take(this.z2y_1, 1);
+    return take(this.b2z_1, 1);
   };
   protoOf(Fallback).b2t = function () {
     var tmp$ret$3;
@@ -3707,7 +3770,7 @@
   });
   function Companion_16() {
     Companion_instance_16 = this;
-    this.e2z_1 = 'width';
+    this.g2z_1 = 'width';
   }
   var Companion_instance_16;
   function Companion_getInstance_19() {
@@ -3720,11 +3783,11 @@
     Item.call($this);
     Companion_getInstance_59();
     parser.t2r(2, get_XMLNS_CONTENT(), 'item');
-    $this.g2z_1 = flow;
+    $this.i2z_1 = flow;
     var tmp = $this;
     var tmp_0 = Companion_getInstance_16();
     Companion_getInstance_19();
-    tmp.h2z_1 = tmp_0.h2x(parser.n2t('width'));
+    tmp.j2z_1 = tmp_0.b2x(parser.n2t('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
@@ -3751,7 +3814,7 @@
       tmp$ret$1 = tmp_3;
       tmp_2 = tmp$ret$1;
     }
-    tmp_1.i2z_1 = tmp_2;
+    tmp_1.k2z_1 = tmp_2;
     var tmp_4 = $this;
     var tmp1_safe_receiver = tmp1__anonymous__uwfjfc;
     var tmp_5;
@@ -3773,7 +3836,7 @@
       tmp$ret$3 = tmp_6;
       tmp_5 = tmp$ret$3;
     }
-    tmp_4.j2z_1 = tmp_5;
+    tmp_4.l2z_1 = tmp_5;
     var tmp_7 = $this;
     var tmp$ret$12;
     // Inline function 'org.cru.godtools.shared.tool.parser.model.parseContent' call
@@ -3853,7 +3916,7 @@
     tmp$ret$10 = tmp$ret$9.u7();
     tmp$ret$11 = tmp$ret$10;
     tmp$ret$12 = tmp$ret$11;
-    tmp_7.k2z_1 = tmp$ret$12;
+    tmp_7.m2z_1 = tmp$ret$12;
     return $this;
   }
   function Item_init_$Create$(flow, parser) {
@@ -3862,11 +3925,11 @@
   function Item_init_$Init$_0(flow, content, $this) {
     BaseModel.call($this, flow);
     Item.call($this);
-    $this.g2z_1 = flow;
-    $this.h2z_1 = null;
-    $this.i2z_1 = null;
+    $this.i2z_1 = flow;
     $this.j2z_1 = null;
-    $this.k2z_1 = listOfNotNull(content($this));
+    $this.k2z_1 = null;
+    $this.l2z_1 = null;
+    $this.m2z_1 = listOfNotNull(content($this));
     return $this;
   }
   function Item_init_$Create$_0(flow, content) {
@@ -3874,10 +3937,10 @@
   }
   function Companion_17() {
     Companion_instance_17 = this;
-    this.l2z_1 = 'flow';
-    this.m2z_1 = 'item-width';
-    this.n2z_1 = new Percent(1.0);
-    this.o2z_1 = Horizontal_START_getInstance();
+    this.n2z_1 = 'flow';
+    this.o2z_1 = 'item-width';
+    this.p2z_1 = new Percent(1.0);
+    this.q2z_1 = Horizontal_START_getInstance();
   }
   var Companion_instance_17;
   function Companion_getInstance_20() {
@@ -3895,18 +3958,18 @@
     var tmp_0 = $this;
     var tmp_1 = Companion_getInstance_16();
     Companion_getInstance_20();
-    var tmp0_elvis_lhs = tmp_1.h2x(parser.n2t('item-width'));
-    tmp_0.x2z_1 = tmp0_elvis_lhs == null ? Companion_getInstance_20().n2z_1 : tmp0_elvis_lhs;
+    var tmp0_elvis_lhs = tmp_1.b2x(parser.n2t('item-width'));
+    tmp_0.z2z_1 = tmp0_elvis_lhs == null ? Companion_getInstance_20().p2z_1 : tmp0_elvis_lhs;
     var tmp_2 = $this;
     var tmp1_safe_receiver = parser.n2t('row-gravity');
-    var tmp2_safe_receiver = tmp1_safe_receiver == null ? null : Companion_getInstance_22().g2x(tmp1_safe_receiver);
+    var tmp2_safe_receiver = tmp1_safe_receiver == null ? null : Companion_getInstance_22().a2x(tmp1_safe_receiver);
     var tmp3_elvis_lhs = tmp2_safe_receiver == null ? null : tmp2_safe_receiver.horizontal;
-    tmp_2.y2z_1 = tmp3_elvis_lhs == null ? Companion_getInstance_20().o2z_1 : tmp3_elvis_lhs;
+    tmp_2.a30_1 = tmp3_elvis_lhs == null ? Companion_getInstance_20().q2z_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.z2z_1 = tmp$ret$0;
+    tmp_3.b30_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();
@@ -3925,7 +3988,7 @@
         if (tmp1_subject === 'item') {
           var tmp2_this = $this;
           // Inline function 'kotlin.collections.plusAssign' call
-          var tmp0_plusAssign = tmp2_this.z2z_1;
+          var tmp0_plusAssign = tmp2_this.b30_1;
           var tmp1_plusAssign = Item_init_$Create$($this, parser);
           tmp0_plusAssign.b(tmp1_plusAssign);
         }
@@ -3936,12 +3999,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.k2z_1;
+        var tmp2_isNotEmpty = item.m2z_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.z2z_1;
+          var tmp3_plusAssign = tmp3_this.b30_1;
           tmp3_plusAssign.b(item);
         }
       }
@@ -3957,13 +4020,13 @@
     return Flow_init_$Init$(parent, parser, objectCreate(protoOf(Flow)));
   }
   protoOf(Item).f2t = function () {
-    return this.i2z_1;
+    return this.k2z_1;
   };
   protoOf(Item).g2t = function () {
-    return this.j2z_1;
+    return this.l2z_1;
   };
   protoOf(Item).s2s = function () {
-    return this.k2z_1;
+    return this.m2z_1;
   };
   function Item() {
     Companion_getInstance_19();
@@ -4015,7 +4078,7 @@
   }
   function Companion_18() {
     Companion_instance_18 = this;
-    this.a30_1 = 'form';
+    this.c30_1 = 'form';
   }
   var Companion_instance_18;
   function Companion_getInstance_21() {
@@ -4109,14 +4172,14 @@
     tmp$ret$6 = tmp$ret$5.u7();
     tmp$ret$7 = tmp$ret$6;
     tmp$ret$8 = tmp$ret$7;
-    tmp_0.j30_1 = tmp$ret$8;
+    tmp_0.l30_1 = tmp$ret$8;
     return $this;
   }
   function Form_init_$Create$(parent, parser) {
     return Form_init_$Init$(parent, parser, objectCreate(protoOf(Form)));
   }
   protoOf(Form).s2s = function () {
-    return this.j30_1;
+    return this.l30_1;
   };
   protoOf(Form).b2t = function () {
     var tmp$ret$3;
@@ -4158,10 +4221,10 @@
   var Horizontal_START_instance;
   var Horizontal_CENTER_instance;
   var Horizontal_END_instance;
-  function values_2() {
+  function values_4() {
     return [Horizontal_START_getInstance(), Horizontal_CENTER_getInstance(), Horizontal_END_getInstance()];
   }
-  function valueOf_1(value) {
+  function valueOf_3(value) {
     switch (value) {
       case 'START':
         return Horizontal_START_getInstance();
@@ -4187,10 +4250,10 @@
   var Vertical_TOP_instance;
   var Vertical_CENTER_instance;
   var Vertical_BOTTOM_instance;
-  function values_3() {
+  function values_5() {
     return [Vertical_TOP_getInstance(), Vertical_CENTER_getInstance(), Vertical_BOTTOM_getInstance()];
   }
-  function valueOf_2(value) {
+  function valueOf_4(value) {
     switch (value) {
       case 'TOP':
         return Vertical_TOP_getInstance();
@@ -4217,10 +4280,10 @@
     Companion_instance_19 = this;
     this.CENTER = new Gravity(Horizontal_CENTER_getInstance(), Vertical_CENTER_getInstance());
   }
-  protoOf(Companion_19).k30 = function () {
+  protoOf(Companion_19).m30 = function () {
     return this.CENTER;
   };
-  protoOf(Companion_19).g2x = function (_this__u8e3s4) {
+  protoOf(Companion_19).a2x = function (_this__u8e3s4) {
     if (_this__u8e3s4 == null)
       return null;
     var tmp;
@@ -4359,47 +4422,47 @@
     this.horizontal = horizontal;
     this.vertical = vertical;
   }
-  protoOf(Gravity).p30 = function () {
+  protoOf(Gravity).r30 = function () {
     return this.horizontal;
   };
-  protoOf(Gravity).q30 = function () {
+  protoOf(Gravity).s30 = function () {
     return this.vertical;
   };
-  protoOf(Gravity).r30 = function () {
+  protoOf(Gravity).t30 = function () {
     return this.horizontal.equals(Horizontal_START_getInstance());
   };
-  protoOf(Gravity).s30 = function () {
+  protoOf(Gravity).u30 = function () {
     return this.horizontal.equals(Horizontal_END_getInstance());
   };
-  protoOf(Gravity).t30 = function () {
+  protoOf(Gravity).v30 = function () {
     return this.horizontal.equals(Horizontal_CENTER_getInstance());
   };
-  protoOf(Gravity).u30 = function () {
+  protoOf(Gravity).w30 = function () {
     return this.vertical.equals(Vertical_TOP_getInstance());
   };
-  protoOf(Gravity).v30 = function () {
+  protoOf(Gravity).x30 = function () {
     return this.vertical.equals(Vertical_BOTTOM_getInstance());
   };
-  protoOf(Gravity).w30 = function () {
+  protoOf(Gravity).y30 = function () {
     return this.vertical.equals(Vertical_CENTER_getInstance());
   };
-  protoOf(Gravity).x30 = function () {
+  protoOf(Gravity).z30 = function () {
     return this.isCenterX ? this.isCenterY : false;
   };
-  defineProp(protoOf(Gravity), 'isStart', protoOf(Gravity).r30);
-  defineProp(protoOf(Gravity), 'isEnd', protoOf(Gravity).s30);
-  defineProp(protoOf(Gravity), 'isCenterX', protoOf(Gravity).t30);
-  defineProp(protoOf(Gravity), 'isTop', protoOf(Gravity).u30);
-  defineProp(protoOf(Gravity), 'isBottom', protoOf(Gravity).v30);
-  defineProp(protoOf(Gravity), 'isCenterY', protoOf(Gravity).w30);
-  defineProp(protoOf(Gravity), 'isCenter', protoOf(Gravity).x30);
+  defineProp(protoOf(Gravity), 'isStart', protoOf(Gravity).t30);
+  defineProp(protoOf(Gravity), 'isEnd', protoOf(Gravity).u30);
+  defineProp(protoOf(Gravity), 'isCenterX', protoOf(Gravity).v30);
+  defineProp(protoOf(Gravity), 'isTop', protoOf(Gravity).w30);
+  defineProp(protoOf(Gravity), 'isBottom', protoOf(Gravity).x30);
+  defineProp(protoOf(Gravity), 'isCenterY', protoOf(Gravity).y30);
+  defineProp(protoOf(Gravity), 'isCenter', protoOf(Gravity).z30);
   function HasAnalyticsEvents() {
   }
   function Companion_20() {
     Companion_instance_20 = this;
-    this.y30_1 = 'image';
-    this.z30_1 = Horizontal_CENTER_getInstance();
-    this.a31_1 = new Percent(1.0);
+    this.a31_1 = 'image';
+    this.b31_1 = Horizontal_CENTER_getInstance();
+    this.c31_1 = new Percent(1.0);
   }
   var Companion_instance_20;
   function Companion_getInstance_23() {
@@ -4414,7 +4477,7 @@
     var tmp = get_XMLNS_CONTENT();
     Companion_getInstance_23();
     parser.t2r(2, tmp, 'image');
-    $this.l31_1 = parser.n2t('resource');
+    $this.n31_1 = parser.n2t('resource');
     // Inline function 'org.cru.godtools.shared.tool.parser.model.parseClickableAttrs' call
     // Inline function 'kotlin.contracts.contract' call
     var rawUrl = parser.n2t(_get_XML_URL_$accessor$11tx9p3_lkk5sb());
@@ -4434,14 +4497,14 @@
     var tmp0_toEventIds = parser.n2t(_get_XML_EVENTS_$accessor$11tx9p3_otmgk5());
     tmp$ret$0 = Companion_getInstance_17().j2v(tmp0_toEventIds);
     var tmp1__anonymous__uwfjfc = tmp$ret$0;
-    $this.j31_1 = tmp1__anonymous__uwfjfc;
-    $this.k31_1 = uri;
+    $this.l31_1 = tmp1__anonymous__uwfjfc;
+    $this.m31_1 = uri;
     var tmp_1 = $this;
-    var tmp0_safe_receiver_0 = Companion_getInstance_22().g2x(parser.n2t('gravity'));
+    var tmp0_safe_receiver_0 = Companion_getInstance_22().a2x(parser.n2t('gravity'));
     var tmp1_elvis_lhs = tmp0_safe_receiver_0 == null ? null : tmp0_safe_receiver_0.horizontal;
-    tmp_1.gravity = tmp1_elvis_lhs == null ? Companion_getInstance_23().z30_1 : tmp1_elvis_lhs;
+    tmp_1.gravity = tmp1_elvis_lhs == null ? Companion_getInstance_23().b31_1 : tmp1_elvis_lhs;
     var tmp_2 = $this;
-    var tmp2_safe_receiver = Companion_getInstance_16().h2x(parser.n2t('width'));
+    var tmp2_safe_receiver = Companion_getInstance_16().b2x(parser.n2t('width'));
     var tmp_3;
     if (tmp2_safe_receiver == null) {
       tmp_3 = null;
@@ -4462,7 +4525,7 @@
       tmp_3 = tmp$ret$2;
     }
     var tmp3_elvis_lhs = tmp_3;
-    tmp_2.width = tmp3_elvis_lhs == null ? Companion_getInstance_23().a31_1 : tmp3_elvis_lhs;
+    tmp_2.width = tmp3_elvis_lhs == null ? Companion_getInstance_23().c31_1 : tmp3_elvis_lhs;
     skipTag(parser);
     return $this;
   }
@@ -4472,40 +4535,40 @@
   function Image_init_$Init$_0(parent, resource, gravity, width, $this) {
     parent = parent === VOID ? createTestManifest() : parent;
     resource = resource === VOID ? null : resource;
-    gravity = gravity === VOID ? Companion_getInstance_23().z30_1 : gravity;
-    width = width === VOID ? Companion_getInstance_23().a31_1 : width;
+    gravity = gravity === VOID ? Companion_getInstance_23().b31_1 : gravity;
+    width = width === VOID ? Companion_getInstance_23().c31_1 : width;
     Content_init_$Init$_0(parent, VOID, VOID, VOID, VOID, VOID, VOID, VOID, $this);
     Image.call($this);
-    $this.l31_1 = resource;
+    $this.n31_1 = resource;
     $this.gravity = gravity;
     $this.width = width;
-    $this.j31_1 = emptyList();
-    $this.k31_1 = null;
+    $this.l31_1 = emptyList();
+    $this.m31_1 = null;
     return $this;
   }
   function createTestImage(parent, resource, gravity, width) {
     return Image_init_$Init$_0(parent, resource, gravity, width, objectCreate(protoOf(Image)));
   }
   protoOf(Image).q2v = function () {
-    return this.j31_1;
+    return this.l31_1;
   };
   protoOf(Image).r2v = function () {
-    return this.k31_1;
+    return this.m31_1;
   };
   protoOf(Image).k2v = function () {
-    return this.l31_1;
+    return this.n31_1;
   };
   protoOf(Image).l2v = function () {
-    var tmp0_elvis_lhs = getResource(this, this.l31_1);
+    var tmp0_elvis_lhs = getResource(this, this.n31_1);
     var tmp;
     if (tmp0_elvis_lhs == null) {
       var tmp_0;
-      if (this.l31_1 == null) {
+      if (this.n31_1 == null) {
         tmp_0 = null;
       } else if (this.x2o().p2t_1.m2q_1) {
-        var message = 'tool: ' + this.x2o().code + ' locale: ' + this.x2o().locale + ' resource: ' + this.l31_1;
+        var message = 'tool: ' + this.x2o().code + ' locale: ' + this.x2o().locale + ' resource: ' + this.n31_1;
         Napier_getInstance().q2l(message, new DeprecationException('Legacy Manifest missing Image Resource ' + message), 'Image');
-        tmp_0 = Resource_init_$Create$_0(this.x2o(), this.l31_1);
+        tmp_0 = Resource_init_$Create$_0(this.x2o(), this.n31_1);
       } else {
         tmp_0 = null;
       }
@@ -4515,7 +4578,7 @@
     }
     return tmp;
   };
-  protoOf(Image).m31 = function () {
+  protoOf(Image).f2x = function () {
     return this.gravity;
   };
   protoOf(Image).x2v = function () {
@@ -4528,7 +4591,7 @@
     } else {
       var tmp$ret$0;
       // Inline function 'kotlin.text.isNullOrEmpty' call
-      var tmp0_isNullOrEmpty = this.l31_1;
+      var tmp0_isNullOrEmpty = this.n31_1;
       // Inline function 'kotlin.contracts.contract' call
       tmp$ret$0 = tmp0_isNullOrEmpty == null ? true : charSequenceLength(tmp0_isNullOrEmpty) === 0;
       tmp = tmp$ret$0;
@@ -4558,7 +4621,7 @@
   function Companion_21() {
     Companion_instance_21 = this;
   }
-  protoOf(Companion_21).n31 = function (_this__u8e3s4) {
+  protoOf(Companion_21).o31 = function (_this__u8e3s4) {
     var tmp0_subject = _this__u8e3s4;
     switch (tmp0_subject) {
       case 'fit':
@@ -4641,9 +4704,9 @@
   var Type_HIDDEN_instance;
   function Companion_22() {
     Companion_instance_22 = this;
-    this.o31_1 = Type_TEXT_getInstance();
+    this.p31_1 = Type_TEXT_getInstance();
   }
-  protoOf(Companion_22).p31 = function (_this__u8e3s4) {
+  protoOf(Companion_22).q31 = function (_this__u8e3s4) {
     var tmp0_subject = _this__u8e3s4;
     switch (tmp0_subject) {
       case 'email':
@@ -4665,10 +4728,10 @@
       new Companion_22();
     return Companion_instance_22;
   }
-  function values_4() {
+  function values_6() {
     return [Type_TEXT_getInstance(), Type_EMAIL_getInstance(), Type_PHONE_getInstance(), Type_HIDDEN_getInstance()];
   }
-  function valueOf_3(value) {
+  function valueOf_5(value) {
     switch (value) {
       case 'TEXT':
         return Type_TEXT_getInstance();
@@ -4697,7 +4760,7 @@
   }
   function Companion_23() {
     Companion_instance_23 = this;
-    this.q31_1 = 'input';
+    this.r31_1 = 'input';
   }
   var Companion_instance_23;
   function Companion_getInstance_26() {
@@ -4714,8 +4777,8 @@
     parser.t2r(2, tmp, 'input');
     var tmp_0 = $this;
     var tmp0_safe_receiver = parser.n2t('type');
-    var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : Companion_getInstance_25().p31(tmp0_safe_receiver);
-    tmp_0.type = tmp1_elvis_lhs == null ? Companion_getInstance_25().o31_1 : tmp1_elvis_lhs;
+    var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : Companion_getInstance_25().q31(tmp0_safe_receiver);
+    tmp_0.type = tmp1_elvis_lhs == null ? Companion_getInstance_25().p31_1 : tmp1_elvis_lhs;
     $this.name = parser.n2t('name');
     $this.value = parser.n2t('value');
     var tmp_1 = $this;
@@ -4789,13 +4852,13 @@
   protoOf(Input).o1 = function () {
     return this.value;
   };
-  protoOf(Input).b32 = function () {
+  protoOf(Input).c32 = function () {
     return this.isRequired;
   };
-  protoOf(Input).c32 = function () {
+  protoOf(Input).d32 = function () {
     return this.label;
   };
-  protoOf(Input).d32 = function () {
+  protoOf(Input).e32 = function () {
     return this.placeholder;
   };
   protoOf(Input).validateValue = function (raw) {
@@ -4850,7 +4913,7 @@
   }
   function Companion_24() {
     Companion_instance_24 = this;
-    this.e32_1 = 'link';
+    this.f32_1 = 'link';
   }
   var Companion_instance_24;
   function Companion_getInstance_27() {
@@ -4862,7 +4925,7 @@
     var tmp$ret$0;
     // Inline function 'kotlin.getValue' call
     var tmp0_getValue = defaultTextStyles$factory_0();
-    tmp$ret$0 = $this.p32_1.o1();
+    tmp$ret$0 = $this.q32_1.o1();
     return tmp$ret$0;
   }
   function Link_init_$Init$(parent, parser, $this) {
@@ -4891,19 +4954,19 @@
     var tmp0_toEventIds = parser.n2t(_get_XML_EVENTS_$accessor$11tx9p3_otmgk5());
     tmp$ret$0 = Companion_getInstance_17().j2v(tmp0_toEventIds);
     var tmp1__anonymous__uwfjfc = tmp$ret$0;
-    $this.n32_1 = tmp1__anonymous__uwfjfc;
-    $this.o32_1 = uri;
+    $this.o32_1 = tmp1__anonymous__uwfjfc;
+    $this.p32_1 = uri;
     var tmp_1 = $this;
     var tmp$ret$1;
     // Inline function 'kotlin.collections.mutableListOf' call
     tmp$ret$1 = ArrayList_init_$Create$();
-    tmp_1.r32_1 = tmp$ret$1;
+    tmp_1.s32_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.q32_1 = tmp0_elvis_lhs == null ? createTestText(_get_defaultTextStyles__fjozb5_0($this)) : tmp0_elvis_lhs;
+    tmp_2.r32_1 = tmp0_elvis_lhs == null ? createTestText(_get_defaultTextStyles__fjozb5_0($this)) : tmp0_elvis_lhs;
     return $this;
   }
   function Link_init_$Create$(parent, parser) {
@@ -4929,7 +4992,7 @@
         Companion_getInstance_6();
         if (tmp1_subject === 'events') {
           var tmp2_this = this$0;
-          var tmp0_plusAssign = tmp2_this.r32_1;
+          var tmp0_plusAssign = tmp2_this.s32_1;
           var tmp1_plusAssign = Companion_getInstance_6().x2r($parser, this$0);
           addAll(tmp0_plusAssign, tmp1_plusAssign);
           tmp_0 = Unit_getInstance();
@@ -4940,10 +5003,10 @@
     };
   }
   protoOf(Link).q2v = function () {
-    return this.n32_1;
+    return this.o32_1;
   };
   protoOf(Link).r2v = function () {
-    return this.o32_1;
+    return this.p32_1;
   };
   protoOf(Link).h2s = function () {
     return protoOf(Content).h2s.call(this) ? true : !this.isClickable;
@@ -4955,7 +5018,7 @@
     if (tmp0 === 3) {
       var tmp$ret$2;
       // Inline function 'kotlin.collections.filter' call
-      var tmp1_filter = this.r32_1;
+      var tmp1_filter = this.s32_1;
       var tmp$ret$1;
       // Inline function 'kotlin.collections.filterTo' call
       var tmp0_filterTo = ArrayList_init_$Create$();
@@ -4981,7 +5044,7 @@
   function Link() {
     Companion_getInstance_27();
     var tmp = this;
-    tmp.p32_1 = lazy(Link$defaultTextStyles$delegate$lambda(this));
+    tmp.q32_1 = lazy(Link$defaultTextStyles$delegate$lambda(this));
   }
   defineProp(protoOf(Link), '_events', function () {
     return this.q2v();
@@ -5001,20 +5064,20 @@
     }, null);
   }
   function Manifest$Companion$parse$slambda$slambda$slambda($manifest, $fileName, $parseFile, $src, resultContinuation) {
-    this.a33_1 = $manifest;
-    this.b33_1 = $fileName;
-    this.c33_1 = $parseFile;
-    this.d33_1 = $src;
+    this.b33_1 = $manifest;
+    this.c33_1 = $fileName;
+    this.d33_1 = $parseFile;
+    this.e33_1 = $src;
     CoroutineImpl.call(this, resultContinuation);
   }
-  protoOf(Manifest$Companion$parse$slambda$slambda$slambda).g33 = function ($this$async, $completion) {
+  protoOf(Manifest$Companion$parse$slambda$slambda$slambda).h33 = function ($this$async, $completion) {
     var tmp = this.x10($this$async, $completion);
     tmp.ae_1 = Unit_getInstance();
     tmp.be_1 = null;
     return tmp.re();
   };
   protoOf(Manifest$Companion$parse$slambda$slambda$slambda).ff = function (p1, $completion) {
-    return this.g33((!(p1 == null) ? isInterface(p1, CoroutineScope) : false) ? p1 : THROW_CCE(), $completion);
+    return this.h33((!(p1 == null) ? isInterface(p1, CoroutineScope) : false) ? p1 : THROW_CCE(), $completion);
   };
   protoOf(Manifest$Companion$parse$slambda$slambda$slambda).re = function () {
     var suspendResult = this.ae_1;
@@ -5024,9 +5087,9 @@
         switch (tmp) {
           case 0:
             this.zd_1 = 2;
-            this.f33_1 = Companion_getInstance_48();
+            this.g33_1 = Companion_getInstance_48();
             this.yd_1 = 1;
-            suspendResult = this.c33_1(this.d33_1, this);
+            suspendResult = this.d33_1(this.e33_1, this);
             if (suspendResult === get_COROUTINE_SUSPENDED()) {
               return suspendResult;
             }
@@ -5034,7 +5097,7 @@
             continue $sm;
           case 1:
             var ARGUMENT = suspendResult;
-            return this.f33_1.l33(this.a33_1, this.b33_1, ARGUMENT);
+            return this.g33_1.m33(this.b33_1, this.c33_1, ARGUMENT);
           case 2:
             throw this.be_1;
         }
@@ -5050,33 +5113,33 @@
      while (true);
   };
   protoOf(Manifest$Companion$parse$slambda$slambda$slambda).x10 = function ($this$async, completion) {
-    var i = new Manifest$Companion$parse$slambda$slambda$slambda(this.a33_1, this.b33_1, this.c33_1, this.d33_1, completion);
-    i.e33_1 = $this$async;
+    var i = new Manifest$Companion$parse$slambda$slambda$slambda(this.b33_1, this.c33_1, this.d33_1, this.e33_1, completion);
+    i.f33_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.g33($this$async, $completion);
+      return i.h33($this$async, $completion);
     };
     l.$arity = 1;
     return l;
   }
   function Manifest$Companion$parse$slambda$slambda$slambda_1($manifest, $id, $parseFile, $src, resultContinuation) {
-    this.u33_1 = $manifest;
-    this.v33_1 = $id;
-    this.w33_1 = $parseFile;
-    this.x33_1 = $src;
+    this.v33_1 = $manifest;
+    this.w33_1 = $id;
+    this.x33_1 = $parseFile;
+    this.y33_1 = $src;
     CoroutineImpl.call(this, resultContinuation);
   }
-  protoOf(Manifest$Companion$parse$slambda$slambda$slambda_1).z33 = function ($this$async, $completion) {
+  protoOf(Manifest$Companion$parse$slambda$slambda$slambda_1).a34 = function ($this$async, $completion) {
     var tmp = this.x10($this$async, $completion);
     tmp.ae_1 = Unit_getInstance();
     tmp.be_1 = null;
     return tmp.re();
   };
   protoOf(Manifest$Companion$parse$slambda$slambda$slambda_1).ff = function (p1, $completion) {
-    return this.z33((!(p1 == null) ? isInterface(p1, CoroutineScope) : false) ? p1 : THROW_CCE(), $completion);
+    return this.a34((!(p1 == null) ? isInterface(p1, CoroutineScope) : false) ? p1 : THROW_CCE(), $completion);
   };
   protoOf(Manifest$Companion$parse$slambda$slambda$slambda_1).re = function () {
     var suspendResult = this.ae_1;
@@ -5087,7 +5150,7 @@
           case 0:
             this.zd_1 = 2;
             this.yd_1 = 1;
-            suspendResult = this.w33_1(this.x33_1, this);
+            suspendResult = this.x33_1(this.y33_1, this);
             if (suspendResult === get_COROUTINE_SUSPENDED()) {
               return suspendResult;
             }
@@ -5095,7 +5158,7 @@
             continue $sm;
           case 1:
             var ARGUMENT = suspendResult;
-            return Tip_init_$Create$(this.u33_1, this.v33_1, ARGUMENT);
+            return Tip_init_$Create$(this.v33_1, this.w33_1, ARGUMENT);
           case 2:
             throw this.be_1;
         }
@@ -5111,21 +5174,21 @@
      while (true);
   };
   protoOf(Manifest$Companion$parse$slambda$slambda$slambda_1).x10 = function ($this$async, completion) {
-    var i = new Manifest$Companion$parse$slambda$slambda$slambda_1(this.u33_1, this.v33_1, this.w33_1, this.x33_1, completion);
-    i.y33_1 = $this$async;
+    var i = new Manifest$Companion$parse$slambda$slambda$slambda_1(this.v33_1, this.w33_1, this.x33_1, this.y33_1, completion);
+    i.z33_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.z33($this$async, $completion);
+      return i.a34($this$async, $completion);
     };
     l.$arity = 1;
     return l;
   }
   function Manifest$Companion$parse$slambda$slambda($manifest, $parseFile, resultContinuation) {
-    this.i34_1 = $manifest;
-    this.j34_1 = $parseFile;
+    this.j34_1 = $manifest;
+    this.k34_1 = $parseFile;
     CoroutineImpl.call(this, resultContinuation);
   }
   protoOf(Manifest$Companion$parse$slambda$slambda).w10 = function ($this$launch, $completion) {
@@ -5146,14 +5209,14 @@
           case 0:
             this.zd_1 = 2;
             this.yd_1 = 1;
-            var tmp1_map = this.i34_1.j2u_1;
+            var tmp1_map = this.j34_1.j2u_1;
             var tmp0_mapTo = ArrayList_init_$Create$_0(collectionSizeOrDefault(tmp1_map, 10));
             var tmp0_iterator = tmp1_map.f();
             while (tmp0_iterator.g()) {
               var item = tmp0_iterator.h();
               var fileName = item.s2();
               var src = item.t2();
-              tmp0_mapTo.b(async(this.k34_1, VOID, VOID, Manifest$Companion$parse$slambda$slambda$slambda_0(this.i34_1, fileName, this.j34_1, src, null)));
+              tmp0_mapTo.b(async(this.l34_1, VOID, VOID, Manifest$Companion$parse$slambda$slambda$slambda_0(this.j34_1, fileName, this.k34_1, src, null)));
             }
             suspendResult = awaitAll(tmp0_mapTo, this);
@@ -5165,7 +5228,7 @@
           case 1:
             var ARGUMENT = suspendResult;
             var ARGUMENT_0 = filterNotNull(ARGUMENT);
-            _set_pages__j2nojl(this.i34_1, ARGUMENT_0);
+            _set_pages__j2nojl(this.j34_1, ARGUMENT_0);
             return Unit_getInstance();
           case 2:
             throw this.be_1;
@@ -5182,8 +5245,8 @@
      while (true);
   };
   protoOf(Manifest$Companion$parse$slambda$slambda).x10 = function ($this$launch, completion) {
-    var i = new Manifest$Companion$parse$slambda$slambda(this.i34_1, this.j34_1, completion);
-    i.k34_1 = $this$launch;
+    var i = new Manifest$Companion$parse$slambda$slambda(this.j34_1, this.k34_1, completion);
+    i.l34_1 = $this$launch;
     return i;
   };
   function Manifest$Companion$parse$slambda$slambda_0($manifest, $parseFile, resultContinuation) {
@@ -5195,8 +5258,8 @@
     return l;
   }
   function Manifest$Companion$parse$slambda$slambda_1($manifest, $parseFile, resultContinuation) {
-    this.t34_1 = $manifest;
-    this.u34_1 = $parseFile;
+    this.u34_1 = $manifest;
+    this.v34_1 = $parseFile;
     CoroutineImpl.call(this, resultContinuation);
   }
   protoOf(Manifest$Companion$parse$slambda$slambda_1).w10 = function ($this$launch, $completion) {
@@ -5217,14 +5280,14 @@
           case 0:
             this.zd_1 = 2;
             this.yd_1 = 1;
-            var tmp1_map = this.t34_1.k2u_1;
+            var tmp1_map = this.u34_1.k2u_1;
             var tmp0_mapTo = ArrayList_init_$Create$_0(collectionSizeOrDefault(tmp1_map, 10));
             var tmp0_iterator = tmp1_map.f();
             while (tmp0_iterator.g()) {
               var item = tmp0_iterator.h();
               var id = item.s2();
               var src = item.t2();
-              tmp0_mapTo.b(async(this.v34_1, VOID, VOID, Manifest$Companion$parse$slambda$slambda$slambda_2(this.t34_1, id, this.u34_1, src, null)));
+              tmp0_mapTo.b(async(this.w34_1, VOID, VOID, Manifest$Companion$parse$slambda$slambda$slambda_2(this.u34_1, id, this.v34_1, src, null)));
             }
             suspendResult = awaitAll(tmp0_mapTo, this);
@@ -5240,11 +5303,11 @@
             var tmp0_iterator_0 = tmp3_associateBy.f();
             while (tmp0_iterator_0.g()) {
               var element = tmp0_iterator_0.h();
-              tmp2_associateByTo.u2(element.x34_1, element);
+              tmp2_associateByTo.u2(element.y34_1, element);
             }
             var ARGUMENT = tmp2_associateByTo;
-            _set_tips__9ug36n(this.t34_1, ARGUMENT);
+            _set_tips__9ug36n(this.u34_1, ARGUMENT);
             return Unit_getInstance();
           case 2:
             throw this.be_1;
@@ -5261,8 +5324,8 @@
      while (true);
   };
   protoOf(Manifest$Companion$parse$slambda$slambda_1).x10 = function ($this$launch, completion) {
-    var i = new Manifest$Companion$parse$slambda$slambda_1(this.t34_1, this.u34_1, completion);
-    i.v34_1 = $this$launch;
+    var i = new Manifest$Companion$parse$slambda$slambda_1(this.u34_1, this.v34_1, completion);
+    i.w34_1 = $this$launch;
     return i;
   };
   function Manifest$Companion$parse$slambda$slambda_2($manifest, $parseFile, resultContinuation) {
@@ -5274,19 +5337,19 @@
     return l;
   }
   function Manifest$Companion$parse$slambda($config, $manifest, $parseFile, resultContinuation) {
-    this.i35_1 = $config;
-    this.j35_1 = $manifest;
-    this.k35_1 = $parseFile;
+    this.j35_1 = $config;
+    this.k35_1 = $manifest;
+    this.l35_1 = $parseFile;
     CoroutineImpl.call(this, resultContinuation);
   }
-  protoOf(Manifest$Companion$parse$slambda).m35 = function ($this$coroutineScope, $completion) {
+  protoOf(Manifest$Companion$parse$slambda).n35 = function ($this$coroutineScope, $completion) {
     var tmp = this.x10($this$coroutineScope, $completion);
     tmp.ae_1 = Unit_getInstance();
     tmp.be_1 = null;
     return tmp.re();
   };
   protoOf(Manifest$Companion$parse$slambda).ff = function (p1, $completion) {
-    return this.m35((!(p1 == null) ? isInterface(p1, CoroutineScope) : false) ? p1 : THROW_CCE(), $completion);
+    return this.n35((!(p1 == null) ? isInterface(p1, CoroutineScope) : false) ? p1 : THROW_CCE(), $completion);
   };
   protoOf(Manifest$Companion$parse$slambda).re = function () {
     var suspendResult = this.ae_1;
@@ -5295,16 +5358,16 @@
         var tmp = this.yd_1;
         if (tmp === 0) {
           this.zd_1 = 1;
-          if (this.i35_1.k2q_1) {
-            launch(this.l35_1, VOID, VOID, Manifest$Companion$parse$slambda$slambda_0(this.j35_1, this.k35_1, null));
+          if (this.j35_1.k2q_1) {
+            launch(this.m35_1, VOID, VOID, Manifest$Companion$parse$slambda$slambda_0(this.k35_1, this.l35_1, null));
           } else {
-            _set_pages__j2nojl(this.j35_1, emptyList());
+            _set_pages__j2nojl(this.k35_1, emptyList());
           }
           var tmp_0;
-          if (this.i35_1.l2q_1) {
-            tmp_0 = launch(this.l35_1, VOID, VOID, Manifest$Companion$parse$slambda$slambda_2(this.j35_1, this.k35_1, null));
+          if (this.j35_1.l2q_1) {
+            tmp_0 = launch(this.m35_1, VOID, VOID, Manifest$Companion$parse$slambda$slambda_2(this.k35_1, this.l35_1, null));
           } else {
-            _set_tips__9ug36n(this.j35_1, emptyMap());
+            _set_tips__9ug36n(this.k35_1, emptyMap());
             tmp_0 = Unit_getInstance();
           }
           return tmp_0;
@@ -5318,24 +5381,24 @@
      while (true);
   };
   protoOf(Manifest$Companion$parse$slambda).x10 = function ($this$coroutineScope, completion) {
-    var i = new Manifest$Companion$parse$slambda(this.i35_1, this.j35_1, this.k35_1, completion);
-    i.l35_1 = $this$coroutineScope;
+    var i = new Manifest$Companion$parse$slambda(this.j35_1, this.k35_1, this.l35_1, completion);
+    i.m35_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.m35($this$coroutineScope, $completion);
+      return i.n35($this$coroutineScope, $completion);
     };
     l.$arity = 1;
     return l;
   }
   function $parseCOROUTINE$0(_this__u8e3s4, fileName, config, parseFile, resultContinuation) {
     CoroutineImpl.call(this, resultContinuation);
-    this.v35_1 = _this__u8e3s4;
-    this.w35_1 = fileName;
-    this.x35_1 = config;
-    this.y35_1 = parseFile;
+    this.w35_1 = _this__u8e3s4;
+    this.x35_1 = fileName;
+    this.y35_1 = config;
+    this.z35_1 = parseFile;
   }
   protoOf($parseCOROUTINE$0).re = function () {
     var suspendResult = this.ae_1;
@@ -5346,17 +5409,17 @@
           case 0:
             this.zd_1 = 3;
             this.yd_1 = 1;
-            suspendResult = this.y35_1(this.w35_1, this);
+            suspendResult = this.z35_1(this.x35_1, this);
             if (suspendResult === get_COROUTINE_SUSPENDED()) {
               return suspendResult;
             }
             continue $sm;
           case 1:
-            this.z35_1 = suspendResult;
-            this.a36_1 = Manifest_init_$Create$(this.z35_1, this.x35_1);
+            this.a36_1 = suspendResult;
+            this.b36_1 = Manifest_init_$Create$(this.a36_1, this.y35_1);
             this.yd_1 = 2;
-            suspendResult = coroutineScope(Manifest$Companion$parse$slambda_0(this.x35_1, this.a36_1, this.y35_1, null), this);
+            suspendResult = coroutineScope(Manifest$Companion$parse$slambda_0(this.y35_1, this.b36_1, this.z35_1, null), this);
             if (suspendResult === get_COROUTINE_SUSPENDED()) {
               return suspendResult;
             }
@@ -5364,7 +5427,7 @@
             continue $sm;
           case 2:
             ;
-            return this.a36_1;
+            return this.b36_1;
           case 3:
             throw this.be_1;
         }
@@ -5386,9 +5449,9 @@
   var Type_UNKNOWN_instance_0;
   function Companion_25() {
     Companion_instance_25 = this;
-    this.b36_1 = Type_TRACT_getInstance();
+    this.c36_1 = Type_TRACT_getInstance();
   }
-  protoOf(Companion_25).c36 = function (value) {
+  protoOf(Companion_25).d36 = function (value) {
     var tmp0_subject = value;
     switch (tmp0_subject) {
       case 'article':
@@ -5412,10 +5475,10 @@
       new Companion_25();
     return Companion_instance_25;
   }
-  function values_5() {
+  function values_7() {
     return [Type_ARTICLE_getInstance(), Type_CYOA_getInstance(), Type_LESSON_getInstance(), Type_TRACT_getInstance(), Type_UNKNOWN_getInstance_0()];
   }
-  function valueOf_4(value) {
+  function valueOf_6(value) {
     switch (value) {
       case 'ARTICLE':
         return Type_ARTICLE_getInstance();
@@ -5484,10 +5547,10 @@
     return Companion_instance_26;
   }
   function _set_pages__j2nojl($this, _set____db54di) {
-    return $this.g2u_1.d36($this, pages$factory(), _set____db54di);
+    return $this.g2u_1.e36($this, pages$factory(), _set____db54di);
   }
   function _set_tips__9ug36n($this, _set____db54di) {
-    return $this.i2u_1.d36($this, tips$factory(), _set____db54di);
+    return $this.i2u_1.e36($this, tips$factory(), _set____db54di);
   }
   function Manifest_init_$Init$(parser, config, $this) {
     BaseModel.call($this);
@@ -5500,8 +5563,8 @@
     var tmp0_safe_receiver = parser.n2t('locale');
     tmp.locale = tmp0_safe_receiver == null ? null : toLocaleOrNull(tmp0_safe_receiver);
     var tmp_0 = $this;
-    var tmp1_elvis_lhs = Companion_getInstance_28().c36(parser.n2t('type'));
-    tmp_0.type = tmp1_elvis_lhs == null ? Companion_getInstance_28().b36_1 : tmp1_elvis_lhs;
+    var tmp1_elvis_lhs = Companion_getInstance_28().d36(parser.n2t('type'));
+    tmp_0.type = tmp1_elvis_lhs == null ? Companion_getInstance_28().c36_1 : tmp1_elvis_lhs;
     var tmp_1 = $this;
     var tmp$ret$0;
     // Inline function 'org.cru.godtools.shared.tool.parser.model.toEventIds' call
@@ -5529,11 +5592,11 @@
     $this.v2t_1 = parser.i2v(null, get_XML_BACKGROUND_IMAGE());
     var tmp_7 = $this;
     var tmp10_safe_receiver = parser.n2t(get_XML_BACKGROUND_IMAGE_GRAVITY());
-    var tmp11_elvis_lhs = tmp10_safe_receiver == null ? null : Companion_getInstance_22().g2x(tmp10_safe_receiver);
+    var tmp11_elvis_lhs = tmp10_safe_receiver == null ? null : Companion_getInstance_22().a2x(tmp10_safe_receiver);
     tmp_7.w2t_1 = tmp11_elvis_lhs == null ? Companion_getInstance_29().c2q_1 : tmp11_elvis_lhs;
     var tmp_8 = $this;
     var tmp12_safe_receiver = parser.n2t(get_XML_BACKGROUND_IMAGE_SCALE_TYPE());
-    var tmp13_elvis_lhs = tmp12_safe_receiver == null ? null : Companion_getInstance_24().n31(tmp12_safe_receiver);
+    var tmp13_elvis_lhs = tmp12_safe_receiver == null ? null : Companion_getInstance_24().o31(tmp12_safe_receiver);
     tmp_8.x2t_1 = tmp13_elvis_lhs == null ? Companion_getInstance_29().d2q_1 : tmp13_elvis_lhs;
     var tmp_9 = $this;
     var tmp_10 = get_XMLNS_CONTENT();
@@ -5656,13 +5719,13 @@
             var tmp3_this = $this;
             // Inline function 'kotlin.collections.plusAssign' call
             var tmp2_plusAssign = tmp3_this.aemImports;
-            var tmp3_plusAssign = result.g36_1;
+            var tmp3_plusAssign = result.h36_1;
             addAll(tmp2_plusAssign, tmp3_plusAssign);
             var tmp4_this = $this;
             // Inline function 'kotlin.collections.plusAssign' call
             var tmp4_plusAssign = tmp4_this.j2u_1;
-            var tmp5_plusAssign = result.h36_1;
+            var tmp5_plusAssign = result.i36_1;
             addAll(tmp4_plusAssign, tmp5_plusAssign);
             break;
@@ -5705,7 +5768,7 @@
         Companion_getInstance_49();
         if (tmp7_subject === 'items') {
           // Inline function 'kotlin.collections.plusAssign' call
-          var tmp12_plusAssign = Companion_getInstance_49().f36(parser, $this);
+          var tmp12_plusAssign = Companion_getInstance_49().g36(parser, $this);
           addAll(shareables, tmp12_plusAssign);
         }
       }
@@ -5749,7 +5812,7 @@
   }
   function Manifest_init_$Init$_0(config, type, code, locale, primaryColor, primaryTextColor, navBarColor, navBarControlColor, backgroundColor, cardBackgroundColor, categoryLabelColor, pageControlColor, multiselectOptionBackgroundColor, multiselectOptionSelectedColor, textColor, textScale, resources, shareables, tips, pages, $this) {
     config = config === VOID ? createParserConfig() : config;
-    type = type === VOID ? Companion_getInstance_28().b36_1 : type;
+    type = type === VOID ? Companion_getInstance_28().c36_1 : type;
     code = code === VOID ? null : code;
     locale = locale === VOID ? null : locale;
     primaryColor = primaryColor === VOID ? Companion_getInstance_29().z2p_1 : primaryColor;
@@ -5865,7 +5928,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.x34_1;
+        tmp$ret$6 = element_0.y34_1;
         tmp4_associateByTo.u2(tmp$ret$6, element_0);
       }
       tmp$ret$7 = tmp4_associateByTo;
@@ -5932,12 +5995,12 @@
     var tmp$ret$0;
     // Inline function 'kotlin.collections.mutableListOf' call
     tmp$ret$0 = ArrayList_init_$Create$();
-    tmp.g36_1 = tmp$ret$0;
+    tmp.h36_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.h36_1 = tmp$ret$1;
+    tmp_0.i36_1 = tmp$ret$1;
   }
   function parsePages(_this__u8e3s4, $this) {
     var tmp$ret$4;
@@ -5977,7 +6040,7 @@
             var fileName = _this__u8e3s4.n2t('filename');
             var tmp3_this = tmp0_also;
             // Inline function 'kotlin.collections.plusAssign' call
-            var tmp0_plusAssign = tmp3_this.h36_1;
+            var tmp0_plusAssign = tmp3_this.i36_1;
             var tmp1_plusAssign = to(fileName, src);
             tmp0_plusAssign.b(tmp1_plusAssign);
           }
@@ -6012,7 +6075,7 @@
               // Inline function 'kotlin.let' call
               // Inline function 'kotlin.contracts.contract' call
               var tmp0_this = tmp0_also;
-              var tmp0_plusAssign_0 = tmp0_this.g36_1;
+              var tmp0_plusAssign_0 = tmp0_this.h36_1;
               tmp0_plusAssign_0.b(tmp6_safe_receiver);
               tmp$ret$3 = Unit_getInstance();
             }
@@ -6140,10 +6203,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.o36_1 = function_0;
+    this.p36_1 = function_0;
   }
   protoOf(sam$kotlin_Comparator$0).wc = function (a, b) {
-    return this.o36_1(a, b);
+    return this.p36_1(a, b);
   };
   protoOf(sam$kotlin_Comparator$0).compare = function (a, b) {
     return this.wc(a, b);
@@ -6153,11 +6216,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.l36_1;
+    tmp$ret$0 = a.m36_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.l36_1;
+    tmp$ret$1 = b.m36_1;
     tmp$ret$2 = compareValues(tmp, tmp$ret$1);
     return tmp$ret$2;
   }
@@ -6181,36 +6244,36 @@
     Type_initEntries_1();
     return Type_UNKNOWN_instance_0;
   }
-  protoOf(Manifest).p36 = function () {
+  protoOf(Manifest).q36 = function () {
     return this.p2t_1;
   };
-  protoOf(Manifest).q36 = function () {
+  protoOf(Manifest).r36 = function () {
     return this.code;
   };
-  protoOf(Manifest).r36 = function () {
+  protoOf(Manifest).s36 = function () {
     return this.locale;
   };
   protoOf(Manifest).h1c = function () {
     return this.type;
   };
-  protoOf(Manifest).s36 = function () {
+  protoOf(Manifest).t36 = function () {
     return this._dismissListeners;
   };
-  protoOf(Manifest).g2y = function () {
+  protoOf(Manifest).i2y = function () {
     return this.q2t_1;
   };
-  protoOf(Manifest).h2y = function () {
+  protoOf(Manifest).j2y = function () {
     return this.r2t_1;
   };
-  protoOf(Manifest).t36 = function () {
+  protoOf(Manifest).u36 = function () {
     var tmp0_elvis_lhs = this.s2t_1;
     return tmp0_elvis_lhs == null ? this.type.equals(Type_LESSON_getInstance()) ? get_DEFAULT_LESSON_NAV_BAR_COLOR() : this.q2t_1 : tmp0_elvis_lhs;
   };
-  protoOf(Manifest).u36 = function () {
+  protoOf(Manifest).v36 = function () {
     var tmp0_elvis_lhs = this.t2t_1;
     return tmp0_elvis_lhs == null ? this.type.equals(Type_LESSON_getInstance()) ? this.q2t_1 : this.r2t_1 : tmp0_elvis_lhs;
   };
-  protoOf(Manifest).v36 = function () {
+  protoOf(Manifest).h2x = function () {
     return this.u2t_1;
   };
   protoOf(Manifest).w36 = function () {
@@ -6222,31 +6285,31 @@
   protoOf(Manifest).y36 = function () {
     return this.x2t_1;
   };
-  protoOf(Manifest).j2y = function () {
+  protoOf(Manifest).l2y = function () {
     var tmp0_elvis_lhs = this.y2t_1;
     return tmp0_elvis_lhs == null ? this.u2t_1 : tmp0_elvis_lhs;
   };
-  protoOf(Manifest).f2y = function () {
+  protoOf(Manifest).h2y = function () {
     var tmp0_elvis_lhs = this.z2t_1;
     return tmp0_elvis_lhs == null ? this.d2u_1 : tmp0_elvis_lhs;
   };
   protoOf(Manifest).z36 = function () {
     return this.a2u_1;
   };
-  protoOf(Manifest).i2y = function () {
+  protoOf(Manifest).k2y = function () {
     return Companion_getInstance_29().e2q_1;
   };
-  protoOf(Manifest).k2y = function () {
+  protoOf(Manifest).m2y = function () {
     var tmp0_elvis_lhs = this.b2u_1;
     return tmp0_elvis_lhs == null ? get_multiselectOptionBackgroundColor.call(this) : tmp0_elvis_lhs;
   };
-  protoOf(Manifest).l2y = function () {
+  protoOf(Manifest).n2y = function () {
     return this.c2u_1;
   };
-  protoOf(Manifest).e2y = function () {
+  protoOf(Manifest).g2y = function () {
     return this.d2u_1;
   };
-  protoOf(Manifest).m2y = function () {
+  protoOf(Manifest).o2y = function () {
     return this.e2u_1;
   };
   protoOf(Manifest).a37 = function () {
@@ -6402,7 +6465,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.a2y_1 == category;
+        tmp$ret$0 = element.c2y_1 == category;
         if (tmp$ret$0) {
           tmp$ret$1 = element;
           break $l$block;
@@ -7369,39 +7432,39 @@
   }
   function Styles() {
   }
-  function get_primaryColor_0(_this__u8e3s4) {
+  function get_buttonStyle_0(_this__u8e3s4) {
     var tmp0_safe_receiver = _this__u8e3s4;
-    var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.g2y();
-    return tmp1_elvis_lhs == null ? Companion_getInstance_29().z2p_1 : tmp1_elvis_lhs;
+    var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.k2y();
+    return tmp1_elvis_lhs == null ? Companion_getInstance_29().e2q_1 : tmp1_elvis_lhs;
   }
-  function get_multiselectOptionBackgroundColor_0(_this__u8e3s4) {
+  function get_primaryColor_0(_this__u8e3s4) {
     var tmp0_safe_receiver = _this__u8e3s4;
-    var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.k2y();
-    return tmp1_elvis_lhs == null ? get_backgroundColor(get_manifest(_this__u8e3s4)) : tmp1_elvis_lhs;
+    var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.i2y();
+    return tmp1_elvis_lhs == null ? Companion_getInstance_29().z2p_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.h2y();
+    var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.j2y();
     return tmp1_elvis_lhs == null ? Companion_getInstance_29().a2q_1 : tmp1_elvis_lhs;
   }
-  function get_buttonStyle_0(_this__u8e3s4) {
+  function get_multiselectOptionBackgroundColor_0(_this__u8e3s4) {
     var tmp0_safe_receiver = _this__u8e3s4;
-    var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.i2y();
-    return tmp1_elvis_lhs == null ? Companion_getInstance_29().e2q_1 : tmp1_elvis_lhs;
+    var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.m2y();
+    return tmp1_elvis_lhs == null ? get_backgroundColor(get_manifest(_this__u8e3s4)) : 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.j2y();
+    var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.l2y();
     return tmp1_elvis_lhs == null ? Companion_getInstance_29().b2q_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.e2y();
+    var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.g2y();
     return tmp1_elvis_lhs == null ? Companion_getInstance_29().f2q_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.m2y();
+    var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.o2y();
     var tmp;
     if (tmp1_elvis_lhs == null) {
       Companion_getInstance_37();
@@ -7413,7 +7476,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.n2y();
+    var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.p2y();
     return tmp1_elvis_lhs == null ? Companion_getInstance_37().k3a_1 : tmp1_elvis_lhs;
   }
   function stylesOverride(_this__u8e3s4, textAlign, textColor, textScale) {
@@ -7435,17 +7498,17 @@
     this.o3a_1 = _textColor;
     this.p3a_1 = _textScale;
   }
-  protoOf(StylesOverride).n2y = function () {
+  protoOf(StylesOverride).p2y = function () {
     var tmp0_safe_receiver = this.n3a_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).e2y = function () {
+  protoOf(StylesOverride).g2y = function () {
     var tmp0_safe_receiver = this.o3a_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).m2y = function () {
+  protoOf(StylesOverride).o2y = function () {
     return get_textScale.call(this) * this.p3a_1;
   };
   function Tab_init_$Init$(parent, parser, $this) {
@@ -7750,10 +7813,10 @@
       new Companion_36();
     return Companion_instance_36;
   }
-  function values_6() {
+  function values_8() {
     return [Align_START_getInstance(), Align_CENTER_getInstance(), Align_END_getInstance()];
   }
-  function valueOf_5(value) {
+  function valueOf_7(value) {
     switch (value) {
       case 'START':
         return Align_START_getInstance();
@@ -7833,10 +7896,10 @@
       new Companion_37();
     return Companion_instance_37;
   }
-  function values_7() {
+  function values_9() {
     return [Style_BOLD_getInstance(), Style_ITALIC_getInstance(), Style_UNDERLINE_getInstance()];
   }
-  function valueOf_6(value) {
+  function valueOf_8(value) {
     switch (value) {
       case 'BOLD':
         return Style_BOLD_getInstance();
@@ -8041,15 +8104,15 @@
   protoOf(Text).z1c = function () {
     return this.text;
   };
-  protoOf(Text).n2y = function () {
+  protoOf(Text).p2y = function () {
     var tmp0_elvis_lhs = this.j37_1;
     return tmp0_elvis_lhs == null ? get_textAlign_0(this.z2s()) : tmp0_elvis_lhs;
   };
-  protoOf(Text).e2y = function () {
+  protoOf(Text).g2y = function () {
     var tmp0_elvis_lhs = this.k37_1;
     return tmp0_elvis_lhs == null ? get_textColor_0(this.z2s()) : tmp0_elvis_lhs;
   };
-  protoOf(Text).m2y = function () {
+  protoOf(Text).o2y = function () {
     return this.l37_1 * get_textScale_0(this.z2s());
   };
   protoOf(Text).q3b = function () {
@@ -8086,9 +8149,9 @@
   function Text() {
     Companion_getInstance_41();
   }
-  defineProp(protoOf(Text), 'textAlign', protoOf(Text).n2y);
-  defineProp(protoOf(Text), 'textColor', protoOf(Text).e2y);
-  defineProp(protoOf(Text), 'textScale', protoOf(Text).m2y);
+  defineProp(protoOf(Text), 'textAlign', protoOf(Text).p2y);
+  defineProp(protoOf(Text), 'textColor', protoOf(Text).g2y);
+  defineProp(protoOf(Text), 'textScale', protoOf(Text).o2y);
   defineProp(protoOf(Text), 'startImage', protoOf(Text).t3b);
   defineProp(protoOf(Text), 'endImage', protoOf(Text).w3b);
   defineProp(protoOf(Text), 'textStyles', protoOf(Text).y3b);
@@ -8228,7 +8291,7 @@
     }
     return tmp;
   };
-  protoOf(Companion_39).q2y = function (_this__u8e3s4) {
+  protoOf(Companion_39).s2y = function (_this__u8e3s4) {
     var tmp;
     try {
       tmp = this.d2r(_this__u8e3s4);
@@ -8339,7 +8402,7 @@
     Companion_instance_40 = this;
     this.b3c_1 = Provider_UNKNOWN_getInstance();
   }
-  protoOf(Companion_40).c36 = function (value) {
+  protoOf(Companion_40).d36 = function (value) {
     var tmp0_subject = value;
     return tmp0_subject === 'youtube' ? Provider_YOUTUBE_getInstance() : null;
   };
@@ -8350,10 +8413,10 @@
       new Companion_40();
     return Companion_instance_40;
   }
-  function values_8() {
+  function values_10() {
     return [Provider_YOUTUBE_getInstance(), Provider_UNKNOWN_getInstance()];
   }
-  function valueOf_7(value) {
+  function valueOf_9(value) {
     switch (value) {
       case 'YOUTUBE':
         return Provider_YOUTUBE_getInstance();
@@ -8400,18 +8463,18 @@
     Companion_getInstance_44();
     parser.t2r(2, tmp, 'video');
     var tmp_0 = $this;
-    var tmp0_elvis_lhs = Companion_getInstance_43().c36(parser.n2t('provider'));
+    var tmp0_elvis_lhs = Companion_getInstance_43().d36(parser.n2t('provider'));
     tmp_0.provider = tmp0_elvis_lhs == null ? Companion_getInstance_43().b3c_1 : tmp0_elvis_lhs;
     $this.videoId = parser.n2t('video-id');
     var tmp_1 = $this;
     var tmp1_elvis_lhs = Companion_getInstance_8().w2v(parser.n2t('aspect-ratio'));
     tmp_1.aspectRatio = tmp1_elvis_lhs == null ? Companion_getInstance_44().d3c_1 : tmp1_elvis_lhs;
     var tmp_2 = $this;
-    var tmp2_safe_receiver = Companion_getInstance_22().g2x(parser.n2t('gravity'));
+    var tmp2_safe_receiver = Companion_getInstance_22().a2x(parser.n2t('gravity'));
     var tmp3_elvis_lhs = tmp2_safe_receiver == null ? null : tmp2_safe_receiver.horizontal;
     tmp_2.gravity = tmp3_elvis_lhs == null ? Companion_getInstance_44().e3c_1 : tmp3_elvis_lhs;
     var tmp_3 = $this;
-    var tmp4_safe_receiver = Companion_getInstance_16().h2x(parser.n2t('width'));
+    var tmp4_safe_receiver = Companion_getInstance_16().b2x(parser.n2t('width'));
     var tmp_4;
     if (tmp4_safe_receiver == null) {
       tmp_4 = null;
@@ -8456,7 +8519,7 @@
   protoOf(Video).s3c = function () {
     return this.aspectRatio;
   };
-  protoOf(Video).m31 = function () {
+  protoOf(Video).f2x = function () {
     return this.gravity;
   };
   protoOf(Video).x2v = function () {
@@ -8645,13 +8708,13 @@
   function LessonPage_init_$Create$(manifest, fileName, parser) {
     return LessonPage_init_$Init$(manifest, fileName, parser, objectCreate(protoOf(LessonPage)));
   }
-  protoOf(LessonPage).n3d = function () {
+  protoOf(LessonPage).l2x = function () {
     return this.l3d_1;
   };
   protoOf(LessonPage).s2s = function () {
     return this.m3d_1;
   };
-  protoOf(LessonPage).o3d = function (type) {
+  protoOf(LessonPage).n3d = function (type) {
     return type.equals(Type_LESSON_getInstance());
   };
   function LessonPage() {
@@ -8664,9 +8727,9 @@
   });
   function Companion_42() {
     Companion_instance_42 = this;
-    this.p3e_1 = 'card';
-    this.q3e_1 = 'id';
-    this.r3e_1 = 'content';
+    this.o3e_1 = 'card';
+    this.p3e_1 = 'id';
+    this.q3e_1 = 'content';
   }
   var Companion_instance_42;
   function Companion_getInstance_45() {
@@ -8677,27 +8740,27 @@
   function Card_init_$Init$_0(page, parser, $this) {
     BaseModel.call($this, page);
     Card_0.call($this);
-    $this.t3e_1 = page;
+    $this.s3e_1 = page;
     Companion_getInstance_59();
     var tmp = get_XMLNS_PAGE();
     Companion_getInstance_45();
     parser.t2r(2, tmp, 'card');
     var tmp_0 = $this;
     Companion_getInstance_45();
-    tmp_0.u3e_1 = parser.n2t('id');
+    tmp_0.t3e_1 = parser.n2t('id');
     var tmp_1 = $this;
     var tmp0_safe_receiver = parser.n2t(get_XML_BACKGROUND_COLOR());
-    tmp_1.v3e_1 = tmp0_safe_receiver == null ? null : toColorOrNull(tmp0_safe_receiver);
+    tmp_1.u3e_1 = tmp0_safe_receiver == null ? null : toColorOrNull(tmp0_safe_receiver);
     var tmp_2 = $this;
     var tmp$ret$0;
     // Inline function 'kotlin.collections.mutableListOf' call
     tmp$ret$0 = ArrayList_init_$Create$();
-    tmp_2.w3e_1 = tmp$ret$0;
+    tmp_2.v3e_1 = tmp$ret$0;
     var tmp_3 = $this;
     var tmp$ret$1;
     // Inline function 'kotlin.collections.mutableListOf' call
     tmp$ret$1 = ArrayList_init_$Create$();
-    tmp_3.x3e_1 = tmp$ret$1;
+    tmp_3.w3e_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();
@@ -8717,7 +8780,7 @@
         if (tmp1_subject === 'events') {
           var tmp2_this = $this;
           // Inline function 'kotlin.collections.plusAssign' call
-          var tmp0_plusAssign = tmp2_this.w3e_1;
+          var tmp0_plusAssign = tmp2_this.v3e_1;
           var tmp1_plusAssign = Companion_getInstance_6().x2r(parser, $this);
           addAll(tmp0_plusAssign, tmp1_plusAssign);
         }
@@ -8727,7 +8790,7 @@
         if (tmp3_subject === 'content') {
           var tmp4_this = $this;
           // Inline function 'kotlin.collections.plusAssign' call
-          var tmp3_plusAssign = tmp4_this.x3e_1;
+          var tmp3_plusAssign = tmp4_this.w3e_1;
           var tmp$ret$10;
           // Inline function 'org.cru.godtools.shared.tool.parser.model.parseContent' call
           var tmp$ret$9;
@@ -8823,7 +8886,7 @@
   }
   function Companion_43() {
     Companion_instance_43 = this;
-    this.y3e_1 = 'cardcollection';
+    this.x3e_1 = 'cardcollection';
   }
   var Companion_instance_43;
   function Companion_getInstance_46() {
@@ -8840,17 +8903,17 @@
     parser.t2r(2, tmp, 'page');
     var tmp_0 = Companion_getInstance_48();
     Companion_getInstance_46();
-    tmp_0.z3e(parser, 'cardcollection');
+    tmp_0.y3e(parser, 'cardcollection');
     var tmp_1 = $this;
     var tmp$ret$0;
     // Inline function 'kotlin.collections.mutableListOf' call
     tmp$ret$0 = ArrayList_init_$Create$();
-    tmp_1.s3f_1 = tmp$ret$0;
+    tmp_1.r3f_1 = tmp$ret$0;
     var tmp_2 = $this;
     var tmp$ret$1;
     // Inline function 'kotlin.collections.mutableListOf' call
     tmp$ret$1 = ArrayList_init_$Create$();
-    tmp_2.t3f_1 = tmp$ret$1;
+    tmp_2.s3f_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();
@@ -8870,7 +8933,7 @@
         if (tmp1_subject === 'events') {
           var tmp2_this = $this;
           // Inline function 'kotlin.collections.plusAssign' call
-          var tmp0_plusAssign = tmp2_this.s3f_1;
+          var tmp0_plusAssign = tmp2_this.r3f_1;
           var tmp1_plusAssign = Companion_getInstance_6().x2r(parser, $this);
           addAll(tmp0_plusAssign, tmp1_plusAssign);
         }
@@ -8879,7 +8942,7 @@
         if (tmp3_subject === 'cards') {
           var tmp4_this = $this;
           // Inline function 'kotlin.collections.plusAssign' call
-          var tmp2_plusAssign = tmp4_this.t3f_1;
+          var tmp2_plusAssign = tmp4_this.s3f_1;
           var tmp3_plusAssign = parseCards($this, parser);
           addAll(tmp2_plusAssign, tmp3_plusAssign);
         }
@@ -8941,7 +9004,7 @@
     return tmp$ret$2;
   }
   protoOf(Card_0).s2s = function () {
-    return this.x3e_1;
+    return this.w3e_1;
   };
   protoOf(Card_0)._getAnalyticsEvents = function (type) {
     var tmp0_subject = type;
@@ -8951,7 +9014,7 @@
       case 1:
         var tmp$ret$2;
         // Inline function 'kotlin.collections.filter' call
-        var tmp1_filter = this.w3e_1;
+        var tmp1_filter = this.v3e_1;
         var tmp$ret$1;
         // Inline function 'kotlin.collections.filterTo' call
         var tmp0_filterTo = ArrayList_init_$Create$();
@@ -8973,7 +9036,7 @@
       case 2:
         var tmp$ret$5;
         // Inline function 'kotlin.collections.filter' call
-        var tmp3_filter = this.w3e_1;
+        var tmp3_filter = this.v3e_1;
         var tmp$ret$4;
         // Inline function 'kotlin.collections.filterTo' call
         var tmp2_filterTo = ArrayList_init_$Create$();
@@ -9007,10 +9070,10 @@
   defineProp(protoOf(Card_0), 'content', function () {
     return this.a2t();
   });
-  protoOf(CardCollectionPage).n3d = function () {
-    return this.s3f_1;
+  protoOf(CardCollectionPage).l2x = function () {
+    return this.r3f_1;
   };
-  protoOf(CardCollectionPage).o3d = function (type) {
+  protoOf(CardCollectionPage).n3d = function (type) {
     return type.equals(Type_CYOA_getInstance());
   };
   function CardCollectionPage() {
@@ -9046,7 +9109,7 @@
   }
   function Companion_44() {
     Companion_instance_44 = this;
-    this.u3f_1 = 'content';
+    this.t3f_1 = 'content';
   }
   var Companion_instance_44;
   function Companion_getInstance_47() {
@@ -9063,17 +9126,17 @@
     parser.t2r(2, tmp, 'page');
     var tmp_0 = Companion_getInstance_48();
     Companion_getInstance_47();
-    tmp_0.z3e(parser, 'content');
+    tmp_0.y3e(parser, 'content');
     var tmp_1 = $this;
     var tmp$ret$0;
     // Inline function 'kotlin.collections.mutableListOf' call
     tmp$ret$0 = ArrayList_init_$Create$();
-    tmp_1.n3g_1 = tmp$ret$0;
+    tmp_1.m3g_1 = tmp$ret$0;
     var tmp_2 = $this;
     var tmp$ret$1;
     // Inline function 'kotlin.collections.mutableListOf' call
     tmp$ret$1 = ArrayList_init_$Create$();
-    tmp_2.o3g_1 = tmp$ret$1;
+    tmp_2.n3g_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();
@@ -9093,7 +9156,7 @@
         if (tmp1_subject === 'events') {
           var tmp2_this = $this;
           // Inline function 'kotlin.collections.plusAssign' call
-          var tmp0_plusAssign = tmp2_this.n3g_1;
+          var tmp0_plusAssign = tmp2_this.m3g_1;
           var tmp1_plusAssign = Companion_getInstance_6().x2r(parser, $this);
           addAll(tmp0_plusAssign, tmp1_plusAssign);
         }
@@ -9102,7 +9165,7 @@
         if (tmp3_subject === 'content') {
           var tmp4_this = $this;
           // Inline function 'kotlin.collections.plusAssign' call
-          var tmp3_plusAssign = tmp4_this.o3g_1;
+          var tmp3_plusAssign = tmp4_this.n3g_1;
           var tmp$ret$10;
           // Inline function 'org.cru.godtools.shared.tool.parser.model.parseContent' call
           var tmp$ret$9;
@@ -9196,13 +9259,13 @@
   function ContentPage_init_$Create$(manifest, fileName, parser) {
     return ContentPage_init_$Init$(manifest, fileName, parser, objectCreate(protoOf(ContentPage)));
   }
-  protoOf(ContentPage).n3d = function () {
-    return this.n3g_1;
+  protoOf(ContentPage).l2x = function () {
+    return this.m3g_1;
   };
   protoOf(ContentPage).s2s = function () {
-    return this.o3g_1;
+    return this.n3g_1;
   };
-  protoOf(ContentPage).o3d = function (type) {
+  protoOf(ContentPage).n3d = function (type) {
     return type.equals(Type_CYOA_getInstance());
   };
   function ContentPage() {
@@ -9216,16 +9279,16 @@
   });
   function Companion_45() {
     Companion_instance_45 = this;
-    this.h33_1 = 'page';
+    this.i33_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().h2j(0 / 255.0, 0 / 255.0, 0 / 255.0, 0.0));
-    tmp.i33_1 = tmp$ret$0;
-    this.j33_1 = Companion_getInstance_22().CENTER;
-    this.k33_1 = ImageScaleType_FILL_X_getInstance();
+    tmp.j33_1 = tmp$ret$0;
+    this.k33_1 = Companion_getInstance_22().CENTER;
+    this.l33_1 = ImageScaleType_FILL_X_getInstance();
   }
-  protoOf(Companion_45).l33 = function (manifest, fileName, parser) {
+  protoOf(Companion_45).m33 = function (manifest, fileName, parser) {
     Companion_getInstance_59();
     parser.t2r(2, null, 'page');
     var tmp0_subject = parser.v2r();
@@ -9267,7 +9330,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.o3d(manifest.type);
+      tmp$ret$0 = tmp1_safe_receiver.n3d(manifest.type);
       if (tmp$ret$0) {
         tmp_2 = tmp1_safe_receiver;
       } else {
@@ -9278,7 +9341,7 @@
     }
     return tmp_1;
   };
-  protoOf(Companion_45).z3e = function (_this__u8e3s4, type) {
+  protoOf(Companion_45).y3e = function (_this__u8e3s4, type) {
     var actual = _this__u8e3s4.i2v(get_XMLNS_XSI(), 'type');
     if (!(type === actual))
       throw new XmlPullParserException('expected ' + type + ' not ' + actual);
@@ -9295,9 +9358,9 @@
     Companion_getInstance_59();
     Companion_getInstance_48();
     parser.t2r(2, null, 'page');
-    $this.s3d_1 = parser.n2t('id');
-    $this.t3d_1 = fileName;
-    $this.u3d_1 = parser.i2v(get_XMLNS_CYOA(), 'parent');
+    $this.r3d_1 = parser.n2t('id');
+    $this.s3d_1 = fileName;
+    $this.t3d_1 = parser.i2v(get_XMLNS_CYOA(), 'parent');
     var tmp = $this;
     var tmp0_safe_receiver = parser.n2t('hidden');
     var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : toBoolean(tmp0_safe_receiver);
@@ -9316,44 +9379,44 @@
     tmp_1._dismissListeners = toSet_0(tmp$ret$1);
     var tmp_2 = $this;
     var tmp2_safe_receiver = parser.n2t(get_XML_PRIMARY_COLOR());
-    tmp_2.v3d_1 = tmp2_safe_receiver == null ? null : toColorOrNull(tmp2_safe_receiver);
+    tmp_2.u3d_1 = tmp2_safe_receiver == null ? null : toColorOrNull(tmp2_safe_receiver);
     var tmp_3 = $this;
     var tmp3_safe_receiver = parser.n2t(get_XML_PRIMARY_TEXT_COLOR());
-    tmp_3.w3d_1 = tmp3_safe_receiver == null ? null : toColorOrNull(tmp3_safe_receiver);
+    tmp_3.v3d_1 = tmp3_safe_receiver == null ? null : toColorOrNull(tmp3_safe_receiver);
     var tmp_4 = $this;
     var tmp4_safe_receiver = parser.n2t(get_XML_BACKGROUND_COLOR());
     var tmp5_elvis_lhs = tmp4_safe_receiver == null ? null : toColorOrNull(tmp4_safe_receiver);
-    tmp_4.x3d_1 = tmp5_elvis_lhs == null ? Companion_getInstance_48().i33_1 : tmp5_elvis_lhs;
-    $this.y3d_1 = parser.n2t(get_XML_BACKGROUND_IMAGE());
+    tmp_4.w3d_1 = tmp5_elvis_lhs == null ? Companion_getInstance_48().j33_1 : tmp5_elvis_lhs;
+    $this.x3d_1 = parser.n2t(get_XML_BACKGROUND_IMAGE());
     var tmp_5 = $this;
     var tmp6_safe_receiver = parser.n2t(get_XML_BACKGROUND_IMAGE_GRAVITY());
-    var tmp7_elvis_lhs = tmp6_safe_receiver == null ? null : Companion_getInstance_22().g2x(tmp6_safe_receiver);
-    tmp_5.z3d_1 = tmp7_elvis_lhs == null ? Companion_getInstance_48().j33_1 : tmp7_elvis_lhs;
+    var tmp7_elvis_lhs = tmp6_safe_receiver == null ? null : Companion_getInstance_22().a2x(tmp6_safe_receiver);
+    tmp_5.y3d_1 = tmp7_elvis_lhs == null ? Companion_getInstance_48().k33_1 : tmp7_elvis_lhs;
     var tmp_6 = $this;
     var tmp8_safe_receiver = parser.n2t(get_XML_BACKGROUND_IMAGE_SCALE_TYPE());
-    var tmp9_elvis_lhs = tmp8_safe_receiver == null ? null : Companion_getInstance_24().n31(tmp8_safe_receiver);
-    tmp_6.a3e_1 = tmp9_elvis_lhs == null ? Companion_getInstance_48().k33_1 : tmp9_elvis_lhs;
+    var tmp9_elvis_lhs = tmp8_safe_receiver == null ? null : Companion_getInstance_24().o31(tmp8_safe_receiver);
+    tmp_6.z3d_1 = tmp9_elvis_lhs == null ? Companion_getInstance_48().l33_1 : tmp9_elvis_lhs;
     var tmp_7 = $this;
     var tmp10_safe_receiver = parser.n2t(get_XML_CONTROL_COLOR());
-    tmp_7.b3e_1 = tmp10_safe_receiver == null ? null : toColorOrNull(tmp10_safe_receiver);
+    tmp_7.a3e_1 = tmp10_safe_receiver == null ? null : toColorOrNull(tmp10_safe_receiver);
     var tmp_8 = $this;
     var tmp_9 = get_XMLNS_CONTENT();
     Companion_getInstance_12();
     var tmp11_safe_receiver = parser.i2v(tmp_9, 'card-background-color');
-    tmp_8.c3e_1 = tmp11_safe_receiver == null ? null : toColorOrNull(tmp11_safe_receiver);
+    tmp_8.b3e_1 = tmp11_safe_receiver == null ? null : toColorOrNull(tmp11_safe_receiver);
     var tmp_10 = $this;
     var tmp_11 = get_XMLNS_CONTENT();
     Companion_getInstance_32();
     var tmp12_safe_receiver = parser.i2v(tmp_11, 'multiselect-option-background-color');
-    tmp_10.d3e_1 = tmp12_safe_receiver == null ? null : toColorOrNull(tmp12_safe_receiver);
+    tmp_10.c3e_1 = tmp12_safe_receiver == null ? null : toColorOrNull(tmp12_safe_receiver);
     var tmp_12 = $this;
     var tmp_13 = get_XMLNS_CONTENT();
     Companion_getInstance_32();
     var tmp13_safe_receiver = parser.i2v(tmp_13, 'multiselect-option-selected-color');
-    tmp_12.e3e_1 = tmp13_safe_receiver == null ? null : toColorOrNull(tmp13_safe_receiver);
+    tmp_12.d3e_1 = tmp13_safe_receiver == null ? null : toColorOrNull(tmp13_safe_receiver);
     var tmp_14 = $this;
     var tmp14_safe_receiver = parser.n2t(get_XML_TEXT_COLOR());
-    tmp_14.f3e_1 = tmp14_safe_receiver == null ? null : toColorOrNull(tmp14_safe_receiver);
+    tmp_14.e3e_1 = tmp14_safe_receiver == null ? null : toColorOrNull(tmp14_safe_receiver);
     var tmp_15 = $this;
     var tmp15_safe_receiver = parser.n2t(get_XML_TEXT_SCALE());
     var tmp16_elvis_lhs = tmp15_safe_receiver == null ? null : toDoubleOrNull(tmp15_safe_receiver);
@@ -9364,7 +9427,7 @@
     } else {
       tmp_16 = tmp16_elvis_lhs;
     }
-    tmp_15.g3e_1 = tmp_16;
+    tmp_15.f3e_1 = tmp_16;
     return $this;
   }
   function Page_init_$Init$_0(manifest, id, fileName, parentPage, primaryColor, backgroundColor, backgroundImage, backgroundImageGravity, backgroundImageScaleType, controlColor, cardBackgroundColor, multiselectOptionBackgroundColor, multiselectOptionSelectedColor, textColor, textScale, $this) {
@@ -9373,10 +9436,10 @@
     fileName = fileName === VOID ? null : fileName;
     parentPage = parentPage === VOID ? null : parentPage;
     primaryColor = primaryColor === VOID ? null : primaryColor;
-    backgroundColor = backgroundColor === VOID ? Companion_getInstance_48().i33_1 : backgroundColor;
+    backgroundColor = backgroundColor === VOID ? Companion_getInstance_48().j33_1 : backgroundColor;
     backgroundImage = backgroundImage === VOID ? null : backgroundImage;
-    backgroundImageGravity = backgroundImageGravity === VOID ? Companion_getInstance_48().j33_1 : backgroundImageGravity;
-    backgroundImageScaleType = backgroundImageScaleType === VOID ? Companion_getInstance_48().k33_1 : backgroundImageScaleType;
+    backgroundImageGravity = backgroundImageGravity === VOID ? Companion_getInstance_48().k33_1 : backgroundImageGravity;
+    backgroundImageScaleType = backgroundImageScaleType === VOID ? Companion_getInstance_48().l33_1 : backgroundImageScaleType;
     controlColor = controlColor === VOID ? null : controlColor;
     cardBackgroundColor = cardBackgroundColor === VOID ? null : cardBackgroundColor;
     multiselectOptionBackgroundColor = multiselectOptionBackgroundColor === VOID ? null : multiselectOptionBackgroundColor;
@@ -9392,30 +9455,30 @@
     textScale = tmp;
     BaseModel.call($this, manifest);
     Page.call($this);
-    $this.s3d_1 = id;
-    $this.t3d_1 = fileName;
-    $this.u3d_1 = parentPage;
+    $this.r3d_1 = id;
+    $this.s3d_1 = fileName;
+    $this.t3d_1 = parentPage;
     $this.isHidden = false;
     $this._listeners = emptySet();
     $this._dismissListeners = emptySet();
-    $this.v3d_1 = primaryColor;
-    $this.w3d_1 = null;
-    $this.x3d_1 = backgroundColor;
-    $this.y3d_1 = backgroundImage;
-    $this.z3d_1 = backgroundImageGravity;
-    $this.a3e_1 = backgroundImageScaleType;
-    $this.b3e_1 = controlColor;
-    $this.c3e_1 = cardBackgroundColor;
-    $this.d3e_1 = multiselectOptionBackgroundColor;
-    $this.e3e_1 = multiselectOptionSelectedColor;
-    $this.f3e_1 = textColor;
-    $this.g3e_1 = textScale;
+    $this.u3d_1 = primaryColor;
+    $this.v3d_1 = null;
+    $this.w3d_1 = backgroundColor;
+    $this.x3d_1 = backgroundImage;
+    $this.y3d_1 = backgroundImageGravity;
+    $this.z3d_1 = backgroundImageScaleType;
+    $this.a3e_1 = controlColor;
+    $this.b3e_1 = cardBackgroundColor;
+    $this.c3e_1 = multiselectOptionBackgroundColor;
+    $this.d3e_1 = multiselectOptionSelectedColor;
+    $this.e3e_1 = textColor;
+    $this.f3e_1 = textScale;
     return $this;
   }
   function Page$id$delegate$lambda(this$0) {
     return function () {
-      var tmp0_elvis_lhs = this$0.s3d_1;
-      var tmp1_elvis_lhs = tmp0_elvis_lhs == null ? this$0.t3d_1 : tmp0_elvis_lhs;
+      var tmp0_elvis_lhs = this$0.r3d_1;
+      var tmp1_elvis_lhs = tmp0_elvis_lhs == null ? this$0.s3d_1 : tmp0_elvis_lhs;
       return tmp1_elvis_lhs == null ? '' + this$0.x2o().code + '-' + this$0.position : tmp1_elvis_lhs;
     };
   }
@@ -9428,76 +9491,76 @@
     var tmp$ret$0;
     // Inline function 'kotlin.getValue' call
     var tmp0_getValue = id$factory();
-    tmp$ret$0 = this.q3d_1.o1();
+    tmp$ret$0 = this.p3d_1.o1();
     return tmp$ret$0;
   };
-  protoOf(Page).h3e = function () {
+  protoOf(Page).g3e = function () {
     var tmp$ret$0;
     // Inline function 'kotlin.getValue' call
     var tmp0_getValue = position$factory();
-    tmp$ret$0 = this.r3d_1.o1();
+    tmp$ret$0 = this.q3d_1.o1();
     return tmp$ret$0;
   };
+  protoOf(Page).h3e = function () {
+    return this.s3d_1;
+  };
   protoOf(Page).i3e = function () {
-    return this.t3d_1;
+    return this.x2o().findPage(this.t3d_1);
   };
   protoOf(Page).j3e = function () {
-    return this.x2o().findPage(this.u3d_1);
-  };
-  protoOf(Page).k3e = function () {
     return this.isHidden;
   };
-  protoOf(Page).l3e = function () {
+  protoOf(Page).k3e = function () {
     return this._listeners;
   };
-  protoOf(Page).s36 = function () {
+  protoOf(Page).t36 = function () {
     return this._dismissListeners;
   };
-  protoOf(Page).g2y = function () {
-    var tmp0_elvis_lhs = this.v3d_1;
+  protoOf(Page).i2y = function () {
+    var tmp0_elvis_lhs = this.u3d_1;
     return tmp0_elvis_lhs == null ? get_primaryColor_0(this.z2s()) : tmp0_elvis_lhs;
   };
-  protoOf(Page).h2y = function () {
-    var tmp0_elvis_lhs = this.w3d_1;
+  protoOf(Page).j2y = function () {
+    var tmp0_elvis_lhs = this.v3d_1;
     return tmp0_elvis_lhs == null ? get_primaryTextColor_0(this.z2s()) : tmp0_elvis_lhs;
   };
-  protoOf(Page).v36 = function () {
-    return this.x3d_1;
+  protoOf(Page).h2x = function () {
+    return this.w3d_1;
   };
-  protoOf(Page).m3e = function () {
-    return this.y3d_1;
+  protoOf(Page).l3e = function () {
+    return this.x3d_1;
   };
   protoOf(Page).w36 = function () {
-    return getResource(this, this.y3d_1);
+    return getResource(this, this.x3d_1);
   };
   protoOf(Page).x36 = function () {
-    return this.z3d_1;
+    return this.y3d_1;
   };
   protoOf(Page).y36 = function () {
-    return this.a3e_1;
+    return this.z3d_1;
   };
-  protoOf(Page).n3e = function () {
-    var tmp0_elvis_lhs = this.b3e_1;
+  protoOf(Page).m3e = function () {
+    var tmp0_elvis_lhs = this.a3e_1;
     return tmp0_elvis_lhs == null ? this.x2o().a2u_1 : tmp0_elvis_lhs;
   };
-  protoOf(Page).j2y = function () {
-    var tmp0_elvis_lhs = this.c3e_1;
-    return tmp0_elvis_lhs == null ? this.x2o().j2y() : tmp0_elvis_lhs;
+  protoOf(Page).l2y = function () {
+    var tmp0_elvis_lhs = this.b3e_1;
+    return tmp0_elvis_lhs == null ? this.x2o().l2y() : tmp0_elvis_lhs;
   };
-  protoOf(Page).k2y = function () {
-    var tmp0_elvis_lhs = this.d3e_1;
+  protoOf(Page).m2y = function () {
+    var tmp0_elvis_lhs = this.c3e_1;
     return tmp0_elvis_lhs == null ? get_multiselectOptionBackgroundColor.call(this) : tmp0_elvis_lhs;
   };
-  protoOf(Page).l2y = function () {
-    var tmp0_elvis_lhs = this.e3e_1;
+  protoOf(Page).n2y = function () {
+    var tmp0_elvis_lhs = this.d3e_1;
     return tmp0_elvis_lhs == null ? get_multiselectOptionSelectedColor.call(this) : tmp0_elvis_lhs;
   };
-  protoOf(Page).e2y = function () {
-    var tmp0_elvis_lhs = this.f3e_1;
+  protoOf(Page).g2y = function () {
+    var tmp0_elvis_lhs = this.e3e_1;
     return tmp0_elvis_lhs == null ? get_textColor_0(this.z2s()) : tmp0_elvis_lhs;
   };
-  protoOf(Page).m2y = function () {
-    return this.g3e_1 * get_textScale_0(this.z2s());
+  protoOf(Page).o2y = function () {
+    return this.f3e_1 * get_textScale_0(this.z2s());
   };
   protoOf(Page)._getAnalyticsEvents = function (type) {
     var tmp0_subject = type;
@@ -9507,7 +9570,7 @@
       case 1:
         var tmp$ret$2;
         // Inline function 'kotlin.collections.filter' call
-        var tmp1_filter = this.n3d();
+        var tmp1_filter = this.l2x();
         var tmp$ret$1;
         // Inline function 'kotlin.collections.filterTo' call
         var tmp0_filterTo = ArrayList_init_$Create$();
@@ -9529,7 +9592,7 @@
       case 2:
         var tmp$ret$5;
         // Inline function 'kotlin.collections.filter' call
-        var tmp3_filter = this.n3d();
+        var tmp3_filter = this.l2x();
         var tmp$ret$4;
         // Inline function 'kotlin.collections.filterTo' call
         var tmp2_filterTo = ArrayList_init_$Create$();
@@ -9561,7 +9624,7 @@
     tmp$ret$0 = copyToArray(tmp0_toTypedArray);
     return tmp$ret$0;
   };
-  protoOf(Page).o3e = function () {
+  protoOf(Page).n3e = function () {
     var tmp$ret$0;
     // Inline function 'kotlin.collections.toTypedArray' call
     var tmp0_toTypedArray = this._listeners;
@@ -9571,16 +9634,16 @@
   function Page() {
     Companion_getInstance_48();
     var tmp = this;
-    tmp.q3d_1 = lazy(Page$id$delegate$lambda(this));
+    tmp.p3d_1 = lazy(Page$id$delegate$lambda(this));
     var tmp_0 = this;
-    tmp_0.r3d_1 = lazy(Page$position$delegate$lambda(this));
+    tmp_0.q3d_1 = lazy(Page$position$delegate$lambda(this));
   }
   defineProp(protoOf(Page), 'id', protoOf(Page).p2u);
-  defineProp(protoOf(Page), 'position', protoOf(Page).h3e);
-  defineProp(protoOf(Page), 'parentPage', protoOf(Page).j3e);
+  defineProp(protoOf(Page), 'position', protoOf(Page).g3e);
+  defineProp(protoOf(Page), 'parentPage', protoOf(Page).i3e);
   defineProp(protoOf(Page), 'backgroundImage', protoOf(Page).w36);
   defineProp(protoOf(Page), 'dismissListeners', protoOf(Page).z37);
-  defineProp(protoOf(Page), 'listeners', protoOf(Page).o3e);
+  defineProp(protoOf(Page), 'listeners', protoOf(Page).n3e);
   function id$factory() {
     return getPropertyCallableRef('id', 1, KProperty1, function (receiver) {
       return receiver.id;
@@ -9597,9 +9660,9 @@
   var XMLNS_SHAREABLE;
   function Companion_46() {
     Companion_instance_46 = this;
-    this.e36_1 = 'items';
+    this.f36_1 = 'items';
   }
-  protoOf(Companion_46).f36 = function (_this__u8e3s4, manifest) {
+  protoOf(Companion_46).g36 = function (_this__u8e3s4, manifest) {
     var tmp$ret$4;
     // Inline function 'kotlin.collections.buildList' call
     // Inline function 'kotlin.contracts.contract' call
@@ -9628,7 +9691,7 @@
       // Inline function 'org.cru.godtools.shared.tool.parser.model.shareable.Companion.parseShareableItems.<anonymous>.<anonymous>' call
       var tmp0_subject = _this__u8e3s4.v2r();
       if (tmp0_subject === get_XMLNS_SHAREABLE()) {
-        var tmp1_safe_receiver = Companion_getInstance_49().p3g(manifest, _this__u8e3s4);
+        var tmp1_safe_receiver = Companion_getInstance_49().o3g(manifest, _this__u8e3s4);
         if (tmp1_safe_receiver == null)
           null;
         else {
@@ -9652,9 +9715,9 @@
     tmp$ret$4 = tmp$ret$3;
     return tmp$ret$4;
   };
-  protoOf(Companion_46).p3g = function (manifest, parser) {
+  protoOf(Companion_46).o3g = function (manifest, parser) {
     Companion_getInstance_59();
-    parser.q3g(2, get_XMLNS_SHAREABLE());
+    parser.p3g(2, get_XMLNS_SHAREABLE());
     var tmp0_subject = parser.v2r();
     var tmp;
     if (tmp0_subject === get_XMLNS_SHAREABLE()) {
@@ -9682,23 +9745,23 @@
     BaseModel.call($this, parent);
     Shareable.call($this);
     Companion_getInstance_59();
-    parser.q3g(2, get_XMLNS_SHAREABLE());
-    $this.k36_1 = parser.n2t('id');
+    parser.p3g(2, get_XMLNS_SHAREABLE());
+    $this.l36_1 = parser.n2t('id');
     var tmp = $this;
     var tmp0_safe_receiver = parser.n2t('order');
     var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : toIntOrNull(tmp0_safe_receiver);
-    tmp.l36_1 = tmp1_elvis_lhs == null ? 2147483647 : tmp1_elvis_lhs;
+    tmp.m36_1 = tmp1_elvis_lhs == null ? 2147483647 : tmp1_elvis_lhs;
     return $this;
   }
   protoOf(Shareable).p2u = function () {
-    return this.k36_1;
+    return this.l36_1;
   };
   function Shareable() {
     Companion_getInstance_49();
   }
   function Companion_47() {
     Companion_instance_47 = this;
-    this.r3g_1 = 'image';
+    this.q3g_1 = 'image';
   }
   var Companion_instance_47;
   function Companion_getInstance_50() {
@@ -9713,7 +9776,7 @@
     var tmp = get_XMLNS_SHAREABLE();
     Companion_getInstance_50();
     parser.t2r(2, tmp, 'image');
-    $this.v3g_1 = parser.n2t('resource');
+    $this.u3g_1 = parser.n2t('resource');
     var description = null;
     // Inline function 'org.cru.godtools.shared.tool.parser.xml.parseChildren' call
     $l$loop_1: while (true) {
@@ -9739,7 +9802,7 @@
         continue $l$loop_1;
       skipTag(parser);
     }
-    $this.w3g_1 = description;
+    $this.v3g_1 = description;
     return $this;
   }
   function ShareableImage_init_$Create$(manifest, parser) {
@@ -9747,7 +9810,7 @@
   }
   protoOf(ShareableImage).p2u = function () {
     var tmp0_elvis_lhs = protoOf(Shareable).p2u.call(this);
-    return tmp0_elvis_lhs == null ? this.v3g_1 : tmp0_elvis_lhs;
+    return tmp0_elvis_lhs == null ? this.u3g_1 : tmp0_elvis_lhs;
   };
   function ShareableImage() {
     Companion_getInstance_50();
@@ -9758,7 +9821,7 @@
   var XMLNS_TRAINING;
   function Companion_48() {
     Companion_instance_48 = this;
-    this.x3g_1 = 'tip';
+    this.w3g_1 = 'tip';
   }
   var Companion_instance_48;
   function Companion_getInstance_51() {
@@ -9793,7 +9856,7 @@
   protoOf(InlineTip).p2u = function () {
     return this.id;
   };
-  protoOf(InlineTip).g3h = function () {
+  protoOf(InlineTip).f3h = function () {
     return this.x2o().y37(this.id);
   };
   protoOf(InlineTip).b2t = function () {
@@ -9802,7 +9865,7 @@
   function InlineTip() {
     Companion_getInstance_51();
   }
-  defineProp(protoOf(InlineTip), 'tip', protoOf(InlineTip).g3h);
+  defineProp(protoOf(InlineTip), 'tip', protoOf(InlineTip).f3h);
   var Type_ASK_instance;
   var Type_CONSIDER_instance;
   var Type_TIP_instance;
@@ -9810,9 +9873,9 @@
   var Type_QUOTE_instance;
   function Companion_49() {
     Companion_instance_49 = this;
-    this.h3h_1 = Type_TIP_getInstance();
+    this.g3h_1 = Type_TIP_getInstance();
   }
-  protoOf(Companion_49).p31 = function (_this__u8e3s4) {
+  protoOf(Companion_49).q31 = function (_this__u8e3s4) {
     var tmp0_subject = _this__u8e3s4;
     switch (tmp0_subject) {
       case 'tip':
@@ -9853,11 +9916,11 @@
     Tip.call($this);
     Companion_getInstance_59();
     parser.t2r(2, get_XMLNS_TRAINING(), 'tip');
-    $this.x34_1 = id;
+    $this.y34_1 = id;
     var tmp = $this;
     var tmp0_safe_receiver = parser.i2v(null, 'type');
-    var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : Companion_getInstance_52().p31(tmp0_safe_receiver);
-    tmp.y34_1 = tmp1_elvis_lhs == null ? Companion_getInstance_52().h3h_1 : tmp1_elvis_lhs;
+    var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : Companion_getInstance_52().q31(tmp0_safe_receiver);
+    tmp.z34_1 = tmp1_elvis_lhs == null ? Companion_getInstance_52().g3h_1 : tmp1_elvis_lhs;
     var tmp_0 = $this;
     var tmp$ret$2;
     // Inline function 'kotlin.collections.buildList' call
@@ -9897,7 +9960,7 @@
     tmp$ret$0 = tmp0_apply;
     tmp$ret$1 = tmp$ret$0.u7();
     tmp$ret$2 = tmp$ret$1;
-    tmp_0.z34_1 = tmp$ret$2;
+    tmp_0.a35_1 = tmp$ret$2;
     return $this;
   }
   function Tip_init_$Create$(manifest, id, parser) {
@@ -9970,20 +10033,20 @@
     Type_initEntries_2();
     return Type_QUOTE_instance;
   }
-  protoOf(Tip).g2y = function () {
+  protoOf(Tip).i2y = function () {
     return Companion_getInstance_29().z2p_1;
   };
-  protoOf(Tip).h2y = function () {
+  protoOf(Tip).j2y = function () {
     return Companion_getInstance_29().a2q_1;
   };
-  protoOf(Tip).e2y = function () {
+  protoOf(Tip).g2y = function () {
     return Companion_getInstance_29().f2q_1;
   };
   function Tip() {
   }
   function Companion_50() {
     Companion_instance_50 = this;
-    this.i3h_1 = 'page';
+    this.h3h_1 = 'page';
   }
   var Companion_instance_50;
   function Companion_getInstance_53() {
@@ -9998,8 +10061,8 @@
     var tmp = get_XMLNS_TRAINING();
     Companion_getInstance_53();
     parser.t2r(2, tmp, 'page');
-    $this.k3h_1 = tip;
-    $this.l3h_1 = position;
+    $this.j3h_1 = tip;
+    $this.k3h_1 = position;
     var tmp_0 = $this;
     var tmp$ret$8;
     // Inline function 'org.cru.godtools.shared.tool.parser.model.parseContent' call
@@ -10079,14 +10142,14 @@
     tmp$ret$6 = tmp$ret$5.u7();
     tmp$ret$7 = tmp$ret$6;
     tmp$ret$8 = tmp$ret$7;
-    tmp_0.m3h_1 = tmp$ret$8;
+    tmp_0.l3h_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).s2s = function () {
-    return this.m3h_1;
+    return this.l3h_1;
   };
   function TipPage() {
     Companion_getInstance_53();
@@ -10099,7 +10162,7 @@
   });
   function Companion_51() {
     Companion_instance_51 = this;
-    this.n3h_1 = 'call-to-action';
+    this.m3h_1 = 'call-to-action';
   }
   var Companion_instance_51;
   function Companion_getInstance_54() {
@@ -10110,10 +10173,10 @@
   function CallToAction_init_$Init$(parent, $this) {
     BaseModel.call($this, parent);
     CallToAction.call($this);
-    $this.p3h_1 = parent;
+    $this.o3h_1 = parent;
     $this.label = null;
+    $this.p3h_1 = null;
     $this.q3h_1 = null;
-    $this.r3h_1 = null;
     return $this;
   }
   function CallToAction_init_$Create$(parent) {
@@ -10126,11 +10189,11 @@
     var tmp = get_XMLNS_TRACT();
     Companion_getInstance_54();
     parser.t2r(2, tmp, 'call-to-action');
-    $this.p3h_1 = page;
+    $this.o3h_1 = page;
     var tmp_0 = $this;
     var tmp0_safe_receiver = parser.n2t('control-color');
-    tmp_0.q3h_1 = tmp0_safe_receiver == null ? null : toColorOrNull(tmp0_safe_receiver);
-    $this.r3h_1 = parser.i2v(get_XMLNS_TRAINING(), 'tip');
+    tmp_0.p3h_1 = tmp0_safe_receiver == null ? null : toColorOrNull(tmp0_safe_receiver);
+    $this.q3h_1 = parser.i2v(get_XMLNS_TRAINING(), 'tip');
     var tmp_1 = $this;
     var tmp_2 = get_XMLNS_TRACT();
     Companion_getInstance_54();
@@ -10147,41 +10210,41 @@
     tip = tip === VOID ? null : tip;
     BaseModel.call($this, page);
     CallToAction.call($this);
-    $this.p3h_1 = page;
+    $this.o3h_1 = page;
     var tmp = $this;
     var tmp0_safe_receiver = label;
     tmp.label = tmp0_safe_receiver == null ? null : tmp0_safe_receiver($this);
-    $this.q3h_1 = controlColor;
-    $this.r3h_1 = tip;
+    $this.p3h_1 = controlColor;
+    $this.q3h_1 = tip;
     return $this;
   }
   function createTestCallToAction(page, label, controlColor, tip) {
     return CallToAction_init_$Init$_1(page, label, controlColor, tip, objectCreate(protoOf(CallToAction)));
   }
-  protoOf(CallToAction).c32 = function () {
+  protoOf(CallToAction).d32 = function () {
     return this.label;
   };
-  protoOf(CallToAction).n3e = function () {
-    var tmp0_elvis_lhs = this.q3h_1;
+  protoOf(CallToAction).m3e = function () {
+    var tmp0_elvis_lhs = this.p3h_1;
     return tmp0_elvis_lhs == null ? get_primaryColor_0(this.z2s()) : tmp0_elvis_lhs;
   };
-  protoOf(CallToAction).s3h = function () {
-    return this.r3h_1;
+  protoOf(CallToAction).r3h = function () {
+    return this.q3h_1;
   };
-  protoOf(CallToAction).g3h = function () {
-    return this.x2o().y37(this.r3h_1);
+  protoOf(CallToAction).f3h = function () {
+    return this.x2o().y37(this.q3h_1);
   };
   function CallToAction() {
     Companion_getInstance_54();
   }
-  defineProp(protoOf(CallToAction), 'tip', protoOf(CallToAction).g3h);
+  defineProp(protoOf(CallToAction), 'tip', protoOf(CallToAction).f3h);
   function get_XMLNS_TRACT() {
     return XMLNS_TRACT;
   }
   var XMLNS_TRACT;
   function Companion_52() {
     Companion_instance_52 = this;
-    this.t3h_1 = 'header';
+    this.s3h_1 = 'header';
   }
   var Companion_instance_52;
   function Companion_getInstance_55() {
@@ -10198,8 +10261,8 @@
     parser.t2r(2, tmp, 'header');
     var tmp_0 = $this;
     var tmp0_safe_receiver = parser.n2t(get_XML_BACKGROUND_COLOR());
-    tmp_0.v3h_1 = tmp0_safe_receiver == null ? null : toColorOrNull(tmp0_safe_receiver);
-    $this.w3h_1 = parser.i2v(get_XMLNS_TRAINING(), 'tip');
+    tmp_0.u3h_1 = tmp0_safe_receiver == null ? null : toColorOrNull(tmp0_safe_receiver);
+    $this.v3h_1 = parser.i2v(get_XMLNS_TRAINING(), 'tip');
     var number = null;
     var title = null;
     // Inline function 'org.cru.godtools.shared.tool.parser.xml.parseChildren' call
@@ -10235,32 +10298,32 @@
   function Header_init_$Create$(page, parser) {
     return Header_init_$Init$(page, parser, objectCreate(protoOf(Header)));
   }
-  protoOf(Header).v36 = function () {
-    var tmp0_elvis_lhs = this.v3h_1;
-    return tmp0_elvis_lhs == null ? this.g2y() : tmp0_elvis_lhs;
+  protoOf(Header).h2x = function () {
+    var tmp0_elvis_lhs = this.u3h_1;
+    return tmp0_elvis_lhs == null ? this.i2y() : tmp0_elvis_lhs;
   };
-  protoOf(Header).e2y = function () {
-    return this.h2y();
+  protoOf(Header).g2y = function () {
+    return this.j2y();
   };
-  protoOf(Header).x3h = function () {
+  protoOf(Header).w3h = function () {
     return this.number;
   };
   protoOf(Header).a37 = function () {
     return this.title;
   };
-  protoOf(Header).s3h = function () {
-    return this.w3h_1;
+  protoOf(Header).r3h = function () {
+    return this.v3h_1;
   };
-  protoOf(Header).g3h = function () {
-    return this.x2o().y37(this.w3h_1);
+  protoOf(Header).f3h = function () {
+    return this.x2o().y37(this.v3h_1);
   };
   function Header() {
     Companion_getInstance_55();
   }
-  defineProp(protoOf(Header), 'tip', protoOf(Header).g3h);
+  defineProp(protoOf(Header), 'tip', protoOf(Header).f3h);
   function Companion_53() {
     Companion_instance_53 = this;
-    this.y3h_1 = 'hero';
+    this.x3h_1 = 'hero';
   }
   var Companion_instance_53;
   function Companion_getInstance_56() {
@@ -10272,7 +10335,7 @@
     var tmp$ret$0;
     // Inline function 'kotlin.getValue' call
     var tmp0_getValue = headingParent$factory();
-    tmp$ret$0 = $this.a3i_1.o1();
+    tmp$ret$0 = $this.z3h_1.o1();
     return tmp$ret$0;
   }
   function Hero_init_$Init$(page, parser, $this) {
@@ -10286,7 +10349,7 @@
     var tmp$ret$0;
     // Inline function 'kotlin.collections.mutableListOf' call
     tmp$ret$0 = ArrayList_init_$Create$();
-    tmp_0.c3i_1 = tmp$ret$0;
+    tmp_0.b3i_1 = tmp$ret$0;
     var heading = null;
     var tmp_1 = $this;
     var tmp$ret$8;
@@ -10325,7 +10388,7 @@
           if (tmp1_subject === 'events') {
             var tmp2_this = $this;
             // Inline function 'kotlin.collections.plusAssign' call
-            var tmp0_plusAssign = tmp2_this.c3i_1;
+            var tmp0_plusAssign = tmp2_this.b3i_1;
             var tmp1_plusAssign = Companion_getInstance_6().x2r(parser, $this);
             addAll(tmp0_plusAssign, tmp1_plusAssign);
           }
@@ -10381,7 +10444,7 @@
     tmp$ret$6 = tmp$ret$5.u7();
     tmp$ret$7 = tmp$ret$6;
     tmp$ret$8 = tmp$ret$7;
-    tmp_1.b3i_1 = tmp$ret$8;
+    tmp_1.a3i_1 = tmp$ret$8;
     $this.heading = heading;
     return $this;
   }
@@ -10394,11 +10457,11 @@
     heading = heading === VOID ? null : heading;
     BaseModel.call($this, page);
     Hero.call($this);
-    $this.c3i_1 = analyticsEvents;
+    $this.b3i_1 = analyticsEvents;
     var tmp = $this;
     var tmp0_safe_receiver = heading;
     tmp.heading = tmp0_safe_receiver == null ? null : tmp0_safe_receiver(_get_headingParent__2ts5bv($this));
-    $this.b3i_1 = emptyList();
+    $this.a3i_1 = emptyList();
     return $this;
   }
   function createTestHero(page, analyticsEvents, heading) {
@@ -10414,14 +10477,14 @@
       return stylesOverride(this$0, VOID, Hero$headingParent$delegate$lambda$lambda(this$0));
     };
   }
-  protoOf(Hero).d3i = function () {
+  protoOf(Hero).c3i = function () {
     return this.heading;
   };
   protoOf(Hero).s2s = function () {
-    return this.b3i_1;
+    return this.a3i_1;
   };
-  protoOf(Hero).n3d = function () {
-    return this.c3i_1;
+  protoOf(Hero).l2x = function () {
+    return this.b3i_1;
   };
   protoOf(Hero)._getAnalyticsEvents = function (type) {
     var tmp0_subject = type;
@@ -10431,7 +10494,7 @@
       case 1:
         var tmp$ret$2;
         // Inline function 'kotlin.collections.filter' call
-        var tmp1_filter = this.c3i_1;
+        var tmp1_filter = this.b3i_1;
         var tmp$ret$1;
         // Inline function 'kotlin.collections.filterTo' call
         var tmp0_filterTo = ArrayList_init_$Create$();
@@ -10453,7 +10516,7 @@
       case 2:
         var tmp$ret$5;
         // Inline function 'kotlin.collections.filter' call
-        var tmp3_filter = this.c3i_1;
+        var tmp3_filter = this.b3i_1;
         var tmp$ret$4;
         // Inline function 'kotlin.collections.filterTo' call
         var tmp2_filterTo = ArrayList_init_$Create$();
@@ -10481,7 +10544,7 @@
   function Hero() {
     Companion_getInstance_56();
     var tmp = this;
-    tmp.a3i_1 = lazy(Hero$headingParent$delegate$lambda(this));
+    tmp.z3h_1 = lazy(Hero$headingParent$delegate$lambda(this));
   }
   defineProp(protoOf(Hero), '_content', function () {
     return this.s2s();
@@ -10496,7 +10559,7 @@
   }
   function Companion_54() {
     Companion_instance_54 = this;
-    this.e3i_1 = 'modal';
+    this.d3i_1 = 'modal';
   }
   var Companion_instance_54;
   function Companion_getInstance_57() {
@@ -10611,14 +10674,14 @@
     tmp$ret$7 = tmp$ret$6.u7();
     tmp$ret$8 = tmp$ret$7;
     tmp$ret$9 = tmp$ret$8;
-    tmp_2.a3j_1 = tmp$ret$9;
+    tmp_2.z3i_1 = tmp$ret$9;
     $this.title = title;
     return $this;
   }
   function Modal_init_$Create$(parent, parser) {
     return Modal_init_$Init$(parent, parser, objectCreate(protoOf(Modal)));
   }
-  protoOf(Modal).b3j = function () {
+  protoOf(Modal).a3j = function () {
     return this.page;
   };
   protoOf(Modal).p2u = function () {
@@ -10628,30 +10691,30 @@
     return this.title;
   };
   protoOf(Modal).s2s = function () {
-    return this.a3j_1;
+    return this.z3i_1;
   };
-  protoOf(Modal).o3e = function () {
+  protoOf(Modal).n3e = function () {
     return this.listeners;
   };
   protoOf(Modal).z37 = function () {
     return this.dismissListeners;
   };
-  protoOf(Modal).g2y = function () {
+  protoOf(Modal).i2y = function () {
     return get_TRANSPARENT();
   };
-  protoOf(Modal).h2y = function () {
+  protoOf(Modal).j2y = function () {
     return get_WHITE();
   };
-  protoOf(Modal).j2x = function () {
+  protoOf(Modal).g2x = function () {
     return get_WHITE();
   };
-  protoOf(Modal).i2y = function () {
+  protoOf(Modal).k2y = function () {
     return Style_OUTLINED_getInstance();
   };
-  protoOf(Modal).n2y = function () {
+  protoOf(Modal).p2y = function () {
     return Align_CENTER_getInstance();
   };
-  protoOf(Modal).e2y = function () {
+  protoOf(Modal).g2y = function () {
     return get_WHITE();
   };
   function Modal() {
@@ -10666,11 +10729,11 @@
   });
   function Companion_55() {
     Companion_instance_55 = this;
-    this.c3j_1 = 'card';
-    this.d3j_1 = 'label';
-    this.e3j_1 = 'hidden';
-    this.f3j_1 = ImageScaleType_FILL_X_getInstance();
-    this.g3j_1 = Companion_getInstance_22().CENTER;
+    this.b3j_1 = 'card';
+    this.c3j_1 = 'label';
+    this.d3j_1 = 'hidden';
+    this.e3j_1 = ImageScaleType_FILL_X_getInstance();
+    this.f3j_1 = Companion_getInstance_22().CENTER;
   }
   var Companion_instance_55;
   function Companion_getInstance_58() {
@@ -10682,7 +10745,7 @@
     var tmp$ret$0;
     // Inline function 'kotlin.getValue' call
     var tmp0_getValue = labelParent$factory();
-    tmp$ret$0 = $this.n3j_1.o1();
+    tmp$ret$0 = $this.m3j_1.o1();
     return tmp$ret$0;
   }
   function Card_init_$Init$_1(page, position, parser, $this) {
@@ -10713,24 +10776,24 @@
     tmp_2._dismissListeners = toSet_0(tmp$ret$1);
     var tmp_3 = $this;
     var tmp2_safe_receiver = parser.n2t(get_XML_BACKGROUND_COLOR());
-    tmp_3.i3j_1 = tmp2_safe_receiver == null ? null : toColorOrNull(tmp2_safe_receiver);
-    $this.j3j_1 = parser.n2t(get_XML_BACKGROUND_IMAGE());
+    tmp_3.h3j_1 = tmp2_safe_receiver == null ? null : toColorOrNull(tmp2_safe_receiver);
+    $this.i3j_1 = parser.n2t(get_XML_BACKGROUND_IMAGE());
     var tmp_4 = $this;
     var tmp3_safe_receiver = parser.n2t(get_XML_BACKGROUND_IMAGE_GRAVITY());
-    var tmp4_elvis_lhs = tmp3_safe_receiver == null ? null : Companion_getInstance_22().g2x(tmp3_safe_receiver);
-    tmp_4.k3j_1 = tmp4_elvis_lhs == null ? Companion_getInstance_58().g3j_1 : tmp4_elvis_lhs;
+    var tmp4_elvis_lhs = tmp3_safe_receiver == null ? null : Companion_getInstance_22().a2x(tmp3_safe_receiver);
+    tmp_4.j3j_1 = tmp4_elvis_lhs == null ? Companion_getInstance_58().f3j_1 : tmp4_elvis_lhs;
     var tmp_5 = $this;
     var tmp5_safe_receiver = parser.n2t(get_XML_BACKGROUND_IMAGE_SCALE_TYPE());
-    var tmp6_elvis_lhs = tmp5_safe_receiver == null ? null : Companion_getInstance_24().n31(tmp5_safe_receiver);
-    tmp_5.l3j_1 = tmp6_elvis_lhs == null ? Companion_getInstance_58().f3j_1 : tmp6_elvis_lhs;
+    var tmp6_elvis_lhs = tmp5_safe_receiver == null ? null : Companion_getInstance_24().o31(tmp5_safe_receiver);
+    tmp_5.k3j_1 = tmp6_elvis_lhs == null ? Companion_getInstance_58().e3j_1 : tmp6_elvis_lhs;
     var tmp_6 = $this;
     var tmp7_safe_receiver = parser.n2t(get_XML_TEXT_COLOR());
-    tmp_6.m3j_1 = tmp7_safe_receiver == null ? null : toColorOrNull(tmp7_safe_receiver);
+    tmp_6.l3j_1 = tmp7_safe_receiver == null ? null : toColorOrNull(tmp7_safe_receiver);
     var tmp_7 = $this;
     var tmp$ret$2;
     // Inline function 'kotlin.collections.mutableListOf' call
     tmp$ret$2 = ArrayList_init_$Create$();
-    tmp_7.p3j_1 = tmp$ret$2;
+    tmp_7.o3j_1 = tmp$ret$2;
     var label = null;
     var tmp_8 = $this;
     var tmp$ret$10;
@@ -10769,7 +10832,7 @@
           if (tmp1_subject === 'events') {
             var tmp2_this = $this;
             // Inline function 'kotlin.collections.plusAssign' call
-            var tmp0_plusAssign = tmp2_this.p3j_1;
+            var tmp0_plusAssign = tmp2_this.o3j_1;
             var tmp1_plusAssign = Companion_getInstance_6().x2r(parser, $this);
             addAll(tmp0_plusAssign, tmp1_plusAssign);
           }
@@ -10830,7 +10893,7 @@
     tmp$ret$8 = tmp$ret$7.u7();
     tmp$ret$9 = tmp$ret$8;
     tmp$ret$10 = tmp$ret$9;
-    tmp_8.o3j_1 = tmp$ret$10;
+    tmp_8.n3j_1 = tmp$ret$10;
     $this.label = label;
     return $this;
   }
@@ -10839,7 +10902,7 @@
   }
   function TractPage$Card$labelParent$delegate$lambda$lambda(this$0) {
     return function () {
-      return this$0.g2y();
+      return this$0.i2y();
     };
   }
   function TractPage$Card$labelParent$delegate$lambda(this$0) {
@@ -10856,7 +10919,7 @@
     parser.t2r(2, tmp, 'page');
     var tmp_0 = $this;
     var tmp0_safe_receiver = parser.n2t('card-text-color');
-    tmp_0.y3i_1 = tmp0_safe_receiver == null ? null : toColorOrNull(tmp0_safe_receiver);
+    tmp_0.x3i_1 = tmp0_safe_receiver == null ? null : toColorOrNull(tmp0_safe_receiver);
     var header = null;
     var hero = null;
     var tmp_1 = $this;
@@ -10934,11 +10997,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().i33_1 : backgroundColor;
+    backgroundColor = backgroundColor === VOID ? Companion_getInstance_48().j33_1 : backgroundColor;
     backgroundImage = backgroundImage === VOID ? null : backgroundImage;
     primaryColor = primaryColor === VOID ? null : primaryColor;
-    backgroundImageGravity = backgroundImageGravity === VOID ? Companion_getInstance_48().j33_1 : backgroundImageGravity;
-    backgroundImageScaleType = backgroundImageScaleType === VOID ? Companion_getInstance_48().k33_1 : backgroundImageScaleType;
+    backgroundImageGravity = backgroundImageGravity === VOID ? Companion_getInstance_48().k33_1 : backgroundImageGravity;
+    backgroundImageScaleType = backgroundImageScaleType === VOID ? Companion_getInstance_48().l33_1 : backgroundImageScaleType;
     textColor = textColor === VOID ? null : textColor;
     var tmp;
     if (textScale === VOID) {
@@ -10954,7 +11017,7 @@
     callToAction = callToAction === VOID ? null : callToAction;
     Page_init_$Init$_0(manifest, VOID, fileName, VOID, primaryColor, backgroundColor, backgroundImage, backgroundImageGravity, backgroundImageScaleType, VOID, cardBackgroundColor, VOID, VOID, textColor, textScale, $this);
     TractPage.call($this);
-    $this.y3i_1 = cardTextColor;
+    $this.x3i_1 = cardTextColor;
     $this.header = null;
     $this.hero = null;
     var tmp_0 = $this;
@@ -10975,16 +11038,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).b3j = function () {
+  protoOf(Card_1).a3j = function () {
     return this.page;
   };
   protoOf(Card_1).p2u = function () {
     return this.page.id + '-' + this.position;
   };
-  protoOf(Card_1).h3e = function () {
+  protoOf(Card_1).g3e = function () {
     return this.position;
   };
-  protoOf(Card_1).q3j = function () {
+  protoOf(Card_1).p3j = function () {
     var tmp$ret$1;
     // Inline function 'kotlin.takeUnless' call
     var tmp0_takeUnless = this.page.visibleCards.l1(this);
@@ -11001,40 +11064,40 @@
     tmp$ret$1 = tmp;
     return tmp$ret$1;
   };
-  protoOf(Card_1).r3j = function () {
+  protoOf(Card_1).q3j = function () {
     return equals(this, lastOrNull(this.page.visibleCards));
   };
-  protoOf(Card_1).k3e = function () {
+  protoOf(Card_1).j3e = function () {
     return this.isHidden;
   };
-  protoOf(Card_1).l3e = function () {
+  protoOf(Card_1).k3e = function () {
     return this._listeners;
   };
-  protoOf(Card_1).s36 = function () {
+  protoOf(Card_1).t36 = function () {
     return this._dismissListeners;
   };
-  protoOf(Card_1).v36 = function () {
-    var tmp0_elvis_lhs = this.i3j_1;
-    return tmp0_elvis_lhs == null ? this.page.j2y() : tmp0_elvis_lhs;
+  protoOf(Card_1).h2x = function () {
+    var tmp0_elvis_lhs = this.h3j_1;
+    return tmp0_elvis_lhs == null ? this.page.l2y() : tmp0_elvis_lhs;
   };
   protoOf(Card_1).w36 = function () {
-    return getResource(this, this.j3j_1);
+    return getResource(this, this.i3j_1);
   };
   protoOf(Card_1).x36 = function () {
-    return this.k3j_1;
+    return this.j3j_1;
   };
   protoOf(Card_1).y36 = function () {
-    return this.l3j_1;
+    return this.k3j_1;
   };
-  protoOf(Card_1).e2y = function () {
-    var tmp0_elvis_lhs = this.m3j_1;
+  protoOf(Card_1).g2y = function () {
+    var tmp0_elvis_lhs = this.l3j_1;
     return tmp0_elvis_lhs == null ? this.page.cardTextColor : tmp0_elvis_lhs;
   };
-  protoOf(Card_1).c32 = function () {
+  protoOf(Card_1).d32 = function () {
     return this.label;
   };
   protoOf(Card_1).s2s = function () {
-    return this.o3j_1;
+    return this.n3j_1;
   };
   protoOf(Card_1).b2t = function () {
     var tmp$ret$3;
@@ -11059,8 +11122,8 @@
     tmp$ret$3 = tmp$ret$2;
     return tmp$ret$3;
   };
-  protoOf(Card_1).n3d = function () {
-    return this.p3j_1;
+  protoOf(Card_1).l2x = function () {
+    return this.o3j_1;
   };
   protoOf(Card_1)._getAnalyticsEvents = function (type) {
     var tmp0_subject = type;
@@ -11070,7 +11133,7 @@
       case 1:
         var tmp$ret$2;
         // Inline function 'kotlin.collections.filter' call
-        var tmp1_filter = this.p3j_1;
+        var tmp1_filter = this.o3j_1;
         var tmp$ret$1;
         // Inline function 'kotlin.collections.filterTo' call
         var tmp0_filterTo = ArrayList_init_$Create$();
@@ -11092,7 +11155,7 @@
       case 2:
         var tmp$ret$5;
         // Inline function 'kotlin.collections.filter' call
-        var tmp3_filter = this.p3j_1;
+        var tmp3_filter = this.o3j_1;
         var tmp$ret$4;
         // Inline function 'kotlin.collections.filterTo' call
         var tmp2_filterTo = ArrayList_init_$Create$();
@@ -11124,7 +11187,7 @@
     tmp$ret$0 = copyToArray(tmp0_toTypedArray);
     return tmp$ret$0;
   };
-  protoOf(Card_1).o3e = function () {
+  protoOf(Card_1).n3e = function () {
     var tmp$ret$0;
     // Inline function 'kotlin.collections.toTypedArray' call
     var tmp0_toTypedArray = this._listeners;
@@ -11134,18 +11197,18 @@
   function Card_1() {
     Companion_getInstance_58();
     var tmp = this;
-    tmp.n3j_1 = lazy(TractPage$Card$labelParent$delegate$lambda(this));
+    tmp.m3j_1 = lazy(TractPage$Card$labelParent$delegate$lambda(this));
   }
   defineProp(protoOf(Card_1), 'id', protoOf(Card_1).p2u);
-  defineProp(protoOf(Card_1), 'visiblePosition', protoOf(Card_1).q3j);
-  defineProp(protoOf(Card_1), 'isLastVisibleCard', protoOf(Card_1).r3j);
+  defineProp(protoOf(Card_1), 'visiblePosition', protoOf(Card_1).p3j);
+  defineProp(protoOf(Card_1), 'isLastVisibleCard', protoOf(Card_1).q3j);
   defineProp(protoOf(Card_1), 'backgroundImage', protoOf(Card_1).w36);
   defineProp(protoOf(Card_1), '_content', function () {
     return this.s2s();
   });
   defineProp(protoOf(Card_1), 'tips', protoOf(Card_1).b2t);
   defineProp(protoOf(Card_1), 'dismissListeners', protoOf(Card_1).z37);
-  defineProp(protoOf(Card_1), 'listeners', protoOf(Card_1).o3e);
+  defineProp(protoOf(Card_1), 'listeners', protoOf(Card_1).n3e);
   defineProp(protoOf(Card_1), 'content', function () {
     return this.a2t();
   });
@@ -11237,25 +11300,25 @@
     tmp$ret$2 = tmp$ret$1;
     return tmp$ret$2;
   }
-  protoOf(TractPage).s3j = function () {
+  protoOf(TractPage).r3j = function () {
     return equals(lastOrNull(this.x2o()._pages), this);
   };
-  protoOf(TractPage).n3d = function () {
-    return this.x3i_1;
+  protoOf(TractPage).l2x = function () {
+    return this.w3i_1;
   };
-  protoOf(TractPage).t3j = function () {
+  protoOf(TractPage).s3j = function () {
     return this.header;
   };
-  protoOf(TractPage).u3j = function () {
+  protoOf(TractPage).t3j = function () {
     return this.hero;
   };
-  protoOf(TractPage).v3j = function () {
+  protoOf(TractPage).u3j = function () {
     return this._modals;
   };
-  protoOf(TractPage).w3j = function () {
+  protoOf(TractPage).v3j = function () {
     return this.callToAction;
   };
-  protoOf(TractPage).o3d = function (type) {
+  protoOf(TractPage).n3d = function (type) {
     return type.equals(Type_TRACT_getInstance());
   };
   protoOf(TractPage).findModal = function (id) {
@@ -11278,10 +11341,10 @@
     }
     return tmp$ret$1;
   };
-  protoOf(TractPage).x3j = function () {
+  protoOf(TractPage).w3j = function () {
     return this._cards;
   };
-  protoOf(TractPage).y3j = function () {
+  protoOf(TractPage).x3j = function () {
     var tmp$ret$2;
     // Inline function 'kotlin.collections.filter' call
     var tmp1_filter = this._cards;
@@ -11302,18 +11365,18 @@
     tmp$ret$2 = tmp$ret$1;
     return tmp$ret$2;
   };
-  protoOf(TractPage).z3j = function () {
-    var tmp0_elvis_lhs = this.y3i_1;
-    return tmp0_elvis_lhs == null ? this.e2y() : tmp0_elvis_lhs;
+  protoOf(TractPage).y3j = function () {
+    var tmp0_elvis_lhs = this.x3i_1;
+    return tmp0_elvis_lhs == null ? this.g2y() : tmp0_elvis_lhs;
   };
-  protoOf(TractPage).a3k = function () {
+  protoOf(TractPage).z3j = function () {
     var tmp$ret$0;
     // Inline function 'kotlin.collections.toTypedArray' call
     var tmp0_toTypedArray = this._cards;
     tmp$ret$0 = copyToArray(tmp0_toTypedArray);
     return tmp$ret$0;
   };
-  protoOf(TractPage).b3k = function () {
+  protoOf(TractPage).a3k = function () {
     var tmp$ret$0;
     // Inline function 'kotlin.collections.toTypedArray' call
     var tmp0_toTypedArray = this._modals;
@@ -11321,13 +11384,13 @@
     return tmp$ret$0;
   };
   function TractPage() {
-    this.x3i_1 = emptyList();
+    this.w3i_1 = emptyList();
   }
-  defineProp(protoOf(TractPage), 'isLastPage', protoOf(TractPage).s3j);
-  defineProp(protoOf(TractPage), 'visibleCards', protoOf(TractPage).y3j);
-  defineProp(protoOf(TractPage), 'cardTextColor', protoOf(TractPage).z3j);
-  defineProp(protoOf(TractPage), 'cards', protoOf(TractPage).a3k);
-  defineProp(protoOf(TractPage), 'modals', protoOf(TractPage).b3k);
+  defineProp(protoOf(TractPage), 'isLastPage', protoOf(TractPage).r3j);
+  defineProp(protoOf(TractPage), 'visibleCards', protoOf(TractPage).x3j);
+  defineProp(protoOf(TractPage), 'cardTextColor', protoOf(TractPage).y3j);
+  defineProp(protoOf(TractPage), 'cards', protoOf(TractPage).z3j);
+  defineProp(protoOf(TractPage), 'modals', protoOf(TractPage).a3k);
   function labelParent$factory() {
     return getPropertyCallableRef('labelParent', 1, KProperty1, function (receiver) {
       return _get_labelParent__664ln7(receiver);
@@ -11363,11 +11426,11 @@
     return EMPTY_instance;
   }
   function SetOnceProperty() {
-    this.c3k_1 = EMPTY_getInstance();
+    this.b3k_1 = EMPTY_getInstance();
   }
-  protoOf(SetOnceProperty).d3k = function (thisRef, property) {
+  protoOf(SetOnceProperty).c3k = function (thisRef, property) {
     // Inline function 'kotlin.check' call
-    var tmp0_check = !(this.c3k_1 === EMPTY_getInstance());
+    var tmp0_check = !(this.b3k_1 === EMPTY_getInstance());
     // Inline function 'kotlin.contracts.contract' call
     if (!tmp0_check) {
       var tmp$ret$0;
@@ -11376,15 +11439,15 @@
       var message = tmp$ret$0;
       throw IllegalStateException_init_$Create$(toString(message));
     }
-    var tmp = this.c3k_1;
+    var tmp = this.b3k_1;
     return (tmp == null ? true : isObject(tmp)) ? tmp : THROW_CCE();
   };
   protoOf(SetOnceProperty).r37 = function (thisRef, property) {
-    return this.d3k(isObject(thisRef) ? thisRef : THROW_CCE(), property);
+    return this.c3k(isObject(thisRef) ? thisRef : THROW_CCE(), property);
   };
-  protoOf(SetOnceProperty).e3k = function (thisRef, property, value) {
+  protoOf(SetOnceProperty).d3k = function (thisRef, property, value) {
     // Inline function 'kotlin.check' call
-    var tmp0_check = this.c3k_1 === EMPTY_getInstance();
+    var tmp0_check = this.b3k_1 === EMPTY_getInstance();
     // Inline function 'kotlin.contracts.contract' call
     if (!tmp0_check) {
       var tmp$ret$0;
@@ -11393,11 +11456,11 @@
       var message = tmp$ret$0;
       throw IllegalStateException_init_$Create$(toString(message));
     }
-    this.c3k_1 = value;
+    this.b3k_1 = value;
   };
-  protoOf(SetOnceProperty).d36 = function (thisRef, property, value) {
+  protoOf(SetOnceProperty).e36 = function (thisRef, property, value) {
     var tmp = isObject(thisRef) ? thisRef : THROW_CCE();
-    return this.e3k(tmp, property, (value == null ? true : isObject(value)) ? value : THROW_CCE());
+    return this.d3k(tmp, property, (value == null ? true : isObject(value)) ? value : THROW_CCE());
   };
   function get_hasUriScheme(_this__u8e3s4) {
     return contains_1(_this__u8e3s4, _Char___init__impl__6a9atx(58));
@@ -11429,15 +11492,15 @@
   }
   function QName(uri, local) {
     uri = uri === VOID ? null : uri;
-    this.f3k_1 = uri;
-    this.g3k_1 = local;
+    this.e3k_1 = uri;
+    this.f3k_1 = local;
   }
   protoOf(QName).toString = function () {
-    return 'QName(uri=' + this.f3k_1 + ', local=' + this.g3k_1 + ')';
+    return 'QName(uri=' + this.e3k_1 + ', local=' + this.f3k_1 + ')';
   };
   protoOf(QName).hashCode = function () {
-    var result = this.f3k_1 == null ? 0 : getStringHashCode(this.f3k_1);
-    result = imul(result, 31) + getStringHashCode(this.g3k_1) | 0;
+    var result = this.e3k_1 == null ? 0 : getStringHashCode(this.e3k_1);
+    result = imul(result, 31) + getStringHashCode(this.f3k_1) | 0;
     return result;
   };
   protoOf(QName).equals = function (other) {
@@ -11446,9 +11509,9 @@
     if (!(other instanceof QName))
       return false;
     var tmp0_other_with_cast = other instanceof QName ? other : THROW_CCE();
-    if (!(this.f3k_1 == tmp0_other_with_cast.f3k_1))
+    if (!(this.e3k_1 == tmp0_other_with_cast.e3k_1))
       return false;
-    if (!(this.g3k_1 === tmp0_other_with_cast.g3k_1))
+    if (!(this.f3k_1 === tmp0_other_with_cast.f3k_1))
       return false;
     return true;
   };
@@ -11456,63 +11519,63 @@
     qname = qname === VOID ? null : qname;
     content = content === VOID ? null : content;
     attrs = attrs === VOID ? null : attrs;
-    this.h3k_1 = type;
-    this.i3k_1 = qname;
-    this.j3k_1 = content;
-    this.k3k_1 = attrs;
+    this.g3k_1 = type;
+    this.h3k_1 = qname;
+    this.i3k_1 = content;
+    this.j3k_1 = attrs;
   }
   function enqueueEvent($this, event) {
     var tmp$ret$0;
     // Inline function 'kotlin.text.isNotEmpty' call
-    var tmp0_isNotEmpty = $this.n3k_1;
+    var tmp0_isNotEmpty = $this.m3k_1;
     tmp$ret$0 = charSequenceLength(tmp0_isNotEmpty) > 0;
     if (tmp$ret$0) {
       var tmp0_this = $this;
       // Inline function 'kotlin.collections.plusAssign' call
-      var tmp1_plusAssign = tmp0_this.m3k_1;
+      var tmp1_plusAssign = tmp0_this.l3k_1;
       Companion_getInstance_59();
-      var tmp2_plusAssign = new ParserEvent(4, VOID, $this.n3k_1.toString());
+      var tmp2_plusAssign = new ParserEvent(4, VOID, $this.m3k_1.toString());
       tmp1_plusAssign.b(tmp2_plusAssign);
-      $this.n3k_1.jb();
+      $this.m3k_1.jb();
     }
     var tmp1_this = $this;
     // Inline function 'kotlin.collections.plusAssign' call
-    var tmp3_plusAssign = tmp1_this.m3k_1;
+    var tmp3_plusAssign = tmp1_this.l3k_1;
     tmp3_plusAssign.b(event);
   }
   function SaxXmlPullParser() {
     var tmp = this;
     Companion_getInstance_59();
-    tmp.l3k_1 = new ParserEvent(0);
+    tmp.k3k_1 = new ParserEvent(0);
     var tmp_0 = this;
     var tmp$ret$0;
     // Inline function 'kotlin.collections.mutableListOf' call
     tmp$ret$0 = ArrayList_init_$Create$();
-    tmp_0.m3k_1 = tmp$ret$0;
-    this.n3k_1 = StringBuilder_init_$Create$();
+    tmp_0.l3k_1 = tmp$ret$0;
+    this.m3k_1 = StringBuilder_init_$Create$();
   }
   protoOf(SaxXmlPullParser).u2r = function () {
-    return this.l3k_1.h3k_1;
+    return this.k3k_1.g3k_1;
   };
   protoOf(SaxXmlPullParser).v2r = function () {
-    var tmp0_safe_receiver = this.l3k_1.i3k_1;
-    return tmp0_safe_receiver == null ? null : tmp0_safe_receiver.f3k_1;
+    var tmp0_safe_receiver = this.k3k_1.h3k_1;
+    return tmp0_safe_receiver == null ? null : tmp0_safe_receiver.e3k_1;
   };
   protoOf(SaxXmlPullParser).id = function () {
-    var tmp0_safe_receiver = this.l3k_1.i3k_1;
-    return tmp0_safe_receiver == null ? null : tmp0_safe_receiver.g3k_1;
+    var tmp0_safe_receiver = this.k3k_1.h3k_1;
+    return tmp0_safe_receiver == null ? null : tmp0_safe_receiver.f3k_1;
   };
   protoOf(SaxXmlPullParser).t2r = function (type, namespace, name) {
     var tmp$ret$0;
     // Inline function 'kotlin.with' call
-    var tmp0_with = this.l3k_1;
+    var tmp0_with = this.k3k_1;
     // Inline function 'kotlin.contracts.contract' call
-    if (!(tmp0_with.h3k_1 === type))
+    if (!(tmp0_with.g3k_1 === type))
       throw new XmlPullParserException('expected ' + type);
     var tmp;
     if (!(namespace == null)) {
-      var tmp0_safe_receiver = tmp0_with.i3k_1;
-      tmp = !(namespace == (tmp0_safe_receiver == null ? null : tmp0_safe_receiver.f3k_1));
+      var tmp0_safe_receiver = tmp0_with.h3k_1;
+      tmp = !(namespace == (tmp0_safe_receiver == null ? null : tmp0_safe_receiver.e3k_1));
     } else {
       tmp = false;
     }
@@ -11521,8 +11584,8 @@
     var tmp_0;
     var tmp_1;
     if (!(name == null)) {
-      var tmp1_safe_receiver = tmp0_with.i3k_1;
-      tmp_1 = !((tmp1_safe_receiver == null ? null : tmp1_safe_receiver.g3k_1) == name);
+      var tmp1_safe_receiver = tmp0_with.h3k_1;
+      tmp_1 = !((tmp1_safe_receiver == null ? null : tmp1_safe_receiver.f3k_1) == name);
     } else {
       tmp_1 = false;
     }
@@ -11535,12 +11598,12 @@
   protoOf(SaxXmlPullParser).h = function () {
     var tmp$ret$0;
     // Inline function 'kotlin.also' call
-    var tmp0_also = removeFirst(this.m3k_1);
+    var tmp0_also = removeFirst(this.l3k_1);
     // Inline function 'kotlin.contracts.contract' call
     // Inline function 'org.cru.godtools.shared.tool.parser.xml.SaxXmlPullParser.next.<anonymous>' call
-    this.l3k_1 = tmp0_also;
+    this.k3k_1 = tmp0_also;
     tmp$ret$0 = tmp0_also;
-    return tmp$ret$0.h3k_1;
+    return tmp$ret$0.g3k_1;
   };
   protoOf(SaxXmlPullParser).l2p = function () {
     var tmp;
@@ -11549,7 +11612,7 @@
     if (tmp_0 === 4) {
       var tmp$ret$0;
       // Inline function 'kotlin.text.isNullOrBlank' call
-      var tmp0_isNullOrBlank = this.l3k_1.j3k_1;
+      var tmp0_isNullOrBlank = this.k3k_1.i3k_1;
       // Inline function 'kotlin.contracts.contract' call
       tmp$ret$0 = tmp0_isNullOrBlank == null ? true : isBlank(tmp0_isNullOrBlank);
       tmp = tmp$ret$0;
@@ -11559,23 +11622,23 @@
     if (tmp) {
       this.h();
     }
-    var event = this.l3k_1;
+    var event = this.k3k_1;
     var tmp_1;
     Companion_getInstance_59();
-    if (!(event.h3k_1 === 2)) {
+    if (!(event.g3k_1 === 2)) {
       Companion_getInstance_59();
-      tmp_1 = !(event.h3k_1 === 3);
+      tmp_1 = !(event.g3k_1 === 3);
     } else {
       tmp_1 = false;
     }
     if (tmp_1) {
-      throw new XmlPullParserException('Expected start or end tag. Found: ' + event.h3k_1);
+      throw new XmlPullParserException('Expected start or end tag. Found: ' + event.g3k_1);
     }
-    return event.h3k_1;
+    return event.g3k_1;
   };
   protoOf(SaxXmlPullParser).l3b = function () {
     Companion_getInstance_59();
-    this.q3g(2);
+    this.p3g(2);
     var tmp0_subject = this.h();
     var tmp;
     Companion_getInstance_59();
@@ -11584,7 +11647,7 @@
       // Inline function 'kotlin.also' call
       var tmp$ret$0;
       // Inline function 'kotlin.text.orEmpty' call
-      var tmp0_orEmpty = this.l3k_1.j3k_1;
+      var tmp0_orEmpty = this.k3k_1.i3k_1;
       var tmp0_elvis_lhs = tmp0_orEmpty;
       tmp$ret$0 = tmp0_elvis_lhs == null ? '' : tmp0_elvis_lhs;
       var tmp1_also = tmp$ret$0;
@@ -11619,13 +11682,13 @@
   protoOf(SaxXmlPullParser).i2v = function (namespace, name) {
     var tmp$ret$1;
     // Inline function 'kotlin.takeIf' call
-    var tmp0_takeIf = this.l3k_1;
+    var tmp0_takeIf = this.k3k_1;
     // Inline function 'kotlin.contracts.contract' call
     var tmp;
     var tmp$ret$0;
     // Inline function 'org.cru.godtools.shared.tool.parser.xml.SaxXmlPullParser.getAttributeValue.<anonymous>' call
     Companion_getInstance_59();
-    tmp$ret$0 = tmp0_takeIf.h3k_1 === 2;
+    tmp$ret$0 = tmp0_takeIf.g3k_1 === 2;
     if (tmp$ret$0) {
       tmp = tmp0_takeIf;
     } else {
@@ -11640,27 +11703,27 @@
       tmp_0 = tmp0_elvis_lhs;
     }
     var event = tmp_0;
-    var tmp1_safe_receiver = event.k3k_1;
+    var tmp1_safe_receiver = event.j3k_1;
     return tmp1_safe_receiver == null ? null : tmp1_safe_receiver.c2(new QName(namespace, name));
   };
-  protoOf(SaxXmlPullParser).o3k = function (qname, attrs) {
+  protoOf(SaxXmlPullParser).n3k = function (qname, attrs) {
     Companion_getInstance_59();
     enqueueEvent(this, new ParserEvent(2, qname, VOID, attrs));
   };
-  protoOf(SaxXmlPullParser).p3k = function (text) {
-    this.n3k_1.ib(text);
+  protoOf(SaxXmlPullParser).o3k = function (text) {
+    this.m3k_1.ib(text);
   };
-  protoOf(SaxXmlPullParser).q3k = function (qname) {
+  protoOf(SaxXmlPullParser).p3k = function (qname) {
     Companion_getInstance_59();
     enqueueEvent(this, new ParserEvent(3, qname));
   };
   function Companion_56() {
     Companion_instance_56 = this;
-    this.r3k_1 = 0;
-    this.s3k_1 = 1;
-    this.t3k_1 = 2;
-    this.u3k_1 = 3;
-    this.v3k_1 = 4;
+    this.q3k_1 = 0;
+    this.r3k_1 = 1;
+    this.s3k_1 = 2;
+    this.t3k_1 = 3;
+    this.u3k_1 = 4;
   }
   var Companion_instance_56;
   function Companion_getInstance_59() {
@@ -11714,26 +11777,26 @@
   }
   var SAX_OPTIONS;
   function InternalSAXParser($outer) {
-    this.w3k_1 = $outer;
+    this.v3k_1 = $outer;
     SAXParser.call(this, true, get_SAX_OPTIONS());
   }
-  protoOf(InternalSAXParser).x3k = function (tag) {
-    return this.w3k_1.o3k(new QName(tag.uri, tag.local), convert(tag.attributes, this.w3k_1));
+  protoOf(InternalSAXParser).w3k = function (tag) {
+    return this.v3k_1.n3k(new QName(tag.uri, tag.local), convert(tag.attributes, this.v3k_1));
   };
   protoOf(InternalSAXParser).onopentag = function (tag) {
-    return this.x3k(tag);
+    return this.w3k(tag);
   };
-  protoOf(InternalSAXParser).y3k = function (tagName) {
-    return this.w3k_1.q3k(new QName(VOID, tagName));
+  protoOf(InternalSAXParser).x3k = function (tagName) {
+    return this.v3k_1.p3k(new QName(VOID, tagName));
   };
   protoOf(InternalSAXParser).onclosetag = function (tagName) {
-    return this.y3k(tagName);
+    return this.x3k(tagName);
   };
-  protoOf(InternalSAXParser).z3k = function (t) {
-    return this.w3k_1.p3k(t);
+  protoOf(InternalSAXParser).y3k = function (t) {
+    return this.v3k_1.o3k(t);
   };
   protoOf(InternalSAXParser).ontext = function (t) {
-    return this.z3k(t);
+    return this.y3k(t);
   };
   function convert(_this__u8e3s4, $this) {
     var tmp$ret$7;
@@ -11801,16 +11864,16 @@
     tmp0_apply.write(xml);
     tmp0_apply.close();
     tmp$ret$0 = tmp0_apply;
-    tmp.d3l_1 = tmp$ret$0;
+    tmp.c3l_1 = tmp$ret$0;
   }
   function SAX_OPTIONS$1() {
-    this.e3l_1 = true;
+    this.d3l_1 = true;
   }
-  protoOf(SAX_OPTIONS$1).f3l = function () {
-    return this.e3l_1;
+  protoOf(SAX_OPTIONS$1).e3l = function () {
+    return this.d3l_1;
   };
   defineProp(protoOf(SAX_OPTIONS$1), 'xmlns', function () {
-    return this.f3l();
+    return this.e3l();
   });
   var properties_initialized_JsXmlPullParser_kt_u4cdem;
   function _init_properties_JsXmlPullParser_kt__2zt5j4() {
@@ -11822,8 +11885,8 @@
   }
   function $getXmlParserCOROUTINE$1(_this__u8e3s4, fileName, resultContinuation) {
     CoroutineImpl.call(this, resultContinuation);
-    this.o3l_1 = _this__u8e3s4;
-    this.p3l_1 = fileName;
+    this.n3l_1 = _this__u8e3s4;
+    this.o3l_1 = fileName;
   }
   protoOf($getXmlParserCOROUTINE$1).re = function () {
     var suspendResult = this.ae_1;
@@ -11834,7 +11897,7 @@
           case 0:
             this.zd_1 = 2;
             this.yd_1 = 1;
-            suspendResult = await_0(this.o3l_1.readFile(this.p3l_1), this);
+            suspendResult = await_0(this.n3l_1.readFile(this.o3l_1), this);
             if (suspendResult === get_COROUTINE_SUSPENDED()) {
               return suspendResult;
             }
@@ -11867,14 +11930,14 @@
   function JsXmlPullParserFactory() {
     XmlPullParserFactory.call(this);
   }
-  protoOf(JsXmlPullParserFactory).q3l = function (fileName, $completion) {
+  protoOf(JsXmlPullParserFactory).p3l = function (fileName, $completion) {
     var tmp = new $getXmlParserCOROUTINE$1(this, fileName, $completion);
     tmp.ae_1 = Unit_getInstance();
     tmp.be_1 = null;
     return tmp.re();
   };
   protoOf(JsXmlPullParserFactory).k2p = function (fileName, $completion) {
-    return this.q3l(fileName, $completion);
+    return this.p3l(fileName, $completion);
   };
   function XmlPullParserException(s) {
     Exception_init_$Init$(s, this);
@@ -11911,15 +11974,15 @@
   protoOf(Card).a2t = get_content;
   protoOf(Card).u2v = get_isClickable;
   protoOf(Card).v2v = get_events;
-  protoOf(Category).g2y = get_primaryColor;
-  protoOf(Category).h2y = get_primaryTextColor;
-  protoOf(Category).i2y = get_buttonStyle;
-  protoOf(Category).j2x = get_buttonColor;
-  protoOf(Category).j2y = get_cardBackgroundColor;
-  protoOf(Category).k2y = get_multiselectOptionBackgroundColor;
-  protoOf(Category).l2y = get_multiselectOptionSelectedColor;
-  protoOf(Category).m2y = get_textScale;
-  protoOf(Category).n2y = get_textAlign;
+  protoOf(Category).i2y = get_primaryColor;
+  protoOf(Category).j2y = get_primaryTextColor;
+  protoOf(Category).k2y = get_buttonStyle;
+  protoOf(Category).g2x = get_buttonColor;
+  protoOf(Category).l2y = get_cardBackgroundColor;
+  protoOf(Category).m2y = get_multiselectOptionBackgroundColor;
+  protoOf(Category).n2y = get_multiselectOptionSelectedColor;
+  protoOf(Category).o2y = get_textScale;
+  protoOf(Category).p2y = get_textAlign;
   protoOf(Fallback).h2t = isInvisible;
   protoOf(Fallback).i2t = isInvisibleFlow;
   protoOf(Fallback).j2t = isGone;
@@ -11954,8 +12017,8 @@
   protoOf(Link).getAnalyticsEvents = getAnalyticsEvents;
   protoOf(Link).u2v = get_isClickable;
   protoOf(Link).v2v = get_events;
-  protoOf(Manifest).j2x = get_buttonColor;
-  protoOf(Manifest).n2y = get_textAlign;
+  protoOf(Manifest).g2x = get_buttonColor;
+  protoOf(Manifest).p2y = get_textAlign;
   protoOf(Option).a2t = get_content;
   protoOf(Option).getAnalyticsEvents = getAnalyticsEvents;
   protoOf(Multiselect).h2t = isInvisible;
@@ -11971,13 +12034,13 @@
   protoOf(Spacer).i2t = isInvisibleFlow;
   protoOf(Spacer).j2t = isGone;
   protoOf(Spacer).k2t = isGoneFlow;
-  protoOf(StylesOverride).g2y = get_primaryColor;
-  protoOf(StylesOverride).h2y = get_primaryTextColor;
-  protoOf(StylesOverride).i2y = get_buttonStyle;
-  protoOf(StylesOverride).j2x = get_buttonColor;
-  protoOf(StylesOverride).j2y = get_cardBackgroundColor;
-  protoOf(StylesOverride).k2y = get_multiselectOptionBackgroundColor;
-  protoOf(StylesOverride).l2y = get_multiselectOptionSelectedColor;
+  protoOf(StylesOverride).i2y = get_primaryColor;
+  protoOf(StylesOverride).j2y = get_primaryTextColor;
+  protoOf(StylesOverride).k2y = get_buttonStyle;
+  protoOf(StylesOverride).g2x = get_buttonColor;
+  protoOf(StylesOverride).l2y = get_cardBackgroundColor;
+  protoOf(StylesOverride).m2y = get_multiselectOptionBackgroundColor;
+  protoOf(StylesOverride).n2y = get_multiselectOptionSelectedColor;
   protoOf(Tab).a2t = get_content;
   protoOf(Tab).getAnalyticsEvents = getAnalyticsEvents;
   protoOf(Tabs).h2t = isInvisible;
@@ -11992,83 +12055,83 @@
   protoOf(Video).i2t = isInvisibleFlow;
   protoOf(Video).j2t = isGone;
   protoOf(Video).k2t = isGoneFlow;
-  protoOf(Page).i2y = get_buttonStyle;
-  protoOf(Page).j2x = get_buttonColor;
-  protoOf(Page).n2y = get_textAlign;
+  protoOf(Page).k2y = get_buttonStyle;
+  protoOf(Page).g2x = get_buttonColor;
+  protoOf(Page).p2y = get_textAlign;
   protoOf(Page).getAnalyticsEvents = getAnalyticsEvents;
-  protoOf(LessonPage).i2y = get_buttonStyle;
-  protoOf(LessonPage).j2x = get_buttonColor;
-  protoOf(LessonPage).n2y = get_textAlign;
+  protoOf(LessonPage).k2y = get_buttonStyle;
+  protoOf(LessonPage).g2x = get_buttonColor;
+  protoOf(LessonPage).p2y = get_textAlign;
   protoOf(LessonPage).getAnalyticsEvents = getAnalyticsEvents;
   protoOf(LessonPage).a2t = get_content;
   protoOf(Card_0).a2t = get_content;
   protoOf(Card_0).getAnalyticsEvents = getAnalyticsEvents;
-  protoOf(CardCollectionPage).i2y = get_buttonStyle;
-  protoOf(CardCollectionPage).j2x = get_buttonColor;
-  protoOf(CardCollectionPage).n2y = get_textAlign;
+  protoOf(CardCollectionPage).k2y = get_buttonStyle;
+  protoOf(CardCollectionPage).g2x = get_buttonColor;
+  protoOf(CardCollectionPage).p2y = get_textAlign;
   protoOf(CardCollectionPage).getAnalyticsEvents = getAnalyticsEvents;
-  protoOf(ContentPage).i2y = get_buttonStyle;
-  protoOf(ContentPage).j2x = get_buttonColor;
-  protoOf(ContentPage).n2y = get_textAlign;
+  protoOf(ContentPage).k2y = get_buttonStyle;
+  protoOf(ContentPage).g2x = get_buttonColor;
+  protoOf(ContentPage).p2y = get_textAlign;
   protoOf(ContentPage).getAnalyticsEvents = getAnalyticsEvents;
   protoOf(ContentPage).a2t = get_content;
   protoOf(InlineTip).h2t = isInvisible;
   protoOf(InlineTip).i2t = isInvisibleFlow;
   protoOf(InlineTip).j2t = isGone;
   protoOf(InlineTip).k2t = isGoneFlow;
-  protoOf(Tip).i2y = get_buttonStyle;
-  protoOf(Tip).j2x = get_buttonColor;
-  protoOf(Tip).j2y = get_cardBackgroundColor;
-  protoOf(Tip).k2y = get_multiselectOptionBackgroundColor;
-  protoOf(Tip).l2y = get_multiselectOptionSelectedColor;
-  protoOf(Tip).m2y = get_textScale;
-  protoOf(Tip).n2y = get_textAlign;
+  protoOf(Tip).k2y = get_buttonStyle;
+  protoOf(Tip).g2x = get_buttonColor;
+  protoOf(Tip).l2y = get_cardBackgroundColor;
+  protoOf(Tip).m2y = get_multiselectOptionBackgroundColor;
+  protoOf(Tip).n2y = get_multiselectOptionSelectedColor;
+  protoOf(Tip).o2y = get_textScale;
+  protoOf(Tip).p2y = get_textAlign;
   protoOf(TipPage).a2t = get_content;
-  protoOf(Header).g2y = get_primaryColor;
-  protoOf(Header).h2y = get_primaryTextColor;
-  protoOf(Header).i2y = get_buttonStyle;
-  protoOf(Header).j2x = get_buttonColor;
-  protoOf(Header).j2y = get_cardBackgroundColor;
-  protoOf(Header).k2y = get_multiselectOptionBackgroundColor;
-  protoOf(Header).l2y = get_multiselectOptionSelectedColor;
-  protoOf(Header).m2y = get_textScale;
-  protoOf(Header).n2y = get_textAlign;
+  protoOf(Header).i2y = get_primaryColor;
+  protoOf(Header).j2y = get_primaryTextColor;
+  protoOf(Header).k2y = get_buttonStyle;
+  protoOf(Header).g2x = get_buttonColor;
+  protoOf(Header).l2y = get_cardBackgroundColor;
+  protoOf(Header).m2y = get_multiselectOptionBackgroundColor;
+  protoOf(Header).n2y = get_multiselectOptionSelectedColor;
+  protoOf(Header).o2y = get_textScale;
+  protoOf(Header).p2y = get_textAlign;
   protoOf(Hero).a2t = get_content;
   protoOf(Hero).getAnalyticsEvents = getAnalyticsEvents;
   protoOf(Modal).a2t = get_content;
-  protoOf(Modal).j2y = get_cardBackgroundColor;
-  protoOf(Modal).k2y = get_multiselectOptionBackgroundColor;
-  protoOf(Modal).l2y = get_multiselectOptionSelectedColor;
-  protoOf(Modal).m2y = get_textScale;
-  protoOf(Card_1).g2y = get_primaryColor;
-  protoOf(Card_1).h2y = get_primaryTextColor;
-  protoOf(Card_1).i2y = get_buttonStyle;
-  protoOf(Card_1).j2x = get_buttonColor;
-  protoOf(Card_1).j2y = get_cardBackgroundColor;
-  protoOf(Card_1).k2y = get_multiselectOptionBackgroundColor;
-  protoOf(Card_1).l2y = get_multiselectOptionSelectedColor;
-  protoOf(Card_1).m2y = get_textScale;
-  protoOf(Card_1).n2y = get_textAlign;
+  protoOf(Modal).l2y = get_cardBackgroundColor;
+  protoOf(Modal).m2y = get_multiselectOptionBackgroundColor;
+  protoOf(Modal).n2y = get_multiselectOptionSelectedColor;
+  protoOf(Modal).o2y = get_textScale;
+  protoOf(Card_1).i2y = get_primaryColor;
+  protoOf(Card_1).j2y = get_primaryTextColor;
+  protoOf(Card_1).k2y = get_buttonStyle;
+  protoOf(Card_1).g2x = get_buttonColor;
+  protoOf(Card_1).l2y = get_cardBackgroundColor;
+  protoOf(Card_1).m2y = get_multiselectOptionBackgroundColor;
+  protoOf(Card_1).n2y = get_multiselectOptionSelectedColor;
+  protoOf(Card_1).o2y = get_textScale;
+  protoOf(Card_1).p2y = get_textAlign;
   protoOf(Card_1).a2t = get_content;
   protoOf(Card_1).getAnalyticsEvents = getAnalyticsEvents;
-  protoOf(TractPage).i2y = get_buttonStyle;
-  protoOf(TractPage).j2x = get_buttonColor;
-  protoOf(TractPage).n2y = get_textAlign;
+  protoOf(TractPage).k2y = get_buttonStyle;
+  protoOf(TractPage).g2x = get_buttonColor;
+  protoOf(TractPage).p2y = get_textAlign;
   protoOf(TractPage).getAnalyticsEvents = getAnalyticsEvents;
-  protoOf(SaxXmlPullParser).q3g = require$default;
+  protoOf(SaxXmlPullParser).p3g = require$default;
   protoOf(SaxXmlPullParser).n2t = getAttributeValue;
-  protoOf(JsXmlPullParser).q3g = require$default;
+  protoOf(JsXmlPullParser).p3g = require$default;
   protoOf(JsXmlPullParser).n2t = getAttributeValue;
   //endregion
   //region block: init
   XMLNS_ANALYTICS = 'https://mobile-content-api.cru.org/xmlns/analytics';
   XMLNS_CONTENT = 'https://mobile-content-api.cru.org/xmlns/content';
+  XML_BACKGROUND_COLOR = 'background-color';
   SCHEMA_VERSION = 2;
   XMLNS_MANIFEST = 'https://mobile-content-api.cru.org/xmlns/manifest';
   XML_DISMISS_LISTENERS = 'dismiss-listeners';
   XML_PRIMARY_COLOR = 'primary-color';
   XML_PRIMARY_TEXT_COLOR = 'primary-text-color';
-  XML_BACKGROUND_COLOR = 'background-color';
   XML_BACKGROUND_IMAGE = 'background-image';
   XML_BACKGROUND_IMAGE_GRAVITY = 'background-image-align';
   XML_BACKGROUND_IMAGE_SCALE_TYPE = 'background-image-scale-type';
@@ -12158,6 +12221,20 @@
     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.Button = Button;
+    $org$cru$godtools$shared$tool$parser$model.Button.Style = Style;
+    $org$cru$godtools$shared$tool$parser$model.Button.Style.values = values_2;
+    $org$cru$godtools$shared$tool$parser$model.Button.Style.valueOf = valueOf_2;
+    defineProp($org$cru$godtools$shared$tool$parser$model.Button.Style, 'CONTAINED', Style_CONTAINED_getInstance);
+    defineProp($org$cru$godtools$shared$tool$parser$model.Button.Style, 'OUTLINED', Style_OUTLINED_getInstance);
+    defineProp($org$cru$godtools$shared$tool$parser$model.Button.Style, 'UNKNOWN', Style_UNKNOWN_getInstance);
+    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 = _.org || (_.org = {});
     var $org$cru = $org.cru || ($org.cru = {});
     var $org$cru$godtools = $org$cru.godtools || ($org$cru.godtools = {});
@@ -12203,14 +12280,14 @@
     $org$cru$godtools$shared$tool$parser$model.Gravity = Gravity;
     defineProp($org$cru$godtools$shared$tool$parser$model.Gravity, 'Companion', Companion_getInstance_22);
     $org$cru$godtools$shared$tool$parser$model.Gravity.Horizontal = Horizontal;
-    $org$cru$godtools$shared$tool$parser$model.Gravity.Horizontal.values = values_2;
-    $org$cru$godtools$shared$tool$parser$model.Gravity.Horizontal.valueOf = valueOf_1;
+    $org$cru$godtools$shared$tool$parser$model.Gravity.Horizontal.values = values_4;
+    $org$cru$godtools$shared$tool$parser$model.Gravity.Horizontal.valueOf = valueOf_3;
     defineProp($org$cru$godtools$shared$tool$parser$model.Gravity.Horizontal, 'START', Horizontal_START_getInstance);
     defineProp($org$cru$godtools$shared$tool$parser$model.Gravity.Horizontal, 'CENTER', Horizontal_CENTER_getInstance);
     defineProp($org$cru$godtools$shared$tool$parser$model.Gravity.Horizontal, 'END', Horizontal_END_getInstance);
     $org$cru$godtools$shared$tool$parser$model.Gravity.Vertical = Vertical;
-    $org$cru$godtools$shared$tool$parser$model.Gravity.Vertical.values = values_3;
-    $org$cru$godtools$shared$tool$parser$model.Gravity.Vertical.valueOf = valueOf_2;
+    $org$cru$godtools$shared$tool$parser$model.Gravity.Vertical.values = values_5;
+    $org$cru$godtools$shared$tool$parser$model.Gravity.Vertical.valueOf = valueOf_4;
     defineProp($org$cru$godtools$shared$tool$parser$model.Gravity.Vertical, 'TOP', Vertical_TOP_getInstance);
     defineProp($org$cru$godtools$shared$tool$parser$model.Gravity.Vertical, 'CENTER', Vertical_CENTER_getInstance);
     defineProp($org$cru$godtools$shared$tool$parser$model.Gravity.Vertical, 'BOTTOM', Vertical_BOTTOM_getInstance);
@@ -12242,8 +12319,8 @@
     defineProp($org$cru$godtools$shared$tool$parser$model.Input.Error, 'Required', Required_getInstance);
     defineProp($org$cru$godtools$shared$tool$parser$model.Input.Error, 'InvalidEmail', InvalidEmail_getInstance);
     $org$cru$godtools$shared$tool$parser$model.Input.Type = Type_0;
-    $org$cru$godtools$shared$tool$parser$model.Input.Type.values = values_4;
-    $org$cru$godtools$shared$tool$parser$model.Input.Type.valueOf = valueOf_3;
+    $org$cru$godtools$shared$tool$parser$model.Input.Type.values = values_6;
+    $org$cru$godtools$shared$tool$parser$model.Input.Type.valueOf = valueOf_5;
     defineProp($org$cru$godtools$shared$tool$parser$model.Input.Type, 'TEXT', Type_TEXT_getInstance);
     defineProp($org$cru$godtools$shared$tool$parser$model.Input.Type, 'EMAIL', Type_EMAIL_getInstance);
     defineProp($org$cru$godtools$shared$tool$parser$model.Input.Type, 'PHONE', Type_PHONE_getInstance);
@@ -12258,8 +12335,8 @@
     $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;
-    $org$cru$godtools$shared$tool$parser$model.Manifest.Type.values = values_5;
-    $org$cru$godtools$shared$tool$parser$model.Manifest.Type.valueOf = valueOf_4;
+    $org$cru$godtools$shared$tool$parser$model.Manifest.Type.values = values_7;
+    $org$cru$godtools$shared$tool$parser$model.Manifest.Type.valueOf = valueOf_6;
     defineProp($org$cru$godtools$shared$tool$parser$model.Manifest.Type, 'ARTICLE', Type_ARTICLE_getInstance);
     defineProp($org$cru$godtools$shared$tool$parser$model.Manifest.Type, 'CYOA', Type_CYOA_getInstance);
     defineProp($org$cru$godtools$shared$tool$parser$model.Manifest.Type, 'LESSON', Type_LESSON_getInstance);
@@ -12299,14 +12376,14 @@
     $org$cru$godtools$shared$tool$parser$model.Text = Text;
     $org$cru$godtools$shared$tool$parser$model.Text.createTestText = createTestText;
     $org$cru$godtools$shared$tool$parser$model.Text.Align = Align;
-    $org$cru$godtools$shared$tool$parser$model.Text.Align.values = values_6;
-    $org$cru$godtools$shared$tool$parser$model.Text.Align.valueOf = valueOf_5;
+    $org$cru$godtools$shared$tool$parser$model.Text.Align.values = values_8;
+    $org$cru$godtools$shared$tool$parser$model.Text.Align.valueOf = valueOf_7;
     defineProp($org$cru$godtools$shared$tool$parser$model.Text.Align, 'START', Align_START_getInstance);
     defineProp($org$cru$godtools$shared$tool$parser$model.Text.Align, 'CENTER', Align_CENTER_getInstance);
     defineProp($org$cru$godtools$shared$tool$parser$model.Text.Align, 'END', Align_END_getInstance);
     $org$cru$godtools$shared$tool$parser$model.Text.Style = Style_1;
-    $org$cru$godtools$shared$tool$parser$model.Text.Style.values = values_7;
-    $org$cru$godtools$shared$tool$parser$model.Text.Style.valueOf = valueOf_6;
+    $org$cru$godtools$shared$tool$parser$model.Text.Style.values = values_9;
+    $org$cru$godtools$shared$tool$parser$model.Text.Style.valueOf = valueOf_8;
     defineProp($org$cru$godtools$shared$tool$parser$model.Text.Style, 'BOLD', Style_BOLD_getInstance);
     defineProp($org$cru$godtools$shared$tool$parser$model.Text.Style, 'ITALIC', Style_ITALIC_getInstance);
     defineProp($org$cru$godtools$shared$tool$parser$model.Text.Style, 'UNDERLINE', Style_UNDERLINE_getInstance);
@@ -12319,8 +12396,8 @@
     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.Video = Video;
     $org$cru$godtools$shared$tool$parser$model.Video.Provider = Provider;
-    $org$cru$godtools$shared$tool$parser$model.Video.Provider.values = values_8;
-    $org$cru$godtools$shared$tool$parser$model.Video.Provider.valueOf = valueOf_7;
+    $org$cru$godtools$shared$tool$parser$model.Video.Provider.values = values_10;
+    $org$cru$godtools$shared$tool$parser$model.Video.Provider.valueOf = valueOf_9;
     defineProp($org$cru$godtools$shared$tool$parser$model.Video.Provider, 'YOUTUBE', Provider_YOUTUBE_getInstance);
     defineProp($org$cru$godtools$shared$tool$parser$model.Video.Provider, 'UNKNOWN', Provider_UNKNOWN_getInstance);
     var $org = _.org || (_.org = {});