diff --git a/packages/client/src/pages/PortalSettings/categories/common/sub-components/colorSchemeDialog.js b/packages/client/src/pages/PortalSettings/categories/common/sub-components/colorSchemeDialog.js
index c9e22fd7e7..fb473c700b 100644
--- a/packages/client/src/pages/PortalSettings/categories/common/sub-components/colorSchemeDialog.js
+++ b/packages/client/src/pages/PortalSettings/categories/common/sub-components/colorSchemeDialog.js
@@ -57,10 +57,12 @@ const StyledComponent = styled(ModalDialog)`
       padding-bottom: 20px;
     }
 
-    ${!isMobile() &&
-    css`
-      max-width: 448px;
-    `}
+    ${
+      !isMobile() &&
+      css`
+        max-width: 448px;
+      `
+    }
   }
 
   .name-color {
@@ -77,19 +79,13 @@ const StyledComponent = styled(ModalDialog)`
     background: ${(props) =>
       props.currentColorAccent
         ? props.currentColorAccent
-        : props.theme.isBase
-          ? `#eceef1 url(${PlusThemeSvgUrl}) no-repeat center`
-          : `#474747 url(${PlusThemeSvgUrl}) no-repeat center`};
-  }
+        : `${props.theme.client.settings.common.appearance.accentBoxBackground} url(${PlusThemeSvgUrl}) no-repeat center`}
 
   .buttons-box {
     background: ${(props) =>
       props.currentColorButtons
         ? props.currentColorButtons
-        : props.theme.isBase
-          ? `#eceef1 url(${PlusThemeSvgUrl}) no-repeat center`
-          : `#474747 url(${PlusThemeSvgUrl}) no-repeat center`};
-  }
+        : `${props.theme.client.settings.common.appearance.buttonBoxBackground} url(${PlusThemeSvgUrl}) no-repeat center`}
 
   .modal-add-theme {
     width: 46px;
@@ -99,34 +95,40 @@ const StyledComponent = styled(ModalDialog)`
   }
 
   .drop-down-container-hex {
-    ${isMobileOnly &&
-    css`
-      width: 100%;
-    `}
+    ${
+      isMobileOnly &&
+      css`
+        width: 100%;
+      `
+    }
   }
 
   .drop-down-item-hex {
-    ${isMobileOnly &&
-    css`
-      width: calc(100vw - 32px);
-    `}
+    ${
+      isMobileOnly &&
+      css`
+        width: calc(100vw - 32px);
+      `
+    }
 
     :hover {
       background-color: unset;
     }
 
-    ${!isMobile() &&
-    css`
-      max-width: 227px;
+    ${
+      !isMobile() &&
+      css`
+        max-width: 227px;
 
-      .hex-color-picker {
-        max-width: 195px;
-      }
+        .hex-color-picker {
+          max-width: 195px;
+        }
 
-      .react-colorful__interactive {
-        max-width: 183px;
-      }
-    `}
+        .react-colorful__interactive {
+          max-width: 183px;
+        }
+      `
+    }
   }
 `;
 
diff --git a/packages/client/src/pages/PortalSettings/categories/delete-data/StyledDeleteData.js b/packages/client/src/pages/PortalSettings/categories/delete-data/StyledDeleteData.js
index 41418914b1..ca4de26d45 100644
--- a/packages/client/src/pages/PortalSettings/categories/delete-data/StyledDeleteData.js
+++ b/packages/client/src/pages/PortalSettings/categories/delete-data/StyledDeleteData.js
@@ -33,7 +33,7 @@ export const DeleteDataLayout = styled.div`
   hr {
     margin: 24px 0;
     border: none;
-    border-top: 1px solid #eceef1;
+    border-top: ${(props) => props.theme.client.settings.deleteData.borderTop};
   }
 `;
 
diff --git a/packages/client/src/pages/PortalSettings/categories/developer-tools/Webhooks/WebhookEventDetails/sub-components/ResponseDetails.js b/packages/client/src/pages/PortalSettings/categories/developer-tools/Webhooks/WebhookEventDetails/sub-components/ResponseDetails.js
index 74f5b40277..93ac6a0f2f 100644
--- a/packages/client/src/pages/PortalSettings/categories/developer-tools/Webhooks/WebhookEventDetails/sub-components/ResponseDetails.js
+++ b/packages/client/src/pages/PortalSettings/categories/developer-tools/Webhooks/WebhookEventDetails/sub-components/ResponseDetails.js
@@ -68,7 +68,7 @@ const LargePayloadStub = styled.div`
   margin-top: 4px;
 
   background: #f8f9f9;
-  border: 1px solid #eceef1;
+  border: ${(props) => props.theme.client.settings.webhooks.border};
   border-radius: 3px;
 
   ${isMobile() &&