diff --git a/fyn-lock.yaml b/fyn-lock.yaml
index 8f8e6a4ad..57496a60f 100644
--- a/fyn-lock.yaml
+++ b/fyn-lock.yaml
@@ -2,7 +2,7 @@ $pkg:
  dev:
   '@xarc/run': ^1.0.4
   bluebird: ^3.7.2
-  fynpo: ^0.1.35
+  fynpo: ^0.1.36
   lerna: ^3.22.1
   lodash: ^4.17.21
   semver: ^7.3.4
@@ -1203,12 +1203,12 @@ ansi-escapes:
   ^4.3.0: 4.3.2
  4.3.2:
   $: sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==
-  _: 'https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz'
+  _: 'https://npme.walmart.com/ansi-escapes/-/ansi-escapes-4.3.2.tgz'
   dependencies:
    type-fest: ^0.21.3
  3.2.0:
   $: sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==
-  _: 'https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz'
+  _: 'https://npme.walmart.com/ansi-escapes/-/ansi-escapes-3.2.0.tgz'
 ansi-regex:
  _latest: 5.0.0
  _:
@@ -1218,16 +1218,16 @@ ansi-regex:
   ^5.0.0: 5.0.0
  5.0.0:
   $: sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==
-  _: 'https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz'
+  _: 'https://npme.walmart.com/ansi-regex/-/ansi-regex-5.0.0.tgz'
  4.1.0:
   $: sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==
-  _: 'https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz'
+  _: 'https://npme.walmart.com/ansi-regex/-/ansi-regex-4.1.0.tgz'
  3.0.0:
   $: sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=
-  _: 'https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz'
+  _: 'https://npme.walmart.com/ansi-regex/-/ansi-regex-3.0.0.tgz'
  2.1.1:
   $: sha1-w7M6te42DYbg5ijwRorn7yfWVN8=
-  _: 'https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz'
+  _: 'https://npme.walmart.com/ansi-regex/-/ansi-regex-2.1.1.tgz'
 ansi-styles:
  _latest: 5.2.0
  _:
@@ -1388,7 +1388,7 @@ astral-regex:
   ^2.0.0: 2.0.0
  2.0.0:
   $: sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==
-  _: 'https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz'
+  _: 'https://npme.walmart.com/astral-regex/-/astral-regex-2.0.0.tgz'
 asynckit:
  _latest: 0.4.0
  _:
@@ -1730,12 +1730,12 @@ cli-cursor:
   ^3.1.0: 3.1.0
  3.1.0:
   $: sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==
-  _: 'https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz'
+  _: 'https://npme.walmart.com/cli-cursor/-/cli-cursor-3.1.0.tgz'
   dependencies:
    restore-cursor: ^3.1.0
  2.1.0:
   $: sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=
-  _: 'https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz'
+  _: 'https://npme.walmart.com/cli-cursor/-/cli-cursor-2.1.0.tgz'
   dependencies:
    restore-cursor: ^2.0.0
 cli-width:
@@ -2280,10 +2280,10 @@ emoji-regex:
   ^8.0.0: 8.0.0
  8.0.0:
   $: sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
-  _: 'https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz'
+  _: 'https://npme.walmart.com/emoji-regex/-/emoji-regex-8.0.0.tgz'
  7.0.3:
   $: sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==
-  _: 'https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz'
+  _: 'https://npme.walmart.com/emoji-regex/-/emoji-regex-7.0.3.tgz'
 encoding:
  _latest: 0.1.13
  _:
@@ -2560,7 +2560,7 @@ filter-scan-dir:
   ^1.0.10: 1.0.10
  1.0.10:
   $: sha512-tuDUZPwDmWULMdJ0CopxwRsHuBq2LAwf2zcNMu0LEXD6V414jwrexMaPRS68/ct0ma2m6EREln8n5jYClvggZQ==
-  _: 'https://registry.npmjs.org/filter-scan-dir/-/filter-scan-dir-1.0.10.tgz'
+  _: 'https://npme.walmart.com/filter-scan-dir/-/filter-scan-dir-1.0.10.tgz'
 find-up:
  _latest: 5.0.0
  _:
@@ -2691,20 +2691,20 @@ function-bind:
   $: sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
   _: 'https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz'
 fyn:
- _latest: 0.4.22
+ _latest: 0.4.23
  _:
-  ^0.4.17: 0.4.22
- 0.4.22:
-  $: sha512-yQ5qqcH0Zvh7q2y3a8Vota4qSaJ84YzAPUJ7fedeZX7017HzmBeGSzaLk1Ac3yO+LWUZL3A03uuVxNEAana7pw==
-  _: 'https://registry.npmjs.org/fyn/-/fyn-0.4.22.tgz'
+  ^0.4.17: 0.4.23
+ 0.4.23:
+  $: sha512-7yzTbk9pdG2rFn2NT7oVXh9YlhFLD3bnajKigr4uuT1lD9uQICDPNwws5D4wb2ELOfbUUPu/dTOJHLgm71MQrg==
+  _: 'https://npme.walmart.com/fyn/-/fyn-0.4.23.tgz'
 fynpo:
  _latest: 0.2.4
  _:
-  ^0.1.35: 0.1.35
- 0.1.35:
+  ^0.1.36: 0.1.36
+ 0.1.36:
   top: 1
-  $: sha512-Aykb3SWY5raGsU2OMyLtmigIS4l6HlBVuVQmTNrK9/BXu2zw1FDsjs0O/a4GZXIeb7TBCFZgR5AI20yN3Q7H1Q==
-  _: 'https://registry.npmjs.org/fynpo/-/fynpo-0.1.35.tgz'
+  $: sha512-R1nRmaGm5JhAer79Z6XhsL8OUlBqnc/hOJPSHQjYZJAzgFxACN2TQS1ss6009siRnuWdzhiJQAw32+vcMLwmvA==
+  _: 'https://registry.npmjs.org/fynpo/-/fynpo-0.1.36.tgz'
   dependencies:
    bluebird: ^3.7.2
    chalk: ^4.1.0
@@ -2985,7 +2985,7 @@ has-ansi:
   ^3.0.0: 3.0.0
  3.0.0:
   $: sha1-Ngd+8dFfMzSEqn+neihgbxxlWzc=
-  _: 'https://registry.npmjs.org/has-ansi/-/has-ansi-3.0.0.tgz'
+  _: 'https://npme.walmart.com/has-ansi/-/has-ansi-3.0.0.tgz'
   dependencies:
    ansi-regex: ^3.0.0
 has-bigints:
@@ -3430,13 +3430,13 @@ is-fullwidth-code-point:
   ^3.0.0: 3.0.0
  3.0.0:
   $: sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==
-  _: 'https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz'
+  _: 'https://npme.walmart.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz'
  2.0.0:
   $: sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=
-  _: 'https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz'
+  _: 'https://npme.walmart.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz'
  1.0.0:
   $: sha1-754xOG8DGn8NZDr4L95QxFfvAMs=
-  _: 'https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz'
+  _: 'https://npme.walmart.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz'
   dependencies:
    number-is-nan: ^1.0.0
 is-glob:
@@ -3620,7 +3620,7 @@ item-queue:
   ^1.0.4: 1.0.4
  1.0.4:
   $: sha512-JLGx41JDCccb4Jw9YpRjFTvRF5sQi9TSO+Azvn0GlHDc2PHXBpNnU/WIVzVOEiQ8IBWbPosVQjbelcff6awo/g==
-  _: 'https://registry.npmjs.org/item-queue/-/item-queue-1.0.4.tgz'
+  _: 'https://npme.walmart.com/item-queue/-/item-queue-1.0.4.tgz'
 jaro-winkler:
  _latest: 0.2.8
  _:
@@ -3916,7 +3916,7 @@ log-update:
   ^4.0.0: 4.0.0
  4.0.0:
   $: sha512-9fkkDevMefjg0mmzWFBW8YkFP91OrizzkW3diF7CpG+S2EYdy4+TVfGwz1zeF8x7hCx1ovSPTOE9Ngib74qqUg==
-  _: 'https://registry.npmjs.org/log-update/-/log-update-4.0.0.tgz'
+  _: 'https://npme.walmart.com/log-update/-/log-update-4.0.0.tgz'
   dependencies:
    ansi-escapes: ^4.3.0
    cli-cursor: ^3.1.0
@@ -4119,10 +4119,10 @@ mimic-fn:
   ^2.1.0: 2.1.0
  2.1.0:
   $: sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==
-  _: 'https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz'
+  _: 'https://npme.walmart.com/mimic-fn/-/mimic-fn-2.1.0.tgz'
  1.2.0:
   $: sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==
-  _: 'https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz'
+  _: 'https://npme.walmart.com/mimic-fn/-/mimic-fn-1.2.0.tgz'
 min-indent:
  _latest: 1.0.1
  _:
@@ -4600,18 +4600,18 @@ once:
   dependencies:
    wrappy: '1'
 onetime:
- _latest: 5.1.2
+ _latest: 6.0.0
  _:
   ^2.0.0: 2.0.1
   ^5.1.0: 5.1.2
  5.1.2:
   $: sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==
-  _: 'https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz'
+  _: 'https://npme.walmart.com/onetime/-/onetime-5.1.2.tgz'
   dependencies:
    mimic-fn: ^2.1.0
  2.0.1:
   $: sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=
-  _: 'https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz'
+  _: 'https://npme.walmart.com/onetime/-/onetime-2.0.1.tgz'
   dependencies:
    mimic-fn: ^1.0.0
 optional-require:
@@ -5376,13 +5376,13 @@ restore-cursor:
   ^3.1.0: 3.1.0
  3.1.0:
   $: sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==
-  _: 'https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz'
+  _: 'https://npme.walmart.com/restore-cursor/-/restore-cursor-3.1.0.tgz'
   dependencies:
    onetime: ^5.1.0
    signal-exit: ^3.0.2
  2.0.0:
   $: sha1-n37ih/gv0ybU/RYpI9YhKe7g368=
-  _: 'https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz'
+  _: 'https://npme.walmart.com/restore-cursor/-/restore-cursor-2.0.0.tgz'
   dependencies:
    onetime: ^2.0.0
    signal-exit: ^3.0.2
@@ -5563,7 +5563,7 @@ slice-ansi:
   ^4.0.0: 4.0.0
  4.0.0:
   $: sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==
-  _: 'https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz'
+  _: 'https://npme.walmart.com/slice-ansi/-/slice-ansi-4.0.0.tgz'
   dependencies:
    ansi-styles: ^4.0.0
    astral-regex: ^2.0.0
@@ -5835,27 +5835,27 @@ string-width:
   ^4.1.0: 4.2.2
  4.2.2:
   $: sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==
-  _: 'https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz'
+  _: 'https://npme.walmart.com/string-width/-/string-width-4.2.2.tgz'
   dependencies:
    emoji-regex: ^8.0.0
    is-fullwidth-code-point: ^3.0.0
    strip-ansi: ^6.0.0
  3.1.0:
   $: sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==
-  _: 'https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz'
+  _: 'https://npme.walmart.com/string-width/-/string-width-3.1.0.tgz'
   dependencies:
    emoji-regex: ^7.0.1
    is-fullwidth-code-point: ^2.0.0
    strip-ansi: ^5.1.0
  2.1.1:
   $: sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==
-  _: 'https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz'
+  _: 'https://npme.walmart.com/string-width/-/string-width-2.1.1.tgz'
   dependencies:
    is-fullwidth-code-point: ^2.0.0
    strip-ansi: ^4.0.0
  1.0.2:
   $: sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=
-  _: 'https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz'
+  _: 'https://npme.walmart.com/string-width/-/string-width-1.0.2.tgz'
   dependencies:
    code-point-at: ^1.0.0
    is-fullwidth-code-point: ^1.0.0
@@ -5898,22 +5898,22 @@ strip-ansi:
   ^6.0.0: 6.0.0
  6.0.0:
   $: sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==
-  _: 'https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz'
+  _: 'https://npme.walmart.com/strip-ansi/-/strip-ansi-6.0.0.tgz'
   dependencies:
    ansi-regex: ^5.0.0
  5.2.0:
   $: sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==
-  _: 'https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz'
+  _: 'https://npme.walmart.com/strip-ansi/-/strip-ansi-5.2.0.tgz'
   dependencies:
    ansi-regex: ^4.1.0
  4.0.0:
   $: sha1-qEeQIusaw2iocTibY1JixQXuNo8=
-  _: 'https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz'
+  _: 'https://npme.walmart.com/strip-ansi/-/strip-ansi-4.0.0.tgz'
   dependencies:
    ansi-regex: ^3.0.0
  3.0.1:
   $: sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=
-  _: 'https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz'
+  _: 'https://npme.walmart.com/strip-ansi/-/strip-ansi-3.0.1.tgz'
   dependencies:
    ansi-regex: ^2.0.0
 strip-bom:
@@ -6186,19 +6186,19 @@ type-fest:
   ^0.8.1: 0.8.1
  0.21.3:
   $: sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==
-  _: 'https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz'
+  _: 'https://npme.walmart.com/type-fest/-/type-fest-0.21.3.tgz'
  0.18.1:
   $: sha512-OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw==
-  _: 'https://registry.npmjs.org/type-fest/-/type-fest-0.18.1.tgz'
+  _: 'https://npme.walmart.com/type-fest/-/type-fest-0.18.1.tgz'
  0.8.1:
   $: sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==
-  _: 'https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz'
+  _: 'https://npme.walmart.com/type-fest/-/type-fest-0.8.1.tgz'
  0.6.0:
   $: sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==
-  _: 'https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz'
+  _: 'https://npme.walmart.com/type-fest/-/type-fest-0.6.0.tgz'
  0.3.1:
   $: sha512-cUGJnCdr4STbePCgqNFbpVNCepa+kAVohJs1sLhxzdH+gnEoOd8VhbYa7pD3zZYGiURWM2xzEII3fQcRizDkYQ==
-  _: 'https://registry.npmjs.org/type-fest/-/type-fest-0.3.1.tgz'
+  _: 'https://npme.walmart.com/type-fest/-/type-fest-0.3.1.tgz'
 typedarray:
  _latest: 0.0.6
  _:
@@ -6398,7 +6398,7 @@ visual-exec:
   ^0.1.8: 0.1.8
  0.1.8:
   $: sha512-fw4XR+lifbjJ1MKP/h/JAcP8g/HPEr4gJXycjQNmieRA7cx75pGI4fpCAywDChCj7lQKOz2T+58evO2devLwUQ==
-  _: 'https://registry.npmjs.org/visual-exec/-/visual-exec-0.1.8.tgz'
+  _: 'https://npme.walmart.com/visual-exec/-/visual-exec-0.1.8.tgz'
   dependencies:
    chalk: ^4.0.0
    has-ansi: ^3.0.0
@@ -6412,7 +6412,7 @@ visual-logger:
   '^1.1.1,^1.1.3': 1.1.3
  1.1.3:
   $: sha512-8XPxTR+RoZZtSkx1TY+aLAvG1EivsO0352WuWyXr0nU7n7T2XOh3ty/QwGS2dx7ZUDJQ5PTVp/p5StXaR11H7w==
-  _: 'https://registry.npmjs.org/visual-logger/-/visual-logger-1.1.3.tgz'
+  _: 'https://npme.walmart.com/visual-logger/-/visual-logger-1.1.3.tgz'
   dependencies:
    chalk: ^4.0.0
    log-update: ^4.0.0
@@ -6504,14 +6504,14 @@ wrap-ansi:
   ^6.2.0: 6.2.0
  6.2.0:
   $: sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==
-  _: 'https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz'
+  _: 'https://npme.walmart.com/wrap-ansi/-/wrap-ansi-6.2.0.tgz'
   dependencies:
    ansi-styles: ^4.0.0
    string-width: ^4.1.0
    strip-ansi: ^6.0.0
  5.1.0:
   $: sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==
-  _: 'https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz'
+  _: 'https://npme.walmart.com/wrap-ansi/-/wrap-ansi-5.1.0.tgz'
   dependencies:
    ansi-styles: ^3.2.0
    string-width: ^3.0.0
diff --git a/package.json b/package.json
index a33d234bc..d77574ec1 100644
--- a/package.json
+++ b/package.json
@@ -17,7 +17,7 @@
   "devDependencies": {
     "@xarc/run": "^1.0.4",
     "bluebird": "^3.7.2",
-    "fynpo": "^0.1.35",
+    "fynpo": "^0.1.36",
     "lerna": "^3.22.1",
     "lodash": "^4.17.21",
     "semver": "^7.3.4",
diff --git a/packages/electrode-archetype-webpack-dll-dev/package.json b/packages/electrode-archetype-webpack-dll-dev/package.json
index 2197d4500..197f56e3d 100644
--- a/packages/electrode-archetype-webpack-dll-dev/package.json
+++ b/packages/electrode-archetype-webpack-dll-dev/package.json
@@ -54,10 +54,5 @@
     "functions": 85,
     "lines": 79,
     "cache": true
-  },
-  "fyn": {
-    "dependencies": {
-      "webpack-config-composer": "../webpack-config-composer"
-    }
   }
 }
diff --git a/packages/electrode-archetype-webpack-dll/package.json b/packages/electrode-archetype-webpack-dll/package.json
index aec86e5d0..851425c7e 100644
--- a/packages/electrode-archetype-webpack-dll/package.json
+++ b/packages/electrode-archetype-webpack-dll/package.json
@@ -39,10 +39,5 @@
     "functions": 45,
     "lines": 66,
     "cache": true
-  },
-  "fyn": {
-    "devDependencies": {
-      "electrode-archetype-webpack-dll-dev": "../electrode-archetype-webpack-dll-dev"
-    }
   }
 }
diff --git a/packages/electrode-react-webapp/package.json b/packages/electrode-react-webapp/package.json
index 2d0d3ac72..049fc85c6 100644
--- a/packages/electrode-react-webapp/package.json
+++ b/packages/electrode-react-webapp/package.json
@@ -119,11 +119,6 @@
       "@babel/register"
     ]
   },
-  "fyn": {
-    "devDependencies": {
-      "electrode-redux-router-engine": "../electrode-redux-router-engine"
-    }
-  },
   "prettier": {
     "printWidth": 100,
     "trailingComma": "none",
diff --git a/packages/electrode-ui-logger/package.json b/packages/electrode-ui-logger/package.json
index 5f7c11a80..70421c7ab 100644
--- a/packages/electrode-ui-logger/package.json
+++ b/packages/electrode-ui-logger/package.json
@@ -51,10 +51,5 @@
       "dist",
       "test"
     ]
-  },
-  "fyn": {
-    "dependencies": {
-      "electrode-ui-config": "../electrode-ui-config"
-    }
   }
 }
diff --git a/packages/subapp-pbundle/package.json b/packages/subapp-pbundle/package.json
index dd7a9abcb..81310c3f8 100644
--- a/packages/subapp-pbundle/package.json
+++ b/packages/subapp-pbundle/package.json
@@ -59,16 +59,6 @@
     "preact": "*",
     "preact-render-to-string": "*"
   },
-  "fyn": {
-    "dependencies": {
-      "subapp-web": "../subapp-web",
-      "subapp-util": "../subapp-util"
-    },
-    "devDependencies": {
-      "@xarc/app": "../xarc-app",
-      "subapp-pkg-util": "../subapp-pkg-util"
-    }
-  },
   "nyc": {
     "all": true,
     "require": [
diff --git a/packages/subapp-react/package.json b/packages/subapp-react/package.json
index 3f06baca1..14df7e36e 100644
--- a/packages/subapp-react/package.json
+++ b/packages/subapp-react/package.json
@@ -62,16 +62,6 @@
     "react": "*",
     "react-dom": "*"
   },
-  "fyn": {
-    "dependencies": {
-      "subapp-web": "../subapp-web",
-      "subapp-util": "../subapp-util"
-    },
-    "devDependencies": {
-      "@xarc/app": "../xarc-app",
-      "subapp-pkg-util": "../subapp-pkg-util"
-    }
-  },
   "nyc": {
     "all": true,
     "require": [
diff --git a/packages/subapp-redux/package.json b/packages/subapp-redux/package.json
index f5810e47f..9592ffd9a 100644
--- a/packages/subapp-redux/package.json
+++ b/packages/subapp-redux/package.json
@@ -82,14 +82,5 @@
     "functions": 10,
     "lines": 10,
     "cache": true
-  },
-  "fyn": {
-    "dependencies": {
-      "subapp-util": "../subapp-util",
-      "subapp-web": "../subapp-web"
-    },
-    "devDependencies": {
-      "subapp-pkg-util": "../subapp-pkg-util"
-    }
   }
 }
diff --git a/packages/subapp-server/package.json b/packages/subapp-server/package.json
index 80b776ce1..b892becba 100644
--- a/packages/subapp-server/package.json
+++ b/packages/subapp-server/package.json
@@ -49,14 +49,6 @@
     "run-verify": "^1.1.2",
     "@xarc/fastify-server": "^1.1.0"
   },
-  "fyn": {
-    "dependencies": {
-      "@xarc/index-page": "../xarc-index-page",
-      "subapp-util": "../subapp-util",
-      "@xarc/jsx-renderer": "../xarc-jsx-renderer",
-      "@xarc/tag-renderer": "../xarc-tag-renderer"
-    }
-  },
   "nyc": {
     "all": true,
     "reporter": [
diff --git a/packages/subapp-web/package.json b/packages/subapp-web/package.json
index 5573a6143..1ba898769 100644
--- a/packages/subapp-web/package.json
+++ b/packages/subapp-web/package.json
@@ -60,16 +60,6 @@
     "run-verify": "^1.2.2",
     "subapp-pkg-util": "../subapp-pkg-util"
   },
-  "fyn": {
-    "dependencies": {
-      "subapp-util": "../subapp-util"
-    },
-    "devDependencies": {
-      "@xarc/app": "../xarc-app",
-      "electrode-react-webapp": "../electrode-react-webapp",
-      "subapp-pkg-util": "../subapp-pkg-util"
-    }
-  },
   "nyc": {
     "all": true,
     "reporter": [
diff --git a/packages/xarc-app-dev/package.json b/packages/xarc-app-dev/package.json
index 2ab74ca8f..ea0a844ab 100644
--- a/packages/xarc-app-dev/package.json
+++ b/packages/xarc-app-dev/package.json
@@ -139,19 +139,6 @@
     "node": ">= 12",
     "npm": ">= 6"
   },
-  "fyn": {
-    "dependencies": {
-      "@xarc/subapp": "../xarc-subapp",
-      "@xarc/webpack": "../xarc-webpack",
-      "electrode-node-resolver": "../electrode-node-resolver",
-      "subapp-util": "../subapp-util",
-      "@xarc/dev-base": "../xarc-dev-base"
-    },
-    "devDependencies": {
-      "@xarc/app": "../xarc-app",
-      "e1": "./e1"
-    }
-  },
   "nyc": {
     "all": true,
     "reporter": [
diff --git a/packages/xarc-app/package.json b/packages/xarc-app/package.json
index b88f36a56..5f1c6bcc3 100644
--- a/packages/xarc-app/package.json
+++ b/packages/xarc-app/package.json
@@ -126,10 +126,5 @@
       "@xarc/module-dev/config/test/setup.js"
     ],
     "recursive": true
-  },
-  "fyn": {
-    "dependencies": {
-      "subapp-util": "../subapp-util"
-    }
   }
 }
diff --git a/packages/xarc-create-app/package.json b/packages/xarc-create-app/package.json
index 3eb8b4136..b102de07e 100644
--- a/packages/xarc-create-app/package.json
+++ b/packages/xarc-create-app/package.json
@@ -101,14 +101,5 @@
     "functions": 100,
     "lines": 100,
     "cache": true
-  },
-  "fyn": {
-    "devDependencies": {
-      "@xarc/app": "../xarc-app",
-      "@xarc/app-dev": "../xarc-app-dev",
-      "@xarc/react": "../xarc-react",
-      "@xarc/react-query": "../xarc-react-query",
-      "@xarc/react-redux": "../xarc-react-redux"
-    }
   }
 }
diff --git a/packages/xarc-index-page/package.json b/packages/xarc-index-page/package.json
index 73b5ab458..31a366754 100644
--- a/packages/xarc-index-page/package.json
+++ b/packages/xarc-index-page/package.json
@@ -99,12 +99,5 @@
       "@xarc/module-dev/config/test/setup.js"
     ],
     "recursive": true
-  },
-  "fyn": {
-    "dependencies": {
-      "@xarc/jsx-renderer": "../xarc-jsx-renderer",
-      "@xarc/render-context": "../xarc-render-context",
-      "@xarc/tag-renderer": "../xarc-tag-renderer"
-    }
   }
 }
diff --git a/packages/xarc-jsx-renderer/package.json b/packages/xarc-jsx-renderer/package.json
index 92ddb1bff..3d4e2a583 100644
--- a/packages/xarc-jsx-renderer/package.json
+++ b/packages/xarc-jsx-renderer/package.json
@@ -111,12 +111,6 @@
     "lines": 100,
     "cache": false
   },
-  "fyn": {
-    "dependencies": {
-      "@xarc/render-context": "../xarc-render-context"
-    },
-    "devDependencies": {}
-  },
   "@xarc/module-dev": {
     "srcDir": [
       "src"
diff --git a/packages/xarc-opt-eslint/package.json b/packages/xarc-opt-eslint/package.json
index 02a7e1820..3ae20c0bf 100644
--- a/packages/xarc-opt-eslint/package.json
+++ b/packages/xarc-opt-eslint/package.json
@@ -50,10 +50,5 @@
       "@xarc/opt-eslint",
       "electrode-archetype-opt-eslint"
     ]
-  },
-  "fyn": {
-    "devDependencies": {
-      "opt-archetype-check": "../opt-archetype-check"
-    }
   }
 }
diff --git a/packages/xarc-opt-jest/package.json b/packages/xarc-opt-jest/package.json
index bdfab4b08..625952cf6 100644
--- a/packages/xarc-opt-jest/package.json
+++ b/packages/xarc-opt-jest/package.json
@@ -47,10 +47,5 @@
       "@xarc/opt-jest",
       "electrode-archetype-opt-jest"
     ]
-  },
-  "fyn": {
-    "devDependencies": {
-      "opt-archetype-check": "../opt-archetype-check"
-    }
   }
 }
diff --git a/packages/xarc-opt-karma/package.json b/packages/xarc-opt-karma/package.json
index 0704f298b..b86644f6e 100644
--- a/packages/xarc-opt-karma/package.json
+++ b/packages/xarc-opt-karma/package.json
@@ -69,10 +69,5 @@
       "@xarc/opt-karma",
       "electrode-archetype-opt-karma"
     ]
-  },
-  "fyn": {
-    "devDependencies": {
-      "opt-archetype-check": "../opt-archetype-check"
-    }
   }
 }
diff --git a/packages/xarc-opt-less/package.json b/packages/xarc-opt-less/package.json
index 2f49ffff5..ece79ab21 100644
--- a/packages/xarc-opt-less/package.json
+++ b/packages/xarc-opt-less/package.json
@@ -45,10 +45,5 @@
       "@xarc/opt-less",
       "electrode-archetype-opt-less"
     ]
-  },
-  "fyn": {
-    "devDependencies": {
-      "opt-archetype-check": "../opt-archetype-check"
-    }
   }
 }
diff --git a/packages/xarc-opt-mocha/package.json b/packages/xarc-opt-mocha/package.json
index 704458685..3d268fe5e 100644
--- a/packages/xarc-opt-mocha/package.json
+++ b/packages/xarc-opt-mocha/package.json
@@ -50,10 +50,5 @@
       "@xarc/opt-mocha",
       "electrode-archetype-opt-mocha"
     ]
-  },
-  "fyn": {
-    "devDependencies": {
-      "opt-archetype-check": "../opt-archetype-check"
-    }
   }
 }
diff --git a/packages/xarc-opt-postcss/package.json b/packages/xarc-opt-postcss/package.json
index 5ec88e7be..41ff8f9e7 100644
--- a/packages/xarc-opt-postcss/package.json
+++ b/packages/xarc-opt-postcss/package.json
@@ -50,10 +50,5 @@
       "@xarc/opt-postcss",
       "electrode-archetype-opt-postcss"
     ]
-  },
-  "fyn": {
-    "devDependencies": {
-      "opt-archetype-check": "../opt-archetype-check"
-    }
   }
 }
diff --git a/packages/xarc-opt-preact/package.json b/packages/xarc-opt-preact/package.json
index b6d171706..0e021c70a 100644
--- a/packages/xarc-opt-preact/package.json
+++ b/packages/xarc-opt-preact/package.json
@@ -47,10 +47,5 @@
       "electrode-archetype-opt-react",
       "electrode-archetype-opt-inferno"
     ]
-  },
-  "fyn": {
-    "devDependencies": {
-      "opt-archetype-check": "../opt-archetype-check"
-    }
   }
 }
diff --git a/packages/xarc-opt-react/package.json b/packages/xarc-opt-react/package.json
index 0aec6f41e..e6ff669fc 100644
--- a/packages/xarc-opt-react/package.json
+++ b/packages/xarc-opt-react/package.json
@@ -52,10 +52,5 @@
       "electrode-archetype-opt-preact",
       "electrode-archetype-opt-inferno"
     ]
-  },
-  "fyn": {
-    "devDependencies": {
-      "opt-archetype-check": "../opt-archetype-check"
-    }
   }
 }
diff --git a/packages/xarc-opt-sass/package.json b/packages/xarc-opt-sass/package.json
index 5da38ce10..c7add2827 100644
--- a/packages/xarc-opt-sass/package.json
+++ b/packages/xarc-opt-sass/package.json
@@ -45,10 +45,5 @@
       "@xarc/opt-sass",
       "electrode-archetype-opt-sass"
     ]
-  },
-  "fyn": {
-    "devDependencies": {
-      "opt-archetype-check": "../opt-archetype-check"
-    }
   }
 }
diff --git a/packages/xarc-opt-stylus/package.json b/packages/xarc-opt-stylus/package.json
index 9957c7fee..527a5e1a4 100644
--- a/packages/xarc-opt-stylus/package.json
+++ b/packages/xarc-opt-stylus/package.json
@@ -45,10 +45,5 @@
       "@xarc/opt-stylus",
       "electrode-archetype-opt-stylus"
     ]
-  },
-  "fyn": {
-    "devDependencies": {
-      "opt-archetype-check": "../opt-archetype-check"
-    }
   }
 }
diff --git a/packages/xarc-react-query/package.json b/packages/xarc-react-query/package.json
index 83372fd25..3fc3f8f05 100644
--- a/packages/xarc-react-query/package.json
+++ b/packages/xarc-react-query/package.json
@@ -32,11 +32,6 @@
     "react-query": "^3.5.16",
     "tslib": "^2.1.0"
   },
-  "fyn": {
-    "dependencies": {
-      "@xarc/subapp": "../xarc-subapp"
-    }
-  },
   "devDependencies": {
     "@istanbuljs/nyc-config-typescript": "^1.0.1",
     "@testing-library/react": "^11.2.3",
diff --git a/packages/xarc-react-recoil/package.json b/packages/xarc-react-recoil/package.json
index be01db4d9..8ff85fb26 100644
--- a/packages/xarc-react-recoil/package.json
+++ b/packages/xarc-react-recoil/package.json
@@ -33,11 +33,6 @@
     "recoil": "^0.1.2",
     "tslib": "^2.1.0"
   },
-  "fyn": {
-    "dependencies": {
-      "@xarc/subapp": "../xarc-subapp"
-    }
-  },
   "devDependencies": {
     "@istanbuljs/nyc-config-typescript": "^1.0.1",
     "@testing-library/react": "^11.2.5",
diff --git a/packages/xarc-react-redux-observable/package.json b/packages/xarc-react-redux-observable/package.json
index 360f1f355..e2e4ec953 100644
--- a/packages/xarc-react-redux-observable/package.json
+++ b/packages/xarc-react-redux-observable/package.json
@@ -110,10 +110,5 @@
       "@xarc/module-dev/config/test/setup.js"
     ],
     "recursive": true
-  },
-  "fyn": {
-    "dependencies": {
-      "@xarc/react-redux": "../xarc-react-redux"
-    }
   }
 }
diff --git a/packages/xarc-react-redux-saga/package.json b/packages/xarc-react-redux-saga/package.json
index f57bb8185..9575902b1 100644
--- a/packages/xarc-react-redux-saga/package.json
+++ b/packages/xarc-react-redux-saga/package.json
@@ -31,11 +31,6 @@
     "redux-saga": "^1.1.3",
     "tslib": "^2.1.0"
   },
-  "fyn": {
-    "dependencies": {
-      "@xarc/react-redux": "../xarc-react-redux"
-    }
-  },
   "devDependencies": {
     "@istanbuljs/nyc-config-typescript": "^1.0.1",
     "@types/chai": "^4.2.14",
diff --git a/packages/xarc-react-redux/package.json b/packages/xarc-react-redux/package.json
index 76dc6afd7..a8098c8f7 100644
--- a/packages/xarc-react-redux/package.json
+++ b/packages/xarc-react-redux/package.json
@@ -33,11 +33,6 @@
     "redux": ">= 4",
     "tslib": "^2.1.0"
   },
-  "fyn": {
-    "dependencies": {
-      "@xarc/subapp": "../xarc-subapp"
-    }
-  },
   "devDependencies": {
     "@istanbuljs/nyc-config-typescript": "^1.0.1",
     "@testing-library/react": "^11.2.5",
diff --git a/packages/xarc-react-router/package.json b/packages/xarc-react-router/package.json
index 767c5553e..a0552afc8 100644
--- a/packages/xarc-react-router/package.json
+++ b/packages/xarc-react-router/package.json
@@ -23,11 +23,6 @@
   "keywords": [],
   "author": "WalmartLabs GTP.js team",
   "license": "Apache-2.0",
-  "fyn": {
-    "dependencies": {
-      "@xarc/subapp": "../xarc-subapp"
-    }
-  },
   "dependencies": {
     "@xarc/subapp": "^0.2.1",
     "history": "^4.10.1",
diff --git a/packages/xarc-react/package.json b/packages/xarc-react/package.json
index 20c88792b..1c5acf25c 100644
--- a/packages/xarc-react/package.json
+++ b/packages/xarc-react/package.json
@@ -105,13 +105,6 @@
       "typescript"
     ]
   },
-  "fyn": {
-    "dependencies": {
-      "@xarc/render-context": "../xarc-render-context",
-      "@xarc/subapp": "../xarc-subapp",
-      "@xarc/tag-renderer": "../xarc-tag-renderer"
-    }
-  },
   "mocha": {
     "require": [
       "ts-node/register",
diff --git a/packages/xarc-subapp/package.json b/packages/xarc-subapp/package.json
index 0e0d1f675..9d6f26839 100644
--- a/packages/xarc-subapp/package.json
+++ b/packages/xarc-subapp/package.json
@@ -128,11 +128,5 @@
       "@xarc/module-dev/config/test/setup.js"
     ],
     "recursive": true
-  },
-  "fyn": {
-    "dependencies": {
-      "@xarc/render-context": "../xarc-render-context",
-      "@xarc/tag-renderer": "../xarc-tag-renderer"
-    }
   }
 }
diff --git a/packages/xarc-tag-renderer/package.json b/packages/xarc-tag-renderer/package.json
index 960883ccf..514c9b645 100644
--- a/packages/xarc-tag-renderer/package.json
+++ b/packages/xarc-tag-renderer/package.json
@@ -84,11 +84,5 @@
     "functions": 100,
     "lines": 100,
     "cache": false
-  },
-  "fyn": {
-    "dependencies": {
-      "@xarc/render-context": "../xarc-render-context"
-    },
-    "devDependencies": {}
   }
 }
diff --git a/packages/xarc-webpack/package.json b/packages/xarc-webpack/package.json
index 24ec01cf8..ae1165d62 100644
--- a/packages/xarc-webpack/package.json
+++ b/packages/xarc-webpack/package.json
@@ -142,17 +142,5 @@
       "typedoc",
       "typescript"
     ]
-  },
-  "fyn": {
-    "dependencies": {
-      "electrode-cdn-file-loader": "../electrode-cdn-file-loader",
-      "electrode-node-resolver": "../electrode-node-resolver",
-      "webpack-config-composer": "../webpack-config-composer",
-      "@xarc/dev-base": "../xarc-dev-base"
-    },
-    "devDependencies": {
-      "@xarc/app": "../xarc-app",
-      "@xarc/app-dev": "../xarc-app-dev"
-    }
   }
 }