diff --git a/tokens.json b/tokens.json
index 5c2198d37..e3530884e 100644
--- a/tokens.json
+++ b/tokens.json
@@ -1339,6 +1339,12 @@
               "value": "{core.color.info.100}",
               "type": "color"
             }
+          },
+          "tertiary": {
+            "default": {
+              "value": "{core.color.tertiary.100}",
+              "type": "color"
+            }
           }
         }
       },
@@ -1527,6 +1533,12 @@
               "value": "{core.color.info.100}",
               "type": "color"
             }
+          },
+          "tertiary": {
+            "default": {
+              "value": "{core.color.tertiary.100}",
+              "type": "color"
+            }
           }
         }
       },
@@ -1750,6 +1762,10 @@
               "value": "{global.background.color.primary.default}",
               "type": "color"
             },
+            "selected": {
+              "value": "{global.background.color.primary.muted}",
+              "type": "color"
+            },
             "pressed": {
               "value": "{global.background.color.primary.emphasis}",
               "type": "color"
@@ -1779,7 +1795,7 @@
               "type": "color"
             },
             "pressed": {
-              "value": "{global.background.color.primary.muted}",
+              "value": "{global.background.color.primary.emphasis}",
               "type": "color"
             }
           }
@@ -2594,20 +2610,12 @@
       },
       "content": {
         "color": {
-          "default": {
-            "value": "{global.content.color.transparent}",
-            "type": "color"
-          },
-          "icon": {
-            "value": "{global.content.color.text.subtle}",
-            "type": "color"
-          },
-          "hover": {
-            "value": "{global.content.color.text.muted}",
+          "text": {
+            "value": "{global.content.color.text.default}",
             "type": "color"
           },
           "selected": {
-            "value": "{global.content.color.primary.default}",
+            "value": "{global.content.color.tertiary.default}",
             "type": "color"
           }
         }
@@ -2617,18 +2625,6 @@
           "default": {
             "value": "{global.background.color.surface.default}",
             "type": "color"
-          },
-          "selected": {
-            "value": "{global.background.color.primary.subtle}",
-            "type": "color"
-          },
-          "default--reverse": {
-            "value": "{global.background.color.primary.subtle}",
-            "type": "color"
-          },
-          "selected--reverse": {
-            "value": "{global.background.color.surface.default}",
-            "type": "color"
           }
         }
       },
@@ -2647,11 +2643,11 @@
             "type": "color"
           },
           "hover": {
-            "value": "{global.border.color.primary.muted}",
+            "value": "{global.border.color.tertiary.default}",
             "type": "color"
           },
           "selected": {
-            "value": "{global.border.color.primary.default}",
+            "value": "{global.border.color.tertiary.default}",
             "type": "color"
           }
         }
@@ -2671,6 +2667,19 @@
             "type": "spacing"
           }
         }
+      },
+      "shadow": {
+        "hover": {
+          "value": {
+            "x": "0",
+            "y": "0",
+            "blur": "2",
+            "spread": "0",
+            "color": "rgba({core.color.tertiary.100}, 0.80)",
+            "type": "dropShadow"
+          },
+          "type": "boxShadow"
+        }
       }
     },
     "checkbox": {
@@ -3584,10 +3593,6 @@
       },
       "border": {
         "color": {
-          "default": {
-            "value": "{global.border.color.transparent}",
-            "type": "color"
-          },
           "hover": {
             "value": "{global.border.color.line.subtle}",
             "type": "color"
@@ -3596,7 +3601,7 @@
             "value": "{global.border.color.primary.default}",
             "type": "color"
           },
-          "down-copy": {
+          "content": {
             "value": "{global.border.color.line.subtle}",
             "type": "color"
           }
@@ -3626,7 +3631,7 @@
             "value": "{global.background.color.primary.subtle}",
             "type": "color"
           },
-          "down": {
+          "selected": {
             "value": "{global.background.color.transparent}",
             "type": "color"
           }