diff --git a/static/AGENTS.md b/static/AGENTS.md
index b6c71051769d51..c2c3db11d08cb4 100644
--- a/static/AGENTS.md
+++ b/static/AGENTS.md
@@ -224,7 +224,7 @@ import {Heading} from '@sentry/scraps/text';
 
 // ❌ Do not use styled and create a new styled component
 const Title = styled('h4')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-size: ${p => p.theme.fontSizes.small};
 `;
 
@@ -251,7 +251,7 @@ import {Text} from '@sentry/scraps/text';
 
 // ❌ Do not use styled and create a new styled component
 const Label = styled('span')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-size: ${p => p.theme.fontSizes.small};
 `;
 
@@ -268,7 +268,7 @@ import {Text} from '@sentry/scraps/text';
 
 // ❌ Do not style intrinsic elements directly
 const Paragraph = styled('p')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   line-height: 1.5;
 `;
 
@@ -313,7 +313,7 @@ function Content() {
 const Component = styled('div')`
   display: flex;
   flex-directon: column;
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-size: ${p => p.theme.fontSize.lg};
 `;
 
diff --git a/static/app/components/IssueStreamHeaderLabel.tsx b/static/app/components/IssueStreamHeaderLabel.tsx
index 9c676787da47ae..9affe4b5c09de4 100644
--- a/static/app/components/IssueStreamHeaderLabel.tsx
+++ b/static/app/components/IssueStreamHeaderLabel.tsx
@@ -13,7 +13,7 @@ const IssueStreamHeaderLabel = styled('div')<{
   margin-right: ${space(2)};
   font-size: 13px;
   font-weight: ${p => p.theme.fontWeight.bold};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   white-space: nowrap;
 
   ${p =>
diff --git a/static/app/components/activity/item/index.tsx b/static/app/components/activity/item/index.tsx
index fb5c0e5a9f8a11..b4f21bf862e130 100644
--- a/static/app/components/activity/item/index.tsx
+++ b/static/app/components/activity/item/index.tsx
@@ -144,15 +144,15 @@ const StyledActivityAvatar = styled(ActivityAvatar)`
 `;
 
 const StyledTimeSince = styled(TimeSince)`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 
 const StyledDateTime = styled(DateTime)`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 
 const StyledDateTimeWindow = styled('div')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 
 const StyledActivityBubble = styled(ActivityBubble)`
diff --git a/static/app/components/activity/note/input.tsx b/static/app/components/activity/note/input.tsx
index 85da022368fc0f..1c81be8ad1eda5 100644
--- a/static/app/components/activity/note/input.tsx
+++ b/static/app/components/activity/note/input.tsx
@@ -335,7 +335,7 @@ const MarkdownIndicator = styled('div')`
   display: flex;
   align-items: center;
   gap: ${space(1)};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 
 const NotePreview = styled(MarkedText, {
diff --git a/static/app/components/alerts/pageBanner.tsx b/static/app/components/alerts/pageBanner.tsx
index b80fcb6706fe3d..98eeb763d3d4e6 100644
--- a/static/app/components/alerts/pageBanner.tsx
+++ b/static/app/components/alerts/pageBanner.tsx
@@ -111,7 +111,7 @@ const TextContainer = styled('div')`
 `;
 
 const SubText = styled('div')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-size: ${p => p.theme.fontSize.md};
   line-height: ${p => p.theme.text.lineHeightBody};
 `;
diff --git a/static/app/components/arithmeticBuilder/token/function.tsx b/static/app/components/arithmeticBuilder/token/function.tsx
index 392fd49250c38c..2ad59822e2af91 100644
--- a/static/app/components/arithmeticBuilder/token/function.tsx
+++ b/static/app/components/arithmeticBuilder/token/function.tsx
@@ -786,7 +786,7 @@ const FunctionGridCell = styled(BaseGridCell)`
 const DeleteButton = styled('button')`
   background: none;
   border: none;
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   outline: none;
   user-select: none;
   padding-right: ${p => p.theme.space.xs};
diff --git a/static/app/components/arithmeticBuilder/token/literal.tsx b/static/app/components/arithmeticBuilder/token/literal.tsx
index 81a1c97e931c7a..f2e2e89b46da12 100644
--- a/static/app/components/arithmeticBuilder/token/literal.tsx
+++ b/static/app/components/arithmeticBuilder/token/literal.tsx
@@ -336,7 +336,7 @@ const LeftGridCell = styled(GridCell)`
 const DeleteButton = styled('button')`
   background: none;
   border: none;
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   outline: none;
   user-select: none;
   padding-right: ${space(0.5)};
diff --git a/static/app/components/assigneeBadge.tsx b/static/app/components/assigneeBadge.tsx
index a8ab33629db45c..86306aed10e775 100644
--- a/static/app/components/assigneeBadge.tsx
+++ b/static/app/components/assigneeBadge.tsx
@@ -152,7 +152,7 @@ const StyledTag = styled(Tag)`
   height: 24px;
   padding: ${space(0.5)};
   padding-right: ${space(0.25)};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 
 const UnassignedTag = styled(StyledTag)`
@@ -161,14 +161,14 @@ const UnassignedTag = styled(StyledTag)`
 `;
 
 const TooltipSubtext = styled('div')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 
 const TooltipSubExternalLink = styled(ExternalLink)`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   text-decoration: underline;
 
   :hover {
-    color: ${p => p.theme.subText};
+    color: ${p => p.theme.tokens.content.secondary};
   }
 `;
diff --git a/static/app/components/assigneeSelectorDropdown.tsx b/static/app/components/assigneeSelectorDropdown.tsx
index 5daa5d2df6dce2..d038d449217c82 100644
--- a/static/app/components/assigneeSelectorDropdown.tsx
+++ b/static/app/components/assigneeSelectorDropdown.tsx
@@ -599,16 +599,16 @@ const TooltipWrapper = styled('div')`
 `;
 
 const TooltipSubExternalLink = styled(ExternalLink)`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   text-decoration: underline;
 
   :hover {
-    color: ${p => p.theme.subText};
+    color: ${p => p.theme.tokens.content.secondary};
   }
 `;
 
 const TooltipSubtext = styled('div')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 
 const FooterWrapper = styled('div')`
diff --git a/static/app/components/avatarChooser/index.tsx b/static/app/components/avatarChooser/index.tsx
index 14498d1650452b..30185f0305a16e 100644
--- a/static/app/components/avatarChooser/index.tsx
+++ b/static/app/components/avatarChooser/index.tsx
@@ -402,7 +402,7 @@ const CropperHovercard = styled(Hovercard)`
 
 const AvatarHelp = styled('p')`
   margin-right: auto;
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-size: ${p => p.theme.fontSize.md};
   width: 50%;
 `;
diff --git a/static/app/components/badge/groupPriority.tsx b/static/app/components/badge/groupPriority.tsx
index cfb9106d539fe9..291705f08f1550 100644
--- a/static/app/components/badge/groupPriority.tsx
+++ b/static/app/components/badge/groupPriority.tsx
@@ -297,7 +297,7 @@ const DismissButton = styled(Button)`
   position: absolute;
   top: ${space(1)};
   right: ${space(1.5)};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 
 const BannerStar1 = styled('img')`
diff --git a/static/app/components/badge/iconCellSignal.tsx b/static/app/components/badge/iconCellSignal.tsx
index 935c9580383b4f..b479e5994a5be9 100644
--- a/static/app/components/badge/iconCellSignal.tsx
+++ b/static/app/components/badge/iconCellSignal.tsx
@@ -7,9 +7,9 @@ interface Props extends SVGIconProps {
 }
 function IconCellSignal({ref, bars = 3, ...props}: Props) {
   const theme = useTheme();
-  const firstBarColor = bars > 0 ? theme.subText : theme.colors.gray200;
-  const secondBarColor = bars > 1 ? theme.subText : theme.colors.gray200;
-  const thirdBarColor = bars > 2 ? theme.subText : theme.colors.gray200;
+  const firstBarColor = bars > 0 ? theme.tokens.content.secondary : theme.colors.gray200;
+  const secondBarColor = bars > 1 ? theme.tokens.content.secondary : theme.colors.gray200;
+  const thirdBarColor = bars > 2 ? theme.tokens.content.secondary : theme.colors.gray200;
 
   return (
     <SvgIcon {...props} ref={ref}>
diff --git a/static/app/components/calendar/calendarStylesWrapper.tsx b/static/app/components/calendar/calendarStylesWrapper.tsx
index 7629d5b00e41ef..2e65773099fc55 100644
--- a/static/app/components/calendar/calendarStylesWrapper.tsx
+++ b/static/app/components/calendar/calendarStylesWrapper.tsx
@@ -45,7 +45,7 @@ const CalendarStylesWrapper = styled('div')`
 
   .rdrDayDisabled .rdrDayNumber span,
   .rdrDayPassive .rdrDayNumber span {
-    color: ${p => p.theme.subText};
+    color: ${p => p.theme.tokens.content.secondary};
     opacity: 0.5;
   }
 
diff --git a/static/app/components/charts/baseChart.tsx b/static/app/components/charts/baseChart.tsx
index e5858c50cd8df9..82accb0619727e 100644
--- a/static/app/components/charts/baseChart.tsx
+++ b/static/app/components/charts/baseChart.tsx
@@ -706,7 +706,7 @@ const getTooltipStyles = (p: {theme: Theme}) => css`
   /* Tooltip styling */
   .tooltip-series,
   .tooltip-footer {
-    color: ${p.theme.subText};
+    color: ${p.theme.tokens.content.secondary};
     font-family: ${p.theme.text.family};
     font-variant-numeric: tabular-nums;
     padding: ${space(1)} ${space(2)};
@@ -759,7 +759,7 @@ const getTooltipStyles = (p: {theme: Theme}) => css`
   .tooltip-code-no-margin {
     padding-left: 0;
     margin-left: 0;
-    color: ${p.theme.subText};
+    color: ${p.theme.tokens.content.secondary};
   }
   .tooltip-footer {
     border-top: solid 1px ${p.theme.tokens.border.secondary};
diff --git a/static/app/components/charts/components/legend.tsx b/static/app/components/charts/components/legend.tsx
index 4dd43c79529164..4a60f1b5086b9d 100644
--- a/static/app/components/charts/components/legend.tsx
+++ b/static/app/components/charts/components/legend.tsx
@@ -42,7 +42,7 @@ export default function Legend(
         fontFamily: theme.text.family,
         lineHeight: 14,
       },
-      inactiveColor: theme.subText,
+      inactiveColor: theme.tokens.content.secondary,
       pageTextStyle: {
         color: theme.tokens.content.primary,
       },
diff --git a/static/app/components/charts/errorPanel.tsx b/static/app/components/charts/errorPanel.tsx
index 8a1b74482e9b05..753535d074f8ac 100644
--- a/static/app/components/charts/errorPanel.tsx
+++ b/static/app/components/charts/errorPanel.tsx
@@ -13,7 +13,7 @@ const ErrorPanel = styled('div')<{height?: string}>`
   position: relative;
   border-color: transparent;
   margin-bottom: 0;
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-size: ${p => p.theme.fontSize.xl};
 `;
 
diff --git a/static/app/components/charts/groupStatusChart.tsx b/static/app/components/charts/groupStatusChart.tsx
index 11f47b3a557afa..d1049c2fb7f657 100644
--- a/static/app/components/charts/groupStatusChart.tsx
+++ b/static/app/components/charts/groupStatusChart.tsx
@@ -162,5 +162,5 @@ const ChartWrapper = styled('div')`
 
 const GraphText = styled('div')`
   font-size: ${p => p.theme.fontSize.sm};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
diff --git a/static/app/components/charts/styles.tsx b/static/app/components/charts/styles.tsx
index b0f69f43952a8e..3b2e95e05d3640 100644
--- a/static/app/components/charts/styles.tsx
+++ b/static/app/components/charts/styles.tsx
@@ -7,13 +7,13 @@ export const SectionHeading = styled('h4')`
   grid-auto-flow: column;
   gap: ${space(1)};
   align-items: center;
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-size: ${p => p.theme.fontSize.md};
   margin: ${space(1)} 0;
 `;
 
 export const SectionValue = styled('span')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-size: ${p => p.theme.fontSize.md};
   margin-right: ${space(1)};
 `;
diff --git a/static/app/components/checkInTimeline/checkInTooltip.tsx b/static/app/components/checkInTimeline/checkInTooltip.tsx
index 59ad57e08177b7..03c5a72de114d1 100644
--- a/static/app/components/checkInTimeline/checkInTooltip.tsx
+++ b/static/app/components/checkInTimeline/checkInTooltip.tsx
@@ -136,5 +136,5 @@ const StatusCount = styled('td')`
 `;
 
 const StatusUnit = styled('td')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
diff --git a/static/app/components/checkInTimeline/gridLines.tsx b/static/app/components/checkInTimeline/gridLines.tsx
index 284cdf25d620ad..c4760fd6fd85e5 100644
--- a/static/app/components/checkInTimeline/gridLines.tsx
+++ b/static/app/components/checkInTimeline/gridLines.tsx
@@ -385,6 +385,6 @@ const TimeLabelContainer = styled('div')<{
 const TimeLabel = styled(DateTime)`
   font-variant-numeric: tabular-nums;
   font-size: ${p => p.theme.fontSize.sm};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   pointer-events: none;
 `;
diff --git a/static/app/components/collapsePanel.tsx b/static/app/components/collapsePanel.tsx
index 807a2436d298ee..35d5a72d8bee42 100644
--- a/static/app/components/collapsePanel.tsx
+++ b/static/app/components/collapsePanel.tsx
@@ -95,7 +95,7 @@ const ShowMore = styled('div')<{disableBorder: boolean}>`
   align-items: center;
   padding: ${space(1)} ${space(2)};
   font-size: ${p => p.theme.fontSize.md};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   cursor: pointer;
   border-top: 1px solid ${p => p.theme.tokens.border.primary};
 
diff --git a/static/app/components/commitRow.tsx b/static/app/components/commitRow.tsx
index 932414d270c082..b46cc3ccd670e6 100644
--- a/static/app/components/commitRow.tsx
+++ b/static/app/components/commitRow.tsx
@@ -301,10 +301,10 @@ const Meta = styled(TextOverflow)<{hasStreamlinedUI?: boolean}>`
   font-size: ${p => (p.hasStreamlinedUI ? p.theme.fontSize.md : '13px')};
   line-height: 1.5;
   margin: 0;
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 
   a {
-    color: ${p => p.theme.subText};
+    color: ${p => p.theme.tokens.content.secondary};
     text-decoration: underline;
     text-decoration-style: dotted;
   }
@@ -324,7 +324,7 @@ const MetaWrapper = styled('div')`
   display: flex;
   align-items: center;
   gap: ${space(0.5)};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-size: ${p => p.theme.fontSize.md};
   padding-top: ${space(0.25)};
 `;
@@ -343,7 +343,7 @@ const AuthorWrapper = styled('span')`
   display: inline-flex;
   align-items: center;
   gap: ${space(0.25)};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 
   & svg {
     transition: 120ms opacity;
diff --git a/static/app/components/core/avatar/avatarList.tsx b/static/app/components/core/avatar/avatarList.tsx
index e437776591b936..87e592f5c43643 100644
--- a/static/app/components/core/avatar/avatarList.tsx
+++ b/static/app/components/core/avatar/avatarList.tsx
@@ -197,7 +197,7 @@ const CollapsedAvatarsCicle = styled('div')<{size: number}>`
   text-align: center;
   font-weight: ${p => p.theme.fontWeight.bold};
   background-color: ${p => p.theme.colors.gray200};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-size: ${p => Math.floor(p.size / 2.3)}px;
   width: ${p => p.size}px;
   height: ${p => p.size}px;
diff --git a/static/app/components/core/avatar/baseAvatar.tsx b/static/app/components/core/avatar/baseAvatar.tsx
index c445bfef5a5e78..928d765ae528ca 100644
--- a/static/app/components/core/avatar/baseAvatar.tsx
+++ b/static/app/components/core/avatar/baseAvatar.tsx
@@ -153,7 +153,8 @@ const AvatarContainer = styled('span')<{
 }>`
   flex-shrink: 0;
   border-radius: ${p => (p.round ? '50%' : '3px')};
-  border: ${p => (p.suggested ? `1px dashed ${p.theme.subText}` : 'none')};
+  border: ${p =>
+    p.suggested ? `1px dashed ${p.theme.tokens.border.neutral.vibrant}` : 'none'};
   background-color: ${p => (p.suggested ? p.theme.tokens.background.primary : 'none')};
 `;
 
diff --git a/static/app/components/core/avatar/letterAvatar.tsx b/static/app/components/core/avatar/letterAvatar.tsx
index 02c16513ce8c2b..33ff1da7092016 100644
--- a/static/app/components/core/avatar/letterAvatar.tsx
+++ b/static/app/components/core/avatar/letterAvatar.tsx
@@ -49,7 +49,7 @@ const LetterAvatarComponent = styled('svg')<LetterAvatarProps>`
   text {
     fill: ${props =>
       props.suggested
-        ? props.theme.subText
+        ? props.theme.tokens.content.secondary
         : getColor(props.identifier, props.theme).content};
   }
 `;
diff --git a/static/app/components/core/compactSelect/control.tsx b/static/app/components/core/compactSelect/control.tsx
index 7fd51d796e1b26..49e63baeae5639 100644
--- a/static/app/components/core/compactSelect/control.tsx
+++ b/static/app/components/core/compactSelect/control.tsx
@@ -636,7 +636,7 @@ const StyledLoadingIndicator = styled(LoadingIndicator)`
 const ClearButton = styled(Button)`
   font-size: inherit; /* Inherit font size from MenuHeader */
   font-weight: ${p => p.theme.font.weight.sans.regular};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   padding: 0 ${space(0.5)};
   margin: -${space(0.25)} -${space(0.5)};
 `;
diff --git a/static/app/components/core/compactSelect/styles.tsx b/static/app/components/core/compactSelect/styles.tsx
index 78273b29e35fbb..6e5b3b96a893ad 100644
--- a/static/app/components/core/compactSelect/styles.tsx
+++ b/static/app/components/core/compactSelect/styles.tsx
@@ -50,7 +50,7 @@ export const ListLabel = styled('p')`
   display: inline-block;
   font-weight: ${p => p.theme.font.weight.sans.medium};
   font-size: ${p => p.theme.font.size.xs};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   text-transform: uppercase;
   white-space: nowrap;
   margin: ${space(0.5)} ${space(1.5)};
@@ -96,7 +96,7 @@ export const SectionTitle = styled('p')`
   display: inline-block;
   font-weight: ${p => p.theme.font.weight.sans.medium};
   font-size: ${p => p.theme.font.size.xs};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   text-transform: uppercase;
   white-space: nowrap;
 
@@ -109,7 +109,7 @@ export const SectionToggleButton = styled(Button)<{visible: boolean}>`
   margin: 0 -${space(0.5)} 0 ${space(2)};
   font-weight: ${p => p.theme.font.weight.sans.regular};
   font-size: ${p => p.theme.font.size.sm};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   transition: opacity 0.1s;
 
   &:focus-visible {
@@ -162,7 +162,7 @@ export const CheckWrap = styled('div')<{isSelected: boolean; multiple: boolean}>
 
 export const EmptyMessage = styled('p')`
   text-align: center;
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   padding: ${space(1)} ${space(1.5)} ${space(1.5)};
   margin: 0;
 
@@ -180,7 +180,7 @@ export const SizeLimitMessage = styled('li')`
   padding: ${space(0.75)} ${space(1)} 0;
 
   font-size: ${p => p.theme.font.size.sm};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   list-style-type: none;
   white-space: nowrap;
   text-align: center;
diff --git a/static/app/components/core/input/numberDragInput.stories.tsx b/static/app/components/core/input/numberDragInput.stories.tsx
index c1677d707623b7..d55cf25bdf1d8d 100644
--- a/static/app/components/core/input/numberDragInput.stories.tsx
+++ b/static/app/components/core/input/numberDragInput.stories.tsx
@@ -74,5 +74,5 @@ export default Storybook.story('NumberDragInput', (story, APIReference) => {
 
 const Label = styled('div')`
   font-size: ${p => p.theme.font.size.sm};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
diff --git a/static/app/components/core/input/numberInput.tsx b/static/app/components/core/input/numberInput.tsx
index a92c3cd203a316..b0c2cebf0ed05f 100644
--- a/static/app/components/core/input/numberInput.tsx
+++ b/static/app/components/core/input/numberInput.tsx
@@ -114,7 +114,7 @@ const StepButton = styled(Button)`
   height: 50%;
   padding: 0 ${space(0.25)};
   min-height: 0;
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 
 const StyledIconChevron = styled(IconChevron)`
diff --git a/static/app/components/core/menuListItem/menuListItem.tsx b/static/app/components/core/menuListItem/menuListItem.tsx
index ffd6f7713a5f72..c6faa4ea50509e 100644
--- a/static/app/components/core/menuListItem/menuListItem.tsx
+++ b/static/app/components/core/menuListItem/menuListItem.tsx
@@ -28,7 +28,7 @@ function getTextColor({
   theme: Theme;
 }) {
   if (disabled) {
-    return theme.subText;
+    return theme.tokens.content.secondary;
   }
   switch (priority) {
     case 'primary':
@@ -151,7 +151,7 @@ const StyledLabelWrap = styled('div')`
 
 const StyledDetails = styled('div')<{disabled: boolean; priority: Priority}>`
   font-size: ${p => p.theme.font.size.sm};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   line-height: 1.4;
   margin-bottom: 0;
 
diff --git a/static/app/components/core/segmentedControl/segmentedControl.tsx b/static/app/components/core/segmentedControl/segmentedControl.tsx
index a819b5b35c6363..fea59960d938d6 100644
--- a/static/app/components/core/segmentedControl/segmentedControl.tsx
+++ b/static/app/components/core/segmentedControl/segmentedControl.tsx
@@ -44,7 +44,7 @@ function getTextColor({
     return priority === 'default' ? theme.colors.blue500 : undefined;
   }
 
-  return theme.subText;
+  return theme.tokens.content.secondary;
 }
 
 const segmentedWrapPadding = {
diff --git a/static/app/components/core/select/select.tsx b/static/app/components/core/select/select.tsx
index 296561c468ee3a..681b6905f0a361 100644
--- a/static/app/components/core/select/select.tsx
+++ b/static/app/components/core/select/select.tsx
@@ -188,7 +188,9 @@ const getStylesConfig = ({
     }),
     placeholder: (provided, state) => ({
       ...provided,
-      color: state.isDisabled ? theme.tokens.content.disabled : theme.subText,
+      color: state.isDisabled
+        ? theme.tokens.content.disabled
+        : theme.tokens.content.secondary,
     }),
     multiValue: provided => ({
       ...provided,
@@ -240,7 +242,7 @@ const getStylesConfig = ({
       ...provided,
       lineHeight: '1.5',
       fontWeight: 600,
-      color: theme.subText,
+      color: theme.tokens.content.secondary,
       marginBottom: 0,
       padding: `${space(0.5)} ${space(1.5)}`,
       ':empty': {
diff --git a/static/app/components/discover/quickContextCommitRow.tsx b/static/app/components/discover/quickContextCommitRow.tsx
index 8125cb27bad649..a18e2042b7658b 100644
--- a/static/app/components/discover/quickContextCommitRow.tsx
+++ b/static/app/components/discover/quickContextCommitRow.tsx
@@ -78,7 +78,8 @@ const LinkToPullRequest = styled(TextOverflow)`
 
 const LinkToCommit = styled(TextOverflow)<{hasPrTitle: string | null | undefined}>`
   font-size: ${p => (p.hasPrTitle ? p.theme.fontSize.sm : p.theme.fontSize.lg)};
-  color: ${p => (p.hasPrTitle ? p.theme.subText : p.theme.tokens.content.primary)};
+  color: ${p =>
+    p.hasPrTitle ? p.theme.tokens.content.secondary : p.theme.tokens.content.primary};
   line-height: 1.5;
   margin: 0;
 `;
diff --git a/static/app/components/dropdownMenu/footer.tsx b/static/app/components/dropdownMenu/footer.tsx
index 04de98397946f3..844881aa5a7c26 100644
--- a/static/app/components/dropdownMenu/footer.tsx
+++ b/static/app/components/dropdownMenu/footer.tsx
@@ -9,7 +9,7 @@ export const DropdownMenuFooter = styled('div')`
   border-top: solid 1px ${p => p.theme.tokens.border.secondary};
   padding: ${space(1)} ${space(1.5)};
   font-size: ${p => p.theme.fontSize.sm};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   display: flex;
   align-items: center;
 `;
diff --git a/static/app/components/dropdownMenu/section.tsx b/static/app/components/dropdownMenu/section.tsx
index eb4ec145540c86..9cb8c4f2e7c4b4 100644
--- a/static/app/components/dropdownMenu/section.tsx
+++ b/static/app/components/dropdownMenu/section.tsx
@@ -39,7 +39,7 @@ const Heading = styled('span')`
   display: inline-block;
   font-weight: ${p => p.theme.fontWeight.bold};
   font-size: ${p => p.theme.fontSize.sm};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   text-transform: uppercase;
   white-space: nowrap;
   margin: ${space(1)} ${space(1.5)} ${space(0.5)};
diff --git a/static/app/components/dynamicSampling/investigationRule.tsx b/static/app/components/dynamicSampling/investigationRule.tsx
index 90c235c677b44b..f12c2ab1026e67 100644
--- a/static/app/components/dynamicSampling/investigationRule.tsx
+++ b/static/app/components/dynamicSampling/investigationRule.tsx
@@ -175,7 +175,7 @@ function useCreateInvestigationRuleMutation() {
 
 const InvestigationInProgressNotification = styled('span')`
   font-size: ${p => p.theme.fontSize.md};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-weight: ${p => p.theme.fontWeight.bold};
   display: inline-flex;
   align-items: center;
diff --git a/static/app/components/emptyStateWarning.tsx b/static/app/components/emptyStateWarning.tsx
index 5f4b043bffd5c4..13a34ba600dba6 100644
--- a/static/app/components/emptyStateWarning.tsx
+++ b/static/app/components/emptyStateWarning.tsx
@@ -48,7 +48,7 @@ export const EmptyStreamWrapper = styled('div')`
 const SmallMessage = styled('div')`
   display: flex;
   align-items: center;
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-size: ${p => p.theme.fontSize.xl};
   line-height: 1em;
 `;
diff --git a/static/app/components/eventOrGroupExtraDetails.tsx b/static/app/components/eventOrGroupExtraDetails.tsx
index b2a564057e366e..558f058138eab3 100644
--- a/static/app/components/eventOrGroupExtraDetails.tsx
+++ b/static/app/components/eventOrGroupExtraDetails.tsx
@@ -167,14 +167,14 @@ const GroupExtra = styled('div')`
   gap: ${space(0.75)};
   justify-content: start;
   align-items: center;
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-size: ${p => p.theme.fontSize.sm};
   white-space: nowrap;
   line-height: 1.2;
   min-height: ${space(2)};
 
   & > a {
-    color: ${p => p.theme.subText};
+    color: ${p => p.theme.tokens.content.secondary};
   }
 
   @media (min-width: ${p => p.theme.breakpoints.xl}) {
@@ -224,7 +224,7 @@ const LoggerAnnotation = styled(AnnotationNoMargin)`
 
 const Location = styled('div')`
   font-size: ${p => p.theme.fontSize.sm};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   min-width: 10px;
   line-height: 1.1;
   ${p => p.theme.overflowEllipsis};
diff --git a/static/app/components/eventOrGroupHeader.tsx b/static/app/components/eventOrGroupHeader.tsx
index c6b4164a5317a7..0f339ab1263f16 100644
--- a/static/app/components/eventOrGroupHeader.tsx
+++ b/static/app/components/eventOrGroupHeader.tsx
@@ -161,7 +161,7 @@ const Title = styled('div')`
     font-size: ${p => p.theme.fontSize.md};
     font-style: normal;
     font-weight: ${p => p.theme.fontWeight.normal};
-    color: ${p => p.theme.subText};
+    color: ${p => p.theme.tokens.content.secondary};
   }
 `;
 
diff --git a/static/app/components/events/autofix/FlyingLinesEffect.tsx b/static/app/components/events/autofix/FlyingLinesEffect.tsx
index e57f2ccb176704..0c3bc784f23f47 100644
--- a/static/app/components/events/autofix/FlyingLinesEffect.tsx
+++ b/static/app/components/events/autofix/FlyingLinesEffect.tsx
@@ -121,12 +121,12 @@ const AdditionalLine = styled('div')<{
   bottom: 0;
   border-radius: 50%;
   border: 2px solid transparent;
-  border-top-color: ${p => p.theme.subText};
-  border-bottom-color: ${p => p.theme.subText};
+  border-top-color: ${p => p.theme.tokens.content.secondary};
+  border-bottom-color: ${p => p.theme.tokens.content.secondary};
   border-left-color: ${p =>
-    p.variant === 'leftColored' ? p.theme.subText : 'transparent'};
+    p.variant === 'leftColored' ? p.theme.tokens.content.secondary : 'transparent'};
   border-right-color: ${p =>
-    p.variant === 'rightColored' ? p.theme.subText : 'transparent'};
+    p.variant === 'rightColored' ? p.theme.tokens.content.secondary : 'transparent'};
   animation: ${flyingLines} 1s linear infinite;
   animation-delay: ${p => p.delay}s;
   transform: ${p => (p.rotation ? `rotate(${p.rotation}deg)` : 'none')};
@@ -151,20 +151,20 @@ const FlyingLinesContainer = styled('div')`
     bottom: 0;
     border-radius: 50%;
     border: 2px solid transparent;
-    border-top-color: ${p => p.theme.subText};
-    border-bottom-color: ${p => p.theme.subText};
+    border-top-color: ${p => p.theme.tokens.content.secondary};
+    border-bottom-color: ${p => p.theme.tokens.content.secondary};
     animation: ${flyingLines} 1s linear infinite;
   }
 
   &:before {
-    border-left-color: ${p => p.theme.subText};
+    border-left-color: ${p => p.theme.tokens.content.secondary};
     border-right-color: transparent;
     animation-delay: -0.4s;
   }
 
   &:after {
     border-left-color: transparent;
-    border-right-color: ${p => p.theme.subText};
+    border-right-color: ${p => p.theme.tokens.content.secondary};
     animation-delay: -0.2s;
   }
 `;
diff --git a/static/app/components/events/autofix/autofixChanges.tsx b/static/app/components/events/autofix/autofixChanges.tsx
index 8a665bcbf1e800..cdaf11293950f5 100644
--- a/static/app/components/events/autofix/autofixChanges.tsx
+++ b/static/app/components/events/autofix/autofixChanges.tsx
@@ -447,7 +447,7 @@ const Title = styled('div')`
 `;
 
 const PullRequestTitle = styled('div')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 
 const RepoChangesHeader = styled('div')`
diff --git a/static/app/components/events/autofix/autofixDiff.tsx b/static/app/components/events/autofix/autofixDiff.tsx
index 93481d684b070f..e6da42c448f4b2 100644
--- a/static/app/components/events/autofix/autofixDiff.tsx
+++ b/static/app/components/events/autofix/autofixDiff.tsx
@@ -749,7 +749,7 @@ const HunkHeaderEmptySpace = styled('div')`
 const HunkHeaderContent = styled('div')`
   grid-column: 3 / -1;
   background-color: ${p => p.theme.backgroundSecondary};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   padding: ${space(0.75)} ${space(1)} ${space(0.75)} ${space(4)};
   white-space: pre-wrap;
 `;
@@ -760,7 +760,7 @@ const LineNumber = styled('div')<{lineType: DiffLineType}>`
   user-select: none;
 
   background-color: ${p => p.theme.backgroundSecondary};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 
   ${p =>
     p.lineType === DiffLineType.ADDED &&
@@ -921,7 +921,7 @@ const SectionTitle = styled('p')`
 
 const NoChangesMessage = styled('p')`
   margin: ${space(1)} 0;
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-family: ${p => p.theme.text.family};
 `;
 
diff --git a/static/app/components/events/autofix/autofixHighlightPopup.tsx b/static/app/components/events/autofix/autofixHighlightPopup.tsx
index f108c1fbec5d44..43ddda924fd417 100644
--- a/static/app/components/events/autofix/autofixHighlightPopup.tsx
+++ b/static/app/components/events/autofix/autofixHighlightPopup.tsx
@@ -745,7 +745,7 @@ const StyledButton = styled(Button)`
   height: 24px;
   width: 24px;
   margin-right: 0;
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   z-index: 2;
 `;
 
@@ -761,7 +761,7 @@ const Header = styled('div')`
 
 const SelectedText = styled('div')`
   font-size: ${p => p.theme.fontSize.sm};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   align-items: center;
   white-space: nowrap;
   overflow: hidden;
@@ -865,7 +865,7 @@ const HeaderRight = styled('div')`
 
 const ReworkText = styled('span')`
   font-size: ${p => p.theme.fontSize.sm};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 
   ${ReworkHeaderSection}:hover & {
     color: ${p => p.theme.tokens.content.primary};
diff --git a/static/app/components/events/autofix/autofixOutputStream.tsx b/static/app/components/events/autofix/autofixOutputStream.tsx
index 56e4a1f57590f6..77c3f41d6b0af2 100644
--- a/static/app/components/events/autofix/autofixOutputStream.tsx
+++ b/static/app/components/events/autofix/autofixOutputStream.tsx
@@ -396,7 +396,7 @@ const StreamContent = styled('div')`
   padding: ${space(2)};
   white-space: pre-wrap;
   word-break: break-word;
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   max-height: 35vh;
   overflow-y: auto;
   display: flex;
@@ -452,7 +452,7 @@ const StyledButton = styled(Button)`
   height: 24px;
   width: 24px;
   margin-right: 0;
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 
 const SeerIconContainer = styled('div')`
diff --git a/static/app/components/events/autofix/autofixRootCause.tsx b/static/app/components/events/autofix/autofixRootCause.tsx
index e6aa284be7bff4..4d1324a690062c 100644
--- a/static/app/components/events/autofix/autofixRootCause.tsx
+++ b/static/app/components/events/autofix/autofixRootCause.tsx
@@ -744,5 +744,5 @@ const DropdownTrigger = styled(Button)`
 
 const SmallIntegrationIdText = styled('div')`
   font-size: ${p => p.theme.fontSize.sm};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
diff --git a/static/app/components/events/autofix/autofixSolution.tsx b/static/app/components/events/autofix/autofixSolution.tsx
index 45f609b467fabc..9a3c27465d5caa 100644
--- a/static/app/components/events/autofix/autofixSolution.tsx
+++ b/static/app/components/events/autofix/autofixSolution.tsx
@@ -755,7 +755,7 @@ const InstructionsInput = styled(Input)`
   padding-right: ${space(4)};
 
   &::placeholder {
-    color: ${p => p.theme.subText};
+    color: ${p => p.theme.tokens.content.secondary};
   }
 `;
 
diff --git a/static/app/components/events/autofix/autofixSolutionEventItem.tsx b/static/app/components/events/autofix/autofixSolutionEventItem.tsx
index 22dd6abbed8385..71085a926a8c86 100644
--- a/static/app/components/events/autofix/autofixSolutionEventItem.tsx
+++ b/static/app/components/events/autofix/autofixSolutionEventItem.tsx
@@ -205,7 +205,7 @@ const SourcesWrapper = styled('div')`
 `;
 
 const StyledIconChevron = styled(IconChevron)`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   flex-shrink: 0;
 `;
 
@@ -237,7 +237,7 @@ const SelectionButton = styled('button')<SelectionButtonProps>`
   align-items: center;
   justify-content: center;
   cursor: pointer;
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   transition:
     color 0.2s ease,
     background-color 0.2s ease;
diff --git a/static/app/components/events/autofix/autofixStartBox.tsx b/static/app/components/events/autofix/autofixStartBox.tsx
index cb2f8c6e0554d2..34c8143befaab5 100644
--- a/static/app/components/events/autofix/autofixStartBox.tsx
+++ b/static/app/components/events/autofix/autofixStartBox.tsx
@@ -226,7 +226,7 @@ const BackgroundStar = styled('img')`
 `;
 
 const StyledArrow = styled(IconArrow)`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   opacity: 0.5;
 `;
 
diff --git a/static/app/components/events/autofix/autofixSteps.tsx b/static/app/components/events/autofix/autofixSteps.tsx
index a36dff4dc25c99..036eb57271ed41 100644
--- a/static/app/components/events/autofix/autofixSteps.tsx
+++ b/static/app/components/events/autofix/autofixSteps.tsx
@@ -313,7 +313,7 @@ export function AutofixSteps({data, groupId, runId, event}: AutofixStepsProps) {
 const StepMessage = styled('div')`
   overflow: hidden;
   padding: ${space(1)};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-size: ${p => p.theme.fontSize.sm};
   justify-content: flex-start;
   text-align: left;
@@ -345,5 +345,5 @@ const AnimationWrapper = styled(motion.div)``;
 const StandaloneErrorMessage = styled('div')`
   margin: ${space(1)} 0;
   padding: ${space(2)};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
diff --git a/static/app/components/events/autofix/autofixTimelineItem.tsx b/static/app/components/events/autofix/autofixTimelineItem.tsx
index 16fac84e43b3e5..d9209571036413 100644
--- a/static/app/components/events/autofix/autofixTimelineItem.tsx
+++ b/static/app/components/events/autofix/autofixTimelineItem.tsx
@@ -182,7 +182,7 @@ const StyledTimelineHeader = styled('div')<{isActive?: boolean}>`
 `;
 
 const StyledIconChevron = styled(IconChevron)`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   flex-shrink: 0;
   margin-right: ${space(0.25)};
 `;
diff --git a/static/app/components/events/autofix/codingAgentCard.tsx b/static/app/components/events/autofix/codingAgentCard.tsx
index 6e978782657177..3253ee2c523c2f 100644
--- a/static/app/components/events/autofix/codingAgentCard.tsx
+++ b/static/app/components/events/autofix/codingAgentCard.tsx
@@ -281,12 +281,12 @@ const DetailRow = styled('div')`
   align-items: center;
   gap: ${p => p.theme.space.xs};
   font-size: ${p => p.theme.fontSize.sm};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 
 const Label = styled('span')`
   font-weight: 600;
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   min-width: 80px;
 `;
 
diff --git a/static/app/components/events/autofix/insights/autofixInsightCard.tsx b/static/app/components/events/autofix/insights/autofixInsightCard.tsx
index ad1057fdf2876a..2415fa635a0a5b 100644
--- a/static/app/components/events/autofix/insights/autofixInsightCard.tsx
+++ b/static/app/components/events/autofix/insights/autofixInsightCard.tsx
@@ -343,10 +343,12 @@ const MiniHeader = styled('p')<{expanded?: boolean}>`
   margin: 0;
   flex: 1;
   word-break: break-word;
-  color: ${p => (p.expanded ? p.theme.tokens.content.primary : p.theme.subText)};
+  color: ${p =>
+    p.expanded ? p.theme.tokens.content.primary : p.theme.tokens.content.secondary};
 
   code {
-    color: ${p => (p.expanded ? p.theme.tokens.content.primary : p.theme.subText)};
+    color: ${p =>
+      p.expanded ? p.theme.tokens.content.primary : p.theme.tokens.content.secondary};
   }
 `;
 
@@ -366,7 +368,7 @@ const ContextBody = styled('div')`
 `;
 
 const StyledIconChevron = styled(IconChevron)`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 
 const RightSection = styled('div')`
@@ -393,7 +395,7 @@ const EditInput = styled(TextArea)`
 `;
 
 const EditButton = styled(Button)`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 
 const DiffContainer = styled('div')`
diff --git a/static/app/components/events/autofix/insights/autofixInsightCards.tsx b/static/app/components/events/autofix/insights/autofixInsightCards.tsx
index 0c7b19deb3bfe7..0e7c2d904646d6 100644
--- a/static/app/components/events/autofix/insights/autofixInsightCards.tsx
+++ b/static/app/components/events/autofix/insights/autofixInsightCards.tsx
@@ -136,14 +136,14 @@ const HeaderWrapper = styled('div')`
 const HeaderText = styled('div')`
   font-weight: ${p => p.theme.fontWeight.bold};
   font-size: ${p => p.theme.fontSize.lg};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 
 const NoInsightsYet = styled('div')`
   display: flex;
   justify-content: center;
   flex-direction: column;
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 
 const InsightsContainerWithLines = styled('div')`
diff --git a/static/app/components/events/autofix/insights/autofixInsightSources.tsx b/static/app/components/events/autofix/insights/autofixInsightSources.tsx
index 1f1b3bc4865688..1d23e793447c41 100644
--- a/static/app/components/events/autofix/insights/autofixInsightSources.tsx
+++ b/static/app/components/events/autofix/insights/autofixInsightSources.tsx
@@ -214,7 +214,10 @@ export const SourceCard = styled(Button)<{isHighlighted?: boolean}>`
   align-items: center;
   gap: ${space(0.5)};
   font-weight: ${p => p.theme.fontWeight.normal};
-  color: ${p => (p.isHighlighted ? p.theme.button.primary.colorActive : p.theme.subText)};
+  color: ${p =>
+    p.isHighlighted
+      ? p.theme.button.primary.colorActive
+      : p.theme.tokens.content.secondary};
   white-space: nowrap;
   flex-shrink: 0;
 `;
@@ -268,7 +271,7 @@ const OverlayTitle = styled('div')`
 
 const InsightTitle = styled('div')`
   padding-bottom: ${space(1)};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-family: ${p => p.theme.text.family};
 `;
 
diff --git a/static/app/components/events/autofix/insights/collapsibleChainLink.tsx b/static/app/components/events/autofix/insights/collapsibleChainLink.tsx
index e040f8f1bb47bd..605f627dfd622b 100644
--- a/static/app/components/events/autofix/insights/collapsibleChainLink.tsx
+++ b/static/app/components/events/autofix/insights/collapsibleChainLink.tsx
@@ -183,13 +183,13 @@ const EditInput = styled(TextArea)`
 `;
 
 const AddButton = styled(Button)`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 
 const RethinkLabel = styled('span')`
   display: flex;
   align-items: center;
   font-size: ${p => p.theme.fontSize.sm};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   margin-right: ${space(0.5)};
 `;
diff --git a/static/app/components/events/autofix/v2/artifactCards.tsx b/static/app/components/events/autofix/v2/artifactCards.tsx
index c1cd2cc47b382e..6e6b110f2cbc66 100644
--- a/static/app/components/events/autofix/v2/artifactCards.tsx
+++ b/static/app/components/events/autofix/v2/artifactCards.tsx
@@ -783,7 +783,7 @@ const TreeRow = styled('div')<{$isClickable?: boolean}>`
   :nth-child(odd) {
     background-color: ${p => p.theme.backgroundSecondary};
   }
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   background-color: ${p => p.theme.background};
   ${p =>
     p.$isClickable &&
@@ -848,15 +848,15 @@ const ImpactTreeKeyContainer = styled('div')`
 `;
 
 const TreeSubValue = styled(TreeValue)`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 
 const SolutionTreeValue = styled(TreeValue)`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 
 const RepoName = styled('span')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 
 const RepoSection = styled('div')`
diff --git a/static/app/components/events/breadcrumbs/breadcrumbsDataSection.tsx b/static/app/components/events/breadcrumbs/breadcrumbsDataSection.tsx
index 5051a81e37828d..4dd21d416d087e 100644
--- a/static/app/components/events/breadcrumbs/breadcrumbsDataSection.tsx
+++ b/static/app/components/events/breadcrumbs/breadcrumbsDataSection.tsx
@@ -226,7 +226,7 @@ const ViewAllContainer = styled('div')`
 
 const VerticalEllipsis = styled(IconEllipsis)`
   height: 22px;
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   margin: ${space(0.5)};
   transform: rotate(90deg);
 `;
diff --git a/static/app/components/events/breadcrumbs/breadcrumbsDrawer.tsx b/static/app/components/events/breadcrumbs/breadcrumbsDrawer.tsx
index 91057bb4d9adce..febc83ab6b3f24 100644
--- a/static/app/components/events/breadcrumbs/breadcrumbsDrawer.tsx
+++ b/static/app/components/events/breadcrumbs/breadcrumbsDrawer.tsx
@@ -268,6 +268,6 @@ const EmptyMessage = styled('div')`
   flex-direction: column;
   justify-content: center;
   align-items: center;
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   padding: ${space(3)} ${space(1)};
 `;
diff --git a/static/app/components/events/breadcrumbs/breadcrumbsTimeline.tsx b/static/app/components/events/breadcrumbs/breadcrumbsTimeline.tsx
index 8db4f2b5630383..0642b7a7be25ac 100644
--- a/static/app/components/events/breadcrumbs/breadcrumbsTimeline.tsx
+++ b/static/app/components/events/breadcrumbs/breadcrumbsTimeline.tsx
@@ -204,7 +204,7 @@ const Subtitle = styled('p')`
 
 const Timestamp = styled('div')`
   margin-right: ${space(1)};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-size: ${p => p.theme.fontSize.sm};
   min-width: 50px;
   text-align: right;
diff --git a/static/app/components/events/breadcrumbs/utils.tsx b/static/app/components/events/breadcrumbs/utils.tsx
index 2871083f491f16..aeed784364f460 100644
--- a/static/app/components/events/breadcrumbs/utils.tsx
+++ b/static/app/components/events/breadcrumbs/utils.tsx
@@ -408,7 +408,7 @@ const BreadcrumbLevel = styled('div')<{level: BreadcrumbLevelType}>`
       case BreadcrumbLevelType.DEBUG:
       case BreadcrumbLevelType.INFO:
       case BreadcrumbLevelType.LOG:
-        return p.theme.subText;
+        return p.theme.tokens.content.secondary;
     }
   }};
   display: ${p => (p.level === BreadcrumbLevelType.UNDEFINED ? 'none' : 'block')};
diff --git a/static/app/components/events/contexts/utils.tsx b/static/app/components/events/contexts/utils.tsx
index 82ddd385bf7e68..9c19b3492b5ed4 100644
--- a/static/app/components/events/contexts/utils.tsx
+++ b/static/app/components/events/contexts/utils.tsx
@@ -579,7 +579,7 @@ export function getContextSummary({
 }
 
 const RelativeTime = styled('span')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   margin-left: ${space(0.5)};
 `;
 
diff --git a/static/app/components/events/eventAnnotation.tsx b/static/app/components/events/eventAnnotation.tsx
index 43541827ff38b6..aa960f9ea4c794 100644
--- a/static/app/components/events/eventAnnotation.tsx
+++ b/static/app/components/events/eventAnnotation.tsx
@@ -6,13 +6,13 @@ const EventAnnotation = styled('span')`
   font-size: ${p => p.theme.fontSize.sm};
   border-left: 1px solid ${p => p.theme.tokens.border.secondary};
   padding-left: ${space(1)};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 
   a {
-    color: ${p => p.theme.subText};
+    color: ${p => p.theme.tokens.content.secondary};
 
     &:hover {
-      color: ${p => p.theme.subText};
+      color: ${p => p.theme.tokens.content.secondary};
     }
   }
 `;
diff --git a/static/app/components/events/eventDataSection.tsx b/static/app/components/events/eventDataSection.tsx
index c467710ec82044..22c823fd37491d 100644
--- a/static/app/components/events/eventDataSection.tsx
+++ b/static/app/components/events/eventDataSection.tsx
@@ -147,7 +147,7 @@ const SectionHeader = styled('div')`
 
   & h3,
   & h3 a {
-    color: ${p => p.theme.subText};
+    color: ${p => p.theme.tokens.content.secondary};
     font-size: ${p => p.theme.fontSize.md};
     font-weight: ${p => p.theme.fontWeight.bold};
   }
diff --git a/static/app/components/events/eventMessage.tsx b/static/app/components/events/eventMessage.tsx
index 4df22ac56f1b1e..0cef08b35c128f 100644
--- a/static/app/components/events/eventMessage.tsx
+++ b/static/app/components/events/eventMessage.tsx
@@ -53,7 +53,7 @@ const Message = styled('div')`
 `;
 
 const NoMessage = styled(Message)`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 
 const ErrorLevelWithMargin = styled(ErrorLevel)`
diff --git a/static/app/components/events/eventStatisticalDetector/eventDifferentialFlamegraph.tsx b/static/app/components/events/eventStatisticalDetector/eventDifferentialFlamegraph.tsx
index 8e4c16abdcf6e3..04e84dd407f7c2 100644
--- a/static/app/components/events/eventStatisticalDetector/eventDifferentialFlamegraph.tsx
+++ b/static/app/components/events/eventStatisticalDetector/eventDifferentialFlamegraph.tsx
@@ -452,7 +452,7 @@ const DifferentialFlamegraphChangedFunctionStats = styled('div')`
 `;
 
 const DifferentialFlamegraphFunctionSecondaryStats = styled('div')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-size: ${p => p.theme.fontSize.sm};
 `;
 
@@ -470,7 +470,7 @@ const DifferentialFlamegraphChangedFunctionNameLink = styled(Link)`
 `;
 
 const DifferentialFlamegraphChangedFunctionModule = styled('div')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   min-width: 0;
   text-overflow: ellipsis;
   overflow: hidden;
@@ -514,7 +514,7 @@ const DifferentialFlamegraphExplanationBarContainer = styled('div')`
   border-radius: 0 0 ${p => p.theme.radius.md} ${p => p.theme.radius.md};
   padding: ${space(0.5)} ${space(1)};
   font-size: ${p => p.theme.fontSize.xs};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   border-top: 1px solid ${p => p.theme.tokens.border.primary};
   background: ${p => p.theme.backgroundSecondary};
 `;
@@ -610,7 +610,7 @@ const DifferentialFlamegraphChangedFunctionsTitleText = styled('div')`
 const DifferentialFlamegraphChangedFunctionsSubtitleText = styled('div')`
   font-weight: ${p => p.theme.fontWeight.normal};
   font-size: ${p => p.theme.fontSize.sm};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 
 const DifferentialFlamegraphFunctionsContainer = styled('div')`
@@ -632,7 +632,7 @@ const ErrorMessageContainer = styled('div')`
   width: 100%;
   height: 100%;
   background-color: ${p => p.theme.tokens.background.primary};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   text-align: center;
   padding: ${space(2)} ${space(4)};
 `;
diff --git a/static/app/components/events/eventStatisticalDetector/eventRegressionTable.tsx b/static/app/components/events/eventStatisticalDetector/eventRegressionTable.tsx
index 9479be73c16840..76cb060c06881f 100644
--- a/static/app/components/events/eventStatisticalDetector/eventRegressionTable.tsx
+++ b/static/app/components/events/eventStatisticalDetector/eventRegressionTable.tsx
@@ -182,6 +182,6 @@ const ChangeContainer = styled(NumberContainer)<{
   change: 'positive' | 'neutral' | 'negative';
 }>`
   ${p => p.change === 'positive' && `color: ${p.theme.colors.red400};`}
-  ${p => p.change === 'neutral' && `color: ${p.theme.subText};`}
+  ${p => p.change === 'neutral' && `color: ${p.theme.tokens.content.secondary};`}
   ${p => p.change === 'negative' && `color: ${p.theme.colors.green400};`}
 `;
diff --git a/static/app/components/events/eventStatisticalDetector/eventThroughput.tsx b/static/app/components/events/eventStatisticalDetector/eventThroughput.tsx
index c5b16b725499ad..bb6d5ecc6bc2cb 100644
--- a/static/app/components/events/eventStatisticalDetector/eventThroughput.tsx
+++ b/static/app/components/events/eventStatisticalDetector/eventThroughput.tsx
@@ -382,5 +382,5 @@ const CompareLabel = styled('div')<{change?: 'increase' | 'decrease'}>`
       ? p.theme.colors.red400
       : p.change === 'decrease'
         ? p.theme.colors.green400
-        : p.theme.subText};
+        : p.theme.tokens.content.secondary};
 `;
diff --git a/static/app/components/events/eventTags/eventTagsTreeRow.tsx b/static/app/components/events/eventTags/eventTagsTreeRow.tsx
index 069d8b1f224130..bea515765bdc93 100644
--- a/static/app/components/events/eventTags/eventTagsTreeRow.tsx
+++ b/static/app/components/events/eventTags/eventTagsTreeRow.tsx
@@ -438,7 +438,8 @@ const TreeRow = styled('div')<{hasErrors: boolean}>`
       visibility: visible;
     }
   }
-  color: ${p => (p.hasErrors ? p.theme.alert.danger.color : p.theme.subText)};
+  color: ${p =>
+    p.hasErrors ? p.theme.alert.danger.color : p.theme.tokens.content.secondary};
   background-color: ${p =>
     p.hasErrors
       ? p.theme.alert.danger.backgroundLight
@@ -497,7 +498,7 @@ const TreeValue = styled('div')<{hasErrors?: boolean}>`
 `;
 
 const TreeKey = styled(TreeValue)<{hasErrors?: boolean}>`
-  color: ${p => (p.hasErrors ? 'inherit' : p.theme.subText)};
+  color: ${p => (p.hasErrors ? 'inherit' : p.theme.tokens.content.secondary)};
 `;
 
 /**
diff --git a/static/app/components/events/featureFlags/eventFeatureFlagSection.tsx b/static/app/components/events/featureFlags/eventFeatureFlagSection.tsx
index 2b722168211355..166050c8811ad6 100644
--- a/static/app/components/events/featureFlags/eventFeatureFlagSection.tsx
+++ b/static/app/components/events/featureFlags/eventFeatureFlagSection.tsx
@@ -348,7 +348,7 @@ const StyledEmptyStateWarning = styled(EmptyStateWarning)`
 `;
 
 const SuspectLabel = styled('div')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 
 const ValueWrapper = styled('div')`
diff --git a/static/app/components/events/groupingInfo/groupingComponent.tsx b/static/app/components/events/groupingInfo/groupingComponent.tsx
index 42ff8ae1c559eb..dafdbb1f05c9ba 100644
--- a/static/app/components/events/groupingInfo/groupingComponent.tsx
+++ b/static/app/components/events/groupingInfo/groupingComponent.tsx
@@ -74,14 +74,17 @@ const CollapseButton = styled(Button)<{folded: boolean}>`
   transition: opacity 0.2s ease;
   align-self: ${p => (p.folded ? 'center' : 'baseline')};
   color: ${p =>
-    p.folded ? p.theme.tokens.interactive.link.accent.rest : p.theme.subText};
+    p.folded
+      ? p.theme.tokens.interactive.link.accent.rest
+      : p.theme.tokens.content.secondary};
 
   transform: ${p => (p.folded ? 'translateY(1px)' : 'translateY(2px)')};
 `;
 
 const GroupingComponentWrapper = styled('div')<{isContributing: boolean}>`
   grid-column: 2;
-  color: ${p => (p.isContributing ? p.theme.tokens.content.primary : p.theme.subText)};
+  color: ${p =>
+    p.isContributing ? p.theme.tokens.content.primary : p.theme.tokens.content.secondary};
 `;
 
 export const GroupingHint = styled('small')`
diff --git a/static/app/components/events/groupingInfo/groupingComponentChildren.tsx b/static/app/components/events/groupingInfo/groupingComponentChildren.tsx
index 3a4678860d6ecc..3fc84f024386c7 100644
--- a/static/app/components/events/groupingInfo/groupingComponentChildren.tsx
+++ b/static/app/components/events/groupingInfo/groupingComponentChildren.tsx
@@ -54,13 +54,16 @@ const GroupingValue = styled('code')<{
   font-size: ${p => p.theme.fontSize.sm};
   padding: 0 ${space(0.25)};
   background: ${p => (p.contributes ? 'rgba(112, 163, 214, 0.1)' : 'transparent')};
-  color: ${p => (p.contributes ? p.theme.tokens.content.primary : p.theme.subText)};
+  color: ${p =>
+    p.contributes ? p.theme.tokens.content.primary : p.theme.tokens.content.secondary};
 
   ${({valueType, theme, contributes}) =>
     (valueType === 'function' || valueType === 'symbol') &&
     css`
       font-weight: ${contributes ? theme.fontWeight.bold : 'normal'};
-      color: ${contributes ? theme.tokens.content.primary : theme.subText};
+      color: ${contributes
+        ? theme.tokens.content.primary
+        : theme.tokens.content.secondary};
     `}
 `;
 
diff --git a/static/app/components/events/groupingInfo/groupingVariant.tsx b/static/app/components/events/groupingInfo/groupingVariant.tsx
index 8f9c4fa74c9ed1..11e0d7cab73d24 100644
--- a/static/app/components/events/groupingInfo/groupingVariant.tsx
+++ b/static/app/components/events/groupingInfo/groupingVariant.tsx
@@ -212,7 +212,7 @@ const VariantHint = styled('span')`
   font-size: ${p => p.theme.fontSize.sm};
   margin-left: ${p => p.theme.space.xs};
   font-weight: ${p => p.theme.fontWeight.normal};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 
 const ContributionIcon = styled(({isContributing, ...p}: any) =>
diff --git a/static/app/components/events/highlights/editHighlightsModal.tsx b/static/app/components/events/highlights/editHighlightsModal.tsx
index 8a5c9f0a9a065d..46ef31a510c38e 100644
--- a/static/app/components/events/highlights/editHighlightsModal.tsx
+++ b/static/app/components/events/highlights/editHighlightsModal.tsx
@@ -505,7 +505,7 @@ const FooterInfo = styled('div')`
   flex: 1;
   display: flex;
   align-items: center;
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   gap: ${space(1)};
 `;
 
@@ -522,7 +522,7 @@ const EditHighlightPreview = styled('div')<{columnCount: number}>`
 
 const EmptyHighlightMessage = styled('div')<{extraMargin?: boolean}>`
   font-size: ${p => p.theme.fontSize.md};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   grid-column: 1 / -1;
   text-align: center;
   margin: ${p => (p.extraMargin ? space(3) : 0)} 0;
@@ -600,7 +600,8 @@ const EditButton = styled(Button)`
 
 const HighlightKey = styled('p')<{disabled?: boolean}>`
   grid-column: span 1;
-  color: ${p => (p.disabled ? p.theme.tokens.content.disabled : p.theme.subText)};
+  color: ${p =>
+    p.disabled ? p.theme.tokens.content.disabled : p.theme.tokens.content.secondary};
   font-family: ${p => p.theme.text.familyMono};
   margin-bottom: 0;
   word-wrap: break-word;
diff --git a/static/app/components/events/highlights/highlightsDataSection.tsx b/static/app/components/events/highlights/highlightsDataSection.tsx
index 72da5f58cdca22..2e30ef890c146c 100644
--- a/static/app/components/events/highlights/highlightsDataSection.tsx
+++ b/static/app/components/events/highlights/highlightsDataSection.tsx
@@ -315,7 +315,7 @@ const EmptyHighlights = styled('div')`
   text-align: center;
   justify-content: center;
   align-items: center;
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 
 const EmptyHighlightsContent = styled('div')`
diff --git a/static/app/components/events/highlights/highlightsIconSummary.tsx b/static/app/components/events/highlights/highlightsIconSummary.tsx
index 01fa0ef15f0278..79fbe61ea29f1f 100644
--- a/static/app/components/events/highlights/highlightsIconSummary.tsx
+++ b/static/app/components/events/highlights/highlightsIconSummary.tsx
@@ -260,7 +260,7 @@ const IconWrapper = styled('div')`
 
 const IconSubtitle = styled(Tooltip)`
   display: block;
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 
 const StyledVersion = styled(Version)`
diff --git a/static/app/components/events/interfaces/breadcrumbs/breadcrumbs.tsx b/static/app/components/events/interfaces/breadcrumbs/breadcrumbs.tsx
index 721452b45456ad..2486fab4c646fa 100644
--- a/static/app/components/events/interfaces/breadcrumbs/breadcrumbs.tsx
+++ b/static/app/components/events/interfaces/breadcrumbs/breadcrumbs.tsx
@@ -302,7 +302,7 @@ const Time = styled('div')`
 const StyledIconSort = styled(IconSort)`
   transition: 0.15s color;
   :hover {
-    color: ${p => p.theme.subText};
+    color: ${p => p.theme.tokens.content.secondary};
   }
 `;
 
diff --git a/static/app/components/events/interfaces/crashContent/exception/actionableItems.tsx b/static/app/components/events/interfaces/crashContent/exception/actionableItems.tsx
index 7bbfb9d1724ac9..a2cbd6948d0b0b 100644
--- a/static/app/components/events/interfaces/crashContent/exception/actionableItems.tsx
+++ b/static/app/components/events/interfaces/crashContent/exception/actionableItems.tsx
@@ -490,7 +490,7 @@ const StyledListItem = styled(ListItem)`
 `;
 
 const ToggleButton = styled(Button)`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   text-decoration: underline;
 
   :hover,
diff --git a/static/app/components/events/interfaces/crashContent/exception/relatedExceptions.tsx b/static/app/components/events/interfaces/crashContent/exception/relatedExceptions.tsx
index 2b53cbd4f50ab4..41a7b7798dda84 100644
--- a/static/app/components/events/interfaces/crashContent/exception/relatedExceptions.tsx
+++ b/static/app/components/events/interfaces/crashContent/exception/relatedExceptions.tsx
@@ -182,7 +182,7 @@ const Heading = styled('div')`
   font-weight: ${p => p.theme.fontWeight.bold};
   font-size: ${p => p.theme.fontSize.md};
   margin: ${space(1)} 0 ${space(0.5)} 0;
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 
 const StyledPre = styled('pre')`
diff --git a/static/app/components/events/interfaces/debugMeta/debugImage/index.tsx b/static/app/components/events/interfaces/debugMeta/debugImage/index.tsx
index 9cc571eb44b50a..2c579de9954a5b 100644
--- a/static/app/components/events/interfaces/debugMeta/debugImage/index.tsx
+++ b/static/app/components/events/interfaces/debugMeta/debugImage/index.tsx
@@ -95,12 +95,12 @@ const FileName = styled('span')`
 `;
 
 const CodeFilename = styled('span')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 
 const ImageColumn = styled(Column)`
   font-family: ${p => p.theme.text.familyMono};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-size: ${p => p.theme.fontSize.sm};
   overflow: hidden;
   flex-direction: column;
diff --git a/static/app/components/events/interfaces/debugMeta/debugImageDetails/generalInfo.tsx b/static/app/components/events/interfaces/debugMeta/debugImageDetails/generalInfo.tsx
index 52cc21a04281e5..dcd6762b5ded07 100644
--- a/static/app/components/events/interfaces/debugMeta/debugImageDetails/generalInfo.tsx
+++ b/static/app/components/events/interfaces/debugMeta/debugImageDetails/generalInfo.tsx
@@ -65,7 +65,7 @@ const Label = styled('div')<{coloredBg?: boolean}>`
 const Value = styled(Label)`
   white-space: pre-wrap;
   word-break: break-all;
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   padding: ${space(1)};
   font-family: ${p => p.theme.text.familyMono};
   ${p => p.coloredBg && `background-color: ${p.theme.backgroundSecondary};`}
diff --git a/static/app/components/events/interfaces/frame/context.tsx b/static/app/components/events/interfaces/frame/context.tsx
index 57e398c1e4401b..006459d4dea4fc 100644
--- a/static/app/components/events/interfaces/frame/context.tsx
+++ b/static/app/components/events/interfaces/frame/context.tsx
@@ -253,7 +253,7 @@ const EmptyContext = styled('div')`
   align-items: center;
   gap: ${space(1)};
   padding: 20px;
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-size: ${p => p.theme.fontSize.md};
 `;
 
diff --git a/static/app/components/events/interfaces/frame/deprecatedLine.tsx b/static/app/components/events/interfaces/frame/deprecatedLine.tsx
index de8a3bc09d4157..72fa7fe9a7b297 100644
--- a/static/app/components/events/interfaces/frame/deprecatedLine.tsx
+++ b/static/app/components/events/interfaces/frame/deprecatedLine.tsx
@@ -380,7 +380,7 @@ const DefaultLineTitleWrapper = styled('div')<{isInAppFrame: boolean}>`
   display: flex;
   align-items: center;
   justify-content: space-between;
-  color: ${p => (p.isInAppFrame ? '' : p.theme.subText)};
+  color: ${p => (p.isInAppFrame ? '' : p.theme.tokens.content.secondary)};
   font-style: ${p => (p.isInAppFrame ? '' : 'italic')};
 `;
 
@@ -426,18 +426,18 @@ const DefaultLineTagWrapper = styled('div')`
 `;
 
 const ToggleContextButton = styled(Button)`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 
 const ToggleButton = styled(Button)`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-size: ${p => p.theme.fontSize.sm};
   font-style: italic;
   font-weight: ${p => p.theme.fontWeight.normal};
   padding: ${space(0.25)} ${space(0.5)};
 
   &:hover {
-    color: ${p => p.theme.subText};
+    color: ${p => p.theme.tokens.content.secondary};
   }
 `;
 
diff --git a/static/app/components/events/interfaces/frame/frameRegisters/index.tsx b/static/app/components/events/interfaces/frame/frameRegisters/index.tsx
index 34f8fe497c94c9..afa3ca37827f13 100644
--- a/static/app/components/events/interfaces/frame/frameRegisters/index.tsx
+++ b/static/app/components/events/interfaces/frame/frameRegisters/index.tsx
@@ -71,7 +71,7 @@ const Register = styled('div')`
   gap: ${space(0.5)};
   grid-template-columns: 3em 1fr;
   align-items: center;
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 
   @media (min-width: ${p => p.theme.breakpoints.sm}) {
     text-align: right;
diff --git a/static/app/components/events/interfaces/frame/openInContextLine.tsx b/static/app/components/events/interfaces/frame/openInContextLine.tsx
index 6410c1cf0fa4fe..e53ec02d055d09 100644
--- a/static/app/components/events/interfaces/frame/openInContextLine.tsx
+++ b/static/app/components/events/interfaces/frame/openInContextLine.tsx
@@ -78,5 +78,5 @@ const OpenInLink = styled(ExternalLink)`
   display: flex;
   gap: ${space(0.75)};
   align-items: center;
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
diff --git a/static/app/components/events/interfaces/nativeFrame.tsx b/static/app/components/events/interfaces/nativeFrame.tsx
index 5cbcc20c8e415d..75abde87a1cac8 100644
--- a/static/app/components/events/interfaces/nativeFrame.tsx
+++ b/static/app/components/events/interfaces/nativeFrame.tsx
@@ -507,7 +507,7 @@ const ExpandCell = styled('div')`
 
 const ToggleButton = styled(Button)`
   display: block;
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 
 const Registers = styled(Context)`
@@ -517,7 +517,7 @@ const Registers = styled(Context)`
 `;
 
 const PackageNote = styled('div')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-size: ${p => p.theme.fontSize.xs};
 `;
 
@@ -530,7 +530,7 @@ const Package = styled('span')`
 `;
 
 const FileName = styled('span')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   border-bottom: 1px dashed ${p => p.theme.tokens.border.primary};
 `;
 
@@ -552,7 +552,7 @@ const RowHeader = styled('span')<{
       : `${p.theme.tokens.background.secondary}`};
   font-size: ${p => p.theme.fontSize.sm};
   padding: ${space(1)};
-  color: ${p => (p.isInAppFrame ? '' : p.theme.subText)};
+  color: ${p => (p.isInAppFrame ? '' : p.theme.tokens.content.secondary)};
   font-style: ${p => (p.isInAppFrame ? '' : 'italic')};
   ${p => p.expandable && `cursor: pointer;`};
 
@@ -576,12 +576,12 @@ const SymbolicatorIcon = styled('div')`
 `;
 
 const ShowHideButton = styled(Button)`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-size: ${p => p.theme.fontSize.sm};
   font-style: italic;
   font-weight: ${p => p.theme.fontWeight.normal};
   padding: ${space(0.25)} ${space(0.5)};
   &:hover {
-    color: ${p => p.theme.subText};
+    color: ${p => p.theme.tokens.content.secondary};
   }
 `;
diff --git a/static/app/components/events/interfaces/performance/anrRootCause.tsx b/static/app/components/events/interfaces/performance/anrRootCause.tsx
index d04ef27b80a2f7..716b7c4cc0ad20 100644
--- a/static/app/components/events/interfaces/performance/anrRootCause.tsx
+++ b/static/app/components/events/interfaces/performance/anrRootCause.tsx
@@ -194,7 +194,7 @@ function Spacer() {
 const Subtitle = styled('div')`
   font-size: ${p => p.theme.fontSize.sm};
   font-weight: ${p => p.theme.fontWeight.normal};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 
 const TitleWithLink = styled(GlobalSelectionLink)`
diff --git a/static/app/components/events/interfaces/sourceMapsDebuggerModal.tsx b/static/app/components/events/interfaces/sourceMapsDebuggerModal.tsx
index 7a10151ad383ce..9006490bd14fdc 100644
--- a/static/app/components/events/interfaces/sourceMapsDebuggerModal.tsx
+++ b/static/app/components/events/interfaces/sourceMapsDebuggerModal.tsx
@@ -2038,8 +2038,8 @@ const ListItemTitle = styled('p')<{status: 'none' | 'checked' | 'alert' | 'quest
   font-weight: ${p => p.theme.fontWeight.bold};
   color: ${p =>
     ({
-      none: p.theme.subText,
-      question: p.theme.subText,
+      none: p.theme.tokens.content.secondary,
+      question: p.theme.tokens.content.secondary,
       alert: p.theme.colors.yellow500,
       checked: p.theme.colors.green400,
     })[p.status]};
@@ -2092,7 +2092,7 @@ const InstructionList = styled('ul')`
 `;
 
 const ScrapingSymbolificationErrorMessage = styled('p')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   border-left: 2px solid ${p => p.theme.colors.gray200};
   padding-left: ${space(1)};
   margin-top: -${space(1)};
diff --git a/static/app/components/events/interfaces/spans/spanProfileDetails.tsx b/static/app/components/events/interfaces/spans/spanProfileDetails.tsx
index 3f5dee94db9545..713111d0d66019 100644
--- a/static/app/components/events/interfaces/spans/spanProfileDetails.tsx
+++ b/static/app/components/events/interfaces/spans/spanProfileDetails.tsx
@@ -485,6 +485,6 @@ const SpanDetailsItem = styled('span')<{grow?: boolean}>`
 `;
 
 const SectionSubtext = styled('span')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-size: ${p => p.theme.fontSize.md};
 `;
diff --git a/static/app/components/events/interfaces/threads.tsx b/static/app/components/events/interfaces/threads.tsx
index a94481b7f63fea..c14cbb928fdf6f 100644
--- a/static/app/components/events/interfaces/threads.tsx
+++ b/static/app/components/events/interfaces/threads.tsx
@@ -453,7 +453,7 @@ const ThreadStateWrapper = styled('div')`
 
 const LockReason = styled(TextOverflow)`
   font-weight: ${p => p.theme.fontWeight.normal};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 
 const Wrapper = styled('div')`
@@ -476,7 +476,7 @@ const ThreadTraceWrapper = styled('div')`
 `;
 
 const ThreadHeading = styled('h3')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-size: ${p => p.theme.fontSize.md};
   font-weight: ${p => p.theme.fontWeight.bold};
   margin-bottom: ${space(1)};
diff --git a/static/app/components/events/interfaces/threads/threadSelector/index.tsx b/static/app/components/events/interfaces/threads/threadSelector/index.tsx
index 3f8f1115812f51..3558014495f050 100644
--- a/static/app/components/events/interfaces/threads/threadSelector/index.tsx
+++ b/static/app/components/events/interfaces/threads/threadSelector/index.tsx
@@ -248,7 +248,7 @@ const ActiveThreadName = styled('span')`
 const StyledGrid = styled(ThreadSelectorGrid)`
   padding-left: 36px;
   padding-right: 20px;
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-weight: ${p => p.theme.fontWeight.bold};
   border-bottom: 1px solid ${p => p.theme.tokens.border.primary};
   margin-bottom: ${space(0.5)};
diff --git a/static/app/components/events/opsBreakdown.tsx b/static/app/components/events/opsBreakdown.tsx
index 1c24ceb703e95e..8d0761f0b3d09b 100644
--- a/static/app/components/events/opsBreakdown.tsx
+++ b/static/app/components/events/opsBreakdown.tsx
@@ -340,7 +340,7 @@ const OpsName = styled('div')`
 `;
 
 const Dur = styled('div')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-variant-numeric: tabular-nums;
 `;
 
diff --git a/static/app/components/events/styles.tsx b/static/app/components/events/styles.tsx
index bdd01d77b94dd6..b30040671f47d2 100644
--- a/static/app/components/events/styles.tsx
+++ b/static/app/components/events/styles.tsx
@@ -87,7 +87,7 @@ export const SuspectCommitHeader = styled('div')`
 
   & button,
   & h3 {
-    color: ${p => p.theme.subText};
+    color: ${p => p.theme.tokens.content.secondary};
     font-size: ${p => p.theme.fontSize.md};
     font-weight: ${p => p.theme.fontWeight.bold};
   }
diff --git a/static/app/components/events/suspectCommitFeedback.tsx b/static/app/components/events/suspectCommitFeedback.tsx
index bdb6f4d0f956e6..b69fb54ca59ba0 100644
--- a/static/app/components/events/suspectCommitFeedback.tsx
+++ b/static/app/components/events/suspectCommitFeedback.tsx
@@ -88,14 +88,14 @@ const FeedbackContainer = styled('div')`
 const FeedbackText = styled('span')`
   font-size: ${p => p.theme.fontSize.md};
   line-height: 1.5;
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   white-space: nowrap;
 `;
 
 const ThankYouText = styled('span')`
   font-size: ${p => p.theme.fontSize.md};
   line-height: 1.5;
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   white-space: nowrap;
 `;
 
diff --git a/static/app/components/events/traceEventDataSection.tsx b/static/app/components/events/traceEventDataSection.tsx
index 11aeea4405f6cb..c27e8910086596 100644
--- a/static/app/components/events/traceEventDataSection.tsx
+++ b/static/app/components/events/traceEventDataSection.tsx
@@ -561,7 +561,7 @@ function InlineThreadSection({
 const Wrapper = styled('div')``;
 
 const ThreadHeading = styled('h3')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-size: ${p => p.theme.fontSize.md};
   font-weight: ${p => p.theme.fontWeight.bold};
   margin-bottom: ${space(1)};
diff --git a/static/app/components/events/userFeedback.tsx b/static/app/components/events/userFeedback.tsx
index 39caade115fb39..49241a58b71917 100644
--- a/static/app/components/events/userFeedback.tsx
+++ b/static/app/components/events/userFeedback.tsx
@@ -88,7 +88,7 @@ const Items = styled('div')`
 `;
 
 const CopyButton = styled(Button)`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-size: ${p => p.theme.fontSize.sm};
   font-weight: ${p => p.theme.fontWeight.normal};
 `;
diff --git a/static/app/components/feedback/feedbackItem/feedbackItemHeader.tsx b/static/app/components/feedback/feedbackItem/feedbackItemHeader.tsx
index 8c93d0eba44e10..37109bd5b4b576 100644
--- a/static/app/components/feedback/feedbackItem/feedbackItemHeader.tsx
+++ b/static/app/components/feedback/feedbackItem/feedbackItemHeader.tsx
@@ -98,6 +98,6 @@ const VerticalSpacing = styled('div')`
 `;
 
 const SeenBy = styled('span')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-size: ${p => p.theme.fontSize.sm};
 `;
diff --git a/static/app/components/feedback/feedbackItem/feedbackScreenshot.tsx b/static/app/components/feedback/feedbackItem/feedbackScreenshot.tsx
index 3ca7cb8d31111e..94def5ab0970a1 100644
--- a/static/app/components/feedback/feedbackItem/feedbackScreenshot.tsx
+++ b/static/app/components/feedback/feedbackItem/feedbackScreenshot.tsx
@@ -131,7 +131,7 @@ const File = styled(StyledPanel)`
 `;
 
 const NoPreviewFound = styled('p')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   display: flex;
   flex-direction: column;
   align-items: center;
diff --git a/static/app/components/feedback/feedbackItem/feedbackShortId.tsx b/static/app/components/feedback/feedbackItem/feedbackShortId.tsx
index f0217c3f13f070..cc7ab7607c0b61 100644
--- a/static/app/components/feedback/feedbackItem/feedbackShortId.tsx
+++ b/static/app/components/feedback/feedbackItem/feedbackShortId.tsx
@@ -113,6 +113,6 @@ export default function FeedbackShortId({className, feedbackItem, style}: Props)
 }
 
 const ShortId = styled(TextOverflow)`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-size: ${p => p.theme.fontSize.sm};
 `;
diff --git a/static/app/components/feedback/feedbackItem/feedbackTimestampsTooltip.tsx b/static/app/components/feedback/feedbackItem/feedbackTimestampsTooltip.tsx
index 17c20ce953749e..b4510b5148c1b4 100644
--- a/static/app/components/feedback/feedbackItem/feedbackTimestampsTooltip.tsx
+++ b/static/app/components/feedback/feedbackItem/feedbackTimestampsTooltip.tsx
@@ -58,5 +58,5 @@ const DescriptionList = styled('dl')`
 `;
 
 const NotApplicableText = styled('span')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
diff --git a/static/app/components/feedback/feedbackItem/messageTitle.tsx b/static/app/components/feedback/feedbackItem/messageTitle.tsx
index b6a1ea89f1d946..8046b317570bde 100644
--- a/static/app/components/feedback/feedbackItem/messageTitle.tsx
+++ b/static/app/components/feedback/feedbackItem/messageTitle.tsx
@@ -56,7 +56,7 @@ export default function MessageTitle({feedbackItem, eventData}: Props) {
 }
 
 const StyledTimeSince = styled(TimeSince)`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-size: ${p => p.theme.fontSize.sm};
   align-self: center;
   white-space: nowrap;
diff --git a/static/app/components/feedback/list/feedbackList.tsx b/static/app/components/feedback/list/feedbackList.tsx
index 7146c72d00b9d3..16e4c7a927fab9 100644
--- a/static/app/components/feedback/list/feedbackList.tsx
+++ b/static/app/components/feedback/list/feedbackList.tsx
@@ -111,7 +111,7 @@ const Centered = styled('div')`
 const NoFeedbackWrapper = styled('div')`
   padding: ${space(4)} ${space(4)};
   text-align: center;
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 
   @media (max-width: ${p => p.theme.breakpoints.sm}) {
     font-size: ${p => p.theme.fontSize.md};
diff --git a/static/app/components/feedback/list/feedbackListItem.tsx b/static/app/components/feedback/list/feedbackListItem.tsx
index 604cd33d4916de..ac1b856890fd03 100644
--- a/static/app/components/feedback/list/feedbackListItem.tsx
+++ b/static/app/components/feedback/list/feedbackListItem.tsx
@@ -256,7 +256,7 @@ const ContactRow = styled(TextOverflow)`
 
 const ShortId = styled(TextOverflow)`
   font-size: ${p => p.theme.fontSize.sm};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 
 const StyledTimeSince = styled(TimeSince)`
diff --git a/static/app/components/feedback/summaryCategories/feedbackSummary.tsx b/static/app/components/feedback/summaryCategories/feedbackSummary.tsx
index 308275f2c2f888..08b646bcde6c01 100644
--- a/static/app/components/feedback/summaryCategories/feedbackSummary.tsx
+++ b/static/app/components/feedback/summaryCategories/feedbackSummary.tsx
@@ -86,6 +86,6 @@ const LoadingPlaceholder = styled(Placeholder)`
 
 const SummaryContent = styled('p')`
   font-size: ${p => p.theme.fontSize.sm};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   margin: 0;
 `;
diff --git a/static/app/components/footer.tsx b/static/app/components/footer.tsx
index 38e8ca652f0d72..be4aee376821b7 100644
--- a/static/app/components/footer.tsx
+++ b/static/app/components/footer.tsx
@@ -117,7 +117,7 @@ const RightLinks = styled('div')`
 `;
 
 const FooterLink = styled(ExternalLink)`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   &:focus-visible {
     outline: none;
     box-shadow: ${p => p.theme.colors.blue400} 0 2px 0;
@@ -128,12 +128,12 @@ const SentryLogoLink = styled(ExternalLink)`
   display: flex;
   align-items: center;
   margin: 0 auto;
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 
 const Build = styled('span')`
   font-size: ${p => p.theme.fontSize.sm};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-weight: ${p => p.theme.fontWeight.bold};
   margin-left: ${space(1)};
 `;
@@ -141,7 +141,7 @@ const Build = styled('span')`
 const Footer = styled(BaseFooter)`
   display: grid;
   grid-template-columns: 1fr 1fr 1fr;
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-size: ${p => p.theme.fontSize.md};
   border-top: 1px solid ${p => p.theme.tokens.border.primary};
   align-content: center;
diff --git a/static/app/components/forms/controls/radioGroup.tsx b/static/app/components/forms/controls/radioGroup.tsx
index f8927b3a360a74..59e851b872d1c2 100644
--- a/static/app/components/forms/controls/radioGroup.tsx
+++ b/static/app/components/forms/controls/radioGroup.tsx
@@ -140,7 +140,7 @@ const RadioLineText = styled('div', {shouldForwardProp})<{disabled?: boolean}>`
 `;
 
 const Description = styled('div')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-size: ${p => p.theme.fontSize.sm};
   line-height: 1.4em;
 `;
diff --git a/static/app/components/forms/controls/rangeSlider/sliderLabel.tsx b/static/app/components/forms/controls/rangeSlider/sliderLabel.tsx
index 4e74beda559a5f..9e28dcc3bd4328 100644
--- a/static/app/components/forms/controls/rangeSlider/sliderLabel.tsx
+++ b/static/app/components/forms/controls/rangeSlider/sliderLabel.tsx
@@ -5,7 +5,7 @@ import {space} from 'sentry/styles/space';
 const SliderLabel = styled('label')`
   font-size: 14px;
   margin-bottom: ${space(1)};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 
 export default SliderLabel;
diff --git a/static/app/components/forms/fieldGroup/fieldHelp.tsx b/static/app/components/forms/fieldGroup/fieldHelp.tsx
index 002fe496bee157..a67ee72a730130 100644
--- a/static/app/components/forms/fieldGroup/fieldHelp.tsx
+++ b/static/app/components/forms/fieldGroup/fieldHelp.tsx
@@ -7,7 +7,7 @@ import type {FieldGroupProps} from './types';
 interface FieldHelpProps extends Pick<FieldGroupProps, 'inline' | 'stacked'> {}
 
 export const FieldHelp = styled('div')<FieldHelpProps>`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-size: ${p => p.theme.fontSize.sm};
   margin-top: ${p => (p.stacked && !p.inline ? 0 : space(0.5))};
   line-height: 1.4;
diff --git a/static/app/components/forms/fields/choiceMapperField.tsx b/static/app/components/forms/fields/choiceMapperField.tsx
index c7847201ec6618..bcb9a7d58a9c83 100644
--- a/static/app/components/forms/fields/choiceMapperField.tsx
+++ b/static/app/components/forms/fields/choiceMapperField.tsx
@@ -455,7 +455,7 @@ const LabelColumn = styled('div')`
 const HeadingItem = styled('div')`
   font-size: 0.8em;
   text-transform: uppercase;
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 
 const Actions = styled('div')`
diff --git a/static/app/components/forms/fields/fileField.tsx b/static/app/components/forms/fields/fileField.tsx
index deb1d10e5de17b..7d066faf93f2fd 100644
--- a/static/app/components/forms/fields/fileField.tsx
+++ b/static/app/components/forms/fields/fileField.tsx
@@ -99,7 +99,8 @@ export default function FileField({accept, hideControlState, ...props}: FileFiel
 }
 
 const FileName = styled('span')<{hasFile: boolean}>`
-  color: ${p => (p.hasFile ? p.theme.tokens.content.primary : p.theme.subText)};
+  color: ${p =>
+    p.hasFile ? p.theme.tokens.content.primary : p.theme.tokens.content.secondary};
 `;
 
 const BrowseIndicator = styled('span')`
diff --git a/static/app/components/forms/fields/numberField.tsx b/static/app/components/forms/fields/numberField.tsx
index ade8cee1aad3d1..0727b6fc2a0a05 100644
--- a/static/app/components/forms/fields/numberField.tsx
+++ b/static/app/components/forms/fields/numberField.tsx
@@ -104,7 +104,7 @@ const HiddenValue = styled('span')`
   visibility: hidden;
 `;
 const Suffix = styled('span')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   margin-left: ${space(0.5)};
   position: absolute;
   top: 50%;
diff --git a/static/app/components/forms/fields/segmentedRadioField.tsx b/static/app/components/forms/fields/segmentedRadioField.tsx
index a5ca294b1b54d4..5bf7425633f09d 100644
--- a/static/app/components/forms/fields/segmentedRadioField.tsx
+++ b/static/app/components/forms/fields/segmentedRadioField.tsx
@@ -174,7 +174,7 @@ const RadioLineText = styled('div', {shouldForwardProp})<{disabled?: boolean}>`
 `;
 
 const Description = styled('div')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-size: ${p => p.theme.fontSize.sm};
   line-height: 1.4em;
 `;
diff --git a/static/app/components/forms/fields/tableField.tsx b/static/app/components/forms/fields/tableField.tsx
index 8cafa532ef19d1..c80848d4f4dae3 100644
--- a/static/app/components/forms/fields/tableField.tsx
+++ b/static/app/components/forms/fields/tableField.tsx
@@ -202,7 +202,7 @@ export default class TableField extends Component<InputFieldProps> {
 const HeaderLabel = styled('div')`
   font-size: 0.8em;
   text-transform: uppercase;
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 
 const Header = styled('div')`
diff --git a/static/app/components/group/externalIssuesList/streamlinedExternalIssueList.tsx b/static/app/components/group/externalIssuesList/streamlinedExternalIssueList.tsx
index 2c8f1e79ba39ed..81a86b0ba33291 100644
--- a/static/app/components/group/externalIssuesList/streamlinedExternalIssueList.tsx
+++ b/static/app/components/group/externalIssuesList/streamlinedExternalIssueList.tsx
@@ -276,5 +276,5 @@ const HorizontalSeparator = styled('div')`
 `;
 
 const UnlinkButton = styled(Button)`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
diff --git a/static/app/components/group/groupSummary.tsx b/static/app/components/group/groupSummary.tsx
index b3ecd24e13b97c..a771b16f1a4e75 100644
--- a/static/app/components/group/groupSummary.tsx
+++ b/static/app/components/group/groupSummary.tsx
@@ -469,7 +469,7 @@ const CardTitle = styled('div')`
   display: flex;
   align-items: center;
   gap: ${space(1)};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   padding-bottom: ${space(0.5)};
 `;
 
@@ -482,7 +482,7 @@ const CardTitleText = styled('p')`
 const CardTitleIcon = styled('div')`
   display: flex;
   align-items: center;
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 
 const CardContentContainer = styled('div')`
@@ -547,7 +547,7 @@ const CollapsedHeaderContent = styled('div')`
 const ChevronIcon = styled('div')`
   display: flex;
   align-items: center;
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   transition: transform 0.2s ease-in-out;
   flex-shrink: 0;
 `;
diff --git a/static/app/components/group/inboxBadges/timesTag.tsx b/static/app/components/group/inboxBadges/timesTag.tsx
index b0c3ce65cd9f81..e34cc161f46cb9 100644
--- a/static/app/components/group/inboxBadges/timesTag.tsx
+++ b/static/app/components/group/inboxBadges/timesTag.tsx
@@ -51,7 +51,7 @@ const Wrapper = styled('div')`
 `;
 
 const Separator = styled('span')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 
 const StyledIconClock = styled(IconClock)`
diff --git a/static/app/components/group/seenInfo.tsx b/static/app/components/group/seenInfo.tsx
index c0faab011db877..a9f30b89a21f72 100644
--- a/static/app/components/group/seenInfo.tsx
+++ b/static/app/components/group/seenInfo.tsx
@@ -104,7 +104,7 @@ function SeenInfo({
 }
 
 const dateTimeCss = (p: any) => css`
-  color: ${p.theme.subText};
+  color: ${p.theme.tokens.content.secondary};
   font-size: ${p.theme.fontSize.md};
   display: flex;
   justify-content: center;
diff --git a/static/app/components/groupPreviewTooltip/evidencePreview.tsx b/static/app/components/groupPreviewTooltip/evidencePreview.tsx
index 50cc77165c7add..b2531b7b0fa9f6 100644
--- a/static/app/components/groupPreviewTooltip/evidencePreview.tsx
+++ b/static/app/components/groupPreviewTooltip/evidencePreview.tsx
@@ -101,7 +101,7 @@ export function EvidencePreview({children, groupId, query}: SpanEvidencePreviewP
 }
 
 const EmptyWrapper = styled('div')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   padding: ${space(1.5)};
   font-size: ${p => p.theme.fontSize.md};
   display: flex;
diff --git a/static/app/components/groupPreviewTooltip/spanEvidencePreview.tsx b/static/app/components/groupPreviewTooltip/spanEvidencePreview.tsx
index 6ab77e5453bfc0..40fe2550f7cf7f 100644
--- a/static/app/components/groupPreviewTooltip/spanEvidencePreview.tsx
+++ b/static/app/components/groupPreviewTooltip/spanEvidencePreview.tsx
@@ -102,7 +102,7 @@ export function SpanEvidencePreview({
 }
 
 const EmptyWrapper = styled('div')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   padding: ${space(1.5)};
   font-size: ${p => p.theme.fontSize.md};
   display: flex;
diff --git a/static/app/components/groupPreviewTooltip/stackTracePreview.tsx b/static/app/components/groupPreviewTooltip/stackTracePreview.tsx
index 834e743123dbc2..f33d4e83d3b790 100644
--- a/static/app/components/groupPreviewTooltip/stackTracePreview.tsx
+++ b/static/app/components/groupPreviewTooltip/stackTracePreview.tsx
@@ -199,7 +199,7 @@ const StackTracePreviewWrapper = styled('div')`
 `;
 
 const NoStackTraceWrapper = styled('div')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   padding: ${space(1.5)};
   font-size: ${p => p.theme.fontSize.md};
   display: flex;
diff --git a/static/app/components/guidedSteps/guidedSteps.tsx b/static/app/components/guidedSteps/guidedSteps.tsx
index c73680d8f1e419..ebd13095370428 100644
--- a/static/app/components/guidedSteps/guidedSteps.tsx
+++ b/static/app/components/guidedSteps/guidedSteps.tsx
@@ -279,26 +279,29 @@ const StepHeading = styled('h4')<{isActive: boolean}>`
   margin: 0;
   font-weight: ${p => p.theme.fontWeight.bold};
   font-size: ${p => p.theme.fontSize.lg};
-  color: ${p => (p.isActive ? p.theme.tokens.content.primary : p.theme.subText)};
+  color: ${p =>
+    p.isActive ? p.theme.tokens.content.primary : p.theme.tokens.content.secondary};
 `;
 
 const StepDoneIcon = styled(IconCheckmark, {
   shouldForwardProp: prop => prop !== 'isActive',
 })<{isActive: boolean}>`
-  color: ${p => (p.isActive ? p.theme.tokens.content.success : p.theme.subText)};
+  color: ${p =>
+    p.isActive ? p.theme.tokens.content.success : p.theme.tokens.content.secondary};
   margin-left: ${space(1)};
   vertical-align: middle;
 `;
 
 const StepOptionalLabel = styled('div')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-size: ${p => p.theme.fontSize.sm};
   margin-top: -${space(0.75)};
   margin-bottom: ${space(1)};
 `;
 
 const ChildrenWrapper = styled('div')<{isActive: boolean}>`
-  color: ${p => (p.isActive ? p.theme.tokens.content.primary : p.theme.subText)};
+  color: ${p =>
+    p.isActive ? p.theme.tokens.content.primary : p.theme.tokens.content.secondary};
 
   p {
     margin-bottom: ${space(1)};
diff --git a/static/app/components/helpSearch.tsx b/static/app/components/helpSearch.tsx
index 109fa9e3c1e33e..15e29aa3fa7753 100644
--- a/static/app/components/helpSearch.tsx
+++ b/static/app/components/helpSearch.tsx
@@ -73,14 +73,14 @@ const SectionHeading = styled('div')`
 
 const Count = styled('div')`
   font-size: ${p => p.theme.fontSize.sm};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 
 const Empty = styled('div')`
   display: flex;
   align-items: center;
   padding: ${space(2)};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-size: ${p => p.theme.fontSize.md};
   border-top: 1px solid ${p => p.theme.tokens.border.secondary};
 `;
diff --git a/static/app/components/hovercard.tsx b/static/app/components/hovercard.tsx
index d16106fbc11bfe..78c5b589a4c055 100644
--- a/static/app/components/hovercard.tsx
+++ b/static/app/components/hovercard.tsx
@@ -187,7 +187,7 @@ const StyledHovercard = styled(Overlay)`
   width: 295px;
   line-height: 1.2;
   h6 {
-    color: ${p => p.theme.subText};
+    color: ${p => p.theme.tokens.content.secondary};
     font-size: ${p => p.theme.fontSize.xs};
     margin-bottom: ${space(1)};
     text-transform: uppercase;
diff --git a/static/app/components/idBadge/baseBadge.tsx b/static/app/components/idBadge/baseBadge.tsx
index 18808eea2f3ff1..84f534caacd2e2 100644
--- a/static/app/components/idBadge/baseBadge.tsx
+++ b/static/app/components/idBadge/baseBadge.tsx
@@ -136,7 +136,7 @@ const DisplayName = styled('span')`
 const Description = styled('div')`
   font-size: 0.875em;
   margin-top: ${space(0.25)};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   line-height: 14px;
   ${p => p.theme.overflowEllipsis};
 `;
diff --git a/static/app/components/idBadge/userBadge.tsx b/static/app/components/idBadge/userBadge.tsx
index edadc5fb8eba04..69eb841d91b904 100644
--- a/static/app/components/idBadge/userBadge.tsx
+++ b/static/app/components/idBadge/userBadge.tsx
@@ -61,7 +61,7 @@ const Name = styled('span')<{hideEmail: boolean}>`
 const Email = styled('div')`
   font-size: 0.875em;
   margin-top: ${space(0.25)};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   ${p => p.theme.overflowEllipsis};
 `;
 
diff --git a/static/app/components/keyValueData/index.tsx b/static/app/components/keyValueData/index.tsx
index 30bde2730fb358..6335ee103fab68 100644
--- a/static/app/components/keyValueData/index.tsx
+++ b/static/app/components/keyValueData/index.tsx
@@ -248,7 +248,7 @@ const ContentWrapper = styled('div')<{
       ? p.theme.alert.danger.color
       : p.isSuspectFlag
         ? p.theme.colors.yellow500
-        : p.theme.subText};
+        : p.theme.tokens.content.secondary};
   box-shadow: inset 0 0 0 1px
     ${p =>
       p.hasErrors
diff --git a/static/app/components/keyValueTable.tsx b/static/app/components/keyValueTable.tsx
index b471efe1725af3..cb91882d828eae 100644
--- a/static/app/components/keyValueTable.tsx
+++ b/static/app/components/keyValueTable.tsx
@@ -51,6 +51,6 @@ const Key = styled('dt')<{type: Props['type']}>`
 
 const Value = styled('dd')<{type: Props['type']}>`
   ${commonStyles};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   text-align: right;
 `;
diff --git a/static/app/components/lastCommit.tsx b/static/app/components/lastCommit.tsx
index 528f089cf0b8c9..641cc27cec3230 100644
--- a/static/app/components/lastCommit.tsx
+++ b/static/app/components/lastCommit.tsx
@@ -89,7 +89,7 @@ const Meta = styled('div')`
   align-items: center;
   gap: ${space(0.5)};
   font-size: ${p => p.theme.fontSize.sm};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 
 const StyledCommitLink = styled(CommitLink)`
diff --git a/static/app/components/list/utils.tsx b/static/app/components/list/utils.tsx
index 4e53d0c93b2da4..398244d23c57f8 100644
--- a/static/app/components/list/utils.tsx
+++ b/static/app/components/list/utils.tsx
@@ -7,7 +7,7 @@ const bulletStyle = (theme: Theme) => css`
   padding-left: ${space(3)};
   list-style-type: circle;
   & > li::marker {
-    color: ${theme.subText};
+    color: ${theme.tokens.content.secondary};
   }
 `;
 
diff --git a/static/app/components/menuItem.tsx b/static/app/components/menuItem.tsx
index 35d09a772d945b..436497803f71f3 100644
--- a/static/app/components/menuItem.tsx
+++ b/static/app/components/menuItem.tsx
@@ -262,7 +262,7 @@ const MenuListItem = styled('li')<MenuListItemProps>`
       padding: ${space(0.25)} ${space(0.5)};
       font-size: ${p.theme.fontSize.sm};
       line-height: 1.4;
-      color: ${p.theme.subText};
+      color: ${p.theme.tokens.content.secondary};
     `}
 
   ${getChildStyles}
diff --git a/static/app/components/modals/dashboardWidgetQuerySelectorModal.tsx b/static/app/components/modals/dashboardWidgetQuerySelectorModal.tsx
index 1234abb645b017..59ab8823d24821 100644
--- a/static/app/components/modals/dashboardWidgetQuerySelectorModal.tsx
+++ b/static/app/components/modals/dashboardWidgetQuerySelectorModal.tsx
@@ -131,7 +131,7 @@ const SearchLabel = styled('label')`
   display: flex;
   padding: ${space(0.5)} 0;
   margin: 0;
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 
 export const modalCss = css`
diff --git a/static/app/components/modals/featureTourModal.tsx b/static/app/components/modals/featureTourModal.tsx
index 081bc6d3979a2b..d754e17d520d93 100644
--- a/static/app/components/modals/featureTourModal.tsx
+++ b/static/app/components/modals/featureTourModal.tsx
@@ -224,7 +224,7 @@ const StepCounter = styled('div')`
   text-transform: uppercase;
   font-size: ${p => p.theme.fontSize.sm};
   font-weight: ${p => p.theme.fontWeight.bold};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 
 // Styled components that can be used to build tour content.
diff --git a/static/app/components/modals/inviteMembersModal/inviteHeaderMessages.tsx b/static/app/components/modals/inviteMembersModal/inviteHeaderMessages.tsx
index 452f3c175a5f24..34044b24cd52a0 100644
--- a/static/app/components/modals/inviteMembersModal/inviteHeaderMessages.tsx
+++ b/static/app/components/modals/inviteMembersModal/inviteHeaderMessages.tsx
@@ -30,6 +30,6 @@ export function InviteMessage() {
 }
 
 const Subtext = styled('p')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   margin-bottom: ${space(3)};
 `;
diff --git a/static/app/components/modals/inviteMissingMembersModal/index.tsx b/static/app/components/modals/inviteMissingMembersModal/index.tsx
index db95e8a63b3a1a..6ff344573335f9 100644
--- a/static/app/components/modals/inviteMissingMembersModal/index.tsx
+++ b/static/app/components/modals/inviteMissingMembersModal/index.tsx
@@ -357,7 +357,7 @@ const MemberEmail = styled('div')`
   max-width: 150px;
   font-size: ${p => p.theme.fontSize.sm};
   font-weight: ${p => p.theme.fontWeight.normal};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   text-overflow: ellipsis;
   overflow: hidden;
 `;
diff --git a/static/app/components/modals/sentryAppDetailsModal.tsx b/static/app/components/modals/sentryAppDetailsModal.tsx
index 452025e4f2928c..d990375bcb7084 100644
--- a/static/app/components/modals/sentryAppDetailsModal.tsx
+++ b/static/app/components/modals/sentryAppDetailsModal.tsx
@@ -233,7 +233,7 @@ const Description = styled(MarkedText)`
 `;
 
 const Author = styled('div')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 
 const DisabledNotice = styled(({reason, ...p}: {reason: React.ReactNode}) => (
diff --git a/static/app/components/onboardingWizard/content.tsx b/static/app/components/onboardingWizard/content.tsx
index 88e141c872267b..80a6752d4ac8a0 100644
--- a/static/app/components/onboardingWizard/content.tsx
+++ b/static/app/components/onboardingWizard/content.tsx
@@ -577,7 +577,8 @@ const TaskGroupWrapper = styled('div')`
 
 const TaskGroupHeader = styled(TaskCard)<{hasProgress: boolean}>`
   p {
-    color: ${p => (p.hasProgress ? p.theme.tokens.content.accent : p.theme.subText)};
+    color: ${p =>
+      p.hasProgress ? p.theme.tokens.content.accent : p.theme.tokens.content.secondary};
   }
 `;
 
@@ -591,7 +592,7 @@ const TaskGroupBody = styled('ul')`
 const TaskWrapper = styled('li')`
   gap: ${space(1)};
   p {
-    color: ${p => p.theme.subText};
+    color: ${p => p.theme.tokens.content.secondary};
   }
 `;
 
diff --git a/static/app/components/organizations/hybridFilter.tsx b/static/app/components/organizations/hybridFilter.tsx
index c0a268494b1762..e614db1816fc28 100644
--- a/static/app/components/organizations/hybridFilter.tsx
+++ b/static/app/components/organizations/hybridFilter.tsx
@@ -436,7 +436,7 @@ export function HybridFilter<Value extends SelectKey>({
 const ResetButton = styled(Button)`
   font-size: inherit; /* Inherit font size from MenuHeader */
   font-weight: ${p => p.theme.fontWeight.normal};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   padding: 0 ${space(0.5)};
   margin: -${space(0.5)} -${space(0.5)};
 `;
@@ -482,7 +482,7 @@ const FooterTip = styled('p')`
   gap: ${space(0.5)};
   align-items: center;
   justify-content: center;
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-size: ${p => p.theme.fontSize.sm};
   margin: 0;
 
diff --git a/static/app/components/organizations/projectPageFilter/index.tsx b/static/app/components/organizations/projectPageFilter/index.tsx
index c7bb70a19654b6..7ef28a5f19a26d 100644
--- a/static/app/components/organizations/projectPageFilter/index.tsx
+++ b/static/app/components/organizations/projectPageFilter/index.tsx
@@ -445,7 +445,7 @@ function shouldCloseOnInteractOutside(target: Element) {
 }
 
 const TrailingButton = styled(LinkButton)<{visible: boolean}>`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   display: ${p => (p.visible ? 'block' : 'none')};
 `;
 
diff --git a/static/app/components/pagination.tsx b/static/app/components/pagination.tsx
index 9dbfa01d5e8f97..c2c0dd04deba2a 100644
--- a/static/app/components/pagination.tsx
+++ b/static/app/components/pagination.tsx
@@ -103,7 +103,7 @@ const Wrapper = styled('div')`
 `;
 
 const PaginationCaption = styled('span')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-size: ${p => p.theme.fontSize.md};
   margin-right: ${space(2)};
 `;
diff --git a/static/app/components/panels/panelFooter.tsx b/static/app/components/panels/panelFooter.tsx
index d6e3d12b492082..f80fe1f5911044 100644
--- a/static/app/components/panels/panelFooter.tsx
+++ b/static/app/components/panels/panelFooter.tsx
@@ -2,7 +2,7 @@ import styled from '@emotion/styled';
 
 const PanelFooter = styled('div')`
   border-top: 1px solid ${p => p.theme.tokens.border.primary};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-size: 14px;
 `;
 
diff --git a/static/app/components/panels/panelHeader.tsx b/static/app/components/panels/panelHeader.tsx
index 560e746f78bdb8..93cf4bff236b44 100644
--- a/static/app/components/panels/panelHeader.tsx
+++ b/static/app/components/panels/panelHeader.tsx
@@ -32,7 +32,8 @@ const PanelHeader = styled('div')<Props>`
   /* Do not apply text styles to overlay elements such as dropdowns */
   > *:not(:has([data-overlay], button, a[role='button']), button, a[role='button']),
   &:not(:has(> *)) {
-    color: ${p => (p.lightText ? p.theme.subText : p.theme.tokens.content.primary)};
+    color: ${p =>
+      p.lightText ? p.theme.tokens.content.secondary : p.theme.tokens.content.primary};
     font-size: ${p => p.theme.fontSize.sm};
     font-weight: ${p => p.theme.fontWeight.bold};
     text-transform: uppercase;
diff --git a/static/app/components/panels/panelTable.tsx b/static/app/components/panels/panelTable.tsx
index 5bf08a0c04831a..1019ef73f10793 100644
--- a/static/app/components/panels/panelTable.tsx
+++ b/static/app/components/panels/panelTable.tsx
@@ -178,7 +178,7 @@ const Wrapper = styled(Panel, {
 `;
 
 const PanelTableHeader = styled('div')<{sticky: boolean}>`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-size: ${p => p.theme.fontSize.sm};
   font-weight: ${p => p.theme.fontWeight.bold};
   text-transform: uppercase;
diff --git a/static/app/components/percentChange.tsx b/static/app/components/percentChange.tsx
index 67a1e09a2d9e17..e71e188d7cc096 100644
--- a/static/app/components/percentChange.tsx
+++ b/static/app/components/percentChange.tsx
@@ -73,5 +73,5 @@ export const ColorizedRating = styled('div')<{
       ? p.theme.tokens.content.success
       : p.rating === 'bad'
         ? p.theme.errorText
-        : p.theme.subText};
+        : p.theme.tokens.content.secondary};
 `;
diff --git a/static/app/components/pill.tsx b/static/app/components/pill.tsx
index 3fcefd772ed935..c35b1a85a63964 100644
--- a/static/app/components/pill.tsx
+++ b/static/app/components/pill.tsx
@@ -129,7 +129,7 @@ const PillValue = styled(PillName)`
   .external-icon {
     display: inline;
     margin: 0 0 0 ${space(1)};
-    color: ${p => p.theme.subText};
+    color: ${p => p.theme.tokens.content.secondary};
     &:hover {
       color: ${p => p.theme.tokens.content.primary};
     }
diff --git a/static/app/components/platformPicker.tsx b/static/app/components/platformPicker.tsx
index 7145d6be1d1cca..30ba49b9d19bd6 100644
--- a/static/app/components/platformPicker.tsx
+++ b/static/app/components/platformPicker.tsx
@@ -386,7 +386,8 @@ const PlatformCard = styled(
     align-items: center;
     justify-content: center;
     width: 100%;
-    color: ${p => (p.selected ? p.theme.tokens.content.primary : p.theme.subText)};
+    color: ${p =>
+      p.selected ? p.theme.tokens.content.primary : p.theme.tokens.content.secondary};
     text-align: center;
     font-size: ${p => p.theme.fontSize.xs};
     text-transform: uppercase;
diff --git a/static/app/components/preprod/preprodBuildsDistributionTable.tsx b/static/app/components/preprod/preprodBuildsDistributionTable.tsx
index b744b98d0a0da2..cb9d5cd2b00c06 100644
--- a/static/app/components/preprod/preprodBuildsDistributionTable.tsx
+++ b/static/app/components/preprod/preprodBuildsDistributionTable.tsx
@@ -96,7 +96,7 @@ const BuildsDistributionTable = styled(SimpleTable)<{showProjectColumn?: boolean
 
 const DisabledRow = styled(SimpleTable.Row)`
   [role='cell'] {
-    color: ${p => p.theme.subText};
+    color: ${p => p.theme.tokens.content.secondary};
     cursor: not-allowed;
     opacity: 0.5;
   }
diff --git a/static/app/components/prevent/branchSelector/branchSelector.tsx b/static/app/components/prevent/branchSelector/branchSelector.tsx
index 47f0e87d132514..26937b972acfab 100644
--- a/static/app/components/prevent/branchSelector/branchSelector.tsx
+++ b/static/app/components/prevent/branchSelector/branchSelector.tsx
@@ -193,7 +193,7 @@ const IconContainer = styled('div')`
 const ResetButton = styled(Button)`
   font-size: inherit; /* Inherit font size from MenuHeader */
   font-weight: ${p => p.theme.fontWeight.normal};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   padding: 0 ${space(0.5)};
   margin: -${space(0.5)} -${space(0.5)};
 `;
diff --git a/static/app/components/prevent/repoSelector/repoSelector.tsx b/static/app/components/prevent/repoSelector/repoSelector.tsx
index 74cfe1ddc04ccc..f18544227650aa 100644
--- a/static/app/components/prevent/repoSelector/repoSelector.tsx
+++ b/static/app/components/prevent/repoSelector/repoSelector.tsx
@@ -199,7 +199,7 @@ const TriggerLabel = styled('span')`
 const Syncbutton = styled(Button)`
   font-size: inherit; /* Inherit font size from MenuHeader */
   font-weight: ${p => p.theme.fontWeight.normal};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   padding: 0 ${p => p.theme.space.xs};
   margin: -${p => p.theme.space['2xs']} -${p => p.theme.space.xs};
 `;
diff --git a/static/app/components/profiling/flamegraph/aggregateFlamegraphSidePanel.tsx b/static/app/components/profiling/flamegraph/aggregateFlamegraphSidePanel.tsx
index 507a0c87f0d465..6d4e7e1e83e4ea 100644
--- a/static/app/components/profiling/flamegraph/aggregateFlamegraphSidePanel.tsx
+++ b/static/app/components/profiling/flamegraph/aggregateFlamegraphSidePanel.tsx
@@ -243,7 +243,7 @@ const RowContainer = styled('div')`
   :nth-child(even) {
     background-color: ${p => p.theme.backgroundSecondary};
   }
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   background-color: ${p => p.theme.tokens.background.primary};
   box-shadow: inset 0 0 0 1px transparent;
 `;
diff --git a/static/app/components/profiling/flamegraph/callTreeTable.tsx b/static/app/components/profiling/flamegraph/callTreeTable.tsx
index 44f214335d19bc..8abd02939aa6e2 100644
--- a/static/app/components/profiling/flamegraph/callTreeTable.tsx
+++ b/static/app/components/profiling/flamegraph/callTreeTable.tsx
@@ -98,7 +98,7 @@ export const CallTreeTable = styled('div')`
     display: inline-block;
     min-width: 7ch;
     padding-right: 0px;
-    color: ${p => p.theme.subText};
+    color: ${p => p.theme.tokens.content.secondary};
     opacity: 1;
   }
   .${CallTreeTableClassNames.BACKGROUND_WEIGHT} {
@@ -120,7 +120,7 @@ export const CallTreeTable = styled('div')`
     display: flex;
     align-items: center;
     justify-content: center;
-    color: ${p => p.theme.subText};
+    color: ${p => p.theme.tokens.content.secondary};
     opacity: ${_p => 1};
   }
 
diff --git a/static/app/components/profiling/flamegraph/collapsibleTimeline.tsx b/static/app/components/profiling/flamegraph/collapsibleTimeline.tsx
index a5a68cab5e8c12..2c7a4fa50281c3 100644
--- a/static/app/components/profiling/flamegraph/collapsibleTimeline.tsx
+++ b/static/app/components/profiling/flamegraph/collapsibleTimeline.tsx
@@ -101,7 +101,7 @@ export const CollapsibleTimelineMessage = styled('p')`
   height: 100%;
   width: 100%;
   position: absolute;
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-size: ${p => p.theme.fontSize.sm};
 `;
 export {CollapsibleTimeline};
diff --git a/static/app/components/profiling/flamegraph/flamegraphToolbar/flamegraphSearch.tsx b/static/app/components/profiling/flamegraph/flamegraphToolbar/flamegraphSearch.tsx
index 8565d5990368a2..6b719dd548b7fa 100644
--- a/static/app/components/profiling/flamegraph/flamegraphToolbar/flamegraphSearch.tsx
+++ b/static/app/components/profiling/flamegraph/flamegraphToolbar/flamegraphSearch.tsx
@@ -472,7 +472,7 @@ const StyledSearchBarTrailingButton = styled(SearchBarTrailingButton)`
 `;
 
 const StyledTrailingText = styled('span')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-size: ${p => p.theme.fontSize.sm};
 `;
 
diff --git a/static/app/components/profiling/flamegraph/flamegraphTooltip.tsx b/static/app/components/profiling/flamegraph/flamegraphTooltip.tsx
index 0bcb6dd57ac9f1..681013f8c1fe15 100644
--- a/static/app/components/profiling/flamegraph/flamegraphTooltip.tsx
+++ b/static/app/components/profiling/flamegraph/flamegraphTooltip.tsx
@@ -226,7 +226,7 @@ const FlamegraphInlineIndicator = styled('span')`
 `;
 
 export const FlamegraphTooltipTimelineInfo = styled('div')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 
 export const FlamegraphTooltipFrameMainInfo = styled('div')`
diff --git a/static/app/components/profiling/profilingContextMenu.tsx b/static/app/components/profiling/profilingContextMenu.tsx
index c5e381fd997021..543dabd3586eb6 100644
--- a/static/app/components/profiling/profilingContextMenu.tsx
+++ b/static/app/components/profiling/profilingContextMenu.tsx
@@ -255,7 +255,7 @@ const MenuHeading = styled((props: MenuHeadingProps) => {
   text-transform: uppercase;
   line-height: 1.5;
   font-weight: ${p => p.theme.fontWeight.bold};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   margin-bottom: 0;
   cursor: default;
   font-size: 75%;
diff --git a/static/app/components/projectList.tsx b/static/app/components/projectList.tsx
index c5d93831dd4fd8..aa63ab5f6bdadf 100644
--- a/static/app/components/projectList.tsx
+++ b/static/app/components/projectList.tsx
@@ -118,7 +118,7 @@ const CollapsedBadge = styled('div')<{fontSize: number; size: number}>`
   text-align: center;
   font-weight: ${p => p.theme.fontWeight.bold};
   background-color: ${p => p.theme.colors.gray200};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-size: ${p => p.fontSize}px;
   width: ${p => p.size}px;
   height: ${p => p.size}px;
diff --git a/static/app/components/replays/breadcrumbs/breadcrumbIssueLink.tsx b/static/app/components/replays/breadcrumbs/breadcrumbIssueLink.tsx
index 471be01a4d19e7..ebbbeff3754cb9 100644
--- a/static/app/components/replays/breadcrumbs/breadcrumbIssueLink.tsx
+++ b/static/app/components/replays/breadcrumbs/breadcrumbIssueLink.tsx
@@ -69,6 +69,6 @@ const CrumbIssueWrapper = styled('div')`
   align-items: center;
   gap: ${p => p.theme.space.xs};
   font-size: ${p => p.theme.fontSize.sm};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   margin-top: ${p => p.theme.space.xs};
 `;
diff --git a/static/app/components/replays/breadcrumbs/breadcrumbWebVital.tsx b/static/app/components/replays/breadcrumbs/breadcrumbWebVital.tsx
index fb496e5d635ac0..235e653dc34ab9 100644
--- a/static/app/components/replays/breadcrumbs/breadcrumbWebVital.tsx
+++ b/static/app/components/replays/breadcrumbs/breadcrumbWebVital.tsx
@@ -150,7 +150,7 @@ const SelectorButton = styled(Button)`
   font-weight: ${p => p.theme.fontWeight.normal};
   box-shadow: none;
   font-size: ${p => p.theme.fontSize.sm};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   margin: 0 ${space(0.5)};
   height: auto;
   min-height: auto;
diff --git a/static/app/components/replays/diff/learnMoreButton.tsx b/static/app/components/replays/diff/learnMoreButton.tsx
index 2bc01564d8994a..9d35f4911bdc81 100644
--- a/static/app/components/replays/diff/learnMoreButton.tsx
+++ b/static/app/components/replays/diff/learnMoreButton.tsx
@@ -102,7 +102,7 @@ const ButtonTitle = styled('div')`
 `;
 
 const ButtonSubtitle = styled('div')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-weight: ${p => p.theme.fontWeight.normal};
   font-size: ${p => p.theme.fontSize.sm};
 `;
diff --git a/static/app/components/replays/header/configureReplayCard.tsx b/static/app/components/replays/header/configureReplayCard.tsx
index d40f907ba08e3e..a7cbabd93af4ae 100644
--- a/static/app/components/replays/header/configureReplayCard.tsx
+++ b/static/app/components/replays/header/configureReplayCard.tsx
@@ -216,7 +216,7 @@ const ButtonTitle = styled('div')`
 `;
 
 const ButtonSubtitle = styled('div')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-weight: ${p => p.theme.fontWeight.normal};
   font-size: ${p => p.theme.fontSize.sm};
 `;
diff --git a/static/app/components/replays/header/errorCounts.tsx b/static/app/components/replays/header/errorCounts.tsx
index 92f6ca352d4bbc..87afae2ab3eb4e 100644
--- a/static/app/components/replays/header/errorCounts.tsx
+++ b/static/app/components/replays/header/errorCounts.tsx
@@ -140,7 +140,7 @@ const Count = styled('span')`
 `;
 
 const ErrorCount = styled(Count)`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 
 const ColumnTooltipContent = styled(CountTooltipContent)`
diff --git a/static/app/components/replays/header/replayMetaData.tsx b/static/app/components/replays/header/replayMetaData.tsx
index e5b27c374bf9e5..c2a237984c0756 100644
--- a/static/app/components/replays/header/replayMetaData.tsx
+++ b/static/app/components/replays/header/replayMetaData.tsx
@@ -117,7 +117,7 @@ const KeyMetrics = styled('dl')`
   height: 42px;
   gap: 0 ${space(3)};
   align-items: center;
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   margin: 0;
 
   @media (min-width: ${p => p.theme.breakpoints.md}) {
@@ -143,7 +143,7 @@ const Count = styled('span')`
 `;
 
 const ClickCount = styled(Count)`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   display: flex;
   gap: ${space(0.75)};
   align-items: center;
diff --git a/static/app/components/replays/list/__stories__/replayList.tsx b/static/app/components/replays/list/__stories__/replayList.tsx
index cf899e01c00be9..fa96edc51cbd4c 100644
--- a/static/app/components/replays/list/__stories__/replayList.tsx
+++ b/static/app/components/replays/list/__stories__/replayList.tsx
@@ -72,7 +72,7 @@ const Centered = styled('div')`
 const NoReplaysWrapper = styled('div')`
   padding: ${p => p.theme.space['3xl']};
   text-align: center;
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 
   @media (max-width: ${p => p.theme.breakpoints.sm}) {
     font-size: ${p => p.theme.fontSize.md};
diff --git a/static/app/components/replays/list/__stories__/replayListItem.tsx b/static/app/components/replays/list/__stories__/replayListItem.tsx
index d40defc37c0754..3025f7b296d9b2 100644
--- a/static/app/components/replays/list/__stories__/replayListItem.tsx
+++ b/static/app/components/replays/list/__stories__/replayListItem.tsx
@@ -114,7 +114,7 @@ const ArchivedWrapper = styled(Flex)`
 const SubText = styled('div')`
   font-size: 0.875em;
   line-height: normal;
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   ${p => p.theme.overflowEllipsis};
   display: flex;
   flex-direction: column;
diff --git a/static/app/components/replays/preferences/replayPreferenceDropdown.tsx b/static/app/components/replays/preferences/replayPreferenceDropdown.tsx
index 1bbb1d9278a77a..938df229402393 100644
--- a/static/app/components/replays/preferences/replayPreferenceDropdown.tsx
+++ b/static/app/components/replays/preferences/replayPreferenceDropdown.tsx
@@ -118,5 +118,5 @@ export default function ReplayPreferenceDropdown({
 }
 
 const DurationDisplay = styled('span')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
diff --git a/static/app/components/replays/table/deleteReplays.tsx b/static/app/components/replays/table/deleteReplays.tsx
index 05a929d9127cb1..7ac28dac0c876b 100644
--- a/static/app/components/replays/table/deleteReplays.tsx
+++ b/static/app/components/replays/table/deleteReplays.tsx
@@ -280,7 +280,7 @@ const SimpleTableWithTwoColumns = styled(SimpleTable)`
 const SubText = styled('div')`
   font-size: 0.875em;
   line-height: normal;
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   ${p => p.theme.overflowEllipsis};
   display: flex;
   flex-direction: column;
diff --git a/static/app/components/replays/timeAndScrubberGrid.tsx b/static/app/components/replays/timeAndScrubberGrid.tsx
index 0db3307b13cc9d..e5844a883b4316 100644
--- a/static/app/components/replays/timeAndScrubberGrid.tsx
+++ b/static/app/components/replays/timeAndScrubberGrid.tsx
@@ -156,7 +156,7 @@ const Grid = styled('div')<{isCompact: boolean}>`
   grid-template-columns: max-content auto max-content;
   align-items: center;
 
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-size: ${p => p.theme.fontSize.sm};
   font-variant-numeric: tabular-nums;
   font-weight: ${p => p.theme.fontWeight.bold};
diff --git a/static/app/components/replays/virtualizedGrid/headerCell.tsx b/static/app/components/replays/virtualizedGrid/headerCell.tsx
index 1fdba9cbdd9126..06292ac2f159f3 100644
--- a/static/app/components/replays/virtualizedGrid/headerCell.tsx
+++ b/static/app/components/replays/virtualizedGrid/headerCell.tsx
@@ -61,7 +61,7 @@ const HeaderButton = styled('button')`
   border: 0;
   border-bottom: 1px solid ${p => p.theme.tokens.border.primary};
   background: ${p => p.theme.backgroundSecondary};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 
   font-size: ${p => p.theme.fontSize.sm};
   font-weight: ${p => p.theme.fontWeight.bold};
diff --git a/static/app/components/resolutionBox.tsx b/static/app/components/resolutionBox.tsx
index 304f18b9b7f898..b6bccc8b16bf03 100644
--- a/static/app/components/resolutionBox.tsx
+++ b/static/app/components/resolutionBox.tsx
@@ -138,7 +138,7 @@ function ResolutionBox(props: Props) {
 }
 
 const StyledTimeSince = styled(TimeSince)`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   margin-left: ${space(0.5)};
   font-size: ${p => p.theme.fontSize.sm};
 `;
diff --git a/static/app/components/scoreCard.tsx b/static/app/components/scoreCard.tsx
index 33d4e0d159b3d0..d9468951bcd709 100644
--- a/static/app/components/scoreCard.tsx
+++ b/static/app/components/scoreCard.tsx
@@ -67,7 +67,7 @@ function getTrendColor(p: TrendProps & {theme: Theme}) {
     case 'bad':
       return p.theme.errorText;
     default:
-      return p.theme.subText;
+      return p.theme.tokens.content.secondary;
   }
 }
 
diff --git a/static/app/components/scrollCarousel.tsx b/static/app/components/scrollCarousel.tsx
index 487ba91104ad87..4e740145fc4d5f 100644
--- a/static/app/components/scrollCarousel.tsx
+++ b/static/app/components/scrollCarousel.tsx
@@ -210,7 +210,7 @@ const StyledArrowButton = styled(Button)<{orientation: 'horizontal' | 'vertical'
   padding: 10px;
   border-radius: 100%;
   z-index: 1;
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   opacity: 0.6;
   background-color: ${p => p.theme.tokens.background.primary};
 
diff --git a/static/app/components/search/searchResult.tsx b/static/app/components/search/searchResult.tsx
index 5eec9ab0e84c93..45d7d39200a3b0 100644
--- a/static/app/components/search/searchResult.tsx
+++ b/static/app/components/search/searchResult.tsx
@@ -109,7 +109,7 @@ const SearchDetail = styled('div')`
 
 const ExtraDetail = styled('div')`
   font-size: ${p => p.theme.fontSize.sm};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   margin-top: ${space(0.5)};
 `;
 
diff --git a/static/app/components/searchBar/index.tsx b/static/app/components/searchBar/index.tsx
index 216b6234bed445..c34c4a0f80b4c4 100644
--- a/static/app/components/searchBar/index.tsx
+++ b/static/app/components/searchBar/index.tsx
@@ -110,7 +110,7 @@ const StyledInput = styled(InputGroup.Input)`
 `;
 
 export const SearchBarTrailingButton = styled(Button)`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   padding: ${space(0.5)};
 `;
 
diff --git a/static/app/components/searchBar/searchDropdown.tsx b/static/app/components/searchBar/searchDropdown.tsx
index 7a34bd815479d9..feee18ce4813c5 100644
--- a/static/app/components/searchBar/searchDropdown.tsx
+++ b/static/app/components/searchBar/searchDropdown.tsx
@@ -504,7 +504,7 @@ const Info = styled('div')`
   display: flex;
   padding: ${space(1)} ${space(2)};
   font-size: ${p => p.theme.fontSize.lg};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 
   &:not(:last-child) {
     border-bottom: 1px solid ${p => p.theme.tokens.border.secondary};
@@ -518,7 +518,7 @@ const SearchDropdownGroupTitle = styled('header')`
   align-items: center;
 
   background-color: ${p => p.theme.backgroundSecondary};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-weight: ${p => p.theme.fontWeight.normal};
   font-size: ${p => p.theme.fontSize.md};
 
@@ -625,7 +625,7 @@ const Documentation = styled('span')`
   ${p => p.theme.overflowEllipsis}
   font-size: ${p => p.theme.fontSize.md};
   font-family: ${p => p.theme.text.family};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   white-space: pre;
 `;
 
@@ -644,7 +644,7 @@ const DropdownFooter = styled(`div`)`
 `;
 
 const HotkeyGlyphWrapper = styled('span')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   margin-right: ${space(0.5)};
 
   @media (max-width: ${p => p.theme.breakpoints.sm}) {
diff --git a/static/app/components/searchQueryBuilder/askSeer/askSeerConsentOption.tsx b/static/app/components/searchQueryBuilder/askSeer/askSeerConsentOption.tsx
index f8fae6ddf9b9e7..2102a11002ea45 100644
--- a/static/app/components/searchQueryBuilder/askSeer/askSeerConsentOption.tsx
+++ b/static/app/components/searchQueryBuilder/askSeer/askSeerConsentOption.tsx
@@ -62,7 +62,7 @@ const AskSeerConsentLabelWrapper = styled('div')`
 `;
 
 const SeerConsentText = styled('p')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-size: ${p => p.theme.fontSize.xs};
   font-weight: ${p => p.theme.fontWeight.normal};
   margin: 0;
diff --git a/static/app/components/searchQueryBuilder/askSeerCombobox/askSeerComboBox.tsx b/static/app/components/searchQueryBuilder/askSeerCombobox/askSeerComboBox.tsx
index ec3e0442799841..5fdd844718c991 100644
--- a/static/app/components/searchQueryBuilder/askSeerCombobox/askSeerComboBox.tsx
+++ b/static/app/components/searchQueryBuilder/askSeerCombobox/askSeerComboBox.tsx
@@ -522,7 +522,7 @@ const PositionedSearchIconContainer = styled('div')`
 `;
 
 const SearchIcon = styled(IconSearch)`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   height: 22px;
 `;
 
diff --git a/static/app/components/searchQueryBuilder/askSeerCombobox/queryTokens.tsx b/static/app/components/searchQueryBuilder/askSeerCombobox/queryTokens.tsx
index b4253006b9881c..0899c06627a80a 100644
--- a/static/app/components/searchQueryBuilder/askSeerCombobox/queryTokens.tsx
+++ b/static/app/components/searchQueryBuilder/askSeerCombobox/queryTokens.tsx
@@ -108,7 +108,7 @@ const Token = styled('span')`
 
 const ExploreParamTitle = styled('span')`
   font-size: ${p => p.theme.form.sm.fontSize};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   white-space: nowrap;
   display: inline-flex;
   align-items: center;
diff --git a/static/app/components/searchQueryBuilder/formattedQuery.tsx b/static/app/components/searchQueryBuilder/formattedQuery.tsx
index 0bdb81bc1ff44e..0024706d149f87 100644
--- a/static/app/components/searchQueryBuilder/formattedQuery.tsx
+++ b/static/app/components/searchQueryBuilder/formattedQuery.tsx
@@ -223,5 +223,5 @@ const FilterValue = styled('div')`
 const Paren = styled('div')`
   display: flex;
   align-items: center;
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
diff --git a/static/app/components/searchQueryBuilder/index.tsx b/static/app/components/searchQueryBuilder/index.tsx
index 814346f6cb1b2d..d5e5264ff675a1 100644
--- a/static/app/components/searchQueryBuilder/index.tsx
+++ b/static/app/components/searchQueryBuilder/index.tsx
@@ -333,7 +333,7 @@ const ButtonsWrapper = styled('div')`
 `;
 
 const ActionButton = styled(Button)<{active?: boolean}>`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   ${p =>
     p.active &&
     css`
@@ -348,6 +348,6 @@ const PositionedSearchIconContainer = styled('div')`
 `;
 
 const SearchIcon = styled(IconSearch)`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   height: 22px;
 `;
diff --git a/static/app/components/searchQueryBuilder/plainTextQueryInput.tsx b/static/app/components/searchQueryBuilder/plainTextQueryInput.tsx
index 88d06ce48b3ba0..f20ec4f218eb2f 100644
--- a/static/app/components/searchQueryBuilder/plainTextQueryInput.tsx
+++ b/static/app/components/searchQueryBuilder/plainTextQueryInput.tsx
@@ -115,7 +115,7 @@ const InvisibleInput = styled('textarea')<{size: 'small' | 'normal'}>`
   background: transparent;
   font-size: ${p => p.theme.fontSize.sm};
   font-family: ${p => p.theme.text.familyMono};
-  caret-color: ${p => p.theme.subText};
+  caret-color: ${p => p.theme.tokens.interactive.transparent.neutral.background.rest};
   color: transparent;
 
   &::selection {
diff --git a/static/app/components/searchQueryBuilder/tokens/boolean.tsx b/static/app/components/searchQueryBuilder/tokens/boolean.tsx
index 664bdd5769a92b..fa7aed0c6266a6 100644
--- a/static/app/components/searchQueryBuilder/tokens/boolean.tsx
+++ b/static/app/components/searchQueryBuilder/tokens/boolean.tsx
@@ -182,7 +182,7 @@ function SearchQueryBuilderBooleanSelect({
 
 const OpButton = styled(UnstyledButton, {shouldForwardProp: isPropValid})`
   padding: 0 ${p => p.theme.space['2xs']} 0 ${p => p.theme.space.xs};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   height: 100%;
   border-left: 1px solid transparent;
   border-right: 1px solid transparent;
@@ -198,7 +198,7 @@ const OpButton = styled(UnstyledButton, {shouldForwardProp: isPropValid})`
 const DeleteButton = styled(UnstyledButton)`
   padding: 0 ${p => p.theme.space.sm} 0 ${p => p.theme.space.xs};
   border-radius: 0 3px 3px 0;
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   border-left: 1px solid transparent;
 
   :focus {
diff --git a/static/app/components/searchQueryBuilder/tokens/deletableToken.tsx b/static/app/components/searchQueryBuilder/tokens/deletableToken.tsx
index e09c08251c2577..5a6e2464febddd 100644
--- a/static/app/components/searchQueryBuilder/tokens/deletableToken.tsx
+++ b/static/app/components/searchQueryBuilder/tokens/deletableToken.tsx
@@ -90,7 +90,7 @@ const FloatingCloseButton = styled('button')`
   user-select: none;
   padding: 0;
   border: none;
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   border-radius: 2px 2px 0 0;
   box-shadow: 0 0 0 1px ${p => p.theme.tokens.border.secondary};
   display: flex;
@@ -136,7 +136,7 @@ const Wrapper = styled('div')`
 
   /* Need to hide visually but keep focusable */
   &:not(:hover):not(:focus-within) {
-    color: ${p => p.theme.subText};
+    color: ${p => p.theme.tokens.content.secondary};
 
     &[aria-invalid='true'] {
       color: ${p => p.theme.colors.red500};
diff --git a/static/app/components/searchQueryBuilder/tokens/filter/aggregateKey.tsx b/static/app/components/searchQueryBuilder/tokens/filter/aggregateKey.tsx
index dcbb262bf8ec82..563b8039ec319e 100644
--- a/static/app/components/searchQueryBuilder/tokens/filter/aggregateKey.tsx
+++ b/static/app/components/searchQueryBuilder/tokens/filter/aggregateKey.tsx
@@ -151,7 +151,7 @@ const FnName = styled('span')`
 `;
 
 const UnfocusedText = styled('span')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 
 const Parameters = styled('span')`
diff --git a/static/app/components/searchQueryBuilder/tokens/filter/filter.tsx b/static/app/components/searchQueryBuilder/tokens/filter/filter.tsx
index 71a60dc18a5f9a..458fb28aaac9ea 100644
--- a/static/app/components/searchQueryBuilder/tokens/filter/filter.tsx
+++ b/static/app/components/searchQueryBuilder/tokens/filter/filter.tsx
@@ -323,7 +323,7 @@ const ValueEditing = styled('div')`
 const DeleteButton = styled(UnstyledButton)`
   padding: 0 ${p => p.theme.space.sm} 0 ${p => p.theme.space.xs};
   border-radius: 0 3px 3px 0;
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   border-left: 1px solid transparent;
 
   :focus {
@@ -341,7 +341,7 @@ const FilterValueList = styled('div')`
 `;
 
 const FilterValueOr = styled('span')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 
 const FilterMultiValueTruncated = styled('div')`
diff --git a/static/app/components/searchQueryBuilder/tokens/filter/filterOperator.tsx b/static/app/components/searchQueryBuilder/tokens/filter/filterOperator.tsx
index 91f3defbaecee5..fa8edd1a4547a9 100644
--- a/static/app/components/searchQueryBuilder/tokens/filter/filterOperator.tsx
+++ b/static/app/components/searchQueryBuilder/tokens/filter/filterOperator.tsx
@@ -346,5 +346,5 @@ const OpButton = styled(UnstyledButton, {
 `;
 
 const OpLabel = styled('span')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
diff --git a/static/app/components/searchQueryBuilder/tokens/filter/functionDescription.tsx b/static/app/components/searchQueryBuilder/tokens/filter/functionDescription.tsx
index c48fd69e3a6771..b7d5b39c3460bb 100644
--- a/static/app/components/searchQueryBuilder/tokens/filter/functionDescription.tsx
+++ b/static/app/components/searchQueryBuilder/tokens/filter/functionDescription.tsx
@@ -81,5 +81,5 @@ const Separator = styled('hr')`
 `;
 
 const FunctionName = styled('span')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
diff --git a/static/app/components/searchQueryBuilder/tokens/filter/valueListBox.tsx b/static/app/components/searchQueryBuilder/tokens/filter/valueListBox.tsx
index c4c8aa7db921be..692acd95890bf1 100644
--- a/static/app/components/searchQueryBuilder/tokens/filter/valueListBox.tsx
+++ b/static/app/components/searchQueryBuilder/tokens/filter/valueListBox.tsx
@@ -222,7 +222,7 @@ const StyledPositionWrapper = styled('div')<{visible?: boolean}>`
 
 const FooterContainer = styled('div')`
   padding: ${p => p.theme.space.md} ${p => p.theme.space.xl};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   border-top: 1px solid ${p => p.theme.tokens.border.secondary};
   font-size: ${p => p.theme.fontSize.sm};
   display: flex;
diff --git a/static/app/components/searchQueryBuilder/tokens/filter/valueSuggestions/date.tsx b/static/app/components/searchQueryBuilder/tokens/filter/valueSuggestions/date.tsx
index 4dfb3d85c75298..8083f07a97f47f 100644
--- a/static/app/components/searchQueryBuilder/tokens/filter/valueSuggestions/date.tsx
+++ b/static/app/components/searchQueryBuilder/tokens/filter/valueSuggestions/date.tsx
@@ -122,6 +122,6 @@ const AbsoluteDateOption = styled('div')`
   align-items: center;
 
   svg {
-    color: ${p => p.theme.subText};
+    color: ${p => p.theme.tokens.content.secondary};
   }
 `;
diff --git a/static/app/components/searchQueryBuilder/tokens/filterKeyListBox/index.tsx b/static/app/components/searchQueryBuilder/tokens/filterKeyListBox/index.tsx
index bb687f02604d75..cb369039bc3ab3 100644
--- a/static/app/components/searchQueryBuilder/tokens/filterKeyListBox/index.tsx
+++ b/static/app/components/searchQueryBuilder/tokens/filterKeyListBox/index.tsx
@@ -547,7 +547,7 @@ const SectionButton = styled(Button)`
   font-weight: ${p => p.theme.fontWeight.normal};
   font-size: ${p => p.theme.fontSize.sm};
   padding: 0 ${p => p.theme.space.lg};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   border: 0;
 
   &[aria-selected='true'] {
@@ -571,7 +571,7 @@ const EmptyState = styled('div')`
   height: 100%;
   padding: ${p => p.theme.space['3xl']};
   text-align: center;
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 
   div {
     max-width: 280px;
diff --git a/static/app/components/searchQueryBuilder/tokens/filterKeyListBox/keyDescription.tsx b/static/app/components/searchQueryBuilder/tokens/filterKeyListBox/keyDescription.tsx
index 996f261649a7a5..38de94ba2f988a 100644
--- a/static/app/components/searchQueryBuilder/tokens/filterKeyListBox/keyDescription.tsx
+++ b/static/app/components/searchQueryBuilder/tokens/filterKeyListBox/keyDescription.tsx
@@ -96,7 +96,7 @@ const DescriptionList = styled('dl')`
 `;
 
 const Term = styled('dt')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-weight: ${p => p.theme.fontWeight.normal};
 `;
 
diff --git a/static/app/components/searchQueryBuilder/tokens/filterKeyListBox/utils.tsx b/static/app/components/searchQueryBuilder/tokens/filterKeyListBox/utils.tsx
index 4de15aec8429c3..50c4c5a7916db2 100644
--- a/static/app/components/searchQueryBuilder/tokens/filterKeyListBox/utils.tsx
+++ b/static/app/components/searchQueryBuilder/tokens/filterKeyListBox/utils.tsx
@@ -297,6 +297,6 @@ export function createLogicFilterItem({
 }
 
 const SearchItemLabel = styled('div')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   white-space: nowrap;
 `;
diff --git a/static/app/components/searchSyntax/renderer.tsx b/static/app/components/searchSyntax/renderer.tsx
index 4465f7b74e9b7e..b4412a6a499c9d 100644
--- a/static/app/components/searchSyntax/renderer.tsx
+++ b/static/app/components/searchSyntax/renderer.tsx
@@ -358,7 +358,7 @@ const Key = styled('span')<{negated: boolean}>`
   ${filterCss};
   border-right: none;
   font-weight: ${p => p.theme.fontWeight.bold};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   ${p =>
     p.negated
       ? css`
@@ -375,7 +375,7 @@ const Key = styled('span')<{negated: boolean}>`
 const ExplicitKey = styled('span')<{prefix: string}>`
   &:before,
   &:after {
-    color: ${p => p.theme.subText};
+    color: ${p => p.theme.tokens.content.secondary};
   }
   &:before {
     content: '${p => p.prefix}[';
@@ -418,7 +418,7 @@ const Unit = styled('span')`
 
 const LogicBoolean = styled('span')<{invalid: boolean}>`
   font-weight: ${p => p.theme.fontWeight.bold};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   ${p => p.invalid && `color: ${p.theme.colors.red500}`}
 `;
 
@@ -431,11 +431,11 @@ const DateTime = styled('span')`
 `;
 
 const ListComma = styled('span')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 
 const Paren = styled('span')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 
 const InList = styled('span')`
diff --git a/static/app/components/serviceIncidentDetails.tsx b/static/app/components/serviceIncidentDetails.tsx
index 75b6ac1332fe03..f019e7fcc48966 100644
--- a/static/app/components/serviceIncidentDetails.tsx
+++ b/static/app/components/serviceIncidentDetails.tsx
@@ -218,7 +218,7 @@ const StatusTitle = styled('div')`
 `;
 
 const StatusDate = styled('div')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-size: ${p => p.theme.fontSize.sm};
 `;
 
diff --git a/static/app/components/sidebarSection.tsx b/static/app/components/sidebarSection.tsx
index 2fa287366000b1..bad280ad658db0 100644
--- a/static/app/components/sidebarSection.tsx
+++ b/static/app/components/sidebarSection.tsx
@@ -7,7 +7,7 @@ export const Wrap = styled('div')`
 `;
 
 export const Title = styled('h6')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   display: flex;
   align-items: center;
   gap: ${space(0.5)};
@@ -16,7 +16,7 @@ export const Title = styled('h6')`
 `;
 
 export const IconWrapper = styled('div')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   margin-left: ${space(0.5)};
 `;
 
diff --git a/static/app/components/slider/index.tsx b/static/app/components/slider/index.tsx
index a33ac54a60feea..cdfe6bb4e84294 100644
--- a/static/app/components/slider/index.tsx
+++ b/static/app/components/slider/index.tsx
@@ -322,7 +322,7 @@ const SliderLabelOutput = styled('output')`
   margin: 0;
   padding: 0;
   font-variant-numeric: tabular-nums;
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 
 const SliderTrack = styled('div', {
@@ -367,7 +367,7 @@ const SliderLowerTrack = styled('div')<{disabled: boolean; error: boolean}>`
   pointer-events: none;
 
   ${p => p.error && `background: ${p.theme.error};`}
-  ${p => p.disabled && `background: ${p.theme.subText};`}
+  ${p => p.disabled && `background: ${p.theme.tokens.content.disabled};`}
 `;
 
 const SliderTick = styled('div')<{
@@ -389,7 +389,11 @@ const SliderTick = styled('div')<{
   ${p =>
     p.inSelection &&
     `background: ${
-      p.disabled ? p.theme.subText : p.error ? p.theme.error : p.theme.active
+      p.disabled
+        ? p.theme.tokens.content.disabled
+        : p.error
+          ? p.theme.error
+          : p.theme.active
     };`}
 `;
 
@@ -399,6 +403,6 @@ const SliderTickLabel = styled('small')`
   top: calc(100% + ${space(1)});
   margin: 0 -1px;
 
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-size: ${p => p.theme.fontSize.sm};
 `;
diff --git a/static/app/components/slider/thumb.tsx b/static/app/components/slider/thumb.tsx
index cd8f56be28889e..e22bb77a17fcae 100644
--- a/static/app/components/slider/thumb.tsx
+++ b/static/app/components/slider/thumb.tsx
@@ -104,11 +104,11 @@ const SliderThumbWrap = styled('div')<{
     p.isDisabled &&
     css`
       cursor: initial;
-      background: ${p.theme.subText};
-      color: ${p.theme.subText};
+      background: ${p.theme.tokens.content.disabled};
+      color: ${p.theme.tokens.content.disabled};
 
       &:hover {
-        background: ${p.theme.subText};
+        background: ${p.theme.tokens.content.disabled};
       }
     `};
 
diff --git a/static/app/components/stream/group.tsx b/static/app/components/stream/group.tsx
index 7b7f55921056e4..2b2ee164f7ecec 100644
--- a/static/app/components/stream/group.tsx
+++ b/static/app/components/stream/group.tsx
@@ -890,14 +890,14 @@ const SecondaryCount = styled(({value, ...p}: any) => <Count {...p} value={value
   font-size: ${p => p.theme.fontSize.sm};
   display: flex;
   justify-content: right;
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-variant-numeric: tabular-nums;
 
   :before {
     content: '/';
     padding-left: ${space(0.25)};
     padding-right: 2px;
-    color: ${p => p.theme.subText};
+    color: ${p => p.theme.tokens.content.secondary};
   }
 `;
 
@@ -910,7 +910,7 @@ const CountTooltipContent = styled('div')`
   align-items: center;
 
   h4 {
-    color: ${p => p.theme.subText};
+    color: ${p => p.theme.tokens.content.secondary};
     font-size: ${p => p.theme.fontSize.xs};
     text-transform: uppercase;
     grid-column: 1 / -1;
diff --git a/static/app/components/structuredEventData/collapsibleValue.tsx b/static/app/components/structuredEventData/collapsibleValue.tsx
index abcd33a1aa3c31..f10308cec70617 100644
--- a/static/app/components/structuredEventData/collapsibleValue.tsx
+++ b/static/app/components/structuredEventData/collapsibleValue.tsx
@@ -117,7 +117,7 @@ const NumItemsButton = styled(Button)`
   font-weight: ${p => p.theme.fontWeight.normal};
   box-shadow: none;
   font-size: ${p => p.theme.fontSize.sm};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   margin: 0 ${space(0.5)};
 
   height: 18px;
diff --git a/static/app/components/tables/gridEditable/styles.tsx b/static/app/components/tables/gridEditable/styles.tsx
index b318406dfc3492..dfedd6d8830cec 100644
--- a/static/app/components/tables/gridEditable/styles.tsx
+++ b/static/app/components/tables/gridEditable/styles.tsx
@@ -28,7 +28,7 @@ export const Header = styled('div')`
 export const HeaderTitle = styled('h4')`
   margin: 0;
   font-size: ${p => p.theme.fontSize.md};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 
 export const HeaderButtonContainer = styled('div')`
@@ -122,7 +122,7 @@ export const GridHead = styled('thead')<{sticky?: boolean}>`
   line-height: 1;
   text-transform: uppercase;
   user-select: none;
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 
   border-top-left-radius: ${p => p.theme.radius.md};
   border-top-right-radius: ${p => p.theme.radius.md};
diff --git a/static/app/components/tables/simpleTable/index.tsx b/static/app/components/tables/simpleTable/index.tsx
index 52fcf09dac0f3d..d66461984553c1 100644
--- a/static/app/components/tables/simpleTable/index.tsx
+++ b/static/app/components/tables/simpleTable/index.tsx
@@ -155,7 +155,7 @@ const ColumnHeaderCell = styled('div')<{isSorted?: boolean}>`
   font-weight: ${p => p.theme.fontWeight.bold};
   text-align: left;
   font-size: ${p => p.theme.fontSize.md};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 
   position: relative;
   display: flex;
@@ -211,7 +211,7 @@ const StyledEmptyMessage = styled('div')`
   display: flex;
   justify-content: center;
   align-items: center;
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-size: ${p => p.theme.fontSize.md};
 `;
 
diff --git a/static/app/components/timeRangeSelector/dateRange.tsx b/static/app/components/timeRangeSelector/dateRange.tsx
index 2d49ca7e3cfa5b..2568cfa8c4175b 100644
--- a/static/app/components/timeRangeSelector/dateRange.tsx
+++ b/static/app/components/timeRangeSelector/dateRange.tsx
@@ -259,7 +259,7 @@ const StyledTimePicker = styled(TimePicker)`
 `;
 
 const UtcPicker = styled('div')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   white-space: nowrap;
   display: flex;
   align-items: center;
diff --git a/static/app/components/timeRangeSelector/timePicker.tsx b/static/app/components/timeRangeSelector/timePicker.tsx
index 17722df7114ce9..8ab36debf49f9e 100644
--- a/static/app/components/timeRangeSelector/timePicker.tsx
+++ b/static/app/components/timeRangeSelector/timePicker.tsx
@@ -102,7 +102,7 @@ const TimePicker = styled(
     grid-template-columns: 48% 48%;
     grid-column-gap: 4%;
     align-items: center;
-    color: ${p => p.theme.subText};
+    color: ${p => p.theme.tokens.content.secondary};
     width: 100%;
     padding: 0;
   }
@@ -117,7 +117,7 @@ const Input = styled('input')`
     width: 100%;
     background: ${p => p.theme.backgroundSecondary};
     border: 1px solid ${p => p.theme.tokens.border.primary};
-    color: ${p => p.theme.subText};
+    color: ${p => p.theme.tokens.content.secondary};
     padding: ${space(0.25)} ${space(0.5)};
     box-shadow: none;
     font-variant-numeric: tabular-nums;
diff --git a/static/app/components/timeline/index.tsx b/static/app/components/timeline/index.tsx
index 42e2e7235149ca..4cfd5cdf377a4c 100644
--- a/static/app/components/timeline/index.tsx
+++ b/static/app/components/timeline/index.tsx
@@ -77,7 +77,7 @@ function makeDefaultColorConfig(theme: Theme) {
 
 const Row = styled('div')<{showLastLine?: boolean}>`
   position: relative;
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   display: grid;
   align-items: start;
   grid-template: auto auto / 22px 1fr auto;
@@ -123,7 +123,7 @@ const Spacer = styled('div')`
 const Content = styled('div')`
   text-align: left;
   grid-column: span 2;
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   margin: ${space(0.25)} 0 0;
   font-size: ${p => p.theme.fontSize.sm};
   word-wrap: break-word;
diff --git a/static/app/components/tokenizedInput/token/deletableToken.tsx b/static/app/components/tokenizedInput/token/deletableToken.tsx
index 01366bcfbca8bb..58bb0a05dde8de 100644
--- a/static/app/components/tokenizedInput/token/deletableToken.tsx
+++ b/static/app/components/tokenizedInput/token/deletableToken.tsx
@@ -97,7 +97,7 @@ const FloatingCloseButton = styled('button')`
   user-select: none;
   padding: 0;
   border: none;
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   border-radius: 2px 2px 0 0;
   box-shadow: 0 0 0 1px ${p => p.theme.tokens.border.secondary};
   display: flex;
@@ -143,7 +143,7 @@ const Wrapper = styled('div')`
 
   /* Need to hide visually but keep focusable */
   &:not(:hover):not(:focus-within) {
-    color: ${p => p.theme.subText};
+    color: ${p => p.theme.tokens.content.secondary};
 
     &[aria-invalid='true'] {
       color: ${p => p.theme.colors.red500};
diff --git a/static/app/components/toolbarHeader.tsx b/static/app/components/toolbarHeader.tsx
index f0e2bbafb6f81a..fd561b1cbc7887 100644
--- a/static/app/components/toolbarHeader.tsx
+++ b/static/app/components/toolbarHeader.tsx
@@ -4,7 +4,7 @@ const ToolbarHeader = styled('div')`
   font-size: 12px;
   text-transform: uppercase;
   font-weight: ${p => p.theme.fontWeight.bold};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 
 export default ToolbarHeader;
diff --git a/static/app/components/versionHoverCard.tsx b/static/app/components/versionHoverCard.tsx
index c8d53b1ad0b94f..72af8c09329a96 100644
--- a/static/app/components/versionHoverCard.tsx
+++ b/static/app/components/versionHoverCard.tsx
@@ -227,7 +227,7 @@ const ConnectRepo = styled('div')`
 `;
 
 const StyledTimeSince = styled(TimeSince)`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-size: ${p => p.theme.fontSize.sm};
 `;
 
diff --git a/static/app/components/workflowEngine/gridCell/issueCell.tsx b/static/app/components/workflowEngine/gridCell/issueCell.tsx
index bd15432d2a534f..6932e7847600a6 100644
--- a/static/app/components/workflowEngine/gridCell/issueCell.tsx
+++ b/static/app/components/workflowEngine/gridCell/issueCell.tsx
@@ -60,7 +60,7 @@ const IssueWrapper = styled(Link)`
   flex-direction: column;
   gap: ${p => p.theme.space.sm};
   flex: 1;
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 
   ${p => css`
     &:hover [data-group-title] {
diff --git a/static/app/components/workflowEngine/gridCell/titleCell.tsx b/static/app/components/workflowEngine/gridCell/titleCell.tsx
index 8b273c6676bddc..5dde1e7ed5d96b 100644
--- a/static/app/components/workflowEngine/gridCell/titleCell.tsx
+++ b/static/app/components/workflowEngine/gridCell/titleCell.tsx
@@ -134,6 +134,6 @@ const DetailsWrapper = styled('div')`
   gap: ${space(0.75)};
   justify-content: start;
   align-items: center;
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   white-space: nowrap;
 `;
diff --git a/static/app/components/workflowEngine/ui/section.tsx b/static/app/components/workflowEngine/ui/section.tsx
index a66165661777ce..1e9528f4ee84eb 100644
--- a/static/app/components/workflowEngine/ui/section.tsx
+++ b/static/app/components/workflowEngine/ui/section.tsx
@@ -40,7 +40,7 @@ export const SectionSubHeading = styled('h5')`
 const SectionDescription = styled('div')`
   font-size: ${p => p.theme.fontSize.md};
   font-weight: ${p => p.theme.fontWeight.normal};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   margin: 0;
 `;
 
diff --git a/static/app/data/timezones.tsx b/static/app/data/timezones.tsx
index 396e2ec28f197e..9a27a63040dc66 100644
--- a/static/app/data/timezones.tsx
+++ b/static/app/data/timezones.tsx
@@ -465,7 +465,7 @@ const timezones: Array<[group: TimezoneGroup, value: string, label: string]> = [
 ];
 
 const OffsetLabel = styled('div')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-weight: ${p => p.theme.fontWeight.bold};
   display: flex;
   align-items: center;
diff --git a/static/app/styles/global.tsx b/static/app/styles/global.tsx
index 8eb929c3fd61ce..dae5675a550911 100644
--- a/static/app/styles/global.tsx
+++ b/static/app/styles/global.tsx
@@ -344,7 +344,7 @@ const styles = (theme: Theme, isDark: boolean) => css`
           }
         }
         .group-detail h3 em {
-          color: ${theme.subText};
+          color: ${theme.tokens.content.secondary};
         }
         .event-details-container {
           background-color: ${theme.tokens.background.primary};
@@ -354,7 +354,7 @@ const styles = (theme: Theme, isDark: boolean) => css`
         }
         .nav-header a.help-link,
         .nav-header span.help-link a {
-          color: ${theme.subText};
+          color: ${theme.tokens.content.secondary};
         }
 
         /* Global Selection header date picker */
diff --git a/static/app/utils/dashboards/issueFieldRenderers.tsx b/static/app/utils/dashboards/issueFieldRenderers.tsx
index 68083b92e4ffbc..efb15789dc9050 100644
--- a/static/app/utils/dashboards/issueFieldRenderers.tsx
+++ b/static/app/utils/dashboards/issueFieldRenderers.tsx
@@ -286,7 +286,7 @@ const WrappedCount = styled(({value, ...p}: any) => (
   font-weight: ${p => p.theme.fontWeight.bold};
   font-variant-numeric: tabular-nums;
   padding-left: ${space(2)};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 
 const Divider = styled('div')`
diff --git a/static/app/utils/discover/fieldRenderers.tsx b/static/app/utils/discover/fieldRenderers.tsx
index e82b39601c95ae..6e53c13abf040b 100644
--- a/static/app/utils/discover/fieldRenderers.tsx
+++ b/static/app/utils/discover/fieldRenderers.tsx
@@ -163,7 +163,7 @@ type FieldFormatters = {
 };
 
 const EmptyValueContainer = styled('span')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 const emptyValue = <EmptyValueContainer>{t('(no value)')}</EmptyValueContainer>;
 export const emptyStringValue = (
diff --git a/static/app/utils/discover/styles.tsx b/static/app/utils/discover/styles.tsx
index 75ed7837e961be..df3c1766d4a57a 100644
--- a/static/app/utils/discover/styles.tsx
+++ b/static/app/utils/discover/styles.tsx
@@ -30,7 +30,7 @@ export const NumberContainer = styled('div')`
 `;
 
 export const FieldDateTime = styled(DateTime)`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-variant-numeric: tabular-nums;
   ${p => p.theme.overflowEllipsis};
 `;
diff --git a/static/app/utils/discover/viewReplayLink.tsx b/static/app/utils/discover/viewReplayLink.tsx
index c269080cd92a54..e2d01bd0aa040e 100644
--- a/static/app/utils/discover/viewReplayLink.tsx
+++ b/static/app/utils/discover/viewReplayLink.tsx
@@ -45,7 +45,7 @@ const StyledLink = styled(Link)`
 `;
 
 const EmptyValueContainer = styled('span')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 
 export default ViewReplayLink;
diff --git a/static/app/utils/profiling/flamegraph/flamegraphTheme.tsx b/static/app/utils/profiling/flamegraph/flamegraphTheme.tsx
index 137991d49b8c18..1704b00b0d8a44 100644
--- a/static/app/utils/profiling/flamegraph/flamegraphTheme.tsx
+++ b/static/app/utils/profiling/flamegraph/flamegraphTheme.tsx
@@ -214,8 +214,8 @@ export const makeLightFlamegraphTheme = (theme: Theme): FlamegraphTheme => {
       // Cursors and labels
       LABEL_FONT_COLOR: theme.tokens.content.primary,
       BAR_LABEL_FONT_COLOR: theme.tokens.content.primary,
-      CHART_CURSOR_INDICATOR: theme.subText,
-      CHART_LABEL_COLOR: theme.subText,
+      CHART_CURSOR_INDICATOR: theme.tokens.content.secondary,
+      CHART_LABEL_COLOR: theme.tokens.content.secondary,
       CURSOR_CROSSHAIR: theme.tokens.border.primary,
 
       // Special states
@@ -305,8 +305,8 @@ export const makeDarkFlamegraphTheme = (theme: Theme): FlamegraphTheme => {
       // Cursors and labels
       LABEL_FONT_COLOR: theme.tokens.content.primary,
       BAR_LABEL_FONT_COLOR: theme.tokens.content.primary,
-      CHART_CURSOR_INDICATOR: theme.subText,
-      CHART_LABEL_COLOR: theme.subText,
+      CHART_CURSOR_INDICATOR: theme.tokens.content.secondary,
+      CHART_LABEL_COLOR: theme.tokens.content.secondary,
       CURSOR_CROSSHAIR: theme.tokens.border.primary,
 
       // Special states
diff --git a/static/app/utils/theme/theme.tsx b/static/app/utils/theme/theme.tsx
index 11552b43fa4f6a..69da428c1aa86e 100644
--- a/static/app/utils/theme/theme.tsx
+++ b/static/app/utils/theme/theme.tsx
@@ -1168,11 +1168,6 @@ const darkShadows = {
 };
 
 const generateAliases = (tokens: Tokens) => ({
-  /**
-   * Text that should not have as much emphasis
-   */
-  subText: tokens.content.secondary,
-
   /**
    * Primary background color
    */
diff --git a/static/app/views/alerts/list/rules/row.tsx b/static/app/views/alerts/list/rules/row.tsx
index f19eb01c3b92a5..630b072ba8bcac 100644
--- a/static/app/views/alerts/list/rules/row.tsx
+++ b/static/app/views/alerts/list/rules/row.tsx
@@ -373,7 +373,7 @@ const AlertName = styled('div')`
 `;
 
 const AlertIncidentDate = styled('div')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 
 const ProjectBadgeContainer = styled('div')`
diff --git a/static/app/views/alerts/rules/issue/details/issuesList.tsx b/static/app/views/alerts/rules/issue/details/issuesList.tsx
index be3444137600a8..f1e6d05058bc5e 100644
--- a/static/app/views/alerts/rules/issue/details/issuesList.tsx
+++ b/static/app/views/alerts/rules/issue/details/issuesList.tsx
@@ -150,7 +150,7 @@ const AlignRight = styled('div')`
 
 const StyledDateTime = styled(DateTime)`
   white-space: nowrap;
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 
 const TitleWrapper = styled('div')`
diff --git a/static/app/views/alerts/rules/issue/sentryAppRuleModal.tsx b/static/app/views/alerts/rules/issue/sentryAppRuleModal.tsx
index 6dcefa6e7f60c6..310d7fe7a0ffda 100644
--- a/static/app/views/alerts/rules/issue/sentryAppRuleModal.tsx
+++ b/static/app/views/alerts/rules/issue/sentryAppRuleModal.tsx
@@ -50,7 +50,7 @@ function SentryAppRuleModal({
 
 const Description = styled('div')`
   padding-top: 0;
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 
 export default SentryAppRuleModal;
diff --git a/static/app/views/alerts/rules/metric/details/metricChart.tsx b/static/app/views/alerts/rules/metric/details/metricChart.tsx
index 2a7beb54ed99b3..2bd84bc4d35407 100644
--- a/static/app/views/alerts/rules/metric/details/metricChart.tsx
+++ b/static/app/views/alerts/rules/metric/details/metricChart.tsx
@@ -659,7 +659,7 @@ const StyledInlineContainer = styled(InlineContainer)`
 `;
 
 const StyledCircleIndicator = styled(CircleIndicator)`
-  background: ${p => p.theme.subText};
+  background: ${p => p.theme.tokens.graphics.neutral.vibrant};
   height: ${space(1)};
   margin-right: ${space(0.5)};
 `;
diff --git a/static/app/views/alerts/rules/metric/details/metricHistory.tsx b/static/app/views/alerts/rules/metric/details/metricHistory.tsx
index 15f3af3d94262e..3c15c7ffafda15 100644
--- a/static/app/views/alerts/rules/metric/details/metricHistory.tsx
+++ b/static/app/views/alerts/rules/metric/details/metricHistory.tsx
@@ -200,7 +200,7 @@ const StyledPanelTable = styled(PanelTable)<{expanded: boolean; isEmpty: boolean
 `;
 
 const StyledDateTime = styled(DateTime)`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 
 const Cell = styled('div')`
diff --git a/static/app/views/alerts/rules/metric/details/sidebar.tsx b/static/app/views/alerts/rules/metric/details/sidebar.tsx
index 4e5f0e91b52af0..3a6b52fc97bb43 100644
--- a/static/app/views/alerts/rules/metric/details/sidebar.tsx
+++ b/static/app/views/alerts/rules/metric/details/sidebar.tsx
@@ -392,7 +392,7 @@ const TriggerTitle = styled('div')`
 `;
 
 const TriggerTitleText = styled('h4')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-size: ${p => p.theme.fontSize.md};
   margin: 0;
   line-height: 24px;
diff --git a/static/app/views/alerts/rules/metric/ruleForm.tsx b/static/app/views/alerts/rules/metric/ruleForm.tsx
index 4e52a3dc2afa2d..24ef00fae095a5 100644
--- a/static/app/views/alerts/rules/metric/ruleForm.tsx
+++ b/static/app/views/alerts/rules/metric/ruleForm.tsx
@@ -1626,7 +1626,7 @@ const AlertInfo = styled('div')`
 `;
 
 const StyledCircleIndicator = styled(CircleIndicator)`
-  background: ${p => p.theme.subText};
+  background: ${p => p.theme.tokens.graphics.neutral.vibrant};
   height: ${space(1)};
   margin-right: ${space(0.5)};
 `;
diff --git a/static/app/views/alerts/rules/uptime/uptimeAlertForm.tsx b/static/app/views/alerts/rules/uptime/uptimeAlertForm.tsx
index ef310871f2b1f1..f9c78fdb469cf5 100644
--- a/static/app/views/alerts/rules/uptime/uptimeAlertForm.tsx
+++ b/static/app/views/alerts/rules/uptime/uptimeAlertForm.tsx
@@ -480,7 +480,7 @@ const AlertListItem = styled(ListItem)`
 
 const ListItemSubText = styled(Text)`
   padding-left: ${space(4)};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 
 const FormRow = styled('div')`
diff --git a/static/app/views/alerts/rules/uptime/uptimeChecksGrid.tsx b/static/app/views/alerts/rules/uptime/uptimeChecksGrid.tsx
index dea20dbaeb9150..1b2642af7751d8 100644
--- a/static/app/views/alerts/rules/uptime/uptimeChecksGrid.tsx
+++ b/static/app/views/alerts/rules/uptime/uptimeChecksGrid.tsx
@@ -152,7 +152,7 @@ function CheckInBodyCell({
         return <Cell>{emptyCell}</Cell>;
       }
       if (httpStatusCode === null) {
-        return <Cell style={{color: theme.subText}}>{t('None')}</Cell>;
+        return <Cell style={{color: theme.tokens.content.secondary}}>{t('None')}</Cell>;
       }
       return <Cell>{httpStatusCode}</Cell>;
     }
@@ -239,7 +239,7 @@ const Cell = styled('div')`
 `;
 
 const TimeCell = styled(Cell)`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   text-decoration: underline;
   text-decoration-style: dotted;
 `;
diff --git a/static/app/views/alerts/wizard/index.tsx b/static/app/views/alerts/wizard/index.tsx
index df9fc8635c8241..07f7c13b17f5c5 100644
--- a/static/app/views/alerts/wizard/index.tsx
+++ b/static/app/views/alerts/wizard/index.tsx
@@ -334,7 +334,7 @@ const DisabledAlertMessageContainer = styled('div')`
   border-top: 1px solid ${p => p.theme.tokens.border.primary};
   padding: ${p => p.theme.space.md} ${p => p.theme.space.lg};
   background-color: ${p => p.theme.backgroundSecondary};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   border-radius: 0 0 ${p => p.theme.radius.md} ${p => p.theme.radius.md};
 `;
 
diff --git a/static/app/views/alerts/wizard/radioPanelGroup.tsx b/static/app/views/alerts/wizard/radioPanelGroup.tsx
index ab2e54b2b33298..1e6b3d6f7f348b 100644
--- a/static/app/views/alerts/wizard/radioPanelGroup.tsx
+++ b/static/app/views/alerts/wizard/radioPanelGroup.tsx
@@ -73,7 +73,7 @@ const RadioLineItem = styled('label')<{
   outline: none;
   font-weight: ${p => p.theme.fontWeight.normal};
   margin: 0;
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   transition: color 0.3s ease-in;
   padding: 0;
   position: relative;
diff --git a/static/app/views/auth/loginForm.tsx b/static/app/views/auth/loginForm.tsx
index 23c6abe674b4e4..d59a7234e89aa4 100644
--- a/static/app/views/auth/loginForm.tsx
+++ b/static/app/views/auth/loginForm.tsx
@@ -152,7 +152,7 @@ const ProviderWrapper = styled('div')`
 `;
 
 const LostPasswordLink = styled(Link)`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-size: ${p => p.theme.fontSize.md};
 
   &:hover {
diff --git a/static/app/views/auth/registerForm.tsx b/static/app/views/auth/registerForm.tsx
index 45ec019d5e34e7..59300fea205a98 100644
--- a/static/app/views/auth/registerForm.tsx
+++ b/static/app/views/auth/registerForm.tsx
@@ -96,7 +96,7 @@ function RegisterForm({authConfig}: Props) {
 }
 
 const PrivacyPolicyLink = styled(ExternalLink)`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 
   &:hover {
     color: ${p => p.theme.tokens.content.primary};
diff --git a/static/app/views/automations/components/automationListTable/connectedDetectors.tsx b/static/app/views/automations/components/automationListTable/connectedDetectors.tsx
index a835408a82d1d8..9af07b327fd742 100644
--- a/static/app/views/automations/components/automationListTable/connectedDetectors.tsx
+++ b/static/app/views/automations/components/automationListTable/connectedDetectors.tsx
@@ -113,7 +113,7 @@ const HovercardRow = styled('div')`
 `;
 
 const MoreText = styled('p')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   text-align: center;
   margin: 0;
   padding: ${space(1)} ${space(2)};
diff --git a/static/app/views/automations/components/conditionsPanel.tsx b/static/app/views/automations/components/conditionsPanel.tsx
index 9003e2fafac16d..7b61301b5f05e3 100644
--- a/static/app/views/automations/components/conditionsPanel.tsx
+++ b/static/app/views/automations/components/conditionsPanel.tsx
@@ -179,7 +179,7 @@ const ConditionGroupWrapper = styled('div')<{showDivider?: boolean}>`
   display: flex;
   flex-direction: column;
   gap: ${p => p.theme.space.md};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 
   ${p =>
     p.showDivider &&
diff --git a/static/app/views/dashboards/dashboard.tsx b/static/app/views/dashboards/dashboard.tsx
index 9418257c3ed450..a96fda76f4edab 100644
--- a/static/app/views/dashboards/dashboard.tsx
+++ b/static/app/views/dashboards/dashboard.tsx
@@ -476,7 +476,7 @@ const ResizeHandle = styled(Button)`
   z-index: 2;
   bottom: ${space(0.5)};
   right: ${space(0.5)};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   cursor: nwse-resize;
 
   .react-resizable-hide & {
diff --git a/static/app/views/dashboards/globalFilter/filterSelector.tsx b/static/app/views/dashboards/globalFilter/filterSelector.tsx
index de85e509912e40..f974becb83709f 100644
--- a/static/app/views/dashboards/globalFilter/filterSelector.tsx
+++ b/static/app/views/dashboards/globalFilter/filterSelector.tsx
@@ -419,7 +419,7 @@ export default FilterSelector;
 const StyledButton = styled(Button)`
   font-size: inherit;
   font-weight: ${p => p.theme.fontWeight.normal};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   padding: 0 ${p => p.theme.space.xs};
   margin: -${p => p.theme.space.xs} -${p => p.theme.space.xs};
 `;
@@ -439,6 +439,6 @@ const WildcardButton = styled(Flex)`
 `;
 
 const SubText = styled('span')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-size: ${p => p.theme.fontSize.sm};
 `;
diff --git a/static/app/views/dashboards/globalFilter/numericFilterSelector.tsx b/static/app/views/dashboards/globalFilter/numericFilterSelector.tsx
index 4823c5fbb1e566..18f4ffa025adca 100644
--- a/static/app/views/dashboards/globalFilter/numericFilterSelector.tsx
+++ b/static/app/views/dashboards/globalFilter/numericFilterSelector.tsx
@@ -392,7 +392,7 @@ const StyledOperatorButton = styled(Button)`
 const StyledButton = styled(Button)`
   font-size: inherit;
   font-weight: ${p => p.theme.fontWeight.normal};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   padding: 0 ${p => p.theme.space.xs};
   margin: -${p => p.theme.space.xs} -${p => p.theme.space.xs};
 `;
diff --git a/static/app/views/dashboards/manage/dashboardCard.tsx b/static/app/views/dashboards/manage/dashboardCard.tsx
index b90fc394b3766e..e0e033576b6f9e 100644
--- a/static/app/views/dashboards/manage/dashboardCard.tsx
+++ b/static/app/views/dashboards/manage/dashboardCard.tsx
@@ -163,7 +163,7 @@ const CardLink = styled(Link)`
 const Detail = styled('div')`
   font-family: ${p => p.theme.text.familyMono};
   font-size: ${p => p.theme.fontSize.sm};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   ${p => p.theme.overflowEllipsis};
   line-height: 1.5;
 `;
@@ -186,7 +186,7 @@ const DateSelected = styled('div')`
 `;
 
 const DateStatus = styled('span')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   padding-left: ${space(1)};
 `;
 
diff --git a/static/app/views/dashboards/manage/templateCard.tsx b/static/app/views/dashboards/manage/templateCard.tsx
index 56ad9f2c4eab37..58bf6ebf2ae098 100644
--- a/static/app/views/dashboards/manage/templateCard.tsx
+++ b/static/app/views/dashboards/manage/templateCard.tsx
@@ -77,7 +77,7 @@ const Title = styled('div')`
 const Detail = styled(Title)`
   font-family: ${p => p.theme.text.familyMono};
   font-size: ${p => p.theme.fontSize.sm};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 
 const StyledButton = styled(Button)`
diff --git a/static/app/views/dashboards/widgetBuilder/buildSteps/thresholdsStep/thresholdsHoverWrapper.tsx b/static/app/views/dashboards/widgetBuilder/buildSteps/thresholdsStep/thresholdsHoverWrapper.tsx
index 1631ee7f46031a..ca8982e396e18f 100644
--- a/static/app/views/dashboards/widgetBuilder/buildSteps/thresholdsStep/thresholdsHoverWrapper.tsx
+++ b/static/app/views/dashboards/widgetBuilder/buildSteps/thresholdsStep/thresholdsHoverWrapper.tsx
@@ -74,7 +74,7 @@ const StyledHoverCard = styled(Hovercard)`
 `;
 
 const ContextTitle = styled('h6')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   margin-bottom: 0 !important;
 `;
 
diff --git a/static/app/views/dashboards/widgetBuilder/components/common/sectionHeader.tsx b/static/app/views/dashboards/widgetBuilder/components/common/sectionHeader.tsx
index 7c06b020d05610..5b0014e0d51ed0 100644
--- a/static/app/views/dashboards/widgetBuilder/components/common/sectionHeader.tsx
+++ b/static/app/views/dashboards/widgetBuilder/components/common/sectionHeader.tsx
@@ -43,7 +43,7 @@ const StyledHeader = styled('h6')`
 
 const OptionalHeader = styled('h6')`
   font-size: ${p => p.theme.form.md.fontSize};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-weight: ${p => p.theme.fontWeight.normal};
   margin-bottom: ${space(0.5)};
 `;
diff --git a/static/app/views/dashboards/widgetBuilder/components/newWidgetBuilder.tsx b/static/app/views/dashboards/widgetBuilder/components/newWidgetBuilder.tsx
index b0ff51bf9cc4e0..bf07447634a66a 100644
--- a/static/app/views/dashboards/widgetBuilder/components/newWidgetBuilder.tsx
+++ b/static/app/views/dashboards/widgetBuilder/components/newWidgetBuilder.tsx
@@ -525,7 +525,7 @@ const TemplateWidgetPreviewPlaceholder = styled('div')`
   justify-content: center;
   width: 100%;
   height: 95%;
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-style: italic;
   font-size: ${p => p.theme.fontSize.md};
   font-weight: ${p => p.theme.fontWeight.normal};
diff --git a/static/app/views/dashboards/widgetBuilder/components/visualize/selectRow.tsx b/static/app/views/dashboards/widgetBuilder/components/visualize/selectRow.tsx
index f9f54784a2cc15..caa25fcb0d938d 100644
--- a/static/app/views/dashboards/widgetBuilder/components/visualize/selectRow.tsx
+++ b/static/app/views/dashboards/widgetBuilder/components/visualize/selectRow.tsx
@@ -468,7 +468,7 @@ const FooterWrapper = styled('div')`
   gap: ${space(0.5)};
   align-items: center;
   justify-content: center;
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-size: ${p => p.theme.fontSize.sm};
 `;
 
diff --git a/static/app/views/dashboards/widgetBuilder/components/widgetBuilderSlideout.tsx b/static/app/views/dashboards/widgetBuilder/components/widgetBuilderSlideout.tsx
index d96090b65b8997..9655de2771b95d 100644
--- a/static/app/views/dashboards/widgetBuilder/components/widgetBuilderSlideout.tsx
+++ b/static/app/views/dashboards/widgetBuilder/components/widgetBuilderSlideout.tsx
@@ -487,7 +487,7 @@ function DisableTransactionWidget({children}: DisableModeProps) {
 }
 
 const CloseButton = styled(Button)`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   height: fit-content;
   &:hover {
     color: ${p => p.theme.colors.gray500};
diff --git a/static/app/views/dashboards/widgetBuilder/components/widgetTemplatesList.tsx b/static/app/views/dashboards/widgetBuilder/components/widgetTemplatesList.tsx
index d89c430adefa6b..d59320ba914036 100644
--- a/static/app/views/dashboards/widgetBuilder/components/widgetTemplatesList.tsx
+++ b/static/app/views/dashboards/widgetBuilder/components/widgetTemplatesList.tsx
@@ -181,7 +181,7 @@ const WidgetTitle = styled('h3')`
 
 const WidgetDescription = styled('p')`
   font-size: ${p => p.theme.fontSize.md};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   margin-bottom: 0;
 `;
 
diff --git a/static/app/views/dashboards/widgetCard/index.tsx b/static/app/views/dashboards/widgetCard/index.tsx
index 634a435e0f908f..6ae80fa70cc3e0 100644
--- a/static/app/views/dashboards/widgetCard/index.tsx
+++ b/static/app/views/dashboards/widgetCard/index.tsx
@@ -551,5 +551,5 @@ const ErrorCard = styled(Placeholder)`
 
 export const WidgetDescription = styled('small')`
   ${p => p.theme.overflowEllipsis}
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
diff --git a/static/app/views/dashboards/widgets/detailsWidget/detailsWidgetVisualization.tsx b/static/app/views/dashboards/widgets/detailsWidget/detailsWidgetVisualization.tsx
index 288340f9dbb3e6..347d847dff39e7 100644
--- a/static/app/views/dashboards/widgets/detailsWidget/detailsWidgetVisualization.tsx
+++ b/static/app/views/dashboards/widgets/detailsWidget/detailsWidgetVisualization.tsx
@@ -11,7 +11,7 @@ import {resolveSpanModule} from 'sentry/views/insights/common/utils/resolveSpanM
 import {DomainStatusLink} from 'sentry/views/insights/http/components/domainStatusLink';
 import {ModuleName, SpanFields, type SpanResponse} from 'sentry/views/insights/types';
 
-import {DEEMPHASIS_COLOR_NAME, LOADING_PLACEHOLDER} from './settings';
+import {LOADING_PLACEHOLDER} from './settings';
 
 interface DetailsWidgetVisualizationProps {
   span: Pick<SpanResponse, DefaultDetailWidgetFields>;
@@ -120,7 +120,7 @@ const AutoResizeParent = styled('div')`
 `;
 
 const LoadingPlaceholder = styled('span')`
-  color: ${p => p.theme[DEEMPHASIS_COLOR_NAME]};
+  color: ${p => p.theme.tokens.content.secondary};
   font-size: ${p => p.theme.fontSize.lg};
 `;
 
diff --git a/static/app/views/dashboards/widgets/detailsWidget/settings.ts b/static/app/views/dashboards/widgets/detailsWidget/settings.ts
index 266629685763b5..dca6abf723bba5 100644
--- a/static/app/views/dashboards/widgets/detailsWidget/settings.ts
+++ b/static/app/views/dashboards/widgets/detailsWidget/settings.ts
@@ -1,2 +1 @@
 export const LOADING_PLACEHOLDER = '\u2014';
-export const DEEMPHASIS_COLOR_NAME = 'subText';
diff --git a/static/app/views/detectors/components/details/metric/detect.tsx b/static/app/views/detectors/components/details/metric/detect.tsx
index 88d6f568f0304b..1caad1096247e8 100644
--- a/static/app/views/detectors/components/details/metric/detect.tsx
+++ b/static/app/views/detectors/components/details/metric/detect.tsx
@@ -243,7 +243,7 @@ const Query = styled('dl')`
 `;
 
 const Label = styled('dt')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   justify-self: flex-end;
   margin: 0;
   font-weight: ${p => p.theme.fontWeight.normal};
diff --git a/static/app/views/detectors/components/detectorLink.tsx b/static/app/views/detectors/components/detectorLink.tsx
index 17eb839f0269da..c7702e3045254e 100644
--- a/static/app/views/detectors/components/detectorLink.tsx
+++ b/static/app/views/detectors/components/detectorLink.tsx
@@ -251,7 +251,7 @@ export function DetectorLink({detector, className, openInNewTab}: DetectorLinkPr
 }
 
 const StyledProjectBadge = styled(ProjectBadge)`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 
 const Separator = styled('span')`
diff --git a/static/app/views/detectors/components/detectorListConnectedAutomations.tsx b/static/app/views/detectors/components/detectorListConnectedAutomations.tsx
index 64dfd6048e8601..dd1e7fe4c299aa 100644
--- a/static/app/views/detectors/components/detectorListConnectedAutomations.tsx
+++ b/static/app/views/detectors/components/detectorListConnectedAutomations.tsx
@@ -135,11 +135,11 @@ const HovercardRow = styled(Link)`
 
 const AutomationActionWrapper = styled('div')`
   margin-top: ${space(0.5)};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 
 const MoreText = styled('p')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   text-align: center;
   margin: 0;
   padding: ${space(1)} ${space(2)};
diff --git a/static/app/views/detectors/components/detectorListTable/detectorAssigneeCell.tsx b/static/app/views/detectors/components/detectorListTable/detectorAssigneeCell.tsx
index d95fb80dc38e9c..37ac89095891d0 100644
--- a/static/app/views/detectors/components/detectorListTable/detectorAssigneeCell.tsx
+++ b/static/app/views/detectors/components/detectorListTable/detectorAssigneeCell.tsx
@@ -26,5 +26,5 @@ export function DetectorAssigneeCell({assignee, className}: DetectorAssigneeCell
 }
 
 const Wrapper = styled('div')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
diff --git a/static/app/views/detectors/components/forms/cron/detect.tsx b/static/app/views/detectors/components/forms/cron/detect.tsx
index a415fdaee3e0e5..1990f7f71e6e3f 100644
--- a/static/app/views/detectors/components/forms/cron/detect.tsx
+++ b/static/app/views/detectors/components/forms/cron/detect.tsx
@@ -254,7 +254,7 @@ const InputGroup = styled('div')<{removeFieldPadding?: boolean}>`
 
 const LabelText = styled(Text)`
   font-weight: ${p => p.theme.fontWeight.bold};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 
 const MultiColumnInput = styled('div')<{columns?: string}>`
diff --git a/static/app/views/detectors/components/forms/sectionLabel.tsx b/static/app/views/detectors/components/forms/sectionLabel.tsx
index cfec2aa2c8d0f1..1cb4434bbbe08b 100644
--- a/static/app/views/detectors/components/forms/sectionLabel.tsx
+++ b/static/app/views/detectors/components/forms/sectionLabel.tsx
@@ -8,6 +8,6 @@ export const SectionLabel = styled('span')<{disabled?: boolean}>`
 `;
 
 export const SectionLabelSecondary = styled(SectionLabel)`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-weight: normal;
 `;
diff --git a/static/app/views/discover/miniGraph.tsx b/static/app/views/discover/miniGraph.tsx
index 3720cd9f77e004..be28aca8e0e925 100644
--- a/static/app/views/discover/miniGraph.tsx
+++ b/static/app/views/discover/miniGraph.tsx
@@ -284,7 +284,7 @@ const StyledGraphContainer = styled((props: any) => (
 `;
 
 const StyledErrorMessage = styled('div')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   margin-left: 4px;
 `;
 
diff --git a/static/app/views/discover/querycard.tsx b/static/app/views/discover/querycard.tsx
index 03a4dde9c47bc8..b15cf7dbdfa3ca 100644
--- a/static/app/views/discover/querycard.tsx
+++ b/static/app/views/discover/querycard.tsx
@@ -114,7 +114,7 @@ const QueryTitle = styled('div')`
 const QueryDetail = styled('div')`
   font-family: ${p => p.theme.text.familyMono};
   font-size: ${p => p.theme.fontSize.sm};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   line-height: 1.5;
   ${p => p.theme.overflowEllipsis};
 `;
@@ -142,7 +142,7 @@ const DateSelected = styled('div')`
 `;
 
 const DateStatus = styled('span')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   padding-left: ${space(1)};
 `;
 
diff --git a/static/app/views/discover/results/resultsChart.tsx b/static/app/views/discover/results/resultsChart.tsx
index 02f20b968c50bf..6f3d3d95c38b84 100644
--- a/static/app/views/discover/results/resultsChart.tsx
+++ b/static/app/views/discover/results/resultsChart.tsx
@@ -313,6 +313,6 @@ const NoChartContainer = styled('div')<{height?: string}>`
   position: relative;
   border-color: transparent;
   margin-bottom: 0;
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-size: ${p => p.theme.fontSize.xl};
 `;
diff --git a/static/app/views/discover/results/resultsHeader.tsx b/static/app/views/discover/results/resultsHeader.tsx
index a09ed30a5e2a42..0187601f62c6ef 100644
--- a/static/app/views/discover/results/resultsHeader.tsx
+++ b/static/app/views/discover/results/resultsHeader.tsx
@@ -213,7 +213,7 @@ class ResultsHeader extends Component<Props, State> {
 const Subtitle = styled('h4')`
   font-size: ${p => p.theme.fontSize.lg};
   font-weight: ${p => p.theme.fontWeight.normal};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   margin: ${space(0.5)} 0 0 0;
 `;
 
diff --git a/static/app/views/discover/table/arithmeticInput.tsx b/static/app/views/discover/table/arithmeticInput.tsx
index ff42c9e0b09a46..2516051e27e132 100644
--- a/static/app/views/discover/table/arithmeticInput.tsx
+++ b/static/app/views/discover/table/arithmeticInput.tsx
@@ -437,7 +437,7 @@ const DropdownTitle = styled('header')`
   align-items: center;
 
   background-color: ${p => p.theme.backgroundSecondary};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-weight: ${p => p.theme.fontWeight.normal};
   font-size: ${p => p.theme.fontSize.md};
 
@@ -476,7 +476,7 @@ const Info = styled('div')`
   display: flex;
   padding: ${space(1)} ${space(2)};
   font-size: ${p => p.theme.fontSize.lg};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 
   &:not(:last-child) {
     border-bottom: 1px solid ${p => p.theme.tokens.border.secondary};
diff --git a/static/app/views/discover/table/queryField.tsx b/static/app/views/discover/table/queryField.tsx
index 47532505cc8fef..7b7bbd282d30c5 100644
--- a/static/app/views/discover/table/queryField.tsx
+++ b/static/app/views/discover/table/queryField.tsx
@@ -865,7 +865,7 @@ const BlankSpace = styled('div')`
   &:after {
     font-size: ${p => p.theme.fontSize.md};
     content: '${t('No parameter')}';
-    color: ${p => p.theme.subText};
+    color: ${p => p.theme.tokens.content.secondary};
   }
 `;
 
diff --git a/static/app/views/discover/table/quickContext/releaseContext.tsx b/static/app/views/discover/table/quickContext/releaseContext.tsx
index 35f56316e6c604..f7d0cf9b2bca43 100644
--- a/static/app/views/discover/table/quickContext/releaseContext.tsx
+++ b/static/app/views/discover/table/quickContext/releaseContext.tsx
@@ -205,7 +205,7 @@ const ReleaseContextContainer = styled(ContextContainer)`
 
 const ReleaseBody = styled(ContextBody)`
   font-size: 13px;
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 
 export default ReleaseContext;
diff --git a/static/app/views/discover/table/quickContext/styles.tsx b/static/app/views/discover/table/quickContext/styles.tsx
index 5144b7611148db..38a9a490e6610c 100644
--- a/static/app/views/discover/table/quickContext/styles.tsx
+++ b/static/app/views/discover/table/quickContext/styles.tsx
@@ -15,7 +15,7 @@ export const ContextHeader = styled('div')`
 `;
 
 export const ContextTitle = styled('h6')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   margin-bottom: 0 !important;
 `;
 
@@ -35,7 +35,7 @@ export const Wrapper = styled('div')`
 `;
 
 export const NoContextWrapper = styled('div')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   height: 50px;
   padding: ${space(1)};
   font-size: ${p => p.theme.fontSize.md};
diff --git a/static/app/views/discover/table/tableView.tsx b/static/app/views/discover/table/tableView.tsx
index 71f5991a2e6dae..2f2406f772d356 100644
--- a/static/app/views/discover/table/tableView.tsx
+++ b/static/app/views/discover/table/tableView.tsx
@@ -703,7 +703,7 @@ export default function TableView(props: TableViewProps) {
 }
 
 const PrependHeader = styled('span')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 
 const StyledTooltip = styled(Tooltip)`
diff --git a/static/app/views/explore/components/attributeBreakdowns/cohortComparisonContent.tsx b/static/app/views/explore/components/attributeBreakdowns/cohortComparisonContent.tsx
index f9a985c6e54b74..1210e38b5b0d7c 100644
--- a/static/app/views/explore/components/attributeBreakdowns/cohortComparisonContent.tsx
+++ b/static/app/views/explore/components/attributeBreakdowns/cohortComparisonContent.tsx
@@ -185,7 +185,7 @@ const SelectionHintContainer = styled('div')`
 const SelectionHint = styled(Text)<{color?: string}>`
   display: flex;
   align-items: center;
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-size: ${p => p.theme.fontSize.sm};
 
   &::before {
diff --git a/static/app/views/explore/components/attributeBreakdowns/styles.tsx b/static/app/views/explore/components/attributeBreakdowns/styles.tsx
index cfe2b34f584b5b..b516c108ec6e32 100644
--- a/static/app/views/explore/components/attributeBreakdowns/styles.tsx
+++ b/static/app/views/explore/components/attributeBreakdowns/styles.tsx
@@ -70,15 +70,15 @@ function FeedbackLink() {
 }
 
 const StyledIconSearch = styled(IconSearch)`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 
 const StyledIconWarning = styled(IconWarning)`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 
 const StyledIconTimer = styled(IconTimer)`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 
 const ERROR_STATE_CONFIG: Record<
diff --git a/static/app/views/explore/components/chart/chartFooter.tsx b/static/app/views/explore/components/chart/chartFooter.tsx
index 9850ae907170a3..0f8623b536c4c6 100644
--- a/static/app/views/explore/components/chart/chartFooter.tsx
+++ b/static/app/views/explore/components/chart/chartFooter.tsx
@@ -8,6 +8,6 @@ export function usePreviouslyLoaded<T>(current: T, isLoading: boolean): T {
 }
 
 export const Container = styled('span')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-size: ${p => p.theme.fontSize.sm};
 `;
diff --git a/static/app/views/explore/components/schemaHints/schemaHintsDrawer.tsx b/static/app/views/explore/components/schemaHints/schemaHintsDrawer.tsx
index 31ffe6d508fbf8..3d008d5ed60d76 100644
--- a/static/app/views/explore/components/schemaHints/schemaHintsDrawer.tsx
+++ b/static/app/views/explore/components/schemaHints/schemaHintsDrawer.tsx
@@ -312,7 +312,7 @@ const NoAttributesMessage = styled('div')`
   justify-content: center;
   align-items: center;
   margin-top: ${space(4)};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 
 const StyledInputGroup = styled(InputGroup)`
diff --git a/static/app/views/explore/components/schemaHints/schemaHintsList.tsx b/static/app/views/explore/components/schemaHints/schemaHintsList.tsx
index bef95c9f71bf11..49e8a1f3d1afb2 100644
--- a/static/app/views/explore/components/schemaHints/schemaHintsList.tsx
+++ b/static/app/views/explore/components/schemaHints/schemaHintsList.tsx
@@ -517,7 +517,7 @@ const HintName = styled('span')`
 
 const HintOperator = styled('span')`
   font-weight: ${p => p.theme.fontWeight.normal};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 
 const HintValue = styled('span')`
diff --git a/static/app/views/explore/components/traceItemAttributes/attributesTree.tsx b/static/app/views/explore/components/traceItemAttributes/attributesTree.tsx
index 554c0a23027a23..29b11f82e71cfd 100644
--- a/static/app/views/explore/components/traceItemAttributes/attributesTree.tsx
+++ b/static/app/views/explore/components/traceItemAttributes/attributesTree.tsx
@@ -514,7 +514,8 @@ const TreeRow = styled('div')<{hasErrors: boolean}>`
       visibility: visible;
     }
   }
-  color: ${p => (p.hasErrors ? p.theme.alert.danger.color : p.theme.subText)};
+  color: ${p =>
+    p.hasErrors ? p.theme.alert.danger.color : p.theme.tokens.content.secondary};
   background-color: ${p =>
     p.hasErrors
       ? p.theme.alert.danger.backgroundLight
@@ -573,7 +574,7 @@ const TreeValue = styled('div')<{hasErrors?: boolean}>`
 `;
 
 const TreeKey = styled(TreeValue)<{hasErrors?: boolean}>`
-  color: ${p => (p.hasErrors ? 'inherit' : p.theme.subText)};
+  color: ${p => (p.hasErrors ? 'inherit' : p.theme.tokens.content.secondary)};
 `;
 
 /**
diff --git a/static/app/views/explore/hooks/useGroupByFields.tsx b/static/app/views/explore/hooks/useGroupByFields.tsx
index c402e1a9308b2c..5d367410913be4 100644
--- a/static/app/views/explore/hooks/useGroupByFields.tsx
+++ b/static/app/views/explore/hooks/useGroupByFields.tsx
@@ -94,5 +94,5 @@ function optionFromTag(tag: Tag, traceItemType: TraceItemDataset) {
 const DISALLOWED_GROUP_BY_FIELDS = new Set(['id', 'timestamp']);
 
 const Disabled = styled('span')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
diff --git a/static/app/views/explore/logs/styles.tsx b/static/app/views/explore/logs/styles.tsx
index 798ce9945c8f9a..89c706f3e7b99f 100644
--- a/static/app/views/explore/logs/styles.tsx
+++ b/static/app/views/explore/logs/styles.tsx
@@ -234,7 +234,7 @@ export const ColoredLogText = styled('span')<{
 `;
 
 export const LogDate = styled('span')<{align?: 'left' | 'center' | 'right'}>`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   text-align: ${p => p.align || 'left'};
 `;
 
@@ -248,7 +248,7 @@ export const LogsHighlight = styled(HighlightComponent)`
 export const LogsFilteredHelperText = styled('span')`
   margin-left: 4px;
   font-size: ${p => p.theme.fontSize.sm};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   background-color: ${p => p.theme.colors.gray200};
 `;
 
diff --git a/static/app/views/explore/savedQueries/exploreParams.tsx b/static/app/views/explore/savedQueries/exploreParams.tsx
index 23cb6a28885091..5771717f59f291 100644
--- a/static/app/views/explore/savedQueries/exploreParams.tsx
+++ b/static/app/views/explore/savedQueries/exploreParams.tsx
@@ -174,7 +174,7 @@ const Token = styled('span')`
 
 const ExploreParamTitle = styled('span')`
   font-size: ${p => p.theme.form.sm.fontSize};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   white-space: nowrap;
   padding-top: 3px;
 `;
diff --git a/static/app/views/explore/spans/charts/confidenceFooter.tsx b/static/app/views/explore/spans/charts/confidenceFooter.tsx
index c08d90d0d4b1bd..679d7c81560b18 100644
--- a/static/app/views/explore/spans/charts/confidenceFooter.tsx
+++ b/static/app/views/explore/spans/charts/confidenceFooter.tsx
@@ -363,6 +363,6 @@ function _LowAccuracyFullTooltip({
 }
 
 const Container = styled('span')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-size: ${p => p.theme.fontSize.sm};
 `;
diff --git a/static/app/views/explore/tables/tracesTable/fieldRenderers.tsx b/static/app/views/explore/tables/tracesTable/fieldRenderers.tsx
index cc05129cc55309..b4125e6a7b82c0 100644
--- a/static/app/views/explore/tables/tracesTable/fieldRenderers.tsx
+++ b/static/app/views/explore/tables/tracesTable/fieldRenderers.tsx
@@ -157,7 +157,7 @@ const CollapsedBadge = styled('div')<{fontSize: number; size: number}>`
   text-align: center;
   font-weight: ${p => p.theme.fontWeight.bold};
   background-color: ${p => p.theme.colors.gray200};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-size: ${p => p.fontSize}px;
   width: ${p => p.size}px;
   height: ${p => p.size}px;
@@ -370,7 +370,7 @@ export function SpanBreakdownSliceRenderer({
 
 const Subtext = styled('span')`
   font-weight: ${p => p.theme.fontWeight.normal};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 const FlexContainer = styled('div')`
   display: flex;
diff --git a/static/app/views/explore/tables/tracesTable/styles.tsx b/static/app/views/explore/tables/tracesTable/styles.tsx
index 82450657f948c4..411e4786a8644c 100644
--- a/static/app/views/explore/tables/tracesTable/styles.tsx
+++ b/static/app/views/explore/tables/tracesTable/styles.tsx
@@ -68,7 +68,7 @@ export const StyledPanelItem = styled(PanelItem)<{
 `;
 
 export const MoreMatchingSpans = styled(StyledPanelItem)`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 
 export const WrappingText = styled('div')`
@@ -116,14 +116,14 @@ export const EmptyStateText = styled('div')<{
   size: 'xl' | 'md';
   textAlign?: CSSProperties['textAlign'];
 }>`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-size: ${p => p.theme.fontSize[p.size]};
   padding-bottom: ${p => p.theme.space.md};
   ${p => p.textAlign && `text-align: ${p.textAlign}`};
 `;
 
 export const EmptyValueContainer = styled('span')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 
 export const SpanPanelContent = styled('div')`
diff --git a/static/app/views/insights/browser/webVitals/components/charts/performanceScoreChart.tsx b/static/app/views/insights/browser/webVitals/components/charts/performanceScoreChart.tsx
index 1c39893c83ae3d..2866ba9b57aeb3 100644
--- a/static/app/views/insights/browser/webVitals/components/charts/performanceScoreChart.tsx
+++ b/static/app/views/insights/browser/webVitals/components/charts/performanceScoreChart.tsx
@@ -137,7 +137,7 @@ const PerformanceScoreLabel = styled('div')`
 export const PerformanceScoreSubtext = styled('div')`
   width: 100%;
   font-size: ${p => p.theme.fontSize.sm};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   margin-bottom: ${space(1)};
 `;
 
diff --git a/static/app/views/insights/browser/webVitals/components/pageOverviewSidebar.tsx b/static/app/views/insights/browser/webVitals/components/pageOverviewSidebar.tsx
index 00021771f6d129..5c49f4673d56f4 100644
--- a/static/app/views/insights/browser/webVitals/components/pageOverviewSidebar.tsx
+++ b/static/app/views/insights/browser/webVitals/components/pageOverviewSidebar.tsx
@@ -442,7 +442,7 @@ const ChartValue = styled('div')`
 
 const ChartSubText = styled('div')<{color?: string}>`
   font-size: ${p => p.theme.fontSize.md};
-  color: ${p => p.color ?? p.theme.subText};
+  color: ${p => p.color ?? p.theme.tokens.content.secondary};
 `;
 
 const SectionHeading = styled('h4')`
@@ -450,7 +450,7 @@ const SectionHeading = styled('h4')`
   grid-auto-flow: column;
   gap: ${p => p.theme.space.md};
   align-items: center;
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-size: ${p => p.theme.fontSize.md};
   margin: 0;
 `;
@@ -491,7 +491,7 @@ const SpanOp = styled('p')`
 const CardTitleIcon = styled('div')`
   display: flex;
   align-items: center;
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 
 const CardContent = styled('div')`
diff --git a/static/app/views/insights/browser/webVitals/components/pageOverviewWebVitalsDetailPanel.tsx b/static/app/views/insights/browser/webVitals/components/pageOverviewWebVitalsDetailPanel.tsx
index 99ea6b14530329..245d85869d346f 100644
--- a/static/app/views/insights/browser/webVitals/components/pageOverviewWebVitalsDetailPanel.tsx
+++ b/static/app/views/insights/browser/webVitals/components/pageOverviewWebVitalsDetailPanel.tsx
@@ -380,7 +380,7 @@ const ChartContainer = styled('div')`
 `;
 
 const NoValue = styled('span')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 
 const TableContainer = styled('div')`
diff --git a/static/app/views/insights/browser/webVitals/components/performanceScoreRingWithTooltips.tsx b/static/app/views/insights/browser/webVitals/components/performanceScoreRingWithTooltips.tsx
index 4f22478200f9ee..afe34c1fda826b 100644
--- a/static/app/views/insights/browser/webVitals/components/performanceScoreRingWithTooltips.tsx
+++ b/static/app/views/insights/browser/webVitals/components/performanceScoreRingWithTooltips.tsx
@@ -356,7 +356,7 @@ const ProgressRingText = styled('text')<{isLink?: boolean}>`
 
 const ProgressRingSubText = styled('text')`
   font-size: ${p => p.theme.fontSize.sm};
-  fill: ${p => p.theme.subText};
+  fill: ${p => p.theme.tokens.content.secondary};
   text-anchor: middle;
 `;
 
@@ -366,7 +366,7 @@ const ProgressRingDiffSubText = styled(ProgressRingSubText)<{value: number}>`
       ? p.theme.colors.green400
       : p.value > 0
         ? p.theme.colors.red400
-        : p.theme.subText};
+        : p.theme.tokens.content.secondary};
 `;
 
 // Hover element on mouse
@@ -416,7 +416,7 @@ const Dot = styled('span')<{color: string}>`
 `;
 
 const TooltipValue = styled('span')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 
 export default PerformanceScoreRingWithTooltips;
diff --git a/static/app/views/insights/browser/webVitals/components/tables/pagePerformanceTable.tsx b/static/app/views/insights/browser/webVitals/components/tables/pagePerformanceTable.tsx
index 7e7e8107ae6d23..fea81f5072c26a 100644
--- a/static/app/views/insights/browser/webVitals/components/tables/pagePerformanceTable.tsx
+++ b/static/app/views/insights/browser/webVitals/components/tables/pagePerformanceTable.tsx
@@ -395,5 +395,5 @@ const StyledTooltip = styled(Tooltip)`
 `;
 
 const NoValue = styled('span')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
diff --git a/static/app/views/insights/browser/webVitals/components/tables/pageSamplePerformanceTable.tsx b/static/app/views/insights/browser/webVitals/components/tables/pageSamplePerformanceTable.tsx
index f8996426bd6cbc..b1f5baf20a29be 100644
--- a/static/app/views/insights/browser/webVitals/components/tables/pageSamplePerformanceTable.tsx
+++ b/static/app/views/insights/browser/webVitals/components/tables/pageSamplePerformanceTable.tsx
@@ -663,7 +663,7 @@ const StyledProjectAvatar = styled(ProjectAvatar)`
 `;
 
 const NoValue = styled('span')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 
 const StyledSearchBar = styled('div')`
diff --git a/static/app/views/insights/browser/webVitals/components/webVitalMetersWithIssues.tsx b/static/app/views/insights/browser/webVitals/components/webVitalMetersWithIssues.tsx
index 7c9729004c1f66..1641e352ee51d8 100644
--- a/static/app/views/insights/browser/webVitals/components/webVitalMetersWithIssues.tsx
+++ b/static/app/views/insights/browser/webVitals/components/webVitalMetersWithIssues.tsx
@@ -340,7 +340,7 @@ const MeterValueText = styled('div')`
 `;
 
 const NoValueContainer = styled('span')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-size: ${p => p.theme.fontSize.xl};
 `;
 
diff --git a/static/app/views/insights/browser/webVitals/views/webVitalsLandingPage.tsx b/static/app/views/insights/browser/webVitals/views/webVitalsLandingPage.tsx
index f048d202a81d62..bdef0b4b265da8 100644
--- a/static/app/views/insights/browser/webVitals/views/webVitalsLandingPage.tsx
+++ b/static/app/views/insights/browser/webVitals/views/webVitalsLandingPage.tsx
@@ -209,6 +209,6 @@ const LoadingBox = styled('div')`
 
 const PagesTooltip = styled('span')`
   font-size: ${p => p.theme.fontSize.sm};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   text-decoration: underline dotted ${p => p.theme.colors.gray400};
 `;
diff --git a/static/app/views/insights/common/components/issues.tsx b/static/app/views/insights/common/components/issues.tsx
index 98ca303dbf1ab9..04ac8de358f2fe 100644
--- a/static/app/views/insights/common/components/issues.tsx
+++ b/static/app/views/insights/common/components/issues.tsx
@@ -149,7 +149,7 @@ const Heading = styled('h6')`
   align-self: center;
   margin: 0 ${space(2)};
   width: 60px;
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-size: ${p => p.theme.fontSize.sm};
 `;
 
diff --git a/static/app/views/insights/common/components/metricReadout.tsx b/static/app/views/insights/common/components/metricReadout.tsx
index ce97dccefa2928..e3867dd2ea2347 100644
--- a/static/app/views/insights/common/components/metricReadout.tsx
+++ b/static/app/views/insights/common/components/metricReadout.tsx
@@ -181,7 +181,7 @@ const ReadoutWrapper = styled('div')`
 `;
 
 const ReadoutTitle = styled('h3')<{alignment: 'left' | 'right'}>`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-size: ${p => p.theme.fontSize.md};
   margin: 0;
   white-space: nowrap;
diff --git a/static/app/views/insights/common/components/modulesOnboarding.tsx b/static/app/views/insights/common/components/modulesOnboarding.tsx
index 13fdcf955e5128..4c0c33c1733af4 100644
--- a/static/app/views/insights/common/components/modulesOnboarding.tsx
+++ b/static/app/views/insights/common/components/modulesOnboarding.tsx
@@ -227,7 +227,7 @@ const SupportedSdkContainer = styled('div')`
   flex-direction: column;
   gap: ${space(1)};
   align-items: center;
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 
 const SupportedSdkIconContainer = styled('div')`
diff --git a/static/app/views/insights/common/components/sampleDrawerHeaderTransaction.tsx b/static/app/views/insights/common/components/sampleDrawerHeaderTransaction.tsx
index fa84f0a020931d..70c527a0c27631 100644
--- a/static/app/views/insights/common/components/sampleDrawerHeaderTransaction.tsx
+++ b/static/app/views/insights/common/components/sampleDrawerHeaderTransaction.tsx
@@ -82,7 +82,7 @@ const Bar = styled('h4')`
 `;
 
 const Deemphasize = styled('span')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 
 const TruncatedLink = styled(Link)`
diff --git a/static/app/views/insights/common/components/samplesTable/common.tsx b/static/app/views/insights/common/components/samplesTable/common.tsx
index 3136251233ac80..0881194635f5ab 100644
--- a/static/app/views/insights/common/components/samplesTable/common.tsx
+++ b/static/app/views/insights/common/components/samplesTable/common.tsx
@@ -41,7 +41,7 @@ export function DurationComparisonCell({
 const ComparisonLabel = styled('span')<{value: number}>`
   color: ${p =>
     p.value === 0
-      ? p.theme.subText
+      ? p.theme.tokens.content.secondary
       : p.value < 0
         ? p.theme.colors.green500
         : p.theme.colors.red500};
diff --git a/static/app/views/insights/common/components/widgets/overviewSlowQueriesChartWidget.tsx b/static/app/views/insights/common/components/widgets/overviewSlowQueriesChartWidget.tsx
index d2f992d45e3175..11ea6c56b23574 100644
--- a/static/app/views/insights/common/components/widgets/overviewSlowQueriesChartWidget.tsx
+++ b/static/app/views/insights/common/components/widgets/overviewSlowQueriesChartWidget.tsx
@@ -175,7 +175,7 @@ export default function OverviewSlowQueriesChartWidget(props: LoadableChartWidge
 
 const ControllerText = styled('div')`
   ${p => p.theme.overflowEllipsis};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-size: ${p => p.theme.fontSize.sm};
   line-height: 1.2;
   min-width: 0px;
diff --git a/static/app/views/insights/common/views/spans/selectors/emptyOption.tsx b/static/app/views/insights/common/views/spans/selectors/emptyOption.tsx
index 0103502e3e6793..50b13d4d1c332f 100644
--- a/static/app/views/insights/common/views/spans/selectors/emptyOption.tsx
+++ b/static/app/views/insights/common/views/spans/selectors/emptyOption.tsx
@@ -1,5 +1,5 @@
 import styled from '@emotion/styled';
 
 export const EmptyContainer = styled('span')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
diff --git a/static/app/views/insights/crons/components/checkInCell.tsx b/static/app/views/insights/crons/components/checkInCell.tsx
index 94895f892c86c2..21be38c4f64fc7 100644
--- a/static/app/views/insights/crons/components/checkInCell.tsx
+++ b/static/app/views/insights/crons/components/checkInCell.tsx
@@ -495,7 +495,7 @@ const TimestampContainer = styled('div')`
 `;
 
 const ExpectedDateTime = styled(DateTime)`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 
 const StyledShortId = styled(ShortId)`
diff --git a/static/app/views/insights/crons/components/cronsLandingPanel.tsx b/static/app/views/insights/crons/components/cronsLandingPanel.tsx
index 54d894f7257ff1..43249b20b54337 100644
--- a/static/app/views/insights/crons/components/cronsLandingPanel.tsx
+++ b/static/app/views/insights/crons/components/cronsLandingPanel.tsx
@@ -93,7 +93,7 @@ export function CronsLandingPanel() {
 
 const BackButton = styled(Button)`
   font-weight: ${p => p.theme.fontWeight.normal};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   margin: ${space(1)} 0 0 ${space(1)};
   padding-left: ${space(0.5)};
   padding-right: ${space(0.5)};
diff --git a/static/app/views/insights/crons/components/detailsSidebar.tsx b/static/app/views/insights/crons/components/detailsSidebar.tsx
index 4716478fc304c7..9881feeb83dda6 100644
--- a/static/app/views/insights/crons/components/detailsSidebar.tsx
+++ b/static/app/views/insights/crons/components/detailsSidebar.tsx
@@ -190,7 +190,7 @@ const Legend = styled('div')`
 
 const CrontabText = styled(Text)`
   font-family: ${p => p.theme.text.familyMono};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 
 const MonitorSlug = styled('button')`
diff --git a/static/app/views/insights/crons/components/monitorCreateForm.tsx b/static/app/views/insights/crons/components/monitorCreateForm.tsx
index bce06cc6538e9d..9f0744b686abf4 100644
--- a/static/app/views/insights/crons/components/monitorCreateForm.tsx
+++ b/static/app/views/insights/crons/components/monitorCreateForm.tsx
@@ -268,12 +268,12 @@ const ScheduleLabel = styled('div')`
 
 const Label = styled('div')`
   font-weight: ${p => p.theme.fontWeight.bold};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 
 const SubHeading = styled('div')`
   font-weight: ${p => p.theme.fontWeight.bold};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   margin-top: ${space(2)};
   margin-bottom: ${space(1)};
   text-transform: uppercase;
@@ -303,7 +303,7 @@ const IntervalInputs = styled(MultiColumnInput)`
 `;
 
 const CronstrueText = styled('div')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-size: ${p => p.theme.fontSize.xs};
   font-family: ${p => p.theme.text.familyMono};
   grid-column: auto / span 2;
diff --git a/static/app/views/insights/crons/components/monitorForm.tsx b/static/app/views/insights/crons/components/monitorForm.tsx
index 3839935ad63277..22ace7afa35d17 100644
--- a/static/app/views/insights/crons/components/monitorForm.tsx
+++ b/static/app/views/insights/crons/components/monitorForm.tsx
@@ -573,12 +573,12 @@ const StyledListItem = styled(ListItem)`
 
 const LabelText = styled(Text)`
   font-weight: ${p => p.theme.fontWeight.bold};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 
 const ListItemSubText = styled(Text)`
   padding-left: ${space(4)};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 
 const InputGroup = styled('div')<{noPadding?: boolean}>`
diff --git a/static/app/views/insights/crons/components/onboarding.tsx b/static/app/views/insights/crons/components/onboarding.tsx
index ff5f84b96a7dce..48e77d98ac66ec 100644
--- a/static/app/views/insights/crons/components/onboarding.tsx
+++ b/static/app/views/insights/crons/components/onboarding.tsx
@@ -43,7 +43,7 @@ const WaitingNotice = styled('div')`
 const WaitingHelpText = styled('small')`
   grid-column: 2;
   font-size: ${p => p.theme.fontSize.sm};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 
 const WaitingIndicator = styled('div')`
diff --git a/static/app/views/insights/crons/components/overviewTimeline/overviewRow.tsx b/static/app/views/insights/crons/components/overviewTimeline/overviewRow.tsx
index 0d1e66bb629adf..4b1558f149ac62 100644
--- a/static/app/views/insights/crons/components/overviewTimeline/overviewRow.tsx
+++ b/static/app/views/insights/crons/components/overviewTimeline/overviewRow.tsx
@@ -269,7 +269,7 @@ const OwnershipDetails = styled('div')`
   flex-wrap: wrap;
   gap: ${space(0.75)};
   align-items: center;
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-size: ${p => p.theme.fontSize.sm};
 `;
 
@@ -283,7 +283,7 @@ const ScheduleDetails = styled('small')`
   display: flex;
   gap: ${space(0.5)};
   align-items: center;
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-size: ${p => p.theme.fontSize.sm};
 `;
 
diff --git a/static/app/views/insights/crons/components/platformPickerPanel.tsx b/static/app/views/insights/crons/components/platformPickerPanel.tsx
index 0bbb4386276923..b64527561215b2 100644
--- a/static/app/views/insights/crons/components/platformPickerPanel.tsx
+++ b/static/app/views/insights/crons/components/platformPickerPanel.tsx
@@ -62,7 +62,7 @@ const OnboardingTitle = styled('h3')`
 
 const SectionTitle = styled('h5')`
   font-size: ${p => p.theme.fontSize.sm};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   text-transform: uppercase;
   margin-bottom: ${space(1)};
   margin-top: ${space(4)};
@@ -79,5 +79,5 @@ const PlatformOption = styled('div')`
   flex-direction: column;
   gap: ${space(0.5)};
   align-items: center;
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
diff --git a/static/app/views/insights/crons/components/timezoneOverride.tsx b/static/app/views/insights/crons/components/timezoneOverride.tsx
index 93e0c7eab0ff39..35eae223e25295 100644
--- a/static/app/views/insights/crons/components/timezoneOverride.tsx
+++ b/static/app/views/insights/crons/components/timezoneOverride.tsx
@@ -73,7 +73,7 @@ function TimezoneLabel({timezone}: {timezone: string}) {
 }
 
 const TimezoneName = styled('div')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-weight: ${p => p.theme.fontWeight.bold};
   display: flex;
   align-items: center;
diff --git a/static/app/views/insights/database/components/stackTraceMiniFrame.tsx b/static/app/views/insights/database/components/stackTraceMiniFrame.tsx
index 92651270193406..c0864d10eb2937 100644
--- a/static/app/views/insights/database/components/stackTraceMiniFrame.tsx
+++ b/static/app/views/insights/database/components/stackTraceMiniFrame.tsx
@@ -101,7 +101,7 @@ const Emphasize = styled('span')`
 `;
 
 const Deemphasize = styled('span')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 
 const PushRight = styled('span')`
@@ -152,7 +152,7 @@ const DeemphasizedExternalLink = styled(ExternalLink)`
   display: flex;
   align-items: center;
   gap: ${space(0.75)};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 
 const StyledIconWrapper = styled('span')`
diff --git a/static/app/views/insights/pages/agents/components/aiSpanList.tsx b/static/app/views/insights/pages/agents/components/aiSpanList.tsx
index 1c4fd0e59d7a5a..fefcea23662039 100644
--- a/static/app/views/insights/pages/agents/components/aiSpanList.tsx
+++ b/static/app/views/insights/pages/agents/components/aiSpanList.tsx
@@ -463,7 +463,7 @@ const TransactionButton = styled('button')`
   border: none;
   outline: none;
   justify-content: flex-start;
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-weight: ${p => p.theme.fontWeight.normal};
 
   &:hover:not(:disabled) {
diff --git a/static/app/views/insights/pages/agents/components/llmCallsWidget.tsx b/static/app/views/insights/pages/agents/components/llmCallsWidget.tsx
index af0d3c6934313e..e7f47588f43df8 100644
--- a/static/app/views/insights/pages/agents/components/llmCallsWidget.tsx
+++ b/static/app/views/insights/pages/agents/components/llmCallsWidget.tsx
@@ -173,7 +173,7 @@ export default function LLMCallsWidget() {
 
 const ModelText = styled('div')`
   ${p => p.theme.overflowEllipsis};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-size: ${p => p.theme.fontSize.sm};
   line-height: 1.2;
   min-width: 0px;
diff --git a/static/app/views/insights/pages/agents/components/modelCostWidget.tsx b/static/app/views/insights/pages/agents/components/modelCostWidget.tsx
index d1cd5533480008..e2869840b8d4e7 100644
--- a/static/app/views/insights/pages/agents/components/modelCostWidget.tsx
+++ b/static/app/views/insights/pages/agents/components/modelCostWidget.tsx
@@ -173,7 +173,7 @@ export default function ModelCostWidget() {
 }
 
 const ModelText = styled('div')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-size: ${p => p.theme.fontSize.sm};
   line-height: 1.2;
   min-width: 0px;
diff --git a/static/app/views/insights/pages/agents/components/tokenTypesWidget.tsx b/static/app/views/insights/pages/agents/components/tokenTypesWidget.tsx
index 42c9917e00f198..dfd4f4133f00dc 100644
--- a/static/app/views/insights/pages/agents/components/tokenTypesWidget.tsx
+++ b/static/app/views/insights/pages/agents/components/tokenTypesWidget.tsx
@@ -289,7 +289,7 @@ function TokenTypeCount({
 }
 
 const FooterText = styled('div')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-size: ${p => p.theme.fontSize.sm};
   line-height: 1.2;
   min-width: 0px;
diff --git a/static/app/views/insights/pages/agents/components/tokenUsageWidget.tsx b/static/app/views/insights/pages/agents/components/tokenUsageWidget.tsx
index 336f34f30a7e09..bdb13d6824d675 100644
--- a/static/app/views/insights/pages/agents/components/tokenUsageWidget.tsx
+++ b/static/app/views/insights/pages/agents/components/tokenUsageWidget.tsx
@@ -175,7 +175,7 @@ export default function TokenUsageWidget() {
 }
 
 const ModelText = styled('div')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-size: ${p => p.theme.fontSize.sm};
   line-height: 1.2;
   min-width: 0px;
diff --git a/static/app/views/insights/pages/agents/components/toolCallsWidget.tsx b/static/app/views/insights/pages/agents/components/toolCallsWidget.tsx
index 3d4ee3be4400bf..e095893bbf9959 100644
--- a/static/app/views/insights/pages/agents/components/toolCallsWidget.tsx
+++ b/static/app/views/insights/pages/agents/components/toolCallsWidget.tsx
@@ -171,7 +171,7 @@ export default function ToolCallsWidget() {
 
 const ToolText = styled('div')`
   ${p => p.theme.overflowEllipsis};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-size: ${p => p.theme.fontSize.sm};
   line-height: 1.2;
   min-width: 0px;
diff --git a/static/app/views/insights/pages/agents/components/toolErrorsWidget.tsx b/static/app/views/insights/pages/agents/components/toolErrorsWidget.tsx
index 8e433a52b07c96..f863493fff927c 100644
--- a/static/app/views/insights/pages/agents/components/toolErrorsWidget.tsx
+++ b/static/app/views/insights/pages/agents/components/toolErrorsWidget.tsx
@@ -173,7 +173,7 @@ export default function ToolErrorsWidget() {
 
 const ToolText = styled('div')`
   ${p => p.theme.overflowEllipsis};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-size: ${p => p.theme.fontSize.sm};
   line-height: 1.2;
   min-width: 0px;
diff --git a/static/app/views/insights/pages/conversations/components/conversationDrawer.tsx b/static/app/views/insights/pages/conversations/components/conversationDrawer.tsx
index b256c60b987d4a..26d2a287d1c88a 100644
--- a/static/app/views/insights/pages/conversations/components/conversationDrawer.tsx
+++ b/static/app/views/insights/pages/conversations/components/conversationDrawer.tsx
@@ -234,7 +234,7 @@ const StyledDrawerHeader = styled(DrawerHeader)`
 `;
 
 const ConversationIdLabel = styled('span')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-family: ${p => p.theme.text.familyMono};
   font-size: ${p => p.theme.fontSize.sm};
 `;
diff --git a/static/app/views/insights/pages/platform/laravel/pathsTable.tsx b/static/app/views/insights/pages/platform/laravel/pathsTable.tsx
index 8a3cba7c72225a..23c230952e65eb 100644
--- a/static/app/views/insights/pages/platform/laravel/pathsTable.tsx
+++ b/static/app/views/insights/pages/platform/laravel/pathsTable.tsx
@@ -202,7 +202,7 @@ function TransactionDetails({
 
 const ControllerText = styled('div')`
   ${p => p.theme.overflowEllipsis};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-size: ${p => p.theme.fontSize.sm};
   min-width: 0px;
 `;
diff --git a/static/app/views/insights/pages/platform/nextjs/serverTree.tsx b/static/app/views/insights/pages/platform/nextjs/serverTree.tsx
index 001d8af4cc62ed..40df36793b4fc8 100644
--- a/static/app/views/insights/pages/platform/nextjs/serverTree.tsx
+++ b/static/app/views/insights/pages/platform/nextjs/serverTree.tsx
@@ -360,7 +360,7 @@ const HeaderCell = styled('div')`
   padding: ${space(2)} ${space(0.75)};
   text-transform: uppercase;
   font-weight: 600;
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-size: ${p => p.theme.fontSize.sm};
   border-bottom: 1px solid ${p => p.theme.tokens.border.primary};
   white-space: nowrap;
@@ -381,7 +381,7 @@ const PathWrapper = styled('div')`
 `;
 
 const StyledIconChevron = styled(IconChevron)`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   cursor: pointer;
   user-select: none;
   width: 10px;
diff --git a/static/app/views/insights/pages/platform/shared/table/ErrorRateCell.tsx b/static/app/views/insights/pages/platform/shared/table/ErrorRateCell.tsx
index d3be14141608a4..80425a6b081a3d 100644
--- a/static/app/views/insights/pages/platform/shared/table/ErrorRateCell.tsx
+++ b/static/app/views/insights/pages/platform/shared/table/ErrorRateCell.tsx
@@ -40,7 +40,9 @@ export function ErrorRateCell({
     issuesLink && errorCount > 0 ? (
       <Link to={issuesLink}>({formatAbbreviatedNumber(errorCount)})</Link>
     ) : (
-      <span style={{color: theme.subText}}>({formatAbbreviatedNumber(errorCount)})</span>
+      <span style={{color: theme.tokens.content.secondary}}>
+        ({formatAbbreviatedNumber(errorCount)})
+      </span>
     );
 
   return (
diff --git a/static/app/views/insights/queues/components/tables/messageSpanSamplesTable.tsx b/static/app/views/insights/queues/components/tables/messageSpanSamplesTable.tsx
index ec8e1d81311e79..1d6571d3cf5f69 100644
--- a/static/app/views/insights/queues/components/tables/messageSpanSamplesTable.tsx
+++ b/static/app/views/insights/queues/components/tables/messageSpanSamplesTable.tsx
@@ -197,5 +197,5 @@ const AlignRight = styled('span')`
 `;
 
 const NoValue = styled('span')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
diff --git a/static/app/views/insights/queues/components/tables/queuesTable.tsx b/static/app/views/insights/queues/components/tables/queuesTable.tsx
index da8b0347b0b81e..69c173fc2b6135 100644
--- a/static/app/views/insights/queues/components/tables/queuesTable.tsx
+++ b/static/app/views/insights/queues/components/tables/queuesTable.tsx
@@ -256,5 +256,5 @@ const AlignRight = styled('span')`
 `;
 
 const NoValue = styled('span')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
diff --git a/static/app/views/insights/queues/components/tables/transactionsTable.tsx b/static/app/views/insights/queues/components/tables/transactionsTable.tsx
index 4b779ddf6ef736..631614f0be1907 100644
--- a/static/app/views/insights/queues/components/tables/transactionsTable.tsx
+++ b/static/app/views/insights/queues/components/tables/transactionsTable.tsx
@@ -275,5 +275,5 @@ const AlignRight = styled('span')`
 `;
 
 const NoValue = styled('span')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
diff --git a/static/app/views/integrationPipeline/awsLambdaFailureDetails.tsx b/static/app/views/integrationPipeline/awsLambdaFailureDetails.tsx
index fd94776f302696..a73f963c5ff184 100644
--- a/static/app/views/integrationPipeline/awsLambdaFailureDetails.tsx
+++ b/static/app/views/integrationPipeline/awsLambdaFailureDetails.tsx
@@ -78,7 +78,7 @@ const StyledRow = styled(PanelItem)`
 `;
 
 const Error = styled('span')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 
 const StyledPanel = styled(Panel)`
diff --git a/static/app/views/issueDetails/actions/shareModal.tsx b/static/app/views/issueDetails/actions/shareModal.tsx
index 0ffc468b1fa954..c9ed450348bdcb 100644
--- a/static/app/views/issueDetails/actions/shareModal.tsx
+++ b/static/app/views/issueDetails/actions/shareModal.tsx
@@ -304,7 +304,7 @@ const Title = styled('div')`
 `;
 
 const SubText = styled('p')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-size: ${p => p.theme.fontSize.sm};
 `;
 
diff --git a/static/app/views/issueDetails/eventCreatedTooltip.tsx b/static/app/views/issueDetails/eventCreatedTooltip.tsx
index 1a2bba832e4f4a..cda8850efa68cb 100644
--- a/static/app/views/issueDetails/eventCreatedTooltip.tsx
+++ b/static/app/views/issueDetails/eventCreatedTooltip.tsx
@@ -87,5 +87,5 @@ const DescriptionList = styled('dl')`
 `;
 
 const NotApplicableText = styled('span')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
diff --git a/static/app/views/issueDetails/groupEventCarousel.tsx b/static/app/views/issueDetails/groupEventCarousel.tsx
index fe7b583b54298e..2acb3ab99717e3 100644
--- a/static/app/views/issueDetails/groupEventCarousel.tsx
+++ b/static/app/views/issueDetails/groupEventCarousel.tsx
@@ -527,7 +527,7 @@ const EventIdContainer = styled('div')`
 `;
 
 const EventTimeLabel = styled('span')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 
 const StyledIconWarning = styled(IconWarning)`
diff --git a/static/app/views/issueDetails/groupFeatureFlags/details/flagDetailsDrawerContent.tsx b/static/app/views/issueDetails/groupFeatureFlags/details/flagDetailsDrawerContent.tsx
index 613518b2ac0c42..2d297f0145d484 100644
--- a/static/app/views/issueDetails/groupFeatureFlags/details/flagDetailsDrawerContent.tsx
+++ b/static/app/views/issueDetails/groupFeatureFlags/details/flagDetailsDrawerContent.tsx
@@ -231,7 +231,7 @@ const Table = styled('div')`
 
 const ColumnTitle = styled('div')`
   white-space: nowrap;
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-weight: ${p => p.theme.fontWeight.bold};
 `;
 
diff --git a/static/app/views/issueDetails/groupMerged/index.tsx b/static/app/views/issueDetails/groupMerged/index.tsx
index 85d1b16523ef3e..f71a4242798ef9 100644
--- a/static/app/views/issueDetails/groupMerged/index.tsx
+++ b/static/app/views/issueDetails/groupMerged/index.tsx
@@ -147,6 +147,6 @@ const HeaderWrapper = styled('div')`
   margin-bottom: ${space(2)};
 
   small {
-    color: ${p => p.theme.subText};
+    color: ${p => p.theme.tokens.content.secondary};
   }
 `;
diff --git a/static/app/views/issueDetails/groupRelatedIssues/index.tsx b/static/app/views/issueDetails/groupRelatedIssues/index.tsx
index 335aa5562e51cd..5c0d2392168d36 100644
--- a/static/app/views/issueDetails/groupRelatedIssues/index.tsx
+++ b/static/app/views/issueDetails/groupRelatedIssues/index.tsx
@@ -179,7 +179,7 @@ const HeaderWrapper = styled('div')`
   margin-bottom: ${space(2)};
 
   small {
-    color: ${p => p.theme.subText};
+    color: ${p => p.theme.tokens.content.secondary};
   }
 `;
 
diff --git a/static/app/views/issueDetails/groupReplays/groupReplays.tsx b/static/app/views/issueDetails/groupReplays/groupReplays.tsx
index a79585c0ad4ae4..3120d8351f8d87 100644
--- a/static/app/views/issueDetails/groupReplays/groupReplays.tsx
+++ b/static/app/views/issueDetails/groupReplays/groupReplays.tsx
@@ -358,7 +358,7 @@ const StyledBreak = styled('hr')`
 `;
 
 const ReplayFilterText = styled('div')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 
 const OverlayText = styled('div')`
diff --git a/static/app/views/issueDetails/groupSimilarIssues/similarStackTrace/index.tsx b/static/app/views/issueDetails/groupSimilarIssues/similarStackTrace/index.tsx
index c483b2dab8b7cd..5389efe51d9361 100644
--- a/static/app/views/issueDetails/groupSimilarIssues/similarStackTrace/index.tsx
+++ b/static/app/views/issueDetails/groupSimilarIssues/similarStackTrace/index.tsx
@@ -266,6 +266,6 @@ const HeaderWrapper = styled('div')`
   margin-bottom: ${space(2)};
 
   small {
-    color: ${p => p.theme.subText};
+    color: ${p => p.theme.tokens.content.secondary};
   }
 `;
diff --git a/static/app/views/issueDetails/groupTags/tagDetailsDrawerContent.tsx b/static/app/views/issueDetails/groupTags/tagDetailsDrawerContent.tsx
index 31a701569117d5..bf1850d313fd97 100644
--- a/static/app/views/issueDetails/groupTags/tagDetailsDrawerContent.tsx
+++ b/static/app/views/issueDetails/groupTags/tagDetailsDrawerContent.tsx
@@ -348,7 +348,7 @@ const Table = styled('div')`
 
 const ColumnTitle = styled('div')`
   white-space: nowrap;
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-weight: ${p => p.theme.fontWeight.bold};
 `;
 
@@ -361,13 +361,13 @@ const ColumnSort = styled(Link)`
   gap: ${space(0.5)};
   align-items: center;
   white-space: nowrap;
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-weight: ${p => p.theme.fontWeight.bold};
   text-decoration: underline;
   text-decoration-style: dotted;
   text-decoration-color: ${p => p.theme.tokens.content.primary};
   &:hover {
-    color: ${p => p.theme.subText};
+    color: ${p => p.theme.tokens.content.secondary};
   }
 `;
 
@@ -406,7 +406,7 @@ const RightAlignedValue = styled('div')`
 `;
 
 const UserSubtitle = styled('div')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   display: inline-block; /* Prevent inheriting text decoration */
 `;
 
@@ -420,7 +420,7 @@ const OverflowTimeSince = styled(TimeSince)`
 `;
 
 const ExternalLinkbutton = styled(Button)`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 
 const UserValue = styled('div')`
diff --git a/static/app/views/issueDetails/groupTags/tagDistribution.tsx b/static/app/views/issueDetails/groupTags/tagDistribution.tsx
index 8eb266ccfcf39f..4dfb50e582575d 100644
--- a/static/app/views/issueDetails/groupTags/tagDistribution.tsx
+++ b/static/app/views/issueDetails/groupTags/tagDistribution.tsx
@@ -140,7 +140,7 @@ const progressBarWidth = '45px'; // Prevent percentages from overflowing
 const TagValueContent = styled('div')`
   display: grid;
   grid-template-columns: 4fr auto ${progressBarWidth};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   grid-column-gap: ${space(1)};
 
   & > :nth-child(2n) {
diff --git a/static/app/views/issueDetails/groupUserFeedback.tsx b/static/app/views/issueDetails/groupUserFeedback.tsx
index df5de28c470a23..e187d52a6f6291 100644
--- a/static/app/views/issueDetails/groupUserFeedback.tsx
+++ b/static/app/views/issueDetails/groupUserFeedback.tsx
@@ -117,7 +117,7 @@ const StyledLayoutBody = styled(Layout.Body)<{hasStreamlinedUI?: boolean}>`
 `;
 
 const FilterMessage = styled('div')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 
 const StyledBreak = styled('hr')`
diff --git a/static/app/views/issueDetails/participantList.tsx b/static/app/views/issueDetails/participantList.tsx
index 30cb17b93a351d..f821d31441a110 100644
--- a/static/app/views/issueDetails/participantList.tsx
+++ b/static/app/views/issueDetails/participantList.tsx
@@ -134,7 +134,7 @@ const ListTitle = styled('div')`
   align-items: center;
   padding: ${space(1)} ${space(1.5)};
   background-color: ${p => p.theme.backgroundSecondary};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   text-transform: uppercase;
   font-weight: ${p => p.theme.fontWeight.bold};
   font-size: ${p => p.theme.fontSize.sm};
@@ -150,6 +150,6 @@ const UserRow = styled('div')`
 `;
 
 const SubText = styled('div')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-size: ${p => p.theme.fontSize.xs};
 `;
diff --git a/static/app/views/issueDetails/reprocessingProgress.tsx b/static/app/views/issueDetails/reprocessingProgress.tsx
index dc385913002ac3..ed174c05fbb23c 100644
--- a/static/app/views/issueDetails/reprocessingProgress.tsx
+++ b/static/app/views/issueDetails/reprocessingProgress.tsx
@@ -51,7 +51,7 @@ const Wrapper = styled('div')`
 `;
 
 const Content = styled('div')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-size: ${p => p.theme.fontSize.md};
   display: grid;
   gap: ${space(1.5)};
diff --git a/static/app/views/issueDetails/sectionToggleButton.tsx b/static/app/views/issueDetails/sectionToggleButton.tsx
index 75f5b1a44fed11..fb7f2d0fed513a 100644
--- a/static/app/views/issueDetails/sectionToggleButton.tsx
+++ b/static/app/views/issueDetails/sectionToggleButton.tsx
@@ -21,7 +21,7 @@ function SectionToggleButton({
 }
 
 const ToggleButton = styled(Button)`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   :hover,
   :focus {
     color: ${p => p.theme.tokens.content.primary};
diff --git a/static/app/views/issueDetails/streamline/eventListTable.tsx b/static/app/views/issueDetails/streamline/eventListTable.tsx
index a84ceff53b9eeb..e518ccab142e2b 100644
--- a/static/app/views/issueDetails/streamline/eventListTable.tsx
+++ b/static/app/views/issueDetails/streamline/eventListTable.tsx
@@ -151,7 +151,7 @@ export const Title = styled('div')`
 `;
 
 export const HeaderItem = styled('div')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-weight: ${p => p.theme.fontWeight.normal};
   font-size: ${p => p.theme.fontSize.sm};
 `;
@@ -224,7 +224,7 @@ const StreamlineGridEditable = styled('div')`
 `;
 
 export const PaginationButton = styled(LinkButton)`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-weight: ${p => p.theme.fontWeight.normal};
 `;
 
diff --git a/static/app/views/issueDetails/streamline/eventMissingBanner.tsx b/static/app/views/issueDetails/streamline/eventMissingBanner.tsx
index a0fb759eb5c550..252e202f47a406 100644
--- a/static/app/views/issueDetails/streamline/eventMissingBanner.tsx
+++ b/static/app/views/issueDetails/streamline/eventMissingBanner.tsx
@@ -113,5 +113,5 @@ const SubText = styled('div')`
 
 const EventIdText = styled(SubText)`
   font-style: italic;
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
diff --git a/static/app/views/issueDetails/streamline/eventNavigation.tsx b/static/app/views/issueDetails/streamline/eventNavigation.tsx
index aba56aedb6ea8d..14555adc5ecd8f 100644
--- a/static/app/views/issueDetails/streamline/eventNavigation.tsx
+++ b/static/app/views/issueDetails/streamline/eventNavigation.tsx
@@ -338,7 +338,7 @@ const NavigationLabel = styled('div')`
 const LargeInThisIssueText = styled('div')`
   font-size: ${p => p.theme.fontSize.lg};
   font-weight: ${p => p.theme.fontWeight.bold};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   line-height: 1;
 `;
 
@@ -377,9 +377,9 @@ const DropdownCountWrapper = styled('div')<{isCurrentTab: boolean}>`
 `;
 
 const ItemCount = styled(Count)`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 
 const CustomItemCount = styled('div')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
diff --git a/static/app/views/issueDetails/streamline/eventTitle.tsx b/static/app/views/issueDetails/streamline/eventTitle.tsx
index ef9432629be4c7..0c712ad47be087 100644
--- a/static/app/views/issueDetails/streamline/eventTitle.tsx
+++ b/static/app/views/issueDetails/streamline/eventTitle.tsx
@@ -118,7 +118,7 @@ export function EventTitle({event, group, ref, ...props}: EventNavigationProps)
   });
 
   const grayText = css`
-    color: ${theme.subText};
+    color: ${theme.tokens.content.secondary};
     font-weight: ${theme.fontWeight.normal};
   `;
 
@@ -208,7 +208,7 @@ export function EventTitle({event, group, ref, ...props}: EventNavigationProps)
 }
 
 const StyledTimeSince = styled(TimeSince)`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-weight: ${p => p.theme.fontWeight.normal};
   white-space: nowrap;
 `;
@@ -258,19 +258,19 @@ const JsonLinkWrapper = styled('div')`
 `;
 
 const JsonLink = styled(ExternalLink)`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   text-decoration: underline;
   text-decoration-color: ${p => Color(p.theme.colors.gray400).alpha(0.5).string()};
 
   :hover {
-    color: ${p => p.theme.subText};
+    color: ${p => p.theme.tokens.content.secondary};
     text-decoration: underline;
-    text-decoration-color: ${p => p.theme.subText};
+    text-decoration-color: ${p => p.theme.tokens.content.secondary};
   }
 `;
 
 const MarkdownButton = styled(Button)`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   text-decoration: underline;
   text-decoration-color: ${p => Color(p.theme.colors.gray400).alpha(0.5).string()};
   font-size: inherit;
@@ -279,9 +279,9 @@ const MarkdownButton = styled(Button)`
   white-space: nowrap;
 
   :hover {
-    color: ${p => p.theme.subText};
+    color: ${p => p.theme.tokens.content.secondary};
     text-decoration: underline;
-    text-decoration-color: ${p => p.theme.subText};
+    text-decoration-color: ${p => p.theme.tokens.content.secondary};
   }
 `;
 
diff --git a/static/app/views/issueDetails/streamline/header/attachmentsBadge.tsx b/static/app/views/issueDetails/streamline/header/attachmentsBadge.tsx
index f636ae4d08944c..d72cc1a9631e6c 100644
--- a/static/app/views/issueDetails/streamline/header/attachmentsBadge.tsx
+++ b/static/app/views/issueDetails/streamline/header/attachmentsBadge.tsx
@@ -57,7 +57,7 @@ export function AttachmentsBadge({group}: {group: Group}) {
 }
 
 const AttachmentButton = styled(LinkButton)`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   text-decoration: underline;
   text-decoration-style: dotted;
 `;
diff --git a/static/app/views/issueDetails/streamline/header/header.tsx b/static/app/views/issueDetails/streamline/header/header.tsx
index 89704c04d3e26a..4a0528098a6190 100644
--- a/static/app/views/issueDetails/streamline/header/header.tsx
+++ b/static/app/views/issueDetails/streamline/header/header.tsx
@@ -319,7 +319,7 @@ const PrimaryTitle = styled('span')`
 
 const StatTitle = styled('div')`
   display: block;
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-size: ${p => p.theme.fontSize.sm};
   font-weight: ${p => p.theme.fontWeight.bold};
   line-height: 1;
@@ -327,7 +327,7 @@ const StatTitle = styled('div')`
 `;
 
 const StatLink = styled(Link)`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   text-decoration: ${p => (p['aria-disabled'] ? 'none' : 'underline')};
   text-decoration-style: dotted;
 `;
@@ -340,7 +340,7 @@ const StatCount = styled(Count)`
 `;
 
 const Subtext = styled('span')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   overflow: hidden;
   text-overflow: ellipsis;
   white-space: nowrap;
@@ -393,7 +393,7 @@ const Workflow = styled('div')`
   display: flex;
   align-items: center;
   gap: ${space(0.5)};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 
 const Title = styled('div')`
diff --git a/static/app/views/issueDetails/streamline/header/replayBadge.tsx b/static/app/views/issueDetails/streamline/header/replayBadge.tsx
index a39324255447cf..77760aeaa66336 100644
--- a/static/app/views/issueDetails/streamline/header/replayBadge.tsx
+++ b/static/app/views/issueDetails/streamline/header/replayBadge.tsx
@@ -51,7 +51,7 @@ export function ReplayBadge({group, project}: {group: Group; project: Project})
 }
 
 const ReplayButton = styled(LinkButton)`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   text-decoration: underline;
   text-decoration-style: dotted;
 `;
diff --git a/static/app/views/issueDetails/streamline/header/seerBadge.tsx b/static/app/views/issueDetails/streamline/header/seerBadge.tsx
index 4201bd4950f30d..caa75727f90cd2 100644
--- a/static/app/views/issueDetails/streamline/header/seerBadge.tsx
+++ b/static/app/views/issueDetails/streamline/header/seerBadge.tsx
@@ -36,7 +36,7 @@ const Wrapper = styled('div')`
   display: flex;
   align-items: center;
   gap: ${space(0.5)};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 
 export default SeerBadge;
diff --git a/static/app/views/issueDetails/streamline/header/userFeedbackBadge.tsx b/static/app/views/issueDetails/streamline/header/userFeedbackBadge.tsx
index f4350ecc942aaa..d5f031b8b7623c 100644
--- a/static/app/views/issueDetails/streamline/header/userFeedbackBadge.tsx
+++ b/static/app/views/issueDetails/streamline/header/userFeedbackBadge.tsx
@@ -40,7 +40,7 @@ export function UserFeedbackBadge({group, project}: {group: Group; project: Proj
 }
 
 const UserFeedbackButton = styled(LinkButton)`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   text-decoration: underline;
   text-decoration-style: dotted;
 `;
diff --git a/static/app/views/issueDetails/streamline/issueCronCheckTimeline.tsx b/static/app/views/issueDetails/streamline/issueCronCheckTimeline.tsx
index 6eb7429e808c72..30a7d5aa35563f 100644
--- a/static/app/views/issueDetails/streamline/issueCronCheckTimeline.tsx
+++ b/static/app/views/issueDetails/streamline/issueCronCheckTimeline.tsx
@@ -217,7 +217,7 @@ const TimelineLegend = styled('div')`
 `;
 
 const TimelineLegendText = styled('div')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-size: ${p => p.theme.fontSize.sm};
 `;
 
@@ -235,7 +235,7 @@ const EnvironmentLabel = styled(Tooltip)`
   left: 0;
   font-weight: ${p => p.theme.fontWeight.bold};
   font-size: ${p => p.theme.fontSize.xs};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   white-space: nowrap;
 `;
 
diff --git a/static/app/views/issueDetails/streamline/issueDetailsEventNavigation.tsx b/static/app/views/issueDetails/streamline/issueDetailsEventNavigation.tsx
index de84d0af3507b6..8e054b6422ff9e 100644
--- a/static/app/views/issueDetails/streamline/issueDetailsEventNavigation.tsx
+++ b/static/app/views/issueDetails/streamline/issueDetailsEventNavigation.tsx
@@ -114,7 +114,7 @@ export function IssueDetailsEventNavigation({
   const baseEventsPath = `/organizations/${organization.slug}/issues/${group.id}/events/`;
 
   const grayText = css`
-    color: ${theme.subText};
+    color: ${theme.tokens.content.secondary};
     font-weight: ${theme.fontWeight.normal};
   `;
 
diff --git a/static/app/views/issueDetails/streamline/issueDetailsJumpTo.tsx b/static/app/views/issueDetails/streamline/issueDetailsJumpTo.tsx
index f0c386968cf8e5..445bd5a6cdb1fa 100644
--- a/static/app/views/issueDetails/streamline/issueDetailsJumpTo.tsx
+++ b/static/app/views/issueDetails/streamline/issueDetailsJumpTo.tsx
@@ -123,7 +123,7 @@ function JumpToLink({config}: {config: SectionConfig}) {
       borderless
       size="xs"
       css={css`
-        color: ${theme.subText};
+        color: ${theme.tokens.content.secondary};
         font-weight: ${theme.fontWeight.normal};
       `}
       analyticsEventName="Issue Details: Jump To Clicked"
@@ -144,7 +144,7 @@ const JumpTo = styled('div')`
   gap: ${p => p.theme.space.xs};
   flex-direction: row;
   align-items: center;
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-size: ${p => p.theme.fontSize.sm};
   white-space: nowrap;
   overflow: hidden;
diff --git a/static/app/views/issueDetails/streamline/issueUptimeCheckTimeline.tsx b/static/app/views/issueDetails/streamline/issueUptimeCheckTimeline.tsx
index b8ba3e89203b3f..a23c155910e1cd 100644
--- a/static/app/views/issueDetails/streamline/issueUptimeCheckTimeline.tsx
+++ b/static/app/views/issueDetails/streamline/issueUptimeCheckTimeline.tsx
@@ -154,7 +154,7 @@ const TimelineLegend = styled('div')`
 `;
 
 const TimelineLegendText = styled('div')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-size: ${p => p.theme.fontSize.sm};
 `;
 
diff --git a/static/app/views/issueDetails/streamline/occurrenceSummary.tsx b/static/app/views/issueDetails/streamline/occurrenceSummary.tsx
index 2bfe5e8f044d60..3b71d2e6cc0bd1 100644
--- a/static/app/views/issueDetails/streamline/occurrenceSummary.tsx
+++ b/static/app/views/issueDetails/streamline/occurrenceSummary.tsx
@@ -155,7 +155,7 @@ export function OccurrenceSummary({group, event, className}: OccurrenceSummaryPr
 
 const ItemTitle = styled('div')`
   font-size: ${p => p.theme.fontSize.sm};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-weight: ${p => p.theme.fontWeight.bold};
 `;
 
@@ -174,5 +174,5 @@ const ItemLink = styled(Link)`
   font-size: ${p => p.theme.fontSize.lg};
   text-decoration: underline;
   text-decoration-style: dotted;
-  text-decoration-color: ${p => p.theme.subText};
+  text-decoration-color: ${p => p.theme.tokens.content.secondary};
 `;
diff --git a/static/app/views/issueDetails/streamline/sidebar/firstLastSeenSection.tsx b/static/app/views/issueDetails/streamline/sidebar/firstLastSeenSection.tsx
index ee91dd9534e2fd..e688da98bb52eb 100644
--- a/static/app/views/issueDetails/streamline/sidebar/firstLastSeenSection.tsx
+++ b/static/app/views/issueDetails/streamline/sidebar/firstLastSeenSection.tsx
@@ -128,7 +128,7 @@ function ReleaseText({project, release}: {project: Project; release?: Release})
 
 const ReleaseWrapper = styled('span')`
   a {
-    color: ${p => p.theme.subText};
+    color: ${p => p.theme.tokens.content.secondary};
     text-decoration: underline;
     text-decoration-style: dotted;
   }
@@ -140,5 +140,5 @@ const Title = styled('div')`
 
 const Subtitle = styled('div')`
   font-size: ${p => p.theme.fontSize.sm};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
diff --git a/static/app/views/issueDetails/streamline/sidebar/groupActivityItem.tsx b/static/app/views/issueDetails/streamline/sidebar/groupActivityItem.tsx
index 4cb9931c444624..a2c4dd6ed3004f 100644
--- a/static/app/views/issueDetails/streamline/sidebar/groupActivityItem.tsx
+++ b/static/app/views/issueDetails/streamline/sidebar/groupActivityItem.tsx
@@ -736,6 +736,6 @@ const StyledRuleSpan = styled('span')`
 `;
 
 const ReleaseVersion = styled(Version)`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   text-decoration: underline;
 `;
diff --git a/static/app/views/issueDetails/streamline/sidebar/participantList.tsx b/static/app/views/issueDetails/streamline/sidebar/participantList.tsx
index 9f89f41a1ed6de..c118b99e0c8dc4 100644
--- a/static/app/views/issueDetails/streamline/sidebar/participantList.tsx
+++ b/static/app/views/issueDetails/streamline/sidebar/participantList.tsx
@@ -118,7 +118,7 @@ const ListTitle = styled('div')`
   align-items: center;
   padding: ${space(1)} ${space(1.5)};
   background-color: ${p => p.theme.backgroundSecondary};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   text-transform: uppercase;
   font-weight: ${p => p.theme.fontWeight.bold};
   font-size: ${p => p.theme.fontSize.sm};
@@ -150,6 +150,6 @@ const StyledAvatarList = styled(AvatarList)`
 `;
 
 const LastSeen = styled(DateTime)`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-size: ${p => p.theme.fontSize.xs};
 `;
diff --git a/static/app/views/issueDetails/streamline/sidebar/seerSection.tsx b/static/app/views/issueDetails/streamline/sidebar/seerSection.tsx
index 08c8ddc51175b1..813f2eb2087ccc 100644
--- a/static/app/views/issueDetails/streamline/sidebar/seerSection.tsx
+++ b/static/app/views/issueDetails/streamline/sidebar/seerSection.tsx
@@ -289,7 +289,7 @@ const ExpandButton = styled(Button)`
   bottom: -${space(1)};
   right: 0;
   font-size: ${p => p.theme.fontSize.xs};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   border: none;
   box-shadow: none;
 
diff --git a/static/app/views/issueDetails/streamline/sidebar/viewButton.tsx b/static/app/views/issueDetails/streamline/sidebar/viewButton.tsx
index 4d1bfc6be04cbe..3bf3bf5c34f4f7 100644
--- a/static/app/views/issueDetails/streamline/sidebar/viewButton.tsx
+++ b/static/app/views/issueDetails/streamline/sidebar/viewButton.tsx
@@ -14,6 +14,6 @@ export function ViewButton({children, ...props}: LinkButtonProps) {
 const TextButton = styled(LinkButton)`
   font-weight: ${p => p.theme.fontWeight.normal};
   font-size: ${p => p.theme.fontSize.sm};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   padding: ${space(0.25)} ${space(0.5)};
 `;
diff --git a/static/app/views/issueDetails/traceTimeline/traceIssue.tsx b/static/app/views/issueDetails/traceTimeline/traceIssue.tsx
index 0a7ef55e02af5a..56c4a64f44be99 100644
--- a/static/app/views/issueDetails/traceTimeline/traceIssue.tsx
+++ b/static/app/views/issueDetails/traceTimeline/traceIssue.tsx
@@ -166,5 +166,5 @@ const TraceIssueEventTitle = styled('span')`
 `;
 
 const TraceIssueEventSubtitle = styled('span')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
diff --git a/static/app/views/issueDetails/traceTimeline/traceLink.tsx b/static/app/views/issueDetails/traceTimeline/traceLink.tsx
index 402e6911d1ed9d..1b154a9eba93a0 100644
--- a/static/app/views/issueDetails/traceTimeline/traceLink.tsx
+++ b/static/app/views/issueDetails/traceTimeline/traceLink.tsx
@@ -87,7 +87,7 @@ const NoTraceAvailable = styled('span')`
   align-items: center;
   gap: ${space(0.25)};
   line-height: 1.2;
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-size: ${p => p.theme.fontSize.md};
 
   svg {
diff --git a/static/app/views/issueDetails/traceTimeline/traceTimelineEvents.tsx b/static/app/views/issueDetails/traceTimeline/traceTimelineEvents.tsx
index 97ee6c3fbccb4d..04265adcf8faab 100644
--- a/static/app/views/issueDetails/traceTimeline/traceTimelineEvents.tsx
+++ b/static/app/views/issueDetails/traceTimeline/traceTimelineEvents.tsx
@@ -118,7 +118,7 @@ const TimestampColumns = styled('div')`
   justify-content: space-between;
   margin-top: ${space(1)};
   text-align: center;
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-size: ${p => p.theme.fontSize.sm};
 `;
 
diff --git a/static/app/views/issueDetails/traceTimeline/traceTimelineTooltip.tsx b/static/app/views/issueDetails/traceTimeline/traceTimelineTooltip.tsx
index 372c7d9df0b6bb..d62993eec601d1 100644
--- a/static/app/views/issueDetails/traceTimeline/traceTimelineTooltip.tsx
+++ b/static/app/views/issueDetails/traceTimeline/traceTimelineTooltip.tsx
@@ -161,7 +161,7 @@ const EventItemsTitle = styled('div')`
   text-transform: uppercase;
   font-size: ${p => p.theme.fontSize.xs};
   font-weight: ${p => p.theme.fontWeight.bold};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 
 const YouAreHere = styled('div')`
diff --git a/static/app/views/issueList/issueViews/issueViewsList/allViewsWelcomeBanner.tsx b/static/app/views/issueList/issueViews/issueViewsList/allViewsWelcomeBanner.tsx
index 37a6b6d27af1eb..4ddf30868d4813 100644
--- a/static/app/views/issueList/issueViews/issueViewsList/allViewsWelcomeBanner.tsx
+++ b/static/app/views/issueList/issueViews/issueViewsList/allViewsWelcomeBanner.tsx
@@ -132,5 +132,5 @@ const DismissButton = styled(Button)`
   position: absolute;
   top: ${space(1)};
   right: ${space(1)};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
diff --git a/static/app/views/issueList/newViewEmptyState.tsx b/static/app/views/issueList/newViewEmptyState.tsx
index f15d4c8fe58fb9..adb8dcdf4cb415 100644
--- a/static/app/views/issueList/newViewEmptyState.tsx
+++ b/static/app/views/issueList/newViewEmptyState.tsx
@@ -136,11 +136,11 @@ const Bold = styled('div')`
 `;
 
 const TooltipSubLink = styled(Link)`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   text-decoration: underline;
 
   :hover {
-    color: ${p => p.theme.subText};
+    color: ${p => p.theme.tokens.content.secondary};
   }
 `;
 
diff --git a/static/app/views/issueList/noGroupsHandler/noUnresolvedIssues.tsx b/static/app/views/issueList/noGroupsHandler/noUnresolvedIssues.tsx
index 7ff3d500e25a7a..0cef08f5e2efc2 100644
--- a/static/app/views/issueList/noGroupsHandler/noUnresolvedIssues.tsx
+++ b/static/app/views/issueList/noGroupsHandler/noUnresolvedIssues.tsx
@@ -34,7 +34,7 @@ const Wrapper = styled('div')`
   flex-direction: column;
   align-items: center;
   text-align: center;
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 
   @media (max-width: ${p => p.theme.breakpoints.sm}) {
     font-size: ${p => p.theme.fontSize.md};
diff --git a/static/app/views/issueList/pages/dynamicGrouping.tsx b/static/app/views/issueList/pages/dynamicGrouping.tsx
index 465f79d856de2b..13285bb065d95f 100644
--- a/static/app/views/issueList/pages/dynamicGrouping.tsx
+++ b/static/app/views/issueList/pages/dynamicGrouping.tsx
@@ -1293,7 +1293,7 @@ const ClusterStats = styled('div')`
   align-items: center;
   gap: ${space(2)};
   font-size: ${p => p.theme.fontSize.sm};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 
 const TimeStats = styled('div')`
@@ -1301,7 +1301,7 @@ const TimeStats = styled('div')`
   align-items: center;
   gap: ${space(2)};
   font-size: ${p => p.theme.fontSize.sm};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 
 const StatItem = styled('div')`
@@ -1318,7 +1318,7 @@ const ProjectAvatars = styled('div')`
 
 const MoreProjectsCount = styled('span')`
   font-size: ${p => p.theme.fontSize.xs};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   margin-left: ${space(0.25)};
 `;
 
@@ -1377,7 +1377,8 @@ const Tab = styled('button')<{isActive: boolean}>`
   padding: ${space(1)} ${space(1.5)};
   font-size: ${p => p.theme.fontSize.sm};
   font-weight: 500;
-  color: ${p => (p.isActive ? p.theme.tokens.content.primary : p.theme.subText)};
+  color: ${p =>
+    p.isActive ? p.theme.tokens.content.primary : p.theme.tokens.content.secondary};
   cursor: pointer;
   position: relative;
   margin-bottom: -1px;
@@ -1460,14 +1461,14 @@ const IssueTitle = styled('div')`
     font-size: ${p => p.theme.fontSize.sm};
     font-style: normal;
     font-weight: ${p => p.theme.fontWeight.normal};
-    color: ${p => p.theme.subText};
+    color: ${p => p.theme.tokens.content.secondary};
   }
 `;
 
 const IssueMessage = styled(EventMessage)`
   margin: 0;
   font-size: ${p => p.theme.fontSize.sm};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   opacity: 0.9;
 `;
 
@@ -1480,7 +1481,7 @@ const MetaSeparator = styled('div')`
 const DescriptionText = styled('p')`
   margin: 0;
   font-size: ${p => p.theme.fontSize.sm};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   line-height: 1.5;
 `;
 
@@ -1500,7 +1501,7 @@ const TagPill = styled('span')`
   display: inline-block;
   padding: ${space(0.25)} ${space(1)};
   font-size: ${p => p.theme.fontSize.xs};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   background: ${p => p.theme.backgroundSecondary};
   border: 1px solid ${p => p.theme.tokens.border.primary};
   border-radius: ${p => p.theme.radius.md};
@@ -1514,7 +1515,7 @@ const InfoRow = styled('div')`
 `;
 
 const InfoLabel = styled('span')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-weight: 500;
   min-width: 60px;
   flex-shrink: 0;
@@ -1527,7 +1528,8 @@ const InfoValue = styled('span')`
 
 const FilterLabel = styled('span')<{disabled?: boolean}>`
   font-size: ${p => p.theme.fontSize.sm};
-  color: ${p => (p.disabled ? p.theme.tokens.content.disabled : p.theme.subText)};
+  color: ${p =>
+    p.disabled ? p.theme.tokens.content.disabled : p.theme.tokens.content.secondary};
 `;
 
 const ShowMoreButton = styled('button')`
@@ -1538,7 +1540,7 @@ const ShowMoreButton = styled('button')`
   background: ${p => p.theme.backgroundSecondary};
   border: 1px dashed ${p => p.theme.tokens.border.primary};
   border-radius: ${p => p.theme.radius.md};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-size: ${p => p.theme.fontSize.md};
   cursor: pointer;
   transition:
@@ -1574,7 +1576,7 @@ const CustomDataBadge = styled('div')`
 
 const LastUpdatedText = styled('span')`
   font-size: ${p => p.theme.fontSize.sm};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   white-space: nowrap;
 `;
 
diff --git a/static/app/views/nav/primary/whatsNew/item.tsx b/static/app/views/nav/primary/whatsNew/item.tsx
index a1f0c6f5762a52..4c2e82d68a51ce 100644
--- a/static/app/views/nav/primary/whatsNew/item.tsx
+++ b/static/app/views/nav/primary/whatsNew/item.tsx
@@ -73,7 +73,7 @@ const Title = styled(ExternalLink)<Pick<BroadcastPanelItemProps, 'hasSeen'>>`
 `;
 
 const Message = styled('div')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 
 const TextBlock = styled('div')`
diff --git a/static/app/views/nav/primary/whatsNew/whatsNew.tsx b/static/app/views/nav/primary/whatsNew/whatsNew.tsx
index bafb59038ca7e3..eb5e0a580db004 100644
--- a/static/app/views/nav/primary/whatsNew/whatsNew.tsx
+++ b/static/app/views/nav/primary/whatsNew/whatsNew.tsx
@@ -161,7 +161,7 @@ const Empty = styled('div')`
   display: flex;
   align-items: center;
   justify-content: center;
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   padding: 0 60px;
   text-align: center;
   min-height: 150px;
diff --git a/static/app/views/nav/secondary/sections/issues/issueViews/issueViewQueryCount.tsx b/static/app/views/nav/secondary/sections/issues/issueViews/issueViewQueryCount.tsx
index 363da760584257..b9e9808ed2e261 100644
--- a/static/app/views/nav/secondary/sections/issues/issueViews/issueViewQueryCount.tsx
+++ b/static/app/views/nav/secondary/sections/issues/issueViews/issueViewQueryCount.tsx
@@ -108,7 +108,7 @@ const QueryCountBubble = styled(motion.span)`
   justify-content: center;
   border-radius: 10px;
   border: 1px solid ${p => p.theme.tokens.border.primary};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   margin-left: 0;
   font-weight: ${p => p.theme.fontWeight.bold};
 `;
diff --git a/static/app/views/onboarding/welcome.tsx b/static/app/views/onboarding/welcome.tsx
index a9f6da0a7a4b88..2bebcf41ae39bb 100644
--- a/static/app/views/onboarding/welcome.tsx
+++ b/static/app/views/onboarding/welcome.tsx
@@ -5,6 +5,8 @@ import {motion} from 'framer-motion';
 
 import OnboardingInstall from 'sentry-images/spot/onboarding-install.svg';
 
+import {Text} from '@sentry/scraps/text';
+
 import {Button} from 'sentry/components/core/button';
 import {Link} from 'sentry/components/core/link';
 import {useOnboardingContext} from 'sentry/components/onboarding/onboardingContext';
@@ -41,7 +43,7 @@ function InnerAction({title, subText, cta, src}: TextWrapperProps) {
       <ActionImage src={src} />
       <TextWrapper>
         <ActionTitle>{title}</ActionTitle>
-        <SubText>{subText}</SubText>
+        <Text variant="muted">{subText}</Text>
       </TextWrapper>
       <ButtonWrapper>{cta}</ButtonWrapper>
     </Fragment>
@@ -195,13 +197,8 @@ const ActionTitle = styled('h5')`
   color: ${p => p.theme.tokens.content.primary};
 `;
 
-const SubText = styled('span')`
-  font-weight: ${p => p.theme.fontWeight.normal};
-  color: ${p => p.theme.tokens.content.muted};
-`;
-
 const SubHeaderText = styled(motion.h6)`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 
 const ButtonWrapper = styled('div')`
diff --git a/static/app/views/organizationStats/teamInsights/descriptionCard.tsx b/static/app/views/organizationStats/teamInsights/descriptionCard.tsx
index c5ffcc803b54ef..072e369d5f0c40 100644
--- a/static/app/views/organizationStats/teamInsights/descriptionCard.tsx
+++ b/static/app/views/organizationStats/teamInsights/descriptionCard.tsx
@@ -51,7 +51,7 @@ const Title = styled('div')`
 `;
 
 const Description = styled('div')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-size: ${p => p.theme.fontSize.md};
 `;
 
diff --git a/static/app/views/organizationStats/teamInsights/teamMisery.tsx b/static/app/views/organizationStats/teamInsights/teamMisery.tsx
index f34e44032bfbfa..056079593e0a30 100644
--- a/static/app/views/organizationStats/teamInsights/teamMisery.tsx
+++ b/static/app/views/organizationStats/teamInsights/teamMisery.tsx
@@ -326,7 +326,7 @@ const ScoreWrapper = styled('div')`
 `;
 
 const SubText = styled('div')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 
 const TrendText = styled('div')<{color: string}>`
diff --git a/static/app/views/organizationStats/teamInsights/teamUnresolvedIssues.tsx b/static/app/views/organizationStats/teamInsights/teamUnresolvedIssues.tsx
index 055b3f2e825a38..7b77c7e6faa20c 100644
--- a/static/app/views/organizationStats/teamInsights/teamUnresolvedIssues.tsx
+++ b/static/app/views/organizationStats/teamInsights/teamUnresolvedIssues.tsx
@@ -185,7 +185,7 @@ export function TeamUnresolvedIssues({
                       <SubText
                         color={
                           totals.percentChange === 0
-                            ? theme.subText
+                            ? theme.tokens.content.secondary
                             : totals.percentChange > 0
                               ? theme.errorText
                               : theme.tokens.content.success
diff --git a/static/app/views/organizationStats/usageChart/index.tsx b/static/app/views/organizationStats/usageChart/index.tsx
index 33607b04b26e07..fe12e2860a0666 100644
--- a/static/app/views/organizationStats/usageChart/index.tsx
+++ b/static/app/views/organizationStats/usageChart/index.tsx
@@ -389,7 +389,7 @@ function UsageChartBody({
             tooltip: {show: false},
             itemStyle: {
               decal: {
-                color: theme.subText,
+                color: theme.tokens.content.secondary,
                 dashArrayX: [1, 0],
                 dashArrayY: [3, 5],
                 rotation: -Math.PI / 4,
diff --git a/static/app/views/organizationStats/usageTable.tsx b/static/app/views/organizationStats/usageTable.tsx
index 1977bf200a8a95..ce5b3d04763576 100644
--- a/static/app/views/organizationStats/usageTable.tsx
+++ b/static/app/views/organizationStats/usageTable.tsx
@@ -206,6 +206,6 @@ const StyledIdBadge = styled(IdBadge)`
 `;
 
 const SubText = styled('span')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   margin-left: ${space(0.5)};
 `;
diff --git a/static/app/views/performance/landing/widgets/components/selectableList.tsx b/static/app/views/performance/landing/widgets/components/selectableList.tsx
index 52a146e6ca56c7..227c536f867aa5 100644
--- a/static/app/views/performance/landing/widgets/components/selectableList.tsx
+++ b/static/app/views/performance/landing/widgets/components/selectableList.tsx
@@ -72,7 +72,7 @@ export const RightAlignedCell = styled('div')`
 `;
 
 export const Subtitle = styled('span')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-size: ${p => p.theme.fontSize.md};
   display: inline-block;
 `;
@@ -265,14 +265,14 @@ const StyledEmptyStateWarning = styled(EmptyStateWarning)`
 
 const PrimaryMessage = styled('span')`
   font-size: ${p => p.theme.fontSize.md};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-weight: ${p => p.theme.fontWeight.bold};
   margin: 0 auto ${space(1)};
 `;
 
 const SecondaryMessage = styled('p')`
   font-size: ${p => p.theme.fontSize.sm};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   max-width: 300px;
 `;
 
diff --git a/static/app/views/performance/landing/widgets/widgets/histogramWidget.tsx b/static/app/views/performance/landing/widgets/widgets/histogramWidget.tsx
index bac9dc74f00f52..ad79ab9a7ffa5f 100644
--- a/static/app/views/performance/landing/widgets/widgets/histogramWidget.tsx
+++ b/static/app/views/performance/landing/widgets/widgets/histogramWidget.tsx
@@ -96,6 +96,6 @@ export function HistogramWidget(props: PerformanceWidgetProps) {
 }
 
 const Subtitle = styled('span')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-size: ${p => p.theme.fontSize.md};
 `;
diff --git a/static/app/views/performance/landing/widgets/widgets/singleFieldAreaWidget.tsx b/static/app/views/performance/landing/widgets/widgets/singleFieldAreaWidget.tsx
index 67d9261c3e7c97..2c78f3b58c6eae 100644
--- a/static/app/views/performance/landing/widgets/widgets/singleFieldAreaWidget.tsx
+++ b/static/app/views/performance/landing/widgets/widgets/singleFieldAreaWidget.tsx
@@ -178,7 +178,7 @@ export function SingleFieldAreaWidget(props: PerformanceWidgetProps) {
 
 const EventsRequest = withApi(_EventsRequest);
 export const Subtitle = styled('span')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-size: ${p => p.theme.fontSize.md};
 `;
 
diff --git a/static/app/views/performance/newTraceDetails/trace.tsx b/static/app/views/performance/newTraceDetails/trace.tsx
index e7ad2ccc3b069a..d31a9de5542950 100644
--- a/static/app/views/performance/newTraceDetails/trace.tsx
+++ b/static/app/views/performance/newTraceDetails/trace.tsx
@@ -872,7 +872,7 @@ const TraceStylingWrapper = styled('div')`
     }
 
     &.None {
-      color: ${p => p.theme.subText};
+      color: ${p => p.theme.tokens.content.secondary};
       border: 1px solid ${p => p.theme.tokens.border.primary};
 
       &.light {
@@ -949,7 +949,7 @@ const TraceStylingWrapper = styled('div')`
         background: repeating-linear-gradient(
             to bottom,
             transparent 0 4px,
-            ${p => p.theme.subText} 4px 8px
+            ${p => p.theme.tokens.content.secondary} 4px 8px
           )
           80%/2px 100% no-repeat;
       }
@@ -1018,7 +1018,7 @@ const TraceStylingWrapper = styled('div')`
         width: auto;
         border: none;
         background-color: transparent;
-        color: ${p => p.theme.subText};
+        color: ${p => p.theme.tokens.content.secondary};
       }
 
       .TraceIndicatorLine {
@@ -1346,7 +1346,7 @@ const TraceStylingWrapper = styled('div')`
       .TraceLeftColumn {
         padding-left: 14px;
         width: 100%;
-        color: ${p => p.theme.subText};
+        color: ${p => p.theme.tokens.content.secondary};
 
         .TraceLeftColumnInner {
           padding-left: 0 !important;
@@ -1436,13 +1436,13 @@ const TraceStylingWrapper = styled('div')`
     border: none;
     transition: 60ms ease-out;
     font-size: ${p => p.theme.fontSize.md};
-    color: ${p => p.theme.subText};
+    color: ${p => p.theme.tokens.content.secondary};
     padding: 0 2px;
     display: flex;
     align-items: center;
 
     svg {
-      fill: ${p => p.theme.subText};
+      fill: ${p => p.theme.tokens.content.secondary};
     }
 
     &.Left {
@@ -1458,7 +1458,7 @@ const TraceStylingWrapper = styled('div')`
     display: inline-block;
     transform-origin: left center;
     font-size: ${p => p.theme.fontSize.xs};
-    color: ${p => p.theme.subText};
+    color: ${p => p.theme.tokens.content.secondary};
     white-space: nowrap;
     font-variant-numeric: tabular-nums;
     position: absolute;
diff --git a/static/app/views/performance/newTraceDetails/traceContextVitals.tsx b/static/app/views/performance/newTraceDetails/traceContextVitals.tsx
index 6e9217fb35a852..00877b1c70724f 100644
--- a/static/app/views/performance/newTraceDetails/traceContextVitals.tsx
+++ b/static/app/views/performance/newTraceDetails/traceContextVitals.tsx
@@ -195,7 +195,7 @@ const VitalPillValue = styled('div')`
 `;
 
 const SecondaryVitalsCount = styled('span')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-size: ${p => p.theme.fontSize.sm};
 `;
 
diff --git a/static/app/views/performance/newTraceDetails/traceDrawer/details/highlightedAttributes.tsx b/static/app/views/performance/newTraceDetails/traceDrawer/details/highlightedAttributes.tsx
index 0304f15f01cb55..d9b8c17d9ea44e 100644
--- a/static/app/views/performance/newTraceDetails/traceDrawer/details/highlightedAttributes.tsx
+++ b/static/app/views/performance/newTraceDetails/traceDrawer/details/highlightedAttributes.tsx
@@ -380,7 +380,7 @@ const TokensTooltipTitle = styled('div')`
 
 const SubTextCell = styled('span')`
   margin-left: ${p => p.theme.space.md};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 
 const TokensSpan = styled('span')`
diff --git a/static/app/views/performance/newTraceDetails/traceDrawer/details/issues/issueSummary.tsx b/static/app/views/performance/newTraceDetails/traceDrawer/details/issues/issueSummary.tsx
index 3280751e39daa8..20f19c3deda1fc 100644
--- a/static/app/views/performance/newTraceDetails/traceDrawer/details/issues/issueSummary.tsx
+++ b/static/app/views/performance/newTraceDetails/traceDrawer/details/issues/issueSummary.tsx
@@ -99,7 +99,7 @@ const Title = styled('div')`
     font-size: ${p => p.theme.fontSize.md};
     font-style: normal;
     font-weight: ${p => p.theme.fontWeight.normal};
-    color: ${p => p.theme.subText};
+    color: ${p => p.theme.tokens.content.secondary};
   }
 `;
 
@@ -112,7 +112,7 @@ const LocationWrapper = styled('div')`
   direction: rtl;
   text-align: left;
   font-size: ${p => p.theme.fontSize.md};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   span {
     direction: ltr;
   }
diff --git a/static/app/views/performance/newTraceDetails/traceDrawer/details/profiling/profilePreview.tsx b/static/app/views/performance/newTraceDetails/traceDrawer/details/profiling/profilePreview.tsx
index 0c71d8beaf5221..d5fcf74bdb54c1 100644
--- a/static/app/views/performance/newTraceDetails/traceDrawer/details/profiling/profilePreview.tsx
+++ b/static/app/views/performance/newTraceDetails/traceDrawer/details/profiling/profilePreview.tsx
@@ -313,7 +313,7 @@ const LegendItem = styled('span')`
   flex-direction: row;
   align-items: center;
   gap: ${space(0.5)};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-size: ${p => p.theme.fontSize.sm};
 `;
 
diff --git a/static/app/views/performance/newTraceDetails/traceDrawer/details/span/eapSections/attributes.tsx b/static/app/views/performance/newTraceDetails/traceDrawer/details/span/eapSections/attributes.tsx
index 89fc108849c106..d9aba97b42958f 100644
--- a/static/app/views/performance/newTraceDetails/traceDrawer/details/span/eapSections/attributes.tsx
+++ b/static/app/views/performance/newTraceDetails/traceDrawer/details/span/eapSections/attributes.tsx
@@ -251,5 +251,5 @@ const NoAttributesMessage = styled('div')`
   justify-content: center;
   align-items: center;
   margin-top: ${space(4)};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
diff --git a/static/app/views/performance/newTraceDetails/traceDrawer/details/span/sections/generalInfo.tsx b/static/app/views/performance/newTraceDetails/traceDrawer/details/span/sections/generalInfo.tsx
index cdfcbad2609cb6..a82c3ea3082483 100644
--- a/static/app/views/performance/newTraceDetails/traceDrawer/details/span/sections/generalInfo.tsx
+++ b/static/app/views/performance/newTraceDetails/traceDrawer/details/span/sections/generalInfo.tsx
@@ -274,5 +274,5 @@ const DescriptionWrapper = styled('div')`
 `;
 
 const EmptyValueContainer = styled('span')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
diff --git a/static/app/views/performance/newTraceDetails/traceDrawer/details/styles.tsx b/static/app/views/performance/newTraceDetails/traceDrawer/details/styles.tsx
index caaec3b4793e54..7cff8dcec2431a 100644
--- a/static/app/views/performance/newTraceDetails/traceDrawer/details/styles.tsx
+++ b/static/app/views/performance/newTraceDetails/traceDrawer/details/styles.tsx
@@ -157,7 +157,7 @@ const SubTitleWrapper = styled(FlexBox)`
 
 const StyledSubTitleText = styled('span')`
   font-size: ${p => p.theme.fontSize.md};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 
 function TitleOp({text}: {text: string}) {
@@ -631,7 +631,7 @@ const TopOpsList = styled('div')`
 `;
 
 const HighlightsOpPct = styled('div')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-size: 14px;
 `;
 
@@ -694,7 +694,7 @@ const HighlightedAttributesWrapper = styled('div')`
 `;
 
 const HighlightedAttributeName = styled('div')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 
 const OpenInAIFocusButton = styled(LinkButton)`
diff --git a/static/app/views/performance/newTraceDetails/traceDrawer/details/transaction/sections/request.tsx b/static/app/views/performance/newTraceDetails/traceDrawer/details/transaction/sections/request.tsx
index 93958755feb9dc..ef6124863339a6 100644
--- a/static/app/views/performance/newTraceDetails/traceDrawer/details/transaction/sections/request.tsx
+++ b/static/app/views/performance/newTraceDetails/traceDrawer/details/transaction/sections/request.tsx
@@ -300,7 +300,7 @@ const Path = styled('span')`
 const StyledIconOpen = styled(IconOpen)`
   transition: 0.1s linear color;
   margin: 0 ${space(0.5)};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   position: relative;
   top: 1px;
 
diff --git a/static/app/views/performance/newTraceDetails/traceDrawer/tabs/traceAiSpans.tsx b/static/app/views/performance/newTraceDetails/traceDrawer/tabs/traceAiSpans.tsx
index 329243c91f52d2..80d093b9af4cd4 100644
--- a/static/app/views/performance/newTraceDetails/traceDrawer/tabs/traceAiSpans.tsx
+++ b/static/app/views/performance/newTraceDetails/traceDrawer/tabs/traceAiSpans.tsx
@@ -152,7 +152,7 @@ const SpansHeader = styled('h6')`
 const HeaderCell = styled('div')<{align?: 'left' | 'right'}>`
   padding: 0 ${space(2)};
   font-size: ${p => p.theme.fontSize.sm};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   border-bottom: 1px solid ${p => p.theme.tokens.border.primary};
   display: flex;
   align-items: center;
diff --git a/static/app/views/performance/newTraceDetails/traceDrawer/tabs/traceProfiles.tsx b/static/app/views/performance/newTraceDetails/traceDrawer/tabs/traceProfiles.tsx
index 128ae349b96bf8..0c2e1f408b1d22 100644
--- a/static/app/views/performance/newTraceDetails/traceDrawer/tabs/traceProfiles.tsx
+++ b/static/app/views/performance/newTraceDetails/traceDrawer/tabs/traceProfiles.tsx
@@ -172,7 +172,7 @@ const ProfilesTableRow = styled('div')`
 `;
 
 const ProfilesTableTitle = styled('div')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-size: ${p => p.theme.fontSize.md};
   font-weight: ${p => p.theme.fontWeight.bold};
   padding: 0 ${space(0.5)};
diff --git a/static/app/views/performance/newTraceDetails/traceDrawer/traceDrawer.tsx b/static/app/views/performance/newTraceDetails/traceDrawer/traceDrawer.tsx
index 642ed907a89c38..74cc75fd07ae97 100644
--- a/static/app/views/performance/newTraceDetails/traceDrawer/traceDrawer.tsx
+++ b/static/app/views/performance/newTraceDetails/traceDrawer/traceDrawer.tsx
@@ -495,7 +495,7 @@ const StyledIconClose = styled(IconClose)`
 
 const CloseButton = styled(Button)`
   font-size: ${p => p.theme.fontSize.sm};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   height: 100%;
   border-bottom: 2px solid transparent;
   &:hover {
diff --git a/static/app/views/performance/newTraceDetails/traceHeader/highlights.tsx b/static/app/views/performance/newTraceDetails/traceHeader/highlights.tsx
index 6ee7226ef81025..9917b5045635ee 100644
--- a/static/app/views/performance/newTraceDetails/traceHeader/highlights.tsx
+++ b/static/app/views/performance/newTraceDetails/traceHeader/highlights.tsx
@@ -300,7 +300,7 @@ const HighlightsIconWrapper = styled('div')`
 
 const HighlightsSubtitle = styled(Tooltip)`
   display: block;
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 
 const StyledVersion = styled(Version)`
diff --git a/static/app/views/performance/newTraceDetails/traceHeader/title.tsx b/static/app/views/performance/newTraceDetails/traceHeader/title.tsx
index 8ee001ce23c412..ad511b33ad7e0a 100644
--- a/static/app/views/performance/newTraceDetails/traceHeader/title.tsx
+++ b/static/app/views/performance/newTraceDetails/traceHeader/title.tsx
@@ -80,7 +80,7 @@ function ContextBadges({rootEventResults}: Pick<TitleProps, 'rootEventResults'>)
 }
 
 const ReplayButton = styled(LinkButton)`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   text-decoration: underline;
   text-decoration-style: dotted;
 `;
diff --git a/static/app/views/performance/newTraceDetails/traceModels/traceTreeNode/baseNode.tsx b/static/app/views/performance/newTraceDetails/traceModels/traceTreeNode/baseNode.tsx
index 98834d1f95384e..5bd583264a4244 100644
--- a/static/app/views/performance/newTraceDetails/traceModels/traceTreeNode/baseNode.tsx
+++ b/static/app/views/performance/newTraceDetails/traceModels/traceTreeNode/baseNode.tsx
@@ -516,7 +516,7 @@ export abstract class BaseNode<T extends TraceTree.NodeValue = TraceTree.NodeVal
   }
 
   makeBarTextColor(inside: boolean, theme: Theme): string {
-    return inside ? 'white' : theme.subText;
+    return inside ? 'white' : theme.tokens.content.secondary;
   }
 
   /**
diff --git a/static/app/views/performance/newTraceDetails/traceModels/traceTreeNode/noInstrumentationNode.tsx b/static/app/views/performance/newTraceDetails/traceModels/traceTreeNode/noInstrumentationNode.tsx
index 90e672197c9c68..e4c6e7797f947b 100644
--- a/static/app/views/performance/newTraceDetails/traceModels/traceTreeNode/noInstrumentationNode.tsx
+++ b/static/app/views/performance/newTraceDetails/traceModels/traceTreeNode/noInstrumentationNode.tsx
@@ -87,7 +87,7 @@ export class NoInstrumentationNode extends BaseNode<TraceTree.MissingInstrumenta
   }
 
   makeBarTextColor(_inside: boolean, theme: Theme): string {
-    return theme.subText;
+    return theme.tokens.content.secondary;
   }
 
   resolveValueFromSearchKey(_key: string): any | null {
diff --git a/static/app/views/performance/newTraceDetails/traceRow/traceLoadingRow.tsx b/static/app/views/performance/newTraceDetails/traceRow/traceLoadingRow.tsx
index b92347c1d09eb7..ee7fd98d9594d8 100644
--- a/static/app/views/performance/newTraceDetails/traceRow/traceLoadingRow.tsx
+++ b/static/app/views/performance/newTraceDetails/traceRow/traceLoadingRow.tsx
@@ -31,7 +31,7 @@ export function TraceLoadingRow(props: {
         transform: props.style.transform,
         height: props.style.height,
         pointerEvents: 'none',
-        color: props.theme.subText,
+        color: props.theme.tokens.content.secondary,
         paddingLeft: 8,
       }}
     >
diff --git a/static/app/views/performance/newTraceDetails/traceSearch/traceSearchInput.tsx b/static/app/views/performance/newTraceDetails/traceSearch/traceSearchInput.tsx
index a5bdd1383b5edd..54e2f5634381cf 100644
--- a/static/app/views/performance/newTraceDetails/traceSearch/traceSearchInput.tsx
+++ b/static/app/views/performance/newTraceDetails/traceSearch/traceSearchInput.tsx
@@ -345,7 +345,7 @@ const StyledSearchBarTrailingButton = styled(SearchBarTrailingButton)`
 `;
 
 const StyledTrailingText = styled('span')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-size: ${p => p.theme.fontSize.sm};
 `;
 
diff --git a/static/app/views/performance/newTraceDetails/traceWaterfallState.tsx b/static/app/views/performance/newTraceDetails/traceWaterfallState.tsx
index 3fdd6a5c2da45d..bc574a1a59df45 100644
--- a/static/app/views/performance/newTraceDetails/traceWaterfallState.tsx
+++ b/static/app/views/performance/newTraceDetails/traceWaterfallState.tsx
@@ -135,7 +135,7 @@ const LoadingContainer = styled('div')<{animate: boolean; error?: boolean}>`
   text-align: center;
   height: auto;
   font-size: ${p => p.theme.fontSize.md};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   z-index: 30;
   padding: 20px;
   background-color: ${p => p.theme.tokens.background.primary};
diff --git a/static/app/views/performance/transactionSummary/transactionProfiles/content.tsx b/static/app/views/performance/transactionSummary/transactionProfiles/content.tsx
index 3cd952128321dd..e42ae3cb03c377 100644
--- a/static/app/views/performance/transactionSummary/transactionProfiles/content.tsx
+++ b/static/app/views/performance/transactionSummary/transactionProfiles/content.tsx
@@ -339,7 +339,7 @@ const RequestStateMessageContainer = styled('div')`
   display: flex;
   justify-content: center;
   align-items: center;
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   pointer-events: none;
 `;
 
diff --git a/static/app/views/performance/transactionSummary/transactionTags/tagsHeatMap.tsx b/static/app/views/performance/transactionSummary/transactionTags/tagsHeatMap.tsx
index 2b95536f00db2a..bb6d9a1819b07a 100644
--- a/static/app/views/performance/transactionSummary/transactionTags/tagsHeatMap.tsx
+++ b/static/app/views/performance/transactionSummary/transactionTags/tagsHeatMap.tsx
@@ -468,7 +468,7 @@ const StyledPanel = styled(Panel)`
 const StyledHeaderTitleLegend = styled(HeaderTitleLegend)``;
 
 const SectionSubtext = styled('div')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-size: ${p => p.theme.fontSize.md};
 `;
 
diff --git a/static/app/views/performance/trends/changedTransactions.tsx b/static/app/views/performance/trends/changedTransactions.tsx
index ecaf1aa0a1d8f4..d201a0cc2e37b3 100644
--- a/static/app/views/performance/trends/changedTransactions.tsx
+++ b/static/app/views/performance/trends/changedTransactions.tsx
@@ -46,7 +46,7 @@ export function CompareDurations({
 }
 
 const DurationChange = styled('span')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   margin: 0 ${space(1)};
 `;
 
diff --git a/static/app/views/preprod/buildDetails/main/insights/appSizeInsightsSidebar.tsx b/static/app/views/preprod/buildDetails/main/insights/appSizeInsightsSidebar.tsx
index 11187843b96d87..9af84baf66a7a9 100644
--- a/static/app/views/preprod/buildDetails/main/insights/appSizeInsightsSidebar.tsx
+++ b/static/app/views/preprod/buildDetails/main/insights/appSizeInsightsSidebar.tsx
@@ -194,7 +194,7 @@ const ResizeHandle = styled(Flex)`
   }
 
   svg {
-    color: ${p => p.theme.subText};
+    color: ${p => p.theme.tokens.content.secondary};
     transform: rotate(90deg);
   }
 `;
diff --git a/static/app/views/profiling/landing/functionTrendsWidget.tsx b/static/app/views/profiling/landing/functionTrendsWidget.tsx
index 17ab632878f89e..8479457ea8ed9e 100644
--- a/static/app/views/profiling/landing/functionTrendsWidget.tsx
+++ b/static/app/views/profiling/landing/functionTrendsWidget.tsx
@@ -549,7 +549,7 @@ const FunctionTrendsChartContainer = styled('div')`
 `;
 
 const DurationChange = styled('span')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   display: flex;
   align-items: center;
   gap: ${space(1)};
diff --git a/static/app/views/profiling/landing/styles.tsx b/static/app/views/profiling/landing/styles.tsx
index 0f44e579bb8873..6962fdd01fb4b9 100644
--- a/static/app/views/profiling/landing/styles.tsx
+++ b/static/app/views/profiling/landing/styles.tsx
@@ -26,7 +26,7 @@ export const HeaderTitleLegend = styled(_HeaderTitleLegend)`
 `;
 
 export const Subtitle = styled('div')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-size: ${p => p.theme.fontSize.md};
   display: inline-block;
 `;
diff --git a/static/app/views/profiling/landingAggregateFlamegraph.tsx b/static/app/views/profiling/landingAggregateFlamegraph.tsx
index 9adb34b7d38f9d..788ec66bb7e7cd 100644
--- a/static/app/views/profiling/landingAggregateFlamegraph.tsx
+++ b/static/app/views/profiling/landingAggregateFlamegraph.tsx
@@ -381,7 +381,7 @@ const RequestStateMessageContainer = styled('div')`
   display: flex;
   justify-content: center;
   align-items: center;
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 
 const AggregateFlamegraphSidePanelContainer = styled('div')<{visible: boolean}>`
diff --git a/static/app/views/profiling/profileSummary/index.tsx b/static/app/views/profiling/profileSummary/index.tsx
index 4fa1639b9bc4a6..4e0dd3a5c65f19 100644
--- a/static/app/views/profiling/profileSummary/index.tsx
+++ b/static/app/views/profiling/profileSummary/index.tsx
@@ -497,7 +497,7 @@ const RequestStateMessageContainer = styled('div')`
   display: flex;
   justify-content: center;
   align-items: center;
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 
 const AggregateFlamegraphContainer = styled('div')`
diff --git a/static/app/views/profiling/profileSummary/regressedProfileFunctions.tsx b/static/app/views/profiling/profileSummary/regressedProfileFunctions.tsx
index 6aa9a1947a8f5f..b563afc0a6b728 100644
--- a/static/app/views/profiling/profileSummary/regressedProfileFunctions.tsx
+++ b/static/app/views/profiling/profileSummary/regressedProfileFunctions.tsx
@@ -407,7 +407,7 @@ function RegressedFunctionBeforeAfterFlamechart(
 }
 
 const ChangeArrow = styled('span')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 
 const RegressedFunctionsTypeSelect = styled(CompactSelect)`
@@ -441,7 +441,7 @@ const RegressedFunctionMetricsRow = styled('div')`
   align-items: center;
   justify-content: space-between;
   font-size: ${p => p.theme.fontSize.sm};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   margin-top: ${space(0.25)};
 `;
 
@@ -478,7 +478,7 @@ const RegressedFunctionsTitleContainer = styled('div')`
 const RegressedFunctionsQueryState = styled('div')`
   text-align: center;
   padding: ${space(2)} ${space(0.5)};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 
 const TRIGGER_PROPS = {borderless: true, size: 'zero' as const};
diff --git a/static/app/views/profiling/profileSummary/slowestProfileFunctions.tsx b/static/app/views/profiling/profileSummary/slowestProfileFunctions.tsx
index 5439cf1fce4ac1..cc2ff18f37af52 100644
--- a/static/app/views/profiling/profileSummary/slowestProfileFunctions.tsx
+++ b/static/app/views/profiling/profileSummary/slowestProfileFunctions.tsx
@@ -267,7 +267,7 @@ const SlowestFunctionsTypeSelect = styled(CompactSelect)`
 const SlowestFunctionsQueryState = styled('div')`
   text-align: center;
   padding: ${space(2)} ${space(0.5)};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 
 const SlowestFunctionRow = styled('div')`
@@ -292,7 +292,7 @@ const SlowestFunctionMetricsRow = styled('div')`
   align-items: center;
   justify-content: space-between;
   font-size: ${p => p.theme.fontSize.sm};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   margin-top: ${space(0.25)};
 `;
 
diff --git a/static/app/views/projectInstall/createProject.tsx b/static/app/views/projectInstall/createProject.tsx
index e247424bdcea3b..cc701b58e0ec0c 100644
--- a/static/app/views/projectInstall/createProject.tsx
+++ b/static/app/views/projectInstall/createProject.tsx
@@ -625,6 +625,6 @@ const TeamSelectInput = styled('div')`
 `;
 
 const HelpText = styled('p')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   max-width: 760px;
 `;
diff --git a/static/app/views/projectsDashboard/deploys.tsx b/static/app/views/projectsDashboard/deploys.tsx
index fb12fbcc033672..fd874f14d907ab 100644
--- a/static/app/views/projectsDashboard/deploys.tsx
+++ b/static/app/views/projectsDashboard/deploys.tsx
@@ -93,6 +93,6 @@ const DeployRows = styled('div')`
 `;
 
 const DeployTime = styled('div')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   ${p => p.theme.overflowEllipsis}
 `;
diff --git a/static/app/views/projectsDashboard/noEvents.tsx b/static/app/views/projectsDashboard/noEvents.tsx
index 57458e3a724894..a3187afbf0a755 100644
--- a/static/app/views/projectsDashboard/noEvents.tsx
+++ b/static/app/views/projectsDashboard/noEvents.tsx
@@ -31,5 +31,5 @@ const EmptyText = styled('div')<Props>`
   margin-left: 4px;
   margin-right: 4px;
   height: ${p => (p.seriesCount > 1 ? '90px' : '150px')};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
diff --git a/static/app/views/projectsDashboard/projectCard.tsx b/static/app/views/projectsDashboard/projectCard.tsx
index 255aefcdfc6c5b..faa9429c769217 100644
--- a/static/app/views/projectsDashboard/projectCard.tsx
+++ b/static/app/views/projectsDashboard/projectCard.tsx
@@ -272,21 +272,21 @@ const SummaryLinks = styled('div')`
   top: -${space(2)};
   font-weight: ${p => p.theme.fontWeight.normal};
 
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-size: ${p => p.theme.fontSize.sm};
 
   /* Need to offset for the project icon and margin */
   margin-left: 40px;
 
   a:not(:hover) {
-    color: ${p => p.theme.subText};
+    color: ${p => p.theme.tokens.content.secondary};
   }
 
   & > *:not(:last-child)::after {
     content: '|';
     position: relative;
     left: ${space(0.5)};
-    color: ${p => p.theme.subText};
+    color: ${p => p.theme.tokens.content.secondary};
   }
 `;
 
@@ -316,7 +316,7 @@ const ScoreCardWrapper = styled('div')`
   }
   ${Title} {
     font-size: ${p => p.theme.fontSize.md};
-    color: ${p => p.theme.subText};
+    color: ${p => p.theme.tokens.content.secondary};
     margin-bottom: ${space(0.5)};
   }
   ${ScoreWrapper} {
@@ -333,7 +333,7 @@ const ScoreCardWrapper = styled('div')`
 `;
 
 const SubHeading = styled('div')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-weight: ${p => p.theme.fontWeight.bold};
   margin-bottom: ${space(0.5)};
 `;
diff --git a/static/app/views/pullRequest/details/main/prFilesList.tsx b/static/app/views/pullRequest/details/main/prFilesList.tsx
index 4315802247e948..08da71831cbb31 100644
--- a/static/app/views/pullRequest/details/main/prFilesList.tsx
+++ b/static/app/views/pullRequest/details/main/prFilesList.tsx
@@ -203,11 +203,11 @@ const DiffRow = styled('tr')`
 
     .old-line-number {
       background-color: ${p => p.theme.tokens.background.primary};
-      color: ${p => p.theme.subText};
+      color: ${p => p.theme.tokens.content.secondary};
     }
     .new-line-number {
       background-color: #d1f4db;
-      color: ${p => p.theme.subText};
+      color: ${p => p.theme.tokens.content.secondary};
     }
   }
 
@@ -226,7 +226,7 @@ const DiffRow = styled('tr')`
     .old-line-number,
     .new-line-number {
       background-color: #ffd7d5;
-      color: ${p => p.theme.subText};
+      color: ${p => p.theme.tokens.content.secondary};
     }
   }
 
@@ -254,7 +254,7 @@ const LineNumber = styled('td')`
   text-align: right;
   border-right: 1px solid ${p => p.theme.tokens.border.primary};
   background-color: ${p => p.theme.tokens.background.primary};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-size: 10px;
   user-select: none;
   vertical-align: top;
diff --git a/static/app/views/releases/detail/commitsAndFiles/releaseCommit.tsx b/static/app/views/releases/detail/commitsAndFiles/releaseCommit.tsx
index baae192081f1b7..2cccc0a873cad6 100644
--- a/static/app/views/releases/detail/commitsAndFiles/releaseCommit.tsx
+++ b/static/app/views/releases/detail/commitsAndFiles/releaseCommit.tsx
@@ -145,10 +145,10 @@ const Message = styled(TextOverflow)`
 const Meta = styled(TextOverflow)`
   line-height: 1.5;
   margin: 0;
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 
   a {
-    color: ${p => p.theme.subText};
+    color: ${p => p.theme.tokens.content.secondary};
     text-decoration: underline;
     text-decoration-style: dotted;
   }
@@ -169,7 +169,7 @@ const MetaWrapper = styled('div')`
   display: flex;
   align-items: center;
   gap: ${space(0.5)};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-size: ${p => p.theme.fontSize.md};
   line-height: 1.2;
 `;
@@ -178,7 +178,7 @@ const AuthorWrapper = styled('span')`
   display: inline-flex;
   align-items: center;
   gap: ${space(0.25)};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 
   & svg {
     transition: 120ms opacity;
diff --git a/static/app/views/releases/detail/header/releaseHeader.tsx b/static/app/views/releases/detail/header/releaseHeader.tsx
index f75d4556df215f..cd28114de0ec03 100644
--- a/static/app/views/releases/detail/header/releaseHeader.tsx
+++ b/static/app/views/releases/detail/header/releaseHeader.tsx
@@ -192,7 +192,7 @@ const IconWrapper = styled('span')`
 
   &,
   a {
-    color: ${p => p.theme.subText};
+    color: ${p => p.theme.tokens.content.secondary};
     display: flex;
     &:hover {
       cursor: pointer;
diff --git a/static/app/views/releases/detail/overview/index.tsx b/static/app/views/releases/detail/overview/index.tsx
index 6c1d041dfa6bfd..40ba8abb8885e4 100644
--- a/static/app/views/releases/detail/overview/index.tsx
+++ b/static/app/views/releases/detail/overview/index.tsx
@@ -564,7 +564,7 @@ const ReleaseDetailsPageFilters = styled('div')`
 
 const ReleaseBoundsDescription = styled('span')<{primary: boolean}>`
   font-size: ${p => p.theme.fontSize.sm};
-  color: ${p => (p.primary ? p.theme.activeText : p.theme.subText)};
+  color: ${p => (p.primary ? p.theme.activeText : p.theme.tokens.content.secondary)};
 `;
 
 export default ReleaseOverview;
diff --git a/static/app/views/releases/detail/overview/releaseComparisonChart/index.tsx b/static/app/views/releases/detail/overview/releaseComparisonChart/index.tsx
index b2fdedac695db8..f1535755f16801 100644
--- a/static/app/views/releases/detail/overview/releaseComparisonChart/index.tsx
+++ b/static/app/views/releases/detail/overview/releaseComparisonChart/index.tsx
@@ -1166,7 +1166,7 @@ const ShowMoreWrapper = styled('div')`
 `;
 
 const ShowMoreTitle = styled('div')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-size: ${p => p.theme.fontSize.md};
   display: inline-grid;
   grid-template-columns: auto auto;
diff --git a/static/app/views/releases/detail/overview/releaseComparisonChart/releaseComparisonChartRow.tsx b/static/app/views/releases/detail/overview/releaseComparisonChart/releaseComparisonChartRow.tsx
index 87f78d9bd198e2..bb49ef4c46a136 100644
--- a/static/app/views/releases/detail/overview/releaseComparisonChart/releaseComparisonChartRow.tsx
+++ b/static/app/views/releases/detail/overview/releaseComparisonChart/releaseComparisonChartRow.tsx
@@ -114,7 +114,7 @@ function ReleaseComparisonChartRow({
 
 const Cell = styled('div')`
   text-align: right;
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   ${p => p.theme.overflowEllipsis}
   font-size: ${p => p.theme.fontSize.md};
 `;
diff --git a/static/app/views/releases/detail/overview/sidebar/commitAuthorBreakdown.tsx b/static/app/views/releases/detail/overview/sidebar/commitAuthorBreakdown.tsx
index 3a3752e20f463a..64cfc9492e09f6 100644
--- a/static/app/views/releases/detail/overview/sidebar/commitAuthorBreakdown.tsx
+++ b/static/app/views/releases/detail/overview/sidebar/commitAuthorBreakdown.tsx
@@ -120,7 +120,7 @@ const AuthorName = styled('div')`
 `;
 
 const Commits = styled('div')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   text-align: right;
 `;
 
diff --git a/static/app/views/releases/detail/overview/sidebar/deploys.tsx b/static/app/views/releases/detail/overview/sidebar/deploys.tsx
index 4c0e90fde1ea4d..1c44e123023ad4 100644
--- a/static/app/views/releases/detail/overview/sidebar/deploys.tsx
+++ b/static/app/views/releases/detail/overview/sidebar/deploys.tsx
@@ -45,7 +45,7 @@ const Row = styled('div')`
   justify-content: space-between;
   margin-bottom: ${space(1)};
   font-size: ${p => p.theme.fontSize.md};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 
 export default Deploys;
diff --git a/static/app/views/releases/detail/overview/sidebar/totalCrashFreeUsers.tsx b/static/app/views/releases/detail/overview/sidebar/totalCrashFreeUsers.tsx
index 0722c6d5fa505b..070e7532c6b1ee 100644
--- a/static/app/views/releases/detail/overview/sidebar/totalCrashFreeUsers.tsx
+++ b/static/app/views/releases/detail/overview/sidebar/totalCrashFreeUsers.tsx
@@ -152,7 +152,8 @@ const InnerRow = styled('div')`
 
 const Text = styled('div')<{bold?: boolean; right?: boolean}>`
   text-align: ${p => (p.right ? 'right' : 'left')};
-  color: ${p => (p.bold ? p.theme.tokens.content.primary : p.theme.subText)};
+  color: ${p =>
+    p.bold ? p.theme.tokens.content.primary : p.theme.tokens.content.secondary};
   padding-bottom: ${space(0.25)};
   ${p => p.theme.overflowEllipsis};
 `;
diff --git a/static/app/views/releases/list/releaseCard/index.tsx b/static/app/views/releases/list/releaseCard/index.tsx
index 07d87a53980958..fd80a414208e29 100644
--- a/static/app/views/releases/list/releaseCard/index.tsx
+++ b/static/app/views/releases/list/releaseCard/index.tsx
@@ -511,7 +511,7 @@ const HiddenProjectsMessage = styled('div')`
   overflow: hidden;
   height: 24px;
   line-height: 24px;
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   background-color: ${p => p.theme.backgroundSecondary};
   border-bottom-right-radius: ${p => p.theme.radius.md};
   @media (max-width: ${p => p.theme.breakpoints.md}) {
diff --git a/static/app/views/releases/list/releaseCard/releaseCardCommits.tsx b/static/app/views/releases/list/releaseCard/releaseCardCommits.tsx
index c9e53eec605172..46bdf03fdbd5ed 100644
--- a/static/app/views/releases/list/releaseCard/releaseCardCommits.tsx
+++ b/static/app/views/releases/list/releaseCard/releaseCardCommits.tsx
@@ -51,7 +51,7 @@ function ReleaseCardCommits({release, withHeading = true}: Props) {
 }
 
 const ReleaseSummaryHeading = styled('div')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-size: ${p => p.theme.fontSize.sm};
   line-height: 1.2;
   font-weight: ${p => p.theme.fontWeight.bold};
diff --git a/static/app/views/releases/list/releaseCard/releaseCardStatsPeriod.tsx b/static/app/views/releases/list/releaseCard/releaseCardStatsPeriod.tsx
index 1f3e01bb53ac78..d6b5e0bfd93e8e 100644
--- a/static/app/views/releases/list/releaseCard/releaseCardStatsPeriod.tsx
+++ b/static/app/views/releases/list/releaseCard/releaseCardStatsPeriod.tsx
@@ -59,11 +59,13 @@ const Wrapper = styled('div')`
 `;
 
 const Period = styled(Link)<{selected: boolean}>`
-  color: ${p => (p.selected ? p.theme.tokens.content.primary : p.theme.subText)};
+  color: ${p =>
+    p.selected ? p.theme.tokens.content.primary : p.theme.tokens.content.secondary};
 
   &:hover,
   &:focus {
-    color: ${p => (p.selected ? p.theme.tokens.content.primary : p.theme.subText)};
+    color: ${p =>
+      p.selected ? p.theme.tokens.content.primary : p.theme.tokens.content.secondary};
   }
 `;
 
diff --git a/static/app/views/relocation/components/wrapper.tsx b/static/app/views/relocation/components/wrapper.tsx
index bfcdad408d435c..83c5e3bd570960 100644
--- a/static/app/views/relocation/components/wrapper.tsx
+++ b/static/app/views/relocation/components/wrapper.tsx
@@ -12,7 +12,7 @@ const Wrapper = styled('div')`
   box-shadow: 0 5px 10px rgba(0, 0, 0, 0.05);
   border-radius: 10px;
   width: 100%;
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   mark {
     border-radius: 8px;
     padding: ${space(0.25)} ${space(0.5)} ${space(0.25)} ${space(0.5)};
@@ -33,7 +33,7 @@ const Wrapper = styled('div')`
     padding-bottom: ${space(1)};
   }
   .encrypt-note {
-    color: ${p => p.theme.subText};
+    color: ${p => p.theme.tokens.content.secondary};
     padding-top: ${space(1)};
   }
 `;
diff --git a/static/app/views/relocation/getStarted.tsx b/static/app/views/relocation/getStarted.tsx
index 3f73fa11942d50..da8c4f450fe7f7 100644
--- a/static/app/views/relocation/getStarted.tsx
+++ b/static/app/views/relocation/getStarted.tsx
@@ -153,7 +153,7 @@ const Wrapper = styled('div')`
   border-radius: 10px;
   max-width: 769px;
   max-height: 525px;
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   h2 {
     color: ${p => p.theme.colors.gray800};
   }
diff --git a/static/app/views/relocation/uploadBackup.tsx b/static/app/views/relocation/uploadBackup.tsx
index 743549934f3c1b..c26b1a6424e66c 100644
--- a/static/app/views/relocation/uploadBackup.tsx
+++ b/static/app/views/relocation/uploadBackup.tsx
@@ -193,7 +193,7 @@ const Wrapper = styled('div')`
   border-radius: 10px;
   width: 100%;
   font-size: 16px;
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   mark {
     border-radius: 8px;
     padding: ${space(0.25)} ${space(0.5)} ${space(0.25)} ${space(0.5)};
diff --git a/static/app/views/replays/detail/ai/ai.tsx b/static/app/views/replays/detail/ai/ai.tsx
index f3e918271dce91..0192cc7ce648c8 100644
--- a/static/app/views/replays/detail/ai/ai.tsx
+++ b/static/app/views/replays/detail/ai/ai.tsx
@@ -357,7 +357,7 @@ const SummaryText = styled('p')`
   white-space: pre-wrap;
   margin: 0;
   font-size: ${p => p.theme.fontSize.md};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-weight: ${p => p.theme.fontWeight.normal};
 `;
 
@@ -393,7 +393,7 @@ const EndStateContainer = styled('div')`
 
 const Subtext = styled(Text)`
   padding: ${space(2)};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-size: ${p => p.theme.fontSize.sm};
   display: flex;
   justify-content: center;
diff --git a/static/app/views/replays/detail/memoryPanel/index.tsx b/static/app/views/replays/detail/memoryPanel/index.tsx
index 7654db509bc72a..be9bf1ca81f2dc 100644
--- a/static/app/views/replays/detail/memoryPanel/index.tsx
+++ b/static/app/views/replays/detail/memoryPanel/index.tsx
@@ -84,12 +84,12 @@ const ChartWrapper = styled('div')`
 const ChartTitle = styled('h5')`
   font-size: ${p => p.theme.fontSize.lg};
   font-weight: ${p => p.theme.fontWeight.bold};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   flex: 0 1 auto;
   margin: 0;
 `;
 
 const Description = styled('p')`
   font-size: ${p => p.theme.fontSize.md};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
diff --git a/static/app/views/replays/detail/network/details/components.tsx b/static/app/views/replays/detail/network/details/components.tsx
index 4e04fa0887d9a8..0b38d5dd00d2cb 100644
--- a/static/app/views/replays/detail/network/details/components.tsx
+++ b/static/app/views/replays/detail/network/details/components.tsx
@@ -18,7 +18,7 @@ export const InspectorMargin = styled('div')`
 `;
 
 const NotFoundText = styled('span')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-size: ${p => p.theme.fontSize.sm};
 `;
 
diff --git a/static/app/views/replays/list/replayIndexTable.tsx b/static/app/views/replays/list/replayIndexTable.tsx
index 9fb7fed566464a..115d8afb928204 100644
--- a/static/app/views/replays/list/replayIndexTable.tsx
+++ b/static/app/views/replays/list/replayIndexTable.tsx
@@ -163,6 +163,6 @@ function useNeedsSDKUpdateForClickSearch({search}: {search: undefined | string})
 }
 
 const EmptyStateSubheading = styled('div')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-size: ${p => p.theme.fontSize.md};
 `;
diff --git a/static/app/views/replays/list/replayOnboardingPanel.tsx b/static/app/views/replays/list/replayOnboardingPanel.tsx
index 35472d9fe710df..be4416427d1ee6 100644
--- a/static/app/views/replays/list/replayOnboardingPanel.tsx
+++ b/static/app/views/replays/list/replayOnboardingPanel.tsx
@@ -366,7 +366,7 @@ const QuestionContent = styled('div')`
 const StyledHeaderContainer = styled(HeaderContainer)`
   font-weight: ${p => p.theme.fontWeight.bold};
   font-size: ${p => p.theme.fontSize.lg};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   display: flex;
   gap: ${space(0.5)};
   align-items: center;
diff --git a/static/app/views/replays/selectors/deadRageSelectorCards.tsx b/static/app/views/replays/selectors/deadRageSelectorCards.tsx
index 08f43867faaf6e..6e1507397b59a4 100644
--- a/static/app/views/replays/selectors/deadRageSelectorCards.tsx
+++ b/static/app/views/replays/selectors/deadRageSelectorCards.tsx
@@ -273,7 +273,7 @@ const EmptyHeader = styled(Flex)`
   justify-content: center;
   align-items: center;
   gap: ${space(1.5)};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 
 const StyledEmptyStateWarning = styled(EmptyStateWarning)`
diff --git a/static/app/views/seerExplorer/blockComponents.tsx b/static/app/views/seerExplorer/blockComponents.tsx
index 46094089052758..642c562cb03b74 100644
--- a/static/app/views/seerExplorer/blockComponents.tsx
+++ b/static/app/views/seerExplorer/blockComponents.tsx
@@ -519,7 +519,7 @@ const BlockRow = styled('div')`
 `;
 
 const BlockChevronIcon = styled(IconChevron)`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   margin-top: 18px;
   margin-left: ${space(2)};
   margin-right: ${space(1)};
@@ -622,7 +622,7 @@ const UserBlockContent = styled('div')`
   padding: ${space(2)} ${space(2)} ${space(2)} 0;
   white-space: pre-wrap;
   word-wrap: break-word;
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 
 const ToolCallStack = styled(Stack)`
@@ -690,7 +690,9 @@ const EnterKeyHint = styled('span')<{isVisible?: boolean}>`
 
 const ToolCallLinkIcon = styled(IconLink)<{isHighlighted?: boolean}>`
   color: ${p =>
-    p.isHighlighted ? p.theme.tokens.interactive.link.accent.hover : p.theme.subText};
+    p.isHighlighted
+      ? p.theme.tokens.interactive.link.accent.hover
+      : p.theme.tokens.content.secondary};
   flex-shrink: 0;
 `;
 
@@ -708,5 +710,5 @@ const TodoListContent = styled(MarkedText)`
   margin-bottom: -${p => p.theme.space.xl};
   font-size: ${p => p.theme.fontSize.xs};
   font-family: ${p => p.theme.text.familyMono};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
diff --git a/static/app/views/seerExplorer/emptyState.tsx b/static/app/views/seerExplorer/emptyState.tsx
index 9f1381d691a411..2242d994a4d4ae 100644
--- a/static/app/views/seerExplorer/emptyState.tsx
+++ b/static/app/views/seerExplorer/emptyState.tsx
@@ -36,7 +36,7 @@ const Container = styled('div')`
 
 const Text = styled('div')`
   margin-top: ${space(2)};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-size: ${p => p.theme.fontSize.md};
   line-height: 1.4;
   max-width: 300px;
diff --git a/static/app/views/seerExplorer/explorerMenu.tsx b/static/app/views/seerExplorer/explorerMenu.tsx
index 4a08468c9c1b2c..46b972011e4c4a 100644
--- a/static/app/views/seerExplorer/explorerMenu.tsx
+++ b/static/app/views/seerExplorer/explorerMenu.tsx
@@ -494,6 +494,6 @@ const ItemName = styled('div')`
 `;
 
 const ItemDescription = styled('div')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-size: ${p => p.theme.fontSize.xs};
 `;
diff --git a/static/app/views/seerExplorer/fileDiffViewer.tsx b/static/app/views/seerExplorer/fileDiffViewer.tsx
index 0fb51c6e9e1bd8..89d46674ca461c 100644
--- a/static/app/views/seerExplorer/fileDiffViewer.tsx
+++ b/static/app/views/seerExplorer/fileDiffViewer.tsx
@@ -236,7 +236,7 @@ const DeletedFileMessage = styled('div')`
   align-items: center;
   justify-content: center;
   padding: ${p => p.theme.space['2xl']};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 
 const DiffContainer = styled('div')`
@@ -254,7 +254,7 @@ const HunkHeaderEmptySpace = styled('div')`
 const HunkHeaderContent = styled('div')`
   grid-column: 3 / -1;
   background-color: ${p => p.theme.backgroundSecondary};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   padding: ${p => p.theme.space.sm} ${p => p.theme.space.md} ${p => p.theme.space.sm}
     ${p => p.theme.space['3xl']};
   white-space: pre-wrap;
@@ -265,7 +265,7 @@ const LineNumber = styled('div')<{lineType: DiffLineType}>`
   padding: ${p => p.theme.space['2xs']} ${p => p.theme.space.md};
   user-select: none;
   background-color: ${p => p.theme.backgroundSecondary};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 
   ${p =>
     p.lineType === DiffLineType.ADDED &&
diff --git a/static/app/views/settings/account/accountAuthorizations.tsx b/static/app/views/settings/account/accountAuthorizations.tsx
index a9a7fff960227e..1015eedceb3e8a 100644
--- a/static/app/views/settings/account/accountAuthorizations.tsx
+++ b/static/app/views/settings/account/accountAuthorizations.tsx
@@ -152,6 +152,6 @@ const Url = styled('div')`
 `;
 
 const DetailRow = styled('div')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-size: ${p => p.theme.fontSize.sm};
 `;
diff --git a/static/app/views/settings/account/accountIdentities.tsx b/static/app/views/settings/account/accountIdentities.tsx
index c8352b0d2e0453..3f25c00d7f7488 100644
--- a/static/app/views/settings/account/accountIdentities.tsx
+++ b/static/app/views/settings/account/accountIdentities.tsx
@@ -253,7 +253,7 @@ const IdentityName = styled('div')`
 `;
 const IdentityDateTime = styled(DateTime)`
   font-size: ${p => p.theme.fontSize.sm};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 
 const TagWrapper = styled('div')`
diff --git a/static/app/views/settings/account/accountSubscriptions.tsx b/static/app/views/settings/account/accountSubscriptions.tsx
index 3aaa1ae1b052f4..f3e67adf3b27ed 100644
--- a/static/app/views/settings/account/accountSubscriptions.tsx
+++ b/static/app/views/settings/account/accountSubscriptions.tsx
@@ -222,7 +222,7 @@ const Heading = styled(PanelItem)`
   font-size: ${p => p.theme.fontSize.md};
   padding: ${space(1.5)} ${space(2)};
   background: ${p => p.theme.backgroundSecondary};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 
 const SubscriptionDetails = styled('label')`
@@ -243,12 +243,12 @@ const SubscriptionName = styled('div')`
 `;
 const Description = styled('div')`
   font-size: ${p => p.theme.fontSize.sm};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   margin-top: ${space(0.5)};
 `;
 
 const SubscribedDescription = styled(Description)`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 
 export default AccountSubscriptions;
diff --git a/static/app/views/settings/account/apiApplications/row.tsx b/static/app/views/settings/account/apiApplications/row.tsx
index 43a8e21d510d85..35dc7f3bfaaa2c 100644
--- a/static/app/views/settings/account/apiApplications/row.tsx
+++ b/static/app/views/settings/account/apiApplications/row.tsx
@@ -88,7 +88,7 @@ const ApplicationName = styled(Link)`
 `;
 
 const ClientId = styled('div')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-size: ${p => p.theme.fontSize.sm};
 `;
 
diff --git a/static/app/views/settings/account/apiTokenRow.tsx b/static/app/views/settings/account/apiTokenRow.tsx
index e35635cbd4cf32..d64d083df02dd4 100644
--- a/static/app/views/settings/account/apiTokenRow.tsx
+++ b/static/app/views/settings/account/apiTokenRow.tsx
@@ -76,7 +76,7 @@ const Actions = styled(ButtonBar)`
 `;
 
 const TokenPreview = styled('div')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 
 export default ApiTokenRow;
diff --git a/static/app/views/settings/account/notifications/notificationSettings.tsx b/static/app/views/settings/account/notifications/notificationSettings.tsx
index 5fbf02967ac3cd..9543ecb67f6513 100644
--- a/static/app/views/settings/account/notifications/notificationSettings.tsx
+++ b/static/app/views/settings/account/notifications/notificationSettings.tsx
@@ -144,7 +144,7 @@ const FieldLabel = styled('div')`
 
 const FieldHelp = styled('div')`
   font-size: ${p => p.theme.fontSize.sm};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 
 const FieldWrapper = styled('div')`
diff --git a/static/app/views/settings/components/dataScrubbing/modals/form/eventIdFieldStatusIcon.tsx b/static/app/views/settings/components/dataScrubbing/modals/form/eventIdFieldStatusIcon.tsx
index 95b61aaece6100..b41c9ced52c92b 100644
--- a/static/app/views/settings/components/dataScrubbing/modals/form/eventIdFieldStatusIcon.tsx
+++ b/static/app/views/settings/components/dataScrubbing/modals/form/eventIdFieldStatusIcon.tsx
@@ -43,7 +43,7 @@ const CloseIcon = styled('div')`
 const StyledIconClose = styled(IconClose)`
   color: ${p => p.theme.colors.gray200};
   :hover {
-    color: ${p => p.theme.subText};
+    color: ${p => p.theme.tokens.content.secondary};
   }
   cursor: pointer;
 `;
diff --git a/static/app/views/settings/components/dataScrubbing/modals/form/index.tsx b/static/app/views/settings/components/dataScrubbing/modals/form/index.tsx
index c3abbb941bae84..cb607e06914d67 100644
--- a/static/app/views/settings/components/dataScrubbing/modals/form/index.tsx
+++ b/static/app/views/settings/components/dataScrubbing/modals/form/index.tsx
@@ -494,7 +494,7 @@ const DatasetRadioField = styled(RadioField)`
 
 const Toggle = styled(Button)`
   font-weight: ${p => p.theme.fontWeight.bold};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   &:hover,
   &:focus {
     color: ${p => p.theme.tokens.content.primary};
diff --git a/static/app/views/settings/components/dataScrubbing/modals/form/sourceField.tsx b/static/app/views/settings/components/dataScrubbing/modals/form/sourceField.tsx
index 56709cf7e9390f..8ddce92e6c6512 100644
--- a/static/app/views/settings/components/dataScrubbing/modals/form/sourceField.tsx
+++ b/static/app/views/settings/components/dataScrubbing/modals/form/sourceField.tsx
@@ -501,7 +501,7 @@ const Suggestion = styled('li')<{active: boolean}>`
 const SuggestionDescription = styled('div')`
   display: flex;
   overflow: hidden;
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   line-height: 1.2;
 `;
 
diff --git a/static/app/views/settings/components/dataScrubbing/organizationRules.tsx b/static/app/views/settings/components/dataScrubbing/organizationRules.tsx
index b4da329cbe8b98..b37e77da0830d2 100644
--- a/static/app/views/settings/components/dataScrubbing/organizationRules.tsx
+++ b/static/app/views/settings/components/dataScrubbing/organizationRules.tsx
@@ -121,7 +121,7 @@ const Header = styled('div')`
 `;
 
 const Wrapper = styled('div')<{contentHeight?: string; isCollapsed?: boolean}>`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   background: ${p => p.theme.backgroundSecondary};
   ${p => !p.contentHeight && `padding: ${space(1)} ${space(2)}`};
   ${p => !p.isCollapsed && ` border-bottom: 1px solid ${p.theme.tokens.border.primary}`};
diff --git a/static/app/views/settings/dynamicSampling/organizationSampleRateInput.tsx b/static/app/views/settings/dynamicSampling/organizationSampleRateInput.tsx
index e24c76b1f659b6..6f399e8bc1be09 100644
--- a/static/app/views/settings/dynamicSampling/organizationSampleRateInput.tsx
+++ b/static/app/views/settings/dynamicSampling/organizationSampleRateInput.tsx
@@ -119,12 +119,12 @@ const Label = styled('label')`
 
 const HelpText = styled('div')`
   font-size: ${p => p.theme.fontSize.sm};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 
 const PreviousValue = styled('span')`
   font-size: ${p => p.theme.fontSize.xs};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 
 const ErrorMessage = styled('span')`
diff --git a/static/app/views/settings/dynamicSampling/organizationSampling.tsx b/static/app/views/settings/dynamicSampling/organizationSampling.tsx
index 40d6a0d3159fb6..75b1dbd81558c9 100644
--- a/static/app/views/settings/dynamicSampling/organizationSampling.tsx
+++ b/static/app/views/settings/dynamicSampling/organizationSampling.tsx
@@ -123,6 +123,6 @@ const HeadingRow = styled('div')`
 `;
 
 const SubTextParagraph = styled('p')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-size: ${p => p.theme.fontSize.sm};
 `;
diff --git a/static/app/views/settings/dynamicSampling/projectsTable.tsx b/static/app/views/settings/dynamicSampling/projectsTable.tsx
index 38780736bcd244..8261c801c6783d 100644
--- a/static/app/views/settings/dynamicSampling/projectsTable.tsx
+++ b/static/app/views/settings/dynamicSampling/projectsTable.tsx
@@ -387,7 +387,7 @@ const SizingWrapper = styled('div')`
 
 const SmallPrint = styled('span')`
   font-size: ${p => p.theme.fontSize.xs};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   line-height: 1.5;
   text-align: right;
 `;
@@ -458,7 +458,7 @@ const FirstCellLine = styled('div')`
 `;
 
 const SubContent = styled('div')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-size: ${p => p.theme.fontSize.sm};
   text-align: right;
   white-space: nowrap;
@@ -515,12 +515,12 @@ const StyledIconChevron = styled(IconChevron)`
   height: 12px;
   width: 12px;
   margin-right: ${space(0.5)};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 
 const SettingsButton = styled(LinkButton)`
   margin-left: ${space(0.5)};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   visibility: hidden;
 
   &:focus {
@@ -532,7 +532,7 @@ const SettingsButton = styled(LinkButton)`
 `;
 
 const TableHeader = styled(TableRowWrapper)`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-size: ${p => p.theme.fontSize.sm};
   font-weight: ${p => p.theme.fontWeight.bold};
   text-transform: uppercase;
diff --git a/static/app/views/settings/dynamicSampling/samplingBreakdown.tsx b/static/app/views/settings/dynamicSampling/samplingBreakdown.tsx
index 1bf4db7e0bfe47..d32e3d08cc1caa 100644
--- a/static/app/views/settings/dynamicSampling/samplingBreakdown.tsx
+++ b/static/app/views/settings/dynamicSampling/samplingBreakdown.tsx
@@ -207,12 +207,12 @@ const Total = styled('div')`
 `;
 
 const SubText = styled('span')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   white-space: nowrap;
 `;
 
 const EmptyStateText = styled('div')`
   text-align: center;
   padding: ${space(0.5)} 0 ${space(3)};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
diff --git a/static/app/views/settings/featureFlags/changeTracking/organizationFeatureFlagsProviderRow.tsx b/static/app/views/settings/featureFlags/changeTracking/organizationFeatureFlagsProviderRow.tsx
index 345708f0726de6..69abfe251f19f5 100644
--- a/static/app/views/settings/featureFlags/changeTracking/organizationFeatureFlagsProviderRow.tsx
+++ b/static/app/views/settings/featureFlags/changeTracking/organizationFeatureFlagsProviderRow.tsx
@@ -74,5 +74,5 @@ const DateTime = styled('div')`
 `;
 
 const SecretPreview = styled('div')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
diff --git a/static/app/views/settings/organizationAuth/providerItem.tsx b/static/app/views/settings/organizationAuth/providerItem.tsx
index 99a1bf955791cc..8806929125da17 100644
--- a/static/app/views/settings/organizationAuth/providerItem.tsx
+++ b/static/app/views/settings/organizationAuth/providerItem.tsx
@@ -160,7 +160,7 @@ const ProviderName = styled('div')`
 
 const ProviderDescription = styled('div')`
   font-size: ${p => p.theme.fontSize.sm};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 
 const FeatureBadge = styled('div')`
diff --git a/static/app/views/settings/organizationAuthTokens/authTokenRow.tsx b/static/app/views/settings/organizationAuthTokens/authTokenRow.tsx
index d1db22394915ba..4b91501b11d841 100644
--- a/static/app/views/settings/organizationAuthTokens/authTokenRow.tsx
+++ b/static/app/views/settings/organizationAuthTokens/authTokenRow.tsx
@@ -156,9 +156,9 @@ const DateTime = styled('div')`
 `;
 
 const NeverUsed = styled('div')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 
 const TokenPreview = styled('div')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
diff --git a/static/app/views/settings/organizationAuthTokens/newAuthToken.tsx b/static/app/views/settings/organizationAuthTokens/newAuthToken.tsx
index 7d4a2abaadd3af..b762f0ce773266 100644
--- a/static/app/views/settings/organizationAuthTokens/newAuthToken.tsx
+++ b/static/app/views/settings/organizationAuthTokens/newAuthToken.tsx
@@ -170,5 +170,5 @@ export default function OrganizationAuthTokensNewAuthToken() {
 }
 
 const ScopeHelpText = styled('div')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
diff --git a/static/app/views/settings/organizationDeveloperSettings/sentryApplicationDashboard/index.tsx b/static/app/views/settings/organizationDeveloperSettings/sentryApplicationDashboard/index.tsx
index 9ddd34916a5d73..31c3f466a35b70 100644
--- a/static/app/views/settings/organizationDeveloperSettings/sentryApplicationDashboard/index.tsx
+++ b/static/app/views/settings/organizationDeveloperSettings/sentryApplicationDashboard/index.tsx
@@ -269,7 +269,7 @@ const StatsHeader = styled('h6')`
   margin-bottom: ${space(1)};
   font-size: 12px;
   text-transform: uppercase;
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 
 const StyledFooter = styled('div')`
diff --git a/static/app/views/settings/organizationDeveloperSettings/sentryApplicationDashboard/requestLog.tsx b/static/app/views/settings/organizationDeveloperSettings/sentryApplicationDashboard/requestLog.tsx
index a323f39762b271..bf82bfd438a86d 100644
--- a/static/app/views/settings/organizationDeveloperSettings/sentryApplicationDashboard/requestLog.tsx
+++ b/static/app/views/settings/organizationDeveloperSettings/sentryApplicationDashboard/requestLog.tsx
@@ -319,7 +319,7 @@ const StyledErrorsOnlyButton = styled(Button)`
 
 const StyledIconOpen = styled(IconOpen)`
   margin-left: 6px;
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 
 const Tags = styled('div')`
diff --git a/static/app/views/settings/organizationDeveloperSettings/subscriptionBox.tsx b/static/app/views/settings/organizationDeveloperSettings/subscriptionBox.tsx
index fc5e77f98cc2b5..a591beadb55270 100644
--- a/static/app/views/settings/organizationDeveloperSettings/subscriptionBox.tsx
+++ b/static/app/views/settings/organizationDeveloperSettings/subscriptionBox.tsx
@@ -108,7 +108,7 @@ const SubscriptionInfo = styled('div')`
 const SubscriptionDescription = styled('div')`
   font-size: ${p => p.theme.fontSize.md};
   line-height: 1;
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 
 const SubscriptionTitle = styled('div')`
diff --git a/static/app/views/settings/organizationIntegrations/detailedView/integrationLayout.tsx b/static/app/views/settings/organizationIntegrations/detailedView/integrationLayout.tsx
index 0b90f7a456c08e..13bd0d92bf9883 100644
--- a/static/app/views/settings/organizationIntegrations/detailedView/integrationLayout.tsx
+++ b/static/app/views/settings/organizationIntegrations/detailedView/integrationLayout.tsx
@@ -377,7 +377,7 @@ const AuthorInfo = styled('div')`
 const CreatedContainer = styled('div')`
   text-transform: uppercase;
   padding-bottom: ${space(1)};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-weight: ${p => p.theme.fontWeight.bold};
   font-size: 12px;
 `;
diff --git a/static/app/views/settings/organizationIntegrations/installedIntegration.tsx b/static/app/views/settings/organizationIntegrations/installedIntegration.tsx
index 940f90d3cacda0..6c5c7210f6563d 100644
--- a/static/app/views/settings/organizationIntegrations/installedIntegration.tsx
+++ b/static/app/views/settings/organizationIntegrations/installedIntegration.tsx
@@ -203,11 +203,11 @@ export default class InstalledIntegration extends Component<Props> {
 }
 
 const StyledButton = styled(Button)`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 
 const StyledLinkButton = styled(LinkButton)`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 
 const IntegrationItemBox = styled('div')`
@@ -257,7 +257,7 @@ function IntegrationStatus(
 const StyledIntegrationStatus = styled(IntegrationStatus)`
   display: flex;
   align-items: center;
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-weight: light;
   text-transform: capitalize;
   &:before {
diff --git a/static/app/views/settings/organizationIntegrations/installedPlugin.tsx b/static/app/views/settings/organizationIntegrations/installedPlugin.tsx
index 9394490467b195..e165f1421bef66 100644
--- a/static/app/views/settings/organizationIntegrations/installedPlugin.tsx
+++ b/static/app/views/settings/organizationIntegrations/installedPlugin.tsx
@@ -188,11 +188,11 @@ const Container = styled('div')`
 `;
 
 const StyledButton = styled(Button)`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 
 const StyledLinkButton = styled(LinkButton)`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 
 const IntegrationItemBox = styled('div')`
diff --git a/static/app/views/settings/organizationIntegrations/integrationItem.tsx b/static/app/views/settings/organizationIntegrations/integrationItem.tsx
index 1f452a0ee120e3..d4abee948f7c58 100644
--- a/static/app/views/settings/organizationIntegrations/integrationItem.tsx
+++ b/static/app/views/settings/organizationIntegrations/integrationItem.tsx
@@ -49,7 +49,7 @@ const IntegrationName = styled('div')`
 // as it sets width 100% which causes layout issues in the
 // integration list.
 const DomainName = styled('div')<{compact: boolean}>`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   margin-left: ${p => (p.compact ? space(1) : 'inherit')};
   margin-top: ${p => (p.compact ? 'inherit' : 0)};
   font-size: ${p => p.theme.fontSize.sm};
diff --git a/static/app/views/settings/organizationIntegrations/integrationListDirectory.tsx b/static/app/views/settings/organizationIntegrations/integrationListDirectory.tsx
index df8b0f770be94b..1ab26282adc219 100644
--- a/static/app/views/settings/organizationIntegrations/integrationListDirectory.tsx
+++ b/static/app/views/settings/organizationIntegrations/integrationListDirectory.tsx
@@ -549,7 +549,7 @@ const EmptyResultsContainer = styled('div')`
 const EmptyResultsBody = styled('div')`
   font-size: 16px;
   line-height: 28px;
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   padding-bottom: ${space(2)};
 `;
 
diff --git a/static/app/views/settings/organizationIntegrations/integrationRow.tsx b/static/app/views/settings/organizationIntegrations/integrationRow.tsx
index 45445a0560aed0..bb2d53d608ca9d 100644
--- a/static/app/views/settings/organizationIntegrations/integrationRow.tsx
+++ b/static/app/views/settings/organizationIntegrations/integrationRow.tsx
@@ -193,16 +193,16 @@ const IntegrationDetails = styled('div')`
 `;
 
 const StyledLink = styled(Link)`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   &:before {
     content: '|';
-    color: ${p => p.theme.subText};
+    color: ${p => p.theme.tokens.content.secondary};
     margin-right: ${space(0.75)};
   }
 `;
 
 const LearnMore = styled(Link)`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 
 type PublishStatusProps = {status: SentryApp['status']};
@@ -211,20 +211,22 @@ const PublishStatus = styled(({status, ...props}: PublishStatusProps) => (
   <div {...props}>{status}</div>
 ))`
   color: ${p =>
-    p.status === 'published' ? p.theme.tokens.content.success : p.theme.subText};
+    p.status === 'published'
+      ? p.theme.tokens.content.success
+      : p.theme.tokens.content.secondary};
   font-weight: light;
   margin-right: ${space(0.75)};
   text-transform: capitalize;
   &:before {
     content: '|';
-    color: ${p => p.theme.subText};
+    color: ${p => p.theme.tokens.content.secondary};
     margin-right: ${space(0.75)};
     font-weight: ${p => p.theme.fontWeight.normal};
   }
 `;
 
 const ResolveNowButton = styled(LinkButton)`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   float: right;
 `;
 
diff --git a/static/app/views/settings/organizationIntegrations/integrationServerlessRow.tsx b/static/app/views/settings/organizationIntegrations/integrationServerlessRow.tsx
index 4f8cbd5b32cba4..6f6bb53f7eb8f2 100644
--- a/static/app/views/settings/organizationIntegrations/integrationServerlessRow.tsx
+++ b/static/app/views/settings/organizationIntegrations/integrationServerlessRow.tsx
@@ -186,7 +186,7 @@ const Name = styled(`span`)`
 const RuntimeAndVersion = styled('div')`
   display: flex;
   flex-direction: row;
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 
 const DetailWrapper = styled('div')`
diff --git a/static/app/views/settings/organizationIntegrations/pluginDeprecationAlert.tsx b/static/app/views/settings/organizationIntegrations/pluginDeprecationAlert.tsx
index ec71d9ee464a68..e20bae682fb99d 100644
--- a/static/app/views/settings/organizationIntegrations/pluginDeprecationAlert.tsx
+++ b/static/app/views/settings/organizationIntegrations/pluginDeprecationAlert.tsx
@@ -58,7 +58,7 @@ class PluginDeprecationAlert extends Component<Props, State> {
 }
 
 const UpgradeNowButton = styled(LinkButton)`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   float: right;
 `;
 
diff --git a/static/app/views/settings/organizationIntegrations/repositoryProjectPathConfigRow.tsx b/static/app/views/settings/organizationIntegrations/repositoryProjectPathConfigRow.tsx
index 69d81153c1b79e..232ae52072f10f 100644
--- a/static/app/views/settings/organizationIntegrations/repositoryProjectPathConfigRow.tsx
+++ b/static/app/views/settings/organizationIntegrations/repositoryProjectPathConfigRow.tsx
@@ -90,7 +90,7 @@ const RepoName = styled(`span`)`
 const ProjectAndBranch = styled('div')`
   display: flex;
   flex-direction: row;
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 
 // match the line height of the badge
diff --git a/static/app/views/settings/organizationIntegrations/sentryAppDetailedView.tsx b/static/app/views/settings/organizationIntegrations/sentryAppDetailedView.tsx
index 087b5f4d760fd5..5792c7b91f4962 100644
--- a/static/app/views/settings/organizationIntegrations/sentryAppDetailedView.tsx
+++ b/static/app/views/settings/organizationIntegrations/sentryAppDetailedView.tsx
@@ -440,7 +440,7 @@ const InstallButton = styled(Button)`
 `;
 
 const StyledButton = styled(Button)`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   background: ${p => p.theme.tokens.background.primary};
 
   border: ${p => `1px solid ${p.theme.colors.gray400}`};
diff --git a/static/app/views/settings/organizationMembers/inviteBanner.tsx b/static/app/views/settings/organizationMembers/inviteBanner.tsx
index 73d109bd8724a3..b133634597092d 100644
--- a/static/app/views/settings/organizationMembers/inviteBanner.tsx
+++ b/static/app/views/settings/organizationMembers/inviteBanner.tsx
@@ -326,7 +326,7 @@ const Subtitle = styled('div')`
   align-items: center;
   font-size: ${p => p.theme.fontSize.sm};
   font-weight: ${p => p.theme.fontWeight.normal};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   gap: ${space(0.5)};
 `;
 
@@ -335,7 +335,7 @@ const MemberEmail = styled('div')`
   max-width: 70%;
   font-size: ${p => p.theme.fontSize.sm};
   font-weight: ${p => p.theme.fontWeight.normal};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   text-overflow: ellipsis;
   overflow: hidden;
 `;
diff --git a/static/app/views/settings/organizationMembers/inviteRequestRow.tsx b/static/app/views/settings/organizationMembers/inviteRequestRow.tsx
index a17643c6deedfd..9c00b19674ed21 100644
--- a/static/app/views/settings/organizationMembers/inviteRequestRow.tsx
+++ b/static/app/views/settings/organizationMembers/inviteRequestRow.tsx
@@ -173,7 +173,7 @@ const UserName = styled('div')`
 
 const Description = styled('div')`
   display: block;
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-size: 14px;
   overflow: hidden;
   text-overflow: ellipsis;
diff --git a/static/app/views/settings/organizationMembers/organizationMemberDetail.tsx b/static/app/views/settings/organizationMembers/organizationMemberDetail.tsx
index b9b09a66df89e6..6e3b7783524265 100644
--- a/static/app/views/settings/organizationMembers/organizationMemberDetail.tsx
+++ b/static/app/views/settings/organizationMembers/organizationMemberDetail.tsx
@@ -418,7 +418,7 @@ function OrganizationMemberDetail() {
 export default OrganizationMemberDetail;
 
 const ExtraHeaderText = styled('div')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-weight: ${p => p.theme.fontWeight.normal};
   font-size: ${p => p.theme.fontSize.lg};
 `;
diff --git a/static/app/views/settings/organizationMembers/organizationMemberRow.tsx b/static/app/views/settings/organizationMembers/organizationMemberRow.tsx
index 9817ad5cd839cc..b8c6811819e6bd 100644
--- a/static/app/views/settings/organizationMembers/organizationMemberRow.tsx
+++ b/static/app/views/settings/organizationMembers/organizationMemberRow.tsx
@@ -293,7 +293,7 @@ const UserName = styled('div')`
 `;
 
 const Email = styled('div')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-size: ${p => p.theme.fontSize.sm};
   overflow: hidden;
   text-overflow: ellipsis;
diff --git a/static/app/views/settings/organizationRelay/list/cardHeader.tsx b/static/app/views/settings/organizationRelay/list/cardHeader.tsx
index aa305851e807dd..264ae4daf60fd3 100644
--- a/static/app/views/settings/organizationRelay/list/cardHeader.tsx
+++ b/static/app/views/settings/organizationRelay/list/cardHeader.tsx
@@ -92,7 +92,7 @@ const KeyName = styled('div')`
 
 const DateCreated = styled('div')`
   grid-row: 2/3;
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-size: ${p => p.theme.fontSize.md};
 `;
 
diff --git a/static/app/views/settings/organizationTeams/teamNotifications.tsx b/static/app/views/settings/organizationTeams/teamNotifications.tsx
index f8ad3261121177..78d94985746c58 100644
--- a/static/app/views/settings/organizationTeams/teamNotifications.tsx
+++ b/static/app/views/settings/organizationTeams/teamNotifications.tsx
@@ -241,7 +241,7 @@ const NotDisabledText = styled('div')`
   line-height: ${space(2)};
 `;
 const NotDisabledSubText = styled('div')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-size: ${p => p.theme.fontSize.sm};
   line-height: 1.4;
   margin-top: ${space(1)};
diff --git a/static/app/views/settings/project/projectFilters/projectFiltersSettings.tsx b/static/app/views/settings/project/projectFilters/projectFiltersSettings.tsx
index 4fd33dac3c8398..5940d15c5e4a69 100644
--- a/static/app/views/settings/project/projectFilters/projectFiltersSettings.tsx
+++ b/static/app/views/settings/project/projectFilters/projectFiltersSettings.tsx
@@ -670,7 +670,7 @@ const FilterTitle = styled('div')`
 `;
 
 const FilterDescription = styled('div')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-size: ${p => p.theme.fontSize.sm};
   white-space: nowrap;
 `;
diff --git a/static/app/views/settings/project/projectKeys/list/keyRow.tsx b/static/app/views/settings/project/projectKeys/list/keyRow.tsx
index 8352768050e77e..b31a2a20b66b4f 100644
--- a/static/app/views/settings/project/projectKeys/list/keyRow.tsx
+++ b/static/app/views/settings/project/projectKeys/list/keyRow.tsx
@@ -133,7 +133,7 @@ const StyledClippedBox = styled(ClippedBox)`
 `;
 
 const PanelHeaderLink = styled(Link)`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 
 const Title = styled('div')<{disabled: boolean}>`
diff --git a/static/app/views/settings/project/projectOwnership/editRulesModal.tsx b/static/app/views/settings/project/projectOwnership/editRulesModal.tsx
index 5eb0d432beda05..5218f0ec6a5d01 100644
--- a/static/app/views/settings/project/projectOwnership/editRulesModal.tsx
+++ b/static/app/views/settings/project/projectOwnership/editRulesModal.tsx
@@ -55,7 +55,7 @@ const StyledPre = styled('pre')`
   word-break: break-word;
   padding: ${space(2)};
   line-height: 1.6;
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 
 const Description = styled('p')`
diff --git a/static/app/views/settings/project/projectOwnership/modal.tsx b/static/app/views/settings/project/projectOwnership/modal.tsx
index 2c605c3004b629..3a9d606f0c53b8 100644
--- a/static/app/views/settings/project/projectOwnership/modal.tsx
+++ b/static/app/views/settings/project/projectOwnership/modal.tsx
@@ -188,7 +188,7 @@ const StyledPre = styled('pre')`
   word-break: break-word;
   padding: ${space(2)};
   line-height: 1.6;
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 
 export default ProjectOwnershipModal;
diff --git a/static/app/views/settings/projectDebugFiles/debugFileRow.tsx b/static/app/views/settings/projectDebugFiles/debugFileRow.tsx
index 84779562c1aba1..c612b14970900a 100644
--- a/static/app/views/settings/projectDebugFiles/debugFileRow.tsx
+++ b/static/app/views/settings/projectDebugFiles/debugFileRow.tsx
@@ -179,7 +179,7 @@ const TimeAndSizeWrapper = styled('div')`
   display: flex;
   font-size: ${p => p.theme.fontSize.sm};
   margin-top: ${space(1)};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   align-items: center;
 `;
 
@@ -204,7 +204,7 @@ const Name = styled('div')`
 
 const Description = styled('div')`
   font-size: ${p => p.theme.fontSize.sm};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   @media (max-width: ${p => p.theme.breakpoints.lg}) {
     line-height: 1.7;
   }
diff --git a/static/app/views/settings/projectDebugFiles/sources/customRepositories/repository.tsx b/static/app/views/settings/projectDebugFiles/sources/customRepositories/repository.tsx
index b6043916abd370..cf17381b4e5b21 100644
--- a/static/app/views/settings/projectDebugFiles/sources/customRepositories/repository.tsx
+++ b/static/app/views/settings/projectDebugFiles/sources/customRepositories/repository.tsx
@@ -44,7 +44,7 @@ const StyledPanelItem = styled(PanelItem)`
 `;
 
 const TypeAndStatus = styled('div')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-size: ${p => p.theme.fontSize.md};
   display: flex;
   flex-wrap: wrap;
diff --git a/static/app/views/settings/projectProguard/projectProguardRow.tsx b/static/app/views/settings/projectProguard/projectProguardRow.tsx
index 136070aba35cac..845318a22b1e50 100644
--- a/static/app/views/settings/projectProguard/projectProguardRow.tsx
+++ b/static/app/views/settings/projectProguard/projectProguardRow.tsx
@@ -125,7 +125,7 @@ const TimeWrapper = styled('div')`
   grid-template-columns: min-content 1fr;
   font-size: ${p => p.theme.fontSize.md};
   align-items: center;
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   margin-top: ${space(1)};
 `;
 
diff --git a/static/app/views/settings/projectSeer/addAutofixRepoModal.tsx b/static/app/views/settings/projectSeer/addAutofixRepoModal.tsx
index 1093952c6d2098..533cb8f3903855 100644
--- a/static/app/views/settings/projectSeer/addAutofixRepoModal.tsx
+++ b/static/app/views/settings/projectSeer/addAutofixRepoModal.tsx
@@ -228,7 +228,7 @@ const SearchContainer = styled('div')<{hasAlert: boolean}>`
 
 const EmptyMessage = styled('div')`
   padding: ${space(2)};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   text-align: center;
   font-size: ${p => p.theme.fontSize.md};
 `;
@@ -248,6 +248,6 @@ const StyledLoadingIndicator = styled(LoadingIndicator)`
 `;
 
 const LoadingMessage = styled('div')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-size: ${p => p.theme.fontSize.md};
 `;
diff --git a/static/app/views/settings/projectSeer/autofixRepoItem.tsx b/static/app/views/settings/projectSeer/autofixRepoItem.tsx
index e9a0392ac03e87..37cbb91b5ffa76 100644
--- a/static/app/views/settings/projectSeer/autofixRepoItem.tsx
+++ b/static/app/views/settings/projectSeer/autofixRepoItem.tsx
@@ -332,7 +332,7 @@ const RepoName = styled('div')`
 
 const RepoProvider = styled('div')`
   font-size: ${p => p.theme.fontSize.sm};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   margin-top: ${space(0.25)};
 `;
 
@@ -366,7 +366,7 @@ const BranchInputLabel = styled('label')`
 
 const SubHeader = styled('div')`
   font-size: ${p => p.theme.fontSize.md};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-weight: ${p => p.theme.fontWeight.bold};
 `;
 
@@ -414,7 +414,7 @@ const RepoInfoWrapper = styled('div')`
   margin-left: ${space(1)};
 `;
 const AddOverrideButton = styled(Button)`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 
 const BranchOverridesList = styled('div')`
diff --git a/static/app/views/settings/projectSeer/autofixRepositories.tsx b/static/app/views/settings/projectSeer/autofixRepositories.tsx
index 224793f5c5289e..289066b3cf74bc 100644
--- a/static/app/views/settings/projectSeer/autofixRepositories.tsx
+++ b/static/app/views/settings/projectSeer/autofixRepositories.tsx
@@ -392,6 +392,6 @@ const StyledLoadingIndicator = styled(LoadingIndicator)`
 `;
 
 const LoadingMessage = styled('div')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-size: ${p => p.theme.fontSize.md};
 `;
diff --git a/static/app/views/settings/projectSeer/index.tsx b/static/app/views/settings/projectSeer/index.tsx
index 1cc569002a1084..0dfcc361be51fc 100644
--- a/static/app/views/settings/projectSeer/index.tsx
+++ b/static/app/views/settings/projectSeer/index.tsx
@@ -687,7 +687,7 @@ export default function ProjectSeerContainer() {
 
 const Subheading = styled('div')`
   font-size: ${p => p.theme.fontSize.sm};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-weight: ${p => p.theme.fontWeight.normal};
   text-transform: none;
   margin-top: ${space(1)};
diff --git a/static/app/views/settings/projectSeer/selectableRepoItem.tsx b/static/app/views/settings/projectSeer/selectableRepoItem.tsx
index 0390d7ebbfb4da..2faf58d7224bd6 100644
--- a/static/app/views/settings/projectSeer/selectableRepoItem.tsx
+++ b/static/app/views/settings/projectSeer/selectableRepoItem.tsx
@@ -104,7 +104,7 @@ const RepoName = styled('div')`
 
 const RepoProvider = styled('div')`
   font-size: ${p => p.theme.fontSize.sm};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   margin-top: ${space(0.25)};
 `;
 
diff --git a/static/app/views/settings/projectSourceMaps/sourceMapsDetails.tsx b/static/app/views/settings/projectSourceMaps/sourceMapsDetails.tsx
index 12934bcce7729b..42a40b80106a21 100644
--- a/static/app/views/settings/projectSourceMaps/sourceMapsDetails.tsx
+++ b/static/app/views/settings/projectSourceMaps/sourceMapsDetails.tsx
@@ -401,7 +401,7 @@ const TypeColumn = styled('div')`
   justify-content: flex-end;
   text-align: right;
   align-items: center;
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 
 const SizeColumn = styled('div')`
@@ -409,7 +409,7 @@ const SizeColumn = styled('div')`
   justify-content: flex-end;
   text-align: right;
   align-items: center;
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 
 const TimeAndDistWrapper = styled('div')`
@@ -425,7 +425,7 @@ const TimeWrapper = styled('div')`
   grid-template-columns: min-content 1fr;
   font-size: ${p => p.theme.fontSize.md};
   align-items: center;
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 
 const StyledTag = styled(Tag)`
@@ -433,7 +433,7 @@ const StyledTag = styled(Tag)`
 `;
 
 const SubText = styled('span')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 
 const VersionAndDetails = styled('div')`
diff --git a/static/app/views/setupWizard/wizardProjectSelection.tsx b/static/app/views/setupWizard/wizardProjectSelection.tsx
index 7eddc853be8256..1531a9d3851dec 100644
--- a/static/app/views/setupWizard/wizardProjectSelection.tsx
+++ b/static/app/views/setupWizard/wizardProjectSelection.tsx
@@ -480,7 +480,7 @@ const StyledCompactSelect = styled(CompactSelect)`
 
 const SelectPlaceholder = styled('span')`
   ${p => p.theme.overflowEllipsis}
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-weight: normal;
   text-align: left;
 `;
diff --git a/static/app/views/sharedGroupDetails/sharedGroupHeader.tsx b/static/app/views/sharedGroupDetails/sharedGroupHeader.tsx
index 92b5f50bd29835..d21b65d44a91e0 100644
--- a/static/app/views/sharedGroupDetails/sharedGroupHeader.tsx
+++ b/static/app/views/sharedGroupDetails/sharedGroupHeader.tsx
@@ -97,6 +97,6 @@ const TimeStamp = styled('div')`
 `;
 
 const EventTimeLabel = styled('span')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   margin-left: ${space(0.25)};
 `;
diff --git a/static/gsAdmin/components/customers/customerStats.tsx b/static/gsAdmin/components/customers/customerStats.tsx
index af492646a9105c..20ed2135a173ab 100644
--- a/static/gsAdmin/components/customers/customerStats.tsx
+++ b/static/gsAdmin/components/customers/customerStats.tsx
@@ -508,7 +508,7 @@ const Footer = styled('div')`
   border-top: 1px solid ${p => p.theme.tokens.border.primary};
   margin: ${space(3)} -${space(2)} -${space(2)} -${space(2)};
   padding: ${space(2)};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 
 const LegendContainer = styled('div')`
diff --git a/static/gsAdmin/components/detailsContainer.tsx b/static/gsAdmin/components/detailsContainer.tsx
index 5d8e1ff9ad3ed5..2b29f54aeaba81 100644
--- a/static/gsAdmin/components/detailsContainer.tsx
+++ b/static/gsAdmin/components/detailsContainer.tsx
@@ -14,7 +14,7 @@ const DetailsContainer = styled('div')`
     padding-bottom: ${space(0.5)};
     text-transform: uppercase;
     font-size: ${p => p.theme.fontSize.md};
-    color: ${p => p.theme.subText};
+    color: ${p => p.theme.tokens.content.secondary};
     border-bottom: 1px solid ${p => p.theme.tokens.border.secondary};
   }
 `;
diff --git a/static/gsAdmin/views/customerUpgradeRequest.tsx b/static/gsAdmin/views/customerUpgradeRequest.tsx
index aef8630e8940a3..5162b32af8aedf 100644
--- a/static/gsAdmin/views/customerUpgradeRequest.tsx
+++ b/static/gsAdmin/views/customerUpgradeRequest.tsx
@@ -206,7 +206,7 @@ const Divider = styled(PanelItem)`
   font-size: ${p => p.theme.fontSize.md};
   padding: ${space(1.5)} ${space(2)};
   background: ${p => p.theme.backgroundSecondary};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 
 export default CustomerUpgradeRequest;
diff --git a/static/gsAdmin/views/home.tsx b/static/gsAdmin/views/home.tsx
index aaf831370e7cb5..6da66890447824 100644
--- a/static/gsAdmin/views/home.tsx
+++ b/static/gsAdmin/views/home.tsx
@@ -184,7 +184,7 @@ const OverviewWrap = styled('div')`
   margin: ${space(2)} 0;
 `;
 const SecondaryText = styled('span')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 
 const Centered = styled('div')`
diff --git a/static/gsAdmin/views/layout.tsx b/static/gsAdmin/views/layout.tsx
index 77e629ede590c1..8e64040c0e5d8b 100644
--- a/static/gsAdmin/views/layout.tsx
+++ b/static/gsAdmin/views/layout.tsx
@@ -154,7 +154,7 @@ const ThemeToggle = styled(Button)`
   text-transform: uppercase;
   font-size: ${p => p.theme.fontSize.sm};
   font-weight: bold;
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 
 const Navigation = styled('ul')`
diff --git a/static/gsApp/components/ai/AiSetupDataConsent.tsx b/static/gsApp/components/ai/AiSetupDataConsent.tsx
index 48fd93b2c77bf9..b8df69940d5571 100644
--- a/static/gsApp/components/ai/AiSetupDataConsent.tsx
+++ b/static/gsApp/components/ai/AiSetupDataConsent.tsx
@@ -325,7 +325,7 @@ const SingleCard = styled('div')`
 const MeetSeerHeader = styled('div')`
   font-size: ${p => p.theme.fontSize.md};
   font-weight: ${p => p.theme.fontWeight.bold};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 
 const BulletList = styled('ul')`
@@ -344,7 +344,7 @@ const TouchCustomerMessage = styled('p')`
 
 const LegalText = styled('div')`
   font-size: ${p => p.theme.fontSize.sm};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   margin-top: ${space(1)};
 `;
 
diff --git a/static/gsApp/components/codecovPromotionModal.tsx b/static/gsApp/components/codecovPromotionModal.tsx
index c79ccc4bc911f9..ad9aabb0c8354f 100644
--- a/static/gsApp/components/codecovPromotionModal.tsx
+++ b/static/gsApp/components/codecovPromotionModal.tsx
@@ -145,7 +145,7 @@ const PriceWrapper = styled('div')`
 
 const SeatText = styled('div')`
   font-size: ${p => p.theme.fontSize.sm};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 
 const OffsetIconArrow = styled(IconArrow)`
diff --git a/static/gsApp/components/dataConsentBanner.tsx b/static/gsApp/components/dataConsentBanner.tsx
index 41561c5d8b86c5..464c6fdc77dddc 100644
--- a/static/gsApp/components/dataConsentBanner.tsx
+++ b/static/gsApp/components/dataConsentBanner.tsx
@@ -182,6 +182,6 @@ const DismissButton = styled(Button)`
   position: absolute;
   top: ${space(1)};
   right: ${space(1)};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   z-index: 1;
 `;
diff --git a/static/gsApp/components/dataConsentModal.tsx b/static/gsApp/components/dataConsentModal.tsx
index 28785a504bbbc0..c6d6fe7ed17a41 100644
--- a/static/gsApp/components/dataConsentModal.tsx
+++ b/static/gsApp/components/dataConsentModal.tsx
@@ -175,7 +175,7 @@ const InfoHeader = styled('div')`
 
 const ConsentHeader = styled('p')`
   font-weight: bold;
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   text-transform: uppercase;
   margin-bottom: ${space(1)};
 `;
@@ -205,13 +205,13 @@ const ConsentLabelHeader = styled('div')`
 `;
 const ConsentLabelBody = styled('p')`
   margin-bottom: 0;
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-size: ${p => p.theme.fontSize.md};
 `;
 
 const StyledIconWrapper = styled('span')`
   margin-left: ${space(3)};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 
 const Footer = styled('div')`
@@ -261,7 +261,7 @@ const DismissButton = styled(Button)`
   position: absolute;
   top: ${space(1)};
   right: ${space(1)};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   z-index: 1;
   background-color: rgba(255, 255, 255, 0.8);
   border-radius: 50%;
diff --git a/static/gsApp/components/dataConsentPriorityLearnMore.tsx b/static/gsApp/components/dataConsentPriorityLearnMore.tsx
index 1983dcf0faceb9..3bf988eb953307 100644
--- a/static/gsApp/components/dataConsentPriorityLearnMore.tsx
+++ b/static/gsApp/components/dataConsentPriorityLearnMore.tsx
@@ -106,7 +106,7 @@ const DismissButton = styled(Button)`
   position: absolute;
   top: ${space(1)};
   right: ${space(1.5)};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 
 const BannerStar1 = styled('img')`
diff --git a/static/gsApp/components/features/disabledSelectorItems.tsx b/static/gsApp/components/features/disabledSelectorItems.tsx
index 62eb49c7532555..194a4213d22048 100644
--- a/static/gsApp/components/features/disabledSelectorItems.tsx
+++ b/static/gsApp/components/features/disabledSelectorItems.tsx
@@ -113,7 +113,7 @@ const SelectorItemLabel = styled('div')`
 
 const UpsellMessage = styled('p')`
   font-size: ${p => p.theme.fontSize.sm};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   margin-bottom: 0;
 `;
 
diff --git a/static/gsApp/components/partnerPlanEndingModal.tsx b/static/gsApp/components/partnerPlanEndingModal.tsx
index 66c83b035fb3c3..2707845ef1bc5a 100644
--- a/static/gsApp/components/partnerPlanEndingModal.tsx
+++ b/static/gsApp/components/partnerPlanEndingModal.tsx
@@ -258,7 +258,7 @@ const PathHeading = styled('h5')`
 const SubHeading = styled('div')`
   font-weight: bold;
   font-size: ${p => p.theme.fontSize.md};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   text-transform: uppercase;
 `;
 
diff --git a/static/gsApp/components/profiling/profilingUpgradeModal.tsx b/static/gsApp/components/profiling/profilingUpgradeModal.tsx
index 9dc6920546ee55..eec1a2c00fd259 100644
--- a/static/gsApp/components/profiling/profilingUpgradeModal.tsx
+++ b/static/gsApp/components/profiling/profilingUpgradeModal.tsx
@@ -155,7 +155,7 @@ const UpsellContent = styled('div')`
 `;
 
 const Note = styled('p')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-size: ${p => p.theme.fontSize.xs};
 `;
 
diff --git a/static/gsApp/components/promotionPriceDisplay.tsx b/static/gsApp/components/promotionPriceDisplay.tsx
index 6d0bfc96f1d223..c9436acaafd5a7 100644
--- a/static/gsApp/components/promotionPriceDisplay.tsx
+++ b/static/gsApp/components/promotionPriceDisplay.tsx
@@ -46,7 +46,8 @@ const Amount = styled('div')<{promo?: boolean}>`
   font-size: 30px;
   font-weight: ${p => (p.promo ? 'bold' : 'none')};
   text-decoration: ${p => (p.promo ? 'none' : 'line-through')};
-  color: ${p => (p.promo ? p.theme.tokens.content.primary : p.theme.subText)};
+  color: ${p =>
+    p.promo ? p.theme.tokens.content.primary : p.theme.tokens.content.secondary};
 `;
 
 const BillingInterval = styled('div')`
diff --git a/static/gsApp/components/stripeWrapper.tsx b/static/gsApp/components/stripeWrapper.tsx
index 045db5b5b0537b..213fb955c88038 100644
--- a/static/gsApp/components/stripeWrapper.tsx
+++ b/static/gsApp/components/stripeWrapper.tsx
@@ -59,7 +59,7 @@ function StripeWrapper({
             },
             '.Label': {
               fontSize: theme.fontSize.sm,
-              color: theme.subText,
+              color: theme.tokens.content.secondary,
             },
           },
         },
diff --git a/static/gsApp/components/upgradeNowModal/index.tsx b/static/gsApp/components/upgradeNowModal/index.tsx
index a04b72fe994b8f..928fdc2e3463bf 100644
--- a/static/gsApp/components/upgradeNowModal/index.tsx
+++ b/static/gsApp/components/upgradeNowModal/index.tsx
@@ -140,7 +140,7 @@ const UpsellContent = styled('div')`
 `;
 
 const Note = styled('p')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-size: ${p => p.theme.fontSize.xs};
 `;
 
diff --git a/static/gsApp/components/upgradeNowModal/modalSamePrice.tsx b/static/gsApp/components/upgradeNowModal/modalSamePrice.tsx
index cd3c6dbaccabfb..e0ce3ff0746e8e 100644
--- a/static/gsApp/components/upgradeNowModal/modalSamePrice.tsx
+++ b/static/gsApp/components/upgradeNowModal/modalSamePrice.tsx
@@ -160,7 +160,7 @@ const CTASecondary = styled('div')`
 
 const Note = styled('p')`
   text-align: center;
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-size: ${p => p.theme.fontSize.xs};
   margin-block: ${space(4)};
 `;
diff --git a/static/gsApp/components/upsellModal/featureList.tsx b/static/gsApp/components/upsellModal/featureList.tsx
index ffb340ed892820..6d3d1f183155a0 100644
--- a/static/gsApp/components/upsellModal/featureList.tsx
+++ b/static/gsApp/components/upsellModal/featureList.tsx
@@ -119,7 +119,7 @@ const Heading = styled('div')`
 const FeatureLink = styled(motion.div)`
   cursor: pointer;
   transition: color 300ms;
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   position: relative;
   display: grid;
   grid-template-columns: max-content auto;
diff --git a/static/gsApp/components/upsellModal/footer.tsx b/static/gsApp/components/upsellModal/footer.tsx
index c882f62f75dc9f..076e1e66d164fb 100644
--- a/static/gsApp/components/upsellModal/footer.tsx
+++ b/static/gsApp/components/upsellModal/footer.tsx
@@ -83,7 +83,7 @@ const SidebarFooter = styled('div')`
   margin-left: auto;
   font-size: ${p => p.theme.fontSize.md};
   white-space: nowrap;
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   h1 {
     text-transform: uppercase;
     font-weight: bold;
diff --git a/static/gsApp/hooks/orgStatsBanner.tsx b/static/gsApp/hooks/orgStatsBanner.tsx
index 6fd4373dca9171..411e2316cf7c99 100644
--- a/static/gsApp/hooks/orgStatsBanner.tsx
+++ b/static/gsApp/hooks/orgStatsBanner.tsx
@@ -126,7 +126,7 @@ const Heading = styled('span')`
 `;
 
 const SubText = styled(TextBlock)`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   margin: 0;
 `;
 
diff --git a/static/gsApp/views/amCheckout/components/cartDiff.tsx b/static/gsApp/views/amCheckout/components/cartDiff.tsx
index f3de5e4013bb1f..fde92f109486c9 100644
--- a/static/gsApp/views/amCheckout/components/cartDiff.tsx
+++ b/static/gsApp/views/amCheckout/components/cartDiff.tsx
@@ -655,7 +655,7 @@ const Removed = styled(Change)<{prefersDarkMode?: boolean}>`
 const ChangedCategory = styled('div')`
   font-family: ${p => p.theme.text.familyMono};
   font-size: ${p => p.theme.fontSize.sm};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 
 const ChangeSection = styled('div')`
diff --git a/static/gsApp/views/amCheckout/components/moreFeaturesLink.tsx b/static/gsApp/views/amCheckout/components/moreFeaturesLink.tsx
index 14fda59bdacaa2..9916b79cce65e0 100644
--- a/static/gsApp/views/amCheckout/components/moreFeaturesLink.tsx
+++ b/static/gsApp/views/amCheckout/components/moreFeaturesLink.tsx
@@ -27,7 +27,7 @@ const MoreLink = styled(ExternalLink)<{color?: string}>`
   gap: ${space(1)};
   align-items: center;
   align-content: center;
-  color: ${p => p.color ?? p.theme.subText};
+  color: ${p => p.color ?? p.theme.tokens.content.secondary};
 
   &:hover,
   &:focus,
diff --git a/static/gsApp/views/amCheckout/components/unitTypeItem.tsx b/static/gsApp/views/amCheckout/components/unitTypeItem.tsx
index 59b78cf38546f6..06c0d8cdd1faaf 100644
--- a/static/gsApp/views/amCheckout/components/unitTypeItem.tsx
+++ b/static/gsApp/views/amCheckout/components/unitTypeItem.tsx
@@ -48,11 +48,11 @@ const Description = styled('p')`
   font-size: ${p => p.theme.fontSize.md};
   margin-bottom: 0px;
   font-weight: normal;
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 
 const UnitTitle = styled('div')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-size: ${p => p.theme.fontSize.sm};
   text-transform: uppercase;
   font-weight: 600;
diff --git a/static/gsApp/views/amCheckout/components/volumeSliders.tsx b/static/gsApp/views/amCheckout/components/volumeSliders.tsx
index 1ba04b45ee24df..b9e9ae62fb6033 100644
--- a/static/gsApp/views/amCheckout/components/volumeSliders.tsx
+++ b/static/gsApp/views/amCheckout/components/volumeSliders.tsx
@@ -277,7 +277,7 @@ const SpaceBetweenGrid = styled('div')`
 
 const Description = styled(SpaceBetweenGrid)`
   font-size: ${p => p.theme.fontSize.sm};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 
 const MinMax = styled(Description)`
@@ -295,7 +295,7 @@ const StyledHovercard = styled(Hovercard)`
   width: 400px;
 
   ${Header} {
-    color: ${p => p.theme.subText};
+    color: ${p => p.theme.tokens.content.secondary};
     text-transform: uppercase;
     font-size: ${p => p.theme.fontSize.sm};
     border-radius: 6px 6px 0px 0px;
diff --git a/static/gsApp/views/amCheckout/index.tsx b/static/gsApp/views/amCheckout/index.tsx
index 62a2ed9c2fb8db..24ba40cf4da6c4 100644
--- a/static/gsApp/views/amCheckout/index.tsx
+++ b/static/gsApp/views/amCheckout/index.tsx
@@ -872,7 +872,7 @@ const CheckoutHeader = styled('header')`
 
 const OrgSlug = styled('div')`
   font-family: ${p => p.theme.text.familyMono};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   text-overflow: ellipsis;
   text-wrap: nowrap;
   flex: 1;
diff --git a/static/gsApp/views/legalAndCompliance/gdprPanel.tsx b/static/gsApp/views/legalAndCompliance/gdprPanel.tsx
index 8ef81c5110610f..8103a5e873de92 100644
--- a/static/gsApp/views/legalAndCompliance/gdprPanel.tsx
+++ b/static/gsApp/views/legalAndCompliance/gdprPanel.tsx
@@ -204,7 +204,7 @@ const ItemLayout = styled(PanelItem)`
 `;
 
 const SubText = styled('div')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-size: ${p => p.theme.fontSize.sm};
 `;
 
diff --git a/static/gsApp/views/legalAndCompliance/policyRow.tsx b/static/gsApp/views/legalAndCompliance/policyRow.tsx
index ea286e4fb8ecd2..6e1ba7dc9e0483 100644
--- a/static/gsApp/views/legalAndCompliance/policyRow.tsx
+++ b/static/gsApp/views/legalAndCompliance/policyRow.tsx
@@ -248,7 +248,7 @@ const PolicyFrame = styled('iframe')`
 
 const PolicySubtext = styled('div')`
   font-size: ${p => p.theme.fontSize.sm};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 
 const PolicyTitle = styled('h6')`
diff --git a/static/gsApp/views/seerAutomation/components/seerAutomationProjectList.tsx b/static/gsApp/views/seerAutomation/components/seerAutomationProjectList.tsx
index 09f2d547a7a55a..27e03d21a6b9f5 100644
--- a/static/gsApp/views/seerAutomation/components/seerAutomationProjectList.tsx
+++ b/static/gsApp/views/seerAutomation/components/seerAutomationProjectList.tsx
@@ -90,7 +90,7 @@ function ProjectSeerSetting({project, orgSlug}: {orgSlug: string; project: Proje
 }
 
 const ValueWrapper = styled('span')<{isDangerous?: boolean}>`
-  color: ${p => (p.isDangerous ? p.theme.errorText : p.theme.subText)};
+  color: ${p => (p.isDangerous ? p.theme.errorText : p.theme.tokens.content.secondary)};
 `;
 
 const Subheading = styled('span')`
@@ -105,7 +105,7 @@ const SeerDropdownLabel = styled('div')`
 
 const SeerDropdownDescription = styled('div')`
   font-size: ${p => p.theme.fontSize.sm};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 
 function getSeerLabel(key: string, seerScannerAutomation: boolean) {
@@ -429,7 +429,7 @@ const SearchBarWrapper = styled('div')`
 `;
 
 const SeerValue = styled('div')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   display: flex;
   justify-content: flex-end;
   gap: ${space(4)};
diff --git a/static/gsApp/views/seerAutomation/onboarding/common.tsx b/static/gsApp/views/seerAutomation/onboarding/common.tsx
index e96e1af34c71a1..c640dc30dc4e7b 100644
--- a/static/gsApp/views/seerAutomation/onboarding/common.tsx
+++ b/static/gsApp/views/seerAutomation/onboarding/common.tsx
@@ -35,6 +35,6 @@ export const FieldLabel = styled('div')`
 
 export const FieldDescription = styled('div')`
   font-size: ${p => p.theme.fontSize.sm};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   line-height: 1.4;
 `;
diff --git a/static/gsApp/views/seerAutomation/onboarding/onboardingLegacy.tsx b/static/gsApp/views/seerAutomation/onboarding/onboardingLegacy.tsx
index ebf6f4f494bef0..5b9a1ea4c5bd70 100644
--- a/static/gsApp/views/seerAutomation/onboarding/onboardingLegacy.tsx
+++ b/static/gsApp/views/seerAutomation/onboarding/onboardingLegacy.tsx
@@ -832,7 +832,7 @@ const ProjectName = styled('span')`
 
 const StepDescription = styled('div')`
   margin-bottom: ${space(2)};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 
 const HeaderText = styled('div')`
@@ -842,7 +842,7 @@ const HeaderText = styled('div')`
 const EmptyState = styled('div')`
   padding: ${space(2)};
   text-align: center;
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 
 const LoadingState = styled('div')`
@@ -851,7 +851,7 @@ const LoadingState = styled('div')`
   align-items: center;
   gap: ${space(1)};
   padding: ${space(3)};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 
 const StyledGuidedSteps = styled(GuidedSteps)`
@@ -878,7 +878,7 @@ const ScanActionWrapper = styled('div')`
 `;
 
 const EmptyProjectsMessage = styled('div')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-weight: ${p => p.theme.fontWeight.bold};
 `;
 
@@ -907,7 +907,7 @@ const CustomizationList = styled('ul')`
 
   li {
     margin-bottom: ${space(1)};
-    color: ${p => p.theme.subText};
+    color: ${p => p.theme.tokens.content.secondary};
   }
 `;
 
diff --git a/static/gsApp/views/spendAllocations/projectAllocationsTable.tsx b/static/gsApp/views/spendAllocations/projectAllocationsTable.tsx
index 79b1ab756d330d..0cbe791d3229cb 100644
--- a/static/gsApp/views/spendAllocations/projectAllocationsTable.tsx
+++ b/static/gsApp/views/spendAllocations/projectAllocationsTable.tsx
@@ -132,7 +132,7 @@ const Table = styled('table')`
 `;
 
 const HeaderCell = styled('th')`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   font-size: ${p => p.theme.fontSize.sm};
   font-weight: 600;
   text-transform: uppercase;
diff --git a/static/gsApp/views/spendLimits/spendLimitSettings.tsx b/static/gsApp/views/spendLimits/spendLimitSettings.tsx
index fe0d677fbafc42..cdf45c12436cd0 100644
--- a/static/gsApp/views/spendLimits/spendLimitSettings.tsx
+++ b/static/gsApp/views/spendLimits/spendLimitSettings.tsx
@@ -739,7 +739,7 @@ const Currency = styled('div')`
     position: absolute;
     padding: 9px ${p => p.theme.space.lg};
     content: '$';
-    color: ${p => p.theme.subText};
+    color: ${p => p.theme.tokens.content.secondary};
     font-size: ${p => p.theme.fontSize.md};
   }
 `;
diff --git a/static/gsApp/views/spikeProtection/spikeProtectionTimeDetails.tsx b/static/gsApp/views/spikeProtection/spikeProtectionTimeDetails.tsx
index 11d10d84576e1e..7f916e815c58bf 100644
--- a/static/gsApp/views/spikeProtection/spikeProtectionTimeDetails.tsx
+++ b/static/gsApp/views/spikeProtection/spikeProtectionTimeDetails.tsx
@@ -49,7 +49,7 @@ const SpikeTimeDetailsWrapper = styled('div')`
     white-space: nowrap;
   }
   span {
-    color: ${p => p.theme.subText};
+    color: ${p => p.theme.tokens.content.secondary};
     display: inline-block;
   }
 `;
diff --git a/static/gsApp/views/subscriptionPage/headerCards/paygCard.tsx b/static/gsApp/views/subscriptionPage/headerCards/paygCard.tsx
index 04e0a7c121bf38..7a33cf72b3644a 100644
--- a/static/gsApp/views/subscriptionPage/headerCards/paygCard.tsx
+++ b/static/gsApp/views/subscriptionPage/headerCards/paygCard.tsx
@@ -262,7 +262,7 @@ const Currency = styled('div')`
     position: absolute;
     padding: 9px ${p => p.theme.space.xl} ${p => p.theme.space.md};
     content: '$';
-    color: ${p => p.theme.subText};
+    color: ${p => p.theme.tokens.content.secondary};
     font-size: ${p => p.theme.fontSize.sm};
     font-weight: bold;
   }
diff --git a/static/gsApp/views/subscriptionPage/planMigrationActive/planMigrationTable.tsx b/static/gsApp/views/subscriptionPage/planMigrationActive/planMigrationTable.tsx
index 072f4a2ca0139e..1d3d5a7f6a776f 100644
--- a/static/gsApp/views/subscriptionPage/planMigrationActive/planMigrationTable.tsx
+++ b/static/gsApp/views/subscriptionPage/planMigrationActive/planMigrationTable.tsx
@@ -295,7 +295,7 @@ const TableContainer = styled('div')`
 
 const Credits = styled('p')`
   font-size: ${p => p.theme.fontSize.sm};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 
 export default PlanMigrationTable;
diff --git a/static/gsApp/views/subscriptionPage/recurringCredits.tsx b/static/gsApp/views/subscriptionPage/recurringCredits.tsx
index d189e6cabdde36..5758b13fdb553f 100644
--- a/static/gsApp/views/subscriptionPage/recurringCredits.tsx
+++ b/static/gsApp/views/subscriptionPage/recurringCredits.tsx
@@ -151,7 +151,7 @@ const StyledPanelBody = styled(PanelBodyWithTable)`
 
 const SubText = styled('p')`
   font-size: ${p => p.theme.fontSize.md};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 `;
 
 const Title = styled('td')`
diff --git a/static/gsApp/views/subscriptionPage/styles.tsx b/static/gsApp/views/subscriptionPage/styles.tsx
index 701a1fb7a4fac4..2802ad7365b49b 100644
--- a/static/gsApp/views/subscriptionPage/styles.tsx
+++ b/static/gsApp/views/subscriptionPage/styles.tsx
@@ -40,7 +40,7 @@ export const StripedTable = styled('table')`
 
 export const AlertStripedTable = styled(StripedTable)`
   text-align: center;
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
 
   th {
     text-transform: uppercase;
diff --git a/static/gsApp/views/subscriptionPage/trialAlert.tsx b/static/gsApp/views/subscriptionPage/trialAlert.tsx
index 361c26c58432e0..8861e421a78de6 100644
--- a/static/gsApp/views/subscriptionPage/trialAlert.tsx
+++ b/static/gsApp/views/subscriptionPage/trialAlert.tsx
@@ -94,7 +94,7 @@ const StyledHeading = styled('span')`
 `;
 
 const StyledSubText = styled(TextBlock)`
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   margin: 0;
 `;
 
diff --git a/static/gsApp/views/subscriptionPage/usageAlert.tsx b/static/gsApp/views/subscriptionPage/usageAlert.tsx
index facd1f49b72e10..a2b5d9d149578f 100644
--- a/static/gsApp/views/subscriptionPage/usageAlert.tsx
+++ b/static/gsApp/views/subscriptionPage/usageAlert.tsx
@@ -316,6 +316,6 @@ const UsageInfo = styled('div')`
 
 const Description = styled(TextBlock)`
   font-size: ${p => p.theme.fontSize.md};
-  color: ${p => p.theme.subText};
+  color: ${p => p.theme.tokens.content.secondary};
   margin-bottom: 0;
 `;