diff --git a/src/fonts/cartoIcon.eot b/src/fonts/cartoIcon.eot
index dcdd55a..60e5afa 100644
Binary files a/src/fonts/cartoIcon.eot and b/src/fonts/cartoIcon.eot differ
diff --git a/src/fonts/cartoIcon.ttf b/src/fonts/cartoIcon.ttf
index 3fed9de..4279ce3 100644
Binary files a/src/fonts/cartoIcon.ttf and b/src/fonts/cartoIcon.ttf differ
diff --git a/src/fonts/cartoIcon.woff b/src/fonts/cartoIcon.woff
index bc80aec..cf2d67c 100644
Binary files a/src/fonts/cartoIcon.woff and b/src/fonts/cartoIcon.woff differ
diff --git a/src/scss/cdb-components/boxes.scss b/src/scss/cdb-components/boxes.scss
index 948afe5..7289585 100644
--- a/src/scss/cdb-components/boxes.scss
+++ b/src/scss/cdb-components/boxes.scss
@@ -140,9 +140,9 @@
 .CDB-BoxLoader-item {
   @include display-flex();
   padding: $baseSize 0;
-  color: $cTypo2;
+  color: $cSecondaryText;
   &.is-working {
-    color: $cTypo3;
+    color: $cAltText;
   }
 }
 
diff --git a/src/scss/cdb-components/colors.scss b/src/scss/cdb-components/colors.scss
index 555cb3a..9eb8b8d 100644
--- a/src/scss/cdb-components/colors.scss
+++ b/src/scss/cdb-components/colors.scss
@@ -89,13 +89,13 @@
 
 
 .Color-Type02 {
-  background: $cTypo2;
+  background: $cSecondaryText;
 }
 .Color-Type03 {
-  background: $cTypo3;
+  background: $cAltText;
 }
 .Color-Type04 {
-  background: $cTypo4;
+  background: $cHintText;
 }
 
 
diff --git a/src/scss/cdb-components/forms/toggle.scss b/src/scss/cdb-components/forms/toggle.scss
index b37f458..244dbdf 100644
--- a/src/scss/cdb-components/forms/toggle.scss
+++ b/src/scss/cdb-components/forms/toggle.scss
@@ -33,7 +33,7 @@
     height: $baseSize * 2;
     margin: 0 2px;
     border-radius: 50px;
-    background: $cTypo4;
+    background: $cHintText;
 
     &::before {
       position: absolute;
diff --git a/src/scss/cdb-components/headers.scss b/src/scss/cdb-components/headers.scss
index 8c046da..33c07dc 100644
--- a/src/scss/cdb-components/headers.scss
+++ b/src/scss/cdb-components/headers.scss
@@ -216,7 +216,7 @@
   border: 1px solid $cMainLine;
   border-radius: 4px;
   background-color: $cWhite;
-  color: $cTypo3;
+  color: $cAltText;
   font-size: $sFontSize-small;
   line-height: 23px;
   text-align: center;
diff --git a/src/scss/cdb-components/loader.scss b/src/scss/cdb-components/loader.scss
index 44403cc..23d72b8 100644
--- a/src/scss/cdb-components/loader.scss
+++ b/src/scss/cdb-components/loader.scss
@@ -67,7 +67,7 @@ This is the generic loader for widgets, maps, components, ...
   border: 2px solid $cMainLine;
   border-radius: 50%;
   &.is-grey {
-    border: 2px solid $cTypo2;
+    border: 2px solid $cSecondaryText;
   }
 }
 
@@ -107,7 +107,7 @@ This is the generic loader for widgets, maps, components, ...
   &.is-grey {
     background: linear-gradient(to right, $cMainBg 10%, rgba($cWhite, 0) 42%);
     &::before {
-      background: $cTypo2;
+      background: $cSecondaryText;
     }
     &::after {
       background: $cMainBg;
diff --git a/src/scss/cdb-components/menu.scss b/src/scss/cdb-components/menu.scss
index 0ab42f8..e5cbc89 100644
--- a/src/scss/cdb-components/menu.scss
+++ b/src/scss/cdb-components/menu.scss
@@ -97,8 +97,8 @@
 }
 
 .CDB-NavMenu-Item.is-active .CDB-NavMenu-Link {
-  border-bottom: 1px solid $cMainBg;
-  color: $cMainBg;
+  border-bottom: 1px solid $cMainLine;
+  color: $cMainText;
 }
 
 .CDB-NavSubmenu {
@@ -118,8 +118,8 @@
 
 .CDB-NavSubmenu-item.is-active {
   .CDB-NavSubmenu-Link {
-    border-bottom: 1px solid $cTypo3;
-    color: $cMainBg;
+    border-bottom: 1px solid $cMainLine;
+    color: $cMainText;
   }
 }
 
@@ -131,12 +131,12 @@
 
   .CDB-NavMenu-Inner,
   .CDB-NavSubmenu {
-    border-bottom: 1px solid $cTypo2;
+    border-bottom: 1px solid $cSecondaryText;
   }
 
   .CDB-NavMenu-Link,
   .CDB-NavSubmenu-Link {
-    color: $cTypo3;
+    color: $cAltText;
   }
 
   .CDB-NavMenu-Item.is-active {
@@ -154,7 +154,7 @@
   }
 
   .CDB-NavSubmenu-Status {
-    color: $cTypo2;
+    color: $cSecondaryText;
   }
 }
 
diff --git a/src/scss/cdb-components/shapes/dots.scss b/src/scss/cdb-components/shapes/dots.scss
index 3b55072..54e61b7 100644
--- a/src/scss/cdb-components/shapes/dots.scss
+++ b/src/scss/cdb-components/shapes/dots.scss
@@ -23,6 +23,6 @@ You may resize and change the colors of the icons with the `glyph-`-classes. Ava
   background: $cSecondaryLine;
 
   &.is-selected {
-    background: $cTypo2;
+    background: $cSecondaryText;
   }
 }
diff --git a/src/scss/cdb-utilities/defaults.css.scss b/src/scss/cdb-utilities/defaults.css.scss
index 6996513..aaabb14 100644
--- a/src/scss/cdb-utilities/defaults.css.scss
+++ b/src/scss/cdb-utilities/defaults.css.scss
@@ -4,7 +4,7 @@
 @import '../cdb-variables/colors';
 
 body {
-  color: $cTypoMain;
+  color: $cMainText;
 }
 
 a {
diff --git a/src/scss/cdb-utilities/helpers.scss b/src/scss/cdb-utilities/helpers.scss
index 4a0d90c..b6f51db 100644
--- a/src/scss/cdb-utilities/helpers.scss
+++ b/src/scss/cdb-utilities/helpers.scss
@@ -46,13 +46,13 @@
   color: $cMainText;
 }
 .u-secondaryTextColor {
-  color: $cTypo2;
+  color: $cSecondaryText;
 }
 .u-altTextColor {
-  color: $cTypo3;
+  color: $cAltText;
 }
 .u-hintTextColor {
-  color: $cTypo4;
+  color: $cHintText;
 }