diff --git a/assets/global.css b/assets/global.css
index 625d5bf65..a7fbd00a6 100644
--- a/assets/global.css
+++ b/assets/global.css
@@ -1,20 +1,27 @@
 @import './font.css';
 
 :root {
-  --bg-primary: white;
-  --bg-primary-hover: rgba(0, 0, 0, 0.075);
-  --bg-primary-accent: #f1f3f5;
-  --bg-secondary: black;
+  --primary: white;
+  --primary-2: #f1f3f5;
+  --secondary: black;
+  --secondary-2: #111;
+
+  --selection: var(--cyan);
+
+  --text-base: black;
   --text-primary: black;
   --text-secondary: white;
-  --text-default: #252f3f;
+
+  --hover: rgba(0, 0, 0, 0.075);
 
   --cyan: #50e3c2;
   --purple: #f81ce5;
+  --violet: #7928ca;
+  --pink: #ff0080;
+  --blue: #0070f3;
+  --green: #37b679;
+  --red: #da3c3c;
 
-  --foreground: #000;
-  --background: #fff;
-  --selection: var(--cyan);
   --accents-1: #fafafa;
   --accents-2: #eaeaea;
   --accents-3: #999999;
@@ -26,25 +33,25 @@
 }
 
 [data-theme='dark'] {
-  --bg-primary: black;
-  --bg-secondary: white;
-  --bg-primary-hover: rgba(255, 255, 255, 0.075);
-  --bg-primary-accent: #111;
+  --primary: black;
+  --primary-2: #111;
+  --secondary: white;
+  --secondary-2: #f1f3f5;
+  --hover: rgba(255, 255, 255, 0.075);
+  --selection: var(--purple);
+
+  --text-base: white;
   --text-primary: white;
   --text-secondary: black;
-  --text-default: white;
 
-  --foreground: #fff;
-  --background: #000;
-  --selection: var(--purple);
-  --accents-8: #fafafa;
-  --accents-7: #eaeaea;
-  --accents-6: #999999;
-  --accents-5: #888888;
-  --accents-4: #666666;
-  --accents-3: #444444;
-  --accents-2: #333333;
   --accents-1: #111111;
+  --accents-2: #333333;
+  --accents-3: #444444;
+  --accents-4: #666666;
+  --accents-5: #888888;
+  --accents-6: #999999;
+  --accents-7: #eaeaea;
+  --accents-8: #fafafa;
 }
 
 .fit {
diff --git a/components/cart/CartItem/CartItem.module.css b/components/cart/CartItem/CartItem.module.css
index c0830b924..618788020 100644
--- a/components/cart/CartItem/CartItem.module.css
+++ b/components/cart/CartItem/CartItem.module.css
@@ -1,6 +1,6 @@
 .quantity {
   appearance: textfield;
-  @apply w-8 border-gray-300 border mx-3 rounded text-center text-sm text-black;
+  @apply w-8 border-accents-2 border mx-3 rounded text-center text-sm text-black;
 }
 
 .quantity::-webkit-outer-spin-button,
diff --git a/components/cart/CartItem/CartItem.tsx b/components/cart/CartItem/CartItem.tsx
index 7d092f6aa..fa472afd0 100644
--- a/components/cart/CartItem/CartItem.tsx
+++ b/components/cart/CartItem/CartItem.tsx
@@ -60,7 +60,7 @@ const CartItem = ({
       <div className="w-12 h-12 bg-violet relative overflow-hidden">
         <img className={s.productImage} src={item.image_url} />
       </div>
-      <div className="flex-1 flex flex-col justify-between text-primary">
+      <div className="flex-1 flex flex-col justify-between text-base">
         <span className="font-bold mb-3">{item.name}</span>
         <div className="flex items-center">
           <button type="button" onClick={() => increaseQuantity(-1)}>
@@ -80,7 +80,7 @@ const CartItem = ({
           </button>
         </div>
       </div>
-      <div className="flex flex-col justify-between space-y-2 text-primary">
+      <div className="flex flex-col justify-between space-y-2 text-base">
         <span>{price}</span>
         <button
           className="flex justify-end"
diff --git a/components/cart/CartSidebarView/CartSidebarView.tsx b/components/cart/CartSidebarView/CartSidebarView.tsx
index 6b2f59bb7..f1274de16 100644
--- a/components/cart/CartSidebarView/CartSidebarView.tsx
+++ b/components/cart/CartSidebarView/CartSidebarView.tsx
@@ -92,7 +92,7 @@ const CartSidebarView: FC = () => {
       ) : (
         <>
           <div className="px-4 sm:px-6 flex-1">
-            <h2 className="pt-1 pb-4 text-2xl leading-7 font-bold text-primary tracking-wide">
+            <h2 className="pt-1 pb-4 text-2xl leading-7 font-bold text-base tracking-wide">
               My Cart
             </h2>
             <ul className="py-6 space-y-6 sm:py-0 sm:space-y-0 sm:divide-y sm:divide-gray-200 border-t border-gray-200">
diff --git a/components/core/Featurebar/Featurebar.tsx b/components/core/Featurebar/Featurebar.tsx
index 1a2aae7be..4b928b4fc 100644
--- a/components/core/Featurebar/Featurebar.tsx
+++ b/components/core/Featurebar/Featurebar.tsx
@@ -10,7 +10,7 @@ interface Props {
 
 const Featurebar: FC<Props> = ({ title, description, className }) => {
   const rootClassName = cn(
-    'hidden py-2 px-6 bg-primary-accent text-primary text-sm text-gray-600 md:flex flex-row justify-center items-center font-medium border-b border-primary-accent',
+    'hidden py-2 px-6 bg-primary-accent text-base text-sm text-gray-600 md:flex flex-row justify-center items-center font-medium border-b border-primary-accent',
     className
   )
   return (
diff --git a/components/core/Navbar/Navbar.module.css b/components/core/Navbar/Navbar.module.css
index d808a2a5b..c2dedc9be 100644
--- a/components/core/Navbar/Navbar.module.css
+++ b/components/core/Navbar/Navbar.module.css
@@ -1,3 +1,3 @@
 .link {
-  @apply group text-primary inline-flex items-center text-base leading-6 font-medium hover:text-secondary focus:outline-none focus:text-secondary transition ease-in-out duration-100 cursor-pointer;
+  @apply group text-base inline-flex items-center text-base leading-6 font-medium hover:text-accents-8 focus:outline-none focus:text-accents-8 transition ease-in-out duration-100 cursor-pointer;
 }
diff --git a/components/core/Searchbar/Searchbar.tsx b/components/core/Searchbar/Searchbar.tsx
index 1c86a87f1..4c2c21332 100644
--- a/components/core/Searchbar/Searchbar.tsx
+++ b/components/core/Searchbar/Searchbar.tsx
@@ -17,7 +17,7 @@ const Searchbar: FC<Props> = ({ className }) => {
   return (
     <div
       className={cn(
-        'relative rounded-lg text-sm bg-primary-accent text-primary w-full',
+        'relative rounded-lg text-sm bg-primary-accent text-base w-full',
         className
       )}
     >
diff --git a/components/core/UserNav/UserNav.module.css b/components/core/UserNav/UserNav.module.css
index 9382fe940..45749a588 100644
--- a/components/core/UserNav/UserNav.module.css
+++ b/components/core/UserNav/UserNav.module.css
@@ -6,10 +6,10 @@
 }
 
 .item {
-  @apply mr-6 cursor-pointer relative transition ease-in-out duration-100 text-primary;
+  @apply mr-6 cursor-pointer relative transition ease-in-out duration-100 text-base;
 
   &:hover {
-    @apply text-secondary;
+    @apply text-accents-8;
   }
 
   &:last-child {
diff --git a/components/core/UserNav/UserNav.tsx b/components/core/UserNav/UserNav.tsx
index d6af699e1..b6367e270 100644
--- a/components/core/UserNav/UserNav.tsx
+++ b/components/core/UserNav/UserNav.tsx
@@ -29,7 +29,7 @@ const UserNav: FC<Props> = ({ className }) => {
         >
           <Bag />
           {itemsCount > 0 && (
-            <span className="bg-black h-4 w-4 absolute rounded-full right-3 top-3 text-white flex items-center justify-center font-bold text-xs">
+            <span className="bg-secondary text-base h-4 w-4 absolute rounded-full right-3 top-3 flex items-center justify-center font-bold text-xs">
               {itemsCount}
             </span>
           )}
diff --git a/components/product/ProductCard/ProductCard.module.css b/components/product/ProductCard/ProductCard.module.css
index a32d3e1b4..f91c7873b 100644
--- a/components/product/ProductCard/ProductCard.module.css
+++ b/components/product/ProductCard/ProductCard.module.css
@@ -9,7 +9,7 @@
     & .productTitle,
     & .productPrice,
     & .wishlistButton {
-      @apply bg-black text-white;
+      @apply bg-secondary text-secondary;
     }
 
     &:nth-child(6n + 1) .productTitle,
@@ -66,7 +66,7 @@
 }
 
 .productTitle {
-  @apply p-3 h-14 bg-primary text-primary font-bold text-xl truncate leading-8 inline-flex;
+  @apply p-3 h-14 bg-primary text-base font-bold text-xl truncate leading-8 inline-flex;
   max-width: calc(100% - 50px);
 
   @screen lg {
@@ -75,9 +75,9 @@
 }
 
 .productPrice {
-  @apply px-3 py-1 pb-2 bg-primary text-primary font-semibold inline-block text-sm leading-6;
+  @apply px-3 py-1 pb-2 bg-primary text-base font-semibold inline-block text-sm leading-6;
 }
 
 .wishlistButton {
-  @apply w-10 h-10 flex items-center justify-center bg-primary text-primary font-semibold inline-block text-xs leading-6 cursor-pointer;
+  @apply w-10 h-10 flex items-center justify-center bg-primary text-base font-semibold inline-block text-xs leading-6 cursor-pointer;
 }
diff --git a/components/product/Swatch/Swatch.module.css b/components/product/Swatch/Swatch.module.css
index 19c107197..5542aa125 100644
--- a/components/product/Swatch/Swatch.module.css
+++ b/components/product/Swatch/Swatch.module.css
@@ -1,15 +1,15 @@
 .root {
-  @apply h-12 w-12 bg-primary text-primary rounded-full mr-3 inline-flex
+  @apply h-12 w-12 bg-primary text-base rounded-full mr-3 inline-flex
   items-center justify-center cursor-pointer transition duration-75 ease-in-out
   p-0 shadow-none border-gray-200 border box-border;
 }
 
 .active.size {
-  @apply border-secondary border-2;
+  @apply border-accents-2 border-2;
 }
 
 .root:hover {
-  @apply transform scale-110 bg-primary-hover;
+  @apply transform scale-110 bg-hover;
 }
 
 .colorViolet {
diff --git a/components/ui/Button/Button.module.css b/components/ui/Button/Button.module.css
index fc27d5022..b1159d9cd 100644
--- a/components/ui/Button/Button.module.css
+++ b/components/ui/Button/Button.module.css
@@ -1,12 +1,12 @@
 .root {
-  @apply text-secondary cursor-pointer inline-flex px-10 rounded-sm leading-6
+  @apply text-accents-8 cursor-pointer inline-flex px-10 rounded-sm leading-6
   bg-secondary transition ease-in-out duration-150 shadow-sm font-semibold
   text-center justify-center uppercase py-4 uppercase text-center focus:outline-none
   border border-transparent items-center;
 }
 
 .root:hover {
-  @apply bg-primary-accent text-primary border border-secondary;
+  @apply bg-primary-2 text-base border border-secondary;
 }
 
 .root:focus {
diff --git a/components/ui/Sidebar/Sidebar.tsx b/components/ui/Sidebar/Sidebar.tsx
index 0f2c0ea7f..0a97c4b67 100644
--- a/components/ui/Sidebar/Sidebar.tsx
+++ b/components/ui/Sidebar/Sidebar.tsx
@@ -73,7 +73,7 @@ const Sidebar: FC<Props> = ({ className, children, show = true, close }) => {
                   leaveTo="translate-x-full"
                 >
                   <div className="h-full w-screen max-w-lg">
-                    <div className="h-full flex flex-col text-primary bg-primary-accent shadow-xl overflow-y-auto">
+                    <div className="h-full flex flex-col text-base bg-primary-accent shadow-xl overflow-y-auto">
                       {children}
                     </div>
                   </div>
diff --git a/pages/cart.tsx b/pages/cart.tsx
index c81b420d6..aa3e7fc35 100644
--- a/pages/cart.tsx
+++ b/pages/cart.tsx
@@ -18,7 +18,7 @@ export default function Home({}: InferGetStaticPropsType<
 >) {
   return (
     <Container>
-      <h2 className="pt-1 pb-4 text-2xl leading-7 font-bold text-primary tracking-wide">
+      <h2 className="pt-1 pb-4 text-2xl leading-7 font-bold text-base tracking-wide">
         My Cart
       </h2>
     </Container>
diff --git a/pages/index.tsx b/pages/index.tsx
index 093f211d3..bb6ce576c 100644
--- a/pages/index.tsx
+++ b/pages/index.tsx
@@ -50,21 +50,21 @@ export default function Home({
       <div className="py-12 flex flex-row w-full px-12">
         <div className="pr-3 w-48">
           <ul className="mb-10">
-            <li className="py-1 text-primary font-bold tracking-wide">
+            <li className="py-1 text-base font-bold tracking-wide">
               All Categories
             </li>
             {categories.map((cat) => (
-              <li key={cat.path} className="py-1 text-default">
+              <li key={cat.path} className="py-1 text-accents-8">
                 <a href="#">{cat.name}</a>
               </li>
             ))}
           </ul>
           <ul className="">
-            <li className="py-1 text-primary font-bold tracking-wide">
+            <li className="py-1 text-base font-bold tracking-wide">
               All Designers
             </li>
             {brands.flatMap(({ node }) => (
-              <li key={node.path} className="py-1 text-default">
+              <li key={node.path} className="py-1 text-accents-8">
                 <a href="#">{node.name}</a>
               </li>
             ))}
diff --git a/pages/search.tsx b/pages/search.tsx
index c57d0e433..e9d029380 100644
--- a/pages/search.tsx
+++ b/pages/search.tsx
@@ -60,7 +60,7 @@ export default function Search({
       <div className="grid grid-cols-12 gap-8 mt-3 mb-20">
         <div className="col-span-2">
           <ul className="mb-10">
-            <li className="py-1 text-primary font-bold tracking-wide">
+            <li className="py-1 text-base font-bold tracking-wide">
               <Link href={{ pathname: getCategoryPath('', brand), query }}>
                 <a>All Categories</a>
               </Link>
@@ -68,7 +68,7 @@ export default function Search({
             {categories.map((cat) => (
               <li
                 key={cat.path}
-                className={cn('py-1 text-default', {
+                className={cn('py-1 text-accents-8', {
                   underline: activeCategory?.entityId === cat.entityId,
                 })}
               >
@@ -84,7 +84,7 @@ export default function Search({
             ))}
           </ul>
           <ul>
-            <li className="py-1 text-primary font-bold tracking-wide">
+            <li className="py-1 text-base font-bold tracking-wide">
               <Link href={{ pathname: getDesignerPath('', category), query }}>
                 <a>All Designers</a>
               </Link>
@@ -92,7 +92,7 @@ export default function Search({
             {brands.flatMap(({ node }) => (
               <li
                 key={node.path}
-                className={cn('py-1 text-default', {
+                className={cn('py-1 text-accents-8', {
                   underline: activeBrand?.entityId === node.entityId,
                 })}
               >
@@ -158,9 +158,9 @@ export default function Search({
         </div>
         <div className="col-span-2">
           <ul>
-            <li className="py-1 text-primary font-bold tracking-wide">Sort</li>
+            <li className="py-1 text-base font-bold tracking-wide">Sort</li>
             <li
-              className={cn('py-1 text-default', {
+              className={cn('py-1 text-accents-8', {
                 underline: !sort,
               })}
             >
@@ -171,7 +171,7 @@ export default function Search({
             {SORT.map(([key, text]) => (
               <li
                 key={key}
-                className={cn('py-1 text-default', {
+                className={cn('py-1 text-accents-8', {
                   underline: sort === key,
                 })}
               >
diff --git a/pages/wishlist.tsx b/pages/wishlist.tsx
index 3084e5e47..f337ebe1f 100644
--- a/pages/wishlist.tsx
+++ b/pages/wishlist.tsx
@@ -24,7 +24,7 @@ export default function Home({
       <div className="grid grid-cols-12 gap-8 mt-3 mb-20">
         <div className="col-span-2">
           <ul className="mb-10">
-            <li className="py-1 text-primary font-bold tracking-wide">
+            <li className="py-1 text-base font-bold tracking-wide">
               All Categories
             </li>
             {categories.map((cat) => (
@@ -35,7 +35,7 @@ export default function Home({
           </ul>
         </div>
         <div className="col-span-8">
-          <h2 className="pt-1 px-3 pb-4 text-2xl leading-7 font-bold text-primary tracking-wide">
+          <h2 className="pt-1 px-3 pb-4 text-2xl leading-7 font-bold text-base tracking-wide">
             My Wishlist
           </h2>
           <div className="group flex flex-col">
@@ -46,7 +46,7 @@ export default function Home({
         </div>
         <div className="col-span-2">
           <ul>
-            <li className="py-1 text-primary font-bold tracking-wide">
+            <li className="py-1 text-base font-bold tracking-wide">
               Relevance
             </li>
             <li className="py-1 text-secondary">Latest arrivals</li>
diff --git a/tailwind.config.js b/tailwind.config.js
index 9bd1a5fdf..0588af510 100644
--- a/tailwind.config.js
+++ b/tailwind.config.js
@@ -14,6 +14,11 @@ module.exports = {
         075: '0.75',
       },
       colors: {
+        primary: 'var(--primary)',
+        'primary-2': 'var(--primary-2)',
+        secondary: 'var(--secondary)',
+        'secondary-2': 'var(--secondary-2)',
+        hover: 'var(--hover)',
         'accents-1': 'var(--accents-1)',
         'accents-2': 'var(--accents-2)',
         'accents-3': 'var(--accents-3)',
@@ -22,19 +27,15 @@ module.exports = {
         'accents-6': 'var(--accents-6)',
         'accents-7': 'var(--accents-7)',
         'accents-8': 'var(--accents-8)',
-        violet: '#7928CA',
-        pink: '#FF0080',
-        cyan: '#50E3C2',
-        blue: '#0070F3',
-        green: '#37B679',
-        red: '#DA3C3C',
-        primary: 'var(--bg-primary)',
-        secondary: 'var(--bg-secondary)',
-        'primary-accent': 'var(--bg-primary-accent)',
-        'primary-hover': 'var(--bg-primary-hover)',
+        violet: 'var(--violet)',
+        pink: 'var(--pink)',
+        cyan: 'var(--cyan)',
+        blue: 'var(--blue)',
+        green: 'var(--green)',
+        red: 'var(--red)',
       },
       textColor: {
-        base: 'var(--text-primary)',
+        base: 'var(--text-base)',
         primary: 'var(--text-primary)',
         secondary: 'var(--text-secondary)',
       },