diff --git a/lib/content-services/src/lib/aspect-list/aspect-list.component.scss b/lib/content-services/src/lib/aspect-list/aspect-list.component.scss
index c1ea703796..75447be1ae 100644
--- a/lib/content-services/src/lib/aspect-list/aspect-list.component.scss
+++ b/lib/content-services/src/lib/aspect-list/aspect-list.component.scss
@@ -10,7 +10,7 @@
         padding-top: 3px;
         height: 400px;
         overflow: auto;
-        border: 1px solid var(--adf-theme-foreground-text-color-007);
+        border: 1px solid var(--adf-theme-foreground-text-transparent-opacity);
 
         .adf-aspect-list-check-button {
             margin-right: 5px;
diff --git a/lib/content-services/src/lib/breadcrumb/breadcrumb.component.scss b/lib/content-services/src/lib/breadcrumb/breadcrumb.component.scss
index 66134e3782..8241ead18e 100644
--- a/lib/content-services/src/lib/breadcrumb/breadcrumb.component.scss
+++ b/lib/content-services/src/lib/breadcrumb/breadcrumb.component.scss
@@ -5,7 +5,6 @@
     font-size: var(--theme-body-1-font-size);
     font-weight: 600;
     letter-spacing: -0.2px;
-    color: var(--adf-theme-foreground-text-color-054);
     overflow: hidden;
 
     &-container {
@@ -79,7 +78,6 @@
         font-weight: 600;
         letter-spacing: -0.2px;
         text-align: left;
-        color: var(--adf-theme-foreground-text-color-054);
         flex: 0 1 auto;
         min-width: 35px;
         margin-top: auto;
@@ -87,11 +85,11 @@
 
         &:hover,
         &.adf-active {
-            color: var(--adf-theme-foreground-text-color-064);
+            color: var(--adf-theme-foreground-text-light-opacity);
         }
 
         &.adf-active {
-            color: var(--adf-theme-foreground-text-color-087);
+            color: var(--adf-theme-foreground-text-dark-opacity);
         }
 
         &-chevron {
diff --git a/lib/content-services/src/lib/breadcrumb/dropdown-breadcrumb.component.scss b/lib/content-services/src/lib/breadcrumb/dropdown-breadcrumb.component.scss
index 6ef1aee8d2..f74043bc2e 100644
--- a/lib/content-services/src/lib/breadcrumb/dropdown-breadcrumb.component.scss
+++ b/lib/content-services/src/lib/breadcrumb/dropdown-breadcrumb.component.scss
@@ -8,7 +8,6 @@ $dropdown-horizontal-offset: 30px;
         font-size: var(--theme-body-1-font-size);
         font-weight: 600;
         letter-spacing: -0.2px;
-        color: var(--adf-theme-foreground-text-color-054);
         overflow: hidden;
         margin-top: 10px;
 
diff --git a/lib/content-services/src/lib/content-metadata/components/content-metadata-card/content-metadata-card.component.scss b/lib/content-services/src/lib/content-metadata/components/content-metadata-card/content-metadata-card.component.scss
index 03bab91550..79bddc5450 100644
--- a/lib/content-services/src/lib/content-metadata/components/content-metadata-card/content-metadata-card.component.scss
+++ b/lib/content-services/src/lib/content-metadata/components/content-metadata-card/content-metadata-card.component.scss
@@ -10,13 +10,13 @@
     &-footer.mat-card-footer {
         margin: 0;
         padding: 8px 12px;
-        border-top: 1px solid var(--adf-theme-foreground-text-color-007);
+        border-top: 1px solid var(--adf-theme-foreground-text-transparent-opacity);
 
         button {
-            color: var(--adf-theme-foreground-text-color-054);
+            color: var(--adf-theme-foreground-text-dark-opacity);
 
             &:hover {
-                color: var(--adf-theme-foreground-text-color-087);
+                color: var(--adf-theme-foreground-text-dark-opacity);
             }
         }
     }
diff --git a/lib/content-services/src/lib/content-node-selector/content-node-selector-panel.component.scss b/lib/content-services/src/lib/content-node-selector/content-node-selector-panel.component.scss
index 3785bca93d..103fb999ef 100644
--- a/lib/content-services/src/lib/content-node-selector/content-node-selector-panel.component.scss
+++ b/lib/content-services/src/lib/content-node-selector/content-node-selector-panel.component.scss
@@ -10,7 +10,7 @@ h2.adf-search-results-label {
     font-stretch: normal;
     line-height: 1.43;
     letter-spacing: -0.2px;
-    color: var(--adf-theme-foreground-text-color-087);
+    color: var(--adf-theme-foreground-text-dark-opacity);
 }
 
 .adf-toolbar .mat-toolbar {
@@ -94,7 +94,7 @@ h2.adf-search-results-label {
         &-list {
             height: 40vh;
             overflow: auto;
-            border: 1px solid var(--adf-theme-foreground-text-color-007);
+            border: 1px solid var(--adf-theme-foreground-text-transparent-opacity);
             border-top: 0;
             position: relative;
 
diff --git a/lib/content-services/src/lib/content-node-selector/content-node-selector.component.scss b/lib/content-services/src/lib/content-node-selector/content-node-selector.component.scss
index 1d4924b9d1..58cbfe5111 100644
--- a/lib/content-services/src/lib/content-node-selector/content-node-selector.component.scss
+++ b/lib/content-services/src/lib/content-node-selector/content-node-selector.component.scss
@@ -60,7 +60,7 @@ adf-content-node-selector {
         font-stretch: normal;
         line-height: 1.6;
         letter-spacing: -0.5px;
-        color: var(--adf-theme-foreground-text-color-087);
+        color: var(--adf-theme-foreground-text-dark-opacity);
 
         h2 {
             margin: unset;
diff --git a/lib/content-services/src/lib/content-node-selector/name-location-cell/name-location-cell.component.scss b/lib/content-services/src/lib/content-node-selector/name-location-cell/name-location-cell.component.scss
index d689fd762e..c4acc3b1b5 100644
--- a/lib/content-services/src/lib/content-node-selector/name-location-cell/name-location-cell.component.scss
+++ b/lib/content-services/src/lib/content-node-selector/name-location-cell/name-location-cell.component.scss
@@ -2,7 +2,6 @@
     display: grid;
 
     &-location {
-        color: var(--adf-theme-foreground-text-color-054);
         font-size: var(--theme-caption-font-size);
     }
 }
diff --git a/lib/content-services/src/lib/content-node-share/content-node-share.dialog.scss b/lib/content-services/src/lib/content-node-share/content-node-share.dialog.scss
index 84f07062eb..c7152823cf 100644
--- a/lib/content-services/src/lib/content-node-share/content-node-share.dialog.scss
+++ b/lib/content-services/src/lib/content-node-share/content-node-share.dialog.scss
@@ -18,7 +18,7 @@
             font-style: normal;
             font-stretch: normal;
             font-size: var(--theme-subheading-2-font-size);
-            color: var(--adf-theme-foreground-text-color-087);
+            color: var(--adf-theme-foreground-text-dark-opacity);
         }
 
         &__label {
@@ -26,7 +26,7 @@
         }
 
         &__info {
-            color: var(--adf-theme-foreground-text-color-054);
+            color: var(--adf-theme-foreground-text-dark-opacity);
             font-size: var(--theme-caption-font-size);
         }
 
@@ -39,7 +39,7 @@
         }
 
         &__input {
-            color: var(--adf-theme-foreground-text-color-087);
+            color: var(--adf-theme-foreground-text-dark-opacity);
         }
     }
 
diff --git a/lib/content-services/src/lib/dialogs/folder.dialog.scss b/lib/content-services/src/lib/dialogs/folder.dialog.scss
index c046663901..7f71807e06 100644
--- a/lib/content-services/src/lib/dialogs/folder.dialog.scss
+++ b/lib/content-services/src/lib/dialogs/folder.dialog.scss
@@ -30,7 +30,7 @@
 }
 
 .adf-dialog-action-button:disabled > span {
-    color: var(--adf-theme-foreground-text-color-054);
+    color: var(--adf-theme-foreground-text-dark-opacity);
 }
 
 @media screen and (max-width: 380px) {
diff --git a/lib/content-services/src/lib/document-list/components/document-list.component.scss b/lib/content-services/src/lib/document-list/components/document-list.component.scss
index 29d31ae356..1ed7985ae5 100644
--- a/lib/content-services/src/lib/document-list/components/document-list.component.scss
+++ b/lib/content-services/src/lib/document-list/components/document-list.component.scss
@@ -131,7 +131,7 @@
         font-size: var(--theme-headline-font-size);
         line-height: 1.33;
         letter-spacing: -1px;
-        color: var(--adf-theme-foreground-text-color-054);
+        color: var(--adf-theme-foreground-text-dark-opacity);
     }
 
     &-drag-drop {
diff --git a/lib/content-services/src/lib/new-version-uploader/new-version-uploader.dialog.scss b/lib/content-services/src/lib/new-version-uploader/new-version-uploader.dialog.scss
index f9d2da7198..b3ac11acae 100644
--- a/lib/content-services/src/lib/new-version-uploader/new-version-uploader.dialog.scss
+++ b/lib/content-services/src/lib/new-version-uploader/new-version-uploader.dialog.scss
@@ -34,7 +34,7 @@
             line-height: 1.6;
             margin: 0;
             letter-spacing: -0.5px;
-            color: var(--adf-theme-foreground-text-color-087);
+            color: var(--adf-theme-foreground-text-dark-opacity);
         }
 
         &-content {
@@ -51,7 +51,7 @@
             padding: 8px 8px 24px 8px;
             display: flex;
             justify-content: flex-end;
-            color: var(--adf-theme-foreground-text-color-054);
+            color: var(--adf-theme-foreground-text-dark-opacity);
 
             button {
                 text-transform: uppercase;
diff --git a/lib/content-services/src/lib/permission-manager/components/add-permission/add-permission-dialog.component.scss b/lib/content-services/src/lib/permission-manager/components/add-permission/add-permission-dialog.component.scss
index 5b4ed96024..9ddb4fd520 100644
--- a/lib/content-services/src/lib/permission-manager/components/add-permission/add-permission-dialog.component.scss
+++ b/lib/content-services/src/lib/permission-manager/components/add-permission/add-permission-dialog.component.scss
@@ -8,7 +8,7 @@
         font-stretch: normal;
         line-height: 1.6;
         letter-spacing: -0.5px;
-        color: var(--adf-theme-foreground-text-color-087);
+        color: var(--adf-theme-foreground-text-dark-opacity);
     }
 
     .mat-dialog-container {
diff --git a/lib/content-services/src/lib/permission-manager/components/add-permission/add-permission-panel.component.scss b/lib/content-services/src/lib/permission-manager/components/add-permission/add-permission-panel.component.scss
index e43fd3378c..a005aaf2b7 100644
--- a/lib/content-services/src/lib/permission-manager/components/add-permission/add-permission-panel.component.scss
+++ b/lib/content-services/src/lib/permission-manager/components/add-permission/add-permission-panel.component.scss
@@ -5,7 +5,7 @@ $search-result-height: calc(100% - 75px);
         display: flex;
         height: $search-result-height;
         overflow: auto;
-        border: 2px solid var(--adf-theme-foreground-text-color-007);
+        border: 2px solid var(--adf-theme-foreground-text-transparent-opacity);
 
         &-elements {
             width: 100%;
@@ -22,7 +22,7 @@ $search-result-height: calc(100% - 75px);
         justify-content: space-around;
         height: $search-result-height;
         overflow: auto;
-        border: 2px solid var(--adf-theme-foreground-text-color-007);
+        border: 2px solid var(--adf-theme-foreground-text-transparent-opacity);
     }
 
     &-permission-no-result {
diff --git a/lib/content-services/src/lib/permission-manager/components/permission-list/permission-list.component.scss b/lib/content-services/src/lib/permission-manager/components/permission-list/permission-list.component.scss
index b003800781..8e65e51555 100644
--- a/lib/content-services/src/lib/permission-manager/components/permission-list/permission-list.component.scss
+++ b/lib/content-services/src/lib/permission-manager/components/permission-list/permission-list.component.scss
@@ -18,7 +18,7 @@
         justify-content: space-between;
         align-items: center;
         padding: 10px 15px;
-        border: 1px solid var(--adf-theme-foreground-text-color-007);
+        border: 1px solid var(--adf-theme-foreground-text-transparent-opacity);
     }
 
     &-inherit-container {
diff --git a/lib/content-services/src/lib/search/components/search-facet-field/search-facet-field.component.scss b/lib/content-services/src/lib/search/components/search-facet-field/search-facet-field.component.scss
index 894fa64168..9a8617a6fd 100644
--- a/lib/content-services/src/lib/search/components/search-facet-field/search-facet-field.component.scss
+++ b/lib/content-services/src/lib/search/components/search-facet-field/search-facet-field.component.scss
@@ -83,6 +83,6 @@
 
     .mat-checkbox-label,
     .mat-radio-label {
-        color: var(--adf-theme-foreground-text-color-054);
+        color: var(--adf-theme-foreground-text-dark-opacity);
     }
 }
diff --git a/lib/content-services/src/lib/search/components/search-filter-container/search-filter-container.component.scss b/lib/content-services/src/lib/search/components/search-filter-container/search-filter-container.component.scss
index 0fede8f85b..9743b00811 100644
--- a/lib/content-services/src/lib/search/components/search-filter-container/search-filter-container.component.scss
+++ b/lib/content-services/src/lib/search/components/search-filter-container/search-filter-container.component.scss
@@ -27,7 +27,7 @@
         display: flex;
         flex-direction: column;
         padding: 15px 15px 10px;
-        color: var(--adf-theme-foreground-text-color-087) !important;
+        color: var(--adf-theme-foreground-text-dark-opacity) !important;
 
         .adf-facet-buttons {
             display: none;
@@ -45,7 +45,7 @@
     &-title {
         font-size: 1.1em;
         padding-bottom: 5px;
-        color: var(--adf-theme-foreground-text-color-087);
+        color: var(--adf-theme-foreground-text-dark-opacity);
     }
 
     &-actions {
@@ -56,7 +56,7 @@
 
         > button {
             font-size: 0.9em;
-            color: var(--adf-theme-foreground-text-color-087);
+            color: var(--adf-theme-foreground-text-dark-opacity);
         }
     }
 }
diff --git a/lib/content-services/src/lib/search/components/search-filter/search-filter.component.scss b/lib/content-services/src/lib/search/components/search-filter/search-filter.component.scss
index 275ecf1bf1..8a01bf74bd 100644
--- a/lib/content-services/src/lib/search/components/search-filter/search-filter.component.scss
+++ b/lib/content-services/src/lib/search/components/search-filter/search-filter.component.scss
@@ -1,11 +1,11 @@
 .adf-search-filter {
     .mat-expansion-panel-header-title {
         font-size: var(--theme-body-1-font-size);
-        color: var(--adf-theme-foreground-text-color-087);
+        color: var(--adf-theme-foreground-text-dark-opacity);
     }
 
     .mat-checkbox-label,
     .mat-radio-label {
-        color: var(--adf-theme-foreground-text-color-054);
+        color: var(--adf-theme-foreground-text-dark-opacity);
     }
 }
diff --git a/lib/content-services/src/lib/search/components/search-sorting-picker/search-sorting-picker.component.scss b/lib/content-services/src/lib/search/components/search-sorting-picker/search-sorting-picker.component.scss
index 4e3d6bb66c..3cbc6a224f 100644
--- a/lib/content-services/src/lib/search/components/search-sorting-picker/search-sorting-picker.component.scss
+++ b/lib/content-services/src/lib/search/components/search-sorting-picker/search-sorting-picker.component.scss
@@ -1,5 +1,5 @@
 .adf-search-sorting-picker {
     .mat-icon-button {
-        color: var(--adf-theme-foreground-text-color-054);
+        color: var(--adf-theme-foreground-text-dark-opacity);
     }
 }
diff --git a/lib/content-services/src/lib/tag/tag-node-list.component.scss b/lib/content-services/src/lib/tag/tag-node-list.component.scss
index c9c80ca3ef..8918529c06 100644
--- a/lib/content-services/src/lib/tag/tag-node-list.component.scss
+++ b/lib/content-services/src/lib/tag/tag-node-list.component.scss
@@ -10,7 +10,7 @@
 
     .adf-view-more-button {
         margin: 4px;
-        color: var(--adf-theme-foreground-text-color-054);
+        color: var(--adf-theme-foreground-text-dark-opacity);
     }
 
     .adf-full-width {
diff --git a/lib/content-services/src/lib/tree/components/tree.component.scss b/lib/content-services/src/lib/tree/components/tree.component.scss
index d527d1fdbe..a2f99cb996 100644
--- a/lib/content-services/src/lib/tree/components/tree.component.scss
+++ b/lib/content-services/src/lib/tree/components/tree.component.scss
@@ -24,7 +24,7 @@ $tree-header-font-size: 12px !default;
     padding-left: 15px;
     padding-right: 15px;
     transition-property: background-color;
-    border-bottom: 1px solid var(--adf-theme-foreground-text-color-007);
+    border-bottom: 1px solid var(--adf-theme-foreground-text-transparent-opacity);
     min-height: $tree-row-height;
     user-select: none;
 
diff --git a/lib/content-services/src/lib/upload/components/file-uploading-dialog.component.scss b/lib/content-services/src/lib/upload/components/file-uploading-dialog.component.scss
index cb1ded7ad7..bf9e40b2ef 100644
--- a/lib/content-services/src/lib/upload/components/file-uploading-dialog.component.scss
+++ b/lib/content-services/src/lib/upload/components/file-uploading-dialog.component.scss
@@ -1,7 +1,7 @@
 /* stylelint-disable no-descending-specificity */
 .adf-upload-dialog {
     background: var(--adf-theme-background-dialog-color);
-    color: var(--adf-theme-foreground-text-color-054);
+    color: var(--adf-theme-foreground-text-dark-opacity);
     position: fixed;
     bottom: 20px;
     width: 40%;
@@ -33,7 +33,7 @@
             min-width: 0;
             padding: 0;
             line-height: 0;
-            color: var(--adf-theme-foreground-text-color-054) !important;
+            color: var(--adf-theme-foreground-text-dark-opacity) !important;
         }
     }
 
@@ -49,8 +49,8 @@
     &__content {
         overflow: auto;
         max-height: 194px;
-        border-top: 1px solid var(--adf-theme-foreground-text-color-014);
-        border-bottom: 1px solid var(--adf-theme-foreground-text-color-014);
+        border-top: 1px solid var(--adf-theme-foreground-text-light-opacity);
+        border-bottom: 1px solid var(--adf-theme-foreground-text-light-opacity);
     }
 
     &__confirmation {
@@ -61,7 +61,7 @@
         font-size: var(--theme-subheading-2-font-size);
         line-height: 1.5;
         letter-spacing: -0.4px;
-        color: var(--adf-theme-foreground-text-color-087);
+        color: var(--adf-theme-foreground-text-dark-opacity);
     }
 
     &__confirmation--text {
diff --git a/lib/content-services/src/lib/upload/components/file-uploading-list-row.component.scss b/lib/content-services/src/lib/upload/components/file-uploading-list-row.component.scss
index 1ded71eb90..423acc8f6a 100644
--- a/lib/content-services/src/lib/upload/components/file-uploading-list-row.component.scss
+++ b/lib/content-services/src/lib/upload/components/file-uploading-list-row.component.scss
@@ -2,7 +2,7 @@ $file-uploading-row-hover-color: #eee !default;
 
 adf-file-uploading-list-row:not(:first-child) {
     display: block;
-    border-top: 1px solid var(--adf-theme-foreground-text-color-014);
+    border-top: 1px solid var(--adf-theme-foreground-text-light-opacity);
 }
 
 .adf-file-uploading-row {
diff --git a/lib/core/src/lib/card-view/components/card-view-arrayitem/card-view-arrayitem.component.scss b/lib/core/src/lib/card-view/components/card-view-arrayitem/card-view-arrayitem.component.scss
index 0c7e66a54a..6eaaab6f25 100644
--- a/lib/core/src/lib/card-view/components/card-view-arrayitem/card-view-arrayitem.component.scss
+++ b/lib/core/src/lib/card-view/components/card-view-arrayitem/card-view-arrayitem.component.scss
@@ -5,7 +5,7 @@
     }
 
     &-array-item-action {
-        color: var(--adf-theme-foreground-text-color-025);
+        color: var(--adf-theme-foreground-text-light-opacity);
     }
 
     &-array-item-action:hover,
diff --git a/lib/core/src/lib/card-view/components/card-view-dateitem/card-view-dateitem.component.scss b/lib/core/src/lib/card-view/components/card-view-dateitem/card-view-dateitem.component.scss
index 5cd6e66d5c..d919b39e1d 100644
--- a/lib/core/src/lib/card-view/components/card-view-dateitem/card-view-dateitem.component.scss
+++ b/lib/core/src/lib/card-view/components/card-view-dateitem/card-view-dateitem.component.scss
@@ -29,7 +29,7 @@
 
     &-dateitem-editable {
         cursor: pointer;
-        border-bottom: 1px solid var(--adf-theme-foreground-text-color-042);
+        border-bottom: 1px solid var(--adf-theme-foreground-text-dark-opacity);
         padding-bottom: 6px;
 
         &-controls {
diff --git a/lib/core/src/lib/card-view/components/card-view-keyvaluepairsitem/card-view-keyvaluepairsitem.component.scss b/lib/core/src/lib/card-view/components/card-view-keyvaluepairsitem/card-view-keyvaluepairsitem.component.scss
index 843f518375..2e12b2a2cd 100644
--- a/lib/core/src/lib/card-view/components/card-view-keyvaluepairsitem/card-view-keyvaluepairsitem.component.scss
+++ b/lib/core/src/lib/card-view/components/card-view-keyvaluepairsitem/card-view-keyvaluepairsitem.component.scss
@@ -14,7 +14,7 @@
             }
 
             .mat-form-field-appearance-legacy .mat-form-field-label {
-                color: var(--adf-theme-foreground-text-color-040) !important;
+                color: var(--adf-theme-foreground-text-light-opacity) !important;
             }
         }
 
diff --git a/lib/core/src/lib/card-view/components/card-view-selectitem/select-filter-input/select-filter-input.component.scss b/lib/core/src/lib/card-view/components/card-view-selectitem/select-filter-input/select-filter-input.component.scss
index 2a3023d9b1..6f7529c1ee 100644
--- a/lib/core/src/lib/card-view/components/card-view-selectitem/select-filter-input/select-filter-input.component.scss
+++ b/lib/core/src/lib/card-view/components/card-view-selectitem/select-filter-input/select-filter-input.component.scss
@@ -11,7 +11,7 @@ $select-filter-height: 4em !default;
         display: flex;
         z-index: 100;
         font-size: var(--theme-body-1-font-size);
-        color: var(--adf-theme-foreground-text-color-087);
+        color: var(--adf-theme-foreground-text-dark-opacity);
         line-height: 3em;
         height: $select-filter-height;
         padding: 5px 16px 0;
diff --git a/lib/core/src/lib/card-view/components/card-view-textitem/card-view-textitem.component.scss b/lib/core/src/lib/card-view/components/card-view-textitem/card-view-textitem.component.scss
index 4c79e56e1c..129079f28e 100644
--- a/lib/core/src/lib/card-view/components/card-view-textitem/card-view-textitem.component.scss
+++ b/lib/core/src/lib/card-view/components/card-view-textitem/card-view-textitem.component.scss
@@ -3,14 +3,14 @@
         font-size: var(--theme-subheading-2-font-size);
         width: 16px;
         height: 16px;
-        color: var(--adf-theme-foreground-text-color-025);
+        color: var(--adf-theme-foreground-text-light-opacity);
     }
 
     &-textitem-action.mat-icon-button {
         width: 20px;
         height: 20px;
         line-height: 20px;
-        color: var(--adf-theme-foreground-text-color-025);
+        color: var(--adf-theme-foreground-text-light-opacity);
     }
 
     &-textitem-action:hover,
@@ -96,7 +96,7 @@
     }
 
     &-textitem-default-value {
-        color: var(--adf-theme-foreground-text-color-054);
+        color: var(--adf-theme-foreground-text-dark-opacity);
     }
 
     &-textitem-editable .mat-form-field-wrapper {
@@ -153,7 +153,7 @@
 
         &:hover::-webkit-scrollbar-thumb {
             display: block;
-            background-color: var(--adf-theme-foreground-text-color-025);
+            background-color: var(--adf-theme-foreground-text-light-opacity);
             border-radius: 2px;
         }
     }
@@ -193,9 +193,12 @@
                 display: none;
             }
 
-            .adf-textitem-clear-icon {
-                display: block;
-            }
+        .adf-property-clear-value {
+            display: flex;
+        }
+
+        .adf-property-clear-value:hover {
+            color: var(--adf-theme-foreground-text-color);
         }
     }
 }
diff --git a/lib/core/src/lib/datatable/components/datatable/datatable.component.scss b/lib/core/src/lib/datatable/components/datatable/datatable.component.scss
index 04d6a379d5..ccb4c588b1 100644
--- a/lib/core/src/lib/datatable/components/datatable/datatable.component.scss
+++ b/lib/core/src/lib/datatable/components/datatable/datatable.component.scss
@@ -27,7 +27,7 @@ $data-table-cell-min-width-file-size: $data-table-cell-min-width !default;
 
         &--divider {
             padding: 24px 0;
-            border: 1px solid var(--adf-theme-foreground-text-color-007);
+            border: 1px solid var(--adf-theme-foreground-text-transparent-opacity);
         }
 
         &:hover {
@@ -128,7 +128,7 @@ $data-table-cell-min-width-file-size: $data-table-cell-min-width !default;
                 margin-left: 10px;
                 text-align: left;
                 content: attr(title);
-                color: var(--adf-theme-foreground-text-color-054);
+                color: var(--adf-theme-foreground-text-dark-opacity);
                 float: left;
                 width: 140px;
                 white-space: nowrap;
@@ -192,7 +192,7 @@ $data-table-cell-min-width-file-size: $data-table-cell-min-width !default;
     display: flex;
     flex-direction: column;
     background-color: var(--adf-theme-background-card-color);
-    border: 1px solid var(--adf-theme-foreground-text-color-007);
+    border: 1px solid var(--adf-theme-foreground-text-transparent-opacity);
     box-sizing: border-box;
     overflow-x: auto;
 
@@ -275,7 +275,7 @@ $data-table-cell-min-width-file-size: $data-table-cell-min-width !default;
             @include material-animation-default(0.28s);
 
             transition-property: background-color;
-            border-top: 1px solid var(--adf-theme-foreground-text-color-007);
+            border-top: 1px solid var(--adf-theme-foreground-text-transparent-opacity);
             min-height: $data-table-row-height;
             cursor: pointer;
 
@@ -287,7 +287,7 @@ $data-table-cell-min-width-file-size: $data-table-cell-min-width !default;
             }
 
             &:last-child {
-                border-bottom: 1px solid var(--adf-theme-foreground-text-color-007);
+                border-bottom: 1px solid var(--adf-theme-foreground-text-transparent-opacity);
             }
         }
     }
@@ -724,8 +724,8 @@ $data-table-cell-min-width-file-size: $data-table-cell-min-width !default;
     .adf-datatable-header {
         display: block;
         margin-right: 0;
-        border-top: 1px solid var(--adf-theme-foreground-text-color-007);
-        border-bottom: 1px solid var(--adf-theme-foreground-text-color-007);
+        border-top: 1px solid var(--adf-theme-foreground-text-transparent-opacity);
+        border-bottom: 1px solid var(--adf-theme-foreground-text-transparent-opacity);
     }
 
     .adf-datatable-body {
@@ -775,7 +775,7 @@ $data-table-cell-min-width-file-size: $data-table-cell-min-width !default;
 
 .adf-datatable--empty--header-visible {
     .adf-datatable-header {
-        border: 1px solid var(--adf-theme-foreground-text-color-007);
+        border: 1px solid var(--adf-theme-foreground-text-transparent-opacity);
     }
 
     .adf-datatable-body {
diff --git a/lib/core/src/lib/directives/tooltip-card/tooltip-card.component.scss b/lib/core/src/lib/directives/tooltip-card/tooltip-card.component.scss
index 17c1ffd7a4..b08c7bf03f 100644
--- a/lib/core/src/lib/directives/tooltip-card/tooltip-card.component.scss
+++ b/lib/core/src/lib/directives/tooltip-card/tooltip-card.component.scss
@@ -15,7 +15,7 @@ div.adf-tooltip-card {
     p,
     div {
         font-size: var(--theme-caption-font-size);
-        color: var(--adf-theme-foreground-text-color-075);
+        color: var(--adf-theme-foreground-text-dark-opacity);
         margin: 0;
     }
 
diff --git a/lib/core/src/lib/info-drawer/info-drawer-layout.component.scss b/lib/core/src/lib/info-drawer/info-drawer-layout.component.scss
index 2165000031..90e87fa091 100644
--- a/lib/core/src/lib/info-drawer/info-drawer-layout.component.scss
+++ b/lib/core/src/lib/info-drawer/info-drawer-layout.component.scss
@@ -50,7 +50,7 @@ $adf-info-drawer-icon-size-half: 24px !default;
                 line-height: 1.6;
                 letter-spacing: -0.5px;
                 text-align: left;
-                color: var(--adf-theme-foreground-text-color-054);
+                color: var(--adf-theme-foreground-text-dark-opacity);
 
                 & > div {
                     overflow: hidden;
@@ -77,7 +77,7 @@ $adf-info-drawer-icon-size-half: 24px !default;
                 .adf-manage-versions-no-permission {
                     margin: 0;
                     padding: $adf-info-drawer-icon-size-half;
-                    color: var(--adf-theme-foreground-text-color-054);
+                    color: var(--adf-theme-foreground-text-dark-opacity);
                     text-align: center;
                     display: flex;
                     flex-direction: column;
diff --git a/lib/core/src/lib/layout/components/layout-container/layout-container.component.scss b/lib/core/src/lib/layout/components/layout-container/layout-container.component.scss
index 642b9a6539..671f0fcb78 100644
--- a/lib/core/src/lib/layout/components/layout-container/layout-container.component.scss
+++ b/lib/core/src/lib/layout/components/layout-container/layout-container.component.scss
@@ -32,7 +32,7 @@ adf-layout-container {
 
 .mat-sidenav {
     overflow: hidden;
-    border-right: 1px solid var(--adf-theme-foreground-text-color-007);
+    border-right: 1px solid var(--adf-theme-foreground-text-transparent-opacity);
     background-color: var(--theme-background-color);
 }
 
diff --git a/lib/core/src/lib/layout/components/sidebar-action/sidebar-action-menu.component.scss b/lib/core/src/lib/layout/components/sidebar-action/sidebar-action-menu.component.scss
index c38c42290a..a935618ee4 100644
--- a/lib/core/src/lib/layout/components/sidebar-action/sidebar-action-menu.component.scss
+++ b/lib/core/src/lib/layout/components/sidebar-action/sidebar-action-menu.component.scss
@@ -28,7 +28,7 @@
 
     &-sidebar-action-menu-icon {
         margin: 18px 0 0 20px;
-        color: var(--adf-theme-foreground-text-color-054);
+        color: var(--adf-theme-foreground-text-dark-opacity);
         cursor: pointer;
 
         &:hover {
@@ -42,7 +42,7 @@
 
         .mat-menu-item {
             font-size: var(--theme-body-1-font-size);
-            color: var(--adf-theme-foreground-text-color-087);
+            color: var(--adf-theme-foreground-text-dark-opacity);
             text-align: left;
             line-height: 1.5;
             letter-spacing: -0.4px;
diff --git a/lib/core/src/lib/styles/_index.scss b/lib/core/src/lib/styles/_index.scss
index a0f7cc3720..34bf6b37bf 100644
--- a/lib/core/src/lib/styles/_index.scss
+++ b/lib/core/src/lib/styles/_index.scss
@@ -26,6 +26,7 @@
 
     // map SCSS variables to expose as CSS variables
     $defaults: (
+        --adf-parameter-opacity-for-labels: 0,54,
         // theme colors
         --theme-primary-color: mat.get-color-from-palette($primary),
         --theme-primary-color-default-contrast: mat.get-color-from-palette($primary, default-contrast),
@@ -51,16 +52,10 @@
         --adf-theme-foreground-icon-color-054: mat.get-color-from-palette($foreground, icon, 0.54),
         --adf-theme-foreground-secondary-text-color: mat.get-color-from-palette($foreground, secondary-text),
         --adf-theme-foreground-text-color: mat.get-color-from-palette($foreground, text),
-        --adf-theme-foreground-text-color-087: mat.get-color-from-palette($foreground, text, 0.87),
-        --adf-theme-foreground-text-color-075: mat.get-color-from-palette($foreground, text, 0.75),
-        --adf-theme-foreground-text-color-064: mat.get-color-from-palette($foreground, text, 0.64),
-        --adf-theme-foreground-text-color-054: mat.get-color-from-palette($foreground, text, 0.54),
-        --adf-theme-foreground-text-color-042: mat.get-color-from-palette($foreground, text, 0.42),
-        --adf-theme-foreground-text-color-040: mat.get-color-from-palette($foreground, text, 0.4),
-        --adf-theme-foreground-text-color-027: mat.get-color-from-palette($foreground, text, 0.27),
-        --adf-theme-foreground-text-color-025: mat.get-color-from-palette($foreground, text, 0.25),
-        --adf-theme-foreground-text-color-014: mat.get-color-from-palette($foreground, text, 0.14),
-        --adf-theme-foreground-text-color-007: mat.get-color-from-palette($foreground, text, 0.07),
+
+        --adf-theme-foreground-text-dark-opacity: mat.get-color-from-palette($foreground, text, 0.64),
+        --adf-theme-foreground-text-light-opacity: mat.get-color-from-palette($foreground, text, 0.4),
+        --adf-theme-foreground-text-transparent-opacity: mat.get-color-from-palette($foreground, text, 0.07),
 
         --adf-theme-background-card-color: mat.get-color-from-palette($background, card),
         --adf-theme-background-card-color-087: mat.get-color-from-palette($background, card, 0.87),
diff --git a/lib/core/src/lib/styles/material.theme.scss b/lib/core/src/lib/styles/material.theme.scss
index 5fc75cba00..6467fc99a6 100644
--- a/lib/core/src/lib/styles/material.theme.scss
+++ b/lib/core/src/lib/styles/material.theme.scss
@@ -12,21 +12,21 @@
     .mat-calendar {
         .mat-calendar-header {
             button {
-                color: var(--adf-theme-foreground-text-color-087);
+                color: var(--adf-theme-foreground-text-dark-opacity);
 
                 &:disabled {
-                    color: var(--adf-theme-foreground-text-color-054);
+                    color: var(--adf-theme-foreground-text-dark-opacity);
                 }
             }
         }
 
         .mat-calendar-content {
             .mat-calendar-table-header th {
-                color: var(--adf-theme-foreground-text-color-054);
+                color: var(--adf-theme-foreground-text-dark-opacity);
             }
 
             .mat-calendar-body-disabled > div {
-                color: var(--adf-theme-foreground-text-color-054) !important;
+                color: var(--adf-theme-foreground-text-dark-opacity) !important;
             }
         }
     }
@@ -48,11 +48,11 @@
 
         .mat-datetimepicker-calendar-content {
             .mat-datetimepicker-calendar-table-header th {
-                color: var(--adf-theme-foreground-text-color-054);
+                color: var(--adf-theme-foreground-text-dark-opacity);
             }
 
             .mat-datetimepicker-calendar-body-disabled > div {
-                color: var(--adf-theme-foreground-text-color-054);
+                color: var(--adf-theme-foreground-text-dark-opacity);
             }
         }
     }
diff --git a/lib/core/src/lib/templates/empty-content/empty-content.component.scss b/lib/core/src/lib/templates/empty-content/empty-content.component.scss
index a57ac7db22..3f3ffef978 100644
--- a/lib/core/src/lib/templates/empty-content/empty-content.component.scss
+++ b/lib/core/src/lib/templates/empty-content/empty-content.component.scss
@@ -1,5 +1,5 @@
 .adf-empty-content {
-    color: var(--adf-theme-foreground-text-color-054);
+    color: var(--adf-theme-foreground-text-dark-opacity);
     display: flex;
     flex-direction: column;
     align-items: center;
diff --git a/lib/core/src/lib/templates/error-content/error-content.component.scss b/lib/core/src/lib/templates/error-content/error-content.component.scss
index a6b4b749d6..064a094509 100644
--- a/lib/core/src/lib/templates/error-content/error-content.component.scss
+++ b/lib/core/src/lib/templates/error-content/error-content.component.scss
@@ -1,5 +1,5 @@
 .adf-error-content {
-    color: var(--adf-theme-foreground-text-color-054);
+    color: var(--adf-theme-foreground-text-dark-opacity);
     display: flex;
     flex-direction: column;
     align-items: center;
diff --git a/lib/core/src/lib/toolbar/toolbar.component.scss b/lib/core/src/lib/toolbar/toolbar.component.scss
index 6818d5972a..ac6491b3f3 100644
--- a/lib/core/src/lib/toolbar/toolbar.component.scss
+++ b/lib/core/src/lib/toolbar/toolbar.component.scss
@@ -11,8 +11,8 @@
 
     .mat-toolbar {
         min-height: 48px;
-        border: 1px solid var(--adf-theme-foreground-text-color-007);
-        color: var(--adf-theme-foreground-text-color-054);
+        border: 1px solid var(--adf-theme-foreground-text-transparent-opacity);
+        color: var(--adf-theme-foreground-text-dark-opacity);
     }
 
     .mat-toolbar-row {
diff --git a/lib/core/src/lib/viewer/components/img-viewer.component.scss b/lib/core/src/lib/viewer/components/img-viewer.component.scss
index 7db886c673..07900c5117 100644
--- a/lib/core/src/lib/viewer/components/img-viewer.component.scss
+++ b/lib/core/src/lib/viewer/components/img-viewer.component.scss
@@ -54,7 +54,7 @@
             width: 79px;
             height: 24px;
             font-size: var(--theme-body-1-font-size);
-            border: 1px solid var(--adf-theme-foreground-text-color-007);
+            border: 1px solid var(--adf-theme-foreground-text-transparent-opacity);
             text-align: center;
             line-height: 24px;
             margin-left: 4px;
diff --git a/lib/core/src/lib/viewer/components/pdf-viewer-thumbnails.component.scss b/lib/core/src/lib/viewer/components/pdf-viewer-thumbnails.component.scss
index eeb183ab13..c4c20b0b27 100644
--- a/lib/core/src/lib/viewer/components/pdf-viewer-thumbnails.component.scss
+++ b/lib/core/src/lib/viewer/components/pdf-viewer-thumbnails.component.scss
@@ -21,7 +21,7 @@
     }
 
     &__thumb:hover {
-        box-shadow: 0 0 5px 0 var(--adf-theme-foreground-text-color-087);
+        box-shadow: 0 0 5px 0 var(--adf-theme-foreground-text-dark-opacity);
     }
 
     &__thumb--selected {
diff --git a/lib/core/src/lib/viewer/components/pdf-viewer.component.scss b/lib/core/src/lib/viewer/components/pdf-viewer.component.scss
index 07ca3293a6..dedc2dbab7 100644
--- a/lib/core/src/lib/viewer/components/pdf-viewer.component.scss
+++ b/lib/core/src/lib/viewer/components/pdf-viewer.component.scss
@@ -57,7 +57,7 @@
             justify-content: flex-end;
             align-items: flex-end;
             display: flex;
-            color: var(--adf-theme-foreground-text-color-054);
+            color: var(--adf-theme-foreground-text-dark-opacity);
         }
     }
 
@@ -109,7 +109,7 @@
             font-size: var(--theme-body-1-font-size);
 
             & > input {
-                border: 1px solid var(--adf-theme-foreground-text-color-007);
+                border: 1px solid var(--adf-theme-foreground-text-transparent-opacity);
                 background-color: var(--adf-theme-background-card-color);
                 color: inherit;
                 font-size: var(--theme-body-1-font-size);
@@ -129,7 +129,7 @@
             width: 79px;
             height: 24px;
             font-size: var(--theme-body-1-font-size);
-            border: 1px solid var(--adf-theme-foreground-text-color-007);
+            border: 1px solid var(--adf-theme-foreground-text-transparent-opacity);
             text-align: center;
             line-height: 24px;
             margin-left: 4px;
diff --git a/lib/core/src/lib/viewer/components/viewer.component.scss b/lib/core/src/lib/viewer/components/viewer.component.scss
index bf59bc2868..e9568247b5 100644
--- a/lib/core/src/lib/viewer/components/viewer.component.scss
+++ b/lib/core/src/lib/viewer/components/viewer.component.scss
@@ -11,7 +11,7 @@
     height: 100%;
 
     .mat-toolbar {
-        color: var(--adf-theme-foreground-text-color-054);
+        color: var(--adf-theme-foreground-text-dark-opacity);
 
         .adf-toolbar-title {
             width: auto;
@@ -117,15 +117,15 @@
         display: block;
         padding: 0;
         background-color: var(--theme-background-color);
-        box-shadow: 0 2px 4px 0 var(--adf-theme-foreground-text-color-027);
+        box-shadow: 0 2px 4px 0 var(--adf-theme-foreground-text-light-opacity);
         overflow: auto;
 
         &__right {
-            border-left: 1px solid var(--adf-theme-foreground-text-color-007);
+            border-left: 1px solid var(--adf-theme-foreground-text-transparent-opacity);
         }
 
         &__left {
-            border-right: 1px solid var(--adf-theme-foreground-text-color-007);
+            border-right: 1px solid var(--adf-theme-foreground-text-transparent-opacity);
         }
     }
 }
diff --git a/lib/insights/src/lib/analytics-process/components/analytics-report-list.component.scss b/lib/insights/src/lib/analytics-process/components/analytics-report-list.component.scss
index f4be333007..6abf221cb3 100644
--- a/lib/insights/src/lib/analytics-process/components/analytics-report-list.component.scss
+++ b/lib/insights/src/lib/analytics-process/components/analytics-report-list.component.scss
@@ -81,10 +81,10 @@
             height: 40px;
 
             &-icon {
-                color: var(--adf-theme-foreground-text-color-054);
+                color: var(--adf-theme-foreground-text-dark-opacity);
 
                 &:hover {
-                    color: var(--adf-theme-foreground-text-color-087);
+                    color: var(--adf-theme-foreground-text-dark-opacity);
                 }
             }
         }
diff --git a/lib/process-services-cloud/src/lib/form/components/widgets/attach-file/file-properties-table-cloud.component.scss b/lib/process-services-cloud/src/lib/form/components/widgets/attach-file/file-properties-table-cloud.component.scss
index a97d41d385..7e9fcc5087 100644
--- a/lib/process-services-cloud/src/lib/form/components/widgets/attach-file/file-properties-table-cloud.component.scss
+++ b/lib/process-services-cloud/src/lib/form/components/widgets/attach-file/file-properties-table-cloud.component.scss
@@ -1,7 +1,7 @@
 .adf-file-properties-table {
     table {
         width: 100%;
-        border: 1px solid var(--adf-theme-foreground-text-color-007);
+        border: 1px solid var(--adf-theme-foreground-text-transparent-opacity);
         box-shadow: none;
 
         .adf-file {
diff --git a/lib/process-services-cloud/src/lib/form/components/widgets/properties-viewer/properties-viewer.widget.scss b/lib/process-services-cloud/src/lib/form/components/widgets/properties-viewer/properties-viewer.widget.scss
index 044ff48ab1..078a6c48f8 100644
--- a/lib/process-services-cloud/src/lib/form/components/widgets/properties-viewer/properties-viewer.widget.scss
+++ b/lib/process-services-cloud/src/lib/form/components/widgets/properties-viewer/properties-viewer.widget.scss
@@ -6,7 +6,7 @@ adf-properties-viewer-widget {
         display: block;
         height: 100%;
         width: 100%;
-        border: 1px solid var(--adf-theme-foreground-text-color-007);
+        border: 1px solid var(--adf-theme-foreground-text-transparent-opacity);
         border-radius: 6px;
 
         .adf-properties-viewer-wrapper-loading {
diff --git a/lib/process-services/src/lib/form/start-form.component.scss b/lib/process-services/src/lib/form/start-form.component.scss
index e40c2aec28..ec92975d99 100644
--- a/lib/process-services/src/lib/form/start-form.component.scss
+++ b/lib/process-services/src/lib/form/start-form.component.scss
@@ -21,7 +21,7 @@
             line-height: var(--theme-headline-line-height);
             letter-spacing: -0.4px;
             text-align: left;
-            color: var(--adf-theme-foreground-text-color-054);
+            color: var(--adf-theme-foreground-text-dark-opacity);
             text-transform: uppercase;
         }
 
diff --git a/lib/process-services/src/lib/form/widgets/dynamic-table/dynamic-table.widget.scss b/lib/process-services/src/lib/form/widgets/dynamic-table/dynamic-table.widget.scss
index dcd750693f..b6a25fe96e 100644
--- a/lib/process-services/src/lib/form/widgets/dynamic-table/dynamic-table.widget.scss
+++ b/lib/process-services/src/lib/form/widgets/dynamic-table/dynamic-table.widget.scss
@@ -26,7 +26,7 @@ dynamic-table-widget .adf-label {
     &-dynamic-table {
         width: 100%;
         position: relative;
-        border: 1px solid var(--adf-theme-foreground-text-color-007);
+        border: 1px solid var(--adf-theme-foreground-text-transparent-opacity);
         white-space: nowrap;
         font-size: $dynamic-table-font-size;
 
@@ -82,8 +82,8 @@ dynamic-table-widget .adf-label {
             position: relative;
             vertical-align: middle;
             height: $dynamic-table-row-height;
-            border-top: 1px solid var(--adf-theme-foreground-text-color-007);
-            border-bottom: 1px solid var(--adf-theme-foreground-text-color-007);
+            border-top: 1px solid var(--adf-theme-foreground-text-transparent-opacity);
+            border-bottom: 1px solid var(--adf-theme-foreground-text-transparent-opacity);
             padding-top: $dynamic-table-cell-top;
             box-sizing: border-box;