npm - @cruglobal/godtools-shared - Versions diffs - 1.1.1 → 1.1.2-PR769-SNAPSHOT.1685 - Mend

@cruglobal/godtools-shared 1.1.1 → 1.1.2-PR769-SNAPSHOT.1685

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

package/kotlin-kotlin-stdlib.js +6 -6
package/kotlin-kotlin-stdlib.js.map +1 -1
package/kotlin-mpp-godtools-tool-parser-module-parser.js +849 -848
package/kotlin-mpp-godtools-tool-parser-module-parser.js.map +1 -1
package/kotlin-mpp-godtools-tool-parser-publishing-npm.d.ts +2 -0
package/kotlinx-coroutines-core.js +7 -7
package/kotlinx-coroutines-core.js.map +1 -1
package/package.json +1 -1

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

@@ -262,17 +262,17 @@
     return distinctUntilChanged(state.v1n(tmp, Visibility$isGoneFlow$lambda(this)));
   }
   function watchIsGone(state, block) {
-    return Companion_instance_58.d3u(this.isGoneFlow(state), block);
+    return Companion_instance_58.b3u(this.isGoneFlow(state), block);
   }
   function watchIsInvisible(state, block) {
-    return Companion_instance_58.d3u(this.isInvisibleFlow(state), block);
+    return Companion_instance_58.b3u(this.isInvisibleFlow(state), block);
   }
   function watchVisibility(state, block) {
     var tmp = Companion_instance_58;
     var tmp_0 = this.isInvisibleFlow(state);
     var tmp_1 = this.isGoneFlow(state);
     var tmp_2 = combine(tmp_0, tmp_1, Visibility$watchVisibility$slambda_0(null));
-    return tmp.d3u(tmp_2, Visibility$watchVisibility$lambda(block));
+    return tmp.b3u(tmp_2, Visibility$watchVisibility$lambda(block));
   }
   initMetadataForInterface(Visibility, 'Visibility');
   initMetadataForClass(Content, 'Content', VOID, BaseModel, [BaseModel, Visibility]);
@@ -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.p3l();
+      var tmp0 = this.n3l();
       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.p3l();
+    var this_0 = this.n3l();
     return copyToArray(this_0);
   }
   initMetadataForInterface(HasPages, 'HasPages', VOID, VOID, [Base]);
@@ -3334,7 +3334,7 @@
     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 tmp3_elvis_lhs = tmp2_safe_receiver == null ? null : tmp2_safe_receiver.horizontal;
-    tmp_0.m3k_1 = tmp3_elvis_lhs == null ? Companion_getInstance_20().e3k_1 : tmp3_elvis_lhs;
+    tmp_0.rowGravity = tmp3_elvis_lhs == null ? Companion_getInstance_20().e3k_1 : tmp3_elvis_lhs;
     var tmp_1 = $this;
     // Inline function 'kotlin.collections.mutableListOf' call
     tmp_1._items = ArrayList_init_$Create$();
@@ -3368,10 +3368,10 @@
   function Flow_init_$Create$(parent, parser) {
     return Flow_init_$Init$(parent, parser, objectCreate(protoOf(Flow)));
   }
-  protoOf(Item).n3k = function () {
+  protoOf(Item).m3k = function () {
     return this.flow;
   };
-  protoOf(Item).o3k = function () {
+  protoOf(Item).r3g = function () {
     var tmp0_elvis_lhs = this.x3j_1;
     return tmp0_elvis_lhs == null ? this.flow.l3k_1 : tmp0_elvis_lhs;
   };
@@ -3406,19 +3406,19 @@
       return tmp;
     };
   }
-  protoOf(Flow).p3k = function () {
+  protoOf(Flow).n3k = function () {
     return this.l3k_1;
   };
-  protoOf(Flow).q3k = function () {
-    return this.m3k_1;
+  protoOf(Flow).o3k = function () {
+    return this.rowGravity;
   };
-  protoOf(Flow).r3k = function () {
+  protoOf(Flow).p3k = function () {
     return this._items;
   };
   protoOf(Flow).g3d = function () {
     return !this.x39().i3f_1.i3c('flow') || protoOf(Content).g3d.call(this);
   };
-  protoOf(Flow).s3k = function () {
+  protoOf(Flow).q3k = function () {
     // Inline function 'kotlin.collections.toTypedArray' call
     var this_0 = this._items;
     return copyToArray(this_0);
@@ -3427,7 +3427,7 @@
     Companion_getInstance_20();
   }
   function Companion_18() {
-    this.t3k_1 = 'form';
+    this.r3k_1 = 'form';
   }
   var Companion_instance_19;
   function Companion_getInstance_21() {
@@ -3483,14 +3483,14 @@
         continue $l$loop_0;
       skipTag(parser);
     }
-    tmp.a3l_1 = this_0.p3();
+    tmp.y3k_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.a3l_1;
+    return this.y3k_1;
   };
   protoOf(Form).a3e = function () {
     // Inline function 'org.cru.godtools.shared.tool.parser.model.contentTips' call
@@ -3576,7 +3576,7 @@
     Companion_instance_20 = this;
     this.CENTER = new Gravity(Horizontal_CENTER_getInstance(), Vertical_CENTER_getInstance());
   }
-  protoOf(Companion_19).b3l = function () {
+  protoOf(Companion_19).z3k = function () {
     return this.CENTER;
   };
   protoOf(Companion_19).s3h = function (_this__u8e3s4) {
@@ -3699,31 +3699,31 @@
     this.horizontal = horizontal;
     this.vertical = vertical;
   }
-  protoOf(Gravity).g3l = function () {
+  protoOf(Gravity).e3l = function () {
     return this.horizontal;
   };
-  protoOf(Gravity).h3l = function () {
+  protoOf(Gravity).f3l = function () {
     return this.vertical;
   };
-  protoOf(Gravity).i3l = function () {
+  protoOf(Gravity).g3l = function () {
     return this.horizontal.equals(Horizontal_START_getInstance());
   };
-  protoOf(Gravity).j3l = function () {
+  protoOf(Gravity).h3l = function () {
     return this.horizontal.equals(Horizontal_END_getInstance());
   };
-  protoOf(Gravity).k3l = function () {
+  protoOf(Gravity).i3l = function () {
     return this.horizontal.equals(Horizontal_CENTER_getInstance());
   };
-  protoOf(Gravity).l3l = function () {
+  protoOf(Gravity).j3l = function () {
     return this.vertical.equals(Vertical_TOP_getInstance());
   };
-  protoOf(Gravity).m3l = function () {
+  protoOf(Gravity).k3l = function () {
     return this.vertical.equals(Vertical_BOTTOM_getInstance());
   };
-  protoOf(Gravity).n3l = function () {
+  protoOf(Gravity).l3l = function () {
     return this.vertical.equals(Vertical_CENTER_getInstance());
   };
-  protoOf(Gravity).o3l = function () {
+  protoOf(Gravity).m3l = function () {
     return this.isCenterX && this.isCenterY;
   };
   function HasAnalyticsEvents() {
@@ -3732,9 +3732,9 @@
   }
   function Companion_20() {
     Companion_instance_21 = this;
-    this.s3l_1 = 'image';
-    this.t3l_1 = Horizontal_CENTER_getInstance();
-    this.u3l_1 = new Percent(1.0);
+    this.q3l_1 = 'image';
+    this.r3l_1 = Horizontal_CENTER_getInstance();
+    this.s3l_1 = new Percent(1.0);
   }
   var Companion_instance_21;
   function Companion_getInstance_23() {
@@ -3746,7 +3746,7 @@
     Content_init_$Init$(parent, parser, $this);
     Image.call($this);
     parser.u3c(2, 'https://mobile-content-api.cru.org/xmlns/content', 'image');
-    $this.d3m_1 = parser.j3e('resource');
+    $this.b3m_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,12 +3776,12 @@
     // 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.b3m_1 = Companion_getInstance_17().g3f(this_0);
-    $this.c3m_1 = uri;
+    $this.z3l_1 = Companion_getInstance_17().g3f(this_0);
+    $this.a3m_1 = uri;
     var tmp_1 = $this;
     var tmp0_safe_receiver_0 = Companion_getInstance_22().s3h(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().t3l_1 : tmp1_elvis_lhs;
+    tmp_1.gravity = tmp1_elvis_lhs == null ? Companion_getInstance_23().r3l_1 : tmp1_elvis_lhs;
     var tmp_2 = $this;
     var tmp2_safe_receiver = Companion_instance_14.t3h(parser.j3e('width'));
     var tmp_3;
@@ -3799,7 +3799,7 @@
       tmp_3 = tmp_4;
     }
     var tmp3_elvis_lhs = tmp_3;
-    tmp_2.width = tmp3_elvis_lhs == null ? Companion_getInstance_23().u3l_1 : tmp3_elvis_lhs;
+    tmp_2.width = tmp3_elvis_lhs == null ? Companion_getInstance_23().s3l_1 : tmp3_elvis_lhs;
     skipTag(parser);
     return $this;
   }
@@ -3809,42 +3809,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().t3l_1 : gravity;
-    width = width === VOID ? Companion_getInstance_23().u3l_1 : width;
+    gravity = gravity === VOID ? Companion_getInstance_23().r3l_1 : gravity;
+    width = width === VOID ? Companion_getInstance_23().s3l_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.d3m_1 = resource;
+    $this.b3m_1 = resource;
     $this.gravity = gravity;
     $this.width = width;
-    $this.b3m_1 = events;
-    $this.c3m_1 = url;
+    $this.z3l_1 = events;
+    $this.a3m_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).k3g = function () {
-    return this.b3m_1;
+    return this.z3l_1;
   };
   protoOf(Image).l3g = function () {
-    return this.c3m_1;
+    return this.a3m_1;
   };
   protoOf(Image).e3g = function () {
-    return this.d3m_1;
+    return this.b3m_1;
   };
   protoOf(Image).f3g = function () {
-    var tmp0_elvis_lhs = getResource(this, this.d3m_1);
+    var tmp0_elvis_lhs = getResource(this, this.b3m_1);
     var tmp;
     if (tmp0_elvis_lhs == null) {
       var tmp_0;
-      if (this.d3m_1 == null) {
+      if (this.b3m_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.d3m_1;
+        var message = 'tool: ' + this.x39().code + ' locale: ' + this.x39().locale + ' resource: ' + this.b3m_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 +3853,7 @@
         if (tmp0.z1u().q1v().s2(severity) <= 0) {
           tmp0.a1v(severity, 'Image', throwable, message);
         }
-        tmp_0 = Resource_init_$Create$_0(this.x39(), this.d3m_1);
+        tmp_0 = Resource_init_$Create$_0(this.x39(), this.b3m_1);
       } else {
         tmp_0 = null;
       }
@@ -3875,7 +3875,7 @@
       tmp = true;
     } else {
       // Inline function 'kotlin.text.isNullOrEmpty' call
-      var this_0 = this.d3m_1;
+      var this_0 = this.b3m_1;
       tmp = this_0 == null || charSequenceLength(this_0) === 0;
     }
     return tmp;
@@ -3900,10 +3900,10 @@
               if (!equals(this.width, other.width)) {
                 tmp = false;
               } else {
-                if (!equals(this.b3m_1, other.b3m_1)) {
+                if (!equals(this.z3l_1, other.z3l_1)) {
                   tmp = false;
                 } else {
-                  if (!(this.c3m_1 == other.c3m_1)) {
+                  if (!(this.a3m_1 == other.a3m_1)) {
                     tmp = false;
                   } else {
                     if (!equals(this.invisibleIf, other.invisibleIf)) {
@@ -3926,9 +3926,9 @@
     return tmp;
   };
   protoOf(Image).hashCode = function () {
-    var result = hashCode(this.b3m_1);
+    var result = hashCode(this.z3l_1);
     var tmp = imul(31, result);
-    var tmp0_safe_receiver = this.c3m_1;
+    var tmp0_safe_receiver = this.a3m_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 +3948,7 @@
   var ImageScaleType_FILL_Y_instance;
   function Companion_21() {
   }
-  protoOf(Companion_21).e3m = function (_this__u8e3s4) {
+  protoOf(Companion_21).c3m = function (_this__u8e3s4) {
     switch (_this__u8e3s4) {
       case 'fit':
         return ImageScaleType_FIT_getInstance();
@@ -4026,9 +4026,9 @@
   var Type_HIDDEN_instance;
   function Companion_22() {
     Companion_instance_23 = this;
-    this.f3m_1 = Type_TEXT_getInstance();
+    this.d3m_1 = Type_TEXT_getInstance();
   }
-  protoOf(Companion_22).g3m = function (_this__u8e3s4) {
+  protoOf(Companion_22).e3m = function (_this__u8e3s4) {
     switch (_this__u8e3s4) {
       case 'email':
         return Type_EMAIL_getInstance();
@@ -4080,7 +4080,7 @@
     Companion_getInstance_25();
   }
   function Companion_23() {
-    this.h3m_1 = 'input';
+    this.f3m_1 = 'input';
   }
   var Companion_instance_24;
   function Companion_getInstance_26() {
@@ -4092,8 +4092,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().g3m(tmp0_safe_receiver);
-    tmp.type = tmp1_elvis_lhs == null ? Companion_getInstance_25().f3m_1 : tmp1_elvis_lhs;
+    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;
     $this.name = parser.j3e('name');
     $this.value = parser.j3e('value');
     var tmp_0 = $this;
@@ -4155,13 +4155,13 @@
   protoOf(Input).h2 = function () {
     return this.value;
   };
-  protoOf(Input).q3m = function () {
+  protoOf(Input).o3m = function () {
     return this.isRequired;
   };
-  protoOf(Input).r3m = function () {
+  protoOf(Input).p3m = function () {
     return this.label;
   };
-  protoOf(Input).s3m = function () {
+  protoOf(Input).q3m = function () {
     return this.placeholder;
   };
   protoOf(Input).validateValue = function (raw) {
@@ -4207,14 +4207,14 @@
     }
   }
   function Companion_24() {
-    this.t3m_1 = 'link';
+    this.r3m_1 = 'link';
   }
   var Companion_instance_25;
   function Companion_getInstance_27() {
     return Companion_instance_25;
   }
   function _get_defaultTextStyles__fjozb5_0($this) {
-    var tmp0 = $this.c3n_1;
+    var tmp0 = $this.a3n_1;
     // Inline function 'kotlin.getValue' call
     defaultTextStyles$factory_0();
     return tmp0.h2();
@@ -4252,11 +4252,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.a3n_1 = Companion_getInstance_17().g3f(this_0);
-    $this.b3n_1 = uri;
+    $this.y3m_1 = Companion_getInstance_17().g3f(this_0);
+    $this.z3m_1 = uri;
     var tmp_1 = $this;
     // Inline function 'kotlin.collections.mutableListOf' call
-    tmp_1.d3n_1 = ArrayList_init_$Create$();
+    tmp_1.b3n_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 +4282,7 @@
       if ($parser.w3c() === 'https://mobile-content-api.cru.org/xmlns/analytics') {
         var tmp_0;
         if ($parser.q2() === 'events') {
-          var tmp0 = this$0.d3n_1;
+          var tmp0 = this$0.b3n_1;
           var elements = Companion_instance_4.y3c($parser, this$0);
           addAll(tmp0, elements);
           tmp_0 = Unit_instance;
@@ -4293,10 +4293,10 @@
     };
   }
   protoOf(Link).k3g = function () {
-    return this.a3n_1;
+    return this.y3m_1;
   };
   protoOf(Link).l3g = function () {
-    return this.b3n_1;
+    return this.z3m_1;
   };
   protoOf(Link).c20 = function () {
     return this.text;
@@ -4305,13 +4305,13 @@
     return protoOf(Content).g3d.call(this) || !this.isClickable;
   };
   protoOf(Link).d3i = function () {
-    return this.d3n_1;
+    return this.b3n_1;
   };
   protoOf(Link).r3d = function (type) {
     var tmp;
     if (type.p2_1 === 2) {
       // Inline function 'kotlin.collections.filter' call
-      var tmp0 = this.d3n_1;
+      var tmp0 = this.b3n_1;
       // Inline function 'kotlin.collections.filterTo' call
       var destination = ArrayList_init_$Create$();
       var _iterator__ex2g4s = tmp0.j();
@@ -4334,7 +4334,7 @@
   };
   function Link() {
     var tmp = this;
-    tmp.c3n_1 = lazy(Link$defaultTextStyles$delegate$lambda(this));
+    tmp.a3n_1 = lazy(Link$defaultTextStyles$delegate$lambda(this));
   }
   function defaultTextStyles$factory_0() {
     return getPropertyCallableRef('defaultTextStyles', 1, KProperty1, function (receiver) {
@@ -4342,20 +4342,20 @@
     }, null);
   }
   function Manifest$Companion$parse$slambda$slambda$slambda($manifest, $name, $parseFile, $src, resultContinuation) {
-    this.m3n_1 = $manifest;
-    this.n3n_1 = $name;
-    this.o3n_1 = $parseFile;
-    this.p3n_1 = $src;
+    this.k3n_1 = $manifest;
+    this.l3n_1 = $name;
+    this.m3n_1 = $parseFile;
+    this.n3n_1 = $src;
     CoroutineImpl.call(this, resultContinuation);
   }
-  protoOf(Manifest$Companion$parse$slambda$slambda$slambda).t3n = function ($this$async, $completion) {
+  protoOf(Manifest$Companion$parse$slambda$slambda$slambda).r3n = 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.t3n((!(p1 == null) ? isInterface(p1, CoroutineScope) : false) ? p1 : THROW_CCE(), $completion);
+    return this.r3n((!(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 +4365,18 @@
         switch (tmp) {
           case 0:
             this.d9_1 = 3;
-            this.r3n_1 = Companion_getInstance_48();
+            this.p3n_1 = Companion_getInstance_48();
             this.c9_1 = 1;
-            suspendResult = this.o3n_1(this.p3n_1, this);
+            suspendResult = this.m3n_1(this.n3n_1, this);
             if (suspendResult === get_COROUTINE_SUSPENDED()) {
               return suspendResult;
             }
             continue $sm;
           case 1:
-            this.s3n_1 = suspendResult;
+            this.q3n_1 = suspendResult;
             this.c9_1 = 2;
-            suspendResult = this.r3n_1.z3n(this.m3n_1, this.n3n_1, this.s3n_1, this.o3n_1, this);
+            suspendResult = this.p3n_1.x3n(this.k3n_1, this.l3n_1, this.q3n_1, this.m3n_1, this);
             if (suspendResult === get_COROUTINE_SUSPENDED()) {
               return suspendResult;
             }
@@ -4399,33 +4399,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.m3n_1, this.n3n_1, this.o3n_1, this.p3n_1, completion);
-    i.q3n_1 = $this$async;
+    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;
     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.t3n($this$async, $completion);
+      return i.r3n($this$async, $completion);
     };
     l.$arity = 1;
     return l;
   }
   function Manifest$Companion$parse$slambda$slambda$slambda_1($manifest, $id, $parseFile, $src, resultContinuation) {
-    this.i3o_1 = $manifest;
-    this.j3o_1 = $id;
-    this.k3o_1 = $parseFile;
-    this.l3o_1 = $src;
+    this.g3o_1 = $manifest;
+    this.h3o_1 = $id;
+    this.i3o_1 = $parseFile;
+    this.j3o_1 = $src;
     CoroutineImpl.call(this, resultContinuation);
   }
-  protoOf(Manifest$Companion$parse$slambda$slambda$slambda_1).o3o = function ($this$async, $completion) {
+  protoOf(Manifest$Companion$parse$slambda$slambda$slambda_1).m3o = 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.o3o((!(p1 == null) ? isInterface(p1, CoroutineScope) : false) ? p1 : THROW_CCE(), $completion);
+    return this.m3o((!(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 +4436,10 @@
           case 0:
             this.d9_1 = 2;
             var tmp_0 = this;
-            var tmp0_elvis_lhs = this.j3o_1;
-            tmp_0.n3o_1 = tmp0_elvis_lhs == null ? '' : tmp0_elvis_lhs;
+            var tmp0_elvis_lhs = this.h3o_1;
+            tmp_0.l3o_1 = tmp0_elvis_lhs == null ? '' : tmp0_elvis_lhs;
             this.c9_1 = 1;
-            suspendResult = this.k3o_1(this.l3o_1, this);
+            suspendResult = this.i3o_1(this.j3o_1, this);
             if (suspendResult === get_COROUTINE_SUSPENDED()) {
               return suspendResult;
             }
@@ -4447,7 +4447,7 @@
             continue $sm;
           case 1:
             var ARGUMENT = suspendResult;
-            return Tip_init_$Create$(this.i3o_1, this.n3o_1, ARGUMENT);
+            return Tip_init_$Create$(this.g3o_1, this.l3o_1, ARGUMENT);
           case 2:
             throw this.f9_1;
         }
@@ -4463,21 +4463,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.i3o_1, this.j3o_1, this.k3o_1, this.l3o_1, completion);
-    i.m3o_1 = $this$async;
+    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;
     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.o3o($this$async, $completion);
+      return i.m3o($this$async, $completion);
     };
     l.$arity = 1;
     return l;
   }
   function Manifest$Companion$parse$slambda$slambda($manifest, $parseFile, resultContinuation) {
-    this.x3o_1 = $manifest;
-    this.y3o_1 = $parseFile;
+    this.v3o_1 = $manifest;
+    this.w3o_1 = $parseFile;
     CoroutineImpl.call(this, resultContinuation);
   }
   protoOf(Manifest$Companion$parse$slambda$slambda).u19 = function ($this$launch, $completion) {
@@ -4498,14 +4498,14 @@
           case 0:
             this.d9_1 = 2;
             this.c9_1 = 1;
-            var this_0 = this.x3o_1.c3g_1;
+            var this_0 = this.v3o_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 name = item.j3c();
-              var src = item.c3p();
-              destination.e(async(this.z3o_1, VOID, VOID, Manifest$Companion$parse$slambda$slambda$slambda_0(this.x3o_1, name, this.y3o_1, src, null)));
+              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)));
             }
             suspendResult = awaitAll(destination, this);
@@ -4517,7 +4517,7 @@
           case 1:
             var ARGUMENT = suspendResult;
             var ARGUMENT_0 = filterNotNull(ARGUMENT);
-            _set_pages__j2nojl(this.x3o_1, ARGUMENT_0);
+            _set_pages__j2nojl(this.v3o_1, ARGUMENT_0);
             return Unit_instance;
           case 2:
             throw this.f9_1;
@@ -4534,8 +4534,8 @@
      while (true);
   };
   protoOf(Manifest$Companion$parse$slambda$slambda).v19 = function ($this$launch, completion) {
-    var i = new Manifest$Companion$parse$slambda$slambda(this.x3o_1, this.y3o_1, completion);
-    i.z3o_1 = $this$launch;
+    var i = new Manifest$Companion$parse$slambda$slambda(this.v3o_1, this.w3o_1, completion);
+    i.x3o_1 = $this$launch;
     return i;
   };
   function Manifest$Companion$parse$slambda$slambda_0($manifest, $parseFile, resultContinuation) {
@@ -4547,8 +4547,8 @@
     return l;
   }
   function Manifest$Companion$parse$slambda$slambda_1($manifest, $parseFile, resultContinuation) {
-    this.l3p_1 = $manifest;
-    this.m3p_1 = $parseFile;
+    this.j3p_1 = $manifest;
+    this.k3p_1 = $parseFile;
     CoroutineImpl.call(this, resultContinuation);
   }
   protoOf(Manifest$Companion$parse$slambda$slambda_1).u19 = function ($this$launch, $completion) {
@@ -4569,14 +4569,14 @@
           case 0:
             this.d9_1 = 2;
             this.c9_1 = 1;
-            var this_0 = this.l3p_1.d3g_1;
+            var this_0 = this.j3p_1.d3g_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.c3p();
-              destination.e(async(this.n3p_1, VOID, VOID, Manifest$Companion$parse$slambda$slambda$slambda_2(this.l3p_1, id, this.m3p_1, src, null)));
+              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)));
             }
             suspendResult = awaitAll(destination, this);
@@ -4592,11 +4592,11 @@
             var _iterator__ex2g4s_0 = this_1.j();
             while (_iterator__ex2g4s_0.k()) {
               var element = _iterator__ex2g4s_0.l();
-              destination_0.y3(element.p3p_1, element);
+              destination_0.y3(element.n3p_1, element);
             }
             var ARGUMENT = destination_0;
-            _set_tips__9ug36n(this.l3p_1, ARGUMENT);
+            _set_tips__9ug36n(this.j3p_1, ARGUMENT);
             return Unit_instance;
           case 2:
             throw this.f9_1;
@@ -4613,8 +4613,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.l3p_1, this.m3p_1, completion);
-    i.n3p_1 = $this$launch;
+    var i = new Manifest$Companion$parse$slambda$slambda_1(this.j3p_1, this.k3p_1, completion);
+    i.l3p_1 = $this$launch;
     return i;
   };
   function Manifest$Companion$parse$slambda$slambda_2($manifest, $parseFile, resultContinuation) {
@@ -4626,19 +4626,19 @@
     return l;
   }
   function Manifest$Companion$parse$slambda($config, $manifest, $parseFile, resultContinuation) {
-    this.a3q_1 = $config;
-    this.b3q_1 = $manifest;
-    this.c3q_1 = $parseFile;
+    this.y3p_1 = $config;
+    this.z3p_1 = $manifest;
+    this.a3q_1 = $parseFile;
     CoroutineImpl.call(this, resultContinuation);
   }
-  protoOf(Manifest$Companion$parse$slambda).e3q = function ($this$coroutineScope, $completion) {
+  protoOf(Manifest$Companion$parse$slambda).c3q = 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.e3q((!(p1 == null) ? isInterface(p1, CoroutineScope) : false) ? p1 : THROW_CCE(), $completion);
+    return this.c3q((!(p1 == null) ? isInterface(p1, CoroutineScope) : false) ? p1 : THROW_CCE(), $completion);
   };
   protoOf(Manifest$Companion$parse$slambda).u9 = function () {
     var suspendResult = this.e9_1;
@@ -4647,16 +4647,16 @@
         var tmp = this.c9_1;
         if (tmp === 0) {
           this.d9_1 = 1;
-          if (this.a3q_1.l3b_1) {
-            launch(this.d3q_1, VOID, VOID, Manifest$Companion$parse$slambda$slambda_0(this.b3q_1, this.c3q_1, null));
+          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));
           } else {
-            _set_pages__j2nojl(this.b3q_1, emptyList());
+            _set_pages__j2nojl(this.z3p_1, emptyList());
           }
           var tmp_0;
-          if (this.a3q_1.m3b_1) {
-            tmp_0 = launch(this.d3q_1, VOID, VOID, Manifest$Companion$parse$slambda$slambda_2(this.b3q_1, this.c3q_1, null));
+          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));
           } else {
-            _set_tips__9ug36n(this.b3q_1, emptyMap());
+            _set_tips__9ug36n(this.z3p_1, emptyMap());
             tmp_0 = Unit_instance;
           }
           return tmp_0;
@@ -4670,24 +4670,24 @@
      while (true);
   };
   protoOf(Manifest$Companion$parse$slambda).v19 = function ($this$coroutineScope, completion) {
-    var i = new Manifest$Companion$parse$slambda(this.a3q_1, this.b3q_1, this.c3q_1, completion);
-    i.d3q_1 = $this$coroutineScope;
+    var i = new Manifest$Companion$parse$slambda(this.y3p_1, this.z3p_1, this.a3q_1, completion);
+    i.b3q_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.e3q($this$coroutineScope, $completion);
+      return i.c3q($this$coroutineScope, $completion);
     };
     l.$arity = 1;
     return l;
   }
   function $parseCOROUTINE$0(_this__u8e3s4, fileName, config, parseFile, resultContinuation) {
     CoroutineImpl.call(this, resultContinuation);
-    this.n3q_1 = _this__u8e3s4;
-    this.o3q_1 = fileName;
-    this.p3q_1 = config;
-    this.q3q_1 = parseFile;
+    this.l3q_1 = _this__u8e3s4;
+    this.m3q_1 = fileName;
+    this.n3q_1 = config;
+    this.o3q_1 = parseFile;
   }
   protoOf($parseCOROUTINE$0).u9 = function () {
     var suspendResult = this.e9_1;
@@ -4698,24 +4698,24 @@
           case 0:
             this.d9_1 = 3;
             this.c9_1 = 1;
-            suspendResult = this.q3q_1(this.o3q_1, this);
+            suspendResult = this.o3q_1(this.m3q_1, this);
             if (suspendResult === get_COROUTINE_SUSPENDED()) {
               return suspendResult;
             }
             continue $sm;
           case 1:
-            this.r3q_1 = suspendResult;
-            this.s3q_1 = Manifest_init_$Create$(this.r3q_1, this.p3q_1);
+            this.p3q_1 = suspendResult;
+            this.q3q_1 = Manifest_init_$Create$(this.p3q_1, this.n3q_1);
             this.c9_1 = 2;
-            suspendResult = coroutineScope(Manifest$Companion$parse$slambda_0(this.p3q_1, this.s3q_1, this.q3q_1, null), this);
+            suspendResult = coroutineScope(Manifest$Companion$parse$slambda_0(this.n3q_1, this.q3q_1, this.o3q_1, null), this);
             if (suspendResult === get_COROUTINE_SUSPENDED()) {
               return suspendResult;
             }
             continue $sm;
           case 2:
-            return this.s3q_1;
+            return this.q3q_1;
           case 3:
             throw this.f9_1;
         }
@@ -4737,9 +4737,9 @@
   var Type_UNKNOWN_instance_0;
   function Companion_25() {
     Companion_instance_26 = this;
-    this.t3q_1 = Type_TRACT_getInstance();
+    this.r3q_1 = Type_TRACT_getInstance();
   }
-  protoOf(Companion_25).u3q = function (value) {
+  protoOf(Companion_25).s3q = function (value) {
     switch (value) {
       case 'article':
         return Type_ARTICLE_getInstance();
@@ -4826,10 +4826,10 @@
     return Companion_instance_27;
   }
   function _set_pages__j2nojl($this, _set____db54di) {
-    return $this.z3f_1.v3q($this, pages$factory(), _set____db54di);
+    return $this.z3f_1.t3q($this, pages$factory(), _set____db54di);
   }
   function _set_tips__9ug36n($this, _set____db54di) {
-    return $this.b3g_1.v3q($this, tips$factory(), _set____db54di);
+    return $this.b3g_1.t3q($this, tips$factory(), _set____db54di);
   }
   function Manifest_init_$Init$(parser, config, $this) {
     BaseModel.call($this);
@@ -4841,8 +4841,8 @@
     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().u3q(parser.j3e('type'));
-    tmp_0.type = tmp1_elvis_lhs == null ? Companion_getInstance_28().t3q_1 : tmp1_elvis_lhs;
+    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 tmp_1 = $this;
     // Inline function 'org.cru.godtools.shared.tool.parser.model.toEventIds' call
     var this_0 = parser.j3e('dismiss-listeners');
@@ -4873,7 +4873,7 @@
     tmp_7.p3f_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.e3m(tmp12_safe_receiver);
+    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 tmp_9 = $this;
     var tmp14_safe_receiver = parser.f3f('https://mobile-content-api.cru.org/xmlns/content', 'card-background-color');
@@ -4967,12 +4967,12 @@
             var tmp2_0 = $this.aemImports;
             // Inline function 'kotlin.collections.plusAssign' call
-            var elements_0 = result.y3q_1;
+            var elements_0 = result.w3q_1;
             addAll(tmp2_0, elements_0);
             var tmp4 = $this.c3g_1;
             // Inline function 'kotlin.collections.plusAssign' call
-            var elements_1 = result.z3q_1;
+            var elements_1 = result.x3q_1;
             addAll(tmp4, elements_1);
             break;
           case 'resources':
@@ -5007,7 +5007,7 @@
       } else if (tmp0_subject === 'https://mobile-content-api.cru.org/xmlns/shareable') {
         if (parser.q2() === 'items') {
           // Inline function 'kotlin.collections.plusAssign' call
-          var elements_3 = Companion_instance_48.x3q(parser, $this);
+          var elements_3 = Companion_instance_48.v3q(parser, $this);
           addAll(shareables, elements_3);
         }
       }
@@ -5041,7 +5041,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().t3q_1 : type;
+    type = type === VOID ? Companion_getInstance_28().r3q_1 : type;
     code = code === VOID ? null : code;
     locale = locale === VOID ? null : locale;
     primaryColor = primaryColor === VOID ? Companion_getInstance_29().a3b_1 : primaryColor;
@@ -5129,7 +5129,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.p3p_1;
+        var tmp$ret$6 = element_0.n3p_1;
         destination_0.y3(tmp$ret$6, element_0);
       }
       tmp_2 = destination_0;
@@ -5171,10 +5171,10 @@
   function PagesData() {
     var tmp = this;
     // Inline function 'kotlin.collections.mutableListOf' call
-    tmp.y3q_1 = ArrayList_init_$Create$();
+    tmp.w3q_1 = ArrayList_init_$Create$();
     var tmp_0 = this;
     // Inline function 'kotlin.collections.mutableListOf' call
-    tmp_0.z3q_1 = ArrayList_init_$Create$();
+    tmp_0.x3q_1 = ArrayList_init_$Create$();
   }
   function parsePages(_this__u8e3s4, $this) {
     // Inline function 'kotlin.also' call
@@ -5199,7 +5199,7 @@
             }
             var src = tmp;
             var fileName = _this__u8e3s4.j3e('filename');
-            var tmp0 = this_0.z3q_1;
+            var tmp0 = this_0.x3q_1;
             // Inline function 'kotlin.collections.plusAssign' call
             var element = new XmlFile(fileName, src);
             tmp0.e(element);
@@ -5229,7 +5229,7 @@
               // Inline function 'kotlin.let' call
               // Inline function 'org.cru.godtools.shared.tool.parser.model.Manifest.parsePages.<anonymous>.<anonymous>.<anonymous>' call
               // Inline function 'kotlin.collections.plusAssign' call
-              this_0.y3q_1.e(tmp6_safe_receiver);
+              this_0.w3q_1.e(tmp6_safe_receiver);
             }
           }
         }
@@ -5307,35 +5307,35 @@
     Enum.call(this, name, ordinal);
   }
   function XmlFile(name, src) {
-    this.a3p_1 = name;
-    this.b3p_1 = src;
+    this.y3o_1 = name;
+    this.z3o_1 = src;
   }
-  protoOf(XmlFile).g3r = function () {
-    return this.a3p_1;
+  protoOf(XmlFile).e3r = function () {
+    return this.y3o_1;
   };
-  protoOf(XmlFile).h3r = function () {
-    return this.b3p_1;
+  protoOf(XmlFile).f3r = function () {
+    return this.z3o_1;
   };
   protoOf(XmlFile).j3c = function () {
-    return this.a3p_1;
+    return this.y3o_1;
   };
-  protoOf(XmlFile).c3p = function () {
-    return this.b3p_1;
+  protoOf(XmlFile).a3p = function () {
+    return this.z3o_1;
   };
-  protoOf(XmlFile).i3r = function (name, src) {
+  protoOf(XmlFile).g3r = function (name, src) {
     return new XmlFile(name, src);
   };
   protoOf(XmlFile).copy = function (name, src, $super) {
-    name = name === VOID ? this.a3p_1 : name;
-    src = src === VOID ? this.b3p_1 : src;
-    return this.i3r(name, src);
+    name = name === VOID ? this.y3o_1 : name;
+    src = src === VOID ? this.z3o_1 : src;
+    return this.g3r(name, src);
   };
   protoOf(XmlFile).toString = function () {
-    return 'XmlFile(name=' + this.a3p_1 + ', src=' + this.b3p_1 + ')';
+    return 'XmlFile(name=' + this.y3o_1 + ', src=' + this.z3o_1 + ')';
   };
   protoOf(XmlFile).hashCode = function () {
-    var result = this.a3p_1 == null ? 0 : getStringHashCode(this.a3p_1);
-    result = imul(result, 31) + getStringHashCode(this.b3p_1) | 0;
+    var result = this.y3o_1 == null ? 0 : getStringHashCode(this.y3o_1);
+    result = imul(result, 31) + getStringHashCode(this.z3o_1) | 0;
     return result;
   };
   protoOf(XmlFile).equals = function (other) {
@@ -5344,23 +5344,23 @@
     if (!(other instanceof XmlFile))
       return false;
     var tmp0_other_with_cast = other instanceof XmlFile ? other : THROW_CCE();
-    if (!(this.a3p_1 == tmp0_other_with_cast.a3p_1))
+    if (!(this.y3o_1 == tmp0_other_with_cast.y3o_1))
       return false;
-    if (!(this.b3p_1 === tmp0_other_with_cast.b3p_1))
+    if (!(this.z3o_1 === tmp0_other_with_cast.z3o_1))
       return false;
     return true;
   };
   function sam$kotlin_Comparator$0(function_0) {
-    this.j3r_1 = function_0;
+    this.h3r_1 = function_0;
   }
   protoOf(sam$kotlin_Comparator$0).yd = function (a, b) {
-    return this.j3r_1(a, b);
+    return this.h3r_1(a, b);
   };
   protoOf(sam$kotlin_Comparator$0).compare = function (a, b) {
     return this.yd(a, b);
   };
   protoOf(sam$kotlin_Comparator$0).m3 = function () {
-    return this.j3r_1;
+    return this.h3r_1;
   };
   protoOf(sam$kotlin_Comparator$0).equals = function (other) {
     var tmp;
@@ -5383,9 +5383,9 @@
   function Manifest$_init_$lambda_cbhz6k(a, b) {
     // Inline function 'kotlin.comparisons.compareValuesBy' call
     // Inline function 'org.cru.godtools.shared.tool.parser.model.Manifest.<init>.<anonymous>' call
-    var tmp = a.d3r_1;
+    var tmp = a.b3r_1;
     // Inline function 'org.cru.godtools.shared.tool.parser.model.Manifest.<init>.<anonymous>' call
-    var tmp$ret$1 = b.d3r_1;
+    var tmp$ret$1 = b.b3r_1;
     return compareValues(tmp, tmp$ret$1);
   }
   function Type_ARTICLE_getInstance() {
@@ -5408,19 +5408,19 @@
     Type_initEntries_1();
     return Type_UNKNOWN_instance_0;
   }
-  protoOf(Manifest).k3r = function () {
+  protoOf(Manifest).i3r = function () {
     return this.i3f_1;
   };
-  protoOf(Manifest).l3r = function () {
+  protoOf(Manifest).j3r = function () {
     return this.code;
   };
-  protoOf(Manifest).m3r = function () {
+  protoOf(Manifest).k3r = function () {
     return this.locale;
   };
   protoOf(Manifest).t1z = function () {
     return this.type;
   };
-  protoOf(Manifest).n3r = function () {
+  protoOf(Manifest).l3r = function () {
     return this._dismissListeners;
   };
   protoOf(Manifest).y3i = function () {
@@ -5429,24 +5429,24 @@
   protoOf(Manifest).z3i = function () {
     return this.k3f_1;
   };
-  protoOf(Manifest).o3r = function () {
+  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;
   };
-  protoOf(Manifest).p3r = function () {
+  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;
   };
-  protoOf(Manifest).q3r = function () {
+  protoOf(Manifest).o3r = function () {
     return this.n3f_1;
   };
-  protoOf(Manifest).r3r = function () {
+  protoOf(Manifest).p3r = function () {
     return this.v3g(this.o3f_1);
   };
-  protoOf(Manifest).s3r = function () {
+  protoOf(Manifest).q3r = function () {
     return this.p3f_1;
   };
-  protoOf(Manifest).t3r = function () {
+  protoOf(Manifest).r3r = function () {
     return this.q3f_1;
   };
   protoOf(Manifest).b3j = function () {
@@ -5457,7 +5457,7 @@
     var tmp0_elvis_lhs = this.s3f_1;
     return tmp0_elvis_lhs == null ? this.w3f_1 : tmp0_elvis_lhs;
   };
-  protoOf(Manifest).u3r = function () {
+  protoOf(Manifest).s3r = function () {
     return this.t3f_1;
   };
   protoOf(Manifest).a3j = function () {
@@ -5476,32 +5476,32 @@
   protoOf(Manifest).e3j = function () {
     return this.x3f_1;
   };
-  protoOf(Manifest).v3r = function () {
+  protoOf(Manifest).t3r = function () {
     var tmp0_safe_receiver = this.y3f_1;
     return tmp0_safe_receiver == null ? null : tmp0_safe_receiver.text;
   };
-  protoOf(Manifest).h3s = function () {
+  protoOf(Manifest).f3s = function () {
     return this.aemImports;
   };
-  protoOf(Manifest).i3s = function () {
+  protoOf(Manifest).g3s = function () {
     return this.categories;
   };
-  protoOf(Manifest).p3l = function () {
-    return this.z3f_1.j3s(this, pages$factory_0());
+  protoOf(Manifest).n3l = function () {
+    return this.z3f_1.h3s(this, pages$factory_0());
   };
-  protoOf(Manifest).k3s = function () {
+  protoOf(Manifest).i3s = function () {
     return this.a3g_1;
   };
-  protoOf(Manifest).l3s = function () {
+  protoOf(Manifest).j3s = function () {
     return this.shareables;
   };
-  protoOf(Manifest).m3s = function () {
-    return this.b3g_1.j3s(this, tips$factory_0());
+  protoOf(Manifest).k3s = function () {
+    return this.b3g_1.h3s(this, tips$factory_0());
   };
-  protoOf(Manifest).n3s = function () {
+  protoOf(Manifest).l3s = function () {
     return this.c3g_1;
   };
-  protoOf(Manifest).o3s = function () {
+  protoOf(Manifest).m3s = function () {
     // Inline function 'kotlin.collections.buildSet' call
     // Inline function 'kotlin.collections.buildSetInternal' call
     // Inline function 'kotlin.apply' call
@@ -5515,7 +5515,7 @@
     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.b3p_1;
+      var tmp$ret$0 = item.z3o_1;
       destination.e(tmp$ret$0);
     }
     this_0.n(destination);
@@ -5527,7 +5527,7 @@
     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.b3p_1;
+      var tmp$ret$3 = item_0.z3o_1;
       destination_0.e(tmp$ret$3);
     }
     this_0.n(destination_0);
@@ -5556,10 +5556,10 @@
   protoOf(Manifest).x39 = function () {
     return this;
   };
-  protoOf(Manifest).p3s = function () {
+  protoOf(Manifest).n3s = function () {
     var tmp;
     // Inline function 'kotlin.collections.isNotEmpty' call
-    if (!this.m3s().p()) {
+    if (!this.k3s().p()) {
       tmp = true;
     } else {
       var tmp_0;
@@ -5584,7 +5584,7 @@
     }
     return tmp;
   };
-  protoOf(Manifest).q3s = function (category) {
+  protoOf(Manifest).o3s = function (category) {
     var tmp0 = this.categories;
     var tmp$ret$1;
     $l$block: {
@@ -5602,7 +5602,7 @@
     }
     return tmp$ret$1;
   };
-  protoOf(Manifest).r3s = function (id) {
+  protoOf(Manifest).p3s = function (id) {
     var tmp;
     if (id == null) {
       tmp = null;
@@ -5628,12 +5628,12 @@
     }
     return tmp;
   };
-  protoOf(Manifest).s3s = function (id) {
+  protoOf(Manifest).q3s = function (id) {
     // Inline function 'kotlin.collections.get' call
-    var this_0 = this.m3s();
+    var this_0 = this.k3s();
     return (isInterface(this_0, KtMap) ? this_0 : THROW_CCE()).k2(id);
   };
-  protoOf(Manifest).q3l = function (type) {
+  protoOf(Manifest).o3l = function (type) {
     var tmp;
     switch (this.type.p2_1) {
       case 0:
@@ -5657,7 +5657,7 @@
     }
     return tmp;
   };
-  protoOf(Manifest).t3s = function () {
+  protoOf(Manifest).r3s = function () {
     // Inline function 'kotlin.collections.toTypedArray' call
     var this_0 = this._dismissListeners;
     return copyToArray(this_0);
@@ -5673,28 +5673,28 @@
   }
   function pages$factory() {
     return getPropertyCallableRef('pages', 1, KMutableProperty1, function (receiver) {
-      return receiver.p3l();
+      return receiver.n3l();
     }, function (receiver, value) {
       return _set_pages__j2nojl(receiver, value);
     });
   }
   function pages$factory_0() {
     return getPropertyCallableRef('pages', 1, KMutableProperty1, function (receiver) {
-      return receiver.p3l();
+      return receiver.n3l();
     }, function (receiver, value) {
       return _set_pages__j2nojl(receiver, value);
     });
   }
   function tips$factory() {
     return getPropertyCallableRef('tips', 1, KMutableProperty1, function (receiver) {
-      return receiver.m3s();
+      return receiver.k3s();
     }, function (receiver, value) {
       return _set_tips__9ug36n(receiver, value);
     });
   }
   function tips$factory_0() {
     return getPropertyCallableRef('tips', 1, KMutableProperty1, function (receiver) {
-      return receiver.m3s();
+      return receiver.k3s();
     }, function (receiver, value) {
       return _set_tips__9ug36n(receiver, value);
     });
@@ -5703,7 +5703,7 @@
   var Style_FLAT_instance;
   function Companion_27() {
   }
-  protoOf(Companion_27).u3s = function (_this__u8e3s4) {
+  protoOf(Companion_27).s3s = function (_this__u8e3s4) {
     switch (_this__u8e3s4) {
       case 'card':
         return Style_CARD_getInstance();
@@ -5742,12 +5742,12 @@
   }
   function Companion_28() {
     Companion_instance_29 = this;
-    this.v3s_1 = 'selected-color';
-    this.w3s_1 = 'value';
-    this.x3s_1 = 'style';
-    this.y3s_1 = 'card';
-    this.z3s_1 = 'flat';
-    this.a3t_1 = Style_CARD_getInstance();
+    this.t3s_1 = 'selected-color';
+    this.u3s_1 = 'value';
+    this.v3s_1 = 'style';
+    this.w3s_1 = 'card';
+    this.x3s_1 = 'flat';
+    this.y3s_1 = Style_CARD_getInstance();
   }
   var Companion_instance_29;
   function Companion_getInstance_31() {
@@ -5760,20 +5760,20 @@
     Option.call($this);
     $this.multiselect = multiselect;
     parser.u3c(2, 'https://mobile-content-api.cru.org/xmlns/content', 'option');
-    $this.c3t_1 = Companion_instance_28.u3s(parser.j3e('style'));
+    $this.a3t_1 = Companion_instance_28.s3s(parser.j3e('style'));
     var tmp = $this;
     var tmp0_safe_receiver = parser.j3e('background-color');
-    tmp.d3t_1 = tmp0_safe_receiver == null ? null : toColorOrNull(tmp0_safe_receiver);
+    tmp.b3t_1 = tmp0_safe_receiver == null ? null : toColorOrNull(tmp0_safe_receiver);
     var tmp_0 = $this;
     var tmp1_safe_receiver = parser.j3e('selected-color');
-    tmp_0.e3t_1 = tmp1_safe_receiver == null ? null : toColorOrNull(tmp1_safe_receiver);
+    tmp_0.c3t_1 = tmp1_safe_receiver == null ? null : toColorOrNull(tmp1_safe_receiver);
     var tmp_1 = $this;
     // Inline function 'kotlin.text.orEmpty' call
     var tmp0_elvis_lhs = parser.j3e('value');
-    tmp_1.f3t_1 = tmp0_elvis_lhs == null ? '' : tmp0_elvis_lhs;
+    tmp_1.d3t_1 = tmp0_elvis_lhs == null ? '' : tmp0_elvis_lhs;
     var tmp_2 = $this;
     // Inline function 'kotlin.collections.mutableListOf' call
-    tmp_2.g3t_1 = ArrayList_init_$Create$();
+    tmp_2.e3t_1 = ArrayList_init_$Create$();
     var tmp_3 = $this;
     // Inline function 'org.cru.godtools.shared.tool.parser.model.parseContent' call
     // Inline function 'kotlin.collections.buildList' call
@@ -5791,7 +5791,7 @@
         // Inline function 'org.cru.godtools.shared.tool.parser.model.Option.<init>.<anonymous>' call
         if (parser.w3c() === 'https://mobile-content-api.cru.org/xmlns/analytics') {
           if (parser.q2() === 'events') {
-            var tmp0 = $this.g3t_1;
+            var tmp0 = $this.e3t_1;
             // Inline function 'kotlin.collections.plusAssign' call
             var elements = Companion_instance_4.y3c(parser, $this);
             addAll(tmp0, elements);
@@ -5828,7 +5828,7 @@
         continue $l$loop_0;
       skipTag(parser);
     }
-    tmp_3.h3t_1 = this_0.p3();
+    tmp_3.f3t_1 = this_0.p3();
     return $this;
   }
   function Option_init_$Create$(multiselect, parser) {
@@ -5851,22 +5851,22 @@
     return Style_FLAT_instance;
   }
   function Companion_29() {
-    this.k3t_1 = 'multiselect';
-    this.l3t_1 = 'multiselect-option-background-color';
-    this.m3t_1 = 'multiselect-option-selected-color';
-    this.n3t_1 = 'option-background-color';
-    this.o3t_1 = 'option-selected-color';
+    this.i3t_1 = 'multiselect';
+    this.j3t_1 = 'multiselect-option-background-color';
+    this.k3t_1 = 'multiselect-option-selected-color';
+    this.l3t_1 = 'option-background-color';
+    this.m3t_1 = 'option-selected-color';
   }
   var Companion_instance_30;
   function Companion_getInstance_32() {
     return Companion_instance_30;
   }
   function _get_optionBackgroundColor__l9vc27($this) {
-    var tmp0_elvis_lhs = $this.y3t_1;
+    var tmp0_elvis_lhs = $this.w3t_1;
     return tmp0_elvis_lhs == null ? get_multiselectOptionBackgroundColor_0(get_stylesParent($this)) : tmp0_elvis_lhs;
   }
   function _get_optionSelectedColor__7lkoiq($this) {
-    var tmp0_elvis_lhs = $this.z3t_1;
+    var tmp0_elvis_lhs = $this.x3t_1;
     var tmp;
     if (tmp0_elvis_lhs == null) {
       var tmp1_safe_receiver = get_stylesParent($this);
@@ -5883,7 +5883,7 @@
     var tmp = $this;
     // Inline function 'kotlin.text.orEmpty' call
     var tmp0_elvis_lhs = parser.j3e('state');
-    tmp.v3t_1 = tmp0_elvis_lhs == null ? '' : tmp0_elvis_lhs;
+    tmp.t3t_1 = tmp0_elvis_lhs == null ? '' : tmp0_elvis_lhs;
     var tmp_0 = $this;
     var tmp0_safe_receiver = parser.j3e('columns');
     var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : toIntOrNull(tmp0_safe_receiver);
@@ -5891,16 +5891,16 @@
     var tmp_1 = $this;
     var tmp2_safe_receiver = parser.j3e('selection-limit');
     var tmp3_elvis_lhs = tmp2_safe_receiver == null ? null : toIntOrNull(tmp2_safe_receiver);
-    tmp_1.w3t_1 = coerceAtLeast(tmp3_elvis_lhs == null ? 1 : tmp3_elvis_lhs, 1);
+    tmp_1.u3t_1 = coerceAtLeast(tmp3_elvis_lhs == null ? 1 : tmp3_elvis_lhs, 1);
     var tmp_2 = $this;
-    var tmp4_elvis_lhs = Companion_instance_28.u3s(parser.j3e('option-style'));
-    tmp_2.x3t_1 = tmp4_elvis_lhs == null ? Companion_getInstance_31().a3t_1 : tmp4_elvis_lhs;
+    var tmp4_elvis_lhs = Companion_instance_28.s3s(parser.j3e('option-style'));
+    tmp_2.v3t_1 = tmp4_elvis_lhs == null ? Companion_getInstance_31().y3s_1 : tmp4_elvis_lhs;
     var tmp_3 = $this;
     var tmp5_safe_receiver = parser.j3e('option-background-color');
-    tmp_3.y3t_1 = tmp5_safe_receiver == null ? null : toColorOrNull(tmp5_safe_receiver);
+    tmp_3.w3t_1 = tmp5_safe_receiver == null ? null : toColorOrNull(tmp5_safe_receiver);
     var tmp_4 = $this;
     var tmp6_safe_receiver = parser.j3e('option-selected-color');
-    tmp_4.z3t_1 = tmp6_safe_receiver == null ? null : toColorOrNull(tmp6_safe_receiver);
+    tmp_4.x3t_1 = tmp6_safe_receiver == null ? null : toColorOrNull(tmp6_safe_receiver);
     var tmp_5 = $this;
     // Inline function 'kotlin.collections.mutableListOf' call
     tmp_5._options = ArrayList_init_$Create$();
@@ -5926,36 +5926,36 @@
   function Multiselect_init_$Create$(parent, parser) {
     return Multiselect_init_$Init$(parent, parser, objectCreate(protoOf(Multiselect)));
   }
-  protoOf(Option).a3u = function () {
+  protoOf(Option).y3t = function () {
     return this.multiselect;
   };
   protoOf(Option).w3h = function () {
-    var tmp0_elvis_lhs = this.c3t_1;
-    return tmp0_elvis_lhs == null ? this.multiselect.x3t_1 : tmp0_elvis_lhs;
+    var tmp0_elvis_lhs = this.a3t_1;
+    return tmp0_elvis_lhs == null ? this.multiselect.v3t_1 : tmp0_elvis_lhs;
   };
   protoOf(Option).z3h = function () {
-    var tmp0_elvis_lhs = this.d3t_1;
+    var tmp0_elvis_lhs = this.b3t_1;
     return tmp0_elvis_lhs == null ? _get_optionBackgroundColor__l9vc27(this.multiselect) : tmp0_elvis_lhs;
   };
-  protoOf(Option).b3u = function () {
-    var tmp0_elvis_lhs = this.e3t_1;
+  protoOf(Option).z3t = function () {
+    var tmp0_elvis_lhs = this.c3t_1;
     var tmp1_elvis_lhs = tmp0_elvis_lhs == null ? _get_optionSelectedColor__7lkoiq(this.multiselect) : tmp0_elvis_lhs;
     return tmp1_elvis_lhs == null ? get_defaultSelectedColor(get_stylesParent(this)) : tmp1_elvis_lhs;
   };
-  protoOf(Option).c3u = function () {
-    return this.f3t_1;
+  protoOf(Option).a3u = function () {
+    return this.d3t_1;
   };
   protoOf(Option).d3i = function () {
-    return this.g3t_1;
+    return this.e3t_1;
   };
   protoOf(Option).q3d = function () {
-    return this.h3t_1;
+    return this.f3t_1;
   };
   protoOf(Option).r3d = function (type) {
     var tmp;
     if (type.p2_1 === 2) {
       // Inline function 'kotlin.collections.filter' call
-      var tmp0 = this.g3t_1;
+      var tmp0 = this.e3t_1;
       // Inline function 'kotlin.collections.filterTo' call
       var destination = ArrayList_init_$Create$();
       var _iterator__ex2g4s = tmp0.j();
@@ -5977,23 +5977,23 @@
     return this.r3d(type);
   };
   protoOf(Option).isSelected = function (state) {
-    return state.w1n(this.multiselect.v3t_1).q(this.f3t_1);
+    return state.w1n(this.multiselect.t3t_1).q(this.d3t_1);
   };
   protoOf(Option).isSelectedFlow = function (state) {
-    var tmp = setOf(this.multiselect.v3t_1);
+    var tmp = setOf(this.multiselect.t3t_1);
     return distinctUntilChanged(state.v1n(tmp, Multiselect$Option$isSelectedFlow$lambda(this)));
   };
   protoOf(Option).watchIsSelected = function (state, block) {
-    return Companion_instance_58.d3u(this.isSelectedFlow(state), block);
+    return Companion_instance_58.b3u(this.isSelectedFlow(state), block);
   };
   protoOf(Option).toggleSelected = function (state) {
-    var current = state.w1n(this.multiselect.v3t_1);
-    if (current.q(this.f3t_1)) {
-      state.z1n(this.multiselect.v3t_1, this.f3t_1);
-    } else if (current.m() < this.multiselect.w3t_1) {
-      state.y1n(this.multiselect.v3t_1, this.f3t_1);
-    } else if (this.multiselect.w3t_1 === 1) {
-      state.x1n(this.multiselect.v3t_1, listOf(this.f3t_1));
+    var current = state.w1n(this.multiselect.t3t_1);
+    if (current.q(this.d3t_1)) {
+      state.z1n(this.multiselect.t3t_1, this.d3t_1);
+    } else if (current.m() < this.multiselect.u3t_1) {
+      state.y1n(this.multiselect.t3t_1, this.d3t_1);
+    } else if (this.multiselect.u3t_1 === 1) {
+      state.x1n(this.multiselect.t3t_1, listOf(this.d3t_1));
     } else
       return false;
     return true;
@@ -6001,16 +6001,16 @@
   function Option() {
     Companion_getInstance_31();
   }
-  protoOf(Multiselect).e3u = function () {
-    return this.v3t_1;
+  protoOf(Multiselect).c3u = function () {
+    return this.t3t_1;
   };
-  protoOf(Multiselect).f3u = function () {
+  protoOf(Multiselect).d3u = function () {
     return this.columns;
   };
-  protoOf(Multiselect).g3u = function () {
-    return this.w3t_1;
+  protoOf(Multiselect).e3u = function () {
+    return this.u3t_1;
   };
-  protoOf(Multiselect).h3u = function () {
+  protoOf(Multiselect).f3u = function () {
     return this._options;
   };
   protoOf(Multiselect).a3e = function () {
@@ -6042,7 +6042,7 @@
   protoOf(Multiselect).g3d = function () {
     return !this.x39().i3f_1.i3c('multiselect') || protoOf(Content).g3d.call(this);
   };
-  protoOf(Multiselect).i3u = function () {
+  protoOf(Multiselect).g3u = function () {
     // Inline function 'kotlin.collections.toTypedArray' call
     var this_0 = this._options;
     return copyToArray(this_0);
@@ -6058,8 +6058,8 @@
     return toPlatformColor(tmp$ret$1);
   }
   function Companion_30() {
-    this.j3u_1 = 'paragraph';
-    this.k3u_1 = 'fallback';
+    this.h3u_1 = 'paragraph';
+    this.i3u_1 = 'fallback';
   }
   var Companion_instance_31;
   function Companion_getInstance_33() {
@@ -6115,7 +6115,7 @@
         continue $l$loop_0;
       skipTag(parser);
     }
-    tmp.r3u_1 = this_0.p3();
+    tmp.p3u_1 = this_0.p3();
     return $this;
   }
   function Paragraph_init_$Create$(parent, parser) {
@@ -6132,7 +6132,7 @@
     content = tmp;
     Content_init_$Init$_0(parent, VOID, VOID, VOID, VOID, VOID, VOID, VOID, $this);
     Paragraph.call($this);
-    $this.r3u_1 = content($this);
+    $this.p3u_1 = content($this);
     return $this;
   }
   function createTestParagraph(parent, content) {
@@ -6142,7 +6142,7 @@
     return emptyList();
   }
   protoOf(Paragraph).q3d = function () {
-    return this.r3u_1;
+    return this.p3u_1;
   };
   protoOf(Paragraph).a3e = function () {
     // Inline function 'org.cru.godtools.shared.tool.parser.model.contentTips' call
@@ -6281,7 +6281,7 @@
     }
   }
   function Companion_31() {
-    this.s3u_1 = 'resource';
+    this.q3u_1 = 'resource';
   }
   var Companion_instance_32;
   function Companion_getInstance_34() {
@@ -6315,7 +6315,7 @@
   protoOf(Resource).q2 = function () {
     return this.name;
   };
-  protoOf(Resource).t3u = function () {
+  protoOf(Resource).r3u = function () {
     return this.localName;
   };
   protoOf(Resource).equals = function (other) {
@@ -6359,9 +6359,9 @@
   var Mode_FIXED_instance;
   function Companion_32() {
     Companion_instance_33 = this;
-    this.u3u_1 = Mode_AUTO_getInstance();
+    this.s3u_1 = Mode_AUTO_getInstance();
   }
-  protoOf(Companion_32).v3u = function (_this__u8e3s4) {
+  protoOf(Companion_32).t3u = function (_this__u8e3s4) {
     switch (_this__u8e3s4) {
       case 'auto':
         return Mode_AUTO_getInstance();
@@ -6403,7 +6403,7 @@
     Companion_getInstance_35();
   }
   function Companion_33() {
-    this.w3u_1 = 'spacer';
+    this.u3u_1 = 'spacer';
   }
   var Companion_instance_34;
   function Companion_getInstance_36() {
@@ -6415,8 +6415,8 @@
     parser.u3c(2, 'https://mobile-content-api.cru.org/xmlns/content', 'spacer');
     var tmp = $this;
     var tmp0_safe_receiver = parser.j3e('mode');
-    var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : Companion_getInstance_35().v3u(tmp0_safe_receiver);
-    tmp.mode = tmp1_elvis_lhs == null ? Companion_getInstance_35().u3u_1 : tmp1_elvis_lhs;
+    var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : Companion_getInstance_35().t3u(tmp0_safe_receiver);
+    tmp.mode = tmp1_elvis_lhs == null ? Companion_getInstance_35().s3u_1 : tmp1_elvis_lhs;
     var tmp_0 = $this;
     var tmp2_safe_receiver = parser.j3e('height');
     var tmp3_safe_receiver = tmp2_safe_receiver == null ? null : toIntOrNull(tmp2_safe_receiver);
@@ -6452,7 +6452,7 @@
     Mode_initEntries();
     return Mode_FIXED_instance;
   }
-  protoOf(Spacer).f3v = function () {
+  protoOf(Spacer).d3v = function () {
     return this.mode;
   };
   protoOf(Spacer).s3g = function () {
@@ -6466,8 +6466,8 @@
   }
   function Companion_34() {
     Companion_instance_35 = this;
-    this.g3v_1 = Align_START_getInstance();
-    this.h3v_1 = 1.0;
+    this.e3v_1 = Align_START_getInstance();
+    this.f3v_1 = 1.0;
   }
   var Companion_instance_35;
   function Companion_getInstance_37() {
@@ -6509,7 +6509,7 @@
   }
   function get_textAlign_0(_this__u8e3s4) {
     var tmp1_elvis_lhs = _this__u8e3s4 == null ? null : _this__u8e3s4.f3j();
-    return tmp1_elvis_lhs == null ? Companion_getInstance_37().g3v_1 : tmp1_elvis_lhs;
+    return tmp1_elvis_lhs == null ? Companion_getInstance_37().e3v_1 : tmp1_elvis_lhs;
   }
   function stylesOverride(_this__u8e3s4, textAlign, textColor, textScale) {
     textAlign = textAlign === VOID ? null : textAlign;
@@ -6519,27 +6519,27 @@
   }
   function StylesOverride(parent, _textAlign, _textColor, _textScale) {
     BaseModel.call(this, parent);
-    this.j3v_1 = _textAlign;
-    this.k3v_1 = _textColor;
-    this.l3v_1 = _textScale;
+    this.h3v_1 = _textAlign;
+    this.i3v_1 = _textColor;
+    this.j3v_1 = _textScale;
   }
   protoOf(StylesOverride).f3j = function () {
-    var tmp0_safe_receiver = this.j3v_1;
+    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 () {
-    var tmp0_safe_receiver = this.k3v_1;
+    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 () {
-    return get_textScale.call(this) * this.l3v_1;
+    return get_textScale.call(this) * this.j3v_1;
   };
   function Tab_init_$Init$(parent, parser, $this) {
     BaseModel.call($this, parent);
     Tab.call($this);
-    $this.n3v_1 = parent;
+    $this.l3v_1 = parent;
     parser.u3c(2, 'https://mobile-content-api.cru.org/xmlns/content', 'tab');
     var tmp = $this;
     var tmp0_safe_receiver = parser.j3e('listeners');
@@ -6556,7 +6556,7 @@
     tmp._listeners = tmp0_elvis_lhs == null ? emptySet() : tmp0_elvis_lhs;
     var tmp_1 = $this;
     // Inline function 'kotlin.collections.mutableListOf' call
-    tmp_1.p3v_1 = ArrayList_init_$Create$();
+    tmp_1.n3v_1 = ArrayList_init_$Create$();
     var label = null;
     var tmp_2 = $this;
     // Inline function 'org.cru.godtools.shared.tool.parser.model.parseContent' call
@@ -6576,7 +6576,7 @@
         var tmp0_subject = parser.w3c();
         if (tmp0_subject === 'https://mobile-content-api.cru.org/xmlns/analytics') {
           if (parser.q2() === 'events') {
-            var tmp0 = $this.p3v_1;
+            var tmp0 = $this.n3v_1;
             // Inline function 'kotlin.collections.plusAssign' call
             var elements = Companion_instance_4.y3c(parser, $this);
             addAll(tmp0, elements);
@@ -6616,7 +6616,7 @@
         continue $l$loop_0;
       skipTag(parser);
     }
-    tmp_2.o3v_1 = this_0.p3();
+    tmp_2.m3v_1 = this_0.p3();
     $this.label = label;
     return $this;
   }
@@ -6624,7 +6624,7 @@
     return Tab_init_$Init$(parent, parser, objectCreate(protoOf(Tab)));
   }
   function Companion_35() {
-    this.q3v_1 = 'tabs';
+    this.o3v_1 = 'tabs';
   }
   var Companion_instance_36;
   function Companion_getInstance_38() {
@@ -6660,26 +6660,26 @@
   function Tabs_init_$Create$(parent, parser) {
     return Tabs_init_$Init$(parent, parser, objectCreate(protoOf(Tabs)));
   }
-  protoOf(Tab).x3v = function () {
-    return this.n3v_1._tabs.r(this);
+  protoOf(Tab).v3v = function () {
+    return this.l3v_1._tabs.r(this);
   };
-  protoOf(Tab).y3v = function () {
+  protoOf(Tab).w3v = function () {
     return this._listeners;
   };
-  protoOf(Tab).r3m = function () {
+  protoOf(Tab).p3m = function () {
     return this.label;
   };
   protoOf(Tab).q3d = function () {
-    return this.o3v_1;
+    return this.m3v_1;
   };
   protoOf(Tab).d3i = function () {
-    return this.p3v_1;
+    return this.n3v_1;
   };
   protoOf(Tab).r3d = function (type) {
     var tmp;
     if (type.p2_1 === 2) {
       // Inline function 'kotlin.collections.filter' call
-      var tmp0 = this.p3v_1;
+      var tmp0 = this.n3v_1;
       // Inline function 'kotlin.collections.filterTo' call
       var destination = ArrayList_init_$Create$();
       var _iterator__ex2g4s = tmp0.j();
@@ -6700,14 +6700,14 @@
   protoOf(Tab)._getAnalyticsEvents = function (type) {
     return this.r3d(type);
   };
-  protoOf(Tab).z3v = function () {
+  protoOf(Tab).x3v = function () {
     // Inline function 'kotlin.collections.toTypedArray' call
     var this_0 = this._listeners;
     return copyToArray(this_0);
   };
   function Tab() {
   }
-  protoOf(Tabs).a3w = function () {
+  protoOf(Tabs).y3v = function () {
     return this._tabs;
   };
   protoOf(Tabs).a3e = function () {
@@ -6736,7 +6736,7 @@
     }
     return destination;
   };
-  protoOf(Tabs).b3w = function () {
+  protoOf(Tabs).z3v = function () {
     // Inline function 'kotlin.collections.toTypedArray' call
     var this_0 = this._tabs;
     return copyToArray(this_0);
@@ -6748,7 +6748,7 @@
   var Align_END_instance;
   function Companion_36() {
   }
-  protoOf(Companion_36).c3w = function (_this__u8e3s4) {
+  protoOf(Companion_36).a3w = function (_this__u8e3s4) {
     switch (_this__u8e3s4) {
       case 'start':
         return Align_START_getInstance();
@@ -6807,7 +6807,7 @@
   var Style_UNDERLINE_instance;
   function Companion_37() {
   }
-  protoOf(Companion_37).d3w = function (_this__u8e3s4) {
+  protoOf(Companion_37).b3w = function (_this__u8e3s4) {
     var tmp0 = get_REGEX_SEQUENCE_SEPARATOR().fd(_this__u8e3s4);
     // Inline function 'kotlin.collections.mutableSetOf' call
     // Inline function 'kotlin.collections.mapNotNullTo' call
@@ -6860,9 +6860,9 @@
     Style_UNDERLINE_instance = new Style_1('UNDERLINE', 2);
   }
   function Companion_38() {
-    this.e3w_1 = 'text';
-    this.f3w_1 = 40;
-    this.g3w_1 = 0;
+    this.c3w_1 = 'text';
+    this.d3w_1 = 40;
+    this.e3w_1 = 0;
   }
   var Companion_instance_39;
   function Companion_getInstance_41() {
@@ -6874,18 +6874,18 @@
     parser.u3c(2, 'https://mobile-content-api.cru.org/xmlns/content', 'text');
     var tmp = $this;
     var tmp0_safe_receiver = parser.j3e('text-align');
-    tmp.c3s_1 = tmp0_safe_receiver == null ? null : Companion_instance_37.c3w(tmp0_safe_receiver);
+    tmp.a3s_1 = tmp0_safe_receiver == null ? null : Companion_instance_37.a3w(tmp0_safe_receiver);
     var tmp_0 = $this;
     var tmp1_safe_receiver = parser.j3e('text-color');
-    tmp_0.d3s_1 = tmp1_safe_receiver == null ? null : toColorOrNull(tmp1_safe_receiver);
+    tmp_0.b3s_1 = tmp1_safe_receiver == null ? null : toColorOrNull(tmp1_safe_receiver);
     var tmp_1 = $this;
     var tmp2_safe_receiver = parser.j3e('text-scale');
     var tmp3_elvis_lhs = tmp2_safe_receiver == null ? null : toDoubleOrNull(tmp2_safe_receiver);
-    tmp_1.e3s_1 = tmp3_elvis_lhs == null ? 1.0 : tmp3_elvis_lhs;
+    tmp_1.c3s_1 = tmp3_elvis_lhs == null ? 1.0 : tmp3_elvis_lhs;
     var tmp_2 = $this;
     var tmp4_safe_receiver = parser.j3e('text-style');
     // Inline function 'kotlin.collections.orEmpty' call
-    var tmp0_elvis_lhs = tmp4_safe_receiver == null ? null : Companion_instance_38.d3w(tmp4_safe_receiver);
+    var tmp0_elvis_lhs = tmp4_safe_receiver == null ? null : Companion_instance_38.b3w(tmp4_safe_receiver);
     tmp_2._textStyles = tmp0_elvis_lhs == null ? emptySet() : tmp0_elvis_lhs;
     var tmp_3 = $this;
     var tmp5_safe_receiver = parser.j3e('minimum-lines');
@@ -6906,17 +6906,17 @@
     }
     var tmp7_elvis_lhs = tmp_4;
     tmp_3.minimumLines = tmp7_elvis_lhs == null ? 0 : tmp7_elvis_lhs;
-    $this.f3s_1 = parser.j3e('start-image');
+    $this.d3s_1 = parser.j3e('start-image');
     var tmp_6 = $this;
     var tmp8_safe_receiver = parser.j3e('start-image-size');
     var tmp9_elvis_lhs = tmp8_safe_receiver == null ? null : toIntOrNull(tmp8_safe_receiver);
     tmp_6.startImageSize = tmp9_elvis_lhs == null ? 40 : tmp9_elvis_lhs;
-    $this.g3s_1 = parser.j3e('end-image');
+    $this.e3s_1 = parser.j3e('end-image');
     var tmp_7 = $this;
     var tmp10_safe_receiver = parser.j3e('end-image-size');
     var tmp11_elvis_lhs = tmp10_safe_receiver == null ? null : toIntOrNull(tmp10_safe_receiver);
     tmp_7.endImageSize = tmp11_elvis_lhs == null ? 40 : tmp11_elvis_lhs;
-    $this.text = parser.h3w();
+    $this.text = parser.f3w();
     return $this;
   }
   function Text_init_$Create$(parent, parser) {
@@ -6939,14 +6939,14 @@
     Content_init_$Init$_0(parent, VOID, VOID, VOID, VOID, VOID, invisibleIf, goneIf, $this);
     Text.call($this);
     $this.text = text;
-    $this.c3s_1 = textAlign;
-    $this.d3s_1 = textColor;
-    $this.e3s_1 = textScale;
+    $this.a3s_1 = textAlign;
+    $this.b3s_1 = textColor;
+    $this.c3s_1 = textScale;
     $this._textStyles = textStyles;
     $this.minimumLines = minimumLines;
-    $this.f3s_1 = startImage;
+    $this.d3s_1 = startImage;
     $this.startImageSize = startImageSize;
-    $this.g3s_1 = endImage;
+    $this.e3s_1 = endImage;
     $this.endImageSize = endImageSize;
     return $this;
   }
@@ -6987,38 +6987,38 @@
     return this.text;
   };
   protoOf(Text).f3j = function () {
-    var tmp0_elvis_lhs = this.c3s_1;
+    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 () {
-    var tmp0_elvis_lhs = this.d3s_1;
+    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 () {
-    return this.e3s_1 * get_textScale_0(get_stylesParent(this));
+    return this.c3s_1 * get_textScale_0(get_stylesParent(this));
   };
-  protoOf(Text).m3w = function () {
+  protoOf(Text).k3w = function () {
     return this._textStyles;
   };
-  protoOf(Text).n3w = function () {
+  protoOf(Text).l3w = function () {
     return this.minimumLines;
   };
+  protoOf(Text).m3w = function () {
+    return this.d3s_1;
+  };
+  protoOf(Text).n3w = function () {
+    return getResource(this, this.d3s_1);
+  };
   protoOf(Text).o3w = function () {
-    return this.f3s_1;
+    return this.startImageSize;
   };
   protoOf(Text).p3w = function () {
-    return getResource(this, this.f3s_1);
+    return this.e3s_1;
   };
   protoOf(Text).q3w = function () {
-    return this.startImageSize;
+    return getResource(this, this.e3s_1);
   };
   protoOf(Text).r3w = function () {
-    return this.g3s_1;
-  };
-  protoOf(Text).s3w = function () {
-    return getResource(this, this.g3s_1);
-  };
-  protoOf(Text).t3w = function () {
     return this.endImageSize;
   };
   protoOf(Text).equals = function (other) {
@@ -7107,7 +7107,7 @@
     result = imul(31, result) + this.endImageSize | 0;
     return result;
   };
-  protoOf(Text).u3w = function () {
+  protoOf(Text).s3w = function () {
     // Inline function 'kotlin.collections.toTypedArray' call
     var this_0 = this._textStyles;
     return copyToArray(this_0);
@@ -7302,7 +7302,7 @@
     Companion_getInstance_42();
     this.j3j_1 = version;
   }
-  protoOf(Version).v3w = function (other) {
+  protoOf(Version).t3w = function (other) {
     return Version__compareTo_impl_crux23(this.j3j_1, other);
   };
   protoOf(Version).d = function (other) {
@@ -7321,9 +7321,9 @@
   var Provider_UNKNOWN_instance;
   function Companion_40() {
     Companion_instance_41 = this;
-    this.w3w_1 = Provider_UNKNOWN_getInstance();
+    this.u3w_1 = Provider_UNKNOWN_getInstance();
   }
-  protoOf(Companion_40).u3q = function (value) {
+  protoOf(Companion_40).s3q = function (value) {
     return value === 'youtube' ? Provider_YOUTUBE_getInstance() : null;
   };
   var Companion_instance_41;
@@ -7359,10 +7359,10 @@
   }
   function Companion_41() {
     Companion_instance_42 = this;
-    this.x3w_1 = 'video';
-    this.y3w_1 = new AspectRatio(16, 9);
-    this.z3w_1 = Horizontal_CENTER_getInstance();
-    this.a3x_1 = new Percent(1.0);
+    this.v3w_1 = 'video';
+    this.w3w_1 = new AspectRatio(16, 9);
+    this.x3w_1 = Horizontal_CENTER_getInstance();
+    this.y3w_1 = new Percent(1.0);
   }
   var Companion_instance_42;
   function Companion_getInstance_44() {
@@ -7378,16 +7378,16 @@
     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().u3q(parser.j3e('provider'));
-    tmp.provider = tmp0_elvis_lhs == null ? Companion_getInstance_43().w3w_1 : tmp0_elvis_lhs;
+    var tmp0_elvis_lhs = Companion_getInstance_43().s3q(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'));
-    tmp_0.aspectRatio = tmp1_elvis_lhs == null ? Companion_getInstance_44().y3w_1 : tmp1_elvis_lhs;
+    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 tmp3_elvis_lhs = tmp2_safe_receiver == null ? null : tmp2_safe_receiver.horizontal;
-    tmp_1.gravity = tmp3_elvis_lhs == null ? Companion_getInstance_44().z3w_1 : tmp3_elvis_lhs;
+    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 tmp_3;
@@ -7405,7 +7405,7 @@
       tmp_3 = tmp_4;
     }
     var tmp5_elvis_lhs = tmp_3;
-    tmp_2.width = tmp5_elvis_lhs == null ? Companion_getInstance_44().a3x_1 : tmp5_elvis_lhs;
+    tmp_2.width = tmp5_elvis_lhs == null ? Companion_getInstance_44().y3w_1 : tmp5_elvis_lhs;
     skipTag(parser);
     return $this;
   }
@@ -7420,13 +7420,13 @@
     Provider_initEntries();
     return Provider_UNKNOWN_instance;
   }
-  protoOf(Video).j3x = function () {
+  protoOf(Video).h3x = function () {
     return this.provider;
   };
-  protoOf(Video).k3x = function () {
+  protoOf(Video).i3x = function () {
     return this.videoId;
   };
-  protoOf(Video).l3x = function () {
+  protoOf(Video).j3x = function () {
     return this.aspectRatio;
   };
   protoOf(Video).x3h = function () {
@@ -7454,15 +7454,15 @@
   function Visibility$watchVisibility$slambda(resultContinuation) {
     CoroutineImpl.call(this, resultContinuation);
   }
-  protoOf(Visibility$watchVisibility$slambda).w3x = function (invisible, gone, $completion) {
-    var tmp = this.x3x(invisible, gone, $completion);
+  protoOf(Visibility$watchVisibility$slambda).u3x = function (invisible, gone, $completion) {
+    var tmp = this.v3x(invisible, gone, $completion);
     tmp.e9_1 = Unit_instance;
     tmp.f9_1 = null;
     return tmp.u9();
   };
   protoOf(Visibility$watchVisibility$slambda).h1g = function (p1, p2, $completion) {
     var tmp = (!(p1 == null) ? typeof p1 === 'boolean' : false) ? p1 : THROW_CCE();
-    return this.w3x(tmp, (!(p2 == null) ? typeof p2 === 'boolean' : false) ? p2 : THROW_CCE(), $completion);
+    return this.u3x(tmp, (!(p2 == null) ? typeof p2 === 'boolean' : false) ? p2 : THROW_CCE(), $completion);
   };
   protoOf(Visibility$watchVisibility$slambda).u9 = function () {
     var suspendResult = this.e9_1;
@@ -7471,7 +7471,7 @@
         var tmp = this.c9_1;
         if (tmp === 0) {
           this.d9_1 = 1;
-          return new Pair(this.u3x_1, this.v3x_1);
+          return new Pair(this.s3x_1, this.t3x_1);
         } else if (tmp === 1) {
           throw this.f9_1;
         }
@@ -7481,16 +7481,16 @@
       }
      while (true);
   };
-  protoOf(Visibility$watchVisibility$slambda).x3x = function (invisible, gone, completion) {
+  protoOf(Visibility$watchVisibility$slambda).v3x = function (invisible, gone, completion) {
     var i = new Visibility$watchVisibility$slambda(completion);
-    i.u3x_1 = invisible;
-    i.v3x_1 = gone;
+    i.s3x_1 = invisible;
+    i.t3x_1 = gone;
     return i;
   };
   function Visibility$watchVisibility$slambda_0(resultContinuation) {
     var i = new Visibility$watchVisibility$slambda(resultContinuation);
     var l = function (invisible, gone, $completion) {
-      return i.w3x(invisible, gone, $completion);
+      return i.u3x(invisible, gone, $completion);
     };
     l.$arity = 2;
     return l;
@@ -7522,10 +7522,10 @@
     parser.u3c(2, 'https://mobile-content-api.cru.org/xmlns/lesson', 'page');
     var tmp = $this;
     // Inline function 'kotlin.collections.mutableListOf' call
-    tmp.q3y_1 = ArrayList_init_$Create$();
+    tmp.o3y_1 = ArrayList_init_$Create$();
     var tmp_0 = $this;
     // Inline function 'kotlin.collections.mutableListOf' call
-    tmp_0.r3y_1 = ArrayList_init_$Create$();
+    tmp_0.p3y_1 = ArrayList_init_$Create$();
     // Inline function 'org.cru.godtools.shared.tool.parser.xml.parseChildren' call
     $l$loop_2: while (!(parser.l() === 3)) {
       if (!(parser.v3c() === 2))
@@ -7534,14 +7534,14 @@
       var tmp0_subject = parser.w3c();
       if (tmp0_subject === 'https://mobile-content-api.cru.org/xmlns/analytics') {
         if (parser.q2() === 'events') {
-          var tmp0 = $this.q3y_1;
+          var tmp0 = $this.o3y_1;
           // Inline function 'kotlin.collections.plusAssign' call
           var elements = Companion_instance_4.y3c(parser, $this);
           addAll(tmp0, elements);
         }
       } else if (tmp0_subject === 'https://mobile-content-api.cru.org/xmlns/lesson') {
         if (parser.q2() === 'content') {
-          var tmp4 = $this.r3y_1;
+          var tmp4 = $this.p3y_1;
           // Inline function 'org.cru.godtools.shared.tool.parser.model.parseContent' call
           // Inline function 'kotlin.collections.buildList' call
           // Inline function 'kotlin.collections.buildListInternal' call
@@ -7602,17 +7602,17 @@
     return LessonPage_init_$Init$(container, fileName, parser, objectCreate(protoOf(LessonPage)));
   }
   protoOf(LessonPage).d3i = function () {
-    return this.q3y_1;
+    return this.o3y_1;
   };
   protoOf(LessonPage).q3d = function () {
-    return this.r3y_1;
+    return this.p3y_1;
   };
   function LessonPage() {
   }
   function Companion_42() {
-    this.r3z_1 = 'card';
-    this.s3z_1 = 'id';
-    this.t3z_1 = 'content';
+    this.p3z_1 = 'card';
+    this.q3z_1 = 'id';
+    this.r3z_1 = 'content';
   }
   var Companion_instance_43;
   function Companion_getInstance_45() {
@@ -7623,16 +7623,16 @@
     Card_0.call($this);
     $this.page = page;
     parser.u3c(2, 'https://mobile-content-api.cru.org/xmlns/page', 'card');
-    $this.v3z_1 = parser.j3e('id');
+    $this.t3z_1 = parser.j3e('id');
     var tmp = $this;
     var tmp0_safe_receiver = parser.j3e('background-color');
-    tmp.w3z_1 = tmp0_safe_receiver == null ? null : toColorOrNull(tmp0_safe_receiver);
+    tmp.u3z_1 = tmp0_safe_receiver == null ? null : toColorOrNull(tmp0_safe_receiver);
     var tmp_0 = $this;
     // Inline function 'kotlin.collections.mutableListOf' call
-    tmp_0.x3z_1 = ArrayList_init_$Create$();
+    tmp_0.v3z_1 = ArrayList_init_$Create$();
     var tmp_1 = $this;
     // Inline function 'kotlin.collections.mutableListOf' call
-    tmp_1.y3z_1 = ArrayList_init_$Create$();
+    tmp_1.w3z_1 = ArrayList_init_$Create$();
     // Inline function 'org.cru.godtools.shared.tool.parser.xml.parseChildren' call
     $l$loop_2: while (!(parser.l() === 3)) {
       if (!(parser.v3c() === 2))
@@ -7641,14 +7641,14 @@
       var tmp0_subject = parser.w3c();
       if (tmp0_subject === 'https://mobile-content-api.cru.org/xmlns/analytics') {
         if (parser.q2() === 'events') {
-          var tmp0 = $this.x3z_1;
+          var tmp0 = $this.v3z_1;
           // Inline function 'kotlin.collections.plusAssign' call
           var elements = Companion_instance_4.y3c(parser, $this);
           addAll(tmp0, elements);
         }
       } else if (tmp0_subject === 'https://mobile-content-api.cru.org/xmlns/page') {
         if (parser.q2() === 'content') {
-          var tmp4 = $this.y3z_1;
+          var tmp4 = $this.w3z_1;
           // Inline function 'org.cru.godtools.shared.tool.parser.model.parseContent' call
           // Inline function 'kotlin.collections.buildList' call
           // Inline function 'kotlin.collections.buildListInternal' call
@@ -7709,7 +7709,7 @@
     return Card_init_$Init$_0(page, parser, objectCreate(protoOf(Card_0)));
   }
   function Companion_43() {
-    this.z3z_1 = 'cardcollection';
+    this.x3z_1 = 'cardcollection';
   }
   var Companion_instance_44;
   function Companion_getInstance_46() {
@@ -7719,10 +7719,10 @@
     Page_init_$Init$(container, fileName, parser, $this);
     CardCollectionPage.call($this);
     parser.u3c(2, 'https://mobile-content-api.cru.org/xmlns/page', 'page');
-    Companion_getInstance_48().a40(parser, 'cardcollection');
+    Companion_getInstance_48().y3z(parser, 'cardcollection');
     var tmp = $this;
     // Inline function 'kotlin.collections.mutableListOf' call
-    tmp.t40_1 = ArrayList_init_$Create$();
+    tmp.r40_1 = ArrayList_init_$Create$();
     var tmp_0 = $this;
     // Inline function 'kotlin.collections.mutableListOf' call
     tmp_0._cards = ArrayList_init_$Create$();
@@ -7734,7 +7734,7 @@
       var tmp0_subject = parser.w3c();
       if (tmp0_subject === 'https://mobile-content-api.cru.org/xmlns/analytics') {
         if (parser.q2() === 'events') {
-          var tmp0 = $this.t40_1;
+          var tmp0 = $this.r40_1;
           // Inline function 'kotlin.collections.plusAssign' call
           var elements = Companion_instance_4.y3c(parser, $this);
           addAll(tmp0, elements);
@@ -7776,22 +7776,22 @@
     }
     return this_0.p3();
   }
-  protoOf(Card_0).u40 = function () {
+  protoOf(Card_0).s40 = function () {
     return this.page;
   };
   protoOf(Card_0).o3d = function () {
-    var tmp0_elvis_lhs = this.v3z_1;
+    var tmp0_elvis_lhs = this.t3z_1;
     return tmp0_elvis_lhs == null ? this.page.id + '-' + this.position : tmp0_elvis_lhs;
   };
-  protoOf(Card_0).x3v = function () {
+  protoOf(Card_0).v3v = function () {
     return this.page._cards.r(this);
   };
-  protoOf(Card_0).q3r = function () {
-    var tmp0_elvis_lhs = this.w3z_1;
+  protoOf(Card_0).o3r = function () {
+    var tmp0_elvis_lhs = this.u3z_1;
     return tmp0_elvis_lhs == null ? this.page.b3j() : tmp0_elvis_lhs;
   };
   protoOf(Card_0).q3d = function () {
-    return this.y3z_1;
+    return this.w3z_1;
   };
   protoOf(Card_0).a3e = function () {
     // Inline function 'org.cru.godtools.shared.tool.parser.model.contentTips' call
@@ -7814,7 +7814,7 @@
       case 0:
         // Inline function 'kotlin.collections.filter' call
-        var tmp0 = this.x3z_1;
+        var tmp0 = this.v3z_1;
         // Inline function 'kotlin.collections.filterTo' call
         var destination = ArrayList_init_$Create$();
@@ -7832,7 +7832,7 @@
       case 1:
         // Inline function 'kotlin.collections.filter' call
-        var tmp0_0 = this.x3z_1;
+        var tmp0_0 = this.v3z_1;
         // Inline function 'kotlin.collections.filterTo' call
         var destination_0 = ArrayList_init_$Create$();
@@ -7859,12 +7859,12 @@
   function Card_0() {
   }
   protoOf(CardCollectionPage).d3i = function () {
-    return this.t40_1;
+    return this.r40_1;
   };
-  protoOf(CardCollectionPage).v40 = function () {
+  protoOf(CardCollectionPage).t40 = function () {
     return this._cards;
   };
-  protoOf(CardCollectionPage).w40 = function () {
+  protoOf(CardCollectionPage).u40 = function () {
     // Inline function 'kotlin.collections.toTypedArray' call
     var this_0 = this._cards;
     return copyToArray(this_0);
@@ -7885,7 +7885,7 @@
     }
   }
   function Companion_44() {
-    this.x40_1 = 'content';
+    this.v40_1 = 'content';
   }
   var Companion_instance_45;
   function Companion_getInstance_47() {
@@ -7895,13 +7895,13 @@
     Page_init_$Init$(container, fileName, parser, $this);
     ContentPage.call($this);
     parser.u3c(2, 'https://mobile-content-api.cru.org/xmlns/page', 'page');
-    Companion_getInstance_48().a40(parser, 'content');
+    Companion_getInstance_48().y3z(parser, 'content');
     var tmp = $this;
     // Inline function 'kotlin.collections.mutableListOf' call
-    tmp.q41_1 = ArrayList_init_$Create$();
+    tmp.o41_1 = ArrayList_init_$Create$();
     var tmp_0 = $this;
     // Inline function 'kotlin.collections.mutableListOf' call
-    tmp_0.r41_1 = ArrayList_init_$Create$();
+    tmp_0.p41_1 = ArrayList_init_$Create$();
     // Inline function 'org.cru.godtools.shared.tool.parser.xml.parseChildren' call
     $l$loop_2: while (!(parser.l() === 3)) {
       if (!(parser.v3c() === 2))
@@ -7910,14 +7910,14 @@
       var tmp0_subject = parser.w3c();
       if (tmp0_subject === 'https://mobile-content-api.cru.org/xmlns/analytics') {
         if (parser.q2() === 'events') {
-          var tmp0 = $this.q41_1;
+          var tmp0 = $this.o41_1;
           // Inline function 'kotlin.collections.plusAssign' call
           var elements = Companion_instance_4.y3c(parser, $this);
           addAll(tmp0, elements);
         }
       } else if (tmp0_subject === 'https://mobile-content-api.cru.org/xmlns/page') {
         if (parser.q2() === 'content') {
-          var tmp4 = $this.r41_1;
+          var tmp4 = $this.p41_1;
           // Inline function 'org.cru.godtools.shared.tool.parser.model.parseContent' call
           // Inline function 'kotlin.collections.buildList' call
           // Inline function 'kotlin.collections.buildListInternal' call
@@ -7978,20 +7978,20 @@
     return ContentPage_init_$Init$(container, fileName, parser, objectCreate(protoOf(ContentPage)));
   }
   protoOf(ContentPage).d3i = function () {
-    return this.q41_1;
+    return this.o41_1;
   };
   protoOf(ContentPage).q3d = function () {
-    return this.r41_1;
+    return this.p41_1;
   };
   function ContentPage() {
   }
   function $parseCOROUTINE$1(_this__u8e3s4, container, fileName, parser, parseFile, resultContinuation) {
     CoroutineImpl.call(this, resultContinuation);
-    this.a42_1 = _this__u8e3s4;
-    this.b42_1 = container;
-    this.c42_1 = fileName;
-    this.d42_1 = parser;
-    this.e42_1 = parseFile;
+    this.y41_1 = _this__u8e3s4;
+    this.z41_1 = container;
+    this.a42_1 = fileName;
+    this.b42_1 = parser;
+    this.c42_1 = parseFile;
   }
   protoOf($parseCOROUTINE$1).u9 = function () {
     var suspendResult = this.e9_1;
@@ -8001,35 +8001,35 @@
         switch (tmp) {
           case 0:
             this.d9_1 = 3;
-            this.d42_1.u3c(2, null, 'page');
-            this.f42_1 = to(this.d42_1.w3c(), this.d42_1.f3f('http://www.w3.org/2001/XMLSchema-instance', 'type'));
-            if (this.f42_1.equals(to('https://mobile-content-api.cru.org/xmlns/page', 'page-collection'))) {
-              if (!this.b42_1.q3l(getKClass(PageCollectionPage)))
+            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'));
+            if (this.d42_1.equals(to('https://mobile-content-api.cru.org/xmlns/page', 'page-collection'))) {
+              if (!this.z41_1.o3l(getKClass(PageCollectionPage)))
                 return null;
               this.c9_1 = 1;
-              suspendResult = Companion_instance_47.m42(this.b42_1, this.c42_1, this.d42_1, this.e42_1, this);
+              suspendResult = Companion_instance_47.k42(this.z41_1, this.a42_1, this.b42_1, this.c42_1, this);
               if (suspendResult === get_COROUTINE_SUSPENDED()) {
                 return suspendResult;
               }
               continue $sm;
             } else {
-              this.g42_1 = this.a42_1.h42(this.b42_1, this.c42_1, this.d42_1);
+              this.e42_1 = this.y41_1.f42(this.z41_1, this.a42_1, this.b42_1);
               this.c9_1 = 2;
               continue $sm;
             }
           case 1:
-            this.g42_1 = suspendResult;
+            this.e42_1 = suspendResult;
             this.c9_1 = 2;
             continue $sm;
           case 2:
-            var tmp1_safe_receiver = this.g42_1;
+            var tmp1_safe_receiver = this.e42_1;
             var tmp_0;
             if (tmp1_safe_receiver == null) {
               tmp_0 = null;
             } else {
               var tmp_1;
-              if (this.b42_1.q3l(getKClassFromExpression(tmp1_safe_receiver))) {
+              if (this.z41_1.o3l(getKClassFromExpression(tmp1_safe_receiver))) {
                 tmp_1 = tmp1_safe_receiver;
               } else {
                 tmp_1 = null;
@@ -8054,21 +8054,21 @@
   };
   function Companion_45() {
     Companion_instance_46 = this;
-    this.u3n_1 = 'page';
-    this.v3n_1 = 'parent_override_page-collection';
+    this.s3n_1 = 'page';
+    this.t3n_1 = 'parent_override_page-collection';
     var tmp = this;
     // Inline function 'org.cru.godtools.shared.tool.parser.model.color' call
-    tmp.w3n_1 = toPlatformColor_0(Companion_getInstance_1().d1t(0 / 255.0, 0 / 255.0, 0 / 255.0, 0.0));
-    this.x3n_1 = Companion_getInstance_22().CENTER;
-    this.y3n_1 = ImageScaleType_FILL_X_getInstance();
+    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();
   }
-  protoOf(Companion_45).z3n = function (container, fileName, parser, parseFile, $completion) {
+  protoOf(Companion_45).x3n = 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;
     return tmp.u9();
   };
-  protoOf(Companion_45).h42 = function (container, fileName, parser) {
+  protoOf(Companion_45).f42 = function (container, fileName, parser) {
     parser.u3c(2, null, 'page');
     var tmp;
     switch (parser.w3c()) {
@@ -8131,7 +8131,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.q3l(getKClassFromExpression(tmp1_safe_receiver))) {
+      if (container.o3l(getKClassFromExpression(tmp1_safe_receiver))) {
         tmp_2 = tmp1_safe_receiver;
       } else {
         tmp_2 = null;
@@ -8140,7 +8140,7 @@
     }
     return tmp_1;
   };
-  protoOf(Companion_45).a40 = function (_this__u8e3s4, type) {
+  protoOf(Companion_45).y3z = function (_this__u8e3s4, type) {
     var actual = _this__u8e3s4.f3f('http://www.w3.org/2001/XMLSchema-instance', 'type');
     if (!(type === actual))
       throw new XmlPullParserException('expected ' + type + ' not ' + actual);
@@ -8170,8 +8170,8 @@
     BaseModel.call($this, container);
     Page.call($this);
     parser.u3c(2, null, 'page');
-    $this.v3y_1 = parser.j3e('id');
-    $this.w3y_1 = fileName;
+    $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 tmp_0;
@@ -8189,7 +8189,7 @@
       tmp_0 = tmp_1;
     }
     var tmp1_elvis_lhs = tmp_0;
-    tmp.x3y_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.f3f('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);
@@ -8206,42 +8206,42 @@
     tmp_4._dismissListeners = toSet_0(tmp$ret$3);
     var tmp_5 = $this;
     var tmp4_safe_receiver = parser.j3e('primary-color');
-    tmp_5.y3y_1 = tmp4_safe_receiver == null ? null : toColorOrNull(tmp4_safe_receiver);
+    tmp_5.w3y_1 = tmp4_safe_receiver == null ? null : toColorOrNull(tmp4_safe_receiver);
     var tmp_6 = $this;
     var tmp5_safe_receiver = parser.j3e('primary-text-color');
-    tmp_6.z3y_1 = tmp5_safe_receiver == null ? null : toColorOrNull(tmp5_safe_receiver);
+    tmp_6.x3y_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.a3z_1 = tmp7_elvis_lhs == null ? Companion_getInstance_48().w3n_1 : tmp7_elvis_lhs;
-    $this.b3z_1 = parser.j3e('background-image');
+    tmp_7.y3y_1 = tmp7_elvis_lhs == null ? Companion_getInstance_48().u3n_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.c3z_1 = tmp9_elvis_lhs == null ? Companion_getInstance_48().x3n_1 : tmp9_elvis_lhs;
+    tmp_8.a3z_1 = tmp9_elvis_lhs == null ? Companion_getInstance_48().v3n_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.e3m(tmp10_safe_receiver);
-    tmp_9.d3z_1 = tmp11_elvis_lhs == null ? Companion_getInstance_48().y3n_1 : tmp11_elvis_lhs;
+    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 tmp_10 = $this;
     var tmp12_safe_receiver = parser.j3e('control-color');
-    tmp_10.e3z_1 = tmp12_safe_receiver == null ? null : toColorOrNull(tmp12_safe_receiver);
+    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');
-    tmp_11.f3z_1 = tmp13_safe_receiver == null ? null : toColorOrNull(tmp13_safe_receiver);
+    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');
-    tmp_12.g3z_1 = tmp14_safe_receiver == null ? null : toColorOrNull(tmp14_safe_receiver);
+    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');
-    tmp_13.h3z_1 = tmp15_safe_receiver == null ? null : toColorOrNull(tmp15_safe_receiver);
+    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');
-    tmp_14.i3z_1 = tmp16_safe_receiver == null ? null : toColorOrNull(tmp16_safe_receiver);
+    tmp_14.g3z_1 = tmp16_safe_receiver == null ? null : toColorOrNull(tmp16_safe_receiver);
     var tmp_15 = $this;
     var tmp17_safe_receiver = parser.j3e('text-scale');
     var tmp18_elvis_lhs = tmp17_safe_receiver == null ? null : toDoubleOrNull(tmp17_safe_receiver);
-    tmp_15.j3z_1 = tmp18_elvis_lhs == null ? 1.0 : tmp18_elvis_lhs;
+    tmp_15.h3z_1 = tmp18_elvis_lhs == null ? 1.0 : tmp18_elvis_lhs;
     return $this;
   }
   function Page_init_$Init$_0(container, id, fileName, parentPage, primaryColor, backgroundColor, backgroundImage, backgroundImageGravity, backgroundImageScaleType, controlColor, cardBackgroundColor, multiselectOptionBackgroundColor, multiselectOptionSelectedColor, textColor, textScale, $this) {
@@ -8250,10 +8250,10 @@
     fileName = fileName === VOID ? null : fileName;
     parentPage = parentPage === VOID ? null : parentPage;
     primaryColor = primaryColor === VOID ? null : primaryColor;
-    backgroundColor = backgroundColor === VOID ? Companion_getInstance_48().w3n_1 : backgroundColor;
+    backgroundColor = backgroundColor === VOID ? Companion_getInstance_48().u3n_1 : backgroundColor;
     backgroundImage = backgroundImage === VOID ? null : backgroundImage;
-    backgroundImageGravity = backgroundImageGravity === VOID ? Companion_getInstance_48().x3n_1 : backgroundImageGravity;
-    backgroundImageScaleType = backgroundImageScaleType === VOID ? Companion_getInstance_48().y3n_1 : backgroundImageScaleType;
+    backgroundImageGravity = backgroundImageGravity === VOID ? Companion_getInstance_48().v3n_1 : backgroundImageGravity;
+    backgroundImageScaleType = backgroundImageScaleType === VOID ? Companion_getInstance_48().w3n_1 : backgroundImageScaleType;
     controlColor = controlColor === VOID ? null : controlColor;
     cardBackgroundColor = cardBackgroundColor === VOID ? null : cardBackgroundColor;
     multiselectOptionBackgroundColor = multiselectOptionBackgroundColor === VOID ? null : multiselectOptionBackgroundColor;
@@ -8262,65 +8262,65 @@
     textScale = textScale === VOID ? 1.0 : textScale;
     BaseModel.call($this, container);
     Page.call($this);
-    $this.v3y_1 = id;
-    $this.w3y_1 = fileName;
-    $this.x3y_1 = parentPage;
+    $this.t3y_1 = id;
+    $this.u3y_1 = fileName;
+    $this.v3y_1 = parentPage;
     $this.isHidden = false;
     $this._listeners = emptySet();
     $this._dismissListeners = emptySet();
-    $this.y3y_1 = primaryColor;
-    $this.z3y_1 = null;
-    $this.a3z_1 = backgroundColor;
-    $this.b3z_1 = backgroundImage;
-    $this.c3z_1 = backgroundImageGravity;
-    $this.d3z_1 = backgroundImageScaleType;
-    $this.e3z_1 = controlColor;
-    $this.f3z_1 = cardBackgroundColor;
-    $this.g3z_1 = multiselectOptionBackgroundColor;
-    $this.h3z_1 = multiselectOptionSelectedColor;
-    $this.i3z_1 = textColor;
-    $this.j3z_1 = textScale;
+    $this.w3y_1 = primaryColor;
+    $this.x3y_1 = null;
+    $this.y3y_1 = backgroundColor;
+    $this.z3y_1 = backgroundImage;
+    $this.a3z_1 = backgroundImageGravity;
+    $this.b3z_1 = backgroundImageScaleType;
+    $this.c3z_1 = controlColor;
+    $this.d3z_1 = cardBackgroundColor;
+    $this.e3z_1 = multiselectOptionBackgroundColor;
+    $this.f3z_1 = multiselectOptionSelectedColor;
+    $this.g3z_1 = textColor;
+    $this.h3z_1 = textScale;
     return $this;
   }
   function Page$id$delegate$lambda(this$0) {
     return function () {
-      var tmp0_elvis_lhs = this$0.v3y_1;
-      var tmp1_elvis_lhs = tmp0_elvis_lhs == null ? this$0.w3y_1 : tmp0_elvis_lhs;
+      var tmp0_elvis_lhs = this$0.t3y_1;
+      var tmp1_elvis_lhs = tmp0_elvis_lhs == null ? this$0.u3y_1 : tmp0_elvis_lhs;
       return tmp1_elvis_lhs == null ? '' + this$0.x39().code + '-' + this$0.position : tmp1_elvis_lhs;
     };
   }
   function Page$position$delegate$lambda(this$0) {
     return function () {
-      return _get_parentPageContainer__qsoup5(this$0).p3l().r(this$0);
+      return _get_parentPageContainer__qsoup5(this$0).n3l().r(this$0);
     };
   }
   protoOf(Page).o3d = function () {
-    var tmp0 = this.t3y_1;
+    var tmp0 = this.r3y_1;
     // Inline function 'kotlin.getValue' call
     id$factory();
     return tmp0.h2();
   };
-  protoOf(Page).x3v = function () {
-    var tmp0 = this.u3y_1;
+  protoOf(Page).v3v = function () {
+    var tmp0 = this.s3y_1;
     // Inline function 'kotlin.getValue' call
     position$factory();
     return tmp0.h2();
   };
-  protoOf(Page).k3z = function () {
-    return this.w3y_1;
+  protoOf(Page).i3z = function () {
+    return this.u3y_1;
   };
-  protoOf(Page).l3z = function () {
+  protoOf(Page).j3z = function () {
     var tmp = _get_parentPageContainer__qsoup5(this);
-    var tmp0_safe_receiver = this.x3y_1;
+    var tmp0_safe_receiver = this.v3y_1;
     return tmp.findPage(tmp0_safe_receiver == null ? null : substringBefore(tmp0_safe_receiver, '?'));
   };
-  protoOf(Page).m3z = function () {
+  protoOf(Page).k3z = function () {
     var tmp;
     if (this.parentPage == null) {
       tmp = emptyMap();
     } else {
       // Inline function 'kotlin.text.orEmpty' call
-      var tmp0_elvis_lhs = this.x3y_1;
+      var tmp0_elvis_lhs = this.v3y_1;
       var tmp$ret$0 = tmp0_elvis_lhs == null ? '' : tmp0_elvis_lhs;
       // Inline function 'kotlin.collections.mapNotNull' call
       var tmp0 = split_0(substringAfter(tmp$ret$0, '?', ''), ['&']);
@@ -8370,48 +8370,48 @@
     }
     return tmp;
   };
-  protoOf(Page).n3z = function () {
-    return getOrNull(_get_parentPageContainer__qsoup5(this).p3l(), this.position + 1 | 0);
+  protoOf(Page).l3z = function () {
+    return getOrNull(_get_parentPageContainer__qsoup5(this).n3l(), this.position + 1 | 0);
   };
-  protoOf(Page).o3z = function () {
-    return getOrNull(_get_parentPageContainer__qsoup5(this).p3l(), this.position - 1 | 0);
+  protoOf(Page).m3z = function () {
+    return getOrNull(_get_parentPageContainer__qsoup5(this).n3l(), this.position - 1 | 0);
   };
-  protoOf(Page).p3z = function () {
+  protoOf(Page).n3z = function () {
     return this.isHidden;
   };
-  protoOf(Page).y3v = function () {
+  protoOf(Page).w3v = function () {
     return this._listeners;
   };
-  protoOf(Page).n3r = function () {
+  protoOf(Page).l3r = function () {
     return this._dismissListeners;
   };
   protoOf(Page).y3i = function () {
-    var tmp0_elvis_lhs = this.y3y_1;
+    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 () {
-    var tmp0_elvis_lhs = this.z3y_1;
+    var tmp0_elvis_lhs = this.x3y_1;
     return tmp0_elvis_lhs == null ? get_primaryTextColor_0(get_stylesParent(this)) : tmp0_elvis_lhs;
   };
+  protoOf(Page).o3r = function () {
+    return this.y3y_1;
+  };
+  protoOf(Page).p3r = function () {
+    return getResource(this, this.z3y_1);
+  };
   protoOf(Page).q3r = function () {
     return this.a3z_1;
   };
   protoOf(Page).r3r = function () {
-    return getResource(this, this.b3z_1);
-  };
-  protoOf(Page).s3r = function () {
-    return this.c3z_1;
+    return this.b3z_1;
   };
-  protoOf(Page).t3r = function () {
-    return this.d3z_1;
-  };
-  protoOf(Page).q3z = function () {
-    var tmp0_elvis_lhs = this.e3z_1;
+  protoOf(Page).o3z = function () {
+    var tmp0_elvis_lhs = this.c3z_1;
     var tmp;
     if (tmp0_elvis_lhs == null) {
       var tmp_0 = _get_parentPageContainer__qsoup5(this);
       var tmp1_safe_receiver = tmp_0 instanceof Page ? tmp_0 : null;
-      tmp = tmp1_safe_receiver == null ? null : tmp1_safe_receiver.q3z();
+      tmp = tmp1_safe_receiver == null ? null : tmp1_safe_receiver.o3z();
     } else {
       tmp = tmp0_elvis_lhs;
     }
@@ -8419,23 +8419,23 @@
     return tmp2_elvis_lhs == null ? this.x39().t3f_1 : tmp2_elvis_lhs;
   };
   protoOf(Page).b3j = function () {
-    var tmp0_elvis_lhs = this.f3z_1;
+    var tmp0_elvis_lhs = this.d3z_1;
     return tmp0_elvis_lhs == null ? get_cardBackgroundColor.call(this) : tmp0_elvis_lhs;
   };
   protoOf(Page).c3j = function () {
-    var tmp0_elvis_lhs = this.g3z_1;
+    var tmp0_elvis_lhs = this.e3z_1;
     return tmp0_elvis_lhs == null ? get_multiselectOptionBackgroundColor.call(this) : tmp0_elvis_lhs;
   };
   protoOf(Page).d3j = function () {
-    var tmp0_elvis_lhs = this.h3z_1;
+    var tmp0_elvis_lhs = this.f3z_1;
     return tmp0_elvis_lhs == null ? get_multiselectOptionSelectedColor.call(this) : tmp0_elvis_lhs;
   };
   protoOf(Page).w3i = function () {
-    var tmp0_elvis_lhs = this.i3z_1;
+    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 () {
-    return this.j3z_1 * get_textScale_0(get_stylesParent(this));
+    return this.h3z_1 * get_textScale_0(get_stylesParent(this));
   };
   protoOf(Page).r3d = function (type) {
     var tmp;
@@ -8485,12 +8485,12 @@
   protoOf(Page)._getAnalyticsEvents = function (type) {
     return this.r3d(type);
   };
-  protoOf(Page).t3s = function () {
+  protoOf(Page).r3s = function () {
     // Inline function 'kotlin.collections.toTypedArray' call
     var this_0 = this._dismissListeners;
     return copyToArray(this_0);
   };
-  protoOf(Page).z3v = function () {
+  protoOf(Page).x3v = function () {
     // Inline function 'kotlin.collections.toTypedArray' call
     var this_0 = this._listeners;
     return copyToArray(this_0);
@@ -8498,9 +8498,9 @@
   function Page() {
     Companion_getInstance_48();
     var tmp = this;
-    tmp.t3y_1 = lazy(Page$id$delegate$lambda(this));
+    tmp.r3y_1 = lazy(Page$id$delegate$lambda(this));
     var tmp_0 = this;
-    tmp_0.u3y_1 = lazy(Page$position$delegate$lambda(this));
+    tmp_0.s3y_1 = lazy(Page$position$delegate$lambda(this));
   }
   function id$factory() {
     return getPropertyCallableRef('id', 1, KProperty1, function (receiver) {
@@ -8514,11 +8514,11 @@
   }
   function $parseCOROUTINE$2(_this__u8e3s4, container, fileName, parser, parseFile, resultContinuation) {
     CoroutineImpl.call(this, resultContinuation);
-    this.v42_1 = _this__u8e3s4;
-    this.w42_1 = container;
-    this.x42_1 = fileName;
-    this.y42_1 = parser;
-    this.z42_1 = parseFile;
+    this.t42_1 = _this__u8e3s4;
+    this.u42_1 = container;
+    this.v42_1 = fileName;
+    this.w42_1 = parser;
+    this.x42_1 = parseFile;
   }
   protoOf($parseCOROUTINE$2).u9 = function () {
     var suspendResult = this.e9_1;
@@ -8529,20 +8529,20 @@
           case 0:
             this.d9_1 = 2;
             var tmp_0 = this;
-            tmp_0.a43_1 = PageCollectionPage_init_$Create$(this.w42_1, this.x42_1, this.y42_1);
-            this.b43_1 = this.a43_1;
+            tmp_0.y42_1 = PageCollectionPage_init_$Create$(this.u42_1, this.v42_1, this.w42_1);
+            this.z42_1 = this.y42_1;
             var tmp_1 = this;
-            tmp_1.c43_1 = this.b43_1;
-            this.d43_1 = this.c43_1;
+            tmp_1.a43_1 = this.z42_1;
+            this.b43_1 = this.a43_1;
             this.c9_1 = 1;
-            suspendResult = buildPagesFromParsedPages(this.d43_1, this.z42_1, this);
+            suspendResult = buildPagesFromParsedPages(this.b43_1, this.x42_1, this);
             if (suspendResult === get_COROUTINE_SUSPENDED()) {
               return suspendResult;
             }
             continue $sm;
           case 1:
-            return this.b43_1;
+            return this.z42_1;
           case 2:
             throw this.f9_1;
         }
@@ -8558,20 +8558,20 @@
      while (true);
   };
   function PageCollectionPage$buildPagesFromParsedPages$slambda$slambda($it, this$0, $parseFile, $pageIndex$delegate, resultContinuation) {
-    this.m43_1 = $it;
-    this.n43_1 = this$0;
-    this.o43_1 = $parseFile;
-    this.p43_1 = $pageIndex$delegate;
+    this.k43_1 = $it;
+    this.l43_1 = this$0;
+    this.m43_1 = $parseFile;
+    this.n43_1 = $pageIndex$delegate;
     CoroutineImpl.call(this, resultContinuation);
   }
-  protoOf(PageCollectionPage$buildPagesFromParsedPages$slambda$slambda).t3n = function ($this$async, $completion) {
+  protoOf(PageCollectionPage$buildPagesFromParsedPages$slambda$slambda).r3n = 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.t3n((!(p1 == null) ? isInterface(p1, CoroutineScope) : false) ? p1 : THROW_CCE(), $completion);
+    return this.r3n((!(p1 == null) ? isInterface(p1, CoroutineScope) : false) ? p1 : THROW_CCE(), $completion);
   };
   protoOf(PageCollectionPage$buildPagesFromParsedPages$slambda$slambda).u9 = function () {
     var suspendResult = this.e9_1;
@@ -8582,12 +8582,12 @@
           case 0:
             this.d9_1 = 3;
             var tmp_0 = this;
-            var tmp0_safe_receiver = this.m43_1.w43_1;
+            var tmp0_safe_receiver = this.k43_1.u43_1;
             var tmp_1;
             if (tmp0_safe_receiver == null) {
               tmp_1 = null;
             } else {
-              tmp_1 = buildPagesFromParsedPages$lambda(this.p43_1).k2(tmp0_safe_receiver);
+              tmp_1 = buildPagesFromParsedPages$lambda(this.n43_1).k2(tmp0_safe_receiver);
             }
             var tmp1_elvis_lhs = tmp_1;
@@ -8598,20 +8598,20 @@
               tmp_2 = tmp1_elvis_lhs;
             }
-            tmp_0.r43_1 = tmp_2;
-            this.s43_1 = Companion_getInstance_48();
-            this.t43_1 = this.m43_1.w43_1;
+            tmp_0.p43_1 = tmp_2;
+            this.q43_1 = Companion_getInstance_48();
+            this.r43_1 = this.k43_1.u43_1;
             this.c9_1 = 1;
-            suspendResult = this.o43_1(this.r43_1, this);
+            suspendResult = this.m43_1(this.p43_1, this);
             if (suspendResult === get_COROUTINE_SUSPENDED()) {
               return suspendResult;
             }
             continue $sm;
           case 1:
-            this.u43_1 = suspendResult;
+            this.s43_1 = suspendResult;
             this.c9_1 = 2;
-            suspendResult = this.s43_1.z3n(this.n43_1, this.t43_1, this.u43_1, this.o43_1, this);
+            suspendResult = this.q43_1.x3n(this.l43_1, this.r43_1, this.s43_1, this.m43_1, this);
             if (suspendResult === get_COROUTINE_SUSPENDED()) {
               return suspendResult;
             }
@@ -8634,32 +8634,32 @@
      while (true);
   };
   protoOf(PageCollectionPage$buildPagesFromParsedPages$slambda$slambda).v19 = function ($this$async, completion) {
-    var i = new PageCollectionPage$buildPagesFromParsedPages$slambda$slambda(this.m43_1, this.n43_1, this.o43_1, this.p43_1, completion);
-    i.q43_1 = $this$async;
+    var i = new PageCollectionPage$buildPagesFromParsedPages$slambda$slambda(this.k43_1, this.l43_1, this.m43_1, this.n43_1, completion);
+    i.o43_1 = $this$async;
     return i;
   };
   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.t3n($this$async, $completion);
+      return i.r3n($this$async, $completion);
     };
     l.$arity = 1;
     return l;
   }
   function Companion_46() {
-    this.i42_1 = 'page-collection';
-    this.j42_1 = 'pages';
-    this.k42_1 = 'import';
-    this.l42_1 = 'filename';
+    this.g42_1 = 'page-collection';
+    this.h42_1 = 'pages';
+    this.i42_1 = 'import';
+    this.j42_1 = 'filename';
     this.PARENT_PARAM_ACTIVE_PAGE = 'active-page';
   }
-  protoOf(Companion_46).x43 = function () {
-    return this.i42_1;
+  protoOf(Companion_46).v43 = function () {
+    return this.g42_1;
   };
-  protoOf(Companion_46).y43 = function () {
+  protoOf(Companion_46).w43 = function () {
     return this.PARENT_PARAM_ACTIVE_PAGE;
   };
-  protoOf(Companion_46).m42 = function (container, fileName, parser, parseFile, $completion) {
+  protoOf(Companion_46).k42 = function (container, fileName, parser, parseFile, $completion) {
     var tmp = new $parseCOROUTINE$2(this, container, fileName, parser, parseFile, $completion);
     tmp.e9_1 = Unit_instance;
     tmp.f9_1 = null;
@@ -8670,19 +8670,19 @@
     return Companion_instance_47;
   }
   function _set_pages__j2nojl_0($this, _set____db54di) {
-    return $this.t44_1.v3q($this, pages$factory_1(), _set____db54di);
+    return $this.r44_1.t3q($this, pages$factory_1(), _set____db54di);
   }
   function PageCollectionPage_init_$Init$(container, fileName, parser, $this) {
     Page_init_$Init$(container, fileName, parser, $this);
     PageCollectionPage.call($this);
     parser.u3c(2, 'https://mobile-content-api.cru.org/xmlns/page', 'page');
-    Companion_getInstance_48().a40(parser, 'page-collection');
+    Companion_getInstance_48().y3z(parser, 'page-collection');
     var tmp = $this;
     // Inline function 'kotlin.collections.mutableListOf' call
-    tmp.r44_1 = ArrayList_init_$Create$();
+    tmp.p44_1 = ArrayList_init_$Create$();
     var tmp_0 = $this;
     // Inline function 'kotlin.collections.mutableListOf' call
-    tmp_0.s44_1 = ArrayList_init_$Create$();
+    tmp_0.q44_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))
@@ -8691,14 +8691,14 @@
       var tmp0_subject = parser.w3c();
       if (tmp0_subject === 'https://mobile-content-api.cru.org/xmlns/analytics') {
         if (parser.q2() === 'events') {
-          var tmp0 = $this.r44_1;
+          var tmp0 = $this.p44_1;
           // Inline function 'kotlin.collections.plusAssign' call
           var elements = Companion_instance_4.y3c(parser, $this);
           addAll(tmp0, elements);
         }
       } else if (tmp0_subject === 'https://mobile-content-api.cru.org/xmlns/page') {
         if (parser.q2() === 'pages') {
-          var tmp2 = $this.s44_1;
+          var tmp2 = $this.q44_1;
           // Inline function 'kotlin.collections.plusAssign' call
           var elements_0 = parsePages_0(parser, $this);
           addAll(tmp2, elements_0);
@@ -8728,7 +8728,7 @@
       if (_this__u8e3s4.w3c() === 'https://mobile-content-api.cru.org/xmlns/page') {
         var tmp1_subject = _this__u8e3s4.q2();
         if (tmp1_subject === 'page') {
-          var tmp2_safe_receiver = Companion_getInstance_48().h42($this, null, _this__u8e3s4);
+          var tmp2_safe_receiver = Companion_getInstance_48().f42($this, null, _this__u8e3s4);
           if (tmp2_safe_receiver == null)
             null;
           else {
@@ -8755,8 +8755,8 @@
   function PageOrImport(page, ref) {
     page = page === VOID ? null : page;
     ref = ref === VOID ? null : ref;
-    this.v43_1 = page;
-    this.w43_1 = ref;
+    this.t43_1 = page;
+    this.u43_1 = ref;
   }
   function buildPagesFromParsedPages$lambda($pageIndex$delegate) {
     // Inline function 'kotlin.getValue' call
@@ -8777,26 +8777,26 @@
         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.a3p_1, element.b3p_1);
+        var pair = to(element.y3o_1, element.z3o_1);
         destination.y3(pair.rf_1, pair.sf_1);
       }
       return destination;
     };
   }
   function PageCollectionPage$buildPagesFromParsedPages$slambda(this$0, $parseFile, $pageIndex$delegate, resultContinuation) {
-    this.n45_1 = this$0;
-    this.o45_1 = $parseFile;
-    this.p45_1 = $pageIndex$delegate;
+    this.l45_1 = this$0;
+    this.m45_1 = $parseFile;
+    this.n45_1 = $pageIndex$delegate;
     CoroutineImpl.call(this, resultContinuation);
   }
-  protoOf(PageCollectionPage$buildPagesFromParsedPages$slambda).r45 = function ($this$coroutineScope, $completion) {
+  protoOf(PageCollectionPage$buildPagesFromParsedPages$slambda).p45 = function ($this$coroutineScope, $completion) {
     var tmp = this.v19($this$coroutineScope, $completion);
     tmp.e9_1 = Unit_instance;
     tmp.f9_1 = null;
     return tmp.u9();
   };
   protoOf(PageCollectionPage$buildPagesFromParsedPages$slambda).ea = function (p1, $completion) {
-    return this.r45((!(p1 == null) ? isInterface(p1, CoroutineScope) : false) ? p1 : THROW_CCE(), $completion);
+    return this.p45((!(p1 == null) ? isInterface(p1, CoroutineScope) : false) ? p1 : THROW_CCE(), $completion);
   };
   protoOf(PageCollectionPage$buildPagesFromParsedPages$slambda).u9 = function () {
     var suspendResult = this.e9_1;
@@ -8807,12 +8807,12 @@
           case 0:
             this.d9_1 = 2;
             this.c9_1 = 1;
-            var this_0 = this.n45_1.s44_1;
+            var this_0 = this.l45_1.q44_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 tmp0_safe_receiver = item.v43_1;
+              var tmp0_safe_receiver = item.t43_1;
               var tmp_0;
               if (tmp0_safe_receiver == null) {
                 tmp_0 = null;
@@ -8822,7 +8822,7 @@
               var tmp1_elvis_lhs = tmp_0;
               var tmp_1;
               if (tmp1_elvis_lhs == null) {
-                tmp_1 = async(this.q45_1, VOID, VOID, PageCollectionPage$buildPagesFromParsedPages$slambda$slambda_0(item, this.n45_1, this.o45_1, this.p45_1, null));
+                tmp_1 = async(this.o45_1, VOID, VOID, PageCollectionPage$buildPagesFromParsedPages$slambda$slambda_0(item, this.l45_1, this.m45_1, this.n45_1, null));
               } else {
                 tmp_1 = tmp1_elvis_lhs;
               }
@@ -8853,22 +8853,22 @@
      while (true);
   };
   protoOf(PageCollectionPage$buildPagesFromParsedPages$slambda).v19 = function ($this$coroutineScope, completion) {
-    var i = new PageCollectionPage$buildPagesFromParsedPages$slambda(this.n45_1, this.o45_1, this.p45_1, completion);
-    i.q45_1 = $this$coroutineScope;
+    var i = new PageCollectionPage$buildPagesFromParsedPages$slambda(this.l45_1, this.m45_1, this.n45_1, completion);
+    i.o45_1 = $this$coroutineScope;
     return i;
   };
   function PageCollectionPage$buildPagesFromParsedPages$slambda_0(this$0, $parseFile, $pageIndex$delegate, resultContinuation) {
     var i = new PageCollectionPage$buildPagesFromParsedPages$slambda(this$0, $parseFile, $pageIndex$delegate, resultContinuation);
     var l = function ($this$coroutineScope, $completion) {
-      return i.r45($this$coroutineScope, $completion);
+      return i.p45($this$coroutineScope, $completion);
     };
     l.$arity = 1;
     return l;
   }
   function $buildPagesFromParsedPagesCOROUTINE$3(_this__u8e3s4, parseFile, resultContinuation) {
     CoroutineImpl.call(this, resultContinuation);
-    this.c45_1 = _this__u8e3s4;
-    this.d45_1 = parseFile;
+    this.a45_1 = _this__u8e3s4;
+    this.b45_1 = parseFile;
   }
   protoOf($buildPagesFromParsedPagesCOROUTINE$3).u9 = function () {
     var suspendResult = this.e9_1;
@@ -8879,9 +8879,9 @@
           case 0:
             this.d9_1 = 2;
             var tmp_0 = this;
-            tmp_0.e45_1 = lazy(PageCollectionPage$buildPagesFromParsedPages$lambda(this.c45_1));
+            tmp_0.c45_1 = lazy(PageCollectionPage$buildPagesFromParsedPages$lambda(this.a45_1));
             this.c9_1 = 1;
-            suspendResult = coroutineScope(PageCollectionPage$buildPagesFromParsedPages$slambda_0(this.c45_1, this.d45_1, this.e45_1, null), this);
+            suspendResult = coroutineScope(PageCollectionPage$buildPagesFromParsedPages$slambda_0(this.a45_1, this.b45_1, this.c45_1, null), this);
             if (suspendResult === get_COROUTINE_SUSPENDED()) {
               return suspendResult;
             }
@@ -8889,7 +8889,7 @@
             continue $sm;
           case 1:
             var ARGUMENT = suspendResult;
-            _set_pages__j2nojl_0(this.c45_1, ARGUMENT);
+            _set_pages__j2nojl_0(this.a45_1, ARGUMENT);
             return Unit_instance;
           case 2:
             throw this.f9_1;
@@ -8906,35 +8906,35 @@
      while (true);
   };
   protoOf(PageCollectionPage).d3i = function () {
-    return this.r44_1;
+    return this.p44_1;
   };
-  protoOf(PageCollectionPage).p3l = function () {
-    return this.t44_1.j3s(this, pages$factory_2());
+  protoOf(PageCollectionPage).n3l = function () {
+    return this.r44_1.h3s(this, pages$factory_2());
   };
-  protoOf(PageCollectionPage).q3l = function (type) {
+  protoOf(PageCollectionPage).o3l = function (type) {
     return type.equals(getKClass(ContentPage));
   };
   function PageCollectionPage() {
-    this.t44_1 = setOnce();
+    this.r44_1 = setOnce();
   }
   function pages$factory_1() {
     return getPropertyCallableRef('pages', 1, KMutableProperty1, function (receiver) {
-      return receiver.p3l();
+      return receiver.n3l();
     }, function (receiver, value) {
       return _set_pages__j2nojl_0(receiver, value);
     });
   }
   function pages$factory_2() {
     return getPropertyCallableRef('pages', 1, KMutableProperty1, function (receiver) {
-      return receiver.p3l();
+      return receiver.n3l();
     }, function (receiver, value) {
       return _set_pages__j2nojl_0(receiver, value);
     });
   }
   function Companion_47() {
-    this.w3q_1 = 'items';
+    this.u3q_1 = 'items';
   }
-  protoOf(Companion_47).x3q = function (_this__u8e3s4, manifest) {
+  protoOf(Companion_47).v3q = function (_this__u8e3s4, manifest) {
     // Inline function 'kotlin.collections.buildList' call
     // Inline function 'kotlin.collections.buildListInternal' call
     // Inline function 'kotlin.apply' call
@@ -8947,7 +8947,7 @@
         continue $l$loop_0;
       // Inline function 'org.cru.godtools.shared.tool.parser.model.shareable.Companion.parseShareableItems.<anonymous>.<anonymous>' call
       if (_this__u8e3s4.w3c() === 'https://mobile-content-api.cru.org/xmlns/shareable') {
-        var tmp1_safe_receiver = Companion_instance_48.s45(manifest, _this__u8e3s4);
+        var tmp1_safe_receiver = Companion_instance_48.q45(manifest, _this__u8e3s4);
         if (tmp1_safe_receiver == null)
           null;
         else {
@@ -8962,8 +8962,8 @@
     }
     return this_0.p3();
   };
-  protoOf(Companion_47).s45 = function (manifest, parser) {
-    parser.t45(2, 'https://mobile-content-api.cru.org/xmlns/shareable');
+  protoOf(Companion_47).q45 = function (manifest, parser) {
+    parser.r45(2, 'https://mobile-content-api.cru.org/xmlns/shareable');
     var tmp;
     if (parser.w3c() === 'https://mobile-content-api.cru.org/xmlns/shareable') {
       tmp = parser.q2() === 'image' ? ShareableImage_init_$Create$(manifest, parser) : null;
@@ -8979,21 +8979,21 @@
   function Shareable_init_$Init$(parent, parser, $this) {
     BaseModel.call($this, parent);
     Shareable.call($this);
-    parser.t45(2, 'https://mobile-content-api.cru.org/xmlns/shareable');
-    $this.c3r_1 = parser.j3e('id');
+    parser.r45(2, 'https://mobile-content-api.cru.org/xmlns/shareable');
+    $this.a3r_1 = parser.j3e('id');
     var tmp = $this;
     var tmp0_safe_receiver = parser.j3e('order');
     var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : toIntOrNull(tmp0_safe_receiver);
-    tmp.d3r_1 = tmp1_elvis_lhs == null ? 2147483647 : tmp1_elvis_lhs;
+    tmp.b3r_1 = tmp1_elvis_lhs == null ? 2147483647 : tmp1_elvis_lhs;
     return $this;
   }
   protoOf(Shareable).o3d = function () {
-    return this.c3r_1;
+    return this.a3r_1;
   };
   function Shareable() {
   }
   function Companion_48() {
-    this.u45_1 = 'image';
+    this.s45_1 = 'image';
   }
   var Companion_instance_49;
   function Companion_getInstance_51() {
@@ -9003,7 +9003,7 @@
     Shareable_init_$Init$(manifest, parser, $this);
     ShareableImage.call($this);
     parser.u3c(2, 'https://mobile-content-api.cru.org/xmlns/shareable', 'image');
-    $this.y45_1 = parser.j3e('resource');
+    $this.w45_1 = parser.j3e('resource');
     var description = null;
     // Inline function 'org.cru.godtools.shared.tool.parser.xml.parseChildren' call
     $l$loop_0: while (!(parser.l() === 3)) {
@@ -9018,7 +9018,7 @@
         continue $l$loop_0;
       skipTag(parser);
     }
-    $this.z45_1 = description;
+    $this.x45_1 = description;
     return $this;
   }
   function ShareableImage_init_$Create$(manifest, parser) {
@@ -9026,12 +9026,12 @@
   }
   protoOf(ShareableImage).o3d = function () {
     var tmp0_elvis_lhs = protoOf(Shareable).o3d.call(this);
-    return tmp0_elvis_lhs == null ? this.y45_1 : tmp0_elvis_lhs;
+    return tmp0_elvis_lhs == null ? this.w45_1 : tmp0_elvis_lhs;
   };
   function ShareableImage() {
   }
   function Companion_49() {
-    this.a46_1 = 'tip';
+    this.y45_1 = 'tip';
   }
   var Companion_instance_50;
   function Companion_getInstance_52() {
@@ -9061,8 +9061,8 @@
   protoOf(InlineTip).o3d = function () {
     return this.id;
   };
-  protoOf(InlineTip).h46 = function () {
-    return this.x39().s3s(this.id);
+  protoOf(InlineTip).f46 = function () {
+    return this.x39().q3s(this.id);
   };
   protoOf(InlineTip).a3e = function () {
     return listOfNotNull(this.tip);
@@ -9076,9 +9076,9 @@
   var Type_QUOTE_instance;
   function Companion_50() {
     Companion_instance_51 = this;
-    this.i46_1 = Type_TIP_getInstance();
+    this.g46_1 = Type_TIP_getInstance();
   }
-  protoOf(Companion_50).g3m = function (_this__u8e3s4) {
+  protoOf(Companion_50).e3m = function (_this__u8e3s4) {
     switch (_this__u8e3s4) {
       case 'tip':
         return Type_TIP_getInstance();
@@ -9117,11 +9117,11 @@
     BaseModel.call($this, manifest);
     Tip.call($this);
     parser.u3c(2, 'https://mobile-content-api.cru.org/xmlns/training', 'tip');
-    $this.p3p_1 = id;
+    $this.n3p_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().g3m(tmp0_safe_receiver);
-    tmp.q3p_1 = tmp1_elvis_lhs == null ? Companion_getInstance_53().i46_1 : tmp1_elvis_lhs;
+    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 tmp_0 = $this;
     // Inline function 'kotlin.collections.buildList' call
     // Inline function 'kotlin.collections.buildListInternal' call
@@ -9142,7 +9142,7 @@
         continue $l$loop_0;
       skipTag(parser);
     }
-    tmp_0.r3p_1 = this_0.p3();
+    tmp_0.p3p_1 = this_0.p3();
     return $this;
   }
   function Tip_init_$Create$(manifest, id, parser) {
@@ -9151,12 +9151,12 @@
   function Tip_init_$Init$_0(manifest, id, type, $this) {
     manifest = manifest === VOID ? null : manifest;
     id = id === VOID ? '' : id;
-    type = type === VOID ? Companion_getInstance_53().i46_1 : type;
+    type = type === VOID ? Companion_getInstance_53().g46_1 : type;
     BaseModel.call($this, manifest);
     Tip.call($this);
-    $this.p3p_1 = id;
-    $this.q3p_1 = type;
-    $this.r3p_1 = emptyList();
+    $this.n3p_1 = id;
+    $this.o3p_1 = type;
+    $this.p3p_1 = emptyList();
     return $this;
   }
   function Tip_init_$Create$_0(manifest, id, type) {
@@ -9220,7 +9220,7 @@
   function Tip() {
   }
   function Companion_51() {
-    this.j46_1 = 'page';
+    this.h46_1 = 'page';
   }
   var Companion_instance_52;
   function Companion_getInstance_54() {
@@ -9230,8 +9230,8 @@
     BaseModel.call($this, tip);
     TipPage.call($this);
     parser.u3c(2, 'https://mobile-content-api.cru.org/xmlns/training', 'page');
-    $this.l46_1 = tip;
-    $this.m46_1 = position;
+    $this.j46_1 = tip;
+    $this.k46_1 = position;
     var tmp = $this;
     // Inline function 'org.cru.godtools.shared.tool.parser.model.parseContent' call
     // Inline function 'kotlin.collections.buildList' call
@@ -9278,19 +9278,19 @@
         continue $l$loop_0;
       skipTag(parser);
     }
-    tmp.n46_1 = this_0.p3();
+    tmp.l46_1 = this_0.p3();
     return $this;
   }
   function TipPage_init_$Create$(tip, position, parser) {
     return TipPage_init_$Init$(tip, position, parser, objectCreate(protoOf(TipPage)));
   }
   protoOf(TipPage).q3d = function () {
-    return this.n46_1;
+    return this.l46_1;
   };
   function TipPage() {
   }
   function Companion_52() {
-    this.o46_1 = 'call-to-action';
+    this.m46_1 = 'call-to-action';
   }
   var Companion_instance_53;
   function Companion_getInstance_55() {
@@ -9299,10 +9299,10 @@
   function CallToAction_init_$Init$(parent, $this) {
     BaseModel.call($this, parent);
     CallToAction.call($this);
-    $this.q46_1 = parent;
+    $this.o46_1 = parent;
     $this.label = null;
-    $this.r46_1 = null;
-    $this.s46_1 = null;
+    $this.p46_1 = null;
+    $this.q46_1 = null;
     return $this;
   }
   function CallToAction_init_$Create$(parent) {
@@ -9312,11 +9312,11 @@
     BaseModel.call($this, page);
     CallToAction.call($this);
     parser.u3c(2, 'https://mobile-content-api.cru.org/xmlns/tract', 'call-to-action');
-    $this.q46_1 = page;
+    $this.o46_1 = page;
     var tmp = $this;
     var tmp0_safe_receiver = parser.j3e('control-color');
-    tmp.r46_1 = tmp0_safe_receiver == null ? null : toColorOrNull(tmp0_safe_receiver);
-    $this.s46_1 = parser.f3f('https://mobile-content-api.cru.org/xmlns/training', 'tip');
+    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.label = parseTextChild(parser, $this, 'https://mobile-content-api.cru.org/xmlns/tract', 'call-to-action');
     return $this;
   }
@@ -9330,33 +9330,33 @@
     tip = tip === VOID ? null : tip;
     BaseModel.call($this, page);
     CallToAction.call($this);
-    $this.q46_1 = page;
+    $this.o46_1 = page;
     var tmp = $this;
     tmp.label = label == null ? null : label($this);
-    $this.r46_1 = controlColor;
-    $this.s46_1 = tip;
+    $this.p46_1 = controlColor;
+    $this.q46_1 = tip;
     return $this;
   }
   function createTestCallToAction(page, label, controlColor, tip) {
     return CallToAction_init_$Init$_1(page, label, controlColor, tip, objectCreate(protoOf(CallToAction)));
   }
-  protoOf(CallToAction).r3m = function () {
+  protoOf(CallToAction).p3m = function () {
     return this.label;
   };
-  protoOf(CallToAction).q3z = function () {
-    var tmp0_elvis_lhs = this.r46_1;
+  protoOf(CallToAction).o3z = function () {
+    var tmp0_elvis_lhs = this.p46_1;
     return tmp0_elvis_lhs == null ? get_primaryColor_0(get_stylesParent(this)) : tmp0_elvis_lhs;
   };
-  protoOf(CallToAction).t46 = function () {
-    return this.s46_1;
+  protoOf(CallToAction).r46 = function () {
+    return this.q46_1;
   };
-  protoOf(CallToAction).h46 = function () {
-    return this.x39().s3s(this.s46_1);
+  protoOf(CallToAction).f46 = function () {
+    return this.x39().q3s(this.q46_1);
   };
   function CallToAction() {
   }
   function Companion_53() {
-    this.u46_1 = 'header';
+    this.s46_1 = 'header';
   }
   var Companion_instance_54;
   function Companion_getInstance_56() {
@@ -9368,8 +9368,8 @@
     parser.u3c(2, 'https://mobile-content-api.cru.org/xmlns/tract', 'header');
     var tmp = $this;
     var tmp0_safe_receiver = parser.j3e('background-color');
-    tmp.w46_1 = tmp0_safe_receiver == null ? null : toColorOrNull(tmp0_safe_receiver);
-    $this.x46_1 = parser.f3f('https://mobile-content-api.cru.org/xmlns/training', 'tip');
+    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');
     var number = null;
     var title = null;
     // Inline function 'org.cru.godtools.shared.tool.parser.xml.parseChildren' call
@@ -9395,8 +9395,8 @@
   function Header_init_$Create$(page, parser) {
     return Header_init_$Init$(page, parser, objectCreate(protoOf(Header)));
   }
-  protoOf(Header).q3r = function () {
-    var tmp0_elvis_lhs = this.w46_1;
+  protoOf(Header).o3r = function () {
+    var tmp0_elvis_lhs = this.u46_1;
     return tmp0_elvis_lhs == null ? this.y3i() : tmp0_elvis_lhs;
   };
   protoOf(Header).w3i = function () {
@@ -9405,26 +9405,26 @@
   protoOf(Header).dj = function () {
     return this.number;
   };
-  protoOf(Header).v3r = function () {
+  protoOf(Header).t3r = function () {
     return this.title;
   };
-  protoOf(Header).t46 = function () {
-    return this.x46_1;
+  protoOf(Header).r46 = function () {
+    return this.v46_1;
   };
-  protoOf(Header).h46 = function () {
-    return this.x39().s3s(this.x46_1);
+  protoOf(Header).f46 = function () {
+    return this.x39().q3s(this.v46_1);
   };
   function Header() {
   }
   function Companion_54() {
-    this.y46_1 = 'hero';
+    this.w46_1 = 'hero';
   }
   var Companion_instance_55;
   function Companion_getInstance_57() {
     return Companion_instance_55;
   }
   function _get_headingParent__2ts5bv($this) {
-    var tmp0 = $this.a47_1;
+    var tmp0 = $this.y46_1;
     // Inline function 'kotlin.getValue' call
     headingParent$factory();
     return tmp0.h2();
@@ -9435,7 +9435,7 @@
     parser.u3c(2, 'https://mobile-content-api.cru.org/xmlns/tract', 'hero');
     var tmp = $this;
     // Inline function 'kotlin.collections.mutableListOf' call
-    tmp.c47_1 = ArrayList_init_$Create$();
+    tmp.a47_1 = ArrayList_init_$Create$();
     var heading = null;
     var tmp_0 = $this;
     // Inline function 'org.cru.godtools.shared.tool.parser.model.parseContent' call
@@ -9455,7 +9455,7 @@
         var tmp0_subject = parser.w3c();
         if (tmp0_subject === 'https://mobile-content-api.cru.org/xmlns/analytics') {
           if (parser.q2() === 'events') {
-            var tmp0 = $this.c47_1;
+            var tmp0 = $this.a47_1;
             // Inline function 'kotlin.collections.plusAssign' call
             var elements = Companion_instance_4.y3c(parser, $this);
             addAll(tmp0, elements);
@@ -9495,7 +9495,7 @@
         continue $l$loop_0;
       skipTag(parser);
     }
-    tmp_0.b47_1 = this_0.p3();
+    tmp_0.z46_1 = this_0.p3();
     $this.heading = heading;
     return $this;
   }
@@ -9508,10 +9508,10 @@
     heading = heading === VOID ? null : heading;
     BaseModel.call($this, page);
     Hero.call($this);
-    $this.c47_1 = analyticsEvents;
+    $this.a47_1 = analyticsEvents;
     var tmp = $this;
     tmp.heading = heading == null ? null : heading(_get_headingParent__2ts5bv($this));
-    $this.b47_1 = emptyList();
+    $this.z46_1 = emptyList();
     return $this;
   }
   function createTestHero(page, analyticsEvents, heading) {
@@ -9527,14 +9527,14 @@
       return stylesOverride(this$0, VOID, Hero$headingParent$delegate$lambda$lambda(this$0));
     };
   }
-  protoOf(Hero).d47 = function () {
+  protoOf(Hero).b47 = function () {
     return this.heading;
   };
   protoOf(Hero).q3d = function () {
-    return this.b47_1;
+    return this.z46_1;
   };
   protoOf(Hero).d3i = function () {
-    return this.c47_1;
+    return this.a47_1;
   };
   protoOf(Hero).r3d = function (type) {
     var tmp;
@@ -9542,7 +9542,7 @@
       case 0:
         // Inline function 'kotlin.collections.filter' call
-        var tmp0 = this.c47_1;
+        var tmp0 = this.a47_1;
         // Inline function 'kotlin.collections.filterTo' call
         var destination = ArrayList_init_$Create$();
@@ -9560,7 +9560,7 @@
       case 1:
         // Inline function 'kotlin.collections.filter' call
-        var tmp0_0 = this.c47_1;
+        var tmp0_0 = this.a47_1;
         // Inline function 'kotlin.collections.filterTo' call
         var destination_0 = ArrayList_init_$Create$();
@@ -9586,7 +9586,7 @@
   };
   function Hero() {
     var tmp = this;
-    tmp.a47_1 = lazy(Hero$headingParent$delegate$lambda(this));
+    tmp.y46_1 = lazy(Hero$headingParent$delegate$lambda(this));
   }
   function headingParent$factory() {
     return getPropertyCallableRef('headingParent', 1, KProperty1, function (receiver) {
@@ -9594,7 +9594,7 @@
     }, null);
   }
   function Companion_55() {
-    this.e47_1 = 'modal';
+    this.c47_1 = 'modal';
   }
   var Companion_instance_56;
   function Companion_getInstance_58() {
@@ -9669,29 +9669,29 @@
         continue $l$loop_0;
       skipTag(parser);
     }
-    tmp_1.a48_1 = this_2.p3();
+    tmp_1.y47_1 = this_2.p3();
     $this.title = title;
     return $this;
   }
   function Modal_init_$Create$(parent, parser) {
     return Modal_init_$Init$(parent, parser, objectCreate(protoOf(Modal)));
   }
-  protoOf(Modal).u40 = function () {
+  protoOf(Modal).s40 = function () {
     return this.page;
   };
   protoOf(Modal).o3d = function () {
     return this.page.id + '-' + _get_position__iahqv2(this);
   };
-  protoOf(Modal).v3r = function () {
+  protoOf(Modal).t3r = function () {
     return this.title;
   };
   protoOf(Modal).q3d = function () {
-    return this.a48_1;
+    return this.y47_1;
   };
-  protoOf(Modal).y3v = function () {
+  protoOf(Modal).w3v = function () {
     return this._listeners;
   };
-  protoOf(Modal).n3r = function () {
+  protoOf(Modal).l3r = function () {
     return this._dismissListeners;
   };
   protoOf(Modal).y3i = function () {
@@ -9712,12 +9712,12 @@
   protoOf(Modal).w3i = function () {
     return get_WHITE();
   };
-  protoOf(Modal).t3s = function () {
+  protoOf(Modal).r3s = function () {
     // Inline function 'kotlin.collections.toTypedArray' call
     var this_0 = this._dismissListeners;
     return copyToArray(this_0);
   };
-  protoOf(Modal).z3v = function () {
+  protoOf(Modal).x3v = function () {
     // Inline function 'kotlin.collections.toTypedArray' call
     var this_0 = this._listeners;
     return copyToArray(this_0);
@@ -9726,11 +9726,11 @@
   }
   function Companion_56() {
     Companion_instance_57 = this;
-    this.b48_1 = 'card';
-    this.c48_1 = 'label';
-    this.d48_1 = 'hidden';
-    this.e48_1 = ImageScaleType_FILL_X_getInstance();
-    this.f48_1 = Companion_getInstance_22().CENTER;
+    this.z47_1 = 'card';
+    this.a48_1 = 'label';
+    this.b48_1 = 'hidden';
+    this.c48_1 = ImageScaleType_FILL_X_getInstance();
+    this.d48_1 = Companion_getInstance_22().CENTER;
   }
   var Companion_instance_57;
   function Companion_getInstance_59() {
@@ -9739,7 +9739,7 @@
     return Companion_instance_57;
   }
   function _get_labelParent__664ln7($this) {
-    var tmp0 = $this.m48_1;
+    var tmp0 = $this.k48_1;
     // Inline function 'kotlin.getValue' call
     labelParent$factory();
     return tmp0.h2();
@@ -9766,22 +9766,22 @@
     tmp_1._dismissListeners = toSet_0(tmp$ret$1);
     var tmp_2 = $this;
     var tmp2_safe_receiver = parser.j3e('background-color');
-    tmp_2.h48_1 = tmp2_safe_receiver == null ? null : toColorOrNull(tmp2_safe_receiver);
-    $this.i48_1 = parser.j3e('background-image');
+    tmp_2.f48_1 = tmp2_safe_receiver == null ? null : toColorOrNull(tmp2_safe_receiver);
+    $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);
-    tmp_3.j48_1 = tmp4_elvis_lhs == null ? Companion_getInstance_59().f48_1 : tmp4_elvis_lhs;
+    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.e3m(tmp5_safe_receiver);
-    tmp_4.k48_1 = tmp6_elvis_lhs == null ? Companion_getInstance_59().e48_1 : tmp6_elvis_lhs;
+    var tmp6_elvis_lhs = tmp5_safe_receiver == null ? null : Companion_instance_22.c3m(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');
-    tmp_5.l48_1 = tmp7_safe_receiver == null ? null : toColorOrNull(tmp7_safe_receiver);
+    tmp_5.j48_1 = tmp7_safe_receiver == null ? null : toColorOrNull(tmp7_safe_receiver);
     var tmp_6 = $this;
     // Inline function 'kotlin.collections.mutableListOf' call
-    tmp_6.o48_1 = ArrayList_init_$Create$();
+    tmp_6.m48_1 = ArrayList_init_$Create$();
     var label = null;
     var tmp_7 = $this;
     // Inline function 'org.cru.godtools.shared.tool.parser.model.parseContent' call
@@ -9801,7 +9801,7 @@
         var tmp0_subject = parser.w3c();
         if (tmp0_subject === 'https://mobile-content-api.cru.org/xmlns/analytics') {
           if (parser.q2() === 'events') {
-            var tmp0 = $this.o48_1;
+            var tmp0 = $this.m48_1;
             // Inline function 'kotlin.collections.plusAssign' call
             var elements = Companion_instance_4.y3c(parser, $this);
             addAll(tmp0, elements);
@@ -9841,7 +9841,7 @@
         continue $l$loop_0;
       skipTag(parser);
     }
-    tmp_7.n48_1 = this_2.p3();
+    tmp_7.l48_1 = this_2.p3();
     $this.label = label;
     return $this;
   }
@@ -9853,8 +9853,8 @@
     position = position === VOID ? 0 : position;
     backgroundColor = backgroundColor === VOID ? null : backgroundColor;
     backgroundImage = backgroundImage === VOID ? null : backgroundImage;
-    backgroundImageGravity = backgroundImageGravity === VOID ? Companion_getInstance_59().f48_1 : backgroundImageGravity;
-    backgroundImageScaleType = backgroundImageScaleType === VOID ? Companion_getInstance_59().e48_1 : backgroundImageScaleType;
+    backgroundImageGravity = backgroundImageGravity === VOID ? Companion_getInstance_59().d48_1 : backgroundImageGravity;
+    backgroundImageScaleType = backgroundImageScaleType === VOID ? Companion_getInstance_59().c48_1 : backgroundImageScaleType;
     isHidden = isHidden === VOID ? false : isHidden;
     analyticsEvents = analyticsEvents === VOID ? emptyList() : analyticsEvents;
     label = label === VOID ? null : label;
@@ -9866,18 +9866,18 @@
     $this.isHidden = isHidden;
     $this._listeners = emptySet();
     $this._dismissListeners = emptySet();
-    $this.o48_1 = analyticsEvents;
-    $this.h48_1 = backgroundColor;
-    $this.i48_1 = backgroundImage;
-    $this.j48_1 = backgroundImageGravity;
-    $this.k48_1 = backgroundImageScaleType;
-    $this.l48_1 = null;
+    $this.m48_1 = analyticsEvents;
+    $this.f48_1 = backgroundColor;
+    $this.g48_1 = backgroundImage;
+    $this.h48_1 = backgroundImageGravity;
+    $this.i48_1 = backgroundImageScaleType;
+    $this.j48_1 = null;
     var tmp = $this;
     tmp.label = label == null ? null : label(_get_labelParent__664ln7($this));
     var tmp_0 = $this;
     // Inline function 'kotlin.collections.orEmpty' call
     var tmp0_elvis_lhs = content == null ? null : content($this);
-    tmp_0.n48_1 = tmp0_elvis_lhs == null ? emptyList() : tmp0_elvis_lhs;
+    tmp_0.l48_1 = tmp0_elvis_lhs == null ? emptyList() : tmp0_elvis_lhs;
     return $this;
   }
   function createTestCard(page, position, backgroundColor, backgroundImage, backgroundImageGravity, backgroundImageScaleType, isHidden, analyticsEvents, label, content) {
@@ -9899,7 +9899,7 @@
     parser.u3c(2, 'https://mobile-content-api.cru.org/xmlns/tract', 'page');
     var tmp = $this;
     var tmp0_safe_receiver = parser.j3e('card-text-color');
-    tmp.y47_1 = tmp0_safe_receiver == null ? null : toColorOrNull(tmp0_safe_receiver);
+    tmp.w47_1 = tmp0_safe_receiver == null ? null : toColorOrNull(tmp0_safe_receiver);
     var header = null;
     var hero = null;
     var tmp_0 = $this;
@@ -9958,11 +9958,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().w3n_1 : backgroundColor;
+    backgroundColor = backgroundColor === VOID ? Companion_getInstance_48().u3n_1 : backgroundColor;
     backgroundImage = backgroundImage === VOID ? null : backgroundImage;
     primaryColor = primaryColor === VOID ? null : primaryColor;
-    backgroundImageGravity = backgroundImageGravity === VOID ? Companion_getInstance_48().x3n_1 : backgroundImageGravity;
-    backgroundImageScaleType = backgroundImageScaleType === VOID ? Companion_getInstance_48().y3n_1 : backgroundImageScaleType;
+    backgroundImageGravity = backgroundImageGravity === VOID ? Companion_getInstance_48().v3n_1 : backgroundImageGravity;
+    backgroundImageScaleType = backgroundImageScaleType === VOID ? Companion_getInstance_48().w3n_1 : backgroundImageScaleType;
     textColor = textColor === VOID ? null : textColor;
     textScale = textScale === VOID ? 1.0 : textScale;
     cardBackgroundColor = cardBackgroundColor === VOID ? null : cardBackgroundColor;
@@ -9971,7 +9971,7 @@
     callToAction = callToAction === VOID ? null : callToAction;
     Page_init_$Init$_0(manifest, VOID, fileName, VOID, primaryColor, backgroundColor, backgroundImage, backgroundImageGravity, backgroundImageScaleType, VOID, cardBackgroundColor, VOID, VOID, textColor, textScale, $this);
     TractPage.call($this);
-    $this.y47_1 = cardTextColor;
+    $this.w47_1 = cardTextColor;
     $this.header = null;
     $this.hero = null;
     var tmp = $this;
@@ -9987,16 +9987,16 @@
   function createTestTractPage(manifest, fileName, backgroundColor, backgroundImage, primaryColor, backgroundImageGravity, backgroundImageScaleType, textColor, textScale, cardBackgroundColor, cardTextColor, cards, callToAction) {
     return TractPage_init_$Init$_0(manifest, fileName, backgroundColor, backgroundImage, primaryColor, backgroundImageGravity, backgroundImageScaleType, textColor, textScale, cardBackgroundColor, cardTextColor, cards, callToAction, objectCreate(protoOf(TractPage)));
   }
-  protoOf(Card_1).u40 = function () {
+  protoOf(Card_1).s40 = function () {
     return this.page;
   };
   protoOf(Card_1).o3d = function () {
     return this.page.id + '-' + this.position;
   };
-  protoOf(Card_1).x3v = function () {
+  protoOf(Card_1).v3v = function () {
     return this.position;
   };
-  protoOf(Card_1).p48 = function () {
+  protoOf(Card_1).n48 = function () {
     // Inline function 'kotlin.takeUnless' call
     var this_0 = this.page.visibleCards.r(this);
     var tmp;
@@ -10008,40 +10008,40 @@
     }
     return tmp;
   };
-  protoOf(Card_1).q48 = function () {
+  protoOf(Card_1).o48 = function () {
     return equals(this, lastOrNull(this.page.visibleCards));
   };
-  protoOf(Card_1).p3z = function () {
+  protoOf(Card_1).n3z = function () {
     return this.isHidden;
   };
-  protoOf(Card_1).y3v = function () {
+  protoOf(Card_1).w3v = function () {
     return this._listeners;
   };
-  protoOf(Card_1).n3r = function () {
+  protoOf(Card_1).l3r = function () {
     return this._dismissListeners;
   };
-  protoOf(Card_1).q3r = function () {
-    var tmp0_elvis_lhs = this.h48_1;
+  protoOf(Card_1).o3r = function () {
+    var tmp0_elvis_lhs = this.f48_1;
     return tmp0_elvis_lhs == null ? this.page.b3j() : tmp0_elvis_lhs;
   };
-  protoOf(Card_1).r3r = function () {
-    return getResource(this, this.i48_1);
+  protoOf(Card_1).p3r = function () {
+    return getResource(this, this.g48_1);
   };
-  protoOf(Card_1).s3r = function () {
-    return this.j48_1;
+  protoOf(Card_1).q3r = function () {
+    return this.h48_1;
   };
-  protoOf(Card_1).t3r = function () {
-    return this.k48_1;
+  protoOf(Card_1).r3r = function () {
+    return this.i48_1;
   };
   protoOf(Card_1).w3i = function () {
-    var tmp0_elvis_lhs = this.l48_1;
+    var tmp0_elvis_lhs = this.j48_1;
     return tmp0_elvis_lhs == null ? this.page.cardTextColor : tmp0_elvis_lhs;
   };
-  protoOf(Card_1).r3m = function () {
+  protoOf(Card_1).p3m = function () {
     return this.label;
   };
   protoOf(Card_1).q3d = function () {
-    return this.n48_1;
+    return this.l48_1;
   };
   protoOf(Card_1).a3e = function () {
     // Inline function 'org.cru.godtools.shared.tool.parser.model.contentTips' call
@@ -10059,7 +10059,7 @@
     return destination;
   };
   protoOf(Card_1).d3i = function () {
-    return this.o48_1;
+    return this.m48_1;
   };
   protoOf(Card_1).r3d = function (type) {
     var tmp;
@@ -10067,7 +10067,7 @@
       case 0:
         // Inline function 'kotlin.collections.filter' call
-        var tmp0 = this.o48_1;
+        var tmp0 = this.m48_1;
         // Inline function 'kotlin.collections.filterTo' call
         var destination = ArrayList_init_$Create$();
@@ -10085,7 +10085,7 @@
       case 1:
         // Inline function 'kotlin.collections.filter' call
-        var tmp0_0 = this.o48_1;
+        var tmp0_0 = this.m48_1;
         // Inline function 'kotlin.collections.filterTo' call
         var destination_0 = ArrayList_init_$Create$();
@@ -10109,12 +10109,12 @@
   protoOf(Card_1)._getAnalyticsEvents = function (type) {
     return this.r3d(type);
   };
-  protoOf(Card_1).t3s = function () {
+  protoOf(Card_1).r3s = function () {
     // Inline function 'kotlin.collections.toTypedArray' call
     var this_0 = this._dismissListeners;
     return copyToArray(this_0);
   };
-  protoOf(Card_1).z3v = function () {
+  protoOf(Card_1).x3v = function () {
     // Inline function 'kotlin.collections.toTypedArray' call
     var this_0 = this._listeners;
     return copyToArray(this_0);
@@ -10122,7 +10122,7 @@
   function Card_1() {
     Companion_getInstance_59();
     var tmp = this;
-    tmp.m48_1 = lazy(TractPage$Card$labelParent$delegate$lambda(this));
+    tmp.k48_1 = lazy(TractPage$Card$labelParent$delegate$lambda(this));
   }
   function parseCardsXml(_this__u8e3s4, $this) {
     // Inline function 'kotlin.collections.buildList' call
@@ -10170,22 +10170,22 @@
     }
     return this_0.p3();
   }
-  protoOf(TractPage).r48 = function () {
-    return equals(lastOrNull(this.x39().p3l()), this);
+  protoOf(TractPage).p48 = function () {
+    return equals(lastOrNull(this.x39().n3l()), this);
   };
   protoOf(TractPage).d3i = function () {
-    return this.x47_1;
+    return this.v47_1;
   };
   protoOf(TractPage).p3d = function () {
     return this.header;
   };
-  protoOf(TractPage).s48 = function () {
+  protoOf(TractPage).q48 = function () {
     return this.hero;
   };
-  protoOf(TractPage).t48 = function () {
+  protoOf(TractPage).r48 = function () {
     return this._modals;
   };
-  protoOf(TractPage).u48 = function () {
+  protoOf(TractPage).s48 = function () {
     return this.callToAction;
   };
   protoOf(TractPage).findModal = function (id) {
@@ -10206,10 +10206,10 @@
     }
     return tmp$ret$1;
   };
-  protoOf(TractPage).v40 = function () {
+  protoOf(TractPage).t40 = function () {
     return this._cards;
   };
-  protoOf(TractPage).v48 = function () {
+  protoOf(TractPage).t48 = function () {
     // Inline function 'kotlin.collections.filter' call
     var tmp0 = this._cards;
     // Inline function 'kotlin.collections.filterTo' call
@@ -10224,22 +10224,22 @@
     }
     return destination;
   };
-  protoOf(TractPage).w48 = function () {
-    var tmp0_elvis_lhs = this.y47_1;
+  protoOf(TractPage).u48 = function () {
+    var tmp0_elvis_lhs = this.w47_1;
     return tmp0_elvis_lhs == null ? this.w3i() : tmp0_elvis_lhs;
   };
-  protoOf(TractPage).w40 = function () {
+  protoOf(TractPage).u40 = function () {
     // Inline function 'kotlin.collections.toTypedArray' call
     var this_0 = this._cards;
     return copyToArray(this_0);
   };
-  protoOf(TractPage).x48 = function () {
+  protoOf(TractPage).v48 = function () {
     // Inline function 'kotlin.collections.toTypedArray' call
     var this_0 = this._modals;
     return copyToArray(this_0);
   };
   function TractPage() {
-    this.x47_1 = emptyList();
+    this.v47_1 = emptyList();
   }
   function labelParent$factory() {
     return getPropertyCallableRef('labelParent', 1, KProperty1, function (receiver) {
@@ -10250,7 +10250,7 @@
     return new FlowWatcher(launchIn(onEach(_this__u8e3s4, FlowWatcher$Companion$watchIn$slambda_0(block, null)), scope));
   }
   function FlowWatcher$Companion$watchIn$slambda($block, resultContinuation) {
-    this.g49_1 = $block;
+    this.e49_1 = $block;
     CoroutineImpl.call(this, resultContinuation);
   }
   protoOf(FlowWatcher$Companion$watchIn$slambda).g1a = function (it, $completion) {
@@ -10269,7 +10269,7 @@
         var tmp = this.c9_1;
         if (tmp === 0) {
           this.d9_1 = 1;
-          this.g49_1(this.h49_1);
+          this.e49_1(this.f49_1);
           return Unit_instance;
         } else if (tmp === 1) {
           throw this.f9_1;
@@ -10281,8 +10281,8 @@
      while (true);
   };
   protoOf(FlowWatcher$Companion$watchIn$slambda).h1a = function (it, completion) {
-    var i = new FlowWatcher$Companion$watchIn$slambda(this.g49_1, completion);
-    i.h49_1 = it;
+    var i = new FlowWatcher$Companion$watchIn$slambda(this.e49_1, completion);
+    i.f49_1 = it;
     return i;
   };
   function FlowWatcher$Companion$watchIn$slambda_0($block, resultContinuation) {
@@ -10295,7 +10295,7 @@
   }
   function Companion_57() {
   }
-  protoOf(Companion_57).d3u = function (_this__u8e3s4, block) {
+  protoOf(Companion_57).b3u = function (_this__u8e3s4, block) {
     return watchIn(_this__u8e3s4, this, CoroutineScope_0(Dispatchers_getInstance().kv()), block);
   };
   var Companion_instance_58;
@@ -10303,10 +10303,10 @@
     return Companion_instance_58;
   }
   function FlowWatcher(job) {
-    this.i49_1 = job;
+    this.g49_1 = job;
   }
   protoOf(FlowWatcher).close = function () {
-    return this.i49_1.pm();
+    return this.g49_1.pm();
   };
   function get_REGEX_SEQUENCE_SEPARATOR() {
     _init_properties_Regex_kt__v9a4ph();
@@ -10334,33 +10334,33 @@
     return EMPTY_instance;
   }
   function SetOnceProperty() {
-    this.j49_1 = EMPTY_instance;
+    this.h49_1 = EMPTY_instance;
   }
-  protoOf(SetOnceProperty).k49 = function (thisRef, property) {
+  protoOf(SetOnceProperty).i49 = function (thisRef, property) {
     // Inline function 'kotlin.check' call
-    if (!!(this.j49_1 === EMPTY_instance)) {
+    if (!!(this.h49_1 === EMPTY_instance)) {
       // Inline function 'org.cru.godtools.shared.tool.parser.util.SetOnceProperty.getValue.<anonymous>' call
       var message = "Value isn't initialized";
       throw IllegalStateException_init_$Create$(toString_0(message));
     }
-    var tmp = this.j49_1;
+    var tmp = this.h49_1;
     return (tmp == null ? true : !(tmp == null)) ? tmp : THROW_CCE();
   };
-  protoOf(SetOnceProperty).j3s = function (thisRef, property) {
-    return this.k49(!(thisRef == null) ? thisRef : THROW_CCE(), property);
+  protoOf(SetOnceProperty).h3s = function (thisRef, property) {
+    return this.i49(!(thisRef == null) ? thisRef : THROW_CCE(), property);
   };
-  protoOf(SetOnceProperty).l49 = function (thisRef, property, value) {
+  protoOf(SetOnceProperty).j49 = function (thisRef, property, value) {
     // Inline function 'kotlin.check' call
-    if (!(this.j49_1 === EMPTY_instance)) {
+    if (!(this.h49_1 === EMPTY_instance)) {
       // Inline function 'org.cru.godtools.shared.tool.parser.util.SetOnceProperty.setValue.<anonymous>' call
       var message = 'Value is initialized';
       throw IllegalStateException_init_$Create$(toString_0(message));
     }
-    this.j49_1 = value;
+    this.h49_1 = value;
   };
-  protoOf(SetOnceProperty).v3q = function (thisRef, property, value) {
+  protoOf(SetOnceProperty).t3q = function (thisRef, property, value) {
     var tmp = !(thisRef == null) ? thisRef : THROW_CCE();
-    return this.l49(tmp, property, (value == null ? true : !(value == null)) ? value : THROW_CCE());
+    return this.j49(tmp, property, (value == null ? true : !(value == null)) ? value : THROW_CCE());
   };
   function get_hasUriScheme(_this__u8e3s4) {
     return contains_1(_this__u8e3s4, _Char___init__impl__6a9atx(58));
@@ -10375,15 +10375,15 @@
   }
   function QName(uri, local) {
     uri = uri === VOID ? null : uri;
-    this.m49_1 = uri;
-    this.n49_1 = local;
+    this.k49_1 = uri;
+    this.l49_1 = local;
   }
   protoOf(QName).toString = function () {
-    return 'QName(uri=' + this.m49_1 + ', local=' + this.n49_1 + ')';
+    return 'QName(uri=' + this.k49_1 + ', local=' + this.l49_1 + ')';
   };
   protoOf(QName).hashCode = function () {
-    var result = this.m49_1 == null ? 0 : getStringHashCode(this.m49_1);
-    result = imul(result, 31) + getStringHashCode(this.n49_1) | 0;
+    var result = this.k49_1 == null ? 0 : getStringHashCode(this.k49_1);
+    result = imul(result, 31) + getStringHashCode(this.l49_1) | 0;
     return result;
   };
   protoOf(QName).equals = function (other) {
@@ -10392,9 +10392,9 @@
     if (!(other instanceof QName))
       return false;
     var tmp0_other_with_cast = other instanceof QName ? other : THROW_CCE();
-    if (!(this.m49_1 == tmp0_other_with_cast.m49_1))
+    if (!(this.k49_1 == tmp0_other_with_cast.k49_1))
       return false;
-    if (!(this.n49_1 === tmp0_other_with_cast.n49_1))
+    if (!(this.l49_1 === tmp0_other_with_cast.l49_1))
       return false;
     return true;
   };
@@ -10402,52 +10402,52 @@
     qname = qname === VOID ? null : qname;
     content = content === VOID ? null : content;
     attrs = attrs === VOID ? null : attrs;
-    this.o49_1 = type;
-    this.p49_1 = qname;
-    this.q49_1 = content;
-    this.r49_1 = attrs;
+    this.m49_1 = type;
+    this.n49_1 = qname;
+    this.o49_1 = content;
+    this.p49_1 = attrs;
   }
   function enqueueEvent($this, event) {
     // Inline function 'kotlin.text.isNotEmpty' call
-    var this_0 = $this.u49_1;
+    var this_0 = $this.s49_1;
     if (charSequenceLength(this_0) > 0) {
-      var tmp1 = $this.t49_1;
+      var tmp1 = $this.r49_1;
       // Inline function 'kotlin.collections.plusAssign' call
-      var element = new ParserEvent(4, VOID, $this.u49_1.toString());
+      var element = new ParserEvent(4, VOID, $this.s49_1.toString());
       tmp1.e(element);
-      $this.u49_1.gc();
+      $this.s49_1.gc();
     }
     // Inline function 'kotlin.collections.plusAssign' call
-    $this.t49_1.e(event);
+    $this.r49_1.e(event);
   }
   function SaxXmlPullParser() {
-    this.s49_1 = new ParserEvent(0);
+    this.q49_1 = new ParserEvent(0);
     var tmp = this;
     // Inline function 'kotlin.collections.mutableListOf' call
-    tmp.t49_1 = ArrayList_init_$Create$();
-    this.u49_1 = StringBuilder_init_$Create$();
+    tmp.r49_1 = ArrayList_init_$Create$();
+    this.s49_1 = StringBuilder_init_$Create$();
   }
   protoOf(SaxXmlPullParser).v3c = function () {
-    return this.s49_1.o49_1;
+    return this.q49_1.m49_1;
   };
   protoOf(SaxXmlPullParser).w3c = function () {
-    var tmp0_safe_receiver = this.s49_1.p49_1;
-    return tmp0_safe_receiver == null ? null : tmp0_safe_receiver.m49_1;
+    var tmp0_safe_receiver = this.q49_1.n49_1;
+    return tmp0_safe_receiver == null ? null : tmp0_safe_receiver.k49_1;
   };
   protoOf(SaxXmlPullParser).q2 = function () {
-    var tmp0_safe_receiver = this.s49_1.p49_1;
-    return tmp0_safe_receiver == null ? null : tmp0_safe_receiver.n49_1;
+    var tmp0_safe_receiver = this.q49_1.n49_1;
+    return tmp0_safe_receiver == null ? null : tmp0_safe_receiver.l49_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.s49_1;
-    if (!($this$with.o49_1 === type))
+    var $this$with = this.q49_1;
+    if (!($this$with.m49_1 === type))
       throw new XmlPullParserException('expected ' + type);
     var tmp;
     if (!(namespace == null)) {
-      var tmp0_safe_receiver = $this$with.p49_1;
-      tmp = !(namespace == (tmp0_safe_receiver == null ? null : tmp0_safe_receiver.m49_1));
+      var tmp0_safe_receiver = $this$with.n49_1;
+      tmp = !(namespace == (tmp0_safe_receiver == null ? null : tmp0_safe_receiver.k49_1));
     } else {
       tmp = false;
     }
@@ -10455,8 +10455,8 @@
       throw new XmlPullParserException('expected ' + namespace);
     var tmp_0;
     if (!(name == null)) {
-      var tmp1_safe_receiver = $this$with.p49_1;
-      tmp_0 = !((tmp1_safe_receiver == null ? null : tmp1_safe_receiver.n49_1) == name);
+      var tmp1_safe_receiver = $this$with.n49_1;
+      tmp_0 = !((tmp1_safe_receiver == null ? null : tmp1_safe_receiver.l49_1) == name);
     } else {
       tmp_0 = false;
     }
@@ -10466,16 +10466,16 @@
   };
   protoOf(SaxXmlPullParser).l = function () {
     // Inline function 'kotlin.also' call
-    var this_0 = removeFirst(this.t49_1);
+    var this_0 = removeFirst(this.r49_1);
     // Inline function 'org.cru.godtools.shared.tool.parser.xml.SaxXmlPullParser.next.<anonymous>' call
-    this.s49_1 = this_0;
-    return this_0.o49_1;
+    this.q49_1 = this_0;
+    return this_0.m49_1;
   };
   protoOf(SaxXmlPullParser).m3a = function () {
     var tmp;
     if (this.l() === 4) {
       // Inline function 'kotlin.text.isNullOrBlank' call
-      var this_0 = this.s49_1.q49_1;
+      var this_0 = this.q49_1.o49_1;
       tmp = this_0 == null || isBlank(this_0);
     } else {
       tmp = false;
@@ -10483,20 +10483,20 @@
     if (tmp) {
       this.l();
     }
-    var event = this.s49_1;
-    if (!(event.o49_1 === 2) && !(event.o49_1 === 3)) {
-      throw new XmlPullParserException('Expected start or end tag. Found: ' + event.o49_1);
+    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);
     }
-    return event.o49_1;
+    return event.m49_1;
   };
-  protoOf(SaxXmlPullParser).h3w = function () {
-    this.t45(2);
+  protoOf(SaxXmlPullParser).f3w = function () {
+    this.r45(2);
     var tmp;
     switch (this.l()) {
       case 4:
         // Inline function 'kotlin.text.orEmpty' call
-        var tmp0_elvis_lhs = this.s49_1.q49_1;
+        var tmp0_elvis_lhs = this.q49_1.o49_1;
         // Inline function 'kotlin.also' call
         var this_0 = tmp0_elvis_lhs == null ? '' : tmp0_elvis_lhs;
@@ -10520,10 +10520,10 @@
   };
   protoOf(SaxXmlPullParser).f3f = function (namespace, name) {
     // Inline function 'kotlin.takeIf' call
-    var this_0 = this.s49_1;
+    var this_0 = this.q49_1;
     var tmp;
     // Inline function 'org.cru.godtools.shared.tool.parser.xml.SaxXmlPullParser.getAttributeValue.<anonymous>' call
-    if (this_0.o49_1 === 2) {
+    if (this_0.m49_1 === 2) {
       tmp = this_0;
     } else {
       tmp = null;
@@ -10536,16 +10536,16 @@
       tmp_0 = tmp0_elvis_lhs;
     }
     var event = tmp_0;
-    var tmp1_safe_receiver = event.r49_1;
+    var tmp1_safe_receiver = event.p49_1;
     return tmp1_safe_receiver == null ? null : tmp1_safe_receiver.k2(new QName(namespace, name));
   };
-  protoOf(SaxXmlPullParser).v49 = function (qname, attrs) {
+  protoOf(SaxXmlPullParser).t49 = function (qname, attrs) {
     enqueueEvent(this, new ParserEvent(2, qname, VOID, attrs));
   };
-  protoOf(SaxXmlPullParser).w49 = function (text) {
-    this.u49_1.n8(text);
+  protoOf(SaxXmlPullParser).u49 = function (text) {
+    this.s49_1.n8(text);
   };
-  protoOf(SaxXmlPullParser).x49 = function (qname) {
+  protoOf(SaxXmlPullParser).v49 = function (qname) {
     enqueueEvent(this, new ParserEvent(3, qname));
   };
   function XmlPullParser() {
@@ -10588,26 +10588,26 @@
   }
   var SAX_OPTIONS;
   function InternalSAXParser($outer) {
-    this.y49_1 = $outer;
+    this.w49_1 = $outer;
     SAXParser.call(this, true, get_SAX_OPTIONS());
   }
-  protoOf(InternalSAXParser).z49 = function (tag) {
-    return this.y49_1.v49(new QName(tag.uri, tag.local), convert(tag.attributes, this.y49_1));
+  protoOf(InternalSAXParser).x49 = function (tag) {
+    return this.w49_1.t49(new QName(tag.uri, tag.local), convert(tag.attributes, this.w49_1));
   };
   protoOf(InternalSAXParser).onopentag = function (tag) {
-    return this.z49(tag);
+    return this.x49(tag);
   };
-  protoOf(InternalSAXParser).a4a = function (tagName) {
-    return this.y49_1.x49(new QName(VOID, tagName));
+  protoOf(InternalSAXParser).y49 = function (tagName) {
+    return this.w49_1.v49(new QName(VOID, tagName));
   };
   protoOf(InternalSAXParser).onclosetag = function (tagName) {
-    return this.a4a(tagName);
+    return this.y49(tagName);
   };
-  protoOf(InternalSAXParser).b4a = function (t) {
-    return this.y49_1.w49(t);
+  protoOf(InternalSAXParser).z49 = function (t) {
+    return this.w49_1.u49(t);
   };
   protoOf(InternalSAXParser).ontext = function (t) {
-    return this.b4a(t);
+    return this.z49(t);
   };
   function convert(_this__u8e3s4, $this) {
     var tmp = Object.values;
@@ -10655,13 +10655,13 @@
     // Inline function 'org.cru.godtools.shared.tool.parser.xml.JsXmlPullParser.internalParser.<anonymous>' call
     this_0.write(xml);
     this_0.close();
-    tmp.f4a_1 = this_0;
+    tmp.d4a_1 = this_0;
   }
   function SAX_OPTIONS$1() {
-    this.g4a_1 = true;
+    this.e4a_1 = true;
   }
-  protoOf(SAX_OPTIONS$1).h4a = function () {
-    return this.g4a_1;
+  protoOf(SAX_OPTIONS$1).f4a = function () {
+    return this.e4a_1;
   };
   var properties_initialized_JsXmlPullParser_kt_u4cdem;
   function _init_properties_JsXmlPullParser_kt__2zt5j4() {
@@ -10672,8 +10672,8 @@
   }
   function $getXmlParserCOROUTINE$4(_this__u8e3s4, fileName, resultContinuation) {
     CoroutineImpl.call(this, resultContinuation);
-    this.q4a_1 = _this__u8e3s4;
-    this.r4a_1 = fileName;
+    this.o4a_1 = _this__u8e3s4;
+    this.p4a_1 = fileName;
   }
   protoOf($getXmlParserCOROUTINE$4).u9 = function () {
     var suspendResult = this.e9_1;
@@ -10684,7 +10684,7 @@
           case 0:
             this.d9_1 = 2;
             this.c9_1 = 1;
-            suspendResult = await_0(this.q4a_1.readFile(this.r4a_1), this);
+            suspendResult = await_0(this.o4a_1.readFile(this.p4a_1), this);
             if (suspendResult === get_COROUTINE_SUSPENDED()) {
               return suspendResult;
             }
@@ -10717,14 +10717,14 @@
   function JsXmlPullParserFactory() {
     XmlPullParserFactory.call(this);
   }
-  protoOf(JsXmlPullParserFactory).s4a = function (fileName, $completion) {
+  protoOf(JsXmlPullParserFactory).q4a = function (fileName, $completion) {
     var tmp = new $getXmlParserCOROUTINE$4(this, fileName, $completion);
     tmp.e9_1 = Unit_instance;
     tmp.f9_1 = null;
     return tmp.u9();
   };
   protoOf(JsXmlPullParserFactory).l3a = function (fileName, $completion) {
-    return this.s4a(fileName, $completion);
+    return this.q4a(fileName, $completion);
   };
   function XmlPullParserException(s) {
     Exception_init_$Init$(s, this);
@@ -10822,6 +10822,7 @@
   protoOf(Item).watchIsGone = watchIsGone;
   protoOf(Item).watchIsInvisible = watchIsInvisible;
   protoOf(Item).watchVisibility = watchVisibility;
+  defineProp(protoOf(Item), 'width', protoOf(Item).r3g);
   defineProp(protoOf(Item), 'invisibleIf', function () {
     return this.f3e();
   });
@@ -10831,7 +10832,7 @@
   defineProp(protoOf(Item), 'content', function () {
     return this.y3d();
   });
-  defineProp(protoOf(Flow), 'items', protoOf(Flow).s3k);
+  defineProp(protoOf(Flow), 'items', protoOf(Flow).q3k);
   protoOf(Form).y3d = get_content;
   defineProp(protoOf(Form), 'content', function () {
     return this.y3d();
@@ -10840,13 +10841,13 @@
   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).i3l);
-  defineProp(protoOf(Gravity), 'isEnd', protoOf(Gravity).j3l);
-  defineProp(protoOf(Gravity), 'isCenterX', protoOf(Gravity).k3l);
-  defineProp(protoOf(Gravity), 'isTop', protoOf(Gravity).l3l);
-  defineProp(protoOf(Gravity), 'isBottom', protoOf(Gravity).m3l);
-  defineProp(protoOf(Gravity), 'isCenterY', protoOf(Gravity).n3l);
-  defineProp(protoOf(Gravity), 'isCenter', protoOf(Gravity).o3l);
+  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(Image), 'url', function () {
@@ -10878,17 +10879,17 @@
   protoOf(Manifest).y3h = get_buttonColor;
   protoOf(Manifest).f3j = get_textAlign;
   protoOf(Manifest).findPage = findPage;
-  protoOf(Manifest).r3l = get_pages;
-  defineProp(protoOf(Manifest), 'backgroundImage', protoOf(Manifest).r3r);
-  defineProp(protoOf(Manifest), 'title', protoOf(Manifest).v3r);
+  protoOf(Manifest).p3l = get_pages;
+  defineProp(protoOf(Manifest), 'backgroundImage', protoOf(Manifest).p3r);
+  defineProp(protoOf(Manifest), 'title', protoOf(Manifest).t3r);
   defineProp(protoOf(Manifest), '_pages', function () {
-    return this.p3l();
+    return this.n3l();
   });
-  defineProp(protoOf(Manifest), 'relatedFiles', protoOf(Manifest).o3s);
-  defineProp(protoOf(Manifest), 'hasTips', protoOf(Manifest).p3s);
-  defineProp(protoOf(Manifest), 'dismissListeners', protoOf(Manifest).t3s);
+  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.r3l();
+    return this.p3l();
   });
   defineProp(protoOf(Style_0), 'name', protoOf(Style_0).q2);
   defineProp(protoOf(Style_0), 'ordinal', protoOf(Style_0).r2);
@@ -10896,11 +10897,11 @@
   protoOf(Option).getAnalyticsEvents = getAnalyticsEvents;
   defineProp(protoOf(Option), 'style', protoOf(Option).w3h);
   defineProp(protoOf(Option), 'backgroundColor', protoOf(Option).z3h);
-  defineProp(protoOf(Option), 'selectedColor', protoOf(Option).b3u);
+  defineProp(protoOf(Option), 'selectedColor', protoOf(Option).z3t);
   defineProp(protoOf(Option), 'content', function () {
     return this.y3d();
   });
-  defineProp(protoOf(Multiselect), 'options', protoOf(Multiselect).i3u);
+  defineProp(protoOf(Multiselect), 'options', protoOf(Multiselect).g3u);
   protoOf(Paragraph).y3d = get_content;
   defineProp(protoOf(Paragraph), 'content', function () {
     return this.y3d();
@@ -10916,12 +10917,12 @@
   protoOf(StylesOverride).d3j = get_multiselectOptionSelectedColor;
   protoOf(Tab).y3d = get_content;
   protoOf(Tab).getAnalyticsEvents = getAnalyticsEvents;
-  defineProp(protoOf(Tab), 'position', protoOf(Tab).x3v);
-  defineProp(protoOf(Tab), 'listeners', protoOf(Tab).z3v);
+  defineProp(protoOf(Tab), 'position', protoOf(Tab).v3v);
+  defineProp(protoOf(Tab), 'listeners', protoOf(Tab).x3v);
   defineProp(protoOf(Tab), 'content', function () {
     return this.y3d();
   });
-  defineProp(protoOf(Tabs), 'tabs', protoOf(Tabs).b3w);
+  defineProp(protoOf(Tabs), 'tabs', protoOf(Tabs).z3v);
   defineProp(protoOf(Align), 'name', protoOf(Align).q2);
   defineProp(protoOf(Align), 'ordinal', protoOf(Align).r2);
   defineProp(protoOf(Style_1), 'name', protoOf(Style_1).q2);
@@ -10929,9 +10930,9 @@
   defineProp(protoOf(Text), 'textAlign', protoOf(Text).f3j);
   defineProp(protoOf(Text), 'textColor', protoOf(Text).w3i);
   defineProp(protoOf(Text), 'textScale', protoOf(Text).e3j);
-  defineProp(protoOf(Text), 'startImage', protoOf(Text).p3w);
-  defineProp(protoOf(Text), 'endImage', protoOf(Text).s3w);
-  defineProp(protoOf(Text), 'textStyles', protoOf(Text).u3w);
+  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;
@@ -10939,14 +10940,14 @@
   protoOf(Page).f3j = get_textAlign;
   protoOf(Page).getAnalyticsEvents = getAnalyticsEvents;
   defineProp(protoOf(Page), 'id', protoOf(Page).o3d);
-  defineProp(protoOf(Page), 'position', protoOf(Page).x3v);
-  defineProp(protoOf(Page), 'parentPage', protoOf(Page).l3z);
-  defineProp(protoOf(Page), 'parentPageParams', protoOf(Page).m3z);
-  defineProp(protoOf(Page), 'nextPage', protoOf(Page).n3z);
-  defineProp(protoOf(Page), 'previousPage', protoOf(Page).o3z);
-  defineProp(protoOf(Page), 'backgroundImage', protoOf(Page).r3r);
-  defineProp(protoOf(Page), 'dismissListeners', protoOf(Page).t3s);
-  defineProp(protoOf(Page), 'listeners', protoOf(Page).z3v);
+  defineProp(protoOf(Page), 'position', protoOf(Page).v3v);
+  defineProp(protoOf(Page), 'parentPage', protoOf(Page).j3z);
+  defineProp(protoOf(Page), 'parentPageParams', protoOf(Page).k3z);
+  defineProp(protoOf(Page), 'nextPage', protoOf(Page).l3z);
+  defineProp(protoOf(Page), 'previousPage', protoOf(Page).m3z);
+  defineProp(protoOf(Page), 'backgroundImage', protoOf(Page).p3r);
+  defineProp(protoOf(Page), 'dismissListeners', protoOf(Page).r3s);
+  defineProp(protoOf(Page), 'listeners', protoOf(Page).x3v);
   protoOf(LessonPage).y3d = get_content;
   defineProp(protoOf(LessonPage), 'content', function () {
     return this.y3d();
@@ -10954,24 +10955,24 @@
   protoOf(Card_0).y3d = get_content;
   protoOf(Card_0).getAnalyticsEvents = getAnalyticsEvents;
   defineProp(protoOf(Card_0), 'id', protoOf(Card_0).o3d);
-  defineProp(protoOf(Card_0), 'position', protoOf(Card_0).x3v);
+  defineProp(protoOf(Card_0), 'position', protoOf(Card_0).v3v);
   defineProp(protoOf(Card_0), 'content', function () {
     return this.y3d();
   });
-  defineProp(protoOf(CardCollectionPage), 'cards', protoOf(CardCollectionPage).w40);
+  defineProp(protoOf(CardCollectionPage), 'cards', protoOf(CardCollectionPage).u40);
   protoOf(ContentPage).y3d = get_content;
   defineProp(protoOf(ContentPage), 'content', function () {
     return this.y3d();
   });
   protoOf(PageCollectionPage).findPage = findPage;
-  protoOf(PageCollectionPage).r3l = get_pages;
+  protoOf(PageCollectionPage).p3l = get_pages;
   defineProp(protoOf(PageCollectionPage), '_pages', function () {
-    return this.p3l();
+    return this.n3l();
   });
   defineProp(protoOf(PageCollectionPage), 'pages', function () {
-    return this.r3l();
+    return this.p3l();
   });
-  defineProp(protoOf(InlineTip), 'tip', protoOf(InlineTip).h46);
+  defineProp(protoOf(InlineTip), 'tip', protoOf(InlineTip).f46);
   protoOf(Tip).a3j = get_buttonStyle;
   protoOf(Tip).y3h = get_buttonColor;
   protoOf(Tip).b3j = get_cardBackgroundColor;
@@ -10983,7 +10984,7 @@
   defineProp(protoOf(TipPage), 'content', function () {
     return this.y3d();
   });
-  defineProp(protoOf(CallToAction), 'tip', protoOf(CallToAction).h46);
+  defineProp(protoOf(CallToAction), 'tip', protoOf(CallToAction).f46);
   protoOf(Header).y3i = get_primaryColor;
   protoOf(Header).z3i = get_primaryTextColor;
   protoOf(Header).a3j = get_buttonStyle;
@@ -10993,7 +10994,7 @@
   protoOf(Header).d3j = get_multiselectOptionSelectedColor;
   protoOf(Header).e3j = get_textScale;
   protoOf(Header).f3j = get_textAlign;
-  defineProp(protoOf(Header), 'tip', protoOf(Header).h46);
+  defineProp(protoOf(Header), 'tip', protoOf(Header).f46);
   protoOf(Hero).y3d = get_content;
   protoOf(Hero).getAnalyticsEvents = getAnalyticsEvents;
   defineProp(protoOf(Hero), 'content', function () {
@@ -11005,8 +11006,8 @@
   protoOf(Modal).d3j = get_multiselectOptionSelectedColor;
   protoOf(Modal).e3j = get_textScale;
   defineProp(protoOf(Modal), 'id', protoOf(Modal).o3d);
-  defineProp(protoOf(Modal), 'dismissListeners', protoOf(Modal).t3s);
-  defineProp(protoOf(Modal), 'listeners', protoOf(Modal).z3v);
+  defineProp(protoOf(Modal), 'dismissListeners', protoOf(Modal).r3s);
+  defineProp(protoOf(Modal), 'listeners', protoOf(Modal).x3v);
   defineProp(protoOf(Modal), 'content', function () {
     return this.y3d();
   });
@@ -11022,24 +11023,24 @@
   protoOf(Card_1).y3d = get_content;
   protoOf(Card_1).getAnalyticsEvents = getAnalyticsEvents;
   defineProp(protoOf(Card_1), 'id', protoOf(Card_1).o3d);
-  defineProp(protoOf(Card_1), 'visiblePosition', protoOf(Card_1).p48);
-  defineProp(protoOf(Card_1), 'isLastVisibleCard', protoOf(Card_1).q48);
-  defineProp(protoOf(Card_1), 'backgroundImage', protoOf(Card_1).r3r);
+  defineProp(protoOf(Card_1), 'visiblePosition', protoOf(Card_1).n48);
+  defineProp(protoOf(Card_1), 'isLastVisibleCard', protoOf(Card_1).o48);
+  defineProp(protoOf(Card_1), 'backgroundImage', protoOf(Card_1).p3r);
   defineProp(protoOf(Card_1), 'tips', protoOf(Card_1).a3e);
-  defineProp(protoOf(Card_1), 'dismissListeners', protoOf(Card_1).t3s);
-  defineProp(protoOf(Card_1), 'listeners', protoOf(Card_1).z3v);
+  defineProp(protoOf(Card_1), 'dismissListeners', protoOf(Card_1).r3s);
+  defineProp(protoOf(Card_1), 'listeners', protoOf(Card_1).x3v);
   defineProp(protoOf(Card_1), 'content', function () {
     return this.y3d();
   });
-  defineProp(protoOf(TractPage), 'isLastPage', protoOf(TractPage).r48);
-  defineProp(protoOf(TractPage), 'visibleCards', protoOf(TractPage).v48);
-  defineProp(protoOf(TractPage), 'cardTextColor', protoOf(TractPage).w48);
-  defineProp(protoOf(TractPage), 'cards', protoOf(TractPage).w40);
-  defineProp(protoOf(TractPage), 'modals', protoOf(TractPage).x48);
-  protoOf(SaxXmlPullParser).t45 = require$default;
+  defineProp(protoOf(TractPage), 'isLastPage', protoOf(TractPage).p48);
+  defineProp(protoOf(TractPage), 'visibleCards', protoOf(TractPage).t48);
+  defineProp(protoOf(TractPage), 'cardTextColor', protoOf(TractPage).u48);
+  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.h4a();
+    return this.f4a();
   });
   //endregion
   //region block: init