diff --git a/data/tokens/Components/actionpopover.json b/data/tokens/Components/actionpopover.json
index 64e5bdb1..27a853b2 100644
--- a/data/tokens/Components/actionpopover.json
+++ b/data/tokens/Components/actionpopover.json
@@ -1,32 +1,30 @@
 {
   "actionpopover": {
-    "menu": {
-      "bg-active": {
-        "value": "{base.color.interactive.monochrome.standard.active}",
-        "type": "color",
-        "description": "previously action minor 850"
-      },
-      "bg-hover": {
-        "value": "{base.color.interactive.monochrome.inverse.hoverAlt}",
-        "type": "color",
-        "description": "was action minor 100\n"
-      },
-      "label-active": {
-        "value": "{base.color.interactive.monochrome.standard.withActive}",
-        "type": "color"
-      },
-      "label-disabled": {
-        "value": "{base.color.interactive.inactive.content}",
-        "type": "color"
-      },
-      "label-hover": {
-        "value": "{base.color.interactive.monochrome.standard.withHover}",
-        "type": "color"
-      },
-      "label-enabled": {
-        "value": "{base.color.interactive.monochrome.standard.defaultAlt}",
-        "type": "color"
-      }
+    "bg-active": {
+      "value": "{base.color.interactive.monochrome.standard.active}",
+      "type": "color",
+      "description": "previously action minor 850"
+    },
+    "bg-hover": {
+      "value": "{base.color.interactive.monochrome.standard.hoverAlt}",
+      "type": "color",
+      "description": "was action minor 100\n"
+    },
+    "label-active": {
+      "value": "{base.color.interactive.monochrome.standard.withActive}",
+      "type": "color"
+    },
+    "label-disabled": {
+      "value": "{base.color.interactive.inactive.content}",
+      "type": "color"
+    },
+    "label-hover": {
+      "value": "{base.color.interactive.monochrome.standard.withHover}",
+      "type": "color"
+    },
+    "label-enabled": {
+      "value": "{base.color.interactive.monochrome.standard.defaultAlt}",
+      "type": "color"
     }
   }
 }
\ No newline at end of file
diff --git a/data/tokens/Components/button.json b/data/tokens/Components/button.json
index 812ff08f..79013459 100644
--- a/data/tokens/Components/button.json
+++ b/data/tokens/Components/button.json
@@ -6,14 +6,14 @@
           "value": "{base.color.interactive.inactive.default}",
           "type": "color"
         },
-        "bg-enabled": {
-          "value": "{base.color.interactive.danger.default}",
-          "type": "color"
-        },
         "bg-active": {
           "value": "{base.color.interactive.danger.active}",
           "type": "color"
         },
+        "bg-enabled": {
+          "value": "{base.color.interactive.danger.default}",
+          "type": "color"
+        },
         "bg-hover": {
           "value": "{base.color.interactive.danger.hover}",
           "type": "color"
@@ -64,10 +64,6 @@
           "value": "{base.color.interactive.primary.withActive}",
           "type": "color"
         },
-        "label-hover": {
-          "value": "{base.color.interactive.danger.hover}",
-          "type": "color"
-        },
         "label-disabled": {
           "value": "{base.color.interactive.inactive.content}",
           "type": "color"
@@ -75,19 +71,24 @@
         "label-enabled": {
           "value": "{base.color.interactive.danger.default}",
           "type": "color"
+        },
+        "label-hover": {
+          "value": "{base.color.interactive.danger.hover}",
+          "type": "color"
         }
       }
     },
     "standard": {
       "primary": {
+        "bg-active": {
+          "value": "{base.color.interactive.monochrome.standard.active}",
+          "type": "color",
+          "description": "Was previously dark green {base.color.interactive.primary.active}"
+        },
         "bg-disabled": {
           "value": "{base.color.interactive.inactive.default}",
           "type": "color"
         },
-        "bg-active": {
-          "value": "{base.color.interactive.primary.active}",
-          "type": "color"
-        },
         "bg-enabled": {
           "value": "{base.color.interactive.primary.default}",
           "type": "color"
@@ -155,35 +156,15 @@
           "type": "color"
         }
       },
-      "tertiary": {
+      "subtle": {
         "bg-active": {
           "value": "{base.color.interactive.monochrome.standard.active}",
           "type": "color"
         },
-        "bg-activeDisabled": {
-          "value": "{base.color.interactive.inactive.default}",
-          "type": "color"
-        },
         "bg-hover": {
           "value": "{base.color.interactive.monochrome.standard.hoverAlt}",
           "type": "color"
         },
-        "border-active": {
-          "value": "{base.color.interactive.monochrome.standard.active}",
-          "type": "color"
-        },
-        "border-disabled": {
-          "value": "{base.color.interactive.inactive.default}",
-          "type": "color"
-        },
-        "border-enabled": {
-          "value": "{base.color.interactive.monochrome.standard.defaultAlt}",
-          "type": "color"
-        },
-        "border-hover": {
-          "value": "{base.color.interactive.monochrome.standard.defaultAlt}",
-          "type": "color"
-        },
         "label-active": {
           "value": "{base.color.interactive.monochrome.standard.withActive}",
           "type": "color"
@@ -201,11 +182,35 @@
           "type": "color"
         }
       },
-      "subtle": {
+      "tertiary": {
         "bg-active": {
           "value": "{base.color.interactive.monochrome.standard.active}",
           "type": "color"
         },
+        "bg-activeDisabled": {
+          "value": "{base.color.interactive.inactive.default}",
+          "type": "color"
+        },
+        "bg-hover": {
+          "value": "{base.color.interactive.monochrome.standard.hoverAlt}",
+          "type": "color"
+        },
+        "border-active": {
+          "value": "{base.color.interactive.monochrome.standard.active}",
+          "type": "color"
+        },
+        "border-disabled": {
+          "value": "{base.color.interactive.inactive.default}",
+          "type": "color"
+        },
+        "border-enabled": {
+          "value": "{base.color.interactive.monochrome.standard.defaultAlt}",
+          "type": "color"
+        },
+        "border-hover": {
+          "value": "{base.color.interactive.monochrome.standard.defaultAlt}",
+          "type": "color"
+        },
         "label-active": {
           "value": "{base.color.interactive.monochrome.standard.withActive}",
           "type": "color"
diff --git a/data/tokens/Components/container.json b/data/tokens/Components/container.json
index 6073bf78..3781dfca 100644
--- a/data/tokens/Components/container.json
+++ b/data/tokens/Components/container.json
@@ -35,12 +35,16 @@
         "value": "{base.color.status.success.standard.default}",
         "type": "color"
       },
+      "border-alt": {
+        "value": "{base.color.generic.fg.standard.delicate}",
+        "type": "color"
+      },
       "border-inactive": {
-        "value": "{base.color.interactive.inactive.default}",
+        "value": "{base.color.generic.fg.standard.soft}",
         "type": "color"
       },
       "border-enabled": {
-        "value": "{base.color.generic.fg.standard.delicate}",
+        "value": "{base.color.generic.fg.standard.moderate}",
         "type": "color"
       },
       "icon-active": {
@@ -110,6 +114,10 @@
         "type": "color",
         "description": "tile footer bg color\n"
       },
+      "border-alt": {
+        "value": "{base.color.generic.fg.standard.delicate}",
+        "type": "color"
+      },
       "border-default": {
         "value": "{base.color.generic.fg.standard.soft}",
         "type": "color"
diff --git a/data/tokens/Components/datatable.json b/data/tokens/Components/datatable.json
index 8769b430..6ce0ca69 100644
--- a/data/tokens/Components/datatable.json
+++ b/data/tokens/Components/datatable.json
@@ -1,76 +1,78 @@
 {
   "datatable": {
     "header": {
-      "bg-default": {
-        "value": "{origin.colors.transparent}",
-        "type": "color"
-      },
-      "bg-hover": {
-        "value": "{base.color.generic.content.standard.extreme}",
-        "type": "color",
-        "$extensions": {
-          "studio.tokens": {
-            "modify": {
-              "type": "alpha",
-              "value": "0.12",
-              "space": "lch"
+      "subtle": {
+        "bg-alt": {
+          "value": "{base.color.generic.content.standard.extreme}",
+          "type": "color",
+          "$extensions": {
+            "studio.tokens": {
+              "modify": {
+                "type": "alpha",
+                "value": "0.08",
+                "space": "lch"
+              }
             }
-          }
-        }
-      },
-      "bgAlt-default": {
-        "value": "{base.color.generic.content.standard.extreme}",
-        "type": "color",
-        "$extensions": {
-          "studio.tokens": {
-            "modify": {
-              "type": "alpha",
-              "value": "0.08",
-              "space": "lch"
+          },
+          "description": "header alt"
+        },
+        "bg-default": {
+          "value": "{origin.colors.transparent}",
+          "type": "color"
+        },
+        "bg-hover": {
+          "value": "{base.color.generic.content.standard.extreme}",
+          "type": "color",
+          "$extensions": {
+            "studio.tokens": {
+              "modify": {
+                "type": "alpha",
+                "value": "0.12",
+                "space": "lch"
+              }
             }
           }
         },
-        "description": "header alt"
-      },
-      "border-default": {
-        "value": "{base.color.generic.fg.standard.delicate}",
-        "type": "color",
-        "description": "Header borders"
-      },
-      "label-default": {
-        "value": "{base.color.generic.content.standard.harsh}",
-        "type": "color"
-      },
-      "label-hover": {
-        "value": "{base.color.generic.content.standard.extreme}",
-        "type": "color"
-      }
-    },
-    "headeralt": {
-      "bg-default": {
-        "value": "{base.color.generic.bg.inverse.moderate}",
-        "type": "color"
-      },
-      "bg-hover": {
-        "value": "{base.color.generic.bg.inverse.soft}",
-        "type": "color"
-      },
-      "bgAlt-default": {
-        "value": "{base.color.generic.bg.inverse.firm}",
-        "type": "color",
-        "description": "Zebra stripes"
-      },
-      "border-default": {
-        "value": "{base.color.generic.fg.inverse.moderate}",
-        "type": "color"
-      },
-      "label-default": {
-        "value": "{base.color.generic.content.inverse.harsh}",
-        "type": "color"
+        "border-default": {
+          "value": "{base.color.generic.fg.standard.delicate}",
+          "type": "color",
+          "description": "Header borders"
+        },
+        "label-default": {
+          "value": "{base.color.generic.content.standard.harsh}",
+          "type": "color"
+        },
+        "label-hover": {
+          "value": "{base.color.generic.content.standard.extreme}",
+          "type": "color"
+        }
       },
-      "label-hover": {
-        "value": "{base.color.generic.content.inverse.extreme}",
-        "type": "color"
+      "harsh": {
+        "bg-alt": {
+          "value": "{base.color.generic.bg.inverse.harsh}",
+          "type": "color",
+          "description": "Zebra stripes"
+        },
+        "bg-default": {
+          "value": "{base.color.generic.bg.inverse.firm}",
+          "type": "color"
+        },
+        "bg-hover": {
+          "value": "{base.color.generic.bg.inverse.moderate}",
+          "type": "color"
+        },
+        "border-default": {
+          "value": "{base.color.generic.fg.inverse.moderate}",
+          "type": "color"
+        },
+        "label-default": {
+          "value": "{base.color.generic.content.inverse.harsh}",
+          "type": "color"
+        },
+        "label-hover": {
+          "value": "{base.color.generic.content.inverse.extreme}",
+          "type": "color"
+        }
       }
     },
     "row": {
diff --git a/data/tokens/Components/nav.json b/data/tokens/Components/nav.json
index 041f36b7..6feca4a3 100644
--- a/data/tokens/Components/nav.json
+++ b/data/tokens/Components/nav.json
@@ -50,11 +50,11 @@
     },
     "harsh": {
       "bg-default": {
-        "value": "{base.color.generic.bg.inverse.firm}",
+        "value": "{base.color.generic.bg.inverse.harsh}",
         "type": "color"
       },
       "bg-alt": {
-        "value": "{base.color.generic.bg.inverse.moderate}",
+        "value": "{base.color.generic.bg.inverse.firm}",
         "type": "color"
       },
       "item": {
diff --git a/data/tokens/Modes/light.json b/data/tokens/Modes/light.json
index c3a452be..8e06c42c 100644
--- a/data/tokens/Modes/light.json
+++ b/data/tokens/Modes/light.json
@@ -105,7 +105,7 @@
                 "studio.tokens": {
                   "modify": {
                     "type": "mix",
-                    "value": "0.16",
+                    "value": "0.12",
                     "space": "lch",
                     "color": "{base.color.modifier.contrastLess} "
                   }
@@ -119,7 +119,7 @@
                 "studio.tokens": {
                   "modify": {
                     "type": "mix",
-                    "value": "0.24",
+                    "value": "0.16",
                     "space": "lch",
                     "color": "{base.color.modifier.contrastLess} "
                   }
@@ -133,7 +133,7 @@
                 "studio.tokens": {
                   "modify": {
                     "type": "mix",
-                    "value": "0.32",
+                    "value": "0.24",
                     "space": "lch",
                     "color": "{base.color.modifier.contrastLess} "
                   }
@@ -141,6 +141,20 @@
               }
             },
             "harsh": {
+              "value": "{base.color.generic.bg.inverse.nought}",
+              "type": "color",
+              "$extensions": {
+                "studio.tokens": {
+                  "modify": {
+                    "type": "mix",
+                    "value": "0.32",
+                    "space": "lch",
+                    "color": "{base.color.modifier.contrastLess} "
+                  }
+                }
+              }
+            },
+            "severe": {
               "value": "{base.color.generic.bg.inverse.nought}",
               "type": "color",
               "$extensions": {
diff --git a/data/tokens/global.json b/data/tokens/global.json
index 8615c331..f475a5dc 100644
--- a/data/tokens/global.json
+++ b/data/tokens/global.json
@@ -1,29 +1,24 @@
 {
-  "base": {
+  "global": {
     "box-shadow": {
       "container": {
-        "XS": {
-          "value": "{origin.box-shadow.downward.1}",
-          "type": "boxShadow"
-        },
-        "S": {
-          "value": "{origin.box-shadow.downward.2}",
-          "type": "boxShadow"
-        },
-        "M": {
+        "near": {
           "value": "{origin.box-shadow.downward.3}",
-          "type": "boxShadow"
+          "type": "boxShadow",
+          "description": "Popover menus used on split, multiaction, dropdown and action popovers"
         },
-        "L": {
+        "far": {
           "value": "{origin.box-shadow.downward.4}",
-          "type": "boxShadow"
+          "type": "boxShadow",
+          "description": "Toasts"
         },
-        "XL": {
+        "distant": {
           "value": "{origin.box-shadow.downward.5}",
-          "type": "boxShadow"
+          "type": "boxShadow",
+          "description": "Dialogs and sidebars"
         },
         "sticky-footer": {
-          "value": "{origin.box-shadow.upward.1}",
+          "value": "{origin.box-shadow.upward.4}",
           "type": "boxShadow"
         },
         "solid-border": {
@@ -31,14 +26,16 @@
           "type": "boxShadow"
         }
       },
-      "selectable": {
-        "S": {
-          "value": "{origin.box-shadow.downward.1}",
-          "type": "boxShadow"
+      "interactive": {
+        "enabled": {
+          "value": "{origin.box-shadow.downward.3}",
+          "type": "boxShadow",
+          "description": "Default card state"
         },
-        "M": {
-          "value": "{origin.box-shadow.downward.2}",
-          "type": "boxShadow"
+        "hover": {
+          "value": "{origin.box-shadow.downward.5}",
+          "type": "boxShadow",
+          "description": "Card hover state"
         }
       }
     },
@@ -49,55 +46,72 @@
         "description": "We can override this to locally change the size of radius in the future if required."
       },
       "container": {
+        "XXS": {
+          "value": "{origin.dimension.12} * {global.border-radius.scale}",
+          "type": "borderRadius",
+          "description": "Validation bar on input components"
+        },
         "XS": {
-          "value": "{origin.dimension.12} * {base.border-radius.scale}",
+          "value": "{origin.dimension.25} * {global.border-radius.scale}",
           "type": "borderRadius",
-          "description": "Validation bar"
+          "description": "Pill"
         },
         "S": {
-          "value": "{origin.dimension.50} * {base.border-radius.scale}",
+          "value": "{origin.dimension.50} * {global.border-radius.scale}",
           "type": "borderRadius",
           "description": "Color picker advanced (inner container), Tooltip."
         },
         "M": {
-          "value": "{origin.dimension.100} * {base.border-radius.scale}",
+          "value": "{origin.dimension.100} * {global.border-radius.scale}",
           "type": "borderRadius",
-          "description": "Action popover (menu), Anchor navigation, Card (less rounded), Card select (single), Card select group (outer corners), Carousel (slides), Color picker standard (container), Menu (bottom corners), Message, Navigation: top (menu bottom corners), Navigation: left (selected menu), Pagination, Table, Tile (less rounded), Toast."
+          "description": "Popover menus (action popover, split button etc), Color picker standard (container), Menu (bottom corners), Message, Navigation: top (menu bottom corners), Navigation: left (selected menu), Pagination, Table, Tile (less rounded), Toast"
         },
         "L": {
-          "value": "{origin.dimension.200} * {base.border-radius.scale}",
+          "value": "{origin.dimension.200} * {global.border-radius.scale}",
           "type": "borderRadius",
-          "description": "Carousel (outer part), Card (more rounded), Color picker advanced (outer container), Dialog (not full screen), Tile (more rounded)."
+          "description": "Carousel (outer part), Color picker advanced (outer container), Dialog (not full screen), Tile (more rounded)."
         },
-        "none": {
-          "value": "0",
-          "type": "borderRadius"
+        "circle": {
+          "value": "10000",
+          "type": "borderRadius",
+          "description": "Badge, Portrait"
         }
       },
-      "selectable": {
+      "interactive": {
         "XS": {
-          "value": "{origin.dimension.25} * {base.border-radius.scale}",
+          "value": "{origin.dimension.25} * {global.border-radius.scale}",
           "type": "borderRadius",
-          "description": "Checkbox (S, M), Link (focus background),Pill"
+          "description": "Checkbox (S, M), Link (focus background)"
         },
         "S": {
-          "value": "{origin.dimension.50} * {base.border-radius.scale}",
+          "value": "{origin.dimension.50} * {global.border-radius.scale}",
           "type": "borderRadius",
           "description": "Button: minor (including button bar), Button: multi-action & split (menu), Button toggle: minor, Checkbox (large), Date picker, Date range, Dropdown: select (trigger & menu), File input, Link (focus), Search, Text area, Text input."
         },
         "M": {
-          "value": "{origin.dimension.100} * {base.border-radius.scale}",
+          "value": "{origin.dimension.100} * {global.border-radius.scale}",
           "type": "borderRadius",
-          "description": "Tab"
+          "description": "Anchor navigation items, Card (less rounded), Card select (single), Card select group (outer corners), Carousel (slides), Tab items"
         },
         "L": {
-          "value": "{origin.dimension.400} * {base.border-radius.scale}",
+          "value": "{origin.dimension.200} * {global.border-radius.scale}",
+          "type": "borderRadius",
+          "description": "Card (more rounded)"
+        },
+        "XL": {
+          "value": "{origin.dimension.400} * {global.border-radius.scale}",
           "type": "borderRadius",
-          "description": "Action popover (button), Button: major (including button bar), Button: multi-action & split, Button toggle: major, Loader bar, Progress tracker, Switch."
+          "description": "Buttons, Loader bar, Progress tracker, Switch"
+        },
+        "circle": {
+          "value": "10000",
+          "type": "borderRadius",
+          "description": "Radio button"
         },
         "none": {
           "value": "0",
-          "type": "borderRadius"
+          "type": "borderRadius",
+          "description": "Button groups (internal/adjacent corners), Card select group (internal/adjacent corners), File input (integrated base bar top corners)."
         }
       }
     },
@@ -108,7 +122,12 @@
       },
       "container": {
         "S": {
-          "value": "{origin.dimension.12} * {base.border-width.scale}",
+          "value": "{origin.dimension.12} * {global.border-width.scale}",
+          "type": "borderWidth",
+          "description": "Dividing lines"
+        },
+        "M": {
+          "value": "{origin.dimension.50} * {global.border-width.scale}",
           "type": "borderWidth",
           "description": "Dividing lines"
         },
@@ -117,29 +136,29 @@
           "type": "borderWidth"
         }
       },
-      "selectable": {
+      "interactive": {
         "S": {
-          "value": "{origin.dimension.12} * {base.border-width.scale}",
+          "value": "{origin.dimension.12} * {global.border-width.scale}",
           "type": "borderWidth",
           "description": "Inputs, buttons"
         },
         "MS": {
-          "value": "{origin.dimension.25} * {base.border-width.scale}",
+          "value": "{origin.dimension.25} * {global.border-width.scale}",
           "type": "borderWidth",
           "description": "Buttons, Validation bars"
         },
         "M": {
-          "value": "{origin.dimension.38} * {base.border-width.scale}",
+          "value": "{origin.dimension.38} * {global.border-width.scale}",
           "type": "borderWidth",
           "description": "Focus\n"
         },
         "L": {
-          "value": "{origin.dimension.50} * {base.border-width.scale}",
+          "value": "{origin.dimension.50} * {global.border-width.scale}",
           "type": "borderWidth",
           "description": "Focus underline\n"
         },
         "XL": {
-          "value": "{origin.dimension.75} * {base.border-width.scale}",
+          "value": "{origin.dimension.75} * {global.border-width.scale}",
           "type": "borderWidth",
           "description": "Double Focus Border"
         },
@@ -166,7 +185,7 @@
       }
     },
     "space": {
-      "selectable": {
+      "interactive": {
         "inside": {
           "Neg-XS": {
             "value": "{origin.dimension.25} * -1",
@@ -292,324 +311,162 @@
       }
     },
     "typography": {
-      "large viewports": {
-        "hero heading": {
-          "M": {
-            "value": {
-              "fontFamily": "{origin.fontFamilies.sage-headline}",
-              "fontWeight": "{origin.fontWeights.black}",
-              "lineHeight": "{origin.lineHeights.400}",
-              "fontSize": "{origin.font-size.typescale.large viewports.7}"
-            },
-            "type": "typography"
+      "hero heading": {
+        "M": {
+          "value": {
+            "fontFamily": "{origin.fontFamilies.sage-headline}",
+            "fontWeight": "{origin.fontWeights.black}",
+            "lineHeight": "{origin.lineHeights.400}",
+            "fontSize": "{origin.font-size.f7}"
           },
-          "L": {
-            "value": {
-              "fontFamily": "{origin.fontFamilies.sage-headline}",
-              "fontWeight": "{origin.fontWeights.black}",
-              "lineHeight": "{origin.lineHeights.400}",
-              "fontSize": "{origin.font-size.typescale.large viewports.8}"
-            },
-            "type": "typography"
-          }
+          "type": "typography"
         },
-        "heading": {
-          "S": {
-            "value": {
-              "fontFamily": "{origin.fontFamilies.sage-text}",
-              "fontWeight": "{origin.fontWeights.bold}",
-              "lineHeight": "{origin.lineHeights.400}",
-              "fontSize": "{origin.font-size.typescale.large viewports.3}"
-            },
-            "type": "typography"
+        "L": {
+          "value": {
+            "fontFamily": "{origin.fontFamilies.sage-headline}",
+            "fontWeight": "{origin.fontWeights.black}",
+            "lineHeight": "{origin.lineHeights.400}",
+            "fontSize": "{origin.font-size.f8}"
           },
-          "M": {
-            "value": {
-              "fontFamily": "{origin.fontFamilies.sage-text}",
-              "fontWeight": "{origin.fontWeights.bold}",
-              "lineHeight": "{origin.lineHeights.400}",
-              "fontSize": "{origin.font-size.typescale.large viewports.4}"
-            },
-            "type": "typography"
+          "type": "typography"
+        }
+      },
+      "heading": {
+        "S": {
+          "value": {
+            "fontFamily": "{origin.fontFamilies.sage-text}",
+            "fontWeight": "{origin.fontWeights.bold}",
+            "lineHeight": "{origin.lineHeights.400}",
+            "fontSize": "{origin.font-size.f3}"
           },
-          "L": {
-            "value": {
-              "fontFamily": "{origin.fontFamilies.sage-text}",
-              "fontWeight": "{origin.fontWeights.bold}",
-              "lineHeight": "{origin.lineHeights.400}",
-              "fontSize": "{origin.font-size.typescale.large viewports.5}"
-            },
-            "type": "typography"
+          "type": "typography"
+        },
+        "M": {
+          "value": {
+            "fontFamily": "{origin.fontFamilies.sage-text}",
+            "fontWeight": "{origin.fontWeights.bold}",
+            "lineHeight": "{origin.lineHeights.400}",
+            "fontSize": "{origin.font-size.f4}"
           },
-          "XL": {
-            "value": {
-              "fontFamily": "{origin.fontFamilies.sage-text}",
-              "fontWeight": "{origin.fontWeights.bold}",
-              "lineHeight": "{origin.lineHeights.400}",
-              "fontSize": "{origin.font-size.typescale.large viewports.6}"
-            },
-            "type": "typography"
-          }
+          "type": "typography"
         },
-        "subheading": {
-          "M": {
-            "value": {
-              "fontFamily": "{origin.fontFamilies.sage-text}",
-              "fontWeight": "{origin.fontWeights.medium}",
-              "lineHeight": "{origin.lineHeights.400}",
-              "fontSize": "{origin.font-size.typescale.large viewports.2}"
-            },
-            "type": "typography"
+        "L": {
+          "value": {
+            "fontFamily": "{origin.fontFamilies.sage-text}",
+            "fontWeight": "{origin.fontWeights.bold}",
+            "lineHeight": "{origin.lineHeights.400}",
+            "fontSize": "{origin.font-size.f5}"
           },
-          "L": {
-            "value": {
-              "fontFamily": "{origin.fontFamilies.sage-text}",
-              "fontWeight": "{origin.fontWeights.medium}",
-              "lineHeight": "{origin.lineHeights.400}",
-              "fontSize": "{origin.font-size.typescale.large viewports.3}"
-            },
-            "type": "typography"
-          }
+          "type": "typography"
         },
-        "body": {
-          "M": {
-            "value": {
-              "fontFamily": "{origin.fontFamilies.sage-text}",
-              "fontWeight": "{origin.fontWeights.regular}",
-              "lineHeight": "{origin.lineHeights.500}",
-              "fontSize": "{origin.font-size.typescale.large viewports.0}"
-            },
-            "type": "typography"
+        "XL": {
+          "value": {
+            "fontFamily": "{origin.fontFamilies.sage-text}",
+            "fontWeight": "{origin.fontWeights.bold}",
+            "lineHeight": "{origin.lineHeights.400}",
+            "fontSize": "{origin.font-size.f6}"
           },
-          "L": {
-            "value": {
-              "fontFamily": "{origin.fontFamilies.sage-text}",
-              "fontWeight": "{origin.fontWeights.regular}",
-              "lineHeight": "{origin.lineHeights.500}",
-              "fontSize": "{origin.font-size.typescale.large viewports.1}"
-            },
-            "type": "typography"
-          }
+          "type": "typography"
+        }
+      },
+      "subheading": {
+        "M": {
+          "value": {
+            "fontFamily": "{origin.fontFamilies.sage-text}",
+            "fontWeight": "{origin.fontWeights.medium}",
+            "lineHeight": "{origin.lineHeights.400}",
+            "fontSize": "{origin.font-size.f3}"
+          },
+          "type": "typography"
         },
-        "component": {
-          "strong": {
-            "M": {
-              "value": {
-                "fontFamily": "{origin.fontFamilies.sage-ui}",
-                "fontWeight": "{origin.fontWeights.medium}",
-                "lineHeight": "{origin.lineHeights.500}",
-                "fontSize": "{origin.font-size.typescale.large viewports.0}"
-              },
-              "type": "typography"
-            },
-            "L": {
-              "value": {
-                "fontFamily": "{origin.fontFamilies.sage-ui}",
-                "fontWeight": "{origin.fontWeights.medium}",
-                "lineHeight": "{origin.lineHeights.400}",
-                "fontSize": "{origin.font-size.typescale.large viewports.1}"
-              },
-              "type": "typography"
-            },
-            "XL": {
-              "value": {
-                "fontFamily": "{origin.fontFamilies.sage-ui}",
-                "fontWeight": "{origin.fontWeights.medium}",
-                "lineHeight": "{origin.lineHeights.400}",
-                "fontSize": "{origin.font-size.typescale.large viewports.2}"
-              },
-              "type": "typography"
-            }
-          },
-          "subtle": {
-            "M": {
-              "value": {
-                "fontFamily": "{origin.fontFamilies.sage-ui}",
-                "fontWeight": "{origin.fontWeights.regular}",
-                "lineHeight": "{origin.lineHeights.500}",
-                "fontSize": "{origin.font-size.typescale.large viewports.0}"
-              },
-              "type": "typography"
-            },
-            "L": {
-              "value": {
-                "fontFamily": "{origin.fontFamilies.sage-ui}",
-                "fontWeight": "{origin.fontWeights.regular}",
-                "lineHeight": "{origin.lineHeights.400}",
-                "fontSize": "{origin.font-size.typescale.large viewports.1}"
-              },
-              "type": "typography"
-            },
-            "XL": {
-              "value": {
-                "fontFamily": "{origin.fontFamilies.sage-ui}",
-                "fontWeight": "{origin.fontWeights.regular}",
-                "lineHeight": "{origin.lineHeights.400}",
-                "fontSize": "{origin.font-size.typescale.large viewports.2}"
-              },
-              "type": "typography"
-            }
-          }
+        "L": {
+          "value": {
+            "fontFamily": "{origin.fontFamilies.sage-text}",
+            "fontWeight": "{origin.fontWeights.medium}",
+            "lineHeight": "{origin.lineHeights.400}",
+            "fontSize": "{origin.font-size.f4}"
+          },
+          "type": "typography"
         }
       },
-      "small viewports": {
-        "hero heading": {
-          "M": {
-            "value": {
-              "fontFamily": "{origin.fontFamilies.sage-headline}",
-              "fontWeight": "{origin.fontWeights.black}",
-              "lineHeight": "{origin.lineHeights.400}",
-              "fontSize": "{origin.font-size.typescale.small viewports.7}"
-            },
-            "type": "typography"
+      "body": {
+        "M": {
+          "value": {
+            "fontFamily": "{origin.fontFamilies.sage-text}",
+            "fontWeight": "{origin.fontWeights.regular}",
+            "lineHeight": "{origin.lineHeights.500}",
+            "fontSize": "{origin.font-size.f0}"
           },
-          "L": {
-            "value": {
-              "fontFamily": "{origin.fontFamilies.sage-headline}",
-              "fontWeight": "{origin.fontWeights.black}",
-              "lineHeight": "{origin.lineHeights.400}",
-              "fontSize": "{origin.font-size.typescale.small viewports.8}"
-            },
-            "type": "typography"
-          }
+          "type": "typography"
         },
-        "heading": {
-          "S": {
-            "value": {
-              "fontFamily": "{origin.fontFamilies.sage-text}",
-              "fontWeight": "{origin.fontWeights.bold}",
-              "lineHeight": "{origin.lineHeights.400}",
-              "fontSize": "{origin.font-size.typescale.small viewports.3}"
-            },
-            "type": "typography"
+        "L": {
+          "value": {
+            "fontFamily": "{origin.fontFamilies.sage-text}",
+            "fontWeight": "{origin.fontWeights.regular}",
+            "lineHeight": "{origin.lineHeights.500}",
+            "fontSize": "{origin.font-size.f2}"
           },
+          "type": "typography"
+        }
+      },
+      "component": {
+        "strong": {
           "M": {
             "value": {
-              "fontFamily": "{origin.fontFamilies.sage-text}",
-              "fontWeight": "{origin.fontWeights.bold}",
-              "lineHeight": "{origin.lineHeights.400}",
-              "fontSize": "{origin.font-size.typescale.small viewports.4}"
+              "fontFamily": "{origin.fontFamilies.sage-ui}",
+              "fontWeight": "{origin.fontWeights.medium}",
+              "lineHeight": "{origin.lineHeights.500}",
+              "fontSize": "{origin.font-size.f0}"
             },
             "type": "typography"
           },
           "L": {
             "value": {
-              "fontFamily": "{origin.fontFamilies.sage-text}",
-              "fontWeight": "{origin.fontWeights.bold}",
+              "fontFamily": "{origin.fontFamilies.sage-ui}",
+              "fontWeight": "{origin.fontWeights.medium}",
               "lineHeight": "{origin.lineHeights.400}",
-              "fontSize": "{origin.font-size.typescale.small viewports.5}"
+              "fontSize": "{origin.font-size.f1}"
             },
             "type": "typography"
           },
           "XL": {
             "value": {
-              "fontFamily": "{origin.fontFamilies.sage-text}",
-              "fontWeight": "{origin.fontWeights.bold}",
+              "fontFamily": "{origin.fontFamilies.sage-ui}",
+              "fontWeight": "{origin.fontWeights.medium}",
               "lineHeight": "{origin.lineHeights.400}",
-              "fontSize": "{origin.font-size.typescale.small viewports.6}"
+              "fontSize": "{origin.font-size.f3}"
             },
             "type": "typography"
           }
         },
-        "subheading": {
+        "default": {
           "M": {
             "value": {
-              "fontFamily": "{origin.fontFamilies.sage-text}",
-              "fontWeight": "{origin.fontWeights.medium}",
-              "lineHeight": "{origin.lineHeights.400}",
-              "fontSize": "{origin.font-size.typescale.small viewports.2}"
+              "fontFamily": "{origin.fontFamilies.sage-ui}",
+              "fontWeight": "{origin.fontWeights.regular}",
+              "lineHeight": "{origin.lineHeights.500}",
+              "fontSize": "{origin.font-size.f0}"
             },
             "type": "typography"
           },
           "L": {
             "value": {
-              "fontFamily": "{origin.fontFamilies.sage-text}",
-              "fontWeight": "{origin.fontWeights.medium}",
-              "lineHeight": "{origin.lineHeights.400}",
-              "fontSize": "{origin.font-size.typescale.small viewports.3}"
-            },
-            "type": "typography"
-          }
-        },
-        "body": {
-          "M": {
-            "value": {
-              "fontFamily": "{origin.fontFamilies.sage-text}",
+              "fontFamily": "{origin.fontFamilies.sage-ui}",
               "fontWeight": "{origin.fontWeights.regular}",
-              "lineHeight": "{origin.lineHeights.500}",
-              "fontSize": "{origin.font-size.typescale.small viewports.0}"
+              "lineHeight": "{origin.lineHeights.400}",
+              "fontSize": "{origin.font-size.f1}"
             },
             "type": "typography"
           },
-          "L": {
+          "XL": {
             "value": {
-              "fontFamily": "{origin.fontFamilies.sage-text}",
+              "fontFamily": "{origin.fontFamilies.sage-ui}",
               "fontWeight": "{origin.fontWeights.regular}",
-              "lineHeight": "{origin.lineHeights.500}",
-              "fontSize": "{origin.font-size.typescale.small viewports.1}"
+              "lineHeight": "{origin.lineHeights.400}",
+              "fontSize": "{origin.font-size.f3}"
             },
             "type": "typography"
           }
-        },
-        "component": {
-          "strong": {
-            "M": {
-              "value": {
-                "fontFamily": "{origin.fontFamilies.sage-ui}",
-                "fontWeight": "{origin.fontWeights.medium}",
-                "lineHeight": "{origin.lineHeights.500}",
-                "fontSize": "{origin.font-size.typescale.small viewports.0}"
-              },
-              "type": "typography"
-            },
-            "L": {
-              "value": {
-                "fontFamily": "{origin.fontFamilies.sage-ui}",
-                "fontWeight": "{origin.fontWeights.medium}",
-                "lineHeight": "{origin.lineHeights.400}",
-                "fontSize": "{origin.font-size.typescale.small viewports.1}"
-              },
-              "type": "typography"
-            },
-            "XL": {
-              "value": {
-                "fontFamily": "{origin.fontFamilies.sage-ui}",
-                "fontWeight": "{origin.fontWeights.medium}",
-                "lineHeight": "{origin.lineHeights.400}",
-                "fontSize": "{origin.font-size.typescale.small viewports.2}"
-              },
-              "type": "typography"
-            }
-          },
-          "subtle": {
-            "M": {
-              "value": {
-                "fontFamily": "{origin.fontFamilies.sage-ui}",
-                "fontWeight": "{origin.fontWeights.regular}",
-                "lineHeight": "{origin.lineHeights.500}",
-                "fontSize": "{origin.font-size.typescale.small viewports.0}"
-              },
-              "type": "typography"
-            },
-            "L": {
-              "value": {
-                "fontFamily": "{origin.fontFamilies.sage-ui}",
-                "fontWeight": "{origin.fontWeights.regular}",
-                "lineHeight": "{origin.lineHeights.400}",
-                "fontSize": "{origin.font-size.typescale.small viewports.1}"
-              },
-              "type": "typography"
-            },
-            "XL": {
-              "value": {
-                "fontFamily": "{origin.fontFamilies.sage-ui}",
-                "fontWeight": "{origin.fontWeights.regular}",
-                "lineHeight": "{origin.lineHeights.400}",
-                "fontSize": "{origin.font-size.typescale.small viewports.2}"
-              },
-              "type": "typography"
-            }
-          }
         }
       }
     }
diff --git a/data/tokens/origin.json b/data/tokens/origin.json
index 8596f21f..97946af1 100644
--- a/data/tokens/origin.json
+++ b/data/tokens/origin.json
@@ -198,122 +198,6 @@
         "type": "dimension"
       }
     },
-    "font-size": {
-      "REM": {
-        "value": "16",
-        "type": "fontSizes"
-      },
-      "typescale": {
-        "large viewports": {
-          "0": {
-            "value": "{origin.font-size.typescale.large viewports.base}",
-            "type": "fontSizes"
-          },
-          "1": {
-            "value": "{origin.font-size.typescale.large viewports.0} * {origin.font-size.typescale.large viewports.scale}",
-            "type": "fontSizes"
-          },
-          "2": {
-            "value": "{origin.font-size.typescale.large viewports.1} * {origin.font-size.typescale.large viewports.scale}",
-            "type": "fontSizes"
-          },
-          "3": {
-            "value": "{origin.font-size.typescale.large viewports.2} * {origin.font-size.typescale.large viewports.scale}",
-            "type": "fontSizes"
-          },
-          "4": {
-            "value": "{origin.font-size.typescale.large viewports.3} * {origin.font-size.typescale.large viewports.scale}",
-            "type": "fontSizes"
-          },
-          "5": {
-            "value": "{origin.font-size.typescale.large viewports.4} * {origin.font-size.typescale.large viewports.scale}",
-            "type": "fontSizes"
-          },
-          "6": {
-            "value": "{origin.font-size.typescale.large viewports.5} * {origin.font-size.typescale.large viewports.scale}",
-            "type": "fontSizes"
-          },
-          "7": {
-            "value": "{origin.font-size.typescale.large viewports.6} * {origin.font-size.typescale.large viewports.scale}",
-            "type": "fontSizes"
-          },
-          "8": {
-            "value": "{origin.font-size.typescale.large viewports.7} * {origin.font-size.typescale.large viewports.scale}",
-            "type": "fontSizes"
-          },
-          "scale": {
-            "value": "1.16",
-            "type": "fontSizes"
-          },
-          "neg2": {
-            "value": "{origin.font-size.typescale.large viewports.neg1} / {origin.font-size.typescale.large viewports.scale}",
-            "type": "fontSizes"
-          },
-          "neg1": {
-            "value": "{origin.font-size.typescale.large viewports.base} / {origin.font-size.typescale.large viewports.scale}",
-            "type": "fontSizes"
-          },
-          "base": {
-            "value": "{origin.font-size.REM}",
-            "type": "fontSizes"
-          }
-        },
-        "small viewports": {
-          "0": {
-            "value": "{origin.font-size.typescale.small viewports.base}",
-            "type": "fontSizes"
-          },
-          "1": {
-            "value": "{origin.font-size.typescale.small viewports.0} * {origin.font-size.typescale.small viewports.scale}",
-            "type": "fontSizes"
-          },
-          "2": {
-            "value": "{origin.font-size.typescale.small viewports.1} * {origin.font-size.typescale.small viewports.scale}",
-            "type": "fontSizes"
-          },
-          "3": {
-            "value": "{origin.font-size.typescale.small viewports.2} * {origin.font-size.typescale.small viewports.scale}",
-            "type": "fontSizes"
-          },
-          "4": {
-            "value": "{origin.font-size.typescale.small viewports.3} * {origin.font-size.typescale.small viewports.scale}",
-            "type": "fontSizes"
-          },
-          "5": {
-            "value": "{origin.font-size.typescale.small viewports.4} * {origin.font-size.typescale.small viewports.scale}",
-            "type": "fontSizes"
-          },
-          "6": {
-            "value": "{origin.font-size.typescale.small viewports.5} * {origin.font-size.typescale.small viewports.scale}",
-            "type": "fontSizes"
-          },
-          "7": {
-            "value": "{origin.font-size.typescale.small viewports.6} * {origin.font-size.typescale.small viewports.scale}",
-            "type": "fontSizes"
-          },
-          "8": {
-            "value": "{origin.font-size.typescale.small viewports.7} * {origin.font-size.typescale.small viewports.scale}",
-            "type": "fontSizes"
-          },
-          "scale": {
-            "value": "1.08",
-            "type": "fontSizes"
-          },
-          "neg2": {
-            "value": "{origin.font-size.typescale.small viewports.neg1} / {origin.font-size.typescale.small viewports.scale}",
-            "type": "fontSizes"
-          },
-          "neg1": {
-            "value": "{origin.font-size.typescale.small viewports.base} / {origin.font-size.typescale.small viewports.scale}",
-            "type": "fontSizes"
-          },
-          "base": {
-            "value": "{origin.font-size.REM}",
-            "type": "fontSizes"
-          }
-        }
-      }
-    },
     "fontWeights": {
       "regular": {
         "value": "Regular",
@@ -373,62 +257,24 @@
       }
     },
     "box-shadow": {
-      "upward": {
-        "0": {
-          "value": {
-            "x": "0",
-            "y": "0",
-            "blur": "0",
-            "spread": "0",
-            "color": "{origin.colors.black}",
-            "type": "dropShadow"
-          },
-          "type": "boxShadow"
-        },
-        "1": {
-          "value": [
-            {
-              "x": "0",
-              "y": "-4",
-              "blur": "12",
-              "spread": "0",
-              "color": "rgba({origin.colors.black}, 0.05)",
-              "type": "innerShadow"
-            }
-          ],
-          "type": "boxShadow",
-          "description": "sticky footers"
-        }
-      },
       "downward": {
-        "0": {
-          "value": {
-            "x": "0",
-            "y": "0",
-            "blur": "0",
-            "spread": "0",
-            "color": "{origin.colors.black}",
-            "type": "dropShadow"
-          },
-          "type": "boxShadow"
-        },
         "1": {
           "value": [
             {
               "x": "0",
-              "y": "3",
-              "blur": "3",
+              "y": "1",
+              "blur": "2",
               "spread": "0",
-              "color": "rgba({origin.colors.black}, 0.2)",
+              "color": "rgba( {origin.colors.storm} , 0.6)",
               "type": "dropShadow"
             },
             {
               "x": "0",
-              "y": "2",
-              "blur": "4",
+              "y": "1",
+              "blur": "3",
               "spread": "0",
-              "color": "rgba({origin.colors.black}, 0.15)",
-              "type": "innerShadow"
+              "color": "rgba( {origin.colors.storm} , 0.2)",
+              "type": "dropShadow"
             }
           ],
           "type": "boxShadow"
@@ -437,19 +283,19 @@
           "value": [
             {
               "x": "0",
-              "y": "5",
-              "blur": "5",
+              "y": "1",
+              "blur": "2",
               "spread": "0",
-              "color": "rgba({origin.colors.black}, 0.2)",
+              "color": "rgba( {origin.colors.storm} , 0.6)",
               "type": "dropShadow"
             },
             {
               "x": "0",
-              "y": "10",
-              "blur": "10",
-              "spread": "0",
-              "color": "rgba({origin.colors.black}, 0.1)",
-              "type": "innerShadow"
+              "y": "2",
+              "blur": "6",
+              "spread": "2",
+              "color": "rgba( {origin.colors.storm} , 0.2)",
+              "type": "dropShadow"
             }
           ],
           "type": "boxShadow"
@@ -458,19 +304,19 @@
           "value": [
             {
               "x": "0",
-              "y": "10",
-              "blur": "20",
-              "spread": "0",
-              "color": "rgba({origin.colors.black}, 0.2)",
+              "y": "4",
+              "blur": "8",
+              "spread": "3",
+              "color": "rgba( {origin.colors.storm} , 0.2)",
               "type": "dropShadow"
             },
             {
               "x": "0",
-              "y": "20",
-              "blur": "40",
+              "y": "1",
+              "blur": "3",
               "spread": "0",
-              "color": "rgba({origin.colors.black},0.1)",
-              "type": "innerShadow"
+              "color": "rgba( {origin.colors.storm} , 0.60)",
+              "type": "dropShadow"
             }
           ],
           "type": "boxShadow"
@@ -479,19 +325,19 @@
           "value": [
             {
               "x": "0",
-              "y": "10",
-              "blur": "30",
-              "spread": "0",
-              "color": "rgba({origin.colors.black}, 0.1)",
+              "y": "6",
+              "blur": "10",
+              "spread": "4",
+              "color": "rgba( {origin.colors.storm} , 0.2)",
               "type": "dropShadow"
             },
             {
               "x": "0",
-              "y": "30",
-              "blur": "60",
+              "y": "2",
+              "blur": "3",
               "spread": "0",
-              "color": "rgba({origin.colors.black}, 0.1)",
-              "type": "innerShadow"
+              "color": "rgba( {origin.colors.storm} , 0.6)",
+              "type": "dropShadow"
             }
           ],
           "type": "boxShadow"
@@ -500,19 +346,34 @@
           "value": [
             {
               "x": "0",
-              "y": "10",
-              "blur": "40",
-              "spread": "0",
-              "color": "rgba({origin.colors.black}, 0.04)",
+              "y": "8",
+              "blur": "12",
+              "spread": "6",
+              "color": "rgba( {origin.colors.storm} , 0.2)",
               "type": "dropShadow"
             },
             {
               "x": "0",
-              "y": "50",
-              "blur": "80",
+              "y": "4",
+              "blur": "4",
               "spread": "0",
-              "color": "rgba({origin.colors.black}, 0.1)",
-              "type": "innerShadow"
+              "color": "rgba( {origin.colors.storm} , 0.6)",
+              "type": "dropShadow"
+            }
+          ],
+          "type": "boxShadow"
+        }
+      },
+      "upward": {
+        "4": {
+          "value": [
+            {
+              "x": "0",
+              "y": "-6",
+              "blur": "10",
+              "spread": "4",
+              "color": "rgba( {origin.colors.storm} , 0.15)",
+              "type": "dropShadow"
             }
           ],
           "type": "boxShadow"
@@ -526,7 +387,7 @@
               "y": "-1",
               "blur": "0",
               "spread": "0",
-              "color": "origin.colors.navyAdjusted.050",
+              "color": "rgba( {origin.colors.black} , 0.3)",
               "type": "innerShadow"
             }
           ],
@@ -534,20 +395,392 @@
           "description": "sticky footers"
         }
       }
-    }
-  },
-  "opacity": {
-    "300": {
-      "value": "0.3",
-      "type": "opacity"
     },
-    "600": {
-      "value": "0.6",
-      "type": "opacity"
+    "font-scale": {
+      "const": {
+        "min": {
+          "f0": {
+            "value": "16",
+            "type": "fontSizes"
+          },
+          "r": {
+            "value": "1.08",
+            "type": "fontSizes"
+          },
+          "n": {
+            "value": "1",
+            "type": "fontSizes"
+          }
+        },
+        "max": {
+          "f0": {
+            "value": "16",
+            "type": "fontSizes"
+          },
+          "r": {
+            "value": "1.16",
+            "type": "fontSizes"
+          },
+          "n": {
+            "value": "1",
+            "type": "fontSizes"
+          }
+        }
+      },
+      "f-2": {
+        "min": {
+          "value": "5*roundTo(({origin.font-scale.const.min.f0}*{origin.font-scale.const.min.r}^(-2/{origin.font-scale.const.min.n})/5),1)",
+          "type": "fontSizes"
+        },
+        "max": {
+          "value": "5*roundTo(({origin.font-scale.const.max.f0}*{origin.font-scale.const.max.r}^(-2/{origin.font-scale.const.max.n})/5),1)",
+          "type": "fontSizes"
+        },
+        "v": {
+          "value": "100 * ({origin.font-scale.f-2.max}-{origin.font-scale.f-2.min}) / ({origin.viewport.max}-{origin.viewport.min})",
+          "type": "fontSizes"
+        },
+        "r": {
+          "value": "( {origin.viewport.min} * {origin.font-scale.f-2.max} - {origin.viewport.max} * {origin.font-scale.f-2.min}) / ({origin.viewport.min}-{origin.viewport.max})",
+          "type": "fontSizes"
+        },
+        "fluid": {
+          "value": "round(({origin.viewport.width}/100) * {origin.font-scale.f-2.v} + {origin.font-scale.f-2.r})",
+          "type": "fontSizes"
+        }
+      },
+      "f-1": {
+        "min": {
+          "value": "5*roundTo(({origin.font-scale.const.min.f0}*{origin.font-scale.const.min.r}^(-1/{origin.font-scale.const.min.n})/5),1)",
+          "type": "fontSizes"
+        },
+        "max": {
+          "value": "5*roundTo(({origin.font-scale.const.max.f0}*{origin.font-scale.const.max.r}^(-1/{origin.font-scale.const.max.n})/5),1)",
+          "type": "fontSizes"
+        },
+        "v": {
+          "value": "100 * ({origin.font-scale.f-1.max}-{origin.font-scale.f-1.min}) / ({origin.viewport.max}-{origin.viewport.min})",
+          "type": "fontSizes"
+        },
+        "r": {
+          "value": "( {origin.viewport.min} * {origin.font-scale.f-1.max} - {origin.viewport.max} * {origin.font-scale.f-1.min}) / ({origin.viewport.min}-{origin.viewport.max})",
+          "type": "fontSizes"
+        },
+        "fluid": {
+          "value": "round(({origin.viewport.width}/100) * {origin.font-scale.f-1.v} + {origin.font-scale.f-1.r})",
+          "type": "fontSizes"
+        }
+      },
+      "f0": {
+        "min": {
+          "value": "5*roundTo(({origin.font-scale.const.min.f0}*{origin.font-scale.const.min.r}^(0/{origin.font-scale.const.min.n})/5),1)",
+          "type": "fontSizes"
+        },
+        "max": {
+          "value": "5*roundTo(({origin.font-scale.const.max.f0}*{origin.font-scale.const.max.r}^(0/{origin.font-scale.const.max.n})/5),1)",
+          "type": "fontSizes"
+        },
+        "v": {
+          "value": "100 * ({origin.font-scale.f0.max}-{origin.font-scale.f0.min}) / ({origin.viewport.max}-{origin.viewport.min})",
+          "type": "fontSizes"
+        },
+        "r": {
+          "value": "( {origin.viewport.min} * {origin.font-scale.f0.max} - {origin.viewport.max} * {origin.font-scale.f0.min}) / ({origin.viewport.min}-{origin.viewport.max})",
+          "type": "fontSizes"
+        },
+        "fluid": {
+          "value": "round(({origin.viewport.width}/100) * {origin.font-scale.f0.v} + {origin.font-scale.f0.r})",
+          "type": "fontSizes"
+        }
+      },
+      "f1": {
+        "min": {
+          "value": "5*roundTo(({origin.font-scale.const.min.f0}*{origin.font-scale.const.min.r}^(1/{origin.font-scale.const.min.n})/5),1)",
+          "type": "fontSizes"
+        },
+        "max": {
+          "value": "5*roundTo(({origin.font-scale.const.max.f0}*{origin.font-scale.const.max.r}^(1/{origin.font-scale.const.max.n})/5),1)",
+          "type": "fontSizes"
+        },
+        "v": {
+          "value": "100 * ({origin.font-scale.f1.max}-{origin.font-scale.f1.min}) / ({origin.viewport.max}-{origin.viewport.min})",
+          "type": "fontSizes"
+        },
+        "r": {
+          "value": "( {origin.viewport.min} * {origin.font-scale.f1.max} - {origin.viewport.max} * {origin.font-scale.f1.min}) / ({origin.viewport.min}-{origin.viewport.max})",
+          "type": "fontSizes"
+        },
+        "fluid": {
+          "value": "round(({origin.viewport.width}/100) * {origin.font-scale.f1.v} + {origin.font-scale.f1.r})",
+          "type": "fontSizes"
+        }
+      },
+      "f2": {
+        "min": {
+          "value": "5*roundTo(({origin.font-scale.const.min.f0}*{origin.font-scale.const.min.r}^(2/{origin.font-scale.const.min.n})/5),1)",
+          "type": "fontSizes"
+        },
+        "max": {
+          "value": "5*roundTo(({origin.font-scale.const.max.f0}*{origin.font-scale.const.max.r}^(2/{origin.font-scale.const.max.n})/5),1)",
+          "type": "fontSizes"
+        },
+        "v": {
+          "value": "100 * ({origin.font-scale.f2.max}-{origin.font-scale.f2.min}) / ({origin.viewport.max}-{origin.viewport.min})",
+          "type": "fontSizes"
+        },
+        "r": {
+          "value": "( {origin.viewport.min} * {origin.font-scale.f2.max} - {origin.viewport.max} * {origin.font-scale.f2.min}) / ({origin.viewport.min}-{origin.viewport.max})",
+          "type": "fontSizes"
+        },
+        "fluid": {
+          "value": "round(({origin.viewport.width}/100) * {origin.font-scale.f2.v} + {origin.font-scale.f2.r})",
+          "type": "fontSizes"
+        }
+      },
+      "f3": {
+        "min": {
+          "value": "5*roundTo(({origin.font-scale.const.min.f0}*{origin.font-scale.const.min.r}^(3/{origin.font-scale.const.min.n})/5),1)",
+          "type": "fontSizes"
+        },
+        "max": {
+          "value": "5*roundTo(({origin.font-scale.const.max.f0}*{origin.font-scale.const.max.r}^(3/{origin.font-scale.const.max.n})/5),1)",
+          "type": "fontSizes"
+        },
+        "v": {
+          "value": "100 * ({origin.font-scale.f3.max}-{origin.font-scale.f3.min}) / ({origin.viewport.max}-{origin.viewport.min})",
+          "type": "fontSizes"
+        },
+        "r": {
+          "value": "( {origin.viewport.min} * {origin.font-scale.f3.max} - {origin.viewport.max} * {origin.font-scale.f3.min}) / ({origin.viewport.min}-{origin.viewport.max})",
+          "type": "fontSizes"
+        },
+        "fluid": {
+          "value": "round(({origin.viewport.width}/100) * {origin.font-scale.f3.v} + {origin.font-scale.f3.r})",
+          "type": "fontSizes"
+        }
+      },
+      "f4": {
+        "min": {
+          "value": "5*roundTo(({origin.font-scale.const.min.f0}*{origin.font-scale.const.min.r}^(4/{origin.font-scale.const.min.n})/5),1)",
+          "type": "fontSizes"
+        },
+        "max": {
+          "value": "5*roundTo(({origin.font-scale.const.max.f0}*{origin.font-scale.const.max.r}^(4/{origin.font-scale.const.max.n})/5),1)",
+          "type": "fontSizes"
+        },
+        "v": {
+          "value": "100 * ({origin.font-scale.f4.max}-{origin.font-scale.f4.min}) / ({origin.viewport.max}-{origin.viewport.min})",
+          "type": "fontSizes"
+        },
+        "r": {
+          "value": "( {origin.viewport.min} * {origin.font-scale.f4.max} - {origin.viewport.max} * {origin.font-scale.f4.min}) / ({origin.viewport.min}-{origin.viewport.max})",
+          "type": "fontSizes"
+        },
+        "fluid": {
+          "value": "round(({origin.viewport.width}/100) * {origin.font-scale.f4.v} + {origin.font-scale.f4.r})",
+          "type": "fontSizes"
+        }
+      },
+      "f5": {
+        "min": {
+          "value": "5*roundTo(({origin.font-scale.const.min.f0}*{origin.font-scale.const.min.r}^(5/{origin.font-scale.const.min.n})/5),1)",
+          "type": "fontSizes"
+        },
+        "max": {
+          "value": "5*roundTo(({origin.font-scale.const.max.f0}*{origin.font-scale.const.max.r}^(5/{origin.font-scale.const.max.n})/5),1)",
+          "type": "fontSizes"
+        },
+        "v": {
+          "value": "100 * ({origin.font-scale.f5.max}-{origin.font-scale.f5.min}) / ({origin.viewport.max}-{origin.viewport.min})",
+          "type": "fontSizes"
+        },
+        "r": {
+          "value": "( {origin.viewport.min} * {origin.font-scale.f5.max} - {origin.viewport.max} * {origin.font-scale.f5.min}) / ({origin.viewport.min}-{origin.viewport.max})",
+          "type": "fontSizes"
+        },
+        "fluid": {
+          "value": "round(({origin.viewport.width}/100) * {origin.font-scale.f5.v} + {origin.font-scale.f5.r})",
+          "type": "fontSizes"
+        }
+      },
+      "f6": {
+        "min": {
+          "value": "5*roundTo(({origin.font-scale.const.min.f0}*{origin.font-scale.const.min.r}^(6/{origin.font-scale.const.min.n})/5),1)",
+          "type": "fontSizes"
+        },
+        "max": {
+          "value": "5*roundTo(({origin.font-scale.const.max.f0}*{origin.font-scale.const.max.r}^(6/{origin.font-scale.const.max.n})/5),1)",
+          "type": "fontSizes"
+        },
+        "v": {
+          "value": "100 * ({origin.font-scale.f6.max}-{origin.font-scale.f6.min}) / ({origin.viewport.max}-{origin.viewport.min})",
+          "type": "fontSizes"
+        },
+        "r": {
+          "value": "( {origin.viewport.min} * {origin.font-scale.f6.max} - {origin.viewport.max} * {origin.font-scale.f6.min}) / ({origin.viewport.min}-{origin.viewport.max})",
+          "type": "fontSizes"
+        },
+        "fluid": {
+          "value": "round(({origin.viewport.width}/100) * {origin.font-scale.f6.v} + {origin.font-scale.f6.r})",
+          "type": "fontSizes"
+        }
+      },
+      "f7": {
+        "min": {
+          "value": "5*roundTo(({origin.font-scale.const.min.f0}*{origin.font-scale.const.min.r}^(7/{origin.font-scale.const.min.n})/5),1)",
+          "type": "fontSizes"
+        },
+        "max": {
+          "value": "5*roundTo(({origin.font-scale.const.max.f0}*{origin.font-scale.const.max.r}^(7/{origin.font-scale.const.max.n})/5),1)",
+          "type": "fontSizes"
+        },
+        "v": {
+          "value": "100 * ({origin.font-scale.f7.max}-{origin.font-scale.f7.min}) / ({origin.viewport.max}-{origin.viewport.min})",
+          "type": "fontSizes"
+        },
+        "r": {
+          "value": "( {origin.viewport.min} * {origin.font-scale.f7.max} - {origin.viewport.max} * {origin.font-scale.f7.min}) / ({origin.viewport.min}-{origin.viewport.max})",
+          "type": "fontSizes"
+        },
+        "fluid": {
+          "value": "round(({origin.viewport.width}/100) * {origin.font-scale.f7.v} + {origin.font-scale.f7.r})",
+          "type": "fontSizes"
+        }
+      },
+      "f8": {
+        "min": {
+          "value": "5*roundTo(({origin.font-scale.const.min.f0}*{origin.font-scale.const.min.r}^(8/{origin.font-scale.const.min.n})/5),1)",
+          "type": "fontSizes"
+        },
+        "max": {
+          "value": "5*roundTo(({origin.font-scale.const.max.f0}*{origin.font-scale.const.max.r}^(8/{origin.font-scale.const.max.n})/5),1)",
+          "type": "fontSizes"
+        },
+        "v": {
+          "value": "100 * ({origin.font-scale.f8.max}-{origin.font-scale.f8.min}) / ({origin.viewport.max}-{origin.viewport.min})",
+          "type": "fontSizes"
+        },
+        "r": {
+          "value": "( {origin.viewport.min} * {origin.font-scale.f8.max} - {origin.viewport.max} * {origin.font-scale.f8.min}) / ({origin.viewport.min}-{origin.viewport.max})",
+          "type": "fontSizes"
+        },
+        "fluid": {
+          "value": "round(({origin.viewport.width}/100) * {origin.font-scale.f8.v} + {origin.font-scale.f8.r})",
+          "type": "fontSizes"
+        }
+      },
+      "f9": {
+        "min": {
+          "value": "5*roundTo(({origin.font-scale.const.min.f0}*{origin.font-scale.const.min.r}^(9/{origin.font-scale.const.min.n})/5),1)",
+          "type": "fontSizes"
+        },
+        "max": {
+          "value": "5*roundTo(({origin.font-scale.const.max.f0}*{origin.font-scale.const.max.r}^(9/{origin.font-scale.const.max.n})/5),1)",
+          "type": "fontSizes"
+        },
+        "v": {
+          "value": "100 * ({origin.font-scale.f9.max}-{origin.font-scale.f9.min}) / ({origin.viewport.max}-{origin.viewport.min})",
+          "type": "fontSizes"
+        },
+        "r": {
+          "value": "( {origin.viewport.min} * {origin.font-scale.f9.max} - {origin.viewport.max} * {origin.font-scale.f9.min}) / ({origin.viewport.min}-{origin.viewport.max})",
+          "type": "fontSizes"
+        },
+        "fluid": {
+          "value": "round(({origin.viewport.width}/100) * {origin.font-scale.f9.v} + {origin.font-scale.f9.r})",
+          "type": "fontSizes"
+        }
+      },
+      "f10": {
+        "min": {
+          "value": "5*roundTo(({origin.font-scale.const.min.f0}*{origin.font-scale.const.min.r}^(10/{origin.font-scale.const.min.n})/5),1)",
+          "type": "fontSizes"
+        },
+        "max": {
+          "value": "5*roundTo(({origin.font-scale.const.max.f0}*{origin.font-scale.const.max.r}^(10/{origin.font-scale.const.max.n})/5),1)",
+          "type": "fontSizes"
+        },
+        "v": {
+          "value": "100 * ({origin.font-scale.f10.max}-{origin.font-scale.f10.min}) / ({origin.viewport.max}-{origin.viewport.min})",
+          "type": "fontSizes"
+        },
+        "r": {
+          "value": "( {origin.viewport.min} * {origin.font-scale.f10.max} - {origin.viewport.max} * {origin.font-scale.f10.min}) / ({origin.viewport.min}-{origin.viewport.max})",
+          "type": "fontSizes"
+        },
+        "fluid": {
+          "value": "round(({origin.viewport.width}/100) * {origin.font-scale.f10.v} + {origin.font-scale.f10.r})",
+          "type": "fontSizes"
+        }
+      }
+    },
+    "font-size": {
+      "f-2": {
+        "value": "min( max( {origin.font-scale.f-2.min},  {origin.font-scale.f-2.fluid}) ,{origin.font-scale.f-2.max})",
+        "type": "fontSizes"
+      },
+      "f-1": {
+        "value": "min( max( {origin.font-scale.f-1.min},  {origin.font-scale.f-1.fluid}) ,{origin.font-scale.f-1.max})",
+        "type": "fontSizes"
+      },
+      "f0": {
+        "value": "min( max( {origin.font-scale.f0.min},  {origin.font-scale.f0.fluid}) ,{origin.font-scale.f0.max})",
+        "type": "fontSizes"
+      },
+      "f1": {
+        "value": "min( max( {origin.font-scale.f1.min},  {origin.font-scale.f1.fluid}) ,{origin.font-scale.f1.max})",
+        "type": "fontSizes"
+      },
+      "f2": {
+        "value": "min( max( {origin.font-scale.f2.min},  {origin.font-scale.f2.fluid}) ,{origin.font-scale.f2.max})",
+        "type": "fontSizes"
+      },
+      "f3": {
+        "value": "min( max( {origin.font-scale.f3.min},  {origin.font-scale.f3.fluid}) ,{origin.font-scale.f3.max})",
+        "type": "fontSizes"
+      },
+      "f4": {
+        "value": "min( max( {origin.font-scale.f4.min},  {origin.font-scale.f4.fluid}) ,{origin.font-scale.f4.max})",
+        "type": "fontSizes"
+      },
+      "f5": {
+        "value": "min( max( {origin.font-scale.f5.min},  {origin.font-scale.f5.fluid}) ,{origin.font-scale.f5.max})",
+        "type": "fontSizes"
+      },
+      "f6": {
+        "value": "min( max( {origin.font-scale.f6.min},  {origin.font-scale.f6.fluid}) ,{origin.font-scale.f6.max})",
+        "type": "fontSizes"
+      },
+      "f7": {
+        "value": "min( max( {origin.font-scale.f7.min},  {origin.font-scale.f7.fluid}) ,{origin.font-scale.f7.max})",
+        "type": "fontSizes"
+      },
+      "f8": {
+        "value": "min( max( {origin.font-scale.f8.min},  {origin.font-scale.f8.fluid}) ,{origin.font-scale.f8.max})",
+        "type": "fontSizes"
+      },
+      "f9": {
+        "value": "min( max( {origin.font-scale.f9.min},  {origin.font-scale.f9.fluid}) ,{origin.font-scale.f9.max})",
+        "type": "fontSizes"
+      },
+      "f10": {
+        "value": "min( max( {origin.font-scale.f10.min},  {origin.font-scale.f10.fluid}) ,{origin.font-scale.f10.max})",
+        "type": "fontSizes"
+      }
     },
-    "800": {
-      "value": "0.8",
-      "type": "opacity"
+    "viewport": {
+      "width": {
+        "value": "{origin.viewport.min}",
+        "type": "sizing"
+      },
+      "min": {
+        "value": "320",
+        "type": "sizing"
+      },
+      "max": {
+        "value": "1920",
+        "type": "sizing"
+      }
     }
   }
 }
\ No newline at end of file