diff --git a/src/scss/cdb-components/avatars.scss b/src/scss/cdb-components/avatars.scss
index 62a6fe4..c78be1f 100644
--- a/src/scss/cdb-components/avatars.scss
+++ b/src/scss/cdb-components/avatars.scss
@@ -16,7 +16,7 @@
     <img src="/src/img/avatar-40x40.png" alt="User Name" class="CDB-AvatarList-itemMedia" />
   </li>
   <li class="CDB-AvatarList-itemMore">
-    <button class="CDB-Text is-semibold CDB-Size-small">+ 16</button>
+    <button class="CDB-Text is-semibold CDB-Size-small u-textSecondary">+ 16</button>
   </li>
 </ul>
 ```
@@ -44,7 +44,6 @@
   border-left: 2px solid $cWhite;
   border-radius: 50px;
   background: $cSecondaryLine;
-  color: $cTypo2;
 }
 
 .CDB-AvatarList-itemMedia {
diff --git a/src/scss/cdb-components/headers.scss b/src/scss/cdb-components/headers.scss
index 02ca1b2..17980ac 100644
--- a/src/scss/cdb-components/headers.scss
+++ b/src/scss/cdb-components/headers.scss
@@ -43,7 +43,7 @@
       </ul>
     </li>
     <li class="CDB-HeaderInfo-ListItem">
-      <p class="CDB-HeaderInfo-Text CDB-Text CDB-Size-medium u-iBlock">Published 8 days ago</p>
+      <p class="CDB-HeaderInfo-Text CDB-Text CDB-Size-medium u-iBlock u-textSubtitle">Published 8 days ago</p>
     </li>
   </ul>
 </div>
@@ -108,7 +108,7 @@
         </a>
       </div>
     </div>
-    <p class="CDB-HeaderInfo-Text CDB-Text CDB-Size-medium">Positron by CartoDB</p>
+    <p class="CDB-HeaderInfo-Text CDB-Text CDB-Size-medium u-textSubtitle">Positron by CartoDB</p>
   </div>
 </div>
 <br/>
@@ -159,10 +159,6 @@
   }
 }
 
-.CDB-HeaderInfo-Text {
-  color: $cTypo3;
-}
-
 .CDB-HeaderInfo-Inner {
   @include flex(1);
 }
diff --git a/src/scss/cdb-components/menu.scss b/src/scss/cdb-components/menu.scss
index bcf7e13..3880e39 100644
--- a/src/scss/cdb-components/menu.scss
+++ b/src/scss/cdb-components/menu.scss
@@ -18,10 +18,10 @@
       <a class="CDB-NavMenu-Link" href="#">POP-UP</a>
       <ul class="CDB-NavSubmenu CDB-Size-small">
         <li class="CDB-NavSubmenu-Item is-active">
-          <a href="#" class="CDB-NavSubmenu-Link">CLICK <span class="CDB-NavSubmenu-Status">NONE</span></a>
+          <a href="#" class="CDB-NavSubmenu-Link">CLICK <span class="CDB-NavSubmenu-Status u-textDisabled">NONE</span></a>
         </li>
         <li class="CDB-NavSubmenu-Item">
-          <a href="#" class="CDB-NavSubmenu-Link">HOVER <span class="CDB-NavSubmenu-Status">NONE</span></a>
+          <a href="#" class="CDB-NavSubmenu-Link">HOVER <span class="CDB-NavSubmenu-Status u-textDisabled">NONE</span></a>
         </li>
       </ul>
     </li>
@@ -125,7 +125,6 @@
 
 .CDB-NavSubmenu-Status {
   margin-left: 2px;
-  color: $cTypo4;
 }
 
 .CDB-Navmenu.is-dark {