diff --git a/src/core/ui/components/AddonCard.tsx b/src/core/ui/components/AddonCard.tsx
index 973ee38..ad6083d 100644
--- a/src/core/ui/components/AddonCard.tsx
+++ b/src/core/ui/components/AddonCard.tsx
@@ -32,7 +32,7 @@ const useStyles = createStyles({
     },
     headerLabel: {
         ...TextStyleSheet["heading-md/semibold"],
-        color: semanticColors.HEADER_PRIMARY,
+        color: semanticColors.MOBILE_TEXT_HEADING_PRIMARY,
     },
     headerSubtitle: {
         ...TextStyleSheet["text-md/semibold"],
@@ -40,7 +40,7 @@ const useStyles = createStyles({
     },
     descriptionLabel: {
         ...TextStyleSheet["text-md/semibold"],
-        color: semanticColors.HEADER_PRIMARY,
+        color: semanticColors.TEXT_NORMAL,
     },
     actions: {
         flexDirection: "row-reverse",
@@ -48,7 +48,7 @@ const useStyles = createStyles({
         gap: 5
     },
     iconStyle: {
-        tintColor: semanticColors.LOGO_PRIMARY,
+        tintColor: semanticColors.INTERACTIVE_ICON_DEFAULT,
         opacity: 0.2,
         height: 64,
         width: 64,
diff --git a/src/core/ui/components/AddonPage.tsx b/src/core/ui/components/AddonPage.tsx
index 35a5dcc..3da8d3a 100644
--- a/src/core/ui/components/AddonPage.tsx
+++ b/src/core/ui/components/AddonPage.tsx
@@ -151,7 +151,7 @@ export default function AddonPage<T extends object>({ CardComponent, ...props }:
         return <View style={{ gap: 32, flexGrow: 1, justifyContent: "center", alignItems: "center" }}>
             <View style={{ gap: 8, alignItems: "center" }}>
                 <Image source={findAssetId("empty_quick_switcher")!} />
-                <Text variant="text-lg/semibold" color="text-normal">
+                <Text variant="text-lg/semibold" color="text-default">
                     Oops! Nothing to see here… yet!
                 </Text>
             </View>
@@ -204,7 +204,7 @@ export default function AddonPage<T extends object>({ CardComponent, ...props }:
                 ListHeaderComponent={headerElement}
                 ListEmptyComponent={() => <View style={{ gap: 12, padding: 12, alignItems: "center" }}>
                     <Image source={findAssetId("devices_not_found")!} />
-                    <Text variant="text-lg/semibold" color="text-normal">
+                    <Text variant="text-lg/semibold" color="text-default">
                         Hmmm... could not find that!
                     </Text>
                 </View>}
diff --git a/src/core/ui/settings/pages/Fonts/FontEditor.tsx b/src/core/ui/settings/pages/Fonts/FontEditor.tsx
index 40ac61b..c977f70 100644
--- a/src/core/ui/settings/pages/Fonts/FontEditor.tsx
+++ b/src/core/ui/settings/pages/Fonts/FontEditor.tsx
@@ -332,7 +332,7 @@ export default function FontEditor(props: {
 
                     return <TableRow
                         label={name}
-                        subLabel={error ? <Text variant='text-xs/medium' color='text-danger'>{error.message}</Text> : url}
+                        subLabel={error ? <Text variant='text-xs/medium' color='text-feedback-critical'>{error.message}</Text> : url}
                         trailing={<Stack spacing={8} direction="horizontal">
                             <IconButton
                                 size="sm"
@@ -363,7 +363,7 @@ export default function FontEditor(props: {
                 })}
                 <TableRow label={<NewEntryRow fontName={props.name} fontEntry={fontEntries} />} />
             </TableRowGroup>
-            {errors && <Text variant='text-sm/medium' color='text-danger'>Some font entries cannot be imported. Please modify the entries and try again.</Text>}
+            {errors && <Text variant='text-sm/medium' color='text-feedback-critical'>Some font entries cannot be imported. Please modify the entries and try again.</Text>}
             <View style={{ flexDirection: "row", justifyContent: "flex-end", bottom: 0, left: 0 }}>
                 <Button
                     size="lg"
diff --git a/src/core/ui/settings/pages/Plugins/sheets/PluginInfoActionSheet.tsx b/src/core/ui/settings/pages/Plugins/sheets/PluginInfoActionSheet.tsx
index d857f28..93546bb 100644
--- a/src/core/ui/settings/pages/Plugins/sheets/PluginInfoActionSheet.tsx
+++ b/src/core/ui/settings/pages/Plugins/sheets/PluginInfoActionSheet.tsx
@@ -208,7 +208,7 @@ export default function PluginInfoActionSheet({
             color="text-primary"
             style={{
               marginBottom: 4,
-              color: semanticColors.HEADER_PRIMARY,
+              color: "text-strong",
             }}
           >
             Description
diff --git a/src/lib/ui/components/Codeblock.tsx b/src/lib/ui/components/Codeblock.tsx
index 7b37a9a..735bea9 100644
--- a/src/lib/ui/components/Codeblock.tsx
+++ b/src/lib/ui/components/Codeblock.tsx
@@ -14,11 +14,11 @@ const useStyles = createStyles({
         fontFamily: constants.Fonts.CODE_NORMAL,
         fontSize: 12,
         textAlignVertical: "center",
-        backgroundColor: semanticColors.BACKGROUND_SECONDARY,
-        color: semanticColors.TEXT_NORMAL,
+        backgroundColor: semanticColors.CARD_BACKGROUND_DEFAULT,
+        color: semanticColors.TEXT_DEFAULT,
         borderWidth: 1,
         borderRadius: 12,
-        borderColor: semanticColors.BACKGROUND_TERTIARY,
+        borderColor: semanticColors.BORDER_SUBTLE,
         padding: 10,
     },
 });