diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 7f2ba7fe..aa47f5b0 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -14,22 +14,3 @@ jobs:
     with:
       flutter-version: "3.44.0"
       run-dcm: false
-
-  fortal_atlas:
-    name: Fortal Atlas capture drift
-    runs-on: macos-15
-    steps:
-      - uses: actions/checkout@v4
-      - uses: kuhnroyal/flutter-fvm-config-action@v2
-        id: fvm-config-action
-      - uses: subosito/flutter-action@v2
-        with:
-          flutter-version: ${{ steps.fvm-config-action.outputs.FLUTTER_VERSION }}
-          channel: ${{ steps.fvm-config-action.outputs.FLUTTER_CHANNEL }}
-          cache: true
-      - name: Bootstrap workspace
-        run: |
-          dart pub global activate melos
-          melos bootstrap
-      - name: Verify committed Fortal capture
-        run: melos run atlas:fortal:check
diff --git a/atlas/fortal/README.md b/atlas/fortal/README.md
deleted file mode 100644
index 99121a21..00000000
--- a/atlas/fortal/README.md
+++ /dev/null
@@ -1,64 +0,0 @@
-# Fortal Atlas capture
-
-This directory contains a deterministic, inert capture of the Fortal Button.
-It is designed for repository readers such as Mix Atlas; loading it does not
-execute or compile Remix source code.
-
-## Contents
-
-- `capture.json` — integrity envelope and artifact index
-- `catalog.json` — Atlas catalog index
-- `light/` and `dark/` — Button contact-sheet PNGs and structured sidecars
-- `themes/` — strict `mix_protocol` v1 theme documents
-- `components/button.component.json` — bounded Button properties, states,
-  anatomy, semantics, recipe coordinates, evidence, and visual-oracle links
-- `styles/button/` — projected built-in container, label, and icon style
-  documents for all 20 recipes
-- `protocol/coverage.json` — supported and unsupported protocol probes
-- `protocol/fixtures/` — a representable built-in style fixture using Fortal
-  tokens
-
-The capture covers five Button variants, four sizes, and default, hovered,
-pressed, focused, disabled, and loading scenarios in light and dark themes:
-240 cells total, 200 non-loading cells, and 40 loading cells.
-
-The producer adapter walks the real `ButtonStyler` sources and variants,
-then uses each built-in leaf styler's normal merge semantics. It does not copy
-the Fortal recipe. It calls `RemixButton.composeStyle` first so widget-owned
-defaults and tooling share one source of truth. Container, label, and icon
-leaves are portable after the multi-source nested-styler fix from
-`btwld/mix#981`. `RemixSpinner` remains an explicit unsupported slot because no
-neutral primitive has been selected.
-
-The 200 non-loading cells reconstructed from this capture match the existing
-light and dark Button screenshot oracles exactly. The 40 loading cells remain
-screenshot-only until spinner support is deliberately designed.
-
-The raw Fortal theme also contains nested color-token references in six shadow
-tokens; the capture resolves those colors to concrete runtime theme values
-before protocol encoding, while preserving the raw diagnostics in the coverage
-report.
-
-## Regenerate
-
-Use the repository's Flutter 3.44.0 FVM pin on macOS:
-
-```sh
-cd packages/demo
-fvm flutter test test/atlas/fortal_protocol_probe_test.dart --update-goldens
-fvm flutter test test/atlas/fortal_atlas_golden_test.dart --update-goldens
-fvm dart run tool/package_fortal_atlas.dart
-```
-
-Verify committed output without rewriting it:
-
-```sh
-cd packages/demo
-fvm flutter test test/atlas/fortal_protocol_probe_test.dart
-CI=1 fvm flutter test test/atlas/fortal_atlas_golden_test.dart
-fvm dart run tool/package_fortal_atlas.dart --check
-```
-
-Repository transport metadata such as requested ref and resolved Git commit is
-attached by the reader. It is deliberately not embedded in this committed
-manifest, which avoids a self-referential commit identifier.
diff --git a/atlas/fortal/capture.json b/atlas/fortal/capture.json
deleted file mode 100644
index da1702af..00000000
--- a/atlas/fortal/capture.json
+++ /dev/null
@@ -1,380 +0,0 @@
-{
-  "schema": "mix_atlas/capture/v2",
-  "id": "fortal",
-  "producer": {
-    "atlas": "0.1.0",
-    "mixProtocolVersion": "1.0.0",
-    "mixProtocolFormat": 1,
-    "flutter": "3.44.0"
-  },
-  "catalog": "catalog.json",
-  "themes": [
-    {
-      "id": "light",
-      "document": "themes/light.mix.json"
-    },
-    {
-      "id": "dark",
-      "document": "themes/dark.mix.json"
-    }
-  ],
-  "components": [
-    {
-      "id": "button",
-      "document": "components/button.component.json"
-    }
-  ],
-  "protocolCoverage": "protocol/coverage.json",
-  "files": [
-    {
-      "path": "catalog.json",
-      "sha256": "c7b4bfdc8dd0453c94c84541f0f60c7ea01baddb2a0ea5bdff0b48ab34856ed4",
-      "bytes": 639
-    },
-    {
-      "path": "components/button.component.json",
-      "sha256": "c00f12de096dce4fc20bf9b170aafae357a8c07c880add9974412e3cb1f3ba83",
-      "bytes": 27584
-    },
-    {
-      "path": "dark/button.json",
-      "sha256": "72e80463651344dd034a24ab58b3f50ca05ff108d504943aaa8b93d21b07e646",
-      "bytes": 5612
-    },
-    {
-      "path": "dark/button.png",
-      "sha256": "be2beefecfaef0a0d698fc7d192b37a34309402e0c04067f21776111eb5099de",
-      "bytes": 179541
-    },
-    {
-      "path": "light/button.json",
-      "sha256": "daa4bdba64a673a98e267e4dd9cd1a9940ac03c9e5559a4aa1f1e0fd245e42a3",
-      "bytes": 5615
-    },
-    {
-      "path": "light/button.png",
-      "sha256": "09c0ba921a97f1d32906e3d4b1b414cc1c9fee785d6b433e9a5ee6c0f53be941",
-      "bytes": 171298
-    },
-    {
-      "path": "protocol/coverage.json",
-      "sha256": "7b1615f04774c6a1ec3bbc80b703fa4557a5a6371680e1da686bd15937c01abb",
-      "bytes": 7836
-    },
-    {
-      "path": "protocol/fixtures/fortal-tokenized-flex-box.mix.json",
-      "sha256": "b413d177b00998fe55ddf7d30d9ca8c0891a4e67056db2025c911bf3ee4b4ac3",
-      "bytes": 257
-    },
-    {
-      "path": "styles/button/ghost-size1/container.mix.json",
-      "sha256": "c3bc5aa9430266896beb25ab1140688e344aeeb8a5940c69b011c7d2af47856c",
-      "bytes": 2427
-    },
-    {
-      "path": "styles/button/ghost-size1/icon.mix.json",
-      "sha256": "85bcf16a35b2e827395d99d6516de6d375737dd549e48e1bdc73afaae61c939e",
-      "bytes": 302
-    },
-    {
-      "path": "styles/button/ghost-size1/label.mix.json",
-      "sha256": "d446780069282882b24cf823c56396eedfa3bb349e4984b09253cd013e58a5de",
-      "bytes": 638
-    },
-    {
-      "path": "styles/button/ghost-size2/container.mix.json",
-      "sha256": "ded82395e7b0f0d44ef471a0c4e180bdde68194ebbc71411f88b0da0b504772f",
-      "bytes": 2427
-    },
-    {
-      "path": "styles/button/ghost-size2/icon.mix.json",
-      "sha256": "1e6774a0bfebd8bf208b7626154a956c5835dad885970e2164e5d7fb74497bb6",
-      "bytes": 302
-    },
-    {
-      "path": "styles/button/ghost-size2/label.mix.json",
-      "sha256": "8519482344e85cca89b8d6ff6c24e92c48b837e5b93283df82d3076edbecd57a",
-      "bytes": 635
-    },
-    {
-      "path": "styles/button/ghost-size3/container.mix.json",
-      "sha256": "f40afa1467c344729477c5176218a5a1200713ad65f1276fbbbcce36180d8835",
-      "bytes": 2427
-    },
-    {
-      "path": "styles/button/ghost-size3/icon.mix.json",
-      "sha256": "5bd2121f6f6bedb76ec54c28f0b1afc68544d2737873ff8de12d662543452adf",
-      "bytes": 302
-    },
-    {
-      "path": "styles/button/ghost-size3/label.mix.json",
-      "sha256": "c3e61a56cdbcebc85ab6d1c4cd6007e935dcb9ad87d4af943f14faf1e0b79578",
-      "bytes": 620
-    },
-    {
-      "path": "styles/button/ghost-size4/container.mix.json",
-      "sha256": "d21344b171ea76d42127fb021fdcbb6e5569800f0211d52abc45b07c45180b87",
-      "bytes": 2427
-    },
-    {
-      "path": "styles/button/ghost-size4/icon.mix.json",
-      "sha256": "79867c0eb44025ed5e066586e28dd1ec8fcb546bbe697e455d64bfe75b5bb5ba",
-      "bytes": 302
-    },
-    {
-      "path": "styles/button/ghost-size4/label.mix.json",
-      "sha256": "a89d32a028b459dfad58c2f2572334e1302111f18e529bbe1b83e4648b65d12d",
-      "bytes": 639
-    },
-    {
-      "path": "styles/button/outline-size1/container.mix.json",
-      "sha256": "be5f23243abdeb0d705c9e49812be2d54bc39ccd6e32f6f69102246733042593",
-      "bytes": 5111
-    },
-    {
-      "path": "styles/button/outline-size1/icon.mix.json",
-      "sha256": "85bcf16a35b2e827395d99d6516de6d375737dd549e48e1bdc73afaae61c939e",
-      "bytes": 302
-    },
-    {
-      "path": "styles/button/outline-size1/label.mix.json",
-      "sha256": "d446780069282882b24cf823c56396eedfa3bb349e4984b09253cd013e58a5de",
-      "bytes": 638
-    },
-    {
-      "path": "styles/button/outline-size2/container.mix.json",
-      "sha256": "ff073382630fc6c1aec87603354611df7b0a3455161250df84d9c6fac0bd3909",
-      "bytes": 5111
-    },
-    {
-      "path": "styles/button/outline-size2/icon.mix.json",
-      "sha256": "1e6774a0bfebd8bf208b7626154a956c5835dad885970e2164e5d7fb74497bb6",
-      "bytes": 302
-    },
-    {
-      "path": "styles/button/outline-size2/label.mix.json",
-      "sha256": "8519482344e85cca89b8d6ff6c24e92c48b837e5b93283df82d3076edbecd57a",
-      "bytes": 635
-    },
-    {
-      "path": "styles/button/outline-size3/container.mix.json",
-      "sha256": "c7c67b63c90ae3fe3f3c8af2f94a30753a013eb983695055375a257e85211ba2",
-      "bytes": 5111
-    },
-    {
-      "path": "styles/button/outline-size3/icon.mix.json",
-      "sha256": "5bd2121f6f6bedb76ec54c28f0b1afc68544d2737873ff8de12d662543452adf",
-      "bytes": 302
-    },
-    {
-      "path": "styles/button/outline-size3/label.mix.json",
-      "sha256": "c3e61a56cdbcebc85ab6d1c4cd6007e935dcb9ad87d4af943f14faf1e0b79578",
-      "bytes": 620
-    },
-    {
-      "path": "styles/button/outline-size4/container.mix.json",
-      "sha256": "a8360669d38fcd916bc466269d0c538db51ae069def0eaf49230c5e4b3570afe",
-      "bytes": 5111
-    },
-    {
-      "path": "styles/button/outline-size4/icon.mix.json",
-      "sha256": "79867c0eb44025ed5e066586e28dd1ec8fcb546bbe697e455d64bfe75b5bb5ba",
-      "bytes": 302
-    },
-    {
-      "path": "styles/button/outline-size4/label.mix.json",
-      "sha256": "a89d32a028b459dfad58c2f2572334e1302111f18e529bbe1b83e4648b65d12d",
-      "bytes": 639
-    },
-    {
-      "path": "styles/button/soft-size1/container.mix.json",
-      "sha256": "3c67f10d2c1aa3e6bbdea87d05a9b092531754b52abda597710dfc871638c1d7",
-      "bytes": 2692
-    },
-    {
-      "path": "styles/button/soft-size1/icon.mix.json",
-      "sha256": "85bcf16a35b2e827395d99d6516de6d375737dd549e48e1bdc73afaae61c939e",
-      "bytes": 302
-    },
-    {
-      "path": "styles/button/soft-size1/label.mix.json",
-      "sha256": "d446780069282882b24cf823c56396eedfa3bb349e4984b09253cd013e58a5de",
-      "bytes": 638
-    },
-    {
-      "path": "styles/button/soft-size2/container.mix.json",
-      "sha256": "37755194e1e96a2b5ac0e57c496b02b7d594acd609e781fff2ab764269d10ca1",
-      "bytes": 2692
-    },
-    {
-      "path": "styles/button/soft-size2/icon.mix.json",
-      "sha256": "1e6774a0bfebd8bf208b7626154a956c5835dad885970e2164e5d7fb74497bb6",
-      "bytes": 302
-    },
-    {
-      "path": "styles/button/soft-size2/label.mix.json",
-      "sha256": "8519482344e85cca89b8d6ff6c24e92c48b837e5b93283df82d3076edbecd57a",
-      "bytes": 635
-    },
-    {
-      "path": "styles/button/soft-size3/container.mix.json",
-      "sha256": "9d512fd1515476f468f0da31ed5e41804c5aea75fdf072b693cb514d5929953b",
-      "bytes": 2692
-    },
-    {
-      "path": "styles/button/soft-size3/icon.mix.json",
-      "sha256": "5bd2121f6f6bedb76ec54c28f0b1afc68544d2737873ff8de12d662543452adf",
-      "bytes": 302
-    },
-    {
-      "path": "styles/button/soft-size3/label.mix.json",
-      "sha256": "c3e61a56cdbcebc85ab6d1c4cd6007e935dcb9ad87d4af943f14faf1e0b79578",
-      "bytes": 620
-    },
-    {
-      "path": "styles/button/soft-size4/container.mix.json",
-      "sha256": "aa4592105500c6fc1b4d03a75315380fc92deed3b6a251d9967e37ea480e8ff7",
-      "bytes": 2692
-    },
-    {
-      "path": "styles/button/soft-size4/icon.mix.json",
-      "sha256": "79867c0eb44025ed5e066586e28dd1ec8fcb546bbe697e455d64bfe75b5bb5ba",
-      "bytes": 302
-    },
-    {
-      "path": "styles/button/soft-size4/label.mix.json",
-      "sha256": "a89d32a028b459dfad58c2f2572334e1302111f18e529bbe1b83e4648b65d12d",
-      "bytes": 639
-    },
-    {
-      "path": "styles/button/solid-size1/container.mix.json",
-      "sha256": "a697cf46837c1444f2bf4266f8f3752029166fb116b8276b4447fe3f1009670f",
-      "bytes": 2694
-    },
-    {
-      "path": "styles/button/solid-size1/icon.mix.json",
-      "sha256": "87d6287df62a8d9f0dbdbf519ef45752a8a071daf8eaf00b64b952d1ac2f4fd5",
-      "bytes": 308
-    },
-    {
-      "path": "styles/button/solid-size1/label.mix.json",
-      "sha256": "906d184dc3db5b163634089be795eff31370be59293c9cde71f47106421f4f83",
-      "bytes": 644
-    },
-    {
-      "path": "styles/button/solid-size2/container.mix.json",
-      "sha256": "cc992ffca6c974f87bb4171958dbe56b9b03a55227c7e2ce90b4557b6354aa39",
-      "bytes": 2694
-    },
-    {
-      "path": "styles/button/solid-size2/icon.mix.json",
-      "sha256": "5d647a63917081769706012c54332765848bf71a3180fe8dc50edf72152eb777",
-      "bytes": 308
-    },
-    {
-      "path": "styles/button/solid-size2/label.mix.json",
-      "sha256": "4a38f46f015f58daf6c6a4250628d6a5277b1db2a1e5701d366b7571d6157d2d",
-      "bytes": 641
-    },
-    {
-      "path": "styles/button/solid-size3/container.mix.json",
-      "sha256": "2c2411ff3ec2250219470111af64b1cc0b06b73f5f66382b170fd41999f12f6f",
-      "bytes": 2694
-    },
-    {
-      "path": "styles/button/solid-size3/icon.mix.json",
-      "sha256": "3464fd0c045d22b33260e28d439449e0f67a023185ba4fd103a2e38d4cec1e99",
-      "bytes": 308
-    },
-    {
-      "path": "styles/button/solid-size3/label.mix.json",
-      "sha256": "184a013aca7a1082c362469a3cab7d0c687ed4649cd8714e9274f6045a621f64",
-      "bytes": 626
-    },
-    {
-      "path": "styles/button/solid-size4/container.mix.json",
-      "sha256": "761a82023bcc40ecc4c9ea7c1c42d982bdfb97e01f698abfa8e0ef80e49c6ebf",
-      "bytes": 2694
-    },
-    {
-      "path": "styles/button/solid-size4/icon.mix.json",
-      "sha256": "1ae004bb7a22402e7e2812fa7a5a4d0470658c2fe016c65736fb345ec35bc532",
-      "bytes": 308
-    },
-    {
-      "path": "styles/button/solid-size4/label.mix.json",
-      "sha256": "3c6bc13d5a4e08fd05a3a934c4d23d75d5f4de5e7fa100ad4320e36dec8b3e90",
-      "bytes": 645
-    },
-    {
-      "path": "styles/button/surface-size1/container.mix.json",
-      "sha256": "3e20f4862eaf7308661d1d3e8530438c9f699db43d86825fc44e517661c493dd",
-      "bytes": 5648
-    },
-    {
-      "path": "styles/button/surface-size1/icon.mix.json",
-      "sha256": "85bcf16a35b2e827395d99d6516de6d375737dd549e48e1bdc73afaae61c939e",
-      "bytes": 302
-    },
-    {
-      "path": "styles/button/surface-size1/label.mix.json",
-      "sha256": "d446780069282882b24cf823c56396eedfa3bb349e4984b09253cd013e58a5de",
-      "bytes": 638
-    },
-    {
-      "path": "styles/button/surface-size2/container.mix.json",
-      "sha256": "ec51aaef3fdcf52414653a5f1a3adbd1de0e5f81863f19268f12c4cf5fbe567c",
-      "bytes": 5648
-    },
-    {
-      "path": "styles/button/surface-size2/icon.mix.json",
-      "sha256": "1e6774a0bfebd8bf208b7626154a956c5835dad885970e2164e5d7fb74497bb6",
-      "bytes": 302
-    },
-    {
-      "path": "styles/button/surface-size2/label.mix.json",
-      "sha256": "8519482344e85cca89b8d6ff6c24e92c48b837e5b93283df82d3076edbecd57a",
-      "bytes": 635
-    },
-    {
-      "path": "styles/button/surface-size3/container.mix.json",
-      "sha256": "fea154fdad169c11b6dc91f9454ec689f2850fadc6375c143976118657e49907",
-      "bytes": 5648
-    },
-    {
-      "path": "styles/button/surface-size3/icon.mix.json",
-      "sha256": "5bd2121f6f6bedb76ec54c28f0b1afc68544d2737873ff8de12d662543452adf",
-      "bytes": 302
-    },
-    {
-      "path": "styles/button/surface-size3/label.mix.json",
-      "sha256": "c3e61a56cdbcebc85ab6d1c4cd6007e935dcb9ad87d4af943f14faf1e0b79578",
-      "bytes": 620
-    },
-    {
-      "path": "styles/button/surface-size4/container.mix.json",
-      "sha256": "522cddc6fd94d80f6a534f252e4ad353168ddf6452dd1f25ce6163d7d2a459c8",
-      "bytes": 5648
-    },
-    {
-      "path": "styles/button/surface-size4/icon.mix.json",
-      "sha256": "79867c0eb44025ed5e066586e28dd1ec8fcb546bbe697e455d64bfe75b5bb5ba",
-      "bytes": 302
-    },
-    {
-      "path": "styles/button/surface-size4/label.mix.json",
-      "sha256": "a89d32a028b459dfad58c2f2572334e1302111f18e529bbe1b83e4648b65d12d",
-      "bytes": 639
-    },
-    {
-      "path": "themes/dark.mix.json",
-      "sha256": "76484fcdcff252a59efdec0657a6741f379ced392926dccfaaf05ef312e92392",
-      "bytes": 8385
-    },
-    {
-      "path": "themes/light.mix.json",
-      "sha256": "3021364baeb1359fe8d195f404beca0890b0a6b8b5f950222f812ad713b8bab9",
-      "bytes": 8389
-    }
-  ]
-}
diff --git a/atlas/fortal/catalog.json b/atlas/fortal/catalog.json
deleted file mode 100644
index a85074ef..00000000
--- a/atlas/fortal/catalog.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "schema": "mix_atlas/catalog/v1",
-  "id": "fortal",
-  "label": "Fortal Design System",
-  "themes": [
-    {
-      "id": "light",
-      "label": "Light",
-      "brightness": "light"
-    },
-    {
-      "id": "dark",
-      "label": "Dark",
-      "brightness": "dark"
-    }
-  ],
-  "atlases": [
-    {
-      "id": "button",
-      "label": "Button",
-      "files": [
-        {
-          "theme": "light",
-          "image": "light/button.png",
-          "metadata": "light/button.json"
-        },
-        {
-          "theme": "dark",
-          "image": "dark/button.png",
-          "metadata": "dark/button.json"
-        }
-      ]
-    }
-  ]
-}
diff --git a/atlas/fortal/components/button.component.json b/atlas/fortal/components/button.component.json
deleted file mode 100644
index 384b8b48..00000000
--- a/atlas/fortal/components/button.component.json
+++ /dev/null
@@ -1,1037 +0,0 @@
-{
-  "schema": "mix_atlas/component/v1",
-  "id": "button",
-  "label": "Button",
-  "properties": [
-    {
-      "id": "variant",
-      "kind": "enum",
-      "values": [
-        "solid",
-        "soft",
-        "surface",
-        "outline",
-        "ghost"
-      ],
-      "default": "solid"
-    },
-    {
-      "id": "size",
-      "kind": "enum",
-      "values": [
-        "size1",
-        "size2",
-        "size3",
-        "size4"
-      ],
-      "default": "size2"
-    },
-    {
-      "id": "label",
-      "kind": "string",
-      "default": "Button"
-    },
-    {
-      "id": "leadingIcon",
-      "kind": "icon",
-      "required": false
-    },
-    {
-      "id": "trailingIcon",
-      "kind": "icon",
-      "required": false
-    },
-    {
-      "id": "enabled",
-      "kind": "boolean",
-      "default": true
-    },
-    {
-      "id": "loading",
-      "kind": "boolean",
-      "default": false
-    }
-  ],
-  "states": [
-    {
-      "id": "default",
-      "widgetStates": [],
-      "properties": {}
-    },
-    {
-      "id": "hovered",
-      "widgetStates": [
-        "hovered"
-      ],
-      "properties": {}
-    },
-    {
-      "id": "pressed",
-      "widgetStates": [
-        "pressed"
-      ],
-      "properties": {}
-    },
-    {
-      "id": "focused",
-      "widgetStates": [
-        "focused"
-      ],
-      "properties": {}
-    },
-    {
-      "id": "disabled",
-      "widgetStates": [
-        "disabled"
-      ],
-      "properties": {
-        "enabled": false
-      }
-    },
-    {
-      "id": "loading",
-      "widgetStates": [
-        "disabled"
-      ],
-      "properties": {
-        "enabled": false,
-        "loading": true
-      }
-    }
-  ],
-  "slots": [
-    {
-      "id": "container",
-      "kind": "flex_box"
-    },
-    {
-      "id": "label",
-      "kind": "text"
-    },
-    {
-      "id": "leadingIcon",
-      "kind": "icon"
-    },
-    {
-      "id": "trailingIcon",
-      "kind": "icon"
-    },
-    {
-      "id": "spinner",
-      "kind": "spinner"
-    }
-  ],
-  "anatomy": {
-    "root": "root",
-    "nodes": [
-      {
-        "id": "root",
-        "kind": "stack",
-        "alignment": "center",
-        "children": [
-          "content",
-          "spinner"
-        ]
-      },
-      {
-        "id": "content",
-        "kind": "slot",
-        "slot": "container",
-        "children": [
-          "leadingIcon",
-          "label",
-          "trailingIcon"
-        ],
-        "visibleWhen": {
-          "property": "loading",
-          "operator": "equals",
-          "value": false
-        },
-        "maintain": [
-          "size",
-          "state",
-          "animation"
-        ]
-      },
-      {
-        "id": "leadingIcon",
-        "kind": "slot",
-        "slot": "leadingIcon",
-        "children": [],
-        "visibleWhen": {
-          "property": "leadingIcon",
-          "operator": "present"
-        }
-      },
-      {
-        "id": "label",
-        "kind": "slot",
-        "slot": "label",
-        "children": []
-      },
-      {
-        "id": "trailingIcon",
-        "kind": "slot",
-        "slot": "trailingIcon",
-        "children": [],
-        "visibleWhen": {
-          "property": "trailingIcon",
-          "operator": "present"
-        }
-      },
-      {
-        "id": "spinner",
-        "kind": "slot",
-        "slot": "spinner",
-        "children": [],
-        "visibleWhen": {
-          "property": "loading",
-          "operator": "equals",
-          "value": true
-        }
-      }
-    ]
-  },
-  "recipes": [
-    {
-      "id": "solid-size1",
-      "properties": {
-        "variant": "solid",
-        "size": "size1"
-      },
-      "styles": {
-        "container": {
-          "status": "supported",
-          "evidence": "declared",
-          "document": "styles/button/solid-size1/container.mix.json"
-        },
-        "label": {
-          "status": "supported",
-          "evidence": "declared",
-          "document": "styles/button/solid-size1/label.mix.json"
-        },
-        "leadingIcon": {
-          "status": "supported",
-          "evidence": "declared",
-          "document": "styles/button/solid-size1/icon.mix.json"
-        },
-        "trailingIcon": {
-          "status": "supported",
-          "evidence": "declared",
-          "document": "styles/button/solid-size1/icon.mix.json"
-        },
-        "spinner": {
-          "status": "unsupported",
-          "evidence": "declared",
-          "diagnostics": [
-            {
-              "code": "unsupported_slot_primitive",
-              "severity": "error",
-              "path": "spinner",
-              "message": "RemixSpinner has no neutral Mix protocol primitive."
-            }
-          ]
-        }
-      }
-    },
-    {
-      "id": "solid-size2",
-      "properties": {
-        "variant": "solid",
-        "size": "size2"
-      },
-      "styles": {
-        "container": {
-          "status": "supported",
-          "evidence": "declared",
-          "document": "styles/button/solid-size2/container.mix.json"
-        },
-        "label": {
-          "status": "supported",
-          "evidence": "declared",
-          "document": "styles/button/solid-size2/label.mix.json"
-        },
-        "leadingIcon": {
-          "status": "supported",
-          "evidence": "declared",
-          "document": "styles/button/solid-size2/icon.mix.json"
-        },
-        "trailingIcon": {
-          "status": "supported",
-          "evidence": "declared",
-          "document": "styles/button/solid-size2/icon.mix.json"
-        },
-        "spinner": {
-          "status": "unsupported",
-          "evidence": "declared",
-          "diagnostics": [
-            {
-              "code": "unsupported_slot_primitive",
-              "severity": "error",
-              "path": "spinner",
-              "message": "RemixSpinner has no neutral Mix protocol primitive."
-            }
-          ]
-        }
-      }
-    },
-    {
-      "id": "solid-size3",
-      "properties": {
-        "variant": "solid",
-        "size": "size3"
-      },
-      "styles": {
-        "container": {
-          "status": "supported",
-          "evidence": "declared",
-          "document": "styles/button/solid-size3/container.mix.json"
-        },
-        "label": {
-          "status": "supported",
-          "evidence": "declared",
-          "document": "styles/button/solid-size3/label.mix.json"
-        },
-        "leadingIcon": {
-          "status": "supported",
-          "evidence": "declared",
-          "document": "styles/button/solid-size3/icon.mix.json"
-        },
-        "trailingIcon": {
-          "status": "supported",
-          "evidence": "declared",
-          "document": "styles/button/solid-size3/icon.mix.json"
-        },
-        "spinner": {
-          "status": "unsupported",
-          "evidence": "declared",
-          "diagnostics": [
-            {
-              "code": "unsupported_slot_primitive",
-              "severity": "error",
-              "path": "spinner",
-              "message": "RemixSpinner has no neutral Mix protocol primitive."
-            }
-          ]
-        }
-      }
-    },
-    {
-      "id": "solid-size4",
-      "properties": {
-        "variant": "solid",
-        "size": "size4"
-      },
-      "styles": {
-        "container": {
-          "status": "supported",
-          "evidence": "declared",
-          "document": "styles/button/solid-size4/container.mix.json"
-        },
-        "label": {
-          "status": "supported",
-          "evidence": "declared",
-          "document": "styles/button/solid-size4/label.mix.json"
-        },
-        "leadingIcon": {
-          "status": "supported",
-          "evidence": "declared",
-          "document": "styles/button/solid-size4/icon.mix.json"
-        },
-        "trailingIcon": {
-          "status": "supported",
-          "evidence": "declared",
-          "document": "styles/button/solid-size4/icon.mix.json"
-        },
-        "spinner": {
-          "status": "unsupported",
-          "evidence": "declared",
-          "diagnostics": [
-            {
-              "code": "unsupported_slot_primitive",
-              "severity": "error",
-              "path": "spinner",
-              "message": "RemixSpinner has no neutral Mix protocol primitive."
-            }
-          ]
-        }
-      }
-    },
-    {
-      "id": "soft-size1",
-      "properties": {
-        "variant": "soft",
-        "size": "size1"
-      },
-      "styles": {
-        "container": {
-          "status": "supported",
-          "evidence": "declared",
-          "document": "styles/button/soft-size1/container.mix.json"
-        },
-        "label": {
-          "status": "supported",
-          "evidence": "declared",
-          "document": "styles/button/soft-size1/label.mix.json"
-        },
-        "leadingIcon": {
-          "status": "supported",
-          "evidence": "declared",
-          "document": "styles/button/soft-size1/icon.mix.json"
-        },
-        "trailingIcon": {
-          "status": "supported",
-          "evidence": "declared",
-          "document": "styles/button/soft-size1/icon.mix.json"
-        },
-        "spinner": {
-          "status": "unsupported",
-          "evidence": "declared",
-          "diagnostics": [
-            {
-              "code": "unsupported_slot_primitive",
-              "severity": "error",
-              "path": "spinner",
-              "message": "RemixSpinner has no neutral Mix protocol primitive."
-            }
-          ]
-        }
-      }
-    },
-    {
-      "id": "soft-size2",
-      "properties": {
-        "variant": "soft",
-        "size": "size2"
-      },
-      "styles": {
-        "container": {
-          "status": "supported",
-          "evidence": "declared",
-          "document": "styles/button/soft-size2/container.mix.json"
-        },
-        "label": {
-          "status": "supported",
-          "evidence": "declared",
-          "document": "styles/button/soft-size2/label.mix.json"
-        },
-        "leadingIcon": {
-          "status": "supported",
-          "evidence": "declared",
-          "document": "styles/button/soft-size2/icon.mix.json"
-        },
-        "trailingIcon": {
-          "status": "supported",
-          "evidence": "declared",
-          "document": "styles/button/soft-size2/icon.mix.json"
-        },
-        "spinner": {
-          "status": "unsupported",
-          "evidence": "declared",
-          "diagnostics": [
-            {
-              "code": "unsupported_slot_primitive",
-              "severity": "error",
-              "path": "spinner",
-              "message": "RemixSpinner has no neutral Mix protocol primitive."
-            }
-          ]
-        }
-      }
-    },
-    {
-      "id": "soft-size3",
-      "properties": {
-        "variant": "soft",
-        "size": "size3"
-      },
-      "styles": {
-        "container": {
-          "status": "supported",
-          "evidence": "declared",
-          "document": "styles/button/soft-size3/container.mix.json"
-        },
-        "label": {
-          "status": "supported",
-          "evidence": "declared",
-          "document": "styles/button/soft-size3/label.mix.json"
-        },
-        "leadingIcon": {
-          "status": "supported",
-          "evidence": "declared",
-          "document": "styles/button/soft-size3/icon.mix.json"
-        },
-        "trailingIcon": {
-          "status": "supported",
-          "evidence": "declared",
-          "document": "styles/button/soft-size3/icon.mix.json"
-        },
-        "spinner": {
-          "status": "unsupported",
-          "evidence": "declared",
-          "diagnostics": [
-            {
-              "code": "unsupported_slot_primitive",
-              "severity": "error",
-              "path": "spinner",
-              "message": "RemixSpinner has no neutral Mix protocol primitive."
-            }
-          ]
-        }
-      }
-    },
-    {
-      "id": "soft-size4",
-      "properties": {
-        "variant": "soft",
-        "size": "size4"
-      },
-      "styles": {
-        "container": {
-          "status": "supported",
-          "evidence": "declared",
-          "document": "styles/button/soft-size4/container.mix.json"
-        },
-        "label": {
-          "status": "supported",
-          "evidence": "declared",
-          "document": "styles/button/soft-size4/label.mix.json"
-        },
-        "leadingIcon": {
-          "status": "supported",
-          "evidence": "declared",
-          "document": "styles/button/soft-size4/icon.mix.json"
-        },
-        "trailingIcon": {
-          "status": "supported",
-          "evidence": "declared",
-          "document": "styles/button/soft-size4/icon.mix.json"
-        },
-        "spinner": {
-          "status": "unsupported",
-          "evidence": "declared",
-          "diagnostics": [
-            {
-              "code": "unsupported_slot_primitive",
-              "severity": "error",
-              "path": "spinner",
-              "message": "RemixSpinner has no neutral Mix protocol primitive."
-            }
-          ]
-        }
-      }
-    },
-    {
-      "id": "surface-size1",
-      "properties": {
-        "variant": "surface",
-        "size": "size1"
-      },
-      "styles": {
-        "container": {
-          "status": "supported",
-          "evidence": "declared",
-          "document": "styles/button/surface-size1/container.mix.json"
-        },
-        "label": {
-          "status": "supported",
-          "evidence": "declared",
-          "document": "styles/button/surface-size1/label.mix.json"
-        },
-        "leadingIcon": {
-          "status": "supported",
-          "evidence": "declared",
-          "document": "styles/button/surface-size1/icon.mix.json"
-        },
-        "trailingIcon": {
-          "status": "supported",
-          "evidence": "declared",
-          "document": "styles/button/surface-size1/icon.mix.json"
-        },
-        "spinner": {
-          "status": "unsupported",
-          "evidence": "declared",
-          "diagnostics": [
-            {
-              "code": "unsupported_slot_primitive",
-              "severity": "error",
-              "path": "spinner",
-              "message": "RemixSpinner has no neutral Mix protocol primitive."
-            }
-          ]
-        }
-      }
-    },
-    {
-      "id": "surface-size2",
-      "properties": {
-        "variant": "surface",
-        "size": "size2"
-      },
-      "styles": {
-        "container": {
-          "status": "supported",
-          "evidence": "declared",
-          "document": "styles/button/surface-size2/container.mix.json"
-        },
-        "label": {
-          "status": "supported",
-          "evidence": "declared",
-          "document": "styles/button/surface-size2/label.mix.json"
-        },
-        "leadingIcon": {
-          "status": "supported",
-          "evidence": "declared",
-          "document": "styles/button/surface-size2/icon.mix.json"
-        },
-        "trailingIcon": {
-          "status": "supported",
-          "evidence": "declared",
-          "document": "styles/button/surface-size2/icon.mix.json"
-        },
-        "spinner": {
-          "status": "unsupported",
-          "evidence": "declared",
-          "diagnostics": [
-            {
-              "code": "unsupported_slot_primitive",
-              "severity": "error",
-              "path": "spinner",
-              "message": "RemixSpinner has no neutral Mix protocol primitive."
-            }
-          ]
-        }
-      }
-    },
-    {
-      "id": "surface-size3",
-      "properties": {
-        "variant": "surface",
-        "size": "size3"
-      },
-      "styles": {
-        "container": {
-          "status": "supported",
-          "evidence": "declared",
-          "document": "styles/button/surface-size3/container.mix.json"
-        },
-        "label": {
-          "status": "supported",
-          "evidence": "declared",
-          "document": "styles/button/surface-size3/label.mix.json"
-        },
-        "leadingIcon": {
-          "status": "supported",
-          "evidence": "declared",
-          "document": "styles/button/surface-size3/icon.mix.json"
-        },
-        "trailingIcon": {
-          "status": "supported",
-          "evidence": "declared",
-          "document": "styles/button/surface-size3/icon.mix.json"
-        },
-        "spinner": {
-          "status": "unsupported",
-          "evidence": "declared",
-          "diagnostics": [
-            {
-              "code": "unsupported_slot_primitive",
-              "severity": "error",
-              "path": "spinner",
-              "message": "RemixSpinner has no neutral Mix protocol primitive."
-            }
-          ]
-        }
-      }
-    },
-    {
-      "id": "surface-size4",
-      "properties": {
-        "variant": "surface",
-        "size": "size4"
-      },
-      "styles": {
-        "container": {
-          "status": "supported",
-          "evidence": "declared",
-          "document": "styles/button/surface-size4/container.mix.json"
-        },
-        "label": {
-          "status": "supported",
-          "evidence": "declared",
-          "document": "styles/button/surface-size4/label.mix.json"
-        },
-        "leadingIcon": {
-          "status": "supported",
-          "evidence": "declared",
-          "document": "styles/button/surface-size4/icon.mix.json"
-        },
-        "trailingIcon": {
-          "status": "supported",
-          "evidence": "declared",
-          "document": "styles/button/surface-size4/icon.mix.json"
-        },
-        "spinner": {
-          "status": "unsupported",
-          "evidence": "declared",
-          "diagnostics": [
-            {
-              "code": "unsupported_slot_primitive",
-              "severity": "error",
-              "path": "spinner",
-              "message": "RemixSpinner has no neutral Mix protocol primitive."
-            }
-          ]
-        }
-      }
-    },
-    {
-      "id": "outline-size1",
-      "properties": {
-        "variant": "outline",
-        "size": "size1"
-      },
-      "styles": {
-        "container": {
-          "status": "supported",
-          "evidence": "declared",
-          "document": "styles/button/outline-size1/container.mix.json"
-        },
-        "label": {
-          "status": "supported",
-          "evidence": "declared",
-          "document": "styles/button/outline-size1/label.mix.json"
-        },
-        "leadingIcon": {
-          "status": "supported",
-          "evidence": "declared",
-          "document": "styles/button/outline-size1/icon.mix.json"
-        },
-        "trailingIcon": {
-          "status": "supported",
-          "evidence": "declared",
-          "document": "styles/button/outline-size1/icon.mix.json"
-        },
-        "spinner": {
-          "status": "unsupported",
-          "evidence": "declared",
-          "diagnostics": [
-            {
-              "code": "unsupported_slot_primitive",
-              "severity": "error",
-              "path": "spinner",
-              "message": "RemixSpinner has no neutral Mix protocol primitive."
-            }
-          ]
-        }
-      }
-    },
-    {
-      "id": "outline-size2",
-      "properties": {
-        "variant": "outline",
-        "size": "size2"
-      },
-      "styles": {
-        "container": {
-          "status": "supported",
-          "evidence": "declared",
-          "document": "styles/button/outline-size2/container.mix.json"
-        },
-        "label": {
-          "status": "supported",
-          "evidence": "declared",
-          "document": "styles/button/outline-size2/label.mix.json"
-        },
-        "leadingIcon": {
-          "status": "supported",
-          "evidence": "declared",
-          "document": "styles/button/outline-size2/icon.mix.json"
-        },
-        "trailingIcon": {
-          "status": "supported",
-          "evidence": "declared",
-          "document": "styles/button/outline-size2/icon.mix.json"
-        },
-        "spinner": {
-          "status": "unsupported",
-          "evidence": "declared",
-          "diagnostics": [
-            {
-              "code": "unsupported_slot_primitive",
-              "severity": "error",
-              "path": "spinner",
-              "message": "RemixSpinner has no neutral Mix protocol primitive."
-            }
-          ]
-        }
-      }
-    },
-    {
-      "id": "outline-size3",
-      "properties": {
-        "variant": "outline",
-        "size": "size3"
-      },
-      "styles": {
-        "container": {
-          "status": "supported",
-          "evidence": "declared",
-          "document": "styles/button/outline-size3/container.mix.json"
-        },
-        "label": {
-          "status": "supported",
-          "evidence": "declared",
-          "document": "styles/button/outline-size3/label.mix.json"
-        },
-        "leadingIcon": {
-          "status": "supported",
-          "evidence": "declared",
-          "document": "styles/button/outline-size3/icon.mix.json"
-        },
-        "trailingIcon": {
-          "status": "supported",
-          "evidence": "declared",
-          "document": "styles/button/outline-size3/icon.mix.json"
-        },
-        "spinner": {
-          "status": "unsupported",
-          "evidence": "declared",
-          "diagnostics": [
-            {
-              "code": "unsupported_slot_primitive",
-              "severity": "error",
-              "path": "spinner",
-              "message": "RemixSpinner has no neutral Mix protocol primitive."
-            }
-          ]
-        }
-      }
-    },
-    {
-      "id": "outline-size4",
-      "properties": {
-        "variant": "outline",
-        "size": "size4"
-      },
-      "styles": {
-        "container": {
-          "status": "supported",
-          "evidence": "declared",
-          "document": "styles/button/outline-size4/container.mix.json"
-        },
-        "label": {
-          "status": "supported",
-          "evidence": "declared",
-          "document": "styles/button/outline-size4/label.mix.json"
-        },
-        "leadingIcon": {
-          "status": "supported",
-          "evidence": "declared",
-          "document": "styles/button/outline-size4/icon.mix.json"
-        },
-        "trailingIcon": {
-          "status": "supported",
-          "evidence": "declared",
-          "document": "styles/button/outline-size4/icon.mix.json"
-        },
-        "spinner": {
-          "status": "unsupported",
-          "evidence": "declared",
-          "diagnostics": [
-            {
-              "code": "unsupported_slot_primitive",
-              "severity": "error",
-              "path": "spinner",
-              "message": "RemixSpinner has no neutral Mix protocol primitive."
-            }
-          ]
-        }
-      }
-    },
-    {
-      "id": "ghost-size1",
-      "properties": {
-        "variant": "ghost",
-        "size": "size1"
-      },
-      "styles": {
-        "container": {
-          "status": "supported",
-          "evidence": "declared",
-          "document": "styles/button/ghost-size1/container.mix.json"
-        },
-        "label": {
-          "status": "supported",
-          "evidence": "declared",
-          "document": "styles/button/ghost-size1/label.mix.json"
-        },
-        "leadingIcon": {
-          "status": "supported",
-          "evidence": "declared",
-          "document": "styles/button/ghost-size1/icon.mix.json"
-        },
-        "trailingIcon": {
-          "status": "supported",
-          "evidence": "declared",
-          "document": "styles/button/ghost-size1/icon.mix.json"
-        },
-        "spinner": {
-          "status": "unsupported",
-          "evidence": "declared",
-          "diagnostics": [
-            {
-              "code": "unsupported_slot_primitive",
-              "severity": "error",
-              "path": "spinner",
-              "message": "RemixSpinner has no neutral Mix protocol primitive."
-            }
-          ]
-        }
-      }
-    },
-    {
-      "id": "ghost-size2",
-      "properties": {
-        "variant": "ghost",
-        "size": "size2"
-      },
-      "styles": {
-        "container": {
-          "status": "supported",
-          "evidence": "declared",
-          "document": "styles/button/ghost-size2/container.mix.json"
-        },
-        "label": {
-          "status": "supported",
-          "evidence": "declared",
-          "document": "styles/button/ghost-size2/label.mix.json"
-        },
-        "leadingIcon": {
-          "status": "supported",
-          "evidence": "declared",
-          "document": "styles/button/ghost-size2/icon.mix.json"
-        },
-        "trailingIcon": {
-          "status": "supported",
-          "evidence": "declared",
-          "document": "styles/button/ghost-size2/icon.mix.json"
-        },
-        "spinner": {
-          "status": "unsupported",
-          "evidence": "declared",
-          "diagnostics": [
-            {
-              "code": "unsupported_slot_primitive",
-              "severity": "error",
-              "path": "spinner",
-              "message": "RemixSpinner has no neutral Mix protocol primitive."
-            }
-          ]
-        }
-      }
-    },
-    {
-      "id": "ghost-size3",
-      "properties": {
-        "variant": "ghost",
-        "size": "size3"
-      },
-      "styles": {
-        "container": {
-          "status": "supported",
-          "evidence": "declared",
-          "document": "styles/button/ghost-size3/container.mix.json"
-        },
-        "label": {
-          "status": "supported",
-          "evidence": "declared",
-          "document": "styles/button/ghost-size3/label.mix.json"
-        },
-        "leadingIcon": {
-          "status": "supported",
-          "evidence": "declared",
-          "document": "styles/button/ghost-size3/icon.mix.json"
-        },
-        "trailingIcon": {
-          "status": "supported",
-          "evidence": "declared",
-          "document": "styles/button/ghost-size3/icon.mix.json"
-        },
-        "spinner": {
-          "status": "unsupported",
-          "evidence": "declared",
-          "diagnostics": [
-            {
-              "code": "unsupported_slot_primitive",
-              "severity": "error",
-              "path": "spinner",
-              "message": "RemixSpinner has no neutral Mix protocol primitive."
-            }
-          ]
-        }
-      }
-    },
-    {
-      "id": "ghost-size4",
-      "properties": {
-        "variant": "ghost",
-        "size": "size4"
-      },
-      "styles": {
-        "container": {
-          "status": "supported",
-          "evidence": "declared",
-          "document": "styles/button/ghost-size4/container.mix.json"
-        },
-        "label": {
-          "status": "supported",
-          "evidence": "declared",
-          "document": "styles/button/ghost-size4/label.mix.json"
-        },
-        "leadingIcon": {
-          "status": "supported",
-          "evidence": "declared",
-          "document": "styles/button/ghost-size4/icon.mix.json"
-        },
-        "trailingIcon": {
-          "status": "supported",
-          "evidence": "declared",
-          "document": "styles/button/ghost-size4/icon.mix.json"
-        },
-        "spinner": {
-          "status": "unsupported",
-          "evidence": "declared",
-          "diagnostics": [
-            {
-              "code": "unsupported_slot_primitive",
-              "severity": "error",
-              "path": "spinner",
-              "message": "RemixSpinner has no neutral Mix protocol primitive."
-            }
-          ]
-        }
-      }
-    }
-  ],
-  "semantics": {
-    "role": "button",
-    "labelProperty": "label",
-    "enabledProperty": "enabled",
-    "loadingProperty": "loading"
-  },
-  "oracles": [
-    {
-      "theme": "light",
-      "image": "light/button.png",
-      "metadata": "light/button.json",
-      "evidence": "rendered"
-    },
-    {
-      "theme": "dark",
-      "image": "dark/button.png",
-      "metadata": "dark/button.json",
-      "evidence": "rendered"
-    }
-  ]
-}
diff --git a/atlas/fortal/dark/button.json b/atlas/fortal/dark/button.json
deleted file mode 100644
index 4400306b..00000000
--- a/atlas/fortal/dark/button.json
+++ /dev/null
@@ -1,324 +0,0 @@
-{
-  "schema": "mix_atlas/atlas/v1",
-  "component": "button",
-  "componentLabel": "Button",
-  "theme": "dark",
-  "themeLabel": "Dark",
-  "brightness": "dark",
-  "file": "button.png",
-  "rowAxes": [
-    {
-      "id": "variant",
-      "label": "Variant"
-    },
-    {
-      "id": "size",
-      "label": "Size"
-    }
-  ],
-  "rows": [
-    {
-      "id": "solid-size1",
-      "values": {
-        "variant": {
-          "id": "solid",
-          "label": "Solid"
-        },
-        "size": {
-          "id": "size1",
-          "label": "Size 1"
-        }
-      }
-    },
-    {
-      "id": "solid-size2",
-      "values": {
-        "variant": {
-          "id": "solid",
-          "label": "Solid"
-        },
-        "size": {
-          "id": "size2",
-          "label": "Size 2"
-        }
-      }
-    },
-    {
-      "id": "solid-size3",
-      "values": {
-        "variant": {
-          "id": "solid",
-          "label": "Solid"
-        },
-        "size": {
-          "id": "size3",
-          "label": "Size 3"
-        }
-      }
-    },
-    {
-      "id": "solid-size4",
-      "values": {
-        "variant": {
-          "id": "solid",
-          "label": "Solid"
-        },
-        "size": {
-          "id": "size4",
-          "label": "Size 4"
-        }
-      }
-    },
-    {
-      "id": "soft-size1",
-      "values": {
-        "variant": {
-          "id": "soft",
-          "label": "Soft"
-        },
-        "size": {
-          "id": "size1",
-          "label": "Size 1"
-        }
-      }
-    },
-    {
-      "id": "soft-size2",
-      "values": {
-        "variant": {
-          "id": "soft",
-          "label": "Soft"
-        },
-        "size": {
-          "id": "size2",
-          "label": "Size 2"
-        }
-      }
-    },
-    {
-      "id": "soft-size3",
-      "values": {
-        "variant": {
-          "id": "soft",
-          "label": "Soft"
-        },
-        "size": {
-          "id": "size3",
-          "label": "Size 3"
-        }
-      }
-    },
-    {
-      "id": "soft-size4",
-      "values": {
-        "variant": {
-          "id": "soft",
-          "label": "Soft"
-        },
-        "size": {
-          "id": "size4",
-          "label": "Size 4"
-        }
-      }
-    },
-    {
-      "id": "surface-size1",
-      "values": {
-        "variant": {
-          "id": "surface",
-          "label": "Surface"
-        },
-        "size": {
-          "id": "size1",
-          "label": "Size 1"
-        }
-      }
-    },
-    {
-      "id": "surface-size2",
-      "values": {
-        "variant": {
-          "id": "surface",
-          "label": "Surface"
-        },
-        "size": {
-          "id": "size2",
-          "label": "Size 2"
-        }
-      }
-    },
-    {
-      "id": "surface-size3",
-      "values": {
-        "variant": {
-          "id": "surface",
-          "label": "Surface"
-        },
-        "size": {
-          "id": "size3",
-          "label": "Size 3"
-        }
-      }
-    },
-    {
-      "id": "surface-size4",
-      "values": {
-        "variant": {
-          "id": "surface",
-          "label": "Surface"
-        },
-        "size": {
-          "id": "size4",
-          "label": "Size 4"
-        }
-      }
-    },
-    {
-      "id": "outline-size1",
-      "values": {
-        "variant": {
-          "id": "outline",
-          "label": "Outline"
-        },
-        "size": {
-          "id": "size1",
-          "label": "Size 1"
-        }
-      }
-    },
-    {
-      "id": "outline-size2",
-      "values": {
-        "variant": {
-          "id": "outline",
-          "label": "Outline"
-        },
-        "size": {
-          "id": "size2",
-          "label": "Size 2"
-        }
-      }
-    },
-    {
-      "id": "outline-size3",
-      "values": {
-        "variant": {
-          "id": "outline",
-          "label": "Outline"
-        },
-        "size": {
-          "id": "size3",
-          "label": "Size 3"
-        }
-      }
-    },
-    {
-      "id": "outline-size4",
-      "values": {
-        "variant": {
-          "id": "outline",
-          "label": "Outline"
-        },
-        "size": {
-          "id": "size4",
-          "label": "Size 4"
-        }
-      }
-    },
-    {
-      "id": "ghost-size1",
-      "values": {
-        "variant": {
-          "id": "ghost",
-          "label": "Ghost"
-        },
-        "size": {
-          "id": "size1",
-          "label": "Size 1"
-        }
-      }
-    },
-    {
-      "id": "ghost-size2",
-      "values": {
-        "variant": {
-          "id": "ghost",
-          "label": "Ghost"
-        },
-        "size": {
-          "id": "size2",
-          "label": "Size 2"
-        }
-      }
-    },
-    {
-      "id": "ghost-size3",
-      "values": {
-        "variant": {
-          "id": "ghost",
-          "label": "Ghost"
-        },
-        "size": {
-          "id": "size3",
-          "label": "Size 3"
-        }
-      }
-    },
-    {
-      "id": "ghost-size4",
-      "values": {
-        "variant": {
-          "id": "ghost",
-          "label": "Ghost"
-        },
-        "size": {
-          "id": "size4",
-          "label": "Size 4"
-        }
-      }
-    }
-  ],
-  "columns": [
-    {
-      "id": "default",
-      "states": [],
-      "props": {}
-    },
-    {
-      "id": "hovered",
-      "states": [
-        "hovered"
-      ],
-      "props": {}
-    },
-    {
-      "id": "pressed",
-      "states": [
-        "pressed"
-      ],
-      "props": {}
-    },
-    {
-      "id": "focused",
-      "states": [
-        "focused"
-      ],
-      "props": {}
-    },
-    {
-      "id": "disabled",
-      "states": [
-        "disabled"
-      ],
-      "props": {}
-    },
-    {
-      "id": "loading",
-      "label": "Loading",
-      "states": [],
-      "props": {
-        "loading": true
-      }
-    }
-  ]
-}
diff --git a/atlas/fortal/dark/button.png b/atlas/fortal/dark/button.png
deleted file mode 100644
index 5a80d256..00000000
Binary files a/atlas/fortal/dark/button.png and /dev/null differ
diff --git a/atlas/fortal/light/button.json b/atlas/fortal/light/button.json
deleted file mode 100644
index 0f62c9d7..00000000
--- a/atlas/fortal/light/button.json
+++ /dev/null
@@ -1,324 +0,0 @@
-{
-  "schema": "mix_atlas/atlas/v1",
-  "component": "button",
-  "componentLabel": "Button",
-  "theme": "light",
-  "themeLabel": "Light",
-  "brightness": "light",
-  "file": "button.png",
-  "rowAxes": [
-    {
-      "id": "variant",
-      "label": "Variant"
-    },
-    {
-      "id": "size",
-      "label": "Size"
-    }
-  ],
-  "rows": [
-    {
-      "id": "solid-size1",
-      "values": {
-        "variant": {
-          "id": "solid",
-          "label": "Solid"
-        },
-        "size": {
-          "id": "size1",
-          "label": "Size 1"
-        }
-      }
-    },
-    {
-      "id": "solid-size2",
-      "values": {
-        "variant": {
-          "id": "solid",
-          "label": "Solid"
-        },
-        "size": {
-          "id": "size2",
-          "label": "Size 2"
-        }
-      }
-    },
-    {
-      "id": "solid-size3",
-      "values": {
-        "variant": {
-          "id": "solid",
-          "label": "Solid"
-        },
-        "size": {
-          "id": "size3",
-          "label": "Size 3"
-        }
-      }
-    },
-    {
-      "id": "solid-size4",
-      "values": {
-        "variant": {
-          "id": "solid",
-          "label": "Solid"
-        },
-        "size": {
-          "id": "size4",
-          "label": "Size 4"
-        }
-      }
-    },
-    {
-      "id": "soft-size1",
-      "values": {
-        "variant": {
-          "id": "soft",
-          "label": "Soft"
-        },
-        "size": {
-          "id": "size1",
-          "label": "Size 1"
-        }
-      }
-    },
-    {
-      "id": "soft-size2",
-      "values": {
-        "variant": {
-          "id": "soft",
-          "label": "Soft"
-        },
-        "size": {
-          "id": "size2",
-          "label": "Size 2"
-        }
-      }
-    },
-    {
-      "id": "soft-size3",
-      "values": {
-        "variant": {
-          "id": "soft",
-          "label": "Soft"
-        },
-        "size": {
-          "id": "size3",
-          "label": "Size 3"
-        }
-      }
-    },
-    {
-      "id": "soft-size4",
-      "values": {
-        "variant": {
-          "id": "soft",
-          "label": "Soft"
-        },
-        "size": {
-          "id": "size4",
-          "label": "Size 4"
-        }
-      }
-    },
-    {
-      "id": "surface-size1",
-      "values": {
-        "variant": {
-          "id": "surface",
-          "label": "Surface"
-        },
-        "size": {
-          "id": "size1",
-          "label": "Size 1"
-        }
-      }
-    },
-    {
-      "id": "surface-size2",
-      "values": {
-        "variant": {
-          "id": "surface",
-          "label": "Surface"
-        },
-        "size": {
-          "id": "size2",
-          "label": "Size 2"
-        }
-      }
-    },
-    {
-      "id": "surface-size3",
-      "values": {
-        "variant": {
-          "id": "surface",
-          "label": "Surface"
-        },
-        "size": {
-          "id": "size3",
-          "label": "Size 3"
-        }
-      }
-    },
-    {
-      "id": "surface-size4",
-      "values": {
-        "variant": {
-          "id": "surface",
-          "label": "Surface"
-        },
-        "size": {
-          "id": "size4",
-          "label": "Size 4"
-        }
-      }
-    },
-    {
-      "id": "outline-size1",
-      "values": {
-        "variant": {
-          "id": "outline",
-          "label": "Outline"
-        },
-        "size": {
-          "id": "size1",
-          "label": "Size 1"
-        }
-      }
-    },
-    {
-      "id": "outline-size2",
-      "values": {
-        "variant": {
-          "id": "outline",
-          "label": "Outline"
-        },
-        "size": {
-          "id": "size2",
-          "label": "Size 2"
-        }
-      }
-    },
-    {
-      "id": "outline-size3",
-      "values": {
-        "variant": {
-          "id": "outline",
-          "label": "Outline"
-        },
-        "size": {
-          "id": "size3",
-          "label": "Size 3"
-        }
-      }
-    },
-    {
-      "id": "outline-size4",
-      "values": {
-        "variant": {
-          "id": "outline",
-          "label": "Outline"
-        },
-        "size": {
-          "id": "size4",
-          "label": "Size 4"
-        }
-      }
-    },
-    {
-      "id": "ghost-size1",
-      "values": {
-        "variant": {
-          "id": "ghost",
-          "label": "Ghost"
-        },
-        "size": {
-          "id": "size1",
-          "label": "Size 1"
-        }
-      }
-    },
-    {
-      "id": "ghost-size2",
-      "values": {
-        "variant": {
-          "id": "ghost",
-          "label": "Ghost"
-        },
-        "size": {
-          "id": "size2",
-          "label": "Size 2"
-        }
-      }
-    },
-    {
-      "id": "ghost-size3",
-      "values": {
-        "variant": {
-          "id": "ghost",
-          "label": "Ghost"
-        },
-        "size": {
-          "id": "size3",
-          "label": "Size 3"
-        }
-      }
-    },
-    {
-      "id": "ghost-size4",
-      "values": {
-        "variant": {
-          "id": "ghost",
-          "label": "Ghost"
-        },
-        "size": {
-          "id": "size4",
-          "label": "Size 4"
-        }
-      }
-    }
-  ],
-  "columns": [
-    {
-      "id": "default",
-      "states": [],
-      "props": {}
-    },
-    {
-      "id": "hovered",
-      "states": [
-        "hovered"
-      ],
-      "props": {}
-    },
-    {
-      "id": "pressed",
-      "states": [
-        "pressed"
-      ],
-      "props": {}
-    },
-    {
-      "id": "focused",
-      "states": [
-        "focused"
-      ],
-      "props": {}
-    },
-    {
-      "id": "disabled",
-      "states": [
-        "disabled"
-      ],
-      "props": {}
-    },
-    {
-      "id": "loading",
-      "label": "Loading",
-      "states": [],
-      "props": {
-        "loading": true
-      }
-    }
-  ]
-}
diff --git a/atlas/fortal/light/button.png b/atlas/fortal/light/button.png
deleted file mode 100644
index 385c08cd..00000000
Binary files a/atlas/fortal/light/button.png and /dev/null differ
diff --git a/atlas/fortal/protocol/coverage.json b/atlas/fortal/protocol/coverage.json
deleted file mode 100644
index b7454864..00000000
--- a/atlas/fortal/protocol/coverage.json
+++ /dev/null
@@ -1,222 +0,0 @@
-{
-  "schema": "mix_atlas/protocol-coverage/v1",
-  "mixProtocolVersion": "1.0.0",
-  "mixProtocolFormat": 1,
-  "themes": [
-    {
-      "id": "dark",
-      "status": "supported",
-      "tokenCount": 111,
-      "rawStatus": "failed",
-      "captureTransform": "concretizeBoxShadowColorTokenReferences",
-      "rawDiagnostics": [
-        {
-          "code": "constraint_violation",
-          "severity": "error",
-          "path": "/boxShadows/fortal.shadow.1",
-          "message": "Theme token values must be concrete; token references are only allowed as same-kind whole-value aliases in theme JSON.",
-          "value": "MixProtocolTokenReference(colors, fortal.gray.a6)"
-        },
-        {
-          "code": "constraint_violation",
-          "severity": "error",
-          "path": "/boxShadows/fortal.shadow.2",
-          "message": "Theme token values must be concrete; token references are only allowed as same-kind whole-value aliases in theme JSON.",
-          "value": "MixProtocolTokenReference(colors, fortal.shadow.stroke)"
-        },
-        {
-          "code": "constraint_violation",
-          "severity": "error",
-          "path": "/boxShadows/fortal.shadow.3",
-          "message": "Theme token values must be concrete; token references are only allowed as same-kind whole-value aliases in theme JSON.",
-          "value": "MixProtocolTokenReference(colors, fortal.shadow.stroke)"
-        },
-        {
-          "code": "constraint_violation",
-          "severity": "error",
-          "path": "/boxShadows/fortal.shadow.4",
-          "message": "Theme token values must be concrete; token references are only allowed as same-kind whole-value aliases in theme JSON.",
-          "value": "MixProtocolTokenReference(colors, fortal.shadow.stroke)"
-        },
-        {
-          "code": "constraint_violation",
-          "severity": "error",
-          "path": "/boxShadows/fortal.shadow.5",
-          "message": "Theme token values must be concrete; token references are only allowed as same-kind whole-value aliases in theme JSON.",
-          "value": "MixProtocolTokenReference(colors, fortal.shadow.stroke)"
-        },
-        {
-          "code": "constraint_violation",
-          "severity": "error",
-          "path": "/boxShadows/fortal.shadow.6",
-          "message": "Theme token values must be concrete; token references are only allowed as same-kind whole-value aliases in theme JSON.",
-          "value": "MixProtocolTokenReference(colors, fortal.shadow.stroke)"
-        }
-      ]
-    },
-    {
-      "id": "light",
-      "status": "supported",
-      "tokenCount": 111,
-      "rawStatus": "failed",
-      "captureTransform": "concretizeBoxShadowColorTokenReferences",
-      "rawDiagnostics": [
-        {
-          "code": "constraint_violation",
-          "severity": "error",
-          "path": "/boxShadows/fortal.shadow.1",
-          "message": "Theme token values must be concrete; token references are only allowed as same-kind whole-value aliases in theme JSON.",
-          "value": "MixProtocolTokenReference(colors, fortal.gray.a6)"
-        },
-        {
-          "code": "constraint_violation",
-          "severity": "error",
-          "path": "/boxShadows/fortal.shadow.2",
-          "message": "Theme token values must be concrete; token references are only allowed as same-kind whole-value aliases in theme JSON.",
-          "value": "MixProtocolTokenReference(colors, fortal.shadow.stroke)"
-        },
-        {
-          "code": "constraint_violation",
-          "severity": "error",
-          "path": "/boxShadows/fortal.shadow.3",
-          "message": "Theme token values must be concrete; token references are only allowed as same-kind whole-value aliases in theme JSON.",
-          "value": "MixProtocolTokenReference(colors, fortal.shadow.stroke)"
-        },
-        {
-          "code": "constraint_violation",
-          "severity": "error",
-          "path": "/boxShadows/fortal.shadow.4",
-          "message": "Theme token values must be concrete; token references are only allowed as same-kind whole-value aliases in theme JSON.",
-          "value": "MixProtocolTokenReference(colors, fortal.shadow.stroke)"
-        },
-        {
-          "code": "constraint_violation",
-          "severity": "error",
-          "path": "/boxShadows/fortal.shadow.5",
-          "message": "Theme token values must be concrete; token references are only allowed as same-kind whole-value aliases in theme JSON.",
-          "value": "MixProtocolTokenReference(colors, fortal.shadow.stroke)"
-        },
-        {
-          "code": "constraint_violation",
-          "severity": "error",
-          "path": "/boxShadows/fortal.shadow.6",
-          "message": "Theme token values must be concrete; token references are only allowed as same-kind whole-value aliases in theme JSON.",
-          "value": "MixProtocolTokenReference(colors, fortal.shadow.stroke)"
-        }
-      ]
-    }
-  ],
-  "styles": [
-    {
-      "id": "fortal-tokenized-flex-box-fixture",
-      "runtimeType": "FlexBoxStyler",
-      "status": "supported",
-      "tokenReferences": [
-        {
-          "kind": "colors",
-          "name": "fortal.accent.9"
-        },
-        {
-          "kind": "spaces",
-          "name": "fortal.space.2"
-        },
-        {
-          "kind": "spaces",
-          "name": "fortal.space.3"
-        }
-      ]
-    },
-    {
-      "id": "fortal-tokenized-flex-box-fluent",
-      "runtimeType": "FlexBoxStyler",
-      "status": "supported",
-      "tokenReferences": [
-        {
-          "kind": "colors",
-          "name": "fortal.accent.9"
-        },
-        {
-          "kind": "spaces",
-          "name": "fortal.space.2"
-        },
-        {
-          "kind": "spaces",
-          "name": "fortal.space.3"
-        }
-      ]
-    },
-    {
-      "id": "fortal-button-portable",
-      "runtimeType": "ButtonStyler projection",
-      "status": "partial",
-      "recipeCount": 20,
-      "totalMatrixCells": 240,
-      "nonLoadingCells": 200,
-      "loadingUnsupportedCells": 40,
-      "supportedContainerRecipes": 20,
-      "diagnostics": [
-        {
-          "code": "unsupported_slot_primitive",
-          "severity": "error",
-          "path": "spinner",
-          "message": "RemixSpinner has no neutral Mix protocol primitive."
-        }
-      ]
-    },
-    {
-      "id": "fortal-button",
-      "runtimeType": "ButtonStyler",
-      "status": "unsupported",
-      "diagnostics": [
-        {
-          "code": "unsupported_encode_value",
-          "severity": "error",
-          "path": "",
-          "message": "Expected box, got ButtonStyler."
-        },
-        {
-          "code": "unsupported_encode_value",
-          "severity": "error",
-          "path": "",
-          "message": "Expected text, got ButtonStyler."
-        },
-        {
-          "code": "unsupported_encode_value",
-          "severity": "error",
-          "path": "",
-          "message": "Expected flex, got ButtonStyler."
-        },
-        {
-          "code": "unsupported_encode_value",
-          "severity": "error",
-          "path": "",
-          "message": "Expected stack, got ButtonStyler."
-        },
-        {
-          "code": "unsupported_encode_value",
-          "severity": "error",
-          "path": "",
-          "message": "Expected icon, got ButtonStyler."
-        },
-        {
-          "code": "unsupported_encode_value",
-          "severity": "error",
-          "path": "",
-          "message": "Expected image, got ButtonStyler."
-        },
-        {
-          "code": "unsupported_encode_value",
-          "severity": "error",
-          "path": "",
-          "message": "Expected flex_box, got ButtonStyler."
-        },
-        {
-          "code": "unsupported_encode_value",
-          "severity": "error",
-          "path": "",
-          "message": "Expected stack_box, got ButtonStyler."
-        }
-      ]
-    }
-  ]
-}
diff --git a/atlas/fortal/protocol/fixtures/fortal-tokenized-flex-box.mix.json b/atlas/fortal/protocol/fixtures/fortal-tokenized-flex-box.mix.json
deleted file mode 100644
index 0f7d4698..00000000
--- a/atlas/fortal/protocol/fixtures/fortal-tokenized-flex-box.mix.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "type": "flex_box",
-  "padding": {
-    "$token": "fortal.space.3",
-    "kind": "space"
-  },
-  "decoration": {
-    "color": {
-      "$token": "fortal.accent.9"
-    }
-  },
-  "spacing": {
-    "$token": "fortal.space.2",
-    "kind": "space"
-  },
-  "v": 1
-}
diff --git a/atlas/fortal/styles/button/ghost-size1/container.mix.json b/atlas/fortal/styles/button/ghost-size1/container.mix.json
deleted file mode 100644
index 5eda2cc8..00000000
--- a/atlas/fortal/styles/button/ghost-size1/container.mix.json
+++ /dev/null
@@ -1,118 +0,0 @@
-{
-  "type": "flex_box",
-  "padding": {
-    "$merge": [
-      {
-        "left": {
-          "$token": "fortal.space.2",
-          "kind": "space"
-        },
-        "right": {
-          "$token": "fortal.space.2",
-          "kind": "space"
-        }
-      },
-      {
-        "top": {
-          "$token": "fortal.space.1",
-          "kind": "space"
-        },
-        "bottom": {
-          "$token": "fortal.space.1",
-          "kind": "space"
-        }
-      }
-    ]
-  },
-  "decoration": {
-    "$merge": [
-      {
-        "borderRadius": {
-          "$token": "fortal.radius.2"
-        }
-      },
-      {
-        "color": "#00000000"
-      }
-    ]
-  },
-  "mainAxisSize": "min",
-  "spacing": {
-    "$token": "fortal.space.1",
-    "kind": "space"
-  },
-  "variants": [
-    {
-      "kind": "widget_state",
-      "state": "focused",
-      "style": {
-        "type": "flex_box",
-        "decoration": {
-          "border": {
-            "top": {
-              "color": {
-                "$token": "fortal.focus.a8"
-              },
-              "width": {
-                "$token": "fortal.focus.ring.width",
-                "kind": "space"
-              }
-            },
-            "right": {
-              "color": {
-                "$token": "fortal.focus.a8"
-              },
-              "width": {
-                "$token": "fortal.focus.ring.width",
-                "kind": "space"
-              }
-            },
-            "bottom": {
-              "color": {
-                "$token": "fortal.focus.a8"
-              },
-              "width": {
-                "$token": "fortal.focus.ring.width",
-                "kind": "space"
-              }
-            },
-            "left": {
-              "color": {
-                "$token": "fortal.focus.a8"
-              },
-              "width": {
-                "$token": "fortal.focus.ring.width",
-                "kind": "space"
-              }
-            }
-          }
-        }
-      }
-    },
-    {
-      "kind": "widget_state",
-      "state": "hovered",
-      "style": {
-        "type": "flex_box",
-        "decoration": {
-          "color": {
-            "$token": "fortal.accent.a3"
-          }
-        }
-      }
-    },
-    {
-      "kind": "widget_state",
-      "state": "pressed",
-      "style": {
-        "type": "flex_box",
-        "decoration": {
-          "color": {
-            "$token": "fortal.accent.a4"
-          }
-        }
-      }
-    }
-  ],
-  "v": 1
-}
diff --git a/atlas/fortal/styles/button/ghost-size1/icon.mix.json b/atlas/fortal/styles/button/ghost-size1/icon.mix.json
deleted file mode 100644
index 81d43605..00000000
--- a/atlas/fortal/styles/button/ghost-size1/icon.mix.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "type": "icon",
-  "color": {
-    "$token": "fortal.accent.11"
-  },
-  "size": 12.0,
-  "variants": [
-    {
-      "kind": "widget_state",
-      "state": "disabled",
-      "style": {
-        "type": "icon",
-        "color": {
-          "$token": "fortal.gray.8"
-        }
-      }
-    }
-  ],
-  "v": 1
-}
diff --git a/atlas/fortal/styles/button/ghost-size1/label.mix.json b/atlas/fortal/styles/button/ghost-size1/label.mix.json
deleted file mode 100644
index e23fe275..00000000
--- a/atlas/fortal/styles/button/ghost-size1/label.mix.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-  "type": "text",
-  "style": {
-    "$merge": [
-      {
-        "fontWeight": {
-          "$token": "fortal.font.weight.medium"
-        }
-      },
-      {
-        "fontSize": 12.0
-      },
-      {
-        "height": 1.3333333333333333
-      },
-      {
-        "letterSpacing": 0.0025
-      },
-      {
-        "color": {
-          "$token": "fortal.accent.11"
-        }
-      }
-    ]
-  },
-  "variants": [
-    {
-      "kind": "widget_state",
-      "state": "disabled",
-      "style": {
-        "type": "text",
-        "style": {
-          "color": {
-            "$token": "fortal.gray.8"
-          }
-        }
-      }
-    }
-  ],
-  "v": 1
-}
diff --git a/atlas/fortal/styles/button/ghost-size2/container.mix.json b/atlas/fortal/styles/button/ghost-size2/container.mix.json
deleted file mode 100644
index 12b319e1..00000000
--- a/atlas/fortal/styles/button/ghost-size2/container.mix.json
+++ /dev/null
@@ -1,118 +0,0 @@
-{
-  "type": "flex_box",
-  "padding": {
-    "$merge": [
-      {
-        "left": {
-          "$token": "fortal.space.3",
-          "kind": "space"
-        },
-        "right": {
-          "$token": "fortal.space.3",
-          "kind": "space"
-        }
-      },
-      {
-        "top": {
-          "$token": "fortal.space.2",
-          "kind": "space"
-        },
-        "bottom": {
-          "$token": "fortal.space.2",
-          "kind": "space"
-        }
-      }
-    ]
-  },
-  "decoration": {
-    "$merge": [
-      {
-        "borderRadius": {
-          "$token": "fortal.radius.3"
-        }
-      },
-      {
-        "color": "#00000000"
-      }
-    ]
-  },
-  "mainAxisSize": "min",
-  "spacing": {
-    "$token": "fortal.space.2",
-    "kind": "space"
-  },
-  "variants": [
-    {
-      "kind": "widget_state",
-      "state": "focused",
-      "style": {
-        "type": "flex_box",
-        "decoration": {
-          "border": {
-            "top": {
-              "color": {
-                "$token": "fortal.focus.a8"
-              },
-              "width": {
-                "$token": "fortal.focus.ring.width",
-                "kind": "space"
-              }
-            },
-            "right": {
-              "color": {
-                "$token": "fortal.focus.a8"
-              },
-              "width": {
-                "$token": "fortal.focus.ring.width",
-                "kind": "space"
-              }
-            },
-            "bottom": {
-              "color": {
-                "$token": "fortal.focus.a8"
-              },
-              "width": {
-                "$token": "fortal.focus.ring.width",
-                "kind": "space"
-              }
-            },
-            "left": {
-              "color": {
-                "$token": "fortal.focus.a8"
-              },
-              "width": {
-                "$token": "fortal.focus.ring.width",
-                "kind": "space"
-              }
-            }
-          }
-        }
-      }
-    },
-    {
-      "kind": "widget_state",
-      "state": "hovered",
-      "style": {
-        "type": "flex_box",
-        "decoration": {
-          "color": {
-            "$token": "fortal.accent.a3"
-          }
-        }
-      }
-    },
-    {
-      "kind": "widget_state",
-      "state": "pressed",
-      "style": {
-        "type": "flex_box",
-        "decoration": {
-          "color": {
-            "$token": "fortal.accent.a4"
-          }
-        }
-      }
-    }
-  ],
-  "v": 1
-}
diff --git a/atlas/fortal/styles/button/ghost-size2/icon.mix.json b/atlas/fortal/styles/button/ghost-size2/icon.mix.json
deleted file mode 100644
index ce290453..00000000
--- a/atlas/fortal/styles/button/ghost-size2/icon.mix.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "type": "icon",
-  "color": {
-    "$token": "fortal.accent.11"
-  },
-  "size": 16.0,
-  "variants": [
-    {
-      "kind": "widget_state",
-      "state": "disabled",
-      "style": {
-        "type": "icon",
-        "color": {
-          "$token": "fortal.gray.8"
-        }
-      }
-    }
-  ],
-  "v": 1
-}
diff --git a/atlas/fortal/styles/button/ghost-size2/label.mix.json b/atlas/fortal/styles/button/ghost-size2/label.mix.json
deleted file mode 100644
index 0bcb9265..00000000
--- a/atlas/fortal/styles/button/ghost-size2/label.mix.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-  "type": "text",
-  "style": {
-    "$merge": [
-      {
-        "fontWeight": {
-          "$token": "fortal.font.weight.medium"
-        }
-      },
-      {
-        "fontSize": 14.0
-      },
-      {
-        "height": 1.4285714285714286
-      },
-      {
-        "letterSpacing": 0.0
-      },
-      {
-        "color": {
-          "$token": "fortal.accent.11"
-        }
-      }
-    ]
-  },
-  "variants": [
-    {
-      "kind": "widget_state",
-      "state": "disabled",
-      "style": {
-        "type": "text",
-        "style": {
-          "color": {
-            "$token": "fortal.gray.8"
-          }
-        }
-      }
-    }
-  ],
-  "v": 1
-}
diff --git a/atlas/fortal/styles/button/ghost-size3/container.mix.json b/atlas/fortal/styles/button/ghost-size3/container.mix.json
deleted file mode 100644
index 1fd98edf..00000000
--- a/atlas/fortal/styles/button/ghost-size3/container.mix.json
+++ /dev/null
@@ -1,118 +0,0 @@
-{
-  "type": "flex_box",
-  "padding": {
-    "$merge": [
-      {
-        "left": {
-          "$token": "fortal.space.4",
-          "kind": "space"
-        },
-        "right": {
-          "$token": "fortal.space.4",
-          "kind": "space"
-        }
-      },
-      {
-        "top": {
-          "$token": "fortal.space.3",
-          "kind": "space"
-        },
-        "bottom": {
-          "$token": "fortal.space.3",
-          "kind": "space"
-        }
-      }
-    ]
-  },
-  "decoration": {
-    "$merge": [
-      {
-        "borderRadius": {
-          "$token": "fortal.radius.4"
-        }
-      },
-      {
-        "color": "#00000000"
-      }
-    ]
-  },
-  "mainAxisSize": "min",
-  "spacing": {
-    "$token": "fortal.space.3",
-    "kind": "space"
-  },
-  "variants": [
-    {
-      "kind": "widget_state",
-      "state": "focused",
-      "style": {
-        "type": "flex_box",
-        "decoration": {
-          "border": {
-            "top": {
-              "color": {
-                "$token": "fortal.focus.a8"
-              },
-              "width": {
-                "$token": "fortal.focus.ring.width",
-                "kind": "space"
-              }
-            },
-            "right": {
-              "color": {
-                "$token": "fortal.focus.a8"
-              },
-              "width": {
-                "$token": "fortal.focus.ring.width",
-                "kind": "space"
-              }
-            },
-            "bottom": {
-              "color": {
-                "$token": "fortal.focus.a8"
-              },
-              "width": {
-                "$token": "fortal.focus.ring.width",
-                "kind": "space"
-              }
-            },
-            "left": {
-              "color": {
-                "$token": "fortal.focus.a8"
-              },
-              "width": {
-                "$token": "fortal.focus.ring.width",
-                "kind": "space"
-              }
-            }
-          }
-        }
-      }
-    },
-    {
-      "kind": "widget_state",
-      "state": "hovered",
-      "style": {
-        "type": "flex_box",
-        "decoration": {
-          "color": {
-            "$token": "fortal.accent.a3"
-          }
-        }
-      }
-    },
-    {
-      "kind": "widget_state",
-      "state": "pressed",
-      "style": {
-        "type": "flex_box",
-        "decoration": {
-          "color": {
-            "$token": "fortal.accent.a4"
-          }
-        }
-      }
-    }
-  ],
-  "v": 1
-}
diff --git a/atlas/fortal/styles/button/ghost-size3/icon.mix.json b/atlas/fortal/styles/button/ghost-size3/icon.mix.json
deleted file mode 100644
index 3aa7436b..00000000
--- a/atlas/fortal/styles/button/ghost-size3/icon.mix.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "type": "icon",
-  "color": {
-    "$token": "fortal.accent.11"
-  },
-  "size": 20.0,
-  "variants": [
-    {
-      "kind": "widget_state",
-      "state": "disabled",
-      "style": {
-        "type": "icon",
-        "color": {
-          "$token": "fortal.gray.8"
-        }
-      }
-    }
-  ],
-  "v": 1
-}
diff --git a/atlas/fortal/styles/button/ghost-size3/label.mix.json b/atlas/fortal/styles/button/ghost-size3/label.mix.json
deleted file mode 100644
index d473b197..00000000
--- a/atlas/fortal/styles/button/ghost-size3/label.mix.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-  "type": "text",
-  "style": {
-    "$merge": [
-      {
-        "fontWeight": {
-          "$token": "fortal.font.weight.medium"
-        }
-      },
-      {
-        "fontSize": 16.0
-      },
-      {
-        "height": 1.5
-      },
-      {
-        "letterSpacing": 0.0
-      },
-      {
-        "color": {
-          "$token": "fortal.accent.11"
-        }
-      }
-    ]
-  },
-  "variants": [
-    {
-      "kind": "widget_state",
-      "state": "disabled",
-      "style": {
-        "type": "text",
-        "style": {
-          "color": {
-            "$token": "fortal.gray.8"
-          }
-        }
-      }
-    }
-  ],
-  "v": 1
-}
diff --git a/atlas/fortal/styles/button/ghost-size4/container.mix.json b/atlas/fortal/styles/button/ghost-size4/container.mix.json
deleted file mode 100644
index 0c1eec3f..00000000
--- a/atlas/fortal/styles/button/ghost-size4/container.mix.json
+++ /dev/null
@@ -1,118 +0,0 @@
-{
-  "type": "flex_box",
-  "padding": {
-    "$merge": [
-      {
-        "left": {
-          "$token": "fortal.space.5",
-          "kind": "space"
-        },
-        "right": {
-          "$token": "fortal.space.5",
-          "kind": "space"
-        }
-      },
-      {
-        "top": {
-          "$token": "fortal.space.4",
-          "kind": "space"
-        },
-        "bottom": {
-          "$token": "fortal.space.4",
-          "kind": "space"
-        }
-      }
-    ]
-  },
-  "decoration": {
-    "$merge": [
-      {
-        "borderRadius": {
-          "$token": "fortal.radius.5"
-        }
-      },
-      {
-        "color": "#00000000"
-      }
-    ]
-  },
-  "mainAxisSize": "min",
-  "spacing": {
-    "$token": "fortal.space.4",
-    "kind": "space"
-  },
-  "variants": [
-    {
-      "kind": "widget_state",
-      "state": "focused",
-      "style": {
-        "type": "flex_box",
-        "decoration": {
-          "border": {
-            "top": {
-              "color": {
-                "$token": "fortal.focus.a8"
-              },
-              "width": {
-                "$token": "fortal.focus.ring.width",
-                "kind": "space"
-              }
-            },
-            "right": {
-              "color": {
-                "$token": "fortal.focus.a8"
-              },
-              "width": {
-                "$token": "fortal.focus.ring.width",
-                "kind": "space"
-              }
-            },
-            "bottom": {
-              "color": {
-                "$token": "fortal.focus.a8"
-              },
-              "width": {
-                "$token": "fortal.focus.ring.width",
-                "kind": "space"
-              }
-            },
-            "left": {
-              "color": {
-                "$token": "fortal.focus.a8"
-              },
-              "width": {
-                "$token": "fortal.focus.ring.width",
-                "kind": "space"
-              }
-            }
-          }
-        }
-      }
-    },
-    {
-      "kind": "widget_state",
-      "state": "hovered",
-      "style": {
-        "type": "flex_box",
-        "decoration": {
-          "color": {
-            "$token": "fortal.accent.a3"
-          }
-        }
-      }
-    },
-    {
-      "kind": "widget_state",
-      "state": "pressed",
-      "style": {
-        "type": "flex_box",
-        "decoration": {
-          "color": {
-            "$token": "fortal.accent.a4"
-          }
-        }
-      }
-    }
-  ],
-  "v": 1
-}
diff --git a/atlas/fortal/styles/button/ghost-size4/icon.mix.json b/atlas/fortal/styles/button/ghost-size4/icon.mix.json
deleted file mode 100644
index f3867e47..00000000
--- a/atlas/fortal/styles/button/ghost-size4/icon.mix.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "type": "icon",
-  "color": {
-    "$token": "fortal.accent.11"
-  },
-  "size": 24.0,
-  "variants": [
-    {
-      "kind": "widget_state",
-      "state": "disabled",
-      "style": {
-        "type": "icon",
-        "color": {
-          "$token": "fortal.gray.8"
-        }
-      }
-    }
-  ],
-  "v": 1
-}
diff --git a/atlas/fortal/styles/button/ghost-size4/label.mix.json b/atlas/fortal/styles/button/ghost-size4/label.mix.json
deleted file mode 100644
index a07c6afc..00000000
--- a/atlas/fortal/styles/button/ghost-size4/label.mix.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-  "type": "text",
-  "style": {
-    "$merge": [
-      {
-        "fontWeight": {
-          "$token": "fortal.font.weight.medium"
-        }
-      },
-      {
-        "fontSize": 18.0
-      },
-      {
-        "height": 1.4444444444444444
-      },
-      {
-        "letterSpacing": -0.0025
-      },
-      {
-        "color": {
-          "$token": "fortal.accent.11"
-        }
-      }
-    ]
-  },
-  "variants": [
-    {
-      "kind": "widget_state",
-      "state": "disabled",
-      "style": {
-        "type": "text",
-        "style": {
-          "color": {
-            "$token": "fortal.gray.8"
-          }
-        }
-      }
-    }
-  ],
-  "v": 1
-}
diff --git a/atlas/fortal/styles/button/outline-size1/container.mix.json b/atlas/fortal/styles/button/outline-size1/container.mix.json
deleted file mode 100644
index 661fd50c..00000000
--- a/atlas/fortal/styles/button/outline-size1/container.mix.json
+++ /dev/null
@@ -1,221 +0,0 @@
-{
-  "type": "flex_box",
-  "padding": {
-    "$merge": [
-      {
-        "left": {
-          "$token": "fortal.space.2",
-          "kind": "space"
-        },
-        "right": {
-          "$token": "fortal.space.2",
-          "kind": "space"
-        }
-      },
-      {
-        "top": {
-          "$token": "fortal.space.1",
-          "kind": "space"
-        },
-        "bottom": {
-          "$token": "fortal.space.1",
-          "kind": "space"
-        }
-      }
-    ]
-  },
-  "decoration": {
-    "$merge": [
-      {
-        "borderRadius": {
-          "$token": "fortal.radius.2"
-        }
-      },
-      {
-        "color": "#00000000"
-      },
-      {
-        "border": {
-          "top": {
-            "color": {
-              "$token": "fortal.accent.7"
-            },
-            "width": {
-              "$token": "fortal.border.width.1",
-              "kind": "space"
-            }
-          },
-          "right": {
-            "color": {
-              "$token": "fortal.accent.7"
-            },
-            "width": {
-              "$token": "fortal.border.width.1",
-              "kind": "space"
-            }
-          },
-          "bottom": {
-            "color": {
-              "$token": "fortal.accent.7"
-            },
-            "width": {
-              "$token": "fortal.border.width.1",
-              "kind": "space"
-            }
-          },
-          "left": {
-            "color": {
-              "$token": "fortal.accent.7"
-            },
-            "width": {
-              "$token": "fortal.border.width.1",
-              "kind": "space"
-            }
-          }
-        }
-      }
-    ]
-  },
-  "mainAxisSize": "min",
-  "spacing": {
-    "$token": "fortal.space.1",
-    "kind": "space"
-  },
-  "variants": [
-    {
-      "kind": "widget_state",
-      "state": "focused",
-      "style": {
-        "type": "flex_box",
-        "decoration": {
-          "border": {
-            "top": {
-              "color": {
-                "$token": "fortal.focus.a8"
-              },
-              "width": {
-                "$token": "fortal.focus.ring.width",
-                "kind": "space"
-              }
-            },
-            "right": {
-              "color": {
-                "$token": "fortal.focus.a8"
-              },
-              "width": {
-                "$token": "fortal.focus.ring.width",
-                "kind": "space"
-              }
-            },
-            "bottom": {
-              "color": {
-                "$token": "fortal.focus.a8"
-              },
-              "width": {
-                "$token": "fortal.focus.ring.width",
-                "kind": "space"
-              }
-            },
-            "left": {
-              "color": {
-                "$token": "fortal.focus.a8"
-              },
-              "width": {
-                "$token": "fortal.focus.ring.width",
-                "kind": "space"
-              }
-            }
-          }
-        }
-      }
-    },
-    {
-      "kind": "widget_state",
-      "state": "hovered",
-      "style": {
-        "type": "flex_box",
-        "decoration": {
-          "$merge": [
-            {
-              "color": {
-                "$token": "fortal.accent.a2"
-              }
-            },
-            {
-              "border": {
-                "top": {
-                  "color": {
-                    "$token": "fortal.accent.8"
-                  },
-                  "width": {
-                    "$token": "fortal.border.width.1",
-                    "kind": "space"
-                  }
-                },
-                "right": {
-                  "color": {
-                    "$token": "fortal.accent.8"
-                  },
-                  "width": {
-                    "$token": "fortal.border.width.1",
-                    "kind": "space"
-                  }
-                },
-                "bottom": {
-                  "color": {
-                    "$token": "fortal.accent.8"
-                  },
-                  "width": {
-                    "$token": "fortal.border.width.1",
-                    "kind": "space"
-                  }
-                },
-                "left": {
-                  "color": {
-                    "$token": "fortal.accent.8"
-                  },
-                  "width": {
-                    "$token": "fortal.border.width.1",
-                    "kind": "space"
-                  }
-                }
-              }
-            }
-          ]
-        }
-      }
-    },
-    {
-      "kind": "widget_state",
-      "state": "disabled",
-      "style": {
-        "type": "flex_box",
-        "decoration": {
-          "border": {
-            "top": {
-              "color": {
-                "$token": "fortal.gray.5"
-              }
-            },
-            "right": {
-              "color": {
-                "$token": "fortal.gray.5"
-              }
-            },
-            "bottom": {
-              "color": {
-                "$token": "fortal.gray.5"
-              }
-            },
-            "left": {
-              "color": {
-                "$token": "fortal.gray.5"
-              }
-            }
-          }
-        }
-      }
-    }
-  ],
-  "v": 1
-}
diff --git a/atlas/fortal/styles/button/outline-size1/icon.mix.json b/atlas/fortal/styles/button/outline-size1/icon.mix.json
deleted file mode 100644
index 81d43605..00000000
--- a/atlas/fortal/styles/button/outline-size1/icon.mix.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "type": "icon",
-  "color": {
-    "$token": "fortal.accent.11"
-  },
-  "size": 12.0,
-  "variants": [
-    {
-      "kind": "widget_state",
-      "state": "disabled",
-      "style": {
-        "type": "icon",
-        "color": {
-          "$token": "fortal.gray.8"
-        }
-      }
-    }
-  ],
-  "v": 1
-}
diff --git a/atlas/fortal/styles/button/outline-size1/label.mix.json b/atlas/fortal/styles/button/outline-size1/label.mix.json
deleted file mode 100644
index e23fe275..00000000
--- a/atlas/fortal/styles/button/outline-size1/label.mix.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-  "type": "text",
-  "style": {
-    "$merge": [
-      {
-        "fontWeight": {
-          "$token": "fortal.font.weight.medium"
-        }
-      },
-      {
-        "fontSize": 12.0
-      },
-      {
-        "height": 1.3333333333333333
-      },
-      {
-        "letterSpacing": 0.0025
-      },
-      {
-        "color": {
-          "$token": "fortal.accent.11"
-        }
-      }
-    ]
-  },
-  "variants": [
-    {
-      "kind": "widget_state",
-      "state": "disabled",
-      "style": {
-        "type": "text",
-        "style": {
-          "color": {
-            "$token": "fortal.gray.8"
-          }
-        }
-      }
-    }
-  ],
-  "v": 1
-}
diff --git a/atlas/fortal/styles/button/outline-size2/container.mix.json b/atlas/fortal/styles/button/outline-size2/container.mix.json
deleted file mode 100644
index 7891535d..00000000
--- a/atlas/fortal/styles/button/outline-size2/container.mix.json
+++ /dev/null
@@ -1,221 +0,0 @@
-{
-  "type": "flex_box",
-  "padding": {
-    "$merge": [
-      {
-        "left": {
-          "$token": "fortal.space.3",
-          "kind": "space"
-        },
-        "right": {
-          "$token": "fortal.space.3",
-          "kind": "space"
-        }
-      },
-      {
-        "top": {
-          "$token": "fortal.space.2",
-          "kind": "space"
-        },
-        "bottom": {
-          "$token": "fortal.space.2",
-          "kind": "space"
-        }
-      }
-    ]
-  },
-  "decoration": {
-    "$merge": [
-      {
-        "borderRadius": {
-          "$token": "fortal.radius.3"
-        }
-      },
-      {
-        "color": "#00000000"
-      },
-      {
-        "border": {
-          "top": {
-            "color": {
-              "$token": "fortal.accent.7"
-            },
-            "width": {
-              "$token": "fortal.border.width.1",
-              "kind": "space"
-            }
-          },
-          "right": {
-            "color": {
-              "$token": "fortal.accent.7"
-            },
-            "width": {
-              "$token": "fortal.border.width.1",
-              "kind": "space"
-            }
-          },
-          "bottom": {
-            "color": {
-              "$token": "fortal.accent.7"
-            },
-            "width": {
-              "$token": "fortal.border.width.1",
-              "kind": "space"
-            }
-          },
-          "left": {
-            "color": {
-              "$token": "fortal.accent.7"
-            },
-            "width": {
-              "$token": "fortal.border.width.1",
-              "kind": "space"
-            }
-          }
-        }
-      }
-    ]
-  },
-  "mainAxisSize": "min",
-  "spacing": {
-    "$token": "fortal.space.2",
-    "kind": "space"
-  },
-  "variants": [
-    {
-      "kind": "widget_state",
-      "state": "focused",
-      "style": {
-        "type": "flex_box",
-        "decoration": {
-          "border": {
-            "top": {
-              "color": {
-                "$token": "fortal.focus.a8"
-              },
-              "width": {
-                "$token": "fortal.focus.ring.width",
-                "kind": "space"
-              }
-            },
-            "right": {
-              "color": {
-                "$token": "fortal.focus.a8"
-              },
-              "width": {
-                "$token": "fortal.focus.ring.width",
-                "kind": "space"
-              }
-            },
-            "bottom": {
-              "color": {
-                "$token": "fortal.focus.a8"
-              },
-              "width": {
-                "$token": "fortal.focus.ring.width",
-                "kind": "space"
-              }
-            },
-            "left": {
-              "color": {
-                "$token": "fortal.focus.a8"
-              },
-              "width": {
-                "$token": "fortal.focus.ring.width",
-                "kind": "space"
-              }
-            }
-          }
-        }
-      }
-    },
-    {
-      "kind": "widget_state",
-      "state": "hovered",
-      "style": {
-        "type": "flex_box",
-        "decoration": {
-          "$merge": [
-            {
-              "color": {
-                "$token": "fortal.accent.a2"
-              }
-            },
-            {
-              "border": {
-                "top": {
-                  "color": {
-                    "$token": "fortal.accent.8"
-                  },
-                  "width": {
-                    "$token": "fortal.border.width.1",
-                    "kind": "space"
-                  }
-                },
-                "right": {
-                  "color": {
-                    "$token": "fortal.accent.8"
-                  },
-                  "width": {
-                    "$token": "fortal.border.width.1",
-                    "kind": "space"
-                  }
-                },
-                "bottom": {
-                  "color": {
-                    "$token": "fortal.accent.8"
-                  },
-                  "width": {
-                    "$token": "fortal.border.width.1",
-                    "kind": "space"
-                  }
-                },
-                "left": {
-                  "color": {
-                    "$token": "fortal.accent.8"
-                  },
-                  "width": {
-                    "$token": "fortal.border.width.1",
-                    "kind": "space"
-                  }
-                }
-              }
-            }
-          ]
-        }
-      }
-    },
-    {
-      "kind": "widget_state",
-      "state": "disabled",
-      "style": {
-        "type": "flex_box",
-        "decoration": {
-          "border": {
-            "top": {
-              "color": {
-                "$token": "fortal.gray.5"
-              }
-            },
-            "right": {
-              "color": {
-                "$token": "fortal.gray.5"
-              }
-            },
-            "bottom": {
-              "color": {
-                "$token": "fortal.gray.5"
-              }
-            },
-            "left": {
-              "color": {
-                "$token": "fortal.gray.5"
-              }
-            }
-          }
-        }
-      }
-    }
-  ],
-  "v": 1
-}
diff --git a/atlas/fortal/styles/button/outline-size2/icon.mix.json b/atlas/fortal/styles/button/outline-size2/icon.mix.json
deleted file mode 100644
index ce290453..00000000
--- a/atlas/fortal/styles/button/outline-size2/icon.mix.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "type": "icon",
-  "color": {
-    "$token": "fortal.accent.11"
-  },
-  "size": 16.0,
-  "variants": [
-    {
-      "kind": "widget_state",
-      "state": "disabled",
-      "style": {
-        "type": "icon",
-        "color": {
-          "$token": "fortal.gray.8"
-        }
-      }
-    }
-  ],
-  "v": 1
-}
diff --git a/atlas/fortal/styles/button/outline-size2/label.mix.json b/atlas/fortal/styles/button/outline-size2/label.mix.json
deleted file mode 100644
index 0bcb9265..00000000
--- a/atlas/fortal/styles/button/outline-size2/label.mix.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-  "type": "text",
-  "style": {
-    "$merge": [
-      {
-        "fontWeight": {
-          "$token": "fortal.font.weight.medium"
-        }
-      },
-      {
-        "fontSize": 14.0
-      },
-      {
-        "height": 1.4285714285714286
-      },
-      {
-        "letterSpacing": 0.0
-      },
-      {
-        "color": {
-          "$token": "fortal.accent.11"
-        }
-      }
-    ]
-  },
-  "variants": [
-    {
-      "kind": "widget_state",
-      "state": "disabled",
-      "style": {
-        "type": "text",
-        "style": {
-          "color": {
-            "$token": "fortal.gray.8"
-          }
-        }
-      }
-    }
-  ],
-  "v": 1
-}
diff --git a/atlas/fortal/styles/button/outline-size3/container.mix.json b/atlas/fortal/styles/button/outline-size3/container.mix.json
deleted file mode 100644
index 6c7841f7..00000000
--- a/atlas/fortal/styles/button/outline-size3/container.mix.json
+++ /dev/null
@@ -1,221 +0,0 @@
-{
-  "type": "flex_box",
-  "padding": {
-    "$merge": [
-      {
-        "left": {
-          "$token": "fortal.space.4",
-          "kind": "space"
-        },
-        "right": {
-          "$token": "fortal.space.4",
-          "kind": "space"
-        }
-      },
-      {
-        "top": {
-          "$token": "fortal.space.3",
-          "kind": "space"
-        },
-        "bottom": {
-          "$token": "fortal.space.3",
-          "kind": "space"
-        }
-      }
-    ]
-  },
-  "decoration": {
-    "$merge": [
-      {
-        "borderRadius": {
-          "$token": "fortal.radius.4"
-        }
-      },
-      {
-        "color": "#00000000"
-      },
-      {
-        "border": {
-          "top": {
-            "color": {
-              "$token": "fortal.accent.7"
-            },
-            "width": {
-              "$token": "fortal.border.width.1",
-              "kind": "space"
-            }
-          },
-          "right": {
-            "color": {
-              "$token": "fortal.accent.7"
-            },
-            "width": {
-              "$token": "fortal.border.width.1",
-              "kind": "space"
-            }
-          },
-          "bottom": {
-            "color": {
-              "$token": "fortal.accent.7"
-            },
-            "width": {
-              "$token": "fortal.border.width.1",
-              "kind": "space"
-            }
-          },
-          "left": {
-            "color": {
-              "$token": "fortal.accent.7"
-            },
-            "width": {
-              "$token": "fortal.border.width.1",
-              "kind": "space"
-            }
-          }
-        }
-      }
-    ]
-  },
-  "mainAxisSize": "min",
-  "spacing": {
-    "$token": "fortal.space.3",
-    "kind": "space"
-  },
-  "variants": [
-    {
-      "kind": "widget_state",
-      "state": "focused",
-      "style": {
-        "type": "flex_box",
-        "decoration": {
-          "border": {
-            "top": {
-              "color": {
-                "$token": "fortal.focus.a8"
-              },
-              "width": {
-                "$token": "fortal.focus.ring.width",
-                "kind": "space"
-              }
-            },
-            "right": {
-              "color": {
-                "$token": "fortal.focus.a8"
-              },
-              "width": {
-                "$token": "fortal.focus.ring.width",
-                "kind": "space"
-              }
-            },
-            "bottom": {
-              "color": {
-                "$token": "fortal.focus.a8"
-              },
-              "width": {
-                "$token": "fortal.focus.ring.width",
-                "kind": "space"
-              }
-            },
-            "left": {
-              "color": {
-                "$token": "fortal.focus.a8"
-              },
-              "width": {
-                "$token": "fortal.focus.ring.width",
-                "kind": "space"
-              }
-            }
-          }
-        }
-      }
-    },
-    {
-      "kind": "widget_state",
-      "state": "hovered",
-      "style": {
-        "type": "flex_box",
-        "decoration": {
-          "$merge": [
-            {
-              "color": {
-                "$token": "fortal.accent.a2"
-              }
-            },
-            {
-              "border": {
-                "top": {
-                  "color": {
-                    "$token": "fortal.accent.8"
-                  },
-                  "width": {
-                    "$token": "fortal.border.width.1",
-                    "kind": "space"
-                  }
-                },
-                "right": {
-                  "color": {
-                    "$token": "fortal.accent.8"
-                  },
-                  "width": {
-                    "$token": "fortal.border.width.1",
-                    "kind": "space"
-                  }
-                },
-                "bottom": {
-                  "color": {
-                    "$token": "fortal.accent.8"
-                  },
-                  "width": {
-                    "$token": "fortal.border.width.1",
-                    "kind": "space"
-                  }
-                },
-                "left": {
-                  "color": {
-                    "$token": "fortal.accent.8"
-                  },
-                  "width": {
-                    "$token": "fortal.border.width.1",
-                    "kind": "space"
-                  }
-                }
-              }
-            }
-          ]
-        }
-      }
-    },
-    {
-      "kind": "widget_state",
-      "state": "disabled",
-      "style": {
-        "type": "flex_box",
-        "decoration": {
-          "border": {
-            "top": {
-              "color": {
-                "$token": "fortal.gray.5"
-              }
-            },
-            "right": {
-              "color": {
-                "$token": "fortal.gray.5"
-              }
-            },
-            "bottom": {
-              "color": {
-                "$token": "fortal.gray.5"
-              }
-            },
-            "left": {
-              "color": {
-                "$token": "fortal.gray.5"
-              }
-            }
-          }
-        }
-      }
-    }
-  ],
-  "v": 1
-}
diff --git a/atlas/fortal/styles/button/outline-size3/icon.mix.json b/atlas/fortal/styles/button/outline-size3/icon.mix.json
deleted file mode 100644
index 3aa7436b..00000000
--- a/atlas/fortal/styles/button/outline-size3/icon.mix.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "type": "icon",
-  "color": {
-    "$token": "fortal.accent.11"
-  },
-  "size": 20.0,
-  "variants": [
-    {
-      "kind": "widget_state",
-      "state": "disabled",
-      "style": {
-        "type": "icon",
-        "color": {
-          "$token": "fortal.gray.8"
-        }
-      }
-    }
-  ],
-  "v": 1
-}
diff --git a/atlas/fortal/styles/button/outline-size3/label.mix.json b/atlas/fortal/styles/button/outline-size3/label.mix.json
deleted file mode 100644
index d473b197..00000000
--- a/atlas/fortal/styles/button/outline-size3/label.mix.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-  "type": "text",
-  "style": {
-    "$merge": [
-      {
-        "fontWeight": {
-          "$token": "fortal.font.weight.medium"
-        }
-      },
-      {
-        "fontSize": 16.0
-      },
-      {
-        "height": 1.5
-      },
-      {
-        "letterSpacing": 0.0
-      },
-      {
-        "color": {
-          "$token": "fortal.accent.11"
-        }
-      }
-    ]
-  },
-  "variants": [
-    {
-      "kind": "widget_state",
-      "state": "disabled",
-      "style": {
-        "type": "text",
-        "style": {
-          "color": {
-            "$token": "fortal.gray.8"
-          }
-        }
-      }
-    }
-  ],
-  "v": 1
-}
diff --git a/atlas/fortal/styles/button/outline-size4/container.mix.json b/atlas/fortal/styles/button/outline-size4/container.mix.json
deleted file mode 100644
index 261cc523..00000000
--- a/atlas/fortal/styles/button/outline-size4/container.mix.json
+++ /dev/null
@@ -1,221 +0,0 @@
-{
-  "type": "flex_box",
-  "padding": {
-    "$merge": [
-      {
-        "left": {
-          "$token": "fortal.space.5",
-          "kind": "space"
-        },
-        "right": {
-          "$token": "fortal.space.5",
-          "kind": "space"
-        }
-      },
-      {
-        "top": {
-          "$token": "fortal.space.4",
-          "kind": "space"
-        },
-        "bottom": {
-          "$token": "fortal.space.4",
-          "kind": "space"
-        }
-      }
-    ]
-  },
-  "decoration": {
-    "$merge": [
-      {
-        "borderRadius": {
-          "$token": "fortal.radius.5"
-        }
-      },
-      {
-        "color": "#00000000"
-      },
-      {
-        "border": {
-          "top": {
-            "color": {
-              "$token": "fortal.accent.7"
-            },
-            "width": {
-              "$token": "fortal.border.width.1",
-              "kind": "space"
-            }
-          },
-          "right": {
-            "color": {
-              "$token": "fortal.accent.7"
-            },
-            "width": {
-              "$token": "fortal.border.width.1",
-              "kind": "space"
-            }
-          },
-          "bottom": {
-            "color": {
-              "$token": "fortal.accent.7"
-            },
-            "width": {
-              "$token": "fortal.border.width.1",
-              "kind": "space"
-            }
-          },
-          "left": {
-            "color": {
-              "$token": "fortal.accent.7"
-            },
-            "width": {
-              "$token": "fortal.border.width.1",
-              "kind": "space"
-            }
-          }
-        }
-      }
-    ]
-  },
-  "mainAxisSize": "min",
-  "spacing": {
-    "$token": "fortal.space.4",
-    "kind": "space"
-  },
-  "variants": [
-    {
-      "kind": "widget_state",
-      "state": "focused",
-      "style": {
-        "type": "flex_box",
-        "decoration": {
-          "border": {
-            "top": {
-              "color": {
-                "$token": "fortal.focus.a8"
-              },
-              "width": {
-                "$token": "fortal.focus.ring.width",
-                "kind": "space"
-              }
-            },
-            "right": {
-              "color": {
-                "$token": "fortal.focus.a8"
-              },
-              "width": {
-                "$token": "fortal.focus.ring.width",
-                "kind": "space"
-              }
-            },
-            "bottom": {
-              "color": {
-                "$token": "fortal.focus.a8"
-              },
-              "width": {
-                "$token": "fortal.focus.ring.width",
-                "kind": "space"
-              }
-            },
-            "left": {
-              "color": {
-                "$token": "fortal.focus.a8"
-              },
-              "width": {
-                "$token": "fortal.focus.ring.width",
-                "kind": "space"
-              }
-            }
-          }
-        }
-      }
-    },
-    {
-      "kind": "widget_state",
-      "state": "hovered",
-      "style": {
-        "type": "flex_box",
-        "decoration": {
-          "$merge": [
-            {
-              "color": {
-                "$token": "fortal.accent.a2"
-              }
-            },
-            {
-              "border": {
-                "top": {
-                  "color": {
-                    "$token": "fortal.accent.8"
-                  },
-                  "width": {
-                    "$token": "fortal.border.width.1",
-                    "kind": "space"
-                  }
-                },
-                "right": {
-                  "color": {
-                    "$token": "fortal.accent.8"
-                  },
-                  "width": {
-                    "$token": "fortal.border.width.1",
-                    "kind": "space"
-                  }
-                },
-                "bottom": {
-                  "color": {
-                    "$token": "fortal.accent.8"
-                  },
-                  "width": {
-                    "$token": "fortal.border.width.1",
-                    "kind": "space"
-                  }
-                },
-                "left": {
-                  "color": {
-                    "$token": "fortal.accent.8"
-                  },
-                  "width": {
-                    "$token": "fortal.border.width.1",
-                    "kind": "space"
-                  }
-                }
-              }
-            }
-          ]
-        }
-      }
-    },
-    {
-      "kind": "widget_state",
-      "state": "disabled",
-      "style": {
-        "type": "flex_box",
-        "decoration": {
-          "border": {
-            "top": {
-              "color": {
-                "$token": "fortal.gray.5"
-              }
-            },
-            "right": {
-              "color": {
-                "$token": "fortal.gray.5"
-              }
-            },
-            "bottom": {
-              "color": {
-                "$token": "fortal.gray.5"
-              }
-            },
-            "left": {
-              "color": {
-                "$token": "fortal.gray.5"
-              }
-            }
-          }
-        }
-      }
-    }
-  ],
-  "v": 1
-}
diff --git a/atlas/fortal/styles/button/outline-size4/icon.mix.json b/atlas/fortal/styles/button/outline-size4/icon.mix.json
deleted file mode 100644
index f3867e47..00000000
--- a/atlas/fortal/styles/button/outline-size4/icon.mix.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "type": "icon",
-  "color": {
-    "$token": "fortal.accent.11"
-  },
-  "size": 24.0,
-  "variants": [
-    {
-      "kind": "widget_state",
-      "state": "disabled",
-      "style": {
-        "type": "icon",
-        "color": {
-          "$token": "fortal.gray.8"
-        }
-      }
-    }
-  ],
-  "v": 1
-}
diff --git a/atlas/fortal/styles/button/outline-size4/label.mix.json b/atlas/fortal/styles/button/outline-size4/label.mix.json
deleted file mode 100644
index a07c6afc..00000000
--- a/atlas/fortal/styles/button/outline-size4/label.mix.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-  "type": "text",
-  "style": {
-    "$merge": [
-      {
-        "fontWeight": {
-          "$token": "fortal.font.weight.medium"
-        }
-      },
-      {
-        "fontSize": 18.0
-      },
-      {
-        "height": 1.4444444444444444
-      },
-      {
-        "letterSpacing": -0.0025
-      },
-      {
-        "color": {
-          "$token": "fortal.accent.11"
-        }
-      }
-    ]
-  },
-  "variants": [
-    {
-      "kind": "widget_state",
-      "state": "disabled",
-      "style": {
-        "type": "text",
-        "style": {
-          "color": {
-            "$token": "fortal.gray.8"
-          }
-        }
-      }
-    }
-  ],
-  "v": 1
-}
diff --git a/atlas/fortal/styles/button/soft-size1/container.mix.json b/atlas/fortal/styles/button/soft-size1/container.mix.json
deleted file mode 100644
index 5391f218..00000000
--- a/atlas/fortal/styles/button/soft-size1/container.mix.json
+++ /dev/null
@@ -1,132 +0,0 @@
-{
-  "type": "flex_box",
-  "padding": {
-    "$merge": [
-      {
-        "left": {
-          "$token": "fortal.space.2",
-          "kind": "space"
-        },
-        "right": {
-          "$token": "fortal.space.2",
-          "kind": "space"
-        }
-      },
-      {
-        "top": {
-          "$token": "fortal.space.1",
-          "kind": "space"
-        },
-        "bottom": {
-          "$token": "fortal.space.1",
-          "kind": "space"
-        }
-      }
-    ]
-  },
-  "decoration": {
-    "$merge": [
-      {
-        "borderRadius": {
-          "$token": "fortal.radius.2"
-        }
-      },
-      {
-        "color": {
-          "$token": "fortal.accent.3"
-        }
-      }
-    ]
-  },
-  "mainAxisSize": "min",
-  "spacing": {
-    "$token": "fortal.space.1",
-    "kind": "space"
-  },
-  "variants": [
-    {
-      "kind": "widget_state",
-      "state": "focused",
-      "style": {
-        "type": "flex_box",
-        "decoration": {
-          "border": {
-            "top": {
-              "color": {
-                "$token": "fortal.focus.a8"
-              },
-              "width": {
-                "$token": "fortal.focus.ring.width",
-                "kind": "space"
-              }
-            },
-            "right": {
-              "color": {
-                "$token": "fortal.focus.a8"
-              },
-              "width": {
-                "$token": "fortal.focus.ring.width",
-                "kind": "space"
-              }
-            },
-            "bottom": {
-              "color": {
-                "$token": "fortal.focus.a8"
-              },
-              "width": {
-                "$token": "fortal.focus.ring.width",
-                "kind": "space"
-              }
-            },
-            "left": {
-              "color": {
-                "$token": "fortal.focus.a8"
-              },
-              "width": {
-                "$token": "fortal.focus.ring.width",
-                "kind": "space"
-              }
-            }
-          }
-        }
-      }
-    },
-    {
-      "kind": "widget_state",
-      "state": "hovered",
-      "style": {
-        "type": "flex_box",
-        "decoration": {
-          "color": {
-            "$token": "fortal.accent.4"
-          }
-        }
-      }
-    },
-    {
-      "kind": "widget_state",
-      "state": "pressed",
-      "style": {
-        "type": "flex_box",
-        "decoration": {
-          "color": {
-            "$token": "fortal.accent.5"
-          }
-        }
-      }
-    },
-    {
-      "kind": "widget_state",
-      "state": "disabled",
-      "style": {
-        "type": "flex_box",
-        "decoration": {
-          "color": {
-            "$token": "fortal.gray.a3"
-          }
-        }
-      }
-    }
-  ],
-  "v": 1
-}
diff --git a/atlas/fortal/styles/button/soft-size1/icon.mix.json b/atlas/fortal/styles/button/soft-size1/icon.mix.json
deleted file mode 100644
index 81d43605..00000000
--- a/atlas/fortal/styles/button/soft-size1/icon.mix.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "type": "icon",
-  "color": {
-    "$token": "fortal.accent.11"
-  },
-  "size": 12.0,
-  "variants": [
-    {
-      "kind": "widget_state",
-      "state": "disabled",
-      "style": {
-        "type": "icon",
-        "color": {
-          "$token": "fortal.gray.8"
-        }
-      }
-    }
-  ],
-  "v": 1
-}
diff --git a/atlas/fortal/styles/button/soft-size1/label.mix.json b/atlas/fortal/styles/button/soft-size1/label.mix.json
deleted file mode 100644
index e23fe275..00000000
--- a/atlas/fortal/styles/button/soft-size1/label.mix.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-  "type": "text",
-  "style": {
-    "$merge": [
-      {
-        "fontWeight": {
-          "$token": "fortal.font.weight.medium"
-        }
-      },
-      {
-        "fontSize": 12.0
-      },
-      {
-        "height": 1.3333333333333333
-      },
-      {
-        "letterSpacing": 0.0025
-      },
-      {
-        "color": {
-          "$token": "fortal.accent.11"
-        }
-      }
-    ]
-  },
-  "variants": [
-    {
-      "kind": "widget_state",
-      "state": "disabled",
-      "style": {
-        "type": "text",
-        "style": {
-          "color": {
-            "$token": "fortal.gray.8"
-          }
-        }
-      }
-    }
-  ],
-  "v": 1
-}
diff --git a/atlas/fortal/styles/button/soft-size2/container.mix.json b/atlas/fortal/styles/button/soft-size2/container.mix.json
deleted file mode 100644
index 50576bdf..00000000
--- a/atlas/fortal/styles/button/soft-size2/container.mix.json
+++ /dev/null
@@ -1,132 +0,0 @@
-{
-  "type": "flex_box",
-  "padding": {
-    "$merge": [
-      {
-        "left": {
-          "$token": "fortal.space.3",
-          "kind": "space"
-        },
-        "right": {
-          "$token": "fortal.space.3",
-          "kind": "space"
-        }
-      },
-      {
-        "top": {
-          "$token": "fortal.space.2",
-          "kind": "space"
-        },
-        "bottom": {
-          "$token": "fortal.space.2",
-          "kind": "space"
-        }
-      }
-    ]
-  },
-  "decoration": {
-    "$merge": [
-      {
-        "borderRadius": {
-          "$token": "fortal.radius.3"
-        }
-      },
-      {
-        "color": {
-          "$token": "fortal.accent.3"
-        }
-      }
-    ]
-  },
-  "mainAxisSize": "min",
-  "spacing": {
-    "$token": "fortal.space.2",
-    "kind": "space"
-  },
-  "variants": [
-    {
-      "kind": "widget_state",
-      "state": "focused",
-      "style": {
-        "type": "flex_box",
-        "decoration": {
-          "border": {
-            "top": {
-              "color": {
-                "$token": "fortal.focus.a8"
-              },
-              "width": {
-                "$token": "fortal.focus.ring.width",
-                "kind": "space"
-              }
-            },
-            "right": {
-              "color": {
-                "$token": "fortal.focus.a8"
-              },
-              "width": {
-                "$token": "fortal.focus.ring.width",
-                "kind": "space"
-              }
-            },
-            "bottom": {
-              "color": {
-                "$token": "fortal.focus.a8"
-              },
-              "width": {
-                "$token": "fortal.focus.ring.width",
-                "kind": "space"
-              }
-            },
-            "left": {
-              "color": {
-                "$token": "fortal.focus.a8"
-              },
-              "width": {
-                "$token": "fortal.focus.ring.width",
-                "kind": "space"
-              }
-            }
-          }
-        }
-      }
-    },
-    {
-      "kind": "widget_state",
-      "state": "hovered",
-      "style": {
-        "type": "flex_box",
-        "decoration": {
-          "color": {
-            "$token": "fortal.accent.4"
-          }
-        }
-      }
-    },
-    {
-      "kind": "widget_state",
-      "state": "pressed",
-      "style": {
-        "type": "flex_box",
-        "decoration": {
-          "color": {
-            "$token": "fortal.accent.5"
-          }
-        }
-      }
-    },
-    {
-      "kind": "widget_state",
-      "state": "disabled",
-      "style": {
-        "type": "flex_box",
-        "decoration": {
-          "color": {
-            "$token": "fortal.gray.a3"
-          }
-        }
-      }
-    }
-  ],
-  "v": 1
-}
diff --git a/atlas/fortal/styles/button/soft-size2/icon.mix.json b/atlas/fortal/styles/button/soft-size2/icon.mix.json
deleted file mode 100644
index ce290453..00000000
--- a/atlas/fortal/styles/button/soft-size2/icon.mix.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "type": "icon",
-  "color": {
-    "$token": "fortal.accent.11"
-  },
-  "size": 16.0,
-  "variants": [
-    {
-      "kind": "widget_state",
-      "state": "disabled",
-      "style": {
-        "type": "icon",
-        "color": {
-          "$token": "fortal.gray.8"
-        }
-      }
-    }
-  ],
-  "v": 1
-}
diff --git a/atlas/fortal/styles/button/soft-size2/label.mix.json b/atlas/fortal/styles/button/soft-size2/label.mix.json
deleted file mode 100644
index 0bcb9265..00000000
--- a/atlas/fortal/styles/button/soft-size2/label.mix.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-  "type": "text",
-  "style": {
-    "$merge": [
-      {
-        "fontWeight": {
-          "$token": "fortal.font.weight.medium"
-        }
-      },
-      {
-        "fontSize": 14.0
-      },
-      {
-        "height": 1.4285714285714286
-      },
-      {
-        "letterSpacing": 0.0
-      },
-      {
-        "color": {
-          "$token": "fortal.accent.11"
-        }
-      }
-    ]
-  },
-  "variants": [
-    {
-      "kind": "widget_state",
-      "state": "disabled",
-      "style": {
-        "type": "text",
-        "style": {
-          "color": {
-            "$token": "fortal.gray.8"
-          }
-        }
-      }
-    }
-  ],
-  "v": 1
-}
diff --git a/atlas/fortal/styles/button/soft-size3/container.mix.json b/atlas/fortal/styles/button/soft-size3/container.mix.json
deleted file mode 100644
index 8f3632ba..00000000
--- a/atlas/fortal/styles/button/soft-size3/container.mix.json
+++ /dev/null
@@ -1,132 +0,0 @@
-{
-  "type": "flex_box",
-  "padding": {
-    "$merge": [
-      {
-        "left": {
-          "$token": "fortal.space.4",
-          "kind": "space"
-        },
-        "right": {
-          "$token": "fortal.space.4",
-          "kind": "space"
-        }
-      },
-      {
-        "top": {
-          "$token": "fortal.space.3",
-          "kind": "space"
-        },
-        "bottom": {
-          "$token": "fortal.space.3",
-          "kind": "space"
-        }
-      }
-    ]
-  },
-  "decoration": {
-    "$merge": [
-      {
-        "borderRadius": {
-          "$token": "fortal.radius.4"
-        }
-      },
-      {
-        "color": {
-          "$token": "fortal.accent.3"
-        }
-      }
-    ]
-  },
-  "mainAxisSize": "min",
-  "spacing": {
-    "$token": "fortal.space.3",
-    "kind": "space"
-  },
-  "variants": [
-    {
-      "kind": "widget_state",
-      "state": "focused",
-      "style": {
-        "type": "flex_box",
-        "decoration": {
-          "border": {
-            "top": {
-              "color": {
-                "$token": "fortal.focus.a8"
-              },
-              "width": {
-                "$token": "fortal.focus.ring.width",
-                "kind": "space"
-              }
-            },
-            "right": {
-              "color": {
-                "$token": "fortal.focus.a8"
-              },
-              "width": {
-                "$token": "fortal.focus.ring.width",
-                "kind": "space"
-              }
-            },
-            "bottom": {
-              "color": {
-                "$token": "fortal.focus.a8"
-              },
-              "width": {
-                "$token": "fortal.focus.ring.width",
-                "kind": "space"
-              }
-            },
-            "left": {
-              "color": {
-                "$token": "fortal.focus.a8"
-              },
-              "width": {
-                "$token": "fortal.focus.ring.width",
-                "kind": "space"
-              }
-            }
-          }
-        }
-      }
-    },
-    {
-      "kind": "widget_state",
-      "state": "hovered",
-      "style": {
-        "type": "flex_box",
-        "decoration": {
-          "color": {
-            "$token": "fortal.accent.4"
-          }
-        }
-      }
-    },
-    {
-      "kind": "widget_state",
-      "state": "pressed",
-      "style": {
-        "type": "flex_box",
-        "decoration": {
-          "color": {
-            "$token": "fortal.accent.5"
-          }
-        }
-      }
-    },
-    {
-      "kind": "widget_state",
-      "state": "disabled",
-      "style": {
-        "type": "flex_box",
-        "decoration": {
-          "color": {
-            "$token": "fortal.gray.a3"
-          }
-        }
-      }
-    }
-  ],
-  "v": 1
-}
diff --git a/atlas/fortal/styles/button/soft-size3/icon.mix.json b/atlas/fortal/styles/button/soft-size3/icon.mix.json
deleted file mode 100644
index 3aa7436b..00000000
--- a/atlas/fortal/styles/button/soft-size3/icon.mix.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "type": "icon",
-  "color": {
-    "$token": "fortal.accent.11"
-  },
-  "size": 20.0,
-  "variants": [
-    {
-      "kind": "widget_state",
-      "state": "disabled",
-      "style": {
-        "type": "icon",
-        "color": {
-          "$token": "fortal.gray.8"
-        }
-      }
-    }
-  ],
-  "v": 1
-}
diff --git a/atlas/fortal/styles/button/soft-size3/label.mix.json b/atlas/fortal/styles/button/soft-size3/label.mix.json
deleted file mode 100644
index d473b197..00000000
--- a/atlas/fortal/styles/button/soft-size3/label.mix.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-  "type": "text",
-  "style": {
-    "$merge": [
-      {
-        "fontWeight": {
-          "$token": "fortal.font.weight.medium"
-        }
-      },
-      {
-        "fontSize": 16.0
-      },
-      {
-        "height": 1.5
-      },
-      {
-        "letterSpacing": 0.0
-      },
-      {
-        "color": {
-          "$token": "fortal.accent.11"
-        }
-      }
-    ]
-  },
-  "variants": [
-    {
-      "kind": "widget_state",
-      "state": "disabled",
-      "style": {
-        "type": "text",
-        "style": {
-          "color": {
-            "$token": "fortal.gray.8"
-          }
-        }
-      }
-    }
-  ],
-  "v": 1
-}
diff --git a/atlas/fortal/styles/button/soft-size4/container.mix.json b/atlas/fortal/styles/button/soft-size4/container.mix.json
deleted file mode 100644
index d518bea8..00000000
--- a/atlas/fortal/styles/button/soft-size4/container.mix.json
+++ /dev/null
@@ -1,132 +0,0 @@
-{
-  "type": "flex_box",
-  "padding": {
-    "$merge": [
-      {
-        "left": {
-          "$token": "fortal.space.5",
-          "kind": "space"
-        },
-        "right": {
-          "$token": "fortal.space.5",
-          "kind": "space"
-        }
-      },
-      {
-        "top": {
-          "$token": "fortal.space.4",
-          "kind": "space"
-        },
-        "bottom": {
-          "$token": "fortal.space.4",
-          "kind": "space"
-        }
-      }
-    ]
-  },
-  "decoration": {
-    "$merge": [
-      {
-        "borderRadius": {
-          "$token": "fortal.radius.5"
-        }
-      },
-      {
-        "color": {
-          "$token": "fortal.accent.3"
-        }
-      }
-    ]
-  },
-  "mainAxisSize": "min",
-  "spacing": {
-    "$token": "fortal.space.4",
-    "kind": "space"
-  },
-  "variants": [
-    {
-      "kind": "widget_state",
-      "state": "focused",
-      "style": {
-        "type": "flex_box",
-        "decoration": {
-          "border": {
-            "top": {
-              "color": {
-                "$token": "fortal.focus.a8"
-              },
-              "width": {
-                "$token": "fortal.focus.ring.width",
-                "kind": "space"
-              }
-            },
-            "right": {
-              "color": {
-                "$token": "fortal.focus.a8"
-              },
-              "width": {
-                "$token": "fortal.focus.ring.width",
-                "kind": "space"
-              }
-            },
-            "bottom": {
-              "color": {
-                "$token": "fortal.focus.a8"
-              },
-              "width": {
-                "$token": "fortal.focus.ring.width",
-                "kind": "space"
-              }
-            },
-            "left": {
-              "color": {
-                "$token": "fortal.focus.a8"
-              },
-              "width": {
-                "$token": "fortal.focus.ring.width",
-                "kind": "space"
-              }
-            }
-          }
-        }
-      }
-    },
-    {
-      "kind": "widget_state",
-      "state": "hovered",
-      "style": {
-        "type": "flex_box",
-        "decoration": {
-          "color": {
-            "$token": "fortal.accent.4"
-          }
-        }
-      }
-    },
-    {
-      "kind": "widget_state",
-      "state": "pressed",
-      "style": {
-        "type": "flex_box",
-        "decoration": {
-          "color": {
-            "$token": "fortal.accent.5"
-          }
-        }
-      }
-    },
-    {
-      "kind": "widget_state",
-      "state": "disabled",
-      "style": {
-        "type": "flex_box",
-        "decoration": {
-          "color": {
-            "$token": "fortal.gray.a3"
-          }
-        }
-      }
-    }
-  ],
-  "v": 1
-}
diff --git a/atlas/fortal/styles/button/soft-size4/icon.mix.json b/atlas/fortal/styles/button/soft-size4/icon.mix.json
deleted file mode 100644
index f3867e47..00000000
--- a/atlas/fortal/styles/button/soft-size4/icon.mix.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "type": "icon",
-  "color": {
-    "$token": "fortal.accent.11"
-  },
-  "size": 24.0,
-  "variants": [
-    {
-      "kind": "widget_state",
-      "state": "disabled",
-      "style": {
-        "type": "icon",
-        "color": {
-          "$token": "fortal.gray.8"
-        }
-      }
-    }
-  ],
-  "v": 1
-}
diff --git a/atlas/fortal/styles/button/soft-size4/label.mix.json b/atlas/fortal/styles/button/soft-size4/label.mix.json
deleted file mode 100644
index a07c6afc..00000000
--- a/atlas/fortal/styles/button/soft-size4/label.mix.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-  "type": "text",
-  "style": {
-    "$merge": [
-      {
-        "fontWeight": {
-          "$token": "fortal.font.weight.medium"
-        }
-      },
-      {
-        "fontSize": 18.0
-      },
-      {
-        "height": 1.4444444444444444
-      },
-      {
-        "letterSpacing": -0.0025
-      },
-      {
-        "color": {
-          "$token": "fortal.accent.11"
-        }
-      }
-    ]
-  },
-  "variants": [
-    {
-      "kind": "widget_state",
-      "state": "disabled",
-      "style": {
-        "type": "text",
-        "style": {
-          "color": {
-            "$token": "fortal.gray.8"
-          }
-        }
-      }
-    }
-  ],
-  "v": 1
-}
diff --git a/atlas/fortal/styles/button/solid-size1/container.mix.json b/atlas/fortal/styles/button/solid-size1/container.mix.json
deleted file mode 100644
index 1481cc74..00000000
--- a/atlas/fortal/styles/button/solid-size1/container.mix.json
+++ /dev/null
@@ -1,132 +0,0 @@
-{
-  "type": "flex_box",
-  "padding": {
-    "$merge": [
-      {
-        "left": {
-          "$token": "fortal.space.2",
-          "kind": "space"
-        },
-        "right": {
-          "$token": "fortal.space.2",
-          "kind": "space"
-        }
-      },
-      {
-        "top": {
-          "$token": "fortal.space.1",
-          "kind": "space"
-        },
-        "bottom": {
-          "$token": "fortal.space.1",
-          "kind": "space"
-        }
-      }
-    ]
-  },
-  "decoration": {
-    "$merge": [
-      {
-        "borderRadius": {
-          "$token": "fortal.radius.2"
-        }
-      },
-      {
-        "color": {
-          "$token": "fortal.accent.9"
-        }
-      }
-    ]
-  },
-  "mainAxisSize": "min",
-  "spacing": {
-    "$token": "fortal.space.1",
-    "kind": "space"
-  },
-  "variants": [
-    {
-      "kind": "widget_state",
-      "state": "focused",
-      "style": {
-        "type": "flex_box",
-        "decoration": {
-          "border": {
-            "top": {
-              "color": {
-                "$token": "fortal.focus.a8"
-              },
-              "width": {
-                "$token": "fortal.focus.ring.width",
-                "kind": "space"
-              }
-            },
-            "right": {
-              "color": {
-                "$token": "fortal.focus.a8"
-              },
-              "width": {
-                "$token": "fortal.focus.ring.width",
-                "kind": "space"
-              }
-            },
-            "bottom": {
-              "color": {
-                "$token": "fortal.focus.a8"
-              },
-              "width": {
-                "$token": "fortal.focus.ring.width",
-                "kind": "space"
-              }
-            },
-            "left": {
-              "color": {
-                "$token": "fortal.focus.a8"
-              },
-              "width": {
-                "$token": "fortal.focus.ring.width",
-                "kind": "space"
-              }
-            }
-          }
-        }
-      }
-    },
-    {
-      "kind": "widget_state",
-      "state": "hovered",
-      "style": {
-        "type": "flex_box",
-        "decoration": {
-          "color": {
-            "$token": "fortal.accent.10"
-          }
-        }
-      }
-    },
-    {
-      "kind": "widget_state",
-      "state": "pressed",
-      "style": {
-        "type": "flex_box",
-        "decoration": {
-          "color": {
-            "$token": "fortal.accent.10"
-          }
-        }
-      }
-    },
-    {
-      "kind": "widget_state",
-      "state": "disabled",
-      "style": {
-        "type": "flex_box",
-        "decoration": {
-          "color": {
-            "$token": "fortal.gray.a3"
-          }
-        }
-      }
-    }
-  ],
-  "v": 1
-}
diff --git a/atlas/fortal/styles/button/solid-size1/icon.mix.json b/atlas/fortal/styles/button/solid-size1/icon.mix.json
deleted file mode 100644
index c253eb05..00000000
--- a/atlas/fortal/styles/button/solid-size1/icon.mix.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "type": "icon",
-  "color": {
-    "$token": "fortal.accent.contrast"
-  },
-  "size": 12.0,
-  "variants": [
-    {
-      "kind": "widget_state",
-      "state": "disabled",
-      "style": {
-        "type": "icon",
-        "color": {
-          "$token": "fortal.gray.8"
-        }
-      }
-    }
-  ],
-  "v": 1
-}
diff --git a/atlas/fortal/styles/button/solid-size1/label.mix.json b/atlas/fortal/styles/button/solid-size1/label.mix.json
deleted file mode 100644
index 9f2e854d..00000000
--- a/atlas/fortal/styles/button/solid-size1/label.mix.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-  "type": "text",
-  "style": {
-    "$merge": [
-      {
-        "fontWeight": {
-          "$token": "fortal.font.weight.medium"
-        }
-      },
-      {
-        "fontSize": 12.0
-      },
-      {
-        "height": 1.3333333333333333
-      },
-      {
-        "letterSpacing": 0.0025
-      },
-      {
-        "color": {
-          "$token": "fortal.accent.contrast"
-        }
-      }
-    ]
-  },
-  "variants": [
-    {
-      "kind": "widget_state",
-      "state": "disabled",
-      "style": {
-        "type": "text",
-        "style": {
-          "color": {
-            "$token": "fortal.gray.8"
-          }
-        }
-      }
-    }
-  ],
-  "v": 1
-}
diff --git a/atlas/fortal/styles/button/solid-size2/container.mix.json b/atlas/fortal/styles/button/solid-size2/container.mix.json
deleted file mode 100644
index e063f527..00000000
--- a/atlas/fortal/styles/button/solid-size2/container.mix.json
+++ /dev/null
@@ -1,132 +0,0 @@
-{
-  "type": "flex_box",
-  "padding": {
-    "$merge": [
-      {
-        "left": {
-          "$token": "fortal.space.3",
-          "kind": "space"
-        },
-        "right": {
-          "$token": "fortal.space.3",
-          "kind": "space"
-        }
-      },
-      {
-        "top": {
-          "$token": "fortal.space.2",
-          "kind": "space"
-        },
-        "bottom": {
-          "$token": "fortal.space.2",
-          "kind": "space"
-        }
-      }
-    ]
-  },
-  "decoration": {
-    "$merge": [
-      {
-        "borderRadius": {
-          "$token": "fortal.radius.3"
-        }
-      },
-      {
-        "color": {
-          "$token": "fortal.accent.9"
-        }
-      }
-    ]
-  },
-  "mainAxisSize": "min",
-  "spacing": {
-    "$token": "fortal.space.2",
-    "kind": "space"
-  },
-  "variants": [
-    {
-      "kind": "widget_state",
-      "state": "focused",
-      "style": {
-        "type": "flex_box",
-        "decoration": {
-          "border": {
-            "top": {
-              "color": {
-                "$token": "fortal.focus.a8"
-              },
-              "width": {
-                "$token": "fortal.focus.ring.width",
-                "kind": "space"
-              }
-            },
-            "right": {
-              "color": {
-                "$token": "fortal.focus.a8"
-              },
-              "width": {
-                "$token": "fortal.focus.ring.width",
-                "kind": "space"
-              }
-            },
-            "bottom": {
-              "color": {
-                "$token": "fortal.focus.a8"
-              },
-              "width": {
-                "$token": "fortal.focus.ring.width",
-                "kind": "space"
-              }
-            },
-            "left": {
-              "color": {
-                "$token": "fortal.focus.a8"
-              },
-              "width": {
-                "$token": "fortal.focus.ring.width",
-                "kind": "space"
-              }
-            }
-          }
-        }
-      }
-    },
-    {
-      "kind": "widget_state",
-      "state": "hovered",
-      "style": {
-        "type": "flex_box",
-        "decoration": {
-          "color": {
-            "$token": "fortal.accent.10"
-          }
-        }
-      }
-    },
-    {
-      "kind": "widget_state",
-      "state": "pressed",
-      "style": {
-        "type": "flex_box",
-        "decoration": {
-          "color": {
-            "$token": "fortal.accent.10"
-          }
-        }
-      }
-    },
-    {
-      "kind": "widget_state",
-      "state": "disabled",
-      "style": {
-        "type": "flex_box",
-        "decoration": {
-          "color": {
-            "$token": "fortal.gray.a3"
-          }
-        }
-      }
-    }
-  ],
-  "v": 1
-}
diff --git a/atlas/fortal/styles/button/solid-size2/icon.mix.json b/atlas/fortal/styles/button/solid-size2/icon.mix.json
deleted file mode 100644
index 7359b8f9..00000000
--- a/atlas/fortal/styles/button/solid-size2/icon.mix.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "type": "icon",
-  "color": {
-    "$token": "fortal.accent.contrast"
-  },
-  "size": 16.0,
-  "variants": [
-    {
-      "kind": "widget_state",
-      "state": "disabled",
-      "style": {
-        "type": "icon",
-        "color": {
-          "$token": "fortal.gray.8"
-        }
-      }
-    }
-  ],
-  "v": 1
-}
diff --git a/atlas/fortal/styles/button/solid-size2/label.mix.json b/atlas/fortal/styles/button/solid-size2/label.mix.json
deleted file mode 100644
index 8c49361e..00000000
--- a/atlas/fortal/styles/button/solid-size2/label.mix.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-  "type": "text",
-  "style": {
-    "$merge": [
-      {
-        "fontWeight": {
-          "$token": "fortal.font.weight.medium"
-        }
-      },
-      {
-        "fontSize": 14.0
-      },
-      {
-        "height": 1.4285714285714286
-      },
-      {
-        "letterSpacing": 0.0
-      },
-      {
-        "color": {
-          "$token": "fortal.accent.contrast"
-        }
-      }
-    ]
-  },
-  "variants": [
-    {
-      "kind": "widget_state",
-      "state": "disabled",
-      "style": {
-        "type": "text",
-        "style": {
-          "color": {
-            "$token": "fortal.gray.8"
-          }
-        }
-      }
-    }
-  ],
-  "v": 1
-}
diff --git a/atlas/fortal/styles/button/solid-size3/container.mix.json b/atlas/fortal/styles/button/solid-size3/container.mix.json
deleted file mode 100644
index fd901148..00000000
--- a/atlas/fortal/styles/button/solid-size3/container.mix.json
+++ /dev/null
@@ -1,132 +0,0 @@
-{
-  "type": "flex_box",
-  "padding": {
-    "$merge": [
-      {
-        "left": {
-          "$token": "fortal.space.4",
-          "kind": "space"
-        },
-        "right": {
-          "$token": "fortal.space.4",
-          "kind": "space"
-        }
-      },
-      {
-        "top": {
-          "$token": "fortal.space.3",
-          "kind": "space"
-        },
-        "bottom": {
-          "$token": "fortal.space.3",
-          "kind": "space"
-        }
-      }
-    ]
-  },
-  "decoration": {
-    "$merge": [
-      {
-        "borderRadius": {
-          "$token": "fortal.radius.4"
-        }
-      },
-      {
-        "color": {
-          "$token": "fortal.accent.9"
-        }
-      }
-    ]
-  },
-  "mainAxisSize": "min",
-  "spacing": {
-    "$token": "fortal.space.3",
-    "kind": "space"
-  },
-  "variants": [
-    {
-      "kind": "widget_state",
-      "state": "focused",
-      "style": {
-        "type": "flex_box",
-        "decoration": {
-          "border": {
-            "top": {
-              "color": {
-                "$token": "fortal.focus.a8"
-              },
-              "width": {
-                "$token": "fortal.focus.ring.width",
-                "kind": "space"
-              }
-            },
-            "right": {
-              "color": {
-                "$token": "fortal.focus.a8"
-              },
-              "width": {
-                "$token": "fortal.focus.ring.width",
-                "kind": "space"
-              }
-            },
-            "bottom": {
-              "color": {
-                "$token": "fortal.focus.a8"
-              },
-              "width": {
-                "$token": "fortal.focus.ring.width",
-                "kind": "space"
-              }
-            },
-            "left": {
-              "color": {
-                "$token": "fortal.focus.a8"
-              },
-              "width": {
-                "$token": "fortal.focus.ring.width",
-                "kind": "space"
-              }
-            }
-          }
-        }
-      }
-    },
-    {
-      "kind": "widget_state",
-      "state": "hovered",
-      "style": {
-        "type": "flex_box",
-        "decoration": {
-          "color": {
-            "$token": "fortal.accent.10"
-          }
-        }
-      }
-    },
-    {
-      "kind": "widget_state",
-      "state": "pressed",
-      "style": {
-        "type": "flex_box",
-        "decoration": {
-          "color": {
-            "$token": "fortal.accent.10"
-          }
-        }
-      }
-    },
-    {
-      "kind": "widget_state",
-      "state": "disabled",
-      "style": {
-        "type": "flex_box",
-        "decoration": {
-          "color": {
-            "$token": "fortal.gray.a3"
-          }
-        }
-      }
-    }
-  ],
-  "v": 1
-}
diff --git a/atlas/fortal/styles/button/solid-size3/icon.mix.json b/atlas/fortal/styles/button/solid-size3/icon.mix.json
deleted file mode 100644
index 32070f29..00000000
--- a/atlas/fortal/styles/button/solid-size3/icon.mix.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "type": "icon",
-  "color": {
-    "$token": "fortal.accent.contrast"
-  },
-  "size": 20.0,
-  "variants": [
-    {
-      "kind": "widget_state",
-      "state": "disabled",
-      "style": {
-        "type": "icon",
-        "color": {
-          "$token": "fortal.gray.8"
-        }
-      }
-    }
-  ],
-  "v": 1
-}
diff --git a/atlas/fortal/styles/button/solid-size3/label.mix.json b/atlas/fortal/styles/button/solid-size3/label.mix.json
deleted file mode 100644
index 612f6448..00000000
--- a/atlas/fortal/styles/button/solid-size3/label.mix.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-  "type": "text",
-  "style": {
-    "$merge": [
-      {
-        "fontWeight": {
-          "$token": "fortal.font.weight.medium"
-        }
-      },
-      {
-        "fontSize": 16.0
-      },
-      {
-        "height": 1.5
-      },
-      {
-        "letterSpacing": 0.0
-      },
-      {
-        "color": {
-          "$token": "fortal.accent.contrast"
-        }
-      }
-    ]
-  },
-  "variants": [
-    {
-      "kind": "widget_state",
-      "state": "disabled",
-      "style": {
-        "type": "text",
-        "style": {
-          "color": {
-            "$token": "fortal.gray.8"
-          }
-        }
-      }
-    }
-  ],
-  "v": 1
-}
diff --git a/atlas/fortal/styles/button/solid-size4/container.mix.json b/atlas/fortal/styles/button/solid-size4/container.mix.json
deleted file mode 100644
index 1786e475..00000000
--- a/atlas/fortal/styles/button/solid-size4/container.mix.json
+++ /dev/null
@@ -1,132 +0,0 @@
-{
-  "type": "flex_box",
-  "padding": {
-    "$merge": [
-      {
-        "left": {
-          "$token": "fortal.space.5",
-          "kind": "space"
-        },
-        "right": {
-          "$token": "fortal.space.5",
-          "kind": "space"
-        }
-      },
-      {
-        "top": {
-          "$token": "fortal.space.4",
-          "kind": "space"
-        },
-        "bottom": {
-          "$token": "fortal.space.4",
-          "kind": "space"
-        }
-      }
-    ]
-  },
-  "decoration": {
-    "$merge": [
-      {
-        "borderRadius": {
-          "$token": "fortal.radius.5"
-        }
-      },
-      {
-        "color": {
-          "$token": "fortal.accent.9"
-        }
-      }
-    ]
-  },
-  "mainAxisSize": "min",
-  "spacing": {
-    "$token": "fortal.space.4",
-    "kind": "space"
-  },
-  "variants": [
-    {
-      "kind": "widget_state",
-      "state": "focused",
-      "style": {
-        "type": "flex_box",
-        "decoration": {
-          "border": {
-            "top": {
-              "color": {
-                "$token": "fortal.focus.a8"
-              },
-              "width": {
-                "$token": "fortal.focus.ring.width",
-                "kind": "space"
-              }
-            },
-            "right": {
-              "color": {
-                "$token": "fortal.focus.a8"
-              },
-              "width": {
-                "$token": "fortal.focus.ring.width",
-                "kind": "space"
-              }
-            },
-            "bottom": {
-              "color": {
-                "$token": "fortal.focus.a8"
-              },
-              "width": {
-                "$token": "fortal.focus.ring.width",
-                "kind": "space"
-              }
-            },
-            "left": {
-              "color": {
-                "$token": "fortal.focus.a8"
-              },
-              "width": {
-                "$token": "fortal.focus.ring.width",
-                "kind": "space"
-              }
-            }
-          }
-        }
-      }
-    },
-    {
-      "kind": "widget_state",
-      "state": "hovered",
-      "style": {
-        "type": "flex_box",
-        "decoration": {
-          "color": {
-            "$token": "fortal.accent.10"
-          }
-        }
-      }
-    },
-    {
-      "kind": "widget_state",
-      "state": "pressed",
-      "style": {
-        "type": "flex_box",
-        "decoration": {
-          "color": {
-            "$token": "fortal.accent.10"
-          }
-        }
-      }
-    },
-    {
-      "kind": "widget_state",
-      "state": "disabled",
-      "style": {
-        "type": "flex_box",
-        "decoration": {
-          "color": {
-            "$token": "fortal.gray.a3"
-          }
-        }
-      }
-    }
-  ],
-  "v": 1
-}
diff --git a/atlas/fortal/styles/button/solid-size4/icon.mix.json b/atlas/fortal/styles/button/solid-size4/icon.mix.json
deleted file mode 100644
index 4310856b..00000000
--- a/atlas/fortal/styles/button/solid-size4/icon.mix.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "type": "icon",
-  "color": {
-    "$token": "fortal.accent.contrast"
-  },
-  "size": 24.0,
-  "variants": [
-    {
-      "kind": "widget_state",
-      "state": "disabled",
-      "style": {
-        "type": "icon",
-        "color": {
-          "$token": "fortal.gray.8"
-        }
-      }
-    }
-  ],
-  "v": 1
-}
diff --git a/atlas/fortal/styles/button/solid-size4/label.mix.json b/atlas/fortal/styles/button/solid-size4/label.mix.json
deleted file mode 100644
index 72395fde..00000000
--- a/atlas/fortal/styles/button/solid-size4/label.mix.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-  "type": "text",
-  "style": {
-    "$merge": [
-      {
-        "fontWeight": {
-          "$token": "fortal.font.weight.medium"
-        }
-      },
-      {
-        "fontSize": 18.0
-      },
-      {
-        "height": 1.4444444444444444
-      },
-      {
-        "letterSpacing": -0.0025
-      },
-      {
-        "color": {
-          "$token": "fortal.accent.contrast"
-        }
-      }
-    ]
-  },
-  "variants": [
-    {
-      "kind": "widget_state",
-      "state": "disabled",
-      "style": {
-        "type": "text",
-        "style": {
-          "color": {
-            "$token": "fortal.gray.8"
-          }
-        }
-      }
-    }
-  ],
-  "v": 1
-}
diff --git a/atlas/fortal/styles/button/surface-size1/container.mix.json b/atlas/fortal/styles/button/surface-size1/container.mix.json
deleted file mode 100644
index 8f634585..00000000
--- a/atlas/fortal/styles/button/surface-size1/container.mix.json
+++ /dev/null
@@ -1,239 +0,0 @@
-{
-  "type": "flex_box",
-  "padding": {
-    "$merge": [
-      {
-        "left": {
-          "$token": "fortal.space.2",
-          "kind": "space"
-        },
-        "right": {
-          "$token": "fortal.space.2",
-          "kind": "space"
-        }
-      },
-      {
-        "top": {
-          "$token": "fortal.space.1",
-          "kind": "space"
-        },
-        "bottom": {
-          "$token": "fortal.space.1",
-          "kind": "space"
-        }
-      }
-    ]
-  },
-  "decoration": {
-    "$merge": [
-      {
-        "borderRadius": {
-          "$token": "fortal.radius.2"
-        }
-      },
-      {
-        "color": {
-          "$token": "fortal.accent.a2"
-        }
-      },
-      {
-        "border": {
-          "top": {
-            "color": {
-              "$token": "fortal.accent.6"
-            },
-            "width": {
-              "$token": "fortal.border.width.1",
-              "kind": "space"
-            }
-          },
-          "right": {
-            "color": {
-              "$token": "fortal.accent.6"
-            },
-            "width": {
-              "$token": "fortal.border.width.1",
-              "kind": "space"
-            }
-          },
-          "bottom": {
-            "color": {
-              "$token": "fortal.accent.6"
-            },
-            "width": {
-              "$token": "fortal.border.width.1",
-              "kind": "space"
-            }
-          },
-          "left": {
-            "color": {
-              "$token": "fortal.accent.6"
-            },
-            "width": {
-              "$token": "fortal.border.width.1",
-              "kind": "space"
-            }
-          }
-        }
-      }
-    ]
-  },
-  "mainAxisSize": "min",
-  "spacing": {
-    "$token": "fortal.space.1",
-    "kind": "space"
-  },
-  "variants": [
-    {
-      "kind": "widget_state",
-      "state": "focused",
-      "style": {
-        "type": "flex_box",
-        "decoration": {
-          "border": {
-            "top": {
-              "color": {
-                "$token": "fortal.focus.a8"
-              },
-              "width": {
-                "$token": "fortal.focus.ring.width",
-                "kind": "space"
-              }
-            },
-            "right": {
-              "color": {
-                "$token": "fortal.focus.a8"
-              },
-              "width": {
-                "$token": "fortal.focus.ring.width",
-                "kind": "space"
-              }
-            },
-            "bottom": {
-              "color": {
-                "$token": "fortal.focus.a8"
-              },
-              "width": {
-                "$token": "fortal.focus.ring.width",
-                "kind": "space"
-              }
-            },
-            "left": {
-              "color": {
-                "$token": "fortal.focus.a8"
-              },
-              "width": {
-                "$token": "fortal.focus.ring.width",
-                "kind": "space"
-              }
-            }
-          }
-        }
-      }
-    },
-    {
-      "kind": "widget_state",
-      "state": "hovered",
-      "style": {
-        "type": "flex_box",
-        "decoration": {
-          "border": {
-            "top": {
-              "color": {
-                "$token": "fortal.accent.8"
-              },
-              "width": {
-                "$token": "fortal.border.width.1",
-                "kind": "space"
-              }
-            },
-            "right": {
-              "color": {
-                "$token": "fortal.accent.8"
-              },
-              "width": {
-                "$token": "fortal.border.width.1",
-                "kind": "space"
-              }
-            },
-            "bottom": {
-              "color": {
-                "$token": "fortal.accent.8"
-              },
-              "width": {
-                "$token": "fortal.border.width.1",
-                "kind": "space"
-              }
-            },
-            "left": {
-              "color": {
-                "$token": "fortal.accent.8"
-              },
-              "width": {
-                "$token": "fortal.border.width.1",
-                "kind": "space"
-              }
-            }
-          }
-        }
-      }
-    },
-    {
-      "kind": "widget_state",
-      "state": "disabled",
-      "style": {
-        "type": "flex_box",
-        "decoration": {
-          "$merge": [
-            {
-              "color": {
-                "$token": "fortal.gray.a2"
-              }
-            },
-            {
-              "border": {
-                "top": {
-                  "color": {
-                    "$token": "fortal.gray.5"
-                  },
-                  "width": {
-                    "$token": "fortal.border.width.1",
-                    "kind": "space"
-                  }
-                },
-                "right": {
-                  "color": {
-                    "$token": "fortal.gray.5"
-                  },
-                  "width": {
-                    "$token": "fortal.border.width.1",
-                    "kind": "space"
-                  }
-                },
-                "bottom": {
-                  "color": {
-                    "$token": "fortal.gray.5"
-                  },
-                  "width": {
-                    "$token": "fortal.border.width.1",
-                    "kind": "space"
-                  }
-                },
-                "left": {
-                  "color": {
-                    "$token": "fortal.gray.5"
-                  },
-                  "width": {
-                    "$token": "fortal.border.width.1",
-                    "kind": "space"
-                  }
-                }
-              }
-            }
-          ]
-        }
-      }
-    }
-  ],
-  "v": 1
-}
diff --git a/atlas/fortal/styles/button/surface-size1/icon.mix.json b/atlas/fortal/styles/button/surface-size1/icon.mix.json
deleted file mode 100644
index 81d43605..00000000
--- a/atlas/fortal/styles/button/surface-size1/icon.mix.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "type": "icon",
-  "color": {
-    "$token": "fortal.accent.11"
-  },
-  "size": 12.0,
-  "variants": [
-    {
-      "kind": "widget_state",
-      "state": "disabled",
-      "style": {
-        "type": "icon",
-        "color": {
-          "$token": "fortal.gray.8"
-        }
-      }
-    }
-  ],
-  "v": 1
-}
diff --git a/atlas/fortal/styles/button/surface-size1/label.mix.json b/atlas/fortal/styles/button/surface-size1/label.mix.json
deleted file mode 100644
index e23fe275..00000000
--- a/atlas/fortal/styles/button/surface-size1/label.mix.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-  "type": "text",
-  "style": {
-    "$merge": [
-      {
-        "fontWeight": {
-          "$token": "fortal.font.weight.medium"
-        }
-      },
-      {
-        "fontSize": 12.0
-      },
-      {
-        "height": 1.3333333333333333
-      },
-      {
-        "letterSpacing": 0.0025
-      },
-      {
-        "color": {
-          "$token": "fortal.accent.11"
-        }
-      }
-    ]
-  },
-  "variants": [
-    {
-      "kind": "widget_state",
-      "state": "disabled",
-      "style": {
-        "type": "text",
-        "style": {
-          "color": {
-            "$token": "fortal.gray.8"
-          }
-        }
-      }
-    }
-  ],
-  "v": 1
-}
diff --git a/atlas/fortal/styles/button/surface-size2/container.mix.json b/atlas/fortal/styles/button/surface-size2/container.mix.json
deleted file mode 100644
index f427648e..00000000
--- a/atlas/fortal/styles/button/surface-size2/container.mix.json
+++ /dev/null
@@ -1,239 +0,0 @@
-{
-  "type": "flex_box",
-  "padding": {
-    "$merge": [
-      {
-        "left": {
-          "$token": "fortal.space.3",
-          "kind": "space"
-        },
-        "right": {
-          "$token": "fortal.space.3",
-          "kind": "space"
-        }
-      },
-      {
-        "top": {
-          "$token": "fortal.space.2",
-          "kind": "space"
-        },
-        "bottom": {
-          "$token": "fortal.space.2",
-          "kind": "space"
-        }
-      }
-    ]
-  },
-  "decoration": {
-    "$merge": [
-      {
-        "borderRadius": {
-          "$token": "fortal.radius.3"
-        }
-      },
-      {
-        "color": {
-          "$token": "fortal.accent.a2"
-        }
-      },
-      {
-        "border": {
-          "top": {
-            "color": {
-              "$token": "fortal.accent.6"
-            },
-            "width": {
-              "$token": "fortal.border.width.1",
-              "kind": "space"
-            }
-          },
-          "right": {
-            "color": {
-              "$token": "fortal.accent.6"
-            },
-            "width": {
-              "$token": "fortal.border.width.1",
-              "kind": "space"
-            }
-          },
-          "bottom": {
-            "color": {
-              "$token": "fortal.accent.6"
-            },
-            "width": {
-              "$token": "fortal.border.width.1",
-              "kind": "space"
-            }
-          },
-          "left": {
-            "color": {
-              "$token": "fortal.accent.6"
-            },
-            "width": {
-              "$token": "fortal.border.width.1",
-              "kind": "space"
-            }
-          }
-        }
-      }
-    ]
-  },
-  "mainAxisSize": "min",
-  "spacing": {
-    "$token": "fortal.space.2",
-    "kind": "space"
-  },
-  "variants": [
-    {
-      "kind": "widget_state",
-      "state": "focused",
-      "style": {
-        "type": "flex_box",
-        "decoration": {
-          "border": {
-            "top": {
-              "color": {
-                "$token": "fortal.focus.a8"
-              },
-              "width": {
-                "$token": "fortal.focus.ring.width",
-                "kind": "space"
-              }
-            },
-            "right": {
-              "color": {
-                "$token": "fortal.focus.a8"
-              },
-              "width": {
-                "$token": "fortal.focus.ring.width",
-                "kind": "space"
-              }
-            },
-            "bottom": {
-              "color": {
-                "$token": "fortal.focus.a8"
-              },
-              "width": {
-                "$token": "fortal.focus.ring.width",
-                "kind": "space"
-              }
-            },
-            "left": {
-              "color": {
-                "$token": "fortal.focus.a8"
-              },
-              "width": {
-                "$token": "fortal.focus.ring.width",
-                "kind": "space"
-              }
-            }
-          }
-        }
-      }
-    },
-    {
-      "kind": "widget_state",
-      "state": "hovered",
-      "style": {
-        "type": "flex_box",
-        "decoration": {
-          "border": {
-            "top": {
-              "color": {
-                "$token": "fortal.accent.8"
-              },
-              "width": {
-                "$token": "fortal.border.width.1",
-                "kind": "space"
-              }
-            },
-            "right": {
-              "color": {
-                "$token": "fortal.accent.8"
-              },
-              "width": {
-                "$token": "fortal.border.width.1",
-                "kind": "space"
-              }
-            },
-            "bottom": {
-              "color": {
-                "$token": "fortal.accent.8"
-              },
-              "width": {
-                "$token": "fortal.border.width.1",
-                "kind": "space"
-              }
-            },
-            "left": {
-              "color": {
-                "$token": "fortal.accent.8"
-              },
-              "width": {
-                "$token": "fortal.border.width.1",
-                "kind": "space"
-              }
-            }
-          }
-        }
-      }
-    },
-    {
-      "kind": "widget_state",
-      "state": "disabled",
-      "style": {
-        "type": "flex_box",
-        "decoration": {
-          "$merge": [
-            {
-              "color": {
-                "$token": "fortal.gray.a2"
-              }
-            },
-            {
-              "border": {
-                "top": {
-                  "color": {
-                    "$token": "fortal.gray.5"
-                  },
-                  "width": {
-                    "$token": "fortal.border.width.1",
-                    "kind": "space"
-                  }
-                },
-                "right": {
-                  "color": {
-                    "$token": "fortal.gray.5"
-                  },
-                  "width": {
-                    "$token": "fortal.border.width.1",
-                    "kind": "space"
-                  }
-                },
-                "bottom": {
-                  "color": {
-                    "$token": "fortal.gray.5"
-                  },
-                  "width": {
-                    "$token": "fortal.border.width.1",
-                    "kind": "space"
-                  }
-                },
-                "left": {
-                  "color": {
-                    "$token": "fortal.gray.5"
-                  },
-                  "width": {
-                    "$token": "fortal.border.width.1",
-                    "kind": "space"
-                  }
-                }
-              }
-            }
-          ]
-        }
-      }
-    }
-  ],
-  "v": 1
-}
diff --git a/atlas/fortal/styles/button/surface-size2/icon.mix.json b/atlas/fortal/styles/button/surface-size2/icon.mix.json
deleted file mode 100644
index ce290453..00000000
--- a/atlas/fortal/styles/button/surface-size2/icon.mix.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "type": "icon",
-  "color": {
-    "$token": "fortal.accent.11"
-  },
-  "size": 16.0,
-  "variants": [
-    {
-      "kind": "widget_state",
-      "state": "disabled",
-      "style": {
-        "type": "icon",
-        "color": {
-          "$token": "fortal.gray.8"
-        }
-      }
-    }
-  ],
-  "v": 1
-}
diff --git a/atlas/fortal/styles/button/surface-size2/label.mix.json b/atlas/fortal/styles/button/surface-size2/label.mix.json
deleted file mode 100644
index 0bcb9265..00000000
--- a/atlas/fortal/styles/button/surface-size2/label.mix.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-  "type": "text",
-  "style": {
-    "$merge": [
-      {
-        "fontWeight": {
-          "$token": "fortal.font.weight.medium"
-        }
-      },
-      {
-        "fontSize": 14.0
-      },
-      {
-        "height": 1.4285714285714286
-      },
-      {
-        "letterSpacing": 0.0
-      },
-      {
-        "color": {
-          "$token": "fortal.accent.11"
-        }
-      }
-    ]
-  },
-  "variants": [
-    {
-      "kind": "widget_state",
-      "state": "disabled",
-      "style": {
-        "type": "text",
-        "style": {
-          "color": {
-            "$token": "fortal.gray.8"
-          }
-        }
-      }
-    }
-  ],
-  "v": 1
-}
diff --git a/atlas/fortal/styles/button/surface-size3/container.mix.json b/atlas/fortal/styles/button/surface-size3/container.mix.json
deleted file mode 100644
index 73e03851..00000000
--- a/atlas/fortal/styles/button/surface-size3/container.mix.json
+++ /dev/null
@@ -1,239 +0,0 @@
-{
-  "type": "flex_box",
-  "padding": {
-    "$merge": [
-      {
-        "left": {
-          "$token": "fortal.space.4",
-          "kind": "space"
-        },
-        "right": {
-          "$token": "fortal.space.4",
-          "kind": "space"
-        }
-      },
-      {
-        "top": {
-          "$token": "fortal.space.3",
-          "kind": "space"
-        },
-        "bottom": {
-          "$token": "fortal.space.3",
-          "kind": "space"
-        }
-      }
-    ]
-  },
-  "decoration": {
-    "$merge": [
-      {
-        "borderRadius": {
-          "$token": "fortal.radius.4"
-        }
-      },
-      {
-        "color": {
-          "$token": "fortal.accent.a2"
-        }
-      },
-      {
-        "border": {
-          "top": {
-            "color": {
-              "$token": "fortal.accent.6"
-            },
-            "width": {
-              "$token": "fortal.border.width.1",
-              "kind": "space"
-            }
-          },
-          "right": {
-            "color": {
-              "$token": "fortal.accent.6"
-            },
-            "width": {
-              "$token": "fortal.border.width.1",
-              "kind": "space"
-            }
-          },
-          "bottom": {
-            "color": {
-              "$token": "fortal.accent.6"
-            },
-            "width": {
-              "$token": "fortal.border.width.1",
-              "kind": "space"
-            }
-          },
-          "left": {
-            "color": {
-              "$token": "fortal.accent.6"
-            },
-            "width": {
-              "$token": "fortal.border.width.1",
-              "kind": "space"
-            }
-          }
-        }
-      }
-    ]
-  },
-  "mainAxisSize": "min",
-  "spacing": {
-    "$token": "fortal.space.3",
-    "kind": "space"
-  },
-  "variants": [
-    {
-      "kind": "widget_state",
-      "state": "focused",
-      "style": {
-        "type": "flex_box",
-        "decoration": {
-          "border": {
-            "top": {
-              "color": {
-                "$token": "fortal.focus.a8"
-              },
-              "width": {
-                "$token": "fortal.focus.ring.width",
-                "kind": "space"
-              }
-            },
-            "right": {
-              "color": {
-                "$token": "fortal.focus.a8"
-              },
-              "width": {
-                "$token": "fortal.focus.ring.width",
-                "kind": "space"
-              }
-            },
-            "bottom": {
-              "color": {
-                "$token": "fortal.focus.a8"
-              },
-              "width": {
-                "$token": "fortal.focus.ring.width",
-                "kind": "space"
-              }
-            },
-            "left": {
-              "color": {
-                "$token": "fortal.focus.a8"
-              },
-              "width": {
-                "$token": "fortal.focus.ring.width",
-                "kind": "space"
-              }
-            }
-          }
-        }
-      }
-    },
-    {
-      "kind": "widget_state",
-      "state": "hovered",
-      "style": {
-        "type": "flex_box",
-        "decoration": {
-          "border": {
-            "top": {
-              "color": {
-                "$token": "fortal.accent.8"
-              },
-              "width": {
-                "$token": "fortal.border.width.1",
-                "kind": "space"
-              }
-            },
-            "right": {
-              "color": {
-                "$token": "fortal.accent.8"
-              },
-              "width": {
-                "$token": "fortal.border.width.1",
-                "kind": "space"
-              }
-            },
-            "bottom": {
-              "color": {
-                "$token": "fortal.accent.8"
-              },
-              "width": {
-                "$token": "fortal.border.width.1",
-                "kind": "space"
-              }
-            },
-            "left": {
-              "color": {
-                "$token": "fortal.accent.8"
-              },
-              "width": {
-                "$token": "fortal.border.width.1",
-                "kind": "space"
-              }
-            }
-          }
-        }
-      }
-    },
-    {
-      "kind": "widget_state",
-      "state": "disabled",
-      "style": {
-        "type": "flex_box",
-        "decoration": {
-          "$merge": [
-            {
-              "color": {
-                "$token": "fortal.gray.a2"
-              }
-            },
-            {
-              "border": {
-                "top": {
-                  "color": {
-                    "$token": "fortal.gray.5"
-                  },
-                  "width": {
-                    "$token": "fortal.border.width.1",
-                    "kind": "space"
-                  }
-                },
-                "right": {
-                  "color": {
-                    "$token": "fortal.gray.5"
-                  },
-                  "width": {
-                    "$token": "fortal.border.width.1",
-                    "kind": "space"
-                  }
-                },
-                "bottom": {
-                  "color": {
-                    "$token": "fortal.gray.5"
-                  },
-                  "width": {
-                    "$token": "fortal.border.width.1",
-                    "kind": "space"
-                  }
-                },
-                "left": {
-                  "color": {
-                    "$token": "fortal.gray.5"
-                  },
-                  "width": {
-                    "$token": "fortal.border.width.1",
-                    "kind": "space"
-                  }
-                }
-              }
-            }
-          ]
-        }
-      }
-    }
-  ],
-  "v": 1
-}
diff --git a/atlas/fortal/styles/button/surface-size3/icon.mix.json b/atlas/fortal/styles/button/surface-size3/icon.mix.json
deleted file mode 100644
index 3aa7436b..00000000
--- a/atlas/fortal/styles/button/surface-size3/icon.mix.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "type": "icon",
-  "color": {
-    "$token": "fortal.accent.11"
-  },
-  "size": 20.0,
-  "variants": [
-    {
-      "kind": "widget_state",
-      "state": "disabled",
-      "style": {
-        "type": "icon",
-        "color": {
-          "$token": "fortal.gray.8"
-        }
-      }
-    }
-  ],
-  "v": 1
-}
diff --git a/atlas/fortal/styles/button/surface-size3/label.mix.json b/atlas/fortal/styles/button/surface-size3/label.mix.json
deleted file mode 100644
index d473b197..00000000
--- a/atlas/fortal/styles/button/surface-size3/label.mix.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-  "type": "text",
-  "style": {
-    "$merge": [
-      {
-        "fontWeight": {
-          "$token": "fortal.font.weight.medium"
-        }
-      },
-      {
-        "fontSize": 16.0
-      },
-      {
-        "height": 1.5
-      },
-      {
-        "letterSpacing": 0.0
-      },
-      {
-        "color": {
-          "$token": "fortal.accent.11"
-        }
-      }
-    ]
-  },
-  "variants": [
-    {
-      "kind": "widget_state",
-      "state": "disabled",
-      "style": {
-        "type": "text",
-        "style": {
-          "color": {
-            "$token": "fortal.gray.8"
-          }
-        }
-      }
-    }
-  ],
-  "v": 1
-}
diff --git a/atlas/fortal/styles/button/surface-size4/container.mix.json b/atlas/fortal/styles/button/surface-size4/container.mix.json
deleted file mode 100644
index f42d7307..00000000
--- a/atlas/fortal/styles/button/surface-size4/container.mix.json
+++ /dev/null
@@ -1,239 +0,0 @@
-{
-  "type": "flex_box",
-  "padding": {
-    "$merge": [
-      {
-        "left": {
-          "$token": "fortal.space.5",
-          "kind": "space"
-        },
-        "right": {
-          "$token": "fortal.space.5",
-          "kind": "space"
-        }
-      },
-      {
-        "top": {
-          "$token": "fortal.space.4",
-          "kind": "space"
-        },
-        "bottom": {
-          "$token": "fortal.space.4",
-          "kind": "space"
-        }
-      }
-    ]
-  },
-  "decoration": {
-    "$merge": [
-      {
-        "borderRadius": {
-          "$token": "fortal.radius.5"
-        }
-      },
-      {
-        "color": {
-          "$token": "fortal.accent.a2"
-        }
-      },
-      {
-        "border": {
-          "top": {
-            "color": {
-              "$token": "fortal.accent.6"
-            },
-            "width": {
-              "$token": "fortal.border.width.1",
-              "kind": "space"
-            }
-          },
-          "right": {
-            "color": {
-              "$token": "fortal.accent.6"
-            },
-            "width": {
-              "$token": "fortal.border.width.1",
-              "kind": "space"
-            }
-          },
-          "bottom": {
-            "color": {
-              "$token": "fortal.accent.6"
-            },
-            "width": {
-              "$token": "fortal.border.width.1",
-              "kind": "space"
-            }
-          },
-          "left": {
-            "color": {
-              "$token": "fortal.accent.6"
-            },
-            "width": {
-              "$token": "fortal.border.width.1",
-              "kind": "space"
-            }
-          }
-        }
-      }
-    ]
-  },
-  "mainAxisSize": "min",
-  "spacing": {
-    "$token": "fortal.space.4",
-    "kind": "space"
-  },
-  "variants": [
-    {
-      "kind": "widget_state",
-      "state": "focused",
-      "style": {
-        "type": "flex_box",
-        "decoration": {
-          "border": {
-            "top": {
-              "color": {
-                "$token": "fortal.focus.a8"
-              },
-              "width": {
-                "$token": "fortal.focus.ring.width",
-                "kind": "space"
-              }
-            },
-            "right": {
-              "color": {
-                "$token": "fortal.focus.a8"
-              },
-              "width": {
-                "$token": "fortal.focus.ring.width",
-                "kind": "space"
-              }
-            },
-            "bottom": {
-              "color": {
-                "$token": "fortal.focus.a8"
-              },
-              "width": {
-                "$token": "fortal.focus.ring.width",
-                "kind": "space"
-              }
-            },
-            "left": {
-              "color": {
-                "$token": "fortal.focus.a8"
-              },
-              "width": {
-                "$token": "fortal.focus.ring.width",
-                "kind": "space"
-              }
-            }
-          }
-        }
-      }
-    },
-    {
-      "kind": "widget_state",
-      "state": "hovered",
-      "style": {
-        "type": "flex_box",
-        "decoration": {
-          "border": {
-            "top": {
-              "color": {
-                "$token": "fortal.accent.8"
-              },
-              "width": {
-                "$token": "fortal.border.width.1",
-                "kind": "space"
-              }
-            },
-            "right": {
-              "color": {
-                "$token": "fortal.accent.8"
-              },
-              "width": {
-                "$token": "fortal.border.width.1",
-                "kind": "space"
-              }
-            },
-            "bottom": {
-              "color": {
-                "$token": "fortal.accent.8"
-              },
-              "width": {
-                "$token": "fortal.border.width.1",
-                "kind": "space"
-              }
-            },
-            "left": {
-              "color": {
-                "$token": "fortal.accent.8"
-              },
-              "width": {
-                "$token": "fortal.border.width.1",
-                "kind": "space"
-              }
-            }
-          }
-        }
-      }
-    },
-    {
-      "kind": "widget_state",
-      "state": "disabled",
-      "style": {
-        "type": "flex_box",
-        "decoration": {
-          "$merge": [
-            {
-              "color": {
-                "$token": "fortal.gray.a2"
-              }
-            },
-            {
-              "border": {
-                "top": {
-                  "color": {
-                    "$token": "fortal.gray.5"
-                  },
-                  "width": {
-                    "$token": "fortal.border.width.1",
-                    "kind": "space"
-                  }
-                },
-                "right": {
-                  "color": {
-                    "$token": "fortal.gray.5"
-                  },
-                  "width": {
-                    "$token": "fortal.border.width.1",
-                    "kind": "space"
-                  }
-                },
-                "bottom": {
-                  "color": {
-                    "$token": "fortal.gray.5"
-                  },
-                  "width": {
-                    "$token": "fortal.border.width.1",
-                    "kind": "space"
-                  }
-                },
-                "left": {
-                  "color": {
-                    "$token": "fortal.gray.5"
-                  },
-                  "width": {
-                    "$token": "fortal.border.width.1",
-                    "kind": "space"
-                  }
-                }
-              }
-            }
-          ]
-        }
-      }
-    }
-  ],
-  "v": 1
-}
diff --git a/atlas/fortal/styles/button/surface-size4/icon.mix.json b/atlas/fortal/styles/button/surface-size4/icon.mix.json
deleted file mode 100644
index f3867e47..00000000
--- a/atlas/fortal/styles/button/surface-size4/icon.mix.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "type": "icon",
-  "color": {
-    "$token": "fortal.accent.11"
-  },
-  "size": 24.0,
-  "variants": [
-    {
-      "kind": "widget_state",
-      "state": "disabled",
-      "style": {
-        "type": "icon",
-        "color": {
-          "$token": "fortal.gray.8"
-        }
-      }
-    }
-  ],
-  "v": 1
-}
diff --git a/atlas/fortal/styles/button/surface-size4/label.mix.json b/atlas/fortal/styles/button/surface-size4/label.mix.json
deleted file mode 100644
index a07c6afc..00000000
--- a/atlas/fortal/styles/button/surface-size4/label.mix.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-  "type": "text",
-  "style": {
-    "$merge": [
-      {
-        "fontWeight": {
-          "$token": "fortal.font.weight.medium"
-        }
-      },
-      {
-        "fontSize": 18.0
-      },
-      {
-        "height": 1.4444444444444444
-      },
-      {
-        "letterSpacing": -0.0025
-      },
-      {
-        "color": {
-          "$token": "fortal.accent.11"
-        }
-      }
-    ]
-  },
-  "variants": [
-    {
-      "kind": "widget_state",
-      "state": "disabled",
-      "style": {
-        "type": "text",
-        "style": {
-          "color": {
-            "$token": "fortal.gray.8"
-          }
-        }
-      }
-    }
-  ],
-  "v": 1
-}
diff --git a/atlas/fortal/themes/dark.mix.json b/atlas/fortal/themes/dark.mix.json
deleted file mode 100644
index e1ede959..00000000
--- a/atlas/fortal/themes/dark.mix.json
+++ /dev/null
@@ -1,360 +0,0 @@
-{
-  "v": 1,
-  "type": "theme",
-  "colors": {
-    "fortal.color.background": "#111113",
-    "fortal.color.surface": "#801F2123",
-    "fortal.color.panel.solid": "#18191B",
-    "fortal.color.panel.translucent": "#09D8F4F6",
-    "fortal.color.overlay": "#99000000",
-    "fortal.accent.surface": "#80171D3B",
-    "fortal.accent.indicator": "#3E63DD",
-    "fortal.accent.track": "#3E63DD",
-    "fortal.accent.contrast": "#FFFFFF",
-    "fortal.focus.8": "#405EB2",
-    "fortal.focus.a8": "#AC5783FF",
-    "fortal.accent.1": "#0C111C",
-    "fortal.accent.2": "#111725",
-    "fortal.accent.3": "#172448",
-    "fortal.accent.4": "#1D2E61",
-    "fortal.accent.5": "#243974",
-    "fortal.accent.6": "#2D4484",
-    "fortal.accent.7": "#375098",
-    "fortal.accent.8": "#405EB2",
-    "fortal.accent.9": "#3D63DD",
-    "fortal.accent.10": "#3F5CB0",
-    "fortal.accent.11": "#93B4FF",
-    "fortal.accent.12": "#D5E2FF",
-    "fortal.gray.1": "#111113",
-    "fortal.gray.2": "#18191B",
-    "fortal.gray.3": "#212225",
-    "fortal.gray.4": "#272A2D",
-    "fortal.gray.5": "#2E3135",
-    "fortal.gray.6": "#363A3F",
-    "fortal.gray.7": "#43484E",
-    "fortal.gray.8": "#5A6169",
-    "fortal.gray.9": "#696E77",
-    "fortal.gray.10": "#777B84",
-    "fortal.gray.11": "#B0B4BA",
-    "fortal.gray.12": "#EDEEF0",
-    "fortal.gray.surface": "#801F2123",
-    "fortal.gray.indicator": "#696E77",
-    "fortal.gray.track": "#696E77",
-    "fortal.gray.contrast": "#FFFFFF",
-    "fortal.accent.a1": "#0F0012FB",
-    "fortal.accent.a2": "#171156F9",
-    "fortal.accent.a3": "#3C2B64FF",
-    "fortal.accent.a4": "#573567FF",
-    "fortal.accent.a5": "#6B3F71FD",
-    "fortal.accent.a6": "#7C4B7AFD",
-    "fortal.accent.a7": "#905480FF",
-    "fortal.accent.a8": "#AC5783FF",
-    "fortal.accent.a9": "#DB4571FF",
-    "fortal.accent.a10": "#E35580FE",
-    "fortal.accent.a11": "#93B4FF",
-    "fortal.accent.a12": "#D5E2FF",
-    "fortal.gray.a1": "#00000000",
-    "fortal.gray.a2": "#09D8F4F6",
-    "fortal.gray.a3": "#14DDEAF8",
-    "fortal.gray.a4": "#1DD3EDF8",
-    "fortal.gray.a5": "#25D9EDFE",
-    "fortal.gray.a6": "#30D6EBFD",
-    "fortal.gray.a7": "#40D9EDFF",
-    "fortal.gray.a8": "#5DD9EDFF",
-    "fortal.gray.a9": "#6DDFEBFD",
-    "fortal.gray.a10": "#7BE5EDFD",
-    "fortal.gray.a11": "#B5F1F7FE",
-    "fortal.gray.a12": "#EFFCFDFF",
-    "fortal.black.a3": "#26000000",
-    "fortal.black.a4": "#33000000",
-    "fortal.black.a5": "#4D000000",
-    "fortal.black.a6": "#66000000",
-    "fortal.black.a7": "#80000000",
-    "fortal.black.a11": "#E6000000",
-    "fortal.shadow.stroke": "#66000000"
-  },
-  "spaces": {
-    "fortal.space.1": 4.0,
-    "fortal.space.2": 8.0,
-    "fortal.space.3": 12.0,
-    "fortal.space.4": 16.0,
-    "fortal.space.5": 24.0,
-    "fortal.space.6": 32.0,
-    "fortal.space.7": 40.0,
-    "fortal.space.8": 48.0,
-    "fortal.space.9": 64.0,
-    "fortal.border.width.1": 1.0,
-    "fortal.border.width.2": 2.0,
-    "fortal.focus.ring.width": 2.0,
-    "fortal.focus.ring.offset": 2.0
-  },
-  "radii": {
-    "fortal.radius.1": 3.0,
-    "fortal.radius.2": 4.0,
-    "fortal.radius.3": 6.0,
-    "fortal.radius.4": 8.0,
-    "fortal.radius.5": 12.0,
-    "fortal.radius.6": 16.0,
-    "fortal.radius.full": 9999.0
-  },
-  "textStyles": {
-    "fortal.text.1": {
-      "fontSize": 12.0,
-      "letterSpacing": 0.03,
-      "height": 1.3333333333333333
-    },
-    "fortal.text.2": {
-      "fontSize": 14.0,
-      "letterSpacing": 0.0,
-      "height": 1.4285714285714286
-    },
-    "fortal.text.3": {
-      "fontSize": 16.0,
-      "letterSpacing": 0.0,
-      "height": 1.5
-    },
-    "fortal.text.4": {
-      "fontSize": 18.0,
-      "letterSpacing": -0.045,
-      "height": 1.4444444444444444
-    },
-    "fortal.text.5": {
-      "fontSize": 20.0,
-      "letterSpacing": -0.1,
-      "height": 1.4
-    },
-    "fortal.text.6": {
-      "fontSize": 24.0,
-      "letterSpacing": -0.15000000000000002,
-      "height": 1.25
-    },
-    "fortal.text.7": {
-      "fontSize": 28.0,
-      "letterSpacing": -0.21,
-      "height": 1.2857142857142858
-    },
-    "fortal.text.8": {
-      "fontSize": 35.0,
-      "letterSpacing": -0.35000000000000003,
-      "height": 1.1428571428571428
-    },
-    "fortal.text.9": {
-      "fontSize": 60.0,
-      "letterSpacing": -1.5,
-      "height": 1.0
-    }
-  },
-  "boxShadows": {
-    "fortal.shadow.1": [
-      {
-        "color": "#30D6EBFD",
-        "offset": {
-          "x": 0.0,
-          "y": 0.0
-        },
-        "blurRadius": 0.0,
-        "spreadRadius": 1.0
-      },
-      {
-        "color": "#4D000000",
-        "offset": {
-          "x": 0.0,
-          "y": 1.0
-        },
-        "blurRadius": 2.0,
-        "spreadRadius": 0.0
-      }
-    ],
-    "fortal.shadow.2": [
-      {
-        "color": "#66000000",
-        "offset": {
-          "x": 0.0,
-          "y": 0.0
-        },
-        "blurRadius": 0.0,
-        "spreadRadius": 1.0
-      },
-      {
-        "color": "#26000000",
-        "offset": {
-          "x": 0.0,
-          "y": 0.0
-        },
-        "blurRadius": 0.5,
-        "spreadRadius": 0.0
-      },
-      {
-        "color": "#66000000",
-        "offset": {
-          "x": 0.0,
-          "y": 1.0
-        },
-        "blurRadius": 1.0,
-        "spreadRadius": 0.0
-      },
-      {
-        "color": "#66000000",
-        "offset": {
-          "x": 0.0,
-          "y": 2.0
-        },
-        "blurRadius": 1.0,
-        "spreadRadius": -1.0
-      },
-      {
-        "color": "#4D000000",
-        "offset": {
-          "x": 0.0,
-          "y": 1.0
-        },
-        "blurRadius": 3.0,
-        "spreadRadius": 0.0
-      }
-    ],
-    "fortal.shadow.3": [
-      {
-        "color": "#66000000",
-        "offset": {
-          "x": 0.0,
-          "y": 0.0
-        },
-        "blurRadius": 0.0,
-        "spreadRadius": 1.0
-      },
-      {
-        "color": "#26000000",
-        "offset": {
-          "x": 0.0,
-          "y": 2.0
-        },
-        "blurRadius": 3.0,
-        "spreadRadius": -2.0
-      },
-      {
-        "color": "#66000000",
-        "offset": {
-          "x": 0.0,
-          "y": 3.0
-        },
-        "blurRadius": 8.0,
-        "spreadRadius": -2.0
-      },
-      {
-        "color": "#80000000",
-        "offset": {
-          "x": 0.0,
-          "y": 4.0
-        },
-        "blurRadius": 12.0,
-        "spreadRadius": -4.0
-      }
-    ],
-    "fortal.shadow.4": [
-      {
-        "color": "#66000000",
-        "offset": {
-          "x": 0.0,
-          "y": 0.0
-        },
-        "blurRadius": 0.0,
-        "spreadRadius": 1.0
-      },
-      {
-        "color": "#26000000",
-        "offset": {
-          "x": 0.0,
-          "y": 8.0
-        },
-        "blurRadius": 40.0,
-        "spreadRadius": 0.0
-      },
-      {
-        "color": "#4D000000",
-        "offset": {
-          "x": 0.0,
-          "y": 12.0
-        },
-        "blurRadius": 32.0,
-        "spreadRadius": -16.0
-      }
-    ],
-    "fortal.shadow.5": [
-      {
-        "color": "#66000000",
-        "offset": {
-          "x": 0.0,
-          "y": 0.0
-        },
-        "blurRadius": 0.0,
-        "spreadRadius": 1.0
-      },
-      {
-        "color": "#4D000000",
-        "offset": {
-          "x": 0.0,
-          "y": 12.0
-        },
-        "blurRadius": 60.0,
-        "spreadRadius": 0.0
-      },
-      {
-        "color": "#80000000",
-        "offset": {
-          "x": 0.0,
-          "y": 12.0
-        },
-        "blurRadius": 32.0,
-        "spreadRadius": -16.0
-      }
-    ],
-    "fortal.shadow.6": [
-      {
-        "color": "#66000000",
-        "offset": {
-          "x": 0.0,
-          "y": 0.0
-        },
-        "blurRadius": 0.0,
-        "spreadRadius": 1.0
-      },
-      {
-        "color": "#33000000",
-        "offset": {
-          "x": 0.0,
-          "y": 12.0
-        },
-        "blurRadius": 60.0,
-        "spreadRadius": 0.0
-      },
-      {
-        "color": "#66000000",
-        "offset": {
-          "x": 0.0,
-          "y": 16.0
-        },
-        "blurRadius": 64.0,
-        "spreadRadius": 0.0
-      },
-      {
-        "color": "#E6000000",
-        "offset": {
-          "x": 0.0,
-          "y": 16.0
-        },
-        "blurRadius": 36.0,
-        "spreadRadius": -20.0
-      }
-    ]
-  },
-  "fontWeights": {
-    "fortal.font.weight.light": "w300",
-    "fortal.font.weight.regular": "w400",
-    "fortal.font.weight.medium": "w500",
-    "fortal.font.weight.bold": "w700"
-  },
-  "durations": {
-    "fortal.transition.fast": 100,
-    "fortal.transition.slow": 300
-  }
-}
diff --git a/atlas/fortal/themes/light.mix.json b/atlas/fortal/themes/light.mix.json
deleted file mode 100644
index 994c1ce5..00000000
--- a/atlas/fortal/themes/light.mix.json
+++ /dev/null
@@ -1,360 +0,0 @@
-{
-  "v": 1,
-  "type": "theme",
-  "colors": {
-    "fortal.color.background": "#FCFCFD",
-    "fortal.color.surface": "#CCFFFFFF",
-    "fortal.color.panel.solid": "#F9F9FB",
-    "fortal.color.panel.translucent": "#06000055",
-    "fortal.color.overlay": "#66000000",
-    "fortal.accent.surface": "#CCF5F8FF",
-    "fortal.accent.indicator": "#3E63DD",
-    "fortal.accent.track": "#3E63DD",
-    "fortal.accent.contrast": "#FFFFFF",
-    "fortal.focus.8": "#87A5EF",
-    "fortal.focus.a8": "#720040DD",
-    "fortal.accent.1": "#FDFDFE",
-    "fortal.accent.2": "#F7F9FF",
-    "fortal.accent.3": "#EDF2FE",
-    "fortal.accent.4": "#DFEAFF",
-    "fortal.accent.5": "#D0DFFF",
-    "fortal.accent.6": "#BDD1FF",
-    "fortal.accent.7": "#A6BFF9",
-    "fortal.accent.8": "#87A5EF",
-    "fortal.accent.9": "#3D63DD",
-    "fortal.accent.10": "#3657C3",
-    "fortal.accent.11": "#395BC7",
-    "fortal.accent.12": "#1D2E5C",
-    "fortal.gray.1": "#FCFCFD",
-    "fortal.gray.2": "#F9F9FB",
-    "fortal.gray.3": "#F0F0F3",
-    "fortal.gray.4": "#E8E8EC",
-    "fortal.gray.5": "#E0E1E6",
-    "fortal.gray.6": "#D9D9E0",
-    "fortal.gray.7": "#CDCED7",
-    "fortal.gray.8": "#B9BBC6",
-    "fortal.gray.9": "#8B8D98",
-    "fortal.gray.10": "#80828D",
-    "fortal.gray.11": "#62636C",
-    "fortal.gray.12": "#1E1F24",
-    "fortal.gray.surface": "#CCFFFFFF",
-    "fortal.gray.indicator": "#8B8D98",
-    "fortal.gray.track": "#8B8D98",
-    "fortal.gray.contrast": "#FFFFFF",
-    "fortal.accent.a1": "#02000080",
-    "fortal.accent.a2": "#080040FF",
-    "fortal.accent.a3": "#120047F1",
-    "fortal.accent.a4": "#1E0058FF",
-    "fortal.accent.a5": "#2D0052FF",
-    "fortal.accent.a6": "#3E004EFF",
-    "fortal.accent.a7": "#540048EE",
-    "fortal.accent.a8": "#720040DD",
-    "fortal.accent.a9": "#C10032D2",
-    "fortal.accent.a10": "#CC002AB3",
-    "fortal.accent.a11": "#C5002CB7",
-    "fortal.accent.a12": "#E0001347",
-    "fortal.gray.a1": "#03000055",
-    "fortal.gray.a2": "#06000055",
-    "fortal.gray.a3": "#0F001040",
-    "fortal.gray.a4": "#17000B36",
-    "fortal.gray.a5": "#1F000932",
-    "fortal.gray.a6": "#26000735",
-    "fortal.gray.a7": "#32000633",
-    "fortal.gray.a8": "#46000830",
-    "fortal.gray.a9": "#7400051D",
-    "fortal.gray.a10": "#7F00051B",
-    "fortal.gray.a11": "#9F000211",
-    "fortal.gray.a12": "#E3000107",
-    "fortal.black.a3": "#26000000",
-    "fortal.black.a4": "#33000000",
-    "fortal.black.a5": "#4D000000",
-    "fortal.black.a6": "#66000000",
-    "fortal.black.a7": "#80000000",
-    "fortal.black.a11": "#E6000000",
-    "fortal.shadow.stroke": "#66000000"
-  },
-  "spaces": {
-    "fortal.space.1": 4.0,
-    "fortal.space.2": 8.0,
-    "fortal.space.3": 12.0,
-    "fortal.space.4": 16.0,
-    "fortal.space.5": 24.0,
-    "fortal.space.6": 32.0,
-    "fortal.space.7": 40.0,
-    "fortal.space.8": 48.0,
-    "fortal.space.9": 64.0,
-    "fortal.border.width.1": 1.0,
-    "fortal.border.width.2": 2.0,
-    "fortal.focus.ring.width": 2.0,
-    "fortal.focus.ring.offset": 2.0
-  },
-  "radii": {
-    "fortal.radius.1": 3.0,
-    "fortal.radius.2": 4.0,
-    "fortal.radius.3": 6.0,
-    "fortal.radius.4": 8.0,
-    "fortal.radius.5": 12.0,
-    "fortal.radius.6": 16.0,
-    "fortal.radius.full": 9999.0
-  },
-  "textStyles": {
-    "fortal.text.1": {
-      "fontSize": 12.0,
-      "letterSpacing": 0.03,
-      "height": 1.3333333333333333
-    },
-    "fortal.text.2": {
-      "fontSize": 14.0,
-      "letterSpacing": 0.0,
-      "height": 1.4285714285714286
-    },
-    "fortal.text.3": {
-      "fontSize": 16.0,
-      "letterSpacing": 0.0,
-      "height": 1.5
-    },
-    "fortal.text.4": {
-      "fontSize": 18.0,
-      "letterSpacing": -0.045,
-      "height": 1.4444444444444444
-    },
-    "fortal.text.5": {
-      "fontSize": 20.0,
-      "letterSpacing": -0.1,
-      "height": 1.4
-    },
-    "fortal.text.6": {
-      "fontSize": 24.0,
-      "letterSpacing": -0.15000000000000002,
-      "height": 1.25
-    },
-    "fortal.text.7": {
-      "fontSize": 28.0,
-      "letterSpacing": -0.21,
-      "height": 1.2857142857142858
-    },
-    "fortal.text.8": {
-      "fontSize": 35.0,
-      "letterSpacing": -0.35000000000000003,
-      "height": 1.1428571428571428
-    },
-    "fortal.text.9": {
-      "fontSize": 60.0,
-      "letterSpacing": -1.5,
-      "height": 1.0
-    }
-  },
-  "boxShadows": {
-    "fortal.shadow.1": [
-      {
-        "color": "#26000735",
-        "offset": {
-          "x": 0.0,
-          "y": 0.0
-        },
-        "blurRadius": 0.0,
-        "spreadRadius": 1.0
-      },
-      {
-        "color": "#4D000000",
-        "offset": {
-          "x": 0.0,
-          "y": 1.0
-        },
-        "blurRadius": 2.0,
-        "spreadRadius": 0.0
-      }
-    ],
-    "fortal.shadow.2": [
-      {
-        "color": "#66000000",
-        "offset": {
-          "x": 0.0,
-          "y": 0.0
-        },
-        "blurRadius": 0.0,
-        "spreadRadius": 1.0
-      },
-      {
-        "color": "#26000000",
-        "offset": {
-          "x": 0.0,
-          "y": 0.0
-        },
-        "blurRadius": 0.5,
-        "spreadRadius": 0.0
-      },
-      {
-        "color": "#66000000",
-        "offset": {
-          "x": 0.0,
-          "y": 1.0
-        },
-        "blurRadius": 1.0,
-        "spreadRadius": 0.0
-      },
-      {
-        "color": "#66000000",
-        "offset": {
-          "x": 0.0,
-          "y": 2.0
-        },
-        "blurRadius": 1.0,
-        "spreadRadius": -1.0
-      },
-      {
-        "color": "#4D000000",
-        "offset": {
-          "x": 0.0,
-          "y": 1.0
-        },
-        "blurRadius": 3.0,
-        "spreadRadius": 0.0
-      }
-    ],
-    "fortal.shadow.3": [
-      {
-        "color": "#66000000",
-        "offset": {
-          "x": 0.0,
-          "y": 0.0
-        },
-        "blurRadius": 0.0,
-        "spreadRadius": 1.0
-      },
-      {
-        "color": "#26000000",
-        "offset": {
-          "x": 0.0,
-          "y": 2.0
-        },
-        "blurRadius": 3.0,
-        "spreadRadius": -2.0
-      },
-      {
-        "color": "#66000000",
-        "offset": {
-          "x": 0.0,
-          "y": 3.0
-        },
-        "blurRadius": 8.0,
-        "spreadRadius": -2.0
-      },
-      {
-        "color": "#80000000",
-        "offset": {
-          "x": 0.0,
-          "y": 4.0
-        },
-        "blurRadius": 12.0,
-        "spreadRadius": -4.0
-      }
-    ],
-    "fortal.shadow.4": [
-      {
-        "color": "#66000000",
-        "offset": {
-          "x": 0.0,
-          "y": 0.0
-        },
-        "blurRadius": 0.0,
-        "spreadRadius": 1.0
-      },
-      {
-        "color": "#26000000",
-        "offset": {
-          "x": 0.0,
-          "y": 8.0
-        },
-        "blurRadius": 40.0,
-        "spreadRadius": 0.0
-      },
-      {
-        "color": "#4D000000",
-        "offset": {
-          "x": 0.0,
-          "y": 12.0
-        },
-        "blurRadius": 32.0,
-        "spreadRadius": -16.0
-      }
-    ],
-    "fortal.shadow.5": [
-      {
-        "color": "#66000000",
-        "offset": {
-          "x": 0.0,
-          "y": 0.0
-        },
-        "blurRadius": 0.0,
-        "spreadRadius": 1.0
-      },
-      {
-        "color": "#4D000000",
-        "offset": {
-          "x": 0.0,
-          "y": 12.0
-        },
-        "blurRadius": 60.0,
-        "spreadRadius": 0.0
-      },
-      {
-        "color": "#80000000",
-        "offset": {
-          "x": 0.0,
-          "y": 12.0
-        },
-        "blurRadius": 32.0,
-        "spreadRadius": -16.0
-      }
-    ],
-    "fortal.shadow.6": [
-      {
-        "color": "#66000000",
-        "offset": {
-          "x": 0.0,
-          "y": 0.0
-        },
-        "blurRadius": 0.0,
-        "spreadRadius": 1.0
-      },
-      {
-        "color": "#33000000",
-        "offset": {
-          "x": 0.0,
-          "y": 12.0
-        },
-        "blurRadius": 60.0,
-        "spreadRadius": 0.0
-      },
-      {
-        "color": "#66000000",
-        "offset": {
-          "x": 0.0,
-          "y": 16.0
-        },
-        "blurRadius": 64.0,
-        "spreadRadius": 0.0
-      },
-      {
-        "color": "#E6000000",
-        "offset": {
-          "x": 0.0,
-          "y": 16.0
-        },
-        "blurRadius": 36.0,
-        "spreadRadius": -20.0
-      }
-    ]
-  },
-  "fontWeights": {
-    "fortal.font.weight.light": "w300",
-    "fortal.font.weight.regular": "w400",
-    "fortal.font.weight.medium": "w500",
-    "fortal.font.weight.bold": "w700"
-  },
-  "durations": {
-    "fortal.transition.fast": 100,
-    "fortal.transition.slow": 300
-  }
-}
diff --git a/packages/demo/pubspec.yaml b/packages/demo/pubspec.yaml
index 5a39b005..95dc8a17 100644
--- a/packages/demo/pubspec.yaml
+++ b/packages/demo/pubspec.yaml
@@ -9,8 +9,8 @@ environment:
 
 dependency_overrides:
   accessibility_tools: ^2.8.0
-  # Keep Mix and Atlas on their compatible revision while the generator and
-  # annotation packages use their published beta through Remix.
+  # Keep Mix on the compatible revision while the generator and annotation
+  # packages use their published beta through Remix.
   mix:
     git:
       url: https://github.com/btwld/mix.git
@@ -30,21 +30,11 @@ dependencies:
 dev_dependencies:
   flutter_test:
     sdk: flutter
-  mix_atlas:
-    git:
-      url: https://github.com/btwld/mix.git
-      ref: 07dafe904e56a9b60a172f4ef1863cf45564603a
-      path: packages/mix_atlas
   mix_protocol:
     git:
       url: https://github.com/btwld/mix.git
       ref: 07dafe904e56a9b60a172f4ef1863cf45564603a
       path: packages/mix_protocol
-  mix_atlas_capture:
-    git:
-      url: https://github.com/btwld/mix.git
-      ref: 07dafe904e56a9b60a172f4ef1863cf45564603a
-      path: packages/mix_atlas_capture
   widgetbook_generator: ^3.24.0
 
 flutter:
diff --git a/packages/demo/test/atlas/fortal_atlas_golden_test.dart b/packages/demo/test/atlas/fortal_atlas_golden_test.dart
deleted file mode 100644
index 3e613a95..00000000
--- a/packages/demo/test/atlas/fortal_atlas_golden_test.dart
+++ /dev/null
@@ -1,7 +0,0 @@
-import 'package:mix_atlas/golden.dart';
-
-import 'support/fortal_atlas_catalog.dart';
-
-void main() {
-  registerAtlasCatalogGoldens(fortalAtlasCatalog);
-}
diff --git a/packages/demo/test/atlas/fortal_button_protocol_adapter_test.dart b/packages/demo/test/atlas/fortal_button_protocol_adapter_test.dart
deleted file mode 100644
index dfaeddbb..00000000
--- a/packages/demo/test/atlas/fortal_button_protocol_adapter_test.dart
+++ /dev/null
@@ -1,113 +0,0 @@
-import 'dart:convert';
-
-import 'package:flutter/material.dart';
-import 'package:flutter_test/flutter_test.dart';
-import 'package:mix_protocol/mix_protocol.dart';
-import 'package:remix/remix.dart';
-
-import 'support/fortal_button_protocol_adapter.dart';
-import 'support/fortal_button_component_artifact.dart';
-
-void main() {
-  group('Fortal Button protocol adapter', () {
-    test('projects real composite sources without restating the recipe', () {
-      final projection = projectButtonStyler(
-        fortalButtonStyler(
-          variant: FortalButtonVariant.surface,
-          size: FortalButtonSize.size3,
-        ),
-      );
-
-      expect(projection.container, isNotNull);
-      expect(projection.label, isNotNull);
-      expect(projection.icon, isNotNull);
-      expect(projection.diagnostics, isEmpty);
-      expect(
-        projection.container!.$variants!
-            .map((variant) => variant.variant)
-            .whereType<WidgetStateVariant>()
-            .map((variant) => variant.state),
-        containsAll({
-          WidgetState.hovered,
-          WidgetState.focused,
-          WidgetState.disabled,
-        }),
-      );
-    });
-
-    test('all projected slots encode as built-in protocol styles', () {
-      for (final variant in FortalButtonVariant.values) {
-        for (final size in FortalButtonSize.values) {
-          final projection = projectButtonStyler(
-            fortalButtonStyler(variant: variant, size: size),
-          );
-
-          expect(
-            mixProtocol.encodeStyle(projection.container!),
-            isA<MixProtocolSuccess<Map<String, Object?>>>(),
-            reason: '${variant.name}-${size.name} container',
-          );
-          expect(
-            mixProtocol.encodeStyle(projection.label!),
-            isA<MixProtocolSuccess<Map<String, Object?>>>(),
-            reason: '${variant.name}-${size.name} label',
-          );
-          expect(
-            mixProtocol.encodeStyle(projection.icon!),
-            isA<MixProtocolSuccess<Map<String, Object?>>>(),
-            reason: '${variant.name}-${size.name} icon',
-          );
-        }
-      }
-    });
-
-    test(
-      'keeps spinner support explicit instead of projecting custom code',
-      () {
-        final projection = projectButtonStyler(fortalButtonStyler());
-
-        expect(projection.spinnerSupported, isFalse);
-        expect(projection.spinnerDiagnostic.code, 'unsupported_slot_primitive');
-        expect(projection.spinnerDiagnostic.path, 'spinner');
-      },
-    );
-
-    test('builds a deterministic 240-cell portable Button contract', () {
-      final first = buildFortalButtonComponentArtifacts();
-      final second = buildFortalButtonComponentArtifacts();
-      final recipes = first.document['recipes']! as List<Object?>;
-      final states = first.document['states']! as List<Object?>;
-      final oracles = first.document['oracles']! as List<Object?>;
-
-      expect(recipes, hasLength(20));
-      expect(states, hasLength(6));
-      expect(oracles, hasLength(2));
-      expect(first.totalMatrixCells, 240);
-      expect(first.nonLoadingCells, 200);
-      expect(first.loadingUnsupportedCells, 40);
-      expect(first.styleDocuments, hasLength(60));
-      expect(first.supportedContainerRecipes, 20);
-      expect(jsonEncode(first.document), jsonEncode(second.document));
-      expect(
-        jsonEncode(first.styleDocuments),
-        jsonEncode(second.styleDocuments),
-      );
-      for (final recipeValue in recipes) {
-        final recipe = recipeValue! as Map<String, Object?>;
-        final styles = recipe['styles']! as Map<String, Object?>;
-        expect(styles.keys, {
-          'container',
-          'label',
-          'leadingIcon',
-          'trailingIcon',
-          'spinner',
-        });
-        final spinner = styles['spinner']! as Map<String, Object?>;
-        expect(spinner['status'], 'unsupported');
-        final container = styles['container']! as Map<String, Object?>;
-        expect(container['status'], 'supported');
-        expect(container['document'], endsWith('/container.mix.json'));
-      }
-    });
-  });
-}
diff --git a/packages/demo/test/atlas/fortal_protocol_probe_test.dart b/packages/demo/test/atlas/fortal_protocol_probe_test.dart
deleted file mode 100644
index 6629fd8c..00000000
--- a/packages/demo/test/atlas/fortal_protocol_probe_test.dart
+++ /dev/null
@@ -1,379 +0,0 @@
-import 'dart:convert';
-import 'dart:io';
-
-import 'package:flutter/material.dart';
-import 'package:flutter_test/flutter_test.dart';
-import 'package:mix_protocol/mix_protocol.dart';
-import 'package:remix/remix.dart';
-
-import 'support/fortal_button_component_artifact.dart';
-
-void main() {
-  group('Fortal protocol probe', () {
-    for (final brightness in Brightness.values) {
-      testWidgets('${brightness.name} theme round-trips canonically', (
-        tester,
-      ) async {
-        final rawTokens = await _captureFortalTokens(tester, brightness);
-        final rawErrors = _expectFailure(
-          mixProtocol.encodeTheme(MixProtocolTheme(tokens: rawTokens)),
-        );
-        final tokens = _concretizeFortalShadowTokens(rawTokens);
-
-        final encoded = _expectSuccess(
-          mixProtocol.encodeTheme(MixProtocolTheme(tokens: tokens)),
-        );
-        final decoded = _expectSuccess(mixProtocol.decodeTheme(encoded));
-        final reencoded = _expectSuccess(mixProtocol.encodeTheme(decoded));
-
-        expect(rawErrors, hasLength(6));
-        expect(
-          rawErrors,
-          everyElement(
-            isA<MixProtocolError>()
-                .having(
-                  (error) => error.code,
-                  'code',
-                  MixProtocolErrorCode.constraintViolation,
-                )
-                .having(
-                  (error) => error.path,
-                  'path',
-                  startsWith('/boxShadows/fortal.shadow.'),
-                ),
-          ),
-        );
-        expect(reencoded, encoded);
-        expect(decoded.tokens, hasLength(tokens.length));
-      });
-    }
-
-    test('built-in Fortal-tokenized style round-trips', () {
-      final style = FlexBoxStyler(
-        decoration: BoxDecorationMix(color: FortalTokens.accent9()),
-        padding: EdgeInsetsMix.all(FortalTokens.space3()),
-        spacing: FortalTokens.space2(),
-      );
-
-      final encoded = _expectSuccess(mixProtocol.encodeStyle(style));
-      final decoded = _expectSuccess(
-        mixProtocol.decodeStyle<FlexBoxStyler>(encoded),
-      );
-      final reencoded = _expectSuccess(mixProtocol.encodeStyle(decoded));
-      final references = tokenReferencesOf(
-        decoded,
-      ).map((reference) => '${reference.kind}:${reference.name}').toSet();
-
-      expect(reencoded, encoded);
-      expect(references, {
-        'colors:fortal.accent.9',
-        'spaces:fortal.space.2',
-        'spaces:fortal.space.3',
-      });
-    });
-
-    test('fluent multi-source built-in style round-trips canonically', () {
-      final style = FlexBoxStyler()
-          .color(FortalTokens.accent9())
-          .paddingAll(FortalTokens.space3())
-          .spacing(FortalTokens.space2());
-
-      final encoded = _expectSuccess(mixProtocol.encodeStyle(style));
-      final decoded = _expectSuccess(
-        mixProtocol.decodeStyle<FlexBoxStyler>(encoded),
-      );
-      final reencoded = _expectSuccess(mixProtocol.encodeStyle(decoded));
-      final references = tokenReferencesOf(
-        decoded,
-      ).map((reference) => '${reference.kind}:${reference.name}').toSet();
-
-      expect(reencoded, encoded);
-      expect(references, {
-        'colors:fortal.accent.9',
-        'spaces:fortal.space.2',
-        'spaces:fortal.space.3',
-      });
-    });
-
-    test('custom ButtonStyler fails with a structured diagnostic', () {
-      final errors = _expectFailure(
-        mixProtocol.encodeStyle(fortalButtonStyler()),
-      );
-
-      expect(
-        errors.map((error) => error.code),
-        contains(MixProtocolErrorCode.unsupportedEncodeValue),
-      );
-      expect(errors, everyElement(isA<MixProtocolError>()));
-    });
-
-    test('strict theme decode rejects unknown fields', () {
-      final errors = _expectFailure(
-        mixProtocol.decodeTheme({
-          'v': mixProtocolFormatVersion,
-          'type': 'theme',
-          'unexpected': true,
-        }),
-      );
-
-      expect(errors.single.code, MixProtocolErrorCode.unknownField);
-      expect(errors.single.path, '/unexpected');
-    });
-
-    test('theme decode rejects unsupported versions', () {
-      final errors = _expectFailure(
-        mixProtocol.decodeTheme({'v': 999, 'type': 'theme'}),
-      );
-
-      expect(errors.single.code, MixProtocolErrorCode.unsupportedVersion);
-      expect(errors.single.path, '/v');
-    });
-
-    testWidgets('canonical protocol artifacts match', (tester) async {
-      if (autoUpdateGoldenFiles) _resetGeneratedButtonArtifacts();
-      final themeCoverage = <Map<String, Object?>>[];
-
-      for (final brightness in Brightness.values) {
-        final rawTokens = await _captureFortalTokens(tester, brightness);
-        final rawErrors = _expectFailure(
-          mixProtocol.encodeTheme(MixProtocolTheme(tokens: rawTokens)),
-        );
-        final concreteTokens = _concretizeFortalShadowTokens(rawTokens);
-        final themeDocument = _expectSuccess(
-          mixProtocol.encodeTheme(MixProtocolTheme(tokens: concreteTokens)),
-        );
-
-        _expectJsonArtifact(
-          'goldens/protocol/themes/${brightness.name}.mix.json',
-          themeDocument,
-        );
-        themeCoverage.add({
-          'id': brightness.name,
-          'status': 'supported',
-          'tokenCount': concreteTokens.length,
-          'rawStatus': 'failed',
-          'captureTransform': 'concretizeBoxShadowColorTokenReferences',
-          'rawDiagnostics': [for (final error in rawErrors) error.toJson()],
-        });
-      }
-
-      final builtInStyle = FlexBoxStyler(
-        decoration: BoxDecorationMix(color: FortalTokens.accent9()),
-        padding: EdgeInsetsMix.all(FortalTokens.space3()),
-        spacing: FortalTokens.space2(),
-      );
-      final builtInDocument = _expectSuccess(
-        mixProtocol.encodeStyle(builtInStyle),
-      );
-      final builtInReferences = tokenReferencesOf(builtInStyle).toList()
-        ..sort(
-          (a, b) => '${a.kind}:${a.name}'.compareTo('${b.kind}:${b.name}'),
-        );
-      _expectJsonArtifact(
-        'goldens/protocol/fixtures/fortal-tokenized-flex-box.mix.json',
-        builtInDocument,
-      );
-
-      final componentArtifacts = buildFortalButtonComponentArtifacts();
-      _expectJsonArtifact(
-        'goldens/components/button.component.json',
-        componentArtifacts.document,
-      );
-      final componentStyleEntries =
-          componentArtifacts.styleDocuments.entries.toList()
-            ..sort((left, right) => left.key.compareTo(right.key));
-      for (final entry in componentStyleEntries) {
-        _expectJsonArtifact('goldens/${entry.key}', entry.value);
-      }
-      final componentRecipes =
-          componentArtifacts.document['recipes']! as List<Object?>;
-      final firstRecipe = componentRecipes.first! as Map<String, Object?>;
-      final firstStyles = firstRecipe['styles']! as Map<String, Object?>;
-      final firstContainer = firstStyles['container']! as Map<String, Object?>;
-      final firstSpinner = firstStyles['spinner']! as Map<String, Object?>;
-      final componentDiagnostics = <Object?>[
-        ...(firstSpinner['diagnostics']! as List<Object?>),
-        if (firstContainer['status'] == 'unsupported')
-          ...(firstContainer['diagnostics']! as List<Object?>),
-      ];
-
-      final fluentStyle = FlexBoxStyler()
-          .color(FortalTokens.accent9())
-          .paddingAll(FortalTokens.space3())
-          .spacing(FortalTokens.space2());
-      final fluentDocument = _expectSuccess(
-        mixProtocol.encodeStyle(fluentStyle),
-      );
-      final fluentRoundTrip = _expectSuccess(
-        mixProtocol.decodeStyle<FlexBoxStyler>(fluentDocument),
-      );
-      final fluentReferences = tokenReferencesOf(fluentRoundTrip).toList()
-        ..sort(
-          (a, b) => '${a.kind}:${a.name}'.compareTo('${b.kind}:${b.name}'),
-        );
-      final customErrors = _expectFailure(
-        mixProtocol.encodeStyle(fortalButtonStyler()),
-      );
-      final coverage = <String, Object?>{
-        'schema': 'mix_atlas/protocol-coverage/v1',
-        'mixProtocolVersion': mixProtocolVersion,
-        'mixProtocolFormat': mixProtocolFormatVersion,
-        'themes': themeCoverage,
-        'styles': [
-          {
-            'id': 'fortal-tokenized-flex-box-fixture',
-            'runtimeType': 'FlexBoxStyler',
-            'status': 'supported',
-            'tokenReferences': [
-              for (final reference in builtInReferences)
-                {'kind': reference.kind, 'name': reference.name},
-            ],
-          },
-          {
-            'id': 'fortal-tokenized-flex-box-fluent',
-            'runtimeType': 'FlexBoxStyler',
-            'status': 'supported',
-            'tokenReferences': [
-              for (final reference in fluentReferences)
-                {'kind': reference.kind, 'name': reference.name},
-            ],
-          },
-          {
-            'id': 'fortal-button-portable',
-            'runtimeType': 'ButtonStyler projection',
-            'status': componentArtifacts.supportedContainerRecipes == 20
-                ? 'partial'
-                : 'unsupported',
-            'recipeCount': componentRecipes.length,
-            'totalMatrixCells': componentArtifacts.totalMatrixCells,
-            'nonLoadingCells': componentArtifacts.nonLoadingCells,
-            'loadingUnsupportedCells':
-                componentArtifacts.loadingUnsupportedCells,
-            'supportedContainerRecipes':
-                componentArtifacts.supportedContainerRecipes,
-            'diagnostics': componentDiagnostics,
-          },
-          {
-            'id': 'fortal-button',
-            'runtimeType': 'ButtonStyler',
-            'status': 'unsupported',
-            'diagnostics': [for (final error in customErrors) error.toJson()],
-          },
-        ],
-      };
-      _expectJsonArtifact('goldens/protocol/coverage.json', coverage);
-    });
-  });
-}
-
-void _resetGeneratedButtonArtifacts() {
-  final comparator = goldenFileComparator;
-  if (comparator is! LocalFileComparator) {
-    fail('Protocol artifacts require Flutter LocalFileComparator.');
-  }
-  for (final path in ['goldens/components', 'goldens/styles']) {
-    final directory = Directory.fromUri(comparator.basedir.resolve(path));
-    if (directory.existsSync()) directory.deleteSync(recursive: true);
-  }
-}
-
-Future<Map<MixToken, Object>> _captureFortalTokens(
-  WidgetTester tester,
-  Brightness brightness,
-) async {
-  Map<MixToken, Object>? captured;
-
-  await tester.pumpWidget(
-    MaterialApp(
-      home: FortalScope(
-        brightness: brightness,
-        child: Builder(
-          builder: (context) {
-            captured = Map.unmodifiable(MixScope.of(context).tokens!);
-
-            return const SizedBox.shrink();
-          },
-        ),
-      ),
-    ),
-  );
-
-  return captured!;
-}
-
-Map<MixToken, Object> _concretizeFortalShadowTokens(
-  Map<MixToken, Object> tokens,
-) {
-  return {
-    for (final MapEntry(:key, :value) in tokens.entries)
-      key: switch (value) {
-        List<BoxShadow>() => [
-          for (final shadow in value)
-            shadow.copyWith(color: _resolveColor(shadow.color, tokens)),
-        ],
-        _ => value,
-      },
-  };
-}
-
-Color _resolveColor(Color color, Map<MixToken, Object> tokens) {
-  final active = <MixToken<dynamic>>{};
-  var current = color;
-
-  while (true) {
-    final token = tokenFromReferenceValue<Color>(current);
-    if (token == null) break;
-    if (!active.add(token)) {
-      fail('Circular Fortal color token reference: ${token.name}');
-    }
-    final resolved = tokens[token];
-    if (resolved is! Color) {
-      fail(
-        'Fortal color token ${token.name} resolved to ${resolved.runtimeType}.',
-      );
-    }
-    current = resolved;
-  }
-
-  return current;
-}
-
-T _expectSuccess<T extends Object>(MixProtocolResult<T> result) {
-  return switch (result) {
-    MixProtocolSuccess<T>(:final value) => value,
-    MixProtocolFailure<T>(:final errors) => fail('Expected success: $errors'),
-  };
-}
-
-List<MixProtocolError> _expectFailure<T extends Object>(
-  MixProtocolResult<T> result,
-) {
-  return switch (result) {
-    MixProtocolFailure<T>(:final errors) => errors,
-    MixProtocolSuccess<T>() => fail('Expected protocol failure.'),
-  };
-}
-
-void _expectJsonArtifact(String path, Map<String, Object?> payload) {
-  final canonical = '${const JsonEncoder.withIndent('  ').convert(payload)}\n';
-  final comparator = goldenFileComparator;
-  if (comparator is! LocalFileComparator) {
-    fail('Protocol artifacts require Flutter LocalFileComparator.');
-  }
-  final file = File.fromUri(comparator.basedir.resolve(path));
-
-  if (autoUpdateGoldenFiles) {
-    file.parent.createSync(recursive: true);
-    file.writeAsStringSync(canonical);
-
-    return;
-  }
-
-  expect(file.existsSync(), isTrue, reason: 'Missing protocol artifact: $path');
-  if (!file.existsSync()) return;
-  expect(
-    file.readAsStringSync(),
-    canonical,
-    reason: 'Stale protocol artifact: $path',
-  );
-}
diff --git a/packages/demo/test/atlas/goldens/catalog.json b/packages/demo/test/atlas/goldens/catalog.json
deleted file mode 100644
index a85074ef..00000000
--- a/packages/demo/test/atlas/goldens/catalog.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "schema": "mix_atlas/catalog/v1",
-  "id": "fortal",
-  "label": "Fortal Design System",
-  "themes": [
-    {
-      "id": "light",
-      "label": "Light",
-      "brightness": "light"
-    },
-    {
-      "id": "dark",
-      "label": "Dark",
-      "brightness": "dark"
-    }
-  ],
-  "atlases": [
-    {
-      "id": "button",
-      "label": "Button",
-      "files": [
-        {
-          "theme": "light",
-          "image": "light/button.png",
-          "metadata": "light/button.json"
-        },
-        {
-          "theme": "dark",
-          "image": "dark/button.png",
-          "metadata": "dark/button.json"
-        }
-      ]
-    }
-  ]
-}
diff --git a/packages/demo/test/atlas/goldens/components/button.component.json b/packages/demo/test/atlas/goldens/components/button.component.json
deleted file mode 100644
index 384b8b48..00000000
--- a/packages/demo/test/atlas/goldens/components/button.component.json
+++ /dev/null
@@ -1,1037 +0,0 @@
-{
-  "schema": "mix_atlas/component/v1",
-  "id": "button",
-  "label": "Button",
-  "properties": [
-    {
-      "id": "variant",
-      "kind": "enum",
-      "values": [
-        "solid",
-        "soft",
-        "surface",
-        "outline",
-        "ghost"
-      ],
-      "default": "solid"
-    },
-    {
-      "id": "size",
-      "kind": "enum",
-      "values": [
-        "size1",
-        "size2",
-        "size3",
-        "size4"
-      ],
-      "default": "size2"
-    },
-    {
-      "id": "label",
-      "kind": "string",
-      "default": "Button"
-    },
-    {
-      "id": "leadingIcon",
-      "kind": "icon",
-      "required": false
-    },
-    {
-      "id": "trailingIcon",
-      "kind": "icon",
-      "required": false
-    },
-    {
-      "id": "enabled",
-      "kind": "boolean",
-      "default": true
-    },
-    {
-      "id": "loading",
-      "kind": "boolean",
-      "default": false
-    }
-  ],
-  "states": [
-    {
-      "id": "default",
-      "widgetStates": [],
-      "properties": {}
-    },
-    {
-      "id": "hovered",
-      "widgetStates": [
-        "hovered"
-      ],
-      "properties": {}
-    },
-    {
-      "id": "pressed",
-      "widgetStates": [
-        "pressed"
-      ],
-      "properties": {}
-    },
-    {
-      "id": "focused",
-      "widgetStates": [
-        "focused"
-      ],
-      "properties": {}
-    },
-    {
-      "id": "disabled",
-      "widgetStates": [
-        "disabled"
-      ],
-      "properties": {
-        "enabled": false
-      }
-    },
-    {
-      "id": "loading",
-      "widgetStates": [
-        "disabled"
-      ],
-      "properties": {
-        "enabled": false,
-        "loading": true
-      }
-    }
-  ],
-  "slots": [
-    {
-      "id": "container",
-      "kind": "flex_box"
-    },
-    {
-      "id": "label",
-      "kind": "text"
-    },
-    {
-      "id": "leadingIcon",
-      "kind": "icon"
-    },
-    {
-      "id": "trailingIcon",
-      "kind": "icon"
-    },
-    {
-      "id": "spinner",
-      "kind": "spinner"
-    }
-  ],
-  "anatomy": {
-    "root": "root",
-    "nodes": [
-      {
-        "id": "root",
-        "kind": "stack",
-        "alignment": "center",
-        "children": [
-          "content",
-          "spinner"
-        ]
-      },
-      {
-        "id": "content",
-        "kind": "slot",
-        "slot": "container",
-        "children": [
-          "leadingIcon",
-          "label",
-          "trailingIcon"
-        ],
-        "visibleWhen": {
-          "property": "loading",
-          "operator": "equals",
-          "value": false
-        },
-        "maintain": [
-          "size",
-          "state",
-          "animation"
-        ]
-      },
-      {
-        "id": "leadingIcon",
-        "kind": "slot",
-        "slot": "leadingIcon",
-        "children": [],
-        "visibleWhen": {
-          "property": "leadingIcon",
-          "operator": "present"
-        }
-      },
-      {
-        "id": "label",
-        "kind": "slot",
-        "slot": "label",
-        "children": []
-      },
-      {
-        "id": "trailingIcon",
-        "kind": "slot",
-        "slot": "trailingIcon",
-        "children": [],
-        "visibleWhen": {
-          "property": "trailingIcon",
-          "operator": "present"
-        }
-      },
-      {
-        "id": "spinner",
-        "kind": "slot",
-        "slot": "spinner",
-        "children": [],
-        "visibleWhen": {
-          "property": "loading",
-          "operator": "equals",
-          "value": true
-        }
-      }
-    ]
-  },
-  "recipes": [
-    {
-      "id": "solid-size1",
-      "properties": {
-        "variant": "solid",
-        "size": "size1"
-      },
-      "styles": {
-        "container": {
-          "status": "supported",
-          "evidence": "declared",
-          "document": "styles/button/solid-size1/container.mix.json"
-        },
-        "label": {
-          "status": "supported",
-          "evidence": "declared",
-          "document": "styles/button/solid-size1/label.mix.json"
-        },
-        "leadingIcon": {
-          "status": "supported",
-          "evidence": "declared",
-          "document": "styles/button/solid-size1/icon.mix.json"
-        },
-        "trailingIcon": {
-          "status": "supported",
-          "evidence": "declared",
-          "document": "styles/button/solid-size1/icon.mix.json"
-        },
-        "spinner": {
-          "status": "unsupported",
-          "evidence": "declared",
-          "diagnostics": [
-            {
-              "code": "unsupported_slot_primitive",
-              "severity": "error",
-              "path": "spinner",
-              "message": "RemixSpinner has no neutral Mix protocol primitive."
-            }
-          ]
-        }
-      }
-    },
-    {
-      "id": "solid-size2",
-      "properties": {
-        "variant": "solid",
-        "size": "size2"
-      },
-      "styles": {
-        "container": {
-          "status": "supported",
-          "evidence": "declared",
-          "document": "styles/button/solid-size2/container.mix.json"
-        },
-        "label": {
-          "status": "supported",
-          "evidence": "declared",
-          "document": "styles/button/solid-size2/label.mix.json"
-        },
-        "leadingIcon": {
-          "status": "supported",
-          "evidence": "declared",
-          "document": "styles/button/solid-size2/icon.mix.json"
-        },
-        "trailingIcon": {
-          "status": "supported",
-          "evidence": "declared",
-          "document": "styles/button/solid-size2/icon.mix.json"
-        },
-        "spinner": {
-          "status": "unsupported",
-          "evidence": "declared",
-          "diagnostics": [
-            {
-              "code": "unsupported_slot_primitive",
-              "severity": "error",
-              "path": "spinner",
-              "message": "RemixSpinner has no neutral Mix protocol primitive."
-            }
-          ]
-        }
-      }
-    },
-    {
-      "id": "solid-size3",
-      "properties": {
-        "variant": "solid",
-        "size": "size3"
-      },
-      "styles": {
-        "container": {
-          "status": "supported",
-          "evidence": "declared",
-          "document": "styles/button/solid-size3/container.mix.json"
-        },
-        "label": {
-          "status": "supported",
-          "evidence": "declared",
-          "document": "styles/button/solid-size3/label.mix.json"
-        },
-        "leadingIcon": {
-          "status": "supported",
-          "evidence": "declared",
-          "document": "styles/button/solid-size3/icon.mix.json"
-        },
-        "trailingIcon": {
-          "status": "supported",
-          "evidence": "declared",
-          "document": "styles/button/solid-size3/icon.mix.json"
-        },
-        "spinner": {
-          "status": "unsupported",
-          "evidence": "declared",
-          "diagnostics": [
-            {
-              "code": "unsupported_slot_primitive",
-              "severity": "error",
-              "path": "spinner",
-              "message": "RemixSpinner has no neutral Mix protocol primitive."
-            }
-          ]
-        }
-      }
-    },
-    {
-      "id": "solid-size4",
-      "properties": {
-        "variant": "solid",
-        "size": "size4"
-      },
-      "styles": {
-        "container": {
-          "status": "supported",
-          "evidence": "declared",
-          "document": "styles/button/solid-size4/container.mix.json"
-        },
-        "label": {
-          "status": "supported",
-          "evidence": "declared",
-          "document": "styles/button/solid-size4/label.mix.json"
-        },
-        "leadingIcon": {
-          "status": "supported",
-          "evidence": "declared",
-          "document": "styles/button/solid-size4/icon.mix.json"
-        },
-        "trailingIcon": {
-          "status": "supported",
-          "evidence": "declared",
-          "document": "styles/button/solid-size4/icon.mix.json"
-        },
-        "spinner": {
-          "status": "unsupported",
-          "evidence": "declared",
-          "diagnostics": [
-            {
-              "code": "unsupported_slot_primitive",
-              "severity": "error",
-              "path": "spinner",
-              "message": "RemixSpinner has no neutral Mix protocol primitive."
-            }
-          ]
-        }
-      }
-    },
-    {
-      "id": "soft-size1",
-      "properties": {
-        "variant": "soft",
-        "size": "size1"
-      },
-      "styles": {
-        "container": {
-          "status": "supported",
-          "evidence": "declared",
-          "document": "styles/button/soft-size1/container.mix.json"
-        },
-        "label": {
-          "status": "supported",
-          "evidence": "declared",
-          "document": "styles/button/soft-size1/label.mix.json"
-        },
-        "leadingIcon": {
-          "status": "supported",
-          "evidence": "declared",
-          "document": "styles/button/soft-size1/icon.mix.json"
-        },
-        "trailingIcon": {
-          "status": "supported",
-          "evidence": "declared",
-          "document": "styles/button/soft-size1/icon.mix.json"
-        },
-        "spinner": {
-          "status": "unsupported",
-          "evidence": "declared",
-          "diagnostics": [
-            {
-              "code": "unsupported_slot_primitive",
-              "severity": "error",
-              "path": "spinner",
-              "message": "RemixSpinner has no neutral Mix protocol primitive."
-            }
-          ]
-        }
-      }
-    },
-    {
-      "id": "soft-size2",
-      "properties": {
-        "variant": "soft",
-        "size": "size2"
-      },
-      "styles": {
-        "container": {
-          "status": "supported",
-          "evidence": "declared",
-          "document": "styles/button/soft-size2/container.mix.json"
-        },
-        "label": {
-          "status": "supported",
-          "evidence": "declared",
-          "document": "styles/button/soft-size2/label.mix.json"
-        },
-        "leadingIcon": {
-          "status": "supported",
-          "evidence": "declared",
-          "document": "styles/button/soft-size2/icon.mix.json"
-        },
-        "trailingIcon": {
-          "status": "supported",
-          "evidence": "declared",
-          "document": "styles/button/soft-size2/icon.mix.json"
-        },
-        "spinner": {
-          "status": "unsupported",
-          "evidence": "declared",
-          "diagnostics": [
-            {
-              "code": "unsupported_slot_primitive",
-              "severity": "error",
-              "path": "spinner",
-              "message": "RemixSpinner has no neutral Mix protocol primitive."
-            }
-          ]
-        }
-      }
-    },
-    {
-      "id": "soft-size3",
-      "properties": {
-        "variant": "soft",
-        "size": "size3"
-      },
-      "styles": {
-        "container": {
-          "status": "supported",
-          "evidence": "declared",
-          "document": "styles/button/soft-size3/container.mix.json"
-        },
-        "label": {
-          "status": "supported",
-          "evidence": "declared",
-          "document": "styles/button/soft-size3/label.mix.json"
-        },
-        "leadingIcon": {
-          "status": "supported",
-          "evidence": "declared",
-          "document": "styles/button/soft-size3/icon.mix.json"
-        },
-        "trailingIcon": {
-          "status": "supported",
-          "evidence": "declared",
-          "document": "styles/button/soft-size3/icon.mix.json"
-        },
-        "spinner": {
-          "status": "unsupported",
-          "evidence": "declared",
-          "diagnostics": [
-            {
-              "code": "unsupported_slot_primitive",
-              "severity": "error",
-              "path": "spinner",
-              "message": "RemixSpinner has no neutral Mix protocol primitive."
-            }
-          ]
-        }
-      }
-    },
-    {
-      "id": "soft-size4",
-      "properties": {
-        "variant": "soft",
-        "size": "size4"
-      },
-      "styles": {
-        "container": {
-          "status": "supported",
-          "evidence": "declared",
-          "document": "styles/button/soft-size4/container.mix.json"
-        },
-        "label": {
-          "status": "supported",
-          "evidence": "declared",
-          "document": "styles/button/soft-size4/label.mix.json"
-        },
-        "leadingIcon": {
-          "status": "supported",
-          "evidence": "declared",
-          "document": "styles/button/soft-size4/icon.mix.json"
-        },
-        "trailingIcon": {
-          "status": "supported",
-          "evidence": "declared",
-          "document": "styles/button/soft-size4/icon.mix.json"
-        },
-        "spinner": {
-          "status": "unsupported",
-          "evidence": "declared",
-          "diagnostics": [
-            {
-              "code": "unsupported_slot_primitive",
-              "severity": "error",
-              "path": "spinner",
-              "message": "RemixSpinner has no neutral Mix protocol primitive."
-            }
-          ]
-        }
-      }
-    },
-    {
-      "id": "surface-size1",
-      "properties": {
-        "variant": "surface",
-        "size": "size1"
-      },
-      "styles": {
-        "container": {
-          "status": "supported",
-          "evidence": "declared",
-          "document": "styles/button/surface-size1/container.mix.json"
-        },
-        "label": {
-          "status": "supported",
-          "evidence": "declared",
-          "document": "styles/button/surface-size1/label.mix.json"
-        },
-        "leadingIcon": {
-          "status": "supported",
-          "evidence": "declared",
-          "document": "styles/button/surface-size1/icon.mix.json"
-        },
-        "trailingIcon": {
-          "status": "supported",
-          "evidence": "declared",
-          "document": "styles/button/surface-size1/icon.mix.json"
-        },
-        "spinner": {
-          "status": "unsupported",
-          "evidence": "declared",
-          "diagnostics": [
-            {
-              "code": "unsupported_slot_primitive",
-              "severity": "error",
-              "path": "spinner",
-              "message": "RemixSpinner has no neutral Mix protocol primitive."
-            }
-          ]
-        }
-      }
-    },
-    {
-      "id": "surface-size2",
-      "properties": {
-        "variant": "surface",
-        "size": "size2"
-      },
-      "styles": {
-        "container": {
-          "status": "supported",
-          "evidence": "declared",
-          "document": "styles/button/surface-size2/container.mix.json"
-        },
-        "label": {
-          "status": "supported",
-          "evidence": "declared",
-          "document": "styles/button/surface-size2/label.mix.json"
-        },
-        "leadingIcon": {
-          "status": "supported",
-          "evidence": "declared",
-          "document": "styles/button/surface-size2/icon.mix.json"
-        },
-        "trailingIcon": {
-          "status": "supported",
-          "evidence": "declared",
-          "document": "styles/button/surface-size2/icon.mix.json"
-        },
-        "spinner": {
-          "status": "unsupported",
-          "evidence": "declared",
-          "diagnostics": [
-            {
-              "code": "unsupported_slot_primitive",
-              "severity": "error",
-              "path": "spinner",
-              "message": "RemixSpinner has no neutral Mix protocol primitive."
-            }
-          ]
-        }
-      }
-    },
-    {
-      "id": "surface-size3",
-      "properties": {
-        "variant": "surface",
-        "size": "size3"
-      },
-      "styles": {
-        "container": {
-          "status": "supported",
-          "evidence": "declared",
-          "document": "styles/button/surface-size3/container.mix.json"
-        },
-        "label": {
-          "status": "supported",
-          "evidence": "declared",
-          "document": "styles/button/surface-size3/label.mix.json"
-        },
-        "leadingIcon": {
-          "status": "supported",
-          "evidence": "declared",
-          "document": "styles/button/surface-size3/icon.mix.json"
-        },
-        "trailingIcon": {
-          "status": "supported",
-          "evidence": "declared",
-          "document": "styles/button/surface-size3/icon.mix.json"
-        },
-        "spinner": {
-          "status": "unsupported",
-          "evidence": "declared",
-          "diagnostics": [
-            {
-              "code": "unsupported_slot_primitive",
-              "severity": "error",
-              "path": "spinner",
-              "message": "RemixSpinner has no neutral Mix protocol primitive."
-            }
-          ]
-        }
-      }
-    },
-    {
-      "id": "surface-size4",
-      "properties": {
-        "variant": "surface",
-        "size": "size4"
-      },
-      "styles": {
-        "container": {
-          "status": "supported",
-          "evidence": "declared",
-          "document": "styles/button/surface-size4/container.mix.json"
-        },
-        "label": {
-          "status": "supported",
-          "evidence": "declared",
-          "document": "styles/button/surface-size4/label.mix.json"
-        },
-        "leadingIcon": {
-          "status": "supported",
-          "evidence": "declared",
-          "document": "styles/button/surface-size4/icon.mix.json"
-        },
-        "trailingIcon": {
-          "status": "supported",
-          "evidence": "declared",
-          "document": "styles/button/surface-size4/icon.mix.json"
-        },
-        "spinner": {
-          "status": "unsupported",
-          "evidence": "declared",
-          "diagnostics": [
-            {
-              "code": "unsupported_slot_primitive",
-              "severity": "error",
-              "path": "spinner",
-              "message": "RemixSpinner has no neutral Mix protocol primitive."
-            }
-          ]
-        }
-      }
-    },
-    {
-      "id": "outline-size1",
-      "properties": {
-        "variant": "outline",
-        "size": "size1"
-      },
-      "styles": {
-        "container": {
-          "status": "supported",
-          "evidence": "declared",
-          "document": "styles/button/outline-size1/container.mix.json"
-        },
-        "label": {
-          "status": "supported",
-          "evidence": "declared",
-          "document": "styles/button/outline-size1/label.mix.json"
-        },
-        "leadingIcon": {
-          "status": "supported",
-          "evidence": "declared",
-          "document": "styles/button/outline-size1/icon.mix.json"
-        },
-        "trailingIcon": {
-          "status": "supported",
-          "evidence": "declared",
-          "document": "styles/button/outline-size1/icon.mix.json"
-        },
-        "spinner": {
-          "status": "unsupported",
-          "evidence": "declared",
-          "diagnostics": [
-            {
-              "code": "unsupported_slot_primitive",
-              "severity": "error",
-              "path": "spinner",
-              "message": "RemixSpinner has no neutral Mix protocol primitive."
-            }
-          ]
-        }
-      }
-    },
-    {
-      "id": "outline-size2",
-      "properties": {
-        "variant": "outline",
-        "size": "size2"
-      },
-      "styles": {
-        "container": {
-          "status": "supported",
-          "evidence": "declared",
-          "document": "styles/button/outline-size2/container.mix.json"
-        },
-        "label": {
-          "status": "supported",
-          "evidence": "declared",
-          "document": "styles/button/outline-size2/label.mix.json"
-        },
-        "leadingIcon": {
-          "status": "supported",
-          "evidence": "declared",
-          "document": "styles/button/outline-size2/icon.mix.json"
-        },
-        "trailingIcon": {
-          "status": "supported",
-          "evidence": "declared",
-          "document": "styles/button/outline-size2/icon.mix.json"
-        },
-        "spinner": {
-          "status": "unsupported",
-          "evidence": "declared",
-          "diagnostics": [
-            {
-              "code": "unsupported_slot_primitive",
-              "severity": "error",
-              "path": "spinner",
-              "message": "RemixSpinner has no neutral Mix protocol primitive."
-            }
-          ]
-        }
-      }
-    },
-    {
-      "id": "outline-size3",
-      "properties": {
-        "variant": "outline",
-        "size": "size3"
-      },
-      "styles": {
-        "container": {
-          "status": "supported",
-          "evidence": "declared",
-          "document": "styles/button/outline-size3/container.mix.json"
-        },
-        "label": {
-          "status": "supported",
-          "evidence": "declared",
-          "document": "styles/button/outline-size3/label.mix.json"
-        },
-        "leadingIcon": {
-          "status": "supported",
-          "evidence": "declared",
-          "document": "styles/button/outline-size3/icon.mix.json"
-        },
-        "trailingIcon": {
-          "status": "supported",
-          "evidence": "declared",
-          "document": "styles/button/outline-size3/icon.mix.json"
-        },
-        "spinner": {
-          "status": "unsupported",
-          "evidence": "declared",
-          "diagnostics": [
-            {
-              "code": "unsupported_slot_primitive",
-              "severity": "error",
-              "path": "spinner",
-              "message": "RemixSpinner has no neutral Mix protocol primitive."
-            }
-          ]
-        }
-      }
-    },
-    {
-      "id": "outline-size4",
-      "properties": {
-        "variant": "outline",
-        "size": "size4"
-      },
-      "styles": {
-        "container": {
-          "status": "supported",
-          "evidence": "declared",
-          "document": "styles/button/outline-size4/container.mix.json"
-        },
-        "label": {
-          "status": "supported",
-          "evidence": "declared",
-          "document": "styles/button/outline-size4/label.mix.json"
-        },
-        "leadingIcon": {
-          "status": "supported",
-          "evidence": "declared",
-          "document": "styles/button/outline-size4/icon.mix.json"
-        },
-        "trailingIcon": {
-          "status": "supported",
-          "evidence": "declared",
-          "document": "styles/button/outline-size4/icon.mix.json"
-        },
-        "spinner": {
-          "status": "unsupported",
-          "evidence": "declared",
-          "diagnostics": [
-            {
-              "code": "unsupported_slot_primitive",
-              "severity": "error",
-              "path": "spinner",
-              "message": "RemixSpinner has no neutral Mix protocol primitive."
-            }
-          ]
-        }
-      }
-    },
-    {
-      "id": "ghost-size1",
-      "properties": {
-        "variant": "ghost",
-        "size": "size1"
-      },
-      "styles": {
-        "container": {
-          "status": "supported",
-          "evidence": "declared",
-          "document": "styles/button/ghost-size1/container.mix.json"
-        },
-        "label": {
-          "status": "supported",
-          "evidence": "declared",
-          "document": "styles/button/ghost-size1/label.mix.json"
-        },
-        "leadingIcon": {
-          "status": "supported",
-          "evidence": "declared",
-          "document": "styles/button/ghost-size1/icon.mix.json"
-        },
-        "trailingIcon": {
-          "status": "supported",
-          "evidence": "declared",
-          "document": "styles/button/ghost-size1/icon.mix.json"
-        },
-        "spinner": {
-          "status": "unsupported",
-          "evidence": "declared",
-          "diagnostics": [
-            {
-              "code": "unsupported_slot_primitive",
-              "severity": "error",
-              "path": "spinner",
-              "message": "RemixSpinner has no neutral Mix protocol primitive."
-            }
-          ]
-        }
-      }
-    },
-    {
-      "id": "ghost-size2",
-      "properties": {
-        "variant": "ghost",
-        "size": "size2"
-      },
-      "styles": {
-        "container": {
-          "status": "supported",
-          "evidence": "declared",
-          "document": "styles/button/ghost-size2/container.mix.json"
-        },
-        "label": {
-          "status": "supported",
-          "evidence": "declared",
-          "document": "styles/button/ghost-size2/label.mix.json"
-        },
-        "leadingIcon": {
-          "status": "supported",
-          "evidence": "declared",
-          "document": "styles/button/ghost-size2/icon.mix.json"
-        },
-        "trailingIcon": {
-          "status": "supported",
-          "evidence": "declared",
-          "document": "styles/button/ghost-size2/icon.mix.json"
-        },
-        "spinner": {
-          "status": "unsupported",
-          "evidence": "declared",
-          "diagnostics": [
-            {
-              "code": "unsupported_slot_primitive",
-              "severity": "error",
-              "path": "spinner",
-              "message": "RemixSpinner has no neutral Mix protocol primitive."
-            }
-          ]
-        }
-      }
-    },
-    {
-      "id": "ghost-size3",
-      "properties": {
-        "variant": "ghost",
-        "size": "size3"
-      },
-      "styles": {
-        "container": {
-          "status": "supported",
-          "evidence": "declared",
-          "document": "styles/button/ghost-size3/container.mix.json"
-        },
-        "label": {
-          "status": "supported",
-          "evidence": "declared",
-          "document": "styles/button/ghost-size3/label.mix.json"
-        },
-        "leadingIcon": {
-          "status": "supported",
-          "evidence": "declared",
-          "document": "styles/button/ghost-size3/icon.mix.json"
-        },
-        "trailingIcon": {
-          "status": "supported",
-          "evidence": "declared",
-          "document": "styles/button/ghost-size3/icon.mix.json"
-        },
-        "spinner": {
-          "status": "unsupported",
-          "evidence": "declared",
-          "diagnostics": [
-            {
-              "code": "unsupported_slot_primitive",
-              "severity": "error",
-              "path": "spinner",
-              "message": "RemixSpinner has no neutral Mix protocol primitive."
-            }
-          ]
-        }
-      }
-    },
-    {
-      "id": "ghost-size4",
-      "properties": {
-        "variant": "ghost",
-        "size": "size4"
-      },
-      "styles": {
-        "container": {
-          "status": "supported",
-          "evidence": "declared",
-          "document": "styles/button/ghost-size4/container.mix.json"
-        },
-        "label": {
-          "status": "supported",
-          "evidence": "declared",
-          "document": "styles/button/ghost-size4/label.mix.json"
-        },
-        "leadingIcon": {
-          "status": "supported",
-          "evidence": "declared",
-          "document": "styles/button/ghost-size4/icon.mix.json"
-        },
-        "trailingIcon": {
-          "status": "supported",
-          "evidence": "declared",
-          "document": "styles/button/ghost-size4/icon.mix.json"
-        },
-        "spinner": {
-          "status": "unsupported",
-          "evidence": "declared",
-          "diagnostics": [
-            {
-              "code": "unsupported_slot_primitive",
-              "severity": "error",
-              "path": "spinner",
-              "message": "RemixSpinner has no neutral Mix protocol primitive."
-            }
-          ]
-        }
-      }
-    }
-  ],
-  "semantics": {
-    "role": "button",
-    "labelProperty": "label",
-    "enabledProperty": "enabled",
-    "loadingProperty": "loading"
-  },
-  "oracles": [
-    {
-      "theme": "light",
-      "image": "light/button.png",
-      "metadata": "light/button.json",
-      "evidence": "rendered"
-    },
-    {
-      "theme": "dark",
-      "image": "dark/button.png",
-      "metadata": "dark/button.json",
-      "evidence": "rendered"
-    }
-  ]
-}
diff --git a/packages/demo/test/atlas/goldens/dark/button.json b/packages/demo/test/atlas/goldens/dark/button.json
deleted file mode 100644
index 4400306b..00000000
--- a/packages/demo/test/atlas/goldens/dark/button.json
+++ /dev/null
@@ -1,324 +0,0 @@
-{
-  "schema": "mix_atlas/atlas/v1",
-  "component": "button",
-  "componentLabel": "Button",
-  "theme": "dark",
-  "themeLabel": "Dark",
-  "brightness": "dark",
-  "file": "button.png",
-  "rowAxes": [
-    {
-      "id": "variant",
-      "label": "Variant"
-    },
-    {
-      "id": "size",
-      "label": "Size"
-    }
-  ],
-  "rows": [
-    {
-      "id": "solid-size1",
-      "values": {
-        "variant": {
-          "id": "solid",
-          "label": "Solid"
-        },
-        "size": {
-          "id": "size1",
-          "label": "Size 1"
-        }
-      }
-    },
-    {
-      "id": "solid-size2",
-      "values": {
-        "variant": {
-          "id": "solid",
-          "label": "Solid"
-        },
-        "size": {
-          "id": "size2",
-          "label": "Size 2"
-        }
-      }
-    },
-    {
-      "id": "solid-size3",
-      "values": {
-        "variant": {
-          "id": "solid",
-          "label": "Solid"
-        },
-        "size": {
-          "id": "size3",
-          "label": "Size 3"
-        }
-      }
-    },
-    {
-      "id": "solid-size4",
-      "values": {
-        "variant": {
-          "id": "solid",
-          "label": "Solid"
-        },
-        "size": {
-          "id": "size4",
-          "label": "Size 4"
-        }
-      }
-    },
-    {
-      "id": "soft-size1",
-      "values": {
-        "variant": {
-          "id": "soft",
-          "label": "Soft"
-        },
-        "size": {
-          "id": "size1",
-          "label": "Size 1"
-        }
-      }
-    },
-    {
-      "id": "soft-size2",
-      "values": {
-        "variant": {
-          "id": "soft",
-          "label": "Soft"
-        },
-        "size": {
-          "id": "size2",
-          "label": "Size 2"
-        }
-      }
-    },
-    {
-      "id": "soft-size3",
-      "values": {
-        "variant": {
-          "id": "soft",
-          "label": "Soft"
-        },
-        "size": {
-          "id": "size3",
-          "label": "Size 3"
-        }
-      }
-    },
-    {
-      "id": "soft-size4",
-      "values": {
-        "variant": {
-          "id": "soft",
-          "label": "Soft"
-        },
-        "size": {
-          "id": "size4",
-          "label": "Size 4"
-        }
-      }
-    },
-    {
-      "id": "surface-size1",
-      "values": {
-        "variant": {
-          "id": "surface",
-          "label": "Surface"
-        },
-        "size": {
-          "id": "size1",
-          "label": "Size 1"
-        }
-      }
-    },
-    {
-      "id": "surface-size2",
-      "values": {
-        "variant": {
-          "id": "surface",
-          "label": "Surface"
-        },
-        "size": {
-          "id": "size2",
-          "label": "Size 2"
-        }
-      }
-    },
-    {
-      "id": "surface-size3",
-      "values": {
-        "variant": {
-          "id": "surface",
-          "label": "Surface"
-        },
-        "size": {
-          "id": "size3",
-          "label": "Size 3"
-        }
-      }
-    },
-    {
-      "id": "surface-size4",
-      "values": {
-        "variant": {
-          "id": "surface",
-          "label": "Surface"
-        },
-        "size": {
-          "id": "size4",
-          "label": "Size 4"
-        }
-      }
-    },
-    {
-      "id": "outline-size1",
-      "values": {
-        "variant": {
-          "id": "outline",
-          "label": "Outline"
-        },
-        "size": {
-          "id": "size1",
-          "label": "Size 1"
-        }
-      }
-    },
-    {
-      "id": "outline-size2",
-      "values": {
-        "variant": {
-          "id": "outline",
-          "label": "Outline"
-        },
-        "size": {
-          "id": "size2",
-          "label": "Size 2"
-        }
-      }
-    },
-    {
-      "id": "outline-size3",
-      "values": {
-        "variant": {
-          "id": "outline",
-          "label": "Outline"
-        },
-        "size": {
-          "id": "size3",
-          "label": "Size 3"
-        }
-      }
-    },
-    {
-      "id": "outline-size4",
-      "values": {
-        "variant": {
-          "id": "outline",
-          "label": "Outline"
-        },
-        "size": {
-          "id": "size4",
-          "label": "Size 4"
-        }
-      }
-    },
-    {
-      "id": "ghost-size1",
-      "values": {
-        "variant": {
-          "id": "ghost",
-          "label": "Ghost"
-        },
-        "size": {
-          "id": "size1",
-          "label": "Size 1"
-        }
-      }
-    },
-    {
-      "id": "ghost-size2",
-      "values": {
-        "variant": {
-          "id": "ghost",
-          "label": "Ghost"
-        },
-        "size": {
-          "id": "size2",
-          "label": "Size 2"
-        }
-      }
-    },
-    {
-      "id": "ghost-size3",
-      "values": {
-        "variant": {
-          "id": "ghost",
-          "label": "Ghost"
-        },
-        "size": {
-          "id": "size3",
-          "label": "Size 3"
-        }
-      }
-    },
-    {
-      "id": "ghost-size4",
-      "values": {
-        "variant": {
-          "id": "ghost",
-          "label": "Ghost"
-        },
-        "size": {
-          "id": "size4",
-          "label": "Size 4"
-        }
-      }
-    }
-  ],
-  "columns": [
-    {
-      "id": "default",
-      "states": [],
-      "props": {}
-    },
-    {
-      "id": "hovered",
-      "states": [
-        "hovered"
-      ],
-      "props": {}
-    },
-    {
-      "id": "pressed",
-      "states": [
-        "pressed"
-      ],
-      "props": {}
-    },
-    {
-      "id": "focused",
-      "states": [
-        "focused"
-      ],
-      "props": {}
-    },
-    {
-      "id": "disabled",
-      "states": [
-        "disabled"
-      ],
-      "props": {}
-    },
-    {
-      "id": "loading",
-      "label": "Loading",
-      "states": [],
-      "props": {
-        "loading": true
-      }
-    }
-  ]
-}
diff --git a/packages/demo/test/atlas/goldens/dark/button.png b/packages/demo/test/atlas/goldens/dark/button.png
deleted file mode 100644
index 5a80d256..00000000
Binary files a/packages/demo/test/atlas/goldens/dark/button.png and /dev/null differ
diff --git a/packages/demo/test/atlas/goldens/light/button.json b/packages/demo/test/atlas/goldens/light/button.json
deleted file mode 100644
index 0f62c9d7..00000000
--- a/packages/demo/test/atlas/goldens/light/button.json
+++ /dev/null
@@ -1,324 +0,0 @@
-{
-  "schema": "mix_atlas/atlas/v1",
-  "component": "button",
-  "componentLabel": "Button",
-  "theme": "light",
-  "themeLabel": "Light",
-  "brightness": "light",
-  "file": "button.png",
-  "rowAxes": [
-    {
-      "id": "variant",
-      "label": "Variant"
-    },
-    {
-      "id": "size",
-      "label": "Size"
-    }
-  ],
-  "rows": [
-    {
-      "id": "solid-size1",
-      "values": {
-        "variant": {
-          "id": "solid",
-          "label": "Solid"
-        },
-        "size": {
-          "id": "size1",
-          "label": "Size 1"
-        }
-      }
-    },
-    {
-      "id": "solid-size2",
-      "values": {
-        "variant": {
-          "id": "solid",
-          "label": "Solid"
-        },
-        "size": {
-          "id": "size2",
-          "label": "Size 2"
-        }
-      }
-    },
-    {
-      "id": "solid-size3",
-      "values": {
-        "variant": {
-          "id": "solid",
-          "label": "Solid"
-        },
-        "size": {
-          "id": "size3",
-          "label": "Size 3"
-        }
-      }
-    },
-    {
-      "id": "solid-size4",
-      "values": {
-        "variant": {
-          "id": "solid",
-          "label": "Solid"
-        },
-        "size": {
-          "id": "size4",
-          "label": "Size 4"
-        }
-      }
-    },
-    {
-      "id": "soft-size1",
-      "values": {
-        "variant": {
-          "id": "soft",
-          "label": "Soft"
-        },
-        "size": {
-          "id": "size1",
-          "label": "Size 1"
-        }
-      }
-    },
-    {
-      "id": "soft-size2",
-      "values": {
-        "variant": {
-          "id": "soft",
-          "label": "Soft"
-        },
-        "size": {
-          "id": "size2",
-          "label": "Size 2"
-        }
-      }
-    },
-    {
-      "id": "soft-size3",
-      "values": {
-        "variant": {
-          "id": "soft",
-          "label": "Soft"
-        },
-        "size": {
-          "id": "size3",
-          "label": "Size 3"
-        }
-      }
-    },
-    {
-      "id": "soft-size4",
-      "values": {
-        "variant": {
-          "id": "soft",
-          "label": "Soft"
-        },
-        "size": {
-          "id": "size4",
-          "label": "Size 4"
-        }
-      }
-    },
-    {
-      "id": "surface-size1",
-      "values": {
-        "variant": {
-          "id": "surface",
-          "label": "Surface"
-        },
-        "size": {
-          "id": "size1",
-          "label": "Size 1"
-        }
-      }
-    },
-    {
-      "id": "surface-size2",
-      "values": {
-        "variant": {
-          "id": "surface",
-          "label": "Surface"
-        },
-        "size": {
-          "id": "size2",
-          "label": "Size 2"
-        }
-      }
-    },
-    {
-      "id": "surface-size3",
-      "values": {
-        "variant": {
-          "id": "surface",
-          "label": "Surface"
-        },
-        "size": {
-          "id": "size3",
-          "label": "Size 3"
-        }
-      }
-    },
-    {
-      "id": "surface-size4",
-      "values": {
-        "variant": {
-          "id": "surface",
-          "label": "Surface"
-        },
-        "size": {
-          "id": "size4",
-          "label": "Size 4"
-        }
-      }
-    },
-    {
-      "id": "outline-size1",
-      "values": {
-        "variant": {
-          "id": "outline",
-          "label": "Outline"
-        },
-        "size": {
-          "id": "size1",
-          "label": "Size 1"
-        }
-      }
-    },
-    {
-      "id": "outline-size2",
-      "values": {
-        "variant": {
-          "id": "outline",
-          "label": "Outline"
-        },
-        "size": {
-          "id": "size2",
-          "label": "Size 2"
-        }
-      }
-    },
-    {
-      "id": "outline-size3",
-      "values": {
-        "variant": {
-          "id": "outline",
-          "label": "Outline"
-        },
-        "size": {
-          "id": "size3",
-          "label": "Size 3"
-        }
-      }
-    },
-    {
-      "id": "outline-size4",
-      "values": {
-        "variant": {
-          "id": "outline",
-          "label": "Outline"
-        },
-        "size": {
-          "id": "size4",
-          "label": "Size 4"
-        }
-      }
-    },
-    {
-      "id": "ghost-size1",
-      "values": {
-        "variant": {
-          "id": "ghost",
-          "label": "Ghost"
-        },
-        "size": {
-          "id": "size1",
-          "label": "Size 1"
-        }
-      }
-    },
-    {
-      "id": "ghost-size2",
-      "values": {
-        "variant": {
-          "id": "ghost",
-          "label": "Ghost"
-        },
-        "size": {
-          "id": "size2",
-          "label": "Size 2"
-        }
-      }
-    },
-    {
-      "id": "ghost-size3",
-      "values": {
-        "variant": {
-          "id": "ghost",
-          "label": "Ghost"
-        },
-        "size": {
-          "id": "size3",
-          "label": "Size 3"
-        }
-      }
-    },
-    {
-      "id": "ghost-size4",
-      "values": {
-        "variant": {
-          "id": "ghost",
-          "label": "Ghost"
-        },
-        "size": {
-          "id": "size4",
-          "label": "Size 4"
-        }
-      }
-    }
-  ],
-  "columns": [
-    {
-      "id": "default",
-      "states": [],
-      "props": {}
-    },
-    {
-      "id": "hovered",
-      "states": [
-        "hovered"
-      ],
-      "props": {}
-    },
-    {
-      "id": "pressed",
-      "states": [
-        "pressed"
-      ],
-      "props": {}
-    },
-    {
-      "id": "focused",
-      "states": [
-        "focused"
-      ],
-      "props": {}
-    },
-    {
-      "id": "disabled",
-      "states": [
-        "disabled"
-      ],
-      "props": {}
-    },
-    {
-      "id": "loading",
-      "label": "Loading",
-      "states": [],
-      "props": {
-        "loading": true
-      }
-    }
-  ]
-}
diff --git a/packages/demo/test/atlas/goldens/light/button.png b/packages/demo/test/atlas/goldens/light/button.png
deleted file mode 100644
index 385c08cd..00000000
Binary files a/packages/demo/test/atlas/goldens/light/button.png and /dev/null differ
diff --git a/packages/demo/test/atlas/goldens/protocol/coverage.json b/packages/demo/test/atlas/goldens/protocol/coverage.json
deleted file mode 100644
index b7454864..00000000
--- a/packages/demo/test/atlas/goldens/protocol/coverage.json
+++ /dev/null
@@ -1,222 +0,0 @@
-{
-  "schema": "mix_atlas/protocol-coverage/v1",
-  "mixProtocolVersion": "1.0.0",
-  "mixProtocolFormat": 1,
-  "themes": [
-    {
-      "id": "dark",
-      "status": "supported",
-      "tokenCount": 111,
-      "rawStatus": "failed",
-      "captureTransform": "concretizeBoxShadowColorTokenReferences",
-      "rawDiagnostics": [
-        {
-          "code": "constraint_violation",
-          "severity": "error",
-          "path": "/boxShadows/fortal.shadow.1",
-          "message": "Theme token values must be concrete; token references are only allowed as same-kind whole-value aliases in theme JSON.",
-          "value": "MixProtocolTokenReference(colors, fortal.gray.a6)"
-        },
-        {
-          "code": "constraint_violation",
-          "severity": "error",
-          "path": "/boxShadows/fortal.shadow.2",
-          "message": "Theme token values must be concrete; token references are only allowed as same-kind whole-value aliases in theme JSON.",
-          "value": "MixProtocolTokenReference(colors, fortal.shadow.stroke)"
-        },
-        {
-          "code": "constraint_violation",
-          "severity": "error",
-          "path": "/boxShadows/fortal.shadow.3",
-          "message": "Theme token values must be concrete; token references are only allowed as same-kind whole-value aliases in theme JSON.",
-          "value": "MixProtocolTokenReference(colors, fortal.shadow.stroke)"
-        },
-        {
-          "code": "constraint_violation",
-          "severity": "error",
-          "path": "/boxShadows/fortal.shadow.4",
-          "message": "Theme token values must be concrete; token references are only allowed as same-kind whole-value aliases in theme JSON.",
-          "value": "MixProtocolTokenReference(colors, fortal.shadow.stroke)"
-        },
-        {
-          "code": "constraint_violation",
-          "severity": "error",
-          "path": "/boxShadows/fortal.shadow.5",
-          "message": "Theme token values must be concrete; token references are only allowed as same-kind whole-value aliases in theme JSON.",
-          "value": "MixProtocolTokenReference(colors, fortal.shadow.stroke)"
-        },
-        {
-          "code": "constraint_violation",
-          "severity": "error",
-          "path": "/boxShadows/fortal.shadow.6",
-          "message": "Theme token values must be concrete; token references are only allowed as same-kind whole-value aliases in theme JSON.",
-          "value": "MixProtocolTokenReference(colors, fortal.shadow.stroke)"
-        }
-      ]
-    },
-    {
-      "id": "light",
-      "status": "supported",
-      "tokenCount": 111,
-      "rawStatus": "failed",
-      "captureTransform": "concretizeBoxShadowColorTokenReferences",
-      "rawDiagnostics": [
-        {
-          "code": "constraint_violation",
-          "severity": "error",
-          "path": "/boxShadows/fortal.shadow.1",
-          "message": "Theme token values must be concrete; token references are only allowed as same-kind whole-value aliases in theme JSON.",
-          "value": "MixProtocolTokenReference(colors, fortal.gray.a6)"
-        },
-        {
-          "code": "constraint_violation",
-          "severity": "error",
-          "path": "/boxShadows/fortal.shadow.2",
-          "message": "Theme token values must be concrete; token references are only allowed as same-kind whole-value aliases in theme JSON.",
-          "value": "MixProtocolTokenReference(colors, fortal.shadow.stroke)"
-        },
-        {
-          "code": "constraint_violation",
-          "severity": "error",
-          "path": "/boxShadows/fortal.shadow.3",
-          "message": "Theme token values must be concrete; token references are only allowed as same-kind whole-value aliases in theme JSON.",
-          "value": "MixProtocolTokenReference(colors, fortal.shadow.stroke)"
-        },
-        {
-          "code": "constraint_violation",
-          "severity": "error",
-          "path": "/boxShadows/fortal.shadow.4",
-          "message": "Theme token values must be concrete; token references are only allowed as same-kind whole-value aliases in theme JSON.",
-          "value": "MixProtocolTokenReference(colors, fortal.shadow.stroke)"
-        },
-        {
-          "code": "constraint_violation",
-          "severity": "error",
-          "path": "/boxShadows/fortal.shadow.5",
-          "message": "Theme token values must be concrete; token references are only allowed as same-kind whole-value aliases in theme JSON.",
-          "value": "MixProtocolTokenReference(colors, fortal.shadow.stroke)"
-        },
-        {
-          "code": "constraint_violation",
-          "severity": "error",
-          "path": "/boxShadows/fortal.shadow.6",
-          "message": "Theme token values must be concrete; token references are only allowed as same-kind whole-value aliases in theme JSON.",
-          "value": "MixProtocolTokenReference(colors, fortal.shadow.stroke)"
-        }
-      ]
-    }
-  ],
-  "styles": [
-    {
-      "id": "fortal-tokenized-flex-box-fixture",
-      "runtimeType": "FlexBoxStyler",
-      "status": "supported",
-      "tokenReferences": [
-        {
-          "kind": "colors",
-          "name": "fortal.accent.9"
-        },
-        {
-          "kind": "spaces",
-          "name": "fortal.space.2"
-        },
-        {
-          "kind": "spaces",
-          "name": "fortal.space.3"
-        }
-      ]
-    },
-    {
-      "id": "fortal-tokenized-flex-box-fluent",
-      "runtimeType": "FlexBoxStyler",
-      "status": "supported",
-      "tokenReferences": [
-        {
-          "kind": "colors",
-          "name": "fortal.accent.9"
-        },
-        {
-          "kind": "spaces",
-          "name": "fortal.space.2"
-        },
-        {
-          "kind": "spaces",
-          "name": "fortal.space.3"
-        }
-      ]
-    },
-    {
-      "id": "fortal-button-portable",
-      "runtimeType": "ButtonStyler projection",
-      "status": "partial",
-      "recipeCount": 20,
-      "totalMatrixCells": 240,
-      "nonLoadingCells": 200,
-      "loadingUnsupportedCells": 40,
-      "supportedContainerRecipes": 20,
-      "diagnostics": [
-        {
-          "code": "unsupported_slot_primitive",
-          "severity": "error",
-          "path": "spinner",
-          "message": "RemixSpinner has no neutral Mix protocol primitive."
-        }
-      ]
-    },
-    {
-      "id": "fortal-button",
-      "runtimeType": "ButtonStyler",
-      "status": "unsupported",
-      "diagnostics": [
-        {
-          "code": "unsupported_encode_value",
-          "severity": "error",
-          "path": "",
-          "message": "Expected box, got ButtonStyler."
-        },
-        {
-          "code": "unsupported_encode_value",
-          "severity": "error",
-          "path": "",
-          "message": "Expected text, got ButtonStyler."
-        },
-        {
-          "code": "unsupported_encode_value",
-          "severity": "error",
-          "path": "",
-          "message": "Expected flex, got ButtonStyler."
-        },
-        {
-          "code": "unsupported_encode_value",
-          "severity": "error",
-          "path": "",
-          "message": "Expected stack, got ButtonStyler."
-        },
-        {
-          "code": "unsupported_encode_value",
-          "severity": "error",
-          "path": "",
-          "message": "Expected icon, got ButtonStyler."
-        },
-        {
-          "code": "unsupported_encode_value",
-          "severity": "error",
-          "path": "",
-          "message": "Expected image, got ButtonStyler."
-        },
-        {
-          "code": "unsupported_encode_value",
-          "severity": "error",
-          "path": "",
-          "message": "Expected flex_box, got ButtonStyler."
-        },
-        {
-          "code": "unsupported_encode_value",
-          "severity": "error",
-          "path": "",
-          "message": "Expected stack_box, got ButtonStyler."
-        }
-      ]
-    }
-  ]
-}
diff --git a/packages/demo/test/atlas/goldens/protocol/fixtures/fortal-tokenized-flex-box.mix.json b/packages/demo/test/atlas/goldens/protocol/fixtures/fortal-tokenized-flex-box.mix.json
deleted file mode 100644
index 0f7d4698..00000000
--- a/packages/demo/test/atlas/goldens/protocol/fixtures/fortal-tokenized-flex-box.mix.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "type": "flex_box",
-  "padding": {
-    "$token": "fortal.space.3",
-    "kind": "space"
-  },
-  "decoration": {
-    "color": {
-      "$token": "fortal.accent.9"
-    }
-  },
-  "spacing": {
-    "$token": "fortal.space.2",
-    "kind": "space"
-  },
-  "v": 1
-}
diff --git a/packages/demo/test/atlas/goldens/protocol/themes/dark.mix.json b/packages/demo/test/atlas/goldens/protocol/themes/dark.mix.json
deleted file mode 100644
index e1ede959..00000000
--- a/packages/demo/test/atlas/goldens/protocol/themes/dark.mix.json
+++ /dev/null
@@ -1,360 +0,0 @@
-{
-  "v": 1,
-  "type": "theme",
-  "colors": {
-    "fortal.color.background": "#111113",
-    "fortal.color.surface": "#801F2123",
-    "fortal.color.panel.solid": "#18191B",
-    "fortal.color.panel.translucent": "#09D8F4F6",
-    "fortal.color.overlay": "#99000000",
-    "fortal.accent.surface": "#80171D3B",
-    "fortal.accent.indicator": "#3E63DD",
-    "fortal.accent.track": "#3E63DD",
-    "fortal.accent.contrast": "#FFFFFF",
-    "fortal.focus.8": "#405EB2",
-    "fortal.focus.a8": "#AC5783FF",
-    "fortal.accent.1": "#0C111C",
-    "fortal.accent.2": "#111725",
-    "fortal.accent.3": "#172448",
-    "fortal.accent.4": "#1D2E61",
-    "fortal.accent.5": "#243974",
-    "fortal.accent.6": "#2D4484",
-    "fortal.accent.7": "#375098",
-    "fortal.accent.8": "#405EB2",
-    "fortal.accent.9": "#3D63DD",
-    "fortal.accent.10": "#3F5CB0",
-    "fortal.accent.11": "#93B4FF",
-    "fortal.accent.12": "#D5E2FF",
-    "fortal.gray.1": "#111113",
-    "fortal.gray.2": "#18191B",
-    "fortal.gray.3": "#212225",
-    "fortal.gray.4": "#272A2D",
-    "fortal.gray.5": "#2E3135",
-    "fortal.gray.6": "#363A3F",
-    "fortal.gray.7": "#43484E",
-    "fortal.gray.8": "#5A6169",
-    "fortal.gray.9": "#696E77",
-    "fortal.gray.10": "#777B84",
-    "fortal.gray.11": "#B0B4BA",
-    "fortal.gray.12": "#EDEEF0",
-    "fortal.gray.surface": "#801F2123",
-    "fortal.gray.indicator": "#696E77",
-    "fortal.gray.track": "#696E77",
-    "fortal.gray.contrast": "#FFFFFF",
-    "fortal.accent.a1": "#0F0012FB",
-    "fortal.accent.a2": "#171156F9",
-    "fortal.accent.a3": "#3C2B64FF",
-    "fortal.accent.a4": "#573567FF",
-    "fortal.accent.a5": "#6B3F71FD",
-    "fortal.accent.a6": "#7C4B7AFD",
-    "fortal.accent.a7": "#905480FF",
-    "fortal.accent.a8": "#AC5783FF",
-    "fortal.accent.a9": "#DB4571FF",
-    "fortal.accent.a10": "#E35580FE",
-    "fortal.accent.a11": "#93B4FF",
-    "fortal.accent.a12": "#D5E2FF",
-    "fortal.gray.a1": "#00000000",
-    "fortal.gray.a2": "#09D8F4F6",
-    "fortal.gray.a3": "#14DDEAF8",
-    "fortal.gray.a4": "#1DD3EDF8",
-    "fortal.gray.a5": "#25D9EDFE",
-    "fortal.gray.a6": "#30D6EBFD",
-    "fortal.gray.a7": "#40D9EDFF",
-    "fortal.gray.a8": "#5DD9EDFF",
-    "fortal.gray.a9": "#6DDFEBFD",
-    "fortal.gray.a10": "#7BE5EDFD",
-    "fortal.gray.a11": "#B5F1F7FE",
-    "fortal.gray.a12": "#EFFCFDFF",
-    "fortal.black.a3": "#26000000",
-    "fortal.black.a4": "#33000000",
-    "fortal.black.a5": "#4D000000",
-    "fortal.black.a6": "#66000000",
-    "fortal.black.a7": "#80000000",
-    "fortal.black.a11": "#E6000000",
-    "fortal.shadow.stroke": "#66000000"
-  },
-  "spaces": {
-    "fortal.space.1": 4.0,
-    "fortal.space.2": 8.0,
-    "fortal.space.3": 12.0,
-    "fortal.space.4": 16.0,
-    "fortal.space.5": 24.0,
-    "fortal.space.6": 32.0,
-    "fortal.space.7": 40.0,
-    "fortal.space.8": 48.0,
-    "fortal.space.9": 64.0,
-    "fortal.border.width.1": 1.0,
-    "fortal.border.width.2": 2.0,
-    "fortal.focus.ring.width": 2.0,
-    "fortal.focus.ring.offset": 2.0
-  },
-  "radii": {
-    "fortal.radius.1": 3.0,
-    "fortal.radius.2": 4.0,
-    "fortal.radius.3": 6.0,
-    "fortal.radius.4": 8.0,
-    "fortal.radius.5": 12.0,
-    "fortal.radius.6": 16.0,
-    "fortal.radius.full": 9999.0
-  },
-  "textStyles": {
-    "fortal.text.1": {
-      "fontSize": 12.0,
-      "letterSpacing": 0.03,
-      "height": 1.3333333333333333
-    },
-    "fortal.text.2": {
-      "fontSize": 14.0,
-      "letterSpacing": 0.0,
-      "height": 1.4285714285714286
-    },
-    "fortal.text.3": {
-      "fontSize": 16.0,
-      "letterSpacing": 0.0,
-      "height": 1.5
-    },
-    "fortal.text.4": {
-      "fontSize": 18.0,
-      "letterSpacing": -0.045,
-      "height": 1.4444444444444444
-    },
-    "fortal.text.5": {
-      "fontSize": 20.0,
-      "letterSpacing": -0.1,
-      "height": 1.4
-    },
-    "fortal.text.6": {
-      "fontSize": 24.0,
-      "letterSpacing": -0.15000000000000002,
-      "height": 1.25
-    },
-    "fortal.text.7": {
-      "fontSize": 28.0,
-      "letterSpacing": -0.21,
-      "height": 1.2857142857142858
-    },
-    "fortal.text.8": {
-      "fontSize": 35.0,
-      "letterSpacing": -0.35000000000000003,
-      "height": 1.1428571428571428
-    },
-    "fortal.text.9": {
-      "fontSize": 60.0,
-      "letterSpacing": -1.5,
-      "height": 1.0
-    }
-  },
-  "boxShadows": {
-    "fortal.shadow.1": [
-      {
-        "color": "#30D6EBFD",
-        "offset": {
-          "x": 0.0,
-          "y": 0.0
-        },
-        "blurRadius": 0.0,
-        "spreadRadius": 1.0
-      },
-      {
-        "color": "#4D000000",
-        "offset": {
-          "x": 0.0,
-          "y": 1.0
-        },
-        "blurRadius": 2.0,
-        "spreadRadius": 0.0
-      }
-    ],
-    "fortal.shadow.2": [
-      {
-        "color": "#66000000",
-        "offset": {
-          "x": 0.0,
-          "y": 0.0
-        },
-        "blurRadius": 0.0,
-        "spreadRadius": 1.0
-      },
-      {
-        "color": "#26000000",
-        "offset": {
-          "x": 0.0,
-          "y": 0.0
-        },
-        "blurRadius": 0.5,
-        "spreadRadius": 0.0
-      },
-      {
-        "color": "#66000000",
-        "offset": {
-          "x": 0.0,
-          "y": 1.0
-        },
-        "blurRadius": 1.0,
-        "spreadRadius": 0.0
-      },
-      {
-        "color": "#66000000",
-        "offset": {
-          "x": 0.0,
-          "y": 2.0
-        },
-        "blurRadius": 1.0,
-        "spreadRadius": -1.0
-      },
-      {
-        "color": "#4D000000",
-        "offset": {
-          "x": 0.0,
-          "y": 1.0
-        },
-        "blurRadius": 3.0,
-        "spreadRadius": 0.0
-      }
-    ],
-    "fortal.shadow.3": [
-      {
-        "color": "#66000000",
-        "offset": {
-          "x": 0.0,
-          "y": 0.0
-        },
-        "blurRadius": 0.0,
-        "spreadRadius": 1.0
-      },
-      {
-        "color": "#26000000",
-        "offset": {
-          "x": 0.0,
-          "y": 2.0
-        },
-        "blurRadius": 3.0,
-        "spreadRadius": -2.0
-      },
-      {
-        "color": "#66000000",
-        "offset": {
-          "x": 0.0,
-          "y": 3.0
-        },
-        "blurRadius": 8.0,
-        "spreadRadius": -2.0
-      },
-      {
-        "color": "#80000000",
-        "offset": {
-          "x": 0.0,
-          "y": 4.0
-        },
-        "blurRadius": 12.0,
-        "spreadRadius": -4.0
-      }
-    ],
-    "fortal.shadow.4": [
-      {
-        "color": "#66000000",
-        "offset": {
-          "x": 0.0,
-          "y": 0.0
-        },
-        "blurRadius": 0.0,
-        "spreadRadius": 1.0
-      },
-      {
-        "color": "#26000000",
-        "offset": {
-          "x": 0.0,
-          "y": 8.0
-        },
-        "blurRadius": 40.0,
-        "spreadRadius": 0.0
-      },
-      {
-        "color": "#4D000000",
-        "offset": {
-          "x": 0.0,
-          "y": 12.0
-        },
-        "blurRadius": 32.0,
-        "spreadRadius": -16.0
-      }
-    ],
-    "fortal.shadow.5": [
-      {
-        "color": "#66000000",
-        "offset": {
-          "x": 0.0,
-          "y": 0.0
-        },
-        "blurRadius": 0.0,
-        "spreadRadius": 1.0
-      },
-      {
-        "color": "#4D000000",
-        "offset": {
-          "x": 0.0,
-          "y": 12.0
-        },
-        "blurRadius": 60.0,
-        "spreadRadius": 0.0
-      },
-      {
-        "color": "#80000000",
-        "offset": {
-          "x": 0.0,
-          "y": 12.0
-        },
-        "blurRadius": 32.0,
-        "spreadRadius": -16.0
-      }
-    ],
-    "fortal.shadow.6": [
-      {
-        "color": "#66000000",
-        "offset": {
-          "x": 0.0,
-          "y": 0.0
-        },
-        "blurRadius": 0.0,
-        "spreadRadius": 1.0
-      },
-      {
-        "color": "#33000000",
-        "offset": {
-          "x": 0.0,
-          "y": 12.0
-        },
-        "blurRadius": 60.0,
-        "spreadRadius": 0.0
-      },
-      {
-        "color": "#66000000",
-        "offset": {
-          "x": 0.0,
-          "y": 16.0
-        },
-        "blurRadius": 64.0,
-        "spreadRadius": 0.0
-      },
-      {
-        "color": "#E6000000",
-        "offset": {
-          "x": 0.0,
-          "y": 16.0
-        },
-        "blurRadius": 36.0,
-        "spreadRadius": -20.0
-      }
-    ]
-  },
-  "fontWeights": {
-    "fortal.font.weight.light": "w300",
-    "fortal.font.weight.regular": "w400",
-    "fortal.font.weight.medium": "w500",
-    "fortal.font.weight.bold": "w700"
-  },
-  "durations": {
-    "fortal.transition.fast": 100,
-    "fortal.transition.slow": 300
-  }
-}
diff --git a/packages/demo/test/atlas/goldens/protocol/themes/light.mix.json b/packages/demo/test/atlas/goldens/protocol/themes/light.mix.json
deleted file mode 100644
index 994c1ce5..00000000
--- a/packages/demo/test/atlas/goldens/protocol/themes/light.mix.json
+++ /dev/null
@@ -1,360 +0,0 @@
-{
-  "v": 1,
-  "type": "theme",
-  "colors": {
-    "fortal.color.background": "#FCFCFD",
-    "fortal.color.surface": "#CCFFFFFF",
-    "fortal.color.panel.solid": "#F9F9FB",
-    "fortal.color.panel.translucent": "#06000055",
-    "fortal.color.overlay": "#66000000",
-    "fortal.accent.surface": "#CCF5F8FF",
-    "fortal.accent.indicator": "#3E63DD",
-    "fortal.accent.track": "#3E63DD",
-    "fortal.accent.contrast": "#FFFFFF",
-    "fortal.focus.8": "#87A5EF",
-    "fortal.focus.a8": "#720040DD",
-    "fortal.accent.1": "#FDFDFE",
-    "fortal.accent.2": "#F7F9FF",
-    "fortal.accent.3": "#EDF2FE",
-    "fortal.accent.4": "#DFEAFF",
-    "fortal.accent.5": "#D0DFFF",
-    "fortal.accent.6": "#BDD1FF",
-    "fortal.accent.7": "#A6BFF9",
-    "fortal.accent.8": "#87A5EF",
-    "fortal.accent.9": "#3D63DD",
-    "fortal.accent.10": "#3657C3",
-    "fortal.accent.11": "#395BC7",
-    "fortal.accent.12": "#1D2E5C",
-    "fortal.gray.1": "#FCFCFD",
-    "fortal.gray.2": "#F9F9FB",
-    "fortal.gray.3": "#F0F0F3",
-    "fortal.gray.4": "#E8E8EC",
-    "fortal.gray.5": "#E0E1E6",
-    "fortal.gray.6": "#D9D9E0",
-    "fortal.gray.7": "#CDCED7",
-    "fortal.gray.8": "#B9BBC6",
-    "fortal.gray.9": "#8B8D98",
-    "fortal.gray.10": "#80828D",
-    "fortal.gray.11": "#62636C",
-    "fortal.gray.12": "#1E1F24",
-    "fortal.gray.surface": "#CCFFFFFF",
-    "fortal.gray.indicator": "#8B8D98",
-    "fortal.gray.track": "#8B8D98",
-    "fortal.gray.contrast": "#FFFFFF",
-    "fortal.accent.a1": "#02000080",
-    "fortal.accent.a2": "#080040FF",
-    "fortal.accent.a3": "#120047F1",
-    "fortal.accent.a4": "#1E0058FF",
-    "fortal.accent.a5": "#2D0052FF",
-    "fortal.accent.a6": "#3E004EFF",
-    "fortal.accent.a7": "#540048EE",
-    "fortal.accent.a8": "#720040DD",
-    "fortal.accent.a9": "#C10032D2",
-    "fortal.accent.a10": "#CC002AB3",
-    "fortal.accent.a11": "#C5002CB7",
-    "fortal.accent.a12": "#E0001347",
-    "fortal.gray.a1": "#03000055",
-    "fortal.gray.a2": "#06000055",
-    "fortal.gray.a3": "#0F001040",
-    "fortal.gray.a4": "#17000B36",
-    "fortal.gray.a5": "#1F000932",
-    "fortal.gray.a6": "#26000735",
-    "fortal.gray.a7": "#32000633",
-    "fortal.gray.a8": "#46000830",
-    "fortal.gray.a9": "#7400051D",
-    "fortal.gray.a10": "#7F00051B",
-    "fortal.gray.a11": "#9F000211",
-    "fortal.gray.a12": "#E3000107",
-    "fortal.black.a3": "#26000000",
-    "fortal.black.a4": "#33000000",
-    "fortal.black.a5": "#4D000000",
-    "fortal.black.a6": "#66000000",
-    "fortal.black.a7": "#80000000",
-    "fortal.black.a11": "#E6000000",
-    "fortal.shadow.stroke": "#66000000"
-  },
-  "spaces": {
-    "fortal.space.1": 4.0,
-    "fortal.space.2": 8.0,
-    "fortal.space.3": 12.0,
-    "fortal.space.4": 16.0,
-    "fortal.space.5": 24.0,
-    "fortal.space.6": 32.0,
-    "fortal.space.7": 40.0,
-    "fortal.space.8": 48.0,
-    "fortal.space.9": 64.0,
-    "fortal.border.width.1": 1.0,
-    "fortal.border.width.2": 2.0,
-    "fortal.focus.ring.width": 2.0,
-    "fortal.focus.ring.offset": 2.0
-  },
-  "radii": {
-    "fortal.radius.1": 3.0,
-    "fortal.radius.2": 4.0,
-    "fortal.radius.3": 6.0,
-    "fortal.radius.4": 8.0,
-    "fortal.radius.5": 12.0,
-    "fortal.radius.6": 16.0,
-    "fortal.radius.full": 9999.0
-  },
-  "textStyles": {
-    "fortal.text.1": {
-      "fontSize": 12.0,
-      "letterSpacing": 0.03,
-      "height": 1.3333333333333333
-    },
-    "fortal.text.2": {
-      "fontSize": 14.0,
-      "letterSpacing": 0.0,
-      "height": 1.4285714285714286
-    },
-    "fortal.text.3": {
-      "fontSize": 16.0,
-      "letterSpacing": 0.0,
-      "height": 1.5
-    },
-    "fortal.text.4": {
-      "fontSize": 18.0,
-      "letterSpacing": -0.045,
-      "height": 1.4444444444444444
-    },
-    "fortal.text.5": {
-      "fontSize": 20.0,
-      "letterSpacing": -0.1,
-      "height": 1.4
-    },
-    "fortal.text.6": {
-      "fontSize": 24.0,
-      "letterSpacing": -0.15000000000000002,
-      "height": 1.25
-    },
-    "fortal.text.7": {
-      "fontSize": 28.0,
-      "letterSpacing": -0.21,
-      "height": 1.2857142857142858
-    },
-    "fortal.text.8": {
-      "fontSize": 35.0,
-      "letterSpacing": -0.35000000000000003,
-      "height": 1.1428571428571428
-    },
-    "fortal.text.9": {
-      "fontSize": 60.0,
-      "letterSpacing": -1.5,
-      "height": 1.0
-    }
-  },
-  "boxShadows": {
-    "fortal.shadow.1": [
-      {
-        "color": "#26000735",
-        "offset": {
-          "x": 0.0,
-          "y": 0.0
-        },
-        "blurRadius": 0.0,
-        "spreadRadius": 1.0
-      },
-      {
-        "color": "#4D000000",
-        "offset": {
-          "x": 0.0,
-          "y": 1.0
-        },
-        "blurRadius": 2.0,
-        "spreadRadius": 0.0
-      }
-    ],
-    "fortal.shadow.2": [
-      {
-        "color": "#66000000",
-        "offset": {
-          "x": 0.0,
-          "y": 0.0
-        },
-        "blurRadius": 0.0,
-        "spreadRadius": 1.0
-      },
-      {
-        "color": "#26000000",
-        "offset": {
-          "x": 0.0,
-          "y": 0.0
-        },
-        "blurRadius": 0.5,
-        "spreadRadius": 0.0
-      },
-      {
-        "color": "#66000000",
-        "offset": {
-          "x": 0.0,
-          "y": 1.0
-        },
-        "blurRadius": 1.0,
-        "spreadRadius": 0.0
-      },
-      {
-        "color": "#66000000",
-        "offset": {
-          "x": 0.0,
-          "y": 2.0
-        },
-        "blurRadius": 1.0,
-        "spreadRadius": -1.0
-      },
-      {
-        "color": "#4D000000",
-        "offset": {
-          "x": 0.0,
-          "y": 1.0
-        },
-        "blurRadius": 3.0,
-        "spreadRadius": 0.0
-      }
-    ],
-    "fortal.shadow.3": [
-      {
-        "color": "#66000000",
-        "offset": {
-          "x": 0.0,
-          "y": 0.0
-        },
-        "blurRadius": 0.0,
-        "spreadRadius": 1.0
-      },
-      {
-        "color": "#26000000",
-        "offset": {
-          "x": 0.0,
-          "y": 2.0
-        },
-        "blurRadius": 3.0,
-        "spreadRadius": -2.0
-      },
-      {
-        "color": "#66000000",
-        "offset": {
-          "x": 0.0,
-          "y": 3.0
-        },
-        "blurRadius": 8.0,
-        "spreadRadius": -2.0
-      },
-      {
-        "color": "#80000000",
-        "offset": {
-          "x": 0.0,
-          "y": 4.0
-        },
-        "blurRadius": 12.0,
-        "spreadRadius": -4.0
-      }
-    ],
-    "fortal.shadow.4": [
-      {
-        "color": "#66000000",
-        "offset": {
-          "x": 0.0,
-          "y": 0.0
-        },
-        "blurRadius": 0.0,
-        "spreadRadius": 1.0
-      },
-      {
-        "color": "#26000000",
-        "offset": {
-          "x": 0.0,
-          "y": 8.0
-        },
-        "blurRadius": 40.0,
-        "spreadRadius": 0.0
-      },
-      {
-        "color": "#4D000000",
-        "offset": {
-          "x": 0.0,
-          "y": 12.0
-        },
-        "blurRadius": 32.0,
-        "spreadRadius": -16.0
-      }
-    ],
-    "fortal.shadow.5": [
-      {
-        "color": "#66000000",
-        "offset": {
-          "x": 0.0,
-          "y": 0.0
-        },
-        "blurRadius": 0.0,
-        "spreadRadius": 1.0
-      },
-      {
-        "color": "#4D000000",
-        "offset": {
-          "x": 0.0,
-          "y": 12.0
-        },
-        "blurRadius": 60.0,
-        "spreadRadius": 0.0
-      },
-      {
-        "color": "#80000000",
-        "offset": {
-          "x": 0.0,
-          "y": 12.0
-        },
-        "blurRadius": 32.0,
-        "spreadRadius": -16.0
-      }
-    ],
-    "fortal.shadow.6": [
-      {
-        "color": "#66000000",
-        "offset": {
-          "x": 0.0,
-          "y": 0.0
-        },
-        "blurRadius": 0.0,
-        "spreadRadius": 1.0
-      },
-      {
-        "color": "#33000000",
-        "offset": {
-          "x": 0.0,
-          "y": 12.0
-        },
-        "blurRadius": 60.0,
-        "spreadRadius": 0.0
-      },
-      {
-        "color": "#66000000",
-        "offset": {
-          "x": 0.0,
-          "y": 16.0
-        },
-        "blurRadius": 64.0,
-        "spreadRadius": 0.0
-      },
-      {
-        "color": "#E6000000",
-        "offset": {
-          "x": 0.0,
-          "y": 16.0
-        },
-        "blurRadius": 36.0,
-        "spreadRadius": -20.0
-      }
-    ]
-  },
-  "fontWeights": {
-    "fortal.font.weight.light": "w300",
-    "fortal.font.weight.regular": "w400",
-    "fortal.font.weight.medium": "w500",
-    "fortal.font.weight.bold": "w700"
-  },
-  "durations": {
-    "fortal.transition.fast": 100,
-    "fortal.transition.slow": 300
-  }
-}
diff --git a/packages/demo/test/atlas/goldens/styles/button/ghost-size1/container.mix.json b/packages/demo/test/atlas/goldens/styles/button/ghost-size1/container.mix.json
deleted file mode 100644
index 5eda2cc8..00000000
--- a/packages/demo/test/atlas/goldens/styles/button/ghost-size1/container.mix.json
+++ /dev/null
@@ -1,118 +0,0 @@
-{
-  "type": "flex_box",
-  "padding": {
-    "$merge": [
-      {
-        "left": {
-          "$token": "fortal.space.2",
-          "kind": "space"
-        },
-        "right": {
-          "$token": "fortal.space.2",
-          "kind": "space"
-        }
-      },
-      {
-        "top": {
-          "$token": "fortal.space.1",
-          "kind": "space"
-        },
-        "bottom": {
-          "$token": "fortal.space.1",
-          "kind": "space"
-        }
-      }
-    ]
-  },
-  "decoration": {
-    "$merge": [
-      {
-        "borderRadius": {
-          "$token": "fortal.radius.2"
-        }
-      },
-      {
-        "color": "#00000000"
-      }
-    ]
-  },
-  "mainAxisSize": "min",
-  "spacing": {
-    "$token": "fortal.space.1",
-    "kind": "space"
-  },
-  "variants": [
-    {
-      "kind": "widget_state",
-      "state": "focused",
-      "style": {
-        "type": "flex_box",
-        "decoration": {
-          "border": {
-            "top": {
-              "color": {
-                "$token": "fortal.focus.a8"
-              },
-              "width": {
-                "$token": "fortal.focus.ring.width",
-                "kind": "space"
-              }
-            },
-            "right": {
-              "color": {
-                "$token": "fortal.focus.a8"
-              },
-              "width": {
-                "$token": "fortal.focus.ring.width",
-                "kind": "space"
-              }
-            },
-            "bottom": {
-              "color": {
-                "$token": "fortal.focus.a8"
-              },
-              "width": {
-                "$token": "fortal.focus.ring.width",
-                "kind": "space"
-              }
-            },
-            "left": {
-              "color": {
-                "$token": "fortal.focus.a8"
-              },
-              "width": {
-                "$token": "fortal.focus.ring.width",
-                "kind": "space"
-              }
-            }
-          }
-        }
-      }
-    },
-    {
-      "kind": "widget_state",
-      "state": "hovered",
-      "style": {
-        "type": "flex_box",
-        "decoration": {
-          "color": {
-            "$token": "fortal.accent.a3"
-          }
-        }
-      }
-    },
-    {
-      "kind": "widget_state",
-      "state": "pressed",
-      "style": {
-        "type": "flex_box",
-        "decoration": {
-          "color": {
-            "$token": "fortal.accent.a4"
-          }
-        }
-      }
-    }
-  ],
-  "v": 1
-}
diff --git a/packages/demo/test/atlas/goldens/styles/button/ghost-size1/icon.mix.json b/packages/demo/test/atlas/goldens/styles/button/ghost-size1/icon.mix.json
deleted file mode 100644
index 81d43605..00000000
--- a/packages/demo/test/atlas/goldens/styles/button/ghost-size1/icon.mix.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "type": "icon",
-  "color": {
-    "$token": "fortal.accent.11"
-  },
-  "size": 12.0,
-  "variants": [
-    {
-      "kind": "widget_state",
-      "state": "disabled",
-      "style": {
-        "type": "icon",
-        "color": {
-          "$token": "fortal.gray.8"
-        }
-      }
-    }
-  ],
-  "v": 1
-}
diff --git a/packages/demo/test/atlas/goldens/styles/button/ghost-size1/label.mix.json b/packages/demo/test/atlas/goldens/styles/button/ghost-size1/label.mix.json
deleted file mode 100644
index e23fe275..00000000
--- a/packages/demo/test/atlas/goldens/styles/button/ghost-size1/label.mix.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-  "type": "text",
-  "style": {
-    "$merge": [
-      {
-        "fontWeight": {
-          "$token": "fortal.font.weight.medium"
-        }
-      },
-      {
-        "fontSize": 12.0
-      },
-      {
-        "height": 1.3333333333333333
-      },
-      {
-        "letterSpacing": 0.0025
-      },
-      {
-        "color": {
-          "$token": "fortal.accent.11"
-        }
-      }
-    ]
-  },
-  "variants": [
-    {
-      "kind": "widget_state",
-      "state": "disabled",
-      "style": {
-        "type": "text",
-        "style": {
-          "color": {
-            "$token": "fortal.gray.8"
-          }
-        }
-      }
-    }
-  ],
-  "v": 1
-}
diff --git a/packages/demo/test/atlas/goldens/styles/button/ghost-size2/container.mix.json b/packages/demo/test/atlas/goldens/styles/button/ghost-size2/container.mix.json
deleted file mode 100644
index 12b319e1..00000000
--- a/packages/demo/test/atlas/goldens/styles/button/ghost-size2/container.mix.json
+++ /dev/null
@@ -1,118 +0,0 @@
-{
-  "type": "flex_box",
-  "padding": {
-    "$merge": [
-      {
-        "left": {
-          "$token": "fortal.space.3",
-          "kind": "space"
-        },
-        "right": {
-          "$token": "fortal.space.3",
-          "kind": "space"
-        }
-      },
-      {
-        "top": {
-          "$token": "fortal.space.2",
-          "kind": "space"
-        },
-        "bottom": {
-          "$token": "fortal.space.2",
-          "kind": "space"
-        }
-      }
-    ]
-  },
-  "decoration": {
-    "$merge": [
-      {
-        "borderRadius": {
-          "$token": "fortal.radius.3"
-        }
-      },
-      {
-        "color": "#00000000"
-      }
-    ]
-  },
-  "mainAxisSize": "min",
-  "spacing": {
-    "$token": "fortal.space.2",
-    "kind": "space"
-  },
-  "variants": [
-    {
-      "kind": "widget_state",
-      "state": "focused",
-      "style": {
-        "type": "flex_box",
-        "decoration": {
-          "border": {
-            "top": {
-              "color": {
-                "$token": "fortal.focus.a8"
-              },
-              "width": {
-                "$token": "fortal.focus.ring.width",
-                "kind": "space"
-              }
-            },
-            "right": {
-              "color": {
-                "$token": "fortal.focus.a8"
-              },
-              "width": {
-                "$token": "fortal.focus.ring.width",
-                "kind": "space"
-              }
-            },
-            "bottom": {
-              "color": {
-                "$token": "fortal.focus.a8"
-              },
-              "width": {
-                "$token": "fortal.focus.ring.width",
-                "kind": "space"
-              }
-            },
-            "left": {
-              "color": {
-                "$token": "fortal.focus.a8"
-              },
-              "width": {
-                "$token": "fortal.focus.ring.width",
-                "kind": "space"
-              }
-            }
-          }
-        }
-      }
-    },
-    {
-      "kind": "widget_state",
-      "state": "hovered",
-      "style": {
-        "type": "flex_box",
-        "decoration": {
-          "color": {
-            "$token": "fortal.accent.a3"
-          }
-        }
-      }
-    },
-    {
-      "kind": "widget_state",
-      "state": "pressed",
-      "style": {
-        "type": "flex_box",
-        "decoration": {
-          "color": {
-            "$token": "fortal.accent.a4"
-          }
-        }
-      }
-    }
-  ],
-  "v": 1
-}
diff --git a/packages/demo/test/atlas/goldens/styles/button/ghost-size2/icon.mix.json b/packages/demo/test/atlas/goldens/styles/button/ghost-size2/icon.mix.json
deleted file mode 100644
index ce290453..00000000
--- a/packages/demo/test/atlas/goldens/styles/button/ghost-size2/icon.mix.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "type": "icon",
-  "color": {
-    "$token": "fortal.accent.11"
-  },
-  "size": 16.0,
-  "variants": [
-    {
-      "kind": "widget_state",
-      "state": "disabled",
-      "style": {
-        "type": "icon",
-        "color": {
-          "$token": "fortal.gray.8"
-        }
-      }
-    }
-  ],
-  "v": 1
-}
diff --git a/packages/demo/test/atlas/goldens/styles/button/ghost-size2/label.mix.json b/packages/demo/test/atlas/goldens/styles/button/ghost-size2/label.mix.json
deleted file mode 100644
index 0bcb9265..00000000
--- a/packages/demo/test/atlas/goldens/styles/button/ghost-size2/label.mix.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-  "type": "text",
-  "style": {
-    "$merge": [
-      {
-        "fontWeight": {
-          "$token": "fortal.font.weight.medium"
-        }
-      },
-      {
-        "fontSize": 14.0
-      },
-      {
-        "height": 1.4285714285714286
-      },
-      {
-        "letterSpacing": 0.0
-      },
-      {
-        "color": {
-          "$token": "fortal.accent.11"
-        }
-      }
-    ]
-  },
-  "variants": [
-    {
-      "kind": "widget_state",
-      "state": "disabled",
-      "style": {
-        "type": "text",
-        "style": {
-          "color": {
-            "$token": "fortal.gray.8"
-          }
-        }
-      }
-    }
-  ],
-  "v": 1
-}
diff --git a/packages/demo/test/atlas/goldens/styles/button/ghost-size3/container.mix.json b/packages/demo/test/atlas/goldens/styles/button/ghost-size3/container.mix.json
deleted file mode 100644
index 1fd98edf..00000000
--- a/packages/demo/test/atlas/goldens/styles/button/ghost-size3/container.mix.json
+++ /dev/null
@@ -1,118 +0,0 @@
-{
-  "type": "flex_box",
-  "padding": {
-    "$merge": [
-      {
-        "left": {
-          "$token": "fortal.space.4",
-          "kind": "space"
-        },
-        "right": {
-          "$token": "fortal.space.4",
-          "kind": "space"
-        }
-      },
-      {
-        "top": {
-          "$token": "fortal.space.3",
-          "kind": "space"
-        },
-        "bottom": {
-          "$token": "fortal.space.3",
-          "kind": "space"
-        }
-      }
-    ]
-  },
-  "decoration": {
-    "$merge": [
-      {
-        "borderRadius": {
-          "$token": "fortal.radius.4"
-        }
-      },
-      {
-        "color": "#00000000"
-      }
-    ]
-  },
-  "mainAxisSize": "min",
-  "spacing": {
-    "$token": "fortal.space.3",
-    "kind": "space"
-  },
-  "variants": [
-    {
-      "kind": "widget_state",
-      "state": "focused",
-      "style": {
-        "type": "flex_box",
-        "decoration": {
-          "border": {
-            "top": {
-              "color": {
-                "$token": "fortal.focus.a8"
-              },
-              "width": {
-                "$token": "fortal.focus.ring.width",
-                "kind": "space"
-              }
-            },
-            "right": {
-              "color": {
-                "$token": "fortal.focus.a8"
-              },
-              "width": {
-                "$token": "fortal.focus.ring.width",
-                "kind": "space"
-              }
-            },
-            "bottom": {
-              "color": {
-                "$token": "fortal.focus.a8"
-              },
-              "width": {
-                "$token": "fortal.focus.ring.width",
-                "kind": "space"
-              }
-            },
-            "left": {
-              "color": {
-                "$token": "fortal.focus.a8"
-              },
-              "width": {
-                "$token": "fortal.focus.ring.width",
-                "kind": "space"
-              }
-            }
-          }
-        }
-      }
-    },
-    {
-      "kind": "widget_state",
-      "state": "hovered",
-      "style": {
-        "type": "flex_box",
-        "decoration": {
-          "color": {
-            "$token": "fortal.accent.a3"
-          }
-        }
-      }
-    },
-    {
-      "kind": "widget_state",
-      "state": "pressed",
-      "style": {
-        "type": "flex_box",
-        "decoration": {
-          "color": {
-            "$token": "fortal.accent.a4"
-          }
-        }
-      }
-    }
-  ],
-  "v": 1
-}
diff --git a/packages/demo/test/atlas/goldens/styles/button/ghost-size3/icon.mix.json b/packages/demo/test/atlas/goldens/styles/button/ghost-size3/icon.mix.json
deleted file mode 100644
index 3aa7436b..00000000
--- a/packages/demo/test/atlas/goldens/styles/button/ghost-size3/icon.mix.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "type": "icon",
-  "color": {
-    "$token": "fortal.accent.11"
-  },
-  "size": 20.0,
-  "variants": [
-    {
-      "kind": "widget_state",
-      "state": "disabled",
-      "style": {
-        "type": "icon",
-        "color": {
-          "$token": "fortal.gray.8"
-        }
-      }
-    }
-  ],
-  "v": 1
-}
diff --git a/packages/demo/test/atlas/goldens/styles/button/ghost-size3/label.mix.json b/packages/demo/test/atlas/goldens/styles/button/ghost-size3/label.mix.json
deleted file mode 100644
index d473b197..00000000
--- a/packages/demo/test/atlas/goldens/styles/button/ghost-size3/label.mix.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-  "type": "text",
-  "style": {
-    "$merge": [
-      {
-        "fontWeight": {
-          "$token": "fortal.font.weight.medium"
-        }
-      },
-      {
-        "fontSize": 16.0
-      },
-      {
-        "height": 1.5
-      },
-      {
-        "letterSpacing": 0.0
-      },
-      {
-        "color": {
-          "$token": "fortal.accent.11"
-        }
-      }
-    ]
-  },
-  "variants": [
-    {
-      "kind": "widget_state",
-      "state": "disabled",
-      "style": {
-        "type": "text",
-        "style": {
-          "color": {
-            "$token": "fortal.gray.8"
-          }
-        }
-      }
-    }
-  ],
-  "v": 1
-}
diff --git a/packages/demo/test/atlas/goldens/styles/button/ghost-size4/container.mix.json b/packages/demo/test/atlas/goldens/styles/button/ghost-size4/container.mix.json
deleted file mode 100644
index 0c1eec3f..00000000
--- a/packages/demo/test/atlas/goldens/styles/button/ghost-size4/container.mix.json
+++ /dev/null
@@ -1,118 +0,0 @@
-{
-  "type": "flex_box",
-  "padding": {
-    "$merge": [
-      {
-        "left": {
-          "$token": "fortal.space.5",
-          "kind": "space"
-        },
-        "right": {
-          "$token": "fortal.space.5",
-          "kind": "space"
-        }
-      },
-      {
-        "top": {
-          "$token": "fortal.space.4",
-          "kind": "space"
-        },
-        "bottom": {
-          "$token": "fortal.space.4",
-          "kind": "space"
-        }
-      }
-    ]
-  },
-  "decoration": {
-    "$merge": [
-      {
-        "borderRadius": {
-          "$token": "fortal.radius.5"
-        }
-      },
-      {
-        "color": "#00000000"
-      }
-    ]
-  },
-  "mainAxisSize": "min",
-  "spacing": {
-    "$token": "fortal.space.4",
-    "kind": "space"
-  },
-  "variants": [
-    {
-      "kind": "widget_state",
-      "state": "focused",
-      "style": {
-        "type": "flex_box",
-        "decoration": {
-          "border": {
-            "top": {
-              "color": {
-                "$token": "fortal.focus.a8"
-              },
-              "width": {
-                "$token": "fortal.focus.ring.width",
-                "kind": "space"
-              }
-            },
-            "right": {
-              "color": {
-                "$token": "fortal.focus.a8"
-              },
-              "width": {
-                "$token": "fortal.focus.ring.width",
-                "kind": "space"
-              }
-            },
-            "bottom": {
-              "color": {
-                "$token": "fortal.focus.a8"
-              },
-              "width": {
-                "$token": "fortal.focus.ring.width",
-                "kind": "space"
-              }
-            },
-            "left": {
-              "color": {
-                "$token": "fortal.focus.a8"
-              },
-              "width": {
-                "$token": "fortal.focus.ring.width",
-                "kind": "space"
-              }
-            }
-          }
-        }
-      }
-    },
-    {
-      "kind": "widget_state",
-      "state": "hovered",
-      "style": {
-        "type": "flex_box",
-        "decoration": {
-          "color": {
-            "$token": "fortal.accent.a3"
-          }
-        }
-      }
-    },
-    {
-      "kind": "widget_state",
-      "state": "pressed",
-      "style": {
-        "type": "flex_box",
-        "decoration": {
-          "color": {
-            "$token": "fortal.accent.a4"
-          }
-        }
-      }
-    }
-  ],
-  "v": 1
-}
diff --git a/packages/demo/test/atlas/goldens/styles/button/ghost-size4/icon.mix.json b/packages/demo/test/atlas/goldens/styles/button/ghost-size4/icon.mix.json
deleted file mode 100644
index f3867e47..00000000
--- a/packages/demo/test/atlas/goldens/styles/button/ghost-size4/icon.mix.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "type": "icon",
-  "color": {
-    "$token": "fortal.accent.11"
-  },
-  "size": 24.0,
-  "variants": [
-    {
-      "kind": "widget_state",
-      "state": "disabled",
-      "style": {
-        "type": "icon",
-        "color": {
-          "$token": "fortal.gray.8"
-        }
-      }
-    }
-  ],
-  "v": 1
-}
diff --git a/packages/demo/test/atlas/goldens/styles/button/ghost-size4/label.mix.json b/packages/demo/test/atlas/goldens/styles/button/ghost-size4/label.mix.json
deleted file mode 100644
index a07c6afc..00000000
--- a/packages/demo/test/atlas/goldens/styles/button/ghost-size4/label.mix.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-  "type": "text",
-  "style": {
-    "$merge": [
-      {
-        "fontWeight": {
-          "$token": "fortal.font.weight.medium"
-        }
-      },
-      {
-        "fontSize": 18.0
-      },
-      {
-        "height": 1.4444444444444444
-      },
-      {
-        "letterSpacing": -0.0025
-      },
-      {
-        "color": {
-          "$token": "fortal.accent.11"
-        }
-      }
-    ]
-  },
-  "variants": [
-    {
-      "kind": "widget_state",
-      "state": "disabled",
-      "style": {
-        "type": "text",
-        "style": {
-          "color": {
-            "$token": "fortal.gray.8"
-          }
-        }
-      }
-    }
-  ],
-  "v": 1
-}
diff --git a/packages/demo/test/atlas/goldens/styles/button/outline-size1/container.mix.json b/packages/demo/test/atlas/goldens/styles/button/outline-size1/container.mix.json
deleted file mode 100644
index 661fd50c..00000000
--- a/packages/demo/test/atlas/goldens/styles/button/outline-size1/container.mix.json
+++ /dev/null
@@ -1,221 +0,0 @@
-{
-  "type": "flex_box",
-  "padding": {
-    "$merge": [
-      {
-        "left": {
-          "$token": "fortal.space.2",
-          "kind": "space"
-        },
-        "right": {
-          "$token": "fortal.space.2",
-          "kind": "space"
-        }
-      },
-      {
-        "top": {
-          "$token": "fortal.space.1",
-          "kind": "space"
-        },
-        "bottom": {
-          "$token": "fortal.space.1",
-          "kind": "space"
-        }
-      }
-    ]
-  },
-  "decoration": {
-    "$merge": [
-      {
-        "borderRadius": {
-          "$token": "fortal.radius.2"
-        }
-      },
-      {
-        "color": "#00000000"
-      },
-      {
-        "border": {
-          "top": {
-            "color": {
-              "$token": "fortal.accent.7"
-            },
-            "width": {
-              "$token": "fortal.border.width.1",
-              "kind": "space"
-            }
-          },
-          "right": {
-            "color": {
-              "$token": "fortal.accent.7"
-            },
-            "width": {
-              "$token": "fortal.border.width.1",
-              "kind": "space"
-            }
-          },
-          "bottom": {
-            "color": {
-              "$token": "fortal.accent.7"
-            },
-            "width": {
-              "$token": "fortal.border.width.1",
-              "kind": "space"
-            }
-          },
-          "left": {
-            "color": {
-              "$token": "fortal.accent.7"
-            },
-            "width": {
-              "$token": "fortal.border.width.1",
-              "kind": "space"
-            }
-          }
-        }
-      }
-    ]
-  },
-  "mainAxisSize": "min",
-  "spacing": {
-    "$token": "fortal.space.1",
-    "kind": "space"
-  },
-  "variants": [
-    {
-      "kind": "widget_state",
-      "state": "focused",
-      "style": {
-        "type": "flex_box",
-        "decoration": {
-          "border": {
-            "top": {
-              "color": {
-                "$token": "fortal.focus.a8"
-              },
-              "width": {
-                "$token": "fortal.focus.ring.width",
-                "kind": "space"
-              }
-            },
-            "right": {
-              "color": {
-                "$token": "fortal.focus.a8"
-              },
-              "width": {
-                "$token": "fortal.focus.ring.width",
-                "kind": "space"
-              }
-            },
-            "bottom": {
-              "color": {
-                "$token": "fortal.focus.a8"
-              },
-              "width": {
-                "$token": "fortal.focus.ring.width",
-                "kind": "space"
-              }
-            },
-            "left": {
-              "color": {
-                "$token": "fortal.focus.a8"
-              },
-              "width": {
-                "$token": "fortal.focus.ring.width",
-                "kind": "space"
-              }
-            }
-          }
-        }
-      }
-    },
-    {
-      "kind": "widget_state",
-      "state": "hovered",
-      "style": {
-        "type": "flex_box",
-        "decoration": {
-          "$merge": [
-            {
-              "color": {
-                "$token": "fortal.accent.a2"
-              }
-            },
-            {
-              "border": {
-                "top": {
-                  "color": {
-                    "$token": "fortal.accent.8"
-                  },
-                  "width": {
-                    "$token": "fortal.border.width.1",
-                    "kind": "space"
-                  }
-                },
-                "right": {
-                  "color": {
-                    "$token": "fortal.accent.8"
-                  },
-                  "width": {
-                    "$token": "fortal.border.width.1",
-                    "kind": "space"
-                  }
-                },
-                "bottom": {
-                  "color": {
-                    "$token": "fortal.accent.8"
-                  },
-                  "width": {
-                    "$token": "fortal.border.width.1",
-                    "kind": "space"
-                  }
-                },
-                "left": {
-                  "color": {
-                    "$token": "fortal.accent.8"
-                  },
-                  "width": {
-                    "$token": "fortal.border.width.1",
-                    "kind": "space"
-                  }
-                }
-              }
-            }
-          ]
-        }
-      }
-    },
-    {
-      "kind": "widget_state",
-      "state": "disabled",
-      "style": {
-        "type": "flex_box",
-        "decoration": {
-          "border": {
-            "top": {
-              "color": {
-                "$token": "fortal.gray.5"
-              }
-            },
-            "right": {
-              "color": {
-                "$token": "fortal.gray.5"
-              }
-            },
-            "bottom": {
-              "color": {
-                "$token": "fortal.gray.5"
-              }
-            },
-            "left": {
-              "color": {
-                "$token": "fortal.gray.5"
-              }
-            }
-          }
-        }
-      }
-    }
-  ],
-  "v": 1
-}
diff --git a/packages/demo/test/atlas/goldens/styles/button/outline-size1/icon.mix.json b/packages/demo/test/atlas/goldens/styles/button/outline-size1/icon.mix.json
deleted file mode 100644
index 81d43605..00000000
--- a/packages/demo/test/atlas/goldens/styles/button/outline-size1/icon.mix.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "type": "icon",
-  "color": {
-    "$token": "fortal.accent.11"
-  },
-  "size": 12.0,
-  "variants": [
-    {
-      "kind": "widget_state",
-      "state": "disabled",
-      "style": {
-        "type": "icon",
-        "color": {
-          "$token": "fortal.gray.8"
-        }
-      }
-    }
-  ],
-  "v": 1
-}
diff --git a/packages/demo/test/atlas/goldens/styles/button/outline-size1/label.mix.json b/packages/demo/test/atlas/goldens/styles/button/outline-size1/label.mix.json
deleted file mode 100644
index e23fe275..00000000
--- a/packages/demo/test/atlas/goldens/styles/button/outline-size1/label.mix.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-  "type": "text",
-  "style": {
-    "$merge": [
-      {
-        "fontWeight": {
-          "$token": "fortal.font.weight.medium"
-        }
-      },
-      {
-        "fontSize": 12.0
-      },
-      {
-        "height": 1.3333333333333333
-      },
-      {
-        "letterSpacing": 0.0025
-      },
-      {
-        "color": {
-          "$token": "fortal.accent.11"
-        }
-      }
-    ]
-  },
-  "variants": [
-    {
-      "kind": "widget_state",
-      "state": "disabled",
-      "style": {
-        "type": "text",
-        "style": {
-          "color": {
-            "$token": "fortal.gray.8"
-          }
-        }
-      }
-    }
-  ],
-  "v": 1
-}
diff --git a/packages/demo/test/atlas/goldens/styles/button/outline-size2/container.mix.json b/packages/demo/test/atlas/goldens/styles/button/outline-size2/container.mix.json
deleted file mode 100644
index 7891535d..00000000
--- a/packages/demo/test/atlas/goldens/styles/button/outline-size2/container.mix.json
+++ /dev/null
@@ -1,221 +0,0 @@
-{
-  "type": "flex_box",
-  "padding": {
-    "$merge": [
-      {
-        "left": {
-          "$token": "fortal.space.3",
-          "kind": "space"
-        },
-        "right": {
-          "$token": "fortal.space.3",
-          "kind": "space"
-        }
-      },
-      {
-        "top": {
-          "$token": "fortal.space.2",
-          "kind": "space"
-        },
-        "bottom": {
-          "$token": "fortal.space.2",
-          "kind": "space"
-        }
-      }
-    ]
-  },
-  "decoration": {
-    "$merge": [
-      {
-        "borderRadius": {
-          "$token": "fortal.radius.3"
-        }
-      },
-      {
-        "color": "#00000000"
-      },
-      {
-        "border": {
-          "top": {
-            "color": {
-              "$token": "fortal.accent.7"
-            },
-            "width": {
-              "$token": "fortal.border.width.1",
-              "kind": "space"
-            }
-          },
-          "right": {
-            "color": {
-              "$token": "fortal.accent.7"
-            },
-            "width": {
-              "$token": "fortal.border.width.1",
-              "kind": "space"
-            }
-          },
-          "bottom": {
-            "color": {
-              "$token": "fortal.accent.7"
-            },
-            "width": {
-              "$token": "fortal.border.width.1",
-              "kind": "space"
-            }
-          },
-          "left": {
-            "color": {
-              "$token": "fortal.accent.7"
-            },
-            "width": {
-              "$token": "fortal.border.width.1",
-              "kind": "space"
-            }
-          }
-        }
-      }
-    ]
-  },
-  "mainAxisSize": "min",
-  "spacing": {
-    "$token": "fortal.space.2",
-    "kind": "space"
-  },
-  "variants": [
-    {
-      "kind": "widget_state",
-      "state": "focused",
-      "style": {
-        "type": "flex_box",
-        "decoration": {
-          "border": {
-            "top": {
-              "color": {
-                "$token": "fortal.focus.a8"
-              },
-              "width": {
-                "$token": "fortal.focus.ring.width",
-                "kind": "space"
-              }
-            },
-            "right": {
-              "color": {
-                "$token": "fortal.focus.a8"
-              },
-              "width": {
-                "$token": "fortal.focus.ring.width",
-                "kind": "space"
-              }
-            },
-            "bottom": {
-              "color": {
-                "$token": "fortal.focus.a8"
-              },
-              "width": {
-                "$token": "fortal.focus.ring.width",
-                "kind": "space"
-              }
-            },
-            "left": {
-              "color": {
-                "$token": "fortal.focus.a8"
-              },
-              "width": {
-                "$token": "fortal.focus.ring.width",
-                "kind": "space"
-              }
-            }
-          }
-        }
-      }
-    },
-    {
-      "kind": "widget_state",
-      "state": "hovered",
-      "style": {
-        "type": "flex_box",
-        "decoration": {
-          "$merge": [
-            {
-              "color": {
-                "$token": "fortal.accent.a2"
-              }
-            },
-            {
-              "border": {
-                "top": {
-                  "color": {
-                    "$token": "fortal.accent.8"
-                  },
-                  "width": {
-                    "$token": "fortal.border.width.1",
-                    "kind": "space"
-                  }
-                },
-                "right": {
-                  "color": {
-                    "$token": "fortal.accent.8"
-                  },
-                  "width": {
-                    "$token": "fortal.border.width.1",
-                    "kind": "space"
-                  }
-                },
-                "bottom": {
-                  "color": {
-                    "$token": "fortal.accent.8"
-                  },
-                  "width": {
-                    "$token": "fortal.border.width.1",
-                    "kind": "space"
-                  }
-                },
-                "left": {
-                  "color": {
-                    "$token": "fortal.accent.8"
-                  },
-                  "width": {
-                    "$token": "fortal.border.width.1",
-                    "kind": "space"
-                  }
-                }
-              }
-            }
-          ]
-        }
-      }
-    },
-    {
-      "kind": "widget_state",
-      "state": "disabled",
-      "style": {
-        "type": "flex_box",
-        "decoration": {
-          "border": {
-            "top": {
-              "color": {
-                "$token": "fortal.gray.5"
-              }
-            },
-            "right": {
-              "color": {
-                "$token": "fortal.gray.5"
-              }
-            },
-            "bottom": {
-              "color": {
-                "$token": "fortal.gray.5"
-              }
-            },
-            "left": {
-              "color": {
-                "$token": "fortal.gray.5"
-              }
-            }
-          }
-        }
-      }
-    }
-  ],
-  "v": 1
-}
diff --git a/packages/demo/test/atlas/goldens/styles/button/outline-size2/icon.mix.json b/packages/demo/test/atlas/goldens/styles/button/outline-size2/icon.mix.json
deleted file mode 100644
index ce290453..00000000
--- a/packages/demo/test/atlas/goldens/styles/button/outline-size2/icon.mix.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "type": "icon",
-  "color": {
-    "$token": "fortal.accent.11"
-  },
-  "size": 16.0,
-  "variants": [
-    {
-      "kind": "widget_state",
-      "state": "disabled",
-      "style": {
-        "type": "icon",
-        "color": {
-          "$token": "fortal.gray.8"
-        }
-      }
-    }
-  ],
-  "v": 1
-}
diff --git a/packages/demo/test/atlas/goldens/styles/button/outline-size2/label.mix.json b/packages/demo/test/atlas/goldens/styles/button/outline-size2/label.mix.json
deleted file mode 100644
index 0bcb9265..00000000
--- a/packages/demo/test/atlas/goldens/styles/button/outline-size2/label.mix.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-  "type": "text",
-  "style": {
-    "$merge": [
-      {
-        "fontWeight": {
-          "$token": "fortal.font.weight.medium"
-        }
-      },
-      {
-        "fontSize": 14.0
-      },
-      {
-        "height": 1.4285714285714286
-      },
-      {
-        "letterSpacing": 0.0
-      },
-      {
-        "color": {
-          "$token": "fortal.accent.11"
-        }
-      }
-    ]
-  },
-  "variants": [
-    {
-      "kind": "widget_state",
-      "state": "disabled",
-      "style": {
-        "type": "text",
-        "style": {
-          "color": {
-            "$token": "fortal.gray.8"
-          }
-        }
-      }
-    }
-  ],
-  "v": 1
-}
diff --git a/packages/demo/test/atlas/goldens/styles/button/outline-size3/container.mix.json b/packages/demo/test/atlas/goldens/styles/button/outline-size3/container.mix.json
deleted file mode 100644
index 6c7841f7..00000000
--- a/packages/demo/test/atlas/goldens/styles/button/outline-size3/container.mix.json
+++ /dev/null
@@ -1,221 +0,0 @@
-{
-  "type": "flex_box",
-  "padding": {
-    "$merge": [
-      {
-        "left": {
-          "$token": "fortal.space.4",
-          "kind": "space"
-        },
-        "right": {
-          "$token": "fortal.space.4",
-          "kind": "space"
-        }
-      },
-      {
-        "top": {
-          "$token": "fortal.space.3",
-          "kind": "space"
-        },
-        "bottom": {
-          "$token": "fortal.space.3",
-          "kind": "space"
-        }
-      }
-    ]
-  },
-  "decoration": {
-    "$merge": [
-      {
-        "borderRadius": {
-          "$token": "fortal.radius.4"
-        }
-      },
-      {
-        "color": "#00000000"
-      },
-      {
-        "border": {
-          "top": {
-            "color": {
-              "$token": "fortal.accent.7"
-            },
-            "width": {
-              "$token": "fortal.border.width.1",
-              "kind": "space"
-            }
-          },
-          "right": {
-            "color": {
-              "$token": "fortal.accent.7"
-            },
-            "width": {
-              "$token": "fortal.border.width.1",
-              "kind": "space"
-            }
-          },
-          "bottom": {
-            "color": {
-              "$token": "fortal.accent.7"
-            },
-            "width": {
-              "$token": "fortal.border.width.1",
-              "kind": "space"
-            }
-          },
-          "left": {
-            "color": {
-              "$token": "fortal.accent.7"
-            },
-            "width": {
-              "$token": "fortal.border.width.1",
-              "kind": "space"
-            }
-          }
-        }
-      }
-    ]
-  },
-  "mainAxisSize": "min",
-  "spacing": {
-    "$token": "fortal.space.3",
-    "kind": "space"
-  },
-  "variants": [
-    {
-      "kind": "widget_state",
-      "state": "focused",
-      "style": {
-        "type": "flex_box",
-        "decoration": {
-          "border": {
-            "top": {
-              "color": {
-                "$token": "fortal.focus.a8"
-              },
-              "width": {
-                "$token": "fortal.focus.ring.width",
-                "kind": "space"
-              }
-            },
-            "right": {
-              "color": {
-                "$token": "fortal.focus.a8"
-              },
-              "width": {
-                "$token": "fortal.focus.ring.width",
-                "kind": "space"
-              }
-            },
-            "bottom": {
-              "color": {
-                "$token": "fortal.focus.a8"
-              },
-              "width": {
-                "$token": "fortal.focus.ring.width",
-                "kind": "space"
-              }
-            },
-            "left": {
-              "color": {
-                "$token": "fortal.focus.a8"
-              },
-              "width": {
-                "$token": "fortal.focus.ring.width",
-                "kind": "space"
-              }
-            }
-          }
-        }
-      }
-    },
-    {
-      "kind": "widget_state",
-      "state": "hovered",
-      "style": {
-        "type": "flex_box",
-        "decoration": {
-          "$merge": [
-            {
-              "color": {
-                "$token": "fortal.accent.a2"
-              }
-            },
-            {
-              "border": {
-                "top": {
-                  "color": {
-                    "$token": "fortal.accent.8"
-                  },
-                  "width": {
-                    "$token": "fortal.border.width.1",
-                    "kind": "space"
-                  }
-                },
-                "right": {
-                  "color": {
-                    "$token": "fortal.accent.8"
-                  },
-                  "width": {
-                    "$token": "fortal.border.width.1",
-                    "kind": "space"
-                  }
-                },
-                "bottom": {
-                  "color": {
-                    "$token": "fortal.accent.8"
-                  },
-                  "width": {
-                    "$token": "fortal.border.width.1",
-                    "kind": "space"
-                  }
-                },
-                "left": {
-                  "color": {
-                    "$token": "fortal.accent.8"
-                  },
-                  "width": {
-                    "$token": "fortal.border.width.1",
-                    "kind": "space"
-                  }
-                }
-              }
-            }
-          ]
-        }
-      }
-    },
-    {
-      "kind": "widget_state",
-      "state": "disabled",
-      "style": {
-        "type": "flex_box",
-        "decoration": {
-          "border": {
-            "top": {
-              "color": {
-                "$token": "fortal.gray.5"
-              }
-            },
-            "right": {
-              "color": {
-                "$token": "fortal.gray.5"
-              }
-            },
-            "bottom": {
-              "color": {
-                "$token": "fortal.gray.5"
-              }
-            },
-            "left": {
-              "color": {
-                "$token": "fortal.gray.5"
-              }
-            }
-          }
-        }
-      }
-    }
-  ],
-  "v": 1
-}
diff --git a/packages/demo/test/atlas/goldens/styles/button/outline-size3/icon.mix.json b/packages/demo/test/atlas/goldens/styles/button/outline-size3/icon.mix.json
deleted file mode 100644
index 3aa7436b..00000000
--- a/packages/demo/test/atlas/goldens/styles/button/outline-size3/icon.mix.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "type": "icon",
-  "color": {
-    "$token": "fortal.accent.11"
-  },
-  "size": 20.0,
-  "variants": [
-    {
-      "kind": "widget_state",
-      "state": "disabled",
-      "style": {
-        "type": "icon",
-        "color": {
-          "$token": "fortal.gray.8"
-        }
-      }
-    }
-  ],
-  "v": 1
-}
diff --git a/packages/demo/test/atlas/goldens/styles/button/outline-size3/label.mix.json b/packages/demo/test/atlas/goldens/styles/button/outline-size3/label.mix.json
deleted file mode 100644
index d473b197..00000000
--- a/packages/demo/test/atlas/goldens/styles/button/outline-size3/label.mix.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-  "type": "text",
-  "style": {
-    "$merge": [
-      {
-        "fontWeight": {
-          "$token": "fortal.font.weight.medium"
-        }
-      },
-      {
-        "fontSize": 16.0
-      },
-      {
-        "height": 1.5
-      },
-      {
-        "letterSpacing": 0.0
-      },
-      {
-        "color": {
-          "$token": "fortal.accent.11"
-        }
-      }
-    ]
-  },
-  "variants": [
-    {
-      "kind": "widget_state",
-      "state": "disabled",
-      "style": {
-        "type": "text",
-        "style": {
-          "color": {
-            "$token": "fortal.gray.8"
-          }
-        }
-      }
-    }
-  ],
-  "v": 1
-}
diff --git a/packages/demo/test/atlas/goldens/styles/button/outline-size4/container.mix.json b/packages/demo/test/atlas/goldens/styles/button/outline-size4/container.mix.json
deleted file mode 100644
index 261cc523..00000000
--- a/packages/demo/test/atlas/goldens/styles/button/outline-size4/container.mix.json
+++ /dev/null
@@ -1,221 +0,0 @@
-{
-  "type": "flex_box",
-  "padding": {
-    "$merge": [
-      {
-        "left": {
-          "$token": "fortal.space.5",
-          "kind": "space"
-        },
-        "right": {
-          "$token": "fortal.space.5",
-          "kind": "space"
-        }
-      },
-      {
-        "top": {
-          "$token": "fortal.space.4",
-          "kind": "space"
-        },
-        "bottom": {
-          "$token": "fortal.space.4",
-          "kind": "space"
-        }
-      }
-    ]
-  },
-  "decoration": {
-    "$merge": [
-      {
-        "borderRadius": {
-          "$token": "fortal.radius.5"
-        }
-      },
-      {
-        "color": "#00000000"
-      },
-      {
-        "border": {
-          "top": {
-            "color": {
-              "$token": "fortal.accent.7"
-            },
-            "width": {
-              "$token": "fortal.border.width.1",
-              "kind": "space"
-            }
-          },
-          "right": {
-            "color": {
-              "$token": "fortal.accent.7"
-            },
-            "width": {
-              "$token": "fortal.border.width.1",
-              "kind": "space"
-            }
-          },
-          "bottom": {
-            "color": {
-              "$token": "fortal.accent.7"
-            },
-            "width": {
-              "$token": "fortal.border.width.1",
-              "kind": "space"
-            }
-          },
-          "left": {
-            "color": {
-              "$token": "fortal.accent.7"
-            },
-            "width": {
-              "$token": "fortal.border.width.1",
-              "kind": "space"
-            }
-          }
-        }
-      }
-    ]
-  },
-  "mainAxisSize": "min",
-  "spacing": {
-    "$token": "fortal.space.4",
-    "kind": "space"
-  },
-  "variants": [
-    {
-      "kind": "widget_state",
-      "state": "focused",
-      "style": {
-        "type": "flex_box",
-        "decoration": {
-          "border": {
-            "top": {
-              "color": {
-                "$token": "fortal.focus.a8"
-              },
-              "width": {
-                "$token": "fortal.focus.ring.width",
-                "kind": "space"
-              }
-            },
-            "right": {
-              "color": {
-                "$token": "fortal.focus.a8"
-              },
-              "width": {
-                "$token": "fortal.focus.ring.width",
-                "kind": "space"
-              }
-            },
-            "bottom": {
-              "color": {
-                "$token": "fortal.focus.a8"
-              },
-              "width": {
-                "$token": "fortal.focus.ring.width",
-                "kind": "space"
-              }
-            },
-            "left": {
-              "color": {
-                "$token": "fortal.focus.a8"
-              },
-              "width": {
-                "$token": "fortal.focus.ring.width",
-                "kind": "space"
-              }
-            }
-          }
-        }
-      }
-    },
-    {
-      "kind": "widget_state",
-      "state": "hovered",
-      "style": {
-        "type": "flex_box",
-        "decoration": {
-          "$merge": [
-            {
-              "color": {
-                "$token": "fortal.accent.a2"
-              }
-            },
-            {
-              "border": {
-                "top": {
-                  "color": {
-                    "$token": "fortal.accent.8"
-                  },
-                  "width": {
-                    "$token": "fortal.border.width.1",
-                    "kind": "space"
-                  }
-                },
-                "right": {
-                  "color": {
-                    "$token": "fortal.accent.8"
-                  },
-                  "width": {
-                    "$token": "fortal.border.width.1",
-                    "kind": "space"
-                  }
-                },
-                "bottom": {
-                  "color": {
-                    "$token": "fortal.accent.8"
-                  },
-                  "width": {
-                    "$token": "fortal.border.width.1",
-                    "kind": "space"
-                  }
-                },
-                "left": {
-                  "color": {
-                    "$token": "fortal.accent.8"
-                  },
-                  "width": {
-                    "$token": "fortal.border.width.1",
-                    "kind": "space"
-                  }
-                }
-              }
-            }
-          ]
-        }
-      }
-    },
-    {
-      "kind": "widget_state",
-      "state": "disabled",
-      "style": {
-        "type": "flex_box",
-        "decoration": {
-          "border": {
-            "top": {
-              "color": {
-                "$token": "fortal.gray.5"
-              }
-            },
-            "right": {
-              "color": {
-                "$token": "fortal.gray.5"
-              }
-            },
-            "bottom": {
-              "color": {
-                "$token": "fortal.gray.5"
-              }
-            },
-            "left": {
-              "color": {
-                "$token": "fortal.gray.5"
-              }
-            }
-          }
-        }
-      }
-    }
-  ],
-  "v": 1
-}
diff --git a/packages/demo/test/atlas/goldens/styles/button/outline-size4/icon.mix.json b/packages/demo/test/atlas/goldens/styles/button/outline-size4/icon.mix.json
deleted file mode 100644
index f3867e47..00000000
--- a/packages/demo/test/atlas/goldens/styles/button/outline-size4/icon.mix.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "type": "icon",
-  "color": {
-    "$token": "fortal.accent.11"
-  },
-  "size": 24.0,
-  "variants": [
-    {
-      "kind": "widget_state",
-      "state": "disabled",
-      "style": {
-        "type": "icon",
-        "color": {
-          "$token": "fortal.gray.8"
-        }
-      }
-    }
-  ],
-  "v": 1
-}
diff --git a/packages/demo/test/atlas/goldens/styles/button/outline-size4/label.mix.json b/packages/demo/test/atlas/goldens/styles/button/outline-size4/label.mix.json
deleted file mode 100644
index a07c6afc..00000000
--- a/packages/demo/test/atlas/goldens/styles/button/outline-size4/label.mix.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-  "type": "text",
-  "style": {
-    "$merge": [
-      {
-        "fontWeight": {
-          "$token": "fortal.font.weight.medium"
-        }
-      },
-      {
-        "fontSize": 18.0
-      },
-      {
-        "height": 1.4444444444444444
-      },
-      {
-        "letterSpacing": -0.0025
-      },
-      {
-        "color": {
-          "$token": "fortal.accent.11"
-        }
-      }
-    ]
-  },
-  "variants": [
-    {
-      "kind": "widget_state",
-      "state": "disabled",
-      "style": {
-        "type": "text",
-        "style": {
-          "color": {
-            "$token": "fortal.gray.8"
-          }
-        }
-      }
-    }
-  ],
-  "v": 1
-}
diff --git a/packages/demo/test/atlas/goldens/styles/button/soft-size1/container.mix.json b/packages/demo/test/atlas/goldens/styles/button/soft-size1/container.mix.json
deleted file mode 100644
index 5391f218..00000000
--- a/packages/demo/test/atlas/goldens/styles/button/soft-size1/container.mix.json
+++ /dev/null
@@ -1,132 +0,0 @@
-{
-  "type": "flex_box",
-  "padding": {
-    "$merge": [
-      {
-        "left": {
-          "$token": "fortal.space.2",
-          "kind": "space"
-        },
-        "right": {
-          "$token": "fortal.space.2",
-          "kind": "space"
-        }
-      },
-      {
-        "top": {
-          "$token": "fortal.space.1",
-          "kind": "space"
-        },
-        "bottom": {
-          "$token": "fortal.space.1",
-          "kind": "space"
-        }
-      }
-    ]
-  },
-  "decoration": {
-    "$merge": [
-      {
-        "borderRadius": {
-          "$token": "fortal.radius.2"
-        }
-      },
-      {
-        "color": {
-          "$token": "fortal.accent.3"
-        }
-      }
-    ]
-  },
-  "mainAxisSize": "min",
-  "spacing": {
-    "$token": "fortal.space.1",
-    "kind": "space"
-  },
-  "variants": [
-    {
-      "kind": "widget_state",
-      "state": "focused",
-      "style": {
-        "type": "flex_box",
-        "decoration": {
-          "border": {
-            "top": {
-              "color": {
-                "$token": "fortal.focus.a8"
-              },
-              "width": {
-                "$token": "fortal.focus.ring.width",
-                "kind": "space"
-              }
-            },
-            "right": {
-              "color": {
-                "$token": "fortal.focus.a8"
-              },
-              "width": {
-                "$token": "fortal.focus.ring.width",
-                "kind": "space"
-              }
-            },
-            "bottom": {
-              "color": {
-                "$token": "fortal.focus.a8"
-              },
-              "width": {
-                "$token": "fortal.focus.ring.width",
-                "kind": "space"
-              }
-            },
-            "left": {
-              "color": {
-                "$token": "fortal.focus.a8"
-              },
-              "width": {
-                "$token": "fortal.focus.ring.width",
-                "kind": "space"
-              }
-            }
-          }
-        }
-      }
-    },
-    {
-      "kind": "widget_state",
-      "state": "hovered",
-      "style": {
-        "type": "flex_box",
-        "decoration": {
-          "color": {
-            "$token": "fortal.accent.4"
-          }
-        }
-      }
-    },
-    {
-      "kind": "widget_state",
-      "state": "pressed",
-      "style": {
-        "type": "flex_box",
-        "decoration": {
-          "color": {
-            "$token": "fortal.accent.5"
-          }
-        }
-      }
-    },
-    {
-      "kind": "widget_state",
-      "state": "disabled",
-      "style": {
-        "type": "flex_box",
-        "decoration": {
-          "color": {
-            "$token": "fortal.gray.a3"
-          }
-        }
-      }
-    }
-  ],
-  "v": 1
-}
diff --git a/packages/demo/test/atlas/goldens/styles/button/soft-size1/icon.mix.json b/packages/demo/test/atlas/goldens/styles/button/soft-size1/icon.mix.json
deleted file mode 100644
index 81d43605..00000000
--- a/packages/demo/test/atlas/goldens/styles/button/soft-size1/icon.mix.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "type": "icon",
-  "color": {
-    "$token": "fortal.accent.11"
-  },
-  "size": 12.0,
-  "variants": [
-    {
-      "kind": "widget_state",
-      "state": "disabled",
-      "style": {
-        "type": "icon",
-        "color": {
-          "$token": "fortal.gray.8"
-        }
-      }
-    }
-  ],
-  "v": 1
-}
diff --git a/packages/demo/test/atlas/goldens/styles/button/soft-size1/label.mix.json b/packages/demo/test/atlas/goldens/styles/button/soft-size1/label.mix.json
deleted file mode 100644
index e23fe275..00000000
--- a/packages/demo/test/atlas/goldens/styles/button/soft-size1/label.mix.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-  "type": "text",
-  "style": {
-    "$merge": [
-      {
-        "fontWeight": {
-          "$token": "fortal.font.weight.medium"
-        }
-      },
-      {
-        "fontSize": 12.0
-      },
-      {
-        "height": 1.3333333333333333
-      },
-      {
-        "letterSpacing": 0.0025
-      },
-      {
-        "color": {
-          "$token": "fortal.accent.11"
-        }
-      }
-    ]
-  },
-  "variants": [
-    {
-      "kind": "widget_state",
-      "state": "disabled",
-      "style": {
-        "type": "text",
-        "style": {
-          "color": {
-            "$token": "fortal.gray.8"
-          }
-        }
-      }
-    }
-  ],
-  "v": 1
-}
diff --git a/packages/demo/test/atlas/goldens/styles/button/soft-size2/container.mix.json b/packages/demo/test/atlas/goldens/styles/button/soft-size2/container.mix.json
deleted file mode 100644
index 50576bdf..00000000
--- a/packages/demo/test/atlas/goldens/styles/button/soft-size2/container.mix.json
+++ /dev/null
@@ -1,132 +0,0 @@
-{
-  "type": "flex_box",
-  "padding": {
-    "$merge": [
-      {
-        "left": {
-          "$token": "fortal.space.3",
-          "kind": "space"
-        },
-        "right": {
-          "$token": "fortal.space.3",
-          "kind": "space"
-        }
-      },
-      {
-        "top": {
-          "$token": "fortal.space.2",
-          "kind": "space"
-        },
-        "bottom": {
-          "$token": "fortal.space.2",
-          "kind": "space"
-        }
-      }
-    ]
-  },
-  "decoration": {
-    "$merge": [
-      {
-        "borderRadius": {
-          "$token": "fortal.radius.3"
-        }
-      },
-      {
-        "color": {
-          "$token": "fortal.accent.3"
-        }
-      }
-    ]
-  },
-  "mainAxisSize": "min",
-  "spacing": {
-    "$token": "fortal.space.2",
-    "kind": "space"
-  },
-  "variants": [
-    {
-      "kind": "widget_state",
-      "state": "focused",
-      "style": {
-        "type": "flex_box",
-        "decoration": {
-          "border": {
-            "top": {
-              "color": {
-                "$token": "fortal.focus.a8"
-              },
-              "width": {
-                "$token": "fortal.focus.ring.width",
-                "kind": "space"
-              }
-            },
-            "right": {
-              "color": {
-                "$token": "fortal.focus.a8"
-              },
-              "width": {
-                "$token": "fortal.focus.ring.width",
-                "kind": "space"
-              }
-            },
-            "bottom": {
-              "color": {
-                "$token": "fortal.focus.a8"
-              },
-              "width": {
-                "$token": "fortal.focus.ring.width",
-                "kind": "space"
-              }
-            },
-            "left": {
-              "color": {
-                "$token": "fortal.focus.a8"
-              },
-              "width": {
-                "$token": "fortal.focus.ring.width",
-                "kind": "space"
-              }
-            }
-          }
-        }
-      }
-    },
-    {
-      "kind": "widget_state",
-      "state": "hovered",
-      "style": {
-        "type": "flex_box",
-        "decoration": {
-          "color": {
-            "$token": "fortal.accent.4"
-          }
-        }
-      }
-    },
-    {
-      "kind": "widget_state",
-      "state": "pressed",
-      "style": {
-        "type": "flex_box",
-        "decoration": {
-          "color": {
-            "$token": "fortal.accent.5"
-          }
-        }
-      }
-    },
-    {
-      "kind": "widget_state",
-      "state": "disabled",
-      "style": {
-        "type": "flex_box",
-        "decoration": {
-          "color": {
-            "$token": "fortal.gray.a3"
-          }
-        }
-      }
-    }
-  ],
-  "v": 1
-}
diff --git a/packages/demo/test/atlas/goldens/styles/button/soft-size2/icon.mix.json b/packages/demo/test/atlas/goldens/styles/button/soft-size2/icon.mix.json
deleted file mode 100644
index ce290453..00000000
--- a/packages/demo/test/atlas/goldens/styles/button/soft-size2/icon.mix.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "type": "icon",
-  "color": {
-    "$token": "fortal.accent.11"
-  },
-  "size": 16.0,
-  "variants": [
-    {
-      "kind": "widget_state",
-      "state": "disabled",
-      "style": {
-        "type": "icon",
-        "color": {
-          "$token": "fortal.gray.8"
-        }
-      }
-    }
-  ],
-  "v": 1
-}
diff --git a/packages/demo/test/atlas/goldens/styles/button/soft-size2/label.mix.json b/packages/demo/test/atlas/goldens/styles/button/soft-size2/label.mix.json
deleted file mode 100644
index 0bcb9265..00000000
--- a/packages/demo/test/atlas/goldens/styles/button/soft-size2/label.mix.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-  "type": "text",
-  "style": {
-    "$merge": [
-      {
-        "fontWeight": {
-          "$token": "fortal.font.weight.medium"
-        }
-      },
-      {
-        "fontSize": 14.0
-      },
-      {
-        "height": 1.4285714285714286
-      },
-      {
-        "letterSpacing": 0.0
-      },
-      {
-        "color": {
-          "$token": "fortal.accent.11"
-        }
-      }
-    ]
-  },
-  "variants": [
-    {
-      "kind": "widget_state",
-      "state": "disabled",
-      "style": {
-        "type": "text",
-        "style": {
-          "color": {
-            "$token": "fortal.gray.8"
-          }
-        }
-      }
-    }
-  ],
-  "v": 1
-}
diff --git a/packages/demo/test/atlas/goldens/styles/button/soft-size3/container.mix.json b/packages/demo/test/atlas/goldens/styles/button/soft-size3/container.mix.json
deleted file mode 100644
index 8f3632ba..00000000
--- a/packages/demo/test/atlas/goldens/styles/button/soft-size3/container.mix.json
+++ /dev/null
@@ -1,132 +0,0 @@
-{
-  "type": "flex_box",
-  "padding": {
-    "$merge": [
-      {
-        "left": {
-          "$token": "fortal.space.4",
-          "kind": "space"
-        },
-        "right": {
-          "$token": "fortal.space.4",
-          "kind": "space"
-        }
-      },
-      {
-        "top": {
-          "$token": "fortal.space.3",
-          "kind": "space"
-        },
-        "bottom": {
-          "$token": "fortal.space.3",
-          "kind": "space"
-        }
-      }
-    ]
-  },
-  "decoration": {
-    "$merge": [
-      {
-        "borderRadius": {
-          "$token": "fortal.radius.4"
-        }
-      },
-      {
-        "color": {
-          "$token": "fortal.accent.3"
-        }
-      }
-    ]
-  },
-  "mainAxisSize": "min",
-  "spacing": {
-    "$token": "fortal.space.3",
-    "kind": "space"
-  },
-  "variants": [
-    {
-      "kind": "widget_state",
-      "state": "focused",
-      "style": {
-        "type": "flex_box",
-        "decoration": {
-          "border": {
-            "top": {
-              "color": {
-                "$token": "fortal.focus.a8"
-              },
-              "width": {
-                "$token": "fortal.focus.ring.width",
-                "kind": "space"
-              }
-            },
-            "right": {
-              "color": {
-                "$token": "fortal.focus.a8"
-              },
-              "width": {
-                "$token": "fortal.focus.ring.width",
-                "kind": "space"
-              }
-            },
-            "bottom": {
-              "color": {
-                "$token": "fortal.focus.a8"
-              },
-              "width": {
-                "$token": "fortal.focus.ring.width",
-                "kind": "space"
-              }
-            },
-            "left": {
-              "color": {
-                "$token": "fortal.focus.a8"
-              },
-              "width": {
-                "$token": "fortal.focus.ring.width",
-                "kind": "space"
-              }
-            }
-          }
-        }
-      }
-    },
-    {
-      "kind": "widget_state",
-      "state": "hovered",
-      "style": {
-        "type": "flex_box",
-        "decoration": {
-          "color": {
-            "$token": "fortal.accent.4"
-          }
-        }
-      }
-    },
-    {
-      "kind": "widget_state",
-      "state": "pressed",
-      "style": {
-        "type": "flex_box",
-        "decoration": {
-          "color": {
-            "$token": "fortal.accent.5"
-          }
-        }
-      }
-    },
-    {
-      "kind": "widget_state",
-      "state": "disabled",
-      "style": {
-        "type": "flex_box",
-        "decoration": {
-          "color": {
-            "$token": "fortal.gray.a3"
-          }
-        }
-      }
-    }
-  ],
-  "v": 1
-}
diff --git a/packages/demo/test/atlas/goldens/styles/button/soft-size3/icon.mix.json b/packages/demo/test/atlas/goldens/styles/button/soft-size3/icon.mix.json
deleted file mode 100644
index 3aa7436b..00000000
--- a/packages/demo/test/atlas/goldens/styles/button/soft-size3/icon.mix.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "type": "icon",
-  "color": {
-    "$token": "fortal.accent.11"
-  },
-  "size": 20.0,
-  "variants": [
-    {
-      "kind": "widget_state",
-      "state": "disabled",
-      "style": {
-        "type": "icon",
-        "color": {
-          "$token": "fortal.gray.8"
-        }
-      }
-    }
-  ],
-  "v": 1
-}
diff --git a/packages/demo/test/atlas/goldens/styles/button/soft-size3/label.mix.json b/packages/demo/test/atlas/goldens/styles/button/soft-size3/label.mix.json
deleted file mode 100644
index d473b197..00000000
--- a/packages/demo/test/atlas/goldens/styles/button/soft-size3/label.mix.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-  "type": "text",
-  "style": {
-    "$merge": [
-      {
-        "fontWeight": {
-          "$token": "fortal.font.weight.medium"
-        }
-      },
-      {
-        "fontSize": 16.0
-      },
-      {
-        "height": 1.5
-      },
-      {
-        "letterSpacing": 0.0
-      },
-      {
-        "color": {
-          "$token": "fortal.accent.11"
-        }
-      }
-    ]
-  },
-  "variants": [
-    {
-      "kind": "widget_state",
-      "state": "disabled",
-      "style": {
-        "type": "text",
-        "style": {
-          "color": {
-            "$token": "fortal.gray.8"
-          }
-        }
-      }
-    }
-  ],
-  "v": 1
-}
diff --git a/packages/demo/test/atlas/goldens/styles/button/soft-size4/container.mix.json b/packages/demo/test/atlas/goldens/styles/button/soft-size4/container.mix.json
deleted file mode 100644
index d518bea8..00000000
--- a/packages/demo/test/atlas/goldens/styles/button/soft-size4/container.mix.json
+++ /dev/null
@@ -1,132 +0,0 @@
-{
-  "type": "flex_box",
-  "padding": {
-    "$merge": [
-      {
-        "left": {
-          "$token": "fortal.space.5",
-          "kind": "space"
-        },
-        "right": {
-          "$token": "fortal.space.5",
-          "kind": "space"
-        }
-      },
-      {
-        "top": {
-          "$token": "fortal.space.4",
-          "kind": "space"
-        },
-        "bottom": {
-          "$token": "fortal.space.4",
-          "kind": "space"
-        }
-      }
-    ]
-  },
-  "decoration": {
-    "$merge": [
-      {
-        "borderRadius": {
-          "$token": "fortal.radius.5"
-        }
-      },
-      {
-        "color": {
-          "$token": "fortal.accent.3"
-        }
-      }
-    ]
-  },
-  "mainAxisSize": "min",
-  "spacing": {
-    "$token": "fortal.space.4",
-    "kind": "space"
-  },
-  "variants": [
-    {
-      "kind": "widget_state",
-      "state": "focused",
-      "style": {
-        "type": "flex_box",
-        "decoration": {
-          "border": {
-            "top": {
-              "color": {
-                "$token": "fortal.focus.a8"
-              },
-              "width": {
-                "$token": "fortal.focus.ring.width",
-                "kind": "space"
-              }
-            },
-            "right": {
-              "color": {
-                "$token": "fortal.focus.a8"
-              },
-              "width": {
-                "$token": "fortal.focus.ring.width",
-                "kind": "space"
-              }
-            },
-            "bottom": {
-              "color": {
-                "$token": "fortal.focus.a8"
-              },
-              "width": {
-                "$token": "fortal.focus.ring.width",
-                "kind": "space"
-              }
-            },
-            "left": {
-              "color": {
-                "$token": "fortal.focus.a8"
-              },
-              "width": {
-                "$token": "fortal.focus.ring.width",
-                "kind": "space"
-              }
-            }
-          }
-        }
-      }
-    },
-    {
-      "kind": "widget_state",
-      "state": "hovered",
-      "style": {
-        "type": "flex_box",
-        "decoration": {
-          "color": {
-            "$token": "fortal.accent.4"
-          }
-        }
-      }
-    },
-    {
-      "kind": "widget_state",
-      "state": "pressed",
-      "style": {
-        "type": "flex_box",
-        "decoration": {
-          "color": {
-            "$token": "fortal.accent.5"
-          }
-        }
-      }
-    },
-    {
-      "kind": "widget_state",
-      "state": "disabled",
-      "style": {
-        "type": "flex_box",
-        "decoration": {
-          "color": {
-            "$token": "fortal.gray.a3"
-          }
-        }
-      }
-    }
-  ],
-  "v": 1
-}
diff --git a/packages/demo/test/atlas/goldens/styles/button/soft-size4/icon.mix.json b/packages/demo/test/atlas/goldens/styles/button/soft-size4/icon.mix.json
deleted file mode 100644
index f3867e47..00000000
--- a/packages/demo/test/atlas/goldens/styles/button/soft-size4/icon.mix.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "type": "icon",
-  "color": {
-    "$token": "fortal.accent.11"
-  },
-  "size": 24.0,
-  "variants": [
-    {
-      "kind": "widget_state",
-      "state": "disabled",
-      "style": {
-        "type": "icon",
-        "color": {
-          "$token": "fortal.gray.8"
-        }
-      }
-    }
-  ],
-  "v": 1
-}
diff --git a/packages/demo/test/atlas/goldens/styles/button/soft-size4/label.mix.json b/packages/demo/test/atlas/goldens/styles/button/soft-size4/label.mix.json
deleted file mode 100644
index a07c6afc..00000000
--- a/packages/demo/test/atlas/goldens/styles/button/soft-size4/label.mix.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-  "type": "text",
-  "style": {
-    "$merge": [
-      {
-        "fontWeight": {
-          "$token": "fortal.font.weight.medium"
-        }
-      },
-      {
-        "fontSize": 18.0
-      },
-      {
-        "height": 1.4444444444444444
-      },
-      {
-        "letterSpacing": -0.0025
-      },
-      {
-        "color": {
-          "$token": "fortal.accent.11"
-        }
-      }
-    ]
-  },
-  "variants": [
-    {
-      "kind": "widget_state",
-      "state": "disabled",
-      "style": {
-        "type": "text",
-        "style": {
-          "color": {
-            "$token": "fortal.gray.8"
-          }
-        }
-      }
-    }
-  ],
-  "v": 1
-}
diff --git a/packages/demo/test/atlas/goldens/styles/button/solid-size1/container.mix.json b/packages/demo/test/atlas/goldens/styles/button/solid-size1/container.mix.json
deleted file mode 100644
index 1481cc74..00000000
--- a/packages/demo/test/atlas/goldens/styles/button/solid-size1/container.mix.json
+++ /dev/null
@@ -1,132 +0,0 @@
-{
-  "type": "flex_box",
-  "padding": {
-    "$merge": [
-      {
-        "left": {
-          "$token": "fortal.space.2",
-          "kind": "space"
-        },
-        "right": {
-          "$token": "fortal.space.2",
-          "kind": "space"
-        }
-      },
-      {
-        "top": {
-          "$token": "fortal.space.1",
-          "kind": "space"
-        },
-        "bottom": {
-          "$token": "fortal.space.1",
-          "kind": "space"
-        }
-      }
-    ]
-  },
-  "decoration": {
-    "$merge": [
-      {
-        "borderRadius": {
-          "$token": "fortal.radius.2"
-        }
-      },
-      {
-        "color": {
-          "$token": "fortal.accent.9"
-        }
-      }
-    ]
-  },
-  "mainAxisSize": "min",
-  "spacing": {
-    "$token": "fortal.space.1",
-    "kind": "space"
-  },
-  "variants": [
-    {
-      "kind": "widget_state",
-      "state": "focused",
-      "style": {
-        "type": "flex_box",
-        "decoration": {
-          "border": {
-            "top": {
-              "color": {
-                "$token": "fortal.focus.a8"
-              },
-              "width": {
-                "$token": "fortal.focus.ring.width",
-                "kind": "space"
-              }
-            },
-            "right": {
-              "color": {
-                "$token": "fortal.focus.a8"
-              },
-              "width": {
-                "$token": "fortal.focus.ring.width",
-                "kind": "space"
-              }
-            },
-            "bottom": {
-              "color": {
-                "$token": "fortal.focus.a8"
-              },
-              "width": {
-                "$token": "fortal.focus.ring.width",
-                "kind": "space"
-              }
-            },
-            "left": {
-              "color": {
-                "$token": "fortal.focus.a8"
-              },
-              "width": {
-                "$token": "fortal.focus.ring.width",
-                "kind": "space"
-              }
-            }
-          }
-        }
-      }
-    },
-    {
-      "kind": "widget_state",
-      "state": "hovered",
-      "style": {
-        "type": "flex_box",
-        "decoration": {
-          "color": {
-            "$token": "fortal.accent.10"
-          }
-        }
-      }
-    },
-    {
-      "kind": "widget_state",
-      "state": "pressed",
-      "style": {
-        "type": "flex_box",
-        "decoration": {
-          "color": {
-            "$token": "fortal.accent.10"
-          }
-        }
-      }
-    },
-    {
-      "kind": "widget_state",
-      "state": "disabled",
-      "style": {
-        "type": "flex_box",
-        "decoration": {
-          "color": {
-            "$token": "fortal.gray.a3"
-          }
-        }
-      }
-    }
-  ],
-  "v": 1
-}
diff --git a/packages/demo/test/atlas/goldens/styles/button/solid-size1/icon.mix.json b/packages/demo/test/atlas/goldens/styles/button/solid-size1/icon.mix.json
deleted file mode 100644
index c253eb05..00000000
--- a/packages/demo/test/atlas/goldens/styles/button/solid-size1/icon.mix.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "type": "icon",
-  "color": {
-    "$token": "fortal.accent.contrast"
-  },
-  "size": 12.0,
-  "variants": [
-    {
-      "kind": "widget_state",
-      "state": "disabled",
-      "style": {
-        "type": "icon",
-        "color": {
-          "$token": "fortal.gray.8"
-        }
-      }
-    }
-  ],
-  "v": 1
-}
diff --git a/packages/demo/test/atlas/goldens/styles/button/solid-size1/label.mix.json b/packages/demo/test/atlas/goldens/styles/button/solid-size1/label.mix.json
deleted file mode 100644
index 9f2e854d..00000000
--- a/packages/demo/test/atlas/goldens/styles/button/solid-size1/label.mix.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-  "type": "text",
-  "style": {
-    "$merge": [
-      {
-        "fontWeight": {
-          "$token": "fortal.font.weight.medium"
-        }
-      },
-      {
-        "fontSize": 12.0
-      },
-      {
-        "height": 1.3333333333333333
-      },
-      {
-        "letterSpacing": 0.0025
-      },
-      {
-        "color": {
-          "$token": "fortal.accent.contrast"
-        }
-      }
-    ]
-  },
-  "variants": [
-    {
-      "kind": "widget_state",
-      "state": "disabled",
-      "style": {
-        "type": "text",
-        "style": {
-          "color": {
-            "$token": "fortal.gray.8"
-          }
-        }
-      }
-    }
-  ],
-  "v": 1
-}
diff --git a/packages/demo/test/atlas/goldens/styles/button/solid-size2/container.mix.json b/packages/demo/test/atlas/goldens/styles/button/solid-size2/container.mix.json
deleted file mode 100644
index e063f527..00000000
--- a/packages/demo/test/atlas/goldens/styles/button/solid-size2/container.mix.json
+++ /dev/null
@@ -1,132 +0,0 @@
-{
-  "type": "flex_box",
-  "padding": {
-    "$merge": [
-      {
-        "left": {
-          "$token": "fortal.space.3",
-          "kind": "space"
-        },
-        "right": {
-          "$token": "fortal.space.3",
-          "kind": "space"
-        }
-      },
-      {
-        "top": {
-          "$token": "fortal.space.2",
-          "kind": "space"
-        },
-        "bottom": {
-          "$token": "fortal.space.2",
-          "kind": "space"
-        }
-      }
-    ]
-  },
-  "decoration": {
-    "$merge": [
-      {
-        "borderRadius": {
-          "$token": "fortal.radius.3"
-        }
-      },
-      {
-        "color": {
-          "$token": "fortal.accent.9"
-        }
-      }
-    ]
-  },
-  "mainAxisSize": "min",
-  "spacing": {
-    "$token": "fortal.space.2",
-    "kind": "space"
-  },
-  "variants": [
-    {
-      "kind": "widget_state",
-      "state": "focused",
-      "style": {
-        "type": "flex_box",
-        "decoration": {
-          "border": {
-            "top": {
-              "color": {
-                "$token": "fortal.focus.a8"
-              },
-              "width": {
-                "$token": "fortal.focus.ring.width",
-                "kind": "space"
-              }
-            },
-            "right": {
-              "color": {
-                "$token": "fortal.focus.a8"
-              },
-              "width": {
-                "$token": "fortal.focus.ring.width",
-                "kind": "space"
-              }
-            },
-            "bottom": {
-              "color": {
-                "$token": "fortal.focus.a8"
-              },
-              "width": {
-                "$token": "fortal.focus.ring.width",
-                "kind": "space"
-              }
-            },
-            "left": {
-              "color": {
-                "$token": "fortal.focus.a8"
-              },
-              "width": {
-                "$token": "fortal.focus.ring.width",
-                "kind": "space"
-              }
-            }
-          }
-        }
-      }
-    },
-    {
-      "kind": "widget_state",
-      "state": "hovered",
-      "style": {
-        "type": "flex_box",
-        "decoration": {
-          "color": {
-            "$token": "fortal.accent.10"
-          }
-        }
-      }
-    },
-    {
-      "kind": "widget_state",
-      "state": "pressed",
-      "style": {
-        "type": "flex_box",
-        "decoration": {
-          "color": {
-            "$token": "fortal.accent.10"
-          }
-        }
-      }
-    },
-    {
-      "kind": "widget_state",
-      "state": "disabled",
-      "style": {
-        "type": "flex_box",
-        "decoration": {
-          "color": {
-            "$token": "fortal.gray.a3"
-          }
-        }
-      }
-    }
-  ],
-  "v": 1
-}
diff --git a/packages/demo/test/atlas/goldens/styles/button/solid-size2/icon.mix.json b/packages/demo/test/atlas/goldens/styles/button/solid-size2/icon.mix.json
deleted file mode 100644
index 7359b8f9..00000000
--- a/packages/demo/test/atlas/goldens/styles/button/solid-size2/icon.mix.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "type": "icon",
-  "color": {
-    "$token": "fortal.accent.contrast"
-  },
-  "size": 16.0,
-  "variants": [
-    {
-      "kind": "widget_state",
-      "state": "disabled",
-      "style": {
-        "type": "icon",
-        "color": {
-          "$token": "fortal.gray.8"
-        }
-      }
-    }
-  ],
-  "v": 1
-}
diff --git a/packages/demo/test/atlas/goldens/styles/button/solid-size2/label.mix.json b/packages/demo/test/atlas/goldens/styles/button/solid-size2/label.mix.json
deleted file mode 100644
index 8c49361e..00000000
--- a/packages/demo/test/atlas/goldens/styles/button/solid-size2/label.mix.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-  "type": "text",
-  "style": {
-    "$merge": [
-      {
-        "fontWeight": {
-          "$token": "fortal.font.weight.medium"
-        }
-      },
-      {
-        "fontSize": 14.0
-      },
-      {
-        "height": 1.4285714285714286
-      },
-      {
-        "letterSpacing": 0.0
-      },
-      {
-        "color": {
-          "$token": "fortal.accent.contrast"
-        }
-      }
-    ]
-  },
-  "variants": [
-    {
-      "kind": "widget_state",
-      "state": "disabled",
-      "style": {
-        "type": "text",
-        "style": {
-          "color": {
-            "$token": "fortal.gray.8"
-          }
-        }
-      }
-    }
-  ],
-  "v": 1
-}
diff --git a/packages/demo/test/atlas/goldens/styles/button/solid-size3/container.mix.json b/packages/demo/test/atlas/goldens/styles/button/solid-size3/container.mix.json
deleted file mode 100644
index fd901148..00000000
--- a/packages/demo/test/atlas/goldens/styles/button/solid-size3/container.mix.json
+++ /dev/null
@@ -1,132 +0,0 @@
-{
-  "type": "flex_box",
-  "padding": {
-    "$merge": [
-      {
-        "left": {
-          "$token": "fortal.space.4",
-          "kind": "space"
-        },
-        "right": {
-          "$token": "fortal.space.4",
-          "kind": "space"
-        }
-      },
-      {
-        "top": {
-          "$token": "fortal.space.3",
-          "kind": "space"
-        },
-        "bottom": {
-          "$token": "fortal.space.3",
-          "kind": "space"
-        }
-      }
-    ]
-  },
-  "decoration": {
-    "$merge": [
-      {
-        "borderRadius": {
-          "$token": "fortal.radius.4"
-        }
-      },
-      {
-        "color": {
-          "$token": "fortal.accent.9"
-        }
-      }
-    ]
-  },
-  "mainAxisSize": "min",
-  "spacing": {
-    "$token": "fortal.space.3",
-    "kind": "space"
-  },
-  "variants": [
-    {
-      "kind": "widget_state",
-      "state": "focused",
-      "style": {
-        "type": "flex_box",
-        "decoration": {
-          "border": {
-            "top": {
-              "color": {
-                "$token": "fortal.focus.a8"
-              },
-              "width": {
-                "$token": "fortal.focus.ring.width",
-                "kind": "space"
-              }
-            },
-            "right": {
-              "color": {
-                "$token": "fortal.focus.a8"
-              },
-              "width": {
-                "$token": "fortal.focus.ring.width",
-                "kind": "space"
-              }
-            },
-            "bottom": {
-              "color": {
-                "$token": "fortal.focus.a8"
-              },
-              "width": {
-                "$token": "fortal.focus.ring.width",
-                "kind": "space"
-              }
-            },
-            "left": {
-              "color": {
-                "$token": "fortal.focus.a8"
-              },
-              "width": {
-                "$token": "fortal.focus.ring.width",
-                "kind": "space"
-              }
-            }
-          }
-        }
-      }
-    },
-    {
-      "kind": "widget_state",
-      "state": "hovered",
-      "style": {
-        "type": "flex_box",
-        "decoration": {
-          "color": {
-            "$token": "fortal.accent.10"
-          }
-        }
-      }
-    },
-    {
-      "kind": "widget_state",
-      "state": "pressed",
-      "style": {
-        "type": "flex_box",
-        "decoration": {
-          "color": {
-            "$token": "fortal.accent.10"
-          }
-        }
-      }
-    },
-    {
-      "kind": "widget_state",
-      "state": "disabled",
-      "style": {
-        "type": "flex_box",
-        "decoration": {
-          "color": {
-            "$token": "fortal.gray.a3"
-          }
-        }
-      }
-    }
-  ],
-  "v": 1
-}
diff --git a/packages/demo/test/atlas/goldens/styles/button/solid-size3/icon.mix.json b/packages/demo/test/atlas/goldens/styles/button/solid-size3/icon.mix.json
deleted file mode 100644
index 32070f29..00000000
--- a/packages/demo/test/atlas/goldens/styles/button/solid-size3/icon.mix.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "type": "icon",
-  "color": {
-    "$token": "fortal.accent.contrast"
-  },
-  "size": 20.0,
-  "variants": [
-    {
-      "kind": "widget_state",
-      "state": "disabled",
-      "style": {
-        "type": "icon",
-        "color": {
-          "$token": "fortal.gray.8"
-        }
-      }
-    }
-  ],
-  "v": 1
-}
diff --git a/packages/demo/test/atlas/goldens/styles/button/solid-size3/label.mix.json b/packages/demo/test/atlas/goldens/styles/button/solid-size3/label.mix.json
deleted file mode 100644
index 612f6448..00000000
--- a/packages/demo/test/atlas/goldens/styles/button/solid-size3/label.mix.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-  "type": "text",
-  "style": {
-    "$merge": [
-      {
-        "fontWeight": {
-          "$token": "fortal.font.weight.medium"
-        }
-      },
-      {
-        "fontSize": 16.0
-      },
-      {
-        "height": 1.5
-      },
-      {
-        "letterSpacing": 0.0
-      },
-      {
-        "color": {
-          "$token": "fortal.accent.contrast"
-        }
-      }
-    ]
-  },
-  "variants": [
-    {
-      "kind": "widget_state",
-      "state": "disabled",
-      "style": {
-        "type": "text",
-        "style": {
-          "color": {
-            "$token": "fortal.gray.8"
-          }
-        }
-      }
-    }
-  ],
-  "v": 1
-}
diff --git a/packages/demo/test/atlas/goldens/styles/button/solid-size4/container.mix.json b/packages/demo/test/atlas/goldens/styles/button/solid-size4/container.mix.json
deleted file mode 100644
index 1786e475..00000000
--- a/packages/demo/test/atlas/goldens/styles/button/solid-size4/container.mix.json
+++ /dev/null
@@ -1,132 +0,0 @@
-{
-  "type": "flex_box",
-  "padding": {
-    "$merge": [
-      {
-        "left": {
-          "$token": "fortal.space.5",
-          "kind": "space"
-        },
-        "right": {
-          "$token": "fortal.space.5",
-          "kind": "space"
-        }
-      },
-      {
-        "top": {
-          "$token": "fortal.space.4",
-          "kind": "space"
-        },
-        "bottom": {
-          "$token": "fortal.space.4",
-          "kind": "space"
-        }
-      }
-    ]
-  },
-  "decoration": {
-    "$merge": [
-      {
-        "borderRadius": {
-          "$token": "fortal.radius.5"
-        }
-      },
-      {
-        "color": {
-          "$token": "fortal.accent.9"
-        }
-      }
-    ]
-  },
-  "mainAxisSize": "min",
-  "spacing": {
-    "$token": "fortal.space.4",
-    "kind": "space"
-  },
-  "variants": [
-    {
-      "kind": "widget_state",
-      "state": "focused",
-      "style": {
-        "type": "flex_box",
-        "decoration": {
-          "border": {
-            "top": {
-              "color": {
-                "$token": "fortal.focus.a8"
-              },
-              "width": {
-                "$token": "fortal.focus.ring.width",
-                "kind": "space"
-              }
-            },
-            "right": {
-              "color": {
-                "$token": "fortal.focus.a8"
-              },
-              "width": {
-                "$token": "fortal.focus.ring.width",
-                "kind": "space"
-              }
-            },
-            "bottom": {
-              "color": {
-                "$token": "fortal.focus.a8"
-              },
-              "width": {
-                "$token": "fortal.focus.ring.width",
-                "kind": "space"
-              }
-            },
-            "left": {
-              "color": {
-                "$token": "fortal.focus.a8"
-              },
-              "width": {
-                "$token": "fortal.focus.ring.width",
-                "kind": "space"
-              }
-            }
-          }
-        }
-      }
-    },
-    {
-      "kind": "widget_state",
-      "state": "hovered",
-      "style": {
-        "type": "flex_box",
-        "decoration": {
-          "color": {
-            "$token": "fortal.accent.10"
-          }
-        }
-      }
-    },
-    {
-      "kind": "widget_state",
-      "state": "pressed",
-      "style": {
-        "type": "flex_box",
-        "decoration": {
-          "color": {
-            "$token": "fortal.accent.10"
-          }
-        }
-      }
-    },
-    {
-      "kind": "widget_state",
-      "state": "disabled",
-      "style": {
-        "type": "flex_box",
-        "decoration": {
-          "color": {
-            "$token": "fortal.gray.a3"
-          }
-        }
-      }
-    }
-  ],
-  "v": 1
-}
diff --git a/packages/demo/test/atlas/goldens/styles/button/solid-size4/icon.mix.json b/packages/demo/test/atlas/goldens/styles/button/solid-size4/icon.mix.json
deleted file mode 100644
index 4310856b..00000000
--- a/packages/demo/test/atlas/goldens/styles/button/solid-size4/icon.mix.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "type": "icon",
-  "color": {
-    "$token": "fortal.accent.contrast"
-  },
-  "size": 24.0,
-  "variants": [
-    {
-      "kind": "widget_state",
-      "state": "disabled",
-      "style": {
-        "type": "icon",
-        "color": {
-          "$token": "fortal.gray.8"
-        }
-      }
-    }
-  ],
-  "v": 1
-}
diff --git a/packages/demo/test/atlas/goldens/styles/button/solid-size4/label.mix.json b/packages/demo/test/atlas/goldens/styles/button/solid-size4/label.mix.json
deleted file mode 100644
index 72395fde..00000000
--- a/packages/demo/test/atlas/goldens/styles/button/solid-size4/label.mix.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-  "type": "text",
-  "style": {
-    "$merge": [
-      {
-        "fontWeight": {
-          "$token": "fortal.font.weight.medium"
-        }
-      },
-      {
-        "fontSize": 18.0
-      },
-      {
-        "height": 1.4444444444444444
-      },
-      {
-        "letterSpacing": -0.0025
-      },
-      {
-        "color": {
-          "$token": "fortal.accent.contrast"
-        }
-      }
-    ]
-  },
-  "variants": [
-    {
-      "kind": "widget_state",
-      "state": "disabled",
-      "style": {
-        "type": "text",
-        "style": {
-          "color": {
-            "$token": "fortal.gray.8"
-          }
-        }
-      }
-    }
-  ],
-  "v": 1
-}
diff --git a/packages/demo/test/atlas/goldens/styles/button/surface-size1/container.mix.json b/packages/demo/test/atlas/goldens/styles/button/surface-size1/container.mix.json
deleted file mode 100644
index 8f634585..00000000
--- a/packages/demo/test/atlas/goldens/styles/button/surface-size1/container.mix.json
+++ /dev/null
@@ -1,239 +0,0 @@
-{
-  "type": "flex_box",
-  "padding": {
-    "$merge": [
-      {
-        "left": {
-          "$token": "fortal.space.2",
-          "kind": "space"
-        },
-        "right": {
-          "$token": "fortal.space.2",
-          "kind": "space"
-        }
-      },
-      {
-        "top": {
-          "$token": "fortal.space.1",
-          "kind": "space"
-        },
-        "bottom": {
-          "$token": "fortal.space.1",
-          "kind": "space"
-        }
-      }
-    ]
-  },
-  "decoration": {
-    "$merge": [
-      {
-        "borderRadius": {
-          "$token": "fortal.radius.2"
-        }
-      },
-      {
-        "color": {
-          "$token": "fortal.accent.a2"
-        }
-      },
-      {
-        "border": {
-          "top": {
-            "color": {
-              "$token": "fortal.accent.6"
-            },
-            "width": {
-              "$token": "fortal.border.width.1",
-              "kind": "space"
-            }
-          },
-          "right": {
-            "color": {
-              "$token": "fortal.accent.6"
-            },
-            "width": {
-              "$token": "fortal.border.width.1",
-              "kind": "space"
-            }
-          },
-          "bottom": {
-            "color": {
-              "$token": "fortal.accent.6"
-            },
-            "width": {
-              "$token": "fortal.border.width.1",
-              "kind": "space"
-            }
-          },
-          "left": {
-            "color": {
-              "$token": "fortal.accent.6"
-            },
-            "width": {
-              "$token": "fortal.border.width.1",
-              "kind": "space"
-            }
-          }
-        }
-      }
-    ]
-  },
-  "mainAxisSize": "min",
-  "spacing": {
-    "$token": "fortal.space.1",
-    "kind": "space"
-  },
-  "variants": [
-    {
-      "kind": "widget_state",
-      "state": "focused",
-      "style": {
-        "type": "flex_box",
-        "decoration": {
-          "border": {
-            "top": {
-              "color": {
-                "$token": "fortal.focus.a8"
-              },
-              "width": {
-                "$token": "fortal.focus.ring.width",
-                "kind": "space"
-              }
-            },
-            "right": {
-              "color": {
-                "$token": "fortal.focus.a8"
-              },
-              "width": {
-                "$token": "fortal.focus.ring.width",
-                "kind": "space"
-              }
-            },
-            "bottom": {
-              "color": {
-                "$token": "fortal.focus.a8"
-              },
-              "width": {
-                "$token": "fortal.focus.ring.width",
-                "kind": "space"
-              }
-            },
-            "left": {
-              "color": {
-                "$token": "fortal.focus.a8"
-              },
-              "width": {
-                "$token": "fortal.focus.ring.width",
-                "kind": "space"
-              }
-            }
-          }
-        }
-      }
-    },
-    {
-      "kind": "widget_state",
-      "state": "hovered",
-      "style": {
-        "type": "flex_box",
-        "decoration": {
-          "border": {
-            "top": {
-              "color": {
-                "$token": "fortal.accent.8"
-              },
-              "width": {
-                "$token": "fortal.border.width.1",
-                "kind": "space"
-              }
-            },
-            "right": {
-              "color": {
-                "$token": "fortal.accent.8"
-              },
-              "width": {
-                "$token": "fortal.border.width.1",
-                "kind": "space"
-              }
-            },
-            "bottom": {
-              "color": {
-                "$token": "fortal.accent.8"
-              },
-              "width": {
-                "$token": "fortal.border.width.1",
-                "kind": "space"
-              }
-            },
-            "left": {
-              "color": {
-                "$token": "fortal.accent.8"
-              },
-              "width": {
-                "$token": "fortal.border.width.1",
-                "kind": "space"
-              }
-            }
-          }
-        }
-      }
-    },
-    {
-      "kind": "widget_state",
-      "state": "disabled",
-      "style": {
-        "type": "flex_box",
-        "decoration": {
-          "$merge": [
-            {
-              "color": {
-                "$token": "fortal.gray.a2"
-              }
-            },
-            {
-              "border": {
-                "top": {
-                  "color": {
-                    "$token": "fortal.gray.5"
-                  },
-                  "width": {
-                    "$token": "fortal.border.width.1",
-                    "kind": "space"
-                  }
-                },
-                "right": {
-                  "color": {
-                    "$token": "fortal.gray.5"
-                  },
-                  "width": {
-                    "$token": "fortal.border.width.1",
-                    "kind": "space"
-                  }
-                },
-                "bottom": {
-                  "color": {
-                    "$token": "fortal.gray.5"
-                  },
-                  "width": {
-                    "$token": "fortal.border.width.1",
-                    "kind": "space"
-                  }
-                },
-                "left": {
-                  "color": {
-                    "$token": "fortal.gray.5"
-                  },
-                  "width": {
-                    "$token": "fortal.border.width.1",
-                    "kind": "space"
-                  }
-                }
-              }
-            }
-          ]
-        }
-      }
-    }
-  ],
-  "v": 1
-}
diff --git a/packages/demo/test/atlas/goldens/styles/button/surface-size1/icon.mix.json b/packages/demo/test/atlas/goldens/styles/button/surface-size1/icon.mix.json
deleted file mode 100644
index 81d43605..00000000
--- a/packages/demo/test/atlas/goldens/styles/button/surface-size1/icon.mix.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "type": "icon",
-  "color": {
-    "$token": "fortal.accent.11"
-  },
-  "size": 12.0,
-  "variants": [
-    {
-      "kind": "widget_state",
-      "state": "disabled",
-      "style": {
-        "type": "icon",
-        "color": {
-          "$token": "fortal.gray.8"
-        }
-      }
-    }
-  ],
-  "v": 1
-}
diff --git a/packages/demo/test/atlas/goldens/styles/button/surface-size1/label.mix.json b/packages/demo/test/atlas/goldens/styles/button/surface-size1/label.mix.json
deleted file mode 100644
index e23fe275..00000000
--- a/packages/demo/test/atlas/goldens/styles/button/surface-size1/label.mix.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-  "type": "text",
-  "style": {
-    "$merge": [
-      {
-        "fontWeight": {
-          "$token": "fortal.font.weight.medium"
-        }
-      },
-      {
-        "fontSize": 12.0
-      },
-      {
-        "height": 1.3333333333333333
-      },
-      {
-        "letterSpacing": 0.0025
-      },
-      {
-        "color": {
-          "$token": "fortal.accent.11"
-        }
-      }
-    ]
-  },
-  "variants": [
-    {
-      "kind": "widget_state",
-      "state": "disabled",
-      "style": {
-        "type": "text",
-        "style": {
-          "color": {
-            "$token": "fortal.gray.8"
-          }
-        }
-      }
-    }
-  ],
-  "v": 1
-}
diff --git a/packages/demo/test/atlas/goldens/styles/button/surface-size2/container.mix.json b/packages/demo/test/atlas/goldens/styles/button/surface-size2/container.mix.json
deleted file mode 100644
index f427648e..00000000
--- a/packages/demo/test/atlas/goldens/styles/button/surface-size2/container.mix.json
+++ /dev/null
@@ -1,239 +0,0 @@
-{
-  "type": "flex_box",
-  "padding": {
-    "$merge": [
-      {
-        "left": {
-          "$token": "fortal.space.3",
-          "kind": "space"
-        },
-        "right": {
-          "$token": "fortal.space.3",
-          "kind": "space"
-        }
-      },
-      {
-        "top": {
-          "$token": "fortal.space.2",
-          "kind": "space"
-        },
-        "bottom": {
-          "$token": "fortal.space.2",
-          "kind": "space"
-        }
-      }
-    ]
-  },
-  "decoration": {
-    "$merge": [
-      {
-        "borderRadius": {
-          "$token": "fortal.radius.3"
-        }
-      },
-      {
-        "color": {
-          "$token": "fortal.accent.a2"
-        }
-      },
-      {
-        "border": {
-          "top": {
-            "color": {
-              "$token": "fortal.accent.6"
-            },
-            "width": {
-              "$token": "fortal.border.width.1",
-              "kind": "space"
-            }
-          },
-          "right": {
-            "color": {
-              "$token": "fortal.accent.6"
-            },
-            "width": {
-              "$token": "fortal.border.width.1",
-              "kind": "space"
-            }
-          },
-          "bottom": {
-            "color": {
-              "$token": "fortal.accent.6"
-            },
-            "width": {
-              "$token": "fortal.border.width.1",
-              "kind": "space"
-            }
-          },
-          "left": {
-            "color": {
-              "$token": "fortal.accent.6"
-            },
-            "width": {
-              "$token": "fortal.border.width.1",
-              "kind": "space"
-            }
-          }
-        }
-      }
-    ]
-  },
-  "mainAxisSize": "min",
-  "spacing": {
-    "$token": "fortal.space.2",
-    "kind": "space"
-  },
-  "variants": [
-    {
-      "kind": "widget_state",
-      "state": "focused",
-      "style": {
-        "type": "flex_box",
-        "decoration": {
-          "border": {
-            "top": {
-              "color": {
-                "$token": "fortal.focus.a8"
-              },
-              "width": {
-                "$token": "fortal.focus.ring.width",
-                "kind": "space"
-              }
-            },
-            "right": {
-              "color": {
-                "$token": "fortal.focus.a8"
-              },
-              "width": {
-                "$token": "fortal.focus.ring.width",
-                "kind": "space"
-              }
-            },
-            "bottom": {
-              "color": {
-                "$token": "fortal.focus.a8"
-              },
-              "width": {
-                "$token": "fortal.focus.ring.width",
-                "kind": "space"
-              }
-            },
-            "left": {
-              "color": {
-                "$token": "fortal.focus.a8"
-              },
-              "width": {
-                "$token": "fortal.focus.ring.width",
-                "kind": "space"
-              }
-            }
-          }
-        }
-      }
-    },
-    {
-      "kind": "widget_state",
-      "state": "hovered",
-      "style": {
-        "type": "flex_box",
-        "decoration": {
-          "border": {
-            "top": {
-              "color": {
-                "$token": "fortal.accent.8"
-              },
-              "width": {
-                "$token": "fortal.border.width.1",
-                "kind": "space"
-              }
-            },
-            "right": {
-              "color": {
-                "$token": "fortal.accent.8"
-              },
-              "width": {
-                "$token": "fortal.border.width.1",
-                "kind": "space"
-              }
-            },
-            "bottom": {
-              "color": {
-                "$token": "fortal.accent.8"
-              },
-              "width": {
-                "$token": "fortal.border.width.1",
-                "kind": "space"
-              }
-            },
-            "left": {
-              "color": {
-                "$token": "fortal.accent.8"
-              },
-              "width": {
-                "$token": "fortal.border.width.1",
-                "kind": "space"
-              }
-            }
-          }
-        }
-      }
-    },
-    {
-      "kind": "widget_state",
-      "state": "disabled",
-      "style": {
-        "type": "flex_box",
-        "decoration": {
-          "$merge": [
-            {
-              "color": {
-                "$token": "fortal.gray.a2"
-              }
-            },
-            {
-              "border": {
-                "top": {
-                  "color": {
-                    "$token": "fortal.gray.5"
-                  },
-                  "width": {
-                    "$token": "fortal.border.width.1",
-                    "kind": "space"
-                  }
-                },
-                "right": {
-                  "color": {
-                    "$token": "fortal.gray.5"
-                  },
-                  "width": {
-                    "$token": "fortal.border.width.1",
-                    "kind": "space"
-                  }
-                },
-                "bottom": {
-                  "color": {
-                    "$token": "fortal.gray.5"
-                  },
-                  "width": {
-                    "$token": "fortal.border.width.1",
-                    "kind": "space"
-                  }
-                },
-                "left": {
-                  "color": {
-                    "$token": "fortal.gray.5"
-                  },
-                  "width": {
-                    "$token": "fortal.border.width.1",
-                    "kind": "space"
-                  }
-                }
-              }
-            }
-          ]
-        }
-      }
-    }
-  ],
-  "v": 1
-}
diff --git a/packages/demo/test/atlas/goldens/styles/button/surface-size2/icon.mix.json b/packages/demo/test/atlas/goldens/styles/button/surface-size2/icon.mix.json
deleted file mode 100644
index ce290453..00000000
--- a/packages/demo/test/atlas/goldens/styles/button/surface-size2/icon.mix.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "type": "icon",
-  "color": {
-    "$token": "fortal.accent.11"
-  },
-  "size": 16.0,
-  "variants": [
-    {
-      "kind": "widget_state",
-      "state": "disabled",
-      "style": {
-        "type": "icon",
-        "color": {
-          "$token": "fortal.gray.8"
-        }
-      }
-    }
-  ],
-  "v": 1
-}
diff --git a/packages/demo/test/atlas/goldens/styles/button/surface-size2/label.mix.json b/packages/demo/test/atlas/goldens/styles/button/surface-size2/label.mix.json
deleted file mode 100644
index 0bcb9265..00000000
--- a/packages/demo/test/atlas/goldens/styles/button/surface-size2/label.mix.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-  "type": "text",
-  "style": {
-    "$merge": [
-      {
-        "fontWeight": {
-          "$token": "fortal.font.weight.medium"
-        }
-      },
-      {
-        "fontSize": 14.0
-      },
-      {
-        "height": 1.4285714285714286
-      },
-      {
-        "letterSpacing": 0.0
-      },
-      {
-        "color": {
-          "$token": "fortal.accent.11"
-        }
-      }
-    ]
-  },
-  "variants": [
-    {
-      "kind": "widget_state",
-      "state": "disabled",
-      "style": {
-        "type": "text",
-        "style": {
-          "color": {
-            "$token": "fortal.gray.8"
-          }
-        }
-      }
-    }
-  ],
-  "v": 1
-}
diff --git a/packages/demo/test/atlas/goldens/styles/button/surface-size3/container.mix.json b/packages/demo/test/atlas/goldens/styles/button/surface-size3/container.mix.json
deleted file mode 100644
index 73e03851..00000000
--- a/packages/demo/test/atlas/goldens/styles/button/surface-size3/container.mix.json
+++ /dev/null
@@ -1,239 +0,0 @@
-{
-  "type": "flex_box",
-  "padding": {
-    "$merge": [
-      {
-        "left": {
-          "$token": "fortal.space.4",
-          "kind": "space"
-        },
-        "right": {
-          "$token": "fortal.space.4",
-          "kind": "space"
-        }
-      },
-      {
-        "top": {
-          "$token": "fortal.space.3",
-          "kind": "space"
-        },
-        "bottom": {
-          "$token": "fortal.space.3",
-          "kind": "space"
-        }
-      }
-    ]
-  },
-  "decoration": {
-    "$merge": [
-      {
-        "borderRadius": {
-          "$token": "fortal.radius.4"
-        }
-      },
-      {
-        "color": {
-          "$token": "fortal.accent.a2"
-        }
-      },
-      {
-        "border": {
-          "top": {
-            "color": {
-              "$token": "fortal.accent.6"
-            },
-            "width": {
-              "$token": "fortal.border.width.1",
-              "kind": "space"
-            }
-          },
-          "right": {
-            "color": {
-              "$token": "fortal.accent.6"
-            },
-            "width": {
-              "$token": "fortal.border.width.1",
-              "kind": "space"
-            }
-          },
-          "bottom": {
-            "color": {
-              "$token": "fortal.accent.6"
-            },
-            "width": {
-              "$token": "fortal.border.width.1",
-              "kind": "space"
-            }
-          },
-          "left": {
-            "color": {
-              "$token": "fortal.accent.6"
-            },
-            "width": {
-              "$token": "fortal.border.width.1",
-              "kind": "space"
-            }
-          }
-        }
-      }
-    ]
-  },
-  "mainAxisSize": "min",
-  "spacing": {
-    "$token": "fortal.space.3",
-    "kind": "space"
-  },
-  "variants": [
-    {
-      "kind": "widget_state",
-      "state": "focused",
-      "style": {
-        "type": "flex_box",
-        "decoration": {
-          "border": {
-            "top": {
-              "color": {
-                "$token": "fortal.focus.a8"
-              },
-              "width": {
-                "$token": "fortal.focus.ring.width",
-                "kind": "space"
-              }
-            },
-            "right": {
-              "color": {
-                "$token": "fortal.focus.a8"
-              },
-              "width": {
-                "$token": "fortal.focus.ring.width",
-                "kind": "space"
-              }
-            },
-            "bottom": {
-              "color": {
-                "$token": "fortal.focus.a8"
-              },
-              "width": {
-                "$token": "fortal.focus.ring.width",
-                "kind": "space"
-              }
-            },
-            "left": {
-              "color": {
-                "$token": "fortal.focus.a8"
-              },
-              "width": {
-                "$token": "fortal.focus.ring.width",
-                "kind": "space"
-              }
-            }
-          }
-        }
-      }
-    },
-    {
-      "kind": "widget_state",
-      "state": "hovered",
-      "style": {
-        "type": "flex_box",
-        "decoration": {
-          "border": {
-            "top": {
-              "color": {
-                "$token": "fortal.accent.8"
-              },
-              "width": {
-                "$token": "fortal.border.width.1",
-                "kind": "space"
-              }
-            },
-            "right": {
-              "color": {
-                "$token": "fortal.accent.8"
-              },
-              "width": {
-                "$token": "fortal.border.width.1",
-                "kind": "space"
-              }
-            },
-            "bottom": {
-              "color": {
-                "$token": "fortal.accent.8"
-              },
-              "width": {
-                "$token": "fortal.border.width.1",
-                "kind": "space"
-              }
-            },
-            "left": {
-              "color": {
-                "$token": "fortal.accent.8"
-              },
-              "width": {
-                "$token": "fortal.border.width.1",
-                "kind": "space"
-              }
-            }
-          }
-        }
-      }
-    },
-    {
-      "kind": "widget_state",
-      "state": "disabled",
-      "style": {
-        "type": "flex_box",
-        "decoration": {
-          "$merge": [
-            {
-              "color": {
-                "$token": "fortal.gray.a2"
-              }
-            },
-            {
-              "border": {
-                "top": {
-                  "color": {
-                    "$token": "fortal.gray.5"
-                  },
-                  "width": {
-                    "$token": "fortal.border.width.1",
-                    "kind": "space"
-                  }
-                },
-                "right": {
-                  "color": {
-                    "$token": "fortal.gray.5"
-                  },
-                  "width": {
-                    "$token": "fortal.border.width.1",
-                    "kind": "space"
-                  }
-                },
-                "bottom": {
-                  "color": {
-                    "$token": "fortal.gray.5"
-                  },
-                  "width": {
-                    "$token": "fortal.border.width.1",
-                    "kind": "space"
-                  }
-                },
-                "left": {
-                  "color": {
-                    "$token": "fortal.gray.5"
-                  },
-                  "width": {
-                    "$token": "fortal.border.width.1",
-                    "kind": "space"
-                  }
-                }
-              }
-            }
-          ]
-        }
-      }
-    }
-  ],
-  "v": 1
-}
diff --git a/packages/demo/test/atlas/goldens/styles/button/surface-size3/icon.mix.json b/packages/demo/test/atlas/goldens/styles/button/surface-size3/icon.mix.json
deleted file mode 100644
index 3aa7436b..00000000
--- a/packages/demo/test/atlas/goldens/styles/button/surface-size3/icon.mix.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "type": "icon",
-  "color": {
-    "$token": "fortal.accent.11"
-  },
-  "size": 20.0,
-  "variants": [
-    {
-      "kind": "widget_state",
-      "state": "disabled",
-      "style": {
-        "type": "icon",
-        "color": {
-          "$token": "fortal.gray.8"
-        }
-      }
-    }
-  ],
-  "v": 1
-}
diff --git a/packages/demo/test/atlas/goldens/styles/button/surface-size3/label.mix.json b/packages/demo/test/atlas/goldens/styles/button/surface-size3/label.mix.json
deleted file mode 100644
index d473b197..00000000
--- a/packages/demo/test/atlas/goldens/styles/button/surface-size3/label.mix.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-  "type": "text",
-  "style": {
-    "$merge": [
-      {
-        "fontWeight": {
-          "$token": "fortal.font.weight.medium"
-        }
-      },
-      {
-        "fontSize": 16.0
-      },
-      {
-        "height": 1.5
-      },
-      {
-        "letterSpacing": 0.0
-      },
-      {
-        "color": {
-          "$token": "fortal.accent.11"
-        }
-      }
-    ]
-  },
-  "variants": [
-    {
-      "kind": "widget_state",
-      "state": "disabled",
-      "style": {
-        "type": "text",
-        "style": {
-          "color": {
-            "$token": "fortal.gray.8"
-          }
-        }
-      }
-    }
-  ],
-  "v": 1
-}
diff --git a/packages/demo/test/atlas/goldens/styles/button/surface-size4/container.mix.json b/packages/demo/test/atlas/goldens/styles/button/surface-size4/container.mix.json
deleted file mode 100644
index f42d7307..00000000
--- a/packages/demo/test/atlas/goldens/styles/button/surface-size4/container.mix.json
+++ /dev/null
@@ -1,239 +0,0 @@
-{
-  "type": "flex_box",
-  "padding": {
-    "$merge": [
-      {
-        "left": {
-          "$token": "fortal.space.5",
-          "kind": "space"
-        },
-        "right": {
-          "$token": "fortal.space.5",
-          "kind": "space"
-        }
-      },
-      {
-        "top": {
-          "$token": "fortal.space.4",
-          "kind": "space"
-        },
-        "bottom": {
-          "$token": "fortal.space.4",
-          "kind": "space"
-        }
-      }
-    ]
-  },
-  "decoration": {
-    "$merge": [
-      {
-        "borderRadius": {
-          "$token": "fortal.radius.5"
-        }
-      },
-      {
-        "color": {
-          "$token": "fortal.accent.a2"
-        }
-      },
-      {
-        "border": {
-          "top": {
-            "color": {
-              "$token": "fortal.accent.6"
-            },
-            "width": {
-              "$token": "fortal.border.width.1",
-              "kind": "space"
-            }
-          },
-          "right": {
-            "color": {
-              "$token": "fortal.accent.6"
-            },
-            "width": {
-              "$token": "fortal.border.width.1",
-              "kind": "space"
-            }
-          },
-          "bottom": {
-            "color": {
-              "$token": "fortal.accent.6"
-            },
-            "width": {
-              "$token": "fortal.border.width.1",
-              "kind": "space"
-            }
-          },
-          "left": {
-            "color": {
-              "$token": "fortal.accent.6"
-            },
-            "width": {
-              "$token": "fortal.border.width.1",
-              "kind": "space"
-            }
-          }
-        }
-      }
-    ]
-  },
-  "mainAxisSize": "min",
-  "spacing": {
-    "$token": "fortal.space.4",
-    "kind": "space"
-  },
-  "variants": [
-    {
-      "kind": "widget_state",
-      "state": "focused",
-      "style": {
-        "type": "flex_box",
-        "decoration": {
-          "border": {
-            "top": {
-              "color": {
-                "$token": "fortal.focus.a8"
-              },
-              "width": {
-                "$token": "fortal.focus.ring.width",
-                "kind": "space"
-              }
-            },
-            "right": {
-              "color": {
-                "$token": "fortal.focus.a8"
-              },
-              "width": {
-                "$token": "fortal.focus.ring.width",
-                "kind": "space"
-              }
-            },
-            "bottom": {
-              "color": {
-                "$token": "fortal.focus.a8"
-              },
-              "width": {
-                "$token": "fortal.focus.ring.width",
-                "kind": "space"
-              }
-            },
-            "left": {
-              "color": {
-                "$token": "fortal.focus.a8"
-              },
-              "width": {
-                "$token": "fortal.focus.ring.width",
-                "kind": "space"
-              }
-            }
-          }
-        }
-      }
-    },
-    {
-      "kind": "widget_state",
-      "state": "hovered",
-      "style": {
-        "type": "flex_box",
-        "decoration": {
-          "border": {
-            "top": {
-              "color": {
-                "$token": "fortal.accent.8"
-              },
-              "width": {
-                "$token": "fortal.border.width.1",
-                "kind": "space"
-              }
-            },
-            "right": {
-              "color": {
-                "$token": "fortal.accent.8"
-              },
-              "width": {
-                "$token": "fortal.border.width.1",
-                "kind": "space"
-              }
-            },
-            "bottom": {
-              "color": {
-                "$token": "fortal.accent.8"
-              },
-              "width": {
-                "$token": "fortal.border.width.1",
-                "kind": "space"
-              }
-            },
-            "left": {
-              "color": {
-                "$token": "fortal.accent.8"
-              },
-              "width": {
-                "$token": "fortal.border.width.1",
-                "kind": "space"
-              }
-            }
-          }
-        }
-      }
-    },
-    {
-      "kind": "widget_state",
-      "state": "disabled",
-      "style": {
-        "type": "flex_box",
-        "decoration": {
-          "$merge": [
-            {
-              "color": {
-                "$token": "fortal.gray.a2"
-              }
-            },
-            {
-              "border": {
-                "top": {
-                  "color": {
-                    "$token": "fortal.gray.5"
-                  },
-                  "width": {
-                    "$token": "fortal.border.width.1",
-                    "kind": "space"
-                  }
-                },
-                "right": {
-                  "color": {
-                    "$token": "fortal.gray.5"
-                  },
-                  "width": {
-                    "$token": "fortal.border.width.1",
-                    "kind": "space"
-                  }
-                },
-                "bottom": {
-                  "color": {
-                    "$token": "fortal.gray.5"
-                  },
-                  "width": {
-                    "$token": "fortal.border.width.1",
-                    "kind": "space"
-                  }
-                },
-                "left": {
-                  "color": {
-                    "$token": "fortal.gray.5"
-                  },
-                  "width": {
-                    "$token": "fortal.border.width.1",
-                    "kind": "space"
-                  }
-                }
-              }
-            }
-          ]
-        }
-      }
-    }
-  ],
-  "v": 1
-}
diff --git a/packages/demo/test/atlas/goldens/styles/button/surface-size4/icon.mix.json b/packages/demo/test/atlas/goldens/styles/button/surface-size4/icon.mix.json
deleted file mode 100644
index f3867e47..00000000
--- a/packages/demo/test/atlas/goldens/styles/button/surface-size4/icon.mix.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "type": "icon",
-  "color": {
-    "$token": "fortal.accent.11"
-  },
-  "size": 24.0,
-  "variants": [
-    {
-      "kind": "widget_state",
-      "state": "disabled",
-      "style": {
-        "type": "icon",
-        "color": {
-          "$token": "fortal.gray.8"
-        }
-      }
-    }
-  ],
-  "v": 1
-}
diff --git a/packages/demo/test/atlas/goldens/styles/button/surface-size4/label.mix.json b/packages/demo/test/atlas/goldens/styles/button/surface-size4/label.mix.json
deleted file mode 100644
index a07c6afc..00000000
--- a/packages/demo/test/atlas/goldens/styles/button/surface-size4/label.mix.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-  "type": "text",
-  "style": {
-    "$merge": [
-      {
-        "fontWeight": {
-          "$token": "fortal.font.weight.medium"
-        }
-      },
-      {
-        "fontSize": 18.0
-      },
-      {
-        "height": 1.4444444444444444
-      },
-      {
-        "letterSpacing": -0.0025
-      },
-      {
-        "color": {
-          "$token": "fortal.accent.11"
-        }
-      }
-    ]
-  },
-  "variants": [
-    {
-      "kind": "widget_state",
-      "state": "disabled",
-      "style": {
-        "type": "text",
-        "style": {
-          "color": {
-            "$token": "fortal.gray.8"
-          }
-        }
-      }
-    }
-  ],
-  "v": 1
-}
diff --git a/packages/demo/test/atlas/support/fortal_atlas_catalog.dart b/packages/demo/test/atlas/support/fortal_atlas_catalog.dart
deleted file mode 100644
index 1a3702d9..00000000
--- a/packages/demo/test/atlas/support/fortal_atlas_catalog.dart
+++ /dev/null
@@ -1,67 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:mix_atlas/mix_atlas.dart';
-import 'package:remix/remix.dart';
-
-final fortalAtlasCatalog = AtlasCatalog(
-  id: 'fortal',
-  label: 'Fortal Design System',
-  themes: [
-    AtlasTheme(
-      'light',
-      label: 'Light',
-      background: Colors.white,
-      builder: (_, child) => FortalScope(child: child),
-    ),
-    AtlasTheme(
-      'dark',
-      label: 'Dark',
-      brightness: Brightness.dark,
-      background: const Color(0xFF111111),
-      builder: (_, child) =>
-          FortalScope(brightness: Brightness.dark, child: child),
-    ),
-  ],
-  atlases: [_buttonAtlas],
-);
-
-final _buttonAtlas = ComponentAtlas(
-  id: 'button',
-  label: 'Button',
-  rowAxes: const [AtlasAxis('variant', 'Variant'), AtlasAxis('size', 'Size')],
-  scenarios: const [
-    ...AtlasScenarios.interactive,
-    AtlasScenario('loading', label: 'Loading', props: {'loading': true}),
-  ],
-  rows: [
-    for (final variant in FortalButtonVariant.values)
-      for (final size in FortalButtonSize.values) _buttonRow(variant, size),
-  ],
-);
-
-AtlasRow _buttonRow(FortalButtonVariant variant, FortalButtonSize size) {
-  return AtlasRow(
-    '${variant.name}-${size.name}',
-    (context, cell) => FortalButton(
-      variant: variant,
-      size: size,
-      label: 'Button',
-      leadingIcon: Icons.add,
-      enabled: !cell.disabled,
-      loading: cell.propOr('loading', false),
-      onPressed: () {},
-    ),
-    values: {
-      'variant': AtlasAxisValue(variant.name, _title(variant.name)),
-      'size': AtlasAxisValue(size.name, _sizeLabel(size)),
-    },
-  );
-}
-
-String _sizeLabel(FortalButtonSize size) => switch (size) {
-  FortalButtonSize.size1 => 'Size 1',
-  FortalButtonSize.size2 => 'Size 2',
-  FortalButtonSize.size3 => 'Size 3',
-  FortalButtonSize.size4 => 'Size 4',
-};
-
-String _title(String value) => '${value[0].toUpperCase()}${value.substring(1)}';
diff --git a/packages/demo/test/atlas/support/fortal_button_component_artifact.dart b/packages/demo/test/atlas/support/fortal_button_component_artifact.dart
deleted file mode 100644
index e80e3930..00000000
--- a/packages/demo/test/atlas/support/fortal_button_component_artifact.dart
+++ /dev/null
@@ -1,258 +0,0 @@
-import 'package:mix_protocol/mix_protocol.dart';
-import 'package:remix/remix.dart';
-
-import 'fortal_button_protocol_adapter.dart';
-
-final class FortalButtonComponentArtifacts {
-  FortalButtonComponentArtifacts({
-    required this.document,
-    required Map<String, Map<String, Object?>> styleDocuments,
-  }) : styleDocuments = Map.unmodifiable(styleDocuments);
-
-  final Map<String, Object?> document;
-  final Map<String, Map<String, Object?>> styleDocuments;
-
-  int get totalMatrixCells => 5 * 4 * 6 * 2;
-  int get nonLoadingCells => 5 * 4 * 5 * 2;
-  int get loadingUnsupportedCells => 5 * 4 * 1 * 2;
-
-  int get supportedContainerRecipes {
-    final recipes = document['recipes']! as List<Object?>;
-
-    return recipes.where((value) {
-      final recipe = value! as Map<String, Object?>;
-      final styles = recipe['styles']! as Map<String, Object?>;
-      final container = styles['container']! as Map<String, Object?>;
-
-      return container['status'] == 'supported';
-    }).length;
-  }
-}
-
-FortalButtonComponentArtifacts buildFortalButtonComponentArtifacts() {
-  final styleDocuments = <String, Map<String, Object?>>{};
-  final recipes = <Map<String, Object?>>[];
-  for (final variant in FortalButtonVariant.values) {
-    for (final size in FortalButtonSize.values) {
-      final id = '${variant.name}-${size.name}';
-      final projection = projectButtonStyler(
-        fortalButtonStyler(variant: variant, size: size),
-      );
-      if (projection.diagnostics.isNotEmpty) {
-        throw StateError(
-          'Fortal Button projection lost component behavior for $id: '
-          '${projection.diagnostics.map((item) => item.message).join('; ')}',
-        );
-      }
-      final container = _encodeSlot(
-        projection.container,
-        path: 'styles/button/$id/container.mix.json',
-        documents: styleDocuments,
-      );
-      final label = _encodeSlot(
-        projection.label,
-        path: 'styles/button/$id/label.mix.json',
-        documents: styleDocuments,
-      );
-      final icon = _encodeSlot(
-        projection.icon,
-        path: 'styles/button/$id/icon.mix.json',
-        documents: styleDocuments,
-      );
-      recipes.add({
-        'id': id,
-        'properties': {'variant': variant.name, 'size': size.name},
-        'styles': {
-          'container': container,
-          'label': label,
-          'leadingIcon': Map<String, Object?>.of(icon),
-          'trailingIcon': Map<String, Object?>.of(icon),
-          'spinner': {
-            'status': 'unsupported',
-            'evidence': 'declared',
-            'diagnostics': [projection.spinnerDiagnostic.toJson()],
-          },
-        },
-      });
-    }
-  }
-
-  return FortalButtonComponentArtifacts(
-    document: {
-      'schema': 'mix_atlas/component/v1',
-      'id': 'button',
-      'label': 'Button',
-      'properties': [
-        {
-          'id': 'variant',
-          'kind': 'enum',
-          'values': [
-            for (final value in FortalButtonVariant.values) value.name,
-          ],
-          'default': FortalButtonVariant.solid.name,
-        },
-        {
-          'id': 'size',
-          'kind': 'enum',
-          'values': [for (final value in FortalButtonSize.values) value.name],
-          'default': FortalButtonSize.size2.name,
-        },
-        {'id': 'label', 'kind': 'string', 'default': 'Button'},
-        {'id': 'leadingIcon', 'kind': 'icon', 'required': false},
-        {'id': 'trailingIcon', 'kind': 'icon', 'required': false},
-        {'id': 'enabled', 'kind': 'boolean', 'default': true},
-        {'id': 'loading', 'kind': 'boolean', 'default': false},
-      ],
-      'states': [
-        {
-          'id': 'default',
-          'widgetStates': <Object?>[],
-          'properties': <String, Object?>{},
-        },
-        {
-          'id': 'hovered',
-          'widgetStates': ['hovered'],
-          'properties': <String, Object?>{},
-        },
-        {
-          'id': 'pressed',
-          'widgetStates': ['pressed'],
-          'properties': <String, Object?>{},
-        },
-        {
-          'id': 'focused',
-          'widgetStates': ['focused'],
-          'properties': <String, Object?>{},
-        },
-        {
-          'id': 'disabled',
-          'widgetStates': ['disabled'],
-          'properties': {'enabled': false},
-        },
-        {
-          'id': 'loading',
-          'widgetStates': ['disabled'],
-          'properties': {'enabled': false, 'loading': true},
-        },
-      ],
-      'slots': [
-        {'id': 'container', 'kind': 'flex_box'},
-        {'id': 'label', 'kind': 'text'},
-        {'id': 'leadingIcon', 'kind': 'icon'},
-        {'id': 'trailingIcon', 'kind': 'icon'},
-        {'id': 'spinner', 'kind': 'spinner'},
-      ],
-      'anatomy': {
-        'root': 'root',
-        'nodes': [
-          {
-            'id': 'root',
-            'kind': 'stack',
-            'alignment': 'center',
-            'children': ['content', 'spinner'],
-          },
-          {
-            'id': 'content',
-            'kind': 'slot',
-            'slot': 'container',
-            'children': ['leadingIcon', 'label', 'trailingIcon'],
-            'visibleWhen': {
-              'property': 'loading',
-              'operator': 'equals',
-              'value': false,
-            },
-            'maintain': ['size', 'state', 'animation'],
-          },
-          {
-            'id': 'leadingIcon',
-            'kind': 'slot',
-            'slot': 'leadingIcon',
-            'children': <Object?>[],
-            'visibleWhen': {'property': 'leadingIcon', 'operator': 'present'},
-          },
-          {
-            'id': 'label',
-            'kind': 'slot',
-            'slot': 'label',
-            'children': <Object?>[],
-          },
-          {
-            'id': 'trailingIcon',
-            'kind': 'slot',
-            'slot': 'trailingIcon',
-            'children': <Object?>[],
-            'visibleWhen': {'property': 'trailingIcon', 'operator': 'present'},
-          },
-          {
-            'id': 'spinner',
-            'kind': 'slot',
-            'slot': 'spinner',
-            'children': <Object?>[],
-            'visibleWhen': {
-              'property': 'loading',
-              'operator': 'equals',
-              'value': true,
-            },
-          },
-        ],
-      },
-      'recipes': recipes,
-      'semantics': {
-        'role': 'button',
-        'labelProperty': 'label',
-        'enabledProperty': 'enabled',
-        'loadingProperty': 'loading',
-      },
-      'oracles': [
-        {
-          'theme': 'light',
-          'image': 'light/button.png',
-          'metadata': 'light/button.json',
-          'evidence': 'rendered',
-        },
-        {
-          'theme': 'dark',
-          'image': 'dark/button.png',
-          'metadata': 'dark/button.json',
-          'evidence': 'rendered',
-        },
-      ],
-    },
-    styleDocuments: styleDocuments,
-  );
-}
-
-Map<String, Object?> _encodeSlot(
-  Object? style, {
-  required String path,
-  required Map<String, Map<String, Object?>> documents,
-}) {
-  if (style == null) {
-    return {
-      'status': 'unsupported',
-      'evidence': 'declared',
-      'diagnostics': [
-        {
-          'code': 'missing_component_slot_style',
-          'severity': 'error',
-          'path': path,
-          'message': 'The composite style did not declare this slot.',
-        },
-      ],
-    };
-  }
-  final encoded = mixProtocol.encodeStyle(style);
-
-  return switch (encoded) {
-    MixProtocolSuccess<Map<String, Object?>>(:final value) => () {
-      documents[path] = value;
-
-      return {'status': 'supported', 'evidence': 'declared', 'document': path};
-    }(),
-    MixProtocolFailure<Map<String, Object?>>(:final errors) => {
-      'status': 'unsupported',
-      'evidence': 'declared',
-      'diagnostics': [for (final error in errors) error.toJson()],
-    },
-  };
-}
diff --git a/packages/demo/test/atlas/support/fortal_button_protocol_adapter.dart b/packages/demo/test/atlas/support/fortal_button_protocol_adapter.dart
deleted file mode 100644
index ebf16b12..00000000
--- a/packages/demo/test/atlas/support/fortal_button_protocol_adapter.dart
+++ /dev/null
@@ -1,265 +0,0 @@
-import 'package:remix/remix.dart';
-
-final class ButtonProjectionDiagnostic {
-  const ButtonProjectionDiagnostic({
-    required this.code,
-    required this.severity,
-    required this.path,
-    required this.message,
-  });
-
-  final String code;
-  final String severity;
-  final String path;
-  final String message;
-
-  Map<String, Object?> toJson() => {
-    'code': code,
-    'severity': severity,
-    'path': path,
-    'message': message,
-  };
-}
-
-final class RemixButtonProtocolProjection {
-  RemixButtonProtocolProjection({
-    required this.container,
-    required this.label,
-    required this.icon,
-    required List<ButtonProjectionDiagnostic> diagnostics,
-  }) : diagnostics = List.unmodifiable(diagnostics);
-
-  final FlexBoxStyler? container;
-  final TextStyler? label;
-  final IconStyler? icon;
-  final List<ButtonProjectionDiagnostic> diagnostics;
-
-  bool get spinnerSupported => false;
-
-  ButtonProjectionDiagnostic get spinnerDiagnostic =>
-      const ButtonProjectionDiagnostic(
-        code: 'unsupported_slot_primitive',
-        severity: 'error',
-        path: 'spinner',
-        message: 'RemixSpinner has no neutral Mix protocol primitive.',
-      );
-}
-
-/// Projects a real Remix Button style into protocol-supported leaf stylers.
-///
-/// It reads the composite style's existing sources and variants, then combines
-/// leaf stylers through their generated `merge` implementations. It does not
-/// resolve a widget, inspect private fields, or restate the Fortal recipe.
-RemixButtonProtocolProjection projectButtonStyler(ButtonStyler style) {
-  final effectiveStyle = RemixButton.composeStyle(style);
-  final container = _projectContainer(effectiveStyle, depth: 0);
-  final label = _projectLabel(effectiveStyle, depth: 0);
-  final icon = _projectIcon(effectiveStyle, depth: 0);
-  final diagnostics = <ButtonProjectionDiagnostic>[
-    ...container.diagnostics,
-    ...label.diagnostics,
-    ...icon.diagnostics,
-  ];
-  if (effectiveStyle.$modifier != null) {
-    diagnostics.add(
-      const ButtonProjectionDiagnostic(
-        code: 'unsupported_component_modifier',
-        severity: 'error',
-        path: 'modifier',
-        message: 'Button-level widget modifiers cannot be projected to a slot.',
-      ),
-    );
-  }
-  if (effectiveStyle.$animation != null) {
-    diagnostics.add(
-      const ButtonProjectionDiagnostic(
-        code: 'unsupported_component_animation',
-        severity: 'error',
-        path: 'animation',
-        message: 'Button-level animation cannot be projected to a single slot.',
-      ),
-    );
-  }
-  if (effectiveStyle.$iconAlignment != null) {
-    diagnostics.add(
-      const ButtonProjectionDiagnostic(
-        code: 'unsupported_component_scalar',
-        severity: 'error',
-        path: 'iconAlignment',
-        message: 'Icon alignment requires an explicit anatomy property.',
-      ),
-    );
-  }
-
-  return RemixButtonProtocolProjection(
-    container: container.value,
-    label: label.value,
-    icon: icon.value,
-    diagnostics: diagnostics,
-  );
-}
-
-final class _Projection<T extends Object> {
-  const _Projection({required this.value, required this.diagnostics});
-
-  final T? value;
-  final List<ButtonProjectionDiagnostic> diagnostics;
-}
-
-_Projection<FlexBoxStyler> _projectContainer(
-  ButtonStyler style, {
-  required int depth,
-}) {
-  if (depth > 16) return _depthFailure('container');
-  final diagnostics = <ButtonProjectionDiagnostic>[];
-  FlexBoxStyler? result;
-  final property = style.$container;
-  if (property != null) {
-    if (property.$directives?.isNotEmpty ?? false) {
-      diagnostics.add(_unsupportedSource('container', 'directives'));
-    }
-    for (final source in property.sources) {
-      if (source is MixSource<StyleSpec<FlexBoxSpec>> &&
-          source.mix is FlexBoxStyler) {
-        final leaf = source.mix as FlexBoxStyler;
-        result = result == null ? leaf : result.merge(leaf);
-      } else {
-        diagnostics.add(
-          _unsupportedSource('container', source.runtimeType.toString()),
-        );
-      }
-    }
-  }
-  final variants = <VariantStyle<FlexBoxSpec>>[];
-  for (final variant
-      in style.$variants ?? const <VariantStyle<RemixButtonSpec>>[]) {
-    final nested = variant.value;
-    if (nested is! ButtonStyler) {
-      diagnostics.add(
-        _unsupportedSource('container', nested.runtimeType.toString()),
-      );
-      continue;
-    }
-    final projected = _projectContainer(nested, depth: depth + 1);
-    diagnostics.addAll(projected.diagnostics);
-    if (projected.value != null) {
-      variants.add(VariantStyle(variant.variant, projected.value!));
-    }
-  }
-  if (variants.isNotEmpty) {
-    result = (result ?? FlexBoxStyler()).variants(variants);
-  }
-
-  return _Projection(value: result, diagnostics: diagnostics);
-}
-
-_Projection<TextStyler> _projectLabel(
-  ButtonStyler style, {
-  required int depth,
-}) {
-  if (depth > 16) return _depthFailure('label');
-  final diagnostics = <ButtonProjectionDiagnostic>[];
-  TextStyler? result;
-  final property = style.$label;
-  if (property != null) {
-    if (property.$directives?.isNotEmpty ?? false) {
-      diagnostics.add(_unsupportedSource('label', 'directives'));
-    }
-    for (final source in property.sources) {
-      if (source is MixSource<StyleSpec<TextSpec>> &&
-          source.mix is TextStyler) {
-        final leaf = source.mix as TextStyler;
-        result = result == null ? leaf : result.merge(leaf);
-      } else {
-        diagnostics.add(
-          _unsupportedSource('label', source.runtimeType.toString()),
-        );
-      }
-    }
-  }
-  final variants = <VariantStyle<TextSpec>>[];
-  for (final variant
-      in style.$variants ?? const <VariantStyle<RemixButtonSpec>>[]) {
-    final nested = variant.value;
-    if (nested is! ButtonStyler) {
-      diagnostics.add(
-        _unsupportedSource('label', nested.runtimeType.toString()),
-      );
-      continue;
-    }
-    final projected = _projectLabel(nested, depth: depth + 1);
-    diagnostics.addAll(projected.diagnostics);
-    if (projected.value != null) {
-      variants.add(VariantStyle(variant.variant, projected.value!));
-    }
-  }
-  if (variants.isNotEmpty) {
-    result = (result ?? TextStyler()).variants(variants);
-  }
-
-  return _Projection(value: result, diagnostics: diagnostics);
-}
-
-_Projection<IconStyler> _projectIcon(ButtonStyler style, {required int depth}) {
-  if (depth > 16) return _depthFailure('icon');
-  final diagnostics = <ButtonProjectionDiagnostic>[];
-  IconStyler? result;
-  final property = style.$icon;
-  if (property != null) {
-    if (property.$directives?.isNotEmpty ?? false) {
-      diagnostics.add(_unsupportedSource('icon', 'directives'));
-    }
-    for (final source in property.sources) {
-      if (source is MixSource<StyleSpec<IconSpec>> &&
-          source.mix is IconStyler) {
-        final leaf = source.mix as IconStyler;
-        result = result == null ? leaf : result.merge(leaf);
-      } else {
-        diagnostics.add(
-          _unsupportedSource('icon', source.runtimeType.toString()),
-        );
-      }
-    }
-  }
-  final variants = <VariantStyle<IconSpec>>[];
-  for (final variant
-      in style.$variants ?? const <VariantStyle<RemixButtonSpec>>[]) {
-    final nested = variant.value;
-    if (nested is! ButtonStyler) {
-      diagnostics.add(
-        _unsupportedSource('icon', nested.runtimeType.toString()),
-      );
-      continue;
-    }
-    final projected = _projectIcon(nested, depth: depth + 1);
-    diagnostics.addAll(projected.diagnostics);
-    if (projected.value != null) {
-      variants.add(VariantStyle(variant.variant, projected.value!));
-    }
-  }
-  if (variants.isNotEmpty) {
-    result = (result ?? IconStyler()).variants(variants);
-  }
-
-  return _Projection(value: result, diagnostics: diagnostics);
-}
-
-_Projection<T> _depthFailure<T extends Object>(String path) => _Projection(
-  value: null,
-  diagnostics: [
-    ButtonProjectionDiagnostic(
-      code: 'component_projection_limit',
-      severity: 'error',
-      path: path,
-      message: 'Button variant nesting exceeds the projection limit.',
-    ),
-  ],
-);
-
-ButtonProjectionDiagnostic _unsupportedSource(String path, String source) =>
-    ButtonProjectionDiagnostic(
-      code: 'unsupported_component_source',
-      severity: 'error',
-      path: path,
-      message: 'Cannot project $source into a built-in $path styler.',
-    );
diff --git a/packages/demo/test/flutter_test_config.dart b/packages/demo/test/flutter_test_config.dart
deleted file mode 100644
index 83db0743..00000000
--- a/packages/demo/test/flutter_test_config.dart
+++ /dev/null
@@ -1,12 +0,0 @@
-import 'dart:async';
-
-import 'package:mix_atlas/golden.dart';
-
-Future<void> testExecutable(FutureOr<void> Function() testMain) async {
-  // macOS versions can rasterize a handful of edge pixels differently while
-  // preserving the rendered component. Structured capture hashes remain exact.
-  AtlasGoldens.precisionTolerance = 0.0001;
-  configureAtlasGoldenComparator();
-  await loadAtlasFonts();
-  await testMain();
-}
diff --git a/packages/demo/tool/package_fortal_atlas.dart b/packages/demo/tool/package_fortal_atlas.dart
deleted file mode 100644
index fd2c578a..00000000
--- a/packages/demo/tool/package_fortal_atlas.dart
+++ /dev/null
@@ -1,139 +0,0 @@
-import 'dart:convert';
-import 'dart:io';
-
-import 'package:mix_atlas_capture/producer.dart';
-
-void main(List<String> arguments) {
-  final unknown = arguments.where((argument) => argument != '--check').toList();
-  if (unknown.isNotEmpty) {
-    stderr.writeln('Unknown arguments: ${unknown.join(' ')}');
-    exitCode = 64;
-
-    return;
-  }
-
-  final checkOnly = arguments.contains('--check');
-  final packageRoot = Directory.current;
-  final workspaceRoot = packageRoot.parent.parent;
-  final sourceRoot = Directory('${packageRoot.path}/test/atlas/goldens');
-  final bundleRoot = Directory('${workspaceRoot.path}/atlas/fortal');
-  final input = AtlasCapturePackageInput(
-    sourceDirectory: sourceRoot,
-    outputDirectory: bundleRoot,
-    metadata: AtlasCapturePackageMetadata(
-      id: 'fortal',
-      atlasVersion: '0.1.0',
-      mixProtocolVersion: '1.0.0',
-      mixProtocolFormat: 1,
-      flutterVersion: _flutterVersion(workspaceRoot),
-      catalogPath: 'catalog.json',
-      themes: const [
-        AtlasCaptureThemeSpec(
-          id: 'light',
-          documentPath: 'themes/light.mix.json',
-        ),
-        AtlasCaptureThemeSpec(id: 'dark', documentPath: 'themes/dark.mix.json'),
-      ],
-      components: const [
-        AtlasCaptureComponentSpec(
-          id: 'button',
-          documentPath: 'components/button.component.json',
-        ),
-      ],
-      protocolCoveragePath: 'protocol/coverage.json',
-    ),
-    assets: [
-      const AtlasCaptureAsset(
-        sourcePath: 'catalog.json',
-        destinationPath: 'catalog.json',
-      ),
-      const AtlasCaptureAsset(
-        sourcePath: 'light/button.json',
-        destinationPath: 'light/button.json',
-      ),
-      const AtlasCaptureAsset(
-        sourcePath: 'light/button.png',
-        destinationPath: 'light/button.png',
-      ),
-      const AtlasCaptureAsset(
-        sourcePath: 'dark/button.json',
-        destinationPath: 'dark/button.json',
-      ),
-      const AtlasCaptureAsset(
-        sourcePath: 'dark/button.png',
-        destinationPath: 'dark/button.png',
-      ),
-      const AtlasCaptureAsset(
-        sourcePath: 'protocol/themes/light.mix.json',
-        destinationPath: 'themes/light.mix.json',
-      ),
-      const AtlasCaptureAsset(
-        sourcePath: 'protocol/themes/dark.mix.json',
-        destinationPath: 'themes/dark.mix.json',
-      ),
-      const AtlasCaptureAsset(
-        sourcePath: 'protocol/coverage.json',
-        destinationPath: 'protocol/coverage.json',
-      ),
-      const AtlasCaptureAsset(
-        sourcePath: 'protocol/fixtures/fortal-tokenized-flex-box.mix.json',
-        destinationPath: 'protocol/fixtures/fortal-tokenized-flex-box.mix.json',
-      ),
-      ..._directoryAssets(sourceRoot, 'components'),
-      ..._directoryAssets(sourceRoot, 'styles'),
-    ],
-    preservedPaths: const {'README.md'},
-  );
-  final result = checkOnly
-      ? AtlasCapturePackager.check(input)
-      : AtlasCapturePackager.build(input);
-
-  if (!result.isCurrent) {
-    stderr.writeln(
-      'Fortal Atlas bundle drift: ${result.driftPaths.join(', ')}',
-    );
-    stderr.writeln(
-      'Run `fvm dart run tool/package_fortal_atlas.dart` to regenerate it.',
-    );
-    exitCode = 1;
-
-    return;
-  }
-
-  stdout.writeln(
-    '${checkOnly ? 'Verified' : 'Packaged'} Fortal Atlas bundle: '
-    '${result.fileCount} files, ${result.totalBytes} bytes.',
-  );
-}
-
-List<AtlasCaptureAsset> _directoryAssets(
-  Directory sourceRoot,
-  String relativePath,
-) {
-  final directory = Directory('${sourceRoot.path}/$relativePath');
-  if (!directory.existsSync()) {
-    throw StateError('Missing generated Atlas directory: ${directory.path}');
-  }
-  final assets = <AtlasCaptureAsset>[
-    for (final entity in directory.listSync(recursive: true))
-      if (entity is File)
-        AtlasCaptureAsset(
-          sourcePath: entity.path.substring(sourceRoot.path.length + 1),
-          destinationPath: entity.path.substring(sourceRoot.path.length + 1),
-        ),
-  ];
-  assets.sort((left, right) => left.sourcePath.compareTo(right.sourcePath));
-
-  return assets;
-}
-
-String _flutterVersion(Directory workspaceRoot) {
-  final config = jsonDecode(
-    File('${workspaceRoot.path}/.fvmrc').readAsStringSync(),
-  );
-  if (config is! Map<String, Object?> || config['flutter'] is! String) {
-    throw const FormatException('.fvmrc must contain a Flutter version.');
-  }
-
-  return config['flutter']! as String;
-}
diff --git a/pubspec.lock b/pubspec.lock
index c6a7460d..9254b49b 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -441,24 +441,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.2.0-beta.0"
-  mix_atlas:
-    dependency: transitive
-    description:
-      path: "packages/mix_atlas"
-      ref: "07dafe904e56a9b60a172f4ef1863cf45564603a"
-      resolved-ref: "07dafe904e56a9b60a172f4ef1863cf45564603a"
-      url: "https://github.com/btwld/mix.git"
-    source: git
-    version: "0.1.0"
-  mix_atlas_capture:
-    dependency: transitive
-    description:
-      path: "packages/mix_atlas_capture"
-      ref: "07dafe904e56a9b60a172f4ef1863cf45564603a"
-      resolved-ref: "07dafe904e56a9b60a172f4ef1863cf45564603a"
-      url: "https://github.com/btwld/mix.git"
-    source: git
-    version: "0.1.0"
   mix_generator:
     dependency: transitive
     description:
diff --git a/pubspec.yaml b/pubspec.yaml
index 8082ea5c..714d5706 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -48,17 +48,3 @@ melos:
         - generate:check
         - test:flutter
       description: Verify generated sources, then run Flutter and Dart tests
-
-    atlas:fortal:
-      steps:
-        - melos exec --scope="demo" -- flutter test test/atlas/fortal_protocol_probe_test.dart --update-goldens
-        - melos exec --scope="demo" -- flutter test test/atlas/fortal_atlas_golden_test.dart --update-goldens
-        - melos exec --scope="demo" -- dart run tool/package_fortal_atlas.dart
-      description: Regenerate the committed Fortal Atlas capture
-
-    atlas:fortal:check:
-      steps:
-        - melos exec --scope="demo" -- flutter test test/atlas/fortal_protocol_probe_test.dart
-        - melos exec --scope="demo" -- flutter test test/atlas/fortal_atlas_golden_test.dart
-        - melos exec --scope="demo" -- dart run tool/package_fortal_atlas.dart --check
-      description: Verify the committed Fortal Atlas capture without rewriting it