npm - @cruglobal/godtools-shared - Versions diffs - 1.1.2-SNAPSHOT.1686 → 1.1.2-SNAPSHOT.1691 - Mend

@cruglobal/godtools-shared 1.1.2-SNAPSHOT.1686 → 1.1.2-SNAPSHOT.1691

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

package/kotlin-kotlin-stdlib.js +5 -5
package/kotlin-kotlin-stdlib.js.map +1 -1
package/kotlin-mpp-godtools-tool-parser-module-parser.js +715 -713
package/kotlin-mpp-godtools-tool-parser-module-parser.js.map +1 -1
package/package.json +1 -1

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

@@ -180,9 +180,9 @@
   var launchIn = kotlin_org_jetbrains_kotlinx_kotlinx_coroutines_core.$_$.m;
   var CoroutineScope_0 = kotlin_org_jetbrains_kotlinx_kotlinx_coroutines_core.$_$.q;
   var contains_1 = kotlin_kotlin.$_$.x7;
+  var IndexOutOfBoundsException_init_$Create$ = kotlin_kotlin.$_$.g1;
   var StringBuilder_init_$Create$ = kotlin_kotlin.$_$.v;
   var removeFirst = kotlin_kotlin.$_$.q4;
-  var IndexOutOfBoundsException_init_$Create$ = kotlin_kotlin.$_$.g1;
   var Exception_init_$Init$_0 = kotlin_kotlin.$_$.y;
   var RenderCondition_ALWAYS_getInstance = kotlin_colormath_root_colormath.$_$.c;
   var formatCssString = kotlin_colormath_root_colormath.$_$.a;
@@ -290,13 +290,13 @@
       tmp = true;
     } else {
       // Inline function 'kotlin.collections.isNotEmpty' call
-      tmp = !this.k3g().p();
+      tmp = !this.j3g().p();
     }
     return tmp;
   }
   function get_events() {
     // Inline function 'kotlin.collections.toTypedArray' call
-    var this_0 = this.k3g();
+    var this_0 = this.j3g();
     return copyToArray(this_0);
   }
   initMetadataForInterface(Clickable, 'Clickable', VOID, VOID, [Base]);
@@ -323,7 +323,7 @@
   }
   function get_buttonColor() {
     var tmp0_safe_receiver = get_stylesParent(this);
-    return tmp0_safe_receiver == null ? null : tmp0_safe_receiver.y3h();
+    return tmp0_safe_receiver == null ? null : tmp0_safe_receiver.x3h();
   }
   function get_cardBackgroundColor() {
     return get_cardBackgroundColor_0(get_stylesParent(this));
@@ -333,7 +333,7 @@
   }
   function get_multiselectOptionSelectedColor() {
     var tmp0_safe_receiver = get_stylesParent(this);
-    return tmp0_safe_receiver == null ? null : tmp0_safe_receiver.d3j();
+    return tmp0_safe_receiver == null ? null : tmp0_safe_receiver.c3j();
   }
   function get_textColor() {
     return get_textColor_0(get_stylesParent(this));
@@ -375,7 +375,7 @@
       // Inline function 'kotlin.let' call
       // Inline function 'org.cru.godtools.shared.tool.parser.model.HasPages.findPage.<anonymous>' call
       // Inline function 'kotlin.collections.find' call
-      var tmp0 = this.n3l();
+      var tmp0 = this.m3l();
       var tmp$ret$1;
       $l$block: {
         // Inline function 'kotlin.collections.firstOrNull' call
@@ -396,7 +396,7 @@
   }
   function get_pages() {
     // Inline function 'kotlin.collections.toTypedArray' call
-    var this_0 = this.n3l();
+    var this_0 = this.m3l();
     return copyToArray(this_0);
   }
   initMetadataForInterface(HasPages, 'HasPages', VOID, VOID, [Base]);
@@ -516,9 +516,6 @@
     }
     return tmp;
   }
-  function getAttributeValue(name) {
-    return this.f3f(null, name);
-  }
   initMetadataForInterface(XmlPullParser, 'XmlPullParser');
   initMetadataForClass(SaxXmlPullParser, 'SaxXmlPullParser', VOID, VOID, [XmlPullParser]);
   initMetadataForClass(XmlPullParserFactory, 'XmlPullParserFactory', VOID, VOID, VOID, [1]);
@@ -1657,24 +1654,24 @@
     Content_init_$Init$(parent, parser, $this);
     Animation.call($this);
     parser.u3c(2, 'https://mobile-content-api.cru.org/xmlns/content', 'animation');
-    $this.c3f_1 = parser.f3f(null, 'resource');
+    $this.c3f_1 = parser.j3e('resource');
     var tmp = $this;
-    var tmp0_safe_receiver = parser.f3f(null, 'loop');
+    var tmp0_safe_receiver = parser.j3e('loop');
     var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : toBoolean(tmp0_safe_receiver);
     tmp.loop = tmp1_elvis_lhs == null ? true : tmp1_elvis_lhs;
     var tmp_0 = $this;
-    var tmp2_safe_receiver = parser.f3f(null, 'autoplay');
+    var tmp2_safe_receiver = parser.j3e('autoplay');
     var tmp3_elvis_lhs = tmp2_safe_receiver == null ? null : toBoolean(tmp2_safe_receiver);
     tmp_0.autoPlay = tmp3_elvis_lhs == null ? true : tmp3_elvis_lhs;
     var tmp_1 = $this;
     // Inline function 'org.cru.godtools.shared.tool.parser.model.toEventIds' call
     var this_0 = parser.j3e('play-listeners');
-    var tmp$ret$0 = Companion_getInstance_17().g3f(this_0);
+    var tmp$ret$0 = Companion_getInstance_17().f3f(this_0);
     tmp_1._playListeners = toSet_0(tmp$ret$0);
     var tmp_2 = $this;
     // Inline function 'org.cru.godtools.shared.tool.parser.model.toEventIds' call
     var this_1 = parser.j3e('stop-listeners');
-    var tmp$ret$1 = Companion_getInstance_17().g3f(this_1);
+    var tmp$ret$1 = Companion_getInstance_17().f3f(this_1);
     tmp_2._stopListeners = toSet_0(tmp$ret$1);
     // Inline function 'org.cru.godtools.shared.tool.parser.model.parseClickableAttrs' call
     var tmp0_safe_receiver_0 = parser.j3e('url');
@@ -1705,7 +1702,7 @@
     // Inline function 'org.cru.godtools.shared.tool.parser.model.toEventIds' call
     var this_2 = parser.j3e('events');
     // Inline function 'org.cru.godtools.shared.tool.parser.model.Animation.<init>.<anonymous>' call
-    $this.d3f_1 = Companion_getInstance_17().g3f(this_2);
+    $this.d3f_1 = Companion_getInstance_17().f3f(this_2);
     $this.e3f_1 = uri;
     skipTag(parser);
     return $this;
@@ -1713,39 +1710,39 @@
   function Animation_init_$Create$(parent, parser) {
     return Animation_init_$Init$(parent, parser, objectCreate(protoOf(Animation)));
   }
-  protoOf(Animation).e3g = function () {
+  protoOf(Animation).d3g = function () {
     return this.c3f_1;
   };
-  protoOf(Animation).f3g = function () {
+  protoOf(Animation).e3g = function () {
     return getResource(this, this.c3f_1);
   };
-  protoOf(Animation).g3g = function () {
+  protoOf(Animation).f3g = function () {
     return this.loop;
   };
-  protoOf(Animation).h3g = function () {
+  protoOf(Animation).g3g = function () {
     return this.autoPlay;
   };
-  protoOf(Animation).i3g = function () {
+  protoOf(Animation).h3g = function () {
     return this._playListeners;
   };
-  protoOf(Animation).j3g = function () {
+  protoOf(Animation).i3g = function () {
     return this._stopListeners;
   };
-  protoOf(Animation).k3g = function () {
+  protoOf(Animation).j3g = function () {
     return this.d3f_1;
   };
-  protoOf(Animation).l3g = function () {
+  protoOf(Animation).k3g = function () {
     return this.e3f_1;
   };
   protoOf(Animation).g3d = function () {
-    return !this.x39().i3f_1.i3c('animation') || protoOf(Content).g3d.call(this);
+    return !this.x39().h3f_1.i3c('animation') || protoOf(Content).g3d.call(this);
   };
-  protoOf(Animation).m3g = function () {
+  protoOf(Animation).l3g = function () {
     // Inline function 'kotlin.collections.toTypedArray' call
     var this_0 = this._playListeners;
     return copyToArray(this_0);
   };
-  protoOf(Animation).n3g = function () {
+  protoOf(Animation).m3g = function () {
     // Inline function 'kotlin.collections.toTypedArray' call
     var this_0 = this._stopListeners;
     return copyToArray(this_0);
@@ -1754,7 +1751,7 @@
   }
   function Companion_5() {
   }
-  protoOf(Companion_5).q3g = function (_this__u8e3s4) {
+  protoOf(Companion_5).p3g = function (_this__u8e3s4) {
     var tmp1_safe_receiver = _this__u8e3s4 == null ? null : split(_this__u8e3s4, charArrayOf([_Char___init__impl__6a9atx(58)]));
     var tmp;
     if (tmp1_safe_receiver == null) {
@@ -1802,13 +1799,13 @@
     this.width = width;
     this.height = height;
   }
-  protoOf(AspectRatio).r3g = function () {
+  protoOf(AspectRatio).q3g = function () {
     return this.width;
   };
-  protoOf(AspectRatio).s3g = function () {
+  protoOf(AspectRatio).r3g = function () {
     return this.height;
   };
-  protoOf(AspectRatio).t3g = function () {
+  protoOf(AspectRatio).s3g = function () {
     return this.width / this.height;
   };
   protoOf(AspectRatio).tf = function () {
@@ -1817,13 +1814,13 @@
   protoOf(AspectRatio).uf = function () {
     return this.height;
   };
-  protoOf(AspectRatio).u3g = function (width, height) {
+  protoOf(AspectRatio).t3g = function (width, height) {
     return new AspectRatio(width, height);
   };
   protoOf(AspectRatio).copy = function (width, height, $super) {
     width = width === VOID ? this.width : width;
     height = height === VOID ? this.height : height;
-    return this.u3g(width, height);
+    return this.t3g(width, height);
   };
   protoOf(AspectRatio).toString = function () {
     return 'AspectRatio(width=' + this.width + ', height=' + this.height + ')';
@@ -1848,7 +1845,7 @@
   function Base() {
   }
   function getResource(_this__u8e3s4, name) {
-    return _this__u8e3s4.x39().v3g(name);
+    return _this__u8e3s4.x39().u3g(name);
   }
   function get_stylesParent(_this__u8e3s4) {
     var tmp1_safe_receiver = _this__u8e3s4 == null ? null : _this__u8e3s4.am();
@@ -1875,9 +1872,9 @@
   var Type_UNKNOWN_instance;
   function Companion_6() {
     Companion_instance_7 = this;
-    this.w3g_1 = Type_UNKNOWN_getInstance();
+    this.v3g_1 = Type_UNKNOWN_getInstance();
   }
-  protoOf(Companion_6).x3g = function (_this__u8e3s4) {
+  protoOf(Companion_6).w3g = function (_this__u8e3s4) {
     switch (_this__u8e3s4) {
       case 'event':
         return Type_EVENT_getInstance();
@@ -1932,7 +1929,7 @@
   var Style_UNKNOWN_instance;
   function Companion_7() {
   }
-  protoOf(Companion_7).y3g = function (_this__u8e3s4) {
+  protoOf(Companion_7).x3g = function (_this__u8e3s4) {
     switch (_this__u8e3s4) {
       case 'contained':
         return Style_CONTAINED_getInstance();
@@ -1974,12 +1971,12 @@
   }
   function Companion_8() {
     Companion_instance_9 = this;
-    this.z3g_1 = 'button';
-    this.a3h_1 = Horizontal_CENTER_getInstance();
-    this.b3h_1 = new Percent(1.0);
-    this.c3h_1 = get_TRANSPARENT();
-    this.d3h_1 = Horizontal_START_getInstance();
-    this.e3h_1 = 18;
+    this.y3g_1 = 'button';
+    this.z3g_1 = Horizontal_CENTER_getInstance();
+    this.a3h_1 = new Percent(1.0);
+    this.b3h_1 = get_TRANSPARENT();
+    this.c3h_1 = Horizontal_START_getInstance();
+    this.d3h_1 = 18;
   }
   var Companion_instance_9;
   function Companion_getInstance_11() {
@@ -1988,7 +1985,7 @@
     return Companion_instance_9;
   }
   function _get_defaultTextStyles__fjozb5($this) {
-    var tmp0 = $this.q3h_1;
+    var tmp0 = $this.p3h_1;
     // Inline function 'kotlin.getValue' call
     defaultTextStyles$factory();
     return tmp0.h2();
@@ -1997,7 +1994,7 @@
     Content_init_$Init$(parent, parser, $this);
     Button.call($this);
     parser.u3c(2, 'https://mobile-content-api.cru.org/xmlns/content', 'button');
-    var type = Companion_getInstance_9().x3g(parser.j3e('type'));
+    var type = Companion_getInstance_9().w3g(parser.j3e('type'));
     // Inline function 'org.cru.godtools.shared.tool.parser.model.parseClickableAttrs' call
     var tmp0_safe_receiver = parser.j3e('url');
     var tmp;
@@ -2027,18 +2024,18 @@
     // Inline function 'org.cru.godtools.shared.tool.parser.model.toEventIds' call
     var this_0 = parser.j3e('events');
     // Inline function 'org.cru.godtools.shared.tool.parser.model.Button.<init>.<anonymous>' call
-    var events = Companion_getInstance_17().g3f(this_0);
-    $this.l3h_1 = type == null || equals(type, Type_EVENT_getInstance()) ? events : emptyList();
-    $this.m3h_1 = type == null || equals(type, Type_URL_getInstance()) ? uri : null;
+    var events = Companion_getInstance_17().f3f(this_0);
+    $this.k3h_1 = type == null || equals(type, Type_EVENT_getInstance()) ? events : emptyList();
+    $this.l3h_1 = type == null || equals(type, Type_URL_getInstance()) ? uri : null;
     var tmp_1 = $this;
     var tmp0_safe_receiver_0 = parser.j3e('style');
-    tmp_1.n3h_1 = tmp0_safe_receiver_0 == null ? null : Companion_instance_8.y3g(tmp0_safe_receiver_0);
+    tmp_1.m3h_1 = tmp0_safe_receiver_0 == null ? null : Companion_instance_8.x3g(tmp0_safe_receiver_0);
     var tmp_2 = $this;
-    var tmp1_safe_receiver = Companion_getInstance_22().s3h(parser.j3e('gravity'));
+    var tmp1_safe_receiver = Companion_getInstance_22().r3h(parser.j3e('gravity'));
     var tmp2_elvis_lhs = tmp1_safe_receiver == null ? null : tmp1_safe_receiver.horizontal;
-    tmp_2.gravity = tmp2_elvis_lhs == null ? Companion_getInstance_11().a3h_1 : tmp2_elvis_lhs;
+    tmp_2.gravity = tmp2_elvis_lhs == null ? Companion_getInstance_11().z3g_1 : tmp2_elvis_lhs;
     var tmp_3 = $this;
-    var tmp3_safe_receiver = Companion_instance_14.t3h(parser.j3e('width'));
+    var tmp3_safe_receiver = Companion_instance_14.s3h(parser.j3e('width'));
     var tmp_4;
     if (tmp3_safe_receiver == null) {
       tmp_4 = null;
@@ -2054,26 +2051,26 @@
       tmp_4 = tmp_5;
     }
     var tmp4_elvis_lhs = tmp_4;
-    tmp_3.width = tmp4_elvis_lhs == null ? Companion_getInstance_11().b3h_1 : tmp4_elvis_lhs;
+    tmp_3.width = tmp4_elvis_lhs == null ? Companion_getInstance_11().a3h_1 : tmp4_elvis_lhs;
     var tmp_6 = $this;
     var tmp5_safe_receiver = parser.j3e('color');
-    tmp_6.o3h_1 = tmp5_safe_receiver == null ? null : toColorOrNull(tmp5_safe_receiver);
+    tmp_6.n3h_1 = tmp5_safe_receiver == null ? null : toColorOrNull(tmp5_safe_receiver);
     var tmp_7 = $this;
     var tmp6_safe_receiver = parser.j3e('background-color');
     var tmp7_elvis_lhs = tmp6_safe_receiver == null ? null : toColorOrNull(tmp6_safe_receiver);
-    tmp_7.backgroundColor = tmp7_elvis_lhs == null ? Companion_getInstance_11().c3h_1 : tmp7_elvis_lhs;
-    $this.p3h_1 = parser.j3e('icon');
+    tmp_7.backgroundColor = tmp7_elvis_lhs == null ? Companion_getInstance_11().b3h_1 : tmp7_elvis_lhs;
+    $this.o3h_1 = parser.j3e('icon');
     var tmp_8 = $this;
-    var tmp8_safe_receiver = Companion_getInstance_22().s3h(parser.j3e('icon-gravity'));
+    var tmp8_safe_receiver = Companion_getInstance_22().r3h(parser.j3e('icon-gravity'));
     var tmp9_elvis_lhs = tmp8_safe_receiver == null ? null : tmp8_safe_receiver.horizontal;
-    tmp_8.iconGravity = tmp9_elvis_lhs == null ? Companion_getInstance_11().d3h_1 : tmp9_elvis_lhs;
+    tmp_8.iconGravity = tmp9_elvis_lhs == null ? Companion_getInstance_11().c3h_1 : tmp9_elvis_lhs;
     var tmp_9 = $this;
     var tmp10_safe_receiver = parser.j3e('icon-size');
     var tmp11_elvis_lhs = tmp10_safe_receiver == null ? null : toIntOrNull(tmp10_safe_receiver);
     tmp_9.iconSize = tmp11_elvis_lhs == null ? 18 : tmp11_elvis_lhs;
     var tmp_10 = $this;
     // Inline function 'kotlin.collections.mutableListOf' call
-    tmp_10.r3h_1 = ArrayList_init_$Create$();
+    tmp_10.q3h_1 = ArrayList_init_$Create$();
     var tmp_11 = $this;
     var tmp_12 = _get_defaultTextStyles__fjozb5($this);
     var tmp12_elvis_lhs = parseTextChild(parser, tmp_12, 'https://mobile-content-api.cru.org/xmlns/content', 'button', Button$_init_$lambda_iw8cbr(parser, $this));
@@ -2122,7 +2119,7 @@
       if ($parser.w3c() === 'https://mobile-content-api.cru.org/xmlns/analytics') {
         var tmp_0;
         if ($parser.q2() === 'events') {
-          var tmp0 = this$0.r3h_1;
+          var tmp0 = this$0.q3h_1;
           var elements = Companion_instance_4.y3c($parser, this$0);
           addAll(tmp0, elements);
           tmp_0 = Unit_instance;
@@ -2156,46 +2153,46 @@
     Style_initEntries();
     return Style_UNKNOWN_instance;
   }
+  protoOf(Button).j3g = function () {
+    return this.k3h_1;
+  };
   protoOf(Button).k3g = function () {
     return this.l3h_1;
   };
-  protoOf(Button).l3g = function () {
-    return this.m3h_1;
-  };
-  protoOf(Button).w3h = function () {
-    var tmp0_elvis_lhs = this.n3h_1;
+  protoOf(Button).v3h = function () {
+    var tmp0_elvis_lhs = this.m3h_1;
     return tmp0_elvis_lhs == null ? get_buttonStyle_0(get_stylesParent(this)) : tmp0_elvis_lhs;
   };
-  protoOf(Button).x3h = function () {
+  protoOf(Button).w3h = function () {
     return this.gravity;
   };
-  protoOf(Button).r3g = function () {
+  protoOf(Button).q3g = function () {
     return this.width;
   };
-  protoOf(Button).y3h = function () {
-    var tmp0_elvis_lhs = this.o3h_1;
+  protoOf(Button).x3h = function () {
+    var tmp0_elvis_lhs = this.n3h_1;
     var tmp;
     if (tmp0_elvis_lhs == null) {
       // Inline function 'kotlin.let' call
       // Inline function 'org.cru.godtools.shared.tool.parser.model.Button.<get-buttonColor>.<anonymous>' call
       var it = get_stylesParent(this);
-      var tmp1_elvis_lhs = it == null ? null : it.y3h();
+      var tmp1_elvis_lhs = it == null ? null : it.x3h();
       tmp = tmp1_elvis_lhs == null ? get_primaryColor_0(it) : tmp1_elvis_lhs;
     } else {
       tmp = tmp0_elvis_lhs;
     }
     return tmp;
   };
-  protoOf(Button).z3h = function () {
+  protoOf(Button).y3h = function () {
     return this.backgroundColor;
   };
-  protoOf(Button).a3i = function () {
-    return getResource(this, this.p3h_1);
+  protoOf(Button).z3h = function () {
+    return getResource(this, this.o3h_1);
   };
-  protoOf(Button).b3i = function () {
+  protoOf(Button).a3i = function () {
     return this.iconGravity;
   };
-  protoOf(Button).c3i = function () {
+  protoOf(Button).b3i = function () {
     return this.iconSize;
   };
   protoOf(Button).c20 = function () {
@@ -2204,14 +2201,14 @@
   protoOf(Button).g3d = function () {
     return protoOf(Content).g3d.call(this) || !this.isClickable || this.style.equals(Style_UNKNOWN_getInstance());
   };
-  protoOf(Button).d3i = function () {
-    return this.r3h_1;
+  protoOf(Button).c3i = function () {
+    return this.q3h_1;
   };
   protoOf(Button).r3d = function (type) {
     var tmp;
     if (type.p2_1 === 2) {
       // Inline function 'kotlin.collections.filter' call
-      var tmp0 = this.r3h_1;
+      var tmp0 = this.q3h_1;
       // Inline function 'kotlin.collections.filterTo' call
       var destination = ArrayList_init_$Create$();
       var _iterator__ex2g4s = tmp0.j();
@@ -2235,7 +2232,7 @@
   function Button() {
     Companion_getInstance_11();
     var tmp = this;
-    tmp.q3h_1 = lazy(Button$defaultTextStyles$delegate$lambda(this));
+    tmp.p3h_1 = lazy(Button$defaultTextStyles$delegate$lambda(this));
   }
   function defaultTextStyles$factory() {
     return getPropertyCallableRef('defaultTextStyles', 1, KProperty1, function (receiver) {
@@ -2243,8 +2240,8 @@
     }, null);
   }
   function Companion_9() {
-    this.e3i_1 = 'card';
-    this.f3i_1 = 'card-background-color';
+    this.d3i_1 = 'card';
+    this.e3i_1 = 'card-background-color';
   }
   var Companion_instance_10;
   function Companion_getInstance_12() {
@@ -2254,7 +2251,7 @@
     Content_init_$Init$(parent, parser, $this);
     Card.call($this);
     parser.u3c(2, 'https://mobile-content-api.cru.org/xmlns/content', 'card');
-    $this.m3i_1 = toColorOrNull(parser.j3e('background-color'));
+    $this.l3i_1 = toColorOrNull(parser.j3e('background-color'));
     // Inline function 'org.cru.godtools.shared.tool.parser.model.parseClickableAttrs' call
     var tmp0_safe_receiver = parser.j3e('url');
     var tmp;
@@ -2284,8 +2281,8 @@
     // Inline function 'org.cru.godtools.shared.tool.parser.model.toEventIds' call
     var this_0 = parser.j3e('events');
     // Inline function 'org.cru.godtools.shared.tool.parser.model.Card.<init>.<anonymous>' call
-    $this.o3i_1 = Companion_getInstance_17().g3f(this_0);
-    $this.p3i_1 = uri;
+    $this.n3i_1 = Companion_getInstance_17().f3f(this_0);
+    $this.o3i_1 = uri;
     var tmp_1 = $this;
     // Inline function 'org.cru.godtools.shared.tool.parser.model.parseContent' call
     // Inline function 'kotlin.collections.buildList' call
@@ -2332,32 +2329,32 @@
         continue $l$loop_0;
       skipTag(parser);
     }
-    tmp_1.n3i_1 = this_1.p3();
+    tmp_1.m3i_1 = this_1.p3();
     return $this;
   }
   function Card_init_$Create$(parent, parser) {
     return Card_init_$Init$(parent, parser, objectCreate(protoOf(Card)));
   }
-  protoOf(Card).z3h = function () {
-    var tmp0_elvis_lhs = this.m3i_1;
+  protoOf(Card).y3h = function () {
+    var tmp0_elvis_lhs = this.l3i_1;
     return tmp0_elvis_lhs == null ? get_cardBackgroundColor_0(get_stylesParent(this)) : tmp0_elvis_lhs;
   };
   protoOf(Card).q3d = function () {
+    return this.m3i_1;
+  };
+  protoOf(Card).j3g = function () {
     return this.n3i_1;
   };
   protoOf(Card).k3g = function () {
     return this.o3i_1;
   };
-  protoOf(Card).l3g = function () {
-    return this.p3i_1;
-  };
   protoOf(Card).g3d = function () {
-    return !this.x39().i3f_1.i3c('content_card') || protoOf(Content).g3d.call(this);
+    return !this.x39().h3f_1.i3c('content_card') || protoOf(Content).g3d.call(this);
   };
   function Card() {
   }
   function Companion_10() {
-    this.q3i_1 = 'category';
+    this.p3i_1 = 'category';
   }
   var Companion_instance_11;
   function Companion_getInstance_13() {
@@ -2367,8 +2364,8 @@
     BaseModel.call($this, manifest);
     Category.call($this);
     parser.u3c(2, 'https://mobile-content-api.cru.org/xmlns/manifest', 'category');
-    $this.s3i_1 = parser.j3e('id');
-    $this.v3i_1 = parser.j3e('banner');
+    $this.r3i_1 = parser.j3e('id');
+    $this.u3i_1 = parser.j3e('banner');
     var label = null;
     var tmp = $this;
     // Inline function 'kotlin.collections.buildSet' call
@@ -2401,15 +2398,15 @@
         continue $l$loop_0;
       skipTag(parser);
     }
-    tmp.u3i_1 = this_0.p3();
-    $this.t3i_1 = label;
+    tmp.t3i_1 = this_0.p3();
+    $this.s3i_1 = label;
     return $this;
   }
   function Category_init_$Create$(manifest, parser) {
     return Category_init_$Init$(manifest, parser, objectCreate(protoOf(Category)));
   }
-  protoOf(Category).w3i = function () {
-    return this.x39().x3i();
+  protoOf(Category).v3i = function () {
+    return this.x39().w3i();
   };
   function Category() {
   }
@@ -2439,7 +2436,7 @@
     BaseModel.call($this, parent);
     Content.call($this);
     var tmp = $this;
-    var tmp0_safe_receiver = parser.f3f(null, 'version');
+    var tmp0_safe_receiver = parser.j3e('version');
     var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : toIntOrNull(tmp0_safe_receiver);
     tmp.b3d_1 = tmp1_elvis_lhs == null ? 2 : tmp1_elvis_lhs;
     var tmp_0 = $this;
@@ -2475,16 +2472,16 @@
     tmp_0.c3d_1 = tmp0_elvis_lhs == null ? emptySet() : tmp0_elvis_lhs;
     var tmp_3 = $this;
     var tmp4_safe_receiver = parser.j3e('required-device-type');
-    var tmp5_elvis_lhs = tmp4_safe_receiver == null ? null : Companion_getInstance_15().h3j(tmp4_safe_receiver);
+    var tmp5_elvis_lhs = tmp4_safe_receiver == null ? null : Companion_getInstance_15().g3j(tmp4_safe_receiver);
     var tmp_4;
     if (tmp5_elvis_lhs == null) {
       var tmp6_safe_receiver = parser.j3e('restrictTo');
-      tmp_4 = tmp6_safe_receiver == null ? null : Companion_getInstance_15().h3j(tmp6_safe_receiver);
+      tmp_4 = tmp6_safe_receiver == null ? null : Companion_getInstance_15().g3j(tmp6_safe_receiver);
     } else {
       tmp_4 = tmp5_elvis_lhs;
     }
     var tmp7_elvis_lhs = tmp_4;
-    tmp_3.d3d_1 = tmp7_elvis_lhs == null ? Companion_getInstance_15().g3j_1 : tmp7_elvis_lhs;
+    tmp_3.d3d_1 = tmp7_elvis_lhs == null ? Companion_getInstance_15().f3j_1 : tmp7_elvis_lhs;
     var tmp_5 = $this;
     var tmp8_safe_receiver = parser.j3e('required-android-version');
     var tmp_6;
@@ -2493,7 +2490,7 @@
     } else {
       // Inline function 'kotlin.let' call
       // Inline function 'org.cru.godtools.shared.tool.parser.model.Content.<init>.<anonymous>' call
-      var tmp0_elvis_lhs_0 = Companion_getInstance_42().i3j(tmp8_safe_receiver);
+      var tmp0_elvis_lhs_0 = Companion_getInstance_42().h3j(tmp8_safe_receiver);
       var tmp_7;
       var tmp_8 = tmp0_elvis_lhs_0;
       if ((tmp_8 == null ? null : new Version(tmp_8)) == null) {
@@ -2512,7 +2509,7 @@
     } else {
       // Inline function 'kotlin.let' call
       // Inline function 'org.cru.godtools.shared.tool.parser.model.Content.<init>.<anonymous>' call
-      var tmp0_elvis_lhs_1 = Companion_getInstance_42().i3j(tmp9_safe_receiver);
+      var tmp0_elvis_lhs_1 = Companion_getInstance_42().h3j(tmp9_safe_receiver);
       var tmp_11;
       var tmp_12 = tmp0_elvis_lhs_1;
       if ((tmp_12 == null ? null : new Version(tmp_12)) == null) {
@@ -2535,7 +2532,7 @@
     parent = parent === VOID ? createTestManifest() : parent;
     version = version === VOID ? 2 : version;
     requiredFeatures = requiredFeatures === VOID ? emptySet() : requiredFeatures;
-    requiredDeviceType = requiredDeviceType === VOID ? Companion_getInstance_15().g3j_1 : requiredDeviceType;
+    requiredDeviceType = requiredDeviceType === VOID ? Companion_getInstance_15().f3j_1 : requiredDeviceType;
     requiredAndroidVersion = requiredAndroidVersion === VOID ? null : requiredAndroidVersion;
     requiredIosVersion = requiredIosVersion === VOID ? null : requiredIosVersion;
     invisibleIf = invisibleIf === VOID ? null : invisibleIf;
@@ -2572,7 +2569,7 @@
       while (_iterator__ex2g4s.k()) {
         var element = _iterator__ex2g4s.l();
         // Inline function 'org.cru.godtools.shared.tool.parser.model.Content.<get-areContentRestrictionsSatisfied>.<anonymous>' call
-        if ($this.x39().i3f_1.h3c(element)) {
+        if ($this.x39().h3f_1.h3c(element)) {
           tmp$ret$0 = true;
           break $l$block_0;
         }
@@ -2580,12 +2577,12 @@
       tmp$ret$0 = false;
     }
     if (tmp$ret$0) {
-      tmp_0 = isRequiredVersionSatisfied($this.x39().i3f_1, DeviceType_ANDROID_getInstance(), $this.e3d_1);
+      tmp_0 = isRequiredVersionSatisfied($this.x39().h3f_1, DeviceType_ANDROID_getInstance(), $this.e3d_1);
     } else {
       tmp_0 = false;
     }
     if (tmp_0) {
-      tmp = isRequiredVersionSatisfied($this.x39().i3f_1, DeviceType_IOS_getInstance(), $this.f3d_1);
+      tmp = isRequiredVersionSatisfied($this.x39().h3f_1, DeviceType_IOS_getInstance(), $this.f3d_1);
     } else {
       tmp = false;
     }
@@ -2709,7 +2706,7 @@
         while (_iterator__ex2g4s.k()) {
           var element = _iterator__ex2g4s.l();
           // Inline function 'org.cru.godtools.shared.tool.parser.model.Content.<get-isIgnored>.<anonymous>' call
-          if (!this.x39().i3f_1.i3c(element)) {
+          if (!this.x39().h3f_1.i3c(element)) {
             tmp$ret$0 = true;
             break $l$block_0;
           }
@@ -2788,9 +2785,9 @@
   var DeviceType_UNKNOWN_instance;
   function Companion_12() {
     Companion_instance_13 = this;
-    this.g3j_1 = toSet(values_3());
+    this.f3j_1 = toSet(values_3());
   }
-  protoOf(Companion_12).h3j = function (_this__u8e3s4) {
+  protoOf(Companion_12).g3j = function (_this__u8e3s4) {
     var tmp0 = get_REGEX_SEQUENCE_SEPARATOR().fd(_this__u8e3s4);
     // Inline function 'kotlin.collections.mutableSetOf' call
     // Inline function 'kotlin.collections.mapTo' call
@@ -2861,7 +2858,7 @@
   var REGEX_PIXELS;
   function Companion_13() {
   }
-  protoOf(Companion_13).t3h = function (_this__u8e3s4) {
+  protoOf(Companion_13).s3h = function (_this__u8e3s4) {
     var tmp;
     if (_this__u8e3s4 == null) {
       tmp = null;
@@ -2918,12 +2915,12 @@
   protoOf(Percent).tf = function () {
     return this.value;
   };
-  protoOf(Percent).r3j = function (value) {
+  protoOf(Percent).q3j = function (value) {
     return new Percent(value);
   };
   protoOf(Percent).copy = function (value, $super) {
     value = value === VOID ? this.value : value;
-    return this.r3j(value);
+    return this.q3j(value);
   };
   protoOf(Percent).toString = function () {
     return 'Percent(value=' + this.value + ')';
@@ -2951,12 +2948,12 @@
   protoOf(Pixels).tf = function () {
     return this.value;
   };
-  protoOf(Pixels).s3j = function (value) {
+  protoOf(Pixels).r3j = function (value) {
     return new Pixels(value);
   };
   protoOf(Pixels).copy = function (value, $super) {
     value = value === VOID ? this.value : value;
-    return this.s3j(value);
+    return this.r3j(value);
   };
   protoOf(Pixels).toString = function () {
     return 'Pixels(value=' + this.value + ')';
@@ -2988,10 +2985,10 @@
     Companion_instance_15 = this;
     this.FOLLOWUP = new EventId('followup', 'send');
   }
-  protoOf(Companion_14).t3j = function () {
+  protoOf(Companion_14).s3j = function () {
     return this.FOLLOWUP;
   };
-  protoOf(Companion_14).g3f = function (raw) {
+  protoOf(Companion_14).f3f = function (raw) {
     var tmp;
     if (raw == null) {
       tmp = null;
@@ -3106,7 +3103,7 @@
     return !(this.namespace == null) ? '' + this.namespace + ':' + this.name : this.name;
   };
   function Companion_15() {
-    this.u3j_1 = 'fallback';
+    this.t3j_1 = 'fallback';
   }
   var Companion_instance_16;
   function Companion_getInstance_18() {
@@ -3170,14 +3167,14 @@
         continue $l$loop_0;
       skipTag(parser);
     }
-    tmp.q3j_1 = this_0.p3();
+    tmp.p3j_1 = this_0.p3();
     return $this;
   }
   function Fallback_init_$Create$(parent, parser) {
     return Fallback_init_$Init$(parent, parser, objectCreate(protoOf(Fallback)));
   }
   protoOf(Fallback).q3d = function () {
-    return take(this.q3j_1, 1);
+    return take(this.p3j_1, 1);
   };
   protoOf(Fallback).a3e = function () {
     // Inline function 'org.cru.godtools.shared.tool.parser.model.contentTips' call
@@ -3197,7 +3194,7 @@
   function Fallback() {
   }
   function Companion_16() {
-    this.v3j_1 = 'width';
+    this.u3j_1 = 'width';
   }
   var Companion_instance_17;
   function Companion_getInstance_19() {
@@ -3208,7 +3205,7 @@
     Item.call($this);
     parser.u3c(2, 'https://mobile-content-api.cru.org/xmlns/content', 'item');
     $this.flow = flow;
-    $this.x3j_1 = Companion_instance_14.t3h(parser.j3e('width'));
+    $this.w3j_1 = Companion_instance_14.s3h(parser.j3e('width'));
     // Inline function 'org.cru.godtools.shared.tool.parser.model.parseVisibilityAttrs' call
     var tmp1 = toExpressionOrNull(parser.j3e('invisible-if'));
     // Inline function 'org.cru.godtools.shared.tool.parser.model.Item.<init>.<anonymous>' call
@@ -3228,7 +3225,7 @@
       }
       tmp_0 = tmp_1;
     }
-    tmp.y3j_1 = tmp_0;
+    tmp.x3j_1 = tmp_0;
     var tmp_2 = $this;
     var tmp_3;
     if (goneIf == null) {
@@ -3244,7 +3241,7 @@
       }
       tmp_3 = tmp_4;
     }
-    tmp_2.z3j_1 = tmp_3;
+    tmp_2.y3j_1 = tmp_3;
     var tmp_5 = $this;
     // Inline function 'org.cru.godtools.shared.tool.parser.model.parseContent' call
     // Inline function 'kotlin.collections.buildList' call
@@ -3291,7 +3288,7 @@
         continue $l$loop_0;
       skipTag(parser);
     }
-    tmp_5.a3k_1 = this_0.p3();
+    tmp_5.z3j_1 = this_0.p3();
     return $this;
   }
   function Item_init_$Create$(flow, parser) {
@@ -3301,10 +3298,10 @@
     BaseModel.call($this, flow);
     Item.call($this);
     $this.flow = flow;
+    $this.w3j_1 = null;
     $this.x3j_1 = null;
     $this.y3j_1 = null;
-    $this.z3j_1 = null;
-    $this.a3k_1 = listOfNotNull(content($this));
+    $this.z3j_1 = listOfNotNull(content($this));
     return $this;
   }
   function Item_init_$Create$_0(flow, content) {
@@ -3312,10 +3309,10 @@
   }
   function Companion_17() {
     Companion_instance_18 = this;
-    this.b3k_1 = 'flow';
-    this.c3k_1 = 'item-width';
-    this.d3k_1 = new Percent(1.0);
-    this.e3k_1 = Horizontal_START_getInstance();
+    this.a3k_1 = 'flow';
+    this.b3k_1 = 'item-width';
+    this.c3k_1 = new Percent(1.0);
+    this.d3k_1 = Horizontal_START_getInstance();
   }
   var Companion_instance_18;
   function Companion_getInstance_20() {
@@ -3328,13 +3325,13 @@
     Flow.call($this);
     parser.u3c(2, 'https://mobile-content-api.cru.org/xmlns/content', 'flow');
     var tmp = $this;
-    var tmp0_elvis_lhs = Companion_instance_14.t3h(parser.j3e('item-width'));
-    tmp.l3k_1 = tmp0_elvis_lhs == null ? Companion_getInstance_20().d3k_1 : tmp0_elvis_lhs;
+    var tmp0_elvis_lhs = Companion_instance_14.s3h(parser.j3e('item-width'));
+    tmp.k3k_1 = tmp0_elvis_lhs == null ? Companion_getInstance_20().c3k_1 : tmp0_elvis_lhs;
     var tmp_0 = $this;
     var tmp1_safe_receiver = parser.j3e('row-gravity');
-    var tmp2_safe_receiver = tmp1_safe_receiver == null ? null : Companion_getInstance_22().s3h(tmp1_safe_receiver);
+    var tmp2_safe_receiver = tmp1_safe_receiver == null ? null : Companion_getInstance_22().r3h(tmp1_safe_receiver);
     var tmp3_elvis_lhs = tmp2_safe_receiver == null ? null : tmp2_safe_receiver.horizontal;
-    tmp_0.rowGravity = tmp3_elvis_lhs == null ? Companion_getInstance_20().e3k_1 : tmp3_elvis_lhs;
+    tmp_0.rowGravity = tmp3_elvis_lhs == null ? Companion_getInstance_20().d3k_1 : tmp3_elvis_lhs;
     var tmp_1 = $this;
     // Inline function 'kotlin.collections.mutableListOf' call
     tmp_1._items = ArrayList_init_$Create$();
@@ -3354,7 +3351,7 @@
       if (parser.v3c() === 2) {
         var item = Item_init_$Create$_0($this, Flow$_init_$lambda_98n0kd(parser));
         // Inline function 'kotlin.collections.isNotEmpty' call
-        if (!item.a3k_1.p()) {
+        if (!item.z3j_1.p()) {
           // Inline function 'kotlin.collections.plusAssign' call
           $this._items.e(item);
         }
@@ -3368,21 +3365,21 @@
   function Flow_init_$Create$(parent, parser) {
     return Flow_init_$Init$(parent, parser, objectCreate(protoOf(Flow)));
   }
-  protoOf(Item).m3k = function () {
+  protoOf(Item).l3k = function () {
     return this.flow;
   };
-  protoOf(Item).r3g = function () {
-    var tmp0_elvis_lhs = this.x3j_1;
-    return tmp0_elvis_lhs == null ? this.flow.l3k_1 : tmp0_elvis_lhs;
+  protoOf(Item).q3g = function () {
+    var tmp0_elvis_lhs = this.w3j_1;
+    return tmp0_elvis_lhs == null ? this.flow.k3k_1 : tmp0_elvis_lhs;
   };
   protoOf(Item).f3e = function () {
-    return this.y3j_1;
+    return this.x3j_1;
   };
   protoOf(Item).g3e = function () {
-    return this.z3j_1;
+    return this.y3j_1;
   };
   protoOf(Item).q3d = function () {
-    return this.a3k_1;
+    return this.z3j_1;
   };
   function Item() {
   }
@@ -3406,19 +3403,19 @@
       return tmp;
     };
   }
-  protoOf(Flow).n3k = function () {
-    return this.l3k_1;
+  protoOf(Flow).m3k = function () {
+    return this.k3k_1;
   };
-  protoOf(Flow).o3k = function () {
+  protoOf(Flow).n3k = function () {
     return this.rowGravity;
   };
-  protoOf(Flow).p3k = function () {
+  protoOf(Flow).o3k = function () {
     return this._items;
   };
   protoOf(Flow).g3d = function () {
-    return !this.x39().i3f_1.i3c('flow') || protoOf(Content).g3d.call(this);
+    return !this.x39().h3f_1.i3c('flow') || protoOf(Content).g3d.call(this);
   };
-  protoOf(Flow).q3k = function () {
+  protoOf(Flow).p3k = function () {
     // Inline function 'kotlin.collections.toTypedArray' call
     var this_0 = this._items;
     return copyToArray(this_0);
@@ -3427,7 +3424,7 @@
     Companion_getInstance_20();
   }
   function Companion_18() {
-    this.r3k_1 = 'form';
+    this.q3k_1 = 'form';
   }
   var Companion_instance_19;
   function Companion_getInstance_21() {
@@ -3483,14 +3480,14 @@
         continue $l$loop_0;
       skipTag(parser);
     }
-    tmp.y3k_1 = this_0.p3();
+    tmp.x3k_1 = this_0.p3();
     return $this;
   }
   function Form_init_$Create$(parent, parser) {
     return Form_init_$Init$(parent, parser, objectCreate(protoOf(Form)));
   }
   protoOf(Form).q3d = function () {
-    return this.y3k_1;
+    return this.x3k_1;
   };
   protoOf(Form).a3e = function () {
     // Inline function 'org.cru.godtools.shared.tool.parser.model.contentTips' call
@@ -3576,10 +3573,10 @@
     Companion_instance_20 = this;
     this.CENTER = new Gravity(Horizontal_CENTER_getInstance(), Vertical_CENTER_getInstance());
   }
-  protoOf(Companion_19).z3k = function () {
+  protoOf(Companion_19).y3k = function () {
     return this.CENTER;
   };
-  protoOf(Companion_19).s3h = function (_this__u8e3s4) {
+  protoOf(Companion_19).r3h = function (_this__u8e3s4) {
     if (_this__u8e3s4 == null)
       return null;
     var tmp;
@@ -3699,31 +3696,31 @@
     this.horizontal = horizontal;
     this.vertical = vertical;
   }
-  protoOf(Gravity).e3l = function () {
+  protoOf(Gravity).d3l = function () {
     return this.horizontal;
   };
-  protoOf(Gravity).f3l = function () {
+  protoOf(Gravity).e3l = function () {
     return this.vertical;
   };
-  protoOf(Gravity).g3l = function () {
+  protoOf(Gravity).f3l = function () {
     return this.horizontal.equals(Horizontal_START_getInstance());
   };
-  protoOf(Gravity).h3l = function () {
+  protoOf(Gravity).g3l = function () {
     return this.horizontal.equals(Horizontal_END_getInstance());
   };
-  protoOf(Gravity).i3l = function () {
+  protoOf(Gravity).h3l = function () {
     return this.horizontal.equals(Horizontal_CENTER_getInstance());
   };
-  protoOf(Gravity).j3l = function () {
+  protoOf(Gravity).i3l = function () {
     return this.vertical.equals(Vertical_TOP_getInstance());
   };
-  protoOf(Gravity).k3l = function () {
+  protoOf(Gravity).j3l = function () {
     return this.vertical.equals(Vertical_BOTTOM_getInstance());
   };
-  protoOf(Gravity).l3l = function () {
+  protoOf(Gravity).k3l = function () {
     return this.vertical.equals(Vertical_CENTER_getInstance());
   };
-  protoOf(Gravity).m3l = function () {
+  protoOf(Gravity).l3l = function () {
     return this.isCenterX && this.isCenterY;
   };
   function HasAnalyticsEvents() {
@@ -3732,9 +3729,9 @@
   }
   function Companion_20() {
     Companion_instance_21 = this;
-    this.q3l_1 = 'image';
-    this.r3l_1 = Horizontal_CENTER_getInstance();
-    this.s3l_1 = new Percent(1.0);
+    this.p3l_1 = 'image';
+    this.q3l_1 = Horizontal_CENTER_getInstance();
+    this.r3l_1 = new Percent(1.0);
   }
   var Companion_instance_21;
   function Companion_getInstance_23() {
@@ -3746,7 +3743,7 @@
     Content_init_$Init$(parent, parser, $this);
     Image.call($this);
     parser.u3c(2, 'https://mobile-content-api.cru.org/xmlns/content', 'image');
-    $this.b3m_1 = parser.j3e('resource');
+    $this.a3m_1 = parser.j3e('resource');
     // Inline function 'org.cru.godtools.shared.tool.parser.model.parseClickableAttrs' call
     var tmp0_safe_receiver = parser.j3e('url');
     var tmp;
@@ -3776,14 +3773,14 @@
     // Inline function 'org.cru.godtools.shared.tool.parser.model.toEventIds' call
     var this_0 = parser.j3e('events');
     // Inline function 'org.cru.godtools.shared.tool.parser.model.Image.<init>.<anonymous>' call
-    $this.z3l_1 = Companion_getInstance_17().g3f(this_0);
-    $this.a3m_1 = uri;
+    $this.y3l_1 = Companion_getInstance_17().f3f(this_0);
+    $this.z3l_1 = uri;
     var tmp_1 = $this;
-    var tmp0_safe_receiver_0 = Companion_getInstance_22().s3h(parser.j3e('gravity'));
+    var tmp0_safe_receiver_0 = Companion_getInstance_22().r3h(parser.j3e('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().r3l_1 : tmp1_elvis_lhs;
+    tmp_1.gravity = tmp1_elvis_lhs == null ? Companion_getInstance_23().q3l_1 : tmp1_elvis_lhs;
     var tmp_2 = $this;
-    var tmp2_safe_receiver = Companion_instance_14.t3h(parser.j3e('width'));
+    var tmp2_safe_receiver = Companion_instance_14.s3h(parser.j3e('width'));
     var tmp_3;
     if (tmp2_safe_receiver == null) {
       tmp_3 = null;
@@ -3799,7 +3796,7 @@
       tmp_3 = tmp_4;
     }
     var tmp3_elvis_lhs = tmp_3;
-    tmp_2.width = tmp3_elvis_lhs == null ? Companion_getInstance_23().s3l_1 : tmp3_elvis_lhs;
+    tmp_2.width = tmp3_elvis_lhs == null ? Companion_getInstance_23().r3l_1 : tmp3_elvis_lhs;
     skipTag(parser);
     return $this;
   }
@@ -3809,42 +3806,42 @@
   function Image_init_$Init$_0(parent, resource, gravity, width, events, url, invisibleIf, goneIf, $this) {
     parent = parent === VOID ? createTestManifest() : parent;
     resource = resource === VOID ? null : resource;
-    gravity = gravity === VOID ? Companion_getInstance_23().r3l_1 : gravity;
-    width = width === VOID ? Companion_getInstance_23().s3l_1 : width;
+    gravity = gravity === VOID ? Companion_getInstance_23().q3l_1 : gravity;
+    width = width === VOID ? Companion_getInstance_23().r3l_1 : width;
     events = events === VOID ? emptyList() : events;
     url = url === VOID ? null : url;
     invisibleIf = invisibleIf === VOID ? null : invisibleIf;
     goneIf = goneIf === VOID ? null : goneIf;
     Content_init_$Init$_0(parent, VOID, VOID, VOID, VOID, VOID, invisibleIf, goneIf, $this);
     Image.call($this);
-    $this.b3m_1 = resource;
+    $this.a3m_1 = resource;
     $this.gravity = gravity;
     $this.width = width;
-    $this.z3l_1 = events;
-    $this.a3m_1 = url;
+    $this.y3l_1 = events;
+    $this.z3l_1 = url;
     return $this;
   }
   function createTestImage(parent, resource, gravity, width, events, url, invisibleIf, goneIf) {
     return Image_init_$Init$_0(parent, resource, gravity, width, events, url, invisibleIf, goneIf, objectCreate(protoOf(Image)));
   }
+  protoOf(Image).j3g = function () {
+    return this.y3l_1;
+  };
   protoOf(Image).k3g = function () {
     return this.z3l_1;
   };
-  protoOf(Image).l3g = function () {
+  protoOf(Image).d3g = function () {
     return this.a3m_1;
   };
   protoOf(Image).e3g = function () {
-    return this.b3m_1;
-  };
-  protoOf(Image).f3g = function () {
-    var tmp0_elvis_lhs = getResource(this, this.b3m_1);
+    var tmp0_elvis_lhs = getResource(this, this.a3m_1);
     var tmp;
     if (tmp0_elvis_lhs == null) {
       var tmp_0;
-      if (this.b3m_1 == null) {
+      if (this.a3m_1 == null) {
         tmp_0 = null;
-      } else if (this.x39().i3f_1.n3b_1) {
-        var message = 'tool: ' + this.x39().code + ' locale: ' + this.x39().locale + ' resource: ' + this.b3m_1;
+      } else if (this.x39().h3f_1.n3b_1) {
+        var message = 'tool: ' + this.x39().code + ' locale: ' + this.x39().locale + ' resource: ' + this.a3m_1;
         var tmp0 = Companion_getInstance();
         // Inline function 'co.touchlab.kermit.Logger.e' call
         var throwable = new DeprecationException('Legacy Manifest missing Image Resource ' + message);
@@ -3853,7 +3850,7 @@
         if (tmp0.z1u().q1v().s2(severity) <= 0) {
           tmp0.a1v(severity, 'Image', throwable, message);
         }
-        tmp_0 = Resource_init_$Create$_0(this.x39(), this.b3m_1);
+        tmp_0 = Resource_init_$Create$_0(this.x39(), this.a3m_1);
       } else {
         tmp_0 = null;
       }
@@ -3863,10 +3860,10 @@
     }
     return tmp;
   };
-  protoOf(Image).x3h = function () {
+  protoOf(Image).w3h = function () {
     return this.gravity;
   };
-  protoOf(Image).r3g = function () {
+  protoOf(Image).q3g = function () {
     return this.width;
   };
   protoOf(Image).g3d = function () {
@@ -3875,7 +3872,7 @@
       tmp = true;
     } else {
       // Inline function 'kotlin.text.isNullOrEmpty' call
-      var this_0 = this.b3m_1;
+      var this_0 = this.a3m_1;
       tmp = this_0 == null || charSequenceLength(this_0) === 0;
     }
     return tmp;
@@ -3900,10 +3897,10 @@
               if (!equals(this.width, other.width)) {
                 tmp = false;
               } else {
-                if (!equals(this.z3l_1, other.z3l_1)) {
+                if (!equals(this.y3l_1, other.y3l_1)) {
                   tmp = false;
                 } else {
-                  if (!(this.a3m_1 == other.a3m_1)) {
+                  if (!(this.z3l_1 == other.z3l_1)) {
                     tmp = false;
                   } else {
                     if (!equals(this.invisibleIf, other.invisibleIf)) {
@@ -3926,9 +3923,9 @@
     return tmp;
   };
   protoOf(Image).hashCode = function () {
-    var result = hashCode(this.z3l_1);
+    var result = hashCode(this.y3l_1);
     var tmp = imul(31, result);
-    var tmp0_safe_receiver = this.a3m_1;
+    var tmp0_safe_receiver = this.z3l_1;
     var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : getStringHashCode(tmp0_safe_receiver);
     result = tmp + (tmp1_elvis_lhs == null ? 0 : tmp1_elvis_lhs) | 0;
     var tmp_0 = imul(31, result);
@@ -3948,7 +3945,7 @@
   var ImageScaleType_FILL_Y_instance;
   function Companion_21() {
   }
-  protoOf(Companion_21).c3m = function (_this__u8e3s4) {
+  protoOf(Companion_21).b3m = function (_this__u8e3s4) {
     switch (_this__u8e3s4) {
       case 'fit':
         return ImageScaleType_FIT_getInstance();
@@ -4026,9 +4023,9 @@
   var Type_HIDDEN_instance;
   function Companion_22() {
     Companion_instance_23 = this;
-    this.d3m_1 = Type_TEXT_getInstance();
+    this.c3m_1 = Type_TEXT_getInstance();
   }
-  protoOf(Companion_22).e3m = function (_this__u8e3s4) {
+  protoOf(Companion_22).d3m = function (_this__u8e3s4) {
     switch (_this__u8e3s4) {
       case 'email':
         return Type_EMAIL_getInstance();
@@ -4080,7 +4077,7 @@
     Companion_getInstance_25();
   }
   function Companion_23() {
-    this.f3m_1 = 'input';
+    this.e3m_1 = 'input';
   }
   var Companion_instance_24;
   function Companion_getInstance_26() {
@@ -4092,8 +4089,8 @@
     parser.u3c(2, 'https://mobile-content-api.cru.org/xmlns/content', 'input');
     var tmp = $this;
     var tmp0_safe_receiver = parser.j3e('type');
-    var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : Companion_getInstance_25().e3m(tmp0_safe_receiver);
-    tmp.type = tmp1_elvis_lhs == null ? Companion_getInstance_25().d3m_1 : tmp1_elvis_lhs;
+    var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : Companion_getInstance_25().d3m(tmp0_safe_receiver);
+    tmp.type = tmp1_elvis_lhs == null ? Companion_getInstance_25().c3m_1 : tmp1_elvis_lhs;
     $this.name = parser.j3e('name');
     $this.value = parser.j3e('value');
     var tmp_0 = $this;
@@ -4155,13 +4152,13 @@
   protoOf(Input).h2 = function () {
     return this.value;
   };
-  protoOf(Input).o3m = function () {
+  protoOf(Input).n3m = function () {
     return this.isRequired;
   };
-  protoOf(Input).p3m = function () {
+  protoOf(Input).o3m = function () {
     return this.label;
   };
-  protoOf(Input).q3m = function () {
+  protoOf(Input).p3m = function () {
     return this.placeholder;
   };
   protoOf(Input).validateValue = function (raw) {
@@ -4207,14 +4204,14 @@
     }
   }
   function Companion_24() {
-    this.r3m_1 = 'link';
+    this.q3m_1 = 'link';
   }
   var Companion_instance_25;
   function Companion_getInstance_27() {
     return Companion_instance_25;
   }
   function _get_defaultTextStyles__fjozb5_0($this) {
-    var tmp0 = $this.a3n_1;
+    var tmp0 = $this.z3m_1;
     // Inline function 'kotlin.getValue' call
     defaultTextStyles$factory_0();
     return tmp0.h2();
@@ -4252,11 +4249,11 @@
     // Inline function 'org.cru.godtools.shared.tool.parser.model.toEventIds' call
     var this_0 = parser.j3e('events');
     // Inline function 'org.cru.godtools.shared.tool.parser.model.Link.<init>.<anonymous>' call
-    $this.y3m_1 = Companion_getInstance_17().g3f(this_0);
-    $this.z3m_1 = uri;
+    $this.x3m_1 = Companion_getInstance_17().f3f(this_0);
+    $this.y3m_1 = uri;
     var tmp_1 = $this;
     // Inline function 'kotlin.collections.mutableListOf' call
-    tmp_1.b3n_1 = ArrayList_init_$Create$();
+    tmp_1.a3n_1 = ArrayList_init_$Create$();
     var tmp_2 = $this;
     var tmp_3 = _get_defaultTextStyles__fjozb5_0($this);
     var tmp0_elvis_lhs = parseTextChild(parser, tmp_3, 'https://mobile-content-api.cru.org/xmlns/content', 'link', Link$_init_$lambda_v5gdv3(parser, $this));
@@ -4282,7 +4279,7 @@
       if ($parser.w3c() === 'https://mobile-content-api.cru.org/xmlns/analytics') {
         var tmp_0;
         if ($parser.q2() === 'events') {
-          var tmp0 = this$0.b3n_1;
+          var tmp0 = this$0.a3n_1;
           var elements = Companion_instance_4.y3c($parser, this$0);
           addAll(tmp0, elements);
           tmp_0 = Unit_instance;
@@ -4292,26 +4289,26 @@
       return Unit_instance;
     };
   }
+  protoOf(Link).j3g = function () {
+    return this.x3m_1;
+  };
   protoOf(Link).k3g = function () {
     return this.y3m_1;
   };
-  protoOf(Link).l3g = function () {
-    return this.z3m_1;
-  };
   protoOf(Link).c20 = function () {
     return this.text;
   };
   protoOf(Link).g3d = function () {
     return protoOf(Content).g3d.call(this) || !this.isClickable;
   };
-  protoOf(Link).d3i = function () {
-    return this.b3n_1;
+  protoOf(Link).c3i = function () {
+    return this.a3n_1;
   };
   protoOf(Link).r3d = function (type) {
     var tmp;
     if (type.p2_1 === 2) {
       // Inline function 'kotlin.collections.filter' call
-      var tmp0 = this.b3n_1;
+      var tmp0 = this.a3n_1;
       // Inline function 'kotlin.collections.filterTo' call
       var destination = ArrayList_init_$Create$();
       var _iterator__ex2g4s = tmp0.j();
@@ -4334,7 +4331,7 @@
   };
   function Link() {
     var tmp = this;
-    tmp.a3n_1 = lazy(Link$defaultTextStyles$delegate$lambda(this));
+    tmp.z3m_1 = lazy(Link$defaultTextStyles$delegate$lambda(this));
   }
   function defaultTextStyles$factory_0() {
     return getPropertyCallableRef('defaultTextStyles', 1, KProperty1, function (receiver) {
@@ -4342,20 +4339,20 @@
     }, null);
   }
   function Manifest$Companion$parse$slambda$slambda$slambda($manifest, $name, $parseFile, $src, resultContinuation) {
-    this.k3n_1 = $manifest;
-    this.l3n_1 = $name;
-    this.m3n_1 = $parseFile;
-    this.n3n_1 = $src;
+    this.j3n_1 = $manifest;
+    this.k3n_1 = $name;
+    this.l3n_1 = $parseFile;
+    this.m3n_1 = $src;
     CoroutineImpl.call(this, resultContinuation);
   }
-  protoOf(Manifest$Companion$parse$slambda$slambda$slambda).r3n = function ($this$async, $completion) {
+  protoOf(Manifest$Companion$parse$slambda$slambda$slambda).q3n = function ($this$async, $completion) {
     var tmp = this.v19($this$async, $completion);
     tmp.e9_1 = Unit_instance;
     tmp.f9_1 = null;
     return tmp.u9();
   };
   protoOf(Manifest$Companion$parse$slambda$slambda$slambda).ea = function (p1, $completion) {
-    return this.r3n((!(p1 == null) ? isInterface(p1, CoroutineScope) : false) ? p1 : THROW_CCE(), $completion);
+    return this.q3n((!(p1 == null) ? isInterface(p1, CoroutineScope) : false) ? p1 : THROW_CCE(), $completion);
   };
   protoOf(Manifest$Companion$parse$slambda$slambda$slambda).u9 = function () {
     var suspendResult = this.e9_1;
@@ -4365,18 +4362,18 @@
         switch (tmp) {
           case 0:
             this.d9_1 = 3;
-            this.p3n_1 = Companion_getInstance_48();
+            this.o3n_1 = Companion_getInstance_48();
             this.c9_1 = 1;
-            suspendResult = this.m3n_1(this.n3n_1, this);
+            suspendResult = this.l3n_1(this.m3n_1, this);
             if (suspendResult === get_COROUTINE_SUSPENDED()) {
               return suspendResult;
             }
             continue $sm;
           case 1:
-            this.q3n_1 = suspendResult;
+            this.p3n_1 = suspendResult;
             this.c9_1 = 2;
-            suspendResult = this.p3n_1.x3n(this.k3n_1, this.l3n_1, this.q3n_1, this.m3n_1, this);
+            suspendResult = this.o3n_1.w3n(this.j3n_1, this.k3n_1, this.p3n_1, this.l3n_1, this);
             if (suspendResult === get_COROUTINE_SUSPENDED()) {
               return suspendResult;
             }
@@ -4399,33 +4396,33 @@
      while (true);
   };
   protoOf(Manifest$Companion$parse$slambda$slambda$slambda).v19 = function ($this$async, completion) {
-    var i = new Manifest$Companion$parse$slambda$slambda$slambda(this.k3n_1, this.l3n_1, this.m3n_1, this.n3n_1, completion);
-    i.o3n_1 = $this$async;
+    var i = new Manifest$Companion$parse$slambda$slambda$slambda(this.j3n_1, this.k3n_1, this.l3n_1, this.m3n_1, completion);
+    i.n3n_1 = $this$async;
     return i;
   };
   function Manifest$Companion$parse$slambda$slambda$slambda_0($manifest, $name, $parseFile, $src, resultContinuation) {
     var i = new Manifest$Companion$parse$slambda$slambda$slambda($manifest, $name, $parseFile, $src, resultContinuation);
     var l = function ($this$async, $completion) {
-      return i.r3n($this$async, $completion);
+      return i.q3n($this$async, $completion);
     };
     l.$arity = 1;
     return l;
   }
   function Manifest$Companion$parse$slambda$slambda$slambda_1($manifest, $id, $parseFile, $src, resultContinuation) {
-    this.g3o_1 = $manifest;
-    this.h3o_1 = $id;
-    this.i3o_1 = $parseFile;
-    this.j3o_1 = $src;
+    this.f3o_1 = $manifest;
+    this.g3o_1 = $id;
+    this.h3o_1 = $parseFile;
+    this.i3o_1 = $src;
     CoroutineImpl.call(this, resultContinuation);
   }
-  protoOf(Manifest$Companion$parse$slambda$slambda$slambda_1).m3o = function ($this$async, $completion) {
+  protoOf(Manifest$Companion$parse$slambda$slambda$slambda_1).l3o = function ($this$async, $completion) {
     var tmp = this.v19($this$async, $completion);
     tmp.e9_1 = Unit_instance;
     tmp.f9_1 = null;
     return tmp.u9();
   };
   protoOf(Manifest$Companion$parse$slambda$slambda$slambda_1).ea = function (p1, $completion) {
-    return this.m3o((!(p1 == null) ? isInterface(p1, CoroutineScope) : false) ? p1 : THROW_CCE(), $completion);
+    return this.l3o((!(p1 == null) ? isInterface(p1, CoroutineScope) : false) ? p1 : THROW_CCE(), $completion);
   };
   protoOf(Manifest$Companion$parse$slambda$slambda$slambda_1).u9 = function () {
     var suspendResult = this.e9_1;
@@ -4436,10 +4433,10 @@
           case 0:
             this.d9_1 = 2;
             var tmp_0 = this;
-            var tmp0_elvis_lhs = this.h3o_1;
-            tmp_0.l3o_1 = tmp0_elvis_lhs == null ? '' : tmp0_elvis_lhs;
+            var tmp0_elvis_lhs = this.g3o_1;
+            tmp_0.k3o_1 = tmp0_elvis_lhs == null ? '' : tmp0_elvis_lhs;
             this.c9_1 = 1;
-            suspendResult = this.i3o_1(this.j3o_1, this);
+            suspendResult = this.h3o_1(this.i3o_1, this);
             if (suspendResult === get_COROUTINE_SUSPENDED()) {
               return suspendResult;
             }
@@ -4447,7 +4444,7 @@
             continue $sm;
           case 1:
             var ARGUMENT = suspendResult;
-            return Tip_init_$Create$(this.g3o_1, this.l3o_1, ARGUMENT);
+            return Tip_init_$Create$(this.f3o_1, this.k3o_1, ARGUMENT);
           case 2:
             throw this.f9_1;
         }
@@ -4463,21 +4460,21 @@
      while (true);
   };
   protoOf(Manifest$Companion$parse$slambda$slambda$slambda_1).v19 = function ($this$async, completion) {
-    var i = new Manifest$Companion$parse$slambda$slambda$slambda_1(this.g3o_1, this.h3o_1, this.i3o_1, this.j3o_1, completion);
-    i.k3o_1 = $this$async;
+    var i = new Manifest$Companion$parse$slambda$slambda$slambda_1(this.f3o_1, this.g3o_1, this.h3o_1, this.i3o_1, completion);
+    i.j3o_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.m3o($this$async, $completion);
+      return i.l3o($this$async, $completion);
     };
     l.$arity = 1;
     return l;
   }
   function Manifest$Companion$parse$slambda$slambda($manifest, $parseFile, resultContinuation) {
-    this.v3o_1 = $manifest;
-    this.w3o_1 = $parseFile;
+    this.u3o_1 = $manifest;
+    this.v3o_1 = $parseFile;
     CoroutineImpl.call(this, resultContinuation);
   }
   protoOf(Manifest$Companion$parse$slambda$slambda).u19 = function ($this$launch, $completion) {
@@ -4498,14 +4495,14 @@
           case 0:
             this.d9_1 = 2;
             this.c9_1 = 1;
-            var this_0 = this.v3o_1.c3g_1;
+            var this_0 = this.u3o_1.b3g_1;
             var destination = ArrayList_init_$Create$_0(collectionSizeOrDefault(this_0, 10));
             var _iterator__ex2g4s = this_0.j();
             while (_iterator__ex2g4s.k()) {
               var item = _iterator__ex2g4s.l();
               var name = item.j3c();
-              var src = item.a3p();
-              destination.e(async(this.x3o_1, VOID, VOID, Manifest$Companion$parse$slambda$slambda$slambda_0(this.v3o_1, name, this.w3o_1, src, null)));
+              var src = item.z3o();
+              destination.e(async(this.w3o_1, VOID, VOID, Manifest$Companion$parse$slambda$slambda$slambda_0(this.u3o_1, name, this.v3o_1, src, null)));
             }
             suspendResult = awaitAll(destination, this);
@@ -4517,7 +4514,7 @@
           case 1:
             var ARGUMENT = suspendResult;
             var ARGUMENT_0 = filterNotNull(ARGUMENT);
-            _set_pages__j2nojl(this.v3o_1, ARGUMENT_0);
+            _set_pages__j2nojl(this.u3o_1, ARGUMENT_0);
             return Unit_instance;
           case 2:
             throw this.f9_1;
@@ -4534,8 +4531,8 @@
      while (true);
   };
   protoOf(Manifest$Companion$parse$slambda$slambda).v19 = function ($this$launch, completion) {
-    var i = new Manifest$Companion$parse$slambda$slambda(this.v3o_1, this.w3o_1, completion);
-    i.x3o_1 = $this$launch;
+    var i = new Manifest$Companion$parse$slambda$slambda(this.u3o_1, this.v3o_1, completion);
+    i.w3o_1 = $this$launch;
     return i;
   };
   function Manifest$Companion$parse$slambda$slambda_0($manifest, $parseFile, resultContinuation) {
@@ -4547,8 +4544,8 @@
     return l;
   }
   function Manifest$Companion$parse$slambda$slambda_1($manifest, $parseFile, resultContinuation) {
-    this.j3p_1 = $manifest;
-    this.k3p_1 = $parseFile;
+    this.i3p_1 = $manifest;
+    this.j3p_1 = $parseFile;
     CoroutineImpl.call(this, resultContinuation);
   }
   protoOf(Manifest$Companion$parse$slambda$slambda_1).u19 = function ($this$launch, $completion) {
@@ -4569,14 +4566,14 @@
           case 0:
             this.d9_1 = 2;
             this.c9_1 = 1;
-            var this_0 = this.j3p_1.d3g_1;
+            var this_0 = this.i3p_1.c3g_1;
             var destination = ArrayList_init_$Create$_0(collectionSizeOrDefault(this_0, 10));
             var _iterator__ex2g4s = this_0.j();
             while (_iterator__ex2g4s.k()) {
               var item = _iterator__ex2g4s.l();
               var id = item.j3c();
-              var src = item.a3p();
-              destination.e(async(this.l3p_1, VOID, VOID, Manifest$Companion$parse$slambda$slambda$slambda_2(this.j3p_1, id, this.k3p_1, src, null)));
+              var src = item.z3o();
+              destination.e(async(this.k3p_1, VOID, VOID, Manifest$Companion$parse$slambda$slambda$slambda_2(this.i3p_1, id, this.j3p_1, src, null)));
             }
             suspendResult = awaitAll(destination, this);
@@ -4592,11 +4589,11 @@
             var _iterator__ex2g4s_0 = this_1.j();
             while (_iterator__ex2g4s_0.k()) {
               var element = _iterator__ex2g4s_0.l();
-              destination_0.y3(element.n3p_1, element);
+              destination_0.y3(element.m3p_1, element);
             }
             var ARGUMENT = destination_0;
-            _set_tips__9ug36n(this.j3p_1, ARGUMENT);
+            _set_tips__9ug36n(this.i3p_1, ARGUMENT);
             return Unit_instance;
           case 2:
             throw this.f9_1;
@@ -4613,8 +4610,8 @@
      while (true);
   };
   protoOf(Manifest$Companion$parse$slambda$slambda_1).v19 = function ($this$launch, completion) {
-    var i = new Manifest$Companion$parse$slambda$slambda_1(this.j3p_1, this.k3p_1, completion);
-    i.l3p_1 = $this$launch;
+    var i = new Manifest$Companion$parse$slambda$slambda_1(this.i3p_1, this.j3p_1, completion);
+    i.k3p_1 = $this$launch;
     return i;
   };
   function Manifest$Companion$parse$slambda$slambda_2($manifest, $parseFile, resultContinuation) {
@@ -4626,19 +4623,19 @@
     return l;
   }
   function Manifest$Companion$parse$slambda($config, $manifest, $parseFile, resultContinuation) {
-    this.y3p_1 = $config;
-    this.z3p_1 = $manifest;
-    this.a3q_1 = $parseFile;
+    this.x3p_1 = $config;
+    this.y3p_1 = $manifest;
+    this.z3p_1 = $parseFile;
     CoroutineImpl.call(this, resultContinuation);
   }
-  protoOf(Manifest$Companion$parse$slambda).c3q = function ($this$coroutineScope, $completion) {
+  protoOf(Manifest$Companion$parse$slambda).b3q = function ($this$coroutineScope, $completion) {
     var tmp = this.v19($this$coroutineScope, $completion);
     tmp.e9_1 = Unit_instance;
     tmp.f9_1 = null;
     return tmp.u9();
   };
   protoOf(Manifest$Companion$parse$slambda).ea = function (p1, $completion) {
-    return this.c3q((!(p1 == null) ? isInterface(p1, CoroutineScope) : false) ? p1 : THROW_CCE(), $completion);
+    return this.b3q((!(p1 == null) ? isInterface(p1, CoroutineScope) : false) ? p1 : THROW_CCE(), $completion);
   };
   protoOf(Manifest$Companion$parse$slambda).u9 = function () {
     var suspendResult = this.e9_1;
@@ -4647,16 +4644,16 @@
         var tmp = this.c9_1;
         if (tmp === 0) {
           this.d9_1 = 1;
-          if (this.y3p_1.l3b_1) {
-            launch(this.b3q_1, VOID, VOID, Manifest$Companion$parse$slambda$slambda_0(this.z3p_1, this.a3q_1, null));
+          if (this.x3p_1.l3b_1) {
+            launch(this.a3q_1, VOID, VOID, Manifest$Companion$parse$slambda$slambda_0(this.y3p_1, this.z3p_1, null));
           } else {
-            _set_pages__j2nojl(this.z3p_1, emptyList());
+            _set_pages__j2nojl(this.y3p_1, emptyList());
           }
           var tmp_0;
-          if (this.y3p_1.m3b_1) {
-            tmp_0 = launch(this.b3q_1, VOID, VOID, Manifest$Companion$parse$slambda$slambda_2(this.z3p_1, this.a3q_1, null));
+          if (this.x3p_1.m3b_1) {
+            tmp_0 = launch(this.a3q_1, VOID, VOID, Manifest$Companion$parse$slambda$slambda_2(this.y3p_1, this.z3p_1, null));
           } else {
-            _set_tips__9ug36n(this.z3p_1, emptyMap());
+            _set_tips__9ug36n(this.y3p_1, emptyMap());
             tmp_0 = Unit_instance;
           }
           return tmp_0;
@@ -4670,24 +4667,24 @@
      while (true);
   };
   protoOf(Manifest$Companion$parse$slambda).v19 = function ($this$coroutineScope, completion) {
-    var i = new Manifest$Companion$parse$slambda(this.y3p_1, this.z3p_1, this.a3q_1, completion);
-    i.b3q_1 = $this$coroutineScope;
+    var i = new Manifest$Companion$parse$slambda(this.x3p_1, this.y3p_1, this.z3p_1, completion);
+    i.a3q_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.c3q($this$coroutineScope, $completion);
+      return i.b3q($this$coroutineScope, $completion);
     };
     l.$arity = 1;
     return l;
   }
   function $parseCOROUTINE$0(_this__u8e3s4, fileName, config, parseFile, resultContinuation) {
     CoroutineImpl.call(this, resultContinuation);
-    this.l3q_1 = _this__u8e3s4;
-    this.m3q_1 = fileName;
-    this.n3q_1 = config;
-    this.o3q_1 = parseFile;
+    this.k3q_1 = _this__u8e3s4;
+    this.l3q_1 = fileName;
+    this.m3q_1 = config;
+    this.n3q_1 = parseFile;
   }
   protoOf($parseCOROUTINE$0).u9 = function () {
     var suspendResult = this.e9_1;
@@ -4698,24 +4695,24 @@
           case 0:
             this.d9_1 = 3;
             this.c9_1 = 1;
-            suspendResult = this.o3q_1(this.m3q_1, this);
+            suspendResult = this.n3q_1(this.l3q_1, this);
             if (suspendResult === get_COROUTINE_SUSPENDED()) {
               return suspendResult;
             }
             continue $sm;
           case 1:
-            this.p3q_1 = suspendResult;
-            this.q3q_1 = Manifest_init_$Create$(this.p3q_1, this.n3q_1);
+            this.o3q_1 = suspendResult;
+            this.p3q_1 = Manifest_init_$Create$(this.o3q_1, this.m3q_1);
             this.c9_1 = 2;
-            suspendResult = coroutineScope(Manifest$Companion$parse$slambda_0(this.n3q_1, this.q3q_1, this.o3q_1, null), this);
+            suspendResult = coroutineScope(Manifest$Companion$parse$slambda_0(this.m3q_1, this.p3q_1, this.n3q_1, null), this);
             if (suspendResult === get_COROUTINE_SUSPENDED()) {
               return suspendResult;
             }
             continue $sm;
           case 2:
-            return this.q3q_1;
+            return this.p3q_1;
           case 3:
             throw this.f9_1;
         }
@@ -4737,9 +4734,9 @@
   var Type_UNKNOWN_instance_0;
   function Companion_25() {
     Companion_instance_26 = this;
-    this.r3q_1 = Type_TRACT_getInstance();
+    this.q3q_1 = Type_TRACT_getInstance();
   }
-  protoOf(Companion_25).s3q = function (value) {
+  protoOf(Companion_25).r3q = function (value) {
     switch (value) {
       case 'article':
         return Type_ARTICLE_getInstance();
@@ -4826,67 +4823,67 @@
     return Companion_instance_27;
   }
   function _set_pages__j2nojl($this, _set____db54di) {
-    return $this.z3f_1.t3q($this, pages$factory(), _set____db54di);
+    return $this.y3f_1.s3q($this, pages$factory(), _set____db54di);
   }
   function _set_tips__9ug36n($this, _set____db54di) {
-    return $this.b3g_1.t3q($this, tips$factory(), _set____db54di);
+    return $this.a3g_1.s3q($this, tips$factory(), _set____db54di);
   }
   function Manifest_init_$Init$(parser, config, $this) {
     BaseModel.call($this);
     Manifest.call($this);
     parser.u3c(2, 'https://mobile-content-api.cru.org/xmlns/manifest', 'manifest');
-    $this.i3f_1 = config;
+    $this.h3f_1 = config;
     $this.code = parser.j3e('tool');
     var tmp = $this;
     var tmp0_safe_receiver = parser.j3e('locale');
     tmp.locale = tmp0_safe_receiver == null ? null : toLocaleOrNull(tmp0_safe_receiver);
     var tmp_0 = $this;
-    var tmp1_elvis_lhs = Companion_getInstance_28().s3q(parser.j3e('type'));
-    tmp_0.type = tmp1_elvis_lhs == null ? Companion_getInstance_28().r3q_1 : tmp1_elvis_lhs;
+    var tmp1_elvis_lhs = Companion_getInstance_28().r3q(parser.j3e('type'));
+    tmp_0.type = tmp1_elvis_lhs == null ? Companion_getInstance_28().q3q_1 : tmp1_elvis_lhs;
     var tmp_1 = $this;
     // Inline function 'org.cru.godtools.shared.tool.parser.model.toEventIds' call
     var this_0 = parser.j3e('dismiss-listeners');
-    var tmp$ret$0 = Companion_getInstance_17().g3f(this_0);
+    var tmp$ret$0 = Companion_getInstance_17().f3f(this_0);
     tmp_1._dismissListeners = toSet_0(tmp$ret$0);
     var tmp_2 = $this;
     var tmp2_safe_receiver = parser.j3e('primary-color');
     var tmp3_elvis_lhs = tmp2_safe_receiver == null ? null : toColorOrNull(tmp2_safe_receiver);
-    tmp_2.j3f_1 = tmp3_elvis_lhs == null ? Companion_getInstance_29().a3b_1 : tmp3_elvis_lhs;
+    tmp_2.i3f_1 = tmp3_elvis_lhs == null ? Companion_getInstance_29().a3b_1 : tmp3_elvis_lhs;
     var tmp_3 = $this;
     var tmp4_safe_receiver = parser.j3e('primary-text-color');
     var tmp5_elvis_lhs = tmp4_safe_receiver == null ? null : toColorOrNull(tmp4_safe_receiver);
-    tmp_3.k3f_1 = tmp5_elvis_lhs == null ? Companion_getInstance_29().b3b_1 : tmp5_elvis_lhs;
+    tmp_3.j3f_1 = tmp5_elvis_lhs == null ? Companion_getInstance_29().b3b_1 : tmp5_elvis_lhs;
     var tmp_4 = $this;
     var tmp6_safe_receiver = parser.j3e('navbar-color');
-    tmp_4.l3f_1 = tmp6_safe_receiver == null ? null : toColorOrNull(tmp6_safe_receiver);
+    tmp_4.k3f_1 = tmp6_safe_receiver == null ? null : toColorOrNull(tmp6_safe_receiver);
     var tmp_5 = $this;
     var tmp7_safe_receiver = parser.j3e('navbar-control-color');
-    tmp_5.m3f_1 = tmp7_safe_receiver == null ? null : toColorOrNull(tmp7_safe_receiver);
+    tmp_5.l3f_1 = tmp7_safe_receiver == null ? null : toColorOrNull(tmp7_safe_receiver);
     var tmp_6 = $this;
     var tmp8_safe_receiver = parser.j3e('background-color');
     var tmp9_elvis_lhs = tmp8_safe_receiver == null ? null : toColorOrNull(tmp8_safe_receiver);
-    tmp_6.n3f_1 = tmp9_elvis_lhs == null ? Companion_getInstance_29().c3b_1 : tmp9_elvis_lhs;
-    $this.o3f_1 = parser.f3f(null, 'background-image');
+    tmp_6.m3f_1 = tmp9_elvis_lhs == null ? Companion_getInstance_29().c3b_1 : tmp9_elvis_lhs;
+    $this.n3f_1 = parser.j3e('background-image');
     var tmp_7 = $this;
     var tmp10_safe_receiver = parser.j3e('background-image-align');
-    var tmp11_elvis_lhs = tmp10_safe_receiver == null ? null : Companion_getInstance_22().s3h(tmp10_safe_receiver);
-    tmp_7.p3f_1 = tmp11_elvis_lhs == null ? Companion_getInstance_29().d3b_1 : tmp11_elvis_lhs;
+    var tmp11_elvis_lhs = tmp10_safe_receiver == null ? null : Companion_getInstance_22().r3h(tmp10_safe_receiver);
+    tmp_7.o3f_1 = tmp11_elvis_lhs == null ? Companion_getInstance_29().d3b_1 : tmp11_elvis_lhs;
     var tmp_8 = $this;
     var tmp12_safe_receiver = parser.j3e('background-image-scale-type');
-    var tmp13_elvis_lhs = tmp12_safe_receiver == null ? null : Companion_instance_22.c3m(tmp12_safe_receiver);
-    tmp_8.q3f_1 = tmp13_elvis_lhs == null ? Companion_getInstance_29().e3b_1 : tmp13_elvis_lhs;
+    var tmp13_elvis_lhs = tmp12_safe_receiver == null ? null : Companion_instance_22.b3m(tmp12_safe_receiver);
+    tmp_8.p3f_1 = tmp13_elvis_lhs == null ? Companion_getInstance_29().e3b_1 : tmp13_elvis_lhs;
     var tmp_9 = $this;
-    var tmp14_safe_receiver = parser.f3f('https://mobile-content-api.cru.org/xmlns/content', 'card-background-color');
-    tmp_9.r3f_1 = tmp14_safe_receiver == null ? null : toColorOrNull(tmp14_safe_receiver);
+    var tmp14_safe_receiver = parser.t3q('https://mobile-content-api.cru.org/xmlns/content', 'card-background-color');
+    tmp_9.q3f_1 = tmp14_safe_receiver == null ? null : toColorOrNull(tmp14_safe_receiver);
     var tmp_10 = $this;
     var tmp15_safe_receiver = parser.j3e('category-label-color');
-    tmp_10.s3f_1 = tmp15_safe_receiver == null ? null : toColorOrNull(tmp15_safe_receiver);
+    tmp_10.r3f_1 = tmp15_safe_receiver == null ? null : toColorOrNull(tmp15_safe_receiver);
     var tmp_11 = $this;
-    var tmp16_safe_receiver = parser.f3f('https://mobile-content-api.cru.org/xmlns/page', 'control-color');
+    var tmp16_safe_receiver = parser.t3q('https://mobile-content-api.cru.org/xmlns/page', 'control-color');
     var tmp17_elvis_lhs = tmp16_safe_receiver == null ? null : toColorOrNull(tmp16_safe_receiver);
     var tmp_12;
     if (tmp17_elvis_lhs == null) {
-      var tmp18_safe_receiver = parser.f3f('https://mobile-content-api.cru.org/xmlns/lesson', 'control-color');
+      var tmp18_safe_receiver = parser.t3q('https://mobile-content-api.cru.org/xmlns/lesson', 'control-color');
       var tmp19_safe_receiver = tmp18_safe_receiver == null ? null : toColorOrNull(tmp18_safe_receiver);
       var tmp_13;
       if (tmp19_safe_receiver == null) {
@@ -4911,21 +4908,21 @@
       tmp_12 = tmp17_elvis_lhs;
     }
     var tmp20_elvis_lhs = tmp_12;
-    tmp_11.t3f_1 = tmp20_elvis_lhs == null ? get_DEFAULT_CONTROL_COLOR() : tmp20_elvis_lhs;
+    tmp_11.s3f_1 = tmp20_elvis_lhs == null ? get_DEFAULT_CONTROL_COLOR() : tmp20_elvis_lhs;
     var tmp_14 = $this;
-    var tmp21_safe_receiver = parser.f3f('https://mobile-content-api.cru.org/xmlns/content', 'multiselect-option-background-color');
-    tmp_14.u3f_1 = tmp21_safe_receiver == null ? null : toColorOrNull(tmp21_safe_receiver);
+    var tmp21_safe_receiver = parser.t3q('https://mobile-content-api.cru.org/xmlns/content', 'multiselect-option-background-color');
+    tmp_14.t3f_1 = tmp21_safe_receiver == null ? null : toColorOrNull(tmp21_safe_receiver);
     var tmp_15 = $this;
-    var tmp22_safe_receiver = parser.f3f('https://mobile-content-api.cru.org/xmlns/content', 'multiselect-option-selected-color');
-    tmp_15.v3f_1 = tmp22_safe_receiver == null ? null : toColorOrNull(tmp22_safe_receiver);
+    var tmp22_safe_receiver = parser.t3q('https://mobile-content-api.cru.org/xmlns/content', 'multiselect-option-selected-color');
+    tmp_15.u3f_1 = tmp22_safe_receiver == null ? null : toColorOrNull(tmp22_safe_receiver);
     var tmp_16 = $this;
     var tmp23_safe_receiver = parser.j3e('text-color');
     var tmp24_elvis_lhs = tmp23_safe_receiver == null ? null : toColorOrNull(tmp23_safe_receiver);
-    tmp_16.w3f_1 = tmp24_elvis_lhs == null ? Companion_getInstance_29().g3b_1 : tmp24_elvis_lhs;
+    tmp_16.v3f_1 = tmp24_elvis_lhs == null ? Companion_getInstance_29().g3b_1 : tmp24_elvis_lhs;
     var tmp_17 = $this;
     var tmp25_safe_receiver = parser.j3e('text-scale');
     var tmp26_elvis_lhs = tmp25_safe_receiver == null ? null : toDoubleOrNull(tmp25_safe_receiver);
-    tmp_17.x3f_1 = tmp26_elvis_lhs == null ? 1.0 : tmp26_elvis_lhs;
+    tmp_17.w3f_1 = tmp26_elvis_lhs == null ? 1.0 : tmp26_elvis_lhs;
     var title = null;
     var tmp_18 = $this;
     // Inline function 'kotlin.collections.mutableListOf' call
@@ -4935,15 +4932,15 @@
     tmp_19.categories = ArrayList_init_$Create$();
     var tmp_20 = $this;
     // Inline function 'kotlin.collections.mutableMapOf' call
-    tmp_20.a3g_1 = LinkedHashMap_init_$Create$();
+    tmp_20.z3f_1 = LinkedHashMap_init_$Create$();
     // Inline function 'kotlin.collections.mutableListOf' call
     var shareables = ArrayList_init_$Create$();
     var tmp_21 = $this;
     // Inline function 'kotlin.collections.mutableListOf' call
-    tmp_21.c3g_1 = ArrayList_init_$Create$();
+    tmp_21.b3g_1 = ArrayList_init_$Create$();
     var tmp_22 = $this;
     // Inline function 'kotlin.collections.mutableListOf' call
-    tmp_22.d3g_1 = ArrayList_init_$Create$();
+    tmp_22.c3g_1 = ArrayList_init_$Create$();
     // Inline function 'org.cru.godtools.shared.tool.parser.xml.parseChildren' call
     $l$loop_0: while (!(parser.l() === 3)) {
       if (!(parser.v3c() === 2))
@@ -4969,14 +4966,14 @@
             var elements_0 = result.w3q_1;
             addAll(tmp2_0, elements_0);
-            var tmp4 = $this.c3g_1;
+            var tmp4 = $this.b3g_1;
             // Inline function 'kotlin.collections.plusAssign' call
             var elements_1 = result.x3q_1;
             addAll(tmp4, elements_1);
             break;
           case 'resources':
-            var tmp8 = $this.a3g_1;
+            var tmp8 = $this.z3f_1;
             // Inline function 'kotlin.collections.associateBy' call
             var this_1 = parseResources(parser, $this);
@@ -4997,7 +4994,7 @@
             tmp8.m5(destination);
             break;
           case 'tips':
-            var tmp10 = $this.d3g_1;
+            var tmp10 = $this.c3g_1;
             // Inline function 'kotlin.collections.plusAssign' call
             var elements_2 = parseTips(parser, $this);
@@ -5033,7 +5030,7 @@
     var tmp_24 = Manifest$_init_$lambda_cbhz6k;
     var tmp$ret$13 = new sam$kotlin_Comparator$0(tmp_24);
     tmp_23.shareables = sortedWith(list, tmp$ret$13);
-    $this.y3f_1 = title;
+    $this.x3f_1 = title;
     return $this;
   }
   function Manifest_init_$Create$(parser, config) {
@@ -5041,7 +5038,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, pageXmlFiles, $this) {
     config = config === VOID ? createParserConfig() : config;
-    type = type === VOID ? Companion_getInstance_28().r3q_1 : type;
+    type = type === VOID ? Companion_getInstance_28().q3q_1 : type;
     code = code === VOID ? null : code;
     locale = locale === VOID ? null : locale;
     primaryColor = primaryColor === VOID ? Companion_getInstance_29().a3b_1 : primaryColor;
@@ -5063,27 +5060,27 @@
     pageXmlFiles = pageXmlFiles === VOID ? emptyList() : pageXmlFiles;
     BaseModel.call($this);
     Manifest.call($this);
-    $this.i3f_1 = config;
+    $this.h3f_1 = config;
     $this.code = code;
     $this.locale = locale;
     $this.type = type;
     $this._dismissListeners = emptySet();
-    $this.j3f_1 = primaryColor;
-    $this.k3f_1 = primaryTextColor;
-    $this.l3f_1 = navBarColor;
-    $this.m3f_1 = navBarControlColor;
-    $this.n3f_1 = backgroundColor;
-    $this.o3f_1 = null;
-    $this.p3f_1 = Companion_getInstance_29().d3b_1;
-    $this.q3f_1 = Companion_getInstance_29().e3b_1;
-    $this.r3f_1 = cardBackgroundColor;
-    $this.s3f_1 = categoryLabelColor;
-    $this.t3f_1 = pageControlColor;
-    $this.u3f_1 = multiselectOptionBackgroundColor;
-    $this.v3f_1 = multiselectOptionSelectedColor;
-    $this.w3f_1 = textColor;
-    $this.x3f_1 = textScale;
-    $this.y3f_1 = null;
+    $this.i3f_1 = primaryColor;
+    $this.j3f_1 = primaryTextColor;
+    $this.k3f_1 = navBarColor;
+    $this.l3f_1 = navBarControlColor;
+    $this.m3f_1 = backgroundColor;
+    $this.n3f_1 = null;
+    $this.o3f_1 = Companion_getInstance_29().d3b_1;
+    $this.p3f_1 = Companion_getInstance_29().e3b_1;
+    $this.q3f_1 = cardBackgroundColor;
+    $this.r3f_1 = categoryLabelColor;
+    $this.s3f_1 = pageControlColor;
+    $this.t3f_1 = multiselectOptionBackgroundColor;
+    $this.u3f_1 = multiselectOptionSelectedColor;
+    $this.v3f_1 = textColor;
+    $this.w3f_1 = textScale;
+    $this.x3f_1 = null;
     $this.aemImports = emptyList();
     $this.categories = emptyList();
     // Inline function 'kotlin.collections.orEmpty' call
@@ -5111,7 +5108,7 @@
     }
     // Inline function 'kotlin.collections.orEmpty' call
     var tmp0_elvis_lhs_0 = tmp_0;
-    tmp.a3g_1 = tmp0_elvis_lhs_0 == null ? emptyMap() : tmp0_elvis_lhs_0;
+    tmp.z3f_1 = tmp0_elvis_lhs_0 == null ? emptyMap() : tmp0_elvis_lhs_0;
     var tmp_1 = $this;
     // Inline function 'kotlin.collections.orEmpty' call
     var tmp0_elvis_lhs_1 = shareables == null ? null : shareables($this);
@@ -5129,7 +5126,7 @@
       while (_iterator__ex2g4s_0.k()) {
         var element_0 = _iterator__ex2g4s_0.l();
         // Inline function 'org.cru.godtools.shared.tool.parser.model.Manifest.<init>.<anonymous>' call
-        var tmp$ret$6 = element_0.n3p_1;
+        var tmp$ret$6 = element_0.m3p_1;
         destination_0.y3(tmp$ret$6, element_0);
       }
       tmp_2 = destination_0;
@@ -5138,8 +5135,8 @@
     var tmp0_elvis_lhs_2 = tmp_2;
     var tmp$ret$9 = tmp0_elvis_lhs_2 == null ? emptyMap() : tmp0_elvis_lhs_2;
     _set_tips__9ug36n($this, tmp$ret$9);
-    $this.c3g_1 = pageXmlFiles;
-    $this.d3g_1 = emptyList();
+    $this.b3g_1 = pageXmlFiles;
+    $this.c3g_1 = emptyList();
     return $this;
   }
   function createTestManifest(config, type, code, locale, primaryColor, primaryTextColor, navBarColor, navBarControlColor, backgroundColor, cardBackgroundColor, categoryLabelColor, pageControlColor, multiselectOptionBackgroundColor, multiselectOptionSelectedColor, textColor, textScale, resources, shareables, tips, pages, pageXmlFiles) {
@@ -5307,35 +5304,35 @@
     Enum.call(this, name, ordinal);
   }
   function XmlFile(name, src) {
-    this.y3o_1 = name;
-    this.z3o_1 = src;
+    this.x3o_1 = name;
+    this.y3o_1 = src;
   }
   protoOf(XmlFile).e3r = function () {
-    return this.y3o_1;
+    return this.x3o_1;
   };
   protoOf(XmlFile).f3r = function () {
-    return this.z3o_1;
+    return this.y3o_1;
   };
   protoOf(XmlFile).j3c = function () {
-    return this.y3o_1;
+    return this.x3o_1;
   };
-  protoOf(XmlFile).a3p = function () {
-    return this.z3o_1;
+  protoOf(XmlFile).z3o = function () {
+    return this.y3o_1;
   };
   protoOf(XmlFile).g3r = function (name, src) {
     return new XmlFile(name, src);
   };
   protoOf(XmlFile).copy = function (name, src, $super) {
-    name = name === VOID ? this.y3o_1 : name;
-    src = src === VOID ? this.z3o_1 : src;
+    name = name === VOID ? this.x3o_1 : name;
+    src = src === VOID ? this.y3o_1 : src;
     return this.g3r(name, src);
   };
   protoOf(XmlFile).toString = function () {
-    return 'XmlFile(name=' + this.y3o_1 + ', src=' + this.z3o_1 + ')';
+    return 'XmlFile(name=' + this.x3o_1 + ', src=' + this.y3o_1 + ')';
   };
   protoOf(XmlFile).hashCode = function () {
-    var result = this.y3o_1 == null ? 0 : getStringHashCode(this.y3o_1);
-    result = imul(result, 31) + getStringHashCode(this.z3o_1) | 0;
+    var result = this.x3o_1 == null ? 0 : getStringHashCode(this.x3o_1);
+    result = imul(result, 31) + getStringHashCode(this.y3o_1) | 0;
     return result;
   };
   protoOf(XmlFile).equals = function (other) {
@@ -5344,9 +5341,9 @@
     if (!(other instanceof XmlFile))
       return false;
     var tmp0_other_with_cast = other instanceof XmlFile ? other : THROW_CCE();
-    if (!(this.y3o_1 == tmp0_other_with_cast.y3o_1))
+    if (!(this.x3o_1 == tmp0_other_with_cast.x3o_1))
       return false;
-    if (!(this.z3o_1 === tmp0_other_with_cast.z3o_1))
+    if (!(this.y3o_1 === tmp0_other_with_cast.y3o_1))
       return false;
     return true;
   };
@@ -5409,7 +5406,7 @@
     return Type_UNKNOWN_instance_0;
   }
   protoOf(Manifest).i3r = function () {
-    return this.i3f_1;
+    return this.h3f_1;
   };
   protoOf(Manifest).j3r = function () {
     return this.code;
@@ -5423,61 +5420,61 @@
   protoOf(Manifest).l3r = function () {
     return this._dismissListeners;
   };
+  protoOf(Manifest).x3i = function () {
+    return this.i3f_1;
+  };
   protoOf(Manifest).y3i = function () {
     return this.j3f_1;
   };
-  protoOf(Manifest).z3i = function () {
-    return this.k3f_1;
-  };
   protoOf(Manifest).m3r = function () {
-    var tmp0_elvis_lhs = this.l3f_1;
-    return tmp0_elvis_lhs == null ? this.type.equals(Type_LESSON_getInstance()) ? get_DEFAULT_LESSON_NAV_BAR_COLOR() : this.j3f_1 : tmp0_elvis_lhs;
+    var tmp0_elvis_lhs = this.k3f_1;
+    return tmp0_elvis_lhs == null ? this.type.equals(Type_LESSON_getInstance()) ? get_DEFAULT_LESSON_NAV_BAR_COLOR() : this.i3f_1 : tmp0_elvis_lhs;
   };
   protoOf(Manifest).n3r = function () {
-    var tmp0_elvis_lhs = this.m3f_1;
-    return tmp0_elvis_lhs == null ? this.type.equals(Type_LESSON_getInstance()) ? this.j3f_1 : this.k3f_1 : tmp0_elvis_lhs;
+    var tmp0_elvis_lhs = this.l3f_1;
+    return tmp0_elvis_lhs == null ? this.type.equals(Type_LESSON_getInstance()) ? this.i3f_1 : this.j3f_1 : tmp0_elvis_lhs;
   };
   protoOf(Manifest).o3r = function () {
-    return this.n3f_1;
+    return this.m3f_1;
   };
   protoOf(Manifest).p3r = function () {
-    return this.v3g(this.o3f_1);
+    return this.u3g(this.n3f_1);
   };
   protoOf(Manifest).q3r = function () {
-    return this.p3f_1;
+    return this.o3f_1;
   };
   protoOf(Manifest).r3r = function () {
-    return this.q3f_1;
+    return this.p3f_1;
   };
-  protoOf(Manifest).b3j = function () {
-    var tmp0_elvis_lhs = this.r3f_1;
-    return tmp0_elvis_lhs == null ? this.n3f_1 : tmp0_elvis_lhs;
+  protoOf(Manifest).a3j = function () {
+    var tmp0_elvis_lhs = this.q3f_1;
+    return tmp0_elvis_lhs == null ? this.m3f_1 : tmp0_elvis_lhs;
   };
-  protoOf(Manifest).x3i = function () {
-    var tmp0_elvis_lhs = this.s3f_1;
-    return tmp0_elvis_lhs == null ? this.w3f_1 : tmp0_elvis_lhs;
+  protoOf(Manifest).w3i = function () {
+    var tmp0_elvis_lhs = this.r3f_1;
+    return tmp0_elvis_lhs == null ? this.v3f_1 : tmp0_elvis_lhs;
   };
   protoOf(Manifest).s3r = function () {
-    return this.t3f_1;
+    return this.s3f_1;
   };
-  protoOf(Manifest).a3j = function () {
+  protoOf(Manifest).z3i = function () {
     return Companion_getInstance_29().f3b_1;
   };
-  protoOf(Manifest).c3j = function () {
-    var tmp0_elvis_lhs = this.u3f_1;
+  protoOf(Manifest).b3j = function () {
+    var tmp0_elvis_lhs = this.t3f_1;
     return tmp0_elvis_lhs == null ? get_multiselectOptionBackgroundColor.call(this) : tmp0_elvis_lhs;
   };
-  protoOf(Manifest).d3j = function () {
+  protoOf(Manifest).c3j = function () {
+    return this.u3f_1;
+  };
+  protoOf(Manifest).v3i = function () {
     return this.v3f_1;
   };
-  protoOf(Manifest).w3i = function () {
+  protoOf(Manifest).d3j = function () {
     return this.w3f_1;
   };
-  protoOf(Manifest).e3j = function () {
-    return this.x3f_1;
-  };
   protoOf(Manifest).t3r = function () {
-    var tmp0_safe_receiver = this.y3f_1;
+    var tmp0_safe_receiver = this.x3f_1;
     return tmp0_safe_receiver == null ? null : tmp0_safe_receiver.text;
   };
   protoOf(Manifest).f3s = function () {
@@ -5486,20 +5483,20 @@
   protoOf(Manifest).g3s = function () {
     return this.categories;
   };
-  protoOf(Manifest).n3l = function () {
-    return this.z3f_1.h3s(this, pages$factory_0());
+  protoOf(Manifest).m3l = function () {
+    return this.y3f_1.h3s(this, pages$factory_0());
   };
   protoOf(Manifest).i3s = function () {
-    return this.a3g_1;
+    return this.z3f_1;
   };
   protoOf(Manifest).j3s = function () {
     return this.shareables;
   };
   protoOf(Manifest).k3s = function () {
-    return this.b3g_1.h3s(this, tips$factory_0());
+    return this.a3g_1.h3s(this, tips$factory_0());
   };
   protoOf(Manifest).l3s = function () {
-    return this.c3g_1;
+    return this.b3g_1;
   };
   protoOf(Manifest).m3s = function () {
     // Inline function 'kotlin.collections.buildSet' call
@@ -5508,31 +5505,31 @@
     var this_0 = LinkedHashSet_init_$Create$();
     // Inline function 'org.cru.godtools.shared.tool.parser.model.Manifest.<get-relatedFiles>.<anonymous>' call
     // Inline function 'kotlin.collections.map' call
-    var this_1 = this.c3g_1;
+    var this_1 = this.b3g_1;
     // Inline function 'kotlin.collections.mapTo' call
     var destination = ArrayList_init_$Create$_0(collectionSizeOrDefault(this_1, 10));
     var _iterator__ex2g4s = this_1.j();
     while (_iterator__ex2g4s.k()) {
       var item = _iterator__ex2g4s.l();
       // Inline function 'org.cru.godtools.shared.tool.parser.model.Manifest.<get-relatedFiles>.<anonymous>.<anonymous>' call
-      var tmp$ret$0 = item.z3o_1;
+      var tmp$ret$0 = item.y3o_1;
       destination.e(tmp$ret$0);
     }
     this_0.n(destination);
     // Inline function 'kotlin.collections.map' call
-    var this_2 = this.d3g_1;
+    var this_2 = this.c3g_1;
     // Inline function 'kotlin.collections.mapTo' call
     var destination_0 = ArrayList_init_$Create$_0(collectionSizeOrDefault(this_2, 10));
     var _iterator__ex2g4s_0 = this_2.j();
     while (_iterator__ex2g4s_0.k()) {
       var item_0 = _iterator__ex2g4s_0.l();
       // Inline function 'org.cru.godtools.shared.tool.parser.model.Manifest.<get-relatedFiles>.<anonymous>.<anonymous>' call
-      var tmp$ret$3 = item_0.z3o_1;
+      var tmp$ret$3 = item_0.y3o_1;
       destination_0.e(tmp$ret$3);
     }
     this_0.n(destination_0);
     // Inline function 'kotlin.collections.mapNotNull' call
-    var tmp0 = this.a3g_1.m2();
+    var tmp0 = this.z3f_1.m2();
     // Inline function 'kotlin.collections.mapNotNullTo' call
     var destination_1 = ArrayList_init_$Create$();
     // Inline function 'kotlin.collections.forEach' call
@@ -5563,9 +5560,9 @@
       tmp = true;
     } else {
       var tmp_0;
-      if (!this.i3f_1.m3b_1) {
+      if (!this.h3f_1.m3b_1) {
         // Inline function 'kotlin.collections.isNotEmpty' call
-        tmp_0 = !this.d3g_1.p();
+        tmp_0 = !this.c3g_1.p();
       } else {
         tmp_0 = false;
       }
@@ -5573,14 +5570,14 @@
     }
     return tmp;
   };
-  protoOf(Manifest).v3g = function (name) {
+  protoOf(Manifest).u3g = function (name) {
     var tmp;
     if (name == null) {
       tmp = null;
     } else {
       // Inline function 'kotlin.let' call
       // Inline function 'org.cru.godtools.shared.tool.parser.model.Manifest.getResource.<anonymous>' call
-      tmp = this.a3g_1.k2(name);
+      tmp = this.z3f_1.k2(name);
     }
     return tmp;
   };
@@ -5593,7 +5590,7 @@
       while (_iterator__ex2g4s.k()) {
         var element = _iterator__ex2g4s.l();
         // Inline function 'org.cru.godtools.shared.tool.parser.model.Manifest.findCategory.<anonymous>' call
-        if (element.s3i_1 == category) {
+        if (element.r3i_1 == category) {
           tmp$ret$1 = element;
           break $l$block;
         }
@@ -5633,14 +5630,14 @@
     var this_0 = this.k3s();
     return (isInterface(this_0, KtMap) ? this_0 : THROW_CCE()).k2(id);
   };
-  protoOf(Manifest).o3l = function (type) {
+  protoOf(Manifest).n3l = function (type) {
     var tmp;
     switch (this.type.p2_1) {
       case 0:
         tmp = false;
         break;
       case 1:
-        tmp = type.equals(getKClass(CardCollectionPage)) || type.equals(getKClass(ContentPage)) ? true : type.equals(getKClass(PageCollectionPage)) ? this.i3f_1.i3c('page-collection') : false;
+        tmp = type.equals(getKClass(CardCollectionPage)) || type.equals(getKClass(ContentPage)) ? true : type.equals(getKClass(PageCollectionPage)) ? this.h3f_1.i3c('page-collection') : false;
         break;
       case 2:
         tmp = type.equals(getKClass(LessonPage));
@@ -5664,23 +5661,23 @@
   };
   function Manifest() {
     Companion_getInstance_29();
-    this.z3f_1 = setOnce();
-    this.b3g_1 = setOnce();
+    this.y3f_1 = setOnce();
+    this.a3g_1 = setOnce();
   }
   function get_backgroundColor(_this__u8e3s4) {
-    var tmp1_elvis_lhs = _this__u8e3s4 == null ? null : _this__u8e3s4.n3f_1;
+    var tmp1_elvis_lhs = _this__u8e3s4 == null ? null : _this__u8e3s4.m3f_1;
     return tmp1_elvis_lhs == null ? Companion_getInstance_29().c3b_1 : tmp1_elvis_lhs;
   }
   function pages$factory() {
     return getPropertyCallableRef('pages', 1, KMutableProperty1, function (receiver) {
-      return receiver.n3l();
+      return receiver.m3l();
     }, function (receiver, value) {
       return _set_pages__j2nojl(receiver, value);
     });
   }
   function pages$factory_0() {
     return getPropertyCallableRef('pages', 1, KMutableProperty1, function (receiver) {
-      return receiver.n3l();
+      return receiver.m3l();
     }, function (receiver, value) {
       return _set_pages__j2nojl(receiver, value);
     });
@@ -5870,7 +5867,7 @@
     var tmp;
     if (tmp0_elvis_lhs == null) {
       var tmp1_safe_receiver = get_stylesParent($this);
-      tmp = tmp1_safe_receiver == null ? null : tmp1_safe_receiver.d3j();
+      tmp = tmp1_safe_receiver == null ? null : tmp1_safe_receiver.c3j();
     } else {
       tmp = tmp0_elvis_lhs;
     }
@@ -5929,11 +5926,11 @@
   protoOf(Option).y3t = function () {
     return this.multiselect;
   };
-  protoOf(Option).w3h = function () {
+  protoOf(Option).v3h = function () {
     var tmp0_elvis_lhs = this.a3t_1;
     return tmp0_elvis_lhs == null ? this.multiselect.v3t_1 : tmp0_elvis_lhs;
   };
-  protoOf(Option).z3h = function () {
+  protoOf(Option).y3h = function () {
     var tmp0_elvis_lhs = this.b3t_1;
     return tmp0_elvis_lhs == null ? _get_optionBackgroundColor__l9vc27(this.multiselect) : tmp0_elvis_lhs;
   };
@@ -5945,7 +5942,7 @@
   protoOf(Option).a3u = function () {
     return this.d3t_1;
   };
-  protoOf(Option).d3i = function () {
+  protoOf(Option).c3i = function () {
     return this.e3t_1;
   };
   protoOf(Option).q3d = function () {
@@ -6040,7 +6037,7 @@
     return destination;
   };
   protoOf(Multiselect).g3d = function () {
-    return !this.x39().i3f_1.i3c('multiselect') || protoOf(Content).g3d.call(this);
+    return !this.x39().h3f_1.i3c('multiselect') || protoOf(Content).g3d.call(this);
   };
   protoOf(Multiselect).g3u = function () {
     // Inline function 'kotlin.collections.toTypedArray' call
@@ -6291,8 +6288,8 @@
     BaseModel.call($this, manifest);
     Resource.call($this);
     parser.u3c(2, 'https://mobile-content-api.cru.org/xmlns/manifest', 'resource');
-    $this.name = parser.f3f(null, 'filename');
-    $this.localName = parser.f3f(null, 'src');
+    $this.name = parser.j3e('filename');
+    $this.localName = parser.j3e('src');
     skipTag(parser);
     return $this;
   }
@@ -6455,13 +6452,13 @@
   protoOf(Spacer).d3v = function () {
     return this.mode;
   };
-  protoOf(Spacer).s3g = function () {
+  protoOf(Spacer).r3g = function () {
     return this.height;
   };
   function Spacer() {
   }
   function get_buttonStyle_0(_this__u8e3s4) {
-    var tmp1_elvis_lhs = _this__u8e3s4 == null ? null : _this__u8e3s4.a3j();
+    var tmp1_elvis_lhs = _this__u8e3s4 == null ? null : _this__u8e3s4.z3i();
     return tmp1_elvis_lhs == null ? Companion_getInstance_29().f3b_1 : tmp1_elvis_lhs;
   }
   function Companion_34() {
@@ -6478,19 +6475,19 @@
   function Styles() {
   }
   function get_primaryColor_0(_this__u8e3s4) {
-    var tmp1_elvis_lhs = _this__u8e3s4 == null ? null : _this__u8e3s4.y3i();
+    var tmp1_elvis_lhs = _this__u8e3s4 == null ? null : _this__u8e3s4.x3i();
     return tmp1_elvis_lhs == null ? Companion_getInstance_29().a3b_1 : tmp1_elvis_lhs;
   }
   function get_primaryTextColor_0(_this__u8e3s4) {
-    var tmp1_elvis_lhs = _this__u8e3s4 == null ? null : _this__u8e3s4.z3i();
+    var tmp1_elvis_lhs = _this__u8e3s4 == null ? null : _this__u8e3s4.y3i();
     return tmp1_elvis_lhs == null ? Companion_getInstance_29().b3b_1 : tmp1_elvis_lhs;
   }
   function get_cardBackgroundColor_0(_this__u8e3s4) {
-    var tmp1_elvis_lhs = _this__u8e3s4 == null ? null : _this__u8e3s4.b3j();
+    var tmp1_elvis_lhs = _this__u8e3s4 == null ? null : _this__u8e3s4.a3j();
     return tmp1_elvis_lhs == null ? Companion_getInstance_29().c3b_1 : tmp1_elvis_lhs;
   }
   function get_multiselectOptionBackgroundColor_0(_this__u8e3s4) {
-    var tmp1_elvis_lhs = _this__u8e3s4 == null ? null : _this__u8e3s4.c3j();
+    var tmp1_elvis_lhs = _this__u8e3s4 == null ? null : _this__u8e3s4.b3j();
     var tmp;
     if (tmp1_elvis_lhs == null) {
       tmp = get_backgroundColor(_this__u8e3s4 == null ? null : _this__u8e3s4.x39());
@@ -6500,15 +6497,15 @@
     return tmp;
   }
   function get_textColor_0(_this__u8e3s4) {
-    var tmp1_elvis_lhs = _this__u8e3s4 == null ? null : _this__u8e3s4.w3i();
+    var tmp1_elvis_lhs = _this__u8e3s4 == null ? null : _this__u8e3s4.v3i();
     return tmp1_elvis_lhs == null ? Companion_getInstance_29().g3b_1 : tmp1_elvis_lhs;
   }
   function get_textScale_0(_this__u8e3s4) {
-    var tmp1_elvis_lhs = _this__u8e3s4 == null ? null : _this__u8e3s4.e3j();
+    var tmp1_elvis_lhs = _this__u8e3s4 == null ? null : _this__u8e3s4.d3j();
     return tmp1_elvis_lhs == null ? 1.0 : tmp1_elvis_lhs;
   }
   function get_textAlign_0(_this__u8e3s4) {
-    var tmp1_elvis_lhs = _this__u8e3s4 == null ? null : _this__u8e3s4.f3j();
+    var tmp1_elvis_lhs = _this__u8e3s4 == null ? null : _this__u8e3s4.e3j();
     return tmp1_elvis_lhs == null ? Companion_getInstance_37().e3v_1 : tmp1_elvis_lhs;
   }
   function stylesOverride(_this__u8e3s4, textAlign, textColor, textScale) {
@@ -6523,17 +6520,17 @@
     this.i3v_1 = _textColor;
     this.j3v_1 = _textScale;
   }
-  protoOf(StylesOverride).f3j = function () {
+  protoOf(StylesOverride).e3j = function () {
     var tmp0_safe_receiver = this.h3v_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).w3i = function () {
+  protoOf(StylesOverride).v3i = function () {
     var tmp0_safe_receiver = this.i3v_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).e3j = function () {
+  protoOf(StylesOverride).d3j = function () {
     return get_textScale.call(this) * this.j3v_1;
   };
   function Tab_init_$Init$(parent, parser, $this) {
@@ -6548,7 +6545,7 @@
       tmp_0 = null;
     } else {
       // Inline function 'org.cru.godtools.shared.tool.parser.model.toEventIds' call
-      tmp_0 = Companion_getInstance_17().g3f(tmp0_safe_receiver);
+      tmp_0 = Companion_getInstance_17().f3f(tmp0_safe_receiver);
     }
     var tmp1_safe_receiver = tmp_0;
     // Inline function 'kotlin.collections.orEmpty' call
@@ -6666,13 +6663,13 @@
   protoOf(Tab).w3v = function () {
     return this._listeners;
   };
-  protoOf(Tab).p3m = function () {
+  protoOf(Tab).o3m = function () {
     return this.label;
   };
   protoOf(Tab).q3d = function () {
     return this.m3v_1;
   };
-  protoOf(Tab).d3i = function () {
+  protoOf(Tab).c3i = function () {
     return this.n3v_1;
   };
   protoOf(Tab).r3d = function (type) {
@@ -6986,15 +6983,15 @@
   protoOf(Text).c20 = function () {
     return this.text;
   };
-  protoOf(Text).f3j = function () {
+  protoOf(Text).e3j = function () {
     var tmp0_elvis_lhs = this.a3s_1;
     return tmp0_elvis_lhs == null ? get_textAlign_0(get_stylesParent(this)) : tmp0_elvis_lhs;
   };
-  protoOf(Text).w3i = function () {
+  protoOf(Text).v3i = function () {
     var tmp0_elvis_lhs = this.b3s_1;
     return tmp0_elvis_lhs == null ? get_textColor_0(get_stylesParent(this)) : tmp0_elvis_lhs;
   };
-  protoOf(Text).e3j = function () {
+  protoOf(Text).d3j = function () {
     return this.c3s_1 * get_textScale_0(get_stylesParent(this));
   };
   protoOf(Text).k3w = function () {
@@ -7221,7 +7218,7 @@
     }
     return tmp;
   };
-  protoOf(Companion_39).i3j = function (_this__u8e3s4) {
+  protoOf(Companion_39).h3j = function (_this__u8e3s4) {
     var tmp;
     try {
       tmp = this.f3c(_this__u8e3s4);
@@ -7282,7 +7279,7 @@
     return tmp0_elvis_lhs == null ? compareTo(_Version___get_version__impl__iv3bqm($this).m(), _Version___get_version__impl__iv3bqm(other).m()) : tmp0_elvis_lhs;
   }
   function Version__compareTo_impl_crux23_0($this, other) {
-    return Version__compareTo_impl_crux23($this.j3j_1, other instanceof Version ? other.j3j_1 : THROW_CCE());
+    return Version__compareTo_impl_crux23($this.i3j_1, other instanceof Version ? other.i3j_1 : THROW_CCE());
   }
   function Version__toString_impl_cjmhtj($this) {
     return joinToString(_Version___get_version__impl__iv3bqm($this), '.');
@@ -7293,29 +7290,29 @@
   function Version__equals_impl_tebety($this, other) {
     if (!(other instanceof Version))
       return false;
-    var tmp0_other_with_cast = other instanceof Version ? other.j3j_1 : THROW_CCE();
+    var tmp0_other_with_cast = other instanceof Version ? other.i3j_1 : THROW_CCE();
     if (!equals($this, tmp0_other_with_cast))
       return false;
     return true;
   }
   function Version(version) {
     Companion_getInstance_42();
-    this.j3j_1 = version;
+    this.i3j_1 = version;
   }
   protoOf(Version).t3w = function (other) {
-    return Version__compareTo_impl_crux23(this.j3j_1, other);
+    return Version__compareTo_impl_crux23(this.i3j_1, other);
   };
   protoOf(Version).d = function (other) {
     return Version__compareTo_impl_crux23_0(this, other);
   };
   protoOf(Version).toString = function () {
-    return Version__toString_impl_cjmhtj(this.j3j_1);
+    return Version__toString_impl_cjmhtj(this.i3j_1);
   };
   protoOf(Version).hashCode = function () {
-    return Version__hashCode_impl_yaseme(this.j3j_1);
+    return Version__hashCode_impl_yaseme(this.i3j_1);
   };
   protoOf(Version).equals = function (other) {
-    return Version__equals_impl_tebety(this.j3j_1, other);
+    return Version__equals_impl_tebety(this.i3j_1, other);
   };
   var Provider_YOUTUBE_instance;
   var Provider_UNKNOWN_instance;
@@ -7323,7 +7320,7 @@
     Companion_instance_41 = this;
     this.u3w_1 = Provider_UNKNOWN_getInstance();
   }
-  protoOf(Companion_40).s3q = function (value) {
+  protoOf(Companion_40).r3q = function (value) {
     return value === 'youtube' ? Provider_YOUTUBE_getInstance() : null;
   };
   var Companion_instance_41;
@@ -7378,18 +7375,18 @@
     Video.call($this);
     parser.u3c(2, 'https://mobile-content-api.cru.org/xmlns/content', 'video');
     var tmp = $this;
-    var tmp0_elvis_lhs = Companion_getInstance_43().s3q(parser.j3e('provider'));
+    var tmp0_elvis_lhs = Companion_getInstance_43().r3q(parser.j3e('provider'));
     tmp.provider = tmp0_elvis_lhs == null ? Companion_getInstance_43().u3w_1 : tmp0_elvis_lhs;
     $this.videoId = parser.j3e('video-id');
     var tmp_0 = $this;
-    var tmp1_elvis_lhs = Companion_instance_6.q3g(parser.j3e('aspect-ratio'));
+    var tmp1_elvis_lhs = Companion_instance_6.p3g(parser.j3e('aspect-ratio'));
     tmp_0.aspectRatio = tmp1_elvis_lhs == null ? Companion_getInstance_44().w3w_1 : tmp1_elvis_lhs;
     var tmp_1 = $this;
-    var tmp2_safe_receiver = Companion_getInstance_22().s3h(parser.j3e('gravity'));
+    var tmp2_safe_receiver = Companion_getInstance_22().r3h(parser.j3e('gravity'));
     var tmp3_elvis_lhs = tmp2_safe_receiver == null ? null : tmp2_safe_receiver.horizontal;
     tmp_1.gravity = tmp3_elvis_lhs == null ? Companion_getInstance_44().x3w_1 : tmp3_elvis_lhs;
     var tmp_2 = $this;
-    var tmp4_safe_receiver = Companion_instance_14.t3h(parser.j3e('width'));
+    var tmp4_safe_receiver = Companion_instance_14.s3h(parser.j3e('width'));
     var tmp_3;
     if (tmp4_safe_receiver == null) {
       tmp_3 = null;
@@ -7429,10 +7426,10 @@
   protoOf(Video).j3x = function () {
     return this.aspectRatio;
   };
-  protoOf(Video).x3h = function () {
+  protoOf(Video).w3h = function () {
     return this.gravity;
   };
-  protoOf(Video).r3g = function () {
+  protoOf(Video).q3g = function () {
     return this.width;
   };
   protoOf(Video).g3d = function () {
@@ -7601,7 +7598,7 @@
   function LessonPage_init_$Create$(container, fileName, parser) {
     return LessonPage_init_$Init$(container, fileName, parser, objectCreate(protoOf(LessonPage)));
   }
-  protoOf(LessonPage).d3i = function () {
+  protoOf(LessonPage).c3i = function () {
     return this.o3y_1;
   };
   protoOf(LessonPage).q3d = function () {
@@ -7788,7 +7785,7 @@
   };
   protoOf(Card_0).o3r = function () {
     var tmp0_elvis_lhs = this.u3z_1;
-    return tmp0_elvis_lhs == null ? this.page.b3j() : tmp0_elvis_lhs;
+    return tmp0_elvis_lhs == null ? this.page.a3j() : tmp0_elvis_lhs;
   };
   protoOf(Card_0).q3d = function () {
     return this.w3z_1;
@@ -7858,7 +7855,7 @@
   };
   function Card_0() {
   }
-  protoOf(CardCollectionPage).d3i = function () {
+  protoOf(CardCollectionPage).c3i = function () {
     return this.r40_1;
   };
   protoOf(CardCollectionPage).t40 = function () {
@@ -7977,7 +7974,7 @@
   function ContentPage_init_$Create$(container, fileName, parser) {
     return ContentPage_init_$Init$(container, fileName, parser, objectCreate(protoOf(ContentPage)));
   }
-  protoOf(ContentPage).d3i = function () {
+  protoOf(ContentPage).c3i = function () {
     return this.o41_1;
   };
   protoOf(ContentPage).q3d = function () {
@@ -8002,9 +7999,9 @@
           case 0:
             this.d9_1 = 3;
             this.b42_1.u3c(2, null, 'page');
-            this.d42_1 = to(this.b42_1.w3c(), this.b42_1.f3f('http://www.w3.org/2001/XMLSchema-instance', 'type'));
+            this.d42_1 = to(this.b42_1.w3c(), this.b42_1.t3q('http://www.w3.org/2001/XMLSchema-instance', 'type'));
             if (this.d42_1.equals(to('https://mobile-content-api.cru.org/xmlns/page', 'page-collection'))) {
-              if (!this.z41_1.o3l(getKClass(PageCollectionPage)))
+              if (!this.z41_1.n3l(getKClass(PageCollectionPage)))
                 return null;
               this.c9_1 = 1;
               suspendResult = Companion_instance_47.k42(this.z41_1, this.a42_1, this.b42_1, this.c42_1, this);
@@ -8029,7 +8026,7 @@
               tmp_0 = null;
             } else {
               var tmp_1;
-              if (this.z41_1.o3l(getKClassFromExpression(tmp1_safe_receiver))) {
+              if (this.z41_1.n3l(getKClassFromExpression(tmp1_safe_receiver))) {
                 tmp_1 = tmp1_safe_receiver;
               } else {
                 tmp_1 = null;
@@ -8054,15 +8051,15 @@
   };
   function Companion_45() {
     Companion_instance_46 = this;
-    this.s3n_1 = 'page';
-    this.t3n_1 = 'parent_override_page-collection';
+    this.r3n_1 = 'page';
+    this.s3n_1 = 'parent_override_page-collection';
     var tmp = this;
     // Inline function 'org.cru.godtools.shared.tool.parser.model.color' call
-    tmp.u3n_1 = toPlatformColor_0(Companion_getInstance_1().d1t(0 / 255.0, 0 / 255.0, 0 / 255.0, 0.0));
-    this.v3n_1 = Companion_getInstance_22().CENTER;
-    this.w3n_1 = ImageScaleType_FILL_X_getInstance();
+    tmp.t3n_1 = toPlatformColor_0(Companion_getInstance_1().d1t(0 / 255.0, 0 / 255.0, 0 / 255.0, 0.0));
+    this.u3n_1 = Companion_getInstance_22().CENTER;
+    this.v3n_1 = ImageScaleType_FILL_X_getInstance();
   }
-  protoOf(Companion_45).x3n = function (container, fileName, parser, parseFile, $completion) {
+  protoOf(Companion_45).w3n = function (container, fileName, parser, parseFile, $completion) {
     var tmp = new $parseCOROUTINE$1(this, container, fileName, parser, parseFile, $completion);
     tmp.e9_1 = Unit_instance;
     tmp.f9_1 = null;
@@ -8079,7 +8076,7 @@
         tmp = TractPage_init_$Create$(container, fileName, parser);
         break;
       case 'https://mobile-content-api.cru.org/xmlns/page':
-        var type = parser.f3f('http://www.w3.org/2001/XMLSchema-instance', 'type');
+        var type = parser.t3q('http://www.w3.org/2001/XMLSchema-instance', 'type');
         var tmp_0;
         switch (type) {
           case 'cardcollection':
@@ -8131,7 +8128,7 @@
       // Inline function 'kotlin.takeIf' call
       var tmp_2;
       // Inline function 'org.cru.godtools.shared.tool.parser.model.page.Companion.parse.<anonymous>' call
-      if (container.o3l(getKClassFromExpression(tmp1_safe_receiver))) {
+      if (container.n3l(getKClassFromExpression(tmp1_safe_receiver))) {
         tmp_2 = tmp1_safe_receiver;
       } else {
         tmp_2 = null;
@@ -8141,7 +8138,7 @@
     return tmp_1;
   };
   protoOf(Companion_45).y3z = function (_this__u8e3s4, type) {
-    var actual = _this__u8e3s4.f3f('http://www.w3.org/2001/XMLSchema-instance', 'type');
+    var actual = _this__u8e3s4.t3q('http://www.w3.org/2001/XMLSchema-instance', 'type');
     if (!(type === actual))
       throw new XmlPullParserException('expected ' + type + ' not ' + actual);
   };
@@ -8173,7 +8170,7 @@
     $this.t3y_1 = parser.j3e('id');
     $this.u3y_1 = fileName;
     var tmp = $this;
-    var tmp0_safe_receiver = parser.f3f('https://mobile-content-api.cru.org/xmlns/cyoa', 'parent_override_page-collection');
+    var tmp0_safe_receiver = parser.t3q('https://mobile-content-api.cru.org/xmlns/cyoa', 'parent_override_page-collection');
     var tmp_0;
     if (tmp0_safe_receiver == null) {
       tmp_0 = null;
@@ -8181,7 +8178,7 @@
       // Inline function 'kotlin.takeIf' call
       var tmp_1;
       // Inline function 'org.cru.godtools.shared.tool.parser.model.page.Page.<init>.<anonymous>' call
-      if ($this.x39().i3f_1.i3c('page-collection')) {
+      if ($this.x39().h3f_1.i3c('page-collection')) {
         tmp_1 = tmp0_safe_receiver;
       } else {
         tmp_1 = null;
@@ -8189,7 +8186,7 @@
       tmp_0 = tmp_1;
     }
     var tmp1_elvis_lhs = tmp_0;
-    tmp.v3y_1 = tmp1_elvis_lhs == null ? parser.f3f('https://mobile-content-api.cru.org/xmlns/cyoa', 'parent') : tmp1_elvis_lhs;
+    tmp.v3y_1 = tmp1_elvis_lhs == null ? parser.t3q('https://mobile-content-api.cru.org/xmlns/cyoa', 'parent') : tmp1_elvis_lhs;
     var tmp_2 = $this;
     var tmp2_safe_receiver = parser.j3e('hidden');
     var tmp3_elvis_lhs = tmp2_safe_receiver == null ? null : toBoolean(tmp2_safe_receiver);
@@ -8197,12 +8194,12 @@
     var tmp_3 = $this;
     // Inline function 'org.cru.godtools.shared.tool.parser.model.toEventIds' call
     var this_0 = parser.j3e('listeners');
-    var tmp$ret$2 = Companion_getInstance_17().g3f(this_0);
+    var tmp$ret$2 = Companion_getInstance_17().f3f(this_0);
     tmp_3._listeners = toSet_0(tmp$ret$2);
     var tmp_4 = $this;
     // Inline function 'org.cru.godtools.shared.tool.parser.model.toEventIds' call
     var this_1 = parser.j3e('dismiss-listeners');
-    var tmp$ret$3 = Companion_getInstance_17().g3f(this_1);
+    var tmp$ret$3 = Companion_getInstance_17().f3f(this_1);
     tmp_4._dismissListeners = toSet_0(tmp$ret$3);
     var tmp_5 = $this;
     var tmp4_safe_receiver = parser.j3e('primary-color');
@@ -8213,27 +8210,27 @@
     var tmp_7 = $this;
     var tmp6_safe_receiver = parser.j3e('background-color');
     var tmp7_elvis_lhs = tmp6_safe_receiver == null ? null : toColorOrNull(tmp6_safe_receiver);
-    tmp_7.y3y_1 = tmp7_elvis_lhs == null ? Companion_getInstance_48().u3n_1 : tmp7_elvis_lhs;
+    tmp_7.y3y_1 = tmp7_elvis_lhs == null ? Companion_getInstance_48().t3n_1 : tmp7_elvis_lhs;
     $this.z3y_1 = parser.j3e('background-image');
     var tmp_8 = $this;
     var tmp8_safe_receiver = parser.j3e('background-image-align');
-    var tmp9_elvis_lhs = tmp8_safe_receiver == null ? null : Companion_getInstance_22().s3h(tmp8_safe_receiver);
-    tmp_8.a3z_1 = tmp9_elvis_lhs == null ? Companion_getInstance_48().v3n_1 : tmp9_elvis_lhs;
+    var tmp9_elvis_lhs = tmp8_safe_receiver == null ? null : Companion_getInstance_22().r3h(tmp8_safe_receiver);
+    tmp_8.a3z_1 = tmp9_elvis_lhs == null ? Companion_getInstance_48().u3n_1 : tmp9_elvis_lhs;
     var tmp_9 = $this;
     var tmp10_safe_receiver = parser.j3e('background-image-scale-type');
-    var tmp11_elvis_lhs = tmp10_safe_receiver == null ? null : Companion_instance_22.c3m(tmp10_safe_receiver);
-    tmp_9.b3z_1 = tmp11_elvis_lhs == null ? Companion_getInstance_48().w3n_1 : tmp11_elvis_lhs;
+    var tmp11_elvis_lhs = tmp10_safe_receiver == null ? null : Companion_instance_22.b3m(tmp10_safe_receiver);
+    tmp_9.b3z_1 = tmp11_elvis_lhs == null ? Companion_getInstance_48().v3n_1 : tmp11_elvis_lhs;
     var tmp_10 = $this;
     var tmp12_safe_receiver = parser.j3e('control-color');
     tmp_10.c3z_1 = tmp12_safe_receiver == null ? null : toColorOrNull(tmp12_safe_receiver);
     var tmp_11 = $this;
-    var tmp13_safe_receiver = parser.f3f('https://mobile-content-api.cru.org/xmlns/content', 'card-background-color');
+    var tmp13_safe_receiver = parser.t3q('https://mobile-content-api.cru.org/xmlns/content', 'card-background-color');
     tmp_11.d3z_1 = tmp13_safe_receiver == null ? null : toColorOrNull(tmp13_safe_receiver);
     var tmp_12 = $this;
-    var tmp14_safe_receiver = parser.f3f('https://mobile-content-api.cru.org/xmlns/content', 'multiselect-option-background-color');
+    var tmp14_safe_receiver = parser.t3q('https://mobile-content-api.cru.org/xmlns/content', 'multiselect-option-background-color');
     tmp_12.e3z_1 = tmp14_safe_receiver == null ? null : toColorOrNull(tmp14_safe_receiver);
     var tmp_13 = $this;
-    var tmp15_safe_receiver = parser.f3f('https://mobile-content-api.cru.org/xmlns/content', 'multiselect-option-selected-color');
+    var tmp15_safe_receiver = parser.t3q('https://mobile-content-api.cru.org/xmlns/content', 'multiselect-option-selected-color');
     tmp_13.f3z_1 = tmp15_safe_receiver == null ? null : toColorOrNull(tmp15_safe_receiver);
     var tmp_14 = $this;
     var tmp16_safe_receiver = parser.j3e('text-color');
@@ -8250,10 +8247,10 @@
     fileName = fileName === VOID ? null : fileName;
     parentPage = parentPage === VOID ? null : parentPage;
     primaryColor = primaryColor === VOID ? null : primaryColor;
-    backgroundColor = backgroundColor === VOID ? Companion_getInstance_48().u3n_1 : backgroundColor;
+    backgroundColor = backgroundColor === VOID ? Companion_getInstance_48().t3n_1 : backgroundColor;
     backgroundImage = backgroundImage === VOID ? null : backgroundImage;
-    backgroundImageGravity = backgroundImageGravity === VOID ? Companion_getInstance_48().v3n_1 : backgroundImageGravity;
-    backgroundImageScaleType = backgroundImageScaleType === VOID ? Companion_getInstance_48().w3n_1 : backgroundImageScaleType;
+    backgroundImageGravity = backgroundImageGravity === VOID ? Companion_getInstance_48().u3n_1 : backgroundImageGravity;
+    backgroundImageScaleType = backgroundImageScaleType === VOID ? Companion_getInstance_48().v3n_1 : backgroundImageScaleType;
     controlColor = controlColor === VOID ? null : controlColor;
     cardBackgroundColor = cardBackgroundColor === VOID ? null : cardBackgroundColor;
     multiselectOptionBackgroundColor = multiselectOptionBackgroundColor === VOID ? null : multiselectOptionBackgroundColor;
@@ -8291,7 +8288,7 @@
   }
   function Page$position$delegate$lambda(this$0) {
     return function () {
-      return _get_parentPageContainer__qsoup5(this$0).n3l().r(this$0);
+      return _get_parentPageContainer__qsoup5(this$0).m3l().r(this$0);
     };
   }
   protoOf(Page).o3d = function () {
@@ -8371,10 +8368,10 @@
     return tmp;
   };
   protoOf(Page).l3z = function () {
-    return getOrNull(_get_parentPageContainer__qsoup5(this).n3l(), this.position + 1 | 0);
+    return getOrNull(_get_parentPageContainer__qsoup5(this).m3l(), this.position + 1 | 0);
   };
   protoOf(Page).m3z = function () {
-    return getOrNull(_get_parentPageContainer__qsoup5(this).n3l(), this.position - 1 | 0);
+    return getOrNull(_get_parentPageContainer__qsoup5(this).m3l(), this.position - 1 | 0);
   };
   protoOf(Page).n3z = function () {
     return this.isHidden;
@@ -8385,11 +8382,11 @@
   protoOf(Page).l3r = function () {
     return this._dismissListeners;
   };
-  protoOf(Page).y3i = function () {
+  protoOf(Page).x3i = function () {
     var tmp0_elvis_lhs = this.w3y_1;
     return tmp0_elvis_lhs == null ? get_primaryColor_0(get_stylesParent(this)) : tmp0_elvis_lhs;
   };
-  protoOf(Page).z3i = function () {
+  protoOf(Page).y3i = function () {
     var tmp0_elvis_lhs = this.x3y_1;
     return tmp0_elvis_lhs == null ? get_primaryTextColor_0(get_stylesParent(this)) : tmp0_elvis_lhs;
   };
@@ -8416,25 +8413,25 @@
       tmp = tmp0_elvis_lhs;
     }
     var tmp2_elvis_lhs = tmp;
-    return tmp2_elvis_lhs == null ? this.x39().t3f_1 : tmp2_elvis_lhs;
+    return tmp2_elvis_lhs == null ? this.x39().s3f_1 : tmp2_elvis_lhs;
   };
-  protoOf(Page).b3j = function () {
+  protoOf(Page).a3j = function () {
     var tmp0_elvis_lhs = this.d3z_1;
     return tmp0_elvis_lhs == null ? get_cardBackgroundColor.call(this) : tmp0_elvis_lhs;
   };
-  protoOf(Page).c3j = function () {
+  protoOf(Page).b3j = function () {
     var tmp0_elvis_lhs = this.e3z_1;
     return tmp0_elvis_lhs == null ? get_multiselectOptionBackgroundColor.call(this) : tmp0_elvis_lhs;
   };
-  protoOf(Page).d3j = function () {
+  protoOf(Page).c3j = function () {
     var tmp0_elvis_lhs = this.f3z_1;
     return tmp0_elvis_lhs == null ? get_multiselectOptionSelectedColor.call(this) : tmp0_elvis_lhs;
   };
-  protoOf(Page).w3i = function () {
+  protoOf(Page).v3i = function () {
     var tmp0_elvis_lhs = this.g3z_1;
     return tmp0_elvis_lhs == null ? get_textColor_0(get_stylesParent(this)) : tmp0_elvis_lhs;
   };
-  protoOf(Page).e3j = function () {
+  protoOf(Page).d3j = function () {
     return this.h3z_1 * get_textScale_0(get_stylesParent(this));
   };
   protoOf(Page).r3d = function (type) {
@@ -8443,7 +8440,7 @@
       case 0:
         // Inline function 'kotlin.collections.filter' call
-        var tmp0 = this.d3i();
+        var tmp0 = this.c3i();
         // Inline function 'kotlin.collections.filterTo' call
         var destination = ArrayList_init_$Create$();
@@ -8461,7 +8458,7 @@
       case 1:
         // Inline function 'kotlin.collections.filter' call
-        var tmp0_0 = this.d3i();
+        var tmp0_0 = this.c3i();
         // Inline function 'kotlin.collections.filterTo' call
         var destination_0 = ArrayList_init_$Create$();
@@ -8564,14 +8561,14 @@
     this.n43_1 = $pageIndex$delegate;
     CoroutineImpl.call(this, resultContinuation);
   }
-  protoOf(PageCollectionPage$buildPagesFromParsedPages$slambda$slambda).r3n = function ($this$async, $completion) {
+  protoOf(PageCollectionPage$buildPagesFromParsedPages$slambda$slambda).q3n = function ($this$async, $completion) {
     var tmp = this.v19($this$async, $completion);
     tmp.e9_1 = Unit_instance;
     tmp.f9_1 = null;
     return tmp.u9();
   };
   protoOf(PageCollectionPage$buildPagesFromParsedPages$slambda$slambda).ea = function (p1, $completion) {
-    return this.r3n((!(p1 == null) ? isInterface(p1, CoroutineScope) : false) ? p1 : THROW_CCE(), $completion);
+    return this.q3n((!(p1 == null) ? isInterface(p1, CoroutineScope) : false) ? p1 : THROW_CCE(), $completion);
   };
   protoOf(PageCollectionPage$buildPagesFromParsedPages$slambda$slambda).u9 = function () {
     var suspendResult = this.e9_1;
@@ -8611,7 +8608,7 @@
           case 1:
             this.s43_1 = suspendResult;
             this.c9_1 = 2;
-            suspendResult = this.q43_1.x3n(this.l43_1, this.r43_1, this.s43_1, this.m43_1, this);
+            suspendResult = this.q43_1.w3n(this.l43_1, this.r43_1, this.s43_1, this.m43_1, this);
             if (suspendResult === get_COROUTINE_SUSPENDED()) {
               return suspendResult;
             }
@@ -8641,7 +8638,7 @@
   function PageCollectionPage$buildPagesFromParsedPages$slambda$slambda_0($it, this$0, $parseFile, $pageIndex$delegate, resultContinuation) {
     var i = new PageCollectionPage$buildPagesFromParsedPages$slambda$slambda($it, this$0, $parseFile, $pageIndex$delegate, resultContinuation);
     var l = function ($this$async, $completion) {
-      return i.r3n($this$async, $completion);
+      return i.q3n($this$async, $completion);
     };
     l.$arity = 1;
     return l;
@@ -8670,7 +8667,7 @@
     return Companion_instance_47;
   }
   function _set_pages__j2nojl_0($this, _set____db54di) {
-    return $this.r44_1.t3q($this, pages$factory_1(), _set____db54di);
+    return $this.r44_1.s3q($this, pages$factory_1(), _set____db54di);
   }
   function PageCollectionPage_init_$Init$(container, fileName, parser, $this) {
     Page_init_$Init$(container, fileName, parser, $this);
@@ -8768,7 +8765,7 @@
   function PageCollectionPage$buildPagesFromParsedPages$lambda(this$0) {
     return function () {
       // Inline function 'kotlin.collections.associate' call
-      var this_0 = this$0.x39().c3g_1;
+      var this_0 = this$0.x39().b3g_1;
       var capacity = coerceAtLeast(mapCapacity(collectionSizeOrDefault(this_0, 10)), 16);
       // Inline function 'kotlin.collections.associateTo' call
       var destination = LinkedHashMap_init_$Create$_0(capacity);
@@ -8777,7 +8774,7 @@
         var element = _iterator__ex2g4s.l();
         // Inline function 'org.cru.godtools.shared.tool.parser.model.page.PageCollectionPage.buildPagesFromParsedPages.<anonymous>.<anonymous>' call
         // Inline function 'kotlin.collections.plusAssign' call
-        var pair = to(element.y3o_1, element.z3o_1);
+        var pair = to(element.x3o_1, element.y3o_1);
         destination.y3(pair.rf_1, pair.sf_1);
       }
       return destination;
@@ -8905,13 +8902,13 @@
       }
      while (true);
   };
-  protoOf(PageCollectionPage).d3i = function () {
+  protoOf(PageCollectionPage).c3i = function () {
     return this.p44_1;
   };
-  protoOf(PageCollectionPage).n3l = function () {
+  protoOf(PageCollectionPage).m3l = function () {
     return this.r44_1.h3s(this, pages$factory_2());
   };
-  protoOf(PageCollectionPage).o3l = function (type) {
+  protoOf(PageCollectionPage).n3l = function (type) {
     return type.equals(getKClass(ContentPage));
   };
   function PageCollectionPage() {
@@ -8919,14 +8916,14 @@
   }
   function pages$factory_1() {
     return getPropertyCallableRef('pages', 1, KMutableProperty1, function (receiver) {
-      return receiver.n3l();
+      return receiver.m3l();
     }, function (receiver, value) {
       return _set_pages__j2nojl_0(receiver, value);
     });
   }
   function pages$factory_2() {
     return getPropertyCallableRef('pages', 1, KMutableProperty1, function (receiver) {
-      return receiver.n3l();
+      return receiver.m3l();
     }, function (receiver, value) {
       return _set_pages__j2nojl_0(receiver, value);
     });
@@ -9041,7 +9038,7 @@
     Content_init_$Init$(parent, parser, $this);
     InlineTip.call($this);
     parser.u3c(2, 'https://mobile-content-api.cru.org/xmlns/training', 'tip');
-    $this.id = parser.f3f(null, 'id');
+    $this.id = parser.j3e('id');
     skipTag(parser);
     return $this;
   }
@@ -9078,7 +9075,7 @@
     Companion_instance_51 = this;
     this.g46_1 = Type_TIP_getInstance();
   }
-  protoOf(Companion_50).e3m = function (_this__u8e3s4) {
+  protoOf(Companion_50).d3m = function (_this__u8e3s4) {
     switch (_this__u8e3s4) {
       case 'tip':
         return Type_TIP_getInstance();
@@ -9117,11 +9114,11 @@
     BaseModel.call($this, manifest);
     Tip.call($this);
     parser.u3c(2, 'https://mobile-content-api.cru.org/xmlns/training', 'tip');
-    $this.n3p_1 = id;
+    $this.m3p_1 = id;
     var tmp = $this;
-    var tmp0_safe_receiver = parser.f3f(null, 'type');
-    var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : Companion_getInstance_53().e3m(tmp0_safe_receiver);
-    tmp.o3p_1 = tmp1_elvis_lhs == null ? Companion_getInstance_53().g46_1 : tmp1_elvis_lhs;
+    var tmp0_safe_receiver = parser.j3e('type');
+    var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : Companion_getInstance_53().d3m(tmp0_safe_receiver);
+    tmp.n3p_1 = tmp1_elvis_lhs == null ? Companion_getInstance_53().g46_1 : tmp1_elvis_lhs;
     var tmp_0 = $this;
     // Inline function 'kotlin.collections.buildList' call
     // Inline function 'kotlin.collections.buildListInternal' call
@@ -9142,7 +9139,7 @@
         continue $l$loop_0;
       skipTag(parser);
     }
-    tmp_0.p3p_1 = this_0.p3();
+    tmp_0.o3p_1 = this_0.p3();
     return $this;
   }
   function Tip_init_$Create$(manifest, id, parser) {
@@ -9154,9 +9151,9 @@
     type = type === VOID ? Companion_getInstance_53().g46_1 : type;
     BaseModel.call($this, manifest);
     Tip.call($this);
-    $this.n3p_1 = id;
-    $this.o3p_1 = type;
-    $this.p3p_1 = emptyList();
+    $this.m3p_1 = id;
+    $this.n3p_1 = type;
+    $this.o3p_1 = emptyList();
     return $this;
   }
   function Tip_init_$Create$_0(manifest, id, type) {
@@ -9208,13 +9205,13 @@
     Type_initEntries_2();
     return Type_QUOTE_instance;
   }
-  protoOf(Tip).y3i = function () {
+  protoOf(Tip).x3i = function () {
     return Companion_getInstance_29().a3b_1;
   };
-  protoOf(Tip).z3i = function () {
+  protoOf(Tip).y3i = function () {
     return Companion_getInstance_29().b3b_1;
   };
-  protoOf(Tip).w3i = function () {
+  protoOf(Tip).v3i = function () {
     return Companion_getInstance_29().g3b_1;
   };
   function Tip() {
@@ -9316,7 +9313,7 @@
     var tmp = $this;
     var tmp0_safe_receiver = parser.j3e('control-color');
     tmp.p46_1 = tmp0_safe_receiver == null ? null : toColorOrNull(tmp0_safe_receiver);
-    $this.q46_1 = parser.f3f('https://mobile-content-api.cru.org/xmlns/training', 'tip');
+    $this.q46_1 = parser.t3q('https://mobile-content-api.cru.org/xmlns/training', 'tip');
     $this.label = parseTextChild(parser, $this, 'https://mobile-content-api.cru.org/xmlns/tract', 'call-to-action');
     return $this;
   }
@@ -9340,7 +9337,7 @@
   function createTestCallToAction(page, label, controlColor, tip) {
     return CallToAction_init_$Init$_1(page, label, controlColor, tip, objectCreate(protoOf(CallToAction)));
   }
-  protoOf(CallToAction).p3m = function () {
+  protoOf(CallToAction).o3m = function () {
     return this.label;
   };
   protoOf(CallToAction).o3z = function () {
@@ -9369,7 +9366,7 @@
     var tmp = $this;
     var tmp0_safe_receiver = parser.j3e('background-color');
     tmp.u46_1 = tmp0_safe_receiver == null ? null : toColorOrNull(tmp0_safe_receiver);
-    $this.v46_1 = parser.f3f('https://mobile-content-api.cru.org/xmlns/training', 'tip');
+    $this.v46_1 = parser.t3q('https://mobile-content-api.cru.org/xmlns/training', 'tip');
     var number = null;
     var title = null;
     // Inline function 'org.cru.godtools.shared.tool.parser.xml.parseChildren' call
@@ -9397,10 +9394,10 @@
   }
   protoOf(Header).o3r = function () {
     var tmp0_elvis_lhs = this.u46_1;
-    return tmp0_elvis_lhs == null ? this.y3i() : tmp0_elvis_lhs;
+    return tmp0_elvis_lhs == null ? this.x3i() : tmp0_elvis_lhs;
   };
-  protoOf(Header).w3i = function () {
-    return this.z3i();
+  protoOf(Header).v3i = function () {
+    return this.y3i();
   };
   protoOf(Header).dj = function () {
     return this.number;
@@ -9533,7 +9530,7 @@
   protoOf(Hero).q3d = function () {
     return this.z46_1;
   };
-  protoOf(Hero).d3i = function () {
+  protoOf(Hero).c3i = function () {
     return this.a47_1;
   };
   protoOf(Hero).r3d = function (type) {
@@ -9611,12 +9608,12 @@
     var tmp = $this;
     // Inline function 'org.cru.godtools.shared.tool.parser.model.toEventIds' call
     var this_0 = parser.j3e('listeners');
-    var tmp$ret$0 = Companion_getInstance_17().g3f(this_0);
+    var tmp$ret$0 = Companion_getInstance_17().f3f(this_0);
     tmp._listeners = toSet_0(tmp$ret$0);
     var tmp_0 = $this;
     // Inline function 'org.cru.godtools.shared.tool.parser.model.toEventIds' call
     var this_1 = parser.j3e('dismiss-listeners');
-    var tmp$ret$1 = Companion_getInstance_17().g3f(this_1);
+    var tmp$ret$1 = Companion_getInstance_17().f3f(this_1);
     tmp_0._dismissListeners = toSet_0(tmp$ret$1);
     var title = null;
     var tmp_1 = $this;
@@ -9694,22 +9691,22 @@
   protoOf(Modal).l3r = function () {
     return this._dismissListeners;
   };
-  protoOf(Modal).y3i = function () {
+  protoOf(Modal).x3i = function () {
     return get_TRANSPARENT();
   };
-  protoOf(Modal).z3i = function () {
+  protoOf(Modal).y3i = function () {
     return get_WHITE();
   };
-  protoOf(Modal).y3h = function () {
+  protoOf(Modal).x3h = function () {
     return get_WHITE();
   };
-  protoOf(Modal).a3j = function () {
+  protoOf(Modal).z3i = function () {
     return Style_OUTLINED_getInstance();
   };
-  protoOf(Modal).f3j = function () {
+  protoOf(Modal).e3j = function () {
     return Align_CENTER_getInstance();
   };
-  protoOf(Modal).w3i = function () {
+  protoOf(Modal).v3i = function () {
     return get_WHITE();
   };
   protoOf(Modal).r3s = function () {
@@ -9751,18 +9748,18 @@
     $this.position = position;
     parser.u3c(2, 'https://mobile-content-api.cru.org/xmlns/tract', 'card');
     var tmp = $this;
-    var tmp0_safe_receiver = parser.f3f(null, 'hidden');
+    var tmp0_safe_receiver = parser.j3e('hidden');
     var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : toBoolean(tmp0_safe_receiver);
     tmp.isHidden = tmp1_elvis_lhs == null ? false : tmp1_elvis_lhs;
     var tmp_0 = $this;
     // Inline function 'org.cru.godtools.shared.tool.parser.model.toEventIds' call
     var this_0 = parser.j3e('listeners');
-    var tmp$ret$0 = Companion_getInstance_17().g3f(this_0);
+    var tmp$ret$0 = Companion_getInstance_17().f3f(this_0);
     tmp_0._listeners = toSet_0(tmp$ret$0);
     var tmp_1 = $this;
     // Inline function 'org.cru.godtools.shared.tool.parser.model.toEventIds' call
     var this_1 = parser.j3e('dismiss-listeners');
-    var tmp$ret$1 = Companion_getInstance_17().g3f(this_1);
+    var tmp$ret$1 = Companion_getInstance_17().f3f(this_1);
     tmp_1._dismissListeners = toSet_0(tmp$ret$1);
     var tmp_2 = $this;
     var tmp2_safe_receiver = parser.j3e('background-color');
@@ -9770,11 +9767,11 @@
     $this.g48_1 = parser.j3e('background-image');
     var tmp_3 = $this;
     var tmp3_safe_receiver = parser.j3e('background-image-align');
-    var tmp4_elvis_lhs = tmp3_safe_receiver == null ? null : Companion_getInstance_22().s3h(tmp3_safe_receiver);
+    var tmp4_elvis_lhs = tmp3_safe_receiver == null ? null : Companion_getInstance_22().r3h(tmp3_safe_receiver);
     tmp_3.h48_1 = tmp4_elvis_lhs == null ? Companion_getInstance_59().d48_1 : tmp4_elvis_lhs;
     var tmp_4 = $this;
     var tmp5_safe_receiver = parser.j3e('background-image-scale-type');
-    var tmp6_elvis_lhs = tmp5_safe_receiver == null ? null : Companion_instance_22.c3m(tmp5_safe_receiver);
+    var tmp6_elvis_lhs = tmp5_safe_receiver == null ? null : Companion_instance_22.b3m(tmp5_safe_receiver);
     tmp_4.i48_1 = tmp6_elvis_lhs == null ? Companion_getInstance_59().c48_1 : tmp6_elvis_lhs;
     var tmp_5 = $this;
     var tmp7_safe_receiver = parser.j3e('text-color');
@@ -9885,7 +9882,7 @@
   }
   function TractPage$Card$labelParent$delegate$lambda$lambda(this$0) {
     return function () {
-      return this$0.y3i();
+      return this$0.x3i();
     };
   }
   function TractPage$Card$labelParent$delegate$lambda(this$0) {
@@ -9958,11 +9955,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().u3n_1 : backgroundColor;
+    backgroundColor = backgroundColor === VOID ? Companion_getInstance_48().t3n_1 : backgroundColor;
     backgroundImage = backgroundImage === VOID ? null : backgroundImage;
     primaryColor = primaryColor === VOID ? null : primaryColor;
-    backgroundImageGravity = backgroundImageGravity === VOID ? Companion_getInstance_48().v3n_1 : backgroundImageGravity;
-    backgroundImageScaleType = backgroundImageScaleType === VOID ? Companion_getInstance_48().w3n_1 : backgroundImageScaleType;
+    backgroundImageGravity = backgroundImageGravity === VOID ? Companion_getInstance_48().u3n_1 : backgroundImageGravity;
+    backgroundImageScaleType = backgroundImageScaleType === VOID ? Companion_getInstance_48().v3n_1 : backgroundImageScaleType;
     textColor = textColor === VOID ? null : textColor;
     textScale = textScale === VOID ? 1.0 : textScale;
     cardBackgroundColor = cardBackgroundColor === VOID ? null : cardBackgroundColor;
@@ -10022,7 +10019,7 @@
   };
   protoOf(Card_1).o3r = function () {
     var tmp0_elvis_lhs = this.f48_1;
-    return tmp0_elvis_lhs == null ? this.page.b3j() : tmp0_elvis_lhs;
+    return tmp0_elvis_lhs == null ? this.page.a3j() : tmp0_elvis_lhs;
   };
   protoOf(Card_1).p3r = function () {
     return getResource(this, this.g48_1);
@@ -10033,11 +10030,11 @@
   protoOf(Card_1).r3r = function () {
     return this.i48_1;
   };
-  protoOf(Card_1).w3i = function () {
+  protoOf(Card_1).v3i = function () {
     var tmp0_elvis_lhs = this.j48_1;
     return tmp0_elvis_lhs == null ? this.page.cardTextColor : tmp0_elvis_lhs;
   };
-  protoOf(Card_1).p3m = function () {
+  protoOf(Card_1).o3m = function () {
     return this.label;
   };
   protoOf(Card_1).q3d = function () {
@@ -10058,7 +10055,7 @@
     }
     return destination;
   };
-  protoOf(Card_1).d3i = function () {
+  protoOf(Card_1).c3i = function () {
     return this.m48_1;
   };
   protoOf(Card_1).r3d = function (type) {
@@ -10171,9 +10168,9 @@
     return this_0.p3();
   }
   protoOf(TractPage).p48 = function () {
-    return equals(lastOrNull(this.x39().n3l()), this);
+    return equals(lastOrNull(this.x39().m3l()), this);
   };
-  protoOf(TractPage).d3i = function () {
+  protoOf(TractPage).c3i = function () {
     return this.v47_1;
   };
   protoOf(TractPage).p3d = function () {
@@ -10226,7 +10223,7 @@
   };
   protoOf(TractPage).u48 = function () {
     var tmp0_elvis_lhs = this.w47_1;
-    return tmp0_elvis_lhs == null ? this.w3i() : tmp0_elvis_lhs;
+    return tmp0_elvis_lhs == null ? this.v3i() : tmp0_elvis_lhs;
   };
   protoOf(TractPage).u40 = function () {
     // Inline function 'kotlin.collections.toTypedArray' call
@@ -10358,7 +10355,7 @@
     }
     this.h49_1 = value;
   };
-  protoOf(SetOnceProperty).t3q = function (thisRef, property, value) {
+  protoOf(SetOnceProperty).s3q = function (thisRef, property, value) {
     var tmp = !(thisRef == null) ? thisRef : THROW_CCE();
     return this.j49(tmp, property, (value == null ? true : !(value == null)) ? value : THROW_CCE());
   };
@@ -10373,17 +10370,38 @@
   function addSchemeIfNecessary(_this__u8e3s4, defaultScheme) {
     return get_hasUriScheme(_this__u8e3s4) ? _this__u8e3s4 : defaultScheme + '://' + _this__u8e3s4;
   }
+  function getAttributeValueInt($this, namespace, name) {
+    // Inline function 'kotlin.takeIf' call
+    var this_0 = $this.k49_1;
+    var tmp;
+    // Inline function 'org.cru.godtools.shared.tool.parser.xml.SaxXmlPullParser.getAttributeValueInt.<anonymous>' call
+    if (this_0.n49_1 === 2) {
+      tmp = this_0;
+    } else {
+      tmp = null;
+    }
+    var tmp0_elvis_lhs = tmp;
+    var tmp_0;
+    if (tmp0_elvis_lhs == null) {
+      throw IndexOutOfBoundsException_init_$Create$();
+    } else {
+      tmp_0 = tmp0_elvis_lhs;
+    }
+    var event = tmp_0;
+    var tmp1_safe_receiver = event.q49_1;
+    return tmp1_safe_receiver == null ? null : tmp1_safe_receiver.k2(new QName(namespace, name));
+  }
   function QName(uri, local) {
     uri = uri === VOID ? null : uri;
-    this.k49_1 = uri;
-    this.l49_1 = local;
+    this.r49_1 = uri;
+    this.s49_1 = local;
   }
   protoOf(QName).toString = function () {
-    return 'QName(uri=' + this.k49_1 + ', local=' + this.l49_1 + ')';
+    return 'QName(uri=' + this.r49_1 + ', local=' + this.s49_1 + ')';
   };
   protoOf(QName).hashCode = function () {
-    var result = this.k49_1 == null ? 0 : getStringHashCode(this.k49_1);
-    result = imul(result, 31) + getStringHashCode(this.l49_1) | 0;
+    var result = this.r49_1 == null ? 0 : getStringHashCode(this.r49_1);
+    result = imul(result, 31) + getStringHashCode(this.s49_1) | 0;
     return result;
   };
   protoOf(QName).equals = function (other) {
@@ -10392,9 +10410,9 @@
     if (!(other instanceof QName))
       return false;
     var tmp0_other_with_cast = other instanceof QName ? other : THROW_CCE();
-    if (!(this.k49_1 == tmp0_other_with_cast.k49_1))
+    if (!(this.r49_1 == tmp0_other_with_cast.r49_1))
       return false;
-    if (!(this.l49_1 === tmp0_other_with_cast.l49_1))
+    if (!(this.s49_1 === tmp0_other_with_cast.s49_1))
       return false;
     return true;
   };
@@ -10402,52 +10420,52 @@
     qname = qname === VOID ? null : qname;
     content = content === VOID ? null : content;
     attrs = attrs === VOID ? null : attrs;
-    this.m49_1 = type;
-    this.n49_1 = qname;
-    this.o49_1 = content;
-    this.p49_1 = attrs;
+    this.n49_1 = type;
+    this.o49_1 = qname;
+    this.p49_1 = content;
+    this.q49_1 = attrs;
   }
   function enqueueEvent($this, event) {
     // Inline function 'kotlin.text.isNotEmpty' call
-    var this_0 = $this.s49_1;
+    var this_0 = $this.m49_1;
     if (charSequenceLength(this_0) > 0) {
-      var tmp1 = $this.r49_1;
+      var tmp1 = $this.l49_1;
       // Inline function 'kotlin.collections.plusAssign' call
-      var element = new ParserEvent(4, VOID, $this.s49_1.toString());
+      var element = new ParserEvent(4, VOID, $this.m49_1.toString());
       tmp1.e(element);
-      $this.s49_1.gc();
+      $this.m49_1.gc();
     }
     // Inline function 'kotlin.collections.plusAssign' call
-    $this.r49_1.e(event);
+    $this.l49_1.e(event);
   }
   function SaxXmlPullParser() {
-    this.q49_1 = new ParserEvent(0);
+    this.k49_1 = new ParserEvent(0);
     var tmp = this;
     // Inline function 'kotlin.collections.mutableListOf' call
-    tmp.r49_1 = ArrayList_init_$Create$();
-    this.s49_1 = StringBuilder_init_$Create$();
+    tmp.l49_1 = ArrayList_init_$Create$();
+    this.m49_1 = StringBuilder_init_$Create$();
   }
   protoOf(SaxXmlPullParser).v3c = function () {
-    return this.q49_1.m49_1;
+    return this.k49_1.n49_1;
   };
   protoOf(SaxXmlPullParser).w3c = function () {
-    var tmp0_safe_receiver = this.q49_1.n49_1;
-    return tmp0_safe_receiver == null ? null : tmp0_safe_receiver.k49_1;
+    var tmp0_safe_receiver = this.k49_1.o49_1;
+    return tmp0_safe_receiver == null ? null : tmp0_safe_receiver.r49_1;
   };
   protoOf(SaxXmlPullParser).q2 = function () {
-    var tmp0_safe_receiver = this.q49_1.n49_1;
-    return tmp0_safe_receiver == null ? null : tmp0_safe_receiver.l49_1;
+    var tmp0_safe_receiver = this.k49_1.o49_1;
+    return tmp0_safe_receiver == null ? null : tmp0_safe_receiver.s49_1;
   };
   protoOf(SaxXmlPullParser).u3c = function (type, namespace, name) {
     // Inline function 'kotlin.with' call
     // Inline function 'org.cru.godtools.shared.tool.parser.xml.SaxXmlPullParser.require.<anonymous>' call
-    var $this$with = this.q49_1;
-    if (!($this$with.m49_1 === type))
+    var $this$with = this.k49_1;
+    if (!($this$with.n49_1 === type))
       throw new XmlPullParserException('expected ' + type);
     var tmp;
     if (!(namespace == null)) {
-      var tmp0_safe_receiver = $this$with.n49_1;
-      tmp = !(namespace == (tmp0_safe_receiver == null ? null : tmp0_safe_receiver.k49_1));
+      var tmp0_safe_receiver = $this$with.o49_1;
+      tmp = !(namespace == (tmp0_safe_receiver == null ? null : tmp0_safe_receiver.r49_1));
     } else {
       tmp = false;
     }
@@ -10455,8 +10473,8 @@
       throw new XmlPullParserException('expected ' + namespace);
     var tmp_0;
     if (!(name == null)) {
-      var tmp1_safe_receiver = $this$with.n49_1;
-      tmp_0 = !((tmp1_safe_receiver == null ? null : tmp1_safe_receiver.l49_1) == name);
+      var tmp1_safe_receiver = $this$with.o49_1;
+      tmp_0 = !((tmp1_safe_receiver == null ? null : tmp1_safe_receiver.s49_1) == name);
     } else {
       tmp_0 = false;
     }
@@ -10466,16 +10484,16 @@
   };
   protoOf(SaxXmlPullParser).l = function () {
     // Inline function 'kotlin.also' call
-    var this_0 = removeFirst(this.r49_1);
+    var this_0 = removeFirst(this.l49_1);
     // Inline function 'org.cru.godtools.shared.tool.parser.xml.SaxXmlPullParser.next.<anonymous>' call
-    this.q49_1 = this_0;
-    return this_0.m49_1;
+    this.k49_1 = this_0;
+    return this_0.n49_1;
   };
   protoOf(SaxXmlPullParser).m3a = function () {
     var tmp;
     if (this.l() === 4) {
       // Inline function 'kotlin.text.isNullOrBlank' call
-      var this_0 = this.q49_1.o49_1;
+      var this_0 = this.k49_1.p49_1;
       tmp = this_0 == null || isBlank(this_0);
     } else {
       tmp = false;
@@ -10483,11 +10501,11 @@
     if (tmp) {
       this.l();
     }
-    var event = this.q49_1;
-    if (!(event.m49_1 === 2) && !(event.m49_1 === 3)) {
-      throw new XmlPullParserException('Expected start or end tag. Found: ' + event.m49_1);
+    var event = this.k49_1;
+    if (!(event.n49_1 === 2) && !(event.n49_1 === 3)) {
+      throw new XmlPullParserException('Expected start or end tag. Found: ' + event.n49_1);
     }
-    return event.m49_1;
+    return event.n49_1;
   };
   protoOf(SaxXmlPullParser).f3w = function () {
     this.r45(2);
@@ -10496,7 +10514,7 @@
       case 4:
         // Inline function 'kotlin.text.orEmpty' call
-        var tmp0_elvis_lhs = this.q49_1.o49_1;
+        var tmp0_elvis_lhs = this.k49_1.p49_1;
         // Inline function 'kotlin.also' call
         var this_0 = tmp0_elvis_lhs == null ? '' : tmp0_elvis_lhs;
@@ -10518,32 +10536,17 @@
     }
     return tmp;
   };
-  protoOf(SaxXmlPullParser).f3f = function (namespace, name) {
-    // Inline function 'kotlin.takeIf' call
-    var this_0 = this.q49_1;
-    var tmp;
-    // Inline function 'org.cru.godtools.shared.tool.parser.xml.SaxXmlPullParser.getAttributeValue.<anonymous>' call
-    if (this_0.m49_1 === 2) {
-      tmp = this_0;
-    } else {
-      tmp = null;
-    }
-    var tmp0_elvis_lhs = tmp;
-    var tmp_0;
-    if (tmp0_elvis_lhs == null) {
-      throw IndexOutOfBoundsException_init_$Create$();
-    } else {
-      tmp_0 = tmp0_elvis_lhs;
-    }
-    var event = tmp_0;
-    var tmp1_safe_receiver = event.p49_1;
-    return tmp1_safe_receiver == null ? null : tmp1_safe_receiver.k2(new QName(namespace, name));
+  protoOf(SaxXmlPullParser).j3e = function (name) {
+    return getAttributeValueInt(this, null, name);
+  };
+  protoOf(SaxXmlPullParser).t3q = function (namespace, name) {
+    return getAttributeValueInt(this, namespace, name);
   };
   protoOf(SaxXmlPullParser).t49 = function (qname, attrs) {
     enqueueEvent(this, new ParserEvent(2, qname, VOID, attrs));
   };
   protoOf(SaxXmlPullParser).u49 = function (text) {
-    this.s49_1.n8(text);
+    this.m49_1.n8(text);
   };
   protoOf(SaxXmlPullParser).v49 = function (qname) {
     enqueueEvent(this, new ParserEvent(3, qname));
@@ -10753,63 +10756,63 @@
   defineProp(protoOf(System), 'ordinal', protoOf(System).r2);
   defineProp(protoOf(Trigger), 'name', protoOf(Trigger).q2);
   defineProp(protoOf(Trigger), 'ordinal', protoOf(Trigger).r2);
-  protoOf(Animation).o3g = get_isClickable;
-  protoOf(Animation).p3g = get_events;
-  defineProp(protoOf(Animation), 'resource', protoOf(Animation).f3g);
+  protoOf(Animation).n3g = get_isClickable;
+  protoOf(Animation).o3g = get_events;
+  defineProp(protoOf(Animation), 'resource', protoOf(Animation).e3g);
   defineProp(protoOf(Animation), 'url', function () {
-    return this.l3g();
+    return this.k3g();
   });
-  defineProp(protoOf(Animation), 'playListeners', protoOf(Animation).m3g);
-  defineProp(protoOf(Animation), 'stopListeners', protoOf(Animation).n3g);
+  defineProp(protoOf(Animation), 'playListeners', protoOf(Animation).l3g);
+  defineProp(protoOf(Animation), 'stopListeners', protoOf(Animation).m3g);
   defineProp(protoOf(Animation), 'isClickable', function () {
-    return this.o3g();
+    return this.n3g();
   });
   defineProp(protoOf(Animation), 'events', function () {
-    return this.p3g();
+    return this.o3g();
   });
-  defineProp(protoOf(AspectRatio), 'ratio', protoOf(AspectRatio).t3g);
+  defineProp(protoOf(AspectRatio), 'ratio', protoOf(AspectRatio).s3g);
   defineProp(protoOf(Style), 'name', protoOf(Style).q2);
   defineProp(protoOf(Style), 'ordinal', protoOf(Style).r2);
   protoOf(Button).getAnalyticsEvents = getAnalyticsEvents;
-  protoOf(Button).o3g = get_isClickable;
-  protoOf(Button).p3g = get_events;
+  protoOf(Button).n3g = get_isClickable;
+  protoOf(Button).o3g = get_events;
   defineProp(protoOf(Button), 'url', function () {
-    return this.l3g();
+    return this.k3g();
   });
-  defineProp(protoOf(Button), 'style', protoOf(Button).w3h);
-  defineProp(protoOf(Button), 'buttonColor', protoOf(Button).y3h);
-  defineProp(protoOf(Button), 'icon', protoOf(Button).a3i);
+  defineProp(protoOf(Button), 'style', protoOf(Button).v3h);
+  defineProp(protoOf(Button), 'buttonColor', protoOf(Button).x3h);
+  defineProp(protoOf(Button), 'icon', protoOf(Button).z3h);
   defineProp(protoOf(Button), 'isClickable', function () {
-    return this.o3g();
+    return this.n3g();
   });
   defineProp(protoOf(Button), 'events', function () {
-    return this.p3g();
+    return this.o3g();
   });
   protoOf(Card).y3d = get_content;
-  protoOf(Card).o3g = get_isClickable;
-  protoOf(Card).p3g = get_events;
-  defineProp(protoOf(Card), 'backgroundColor', protoOf(Card).z3h);
+  protoOf(Card).n3g = get_isClickable;
+  protoOf(Card).o3g = get_events;
+  defineProp(protoOf(Card), 'backgroundColor', protoOf(Card).y3h);
   defineProp(protoOf(Card), 'url', function () {
-    return this.l3g();
+    return this.k3g();
   });
   defineProp(protoOf(Card), 'content', function () {
     return this.y3d();
   });
   defineProp(protoOf(Card), 'isClickable', function () {
-    return this.o3g();
+    return this.n3g();
   });
   defineProp(protoOf(Card), 'events', function () {
-    return this.p3g();
+    return this.o3g();
   });
-  protoOf(Category).y3i = get_primaryColor;
-  protoOf(Category).z3i = get_primaryTextColor;
-  protoOf(Category).a3j = get_buttonStyle;
-  protoOf(Category).y3h = get_buttonColor;
-  protoOf(Category).b3j = get_cardBackgroundColor;
-  protoOf(Category).c3j = get_multiselectOptionBackgroundColor;
-  protoOf(Category).d3j = get_multiselectOptionSelectedColor;
-  protoOf(Category).e3j = get_textScale;
-  protoOf(Category).f3j = get_textAlign;
+  protoOf(Category).x3i = get_primaryColor;
+  protoOf(Category).y3i = get_primaryTextColor;
+  protoOf(Category).z3i = get_buttonStyle;
+  protoOf(Category).x3h = get_buttonColor;
+  protoOf(Category).a3j = get_cardBackgroundColor;
+  protoOf(Category).b3j = get_multiselectOptionBackgroundColor;
+  protoOf(Category).c3j = get_multiselectOptionSelectedColor;
+  protoOf(Category).d3j = get_textScale;
+  protoOf(Category).e3j = get_textAlign;
   protoOf(Fallback).y3d = get_content;
   defineProp(protoOf(Fallback), 'content', function () {
     return this.y3d();
@@ -10822,7 +10825,7 @@
   protoOf(Item).watchIsGone = watchIsGone;
   protoOf(Item).watchIsInvisible = watchIsInvisible;
   protoOf(Item).watchVisibility = watchVisibility;
-  defineProp(protoOf(Item), 'width', protoOf(Item).r3g);
+  defineProp(protoOf(Item), 'width', protoOf(Item).q3g);
   defineProp(protoOf(Item), 'invisibleIf', function () {
     return this.f3e();
   });
@@ -10832,7 +10835,7 @@
   defineProp(protoOf(Item), 'content', function () {
     return this.y3d();
   });
-  defineProp(protoOf(Flow), 'items', protoOf(Flow).q3k);
+  defineProp(protoOf(Flow), 'items', protoOf(Flow).p3k);
   protoOf(Form).y3d = get_content;
   defineProp(protoOf(Form), 'content', function () {
     return this.y3d();
@@ -10841,62 +10844,62 @@
   defineProp(protoOf(Horizontal), 'ordinal', protoOf(Horizontal).r2);
   defineProp(protoOf(Vertical), 'name', protoOf(Vertical).q2);
   defineProp(protoOf(Vertical), 'ordinal', protoOf(Vertical).r2);
-  defineProp(protoOf(Gravity), 'isStart', protoOf(Gravity).g3l);
-  defineProp(protoOf(Gravity), 'isEnd', protoOf(Gravity).h3l);
-  defineProp(protoOf(Gravity), 'isCenterX', protoOf(Gravity).i3l);
-  defineProp(protoOf(Gravity), 'isTop', protoOf(Gravity).j3l);
-  defineProp(protoOf(Gravity), 'isBottom', protoOf(Gravity).k3l);
-  defineProp(protoOf(Gravity), 'isCenterY', protoOf(Gravity).l3l);
-  defineProp(protoOf(Gravity), 'isCenter', protoOf(Gravity).m3l);
-  protoOf(Image).o3g = get_isClickable;
-  protoOf(Image).p3g = get_events;
+  defineProp(protoOf(Gravity), 'isStart', protoOf(Gravity).f3l);
+  defineProp(protoOf(Gravity), 'isEnd', protoOf(Gravity).g3l);
+  defineProp(protoOf(Gravity), 'isCenterX', protoOf(Gravity).h3l);
+  defineProp(protoOf(Gravity), 'isTop', protoOf(Gravity).i3l);
+  defineProp(protoOf(Gravity), 'isBottom', protoOf(Gravity).j3l);
+  defineProp(protoOf(Gravity), 'isCenterY', protoOf(Gravity).k3l);
+  defineProp(protoOf(Gravity), 'isCenter', protoOf(Gravity).l3l);
+  protoOf(Image).n3g = get_isClickable;
+  protoOf(Image).o3g = get_events;
   defineProp(protoOf(Image), 'url', function () {
-    return this.l3g();
+    return this.k3g();
   });
-  defineProp(protoOf(Image), 'resource', protoOf(Image).f3g);
+  defineProp(protoOf(Image), 'resource', protoOf(Image).e3g);
   defineProp(protoOf(Image), 'isClickable', function () {
-    return this.o3g();
+    return this.n3g();
   });
   defineProp(protoOf(Image), 'events', function () {
-    return this.p3g();
+    return this.o3g();
   });
   defineProp(protoOf(Type_0), 'name', protoOf(Type_0).q2);
   defineProp(protoOf(Type_0), 'ordinal', protoOf(Type_0).r2);
   protoOf(Link).getAnalyticsEvents = getAnalyticsEvents;
-  protoOf(Link).o3g = get_isClickable;
-  protoOf(Link).p3g = get_events;
+  protoOf(Link).n3g = get_isClickable;
+  protoOf(Link).o3g = get_events;
   defineProp(protoOf(Link), 'url', function () {
-    return this.l3g();
+    return this.k3g();
   });
   defineProp(protoOf(Link), 'isClickable', function () {
-    return this.o3g();
+    return this.n3g();
   });
   defineProp(protoOf(Link), 'events', function () {
-    return this.p3g();
+    return this.o3g();
   });
   defineProp(protoOf(Type_1), 'name', protoOf(Type_1).q2);
   defineProp(protoOf(Type_1), 'ordinal', protoOf(Type_1).r2);
-  protoOf(Manifest).y3h = get_buttonColor;
-  protoOf(Manifest).f3j = get_textAlign;
+  protoOf(Manifest).x3h = get_buttonColor;
+  protoOf(Manifest).e3j = get_textAlign;
   protoOf(Manifest).findPage = findPage;
-  protoOf(Manifest).p3l = get_pages;
+  protoOf(Manifest).o3l = get_pages;
   defineProp(protoOf(Manifest), 'backgroundImage', protoOf(Manifest).p3r);
   defineProp(protoOf(Manifest), 'title', protoOf(Manifest).t3r);
   defineProp(protoOf(Manifest), '_pages', function () {
-    return this.n3l();
+    return this.m3l();
   });
   defineProp(protoOf(Manifest), 'relatedFiles', protoOf(Manifest).m3s);
   defineProp(protoOf(Manifest), 'hasTips', protoOf(Manifest).n3s);
   defineProp(protoOf(Manifest), 'dismissListeners', protoOf(Manifest).r3s);
   defineProp(protoOf(Manifest), 'pages', function () {
-    return this.p3l();
+    return this.o3l();
   });
   defineProp(protoOf(Style_0), 'name', protoOf(Style_0).q2);
   defineProp(protoOf(Style_0), 'ordinal', protoOf(Style_0).r2);
   protoOf(Option).y3d = get_content;
   protoOf(Option).getAnalyticsEvents = getAnalyticsEvents;
-  defineProp(protoOf(Option), 'style', protoOf(Option).w3h);
-  defineProp(protoOf(Option), 'backgroundColor', protoOf(Option).z3h);
+  defineProp(protoOf(Option), 'style', protoOf(Option).v3h);
+  defineProp(protoOf(Option), 'backgroundColor', protoOf(Option).y3h);
   defineProp(protoOf(Option), 'selectedColor', protoOf(Option).z3t);
   defineProp(protoOf(Option), 'content', function () {
     return this.y3d();
@@ -10908,13 +10911,13 @@
   });
   defineProp(protoOf(Mode), 'name', protoOf(Mode).q2);
   defineProp(protoOf(Mode), 'ordinal', protoOf(Mode).r2);
-  protoOf(StylesOverride).y3i = get_primaryColor;
-  protoOf(StylesOverride).z3i = get_primaryTextColor;
-  protoOf(StylesOverride).a3j = get_buttonStyle;
-  protoOf(StylesOverride).y3h = get_buttonColor;
-  protoOf(StylesOverride).b3j = get_cardBackgroundColor;
-  protoOf(StylesOverride).c3j = get_multiselectOptionBackgroundColor;
-  protoOf(StylesOverride).d3j = get_multiselectOptionSelectedColor;
+  protoOf(StylesOverride).x3i = get_primaryColor;
+  protoOf(StylesOverride).y3i = get_primaryTextColor;
+  protoOf(StylesOverride).z3i = get_buttonStyle;
+  protoOf(StylesOverride).x3h = get_buttonColor;
+  protoOf(StylesOverride).a3j = get_cardBackgroundColor;
+  protoOf(StylesOverride).b3j = get_multiselectOptionBackgroundColor;
+  protoOf(StylesOverride).c3j = get_multiselectOptionSelectedColor;
   protoOf(Tab).y3d = get_content;
   protoOf(Tab).getAnalyticsEvents = getAnalyticsEvents;
   defineProp(protoOf(Tab), 'position', protoOf(Tab).v3v);
@@ -10927,17 +10930,17 @@
   defineProp(protoOf(Align), 'ordinal', protoOf(Align).r2);
   defineProp(protoOf(Style_1), 'name', protoOf(Style_1).q2);
   defineProp(protoOf(Style_1), 'ordinal', protoOf(Style_1).r2);
-  defineProp(protoOf(Text), 'textAlign', protoOf(Text).f3j);
-  defineProp(protoOf(Text), 'textColor', protoOf(Text).w3i);
-  defineProp(protoOf(Text), 'textScale', protoOf(Text).e3j);
+  defineProp(protoOf(Text), 'textAlign', protoOf(Text).e3j);
+  defineProp(protoOf(Text), 'textColor', protoOf(Text).v3i);
+  defineProp(protoOf(Text), 'textScale', protoOf(Text).d3j);
   defineProp(protoOf(Text), 'startImage', protoOf(Text).n3w);
   defineProp(protoOf(Text), 'endImage', protoOf(Text).q3w);
   defineProp(protoOf(Text), 'textStyles', protoOf(Text).s3w);
   defineProp(protoOf(Provider), 'name', protoOf(Provider).q2);
   defineProp(protoOf(Provider), 'ordinal', protoOf(Provider).r2);
-  protoOf(Page).a3j = get_buttonStyle;
-  protoOf(Page).y3h = get_buttonColor;
-  protoOf(Page).f3j = get_textAlign;
+  protoOf(Page).z3i = get_buttonStyle;
+  protoOf(Page).x3h = get_buttonColor;
+  protoOf(Page).e3j = get_textAlign;
   protoOf(Page).getAnalyticsEvents = getAnalyticsEvents;
   defineProp(protoOf(Page), 'id', protoOf(Page).o3d);
   defineProp(protoOf(Page), 'position', protoOf(Page).v3v);
@@ -10965,35 +10968,35 @@
     return this.y3d();
   });
   protoOf(PageCollectionPage).findPage = findPage;
-  protoOf(PageCollectionPage).p3l = get_pages;
+  protoOf(PageCollectionPage).o3l = get_pages;
   defineProp(protoOf(PageCollectionPage), '_pages', function () {
-    return this.n3l();
+    return this.m3l();
   });
   defineProp(protoOf(PageCollectionPage), 'pages', function () {
-    return this.p3l();
+    return this.o3l();
   });
   defineProp(protoOf(InlineTip), 'tip', protoOf(InlineTip).f46);
-  protoOf(Tip).a3j = get_buttonStyle;
-  protoOf(Tip).y3h = get_buttonColor;
-  protoOf(Tip).b3j = get_cardBackgroundColor;
-  protoOf(Tip).c3j = get_multiselectOptionBackgroundColor;
-  protoOf(Tip).d3j = get_multiselectOptionSelectedColor;
-  protoOf(Tip).e3j = get_textScale;
-  protoOf(Tip).f3j = get_textAlign;
+  protoOf(Tip).z3i = get_buttonStyle;
+  protoOf(Tip).x3h = get_buttonColor;
+  protoOf(Tip).a3j = get_cardBackgroundColor;
+  protoOf(Tip).b3j = get_multiselectOptionBackgroundColor;
+  protoOf(Tip).c3j = get_multiselectOptionSelectedColor;
+  protoOf(Tip).d3j = get_textScale;
+  protoOf(Tip).e3j = get_textAlign;
   protoOf(TipPage).y3d = get_content;
   defineProp(protoOf(TipPage), 'content', function () {
     return this.y3d();
   });
   defineProp(protoOf(CallToAction), 'tip', protoOf(CallToAction).f46);
-  protoOf(Header).y3i = get_primaryColor;
-  protoOf(Header).z3i = get_primaryTextColor;
-  protoOf(Header).a3j = get_buttonStyle;
-  protoOf(Header).y3h = get_buttonColor;
-  protoOf(Header).b3j = get_cardBackgroundColor;
-  protoOf(Header).c3j = get_multiselectOptionBackgroundColor;
-  protoOf(Header).d3j = get_multiselectOptionSelectedColor;
-  protoOf(Header).e3j = get_textScale;
-  protoOf(Header).f3j = get_textAlign;
+  protoOf(Header).x3i = get_primaryColor;
+  protoOf(Header).y3i = get_primaryTextColor;
+  protoOf(Header).z3i = get_buttonStyle;
+  protoOf(Header).x3h = get_buttonColor;
+  protoOf(Header).a3j = get_cardBackgroundColor;
+  protoOf(Header).b3j = get_multiselectOptionBackgroundColor;
+  protoOf(Header).c3j = get_multiselectOptionSelectedColor;
+  protoOf(Header).d3j = get_textScale;
+  protoOf(Header).e3j = get_textAlign;
   defineProp(protoOf(Header), 'tip', protoOf(Header).f46);
   protoOf(Hero).y3d = get_content;
   protoOf(Hero).getAnalyticsEvents = getAnalyticsEvents;
@@ -11001,25 +11004,25 @@
     return this.y3d();
   });
   protoOf(Modal).y3d = get_content;
-  protoOf(Modal).b3j = get_cardBackgroundColor;
-  protoOf(Modal).c3j = get_multiselectOptionBackgroundColor;
-  protoOf(Modal).d3j = get_multiselectOptionSelectedColor;
-  protoOf(Modal).e3j = get_textScale;
+  protoOf(Modal).a3j = get_cardBackgroundColor;
+  protoOf(Modal).b3j = get_multiselectOptionBackgroundColor;
+  protoOf(Modal).c3j = get_multiselectOptionSelectedColor;
+  protoOf(Modal).d3j = get_textScale;
   defineProp(protoOf(Modal), 'id', protoOf(Modal).o3d);
   defineProp(protoOf(Modal), 'dismissListeners', protoOf(Modal).r3s);
   defineProp(protoOf(Modal), 'listeners', protoOf(Modal).x3v);
   defineProp(protoOf(Modal), 'content', function () {
     return this.y3d();
   });
-  protoOf(Card_1).y3i = get_primaryColor;
-  protoOf(Card_1).z3i = get_primaryTextColor;
-  protoOf(Card_1).a3j = get_buttonStyle;
-  protoOf(Card_1).y3h = get_buttonColor;
-  protoOf(Card_1).b3j = get_cardBackgroundColor;
-  protoOf(Card_1).c3j = get_multiselectOptionBackgroundColor;
-  protoOf(Card_1).d3j = get_multiselectOptionSelectedColor;
-  protoOf(Card_1).e3j = get_textScale;
-  protoOf(Card_1).f3j = get_textAlign;
+  protoOf(Card_1).x3i = get_primaryColor;
+  protoOf(Card_1).y3i = get_primaryTextColor;
+  protoOf(Card_1).z3i = get_buttonStyle;
+  protoOf(Card_1).x3h = get_buttonColor;
+  protoOf(Card_1).a3j = get_cardBackgroundColor;
+  protoOf(Card_1).b3j = get_multiselectOptionBackgroundColor;
+  protoOf(Card_1).c3j = get_multiselectOptionSelectedColor;
+  protoOf(Card_1).d3j = get_textScale;
+  protoOf(Card_1).e3j = get_textAlign;
   protoOf(Card_1).y3d = get_content;
   protoOf(Card_1).getAnalyticsEvents = getAnalyticsEvents;
   defineProp(protoOf(Card_1), 'id', protoOf(Card_1).o3d);
@@ -11038,7 +11041,6 @@
   defineProp(protoOf(TractPage), 'cards', protoOf(TractPage).u40);
   defineProp(protoOf(TractPage), 'modals', protoOf(TractPage).v48);
   protoOf(SaxXmlPullParser).r45 = require$default;
-  protoOf(SaxXmlPullParser).j3e = getAttributeValue;
   defineProp(protoOf(SAX_OPTIONS$1), 'xmlns', function () {
     return this.f4a();
   });