diff --git a/app/components/notifications-page/messages/nf-apistcmpltd1/index.scss b/app/components/notifications-page/messages/nf-apistcmpltd1/index.scss
index 116b78555..b2ff93cd8 100644
--- a/app/components/notifications-page/messages/nf-apistcmpltd1/index.scss
+++ b/app/components/notifications-page/messages/nf-apistcmpltd1/index.scss
@@ -37,20 +37,20 @@
   margin-right: 0.4em;
 }
 .severity-color--critical {
-  background-color: var(--risk-critical);
+  background-color: var(--severity-critical);
 }
 .severity-color--high {
-  background-color: var(--risk-high);
+  background-color: var(--severity-high);
 }
 .severity-color--medium {
-  background-color: var(--risk-medium);
+  background-color: var(--severity-medium);
 }
 .severity-color--low {
-  background-color: var(--risk-low);
+  background-color: var(--severity-low);
 }
 .severity-color--passed {
-  background-color: var(--risk-passed);
+  background-color: var(--severity-passed);
 }
 .severity-color--untested {
-  background-color: var(--risk-untested);
+  background-color: var(--severity-untested);
 }
diff --git a/app/components/notifications-page/messages/nf-dastcmpltd1/index.scss b/app/components/notifications-page/messages/nf-dastcmpltd1/index.scss
index 116b78555..b2ff93cd8 100644
--- a/app/components/notifications-page/messages/nf-dastcmpltd1/index.scss
+++ b/app/components/notifications-page/messages/nf-dastcmpltd1/index.scss
@@ -37,20 +37,20 @@
   margin-right: 0.4em;
 }
 .severity-color--critical {
-  background-color: var(--risk-critical);
+  background-color: var(--severity-critical);
 }
 .severity-color--high {
-  background-color: var(--risk-high);
+  background-color: var(--severity-high);
 }
 .severity-color--medium {
-  background-color: var(--risk-medium);
+  background-color: var(--severity-medium);
 }
 .severity-color--low {
-  background-color: var(--risk-low);
+  background-color: var(--severity-low);
 }
 .severity-color--passed {
-  background-color: var(--risk-passed);
+  background-color: var(--severity-passed);
 }
 .severity-color--untested {
-  background-color: var(--risk-untested);
+  background-color: var(--severity-untested);
 }
diff --git a/app/components/notifications-page/messages/nf-sastcmpltd1/index.scss b/app/components/notifications-page/messages/nf-sastcmpltd1/index.scss
index 116b78555..b2ff93cd8 100644
--- a/app/components/notifications-page/messages/nf-sastcmpltd1/index.scss
+++ b/app/components/notifications-page/messages/nf-sastcmpltd1/index.scss
@@ -37,20 +37,20 @@
   margin-right: 0.4em;
 }
 .severity-color--critical {
-  background-color: var(--risk-critical);
+  background-color: var(--severity-critical);
 }
 .severity-color--high {
-  background-color: var(--risk-high);
+  background-color: var(--severity-high);
 }
 .severity-color--medium {
-  background-color: var(--risk-medium);
+  background-color: var(--severity-medium);
 }
 .severity-color--low {
-  background-color: var(--risk-low);
+  background-color: var(--severity-low);
 }
 .severity-color--passed {
-  background-color: var(--risk-passed);
+  background-color: var(--severity-passed);
 }
 .severity-color--untested {
-  background-color: var(--risk-untested);
+  background-color: var(--severity-untested);
 }
diff --git a/app/components/partner/client-info/styles.scss b/app/components/partner/client-info/styles.scss
index a6bdf670a..c892434db 100644
--- a/app/components/partner/client-info/styles.scss
+++ b/app/components/partner/client-info/styles.scss
@@ -2,10 +2,10 @@ $card-header-height: 5rem;
 $card-thumbnail-size: 2.8rem;
 
 .client-info-card {
-  border: 1px solid var(--bg-gray-darken-050);
+  border: 1px solid var(--border-color-1);
   border-radius: 0.3rem;
   grid-template-rows: $card-header-height 1fr;
-  background-color: var(--bg-gray-lighten-015);
+  background-color: var(--background-light);
 }
 
 .client-info-header {
@@ -21,7 +21,7 @@ $card-thumbnail-size: 2.8rem;
   width: $card-thumbnail-size;
   height: $card-thumbnail-size;
   border-radius: 50%;
-  background-color: var(--bg-darkgray);
+  background-color: var(--neutral-grey-400);
   color: #ffffff;
   display: grid;
   align-items: center;
@@ -35,14 +35,14 @@ $card-thumbnail-size: 2.8rem;
 .title {
   text-transform: capitalize;
   font-weight: bold;
-  color: var(--black-700);
+  color: var(--text-primary);
   max-height: 92%;
   font-size: 1.1rem;
   overflow: hidden;
   text-overflow: ellipsis;
 
   &.empty-title {
-    color: var(--black-400);
+    color: var(--text-secondary);
     font-size: 0.95rem;
     font-style: italic;
   }
@@ -56,7 +56,7 @@ $card-thumbnail-size: 2.8rem;
 
 .row {
   display: flex;
-  border-bottom: 1px dashed var(--bg-gray-darken-050);
+  border-bottom: 1px dashed var(--border-color-1);
   padding: 0.2rem 0;
 
   &:last-child {
diff --git a/app/components/partner/client-list/index.scss b/app/components/partner/client-list/index.scss
index a3ba98f05..406d66e94 100644
--- a/app/components/partner/client-list/index.scss
+++ b/app/components/partner/client-list/index.scss
@@ -9,7 +9,7 @@
 .title {
   font-size: 1.2rem;
   font-weight: bold;
-  color: #5e5f63;
+  color: var(--text-secondary);
   padding-top: 0.8rem;
   padding-bottom: 0.9rem;
 }
@@ -41,10 +41,10 @@
 .loading-error {
   display: flex;
   height: 7.5rem;
-  background: var(--bg-gray);
-  border: 1px solid var(--bg-gray-darken-040);
+  background: var(--neutral-grey-100);
+  border: 1px solid var(--border-color-1);
   border-radius: 0.3rem;
-  color: var(--loading-error-color);
+  color: var(--primary-main);
   align-items: center;
   justify-content: center;
 }
@@ -52,10 +52,10 @@
 .empty-data {
   display: flex;
   height: 7.5rem;
-  background: var(--bg-gray);
-  border: 1px solid var(--bg-gray-darken-040);
+  background: var(--neutral-grey-100);
+  border: 1px solid var(--border-color-1);
   border-radius: 0.3rem;
-  color: var(--empty-state-color);
+  color: var(--neutral-grey-500);
   font-style: italic;
   align-items: center;
   justify-content: center;
diff --git a/app/components/partner/client-plan/styles.scss b/app/components/partner/client-plan/styles.scss
index 3451fe578..4404c5190 100644
--- a/app/components/partner/client-plan/styles.scss
+++ b/app/components/partner/client-plan/styles.scss
@@ -15,28 +15,28 @@
   justify-content: center;
 
   &.per-app {
-    color: var(--label-blue-color);
-    background-color: var(--label-blue-bg);
+    color: var(--info-dark);
+    background-color: var(--info-light);
   }
 
   &.per-scan {
-    color: var(--label-green-color);
-    background-color: var(--label-green-bg);
+    color: var(--success-main);
+    background-color: var(--success-light);
   }
 }
 
 .plan-status {
   display: flex;
   align-items: center;
-  color: var(--black);
+  color: var(--text-primary);
   margin-left: 0.5rem;
 }
 
 .expiry-date {
   font-size: 0.9em;
-  color: var(--empty-state-color);
+  color: var(--neutral-grey-500);
 }
 
 .expiry-date-expired {
-  color: var(--text-error);
+  color: var(--error-main);
 }
diff --git a/app/components/partner/client-project-detail/index.scss b/app/components/partner/client-project-detail/index.scss
index 8feb9ade2..a27eea72d 100644
--- a/app/components/partner/client-project-detail/index.scss
+++ b/app/components/partner/client-project-detail/index.scss
@@ -2,9 +2,9 @@
   display: flex;
   align-items: center;
   justify-content: center;
-  border: 1px solid var(--bg-gray-darken-050);
+  border: 1px solid var(--border-color-1);
   border-radius: 0.3rem;
-  background-color: var(--bg-gray-lighten-015);
+  background-color: var(--background-light);
   padding: 1rem;
   gap: 0.5rem;
 }
diff --git a/app/components/partner/client-project-list/index.scss b/app/components/partner/client-project-list/index.scss
index 7e95d6c87..31e6ecec9 100644
--- a/app/components/partner/client-project-list/index.scss
+++ b/app/components/partner/client-project-list/index.scss
@@ -4,15 +4,16 @@
   display: flex;
   align-items: center;
 }
+
 .title {
   font-size: 1.1rem;
   font-weight: bold;
-  color: var(--black-600);
+  color: var(--neutral-grey-700);
   margin-bottom: 0 !important;
 }
 
 .table {
-  border: 1px solid var(--border-table);
+  border: 1px solid var(--border-color-1);
   border-radius: 0.3rem;
 }
 
@@ -21,16 +22,17 @@
   align-items: center;
   justify-content: space-between;
   padding: 0.6rem 1rem;
-  background-color: var(--bg-gray);
+  background-color: var(--neutral-grey-100);
   word-break: break-all;
   grid-template-columns: 10% 1fr 15%;
+
   &.add-column {
     grid-template-columns: 10% 1fr 15% 15%;
   }
 }
 
 .table-row {
-  border-top: 1px solid var(--border-table);
+  border-top: 1px solid var(--border-color-1);
   display: grid;
   justify-content: space-between;
   align-items: center;
@@ -38,6 +40,7 @@
   padding: 0.3rem 0.8rem;
   min-height: 2.5rem;
   grid-template-columns: 10% 1fr 15%;
+
   &.add-column {
     grid-template-columns: 10% 1fr 15% 15%;
   }
@@ -50,10 +53,10 @@
 .loading-error {
   display: flex;
   height: 7.5rem;
-  background: var(--bg-gray);
-  border: 1px solid var(--bg-gray-darken-040);
+  background: var(--neutral-grey-100);
+  border: 1px solid var(--border-color-1);
   border-radius: 0.3rem;
-  color: var(--loading-error-color);
+  color: var(--primary-main);
   align-items: center;
   justify-content: center;
 }
@@ -68,10 +71,10 @@
 .empty-data {
   display: flex;
   height: 7.5rem;
-  background: var(--bg-gray);
-  border: 1px solid var(--bg-gray-darken-040);
+  background: var(--neutral-grey-100);
+  border: 1px solid var(--border-color-1);
   border-radius: 0.3rem;
-  color: var(--empty-state-color);
+  color: var(--neutral-grey-500);
   font-style: italic;
   align-items: center;
   justify-content: center;
diff --git a/app/components/partner/client-project-list/item/index.scss b/app/components/partner/client-project-list/item/index.scss
index c3af1e12f..93701ad7e 100644
--- a/app/components/partner/client-project-list/item/index.scss
+++ b/app/components/partner/client-project-list/item/index.scss
@@ -1,6 +1,6 @@
 .platform {
   padding-left: 1.5em;
-  color: var(--black-500);
+  color: var(--text-secondary);
 }
 
 .version {
diff --git a/app/components/partner/client-report-download/index.scss b/app/components/partner/client-report-download/index.scss
index 813b0589f..0cefbbb7a 100644
--- a/app/components/partner/client-report-download/index.scss
+++ b/app/components/partner/client-report-download/index.scss
@@ -29,7 +29,7 @@
 }
 
 .report-loading-error {
-  color: var(--text-error);
+  color: var(--error-main);
   font-size: 0.95rem;
   line-height: 1.2;
   display: flex;
diff --git a/app/components/partner/client-report-download/report-password/index.scss b/app/components/partner/client-report-download/report-password/index.scss
index 7db9b8415..a5ca37263 100644
--- a/app/components/partner/client-report-download/report-password/index.scss
+++ b/app/components/partner/client-report-download/report-password/index.scss
@@ -34,11 +34,11 @@
 }
 
 .password-loading {
-  color: var(--black-400);
+  color: var(--text-secondary);
 }
 
 .password-loading-error {
-  color: var(--text-error);
+  color: var(--error-main);
   display: flex;
   align-items: center;
   justify-content: center;
@@ -46,8 +46,8 @@
 }
 
 .password-input {
-  background-color: var(--black-025);
-  border: 1px solid var(--black-100);
+  background-color: var(--background-main);
+  border: 1px solid var(--border-color-1);
   border-radius: 0.3rem;
   height: 2.5rem;
   padding-left: 0.3rem;
diff --git a/app/components/partner/client-report-summary/index.scss b/app/components/partner/client-report-summary/index.scss
index c870851ab..7307f9549 100644
--- a/app/components/partner/client-report-summary/index.scss
+++ b/app/components/partner/client-report-summary/index.scss
@@ -14,32 +14,32 @@
 .riskkey-color {
   width: 0.8rem;
   height: 0.8rem;
-  background-color: var(--black-200);
+  background-color: var(--neutral-grey-200);
 }
 
 .riskblock--critical,
 .riskkey-color--critical {
-  background: var(--risk-critical);
+  background: var(--severity-critical);
 }
 .riskblock--high,
 .riskkey-color--high {
-  background: var(--risk-high);
+  background: var(--severity-high);
 }
 .riskblock--medium,
 .riskkey-color--medium {
-  background: var(--risk-medium);
+  background: var(--severity-medium);
 }
 .riskblock--low,
 .riskkey-color--low {
-  background: var(--risk-low);
+  background: var(--severity-low);
 }
 .riskblock--passed,
 .riskkey-color--passed {
-  background: var(--risk-passed);
+  background: var(--severity-passed);
 }
 .riskblock--untested,
 .riskkey-color--untested {
-  background: var(--risk-untested);
+  background: var(--severity-untested);
 }
 
 .index {
@@ -61,9 +61,9 @@
   gap: 0.36rem;
 }
 .riskkey-text {
-  color: var(--black-800);
+  color: var(--neutral-grey-800);
 }
 .riskkey-count {
-  color: var(--black-900);
+  color: var(--neutral-grey-900);
   font-weight: 600;
 }
diff --git a/app/components/partner/client-uploads-list/index.scss b/app/components/partner/client-uploads-list/index.scss
index fae338812..c66853190 100644
--- a/app/components/partner/client-uploads-list/index.scss
+++ b/app/components/partner/client-uploads-list/index.scss
@@ -6,7 +6,7 @@
 }
 
 .table {
-  border: 1px solid var(--border-table);
+  border: 1px solid var(--border-color-1);
   border-radius: 0.3rem;
 }
 
@@ -15,13 +15,13 @@
   align-items: center;
   justify-content: space-between;
   padding: 0.6rem 1rem;
-  background-color: var(--bg-gray);
+  background-color: var(--neutral-grey-100);
   word-break: break-all;
   text-transform: capitalize;
 }
 
 .table-row {
-  border-top: 1px solid var(--border-table);
+  border-top: 1px solid var(--border-color-1);
   display: grid;
   justify-content: space-between;
   align-items: center;
@@ -57,18 +57,18 @@
   height: 3rem;
   display: block;
   border-radius: 0.3rem;
-  background-color: var(--bg-gray);
+  background-color: var(--neutral-grey-100);
   background-size: contain;
   background-position: center center;
   background-repeat: no-repeat;
 }
 
 .fileid-key {
-  color: var(--black-300);
+  color: var(--text-secondary);
 }
 
 .fileid-value {
-  color: var(--black-900);
+  color: var(--text-secondary);
 }
 
 .version-info {
@@ -81,15 +81,15 @@
 }
 
 .version-key {
-  color: var(--black-300);
+  color: var(--text-secondary);
 }
 
 .version-value {
-  color: var(--black-900);
+  color: var(--neutral-grey-900);
 }
 
 .uploaded {
-  color: var(--black-300);
+  color: var(--text-secondary);
 }
 
 .summary {
@@ -103,10 +103,10 @@
 .loading-error {
   display: flex;
   height: 7.5rem;
-  background: var(--bg-gray);
-  border: 1px solid var(--bg-gray-darken-040);
+  background: var(--neutral-grey-100);
+  border: 1px solid var(--border-color-1);
   border-radius: 0.3rem;
-  color: var(--loading-error-color);
+  color: var(--primary-main);
   align-items: center;
   justify-content: center;
 }
@@ -121,10 +121,10 @@
 .empty-data {
   display: flex;
   height: 7.5rem;
-  background: var(--bg-gray);
-  border: 1px solid var(--bg-gray-darken-040);
+  background: var(--neutral-grey-100);
+  border: 1px solid var(--border-color-1);
   border-radius: 0.3rem;
-  color: var(--empty-state-color);
+  color: var(--neutral-grey-500);
   font-style: italic;
   align-items: center;
   justify-content: center;
diff --git a/app/components/partner/client-uploads-stat-chart/index.scss b/app/components/partner/client-uploads-stat-chart/index.scss
index e2a3cc221..ae4bacb84 100644
--- a/app/components/partner/client-uploads-stat-chart/index.scss
+++ b/app/components/partner/client-uploads-stat-chart/index.scss
@@ -9,17 +9,17 @@
   line-height: 3rem;
   font-size: 1.1rem;
   font-weight: bold;
-  color: var(--black-600);
+  color: var(--neutral-grey-700);
 }
 
 .body {
-  border: 1px solid var(--bg-gray-darken-050);
+  border: 1px solid var(--border-color-1);
   border-radius: 0.3rem;
   padding-right: 1rem;
   padding-top: 1rem;
   padding-bottom: 0.5rem;
   position: relative;
-  background: var(--bg-gray-lighten-015);
+  background: var(--background-light);
 }
 
 .filter {
@@ -35,7 +35,7 @@
       column-gap: 8px;
       justify-content: left;
       align-items: center;
-      border: 1px solid var(--bg-gray-darken-050);
+      border: 1px solid var(--border-color-1);
       background: var(--background-main);
       border-radius: 0.3rem;
       padding: 0.4rem 1rem;
@@ -68,7 +68,7 @@
       &:hover,
       &:active,
       &:focus {
-        background-color: var(--primary-transparent-005);
+        background-color: var(--primary-light);
       }
       &:first-child {
         border-top-left-radius: 0.34rem;
@@ -98,7 +98,7 @@
 }
 
 .tooltip {
-  border: 1px solid var(--bg-gray-darken-080);
+  border: 1px solid var(--border-color-1);
   width: max-content;
   padding: 0.5rem;
   border-radius: 5px;
diff --git a/app/components/partner/clients-nav/index.scss b/app/components/partner/clients-nav/index.scss
index 14d0b9ab9..6205f768f 100644
--- a/app/components/partner/clients-nav/index.scss
+++ b/app/components/partner/clients-nav/index.scss
@@ -1,8 +1,8 @@
 .subnav {
-  background-color: var(--bg-gray-darken-040);
+  background-color: var(--neutral-grey-200);
   margin: 0 -10px;
   padding: 0.4rem 1.5rem 0;
-  border-bottom: 1px solid var(--bg-gray-darken-080);
+  border-bottom: 1px solid var(--border-color-1);
 }
 
 .subnav-link {
@@ -13,14 +13,15 @@
   margin-bottom: -1px;
   border-width: 1px;
   border-style: solid;
-  border-color: var(--bg-gray-darken-080);
+  border-color: var(--border-color-1);
   border-top-left-radius: 0.3rem;
   border-top-right-radius: 0.3rem;
-  background-color: var(--bg-gray-darken-020);
+  background-color: var(--neutral-grey-100);
+
   &.active {
     background-color: var(--background-main);
     color: var(--primary-main);
-    border-color: var(--bg-gray-darken-080) var(--bg-gray-darken-080)
-      var(--common-white) var(--bg-gray-darken-080);
+    border-color: var(--border-color-1) var(--border-color-1)
+      var(--common-white) var(--border-color-1);
   }
 }
diff --git a/app/components/partner/credit-transfer/credit-transfer-input/index.scss b/app/components/partner/credit-transfer/credit-transfer-input/index.scss
index 293eb6a86..7e5718385 100644
--- a/app/components/partner/credit-transfer/credit-transfer-input/index.scss
+++ b/app/components/partner/credit-transfer/credit-transfer-input/index.scss
@@ -17,7 +17,7 @@
 .title {
   text-transform: capitalize;
   font-weight: bold;
-  color: var(--black-700);
+  color: var(--neutral-grey-700);
   max-height: 92%;
   font-size: 1.1rem;
   overflow: hidden;
diff --git a/app/components/partner/export-stats/index.scss b/app/components/partner/export-stats/index.scss
index 3e5203e26..d1634a4a3 100644
--- a/app/components/partner/export-stats/index.scss
+++ b/app/components/partner/export-stats/index.scss
@@ -2,15 +2,15 @@
   line-height: 3rem;
   font-size: 1.1rem;
   font-weight: bold;
-  color: var(--black-600);
+  color: var(--neutral-grey-700);
 }
 .body {
   display: flex;
   align-items: center;
   justify-content: center;
-  background-color: var(--bg-gray-lighten-015);
+  background-color: var(--background-light);
   padding: 2rem;
-  border: 1px solid var(--bg-gray-darken-050);
+  border: 1px solid var(--border-color-1);
   border-radius: 0.3rem;
 }
 
@@ -21,7 +21,7 @@
   min-width: 14rem;
   padding: 0.4rem;
   cursor: pointer;
-  border: 1px solid var(--bg-gray-darken-080);
+  border: 1px solid var(--border-color-1);
   border-radius: 0.3rem;
   background-color: var(--background-main);
 }
diff --git a/app/components/partner/invitation-list/index.scss b/app/components/partner/invitation-list/index.scss
index 70faefe81..d712e21db 100644
--- a/app/components/partner/invitation-list/index.scss
+++ b/app/components/partner/invitation-list/index.scss
@@ -9,12 +9,12 @@
 .title {
   font-size: 1.2rem;
   font-weight: bold;
-  color: var(--black-600);
+  color: var(--neutral-grey-700);
   margin-bottom: 0 !important;
 }
 
 .table {
-  border: 1px solid var(--border-table);
+  border: 1px solid var(--border-color-1);
   border-radius: 0.3rem;
   margin-top: 0.7rem;
 }
@@ -24,7 +24,7 @@
   align-items: center;
   justify-content: space-between;
   padding: 0.6rem 1rem;
-  background-color: var(--bg-gray);
+  background-color: var(--neutral-grey-100);
   word-break: break-all;
   grid-template-columns: 1fr 20% 8rem 6rem 6.5rem 6rem;
   @media (min-width: 1200px) {
@@ -33,7 +33,7 @@
 }
 
 .table-row {
-  border-top: 1px solid var(--border-table);
+  border-top: 1px solid var(--border-color-1);
 }
 
 .pagination {
@@ -43,10 +43,10 @@
 .loading-error {
   display: flex;
   height: 7.5rem;
-  background: var(--bg-gray);
-  border: 1px solid var(--bg-gray-darken-040);
+  background: var(--neutral-grey-100);
+  border: 1px solid var(--border-color-1);
   border-radius: 0.3rem;
-  color: var(--loading-error-color);
+  color: var(--primary-main);
   align-items: center;
   justify-content: center;
 }
@@ -61,10 +61,10 @@
 .empty-data {
   display: flex;
   height: 7.5rem;
-  background: var(--bg-gray);
-  border: 1px solid var(--bg-gray-darken-040);
+  background: var(--neutral-grey-100);
+  border: 1px solid var(--border-color-1);
   border-radius: 0.3rem;
-  color: var(--empty-state-color);
+  color: var(--neutral-grey-500);
   font-style: italic;
   align-items: center;
   justify-content: center;
diff --git a/app/components/partner/invitation/index.scss b/app/components/partner/invitation/index.scss
index 08f3dee20..17cc872c2 100644
--- a/app/components/partner/invitation/index.scss
+++ b/app/components/partner/invitation/index.scss
@@ -11,7 +11,7 @@
 }
 
 .invitation-expired {
-  background-color: var(--bg-gray-lighten-015);
+  background-color: var(--background-light);
   opacity: 0.6;
 }
 
@@ -23,16 +23,16 @@
 }
 
 .source-backoffice {
-  color: var(--label-orange-color);
-  background-color: var(--label-orange-bg);
+  color: var(--primary-main);
+  background-color: var(--primary-light);
 }
 
 .source-invitation {
-  color: var(--label-green-color);
-  background-color: var(--label-green-bg);
+  color: var(--success-main);
+  background-color: var(--success-light);
 }
 
 .source-registration {
-  color: var(--label-blue-color);
-  background-color: var(--label-blue-bg);
+  color: var(--info-dark);
+  background-color: var(--info-light);
 }
diff --git a/app/components/partner/partner-plan/index.scss b/app/components/partner/partner-plan/index.scss
index d65d131c5..c04ee97d9 100644
--- a/app/components/partner/partner-plan/index.scss
+++ b/app/components/partner/partner-plan/index.scss
@@ -12,7 +12,7 @@
   width: auto;
   padding: 0.5rem;
   border-radius: 6px;
-  border: 1px solid var(--bg-gray-darken-040);
+  border: 1px solid var(--border-color-1);
 }
 
 .plan-key {
@@ -37,13 +37,13 @@
   justify-content: center;
 
   &.per-app {
-    color: var(--label-blue-color);
-    background-color: var(--label-blue-bg);
+    color: var(--info-dark);
+    background-color: var(--info-light);
   }
 
   &.per-scan {
-    color: var(--label-green-color);
-    background-color: var(--label-green-bg);
+    color: var(--success-main);
+    background-color: var(--success-light);
   }
 }
 
@@ -52,7 +52,7 @@
   justify-content: center;
   flex-direction: column;
   align-items: center;
-  background-color: var(--bg-gray-darken-040);
+  background-color: var(--neutral-grey-200);
   padding: 0.35rem 0.6rem;
   border-radius: 0.4rem;
   margin-left: 0.5rem;
diff --git a/app/components/partner/registration-request-pending-list/index.scss b/app/components/partner/registration-request-pending-list/index.scss
index a4db92a5e..75e9986bb 100644
--- a/app/components/partner/registration-request-pending-list/index.scss
+++ b/app/components/partner/registration-request-pending-list/index.scss
@@ -1,13 +1,13 @@
 .title {
   font-size: 1.2rem;
   font-weight: bold;
-  color: var(--black-600);
+  color: var(--neutral-grey-700);
   padding-top: 1.5rem;
   margin-bottom: 0.6rem;
 }
 
 .table {
-  border: 1px solid var(--border-table);
+  border: 1px solid var(--border-color-1);
   border-radius: 0.3rem;
   margin-top: 0.7rem;
 }
@@ -16,14 +16,14 @@
   align-items: center;
   justify-content: space-between;
   padding: 0.6rem 1rem;
-  background-color: var(--bg-gray);
+  background-color: var(--neutral-grey-100);
   grid-template-columns: 1fr 21% 14% 12rem;
   @media (min-width: 1200px) {
     grid-template-columns: 1fr 30% 11.5rem 12rem;
   }
 }
 .table-row {
-  border-top: 1px solid var(--border-table);
+  border-top: 1px solid var(--border-color-1);
 }
 
 .pagination {
@@ -40,20 +40,20 @@
 .loading-error {
   display: flex;
   height: 7.5rem;
-  background: var(--bg-gray);
-  border: 1px solid var(--bg-gray-darken-040);
+  background: var(--neutral-grey-100);
+  border: 1px solid var(--border-color-1);
   border-radius: 0.3rem;
-  color: var(--loading-error-color);
+  color: var(--primary-main);
   align-items: center;
   justify-content: center;
 }
 .empty-data {
   display: flex;
   height: 7.5rem;
-  background: var(--bg-gray);
-  border: 1px solid var(--bg-gray-darken-040);
+  background: var(--neutral-grey-100);
+  border: 1px solid var(--border-color-1);
   border-radius: 0.3rem;
-  color: var(--empty-state-color);
+  color: var(--neutral-grey-500);
   font-style: italic;
   align-items: center;
   justify-content: center;
diff --git a/app/components/partner/registration-request-rejected-list/index.scss b/app/components/partner/registration-request-rejected-list/index.scss
index 058c49756..148b1a470 100644
--- a/app/components/partner/registration-request-rejected-list/index.scss
+++ b/app/components/partner/registration-request-rejected-list/index.scss
@@ -1,13 +1,13 @@
 .title {
   font-size: 1.2rem;
   font-weight: bold;
-  color: var(--black-600);
+  color: var(--neutral-grey-700);
   padding-top: 1.5rem;
   margin-bottom: 0.6rem;
 }
 
 .table {
-  border: 1px solid var(--border-table);
+  border: 1px solid var(--border-color-1);
   border-radius: 0.3rem;
   margin-top: 0.7rem;
 }
@@ -16,14 +16,14 @@
   align-items: center;
   justify-content: space-between;
   padding: 0.6rem 1rem;
-  background-color: var(--bg-gray);
+  background-color: var(--neutral-grey-100);
   grid-template-columns: 1fr 20% 15% 15% 3.6rem;
   @media (min-width: 1200px) {
     grid-template-columns: 1fr 30% 10rem 10rem 3.6rem;
   }
 }
 .table-row {
-  border-top: 1px solid var(--border-table);
+  border-top: 1px solid var(--border-color-1);
 }
 
 .pagination {
diff --git a/app/components/partner/registration-request-rejected/index.scss b/app/components/partner/registration-request-rejected/index.scss
index 3dc9fc98b..79c4609c0 100644
--- a/app/components/partner/registration-request-rejected/index.scss
+++ b/app/components/partner/registration-request-rejected/index.scss
@@ -11,5 +11,5 @@
 }
 
 .undo-icon {
-  color: var(--risk-high) !important;
+  color: var(--severity-high) !important;
 }
diff --git a/app/components/partner/styles.scss b/app/components/partner/styles.scss
index cb8b4a532..92afb1cc0 100644
--- a/app/components/partner/styles.scss
+++ b/app/components/partner/styles.scss
@@ -1,9 +1,10 @@
 .header {
   display: flex;
   justify-content: space-between;
-  background-color: var(--bg-gray);
+  background-color: var(--neutral-grey-100);
   margin: -10px -10px 0 -10px;
 }
+
 .header-left {
   padding: 1.5rem;
   display: flex;
@@ -11,30 +12,36 @@
   justify-content: center;
   flex-direction: column;
 }
+
 .header-title {
-  color: var(--black);
+  color: var(--text-primary);
   font-weight: bold;
   font-size: 1.2rem;
   line-height: 1.5;
 }
+
 .header-right {
   display: flex;
   align-items: flex-end;
   justify-content: flex-end;
   padding-right: 1.8rem;
 }
+
 .nav {
   display: flex;
   justify-content: flex-end;
 }
+
 .nav-link {
   padding: 0.3rem 1rem;
   border-bottom: 3px solid transparent;
   color: inherit;
+
   &.active {
     border-bottom-color: var(--primary-main);
     color: var(--text-primary);
   }
+
   &:hover,
   &:focus,
   &:active {
diff --git a/app/components/plus-n-list/index.scss b/app/components/plus-n-list/index.scss
index 2215db25f..6b921955c 100644
--- a/app/components/plus-n-list/index.scss
+++ b/app/components/plus-n-list/index.scss
@@ -4,7 +4,7 @@
 }
 
 .first-item {
-  color: var(--black-700);
+  color: var(--neutral-grey-700);
 }
 
 .list-item:not(:last-child) {
@@ -15,7 +15,7 @@
   padding: 0 0.36rem 0 0.3rem;
   display: flex;
   align-items: center;
-  background: var(--bg-gray-darken-060);
+  background: var(--neutral-grey-300);
   min-width: 1.95em;
   height: 1.5em;
   border-radius: 0.3em;
diff --git a/app/styles/_component-variables.scss b/app/styles/_component-variables.scss
index 6846c8bae..ee0ecce01 100644
--- a/app/styles/_component-variables.scss
+++ b/app/styles/_component-variables.scss
@@ -402,20 +402,20 @@ body {
   // variables for security/analysis-details/cvss-metrics
   --security-analysis-details-cvss-metrics-white-color: var(--common-white);
   --security-analysis-details-cvss-metrics-risk-medium-color: var(
-    --risk-medium
+    --severity-medium
   );
-  --security-analysis-details-cvss-metrics-risk-low-color: var(--risk-low);
-  --security-analysis-details-cvss-metrics-risk-high-color: var(--risk-high);
+  --security-analysis-details-cvss-metrics-risk-low-color: var(--severity-low);
+  --security-analysis-details-cvss-metrics-risk-high-color: var(--severity-high);
   --security-analysis-details-cvss-metrics-risk-critical-color: var(
-    --risk-critical
+    --severity-critical
   );
   --security-analysis-details-cvss-metrics-risk-passed-color: var(
-    --risk-passed
+    --severity-passed
   );
   --security-analysis-details-cvss-metrics-risk-error-color: var(
     --primary-main
   );
-  --security-analysis-details-cvss-metrics-progress-color: var(--risk-untested);
+  --security-analysis-details-cvss-metrics-progress-color: var(--severity-untested);
   --security-analysis-details-cvss-metrics-progress-border-color: var(
     --primary-main-10
   );
@@ -647,7 +647,7 @@ body {
 
   //variables for notifications
   --notification-bell-icon-dot-background-color: var(--primary-main);
-  --notification-bell-icon-dot-border-color: var(--black-700);
+  --notification-bell-icon-dot-border-color: var(--neutral-grey-700);
   --notification-bell-icon-color: var(--background-main);
 
   --notification-unread-count-color-primary: var(--primary-main);
diff --git a/app/styles/_theme-deprecated.scss b/app/styles/_theme-deprecated.scss
deleted file mode 100644
index 356cf16cc..000000000
--- a/app/styles/_theme-deprecated.scss
+++ /dev/null
@@ -1,79 +0,0 @@
-$primary: #fe4d3f;
-$black: #000000;
-
-$lightgreen: #ccf3cc;
-$lightblue: #dbe6ff;
-$lightorange: #fde6ca;
-$darkgreen: #156347;
-$darkblue: #4160a9;
-$darkorange: #a9560f;
-
-$bg-gray: #f6f7f9;
-$color-gray: #6b6b6b;
-$color-error: #fe4d3f;
-
-:root {
-  /* base colors */
-  --black: #{$black};
-  --lightgreen: #{$lightgreen};
-  --darkgreen: #{$darkgreen};
-  --lightblue: #{$lightblue};
-  --darkblue: #{$darkblue};
-  --lightorange: #{$lightorange};
-  --darkorange: #{$darkorange};
-
-  --black-025: #f0f1f3;
-  --black-050: #eff0f1;
-  --black-075: #e4e6e8;
-  --black-100: #d6d9dc;
-  --black-150: #c8ccd0;
-  --black-200: #bbc0c4;
-  --black-300: #9fa6ad;
-  --black-350: #9199a1;
-  --black-400: #848d95;
-  --black-500: #6a737c;
-  --black-600: #5e5f63;
-  --black-700: #3b3f49;
-  --black-750: #2f3337;
-  --black-800: #242729;
-  --black-900: #0c0d0e;
-
-  --android: #33a852;
-  --ios: #8d9096;
-
-  --risk-critical: #ef4836;
-  --risk-high: #ff8c00;
-  --risk-medium: #f5d76e;
-  --risk-low: #2cc2f8;
-  --risk-passed: #80c081;
-  --risk-untested: #6b6b6b;
-
-  /* generic derived colors */
-  --text-default: #{$color-gray};
-  --text-error: #{$color-error};
-
-  --primary-transparent-005: #{rgba($primary, 0.05)};
-
-  --bg-gray: #{$bg-gray};
-  --bg-gray-darken-020: #{darken($bg-gray, 2%)};
-  --bg-gray-darken-040: #{darken($bg-gray, 4%)};
-  --bg-gray-darken-050: #{darken($bg-gray, 5%)};
-  --bg-gray-darken-060: #{darken($bg-gray, 6%)};
-  --bg-gray-darken-070: #{darken($bg-gray, 7%)};
-  --bg-gray-darken-080: #{darken($bg-gray, 8%)};
-  --bg-gray-lighten-015: #{lighten($bg-gray, 1.5%)};
-  --bg-darkgray: #{darken(mix($color-gray, $bg-gray, 2%), 14%)};
-
-  --border-table: var(--bg-gray-darken-020);
-
-  /* element specific derived colors */
-  --label-green-bg: var(--lightgreen);
-  --label-green-color: var(--darkgreen);
-  --label-blue-bg: var(--lightblue);
-  --label-blue-color: var(--darkblue);
-  --label-orange-bg: var(--lightorange);
-  --label-orange-color: var(--darkorange);
-
-  --loading-error-color: #{lighten($color-error, 14%)};
-  --empty-state-color: var(--black-300);
-}
diff --git a/app/styles/_theme.scss b/app/styles/_theme.scss
index b9c4a442b..3b72d8df9 100644
--- a/app/styles/_theme.scss
+++ b/app/styles/_theme.scss
@@ -113,6 +113,10 @@
   --severity-untested: #a0a0a0;
   --severity-unknown: #202020;
 
+  // special case variable for android and ios
+  --android: #33a852;
+  --ios: #8d9096;
+
   // special case variable for project-settings/general-settings/dynamicscan-automation-settings/upselling-feature
   --upselling-feature-footer-bg-color: #f7f3ff;
   --upselling-feature-footer-color: #3e0e8c;
diff --git a/app/styles/app.scss b/app/styles/app.scss
index a0c6cd8f7..aa55f5e8d 100644
--- a/app/styles/app.scss
+++ b/app/styles/app.scss
@@ -3,7 +3,6 @@ $ember-basic-dropdown-content-z-index: 10;
 
 // Reset and base styles
 @import 'reset';
-@import 'theme-deprecated';
 @import 'theme';
 @import 'component-variables';
 @import 'icons';