diff --git a/dist/bootstrap5/border-spinner.css b/dist/bootstrap5/border-spinner.css
deleted file mode 100644
index fc59d04c3..000000000
--- a/dist/bootstrap5/border-spinner.css
+++ /dev/null
@@ -1 +0,0 @@
-/*! @tacc/core-styles 2.35.0+ | MIT | github.com/TACC/Core-Styles */.spinner-border{--bs-spinner-width:1em;--bs-spinner-height:1em;--bs-spinner-border-width:0.125em;box-sizing:border-box}
\ No newline at end of file
diff --git a/dist/bootstrap5/vendor/border-spinner.css b/dist/bootstrap5/vendor/border-spinner.css
deleted file mode 100644
index d5f0fa025..000000000
--- a/dist/bootstrap5/vendor/border-spinner.css
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
-Spinner (Bootstrap 5)
-
-Port only the Bootstrap 5 spinner styles used by known client [TACC/tup-ui: `LoadingSpinner`](https://github.com/TACC/tup-ui/blob/v1.1.10/libs/core-components/src/lib/LoadingSpinner/LoadingSpinner.global.css#L27-L42).
-
-- [Reactstrap: Components: Spinners](https://react-bootstrap.github.io/components/spinners/)
-- [Bootstrap 5: Components: Spinners](https://getbootstrap.com/docs/5.0/components/spinners/)
-
-Styleguide Component.Bootstrap5.Spinners
-*/
-/* https://github.com/twbs/bootstrap/blob/v5.3.3/scss/_spinners.scss */
-/* https://cdn.jsdelivr.net/npm/bootstrap@5/dist/css/bootstrap.css */
-.spinner-border {
-  display: inline-block;
-  width: var(--bs-spinner-width);
-  height: var(--bs-spinner-height);
-  vertical-align: var(--bs-spinner-vertical-align);
-  border-radius: 50%;
-  -webkit-animation: var(--bs-spinner-animation-speed) linear infinite
-    var(--bs-spinner-animation-name);
-  animation: var(--bs-spinner-animation-speed) linear infinite
-    var(--bs-spinner-animation-name);
-}
-@-webkit-keyframes spinner-border {
-  to {
-    transform: rotate(360deg);
-  }
-}
-@keyframes spinner-border {
-  to {
-    transform: rotate(360deg);
-  }
-}
-.spinner-border {
-  --bs-spinner-width: 2rem;
-  --bs-spinner-height: 2rem;
-  --bs-spinner-vertical-align: -0.125em;
-  --bs-spinner-border-width: 0.25em;
-  --bs-spinner-animation-speed: 0.75s;
-  --bs-spinner-animation-name: spinner-border;
-  border: var(--bs-spinner-border-width) solid currentcolor;
-  border-right-color: transparent;
-}
-@media (prefers-reduced-motion: reduce) {
-  .spinner-border {
-    --bs-spinner-animation-speed: 1.5s;
-  }
-}
diff --git a/dist/components/bootstrap/bootstrap--modal.demo copy.css b/dist/components/bootstrap/bootstrap--modal.demo copy.css
deleted file mode 100644
index a11f6f35c..000000000
--- a/dist/components/bootstrap/bootstrap--modal.demo copy.css	
+++ /dev/null
@@ -1 +0,0 @@
-/*! @tacc/core-styles 2.35.1+ | MIT | github.com/TACC/Core-Styles */#exampleModalStatic{bottom:auto;display:block;height:auto;left:auto;position:relative;right:auto;top:auto;z-index:1}
\ No newline at end of file
diff --git a/dist/components/c-card/c-card--images.css b/dist/components/c-card/c-card--images.css
deleted file mode 100644
index 91218fa40..000000000
--- a/dist/components/c-card/c-card--images.css
+++ /dev/null
@@ -1 +0,0 @@
-/*! @tacc/core-styles 2.18.0+ | MIT | github.com/TACC/Core-Styles */.o-section>.c-card:has(.o-grid){grid-column:1/-1}.o-grid--col-min-width{grid-auto-rows:400px}[class*=card--image-]{display:grid}.card--image-top{padding-top:0}.card--image-left{padding-bottom:var(--global-space--pattern-pad);padding-left:0}.card--image-right{padding-bottom:var(--global-space--pattern-pad);padding-right:0}.card--image-bottom{padding-bottom:0}.card--image-left,.card--image-right{--image-width:50%;grid-column-gap:var(--global-space--pattern-pad);grid-template-rows:repeat(10,min-content)}.card--image-left>img,.card--image-right>img{grid-row-end:-1;grid-row-start:1;margin-block:calc(var(--global-space--pattern-pad)*-1)}.card--image-left{grid-template-columns:var(--image-width) 1fr}.card--image-left>img{grid-column-end:span 1;grid-column-start:1}.card--image-right{grid-template-columns:1fr var(--image-width)}.card--image-right>img{grid-column-end:span 1;grid-column-start:2}.card--image-bottom,.card--image-top{--image-height:auto;--global-space--pattern-pad:15px;grid-template-columns:var(--global-space--pattern-pad) 1fr var(--global-space--pattern-pad);padding-inline:unset}.card--image-bottom>:not(img),.card--image-top>:not(img){grid-column-end:-2;grid-column-start:2}.card--image-bottom>img,.card--image-top>img{grid-column-end:-1;grid-column-start:1}.card--image-top{grid-template-rows:repeat(10,min-content) var(--image-height)}.card--image-top>img{grid-row-start:1;margin-bottom:var(--global-space--pattern-pad)}.card--image-bottom>:is(h1,h2,h3,h4,h5):first-of-type{margin-top:unset}.card--image-bottom{grid-template-rows:var(--image-height) repeat(10,min-content)}.card--image-bottom>img{grid-row-end:-1;margin-top:var(--global-space--pattern-pad)}.card--image-bottom>p:last-of-type{margin-bottom:unset}
\ No newline at end of file
diff --git a/dist/components/c-card/c-card--images.demo.css b/dist/components/c-card/c-card--images.demo.css
deleted file mode 100644
index 5c297c3b3..000000000
--- a/dist/components/c-card/c-card--images.demo.css
+++ /dev/null
@@ -1 +0,0 @@
-/*! @tacc/core-styles 2.18.0+ | MIT | github.com/TACC/Core-Styles */
\ No newline at end of file
diff --git a/dist/components/c-card/c-card--images/c-card--images.demo.css b/dist/components/c-card/c-card--images/c-card--images.demo.css
deleted file mode 100644
index 91218fa40..000000000
--- a/dist/components/c-card/c-card--images/c-card--images.demo.css
+++ /dev/null
@@ -1 +0,0 @@
-/*! @tacc/core-styles 2.18.0+ | MIT | github.com/TACC/Core-Styles */.o-section>.c-card:has(.o-grid){grid-column:1/-1}.o-grid--col-min-width{grid-auto-rows:400px}[class*=card--image-]{display:grid}.card--image-top{padding-top:0}.card--image-left{padding-bottom:var(--global-space--pattern-pad);padding-left:0}.card--image-right{padding-bottom:var(--global-space--pattern-pad);padding-right:0}.card--image-bottom{padding-bottom:0}.card--image-left,.card--image-right{--image-width:50%;grid-column-gap:var(--global-space--pattern-pad);grid-template-rows:repeat(10,min-content)}.card--image-left>img,.card--image-right>img{grid-row-end:-1;grid-row-start:1;margin-block:calc(var(--global-space--pattern-pad)*-1)}.card--image-left{grid-template-columns:var(--image-width) 1fr}.card--image-left>img{grid-column-end:span 1;grid-column-start:1}.card--image-right{grid-template-columns:1fr var(--image-width)}.card--image-right>img{grid-column-end:span 1;grid-column-start:2}.card--image-bottom,.card--image-top{--image-height:auto;--global-space--pattern-pad:15px;grid-template-columns:var(--global-space--pattern-pad) 1fr var(--global-space--pattern-pad);padding-inline:unset}.card--image-bottom>:not(img),.card--image-top>:not(img){grid-column-end:-2;grid-column-start:2}.card--image-bottom>img,.card--image-top>img{grid-column-end:-1;grid-column-start:1}.card--image-top{grid-template-rows:repeat(10,min-content) var(--image-height)}.card--image-top>img{grid-row-start:1;margin-bottom:var(--global-space--pattern-pad)}.card--image-bottom>:is(h1,h2,h3,h4,h5):first-of-type{margin-top:unset}.card--image-bottom{grid-template-rows:var(--image-height) repeat(10,min-content)}.card--image-bottom>img{grid-row-end:-1;margin-top:var(--global-space--pattern-pad)}.card--image-bottom>p:last-of-type{margin-bottom:unset}
\ No newline at end of file
diff --git a/dist/components/c-card/c-card-images.demo.css b/dist/components/c-card/c-card-images.demo.css
deleted file mode 100644
index 5c297c3b3..000000000
--- a/dist/components/c-card/c-card-images.demo.css
+++ /dev/null
@@ -1 +0,0 @@
-/*! @tacc/core-styles 2.18.0+ | MIT | github.com/TACC/Core-Styles */
\ No newline at end of file
diff --git a/dist/components/c-card/card-images/c-card--images.demo.css b/dist/components/c-card/card-images/c-card--images.demo.css
deleted file mode 100644
index 91218fa40..000000000
--- a/dist/components/c-card/card-images/c-card--images.demo.css
+++ /dev/null
@@ -1 +0,0 @@
-/*! @tacc/core-styles 2.18.0+ | MIT | github.com/TACC/Core-Styles */.o-section>.c-card:has(.o-grid){grid-column:1/-1}.o-grid--col-min-width{grid-auto-rows:400px}[class*=card--image-]{display:grid}.card--image-top{padding-top:0}.card--image-left{padding-bottom:var(--global-space--pattern-pad);padding-left:0}.card--image-right{padding-bottom:var(--global-space--pattern-pad);padding-right:0}.card--image-bottom{padding-bottom:0}.card--image-left,.card--image-right{--image-width:50%;grid-column-gap:var(--global-space--pattern-pad);grid-template-rows:repeat(10,min-content)}.card--image-left>img,.card--image-right>img{grid-row-end:-1;grid-row-start:1;margin-block:calc(var(--global-space--pattern-pad)*-1)}.card--image-left{grid-template-columns:var(--image-width) 1fr}.card--image-left>img{grid-column-end:span 1;grid-column-start:1}.card--image-right{grid-template-columns:1fr var(--image-width)}.card--image-right>img{grid-column-end:span 1;grid-column-start:2}.card--image-bottom,.card--image-top{--image-height:auto;--global-space--pattern-pad:15px;grid-template-columns:var(--global-space--pattern-pad) 1fr var(--global-space--pattern-pad);padding-inline:unset}.card--image-bottom>:not(img),.card--image-top>:not(img){grid-column-end:-2;grid-column-start:2}.card--image-bottom>img,.card--image-top>img{grid-column-end:-1;grid-column-start:1}.card--image-top{grid-template-rows:repeat(10,min-content) var(--image-height)}.card--image-top>img{grid-row-start:1;margin-bottom:var(--global-space--pattern-pad)}.card--image-bottom>:is(h1,h2,h3,h4,h5):first-of-type{margin-top:unset}.card--image-bottom{grid-template-rows:var(--image-height) repeat(10,min-content)}.card--image-bottom>img{grid-row-end:-1;margin-top:var(--global-space--pattern-pad)}.card--image-bottom>p:last-of-type{margin-bottom:unset}
\ No newline at end of file
diff --git a/dist/components/c-login.css b/dist/components/c-login.css
deleted file mode 100644
index 5d5fa0c21..000000000
--- a/dist/components/c-login.css
+++ /dev/null
@@ -1 +0,0 @@
-/*! @tacc/core-styles 2.14.0+ | MIT | github.com/TACC/Core-Styles */
\ No newline at end of file
diff --git a/dist/components/c-message.portal.css b/dist/components/c-message.portal.css
deleted file mode 100644
index 6b39b98b8..000000000
--- a/dist/components/c-message.portal.css
+++ /dev/null
@@ -1 +0,0 @@
-/*! @tacc/core-styles 2.0.1+ | MIT | github.com/TACC/Core-Styles */.c-message--scope-global,.c-message--scope-inline,.c-message--scope-section{font-size:var(--global-font-size--small)}
\ No newline at end of file
diff --git a/dist/components/c-tabs.css b/dist/components/c-tabs.css
deleted file mode 100644
index 313841408..000000000
--- a/dist/components/c-tabs.css
+++ /dev/null
@@ -1 +0,0 @@
-/*! @tacc/core-styles 2.2.0+ | MIT | github.com/TACC/Core-Styles */.c-tabs,.x-tabs{display:flex;flex-wrap:wrap;position:relative}.x-tabs--focus-within{outline:5px auto}.c-tabs>input,.x-tabs__toggle{opacity:0;position:absolute;visibility:hidden}.c-tabs>label,.x-tabs__label{cursor:pointer;white-space:nowrap}.c-tabs>div,.x-tabs__content{display:none;width:100%}.x-tabs__content--active{display:block;order:99}.x-tabs__content--force-active{display:contents}.c-tabs,.x-tabs{--buffer:20px}.c-tabs>label,.x-tabs__label{border-bottom:var(--global-border-width--x-thick) solid transparent;font-size:var(--global-font-size--medium);font-weight:var(--medium);margin-inline:var(--buffer);padding-block:1.25em .75em}.c-tabs>label:is(a),.x-tabs__label:is(a){text-decoration:none}.c-tabs>label:hover,.x-tabs__label--hover{border-color:var(--global-color-primary--dark)}.c-tabs>input:not(:checked)+label,.x-tabs__label--not-active{color:var(--global-color-primary--dark)}.c-tabs>input:checked+label,.x-tabs__label--active{border-color:var(--global-color-accent--normal);color:var(--global-color-accent--normal)}.c-tabs>div,.x-tabs__content{border-top:var(--global-border-width--normal) solid var(--global-color-primary--dark);padding-inline:var(--buffer)}@media screen{.c-tabs>input:checked+label+div{display:block;order:99}}@media print{.c-tabs>input:not(:checked)+label+div{display:contents}}@media screen{@supports selector(:has(*)){.c-tabs:has(input:focus-visible:where(.c-tabs>*)){outline:5px auto}}@supports not selector(:has(*)){.c-tabs:focus-within{outline:5px auto}}}
\ No newline at end of file
diff --git a/dist/components/s-form-page.css b/dist/components/s-form-page.css
deleted file mode 100644
index dce5a9273..000000000
--- a/dist/components/s-form-page.css
+++ /dev/null
@@ -1 +0,0 @@
-/*! @tacc/core-styles 2.15.0+ | MIT | github.com/TACC/Core-Styles */.c-form-page{padding-block:var(--global-space--section-gap)}.c-form-page__body,.c-form-page__footer{margin-inline:auto;max-width:630px;width:100%}.c-form-page__body{background-color:var(--global-color-background--app);border:var(--global-border--normal);border-color:var(--global-color-primary--dark);padding:50px}@media (max-width:630px){.c-form-page__body{border-inline:0}}.c-form-page__footer{display:flex;font-family:var(--global-font-family--sans--cms);font-size:var(--global-font-size--small);font-weight:var(--bold);gap:1.5em;margin-top:var(--global-space--normal)}@media (max-width:767px){.c-form-page__footer{justify-content:center}}@media (min-width:768px){.c-form-page__footer{justify-content:flex-end}}.c-form-page__footer a{color:var(--global-color-primary--x-dark);font-weight:var(--bold)}
\ No newline at end of file
diff --git a/dist/core-styles.header.theme-has-dark-logo.css b/dist/core-styles.header.theme-has-dark-logo.css
deleted file mode 100644
index b812eead3..000000000
--- a/dist/core-styles.header.theme-has-dark-logo.css
+++ /dev/null
@@ -1,2 +0,0 @@
-/*! @tacc/core-styles 2.7.0+ | MIT | github.com/TACC/Core-Styles */
-/*! core-styles.header.css */.s-header .dropdown-item{color:#212529}.s-header .dropdown-item:focus,.s-header .dropdown-item:hover{background-color:#f8f9fa;color:#16181b;text-decoration:none}.s-header .dropdown-item.active,.s-header .dropdown-item:active{background-color:#007bff;color:#fff;text-decoration:none}.s-header input{font-family:inherit}.s-header{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;border-bottom:1px solid var(--global-color-primary--normal);font-family:var(--global-font-family);font-size:16px;line-height:1.4}.s-header .navbar-brand{color:var(--global-color-primary--x-dark);margin-right:16px;min-width:176px;padding:0}@media only screen and (min-width:1201px){.s-header.navbar{height:50px}}.s-header.navbar{--nav-padding-vert:5px;--nav-padding-horz:36px;background-color:var(--global-color-primary--x-light);padding:var(--nav-padding-vert) var(--nav-padding-horz)}.s-header .nav-link{--line-height:24px;--border-width:4px;--border-offset:calc(var(--nav-padding-vert) - var(--border-width));--border-color:var(--global-color-secondary--light);line-height:var(--line-height);position:relative;top:var(--border-offset);white-space:nowrap}.s-header .nav-item.active .nav-link,.s-header .nav-link:active,.s-header .nav-link:focus,.s-header .nav-link:hover{border-color:var(--border-color);border-style:solid;border-width:0 0 var(--border-width);margin-bottom:calc(var(--border-width)*-1)}#s-header .nav-link,#s-header .nav-link>a{color:var(--global-color-primary--x-dark)}.s-header[class*=navbar-expand-] .navbar-nav .nav-link{padding:8px 14px}.s-header .s-search-bar~.s-portal-nav{border-left:1px solid var(--global-color-primary--normal);margin-left:12px}.dropdown-menu{font-size:16px}.s-header [class*=fa-]{text-align:center;width:27px}.navbar-toggler-icon{filter:invert(100%)}.s-portal-nav{text-transform:none}ul.s-portal-nav{margin-bottom:0;padding-left:0}.s-portal-nav a:hover{text-decoration:none}ul.s-cms-nav{margin-bottom:0;padding-left:0}.s-cms-nav a:hover{text-decoration:none}.branding-header{--branding-logo-height:24px;align-items:center;background-color:var(--global-color-primary--xx-dark);border-bottom:1px solid var(--global-color-primary--normal);color:var(--global-color-primary--xx-light);display:flex;height:49px;justify-content:center}.branding-seperator{border-left:1px solid var(--global-color-primary--xx-light);height:100%;margin:0 15px;max-height:var(--branding-logo-height);vertical-align:middle;width:1px}.branding-logo{border:none;height:30px;margin:0;padding:0}.branding-logo--short{height:var(--branding-logo-height)}.branding-logo--tall{height:35px}.branding-nsf{height:35px}.branding-tacc{height:var(--branding-logo-height)}.branding-utaustin{height:var(--branding-logo-height)}.portal-logo{border:none;float:left;height:40px;margin:0;padding:0}
\ No newline at end of file
diff --git a/dist/elements/c-card.selectors.css b/dist/elements/c-card.selectors.css
deleted file mode 100644
index 0ce636a8c..000000000
--- a/dist/elements/c-card.selectors.css
+++ /dev/null
@@ -1 +0,0 @@
-/*! @tacc/core-styles 1.0.0+ | MIT | github.com/TACC/Core-Styles */
\ No newline at end of file
diff --git a/dist/generics/attributes/attributes.css b/dist/generics/attributes/attributes.css
deleted file mode 100644
index 54f8d82f4..000000000
--- a/dist/generics/attributes/attributes.css
+++ /dev/null
@@ -1 +0,0 @@
-/*! @tacc/core-styles 2.18.0+ | MIT | github.com/TACC/Core-Styles */.c-tag{background-color:var(--global-color-primary--xxx-dark);color:var(--global-color-primary--xx-light)}
\ No newline at end of file
diff --git a/dist/objects/o-table-wrap--flexible-horz.css b/dist/objects/o-table-wrap--flexible-horz.css
deleted file mode 100644
index e1c852a3f..000000000
--- a/dist/objects/o-table-wrap--flexible-horz.css
+++ /dev/null
@@ -1 +0,0 @@
-/*! @tacc/core-styles 2.35.0+ | MIT | github.com/TACC/Core-Styles */.o-table-wrap--flexible-horz>table{table-layout:fixed;width:100%}
\ No newline at end of file
diff --git a/dist/objects/o-table-wrap--flexible-vert.css b/dist/objects/o-table-wrap--flexible-vert.css
deleted file mode 100644
index 03138bb50..000000000
--- a/dist/objects/o-table-wrap--flexible-vert.css
+++ /dev/null
@@ -1 +0,0 @@
-/*! @tacc/core-styles 2.35.0+ | MIT | github.com/TACC/Core-Styles */.o-table-wrap--flexible-vert>table{height:100%}
\ No newline at end of file
diff --git a/dist/objects/o-table-wrap--overflow-hidden.css b/dist/objects/o-table-wrap--overflow-hidden.css
deleted file mode 100644
index 0c575f750..000000000
--- a/dist/objects/o-table-wrap--overflow-hidden.css
+++ /dev/null
@@ -1 +0,0 @@
-/*! @tacc/core-styles 2.35.0+ | MIT | github.com/TACC/Core-Styles */.o-table-wrap--overflow-hidden{overflow:hidden}
\ No newline at end of file
diff --git a/dist/objects/o-table-wrap--overflow-scroll-extra.css b/dist/objects/o-table-wrap--overflow-scroll-extra.css
deleted file mode 100644
index 175a6bc8e..000000000
--- a/dist/objects/o-table-wrap--overflow-scroll-extra.css
+++ /dev/null
@@ -1 +0,0 @@
-/*! @tacc/core-styles 2.35.0+ | MIT | github.com/TACC/Core-Styles */
\ No newline at end of file
diff --git a/dist/objects/o-table-wrap--overflow-scroll.css b/dist/objects/o-table-wrap--overflow-scroll.css
deleted file mode 100644
index ee7df52ff..000000000
--- a/dist/objects/o-table-wrap--overflow-scroll.css
+++ /dev/null
@@ -1 +0,0 @@
-/*! @tacc/core-styles 2.35.0+ | MIT | github.com/TACC/Core-Styles */.o-table-wrap--overflow-scroll{overflow:auto}
\ No newline at end of file
diff --git a/dist/scripts/open-ext-links-in-new-window.js b/dist/scripts/open-ext-links-in-new-window.js
deleted file mode 100644
index 0db3b802b..000000000
--- a/dist/scripts/open-ext-links-in-new-window.js
+++ /dev/null
@@ -1,4 +0,0 @@
-/* To open external links in new window */
-Array.from(document.links)
-  .filter(link => link.hostname != window.location.hostname)
-  .forEach(link => link.target = '_blank');
diff --git a/dist/tokens/ds.json b/dist/tokens/ds.json
deleted file mode 100644
index a6558fb70..000000000
--- a/dist/tokens/ds.json
+++ /dev/null
@@ -1 +0,0 @@
-{"colors":{"neutral":{"light-2x":{"value":"#ffffff","type":"color"},"light-x":{"value":"#f4f4f4","type":"color"},"light":{"value":"#d7d7d7","type":"color"},"medium":{"value":"#afafaf","type":"color"},"dark":{"value":"#707070","type":"color"},"dark-x":{"value":"#484848","type":"color"},"dark-2x":{"value":"#222222","type":"color"}},"accent":{"1":{"light-2x":{"value":"#afd9ee","type":"color"},"light-x":{"value":"#84c9f2","type":"color"},"light":{"value":"#5aace4","type":"color"},"medium":{"value":"#337ab7","type":"color"},"dark":{"value":"#286090","type":"color"},"dark-x":{"value":"#204d74","type":"color"},"dark-2x":{"value":"#122b40","type":"color"}},"2":{"light-2x":{"value":"#cdf9f4","type":"color"},"light-x":{"value":"#a5e4dd","type":"color"},"light":{"value":"#84cec6","type":"color"},"medium":{"value":"#58a19b","type":"color"},"dark":{"value":"#37817b","type":"color"},"dark-x":{"value":"#2d4f4c","type":"color"},"dark-2x":{"value":"#ffffff","type":"color"}},"3":{"light-2x":{"value":"#ece4bf","type":"color"},"light-x":{"value":"#e7d897","type":"color"},"light":{"value":"#d4c16f","type":"color"},"medium":{"value":"#a89a5b","type":"color"},"dark":{"value":"#807649","type":"color"},"dark-x":{"value":"#554f32","type":"color"},"dark-2x":{"value":"#ffffff","type":"color"}},"4":{"light-2x":{"value":"#ffffff","type":"color"},"light-x":{"value":"#addba3","type":"color"},"light":{"value":"#74b566","type":"color"},"medium":{"value":"#449d44","type":"color"},"dark":{"value":"#398439","type":"color"},"dark-x":{"value":"#255625","type":"color"},"dark-2x":{"value":"#ffffff","type":"color"}}},"traffic":{"bad":{"light-x":{"value":"#ffffff","type":"color"},"light":{"value":"#ffffff","type":"color"},"medium":{"value":"#ffffff","type":"color"},"dark":{"value":"#ffffff","type":"color"},"dark-x":{"value":"#ffffff","type":"color"}},"warn":{"light-x":{"value":"{colors.accent.3.light-2x}","type":"color"},"light":{"value":"{colors.accent.3.light-x}","type":"color"},"medium":{"value":"{colors.accent.3.medium}","type":"color"},"dark":{"value":"{colors.accent.3.dark}","type":"color"},"dark-x":{"value":"{colors.accent.3.dark-x}","type":"color"}},"good":{"light-x":{"value":"{colors.accent.4.light-x}","type":"color"},"light":{"value":"{colors.accent.4.light}","type":"color"},"medium":{"value":"{colors.accent.4.medium}","type":"color"},"dark":{"value":"{colors.accent.4.dark}","type":"color"},"dark-x":{"value":"{colors.accent.4.dark-x}","type":"color"}},"other":{"light-x":{"value":"#ffffff","type":"color"},"light":{"value":"#ffffff","type":"color"},"medium":{"value":"#ffffff","type":"color"},"dark":{"value":"#ffffff","type":"color"},"dark-x":{"value":"#ffffff","type":"color"}}}},"spacing":{"1":{"value":8,"type":"number"},"2":{"value":16,"type":"number"},"3":{"value":24,"type":"number"},"4":{"value":32,"type":"number"},"5":{"value":40,"type":"number"},"6":{"value":48,"type":"number"},"7":{"value":56,"type":"number"},"8":{"value":64,"type":"number"},"9":{"value":72,"type":"number"},"10":{"value":80,"type":"number"},"11":{"value":88,"type":"number"},"12":{"value":96,"type":"number"},"13":{"value":104,"type":"number"},"fourth":{"value":2,"type":"number"},"half":{"value":4,"type":"number"}},"font-weight":{"100":{"value":100,"type":"number"},"200":{"value":200,"type":"number"},"300":{"value":300,"type":"number"},"400":{"value":400,"type":"number"},"500":{"value":500,"type":"number"},"600":{"value":600,"type":"number"},"700":{"value":700,"type":"number"},"800":{"value":800,"type":"number"},"900":{"value":900,"type":"number"}},"color":{"gray":{"light-2x":{"value":"{colors.neutral.light-2x}","type":"color"},"light-x":{"value":"{colors.neutral.light-x}","type":"color"},"light":{"value":"{colors.neutral.light}","type":"color"},"medium":{"value":"{colors.neutral.medium}","type":"color"},"dark":{"value":"{colors.neutral.dark}","type":"color"},"dark-x":{"value":"{colors.neutral.dark-x}","type":"color"},"dark-2x":{"value":"{colors.neutral.dark-2x}","type":"color"}},"info":{"light-x":{"value":"{colors.neutral.light-x}","type":"color"},"light":{"value":"{colors.neutral.light}","type":"color"},"medium":{"value":"{colors.neutral.dark}","type":"color"},"dark":{"value":"{colors.neutral.dark-x}","type":"color"},"dark-x":{"value":"{colors.neutral.dark-2x}","type":"color"}},"danger":{"light-x":{"value":"{colors.traffic.bad.light-x}","type":"color"},"light":{"value":"{colors.traffic.bad.light}","type":"color"},"medium":{"value":"{colors.traffic.bad.medium}","type":"color"},"dark":{"value":"{colors.traffic.bad.dark}","type":"color"},"dark-x":{"value":"{colors.traffic.bad.dark-x}","type":"color"}},"warning":{"light-x":{"value":"{colors.traffic.warn.light-x}","type":"color"},"light":{"value":"{colors.traffic.warn.light}","type":"color"},"medium":{"value":"{colors.traffic.warn.medium}","type":"color"},"dark":{"value":"{colors.traffic.warn.dark}","type":"color"},"dark-x":{"value":"{colors.traffic.warn.dark-x}","type":"color"}},"success":{"light-x":{"value":"{colors.traffic.good.light-x}","type":"color"},"light":{"value":"{colors.traffic.good.light}","type":"color"},"medium":{"value":"{colors.traffic.good.medium}","type":"color"},"dark":{"value":"{colors.traffic.good.dark}","type":"color"},"dark-x":{"value":"{colors.traffic.good.dark-x}","type":"color"}},"extra":{"light-x":{"value":"{colors.traffic.other.light-x}","type":"color"},"light":{"value":"{colors.traffic.other.light}","type":"color"},"medium":{"value":"{colors.traffic.other.medium}","type":"color"},"dark":{"value":"{colors.traffic.other.dark}","type":"color"},"dark-x":{"value":"{colors.traffic.other.dark-x}","type":"color"}},"ds":{"blue":{"light-2x":{"value":"{colors.accent.1.light-2x}","type":"color"},"light-x":{"value":"{colors.accent.1.light-x}","type":"color"},"light":{"value":"{colors.accent.1.light}","type":"color"},"medium":{"value":"{colors.accent.1.medium}","type":"color"},"dark":{"value":"{colors.accent.1.dark}","type":"color"},"dark-x":{"value":"{colors.accent.1.dark-x}","type":"color"},"dark-2x":{"value":"{colors.accent.1.dark-2x}","type":"color"}},"teal":{"light-2x":{"value":"{colors.accent.2.light-2x}","type":"color"},"light-x":{"value":"{colors.accent.2.light-x}","type":"color"},"light":{"value":"{colors.accent.2.light}","type":"color"},"medium":{"value":"{colors.accent.2.medium}","type":"color"},"dark":{"value":"{colors.accent.2.dark}","type":"color"},"dark-x":{"value":"{colors.accent.2.dark-x}","type":"color"},"dark-2x":{"value":"{colors.accent.2.dark-2x}","type":"color"}},"yellow":{"light-2x":{"value":"{colors.accent.3.light-2x}","type":"color"},"light-x":{"value":"{colors.accent.3.light-x}","type":"color"},"light":{"value":"{colors.accent.3.light}","type":"color"},"medium":{"value":"{colors.accent.3.medium}","type":"color"},"dark":{"value":"{colors.accent.3.dark}","type":"color"},"dark-x":{"value":"{colors.accent.3.dark-x}","type":"color"},"dark-2x":{"value":"{colors.accent.3.dark-2x}","type":"color"}}}},"space":{"small-2x":{"value":"{spacing.fourth}","type":"number"},"small-x":{"value":"{spacing.half}","type":"number"},"small":{"value":"{spacing.1}","type":"number"},"medium":{"value":"{spacing.2}","type":"number"},"large":{"value":"{spacing.3}","type":"number"},"large-x":{"value":"{spacing.4}","type":"number"},"large-2x":{"value":"{spacing.5}","type":"number"}},"weight":{"light":{"value":"{font-weight.300}","type":"number"},"bold":{"value":"{font-weight.700}","type":"number"},"medium":{"value":"{font-weight.500}","type":"number"},"regular":{"value":"{font-weight.400}","type":"number"},"semibold":{"value":"{font-weight.600}","type":"number"},"thin":{"value":"{font-weight.100}","type":"number"},"extralight":{"value":"{font-weight.200}","type":"number"},"extrabold":{"value":"{font-weight.800}","type":"number"},"black":{"value":"{font-weight.900}","type":"number"},"light-x":{"value":"{weight.extralight}","type":"number"},"bold-x":{"value":"{weight.extrabold}","type":"number"}}}
\ No newline at end of file
diff --git a/dist/tokens/v1.json b/dist/tokens/v1.json
deleted file mode 100644
index f4592fd2d..000000000
--- a/dist/tokens/v1.json
+++ /dev/null
@@ -1 +0,0 @@
-{"colors":{"neutral":{"light-2x":{"value":"#ffffff","type":"color"},"light-x":{"value":"#f4f4f4","type":"color"},"light":{"value":"#d7d7d7","type":"color"},"medium":{"value":"#afafaf","type":"color"},"dark":{"value":"#707070","type":"color"},"dark-x":{"value":"#484848","type":"color"},"dark-2x":{"value":"#222222","type":"color"}},"accent":{"1":{"light-2x":{"value":"#e3d7fd","type":"color"},"light-x":{"value":"#d5bfff","type":"color"},"light":{"value":"#a387ed","type":"color"},"medium":{"value":"#784fe8","type":"color"},"dark":{"value":"#6039cc","type":"color"},"dark-x":{"value":"#3d189b","type":"color"},"dark-2x":{"value":"#281066","type":"color"}},"2":{"light-2x":{"value":"#ffffff","type":"color"},"light-x":{"value":"#ffffff","type":"color"},"light":{"value":"#ffffff","type":"color"},"medium":{"value":"#ffffff","type":"color"},"dark":{"value":"#ffffff","type":"color"},"dark-x":{"value":"#ffffff","type":"color"},"dark-2x":{"value":"#ffffff","type":"color"}},"3":{"light-2x":{"value":"#ffffff","type":"color"},"light-x":{"value":"#ffffff","type":"color"},"light":{"value":"#ffffff","type":"color"},"medium":{"value":"#ffffff","type":"color"},"dark":{"value":"#ffffff","type":"color"},"dark-x":{"value":"#ffffff","type":"color"},"dark-2x":{"value":"#ffffff","type":"color"}},"4":{"light-2x":{"value":"#ffffff","type":"color"},"light-x":{"value":"#ffffff","type":"color"},"light":{"value":"#ffffff","type":"color"},"medium":{"value":"#ffffff","type":"color"},"dark":{"value":"#ffffff","type":"color"},"dark-x":{"value":"#ffffff","type":"color"},"dark-2x":{"value":"#ffffff","type":"color"}}},"traffic":{"bad":{"light-x":{"value":"#fdf1f1","type":"color"},"light":{"value":"#f8c9c9","type":"color"},"medium":{"value":"#f09393","type":"color"},"dark":{"value":"#af1818","type":"color"},"dark-x":{"value":"#3c3030","type":"color"}},"warn":{"light-x":{"value":"#fdfdea","type":"color"},"light":{"value":"#f2f06f","type":"color"},"medium":{"value":"#e9e000","type":"color"},"dark":{"value":"#735911","type":"color"},"dark-x":{"value":"#3a3320","type":"color"}},"good":{"light-x":{"value":"#e7f9e5","type":"color"},"light":{"value":"#afeca7","type":"color"},"medium":{"value":"#43d130","type":"color"},"dark":{"value":"#237119","type":"color"},"dark-x":{"value":"#263824","type":"color"}},"other":{"light-x":{"value":"#f0f6ff","type":"color"},"light":{"value":"#b4d0f9","type":"color"},"medium":{"value":"#3f85f4","type":"color"},"dark":{"value":"#255bb1","type":"color"},"dark-x":{"value":"#174a99","type":"color"}}}},"spacing":{"1":{"value":8,"type":"number"},"2":{"value":16,"type":"number"},"3":{"value":24,"type":"number"},"4":{"value":32,"type":"number"},"5":{"value":40,"type":"number"},"6":{"value":48,"type":"number"},"7":{"value":56,"type":"number"},"8":{"value":64,"type":"number"},"9":{"value":72,"type":"number"},"10":{"value":80,"type":"number"},"11":{"value":88,"type":"number"},"12":{"value":96,"type":"number"},"13":{"value":104,"type":"number"},"fourth":{"value":2,"type":"number"},"half":{"value":4,"type":"number"}},"font-weight":{"100":{"value":100,"type":"number"},"200":{"value":200,"type":"number"},"300":{"value":300,"type":"number"},"400":{"value":400,"type":"number"},"500":{"value":500,"type":"number"},"600":{"value":600,"type":"number"},"700":{"value":700,"type":"number"},"800":{"value":800,"type":"number"},"900":{"value":900,"type":"number"}},"color":{"gray":{"light-2x":{"value":"{colors.neutral.light-2x}","type":"color"},"light-x":{"value":"{colors.neutral.light-x}","type":"color"},"light":{"value":"{colors.neutral.light}","type":"color"},"medium":{"value":"{colors.neutral.medium}","type":"color"},"dark":{"value":"{colors.neutral.dark}","type":"color"},"dark-x":{"value":"{colors.neutral.dark-x}","type":"color"},"dark-2x":{"value":"{colors.neutral.dark-2x}","type":"color"}},"v1":{"purple":{"light-2x":{"value":"{colors.accent.1.light-2x}","type":"color"},"light-x":{"value":"{colors.accent.1.light-x}","type":"color"},"light":{"value":"{colors.accent.1.light}","type":"color"},"medium":{"value":"{colors.accent.1.medium}","type":"color"},"dark":{"value":"{colors.accent.1.dark}","type":"color"},"dark-x":{"value":"{colors.accent.1.dark-x}","type":"color"},"dark-2x":{"value":"{colors.accent.1.dark-2x}","type":"color"}}},"info":{"light-x":{"value":"{colors.neutral.light-x}","type":"color"},"light":{"value":"{colors.neutral.light}","type":"color"},"medium":{"value":"{colors.neutral.dark}","type":"color"},"dark":{"value":"{colors.neutral.dark-x}","type":"color"},"dark-x":{"value":"{colors.neutral.dark-2x}","type":"color"}},"danger":{"light-x":{"value":"{colors.traffic.bad.light-x}","type":"color"},"light":{"value":"{colors.traffic.bad.light}","type":"color"},"medium":{"value":"{colors.traffic.bad.medium}","type":"color"},"dark":{"value":"{colors.traffic.bad.dark}","type":"color"},"dark-x":{"value":"{colors.traffic.bad.dark-x}","type":"color"}},"warning":{"light-x":{"value":"{colors.traffic.warn.light-x}","type":"color"},"light":{"value":"{colors.traffic.warn.light}","type":"color"},"medium":{"value":"{colors.traffic.warn.medium}","type":"color"},"dark":{"value":"{colors.traffic.warn.dark}","type":"color"},"dark-x":{"value":"{colors.traffic.warn.dark-x}","type":"color"}},"success":{"light-x":{"value":"{colors.traffic.good.light-x}","type":"color"},"light":{"value":"{colors.traffic.good.light}","type":"color"},"medium":{"value":"{colors.traffic.good.medium}","type":"color"},"dark":{"value":"{colors.traffic.good.dark}","type":"color"},"dark-x":{"value":"{colors.traffic.good.dark-x}","type":"color"}},"extra":{"light-x":{"value":"{colors.traffic.other.light-x}","type":"color"},"light":{"value":"{colors.traffic.other.light}","type":"color"},"medium":{"value":"{colors.traffic.other.medium}","type":"color"},"dark":{"value":"{colors.traffic.other.dark}","type":"color"},"dark-x":{"value":"{colors.traffic.other.dark-x}","type":"color"}}},"space":{"small-2x":{"value":"{spacing.fourth}","type":"number"},"small-x":{"value":"{spacing.half}","type":"number"},"small":{"value":"{spacing.1}","type":"number"},"medium":{"value":"{spacing.2}","type":"number"},"large":{"value":"{spacing.3}","type":"number"},"large-x":{"value":"{spacing.4}","type":"number"},"large-2x":{"value":"{spacing.5}","type":"number"}},"weight":{"light":{"value":"{font-weight.300}","type":"number"},"bold":{"value":"{font-weight.700}","type":"number"},"medium":{"value":"{font-weight.500}","type":"number"},"regular":{"value":"{font-weight.400}","type":"number"},"semibold":{"value":"{font-weight.600}","type":"number"},"thin":{"value":"{font-weight.100}","type":"number"},"extralight":{"value":"{font-weight.200}","type":"number"},"extrabold":{"value":"{font-weight.800}","type":"number"},"black":{"value":"{font-weight.900}","type":"number"},"light-x":{"value":"{weight.extralight}","type":"number"},"bold-x":{"value":"{weight.extrabold}","type":"number"}}}
\ No newline at end of file
diff --git a/dist/tokens/v2.json b/dist/tokens/v2.json
deleted file mode 100644
index 117a7d92f..000000000
--- a/dist/tokens/v2.json
+++ /dev/null
@@ -1 +0,0 @@
-{"colors":{"neutral":{"light-2x":{"value":"#ffffff","type":"color"},"light-x":{"value":"#f4f4f4","type":"color"},"light":{"value":"#d7d7d7","type":"color"},"medium":{"value":"#afafaf","type":"color"},"dark":{"value":"#707070","type":"color"},"dark-x":{"value":"#484848","type":"color"},"dark-2x":{"value":"#222222","type":"color"}},"accent":{"1":{"light-2x":{"value":"#caddfe","type":"color"},"light-x":{"value":"#aac7ff","type":"color"},"light":{"value":"#3d6acc","type":"color"},"medium":{"value":"#003399","type":"color"},"dark":{"value":"#002266","type":"color"},"dark-x":{"value":"#001133","type":"color"},"dark-2x":{"value":"#021230","type":"color"}},"2":{"light-2x":{"value":"#fcf6ec","type":"color"},"light-x":{"value":"#e5d7c0","type":"color"},"light":{"value":"#d5b57c","type":"color"},"medium":{"value":"#877453","type":"color"},"dark":{"value":"#514328","type":"color"},"dark-x":{"value":"#332c1f","type":"color"},"dark-2x":{"value":"#ffffff","type":"color"}},"3":{"light-2x":{"value":"#e7f1f0","type":"color"},"light-x":{"value":"#b1d1ce","type":"color"},"light":{"value":"#92ccc5","type":"color"},"medium":{"value":"#61a39c","type":"color"},"dark":{"value":"#406d68","type":"color"},"dark-x":{"value":"#1e3331","type":"color"},"dark-2x":{"value":"#ffffff","type":"color"}},"4":{"light-2x":{"value":"#ffffff","type":"color"},"light-x":{"value":"#ffffff","type":"color"},"light":{"value":"#ffffff","type":"color"},"medium":{"value":"#ffffff","type":"color"},"dark":{"value":"#ffffff","type":"color"},"dark-x":{"value":"#ffffff","type":"color"},"dark-2x":{"value":"#ffffff","type":"color"}}},"traffic":{"bad":{"light-x":{"value":"#fce4db","type":"color"},"light":{"value":"#fcaf91","type":"color"},"medium":{"value":"#ed4c11","type":"color"},"dark":{"value":"#c23a03","type":"color"},"dark-x":{"value":"#932b06","type":"color"}},"warn":{"light-x":{"value":"#fdf0d3","type":"color"},"light":{"value":"#fed880","type":"color"},"medium":{"value":"#f2b327","type":"color"},"dark":{"value":"#cd971c","type":"color"},"dark-x":{"value":"#996f0a","type":"color"}},"good":{"light-x":{"value":"#baf8dc","type":"color"},"light":{"value":"#93f6cd","type":"color"},"medium":{"value":"#10f7a9","type":"color"},"dark":{"value":"#3dce92","type":"color"},"dark-x":{"value":"#26885f","type":"color"}},"other":{"light-x":{"value":"#f0f6ff","type":"color"},"light":{"value":"#b4d0f9","type":"color"},"medium":{"value":"#3f85f4","type":"color"},"dark":{"value":"#255bb1","type":"color"},"dark-x":{"value":"#174a99","type":"color"}}}},"spacing":{"1":{"value":8,"type":"number"},"2":{"value":16,"type":"number"},"3":{"value":24,"type":"number"},"4":{"value":32,"type":"number"},"5":{"value":40,"type":"number"},"6":{"value":48,"type":"number"},"7":{"value":56,"type":"number"},"8":{"value":64,"type":"number"},"9":{"value":72,"type":"number"},"10":{"value":80,"type":"number"},"11":{"value":88,"type":"number"},"12":{"value":96,"type":"number"},"13":{"value":104,"type":"number"},"fourth":{"value":2,"type":"number"},"half":{"value":4,"type":"number"}},"font-weight":{"100":{"value":100,"type":"number"},"200":{"value":200,"type":"number"},"300":{"value":300,"type":"number"},"400":{"value":400,"type":"number"},"500":{"value":500,"type":"number"},"600":{"value":600,"type":"number"},"700":{"value":700,"type":"number"},"800":{"value":800,"type":"number"},"900":{"value":900,"type":"number"}},"color":{"gray":{"light-2x":{"value":"{colors.neutral.light-2x}","type":"color"},"light-x":{"value":"{colors.neutral.light-x}","type":"color"},"light":{"value":"{colors.neutral.light}","type":"color"},"medium":{"value":"{colors.neutral.medium}","type":"color"},"dark":{"value":"{colors.neutral.dark}","type":"color"},"dark-x":{"value":"{colors.neutral.dark-x}","type":"color"},"dark-2x":{"value":"{colors.neutral.dark-2x}","type":"color"}},"v2":{"blue":{"light-x":{"value":"{colors.accent.1.light-x}","type":"color"},"light-old":{"value":"#86aeff","type":"color"},"light":{"value":"{colors.accent.1.light}","type":"color"},"medium":{"value":"{colors.accent.1.medium}","type":"color"},"dark":{"value":"{colors.accent.1.dark}","type":"color"},"dark-x":{"value":"{colors.accent.1.dark-x}","type":"color"},"light-2x":{"value":"{colors.accent.1.light-2x}","type":"color"},"dark-2x":{"value":"{colors.accent.1.dark-2x}","type":"color"}},"gold":{"light-2x":{"value":"{colors.accent.2.light-2x}","type":"color"},"light-x":{"value":"{colors.accent.2.light-x}","type":"color"},"light":{"value":"{colors.accent.2.light}","type":"color"},"medium":{"value":"{colors.accent.2.medium}","type":"color"},"dark":{"value":"{colors.accent.2.dark}","type":"color"},"dark-x":{"value":"{colors.accent.2.dark-x}","type":"color"},"dark-2x":{"value":"{colors.accent.2.dark-2x}","type":"color"}},"teal":{"light-2x":{"value":"{colors.accent.3.light-2x}","type":"color"},"light-x":{"value":"{colors.accent.3.light-x}","type":"color"},"light":{"value":"{colors.accent.3.light}","type":"color"},"medium":{"value":"{colors.accent.3.medium}","type":"color"},"dark":{"value":"{colors.accent.3.dark}","type":"color"},"dark-x":{"value":"{colors.accent.3.dark-x}","type":"color"},"dark-2x":{"value":"{colors.accent.3.dark-2x}","type":"color"}}},"info":{"light-x":{"value":"{colors.neutral.light-x}","type":"color"},"light":{"value":"{colors.neutral.light}","type":"color"},"medium":{"value":"{colors.neutral.dark}","type":"color"},"dark":{"value":"{colors.neutral.dark-x}","type":"color"},"dark-x":{"value":"{colors.neutral.dark-2x}","type":"color"}},"danger":{"light-x":{"value":"{colors.traffic.bad.light-x}","type":"color"},"light":{"value":"{colors.traffic.bad.light}","type":"color"},"medium":{"value":"{colors.traffic.bad.medium}","type":"color"},"dark":{"value":"{colors.traffic.bad.dark}","type":"color"},"dark-x":{"value":"{colors.traffic.bad.dark-x}","type":"color"}},"warning":{"light-x":{"value":"{colors.traffic.warn.light-x}","type":"color"},"light":{"value":"{colors.traffic.warn.light}","type":"color"},"medium":{"value":"{colors.traffic.warn.medium}","type":"color"},"dark":{"value":"{colors.traffic.warn.dark}","type":"color"},"dark-x":{"value":"{colors.traffic.warn.dark-x}","type":"color"}},"success":{"light-x":{"value":"{colors.traffic.good.light-x}","type":"color"},"light":{"value":"{colors.traffic.good.light}","type":"color"},"medium":{"value":"{colors.traffic.good.medium}","type":"color"},"dark":{"value":"{colors.traffic.good.dark}","type":"color"},"dark-x":{"value":"{colors.traffic.good.dark-x}","type":"color"}},"extra":{"light-x":{"value":"{colors.traffic.other.light-x}","type":"color"},"light":{"value":"{colors.traffic.other.light}","type":"color"},"medium":{"value":"{colors.traffic.other.medium}","type":"color"},"dark":{"value":"{colors.traffic.other.dark}","type":"color"},"dark-x":{"value":"{colors.traffic.other.dark-x}","type":"color"}}},"space":{"small-2x":{"value":"{spacing.fourth}","type":"number"},"small-x":{"value":"{spacing.half}","type":"number"},"small":{"value":"{spacing.1}","type":"number"},"medium":{"value":"{spacing.2}","type":"number"},"large":{"value":"{spacing.3}","type":"number"},"large-x":{"value":"{spacing.4}","type":"number"},"large-2x":{"value":"{spacing.5}","type":"number"}},"weight":{"light":{"value":"{font-weight.300}","type":"number"},"bold":{"value":"{font-weight.700}","type":"number"},"medium":{"value":"{font-weight.500}","type":"number"},"regular":{"value":"{font-weight.400}","type":"number"},"semibold":{"value":"{font-weight.600}","type":"number"},"thin":{"value":"{font-weight.100}","type":"number"},"extralight":{"value":"{font-weight.200}","type":"number"},"extrabold":{"value":"{font-weight.800}","type":"number"},"black":{"value":"{font-weight.900}","type":"number"},"light-x":{"value":"{weight.extralight}","type":"number"},"bold-x":{"value":"{weight.extrabold}","type":"number"}}}
\ No newline at end of file
diff --git a/dist/tokens/v3.json b/dist/tokens/v3.json
deleted file mode 100644
index 2c2410bfe..000000000
--- a/dist/tokens/v3.json
+++ /dev/null
@@ -1 +0,0 @@
-{"colors":{"neutral":{"light-2x":{"value":"#fcfdf3","type":"color"},"light-x":{"value":"#e2e1d8","type":"color"},"light":{"value":"#cdcac3","type":"color"},"medium":{"value":"#a29e98","type":"color"},"dark":{"value":"#7e7974","type":"color"},"dark-x":{"value":"#4b4744","type":"color"},"dark-2x":{"value":"#2f2b2a","type":"color"}},"accent":{"1":{"light-2x":{"value":"#f9fcff","type":"color"},"light-x":{"value":"#e5f4ff","type":"color"},"light":{"value":"#c3e6ff","type":"color"},"medium":{"value":"#a3d1f1","type":"color"},"dark":{"value":"#53809d","type":"color"},"dark-x":{"value":"#204c68","type":"color"},"dark-2x":{"value":"#003049","type":"color"}},"2":{"light-2x":{"value":"#fffbf9","type":"color"},"light-x":{"value":"#ffeee5","type":"color"},"light":{"value":"#fed8c4","type":"color"},"medium":{"value":"#ffb892","type":"color"},"dark":{"value":"#bf5700","type":"color"},"dark-x":{"value":"#683a20","type":"color"},"dark-2x":{"value":"#491e02","type":"color"}},"3":{"light-2x":{"value":"#fefbf6","type":"color"},"light-x":{"value":"#fff0d7","type":"color"},"light":{"value":"#fedba0","type":"color"},"medium":{"value":"#fcbf49","type":"color"},"dark":{"value":"#9d710d","type":"color"},"dark-x":{"value":"#58441f","type":"color"},"dark-2x":{"value":"#3c2801","type":"color"}},"4":{"light-2x":{"value":"#fefcf1","type":"color"},"light-x":{"value":"#fbf3c8","type":"color"},"light":{"value":"#eae2b7","type":"color"},"medium":{"value":"#d4cca1","type":"color"},"dark":{"value":"#827a53","type":"color"},"dark-x":{"value":"#4f4822","type":"color"},"dark-2x":{"value":"#332c04","type":"color"}}},"traffic":{"bad":{"light-x":{"value":"{colors.accent.2.light-x}","type":"color"},"light":{"value":"{colors.accent.2.light}","type":"color"},"medium":{"value":"{colors.accent.2.medium}","type":"color"},"dark":{"value":"{colors.accent.2.dark}","type":"color"},"dark-x":{"value":"{colors.accent.2.dark-x}","type":"color"}},"warn":{"light-x":{"value":"{colors.accent.3.light-x}","type":"color"},"light":{"value":"{colors.accent.3.light}","type":"color"},"medium":{"value":"{colors.accent.3.medium}","type":"color"},"dark":{"value":"{colors.accent.3.dark}","type":"color"},"dark-x":{"value":"{colors.accent.3.dark-x}","type":"color"}},"good":{"light-x":{"value":"{colors.accent.1.light-x}","type":"color"},"light":{"value":"{colors.accent.1.light}","type":"color"},"medium":{"value":"{colors.accent.1.medium}","type":"color"},"dark":{"value":"{colors.accent.1.dark}","type":"color"},"dark-x":{"value":"{colors.accent.1.dark-x}","type":"color"}},"other":{"light-x":{"value":"{colors.accent.4.light-x}","type":"color"},"light":{"value":"{colors.accent.4.light}","type":"color"},"medium":{"value":"{colors.accent.4.medium}","type":"color"},"dark":{"value":"{colors.accent.4.dark}","type":"color"},"dark-x":{"value":"{colors.accent.4.dark-x}","type":"color"}}}},"spacing":{"1":{"value":8,"type":"number"},"2":{"value":16,"type":"number"},"3":{"value":24,"type":"number"},"4":{"value":32,"type":"number"},"5":{"value":40,"type":"number"},"6":{"value":48,"type":"number"},"7":{"value":56,"type":"number"},"8":{"value":64,"type":"number"},"9":{"value":72,"type":"number"},"10":{"value":80,"type":"number"},"11":{"value":88,"type":"number"},"12":{"value":96,"type":"number"},"13":{"value":104,"type":"number"},"fourth":{"value":2,"type":"number"},"half":{"value":4,"type":"number"}},"font-weight":{"100":{"value":100,"type":"number"},"200":{"value":200,"type":"number"},"300":{"value":300,"type":"number"},"400":{"value":400,"type":"number"},"500":{"value":500,"type":"number"},"600":{"value":600,"type":"number"},"700":{"value":700,"type":"number"},"800":{"value":800,"type":"number"},"900":{"value":900,"type":"number"}},"color":{"gray":{"light-2x":{"value":"{colors.neutral.light-2x}","type":"color"},"light-x":{"value":"{colors.neutral.light-x}","type":"color"},"light":{"value":"{colors.neutral.light}","type":"color"},"medium":{"value":"{colors.neutral.medium}","type":"color"},"dark":{"value":"{colors.neutral.dark}","type":"color"},"dark-x":{"value":"{colors.neutral.dark-x}","type":"color"},"dark-2x":{"value":"{colors.neutral.dark-2x}","type":"color"}},"v3":{"blue":{"value":"{colors.accent.1.dark-2x}","type":"color","light":{"value":"{colors.accent.1.dark-x}","type":"color"},"lighter":{"value":"{colors.accent.1.dark}","type":"color"}},"orange":{"value":"{colors.accent.2.dark}","type":"color","light":{"value":"{colors.accent.2.medium}","type":"color"},"dark":{"value":"{colors.accent.2.dark-x}","type":"color"}},"yellow":{"value":"{colors.accent.3.medium}","type":"color","light":{"value":"{colors.accent.3.light}","type":"color"},"dark":{"value":"{colors.accent.3.dark}","type":"color"}},"vanilla":{"value":"{colors.accent.4.light-x}","type":"color","darker":{"value":"{colors.accent.4.medium}","type":"color"},"dark":{"value":"{colors.accent.4.light}","type":"color"}},"raisin":{"value":"{colors.neutral.dark-2x}","type":"color"},"ivory":{"value":"{colors.neutral.light-2x}","type":"color"}},"info":{"light-x":{"value":"{colors.neutral.light-x}","type":"color"},"light":{"value":"{colors.neutral.light}","type":"color"},"medium":{"value":"{colors.neutral.dark}","type":"color"},"dark":{"value":"{colors.neutral.dark-x}","type":"color"},"dark-x":{"value":"{colors.neutral.dark-2x}","type":"color"}},"danger":{"light-x":{"value":"{colors.traffic.bad.light-x}","type":"color"},"light":{"value":"{colors.traffic.bad.light}","type":"color"},"medium":{"value":"{colors.traffic.bad.medium}","type":"color"},"dark":{"value":"{colors.traffic.bad.dark}","type":"color"},"dark-x":{"value":"{colors.traffic.bad.dark-x}","type":"color"}},"warning":{"light-x":{"value":"{colors.traffic.warn.light-x}","type":"color"},"light":{"value":"{colors.traffic.warn.light}","type":"color"},"medium":{"value":"{colors.traffic.warn.medium}","type":"color"},"dark":{"value":"{colors.traffic.warn.dark}","type":"color"},"dark-x":{"value":"{colors.traffic.warn.dark-x}","type":"color"}},"success":{"light-x":{"value":"{colors.traffic.good.light-x}","type":"color"},"light":{"value":"{colors.traffic.good.light}","type":"color"},"medium":{"value":"{colors.traffic.good.medium}","type":"color"},"dark":{"value":"{colors.traffic.good.dark}","type":"color"},"dark-x":{"value":"{colors.traffic.good.dark-x}","type":"color"}},"extra":{"light-x":{"value":"{colors.traffic.other.light-x}","type":"color"},"light":{"value":"{colors.traffic.other.light}","type":"color"},"medium":{"value":"{colors.traffic.other.medium}","type":"color"},"dark":{"value":"{colors.traffic.other.dark}","type":"color"},"dark-x":{"value":"{colors.traffic.other.dark-x}","type":"color"}}},"space":{"small-2x":{"value":"{spacing.fourth}","type":"number"},"small-x":{"value":"{spacing.half}","type":"number"},"small":{"value":"{spacing.1}","type":"number"},"medium":{"value":"{spacing.2}","type":"number"},"large":{"value":"{spacing.3}","type":"number"},"large-x":{"value":"{spacing.4}","type":"number"},"large-2x":{"value":"{spacing.5}","type":"number"}},"weight":{"light":{"value":"{font-weight.300}","type":"number"},"bold":{"value":"{font-weight.700}","type":"number"},"medium":{"value":"{font-weight.500}","type":"number"},"regular":{"value":"{font-weight.400}","type":"number"},"semibold":{"value":"{font-weight.600}","type":"number"},"thin":{"value":"{font-weight.100}","type":"number"},"extralight":{"value":"{font-weight.200}","type":"number"},"extrabold":{"value":"{font-weight.800}","type":"number"},"black":{"value":"{font-weight.900}","type":"number"},"light-x":{"value":"{weight.extralight}","type":"number"},"bold-x":{"value":"{weight.extrabold}","type":"number"}}}
\ No newline at end of file
diff --git a/dist/tools/c-app-card.css b/dist/tools/c-app-card.css
deleted file mode 100644
index 612ad887a..000000000
--- a/dist/tools/c-app-card.css
+++ /dev/null
@@ -1 +0,0 @@
-/*! @tacc/core-styles 2.25.2+ | MIT | github.com/TACC/Core-Styles */.app-card,.s-app-card,[class*=app-card--]{display:flex;flex-direction:column;text-align:center}.app-card>ul:not(:last-of-type),.s-app-card>ul:not(:last-of-type),[class*=app-card--]>ul:not(:last-of-type){flex-grow:1}.app-card>:is(h1,h2,h3,h4,h5,h6)>.icon,.s-app-card>:is(h1,h2,h3,h4,h5,h6)>.icon,[class*=app-card--]>:is(h1,h2,h3,h4,h5,h6)>.icon{vertical-align:middle}.app-card>ul:not(:last-of-type),.s-app-card>ul:not(:last-of-type),[class*=app-card--]>ul:not(:last-of-type){align-items:center;display:flex;flex-grow:0;flex-wrap:wrap;justify-content:center;margin-block:auto;padding-inline-start:0}.app-card>ul:not(:last-of-type)>li,.s-app-card>ul:not(:last-of-type)>li,[class*=app-card--]>ul:not(:last-of-type)>li{display:inline}.app-card>ul:not(:last-of-type)>li:not(:last-child):after,.s-app-card>ul:not(:last-of-type)>li:not(:last-child):after,[class*=app-card--]>ul:not(:last-of-type)>li:not(:last-child):after{content:"•";display:inline;margin-inline:.25em}.app-card>ul:last-of-type,.s-app-card>ul:last-of-type,[class*=app-card--]>ul:last-of-type{display:flex;flex-direction:row;justify-content:space-between;list-style:none;margin-block:unset;padding-inline-start:0}.app-card>ul:only-of-type,.s-app-card>ul:only-of-type,[class*=app-card--]>ul:only-of-type{align-items:end;flex-grow:1}.app-card>ul:last-of-type>li:where(:not(:first-child),:only-child),.s-app-card>ul:last-of-type>li:where(:not(:first-child),:only-child),[class*=app-card--]>ul:last-of-type>li:where(:not(:first-child),:only-child){margin-left:auto}.app-card,.s-app-card,[class*=app-card--]{position:relative}.app-card>a:last-child,.s-app-card>a:last-child,[class*=app-card--]>a:last-child{bottom:0;color:transparent;left:0;position:absolute;right:0;top:0;-webkit-user-select:none;-moz-user-select:none;user-select:none}
\ No newline at end of file
diff --git a/dist/tools/c-app-card/demo.css b/dist/tools/c-app-card/demo.css
deleted file mode 100644
index bd021e95b..000000000
--- a/dist/tools/c-app-card/demo.css
+++ /dev/null
@@ -1 +0,0 @@
-/*! @tacc/core-styles 2.25.2+ | MIT | github.com/TACC/Core-Styles */.col{margin-bottom:var(--global-space--bootstrap-gap)}.row{margin-bottom:calc(var(--global-space--bootstrap-gap)*-1)}.col .s-app-card{height:100%}
\ No newline at end of file
diff --git a/dist/tools/c-form.selectors.css b/dist/tools/c-form.selectors.css
deleted file mode 100644
index 5d5fa0c21..000000000
--- a/dist/tools/c-form.selectors.css
+++ /dev/null
@@ -1 +0,0 @@
-/*! @tacc/core-styles 2.14.0+ | MIT | github.com/TACC/Core-Styles */
\ No newline at end of file
diff --git a/dist/tools/s-form.css b/dist/tools/s-form.css
deleted file mode 100644
index 5d5fa0c21..000000000
--- a/dist/tools/s-form.css
+++ /dev/null
@@ -1 +0,0 @@
-/*! @tacc/core-styles 2.14.0+ | MIT | github.com/TACC/Core-Styles */
\ No newline at end of file
diff --git a/dist/tools/x-message--v1.css b/dist/tools/x-message--v1.css
deleted file mode 100644
index 16ca76bae..000000000
--- a/dist/tools/x-message--v1.css
+++ /dev/null
@@ -1 +0,0 @@
-/*! @tacc/core-styles 2.33.0+ | MIT | github.com/TACC/Core-Styles */.x-link{color:var(--global-color-accent--normal);text-decoration:none;text-decoration-thickness:var(--global-border-width--normal);text-underline-offset:.2em}.x-link--disabled{opacity:.5;pointer-events:none}.x-link--hover{color:var(--global-color-accent--normal);text-decoration-line:underline;text-decoration-style:solid;text-decoration-thickness:var(--global-border-width--normal)}.x-link--active{text-decoration-line:underline;text-decoration-style:dotted}.x-link--irregular{color:var(--global-color-accent--normal);text-decoration:none;text-decoration-line:underline;text-decoration-thickness:var(--global-border-width--normal);text-underline-offset:.2em}.x-link--irregular--disabled{opacity:.5;pointer-events:none}.x-link--irregular--hover{color:var(--global-color-accent--normal);text-decoration-line:underline;text-decoration-style:solid;text-decoration-style:dashed;text-decoration-thickness:var(--global-border-width--normal)}.x-link--irregular--active{text-decoration-line:underline;text-decoration-style:dotted;text-decoration-style:dotted}
\ No newline at end of file
diff --git a/dist/trumps/s-header.theme-has-dark-logo.css b/dist/trumps/s-header.theme-has-dark-logo.css
deleted file mode 100644
index 60c960b6c..000000000
--- a/dist/trumps/s-header.theme-has-dark-logo.css
+++ /dev/null
@@ -1 +0,0 @@
-/*! @tacc/core-styles 2.7.0+ | MIT | github.com/TACC/Core-Styles */.s-header .dropdown-item{color:#212529}.s-header .dropdown-item:focus,.s-header .dropdown-item:hover{background-color:#f8f9fa;color:#16181b;text-decoration:none}.s-header .dropdown-item.active,.s-header .dropdown-item:active{background-color:#007bff;color:#fff;text-decoration:none}.s-header input{font-family:inherit}.s-header{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;border-bottom:1px solid var(--global-color-primary--normal);font-family:var(--global-font-family);font-size:16px;line-height:1.4}.s-header .navbar-brand{color:var(--global-color-primary--x-dark);margin-right:16px;min-width:176px;padding:0}@media only screen and (min-width:1201px){.s-header.navbar{height:50px}}.s-header.navbar{--nav-padding-vert:5px;--nav-padding-horz:36px;background-color:var(--global-color-primary--x-light);padding:var(--nav-padding-vert) var(--nav-padding-horz)}.s-header .nav-link{--line-height:24px;--border-width:4px;--border-offset:calc(var(--nav-padding-vert) - var(--border-width));--border-color:var(--global-color-secondary--light);line-height:var(--line-height);position:relative;top:var(--border-offset);white-space:nowrap}.s-header .nav-item.active .nav-link,.s-header .nav-link:active,.s-header .nav-link:focus,.s-header .nav-link:hover{border-color:var(--border-color);border-style:solid;border-width:0 0 var(--border-width);margin-bottom:calc(var(--border-width)*-1)}#s-header .nav-link,#s-header .nav-link>a{color:var(--global-color-primary--x-dark)}.s-header[class*=navbar-expand-] .navbar-nav .nav-link{padding:8px 14px}.s-header .s-search-bar~.s-portal-nav{border-left:1px solid var(--global-color-primary--normal);margin-left:12px}.dropdown-menu{font-size:16px}.s-header [class*=fa-]{text-align:center;width:27px}.navbar-toggler-icon{filter:invert(100%)}
\ No newline at end of file
diff --git a/dist/trumps/s-header/s-header--with-branding.demo.css b/dist/trumps/s-header/s-header--with-branding.demo.css
deleted file mode 100644
index 5bfa46e95..000000000
--- a/dist/trumps/s-header/s-header--with-branding.demo.css
+++ /dev/null
@@ -1 +0,0 @@
-/*! @tacc/core-styles 2.19.0+ | MIT | github.com/TACC/Core-Styles */:root{--global-font-family:var(--global-font-family--sans);--font-family-sans-serif:var(--global-font-family--sans);--font-family-monospace:var(--global-font-family--mono)}main{padding-block:unset;width:unset}
\ No newline at end of file
diff --git a/dist/trumps/tacc-search-bar.theme-has-dark-logo.css b/dist/trumps/tacc-search-bar.theme-has-dark-logo.css
deleted file mode 100644
index 3e208e0df..000000000
--- a/dist/trumps/tacc-search-bar.theme-has-dark-logo.css
+++ /dev/null
@@ -1 +0,0 @@
-/*! @tacc/core-styles 2.7.0+ | MIT | github.com/TACC/Core-Styles */:host{--button-horz-pad:10px;--input-horz-pad:0.125em;--input-height:26px;--button-font-size:18px;--input-font-size:14px}:host{font-size:0}:host [part=form]{align-items:center;display:flex;font-family:Roboto;position:relative}:host [part=button]{align-items:center;background-color:transparent;border:none;box-sizing:content-box;color:var(--global-color-primary--x-dark);font-size:16px;font-size:var(--button-font-size);height:var(--input-height,38px);left:0;margin:0;padding:0 var(--button-horz-pad);position:absolute;top:50%;transform:translateY(-50%)}:host [part=input]{background-color:var(--global-color-primary--xx-light);border:var(--global-border-width--normal) solid #d8d8d8;border-radius:5px;color:var(--global-color-primary--x-dark);display:block;font-size:var(--input-font-size);height:var(--input-height);margin:0;padding-bottom:0;padding-left:calc(var(--button-horz-pad) + var(--button-font-size) + var(--button-horz-pad) + var(--input-horz-pad));padding-right:var(--input-horz-pad);padding-top:0;width:100%}:host [part=input]::-moz-placeholder{color:var(--global-color-primary--x-dark);opacity:.5}:host [part=input]::placeholder{color:var(--global-color-primary--x-dark);opacity:.5}
\ No newline at end of file