diff --git a/src/plugins/start/developer-kit/screens/AssetBrowserSettingScreen.tsx b/src/plugins/start/developer-kit/screens/AssetBrowserSettingScreen.tsx
index de06e08..5206923 100644
--- a/src/plugins/start/developer-kit/screens/AssetBrowserSettingScreen.tsx
+++ b/src/plugins/start/developer-kit/screens/AssetBrowserSettingScreen.tsx
@@ -181,7 +181,10 @@ function openAssetDisplayAlert(
                             />
                         ))}
                     </TableRowGroup>
-                    <Text color="text-danger" variant="text-xs/semibold">
+                    <Text
+                        color="text-feedback-critical"
+                        variant="text-xs/semibold"
+                    >
                         Note: Asset IDs and module IDs are not consistent
                         between app launches and app versions respectively and
                         should only be used when absolutely needed.
@@ -196,7 +199,7 @@ function openAssetDisplayAlert(
 function PreviewUnavailable({ type }: { type: string }) {
     return (
         <Text
-            color="text-danger"
+            color="text-feedback-critical"
             style={styles.centeredText}
             variant="text-sm/medium"
         >
diff --git a/src/plugins/start/error-boundary/components/ErrorBoundaryScreen.tsx b/src/plugins/start/error-boundary/components/ErrorBoundaryScreen.tsx
index 6ad117b..fb805ec 100644
--- a/src/plugins/start/error-boundary/components/ErrorBoundaryScreen.tsx
+++ b/src/plugins/start/error-boundary/components/ErrorBoundaryScreen.tsx
@@ -12,7 +12,7 @@ const { createStyles, Button, Card, Stack, Text } = Design
 
 const useErrorBoundaryStyles = createStyles({
     view: {
-        backgroundColor: Tokens.default.colors.BG_BASE_SECONDARY,
+        backgroundColor: Tokens.default.colors.BACKGROUND_BASE_LOWER,
         paddingHorizontal: 16,
         paddingVertical: 24,
         flex: 1,
diff --git a/src/plugins/start/settings/components/NavigatorHeaderWithIcon.tsx b/src/plugins/start/settings/components/NavigatorHeaderWithIcon.tsx
index 3d01d51..3f74fb5 100644
--- a/src/plugins/start/settings/components/NavigatorHeaderWithIcon.tsx
+++ b/src/plugins/start/settings/components/NavigatorHeaderWithIcon.tsx
@@ -32,6 +32,6 @@ const useNavigatorHeaderStyles = createStyles({
         width: 24,
         height: 24,
         marginEnd: 8,
-        tintColor: tokens.colors.HEADER_PRIMARY,
+        tintColor: tokens.colors.MOBILE_TEXT_HEADING_PRIMARY,
     },
 })
diff --git a/src/plugins/start/settings/components/PluginCard.tsx b/src/plugins/start/settings/components/PluginCard.tsx
index 1e62ec0..f77c0a6 100644
--- a/src/plugins/start/settings/components/PluginCard.tsx
+++ b/src/plugins/start/settings/components/PluginCard.tsx
@@ -227,7 +227,7 @@ const usePluginCardStyles = createStyles({
     icon: {
         width: 20,
         height: 20,
-        tintColor: Tokens.default.colors.TEXT_NORMAL,
+        tintColor: Tokens.default.colors.TEXT_DEFAULT,
     },
     card: {
         paddingVertical: 12,
diff --git a/src/plugins/start/settings/components/PluginClearDataConfirmationAlert.tsx b/src/plugins/start/settings/components/PluginClearDataConfirmationAlert.tsx
index fe3479f..0010f45 100644
--- a/src/plugins/start/settings/components/PluginClearDataConfirmationAlert.tsx
+++ b/src/plugins/start/settings/components/PluginClearDataConfirmationAlert.tsx
@@ -14,9 +14,9 @@ export default function PluginClearDataConfirmationAlert({
         <AlertModal
             title="Clear plugin data?"
             content={
-                <Text color="header-secondary">
+                <Text color="text-default">
                     All data, including files and settings for{' '}
-                    <Text variant="text-md/semibold" color="text-normal">
+                    <Text variant="text-md/semibold" color="text-default">
                         {plugin.manifest.name}
                     </Text>{' '}
                     will be deleted
diff --git a/src/plugins/start/settings/components/PluginHasDependenciesAlert.tsx b/src/plugins/start/settings/components/PluginHasDependenciesAlert.tsx
index b008f18..bd6a9a0 100644
--- a/src/plugins/start/settings/components/PluginHasDependenciesAlert.tsx
+++ b/src/plugins/start/settings/components/PluginHasDependenciesAlert.tsx
@@ -22,9 +22,9 @@ export default function PluginHasDependenciesAlert({
         <AlertModal
             title="Plugin has dependencies"
             content={
-                <Text color="header-secondary">
+                <Text color="text-default">
                     Plugin{' '}
-                    <Text variant="text-md/semibold" color="text-normal">
+                    <Text variant="text-md/semibold" color="text-default">
                         {plugin.manifest.name}
                     </Text>{' '}
                     depends on other plugins to function.
diff --git a/src/plugins/start/settings/components/PluginHasDependentsAlert.tsx b/src/plugins/start/settings/components/PluginHasDependentsAlert.tsx
index 066066b..4b8f502 100644
--- a/src/plugins/start/settings/components/PluginHasDependentsAlert.tsx
+++ b/src/plugins/start/settings/components/PluginHasDependentsAlert.tsx
@@ -22,9 +22,9 @@ export default function PluginHasDependentsAlert({
         <AlertModal
             title="Plugin has dependents"
             content={
-                <Text color="header-secondary">
+                <Text color="text-default">
                     Other plugins depend on{' '}
-                    <Text variant="text-md/semibold" color="text-normal">
+                    <Text variant="text-md/semibold" color="text-default">
                         {plugin.manifest.name}
                     </Text>{' '}
                     to function.
diff --git a/src/plugins/start/settings/components/PluginsFailedToStartAlert.tsx b/src/plugins/start/settings/components/PluginsFailedToStartAlert.tsx
index 84e36da..74fe2e4 100644
--- a/src/plugins/start/settings/components/PluginsFailedToStartAlert.tsx
+++ b/src/plugins/start/settings/components/PluginsFailedToStartAlert.tsx
@@ -16,7 +16,7 @@ export default function PluginsFailedToStartAlert({
         <AlertModal
             title="Plugins failed to start"
             content={
-                <Text variant="text-md/medium" color="header-secondary">
+                <Text variant="text-md/medium" color="text-default">
                     The following plugins encountered errors while starting:
                     {'\n'}
                     {plugins.map((plugin, index) => (
@@ -25,7 +25,7 @@ export default function PluginsFailedToStartAlert({
                             <Text
                                 key={plugin.manifest.id}
                                 variant="text-md/bold"
-                                color="text-normal"
+                                color="text-default"
                             >
                                 {plugin.manifest.name}
                             </Text>
diff --git a/src/plugins/start/settings/components/PluginsRequireReloadAlert.tsx b/src/plugins/start/settings/components/PluginsRequireReloadAlert.tsx
index bcf7520..0c7209a 100644
--- a/src/plugins/start/settings/components/PluginsRequireReloadAlert.tsx
+++ b/src/plugins/start/settings/components/PluginsRequireReloadAlert.tsx
@@ -13,7 +13,7 @@ export default function PluginsRequireReloadAlert({
         <AlertModal
             title="Reload Required"
             content={
-                <Text variant="text-md/medium" color="header-secondary">
+                <Text variant="text-md/medium" color="text-default">
                     The following plugins require a reload to apply changes:
                     {'\n'}
                     {plugins.map((plugin, index) => (
@@ -22,7 +22,7 @@ export default function PluginsRequireReloadAlert({
                             <Text
                                 key={plugin.manifest.id}
                                 variant="text-md/bold"
-                                color="text-normal"
+                                color="text-default"
                             >
                                 {plugin.manifest.name}
                             </Text>
diff --git a/src/plugins/start/user-badges/index.tsx b/src/plugins/start/user-badges/index.tsx
index b967215..e53d32d 100644
--- a/src/plugins/start/user-badges/index.tsx
+++ b/src/plugins/start/user-badges/index.tsx
@@ -205,7 +205,10 @@ function openBadgeDialog(
                         source={icon}
                         style={[styles.display, bnw && badgeStyles.tinted]}
                     />
-                    <Text variant="heading-lg/bold" color="header-primary">
+                    <Text
+                        variant="heading-lg/bold"
+                        color="mobile-text-heading-primary"
+                    >
                         {label}
                     </Text>
                 </Stack>
diff --git a/src/plugins/start/user-badges/styles.ts b/src/plugins/start/user-badges/styles.ts
index 54615a6..1749c24 100644
--- a/src/plugins/start/user-badges/styles.ts
+++ b/src/plugins/start/user-badges/styles.ts
@@ -4,7 +4,7 @@ import { StyleSheet } from 'react-native'
 
 export const useBadgeStyles = Design.createStyles({
     tinted: {
-        tintColor: Tokens.default.colors.HEADER_PRIMARY,
+        tintColor: Tokens.default.colors.MOBILE_TEXT_HEADING_PRIMARY,
     },
 })