diff --git a/styles/old-variables/infographics.scss b/styles/old-variables/infographics.scss
index 969aa54ccd..dd9ab4e9b9 100644
--- a/styles/old-variables/infographics.scss
+++ b/styles/old-variables/infographics.scss
@@ -19,4 +19,7 @@
     --yc-color-infographics-danger-heavy: var(--g-color-base-danger-heavy);
     --yc-color-infographics-misc-heavy: var(--g-color-base-misc-heavy);
     --yc-color-infographics-neutral-heavy: var(--g-color-base-neutral-heavy);
+
+    --yc-color-infographics-axis: var(--g-color-infographics-axis);
+    --yc-color-infographics-tooltip-bg: var(--g-color-infographics-tooltip-bg);
 }
diff --git a/styles/themes/dark-hc/text.scss b/styles/themes/dark-hc/text.scss
index 2d7f861e84..c3ffda7761 100644
--- a/styles/themes/dark-hc/text.scss
+++ b/styles/themes/dark-hc/text.scss
@@ -1,8 +1,8 @@
 @mixin g-colors-text-dark-hc {
-    --g-color-text-primary: var(--g-color-private-white-1000-solid);
-    --g-color-text-complementary: var(--g-color-private-white-800);
-    --g-color-text-secondary: var(--g-color-private-white-600);
-    --g-color-text-hint: var(--g-color-private-white-400);
+    --g-color-text-primary: var(--g-color-text-light-primary);
+    --g-color-text-complementary: var(--g-color-text-light-complementary);
+    --g-color-text-secondary: var(--g-color-text-light-secondary);
+    --g-color-text-hint: var(--g-color-text-light-hint);
 
     --g-color-text-info: var(--g-color-private-blue-650-solid);
     --g-color-text-positive: var(--g-color-private-green-650-solid);
diff --git a/styles/themes/dark/text.scss b/styles/themes/dark/text.scss
index 9586bc74d9..704aca6937 100644
--- a/styles/themes/dark/text.scss
+++ b/styles/themes/dark/text.scss
@@ -1,8 +1,8 @@
 @mixin g-colors-text-dark {
-    --g-color-text-primary: var(--g-color-private-white-850);
-    --g-color-text-complementary: var(--g-color-private-white-700);
-    --g-color-text-secondary: var(--g-color-private-white-500);
-    --g-color-text-hint: var(--g-color-private-white-300);
+    --g-color-text-primary: var(--g-color-text-light-primary);
+    --g-color-text-complementary: var(--g-color-text-light-complementary);
+    --g-color-text-secondary: var(--g-color-text-light-secondary);
+    --g-color-text-hint: var(--g-color-text-light-hint);
 
     --g-color-text-info: var(--g-color-private-blue-600-solid);
     --g-color-text-positive: var(--g-color-private-green-600-solid);
diff --git a/styles/themes/light-hc/text.scss b/styles/themes/light-hc/text.scss
index ccaed9ee29..ae11785f68 100644
--- a/styles/themes/light-hc/text.scss
+++ b/styles/themes/light-hc/text.scss
@@ -1,8 +1,8 @@
 @mixin g-colors-text-light-hc {
-    --g-color-text-primary: var(--g-color-private-black-1000-solid);
-    --g-color-text-complementary: var(--g-color-private-black-850);
-    --g-color-text-secondary: var(--g-color-private-black-700);
-    --g-color-text-hint: var(--g-color-private-black-500);
+    --g-color-text-primary: var(--g-color-text-dark-primary);
+    --g-color-text-complementary: var(--g-color-text-dark-complementary);
+    --g-color-text-secondary: var(--g-color-text-dark-secondary);
+    --g-color-text-hint: var(--g-color-text-dark-hint);
 
     --g-color-text-info: var(--g-color-private-blue-650-solid);
     --g-color-text-positive: var(--g-color-private-green-650-solid);
@@ -26,9 +26,9 @@
     --g-color-text-link-visited-hover: var(--g-color-private-purple-850-solid);
 
     --g-color-text-dark-primary: var(--g-color-private-black-1000-solid);
-    --g-color-text-dark-complementary: var(--g-color-private-black-800);
-    --g-color-text-dark-secondary: var(--g-color-private-black-600);
-    --g-color-text-dark-hint: var(--g-color-private-black-400);
+    --g-color-text-dark-complementary: var(--g-color-private-black-850);
+    --g-color-text-dark-secondary: var(--g-color-private-black-700);
+    --g-color-text-dark-hint: var(--g-color-private-black-500);
 
     --g-color-text-light-primary: var(--g-color-private-white-1000-solid);
     --g-color-text-light-complementary: var(--g-color-private-white-850);
diff --git a/styles/themes/light/text.scss b/styles/themes/light/text.scss
index 71f0015861..9324107a79 100644
--- a/styles/themes/light/text.scss
+++ b/styles/themes/light/text.scss
@@ -1,8 +1,8 @@
 @mixin g-colors-text-light {
-    --g-color-text-primary: var(--g-color-private-black-850);
-    --g-color-text-complementary: var(--g-color-private-black-700);
-    --g-color-text-secondary: var(--g-color-private-black-500);
-    --g-color-text-hint: var(--g-color-private-black-300);
+    --g-color-text-primary: var(--g-color-text-dark-primary);
+    --g-color-text-complementary: var(--g-color-text-dark-complementary);
+    --g-color-text-secondary: var(--g-color-text-dark-secondary);
+    --g-color-text-hint: var(--g-color-text-dark-hint);
 
     --g-color-text-info: var(--g-color-private-blue-600-solid);
     --g-color-text-positive: var(--g-color-private-green-600-solid);