diff --git a/src/components/Embedded/EmbeddedHashtag.tsx b/src/components/Embedded/EmbeddedHashtag.tsx
index 2105c86c..49017799 100644
--- a/src/components/Embedded/EmbeddedHashtag.tsx
+++ b/src/components/Embedded/EmbeddedHashtag.tsx
@@ -5,7 +5,7 @@ import { TEmbeddedRenderer } from './types'
 export function EmbeddedHashtag({ hashtag }: { hashtag: string }) {
   return (
     <SecondaryPageLink
-      className="text-highlight hover:underline"
+      className="text-primary hover:underline"
       to={toNoteList({ hashtag })}
       onClick={(e) => e.stopPropagation()}
     >
diff --git a/src/components/Embedded/EmbeddedMention.tsx b/src/components/Embedded/EmbeddedMention.tsx
index 540b699e..886244cd 100644
--- a/src/components/Embedded/EmbeddedMention.tsx
+++ b/src/components/Embedded/EmbeddedMention.tsx
@@ -3,12 +3,7 @@ import { TEmbeddedRenderer } from './types'
 
 export function EmbeddedMention({ userId }: { userId: string }) {
   return (
-    <Username
-      userId={userId}
-      showAt
-      className="text-highlight font-normal inline"
-      withoutSkeleton
-    />
+    <Username userId={userId} showAt className="text-primary font-normal inline" withoutSkeleton />
   )
 }
 
diff --git a/src/components/Embedded/EmbeddedNormalUrl.tsx b/src/components/Embedded/EmbeddedNormalUrl.tsx
index 85770f20..a3570482 100644
--- a/src/components/Embedded/EmbeddedNormalUrl.tsx
+++ b/src/components/Embedded/EmbeddedNormalUrl.tsx
@@ -3,7 +3,7 @@ import { TEmbeddedRenderer } from './types'
 export function EmbeddedNormalUrl({ url }: { url: string }) {
   return (
     <a
-      className="text-highlight hover:underline"
+      className="text-primary hover:underline"
       href={url}
       target="_blank"
       onClick={(e) => e.stopPropagation()}
diff --git a/src/components/Embedded/EmbeddedWebsocketUrl.tsx b/src/components/Embedded/EmbeddedWebsocketUrl.tsx
index 17988f02..3fb4fbe2 100644
--- a/src/components/Embedded/EmbeddedWebsocketUrl.tsx
+++ b/src/components/Embedded/EmbeddedWebsocketUrl.tsx
@@ -6,14 +6,14 @@ export function EmbeddedWebsocketUrl({ url }: { url: string }) {
   const { push } = useSecondaryPage()
   return (
     <span
-      className="cursor-pointer px-1 text-highlight hover:bg-highlight/20"
+      className="cursor-pointer px-1 text-primary hover:bg-primary/20"
       onClick={(e) => {
         e.stopPropagation()
         push(toRelay(url))
       }}
     >
       [ {url} ]
-      <span className="w-2 h-1 bg-highlight" />
+      <span className="w-2 h-1 bg-primary" />
     </span>
   )
 }
diff --git a/src/components/FavoriteRelaysSetting/TemporaryRelaySet.tsx b/src/components/FavoriteRelaysSetting/TemporaryRelaySet.tsx
index d8c7220e..48161c99 100644
--- a/src/components/FavoriteRelaysSetting/TemporaryRelaySet.tsx
+++ b/src/components/FavoriteRelaysSetting/TemporaryRelaySet.tsx
@@ -10,7 +10,7 @@ export default function TemporaryRelaySet() {
   }
 
   return (
-    <div className="w-full border border-dashed rounded-lg p-4 border-highlight bg-highlight/5 flex gap-4 justify-between">
+    <div className="w-full border border-dashed rounded-lg p-4 border-primary bg-primary/5 flex gap-4 justify-between">
       <div className="flex-1 w-0">
         <div className="flex justify-between items-center">
           <div className="h-8 font-semibold">Temporary</div>
diff --git a/src/components/FeedSwitcher/index.tsx b/src/components/FeedSwitcher/index.tsx
index c483d799..8aaea151 100644
--- a/src/components/FeedSwitcher/index.tsx
+++ b/src/components/FeedSwitcher/index.tsx
@@ -53,7 +53,7 @@ export default function FeedSwitcher({ close }: { close?: () => void }) {
         <div className="flex justify-end items-center text-sm">
           <SecondaryPageLink
             to={toRelaySettings()}
-            className="text-highlight font-semibold"
+            className="text-primary font-semibold"
             onClick={() => close?.()}
           >
             {t('edit')}
@@ -108,7 +108,7 @@ function FeedSwitcherItem({
 }) {
   return (
     <div
-      className={`w-full border rounded-lg p-4 ${isActive ? 'border-highlight bg-highlight/5' : 'clickable'} ${temporary ? 'border-dashed' : ''}`}
+      className={`w-full border rounded-lg p-4 ${isActive ? 'border-primary bg-primary/5' : 'clickable'} ${temporary ? 'border-dashed' : ''}`}
       onClick={onClick}
     >
       <div className="flex justify-between items-center">
diff --git a/src/components/Nip05/index.tsx b/src/components/Nip05/index.tsx
index c4fda4ab..2f668271 100644
--- a/src/components/Nip05/index.tsx
+++ b/src/components/Nip05/index.tsx
@@ -30,7 +30,7 @@ export default function Nip05({ pubkey }: { pubkey: string }) {
         <a
           href={`https://${nip05Domain}`}
           target="_blank"
-          className={`flex items-center space-x-1 hover:underline truncate ${nip05IsVerified ? 'text-highlight' : 'text-muted-foreground'}`}
+          className={`flex items-center space-x-1 hover:underline truncate ${nip05IsVerified ? 'text-primary' : 'text-muted-foreground'}`}
           rel="noreferrer"
         >
           {nip05IsVerified ? <BadgeCheck className="size-4" /> : <BadgeAlert className="size-4" />}
diff --git a/src/components/RelaySetCard/index.tsx b/src/components/RelaySetCard/index.tsx
index 60d66617..ae01c75c 100644
--- a/src/components/RelaySetCard/index.tsx
+++ b/src/components/RelaySetCard/index.tsx
@@ -18,7 +18,7 @@ export default function RelaySetCard({
 
   return (
     <div
-      className={`w-full border rounded-lg p-4 clickable ${select ? 'border-highlight bg-highlight/5' : ''}`}
+      className={`w-full border rounded-lg p-4 clickable ${select ? 'border-primary bg-primary/5' : ''}`}
       onClick={() => onSelectChange(!select)}
     >
       <div className="flex justify-between items-center">
diff --git a/src/components/ReplyNote/index.tsx b/src/components/ReplyNote/index.tsx
index 1650e3c4..264a5058 100644
--- a/src/components/ReplyNote/index.tsx
+++ b/src/components/ReplyNote/index.tsx
@@ -32,7 +32,7 @@ export default function ReplyNote({
 
   return (
     <div
-      className={`flex space-x-2 items-start px-4 py-3 border-b transition-colors duration-500 ${highlight ? 'bg-highlight/50' : ''}`}
+      className={`flex space-x-2 items-start px-4 py-3 border-b transition-colors duration-500 ${highlight ? 'bg-primary/50' : ''}`}
     >
       <UserAvatar userId={event.pubkey} size="small" className="shrink-0" />
       <div className="w-full overflow-hidden">
diff --git a/src/components/ui/button.tsx b/src/components/ui/button.tsx
index 1c3cc575..c06e9177 100644
--- a/src/components/ui/button.tsx
+++ b/src/components/ui/button.tsx
@@ -14,7 +14,7 @@ const buttonVariants = cva(
         outline:
           'border border-input bg-background shadow-sm hover:bg-accent hover:text-accent-foreground',
         secondary: 'bg-secondary text-secondary-foreground shadow-sm hover:bg-secondary/80',
-        'secondary-2': 'bg-secondary text-secondary-foreground hover:bg-highlight',
+        'secondary-2': 'bg-secondary text-secondary-foreground hover:bg-primary',
         ghost: 'clickable hover:text-accent-foreground',
         link: 'text-primary underline-offset-4 hover:underline'
       },
diff --git a/src/index.css b/src/index.css
index 998048b8..3b8f284b 100644
--- a/src/index.css
+++ b/src/index.css
@@ -73,7 +73,6 @@
     --chart-4: 43 74% 66%;
     --chart-5: 27 87% 67%;
     --radius: 0.5rem;
-    --highlight: 259 43% 56%;
   }
   .dark {
     --background: 240 10% 3.9%;
@@ -100,6 +99,5 @@
     --chart-3: 30 80% 55%;
     --chart-4: 280 65% 60%;
     --chart-5: 340 75% 55%;
-    --highlight: 259 43% 56%;
   }
 }