diff --git a/home/_includes/cta.html b/home/_includes/cta.html
index c4814588..079a5c6e 100644
--- a/home/_includes/cta.html
+++ b/home/_includes/cta.html
@@ -1,9 +1,9 @@
-<section class="cm-text-body body-font">
+<section class="cm-gray-2 body-font">
   {% unless include.no_container %}
     <div class="container px-5 py-24 mx-auto">
   {% endunless %}
       <div class="lg:w-2/3 flex flex-col sm:flex-row sm:items-center items-start mx-auto">
-        <h1 class="flex-grow sm:pr-16 text-2xl font-medium title-font cm-lgt-txt">{{ include.cta.text }}</h1>
+        <h1 class="flex-grow sm:pr-16 text-2xl font-medium title-font cm-gray-1">{{ include.cta.text }}</h1>
         {% for item in include.cta.btn %}
         <button href="{{ item.link }}" class="flex-shrink-0 text-white bg-secondary border-0 py-2 px-8 focus:outline-none hover:bg-primary rounded text-lg mt-10 sm:mt-0">{{ item.text }}</button>
         {% endfor %}
diff --git a/home/_includes/features.html b/home/_includes/features.html
index cc2fc6c7..f501f8db 100644
--- a/home/_includes/features.html
+++ b/home/_includes/features.html
@@ -1,12 +1,12 @@
-<section class="cm-text-body body-font">
+<section class="cm-gray-2 body-font">
     <div class="container px-5 py-24 mx-auto">
       <div class="flex flex-wrap w-full mb-4">
         <div class="lg:w-1/2 w-full mb-6 lg:mb-0">
           <a class="anchor" id="{{ include.data.header.ref }}"></a>
-          <h1 class="sm:text-3xl text-2xl font-medium title-font mb-2 cm-lgt-txt">{{ include.data.header.title }}</h1>
+          <h1 class="sm:text-3xl text-2xl font-medium title-font mb-2 cm-gray-1">{{ include.data.header.title }}</h1>
           <div class="h-1 w-20 bg-secondary rounded"></div>
         </div>
-        <p class="lg:w-1/2 w-full leading-relaxed text-gray-500">{{ include.data.header.text }}</p>
+        <p class="lg:w-1/2 w-full leading-relaxed cm-gray-3">{{ include.data.header.text }}</p>
       </div>
 
       <div class="flex flex-wrap -m-4">
@@ -14,7 +14,7 @@
         <div class="xl:w-1/4 md:w-1/2 p-4">
           <div class="bg-gray-100 p-6 rounded-lg">
             <h3 class="tracking-widest text-primary text-xs font-medium title-font">{{ item.subtitle }}</h3>
-            <h2 class="text-lg cm-lgt-txt font-medium title-font mb-4">{{ item.title }}</h2>
+            <h2 class="text-lg cm-gray-1 font-medium title-font mb-4">{{ item.title }}</h2>
             <p class="leading-relaxed text-base">{{ item.description }}</p>
           </div>
         </div>
diff --git a/home/_includes/footer.html b/home/_includes/footer.html
index 64dfd8a2..77d3396d 100644
--- a/home/_includes/footer.html
+++ b/home/_includes/footer.html
@@ -1,11 +1,11 @@
-<footer class="cm-text-body body-font">
+<footer class="cm-gray-2 body-font">
     <div class="container px-5 py-8 mx-auto flex md:items-center lg:items-start md:flex-row md:flex-nowrap flex-wrap flex-col">
       <div class="w-64 flex-shrink-0 md:mx-0 mx-auto text-center md:text-left">
-        <a class="flex title-font font-medium items-center md:justify-start justify-center cm-lgt-txt">
+        <a class="flex title-font font-medium items-center md:justify-start justify-center cm-gray-1">
           <img src="/assets/logo.png" class="h-8">
           <span class="ml-3 text-xl">{{ site.title }}</span>
         </a>
-        <p class="mt-2 text-sm text-gray-500">{{ site.tagline }}</p>
+        <p class="mt-2 text-sm cm-gray-3">{{ site.tagline }}</p>
       </div>
 
       <div class="flex-grow flex flex-wrap md:pl-20 -mb-10 md:mt-0 mt-10 md:text-left text-center">
@@ -28,12 +28,12 @@
 
     <div class="bg-gray-100">
       <div class="container mx-auto py-4 px-5 flex flex-wrap flex-col sm:flex-row">
-        <p class="text-gray-500 text-sm text-center sm:text-left">© 2021 {{ site.title }} — made with love by
-          <a href="https://github.com/matmair" rel="noopener noreferrer" class="text-gray-600 ml-1" target="_blank">@matmair</a>
+        <p class="cm-gray-3 text-sm text-center sm:text-left">© 2021 {{ site.title }} — made with love by
+          <a href="https://github.com/matmair" rel="noopener noreferrer" class="cm-gray-2 ml-1" target="_blank">@matmair</a>
         </p>
         <span class="inline-flex sm:ml-auto sm:mt-0 mt-2 justify-center sm:justify-start">
-          <a href="https://github.com/inventree/InvenTree" class="ml-3 text-gray-500">
-            <svg class="h-5 w-5 text-gray-500" fill="currentColor" viewBox="0 0 20 20"><path fill-rule="evenodd" d="M10 0C4.477 0 0 4.484 0 10.017c0 4.425 2.865 8.18 6.839 9.504.5.092.682-.217.682-.483 0-.237-.008-.868-.013-1.703-2.782.605-3.369-1.343-3.369-1.343-.454-1.158-1.11-1.466-1.11-1.466-.908-.62.069-.608.069-.608 1.003.07 1.531 1.032 1.531 1.032.892 1.53 2.341 1.088 2.91.832.092-.647.35-1.088.636-1.338-2.22-.253-4.555-1.113-4.555-4.951 0-1.093.39-1.988 1.029-2.688-.103-.253-.446-1.272.098-2.65 0 0 .84-.27 2.75 1.026A9.564 9.564 0 0110 4.844c.85.004 1.705.115 2.504.337 1.909-1.296 2.747-1.027 2.747-1.027.546 1.379.203 2.398.1 2.651.64.7 1.028 1.595 1.028 2.688 0 3.848-2.339 4.695-4.566 4.942.359.31.678.921.678 1.856 0 1.338-.012 2.419-.012 2.747 0 .268.18.58.688.482A10.019 10.019 0 0020 10.017C20 4.484 15.522 0 10 0z" clip-rule="evenodd"></path></svg>
+          <a href="https://github.com/inventree/InvenTree" class="ml-3 cm-gray-3">
+            <svg class="h-5 w-5 cm-gray-3" fill="currentColor" viewBox="0 0 20 20"><path fill-rule="evenodd" d="M10 0C4.477 0 0 4.484 0 10.017c0 4.425 2.865 8.18 6.839 9.504.5.092.682-.217.682-.483 0-.237-.008-.868-.013-1.703-2.782.605-3.369-1.343-3.369-1.343-.454-1.158-1.11-1.466-1.11-1.466-.908-.62.069-.608.069-.608 1.003.07 1.531 1.032 1.531 1.032.892 1.53 2.341 1.088 2.91.832.092-.647.35-1.088.636-1.338-2.22-.253-4.555-1.113-4.555-4.951 0-1.093.39-1.988 1.029-2.688-.103-.253-.446-1.272.098-2.65 0 0 .84-.27 2.75 1.026A9.564 9.564 0 0110 4.844c.85.004 1.705.115 2.504.337 1.909-1.296 2.747-1.027 2.747-1.027.546 1.379.203 2.398.1 2.651.64.7 1.028 1.595 1.028 2.688 0 3.848-2.339 4.695-4.566 4.942.359.31.678.921.678 1.856 0 1.338-.012 2.419-.012 2.747 0 .268.18.58.688.482A10.019 10.019 0 0020 10.017C20 4.484 15.522 0 10 0z" clip-rule="evenodd"></path></svg>
           </a>
         </span>
       </div>
diff --git a/home/_includes/header.html b/home/_includes/header.html
index d61cce21..8bd1cbfe 100644
--- a/home/_includes/header.html
+++ b/home/_includes/header.html
@@ -1,20 +1,20 @@
-<header class="cm-text-body body-font sticky top-0 z-50 bg-gradient-to-r from-white to-secondary">
+<header class="cm-gray-2 body-font sticky top-0 z-50 bg-gradient-to-r from-white to-secondary">
     <div class="container mx-auto flex flex-wrap p-5 flex-col md:flex-row items-center">
-      <a class="flex title-font font-medium items-center cm-lgt-txt mb-4 md:mb-0" href="/">
+      <a class="flex title-font font-medium items-center cm-gray-1 mb-4 md:mb-0" href="/">
         <img src="/assets/logo.png" class="h-8">
         <span class="ml-3 text-xl">{{ site.title }}</span>
       </a>
 
       <nav class="md:mr-auto md:ml-4 md:py-1 md:pl-4 md:border-l md:border-gray-400	flex flex-wrap items-center text-base justify-center">
-        <a class="mr-5 hover:cm-lgt-txt" href="/">Home</a>
-        <a class="mr-5 hover:cm-lgt-txt" href="{{ site.plugin-link }}">Plugins</a>
-        <a class="mr-5 hover:cm-lgt-txt" href="{{ site.doc-link }}">Docs</a>
+        <a class="mr-5 hover:cm-gray-1" href="/">Home</a>
+        <a class="mr-5 hover:cm-gray-1" href="{{ site.plugin-link }}">Plugins</a>
+        <a class="mr-5 hover:cm-gray-1" href="{{ site.doc-link }}">Docs</a>
       </nav>
 
       <nav class="md:ml-auto flex flex-wrap items-center text-base justify-center rounded border-2 border-primary">
-        <a class="ml-2 mr-2 hover:cm-lgt-txt" href="#hobby">for <strong>hobby</strong></a>
-        <a class="mr-2 hover:cm-lgt-txt" href="#business">for <strong>business</strong></a>
-        <a class="mr-2 hover:cm-lgt-txt" href="#edu">for <strong>edu</strong></a>
+        <a class="ml-2 mr-2 hover:cm-gray-1" href="#hobby">for <strong>hobby</strong></a>
+        <a class="mr-2 hover:cm-gray-1" href="#business">for <strong>business</strong></a>
+        <a class="mr-2 hover:cm-gray-1" href="#edu">for <strong>edu</strong></a>
       </nav>
       <button href="{{site.demo-link}}" class="inline-flex items-center bg-gray-100 ml-2 border-0 py-1 px-3 focus:outline-none hover:bg-gray-200 rounded text-base mt-4 md:mt-0">
         Open demo
diff --git a/home/_includes/hero.html b/home/_includes/hero.html
index ab7c0d26..8c1bf416 100644
--- a/home/_includes/hero.html
+++ b/home/_includes/hero.html
@@ -1,7 +1,7 @@
-<section class="cm-text-body body-font">
+<section class="cm-gray-2 body-font">
     <div class="container mx-auto flex px-5 py-24 md:flex-row flex-col items-center">
       <div class="lg:flex-grow md:w-1/2 lg:pr-24 md:pr-16 flex flex-col md:items-start md:text-left mb-16 md:mb-0 items-center text-center">
-        <h1 class="title-font sm:text-4xl text-3xl mb-4 font-medium cm-lgt-txt">{{ include.title }}
+        <h1 class="title-font sm:text-4xl text-3xl mb-4 font-medium cm-gray-1">{{ include.title }}
           {% if include.title_2 %}
           <br class="hidden lg:inline-block">{{ include.title_2 }}
           {% endif %}
@@ -12,7 +12,7 @@
         <p class="mb-8 leading-relaxed">Copper mug try-hard pitchfork pour-over freegan heirloom neutra air plant cold-pressed tacos poke beard tote bag. Heirloom echo park mlkshk tote bag selvage hot chicken authentic tumeric truffaut hexagon try-hard chambray.</p>
         <div class="flex justify-center">
           <button class="inline-flex text-white bg-secondary border-0 py-2 px-6 focus:outline-none hover:bg-primary rounded text-lg">Button</button>
-          <button class="ml-4 inline-flex text-gray-700 bg-gray-100 border-0 py-2 px-6 focus:outline-none hover:bg-gray-200 rounded text-lg">Button</button>
+          <button class="ml-4 inline-flex cm-hvr-btn border-0 py-2 px-6 focus:outline-none text-lg">Button</button>
         </div>
       </div>
       <div class="lg:max-w-lg lg:w-full md:w-1/2 w-5/6">
diff --git a/home/_layouts/default.html b/home/_layouts/default.html
index a63c6ee3..b767cefd 100644
--- a/home/_layouts/default.html
+++ b/home/_layouts/default.html
@@ -5,7 +5,7 @@
     {% include head.html %}
 </head>
 
-<body class="antialiased cm-lgt-txt min-h-screen">
+<body class="antialiased cm-gray-1 min-h-screen">
     {% include header.html %}
 
     {{ content }}
diff --git a/home/styles/index.css b/home/styles/index.css
index a55eead3..61e6576f 100644
--- a/home/styles/index.css
+++ b/home/styles/index.css
@@ -16,18 +16,27 @@
         @apply font-medium text-gray-900 tracking-widest text-sm mb-3
     }
 
-    .cm-text-body {
+    .cm-hvr-btn {
+        @apply text-gray-700 bg-gray-100 hover:bg-gray-200 rounded
+    }
+
+    .cm-gray-1 {
+        @apply text-gray-900
+    }
+
+    .cm-gray-2 {
         @apply text-gray-600
     }
 
-    .cm-lgt-txt {
-        @apply text-gray-900
+    .cm-gray-3 {
+        @apply text-gray-500
     }
-}
 
-a.anchor {
-    display: block;
-    position: relative;
-    top: -72px;
-    visibility: hidden;
+    a.anchor {
+        display: block;
+        position: relative;
+        top: -72px;
+        visibility: hidden;
+    }
+    
 }