npm - @cruglobal/godtools-shared - Versions diffs - 1.1.4 → 1.2.0-PR799-SNAPSHOT.1762 - Mend

@cruglobal/godtools-shared 1.1.4 → 1.2.0-PR799-SNAPSHOT.1762

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

package/antlr-kotlin-antlr-kotlin-runtime.js +3 -3
package/kotlin-kotlin-stdlib.js +38 -38
package/kotlin-kotlin-stdlib.js.map +1 -1
package/kotlin-mpp-godtools-tool-parser-module-parser.js +705 -681
package/kotlin-mpp-godtools-tool-parser-module-parser.js.map +1 -1
package/kotlin-mpp-godtools-tool-parser-publishing-npm.d.ts +4 -4
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

@@ -1,8 +1,8 @@
 (function (factory) {
   if (typeof define === 'function' && define.amd)
-    define(['exports', 'sax', './kotlinx-coroutines-core.js', './kotlin-kotlin-stdlib.js', './KustomExport-lib.js', './Kermit-kermit.js', './Kermit-kermit-core.js', './fluid-locale.js', './android-gto-support-gto-support-fluidsonic-locale.js', './kotlin-mpp-godtools-tool-parser-module-common.js', './kotlin-mpp-godtools-tool-parser-module-parser-expressions.js', './colormath-root-colormath.js'], factory);
+    define(['exports', 'sax', './kotlinx-coroutines-core.js', './kotlin-kotlin-stdlib.js', './KustomExport-lib.js', './Kermit-kermit.js', './Kermit-kermit-core.js', './colormath-root-colormath.js', './fluid-locale.js', './android-gto-support-gto-support-fluidsonic-locale.js', './kotlin-mpp-godtools-tool-parser-module-common.js', './kotlin-mpp-godtools-tool-parser-module-parser-expressions.js'], factory);
   else if (typeof exports === 'object')
-    factory(module.exports, require('sax'), require('./kotlinx-coroutines-core.js'), require('./kotlin-kotlin-stdlib.js'), require('./KustomExport-lib.js'), require('./Kermit-kermit.js'), require('./Kermit-kermit-core.js'), require('./fluid-locale.js'), require('./android-gto-support-gto-support-fluidsonic-locale.js'), require('./kotlin-mpp-godtools-tool-parser-module-common.js'), require('./kotlin-mpp-godtools-tool-parser-module-parser-expressions.js'), require('./colormath-root-colormath.js'));
+    factory(module.exports, require('sax'), require('./kotlinx-coroutines-core.js'), require('./kotlin-kotlin-stdlib.js'), require('./KustomExport-lib.js'), require('./Kermit-kermit.js'), require('./Kermit-kermit-core.js'), require('./colormath-root-colormath.js'), require('./fluid-locale.js'), require('./android-gto-support-gto-support-fluidsonic-locale.js'), require('./kotlin-mpp-godtools-tool-parser-module-common.js'), require('./kotlin-mpp-godtools-tool-parser-module-parser-expressions.js'));
   else {
     if (typeof sax === 'undefined') {
       throw new Error("Error loading module 'kotlin-mpp-godtools-tool-parser-module-parser'. Its dependency 'sax' was not found. Please, check whether 'sax' is loaded prior to 'kotlin-mpp-godtools-tool-parser-module-parser'.");
@@ -22,6 +22,9 @@
     if (typeof globalThis['Kermit-kermit-core'] === 'undefined') {
       throw new Error("Error loading module 'kotlin-mpp-godtools-tool-parser-module-parser'. Its dependency 'Kermit-kermit-core' was not found. Please, check whether 'Kermit-kermit-core' is loaded prior to 'kotlin-mpp-godtools-tool-parser-module-parser'.");
     }
+    if (typeof globalThis['colormath-root-colormath'] === 'undefined') {
+      throw new Error("Error loading module 'kotlin-mpp-godtools-tool-parser-module-parser'. Its dependency 'colormath-root-colormath' was not found. Please, check whether 'colormath-root-colormath' is loaded prior to 'kotlin-mpp-godtools-tool-parser-module-parser'.");
+    }
     if (typeof globalThis['fluid-locale'] === 'undefined') {
       throw new Error("Error loading module 'kotlin-mpp-godtools-tool-parser-module-parser'. Its dependency 'fluid-locale' was not found. Please, check whether 'fluid-locale' is loaded prior to 'kotlin-mpp-godtools-tool-parser-module-parser'.");
     }
@@ -34,12 +37,9 @@
     if (typeof globalThis['kotlin-mpp-godtools-tool-parser-module-parser-expressions'] === 'undefined') {
       throw new Error("Error loading module 'kotlin-mpp-godtools-tool-parser-module-parser'. Its dependency 'kotlin-mpp-godtools-tool-parser-module-parser-expressions' was not found. Please, check whether 'kotlin-mpp-godtools-tool-parser-module-parser-expressions' is loaded prior to 'kotlin-mpp-godtools-tool-parser-module-parser'.");
     }
-    if (typeof globalThis['colormath-root-colormath'] === 'undefined') {
-      throw new Error("Error loading module 'kotlin-mpp-godtools-tool-parser-module-parser'. Its dependency 'colormath-root-colormath' was not found. Please, check whether 'colormath-root-colormath' is loaded prior to 'kotlin-mpp-godtools-tool-parser-module-parser'.");
-    }
-    globalThis['kotlin-mpp-godtools-tool-parser-module-parser'] = factory(typeof globalThis['kotlin-mpp-godtools-tool-parser-module-parser'] === 'undefined' ? {} : globalThis['kotlin-mpp-godtools-tool-parser-module-parser'], sax, globalThis['kotlinx-coroutines-core'], globalThis['kotlin-kotlin-stdlib'], globalThis['KustomExport-lib'], globalThis['Kermit-kermit'], globalThis['Kermit-kermit-core'], globalThis['fluid-locale'], globalThis['android-gto-support-gto-support-fluidsonic-locale'], globalThis['kotlin-mpp-godtools-tool-parser-module-common'], globalThis['kotlin-mpp-godtools-tool-parser-module-parser-expressions'], globalThis['colormath-root-colormath']);
+    globalThis['kotlin-mpp-godtools-tool-parser-module-parser'] = factory(typeof globalThis['kotlin-mpp-godtools-tool-parser-module-parser'] === 'undefined' ? {} : globalThis['kotlin-mpp-godtools-tool-parser-module-parser'], sax, globalThis['kotlinx-coroutines-core'], globalThis['kotlin-kotlin-stdlib'], globalThis['KustomExport-lib'], globalThis['Kermit-kermit'], globalThis['Kermit-kermit-core'], globalThis['colormath-root-colormath'], globalThis['fluid-locale'], globalThis['android-gto-support-gto-support-fluidsonic-locale'], globalThis['kotlin-mpp-godtools-tool-parser-module-common'], globalThis['kotlin-mpp-godtools-tool-parser-module-parser-expressions']);
   }
-}(function (_, $module$sax, kotlin_org_jetbrains_kotlinx_kotlinx_coroutines_core, kotlin_kotlin, kotlin_deezer_kustomexport_lib, kotlin_co_touchlab_kermit, kotlin_co_touchlab_kermit_core, kotlin_io_fluidsonic_locale_fluid_locale, kotlin_org_ccci_gto_android_gto_support_fluidsonic_locale, kotlin_org_cru_godtools_kotlin_common, kotlin_org_cru_godtools_kotlin_parser_expressions, kotlin_colormath_root_colormath) {
+}(function (_, $module$sax, kotlin_org_jetbrains_kotlinx_kotlinx_coroutines_core, kotlin_kotlin, kotlin_deezer_kustomexport_lib, kotlin_co_touchlab_kermit, kotlin_co_touchlab_kermit_core, kotlin_colormath_root_colormath, kotlin_io_fluidsonic_locale_fluid_locale, kotlin_org_ccci_gto_android_gto_support_fluidsonic_locale, kotlin_org_cru_godtools_kotlin_common, kotlin_org_cru_godtools_kotlin_parser_expressions) {
   'use strict';
   //region block: imports
   var imul = Math.imul;
@@ -75,9 +75,18 @@
   var toString_0 = kotlin_kotlin.$_$.z6;
   var hashCode = kotlin_kotlin.$_$.g6;
   var getBooleanHashCode = kotlin_kotlin.$_$.b6;
+  var toInt = kotlin_kotlin.$_$.t8;
+  var IllegalArgumentException_init_$Create$ = kotlin_kotlin.$_$.a1;
+  var toDouble = kotlin_kotlin.$_$.q8;
+  var contains = kotlin_kotlin.$_$.j7;
+  var IllegalArgumentException = kotlin_kotlin.$_$.g9;
+  var Companion_getInstance_0 = kotlin_colormath_root_colormath.$_$.d;
+  var Regex_init_$Create$ = kotlin_kotlin.$_$.s;
+  var numberRangeToNumber = kotlin_kotlin.$_$.q6;
+  var rangeTo = kotlin_kotlin.$_$.k7;
   var Exception_init_$Init$ = kotlin_kotlin.$_$.z;
   var captureStack = kotlin_kotlin.$_$.u5;
-  var Companion_getInstance_0 = kotlin_io_fluidsonic_locale_fluid_locale.$_$.a;
+  var Companion_getInstance_1 = kotlin_io_fluidsonic_locale_fluid_locale.$_$.a;
   var toPlatform = kotlin_org_ccci_gto_android_gto_support_fluidsonic_locale.$_$.a;
   var ArrayList_init_$Create$ = kotlin_kotlin.$_$.h;
   var addAll = kotlin_kotlin.$_$.x2;
@@ -89,7 +98,7 @@
   var LinkedHashMap_init_$Create$ = kotlin_kotlin.$_$.n;
   var emptyMap = kotlin_kotlin.$_$.n3;
   var Enum = kotlin_kotlin.$_$.d9;
-  var contains = kotlin_kotlin.$_$.d3;
+  var contains_0 = kotlin_kotlin.$_$.d3;
   var toBoolean = kotlin_kotlin.$_$.n8;
   var toSet_0 = kotlin_kotlin.$_$.u4;
   var toUriOrNull = kotlin_org_cru_godtools_kotlin_common.$_$.b;
@@ -97,7 +106,6 @@
   var _Char___init__impl__6a9atx = kotlin_kotlin.$_$.t1;
   var charArrayOf = kotlin_kotlin.$_$.v5;
   var split = kotlin_kotlin.$_$.i8;
-  var toInt = kotlin_kotlin.$_$.t8;
   var NumberFormatException = kotlin_kotlin.$_$.k9;
   var initMetadataForInterface = kotlin_kotlin.$_$.k6;
   var emptyList = kotlin_kotlin.$_$.m3;
@@ -114,7 +122,6 @@
   var trimEnd = kotlin_kotlin.$_$.x8;
   var toDoubleOrNull = kotlin_kotlin.$_$.p8;
   var getNumberHashCode = kotlin_kotlin.$_$.d6;
-  var Regex_init_$Create$ = kotlin_kotlin.$_$.s;
   var charSequenceLength = kotlin_kotlin.$_$.x5;
   var listOf = kotlin_kotlin.$_$.f4;
   var collectionSizeOrDefault = kotlin_kotlin.$_$.c3;
@@ -123,8 +130,6 @@
   var getStringHashCode = kotlin_kotlin.$_$.f6;
   var take = kotlin_kotlin.$_$.s4;
   var listOfNotNull = kotlin_kotlin.$_$.e4;
-  var IllegalArgumentException_init_$Create$ = kotlin_kotlin.$_$.a1;
-  var IllegalArgumentException = kotlin_kotlin.$_$.g9;
   var initMetadataForObject = kotlin_kotlin.$_$.m6;
   var async = kotlin_org_jetbrains_kotlinx_kotlinx_coroutines_core.$_$.s;
   var awaitAll = kotlin_org_jetbrains_kotlinx_kotlinx_coroutines_core.$_$.a;
@@ -147,11 +152,6 @@
   var setOf = kotlin_kotlin.$_$.o4;
   var distinctUntilChanged = kotlin_org_jetbrains_kotlinx_kotlinx_coroutines_core.$_$.k;
   var coerceAtMost = kotlin_kotlin.$_$.f7;
-  var toDouble = kotlin_kotlin.$_$.q8;
-  var contains_0 = kotlin_kotlin.$_$.j7;
-  var Companion_getInstance_1 = kotlin_colormath_root_colormath.$_$.d;
-  var numberRangeToNumber = kotlin_kotlin.$_$.q6;
-  var rangeTo = kotlin_kotlin.$_$.k7;
   var coerceIn = kotlin_kotlin.$_$.i7;
   var _UInt___init__impl__l7qpdl = kotlin_kotlin.$_$.f2;
   var UInt = kotlin_kotlin.$_$.q9;
@@ -1113,13 +1113,108 @@
       return false;
     return true;
   };
+  function get_COLOR_REGEX() {
+    _init_properties_Color_kt__6h0l1r();
+    return COLOR_REGEX;
+  }
+  var COLOR_REGEX;
+  function get_VALID_RGB() {
+    _init_properties_Color_kt__6h0l1r();
+    return VALID_RGB;
+  }
+  var VALID_RGB;
+  function get_VALID_ALPHA() {
+    _init_properties_Color_kt__6h0l1r();
+    return VALID_ALPHA;
+  }
+  var VALID_ALPHA;
+  function toColorOrNull(_this__u8e3s4) {
+    _init_properties_Color_kt__6h0l1r();
+    var tmp0_safe_receiver = get_COLOR_REGEX().fc(_this__u8e3s4);
+    var tmp;
+    if (tmp0_safe_receiver == null) {
+      tmp = null;
+    } else {
+      // Inline function 'kotlin.let' call
+      var tmp_0;
+      try {
+        // Inline function 'kotlin.also' call
+        var this_0 = toInt(tmp0_safe_receiver.bd().o(1));
+        var progression = get_VALID_RGB();
+        var containsLower = progression.rg_1;
+        // Inline function 'kotlin.require' call
+        // Inline function 'kotlin.require' call
+        if (!(this_0 <= progression.sg_1 ? containsLower <= this_0 : false)) {
+          var message = 'Failed requirement.';
+          throw IllegalArgumentException_init_$Create$(toString_0(message));
+        }
+        var red = this_0;
+        // Inline function 'kotlin.also' call
+        var this_1 = toInt(tmp0_safe_receiver.bd().o(2));
+        var progression_0 = get_VALID_RGB();
+        var containsLower_0 = progression_0.rg_1;
+        // Inline function 'kotlin.require' call
+        // Inline function 'kotlin.require' call
+        if (!(this_1 <= progression_0.sg_1 ? containsLower_0 <= this_1 : false)) {
+          var message_0 = 'Failed requirement.';
+          throw IllegalArgumentException_init_$Create$(toString_0(message_0));
+        }
+        var green = this_1;
+        // Inline function 'kotlin.also' call
+        var this_2 = toInt(tmp0_safe_receiver.bd().o(3));
+        var progression_1 = get_VALID_RGB();
+        var containsLower_1 = progression_1.rg_1;
+        // Inline function 'kotlin.require' call
+        // Inline function 'kotlin.require' call
+        if (!(this_2 <= progression_1.sg_1 ? containsLower_1 <= this_2 : false)) {
+          var message_1 = 'Failed requirement.';
+          throw IllegalArgumentException_init_$Create$(toString_0(message_1));
+        }
+        var blue = this_2;
+        // Inline function 'kotlin.also' call
+        var this_3 = toDouble(tmp0_safe_receiver.bd().o(4));
+        // Inline function 'kotlin.require' call
+        // Inline function 'kotlin.require' call
+        if (!contains(get_VALID_ALPHA(), this_3)) {
+          var message_2 = 'Failed requirement.';
+          throw IllegalArgumentException_init_$Create$(toString_0(message_2));
+        }
+        var alpha = this_3;
+        tmp_0 = color(red, green, blue, alpha);
+      } catch ($p) {
+        var tmp_1;
+        if ($p instanceof IllegalArgumentException) {
+          var ignored = $p;
+          tmp_1 = null;
+        } else {
+          throw $p;
+        }
+        tmp_0 = tmp_1;
+      }
+      tmp = tmp_0;
+    }
+    return tmp;
+  }
+  function color(red, green, blue, alpha) {
+    _init_properties_Color_kt__6h0l1r();
+    return Companion_getInstance_0().g1s(red / 255.0, green / 255.0, blue / 255.0, alpha);
+  }
+  var properties_initialized_Color_kt_bdybnx;
+  function _init_properties_Color_kt__6h0l1r() {
+    if (!properties_initialized_Color_kt_bdybnx) {
+      properties_initialized_Color_kt_bdybnx = true;
+      COLOR_REGEX = Regex_init_$Create$('^\\s*rgba\\(\\s*([0-9]+)\\s*,\\s*([0-9]+)\\s*,\\s*([0-9]+)\\s*,\\s*([0-9.]+)\\s*\\)\\s*$');
+      VALID_RGB = numberRangeToNumber(0, 255);
+      VALID_ALPHA = rangeTo(0.0, 1.0);
+    }
+  }
   function DeprecationException(message) {
     message = message === VOID ? null : message;
     Exception_init_$Init$(message, this);
     captureStack(this, DeprecationException);
   }
   function toLocaleOrNull(_this__u8e3s4) {
-    var tmp0_safe_receiver = Companion_getInstance_0().i37(_this__u8e3s4);
+    var tmp0_safe_receiver = Companion_getInstance_1().i37(_this__u8e3s4);
     return tmp0_safe_receiver == null ? null : toPlatform(tmp0_safe_receiver);
   }
   function Section_init_$Init$(parent, parser, $this) {
@@ -1593,7 +1688,7 @@
     return this.attributes;
   };
   protoOf(AnalyticsEvent).q3c = function (types) {
-    return contains(types, this.o3c_1);
+    return contains_0(types, this.o3c_1);
   };
   protoOf(AnalyticsEvent).isForSystem = function (system) {
     return this.systems.u1(system);
@@ -1899,7 +1994,7 @@
     this.r3f_1 = 'button';
     this.s3f_1 = Horizontal_CENTER_getInstance();
     this.t3f_1 = new Percent(1.0);
-    this.u3f_1 = get_TRANSPARENT();
+    this.u3f_1 = toPlatformColor(get_TRANSPARENT());
     this.v3f_1 = Horizontal_START_getInstance();
     this.w3f_1 = 18;
   }
@@ -1974,27 +2069,29 @@
     tmp_3.width = tmp4_elvis_lhs == null ? Companion_getInstance_11().t3f_1 : tmp4_elvis_lhs;
     var tmp_6 = $this;
     var tmp5_safe_receiver = parser.d3d('color');
-    tmp_6.g3g_1 = tmp5_safe_receiver == null ? null : toColorOrNull(tmp5_safe_receiver);
+    var tmp6_safe_receiver = tmp5_safe_receiver == null ? null : toColorOrNull(tmp5_safe_receiver);
+    tmp_6.g3g_1 = tmp6_safe_receiver == null ? null : toPlatformColor(tmp6_safe_receiver);
     var tmp_7 = $this;
-    var tmp6_safe_receiver = parser.d3d('background-color');
-    var tmp7_elvis_lhs = tmp6_safe_receiver == null ? null : toColorOrNull(tmp6_safe_receiver);
-    tmp_7.backgroundColor = tmp7_elvis_lhs == null ? Companion_getInstance_11().u3f_1 : tmp7_elvis_lhs;
+    var tmp7_safe_receiver = parser.d3d('background-color');
+    var tmp8_safe_receiver = tmp7_safe_receiver == null ? null : toColorOrNull(tmp7_safe_receiver);
+    var tmp9_elvis_lhs = tmp8_safe_receiver == null ? null : toPlatformColor(tmp8_safe_receiver);
+    tmp_7.backgroundColor = tmp9_elvis_lhs == null ? Companion_getInstance_11().u3f_1 : tmp9_elvis_lhs;
     $this.h3g_1 = parser.d3d('icon');
     var tmp_8 = $this;
-    var tmp8_safe_receiver = Companion_getInstance_22().k3g(parser.d3d('icon-gravity'));
-    var tmp9_elvis_lhs = tmp8_safe_receiver == null ? null : tmp8_safe_receiver.horizontal;
-    tmp_8.iconGravity = tmp9_elvis_lhs == null ? Companion_getInstance_11().v3f_1 : tmp9_elvis_lhs;
+    var tmp10_safe_receiver = Companion_getInstance_22().k3g(parser.d3d('icon-gravity'));
+    var tmp11_elvis_lhs = tmp10_safe_receiver == null ? null : tmp10_safe_receiver.horizontal;
+    tmp_8.iconGravity = tmp11_elvis_lhs == null ? Companion_getInstance_11().v3f_1 : tmp11_elvis_lhs;
     var tmp_9 = $this;
-    var tmp10_safe_receiver = parser.d3d('icon-size');
-    var tmp11_elvis_lhs = tmp10_safe_receiver == null ? null : toIntOrNull(tmp10_safe_receiver);
-    tmp_9.iconSize = tmp11_elvis_lhs == null ? 18 : tmp11_elvis_lhs;
+    var tmp12_safe_receiver = parser.d3d('icon-size');
+    var tmp13_elvis_lhs = tmp12_safe_receiver == null ? null : toIntOrNull(tmp12_safe_receiver);
+    tmp_9.iconSize = tmp13_elvis_lhs == null ? 18 : tmp13_elvis_lhs;
     var tmp_10 = $this;
     // Inline function 'kotlin.collections.mutableListOf' call
     tmp_10.j3g_1 = ArrayList_init_$Create$();
     var tmp_11 = $this;
     var tmp_12 = _get_defaultTextStyles__fjozb5($this);
-    var tmp12_elvis_lhs = parseTextChild(parser, tmp_12, 'https://mobile-content-api.cru.org/xmlns/content', 'button', Button$_init_$lambda_iw8cbr(parser, $this));
-    tmp_11.text = tmp12_elvis_lhs == null ? createTestText(_get_defaultTextStyles__fjozb5($this)) : tmp12_elvis_lhs;
+    var tmp14_elvis_lhs = parseTextChild(parser, tmp_12, 'https://mobile-content-api.cru.org/xmlns/content', 'button', Button$_init_$lambda_iw8cbr(parser, $this));
+    tmp_11.text = tmp14_elvis_lhs == null ? createTestText(_get_defaultTextStyles__fjozb5($this)) : tmp14_elvis_lhs;
     return $this;
   }
   function Button_init_$Create$(parent, parser) {
@@ -2024,7 +2121,7 @@
           noWhenBranchMatchedException();
           break;
       }
-      return tmp;
+      return toRGB(tmp);
     };
   }
   function Button$defaultTextStyles$delegate$lambda(this$0) {
@@ -2170,17 +2267,20 @@
     Content_init_$Init$(parent, parser, $this);
     Card.call($this);
     parser.o3b(2, 'https://mobile-content-api.cru.org/xmlns/content', 'card');
-    $this.e3h_1 = toColorOrNull(parser.d3d('background-color'));
+    var tmp = $this;
+    var tmp0_safe_receiver = parser.d3d('background-color');
+    var tmp1_safe_receiver = tmp0_safe_receiver == null ? null : toColorOrNull(tmp0_safe_receiver);
+    tmp.e3h_1 = tmp1_safe_receiver == null ? null : toPlatformColor(tmp1_safe_receiver);
     // Inline function 'org.cru.godtools.shared.tool.parser.model.parseClickableAttrs' call
-    var tmp0_safe_receiver = parser.d3d('url');
-    var tmp;
-    if (tmp0_safe_receiver == null) {
-      tmp = null;
+    var tmp0_safe_receiver_0 = parser.d3d('url');
+    var tmp_0;
+    if (tmp0_safe_receiver_0 == null) {
+      tmp_0 = null;
     } else {
       // Inline function 'kotlin.run' call
-      var tmp_0;
-      if (!get_hasUriScheme(tmp0_safe_receiver)) {
-        var message = 'Non-absolute uri tool: ' + $this.s38().code + ' locale: ' + $this.s38().locale + ' uri: ' + tmp0_safe_receiver;
+      var tmp_1;
+      if (!get_hasUriScheme(tmp0_safe_receiver_0)) {
+        var message = 'Non-absolute uri tool: ' + $this.s38().code + ' locale: ' + $this.s38().locale + ' uri: ' + tmp0_safe_receiver_0;
         var tmp0 = Companion_getInstance();
         // Inline function 'co.touchlab.kermit.Logger.d' call
         var throwable = new DeprecationException(message);
@@ -2189,16 +2289,16 @@
         if (tmp0.c1u().t1u().n2(severity) <= 0) {
           tmp0.d1u(severity, 'Uri', throwable, message);
         }
-        tmp_0 = toAbsoluteUriOrNull(tmp0_safe_receiver);
+        tmp_1 = toAbsoluteUriOrNull(tmp0_safe_receiver_0);
       } else {
-        tmp_0 = toUriOrNull(tmp0_safe_receiver);
+        tmp_1 = toUriOrNull(tmp0_safe_receiver_0);
       }
-      tmp = tmp_0;
+      tmp_0 = tmp_1;
     }
-    var uri = tmp;
+    var uri = tmp_0;
     $this.g3h_1 = toEventIds(parser.d3d('events'));
     $this.h3h_1 = uri;
-    var tmp_1 = $this;
+    var tmp_2 = $this;
     // Inline function 'org.cru.godtools.shared.tool.parser.model.parseContent' call
     // Inline function 'kotlin.collections.buildList' call
     // Inline function 'kotlin.collections.buildListInternal' call
@@ -2213,33 +2313,33 @@
         if (parser.p3b() === 3) {
           break $l$block;
         }
-        var tmp0_safe_receiver_0 = Companion_instance_12.t3b(parser, $this);
-        var tmp_2;
-        if (tmp0_safe_receiver_0 == null) {
-          tmp_2 = null;
+        var tmp0_safe_receiver_1 = Companion_instance_12.t3b(parser, $this);
+        var tmp_3;
+        if (tmp0_safe_receiver_1 == null) {
+          tmp_3 = null;
         } else {
           // Inline function 'kotlin.takeUnless' call
-          var tmp_3;
-          if (!tmp0_safe_receiver_0.a3c()) {
-            tmp_3 = tmp0_safe_receiver_0;
+          var tmp_4;
+          if (!tmp0_safe_receiver_1.a3c()) {
+            tmp_4 = tmp0_safe_receiver_1;
           } else {
-            tmp_3 = null;
+            tmp_4 = null;
           }
-          tmp_2 = tmp_3;
+          tmp_3 = tmp_4;
         }
-        var tmp1_safe_receiver = tmp_2;
-        if (tmp1_safe_receiver == null)
+        var tmp1_safe_receiver_0 = tmp_3;
+        if (tmp1_safe_receiver_0 == null)
           null;
         else {
           // Inline function 'kotlin.let' call
-          this_0.e(tmp1_safe_receiver);
+          this_0.e(tmp1_safe_receiver_0);
         }
       }
       if (parser.p3b() === 3)
         continue $l$loop_0;
       skipTag(parser);
     }
-    tmp_1.f3h_1 = this_0.k3();
+    tmp_2.f3h_1 = this_0.k3();
     return $this;
   }
   function Card_init_$Create$(parent, parser) {
@@ -2313,7 +2413,7 @@
     return Category_init_$Init$(manifest, parser, objectCreate(protoOf(Category)));
   }
   protoOf(Category).o3h = function () {
-    return this.s38().p3h();
+    return toRGB(this.s38().p3h());
   };
   function Category() {
   }
@@ -4123,7 +4223,7 @@
   }
   function Link$defaultTextStyles$delegate$lambda$lambda(this$0) {
     return function () {
-      return get_primaryColor_0(get_stylesParent(this$0));
+      return toRGB(get_primaryColor_0(get_stylesParent(this$0)));
     };
   }
   function Link$defaultTextStyles$delegate$lambda(this$0) {
@@ -4652,9 +4752,9 @@
   }
   function Companion_26() {
     Companion_instance_27 = this;
-    this.v39_1 = color(59, 164, 219, 1.0);
-    this.w39_1 = color(255, 255, 255, 1.0);
-    this.x39_1 = color(255, 255, 255, 1.0);
+    this.v39_1 = toPlatformColor(color(59, 164, 219, 1.0));
+    this.w39_1 = toPlatformColor(color(255, 255, 255, 1.0));
+    this.x39_1 = toPlatformColor(color(255, 255, 255, 1.0));
     this.y39_1 = Companion_getInstance_22().CENTER;
     this.z39_1 = ImageScaleType_FILL_getInstance();
     this.a3a_1 = Style_CONTAINED_getInstance();
@@ -4693,46 +4793,55 @@
     $this._dismissListeners = toSet_0(toEventIds(parser.d3d('dismiss-listeners')));
     var tmp_1 = $this;
     var tmp2_safe_receiver = parser.d3d('primary-color');
-    var tmp3_elvis_lhs = tmp2_safe_receiver == null ? null : toColorOrNull(tmp2_safe_receiver);
-    tmp_1.b3e_1 = tmp3_elvis_lhs == null ? Companion_getInstance_29().v39_1 : tmp3_elvis_lhs;
+    var tmp3_safe_receiver = tmp2_safe_receiver == null ? null : toColorOrNull(tmp2_safe_receiver);
+    var tmp4_elvis_lhs = tmp3_safe_receiver == null ? null : toPlatformColor(tmp3_safe_receiver);
+    tmp_1.b3e_1 = tmp4_elvis_lhs == null ? Companion_getInstance_29().v39_1 : tmp4_elvis_lhs;
     var tmp_2 = $this;
-    var tmp4_safe_receiver = parser.d3d('primary-text-color');
-    var tmp5_elvis_lhs = tmp4_safe_receiver == null ? null : toColorOrNull(tmp4_safe_receiver);
-    tmp_2.c3e_1 = tmp5_elvis_lhs == null ? Companion_getInstance_29().w39_1 : tmp5_elvis_lhs;
+    var tmp5_safe_receiver = parser.d3d('primary-text-color');
+    var tmp6_safe_receiver = tmp5_safe_receiver == null ? null : toColorOrNull(tmp5_safe_receiver);
+    var tmp7_elvis_lhs = tmp6_safe_receiver == null ? null : toPlatformColor(tmp6_safe_receiver);
+    tmp_2.c3e_1 = tmp7_elvis_lhs == null ? Companion_getInstance_29().w39_1 : tmp7_elvis_lhs;
     var tmp_3 = $this;
-    var tmp6_safe_receiver = parser.d3d('navbar-color');
-    tmp_3.d3e_1 = tmp6_safe_receiver == null ? null : toColorOrNull(tmp6_safe_receiver);
+    var tmp8_safe_receiver = parser.d3d('navbar-color');
+    var tmp9_safe_receiver = tmp8_safe_receiver == null ? null : toColorOrNull(tmp8_safe_receiver);
+    tmp_3.d3e_1 = tmp9_safe_receiver == null ? null : toPlatformColor(tmp9_safe_receiver);
     var tmp_4 = $this;
-    var tmp7_safe_receiver = parser.d3d('navbar-control-color');
-    tmp_4.e3e_1 = tmp7_safe_receiver == null ? null : toColorOrNull(tmp7_safe_receiver);
+    var tmp10_safe_receiver = parser.d3d('navbar-control-color');
+    var tmp11_safe_receiver = tmp10_safe_receiver == null ? null : toColorOrNull(tmp10_safe_receiver);
+    tmp_4.e3e_1 = tmp11_safe_receiver == null ? null : toPlatformColor(tmp11_safe_receiver);
     var tmp_5 = $this;
-    var tmp8_safe_receiver = parser.d3d('background-color');
-    var tmp9_elvis_lhs = tmp8_safe_receiver == null ? null : toColorOrNull(tmp8_safe_receiver);
-    tmp_5.f3e_1 = tmp9_elvis_lhs == null ? Companion_getInstance_29().x39_1 : tmp9_elvis_lhs;
+    var tmp12_safe_receiver = parser.d3d('background-color');
+    var tmp13_safe_receiver = tmp12_safe_receiver == null ? null : toColorOrNull(tmp12_safe_receiver);
+    var tmp14_elvis_lhs = tmp13_safe_receiver == null ? null : toPlatformColor(tmp13_safe_receiver);
+    tmp_5.f3e_1 = tmp14_elvis_lhs == null ? Companion_getInstance_29().x39_1 : tmp14_elvis_lhs;
     $this.g3e_1 = parser.d3d('background-image');
     var tmp_6 = $this;
-    var tmp10_safe_receiver = parser.d3d('background-image-align');
-    var tmp11_elvis_lhs = tmp10_safe_receiver == null ? null : Companion_getInstance_22().k3g(tmp10_safe_receiver);
-    tmp_6.h3e_1 = tmp11_elvis_lhs == null ? Companion_getInstance_29().y39_1 : tmp11_elvis_lhs;
+    var tmp15_safe_receiver = parser.d3d('background-image-align');
+    var tmp16_elvis_lhs = tmp15_safe_receiver == null ? null : Companion_getInstance_22().k3g(tmp15_safe_receiver);
+    tmp_6.h3e_1 = tmp16_elvis_lhs == null ? Companion_getInstance_29().y39_1 : tmp16_elvis_lhs;
     var tmp_7 = $this;
-    var tmp12_safe_receiver = parser.d3d('background-image-scale-type');
-    var tmp13_elvis_lhs = tmp12_safe_receiver == null ? null : Companion_instance_22.v3k(tmp12_safe_receiver);
-    tmp_7.i3e_1 = tmp13_elvis_lhs == null ? Companion_getInstance_29().z39_1 : tmp13_elvis_lhs;
+    var tmp17_safe_receiver = parser.d3d('background-image-scale-type');
+    var tmp18_elvis_lhs = tmp17_safe_receiver == null ? null : Companion_instance_22.v3k(tmp17_safe_receiver);
+    tmp_7.i3e_1 = tmp18_elvis_lhs == null ? Companion_getInstance_29().z39_1 : tmp18_elvis_lhs;
     var tmp_8 = $this;
-    var tmp14_safe_receiver = parser.n3p('https://mobile-content-api.cru.org/xmlns/content', 'card-background-color');
-    tmp_8.j3e_1 = tmp14_safe_receiver == null ? null : toColorOrNull(tmp14_safe_receiver);
+    var tmp19_safe_receiver = parser.n3p('https://mobile-content-api.cru.org/xmlns/content', 'card-background-color');
+    var tmp20_safe_receiver = tmp19_safe_receiver == null ? null : toColorOrNull(tmp19_safe_receiver);
+    tmp_8.j3e_1 = tmp20_safe_receiver == null ? null : toPlatformColor(tmp20_safe_receiver);
     var tmp_9 = $this;
-    var tmp15_safe_receiver = parser.d3d('category-label-color');
-    tmp_9.k3e_1 = tmp15_safe_receiver == null ? null : toColorOrNull(tmp15_safe_receiver);
+    var tmp21_safe_receiver = parser.d3d('category-label-color');
+    var tmp22_safe_receiver = tmp21_safe_receiver == null ? null : toColorOrNull(tmp21_safe_receiver);
+    tmp_9.k3e_1 = tmp22_safe_receiver == null ? null : toPlatformColor(tmp22_safe_receiver);
     var tmp_10 = $this;
-    var tmp16_safe_receiver = parser.n3p('https://mobile-content-api.cru.org/xmlns/page', 'control-color');
-    var tmp17_elvis_lhs = tmp16_safe_receiver == null ? null : toColorOrNull(tmp16_safe_receiver);
+    var tmp23_safe_receiver = parser.n3p('https://mobile-content-api.cru.org/xmlns/page', 'control-color');
+    var tmp24_safe_receiver = tmp23_safe_receiver == null ? null : toColorOrNull(tmp23_safe_receiver);
+    var tmp25_elvis_lhs = tmp24_safe_receiver == null ? null : toPlatformColor(tmp24_safe_receiver);
     var tmp_11;
-    if (tmp17_elvis_lhs == null) {
-      var tmp18_safe_receiver = parser.n3p('https://mobile-content-api.cru.org/xmlns/lesson', 'control-color');
-      var tmp19_safe_receiver = tmp18_safe_receiver == null ? null : toColorOrNull(tmp18_safe_receiver);
+    if (tmp25_elvis_lhs == null) {
+      var tmp26_safe_receiver = parser.n3p('https://mobile-content-api.cru.org/xmlns/lesson', 'control-color');
+      var tmp27_safe_receiver = tmp26_safe_receiver == null ? null : toColorOrNull(tmp26_safe_receiver);
+      var tmp28_safe_receiver = tmp27_safe_receiver == null ? null : toPlatformColor(tmp27_safe_receiver);
       var tmp_12;
-      if (tmp19_safe_receiver == null) {
+      if (tmp28_safe_receiver == null) {
         tmp_12 = null;
       } else {
         // Inline function 'kotlin.also' call
@@ -4746,28 +4855,30 @@
         if (tmp0.c1u().t1u().n2(severity) <= 0) {
           tmp0.d1u(severity, tag, tmp2, message);
         }
-        tmp_12 = tmp19_safe_receiver;
+        tmp_12 = tmp28_safe_receiver;
       }
       tmp_11 = tmp_12;
     } else {
-      tmp_11 = tmp17_elvis_lhs;
+      tmp_11 = tmp25_elvis_lhs;
     }
-    var tmp20_elvis_lhs = tmp_11;
-    tmp_10.l3e_1 = tmp20_elvis_lhs == null ? get_DEFAULT_CONTROL_COLOR() : tmp20_elvis_lhs;
+    var tmp29_elvis_lhs = tmp_11;
+    tmp_10.l3e_1 = tmp29_elvis_lhs == null ? get_DEFAULT_CONTROL_COLOR() : tmp29_elvis_lhs;
     var tmp_13 = $this;
-    var tmp21_safe_receiver = parser.n3p('https://mobile-content-api.cru.org/xmlns/content', 'multiselect-option-background-color');
-    tmp_13.m3e_1 = tmp21_safe_receiver == null ? null : toColorOrNull(tmp21_safe_receiver);
+    var tmp30_safe_receiver = parser.n3p('https://mobile-content-api.cru.org/xmlns/content', 'multiselect-option-background-color');
+    var tmp31_safe_receiver = tmp30_safe_receiver == null ? null : toColorOrNull(tmp30_safe_receiver);
+    tmp_13.m3e_1 = tmp31_safe_receiver == null ? null : toPlatformColor(tmp31_safe_receiver);
     var tmp_14 = $this;
-    var tmp22_safe_receiver = parser.n3p('https://mobile-content-api.cru.org/xmlns/content', 'multiselect-option-selected-color');
-    tmp_14.n3e_1 = tmp22_safe_receiver == null ? null : toColorOrNull(tmp22_safe_receiver);
+    var tmp32_safe_receiver = parser.n3p('https://mobile-content-api.cru.org/xmlns/content', 'multiselect-option-selected-color');
+    var tmp33_safe_receiver = tmp32_safe_receiver == null ? null : toColorOrNull(tmp32_safe_receiver);
+    tmp_14.n3e_1 = tmp33_safe_receiver == null ? null : toPlatformColor(tmp33_safe_receiver);
     var tmp_15 = $this;
-    var tmp23_safe_receiver = parser.d3d('text-color');
-    var tmp24_elvis_lhs = tmp23_safe_receiver == null ? null : toColorOrNull(tmp23_safe_receiver);
-    tmp_15.o3e_1 = tmp24_elvis_lhs == null ? Companion_getInstance_29().b3a_1 : tmp24_elvis_lhs;
+    var tmp34_safe_receiver = parser.d3d('text-color');
+    var tmp35_elvis_lhs = tmp34_safe_receiver == null ? null : toColorOrNull(tmp34_safe_receiver);
+    tmp_15.o3e_1 = tmp35_elvis_lhs == null ? Companion_getInstance_29().b3a_1 : tmp35_elvis_lhs;
     var tmp_16 = $this;
-    var tmp25_safe_receiver = parser.d3d('text-scale');
-    var tmp26_elvis_lhs = tmp25_safe_receiver == null ? null : toDoubleOrNull(tmp25_safe_receiver);
-    tmp_16.p3e_1 = tmp26_elvis_lhs == null ? 1.0 : tmp26_elvis_lhs;
+    var tmp36_safe_receiver = parser.d3d('text-scale');
+    var tmp37_elvis_lhs = tmp36_safe_receiver == null ? null : toDoubleOrNull(tmp36_safe_receiver);
+    tmp_16.p3e_1 = tmp37_elvis_lhs == null ? 1.0 : tmp37_elvis_lhs;
     var title = null;
     var tmp_17 = $this;
     // Inline function 'kotlin.collections.mutableListOf' call
@@ -5280,7 +5391,7 @@
   };
   protoOf(Manifest).p3h = function () {
     var tmp0_elvis_lhs = this.k3e_1;
-    return tmp0_elvis_lhs == null ? this.o3e_1 : tmp0_elvis_lhs;
+    return tmp0_elvis_lhs == null ? toPlatformColor(this.o3e_1) : tmp0_elvis_lhs;
   };
   protoOf(Manifest).m3q = function () {
     return this.l3e_1;
@@ -5585,10 +5696,12 @@
     $this.u3r_1 = Companion_instance_28.m3r(parser.d3d('style'));
     var tmp = $this;
     var tmp0_safe_receiver = parser.d3d('background-color');
-    tmp.v3r_1 = tmp0_safe_receiver == null ? null : toColorOrNull(tmp0_safe_receiver);
+    var tmp1_safe_receiver = tmp0_safe_receiver == null ? null : toColorOrNull(tmp0_safe_receiver);
+    tmp.v3r_1 = tmp1_safe_receiver == null ? null : toPlatformColor(tmp1_safe_receiver);
     var tmp_0 = $this;
-    var tmp1_safe_receiver = parser.d3d('selected-color');
-    tmp_0.w3r_1 = tmp1_safe_receiver == null ? null : toColorOrNull(tmp1_safe_receiver);
+    var tmp2_safe_receiver = parser.d3d('selected-color');
+    var tmp3_safe_receiver = tmp2_safe_receiver == null ? null : toColorOrNull(tmp2_safe_receiver);
+    tmp_0.w3r_1 = tmp3_safe_receiver == null ? null : toPlatformColor(tmp3_safe_receiver);
     var tmp_1 = $this;
     // Inline function 'kotlin.text.orEmpty' call
     var tmp0_elvis_lhs = parser.d3d('value');
@@ -5714,10 +5827,12 @@
     tmp_2.p3s_1 = tmp4_elvis_lhs == null ? Companion_getInstance_31().s3r_1 : tmp4_elvis_lhs;
     var tmp_3 = $this;
     var tmp5_safe_receiver = parser.d3d('option-background-color');
-    tmp_3.q3s_1 = tmp5_safe_receiver == null ? null : toColorOrNull(tmp5_safe_receiver);
+    var tmp6_safe_receiver = tmp5_safe_receiver == null ? null : toColorOrNull(tmp5_safe_receiver);
+    tmp_3.q3s_1 = tmp6_safe_receiver == null ? null : toPlatformColor(tmp6_safe_receiver);
     var tmp_4 = $this;
-    var tmp6_safe_receiver = parser.d3d('option-selected-color');
-    tmp_4.r3s_1 = tmp6_safe_receiver == null ? null : toColorOrNull(tmp6_safe_receiver);
+    var tmp7_safe_receiver = parser.d3d('option-selected-color');
+    var tmp8_safe_receiver = tmp7_safe_receiver == null ? null : toColorOrNull(tmp7_safe_receiver);
+    tmp_4.r3s_1 = tmp8_safe_receiver == null ? null : toPlatformColor(tmp8_safe_receiver);
     var tmp_5 = $this;
     // Inline function 'kotlin.collections.mutableListOf' call
     tmp_5._options = ArrayList_init_$Create$();
@@ -5969,116 +6084,9 @@
   }
   function Parent() {
   }
-  function get_COLOR_REGEX() {
-    _init_properties_PlatformColor_kt__naxuf2();
-    return COLOR_REGEX;
-  }
-  var COLOR_REGEX;
-  function get_VALID_RGB() {
-    _init_properties_PlatformColor_kt__naxuf2();
-    return VALID_RGB;
-  }
-  var VALID_RGB;
-  function get_VALID_ALPHA() {
-    _init_properties_PlatformColor_kt__naxuf2();
-    return VALID_ALPHA;
-  }
-  var VALID_ALPHA;
-  function toColorOrNull(_this__u8e3s4) {
-    _init_properties_PlatformColor_kt__naxuf2();
-    var tmp;
-    if (_this__u8e3s4 == null) {
-      tmp = null;
-    } else {
-      // Inline function 'kotlin.let' call
-      tmp = get_COLOR_REGEX().fc(_this__u8e3s4);
-    }
-    var tmp1_safe_receiver = tmp;
-    var tmp_0;
-    if (tmp1_safe_receiver == null) {
-      tmp_0 = null;
-    } else {
-      // Inline function 'kotlin.let' call
-      var tmp_1;
-      try {
-        // Inline function 'kotlin.also' call
-        var this_0 = toInt(tmp1_safe_receiver.bd().o(1));
-        var progression = get_VALID_RGB();
-        var containsLower = progression.rg_1;
-        // Inline function 'kotlin.require' call
-        // Inline function 'kotlin.require' call
-        if (!(this_0 <= progression.sg_1 ? containsLower <= this_0 : false)) {
-          var message = 'Failed requirement.';
-          throw IllegalArgumentException_init_$Create$(toString_0(message));
-        }
-        var red = this_0;
-        // Inline function 'kotlin.also' call
-        var this_1 = toInt(tmp1_safe_receiver.bd().o(2));
-        var progression_0 = get_VALID_RGB();
-        var containsLower_0 = progression_0.rg_1;
-        // Inline function 'kotlin.require' call
-        // Inline function 'kotlin.require' call
-        if (!(this_1 <= progression_0.sg_1 ? containsLower_0 <= this_1 : false)) {
-          var message_0 = 'Failed requirement.';
-          throw IllegalArgumentException_init_$Create$(toString_0(message_0));
-        }
-        var green = this_1;
-        // Inline function 'kotlin.also' call
-        var this_2 = toInt(tmp1_safe_receiver.bd().o(3));
-        var progression_1 = get_VALID_RGB();
-        var containsLower_1 = progression_1.rg_1;
-        // Inline function 'kotlin.require' call
-        // Inline function 'kotlin.require' call
-        if (!(this_2 <= progression_1.sg_1 ? containsLower_1 <= this_2 : false)) {
-          var message_1 = 'Failed requirement.';
-          throw IllegalArgumentException_init_$Create$(toString_0(message_1));
-        }
-        var blue = this_2;
-        // Inline function 'kotlin.also' call
-        var this_3 = toDouble(tmp1_safe_receiver.bd().o(4));
-        // Inline function 'kotlin.require' call
-        // Inline function 'kotlin.require' call
-        if (!contains_0(get_VALID_ALPHA(), this_3)) {
-          var message_2 = 'Failed requirement.';
-          throw IllegalArgumentException_init_$Create$(toString_0(message_2));
-        }
-        var alpha = this_3;
-        tmp_1 = color(red, green, blue, alpha);
-      } catch ($p) {
-        var tmp_2;
-        if ($p instanceof IllegalArgumentException) {
-          var ignored = $p;
-          tmp_2 = null;
-        } else {
-          throw $p;
-        }
-        tmp_1 = tmp_2;
-      }
-      tmp_0 = tmp_1;
-    }
-    return tmp_0;
-  }
-  function color(red, green, blue, alpha) {
-    _init_properties_PlatformColor_kt__naxuf2();
-    return toPlatformColor_0(Companion_getInstance_1().g1s(red / 255.0, green / 255.0, blue / 255.0, alpha));
-  }
-  function toPlatformColor(_this__u8e3s4) {
-    _init_properties_PlatformColor_kt__naxuf2();
-    return toPlatformColor_0(_this__u8e3s4.f1n());
-  }
   function toHSL(_this__u8e3s4) {
-    _init_properties_PlatformColor_kt__naxuf2();
     return toRGB(_this__u8e3s4).g1n();
   }
-  var properties_initialized_PlatformColor_kt_ppum8w;
-  function _init_properties_PlatformColor_kt__naxuf2() {
-    if (!properties_initialized_PlatformColor_kt_ppum8w) {
-      properties_initialized_PlatformColor_kt_ppum8w = true;
-      COLOR_REGEX = Regex_init_$Create$('^\\s*rgba\\(\\s*([0-9]+)\\s*,\\s*([0-9]+)\\s*,\\s*([0-9]+)\\s*,\\s*([0-9.]+)\\s*\\)\\s*$');
-      VALID_RGB = numberRangeToNumber(0, 255);
-      VALID_ALPHA = rangeTo(0.0, 1.0);
-    }
-  }
   function Companion_31() {
     this.k3t_1 = 'resource';
   }
@@ -6793,35 +6801,35 @@
     var tmp0_elvis_lhs = this.u3q_1;
     return tmp0_elvis_lhs == null ? get_textAlign_0(get_stylesParent(this)) : tmp0_elvis_lhs;
   };
-  protoOf(Text).o3h = function () {
+  protoOf(Text).h3v = function () {
     var tmp0_elvis_lhs = this.v3q_1;
     return tmp0_elvis_lhs == null ? get_textColor_0(get_stylesParent(this)) : tmp0_elvis_lhs;
   };
   protoOf(Text).w3h = function () {
     return this.w3q_1 * get_textScale_0(get_stylesParent(this));
   };
-  protoOf(Text).h3v = function () {
+  protoOf(Text).i3v = function () {
     return this._textStyles;
   };
-  protoOf(Text).i3v = function () {
+  protoOf(Text).j3v = function () {
     return this.minimumLines;
   };
-  protoOf(Text).j3v = function () {
+  protoOf(Text).k3v = function () {
     return this.x3q_1;
   };
-  protoOf(Text).k3v = function () {
+  protoOf(Text).l3v = function () {
     return getResource(this, this.x3q_1);
   };
-  protoOf(Text).l3v = function () {
+  protoOf(Text).m3v = function () {
     return this.startImageSize;
   };
-  protoOf(Text).m3v = function () {
+  protoOf(Text).n3v = function () {
     return this.y3q_1;
   };
-  protoOf(Text).n3v = function () {
+  protoOf(Text).o3v = function () {
     return getResource(this, this.y3q_1);
   };
-  protoOf(Text).o3v = function () {
+  protoOf(Text).p3v = function () {
     return this.endImageSize;
   };
   protoOf(Text).equals = function (other) {
@@ -6844,7 +6852,7 @@
               if (!this.textAlign.equals(other.textAlign)) {
                 tmp = false;
               } else {
-                if (!(this.textColor === other.textColor)) {
+                if (!equals(this.h3v(), other.h3v())) {
                   tmp = false;
                 } else {
                   if (!(this.textScale === other.textScale)) {
@@ -6900,7 +6908,7 @@
     var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : tmp0_safe_receiver;
     result = tmp + (tmp1_elvis_lhs == null ? 0 : tmp1_elvis_lhs) | 0;
     result = imul(31, result) + this.textAlign.hashCode() | 0;
-    result = imul(31, result) + getStringHashCode(this.textColor) | 0;
+    result = imul(31, result) + hashCode(this.h3v()) | 0;
     result = imul(31, result) + getNumberHashCode(this.textScale) | 0;
     result = imul(31, result) + hashCode(this._textStyles) | 0;
     result = imul(31, result) + this.minimumLines | 0;
@@ -6916,7 +6924,10 @@
     result = imul(31, result) + this.endImageSize | 0;
     return result;
   };
-  protoOf(Text).p3v = function () {
+  protoOf(Text).o3h = function () {
+    return toPlatformColor(this.h3v());
+  };
+  protoOf(Text).q3v = function () {
     // Inline function 'kotlin.collections.toTypedArray' call
     var this_0 = this._textStyles;
     return copyToArray(this_0);
@@ -7104,7 +7115,7 @@
     Companion_getInstance_42();
     this.b3i_1 = version;
   }
-  protoOf(Version).q3v = function (other) {
+  protoOf(Version).r3v = function (other) {
     return Version__compareTo_impl_crux23(this.b3i_1, other);
   };
   protoOf(Version).d = function (other) {
@@ -7123,7 +7134,7 @@
   var Provider_UNKNOWN_instance;
   function Companion_40() {
     Companion_instance_41 = this;
-    this.r3v_1 = Provider_UNKNOWN_getInstance();
+    this.s3v_1 = Provider_UNKNOWN_getInstance();
   }
   protoOf(Companion_40).l3p = function (value) {
     return value === 'youtube' ? Provider_YOUTUBE_getInstance() : null;
@@ -7161,10 +7172,10 @@
   }
   function Companion_41() {
     Companion_instance_42 = this;
-    this.s3v_1 = 'video';
-    this.t3v_1 = new AspectRatio(16, 9);
-    this.u3v_1 = Horizontal_CENTER_getInstance();
-    this.v3v_1 = new Percent(1.0);
+    this.t3v_1 = 'video';
+    this.u3v_1 = new AspectRatio(16, 9);
+    this.v3v_1 = Horizontal_CENTER_getInstance();
+    this.w3v_1 = new Percent(1.0);
   }
   var Companion_instance_42;
   function Companion_getInstance_44() {
@@ -7181,15 +7192,15 @@
     parser.o3b(2, 'https://mobile-content-api.cru.org/xmlns/content', 'video');
     var tmp = $this;
     var tmp0_elvis_lhs = Companion_getInstance_43().l3p(parser.d3d('provider'));
-    tmp.provider = tmp0_elvis_lhs == null ? Companion_getInstance_43().r3v_1 : tmp0_elvis_lhs;
+    tmp.provider = tmp0_elvis_lhs == null ? Companion_getInstance_43().s3v_1 : tmp0_elvis_lhs;
     $this.videoId = parser.d3d('video-id');
     var tmp_0 = $this;
     var tmp1_elvis_lhs = Companion_instance_6.i3f(parser.d3d('aspect-ratio'));
-    tmp_0.aspectRatio = tmp1_elvis_lhs == null ? Companion_getInstance_44().t3v_1 : tmp1_elvis_lhs;
+    tmp_0.aspectRatio = tmp1_elvis_lhs == null ? Companion_getInstance_44().u3v_1 : tmp1_elvis_lhs;
     var tmp_1 = $this;
     var tmp2_safe_receiver = Companion_getInstance_22().k3g(parser.d3d('gravity'));
     var tmp3_elvis_lhs = tmp2_safe_receiver == null ? null : tmp2_safe_receiver.horizontal;
-    tmp_1.gravity = tmp3_elvis_lhs == null ? Companion_getInstance_44().u3v_1 : tmp3_elvis_lhs;
+    tmp_1.gravity = tmp3_elvis_lhs == null ? Companion_getInstance_44().v3v_1 : tmp3_elvis_lhs;
     var tmp_2 = $this;
     var tmp4_safe_receiver = Companion_instance_14.l3g(parser.d3d('width'));
     var tmp_3;
@@ -7206,7 +7217,7 @@
       tmp_3 = tmp_4;
     }
     var tmp5_elvis_lhs = tmp_3;
-    tmp_2.width = tmp5_elvis_lhs == null ? Companion_getInstance_44().v3v_1 : tmp5_elvis_lhs;
+    tmp_2.width = tmp5_elvis_lhs == null ? Companion_getInstance_44().w3v_1 : tmp5_elvis_lhs;
     skipTag(parser);
     return $this;
   }
@@ -7221,13 +7232,13 @@
     Provider_initEntries();
     return Provider_UNKNOWN_instance;
   }
-  protoOf(Video).e3w = function () {
+  protoOf(Video).f3w = function () {
     return this.provider;
   };
-  protoOf(Video).f3w = function () {
+  protoOf(Video).g3w = function () {
     return this.videoId;
   };
-  protoOf(Video).g3w = function () {
+  protoOf(Video).h3w = function () {
     return this.aspectRatio;
   };
   protoOf(Video).p3g = function () {
@@ -7255,15 +7266,15 @@
   function Visibility$watchVisibility$slambda(resultContinuation) {
     CoroutineImpl.call(this, resultContinuation);
   }
-  protoOf(Visibility$watchVisibility$slambda).r3w = function (invisible, gone, $completion) {
-    var tmp = this.s3w(invisible, gone, $completion);
+  protoOf(Visibility$watchVisibility$slambda).s3w = function (invisible, gone, $completion) {
+    var tmp = this.t3w(invisible, gone, $completion);
     tmp.x8_1 = Unit_instance;
     tmp.y8_1 = null;
     return tmp.d9();
   };
   protoOf(Visibility$watchVisibility$slambda).o1f = function (p1, p2, $completion) {
     var tmp = (!(p1 == null) ? typeof p1 === 'boolean' : false) ? p1 : THROW_CCE();
-    return this.r3w(tmp, (!(p2 == null) ? typeof p2 === 'boolean' : false) ? p2 : THROW_CCE(), $completion);
+    return this.s3w(tmp, (!(p2 == null) ? typeof p2 === 'boolean' : false) ? p2 : THROW_CCE(), $completion);
   };
   protoOf(Visibility$watchVisibility$slambda).d9 = function () {
     var suspendResult = this.x8_1;
@@ -7272,7 +7283,7 @@
         var tmp = this.v8_1;
         if (tmp === 0) {
           this.w8_1 = 1;
-          return new Pair(this.p3w_1, this.q3w_1);
+          return new Pair(this.q3w_1, this.r3w_1);
         } else if (tmp === 1) {
           throw this.y8_1;
         }
@@ -7282,16 +7293,16 @@
       }
      while (true);
   };
-  protoOf(Visibility$watchVisibility$slambda).s3w = function (invisible, gone, completion) {
+  protoOf(Visibility$watchVisibility$slambda).t3w = function (invisible, gone, completion) {
     var i = new Visibility$watchVisibility$slambda(completion);
-    i.p3w_1 = invisible;
-    i.q3w_1 = gone;
+    i.q3w_1 = invisible;
+    i.r3w_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.r3w(invisible, gone, $completion);
+      return i.s3w(invisible, gone, $completion);
     };
     l.$arity = 2;
     return l;
@@ -7313,7 +7324,7 @@
   function _init_properties_Constants_kt__atb1ur_0() {
     if (!properties_initialized_Constants_kt_w4w61t_0) {
       properties_initialized_Constants_kt_w4w61t_0 = true;
-      DEFAULT_LESSON_NAV_BAR_COLOR = color(0, 0, 0, 0.0);
+      DEFAULT_LESSON_NAV_BAR_COLOR = toPlatformColor(color(0, 0, 0, 0.0));
     }
   }
   function LessonPage_init_$Init$(container, fileName, parser, $this) {
@@ -7322,10 +7333,10 @@
     parser.o3b(2, 'https://mobile-content-api.cru.org/xmlns/lesson', 'page');
     var tmp = $this;
     // Inline function 'kotlin.collections.mutableListOf' call
-    tmp.l3x_1 = ArrayList_init_$Create$();
+    tmp.m3x_1 = ArrayList_init_$Create$();
     var tmp_0 = $this;
     // Inline function 'kotlin.collections.mutableListOf' call
-    tmp_0.m3x_1 = ArrayList_init_$Create$();
+    tmp_0.n3x_1 = ArrayList_init_$Create$();
     // Inline function 'org.cru.godtools.shared.tool.parser.xml.parseChildren' call
     $l$loop_2: while (!(parser.l() === 3)) {
       if (!(parser.p3b() === 2))
@@ -7333,14 +7344,14 @@
       var tmp0_subject = parser.q3b();
       if (tmp0_subject === 'https://mobile-content-api.cru.org/xmlns/analytics') {
         if (parser.l2() === 'events') {
-          var tmp0 = $this.l3x_1;
+          var tmp0 = $this.m3x_1;
           // Inline function 'kotlin.collections.plusAssign' call
           var elements = Companion_instance_4.s3b(parser, $this);
           addAll(tmp0, elements);
         }
       } else if (tmp0_subject === 'https://mobile-content-api.cru.org/xmlns/lesson') {
         if (parser.l2() === 'content') {
-          var tmp4 = $this.m3x_1;
+          var tmp4 = $this.n3x_1;
           // Inline function 'org.cru.godtools.shared.tool.parser.model.parseContent' call
           // Inline function 'kotlin.collections.buildList' call
           // Inline function 'kotlin.collections.buildListInternal' call
@@ -7396,17 +7407,17 @@
     return LessonPage_init_$Init$(container, fileName, parser, objectCreate(protoOf(LessonPage)));
   }
   protoOf(LessonPage).v3g = function () {
-    return this.l3x_1;
+    return this.m3x_1;
   };
   protoOf(LessonPage).k3c = function () {
-    return this.m3x_1;
+    return this.n3x_1;
   };
   function LessonPage() {
   }
   function Companion_42() {
     Companion_instance_43 = this;
-    this.m3y_1 = 'header';
-    this.n3y_1 = Align_CENTER_getInstance();
+    this.n3y_1 = 'header';
+    this.o3y_1 = Align_CENTER_getInstance();
   }
   var Companion_instance_43;
   function Companion_getInstance_45() {
@@ -7459,16 +7470,16 @@
         continue $l$loop_0;
       skipTag(parser);
     }
-    tmp.q3y_1 = this_0.k3();
+    tmp.r3y_1 = this_0.k3();
     return $this;
   }
   function Header_init_$Create$(page, parser) {
     return Header_init_$Init$(page, parser, objectCreate(protoOf(Header)));
   }
   function Companion_43() {
-    this.r3y_1 = 'card';
-    this.s3y_1 = 'id';
-    this.t3y_1 = 'content';
+    this.s3y_1 = 'card';
+    this.t3y_1 = 'id';
+    this.u3y_1 = 'content';
   }
   var Companion_instance_44;
   function Companion_getInstance_46() {
@@ -7479,16 +7490,17 @@
     Card_0.call($this);
     $this.page = page;
     parser.o3b(2, 'https://mobile-content-api.cru.org/xmlns/page', 'card');
-    $this.v3y_1 = parser.d3d('id');
+    $this.w3y_1 = parser.d3d('id');
     var tmp = $this;
     var tmp0_safe_receiver = parser.d3d('background-color');
-    tmp.w3y_1 = tmp0_safe_receiver == null ? null : toColorOrNull(tmp0_safe_receiver);
+    var tmp1_safe_receiver = tmp0_safe_receiver == null ? null : toColorOrNull(tmp0_safe_receiver);
+    tmp.x3y_1 = tmp1_safe_receiver == null ? null : toPlatformColor(tmp1_safe_receiver);
     var tmp_0 = $this;
     // Inline function 'kotlin.collections.mutableListOf' call
-    tmp_0.x3y_1 = ArrayList_init_$Create$();
+    tmp_0.y3y_1 = ArrayList_init_$Create$();
     var tmp_1 = $this;
     // Inline function 'kotlin.collections.mutableListOf' call
-    tmp_1.y3y_1 = ArrayList_init_$Create$();
+    tmp_1.z3y_1 = ArrayList_init_$Create$();
     // Inline function 'org.cru.godtools.shared.tool.parser.xml.parseChildren' call
     $l$loop_2: while (!(parser.l() === 3)) {
       if (!(parser.p3b() === 2))
@@ -7496,14 +7508,14 @@
       var tmp0_subject = parser.q3b();
       if (tmp0_subject === 'https://mobile-content-api.cru.org/xmlns/analytics') {
         if (parser.l2() === 'events') {
-          var tmp0 = $this.x3y_1;
+          var tmp0 = $this.y3y_1;
           // Inline function 'kotlin.collections.plusAssign' call
           var elements = Companion_instance_4.s3b(parser, $this);
           addAll(tmp0, elements);
         }
       } else if (tmp0_subject === 'https://mobile-content-api.cru.org/xmlns/page') {
         if (parser.l2() === 'content') {
-          var tmp4 = $this.y3y_1;
+          var tmp4 = $this.z3y_1;
           // Inline function 'org.cru.godtools.shared.tool.parser.model.parseContent' call
           // Inline function 'kotlin.collections.buildList' call
           // Inline function 'kotlin.collections.buildListInternal' call
@@ -7532,12 +7544,12 @@
                 }
                 tmp_2 = tmp_3;
               }
-              var tmp1_safe_receiver = tmp_2;
-              if (tmp1_safe_receiver == null)
+              var tmp1_safe_receiver_0 = tmp_2;
+              if (tmp1_safe_receiver_0 == null)
                 null;
               else {
                 // Inline function 'kotlin.let' call
-                this_0.e(tmp1_safe_receiver);
+                this_0.e(tmp1_safe_receiver_0);
               }
             }
             if (parser.p3b() === 3)
@@ -7559,7 +7571,7 @@
     return Card_init_$Init$_0(page, parser, objectCreate(protoOf(Card_0)));
   }
   function Companion_44() {
-    this.z3y_1 = 'cardcollection';
+    this.a3z_1 = 'cardcollection';
   }
   var Companion_instance_45;
   function Companion_getInstance_47() {
@@ -7569,10 +7581,10 @@
     Page_init_$Init$(container, fileName, parser, $this);
     CardCollectionPage.call($this);
     parser.o3b(2, 'https://mobile-content-api.cru.org/xmlns/page', 'page');
-    Companion_getInstance_49().a3z(parser, 'cardcollection');
+    Companion_getInstance_49().b3z(parser, 'cardcollection');
     var tmp = $this;
     // Inline function 'kotlin.collections.mutableListOf' call
-    tmp.t3z_1 = ArrayList_init_$Create$();
+    tmp.u3z_1 = ArrayList_init_$Create$();
     var header = null;
     var tmp_0 = $this;
     // Inline function 'kotlin.collections.mutableListOf' call
@@ -7584,7 +7596,7 @@
       var tmp0_subject = parser.q3b();
       if (tmp0_subject === 'https://mobile-content-api.cru.org/xmlns/analytics') {
         if (parser.l2() === 'events') {
-          var tmp0 = $this.t3z_1;
+          var tmp0 = $this.u3z_1;
           // Inline function 'kotlin.collections.plusAssign' call
           var elements = Companion_instance_4.s3b(parser, $this);
           addAll(tmp0, elements);
@@ -7629,31 +7641,31 @@
     return this_0.k3();
   }
   protoOf(Header).x3h = function () {
-    return this.p3y_1;
+    return this.q3y_1;
   };
   protoOf(Header).k3c = function () {
-    return this.q3y_1;
+    return this.r3y_1;
   };
   function Header() {
     Companion_getInstance_45();
-    this.p3y_1 = Companion_getInstance_45().n3y_1;
+    this.q3y_1 = Companion_getInstance_45().o3y_1;
   }
-  protoOf(Card_0).u3z = function () {
+  protoOf(Card_0).v3z = function () {
     return this.page;
   };
   protoOf(Card_0).i3c = function () {
-    var tmp0_elvis_lhs = this.v3y_1;
+    var tmp0_elvis_lhs = this.w3y_1;
     return tmp0_elvis_lhs == null ? this.page.id + '-' + this.position : tmp0_elvis_lhs;
   };
   protoOf(Card_0).p3u = function () {
     return this.page._cards.w1(this);
   };
   protoOf(Card_0).i3q = function () {
-    var tmp0_elvis_lhs = this.w3y_1;
+    var tmp0_elvis_lhs = this.x3y_1;
     return tmp0_elvis_lhs == null ? this.page.t3h() : tmp0_elvis_lhs;
   };
   protoOf(Card_0).k3c = function () {
-    return this.y3y_1;
+    return this.z3y_1;
   };
   protoOf(Card_0).u3c = function () {
     // Inline function 'org.cru.godtools.shared.tool.parser.model.contentTips' call
@@ -7675,7 +7687,7 @@
       case 0:
         // Inline function 'kotlin.collections.filter' call
-        var tmp0 = this.x3y_1;
+        var tmp0 = this.y3y_1;
         // Inline function 'kotlin.collections.filterTo' call
         var destination = ArrayList_init_$Create$();
@@ -7692,7 +7704,7 @@
       case 1:
         // Inline function 'kotlin.collections.filter' call
-        var tmp0_0 = this.x3y_1;
+        var tmp0_0 = this.y3y_1;
         // Inline function 'kotlin.collections.filterTo' call
         var destination_0 = ArrayList_init_$Create$();
@@ -7718,15 +7730,15 @@
   function Card_0() {
   }
   protoOf(CardCollectionPage).v3g = function () {
-    return this.t3z_1;
+    return this.u3z_1;
   };
   protoOf(CardCollectionPage).j3c = function () {
     return this.header;
   };
-  protoOf(CardCollectionPage).v3z = function () {
+  protoOf(CardCollectionPage).w3z = function () {
     return this._cards;
   };
-  protoOf(CardCollectionPage).w3z = function () {
+  protoOf(CardCollectionPage).x3z = function () {
     // Inline function 'kotlin.collections.toTypedArray' call
     var this_0 = this._cards;
     return copyToArray(this_0);
@@ -7742,11 +7754,11 @@
   function _init_properties_Constants_kt__atb1ur_1() {
     if (!properties_initialized_Constants_kt_w4w61t_1) {
       properties_initialized_Constants_kt_w4w61t_1 = true;
-      DEFAULT_CONTROL_COLOR = color(225, 225, 225, 1.0);
+      DEFAULT_CONTROL_COLOR = toPlatformColor(color(225, 225, 225, 1.0));
     }
   }
   function Companion_45() {
-    this.x3z_1 = 'content';
+    this.y3z_1 = 'content';
   }
   var Companion_instance_46;
   function Companion_getInstance_48() {
@@ -7756,13 +7768,13 @@
     Page_init_$Init$(container, fileName, parser, $this);
     ContentPage.call($this);
     parser.o3b(2, 'https://mobile-content-api.cru.org/xmlns/page', 'page');
-    Companion_getInstance_49().a3z(parser, 'content');
+    Companion_getInstance_49().b3z(parser, 'content');
     var tmp = $this;
     // Inline function 'kotlin.collections.mutableListOf' call
-    tmp.q40_1 = ArrayList_init_$Create$();
+    tmp.r40_1 = ArrayList_init_$Create$();
     var tmp_0 = $this;
     // Inline function 'kotlin.collections.mutableListOf' call
-    tmp_0.r40_1 = ArrayList_init_$Create$();
+    tmp_0.s40_1 = ArrayList_init_$Create$();
     // Inline function 'org.cru.godtools.shared.tool.parser.xml.parseChildren' call
     $l$loop_2: while (!(parser.l() === 3)) {
       if (!(parser.p3b() === 2))
@@ -7770,14 +7782,14 @@
       var tmp0_subject = parser.q3b();
       if (tmp0_subject === 'https://mobile-content-api.cru.org/xmlns/analytics') {
         if (parser.l2() === 'events') {
-          var tmp0 = $this.q40_1;
+          var tmp0 = $this.r40_1;
           // Inline function 'kotlin.collections.plusAssign' call
           var elements = Companion_instance_4.s3b(parser, $this);
           addAll(tmp0, elements);
         }
       } else if (tmp0_subject === 'https://mobile-content-api.cru.org/xmlns/page') {
         if (parser.l2() === 'content') {
-          var tmp4 = $this.r40_1;
+          var tmp4 = $this.s40_1;
           // Inline function 'org.cru.godtools.shared.tool.parser.model.parseContent' call
           // Inline function 'kotlin.collections.buildList' call
           // Inline function 'kotlin.collections.buildListInternal' call
@@ -7833,20 +7845,20 @@
     return ContentPage_init_$Init$(container, fileName, parser, objectCreate(protoOf(ContentPage)));
   }
   protoOf(ContentPage).v3g = function () {
-    return this.q40_1;
+    return this.r40_1;
   };
   protoOf(ContentPage).k3c = function () {
-    return this.r40_1;
+    return this.s40_1;
   };
   function ContentPage() {
   }
   function $parseCOROUTINE$1(_this__u8e3s4, container, fileName, parser, parseFile, resultContinuation) {
     CoroutineImpl.call(this, resultContinuation);
-    this.a41_1 = _this__u8e3s4;
-    this.b41_1 = container;
-    this.c41_1 = fileName;
-    this.d41_1 = parser;
-    this.e41_1 = parseFile;
+    this.b41_1 = _this__u8e3s4;
+    this.c41_1 = container;
+    this.d41_1 = fileName;
+    this.e41_1 = parser;
+    this.f41_1 = parseFile;
   }
   protoOf($parseCOROUTINE$1).d9 = function () {
     var suspendResult = this.x8_1;
@@ -7856,35 +7868,35 @@
         switch (tmp) {
           case 0:
             this.w8_1 = 3;
-            this.d41_1.o3b(2, null, 'page');
-            this.f41_1 = to(this.d41_1.q3b(), this.d41_1.n3p('http://www.w3.org/2001/XMLSchema-instance', 'type'));
-            if (this.f41_1.equals(to('https://mobile-content-api.cru.org/xmlns/page', 'page-collection'))) {
-              if (!this.b41_1.h3k(getKClass(PageCollectionPage)))
+            this.e41_1.o3b(2, null, 'page');
+            this.g41_1 = to(this.e41_1.q3b(), this.e41_1.n3p('http://www.w3.org/2001/XMLSchema-instance', 'type'));
+            if (this.g41_1.equals(to('https://mobile-content-api.cru.org/xmlns/page', 'page-collection'))) {
+              if (!this.c41_1.h3k(getKClass(PageCollectionPage)))
                 return null;
               this.v8_1 = 1;
-              suspendResult = Companion_instance_48.m41(this.b41_1, this.c41_1, this.d41_1, this.e41_1, this);
+              suspendResult = Companion_instance_48.n41(this.c41_1, this.d41_1, this.e41_1, this.f41_1, this);
               if (suspendResult === get_COROUTINE_SUSPENDED()) {
                 return suspendResult;
               }
               continue $sm;
             } else {
-              this.g41_1 = this.a41_1.h41(this.b41_1, this.c41_1, this.d41_1);
+              this.h41_1 = this.b41_1.i41(this.c41_1, this.d41_1, this.e41_1);
               this.v8_1 = 2;
               continue $sm;
             }
           case 1:
-            this.g41_1 = suspendResult;
+            this.h41_1 = suspendResult;
             this.v8_1 = 2;
             continue $sm;
           case 2:
-            var tmp1_safe_receiver = this.g41_1;
+            var tmp1_safe_receiver = this.h41_1;
             var tmp_0;
             if (tmp1_safe_receiver == null) {
               tmp_0 = null;
             } else {
               var tmp_1;
-              if (this.b41_1.h3k(getKClassFromExpression(tmp1_safe_receiver))) {
+              if (this.c41_1.h3k(getKClassFromExpression(tmp1_safe_receiver))) {
                 tmp_1 = tmp1_safe_receiver;
               } else {
                 tmp_1 = null;
@@ -7911,7 +7923,7 @@
     Companion_instance_47 = this;
     this.l3m_1 = 'page';
     this.m3m_1 = 'parent_override_page-collection';
-    this.n3m_1 = color(0, 0, 0, 0.0);
+    this.n3m_1 = toPlatformColor(color(0, 0, 0, 0.0));
     this.o3m_1 = Companion_getInstance_22().CENTER;
     this.p3m_1 = ImageScaleType_FILL_X_getInstance();
   }
@@ -7921,7 +7933,7 @@
     tmp.y8_1 = null;
     return tmp.d9();
   };
-  protoOf(Companion_46).h41 = function (container, fileName, parser) {
+  protoOf(Companion_46).i41 = function (container, fileName, parser) {
     parser.o3b(2, null, 'page');
     var tmp;
     switch (parser.q3b()) {
@@ -7992,7 +8004,7 @@
     }
     return tmp_1;
   };
-  protoOf(Companion_46).a3z = function (_this__u8e3s4, type) {
+  protoOf(Companion_46).b3z = function (_this__u8e3s4, type) {
     var actual = _this__u8e3s4.n3p('http://www.w3.org/2001/XMLSchema-instance', 'type');
     if (!(type === actual))
       throw new XmlPullParserException('expected ' + type + ' not ' + actual);
@@ -8022,8 +8034,8 @@
     BaseModel.call($this, container);
     Page.call($this);
     parser.o3b(2, null, 'page');
-    $this.q3x_1 = parser.d3d('id');
-    $this.r3x_1 = fileName;
+    $this.r3x_1 = parser.d3d('id');
+    $this.s3x_1 = fileName;
     var tmp = $this;
     var tmp0_safe_receiver = parser.n3p('https://mobile-content-api.cru.org/xmlns/cyoa', 'parent_override_page-collection');
     var tmp_0;
@@ -8040,7 +8052,7 @@
       tmp_0 = tmp_1;
     }
     var tmp1_elvis_lhs = tmp_0;
-    tmp.s3x_1 = tmp1_elvis_lhs == null ? parser.n3p('https://mobile-content-api.cru.org/xmlns/cyoa', 'parent') : tmp1_elvis_lhs;
+    tmp.t3x_1 = tmp1_elvis_lhs == null ? parser.n3p('https://mobile-content-api.cru.org/xmlns/cyoa', 'parent') : tmp1_elvis_lhs;
     var tmp_2 = $this;
     var tmp2_safe_receiver = parser.d3d('hidden');
     var tmp3_elvis_lhs = tmp2_safe_receiver == null ? null : toBoolean(tmp2_safe_receiver);
@@ -8049,42 +8061,49 @@
     $this._dismissListeners = toSet_0(toEventIds(parser.d3d('dismiss-listeners')));
     var tmp_3 = $this;
     var tmp4_safe_receiver = parser.d3d('primary-color');
-    tmp_3.t3x_1 = tmp4_safe_receiver == null ? null : toColorOrNull(tmp4_safe_receiver);
+    var tmp5_safe_receiver = tmp4_safe_receiver == null ? null : toColorOrNull(tmp4_safe_receiver);
+    tmp_3.u3x_1 = tmp5_safe_receiver == null ? null : toPlatformColor(tmp5_safe_receiver);
     var tmp_4 = $this;
-    var tmp5_safe_receiver = parser.d3d('primary-text-color');
-    tmp_4.u3x_1 = tmp5_safe_receiver == null ? null : toColorOrNull(tmp5_safe_receiver);
+    var tmp6_safe_receiver = parser.d3d('primary-text-color');
+    var tmp7_safe_receiver = tmp6_safe_receiver == null ? null : toColorOrNull(tmp6_safe_receiver);
+    tmp_4.v3x_1 = tmp7_safe_receiver == null ? null : toPlatformColor(tmp7_safe_receiver);
     var tmp_5 = $this;
-    var tmp6_safe_receiver = parser.d3d('background-color');
-    var tmp7_elvis_lhs = tmp6_safe_receiver == null ? null : toColorOrNull(tmp6_safe_receiver);
-    tmp_5.v3x_1 = tmp7_elvis_lhs == null ? Companion_getInstance_49().n3m_1 : tmp7_elvis_lhs;
-    $this.w3x_1 = parser.d3d('background-image');
+    var tmp8_safe_receiver = parser.d3d('background-color');
+    var tmp9_safe_receiver = tmp8_safe_receiver == null ? null : toColorOrNull(tmp8_safe_receiver);
+    var tmp10_elvis_lhs = tmp9_safe_receiver == null ? null : toPlatformColor(tmp9_safe_receiver);
+    tmp_5.w3x_1 = tmp10_elvis_lhs == null ? Companion_getInstance_49().n3m_1 : tmp10_elvis_lhs;
+    $this.x3x_1 = parser.d3d('background-image');
     var tmp_6 = $this;
-    var tmp8_safe_receiver = parser.d3d('background-image-align');
-    var tmp9_elvis_lhs = tmp8_safe_receiver == null ? null : Companion_getInstance_22().k3g(tmp8_safe_receiver);
-    tmp_6.x3x_1 = tmp9_elvis_lhs == null ? Companion_getInstance_49().o3m_1 : tmp9_elvis_lhs;
+    var tmp11_safe_receiver = parser.d3d('background-image-align');
+    var tmp12_elvis_lhs = tmp11_safe_receiver == null ? null : Companion_getInstance_22().k3g(tmp11_safe_receiver);
+    tmp_6.y3x_1 = tmp12_elvis_lhs == null ? Companion_getInstance_49().o3m_1 : tmp12_elvis_lhs;
     var tmp_7 = $this;
-    var tmp10_safe_receiver = parser.d3d('background-image-scale-type');
-    var tmp11_elvis_lhs = tmp10_safe_receiver == null ? null : Companion_instance_22.v3k(tmp10_safe_receiver);
-    tmp_7.y3x_1 = tmp11_elvis_lhs == null ? Companion_getInstance_49().p3m_1 : tmp11_elvis_lhs;
+    var tmp13_safe_receiver = parser.d3d('background-image-scale-type');
+    var tmp14_elvis_lhs = tmp13_safe_receiver == null ? null : Companion_instance_22.v3k(tmp13_safe_receiver);
+    tmp_7.z3x_1 = tmp14_elvis_lhs == null ? Companion_getInstance_49().p3m_1 : tmp14_elvis_lhs;
     var tmp_8 = $this;
-    var tmp12_safe_receiver = parser.d3d('control-color');
-    tmp_8.z3x_1 = tmp12_safe_receiver == null ? null : toColorOrNull(tmp12_safe_receiver);
+    var tmp15_safe_receiver = parser.d3d('control-color');
+    var tmp16_safe_receiver = tmp15_safe_receiver == null ? null : toColorOrNull(tmp15_safe_receiver);
+    tmp_8.a3y_1 = tmp16_safe_receiver == null ? null : toPlatformColor(tmp16_safe_receiver);
     var tmp_9 = $this;
-    var tmp13_safe_receiver = parser.n3p('https://mobile-content-api.cru.org/xmlns/content', 'card-background-color');
-    tmp_9.a3y_1 = tmp13_safe_receiver == null ? null : toColorOrNull(tmp13_safe_receiver);
+    var tmp17_safe_receiver = parser.n3p('https://mobile-content-api.cru.org/xmlns/content', 'card-background-color');
+    var tmp18_safe_receiver = tmp17_safe_receiver == null ? null : toColorOrNull(tmp17_safe_receiver);
+    tmp_9.b3y_1 = tmp18_safe_receiver == null ? null : toPlatformColor(tmp18_safe_receiver);
     var tmp_10 = $this;
-    var tmp14_safe_receiver = parser.n3p('https://mobile-content-api.cru.org/xmlns/content', 'multiselect-option-background-color');
-    tmp_10.b3y_1 = tmp14_safe_receiver == null ? null : toColorOrNull(tmp14_safe_receiver);
+    var tmp19_safe_receiver = parser.n3p('https://mobile-content-api.cru.org/xmlns/content', 'multiselect-option-background-color');
+    var tmp20_safe_receiver = tmp19_safe_receiver == null ? null : toColorOrNull(tmp19_safe_receiver);
+    tmp_10.c3y_1 = tmp20_safe_receiver == null ? null : toPlatformColor(tmp20_safe_receiver);
     var tmp_11 = $this;
-    var tmp15_safe_receiver = parser.n3p('https://mobile-content-api.cru.org/xmlns/content', 'multiselect-option-selected-color');
-    tmp_11.c3y_1 = tmp15_safe_receiver == null ? null : toColorOrNull(tmp15_safe_receiver);
+    var tmp21_safe_receiver = parser.n3p('https://mobile-content-api.cru.org/xmlns/content', 'multiselect-option-selected-color');
+    var tmp22_safe_receiver = tmp21_safe_receiver == null ? null : toColorOrNull(tmp21_safe_receiver);
+    tmp_11.d3y_1 = tmp22_safe_receiver == null ? null : toPlatformColor(tmp22_safe_receiver);
     var tmp_12 = $this;
-    var tmp16_safe_receiver = parser.d3d('text-color');
-    tmp_12.d3y_1 = tmp16_safe_receiver == null ? null : toColorOrNull(tmp16_safe_receiver);
+    var tmp23_safe_receiver = parser.d3d('text-color');
+    tmp_12.e3y_1 = tmp23_safe_receiver == null ? null : toColorOrNull(tmp23_safe_receiver);
     var tmp_13 = $this;
-    var tmp17_safe_receiver = parser.d3d('text-scale');
-    var tmp18_elvis_lhs = tmp17_safe_receiver == null ? null : toDoubleOrNull(tmp17_safe_receiver);
-    tmp_13.e3y_1 = tmp18_elvis_lhs == null ? 1.0 : tmp18_elvis_lhs;
+    var tmp24_safe_receiver = parser.d3d('text-scale');
+    var tmp25_elvis_lhs = tmp24_safe_receiver == null ? null : toDoubleOrNull(tmp24_safe_receiver);
+    tmp_13.f3y_1 = tmp25_elvis_lhs == null ? 1.0 : tmp25_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) {
@@ -8105,30 +8124,30 @@
     textScale = textScale === VOID ? 1.0 : textScale;
     BaseModel.call($this, container);
     Page.call($this);
-    $this.q3x_1 = id;
-    $this.r3x_1 = fileName;
-    $this.s3x_1 = parentPage;
+    $this.r3x_1 = id;
+    $this.s3x_1 = fileName;
+    $this.t3x_1 = parentPage;
     $this.isHidden = false;
     $this._listeners = emptySet();
     $this._dismissListeners = emptySet();
-    $this.t3x_1 = primaryColor;
-    $this.u3x_1 = null;
-    $this.v3x_1 = backgroundColor;
-    $this.w3x_1 = backgroundImage;
-    $this.x3x_1 = backgroundImageGravity;
-    $this.y3x_1 = backgroundImageScaleType;
-    $this.z3x_1 = controlColor;
-    $this.a3y_1 = cardBackgroundColor;
-    $this.b3y_1 = multiselectOptionBackgroundColor;
-    $this.c3y_1 = multiselectOptionSelectedColor;
-    $this.d3y_1 = textColor;
-    $this.e3y_1 = textScale;
+    $this.u3x_1 = primaryColor;
+    $this.v3x_1 = null;
+    $this.w3x_1 = backgroundColor;
+    $this.x3x_1 = backgroundImage;
+    $this.y3x_1 = backgroundImageGravity;
+    $this.z3x_1 = backgroundImageScaleType;
+    $this.a3y_1 = controlColor;
+    $this.b3y_1 = cardBackgroundColor;
+    $this.c3y_1 = multiselectOptionBackgroundColor;
+    $this.d3y_1 = multiselectOptionSelectedColor;
+    $this.e3y_1 = textColor;
+    $this.f3y_1 = textScale;
     return $this;
   }
   function Page$id$delegate$lambda(this$0) {
     return function () {
-      var tmp0_elvis_lhs = this$0.q3x_1;
-      var tmp1_elvis_lhs = tmp0_elvis_lhs == null ? this$0.r3x_1 : tmp0_elvis_lhs;
+      var tmp0_elvis_lhs = this$0.r3x_1;
+      var tmp1_elvis_lhs = tmp0_elvis_lhs == null ? this$0.s3x_1 : tmp0_elvis_lhs;
       return tmp1_elvis_lhs == null ? '' + this$0.s38().code + '-' + this$0.position : tmp1_elvis_lhs;
     };
   }
@@ -8138,32 +8157,32 @@
     };
   }
   protoOf(Page).i3c = function () {
-    var tmp0 = this.o3x_1;
+    var tmp0 = this.p3x_1;
     // Inline function 'kotlin.getValue' call
     id$factory();
     return tmp0.c2();
   };
   protoOf(Page).p3u = function () {
-    var tmp0 = this.p3x_1;
+    var tmp0 = this.q3x_1;
     // Inline function 'kotlin.getValue' call
     position$factory();
     return tmp0.c2();
   };
-  protoOf(Page).f3y = function () {
-    return this.r3x_1;
-  };
   protoOf(Page).g3y = function () {
+    return this.s3x_1;
+  };
+  protoOf(Page).h3y = function () {
     var tmp = _get_parentPageContainer__qsoup5(this);
-    var tmp0_safe_receiver = this.s3x_1;
+    var tmp0_safe_receiver = this.t3x_1;
     return tmp.findPage(tmp0_safe_receiver == null ? null : substringBefore(tmp0_safe_receiver, '?'));
   };
-  protoOf(Page).h3y = function () {
+  protoOf(Page).i3y = function () {
     var tmp;
     if (this.parentPage == null) {
       tmp = emptyMap();
     } else {
       // Inline function 'kotlin.text.orEmpty' call
-      var tmp0_elvis_lhs = this.s3x_1;
+      var tmp0_elvis_lhs = this.t3x_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, '?', ''), ['&']);
@@ -8208,13 +8227,13 @@
     }
     return tmp;
   };
-  protoOf(Page).i3y = function () {
+  protoOf(Page).j3y = function () {
     return getOrNull(_get_parentPageContainer__qsoup5(this).g3k(), this.position + 1 | 0);
   };
-  protoOf(Page).j3y = function () {
+  protoOf(Page).k3y = function () {
     return getOrNull(_get_parentPageContainer__qsoup5(this).g3k(), this.position - 1 | 0);
   };
-  protoOf(Page).k3y = function () {
+  protoOf(Page).l3y = function () {
     return this.isHidden;
   };
   protoOf(Page).q3u = function () {
@@ -8224,27 +8243,27 @@
     return this._dismissListeners;
   };
   protoOf(Page).q3h = function () {
-    var tmp0_elvis_lhs = this.t3x_1;
+    var tmp0_elvis_lhs = this.u3x_1;
     return tmp0_elvis_lhs == null ? get_primaryColor_0(get_stylesParent(this)) : tmp0_elvis_lhs;
   };
   protoOf(Page).r3h = function () {
-    var tmp0_elvis_lhs = this.u3x_1;
+    var tmp0_elvis_lhs = this.v3x_1;
     return tmp0_elvis_lhs == null ? get_primaryTextColor_0(get_stylesParent(this)) : tmp0_elvis_lhs;
   };
   protoOf(Page).i3q = function () {
-    return this.v3x_1;
+    return this.w3x_1;
   };
   protoOf(Page).j3q = function () {
-    return getResource(this, this.w3x_1);
+    return getResource(this, this.x3x_1);
   };
   protoOf(Page).k3q = function () {
-    return this.x3x_1;
+    return this.y3x_1;
   };
   protoOf(Page).l3q = function () {
-    return this.y3x_1;
+    return this.z3x_1;
   };
-  protoOf(Page).l3y = function () {
-    var tmp0_elvis_lhs = this.z3x_1;
+  protoOf(Page).m3y = function () {
+    var tmp0_elvis_lhs = this.a3y_1;
     var tmp;
     if (tmp0_elvis_lhs == null) {
       var tmp_0 = _get_parentPageContainer__qsoup5(this);
@@ -8257,23 +8276,23 @@
     return tmp2_elvis_lhs == null ? this.s38().l3e_1 : tmp2_elvis_lhs;
   };
   protoOf(Page).t3h = function () {
-    var tmp0_elvis_lhs = this.a3y_1;
+    var tmp0_elvis_lhs = this.b3y_1;
     return tmp0_elvis_lhs == null ? get_cardBackgroundColor.call(this) : tmp0_elvis_lhs;
   };
   protoOf(Page).u3h = function () {
-    var tmp0_elvis_lhs = this.b3y_1;
+    var tmp0_elvis_lhs = this.c3y_1;
     return tmp0_elvis_lhs == null ? get_multiselectOptionBackgroundColor.call(this) : tmp0_elvis_lhs;
   };
   protoOf(Page).v3h = function () {
-    var tmp0_elvis_lhs = this.c3y_1;
+    var tmp0_elvis_lhs = this.d3y_1;
     return tmp0_elvis_lhs == null ? get_multiselectOptionSelectedColor.call(this) : tmp0_elvis_lhs;
   };
   protoOf(Page).o3h = function () {
-    var tmp0_elvis_lhs = this.d3y_1;
+    var tmp0_elvis_lhs = this.e3y_1;
     return tmp0_elvis_lhs == null ? get_textColor_0(get_stylesParent(this)) : tmp0_elvis_lhs;
   };
   protoOf(Page).w3h = function () {
-    return this.e3y_1 * get_textScale_0(get_stylesParent(this));
+    return this.f3y_1 * get_textScale_0(get_stylesParent(this));
   };
   protoOf(Page).l3c = function (type) {
     var tmp;
@@ -8334,9 +8353,9 @@
   function Page() {
     Companion_getInstance_49();
     var tmp = this;
-    tmp.o3x_1 = lazy(Page$id$delegate$lambda(this));
+    tmp.p3x_1 = lazy(Page$id$delegate$lambda(this));
     var tmp_0 = this;
-    tmp_0.p3x_1 = lazy(Page$position$delegate$lambda(this));
+    tmp_0.q3x_1 = lazy(Page$position$delegate$lambda(this));
   }
   function id$factory() {
     return getPropertyCallableRef('id', 1, KProperty1, function (receiver) {
@@ -8350,11 +8369,11 @@
   }
   function $parseCOROUTINE$2(_this__u8e3s4, container, fileName, parser, parseFile, resultContinuation) {
     CoroutineImpl.call(this, resultContinuation);
-    this.v41_1 = _this__u8e3s4;
-    this.w41_1 = container;
-    this.x41_1 = fileName;
-    this.y41_1 = parser;
-    this.z41_1 = parseFile;
+    this.w41_1 = _this__u8e3s4;
+    this.x41_1 = container;
+    this.y41_1 = fileName;
+    this.z41_1 = parser;
+    this.a42_1 = parseFile;
   }
   protoOf($parseCOROUTINE$2).d9 = function () {
     var suspendResult = this.x8_1;
@@ -8365,20 +8384,20 @@
           case 0:
             this.w8_1 = 2;
             var tmp_0 = this;
-            tmp_0.a42_1 = PageCollectionPage_init_$Create$(this.w41_1, this.x41_1, this.y41_1);
-            this.b42_1 = this.a42_1;
+            tmp_0.b42_1 = PageCollectionPage_init_$Create$(this.x41_1, this.y41_1, this.z41_1);
+            this.c42_1 = this.b42_1;
             var tmp_1 = this;
-            tmp_1.c42_1 = this.b42_1;
-            this.d42_1 = this.c42_1;
+            tmp_1.d42_1 = this.c42_1;
+            this.e42_1 = this.d42_1;
             this.v8_1 = 1;
-            suspendResult = buildPagesFromParsedPages(this.d42_1, this.z41_1, this);
+            suspendResult = buildPagesFromParsedPages(this.e42_1, this.a42_1, this);
             if (suspendResult === get_COROUTINE_SUSPENDED()) {
               return suspendResult;
             }
             continue $sm;
           case 1:
-            return this.b42_1;
+            return this.c42_1;
           case 2:
             throw this.y8_1;
         }
@@ -8394,10 +8413,10 @@
      while (true);
   };
   function PageCollectionPage$buildPagesFromParsedPages$slambda$slambda($it, this$0, $parseFile, $pageIndex$delegate, resultContinuation) {
-    this.m42_1 = $it;
-    this.n42_1 = this$0;
-    this.o42_1 = $parseFile;
-    this.p42_1 = $pageIndex$delegate;
+    this.n42_1 = $it;
+    this.o42_1 = this$0;
+    this.p42_1 = $parseFile;
+    this.q42_1 = $pageIndex$delegate;
     CoroutineImpl.call(this, resultContinuation);
   }
   protoOf(PageCollectionPage$buildPagesFromParsedPages$slambda$slambda).k3m = function ($this$async, $completion) {
@@ -8418,12 +8437,12 @@
           case 0:
             this.w8_1 = 3;
             var tmp_0 = this;
-            var tmp0_safe_receiver = this.m42_1.w42_1;
+            var tmp0_safe_receiver = this.n42_1.x42_1;
             var tmp_1;
             if (tmp0_safe_receiver == null) {
               tmp_1 = null;
             } else {
-              tmp_1 = buildPagesFromParsedPages$lambda(this.p42_1).f2(tmp0_safe_receiver);
+              tmp_1 = buildPagesFromParsedPages$lambda(this.q42_1).f2(tmp0_safe_receiver);
             }
             var tmp1_elvis_lhs = tmp_1;
@@ -8434,20 +8453,20 @@
               tmp_2 = tmp1_elvis_lhs;
             }
-            tmp_0.r42_1 = tmp_2;
-            this.s42_1 = Companion_getInstance_49();
-            this.t42_1 = this.m42_1.w42_1;
+            tmp_0.s42_1 = tmp_2;
+            this.t42_1 = Companion_getInstance_49();
+            this.u42_1 = this.n42_1.x42_1;
             this.v8_1 = 1;
-            suspendResult = this.o42_1(this.r42_1, this);
+            suspendResult = this.p42_1(this.s42_1, this);
             if (suspendResult === get_COROUTINE_SUSPENDED()) {
               return suspendResult;
             }
             continue $sm;
           case 1:
-            this.u42_1 = suspendResult;
+            this.v42_1 = suspendResult;
             this.v8_1 = 2;
-            suspendResult = this.s42_1.q3m(this.n42_1, this.t42_1, this.u42_1, this.o42_1, this);
+            suspendResult = this.t42_1.q3m(this.o42_1, this.u42_1, this.v42_1, this.p42_1, this);
             if (suspendResult === get_COROUTINE_SUSPENDED()) {
               return suspendResult;
             }
@@ -8470,8 +8489,8 @@
      while (true);
   };
   protoOf(PageCollectionPage$buildPagesFromParsedPages$slambda$slambda).b19 = function ($this$async, completion) {
-    var i = new PageCollectionPage$buildPagesFromParsedPages$slambda$slambda(this.m42_1, this.n42_1, this.o42_1, this.p42_1, completion);
-    i.q42_1 = $this$async;
+    var i = new PageCollectionPage$buildPagesFromParsedPages$slambda$slambda(this.n42_1, this.o42_1, this.p42_1, this.q42_1, completion);
+    i.r42_1 = $this$async;
     return i;
   };
   function PageCollectionPage$buildPagesFromParsedPages$slambda$slambda_0($it, this$0, $parseFile, $pageIndex$delegate, resultContinuation) {
@@ -8483,19 +8502,19 @@
     return l;
   }
   function Companion_47() {
-    this.i41_1 = 'page-collection';
-    this.j41_1 = 'pages';
-    this.k41_1 = 'import';
-    this.l41_1 = 'filename';
+    this.j41_1 = 'page-collection';
+    this.k41_1 = 'pages';
+    this.l41_1 = 'import';
+    this.m41_1 = 'filename';
     this.PARENT_PARAM_ACTIVE_PAGE = 'active-page';
   }
-  protoOf(Companion_47).x42 = function () {
-    return this.i41_1;
-  };
   protoOf(Companion_47).y42 = function () {
+    return this.j41_1;
+  };
+  protoOf(Companion_47).z42 = function () {
     return this.PARENT_PARAM_ACTIVE_PAGE;
   };
-  protoOf(Companion_47).m41 = function (container, fileName, parser, parseFile, $completion) {
+  protoOf(Companion_47).n41 = function (container, fileName, parser, parseFile, $completion) {
     var tmp = new $parseCOROUTINE$2(this, container, fileName, parser, parseFile, $completion);
     tmp.x8_1 = Unit_instance;
     tmp.y8_1 = null;
@@ -8506,19 +8525,19 @@
     return Companion_instance_48;
   }
   function _set_pages__j2nojl_0($this, _set____db54di) {
-    return $this.t43_1.m3p($this, pages$factory_1(), _set____db54di);
+    return $this.u43_1.m3p($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.o3b(2, 'https://mobile-content-api.cru.org/xmlns/page', 'page');
-    Companion_getInstance_49().a3z(parser, 'page-collection');
+    Companion_getInstance_49().b3z(parser, 'page-collection');
     var tmp = $this;
     // Inline function 'kotlin.collections.mutableListOf' call
-    tmp.r43_1 = ArrayList_init_$Create$();
+    tmp.s43_1 = ArrayList_init_$Create$();
     var tmp_0 = $this;
     // Inline function 'kotlin.collections.mutableListOf' call
-    tmp_0.s43_1 = ArrayList_init_$Create$();
+    tmp_0.t43_1 = ArrayList_init_$Create$();
     // Inline function 'org.cru.godtools.shared.tool.parser.xml.parseChildren' call
     $l$loop_0: while (!(parser.l() === 3)) {
       if (!(parser.p3b() === 2))
@@ -8526,14 +8545,14 @@
       var tmp0_subject = parser.q3b();
       if (tmp0_subject === 'https://mobile-content-api.cru.org/xmlns/analytics') {
         if (parser.l2() === 'events') {
-          var tmp0 = $this.r43_1;
+          var tmp0 = $this.s43_1;
           // Inline function 'kotlin.collections.plusAssign' call
           var elements = Companion_instance_4.s3b(parser, $this);
           addAll(tmp0, elements);
         }
       } else if (tmp0_subject === 'https://mobile-content-api.cru.org/xmlns/page') {
         if (parser.l2() === 'pages') {
-          var tmp2 = $this.s43_1;
+          var tmp2 = $this.t43_1;
           // Inline function 'kotlin.collections.plusAssign' call
           var elements_0 = parsePages_0($this, parser);
           addAll(tmp2, elements_0);
@@ -8561,7 +8580,7 @@
       if (_this__u8e3s4.q3b() === 'https://mobile-content-api.cru.org/xmlns/page') {
         var tmp1_subject = _this__u8e3s4.l2();
         if (tmp1_subject === 'page') {
-          var tmp2_safe_receiver = Companion_getInstance_49().h41($this, null, _this__u8e3s4);
+          var tmp2_safe_receiver = Companion_getInstance_49().i41($this, null, _this__u8e3s4);
           if (tmp2_safe_receiver == null)
             null;
           else {
@@ -8587,8 +8606,8 @@
   function PageOrImport(page, ref) {
     page = page === VOID ? null : page;
     ref = ref === VOID ? null : ref;
-    this.v42_1 = page;
-    this.w42_1 = ref;
+    this.w42_1 = page;
+    this.x42_1 = ref;
   }
   function buildPagesFromParsedPages$lambda($pageIndex$delegate) {
     // Inline function 'kotlin.getValue' call
@@ -8615,19 +8634,19 @@
     };
   }
   function PageCollectionPage$buildPagesFromParsedPages$slambda(this$0, $parseFile, $pageIndex$delegate, resultContinuation) {
-    this.n44_1 = this$0;
-    this.o44_1 = $parseFile;
-    this.p44_1 = $pageIndex$delegate;
+    this.o44_1 = this$0;
+    this.p44_1 = $parseFile;
+    this.q44_1 = $pageIndex$delegate;
     CoroutineImpl.call(this, resultContinuation);
   }
-  protoOf(PageCollectionPage$buildPagesFromParsedPages$slambda).r44 = function ($this$coroutineScope, $completion) {
+  protoOf(PageCollectionPage$buildPagesFromParsedPages$slambda).s44 = function ($this$coroutineScope, $completion) {
     var tmp = this.b19($this$coroutineScope, $completion);
     tmp.x8_1 = Unit_instance;
     tmp.y8_1 = null;
     return tmp.d9();
   };
   protoOf(PageCollectionPage$buildPagesFromParsedPages$slambda).l9 = function (p1, $completion) {
-    return this.r44((!(p1 == null) ? isInterface(p1, CoroutineScope) : false) ? p1 : THROW_CCE(), $completion);
+    return this.s44((!(p1 == null) ? isInterface(p1, CoroutineScope) : false) ? p1 : THROW_CCE(), $completion);
   };
   protoOf(PageCollectionPage$buildPagesFromParsedPages$slambda).d9 = function () {
     var suspendResult = this.x8_1;
@@ -8638,12 +8657,12 @@
           case 0:
             this.w8_1 = 2;
             this.v8_1 = 1;
-            var this_0 = this.n44_1.s43_1;
+            var this_0 = this.o44_1.t43_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.v42_1;
+              var tmp0_safe_receiver = item.w42_1;
               var tmp_0;
               if (tmp0_safe_receiver == null) {
                 tmp_0 = null;
@@ -8653,7 +8672,7 @@
               var tmp1_elvis_lhs = tmp_0;
               var tmp_1;
               if (tmp1_elvis_lhs == null) {
-                tmp_1 = async(this.q44_1, VOID, VOID, PageCollectionPage$buildPagesFromParsedPages$slambda$slambda_0(item, this.n44_1, this.o44_1, this.p44_1, null));
+                tmp_1 = async(this.r44_1, VOID, VOID, PageCollectionPage$buildPagesFromParsedPages$slambda$slambda_0(item, this.o44_1, this.p44_1, this.q44_1, null));
               } else {
                 tmp_1 = tmp1_elvis_lhs;
               }
@@ -8684,22 +8703,22 @@
      while (true);
   };
   protoOf(PageCollectionPage$buildPagesFromParsedPages$slambda).b19 = function ($this$coroutineScope, completion) {
-    var i = new PageCollectionPage$buildPagesFromParsedPages$slambda(this.n44_1, this.o44_1, this.p44_1, completion);
-    i.q44_1 = $this$coroutineScope;
+    var i = new PageCollectionPage$buildPagesFromParsedPages$slambda(this.o44_1, this.p44_1, this.q44_1, completion);
+    i.r44_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.r44($this$coroutineScope, $completion);
+      return i.s44($this$coroutineScope, $completion);
     };
     l.$arity = 1;
     return l;
   }
   function $buildPagesFromParsedPagesCOROUTINE$3(_this__u8e3s4, parseFile, resultContinuation) {
     CoroutineImpl.call(this, resultContinuation);
-    this.c44_1 = _this__u8e3s4;
-    this.d44_1 = parseFile;
+    this.d44_1 = _this__u8e3s4;
+    this.e44_1 = parseFile;
   }
   protoOf($buildPagesFromParsedPagesCOROUTINE$3).d9 = function () {
     var suspendResult = this.x8_1;
@@ -8710,9 +8729,9 @@
           case 0:
             this.w8_1 = 2;
             var tmp_0 = this;
-            tmp_0.e44_1 = lazy(PageCollectionPage$buildPagesFromParsedPages$lambda(this.c44_1));
+            tmp_0.f44_1 = lazy(PageCollectionPage$buildPagesFromParsedPages$lambda(this.d44_1));
             this.v8_1 = 1;
-            suspendResult = coroutineScope(PageCollectionPage$buildPagesFromParsedPages$slambda_0(this.c44_1, this.d44_1, this.e44_1, null), this);
+            suspendResult = coroutineScope(PageCollectionPage$buildPagesFromParsedPages$slambda_0(this.d44_1, this.e44_1, this.f44_1, null), this);
             if (suspendResult === get_COROUTINE_SUSPENDED()) {
               return suspendResult;
             }
@@ -8720,7 +8739,7 @@
             continue $sm;
           case 1:
             var ARGUMENT = suspendResult;
-            _set_pages__j2nojl_0(this.c44_1, ARGUMENT);
+            _set_pages__j2nojl_0(this.d44_1, ARGUMENT);
             return Unit_instance;
           case 2:
             throw this.y8_1;
@@ -8737,16 +8756,16 @@
      while (true);
   };
   protoOf(PageCollectionPage).v3g = function () {
-    return this.r43_1;
+    return this.s43_1;
   };
   protoOf(PageCollectionPage).g3k = function () {
-    return this.t43_1.b3r(this, pages$factory_2());
+    return this.u43_1.b3r(this, pages$factory_2());
   };
   protoOf(PageCollectionPage).h3k = function (type) {
     return type.equals(getKClass(ContentPage));
   };
   function PageCollectionPage() {
-    this.t43_1 = setOnce();
+    this.u43_1 = setOnce();
   }
   function pages$factory_1() {
     return getPropertyCallableRef('pages', 1, KMutableProperty1, function (receiver) {
@@ -8776,7 +8795,7 @@
       if (!(_this__u8e3s4.p3b() === 2))
         continue $l$loop_0;
       if (_this__u8e3s4.q3b() === 'https://mobile-content-api.cru.org/xmlns/shareable') {
-        var tmp1_safe_receiver = Companion_instance_49.s44(manifest, _this__u8e3s4);
+        var tmp1_safe_receiver = Companion_instance_49.t44(manifest, _this__u8e3s4);
         if (tmp1_safe_receiver == null)
           null;
         else {
@@ -8790,8 +8809,8 @@
     }
     return this_0.k3();
   };
-  protoOf(Companion_48).s44 = function (manifest, parser) {
-    parser.t44(2, 'https://mobile-content-api.cru.org/xmlns/shareable');
+  protoOf(Companion_48).t44 = function (manifest, parser) {
+    parser.u44(2, 'https://mobile-content-api.cru.org/xmlns/shareable');
     var tmp;
     if (parser.q3b() === 'https://mobile-content-api.cru.org/xmlns/shareable') {
       tmp = parser.l2() === 'image' ? ShareableImage_init_$Create$(manifest, parser) : null;
@@ -8807,7 +8826,7 @@
   function Shareable_init_$Init$(parent, parser, $this) {
     BaseModel.call($this, parent);
     Shareable.call($this);
-    parser.t44(2, 'https://mobile-content-api.cru.org/xmlns/shareable');
+    parser.u44(2, 'https://mobile-content-api.cru.org/xmlns/shareable');
     $this.u3p_1 = parser.d3d('id');
     var tmp = $this;
     var tmp0_safe_receiver = parser.d3d('order');
@@ -8821,7 +8840,7 @@
   function Shareable() {
   }
   function Companion_49() {
-    this.u44_1 = 'image';
+    this.v44_1 = 'image';
   }
   var Companion_instance_50;
   function Companion_getInstance_52() {
@@ -8831,7 +8850,7 @@
     Shareable_init_$Init$(manifest, parser, $this);
     ShareableImage.call($this);
     parser.o3b(2, 'https://mobile-content-api.cru.org/xmlns/shareable', 'image');
-    $this.y44_1 = parser.d3d('resource');
+    $this.z44_1 = parser.d3d('resource');
     var description = null;
     // Inline function 'org.cru.godtools.shared.tool.parser.xml.parseChildren' call
     $l$loop_0: while (!(parser.l() === 3)) {
@@ -8845,7 +8864,7 @@
         continue $l$loop_0;
       skipTag(parser);
     }
-    $this.z44_1 = description;
+    $this.a45_1 = description;
     return $this;
   }
   function ShareableImage_init_$Create$(manifest, parser) {
@@ -8853,12 +8872,12 @@
   }
   protoOf(ShareableImage).i3c = function () {
     var tmp0_elvis_lhs = protoOf(Shareable).i3c.call(this);
-    return tmp0_elvis_lhs == null ? this.y44_1 : tmp0_elvis_lhs;
+    return tmp0_elvis_lhs == null ? this.z44_1 : tmp0_elvis_lhs;
   };
   function ShareableImage() {
   }
   function Companion_50() {
-    this.a45_1 = 'tip';
+    this.b45_1 = 'tip';
   }
   var Companion_instance_51;
   function Companion_getInstance_53() {
@@ -8888,7 +8907,7 @@
   protoOf(InlineTip).i3c = function () {
     return this.id;
   };
-  protoOf(InlineTip).h45 = function () {
+  protoOf(InlineTip).i45 = function () {
     return this.s38().k3r(this.id);
   };
   protoOf(InlineTip).u3c = function () {
@@ -8903,7 +8922,7 @@
   var Type_QUOTE_instance;
   function Companion_51() {
     Companion_instance_52 = this;
-    this.i45_1 = Type_TIP_getInstance();
+    this.j45_1 = Type_TIP_getInstance();
   }
   protoOf(Companion_51).x3k = function (_this__u8e3s4) {
     switch (_this__u8e3s4) {
@@ -8948,7 +8967,7 @@
     var tmp = $this;
     var tmp0_safe_receiver = parser.d3d('type');
     var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : Companion_getInstance_54().x3k(tmp0_safe_receiver);
-    tmp.h3o_1 = tmp1_elvis_lhs == null ? Companion_getInstance_54().i45_1 : tmp1_elvis_lhs;
+    tmp.h3o_1 = tmp1_elvis_lhs == null ? Companion_getInstance_54().j45_1 : tmp1_elvis_lhs;
     var tmp_0 = $this;
     // Inline function 'kotlin.collections.buildList' call
     // Inline function 'kotlin.collections.buildListInternal' call
@@ -8976,7 +8995,7 @@
   function Tip_init_$Init$_0(manifest, id, type, $this) {
     manifest = manifest === VOID ? null : manifest;
     id = id === VOID ? '' : id;
-    type = type === VOID ? Companion_getInstance_54().i45_1 : type;
+    type = type === VOID ? Companion_getInstance_54().j45_1 : type;
     BaseModel.call($this, manifest);
     Tip.call($this);
     $this.g3o_1 = id;
@@ -9043,7 +9062,7 @@
   function Tip() {
   }
   function Companion_52() {
-    this.j45_1 = 'page';
+    this.k45_1 = 'page';
   }
   var Companion_instance_53;
   function Companion_getInstance_55() {
@@ -9053,8 +9072,8 @@
     BaseModel.call($this, tip);
     TipPage.call($this);
     parser.o3b(2, 'https://mobile-content-api.cru.org/xmlns/training', 'page');
-    $this.l45_1 = tip;
-    $this.m45_1 = position;
+    $this.m45_1 = tip;
+    $this.n45_1 = position;
     var tmp = $this;
     // Inline function 'org.cru.godtools.shared.tool.parser.model.parseContent' call
     // Inline function 'kotlin.collections.buildList' call
@@ -9096,19 +9115,19 @@
         continue $l$loop_0;
       skipTag(parser);
     }
-    tmp.n45_1 = this_0.k3();
+    tmp.o45_1 = this_0.k3();
     return $this;
   }
   function TipPage_init_$Create$(tip, position, parser) {
     return TipPage_init_$Init$(tip, position, parser, objectCreate(protoOf(TipPage)));
   }
   protoOf(TipPage).k3c = function () {
-    return this.n45_1;
+    return this.o45_1;
   };
   function TipPage() {
   }
   function Companion_53() {
-    this.o45_1 = 'call-to-action';
+    this.p45_1 = 'call-to-action';
   }
   var Companion_instance_54;
   function Companion_getInstance_56() {
@@ -9117,10 +9136,10 @@
   function CallToAction_init_$Init$(parent, $this) {
     BaseModel.call($this, parent);
     CallToAction.call($this);
-    $this.q45_1 = parent;
+    $this.r45_1 = parent;
     $this.label = null;
-    $this.r45_1 = null;
     $this.s45_1 = null;
+    $this.t45_1 = null;
     return $this;
   }
   function CallToAction_init_$Create$(parent) {
@@ -9130,11 +9149,12 @@
     BaseModel.call($this, page);
     CallToAction.call($this);
     parser.o3b(2, 'https://mobile-content-api.cru.org/xmlns/tract', 'call-to-action');
-    $this.q45_1 = page;
+    $this.r45_1 = page;
     var tmp = $this;
     var tmp0_safe_receiver = parser.d3d('control-color');
-    tmp.r45_1 = tmp0_safe_receiver == null ? null : toColorOrNull(tmp0_safe_receiver);
-    $this.s45_1 = parser.n3p('https://mobile-content-api.cru.org/xmlns/training', 'tip');
+    var tmp1_safe_receiver = tmp0_safe_receiver == null ? null : toColorOrNull(tmp0_safe_receiver);
+    tmp.s45_1 = tmp1_safe_receiver == null ? null : toPlatformColor(tmp1_safe_receiver);
+    $this.t45_1 = parser.n3p('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;
   }
@@ -9148,11 +9168,11 @@
     tip = tip === VOID ? null : tip;
     BaseModel.call($this, page);
     CallToAction.call($this);
-    $this.q45_1 = page;
+    $this.r45_1 = page;
     var tmp = $this;
     tmp.label = label == null ? null : label($this);
-    $this.r45_1 = controlColor;
-    $this.s45_1 = tip;
+    $this.s45_1 = controlColor;
+    $this.t45_1 = tip;
     return $this;
   }
   function createTestCallToAction(page, label, controlColor, tip) {
@@ -9161,20 +9181,20 @@
   protoOf(CallToAction).i3l = function () {
     return this.label;
   };
-  protoOf(CallToAction).t45 = function () {
-    var tmp0_elvis_lhs = this.r45_1;
+  protoOf(CallToAction).u45 = function () {
+    var tmp0_elvis_lhs = this.s45_1;
     return tmp0_elvis_lhs == null ? get_primaryColor_0(get_stylesParent(this)) : tmp0_elvis_lhs;
   };
-  protoOf(CallToAction).u45 = function () {
-    return this.s45_1;
+  protoOf(CallToAction).v45 = function () {
+    return this.t45_1;
   };
-  protoOf(CallToAction).h45 = function () {
-    return this.s38().k3r(this.s45_1);
+  protoOf(CallToAction).i45 = function () {
+    return this.s38().k3r(this.t45_1);
   };
   function CallToAction() {
   }
   function Companion_54() {
-    this.v45_1 = 'header';
+    this.w45_1 = 'header';
   }
   var Companion_instance_55;
   function Companion_getInstance_57() {
@@ -9186,8 +9206,9 @@
     parser.o3b(2, 'https://mobile-content-api.cru.org/xmlns/tract', 'header');
     var tmp = $this;
     var tmp0_safe_receiver = parser.d3d('background-color');
-    tmp.x45_1 = tmp0_safe_receiver == null ? null : toColorOrNull(tmp0_safe_receiver);
-    $this.y45_1 = parser.n3p('https://mobile-content-api.cru.org/xmlns/training', 'tip');
+    var tmp1_safe_receiver = tmp0_safe_receiver == null ? null : toColorOrNull(tmp0_safe_receiver);
+    tmp.y45_1 = tmp1_safe_receiver == null ? null : toPlatformColor(tmp1_safe_receiver);
+    $this.z45_1 = parser.n3p('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
@@ -9213,11 +9234,11 @@
     return Header_init_$Init$_0(page, parser, objectCreate(protoOf(Header_0)));
   }
   protoOf(Header_0).i3q = function () {
-    var tmp0_elvis_lhs = this.x45_1;
+    var tmp0_elvis_lhs = this.y45_1;
     return tmp0_elvis_lhs == null ? this.q3h() : tmp0_elvis_lhs;
   };
   protoOf(Header_0).o3h = function () {
-    return this.r3h();
+    return toRGB(this.r3h());
   };
   protoOf(Header_0).ji = function () {
     return this.number;
@@ -9225,23 +9246,23 @@
   protoOf(Header_0).n3q = function () {
     return this.title;
   };
-  protoOf(Header_0).u45 = function () {
-    return this.y45_1;
+  protoOf(Header_0).v45 = function () {
+    return this.z45_1;
   };
-  protoOf(Header_0).h45 = function () {
-    return this.s38().k3r(this.y45_1);
+  protoOf(Header_0).i45 = function () {
+    return this.s38().k3r(this.z45_1);
   };
   function Header_0() {
   }
   function Companion_55() {
-    this.z45_1 = 'hero';
+    this.a46_1 = 'hero';
   }
   var Companion_instance_56;
   function Companion_getInstance_58() {
     return Companion_instance_56;
   }
   function _get_headingParent__2ts5bv($this) {
-    var tmp0 = $this.b46_1;
+    var tmp0 = $this.c46_1;
     // Inline function 'kotlin.getValue' call
     headingParent$factory();
     return tmp0.c2();
@@ -9252,7 +9273,7 @@
     parser.o3b(2, 'https://mobile-content-api.cru.org/xmlns/tract', 'hero');
     var tmp = $this;
     // Inline function 'kotlin.collections.mutableListOf' call
-    tmp.d46_1 = ArrayList_init_$Create$();
+    tmp.e46_1 = ArrayList_init_$Create$();
     var heading = null;
     var tmp_0 = $this;
     // Inline function 'org.cru.godtools.shared.tool.parser.model.parseContent' call
@@ -9269,7 +9290,7 @@
         var tmp0_subject = parser.q3b();
         if (tmp0_subject === 'https://mobile-content-api.cru.org/xmlns/analytics') {
           if (parser.l2() === 'events') {
-            var tmp0 = $this.d46_1;
+            var tmp0 = $this.e46_1;
             // Inline function 'kotlin.collections.plusAssign' call
             var elements = Companion_instance_4.s3b(parser, $this);
             addAll(tmp0, elements);
@@ -9307,7 +9328,7 @@
         continue $l$loop_0;
       skipTag(parser);
     }
-    tmp_0.c46_1 = this_0.k3();
+    tmp_0.d46_1 = this_0.k3();
     $this.heading = heading;
     return $this;
   }
@@ -9320,10 +9341,10 @@
     heading = heading === VOID ? null : heading;
     BaseModel.call($this, page);
     Hero.call($this);
-    $this.d46_1 = analyticsEvents;
+    $this.e46_1 = analyticsEvents;
     var tmp = $this;
     tmp.heading = heading == null ? null : heading(_get_headingParent__2ts5bv($this));
-    $this.c46_1 = emptyList();
+    $this.d46_1 = emptyList();
     return $this;
   }
   function createTestHero(page, analyticsEvents, heading) {
@@ -9331,7 +9352,7 @@
   }
   function Hero$headingParent$delegate$lambda$lambda(this$0) {
     return function () {
-      return get_primaryColor_0(get_stylesParent(this$0));
+      return toRGB(get_primaryColor_0(get_stylesParent(this$0)));
     };
   }
   function Hero$headingParent$delegate$lambda(this$0) {
@@ -9339,14 +9360,14 @@
       return stylesOverride(this$0, VOID, Hero$headingParent$delegate$lambda$lambda(this$0));
     };
   }
-  protoOf(Hero).e46 = function () {
+  protoOf(Hero).f46 = function () {
     return this.heading;
   };
   protoOf(Hero).k3c = function () {
-    return this.c46_1;
+    return this.d46_1;
   };
   protoOf(Hero).v3g = function () {
-    return this.d46_1;
+    return this.e46_1;
   };
   protoOf(Hero).l3c = function (type) {
     var tmp;
@@ -9354,7 +9375,7 @@
       case 0:
         // Inline function 'kotlin.collections.filter' call
-        var tmp0 = this.d46_1;
+        var tmp0 = this.e46_1;
         // Inline function 'kotlin.collections.filterTo' call
         var destination = ArrayList_init_$Create$();
@@ -9371,7 +9392,7 @@
       case 1:
         // Inline function 'kotlin.collections.filter' call
-        var tmp0_0 = this.d46_1;
+        var tmp0_0 = this.e46_1;
         // Inline function 'kotlin.collections.filterTo' call
         var destination_0 = ArrayList_init_$Create$();
@@ -9396,7 +9417,7 @@
   };
   function Hero() {
     var tmp = this;
-    tmp.b46_1 = lazy(Hero$headingParent$delegate$lambda(this));
+    tmp.c46_1 = lazy(Hero$headingParent$delegate$lambda(this));
   }
   function headingParent$factory() {
     return getPropertyCallableRef('headingParent', 1, KProperty1, function (receiver) {
@@ -9404,7 +9425,7 @@
     }, null);
   }
   function Companion_56() {
-    this.f46_1 = 'modal';
+    this.g46_1 = 'modal';
   }
   var Companion_instance_57;
   function Companion_getInstance_59() {
@@ -9466,14 +9487,14 @@
         continue $l$loop_0;
       skipTag(parser);
     }
-    tmp.b47_1 = this_0.k3();
+    tmp.c47_1 = this_0.k3();
     $this.title = title;
     return $this;
   }
   function Modal_init_$Create$(parent, parser) {
     return Modal_init_$Init$(parent, parser, objectCreate(protoOf(Modal)));
   }
-  protoOf(Modal).u3z = function () {
+  protoOf(Modal).v3z = function () {
     return this.page;
   };
   protoOf(Modal).i3c = function () {
@@ -9483,7 +9504,7 @@
     return this.title;
   };
   protoOf(Modal).k3c = function () {
-    return this.b47_1;
+    return this.c47_1;
   };
   protoOf(Modal).q3u = function () {
     return this._listeners;
@@ -9492,13 +9513,13 @@
     return this._dismissListeners;
   };
   protoOf(Modal).q3h = function () {
-    return get_TRANSPARENT();
+    return toPlatformColor(get_TRANSPARENT());
   };
   protoOf(Modal).r3h = function () {
-    return get_WHITE();
+    return toPlatformColor(get_WHITE());
   };
   protoOf(Modal).q3g = function () {
-    return get_WHITE();
+    return toPlatformColor(get_WHITE());
   };
   protoOf(Modal).s3h = function () {
     return Style_OUTLINED_getInstance();
@@ -9523,11 +9544,11 @@
   }
   function Companion_57() {
     Companion_instance_58 = this;
-    this.c47_1 = 'card';
-    this.d47_1 = 'label';
-    this.e47_1 = 'hidden';
-    this.f47_1 = ImageScaleType_FILL_X_getInstance();
-    this.g47_1 = Companion_getInstance_22().CENTER;
+    this.d47_1 = 'card';
+    this.e47_1 = 'label';
+    this.f47_1 = 'hidden';
+    this.g47_1 = ImageScaleType_FILL_X_getInstance();
+    this.h47_1 = Companion_getInstance_22().CENTER;
   }
   var Companion_instance_58;
   function Companion_getInstance_60() {
@@ -9536,7 +9557,7 @@
     return Companion_instance_58;
   }
   function _get_labelParent__664ln7($this) {
-    var tmp0 = $this.n47_1;
+    var tmp0 = $this.o47_1;
     // Inline function 'kotlin.getValue' call
     labelParent$factory();
     return tmp0.c2();
@@ -9555,22 +9576,23 @@
     $this._dismissListeners = toSet_0(toEventIds(parser.d3d('dismiss-listeners')));
     var tmp_0 = $this;
     var tmp2_safe_receiver = parser.d3d('background-color');
-    tmp_0.i47_1 = tmp2_safe_receiver == null ? null : toColorOrNull(tmp2_safe_receiver);
-    $this.j47_1 = parser.d3d('background-image');
+    var tmp3_safe_receiver = tmp2_safe_receiver == null ? null : toColorOrNull(tmp2_safe_receiver);
+    tmp_0.j47_1 = tmp3_safe_receiver == null ? null : toPlatformColor(tmp3_safe_receiver);
+    $this.k47_1 = parser.d3d('background-image');
     var tmp_1 = $this;
-    var tmp3_safe_receiver = parser.d3d('background-image-align');
-    var tmp4_elvis_lhs = tmp3_safe_receiver == null ? null : Companion_getInstance_22().k3g(tmp3_safe_receiver);
-    tmp_1.k47_1 = tmp4_elvis_lhs == null ? Companion_getInstance_60().g47_1 : tmp4_elvis_lhs;
+    var tmp4_safe_receiver = parser.d3d('background-image-align');
+    var tmp5_elvis_lhs = tmp4_safe_receiver == null ? null : Companion_getInstance_22().k3g(tmp4_safe_receiver);
+    tmp_1.l47_1 = tmp5_elvis_lhs == null ? Companion_getInstance_60().h47_1 : tmp5_elvis_lhs;
     var tmp_2 = $this;
-    var tmp5_safe_receiver = parser.d3d('background-image-scale-type');
-    var tmp6_elvis_lhs = tmp5_safe_receiver == null ? null : Companion_instance_22.v3k(tmp5_safe_receiver);
-    tmp_2.l47_1 = tmp6_elvis_lhs == null ? Companion_getInstance_60().f47_1 : tmp6_elvis_lhs;
+    var tmp6_safe_receiver = parser.d3d('background-image-scale-type');
+    var tmp7_elvis_lhs = tmp6_safe_receiver == null ? null : Companion_instance_22.v3k(tmp6_safe_receiver);
+    tmp_2.m47_1 = tmp7_elvis_lhs == null ? Companion_getInstance_60().g47_1 : tmp7_elvis_lhs;
     var tmp_3 = $this;
-    var tmp7_safe_receiver = parser.d3d('text-color');
-    tmp_3.m47_1 = tmp7_safe_receiver == null ? null : toColorOrNull(tmp7_safe_receiver);
+    var tmp8_safe_receiver = parser.d3d('text-color');
+    tmp_3.n47_1 = tmp8_safe_receiver == null ? null : toColorOrNull(tmp8_safe_receiver);
     var tmp_4 = $this;
     // Inline function 'kotlin.collections.mutableListOf' call
-    tmp_4.p47_1 = ArrayList_init_$Create$();
+    tmp_4.q47_1 = ArrayList_init_$Create$();
     var label = null;
     var tmp_5 = $this;
     // Inline function 'org.cru.godtools.shared.tool.parser.model.parseContent' call
@@ -9587,7 +9609,7 @@
         var tmp0_subject = parser.q3b();
         if (tmp0_subject === 'https://mobile-content-api.cru.org/xmlns/analytics') {
           if (parser.l2() === 'events') {
-            var tmp0 = $this.p47_1;
+            var tmp0 = $this.q47_1;
             // Inline function 'kotlin.collections.plusAssign' call
             var elements = Companion_instance_4.s3b(parser, $this);
             addAll(tmp0, elements);
@@ -9625,7 +9647,7 @@
         continue $l$loop_0;
       skipTag(parser);
     }
-    tmp_5.o47_1 = this_0.k3();
+    tmp_5.p47_1 = this_0.k3();
     $this.label = label;
     return $this;
   }
@@ -9637,8 +9659,8 @@
     position = position === VOID ? 0 : position;
     backgroundColor = backgroundColor === VOID ? null : backgroundColor;
     backgroundImage = backgroundImage === VOID ? null : backgroundImage;
-    backgroundImageGravity = backgroundImageGravity === VOID ? Companion_getInstance_60().g47_1 : backgroundImageGravity;
-    backgroundImageScaleType = backgroundImageScaleType === VOID ? Companion_getInstance_60().f47_1 : backgroundImageScaleType;
+    backgroundImageGravity = backgroundImageGravity === VOID ? Companion_getInstance_60().h47_1 : backgroundImageGravity;
+    backgroundImageScaleType = backgroundImageScaleType === VOID ? Companion_getInstance_60().g47_1 : backgroundImageScaleType;
     isHidden = isHidden === VOID ? false : isHidden;
     analyticsEvents = analyticsEvents === VOID ? emptyList() : analyticsEvents;
     label = label === VOID ? null : label;
@@ -9650,18 +9672,18 @@
     $this.isHidden = isHidden;
     $this._listeners = emptySet();
     $this._dismissListeners = emptySet();
-    $this.p47_1 = analyticsEvents;
-    $this.i47_1 = backgroundColor;
-    $this.j47_1 = backgroundImage;
-    $this.k47_1 = backgroundImageGravity;
-    $this.l47_1 = backgroundImageScaleType;
-    $this.m47_1 = null;
+    $this.q47_1 = analyticsEvents;
+    $this.j47_1 = backgroundColor;
+    $this.k47_1 = backgroundImage;
+    $this.l47_1 = backgroundImageGravity;
+    $this.m47_1 = backgroundImageScaleType;
+    $this.n47_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.o47_1 = tmp0_elvis_lhs == null ? emptyList() : tmp0_elvis_lhs;
+    tmp_0.p47_1 = tmp0_elvis_lhs == null ? emptyList() : tmp0_elvis_lhs;
     return $this;
   }
   function createTestCard(page, position, backgroundColor, backgroundImage, backgroundImageGravity, backgroundImageScaleType, isHidden, analyticsEvents, label, content) {
@@ -9669,7 +9691,7 @@
   }
   function TractPage$Card$labelParent$delegate$lambda$lambda(this$0) {
     return function () {
-      return this$0.q3h();
+      return toRGB(this$0.q3h());
     };
   }
   function TractPage$Card$labelParent$delegate$lambda(this$0) {
@@ -9683,7 +9705,8 @@
     parser.o3b(2, 'https://mobile-content-api.cru.org/xmlns/tract', 'page');
     var tmp = $this;
     var tmp0_safe_receiver = parser.d3d('card-text-color');
-    tmp.z46_1 = tmp0_safe_receiver == null ? null : toColorOrNull(tmp0_safe_receiver);
+    var tmp1_safe_receiver = tmp0_safe_receiver == null ? null : toColorOrNull(tmp0_safe_receiver);
+    tmp.a47_1 = tmp1_safe_receiver == null ? null : toPlatformColor(tmp1_safe_receiver);
     var header = null;
     var hero = null;
     var tmp_0 = $this;
@@ -9731,8 +9754,8 @@
     $this.header = header;
     $this.hero = hero;
     var tmp_2 = $this;
-    var tmp1_elvis_lhs = callToAction;
-    tmp_2.callToAction = tmp1_elvis_lhs == null ? CallToAction_init_$Create$($this) : tmp1_elvis_lhs;
+    var tmp2_elvis_lhs = callToAction;
+    tmp_2.callToAction = tmp2_elvis_lhs == null ? CallToAction_init_$Create$($this) : tmp2_elvis_lhs;
     return $this;
   }
   function TractPage_init_$Create$(container, fileName, parser) {
@@ -9754,7 +9777,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.z46_1 = cardTextColor;
+    $this.a47_1 = cardTextColor;
     $this.header = null;
     $this.hero = null;
     var tmp = $this;
@@ -9770,7 +9793,7 @@
   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).u3z = function () {
+  protoOf(Card_1).v3z = function () {
     return this.page;
   };
   protoOf(Card_1).i3c = function () {
@@ -9779,7 +9802,7 @@
   protoOf(Card_1).p3u = function () {
     return this.position;
   };
-  protoOf(Card_1).q47 = function () {
+  protoOf(Card_1).r47 = function () {
     // Inline function 'kotlin.takeUnless' call
     var this_0 = this.page.visibleCards.w1(this);
     var tmp;
@@ -9790,10 +9813,10 @@
     }
     return tmp;
   };
-  protoOf(Card_1).r47 = function () {
+  protoOf(Card_1).s47 = function () {
     return equals(this, lastOrNull(this.page.visibleCards));
   };
-  protoOf(Card_1).k3y = function () {
+  protoOf(Card_1).l3y = function () {
     return this.isHidden;
   };
   protoOf(Card_1).q3u = function () {
@@ -9803,27 +9826,27 @@
     return this._dismissListeners;
   };
   protoOf(Card_1).i3q = function () {
-    var tmp0_elvis_lhs = this.i47_1;
+    var tmp0_elvis_lhs = this.j47_1;
     return tmp0_elvis_lhs == null ? this.page.t3h() : tmp0_elvis_lhs;
   };
   protoOf(Card_1).j3q = function () {
-    return getResource(this, this.j47_1);
+    return getResource(this, this.k47_1);
   };
   protoOf(Card_1).k3q = function () {
-    return this.k47_1;
+    return this.l47_1;
   };
   protoOf(Card_1).l3q = function () {
-    return this.l47_1;
+    return this.m47_1;
   };
   protoOf(Card_1).o3h = function () {
-    var tmp0_elvis_lhs = this.m47_1;
-    return tmp0_elvis_lhs == null ? this.page.cardTextColor : tmp0_elvis_lhs;
+    var tmp0_elvis_lhs = this.n47_1;
+    return tmp0_elvis_lhs == null ? toRGB(this.page.cardTextColor) : tmp0_elvis_lhs;
   };
   protoOf(Card_1).i3l = function () {
     return this.label;
   };
   protoOf(Card_1).k3c = function () {
-    return this.o47_1;
+    return this.p47_1;
   };
   protoOf(Card_1).u3c = function () {
     // Inline function 'org.cru.godtools.shared.tool.parser.model.contentTips' call
@@ -9840,7 +9863,7 @@
     return destination;
   };
   protoOf(Card_1).v3g = function () {
-    return this.p47_1;
+    return this.q47_1;
   };
   protoOf(Card_1).l3c = function (type) {
     var tmp;
@@ -9848,7 +9871,7 @@
       case 0:
         // Inline function 'kotlin.collections.filter' call
-        var tmp0 = this.p47_1;
+        var tmp0 = this.q47_1;
         // Inline function 'kotlin.collections.filterTo' call
         var destination = ArrayList_init_$Create$();
@@ -9865,7 +9888,7 @@
       case 1:
         // Inline function 'kotlin.collections.filter' call
-        var tmp0_0 = this.p47_1;
+        var tmp0_0 = this.q47_1;
         // Inline function 'kotlin.collections.filterTo' call
         var destination_0 = ArrayList_init_$Create$();
@@ -9901,7 +9924,7 @@
   function Card_1() {
     Companion_getInstance_60();
     var tmp = this;
-    tmp.n47_1 = lazy(TractPage$Card$labelParent$delegate$lambda(this));
+    tmp.o47_1 = lazy(TractPage$Card$labelParent$delegate$lambda(this));
   }
   function parseCardsXml($this, _this__u8e3s4) {
     // Inline function 'kotlin.collections.buildList' call
@@ -9945,22 +9968,22 @@
     }
     return this_0.k3();
   }
-  protoOf(TractPage).s47 = function () {
+  protoOf(TractPage).t47 = function () {
     return equals(lastOrNull(this.s38().g3k()), this);
   };
   protoOf(TractPage).v3g = function () {
-    return this.y46_1;
+    return this.z46_1;
   };
   protoOf(TractPage).j3c = function () {
     return this.header;
   };
-  protoOf(TractPage).t47 = function () {
+  protoOf(TractPage).u47 = function () {
     return this.hero;
   };
-  protoOf(TractPage).u47 = function () {
+  protoOf(TractPage).v47 = function () {
     return this._modals;
   };
-  protoOf(TractPage).v47 = function () {
+  protoOf(TractPage).w47 = function () {
     return this.callToAction;
   };
   protoOf(TractPage).findModal = function (id) {
@@ -9980,10 +10003,10 @@
     }
     return tmp$ret$1;
   };
-  protoOf(TractPage).v3z = function () {
+  protoOf(TractPage).w3z = function () {
     return this._cards;
   };
-  protoOf(TractPage).w47 = function () {
+  protoOf(TractPage).x47 = function () {
     // Inline function 'kotlin.collections.filter' call
     var tmp0 = this._cards;
     // Inline function 'kotlin.collections.filterTo' call
@@ -9997,22 +10020,22 @@
     }
     return destination;
   };
-  protoOf(TractPage).x47 = function () {
-    var tmp0_elvis_lhs = this.z46_1;
-    return tmp0_elvis_lhs == null ? this.o3h() : tmp0_elvis_lhs;
+  protoOf(TractPage).y47 = function () {
+    var tmp0_elvis_lhs = this.a47_1;
+    return tmp0_elvis_lhs == null ? toPlatformColor(this.o3h()) : tmp0_elvis_lhs;
   };
-  protoOf(TractPage).w3z = function () {
+  protoOf(TractPage).x3z = function () {
     // Inline function 'kotlin.collections.toTypedArray' call
     var this_0 = this._cards;
     return copyToArray(this_0);
   };
-  protoOf(TractPage).y47 = function () {
+  protoOf(TractPage).z47 = function () {
     // Inline function 'kotlin.collections.toTypedArray' call
     var this_0 = this._modals;
     return copyToArray(this_0);
   };
   function TractPage() {
-    this.y46_1 = emptyList();
+    this.z46_1 = emptyList();
   }
   function labelParent$factory() {
     return getPropertyCallableRef('labelParent', 1, KProperty1, function (receiver) {
@@ -10023,7 +10046,7 @@
     return new FlowWatcher(launchIn(onEach(_this__u8e3s4, FlowWatcher$Companion$watchIn$slambda_0(block, null)), scope));
   }
   function FlowWatcher$Companion$watchIn$slambda($block, resultContinuation) {
-    this.h48_1 = $block;
+    this.i48_1 = $block;
     CoroutineImpl.call(this, resultContinuation);
   }
   protoOf(FlowWatcher$Companion$watchIn$slambda).m19 = function (it, $completion) {
@@ -10042,7 +10065,7 @@
         var tmp = this.v8_1;
         if (tmp === 0) {
           this.w8_1 = 1;
-          this.h48_1(this.i48_1);
+          this.i48_1(this.j48_1);
           return Unit_instance;
         } else if (tmp === 1) {
           throw this.y8_1;
@@ -10054,8 +10077,8 @@
      while (true);
   };
   protoOf(FlowWatcher$Companion$watchIn$slambda).n19 = function (it, completion) {
-    var i = new FlowWatcher$Companion$watchIn$slambda(this.h48_1, completion);
-    i.i48_1 = it;
+    var i = new FlowWatcher$Companion$watchIn$slambda(this.i48_1, completion);
+    i.j48_1 = it;
     return i;
   };
   function FlowWatcher$Companion$watchIn$slambda_0($block, resultContinuation) {
@@ -10076,10 +10099,10 @@
     return Companion_instance_59;
   }
   function FlowWatcher(job) {
-    this.j48_1 = job;
+    this.k48_1 = job;
   }
   protoOf(FlowWatcher).close = function () {
-    return this.j48_1.vl();
+    return this.k48_1.vl();
   };
   function get_REGEX_SEQUENCE_SEPARATOR() {
     _init_properties_Regex_kt__v9a4ph();
@@ -10107,31 +10130,31 @@
     return EMPTY_instance;
   }
   function SetOnceProperty() {
-    this.k48_1 = EMPTY_instance;
+    this.l48_1 = EMPTY_instance;
   }
-  protoOf(SetOnceProperty).l48 = function (thisRef, property) {
+  protoOf(SetOnceProperty).m48 = function (thisRef, property) {
     // Inline function 'kotlin.check' call
-    if (!!(this.k48_1 === EMPTY_instance)) {
+    if (!!(this.l48_1 === EMPTY_instance)) {
       var message = "Value isn't initialized";
       throw IllegalStateException_init_$Create$(toString_0(message));
     }
-    var tmp = this.k48_1;
+    var tmp = this.l48_1;
     return (tmp == null ? true : !(tmp == null)) ? tmp : THROW_CCE();
   };
   protoOf(SetOnceProperty).b3r = function (thisRef, property) {
-    return this.l48(!(thisRef == null) ? thisRef : THROW_CCE(), property);
+    return this.m48(!(thisRef == null) ? thisRef : THROW_CCE(), property);
   };
-  protoOf(SetOnceProperty).m48 = function (thisRef, property, value) {
+  protoOf(SetOnceProperty).n48 = function (thisRef, property, value) {
     // Inline function 'kotlin.check' call
-    if (!(this.k48_1 === EMPTY_instance)) {
+    if (!(this.l48_1 === EMPTY_instance)) {
       var message = 'Value is initialized';
       throw IllegalStateException_init_$Create$(toString_0(message));
     }
-    this.k48_1 = value;
+    this.l48_1 = value;
   };
   protoOf(SetOnceProperty).m3p = function (thisRef, property, value) {
     var tmp = !(thisRef == null) ? thisRef : THROW_CCE();
-    return this.m48(tmp, property, (value == null ? true : !(value == null)) ? value : THROW_CCE());
+    return this.n48(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));
@@ -10146,9 +10169,9 @@
   }
   function getAttributeValueInt($this, namespace, name) {
     // Inline function 'kotlin.takeIf' call
-    var this_0 = $this.n48_1;
+    var this_0 = $this.o48_1;
     var tmp;
-    if (this_0.q48_1 === 2) {
+    if (this_0.r48_1 === 2) {
       tmp = this_0;
     } else {
       tmp = null;
@@ -10161,20 +10184,20 @@
       tmp_0 = tmp0_elvis_lhs;
     }
     var event = tmp_0;
-    var tmp1_safe_receiver = event.t48_1;
+    var tmp1_safe_receiver = event.u48_1;
     return tmp1_safe_receiver == null ? null : tmp1_safe_receiver.f2(new QName(namespace, name));
   }
   function QName(uri, local) {
     uri = uri === VOID ? null : uri;
-    this.u48_1 = uri;
-    this.v48_1 = local;
+    this.v48_1 = uri;
+    this.w48_1 = local;
   }
   protoOf(QName).toString = function () {
-    return 'QName(uri=' + this.u48_1 + ', local=' + this.v48_1 + ')';
+    return 'QName(uri=' + this.v48_1 + ', local=' + this.w48_1 + ')';
   };
   protoOf(QName).hashCode = function () {
-    var result = this.u48_1 == null ? 0 : getStringHashCode(this.u48_1);
-    result = imul(result, 31) + getStringHashCode(this.v48_1) | 0;
+    var result = this.v48_1 == null ? 0 : getStringHashCode(this.v48_1);
+    result = imul(result, 31) + getStringHashCode(this.w48_1) | 0;
     return result;
   };
   protoOf(QName).equals = function (other) {
@@ -10183,9 +10206,9 @@
     if (!(other instanceof QName))
       return false;
     var tmp0_other_with_cast = other instanceof QName ? other : THROW_CCE();
-    if (!(this.u48_1 == tmp0_other_with_cast.u48_1))
+    if (!(this.v48_1 == tmp0_other_with_cast.v48_1))
       return false;
-    if (!(this.v48_1 === tmp0_other_with_cast.v48_1))
+    if (!(this.w48_1 === tmp0_other_with_cast.w48_1))
       return false;
     return true;
   };
@@ -10193,51 +10216,51 @@
     qname = qname === VOID ? null : qname;
     content = content === VOID ? null : content;
     attrs = attrs === VOID ? null : attrs;
-    this.q48_1 = type;
-    this.r48_1 = qname;
-    this.s48_1 = content;
-    this.t48_1 = attrs;
+    this.r48_1 = type;
+    this.s48_1 = qname;
+    this.t48_1 = content;
+    this.u48_1 = attrs;
   }
   function enqueueEvent($this, event) {
     // Inline function 'kotlin.text.isNotEmpty' call
-    var this_0 = $this.p48_1;
+    var this_0 = $this.q48_1;
     if (charSequenceLength(this_0) > 0) {
-      var tmp1 = $this.o48_1;
+      var tmp1 = $this.p48_1;
       // Inline function 'kotlin.collections.plusAssign' call
-      var element = new ParserEvent(4, VOID, $this.p48_1.toString());
+      var element = new ParserEvent(4, VOID, $this.q48_1.toString());
       tmp1.e(element);
-      $this.p48_1.nb();
+      $this.q48_1.nb();
     }
     // Inline function 'kotlin.collections.plusAssign' call
-    $this.o48_1.e(event);
+    $this.p48_1.e(event);
   }
   function SaxXmlPullParser() {
-    this.n48_1 = new ParserEvent(0);
+    this.o48_1 = new ParserEvent(0);
     var tmp = this;
     // Inline function 'kotlin.collections.mutableListOf' call
-    tmp.o48_1 = ArrayList_init_$Create$();
-    this.p48_1 = StringBuilder_init_$Create$();
+    tmp.p48_1 = ArrayList_init_$Create$();
+    this.q48_1 = StringBuilder_init_$Create$();
   }
   protoOf(SaxXmlPullParser).p3b = function () {
-    return this.n48_1.q48_1;
+    return this.o48_1.r48_1;
   };
   protoOf(SaxXmlPullParser).q3b = function () {
-    var tmp0_safe_receiver = this.n48_1.r48_1;
-    return tmp0_safe_receiver == null ? null : tmp0_safe_receiver.u48_1;
+    var tmp0_safe_receiver = this.o48_1.s48_1;
+    return tmp0_safe_receiver == null ? null : tmp0_safe_receiver.v48_1;
   };
   protoOf(SaxXmlPullParser).l2 = function () {
-    var tmp0_safe_receiver = this.n48_1.r48_1;
-    return tmp0_safe_receiver == null ? null : tmp0_safe_receiver.v48_1;
+    var tmp0_safe_receiver = this.o48_1.s48_1;
+    return tmp0_safe_receiver == null ? null : tmp0_safe_receiver.w48_1;
   };
   protoOf(SaxXmlPullParser).o3b = function (type, namespace, name) {
     // Inline function 'kotlin.with' call
-    var $this$with = this.n48_1;
-    if (!($this$with.q48_1 === type))
+    var $this$with = this.o48_1;
+    if (!($this$with.r48_1 === type))
       throw new XmlPullParserException('expected ' + type);
     var tmp;
     if (!(namespace == null)) {
-      var tmp0_safe_receiver = $this$with.r48_1;
-      tmp = !(namespace == (tmp0_safe_receiver == null ? null : tmp0_safe_receiver.u48_1));
+      var tmp0_safe_receiver = $this$with.s48_1;
+      tmp = !(namespace == (tmp0_safe_receiver == null ? null : tmp0_safe_receiver.v48_1));
     } else {
       tmp = false;
     }
@@ -10245,8 +10268,8 @@
       throw new XmlPullParserException('expected ' + namespace);
     var tmp_0;
     if (!(name == null)) {
-      var tmp1_safe_receiver = $this$with.r48_1;
-      tmp_0 = !((tmp1_safe_receiver == null ? null : tmp1_safe_receiver.v48_1) == name);
+      var tmp1_safe_receiver = $this$with.s48_1;
+      tmp_0 = !((tmp1_safe_receiver == null ? null : tmp1_safe_receiver.w48_1) == name);
     } else {
       tmp_0 = false;
     }
@@ -10256,15 +10279,15 @@
   };
   protoOf(SaxXmlPullParser).l = function () {
     // Inline function 'kotlin.also' call
-    var this_0 = removeFirst(this.o48_1);
-    this.n48_1 = this_0;
-    return this_0.q48_1;
+    var this_0 = removeFirst(this.p48_1);
+    this.o48_1 = this_0;
+    return this_0.r48_1;
   };
   protoOf(SaxXmlPullParser).h39 = function () {
     var tmp;
     if (this.l() === 4) {
       // Inline function 'kotlin.text.isNullOrBlank' call
-      var this_0 = this.n48_1.s48_1;
+      var this_0 = this.o48_1.t48_1;
       tmp = this_0 == null || isBlank(this_0);
     } else {
       tmp = false;
@@ -10272,20 +10295,20 @@
     if (tmp) {
       this.l();
     }
-    var event = this.n48_1;
-    if (!(event.q48_1 === 2) && !(event.q48_1 === 3)) {
-      throw new XmlPullParserException('Expected start or end tag. Found: ' + event.q48_1);
+    var event = this.o48_1;
+    if (!(event.r48_1 === 2) && !(event.r48_1 === 3)) {
+      throw new XmlPullParserException('Expected start or end tag. Found: ' + event.r48_1);
     }
-    return event.q48_1;
+    return event.r48_1;
   };
   protoOf(SaxXmlPullParser).b3v = function () {
-    this.t44(2);
+    this.u44(2);
     var tmp;
     switch (this.l()) {
       case 4:
         // Inline function 'kotlin.text.orEmpty' call
-        var tmp0_elvis_lhs = this.n48_1.s48_1;
+        var tmp0_elvis_lhs = this.o48_1.t48_1;
         // Inline function 'kotlin.also' call
         var this_0 = tmp0_elvis_lhs == null ? '' : tmp0_elvis_lhs;
@@ -10311,13 +10334,13 @@
   protoOf(SaxXmlPullParser).n3p = function (namespace, name) {
     return getAttributeValueInt(this, namespace, name);
   };
-  protoOf(SaxXmlPullParser).w48 = function (qname, attrs) {
+  protoOf(SaxXmlPullParser).x48 = function (qname, attrs) {
     enqueueEvent(this, new ParserEvent(2, qname, VOID, attrs));
   };
-  protoOf(SaxXmlPullParser).x48 = function (text) {
-    this.p48_1.g8(text);
+  protoOf(SaxXmlPullParser).y48 = function (text) {
+    this.q48_1.g8(text);
   };
-  protoOf(SaxXmlPullParser).y48 = function (qname) {
+  protoOf(SaxXmlPullParser).z48 = function (qname) {
     enqueueEvent(this, new ParserEvent(3, qname));
   };
   function XmlPullParser() {
@@ -10351,9 +10374,10 @@
   function get_DEFAULT(_this__u8e3s4) {
     return DeviceType_WEB_getInstance();
   }
-  function toPlatformColor_0(_this__u8e3s4) {
-    var tmp0_renderAlpha = RenderCondition_ALWAYS_getInstance();
-    return formatCssString(_this__u8e3s4, VOID, tmp0_renderAlpha, VOID, VOID, true, true);
+  function toPlatformColor(_this__u8e3s4) {
+    var tmp0_$receiver = _this__u8e3s4.f1n();
+    var tmp1_renderAlpha = RenderCondition_ALWAYS_getInstance();
+    return formatCssString(tmp0_$receiver, VOID, tmp1_renderAlpha, VOID, VOID, true, true);
   }
   function toRGB(_this__u8e3s4) {
     return parse(Companion_instance, _this__u8e3s4).f1n();
@@ -10364,26 +10388,26 @@
   }
   var SAX_OPTIONS;
   function InternalSAXParser($outer) {
-    this.z48_1 = $outer;
+    this.a49_1 = $outer;
     SAXParser.call(this, true, get_SAX_OPTIONS());
   }
-  protoOf(InternalSAXParser).a49 = function (tag) {
-    return this.z48_1.w48(new QName(tag.uri, tag.local), convert(this.z48_1, tag.attributes));
+  protoOf(InternalSAXParser).b49 = function (tag) {
+    return this.a49_1.x48(new QName(tag.uri, tag.local), convert(this.a49_1, tag.attributes));
   };
   protoOf(InternalSAXParser).onopentag = function (tag) {
-    return this.a49(tag);
+    return this.b49(tag);
   };
-  protoOf(InternalSAXParser).b49 = function (tagName) {
-    return this.z48_1.y48(new QName(VOID, tagName));
+  protoOf(InternalSAXParser).c49 = function (tagName) {
+    return this.a49_1.z48(new QName(VOID, tagName));
   };
   protoOf(InternalSAXParser).onclosetag = function (tagName) {
-    return this.b49(tagName);
+    return this.c49(tagName);
   };
-  protoOf(InternalSAXParser).c49 = function (t) {
-    return this.z48_1.x48(t);
+  protoOf(InternalSAXParser).d49 = function (t) {
+    return this.a49_1.y48(t);
   };
   protoOf(InternalSAXParser).ontext = function (t) {
-    return this.c49(t);
+    return this.d49(t);
   };
   function convert($this, _this__u8e3s4) {
     var tmp = Object.values;
@@ -10427,13 +10451,13 @@
     var this_0 = new InternalSAXParser(this);
     this_0.write(xml);
     this_0.close();
-    tmp.g49_1 = this_0;
+    tmp.h49_1 = this_0;
   }
   function SAX_OPTIONS$1() {
-    this.h49_1 = true;
+    this.i49_1 = true;
   }
-  protoOf(SAX_OPTIONS$1).i49 = function () {
-    return this.h49_1;
+  protoOf(SAX_OPTIONS$1).j49 = function () {
+    return this.i49_1;
   };
   var properties_initialized_JsXmlPullParser_kt_u4cdem;
   function _init_properties_JsXmlPullParser_kt__2zt5j4() {
@@ -10444,8 +10468,8 @@
   }
   function $getXmlParserCOROUTINE$4(_this__u8e3s4, fileName, resultContinuation) {
     CoroutineImpl.call(this, resultContinuation);
-    this.r49_1 = _this__u8e3s4;
-    this.s49_1 = fileName;
+    this.s49_1 = _this__u8e3s4;
+    this.t49_1 = fileName;
   }
   protoOf($getXmlParserCOROUTINE$4).d9 = function () {
     var suspendResult = this.x8_1;
@@ -10456,7 +10480,7 @@
           case 0:
             this.w8_1 = 2;
             this.v8_1 = 1;
-            suspendResult = await_0(this.r49_1.readFile(this.s49_1), this);
+            suspendResult = await_0(this.s49_1.readFile(this.t49_1), this);
             if (suspendResult === get_COROUTINE_SUSPENDED()) {
               return suspendResult;
             }
@@ -10489,14 +10513,14 @@
   function JsXmlPullParserFactory() {
     XmlPullParserFactory.call(this);
   }
-  protoOf(JsXmlPullParserFactory).t49 = function (fileName, $completion) {
+  protoOf(JsXmlPullParserFactory).u49 = function (fileName, $completion) {
     var tmp = new $getXmlParserCOROUTINE$4(this, fileName, $completion);
     tmp.x8_1 = Unit_instance;
     tmp.y8_1 = null;
     return tmp.d9();
   };
   protoOf(JsXmlPullParserFactory).g39 = function (fileName, $completion) {
-    return this.t49(fileName, $completion);
+    return this.u49(fileName, $completion);
   };
   function XmlPullParserException(s) {
     Exception_init_$Init$(s, this);
@@ -10700,11 +10724,11 @@
   defineProp(protoOf(Style_1), 'name', protoOf(Style_1).l2);
   defineProp(protoOf(Style_1), 'ordinal', protoOf(Style_1).m2);
   defineProp(protoOf(Text), 'textAlign', protoOf(Text).x3h);
-  defineProp(protoOf(Text), 'textColor', protoOf(Text).o3h);
   defineProp(protoOf(Text), 'textScale', protoOf(Text).w3h);
-  defineProp(protoOf(Text), 'startImage', protoOf(Text).k3v);
-  defineProp(protoOf(Text), 'endImage', protoOf(Text).n3v);
-  defineProp(protoOf(Text), 'textStyles', protoOf(Text).p3v);
+  defineProp(protoOf(Text), 'startImage', protoOf(Text).l3v);
+  defineProp(protoOf(Text), 'endImage', protoOf(Text).o3v);
+  defineProp(protoOf(Text), 'textColor', protoOf(Text).o3h);
+  defineProp(protoOf(Text), 'textStyles', protoOf(Text).q3v);
   defineProp(protoOf(Provider), 'name', protoOf(Provider).l2);
   defineProp(protoOf(Provider), 'ordinal', protoOf(Provider).m2);
   protoOf(Page).s3h = get_buttonStyle;
@@ -10713,12 +10737,12 @@
   protoOf(Page).getAnalyticsEvents = getAnalyticsEvents;
   defineProp(protoOf(Page), 'id', protoOf(Page).i3c);
   defineProp(protoOf(Page), 'position', protoOf(Page).p3u);
-  defineProp(protoOf(Page), 'parentPage', protoOf(Page).g3y);
-  defineProp(protoOf(Page), 'parentPageParams', protoOf(Page).h3y);
-  defineProp(protoOf(Page), 'nextPage', protoOf(Page).i3y);
-  defineProp(protoOf(Page), 'previousPage', protoOf(Page).j3y);
+  defineProp(protoOf(Page), 'parentPage', protoOf(Page).h3y);
+  defineProp(protoOf(Page), 'parentPageParams', protoOf(Page).i3y);
+  defineProp(protoOf(Page), 'nextPage', protoOf(Page).j3y);
+  defineProp(protoOf(Page), 'previousPage', protoOf(Page).k3y);
   defineProp(protoOf(Page), 'backgroundImage', protoOf(Page).j3q);
-  defineProp(protoOf(Page), 'controlColor', protoOf(Page).l3y);
+  defineProp(protoOf(Page), 'controlColor', protoOf(Page).m3y);
   defineProp(protoOf(Page), 'dismissListeners', protoOf(Page).l3r);
   defineProp(protoOf(Page), 'listeners', protoOf(Page).r3u);
   protoOf(LessonPage).s3c = get_content;
@@ -10745,7 +10769,7 @@
   defineProp(protoOf(Card_0), 'content', function () {
     return this.s3c();
   });
-  defineProp(protoOf(CardCollectionPage), 'cards', protoOf(CardCollectionPage).w3z);
+  defineProp(protoOf(CardCollectionPage), 'cards', protoOf(CardCollectionPage).x3z);
   protoOf(ContentPage).s3c = get_content;
   defineProp(protoOf(ContentPage), 'content', function () {
     return this.s3c();
@@ -10758,7 +10782,7 @@
   defineProp(protoOf(PageCollectionPage), 'pages', function () {
     return this.i3k();
   });
-  defineProp(protoOf(InlineTip), 'tip', protoOf(InlineTip).h45);
+  defineProp(protoOf(InlineTip), 'tip', protoOf(InlineTip).i45);
   protoOf(Tip).s3h = get_buttonStyle;
   protoOf(Tip).q3g = get_buttonColor;
   protoOf(Tip).t3h = get_cardBackgroundColor;
@@ -10770,7 +10794,7 @@
   defineProp(protoOf(TipPage), 'content', function () {
     return this.s3c();
   });
-  defineProp(protoOf(CallToAction), 'tip', protoOf(CallToAction).h45);
+  defineProp(protoOf(CallToAction), 'tip', protoOf(CallToAction).i45);
   protoOf(Header_0).q3h = get_primaryColor;
   protoOf(Header_0).r3h = get_primaryTextColor;
   protoOf(Header_0).s3h = get_buttonStyle;
@@ -10780,7 +10804,7 @@
   protoOf(Header_0).v3h = get_multiselectOptionSelectedColor;
   protoOf(Header_0).w3h = get_textScale;
   protoOf(Header_0).x3h = get_textAlign;
-  defineProp(protoOf(Header_0), 'tip', protoOf(Header_0).h45);
+  defineProp(protoOf(Header_0), 'tip', protoOf(Header_0).i45);
   protoOf(Hero).s3c = get_content;
   protoOf(Hero).getAnalyticsEvents = getAnalyticsEvents;
   defineProp(protoOf(Hero), 'content', function () {
@@ -10809,8 +10833,8 @@
   protoOf(Card_1).s3c = get_content;
   protoOf(Card_1).getAnalyticsEvents = getAnalyticsEvents;
   defineProp(protoOf(Card_1), 'id', protoOf(Card_1).i3c);
-  defineProp(protoOf(Card_1), 'visiblePosition', protoOf(Card_1).q47);
-  defineProp(protoOf(Card_1), 'isLastVisibleCard', protoOf(Card_1).r47);
+  defineProp(protoOf(Card_1), 'visiblePosition', protoOf(Card_1).r47);
+  defineProp(protoOf(Card_1), 'isLastVisibleCard', protoOf(Card_1).s47);
   defineProp(protoOf(Card_1), 'backgroundImage', protoOf(Card_1).j3q);
   defineProp(protoOf(Card_1), 'tips', protoOf(Card_1).u3c);
   defineProp(protoOf(Card_1), 'dismissListeners', protoOf(Card_1).l3r);
@@ -10818,14 +10842,14 @@
   defineProp(protoOf(Card_1), 'content', function () {
     return this.s3c();
   });
-  defineProp(protoOf(TractPage), 'isLastPage', protoOf(TractPage).s47);
-  defineProp(protoOf(TractPage), 'visibleCards', protoOf(TractPage).w47);
-  defineProp(protoOf(TractPage), 'cardTextColor', protoOf(TractPage).x47);
-  defineProp(protoOf(TractPage), 'cards', protoOf(TractPage).w3z);
-  defineProp(protoOf(TractPage), 'modals', protoOf(TractPage).y47);
-  protoOf(SaxXmlPullParser).t44 = require$default;
+  defineProp(protoOf(TractPage), 'isLastPage', protoOf(TractPage).t47);
+  defineProp(protoOf(TractPage), 'visibleCards', protoOf(TractPage).x47);
+  defineProp(protoOf(TractPage), 'cardTextColor', protoOf(TractPage).y47);
+  defineProp(protoOf(TractPage), 'cards', protoOf(TractPage).x3z);
+  defineProp(protoOf(TractPage), 'modals', protoOf(TractPage).z47);
+  protoOf(SaxXmlPullParser).u44 = require$default;
   defineProp(protoOf(SAX_OPTIONS$1), 'xmlns', function () {
-    return this.i49();
+    return this.j49();
   });
   //endregion
   //region block: init