diff --git a/src/components/tabs/tabs.scss b/src/components/tabs/tabs.scss
index ad925fc9..02392389 100644
--- a/src/components/tabs/tabs.scss
+++ b/src/components/tabs/tabs.scss
@@ -27,8 +27,10 @@
         a {
             display: inline-block;
             margin: 0 16px;
-            padding: 12px 36px;
-            color: $argo-color-gray-6;
+            padding: 12px 36px;            
+            @include themify($themes) {
+                color: themed('light-argo-gray-6');
+            }
             font-size: 13px;
             font-weight: 500;
             text-transform: uppercase;
diff --git a/src/components/top-bar/top-bar.scss b/src/components/top-bar/top-bar.scss
index ef44c6df..441e8db6 100644
--- a/src/components/top-bar/top-bar.scss
+++ b/src/components/top-bar/top-bar.scss
@@ -24,7 +24,9 @@
         float: left;
         font-weight: 500;
         font-size: .925em;
-        color: $argo-color-teal-7;
+        @include themify($themes) {
+            color: themed('light-argo-teal-7');
+        }
         text-transform: uppercase;
     }
 
diff --git a/src/styles/theme.scss b/src/styles/theme.scss
index 9bf1732b..07fe06f9 100644
--- a/src/styles/theme.scss
+++ b/src/styles/theme.scss
@@ -9,6 +9,8 @@ $themes: (
         light-argo-gray-6: $argo-color-gray-6,
         light-argo-gray-2: $argo-color-gray-2,
         light-argo-teal-1: $argo-color-teal-1,
+        light-argo-teal-7: $argo-color-teal-7,
+        light-argo-teal-5: $argo-color-teal-5,
         pod-cyan: lightcyan,
         layout-loader-bg: rgba($argo-color-gray-7, 0.4),  
     ),
@@ -20,6 +22,8 @@ $themes: (
         light-argo-gray-6: $argo-color-gray-2,
         light-argo-gray-2: $dark-theme-sliding-panel,
         light-argo-teal-1: $argo-color-gray-6,
+        light-argo-teal-7: $argo-color-teal-5,
+        light-argo-teal-5: $argo-color-teal-4,
         pod-cyan: $argo-color-teal-8,
         layout-loader-bg: rgba($argo-color-gray-3, 0.4),