diff --git a/data/tokens.json b/data/tokens.json
index acb38466..bd4aeaa5 100644
--- a/data/tokens.json
+++ b/data/tokens.json
@@ -231,110 +231,6 @@
           "type": "textCase"
         }
       },
-      "h1": {
-        "value": {
-          "fontFamily": "{typography.fontFamily.sansSerif}",
-          "fontWeight": "{typography.weight.heading}",
-          "lineHeight": "{typography.lineHeight.xlarge}",
-          "fontSize": "{typography.size.h1}",
-          "letterSpacing": "{typography.letterSpacing.base}",
-          "paragraphSpacing": "{typography.paragraphSpacing.base}",
-          "textDecoration": "{typography.textDecoration.base}",
-          "textCase": "{typography.textCase.base}"
-        },
-        "type": "typography"
-      },
-      "h2": {
-        "value": {
-          "fontFamily": "{typography.fontFamily.sansSerif}",
-          "fontWeight": "{typography.weight.heading}",
-          "lineHeight": "{typography.lineHeight.xlarge}",
-          "fontSize": "{typography.size.h2}",
-          "letterSpacing": "{typography.letterSpacing.base}",
-          "paragraphSpacing": "{typography.paragraphSpacing.base}",
-          "textDecoration": "{typography.textDecoration.base}",
-          "textCase": "{typography.textCase.base}"
-        },
-        "type": "typography"
-      },
-      "h3": {
-        "value": {
-          "fontFamily": "{typography.fontFamily.sansSerif}",
-          "fontWeight": "{typography.weight.heading}",
-          "lineHeight": "{typography.lineHeight.large}",
-          "fontSize": "{typography.size.h3}",
-          "letterSpacing": "{typography.letterSpacing.base}",
-          "paragraphSpacing": "{typography.paragraphSpacing.base}",
-          "textDecoration": "{typography.textDecoration.base}",
-          "textCase": "{typography.textCase.base}"
-        },
-        "type": "typography"
-      },
-      "h4": {
-        "value": {
-          "fontFamily": "{typography.fontFamily.sansSerif}",
-          "fontWeight": "{typography.weight.heading}",
-          "lineHeight": "{typography.lineHeight.normal}",
-          "fontSize": "{typography.size.h4}",
-          "letterSpacing": "{typography.letterSpacing.base}",
-          "paragraphSpacing": "{typography.paragraphSpacing.base}",
-          "textDecoration": "{typography.textDecoration.base}",
-          "textCase": "{typography.textCase.base}"
-        },
-        "type": "typography"
-      },
-      "h5": {
-        "value": {
-          "fontFamily": "{typography.fontFamily.sansSerif}",
-          "fontWeight": "{typography.weight.heading}",
-          "lineHeight": "{typography.lineHeight.normal}",
-          "fontSize": "{typography.size.body}",
-          "letterSpacing": "{typography.letterSpacing.base}",
-          "paragraphSpacing": "{typography.paragraphSpacing.base}",
-          "textDecoration": "{typography.textDecoration.base}",
-          "textCase": "{typography.textCase.base}"
-        },
-        "type": "typography"
-      },
-      "body": {
-        "value": {
-          "fontFamily": "{typography.fontFamily.sansSerif}",
-          "fontWeight": "{typography.weight.base}",
-          "lineHeight": "{typography.lineHeight.normal}",
-          "fontSize": "{typography.size.body}",
-          "letterSpacing": "{typography.letterSpacing.base}",
-          "paragraphSpacing": "{typography.paragraphSpacing.base}",
-          "textDecoration": "{typography.textDecoration.base}",
-          "textCase": "{typography.textCase.base}"
-        },
-        "type": "typography"
-      },
-      "footnote": {
-        "value": {
-          "fontFamily": "{typography.fontFamily.sansSerif}",
-          "fontWeight": "{typography.weight.base}",
-          "lineHeight": "{typography.lineHeight.small}",
-          "fontSize": "{typography.size.footnote}",
-          "letterSpacing": "{typography.letterSpacing.base}",
-          "paragraphSpacing": "{typography.paragraphSpacing.base}",
-          "textDecoration": "{typography.textDecoration.base}",
-          "textCase": "{typography.textCase.base}"
-        },
-        "type": "typography"
-      },
-      "caption": {
-        "type": "typography",
-        "value": {
-          "fontFamily": "{typography.fontFamily.sansSerif}",
-          "fontWeight": "{typography.weight.base}",
-          "lineHeight": "{typography.lineHeight.small}",
-          "fontSize": "{typography.size.caption}",
-          "letterSpacing": "{typography.letterSpacing.base}",
-          "paragraphSpacing": "{typography.paragraphSpacing.base}",
-          "textDecoration": "{typography.textDecoration.base}",
-          "textCase": "{typography.textCase.base}"
-        }
-      },
       "size": {
         "h1": {
           "value": "40px",
@@ -365,6 +261,20 @@
           "type": "fontSizes"
         }
       },
+      "mobileSize": {
+        "h1": {
+          "value": "32px",
+          "type": "fontSizes"
+        },
+        "h2": {
+          "value": "28px",
+          "type": "fontSizes"
+        },
+        "h3": {
+          "value": "22px",
+          "type": "fontSizes"
+        }
+      },
       "lineHeight": {
         "xlarge": {
           "value": "40px",
@@ -411,18 +321,151 @@
           "type": "fontWeights"
         }
       },
-      "mobileSize": {
+      "desktop": {
         "h1": {
-          "value": "32px",
-          "type": "fontSizes"
+          "value": {
+            "fontFamily": "{typography.fontFamily.sansSerif}",
+            "fontWeight": "{typography.weight.heading}",
+            "lineHeight": "{typography.lineHeight.xlarge}",
+            "fontSize": "{typography.size.h1}",
+            "letterSpacing": "{typography.letterSpacing.base}",
+            "paragraphSpacing": "{typography.paragraphSpacing.base}",
+            "textDecoration": "{typography.textDecoration.base}",
+            "textCase": "{typography.textCase.base}"
+          },
+          "type": "typography"
         },
         "h2": {
-          "value": "28px",
-          "type": "fontSizes"
+          "value": {
+            "fontFamily": "{typography.fontFamily.sansSerif}",
+            "fontWeight": "{typography.weight.heading}",
+            "lineHeight": "{typography.lineHeight.xlarge}",
+            "fontSize": "{typography.size.h2}",
+            "letterSpacing": "{typography.letterSpacing.base}",
+            "paragraphSpacing": "{typography.paragraphSpacing.base}",
+            "textDecoration": "{typography.textDecoration.base}",
+            "textCase": "{typography.textCase.base}"
+          },
+          "type": "typography"
         },
         "h3": {
-          "value": "22px",
-          "type": "fontSizes"
+          "value": {
+            "fontFamily": "{typography.fontFamily.sansSerif}",
+            "fontWeight": "{typography.weight.heading}",
+            "lineHeight": "{typography.lineHeight.large}",
+            "fontSize": "{typography.size.h3}",
+            "letterSpacing": "{typography.letterSpacing.base}",
+            "paragraphSpacing": "{typography.paragraphSpacing.base}",
+            "textDecoration": "{typography.textDecoration.base}",
+            "textCase": "{typography.textCase.base}"
+          },
+          "type": "typography"
+        },
+        "h4": {
+          "value": {
+            "fontFamily": "{typography.fontFamily.sansSerif}",
+            "fontWeight": "{typography.weight.heading}",
+            "lineHeight": "{typography.lineHeight.normal}",
+            "fontSize": "{typography.size.h4}",
+            "letterSpacing": "{typography.letterSpacing.base}",
+            "paragraphSpacing": "{typography.paragraphSpacing.base}",
+            "textDecoration": "{typography.textDecoration.base}",
+            "textCase": "{typography.textCase.base}"
+          },
+          "type": "typography"
+        },
+        "h5": {
+          "value": {
+            "fontFamily": "{typography.fontFamily.sansSerif}",
+            "fontWeight": "{typography.weight.heading}",
+            "lineHeight": "{typography.lineHeight.normal}",
+            "fontSize": "{typography.size.body}",
+            "letterSpacing": "{typography.letterSpacing.base}",
+            "paragraphSpacing": "{typography.paragraphSpacing.base}",
+            "textDecoration": "{typography.textDecoration.base}",
+            "textCase": "{typography.textCase.base}"
+          },
+          "type": "typography"
+        },
+        "body": {
+          "value": {
+            "fontFamily": "{typography.fontFamily.sansSerif}",
+            "fontWeight": "{typography.weight.base}",
+            "lineHeight": "{typography.lineHeight.normal}",
+            "fontSize": "{typography.size.body}",
+            "letterSpacing": "{typography.letterSpacing.base}",
+            "paragraphSpacing": "{typography.paragraphSpacing.base}",
+            "textDecoration": "{typography.textDecoration.base}",
+            "textCase": "{typography.textCase.base}"
+          },
+          "type": "typography"
+        },
+        "footnote": {
+          "value": {
+            "fontFamily": "{typography.fontFamily.sansSerif}",
+            "fontWeight": "{typography.weight.base}",
+            "lineHeight": "{typography.lineHeight.small}",
+            "fontSize": "{typography.size.footnote}",
+            "letterSpacing": "{typography.letterSpacing.base}",
+            "paragraphSpacing": "{typography.paragraphSpacing.base}",
+            "textDecoration": "{typography.textDecoration.base}",
+            "textCase": "{typography.textCase.base}"
+          },
+          "type": "typography"
+        },
+        "caption": {
+          "type": "typography",
+          "value": {
+            "fontFamily": "{typography.fontFamily.sansSerif}",
+            "fontWeight": "{typography.weight.base}",
+            "lineHeight": "{typography.lineHeight.small}",
+            "fontSize": "{typography.size.caption}",
+            "letterSpacing": "{typography.letterSpacing.base}",
+            "paragraphSpacing": "{typography.paragraphSpacing.base}",
+            "textDecoration": "{typography.textDecoration.base}",
+            "textCase": "{typography.textCase.base}"
+          }
+        }
+      },
+      "mobile": {
+        "h1": {
+          "value": {
+            "fontFamily": "{typography.fontFamily.sansSerif}",
+            "fontWeight": "{typography.weight.heading}",
+            "lineHeight": "{typography.lineHeight.xlarge}",
+            "fontSize": "{typography.mobileSize.h1}",
+            "letterSpacing": "{typography.letterSpacing.base}",
+            "paragraphSpacing": "{typography.paragraphSpacing.base}",
+            "textDecoration": "{typography.textDecoration.base}",
+            "textCase": "{typography.textCase.base}"
+          },
+          "type": "typography"
+        },
+        "h2": {
+          "value": {
+            "fontFamily": "{typography.fontFamily.sansSerif}",
+            "fontWeight": "{typography.weight.heading}",
+            "lineHeight": "{typography.lineHeight.normal}",
+            "fontSize": "{typography.mobileSize.h2}",
+            "letterSpacing": "{typography.letterSpacing.base}",
+            "paragraphSpacing": "{typography.paragraphSpacing.base}",
+            "textDecoration": "{typography.textDecoration.base}",
+            "textCase": "{typography.textCase.base}"
+          },
+          "type": "typography"
+        },
+        "h3": {
+          "value": {
+            "fontFamily": "{typography.fontFamily.sansSerif}",
+            "fontWeight": "{typography.weight.heading}",
+            "lineHeight": "{typography.lineHeight.large}",
+            "fontSize": "{typography.mobileSize.h3}",
+            "letterSpacing": "{typography.letterSpacing.base}",
+            "paragraphSpacing": "{typography.paragraphSpacing.base}",
+            "textDecoration": "{typography.textDecoration.base}",
+            "textCase": "{typography.textCase.base}"
+          },
+          "type": "typography"
         }
       }
     }