From ed7d34ff66804f8f71a43ab8a08a629c330a9259 Mon Sep 17 00:00:00 2001
From: Luke Parrott <lparrott@salesforce.com>
Date: Wed, 18 Dec 2024 16:49:21 -0600
Subject: [PATCH 1/5] First pass at SLDS+ updates

---
 .../BGE_ConfigurationWizard.css               |  2 +-
 .../BGE_DonationSelector.css                  |  4 +--
 .../default/aura/CRLP_Rollup/CRLP_Rollup.css  |  2 +-
 .../aura/HH_AddressMgr/HH_AddressMgr.css      |  2 +-
 .../aura/HH_ContactCard/HH_ContactCard.css    |  2 +-
 .../aura/HH_Container/HH_Container.css        |  4 +--
 .../RD2_EnablementDelegate.css                |  8 ++---
 .../RD2_EnablementDelegateSimple.css          |  4 +--
 .../lwc/bdiFieldMappings/bdiFieldMappings.css | 14 ++++-----
 .../bdiObjectMappings/bdiObjectMappings.css   | 18 ++++++------
 .../geDonationMatchingOpportunityCard.css     | 29 ++++++++++---------
 .../geDonationMatchingPaymentCard.css         | 25 ++++++++--------
 .../lwc/geFormRenderer/geFormRenderer.css     |  8 ++---
 .../lwc/geFormRenderer/geFormRenderer.html    |  8 ++---
 .../geFormWidgetTokenizeCard.css              | 12 ++++----
 .../geGatewaySelectWidget.css                 |  4 +--
 .../default/lwc/geListView/geListView.css     | 12 ++++----
 .../lwc/geModalPrompt/geModalPrompt.css       |  2 +-
 .../geModalRecurringDonation.css              |  2 +-
 .../geRecurringGiftInfo.css                   |  2 +-
 .../geTemplateBuilderFormField.css            |  6 ++--
 .../geTemplateBuilderFormSection.css          | 16 +++++-----
 .../geTemplateBuilderFormSection.html         |  6 ++--
 .../geTemplateBuilderWidget.css               |  4 +--
 .../default/lwc/geTemplates/geTemplates.css   |  8 ++---
 .../lwc/givingSummary/givingSummary.css       |  4 +--
 .../gsAccordionSection/gsAccordionSection.css |  4 +--
 .../gsApplicationStatus.css                   | 20 ++++++-------
 .../lwc/gsChecklistItem/gsChecklistItem.css   | 28 +++++++++---------
 .../lwc/gsChecklistSetup/gsChecklistSetup.css |  2 +-
 .../default/lwc/gsResources/gsResources.css   |  8 ++---
 .../lwc/gsVideoHeader/gsVideoHeader.css       |  8 ++---
 .../default/lwc/gseuHeader/gseuHeader.css     |  8 ++---
 .../lwc/rd2ChangeEntry/rd2ChangeEntry.css     |  2 +-
 .../rd2ElevateCreditCardForm.css              | 12 ++++----
 .../rd2ElevateInformation.html                |  4 +--
 .../default/lwc/rd2EntryForm/rd2EntryForm.css |  6 ++--
 .../rd2RecurringDonation.css                  |  2 +-
 .../relationshipsNavigator.css                | 10 +++----
 .../relationshipsTreeGrid.html                |  2 +-
 .../lwc/utilAlertBanner/utilAlertBanner.html  |  2 +-
 .../main/default/lwc/utilCard/utilCard.css    |  2 +-
 .../utilSearchableCombobox.css                | 10 +++----
 .../default/lwc/utilStencil/utilStencil.css   |  8 ++---
 44 files changed, 174 insertions(+), 172 deletions(-)

diff --git a/force-app/main/default/aura/BGE_ConfigurationWizard/BGE_ConfigurationWizard.css b/force-app/main/default/aura/BGE_ConfigurationWizard/BGE_ConfigurationWizard.css
index 4840b5eb87d..5c709fec3cf 100644
--- a/force-app/main/default/aura/BGE_ConfigurationWizard/BGE_ConfigurationWizard.css
+++ b/force-app/main/default/aura/BGE_ConfigurationWizard/BGE_ConfigurationWizard.css
@@ -1,5 +1,5 @@
 .THIS.slds-tabs_card {
-    background: white;
+    background: var(--slds-g-color-disabled-container-1, white);
 }
 
 /*link-like behaviors*/
diff --git a/force-app/main/default/aura/BGE_DonationSelector/BGE_DonationSelector.css b/force-app/main/default/aura/BGE_DonationSelector/BGE_DonationSelector.css
index 75dfc4db4a5..40433fb3782 100644
--- a/force-app/main/default/aura/BGE_DonationSelector/BGE_DonationSelector.css
+++ b/force-app/main/default/aura/BGE_DonationSelector/BGE_DonationSelector.css
@@ -16,12 +16,12 @@
 
 /*color for selected card border*/
 .THIS .selectedDonationCard {
-    border: 2px solid rgb(21, 137, 238);
+    border: var(--slds-g-radius-border-1, 2px) solid var(--slds-g-color-brand-base-60, rgb(21, 137, 238));
 }
 
 /*shade selected check icon*/
 .THIS .selectedCheckmark  > lightning-primitive-icon > svg {
-    fill: rgb(21, 137, 238);
+    fill: var(--slds-g-color-accent-1, rgb(21, 137, 238));
 }
 
 /*prevent card header from truncating long opp or payment names*/
diff --git a/force-app/main/default/aura/CRLP_Rollup/CRLP_Rollup.css b/force-app/main/default/aura/CRLP_Rollup/CRLP_Rollup.css
index e11d518de0a..a6d40e2d748 100644
--- a/force-app/main/default/aura/CRLP_Rollup/CRLP_Rollup.css
+++ b/force-app/main/default/aura/CRLP_Rollup/CRLP_Rollup.css
@@ -4,7 +4,7 @@
 /*margin is for view mode indentation*/
 .THIS .slds-form-element__label{
     margin-left: .5rem;
-    font-size: 13px;
+    font-size: var(--slds-g-font-size-base, 13px);
 }
 .THIS .slds-form-element__icon{
     margin-left: .2rem;
diff --git a/force-app/main/default/aura/HH_AddressMgr/HH_AddressMgr.css b/force-app/main/default/aura/HH_AddressMgr/HH_AddressMgr.css
index 66475669ccd..971fc0c6b80 100644
--- a/force-app/main/default/aura/HH_AddressMgr/HH_AddressMgr.css
+++ b/force-app/main/default/aura/HH_AddressMgr/HH_AddressMgr.css
@@ -1,5 +1,5 @@
 .THIS li.selected {
-    background-color: token(colorBackgroundRowSelected);
+    background-color: var(--slds-s-table-row-color-background-selected, token(colorBackgroundRowSelected));
 }
 
 .THIS .slds-modal__container {
diff --git a/force-app/main/default/aura/HH_ContactCard/HH_ContactCard.css b/force-app/main/default/aura/HH_ContactCard/HH_ContactCard.css
index 7e759f55f40..14b3b02cf73 100644
--- a/force-app/main/default/aura/HH_ContactCard/HH_ContactCard.css
+++ b/force-app/main/default/aura/HH_ContactCard/HH_ContactCard.css
@@ -1,4 +1,4 @@
 .THIS .removeBtn:hover, .THIS .removeBtn:focus, .THIS .removeBtn.is-selected {
     background: none;
-    border: 0;
+    border: none;
 }
\ No newline at end of file
diff --git a/force-app/main/default/aura/HH_Container/HH_Container.css b/force-app/main/default/aura/HH_Container/HH_Container.css
index fa16635cbd1..4f0944afca6 100644
--- a/force-app/main/default/aura/HH_Container/HH_Container.css
+++ b/force-app/main/default/aura/HH_Container/HH_Container.css
@@ -9,6 +9,6 @@
 
 .THIS .required {
     padding-left: 2px;
-    color: red;
-    font-weight: 700;
+    color: var(--slds-g-color-error-base-50, red);
+    font-weight: bold;
 }
\ No newline at end of file
diff --git a/force-app/main/default/aura/RD2_EnablementDelegate/RD2_EnablementDelegate.css b/force-app/main/default/aura/RD2_EnablementDelegate/RD2_EnablementDelegate.css
index 495c398613c..0178036c8f9 100644
--- a/force-app/main/default/aura/RD2_EnablementDelegate/RD2_EnablementDelegate.css
+++ b/force-app/main/default/aura/RD2_EnablementDelegate/RD2_EnablementDelegate.css
@@ -5,15 +5,15 @@
 }
 .THIS .disabledEdit {
     pointer-events: none;
-    color: #706e6b;
+    color: var(--slds-g-color-on-surface-1, #706e6b);
     cursor: default;
 }
 .THIS .styleButton:disabled {
-    color: #706e6b;
+    color: var(--slds-g-color-on-surface-1, #706e6b);
 }
 .THIS .activeIcon svg {
-    fill: #006dcc;
+    fill: var(--slds-g-color-accent-2, #006dcc);
 }
 .THIS .successIcon svg {
-    fill: rgb(94, 180, 255);
+    fill: var(--slds-g-color-brand-base-70, rgb(94, 180, 255));
 }
\ No newline at end of file
diff --git a/force-app/main/default/aura/RD2_EnablementDelegateSimple/RD2_EnablementDelegateSimple.css b/force-app/main/default/aura/RD2_EnablementDelegateSimple/RD2_EnablementDelegateSimple.css
index 0b5e96543aa..140fc2d657a 100755
--- a/force-app/main/default/aura/RD2_EnablementDelegateSimple/RD2_EnablementDelegateSimple.css
+++ b/force-app/main/default/aura/RD2_EnablementDelegateSimple/RD2_EnablementDelegateSimple.css
@@ -5,9 +5,9 @@
 }
 .THIS .disabledEdit {
     pointer-events: none;
-    color: #706e6b;
+    color: var(--slds-g-color-on-surface-1, #706e6b);
     cursor: default;
 }
 .THIS .activeIcon svg {
-    fill: #006dcc;
+    fill: var(--slds-g-color-accent-2, #006dcc);
 }
\ No newline at end of file
diff --git a/force-app/main/default/lwc/bdiFieldMappings/bdiFieldMappings.css b/force-app/main/default/lwc/bdiFieldMappings/bdiFieldMappings.css
index 33b9adce5d6..9d55336c53f 100644
--- a/force-app/main/default/lwc/bdiFieldMappings/bdiFieldMappings.css
+++ b/force-app/main/default/lwc/bdiFieldMappings/bdiFieldMappings.css
@@ -1,29 +1,29 @@
 .slds-text-heading_medium_extension, .slds-text-heading_small_extension {
-    font-weight: 400;
+    font-weight: normal;
     font-family: "Salesforce Sans";
 }
 
 .slds-text_extension {
-    color: #080707;
+    color: var(--slds-g-color-on-success-2, #080707);
     font-family: "Salesforce Sans";
-    font-size: 13px;
+    font-size: var(--slds-g-font-size-base, 13px);
     line-height: 20px;
 }
 
 .table-header {
-    color: #080707;
+    color: var(--slds-g-color-on-success-2, #080707);
     font-family: "Salesforce Sans";
-    font-size: 14px;
+    font-size: var(--slds-g-font-scale-1, 14px);
     line-height: 21px;
 }
 
 .table-header_source {
-    border-bottom: 2px solid black;
+    border-bottom: var(--slds-g-radius-border-1, 2px) solid var(--slds-g-color-neutral-base-10, black);
     margin-right: 4rem;
 }
 
 .table-header_target {
-    border-bottom: 2px solid black;
+    border-bottom: var(--slds-g-radius-border-1, 2px) solid var(--slds-g-color-neutral-base-10, black);
     margin-left: 1.75rem;
     margin-right: 3rem;
 }
\ No newline at end of file
diff --git a/force-app/main/default/lwc/bdiObjectMappings/bdiObjectMappings.css b/force-app/main/default/lwc/bdiObjectMappings/bdiObjectMappings.css
index fbc09ad8950..ea727387271 100644
--- a/force-app/main/default/lwc/bdiObjectMappings/bdiObjectMappings.css
+++ b/force-app/main/default/lwc/bdiObjectMappings/bdiObjectMappings.css
@@ -1,28 +1,28 @@
 .slds-button_extension-back {
     height: 40px;
-	color: #006DCC;
+	color: var(--slds-g-color-accent-2, #006DCC);
 	font-family: "Salesforce Sans";
-	font-size: 13px;
+	font-size: var(--slds-g-font-size-base, 13px);
     line-height: 40px;
-    font-weight: 300;
+    font-weight: normal;
 }
 
 .slds-text-heading_medium_extension, .slds-text-heading_small_extension {
-    font-weight: 400;
+    font-weight: normal;
     font-family: "Salesforce Sans";
 }
 
 .slds-text_extension {
-    color: #080707;
+    color: var(--slds-g-color-on-success-2, #080707);
     font-family: "Salesforce Sans";
-    font-size: 13px;
+    font-size: var(--slds-g-font-size-base, 13px);
     line-height: 20px;
 }
 
 .table-header {
-    color: #080707;
+    color: var(--slds-g-color-on-success-2, #080707);
     font-family: "Salesforce Sans";
-    font-size: 14px;
+    font-size: var(--slds-g-font-scale-1, 14px);
     line-height: 21px;
 }
 
@@ -31,7 +31,7 @@
 }
 
 .table-no-field-mappings {
-    background-color: rgb(250, 250, 249);
+    background-color: var(--slds-g-color-disabled-container-1, rgb(250, 250, 249));
 }
 
 .custom-col {
diff --git a/force-app/main/default/lwc/geDonationMatchingOpportunityCard/geDonationMatchingOpportunityCard.css b/force-app/main/default/lwc/geDonationMatchingOpportunityCard/geDonationMatchingOpportunityCard.css
index 6220e0e9cdf..90e148d659e 100644
--- a/force-app/main/default/lwc/geDonationMatchingOpportunityCard/geDonationMatchingOpportunityCard.css
+++ b/force-app/main/default/lwc/geDonationMatchingOpportunityCard/geDonationMatchingOpportunityCard.css
@@ -5,11 +5,12 @@
     padding: 0;
     background: transparent;
     background-clip: border-box;
-    border: 1px solid transparent;
-    border-radius: .25rem;
+    border: var(--slds-g-sizing-border-1, 1px) solid transparent;
+    border-radius: var(--slds-g-radius-border-2, .25rem);
     line-height: 1.875rem;
     text-decoration: none;
-    color: var(--lwc-brandAccessible, rgb(0, 112, 210));
+    color: var(--slds-g-color-accent-container-1, var(--lwc-brandAccessible, rgb(0, 112, 210)));
+    appearance: none;
     -webkit-appearance: none;
     white-space: normal;
     -webkit-user-select: none;
@@ -19,8 +20,8 @@
 }
 
 .slds-button:hover {
-    background-color: rgb(244, 246, 249);
-    color: var(--lwc-brandAccessibleActive, rgb(0, 95, 178));
+    background-color: var(--slds-g-color-surface-2, rgb(244, 246, 249));
+    color: var(--slds-g-color-accent-container-2, var(--lwc-brandAccessibleActive, rgb(0, 95, 178)));
 }
 
 .slds-button_neutral {
@@ -29,30 +30,30 @@
     text-align: center;
     vertical-align: middle;
     justify-content: center;
-    border: 1px solid var(--lwc-colorBorder, rgb(221, 219, 218));
+    border: var(--slds-g-sizing-border-1, 1px) solid var(--slds-g-color-border-1, var(--lwc-colorBorder, rgb(221, 219, 218)));
     transition: border .15s linear;
-    border-color: var(--lwc-colorBorder, rgb(221, 219, 218));
-    background-color: var(--lwc-colorBackgroundAlt, rgb(255, 255, 255));
+    border-color: var(--slds-g-color-border-1, var(--lwc-colorBorder, rgb(221, 219, 218)));
+    background-color: var(--slds-g-color-surface-container-1, var(--lwc-colorBackgroundAlt, rgb(255, 255, 255)));
 }
 
 .slds-button_extension {
     width: 100%;
     padding: 0;
     margin: 0;
-    border-radius: 0;
+    border-radius: none;
     padding-top: 0.25rem;
     padding-bottom: 0.25rem;
     border: none;
-    border-radius: 0.25rem;
+    border-radius: var(--slds-g-radius-border-2, 0.25rem);
 }
 
 .slds-border_extension-bottom {
-    border-bottom: 1px solid var(--lwc-colorBorder, rgb(221, 219, 218));
-    border-radius: 0;
+    border-bottom: var(--slds-g-sizing-border-1, 1px) solid var(--slds-g-color-border-1, var(--lwc-colorBorder, rgb(221, 219, 218)));
+    border-radius: none;
 }
 
 .slds-button:disabled {
-    background-color: var(--lwc-colorBackgroundAlt, rgb(255, 255, 255));
-    color:  rgb(221, 219, 218);
+    background-color: var(--slds-g-color-surface-container-1, var(--lwc-colorBackgroundAlt, rgb(255, 255, 255)));
+    color:  var(--slds-g-color-neutral-base-90, rgb(221, 219, 218));
     cursor: default;
 }
\ No newline at end of file
diff --git a/force-app/main/default/lwc/geDonationMatchingPaymentCard/geDonationMatchingPaymentCard.css b/force-app/main/default/lwc/geDonationMatchingPaymentCard/geDonationMatchingPaymentCard.css
index d1229461ffa..5065384b2e9 100644
--- a/force-app/main/default/lwc/geDonationMatchingPaymentCard/geDonationMatchingPaymentCard.css
+++ b/force-app/main/default/lwc/geDonationMatchingPaymentCard/geDonationMatchingPaymentCard.css
@@ -5,12 +5,13 @@
     padding: 0;
     background: transparent;
     background-clip: border-box;
-    border: 1px solid transparent;
-    border-radius: .25rem;
+    border: var(--slds-g-sizing-border-1, 1px) solid transparent;
+    border-radius: var(--slds-g-radius-border-2, .25rem);
     line-height: 1.875rem;
     text-decoration: none;
-    color: var(--lwc-brandAccessible, rgb(0, 112, 210));
+    color: var(--slds-g-color-accent-container-1, var(--lwc-brandAccessible, rgb(0, 112, 210)));
     white-space: normal;
+    appearance: none;
     -webkit-appearance: none;
     -webkit-user-select: none;
     -moz-user-select: none;
@@ -19,8 +20,8 @@
 }
 
 .slds-button:hover {
-    background-color: rgb(244, 246, 249);
-    color: var(--lwc-brandAccessibleActive, rgb(0, 95, 178));
+    background-color: var(--slds-g-color-surface-2, rgb(244, 246, 249));
+    color: var(--slds-g-color-accent-container-2, var(--lwc-brandAccessibleActive, rgb(0, 95, 178)));
 }
 
 .slds-button_neutral {
@@ -29,24 +30,24 @@
     text-align: center;
     vertical-align: middle;
     justify-content: center;
-    border: 1px solid var(--lwc-colorBorder, rgb(221, 219, 218));
+    border: var(--slds-g-sizing-border-1, 1px) solid var(--slds-g-color-border-1, var(--lwc-colorBorder, rgb(221, 219, 218)));
     transition: border .15s linear;
-    border-color: var(--lwc-colorBorder, rgb(221, 219, 218));
-    background-color: var(--lwc-colorBackgroundAlt, rgb(255, 255, 255));
+    border-color: var(--slds-g-color-border-1, var(--lwc-colorBorder, rgb(221, 219, 218)));
+    background-color: var(--slds-g-color-surface-container-1, var(--lwc-colorBackgroundAlt, rgb(255, 255, 255)));
 }
 
 .slds-button_extension {
     width: 100%;
     padding: 0;
     margin: 0;
-    border-radius: 0;
+    border-radius: none;
     padding-top: 0.25rem;
     padding-bottom: 0.25rem;
     border: none;
-    border-radius: 0.25rem;
+    border-radius: var(--slds-g-radius-border-2, 0.25rem);
 }
 
 .slds-border_extension-bottom {
-    border-bottom: 1px solid var(--lwc-colorBorder, rgb(221, 219, 218));
-    border-radius: 0;
+    border-bottom: var(--slds-g-sizing-border-1, 1px) solid var(--slds-g-color-border-1, var(--lwc-colorBorder, rgb(221, 219, 218)));
+    border-radius: none;
 }
\ No newline at end of file
diff --git a/force-app/main/default/lwc/geFormRenderer/geFormRenderer.css b/force-app/main/default/lwc/geFormRenderer/geFormRenderer.css
index 9bd7e7c26cb..785179fa378 100644
--- a/force-app/main/default/lwc/geFormRenderer/geFormRenderer.css
+++ b/force-app/main/default/lwc/geFormRenderer/geFormRenderer.css
@@ -40,12 +40,12 @@ p.critical-error-text {
 }
 
 .payment-warn {
-    --sds-c-alert-image-background: none;
-    --sds-c-alert-color-background: transparent;
-    --sds-c-alert-text-color: var(--lwc-colorTextDefault);
+    background: none;
+    background-color: transparent;
+    color: var(--slds-g-color-on-surface-3, var(--lwc-colorTextDefault));
     justify-content: start;
 }
 
 .payment-warn h2 {
-    font-weight: 400;
+    font-weight: normal;
 }
\ No newline at end of file
diff --git a/force-app/main/default/lwc/geFormRenderer/geFormRenderer.html b/force-app/main/default/lwc/geFormRenderer/geFormRenderer.html
index 31c724a3fe1..87a7d0718b6 100644
--- a/force-app/main/default/lwc/geFormRenderer/geFormRenderer.html
+++ b/force-app/main/default/lwc/geFormRenderer/geFormRenderer.html
@@ -158,9 +158,9 @@
                         <lightning-layout>
                             <lightning-layout-item size="10">
                                 <template if:true={shouldShowElevateTransactionWarning}>
-                                    <div class="slds-notify slds-notify_alert payment-warn" role="alert">
+                                    <div class="slds-notify_alert payment-warn" role="alert">
                                         <span class="slds-assistive-text">{CUSTOM_LABELS.commonWarning}</span>
-                                        <span class="slds-icon_container slds-icon-utility-warning slds-m-right_x-small">
+                                        <span class="slds-icon_container slds-m-right_x-small">
                                             <lightning-icon
                                                     variant="warning"
                                                     icon-name="utility:warning"
@@ -207,9 +207,9 @@
                             </template>
 
                             <template if:true={showMismatchedCurrencyWarning}>
-                                <div class="slds-notify slds-notify_alert payment-warn" role="alert">
+                                <div class="slds-notify_alert payment-warn" role="alert">
                                     <span class="slds-assistive-text">{CUSTOM_LABELS.commonWarning}</span>
-                                    <span class="slds-icon_container slds-icon-utility-warning slds-m-right_x-small">
+                                    <span class="slds-icon_container slds-m-right_x-small">
                                         <lightning-icon
                                                 variant="warning"
                                                 icon-name="utility:warning"
diff --git a/force-app/main/default/lwc/geFormWidgetTokenizeCard/geFormWidgetTokenizeCard.css b/force-app/main/default/lwc/geFormWidgetTokenizeCard/geFormWidgetTokenizeCard.css
index 28322aeeb8f..7165214812c 100644
--- a/force-app/main/default/lwc/geFormWidgetTokenizeCard/geFormWidgetTokenizeCard.css
+++ b/force-app/main/default/lwc/geFormWidgetTokenizeCard/geFormWidgetTokenizeCard.css
@@ -10,20 +10,20 @@
 }
 
 .credit-card-container {
-    border: 1px solid #E2E1E0;
-    border-radius: 0.25rem;
+    border: var(--slds-g-sizing-border-1, 1px) solid var(--slds-g-color-neutral-base-90, #E2E1E0);
+    border-radius: var(--slds-g-radius-border-2, 0.25rem);
     min-height: 5rem;
-    box-shadow: 0 2px 2px 0 rgba(0, 0, 0, 0.1);
+    box-shadow: none var(--slds-g-sizing-border-2, 2px) var(--slds-g-sizing-border-2, 2px) none var(--slds-g-color-neutral-base-90, #ddd);
 }
 
 .credit-card-header {
-    background-color: #E2E1E0;
+    background-color: var(--slds-g-color-surface-3, #E2E1E0);
     font-weight: bold;
 }
 
 .do-not-charge-card-button {
-    font-size: 0.8125rem;
-    font-weight: 500;
+    font-size: var(--slds-g-font-size-base, 0.8125rem);
+    font-weight: bold;
 }
 
 .do-not-charge-card-icon {
diff --git a/force-app/main/default/lwc/geGatewaySelectWidget/geGatewaySelectWidget.css b/force-app/main/default/lwc/geGatewaySelectWidget/geGatewaySelectWidget.css
index f88e81ad553..584095f0961 100644
--- a/force-app/main/default/lwc/geGatewaySelectWidget/geGatewaySelectWidget.css
+++ b/force-app/main/default/lwc/geGatewaySelectWidget/geGatewaySelectWidget.css
@@ -17,6 +17,6 @@
 }
 
 .expand-collapse-link {
-    font-size: 0.8125rem;
-    font-weight: 500;
+    font-size: var(--slds-g-font-size-base, 0.8125rem);
+    font-weight: bold;
 }
\ No newline at end of file
diff --git a/force-app/main/default/lwc/geListView/geListView.css b/force-app/main/default/lwc/geListView/geListView.css
index deaac162155..6a6037184c3 100644
--- a/force-app/main/default/lwc/geListView/geListView.css
+++ b/force-app/main/default/lwc/geListView/geListView.css
@@ -1,13 +1,13 @@
 .slds-lightning-button-menu_extension {
-    font-size: 1.125rem;
-    font-weight: 700;
+    font-size: var(--slds-g-font-scale-3, 1.125rem);
+    font-weight: bold;
     line-height: var(--lwc-lineHeightHeading, 1.25);
     display: block;
 }
 
 .slds-page-header_extension {
-    background: var(--lwc-colorBackgroundAlt, rgb(255, 255, 255));
-    border-bottom: 1px solid var(--lwc-colorBorderSeparatorAlt, rgb(221, 219, 218));
-    border-bottom-left-radius: 0;
-    border-bottom-right-radius: 0;
+    background: var(--slds-g-color-surface-container-1, var(--lwc-colorBackgroundAlt, rgb(255, 255, 255)));
+    border-bottom: var(--slds-g-sizing-border-1, 1px) solid var(--slds-g-color-neutral-base-90, var(--lwc-colorBorderSeparatorAlt, rgb(221, 219, 218)));
+    border-bottom-left-radius: none;
+    border-bottom-right-radius: none;
 }
\ No newline at end of file
diff --git a/force-app/main/default/lwc/geModalPrompt/geModalPrompt.css b/force-app/main/default/lwc/geModalPrompt/geModalPrompt.css
index 80175bb99ac..b4b11223b6e 100644
--- a/force-app/main/default/lwc/geModalPrompt/geModalPrompt.css
+++ b/force-app/main/default/lwc/geModalPrompt/geModalPrompt.css
@@ -1,4 +1,4 @@
 .slds-box_extension {
     border: none;
-    border-radius: 0;
+    border-radius: none;
 }
\ No newline at end of file
diff --git a/force-app/main/default/lwc/geModalRecurringDonation/geModalRecurringDonation.css b/force-app/main/default/lwc/geModalRecurringDonation/geModalRecurringDonation.css
index 80175bb99ac..b4b11223b6e 100644
--- a/force-app/main/default/lwc/geModalRecurringDonation/geModalRecurringDonation.css
+++ b/force-app/main/default/lwc/geModalRecurringDonation/geModalRecurringDonation.css
@@ -1,4 +1,4 @@
 .slds-box_extension {
     border: none;
-    border-radius: 0;
+    border-radius: none;
 }
\ No newline at end of file
diff --git a/force-app/main/default/lwc/geRecurringGiftInfo/geRecurringGiftInfo.css b/force-app/main/default/lwc/geRecurringGiftInfo/geRecurringGiftInfo.css
index 38cbdbd9788..6facaa36b96 100644
--- a/force-app/main/default/lwc/geRecurringGiftInfo/geRecurringGiftInfo.css
+++ b/force-app/main/default/lwc/geRecurringGiftInfo/geRecurringGiftInfo.css
@@ -1,4 +1,4 @@
 .slds-box__extension {
     padding: var(--lwc-spacingSmall);
-    background-color: var(--lwc-colorBackground);
+    background-color: var(--slds-g-color-surface-container-2, var(--lwc-colorBackground));
 }
\ No newline at end of file
diff --git a/force-app/main/default/lwc/geTemplateBuilderFormField/geTemplateBuilderFormField.css b/force-app/main/default/lwc/geTemplateBuilderFormField/geTemplateBuilderFormField.css
index b2911bf37f6..2624df6ff29 100644
--- a/force-app/main/default/lwc/geTemplateBuilderFormField/geTemplateBuilderFormField.css
+++ b/force-app/main/default/lwc/geTemplateBuilderFormField/geTemplateBuilderFormField.css
@@ -1,10 +1,10 @@
 .slds-card_extension {
-    box-shadow: 0 2px 2px 0 rgba(0, 0, 0, 0.10);
-    border: 1px solid rgb(221, 219, 218);
+    box-shadow: none var(--slds-g-sizing-border-2, 2px) var(--slds-g-sizing-border-2, 2px) none var(--slds-g-color-neutral-base-90, #ddd);
+    border: var(--slds-g-sizing-border-1, 1px) solid var(--slds-g-color-neutral-base-90, rgb(221, 219, 218));
 }
 
 .slds-card_extension-widget {
-    background-color: #ECEBEA;
+    background-color: var(--slds-g-color-surface-3, #ECEBEA);
 }
 
 .vertical-align-center {
diff --git a/force-app/main/default/lwc/geTemplateBuilderFormSection/geTemplateBuilderFormSection.css b/force-app/main/default/lwc/geTemplateBuilderFormSection/geTemplateBuilderFormSection.css
index 875b476cdf6..50e416b51da 100644
--- a/force-app/main/default/lwc/geTemplateBuilderFormSection/geTemplateBuilderFormSection.css
+++ b/force-app/main/default/lwc/geTemplateBuilderFormSection/geTemplateBuilderFormSection.css
@@ -1,16 +1,16 @@
 .slds-card_extension {
-    box-shadow: 0 2px 2px 0 rgba(0, 0, 0, 0.10);
-    border: 2px solid rgb(221, 219, 218);
+    box-shadow: none var(--slds-g-sizing-border-2, 2px) var(--slds-g-sizing-border-2, 2px) none var(--slds-g-color-neutral-base-90, #ddd);
+    border: var(--slds-g-radius-border-1, 2px) solid var(--slds-g-color-neutral-base-90, rgb(221, 219, 218));
     transition: box-shadow 0.3s cubic-bezier(.25,.8,.25,1);
 }
 
 .slds-card_extension:hover {
     cursor: pointer;
-    box-shadow: 0 3px 6px rgba(0,0,0,0.16), 0 3px 6px rgba(0,0,0,0.23);
+    box-shadow: none var(--slds-g-sizing-border-3, 3px) var(--slds-g-sizing-border-3, 3px) var(--slds-g-color-neutral-base-90, #ddd), none var(--slds-g-sizing-border-3, 3px) var(--slds-g-sizing-border-3, 3px) var(--slds-g-color-neutral-base-90, #ddd);
 }
 
 .slds-card_extension_active {
-    border: 2px solid #1589ee;
+    border: var(--slds-g-radius-border-1, 2px) solid var(--slds-g-color-brand-base-60, #1589ee);
 }
 
 .slds-card_extension_active:after {
@@ -18,9 +18,9 @@
     position: absolute;
     top: -0.01rem;
     right: 0;
-    border: 1rem solid transparent;
-    border-right-color: #1589ee;
-    border-top-color: #1589ee;
+    border: var(--slds-g-radius-border-4, 1rem) solid transparent;
+    border-right-color: var(--slds-g-color-brand-base-60, #1589ee);
+    border-top-color: var(--slds-g-color-brand-base-60, #1589ee);
 }
 
 .slds-icon_container_extension {
@@ -28,5 +28,5 @@
 }
 
 .slds-icon_extension svg {
-    fill: #ffffff;
+    fill: var(--slds-g-color-on-accent-1, #ffffff);
 }
\ No newline at end of file
diff --git a/force-app/main/default/lwc/geTemplateBuilderFormSection/geTemplateBuilderFormSection.html b/force-app/main/default/lwc/geTemplateBuilderFormSection/geTemplateBuilderFormSection.html
index 9ff6b3f8b10..0f5703c220a 100644
--- a/force-app/main/default/lwc/geTemplateBuilderFormSection/geTemplateBuilderFormSection.html
+++ b/force-app/main/default/lwc/geTemplateBuilderFormSection/geTemplateBuilderFormSection.html
@@ -21,14 +21,14 @@
                 <lightning-button-icon icon-name="utility:settings"
                                        alternative-text={labelGeAssistiveFormFieldsSectionEdit}
                                        onclick={handleEditFormSection}
-                                       class="slds-m-left_xxx-small"
+                                       class="slds-m-left_xx-small"
                                        data-qa-locator={qaLocatorSectionSettings}>
                 </lightning-button-icon>
                 <lightning-button-icon icon-name="utility:chevronup"
                                        alternative-text={labelGeBuilderAssistiveSectionUp}
                                        onclick={handleFormSectionUp}
                                        data-section-id={formSection.id}
-                                       class="slds-m-left_xxx-small"
+                                       class="slds-m-left_xx-small"
                                        disabled={isFirst}
                                        data-id="up"
                                        data-qa-locator={qaLocatorSectionUp}>
@@ -37,7 +37,7 @@
                                        alternative-text={labelGeBuilderAssistiveSectionDown}
                                        onclick={handleFormSectionDown}
                                        data-section-id={formSection.id}
-                                       class="slds-m-left_xxx-small"
+                                       class="slds-m-left_xx-small"
                                        disabled={isLast}
                                        data-id="down"
                                        data-qa-locator={qaLocatorSectionDown}>
diff --git a/force-app/main/default/lwc/geTemplateBuilderWidget/geTemplateBuilderWidget.css b/force-app/main/default/lwc/geTemplateBuilderWidget/geTemplateBuilderWidget.css
index 1416634a3a4..9d55f21300d 100644
--- a/force-app/main/default/lwc/geTemplateBuilderWidget/geTemplateBuilderWidget.css
+++ b/force-app/main/default/lwc/geTemplateBuilderWidget/geTemplateBuilderWidget.css
@@ -1,8 +1,8 @@
 .widget-label {
-    color: #3E3E3C;
+    color: var(--slds-g-color-info-1, #3E3E3C);
     font-weight: bold;
 }
 
 .widget-text {
-    color: #3E3E3C;
+    color: var(--slds-g-color-info-1, #3E3E3C);
 }
\ No newline at end of file
diff --git a/force-app/main/default/lwc/geTemplates/geTemplates.css b/force-app/main/default/lwc/geTemplates/geTemplates.css
index 3310920197e..a20581f99ac 100644
--- a/force-app/main/default/lwc/geTemplates/geTemplates.css
+++ b/force-app/main/default/lwc/geTemplates/geTemplates.css
@@ -1,7 +1,7 @@
 .slds-card_extension {
-    background: #fff;
-    border: 1px solid #dddbda;
-    border-radius: .25rem;
+    background: var(--slds-g-color-disabled-container-1, #fff);
+    border: var(--slds-g-sizing-border-1, 1px) solid var(--slds-g-color-neutral-base-90, #dddbda);
+    border-radius: var(--slds-g-radius-border-2, .25rem);
     background-clip: padding-box;
-    box-shadow: 0 2px 2px 0 rgba(0,0,0,.1);
+    box-shadow: none var(--slds-g-sizing-border-2, 2px) var(--slds-g-sizing-border-2, 2px) none var(--slds-g-color-neutral-base-90, #ddd);
 }
\ No newline at end of file
diff --git a/force-app/main/default/lwc/givingSummary/givingSummary.css b/force-app/main/default/lwc/givingSummary/givingSummary.css
index 4f0b22a408d..d5dd91abbaa 100644
--- a/force-app/main/default/lwc/givingSummary/givingSummary.css
+++ b/force-app/main/default/lwc/givingSummary/givingSummary.css
@@ -3,9 +3,9 @@
 }
 
 .lifetime .bolder .SMALL {
-    border-bottom: 10px;
+    border-bottom: var(--slds-g-radius-border-3, 8px);
 }
 
 .bold-title{
-    font-weight: 700;
+    font-weight: bold;
 }
diff --git a/force-app/main/default/lwc/gsAccordionSection/gsAccordionSection.css b/force-app/main/default/lwc/gsAccordionSection/gsAccordionSection.css
index baf6e5ed52c..b16feb7a9e3 100644
--- a/force-app/main/default/lwc/gsAccordionSection/gsAccordionSection.css
+++ b/force-app/main/default/lwc/gsAccordionSection/gsAccordionSection.css
@@ -19,7 +19,7 @@
     position: absolute;
     height: calc(100% - 90px);
     width: 2px;
-    background: #d3d3d3;
+    background: var(--slds-g-color-disabled-container-2, #d3d3d3);
     display: flex;
     justify-content: flex-end;
     flex-direction: column;
@@ -29,7 +29,7 @@
 
 .slds-media.info.open .border .gap {
     width: 2px;
-    background-color: white;
+    background-color: var(--slds-g-color-disabled-container-1, white);
     height: 8rem;
 }
 
diff --git a/force-app/main/default/lwc/gsApplicationStatus/gsApplicationStatus.css b/force-app/main/default/lwc/gsApplicationStatus/gsApplicationStatus.css
index 5a3e2f26c77..83ae3c707de 100644
--- a/force-app/main/default/lwc/gsApplicationStatus/gsApplicationStatus.css
+++ b/force-app/main/default/lwc/gsApplicationStatus/gsApplicationStatus.css
@@ -5,20 +5,20 @@ img {
 }
 
 .slds-button_outline-brand {
-    border-color: #7614A1;
-    color: #7614A1;
+    border-color: var(--slds-g-color-palette-violet-30, #7614A1);
+    color: var(--slds-g-color-palette-violet-30, #7614A1);
 }
 
 .slds-button_brand {
-    background-color: #7614A1;
-    border-color: #7614A1;
+    background-color: var(--slds-g-color-palette-violet-30, #7614A1);
+    border-color: var(--slds-g-color-palette-violet-30, #7614A1);
 }
 
 .container {
-    background-color:white;
-    box-shadow: 1px -5px 3px -3px #b0adab7a;
-    border-radius: 5px;
-    border: solid 1px #DDDBDA;
+    background-color:var(--slds-g-color-disabled-container-1, white);
+    box-shadow: var(--slds-g-sizing-border-1, 1px) none var(--slds-g-sizing-border-3, 3px) none var(--slds-g-color-palette-yellow-90, #b0adab7a);
+    border-radius: var(--slds-g-radius-border-2, 4px);
+    border: solid var(--slds-g-sizing-border-1, 1px) var(--slds-g-color-neutral-base-90, #DDDBDA);
 }
 
 .button-padding {
@@ -29,9 +29,9 @@ img {
 }
 
 .modal-text {
-    color: #312D2B;
+    color: var(--slds-g-color-on-surface-2, #312D2B);
 }
 
 p {
-    color: #2B2826
+    color: var(--slds-g-color-neutral-base-15, #2B2826)
 }
\ No newline at end of file
diff --git a/force-app/main/default/lwc/gsChecklistItem/gsChecklistItem.css b/force-app/main/default/lwc/gsChecklistItem/gsChecklistItem.css
index 6084462d4be..5b1e98c67f1 100644
--- a/force-app/main/default/lwc/gsChecklistItem/gsChecklistItem.css
+++ b/force-app/main/default/lwc/gsChecklistItem/gsChecklistItem.css
@@ -1,7 +1,7 @@
 .item-card {
     position: relative;
     min-height: 185px;
-    border: 1px solid lightgray;
+    border: var(--slds-g-sizing-border-1, 1px) solid var(--slds-g-color-border-1, lightgray);
     width: 100%;
     margin: 1.5rem 0;
     padding: 18px;
@@ -16,7 +16,7 @@
     grid-column: 1/ 2;
     padding-left: 6px;
     padding-right: 24px;
-    border-right: 1px solid lightgray;
+    border-right: var(--slds-g-sizing-border-1, 1px) solid var(--slds-g-color-border-1, lightgray);
 }
 
 .item-card .card-image img {
@@ -38,29 +38,29 @@
     right: 0;
     height: 14px;
     width: 266.91px;
-    color: #706E6B;
+    color: var(--slds-g-color-on-surface-1, #706E6B);
     font-family: "Salesforce Sans";
-    font-size: 12.98px;
+    font-size: var(--slds-g-font-size-base, 13px);
     letter-spacing: 0;
     line-height: 19.97px;
     text-align: right;
 }
 
 .item-card .card-content .content-title {
-    color: #3E3E3C;
+    color: var(--slds-g-color-info-1, #3E3E3C);
     font-family: "Salesforce Sans";
-    font-size: 12.98px;
+    font-size: var(--slds-g-font-size-base, 13px);
     font-weight: bold;
     letter-spacing: 0;
-    line-height: 19.97px;
+    line-height: 20px;
 }
 
 .item-card .card-content .content-text {
-    color: #3E3E3C;
+    color: var(--slds-g-color-info-1, #3E3E3C);
     font-family: "Salesforce Sans";
-    font-size: 12.98px;
+    font-size: var(--slds-g-font-size-base, 13px);
     letter-spacing: 0;
-    line-height: 19.97px;
+    line-height: 20px;
     padding-right: 3rem;
  }
 
@@ -69,7 +69,7 @@
     left: -38px;
     top: calc(50% - 10px);
     outline: white 5px solid;
-    background: white;
+    background: var(--slds-g-color-disabled-container-1, white);
     outline-offset: 0;
  }
 
@@ -79,12 +79,12 @@
  }
 
  .item-card .card-content .content-footer a {
-    color: #006DCC;
+    color: var(--slds-g-color-accent-2, #006DCC);
     font-family: "Salesforce Sans";
-    font-size: 12.98px;
+    font-size: var(--slds-g-font-size-base, 13px);
     font-weight: bold;
     letter-spacing: 0;
-    line-height: 19.97px;
+    line-height: 120px;
     min-width: 10rem;
     flex: 1 0 0;
  }
diff --git a/force-app/main/default/lwc/gsChecklistSetup/gsChecklistSetup.css b/force-app/main/default/lwc/gsChecklistSetup/gsChecklistSetup.css
index 27d4ebfe131..183fca72411 100644
--- a/force-app/main/default/lwc/gsChecklistSetup/gsChecklistSetup.css
+++ b/force-app/main/default/lwc/gsChecklistSetup/gsChecklistSetup.css
@@ -1,4 +1,4 @@
 .slds-card__header-title {
-    color: #2B2826;
+    color: var(--slds-g-color-neutral-base-15, #2B2826);
     font-weight: bold;
 }
\ No newline at end of file
diff --git a/force-app/main/default/lwc/gsResources/gsResources.css b/force-app/main/default/lwc/gsResources/gsResources.css
index 2619a7b0e38..34fb8f6f8df 100644
--- a/force-app/main/default/lwc/gsResources/gsResources.css
+++ b/force-app/main/default/lwc/gsResources/gsResources.css
@@ -1,6 +1,6 @@
 .resource-list .resource-item {
     height: 80px;
-    border-top: solid 1px  #DDDBDA;
+    border-top: solid var(--slds-g-sizing-border-1, 1px)  var(--slds-g-color-neutral-base-90, #DDDBDA);
     display: flex;
     flex-direction: row;
     flex-wrap: wrap;
@@ -17,7 +17,7 @@
 }
 
 .link > a {
-    color: #006DCC;
+    color: var(--slds-g-color-accent-2, #006DCC);
 }
 
 .label {
@@ -25,8 +25,8 @@
 }
 
 .label > span, .container .link > a  {
-    font-size: 15px;
-    font-weight: 400;
+    font-size: var(--slds-g-font-scale-1, 14px);
+    font-weight: normal;
 }
 
 @media(max-width: 1345px) {
diff --git a/force-app/main/default/lwc/gsVideoHeader/gsVideoHeader.css b/force-app/main/default/lwc/gsVideoHeader/gsVideoHeader.css
index c5f7cced882..1be77fec702 100644
--- a/force-app/main/default/lwc/gsVideoHeader/gsVideoHeader.css
+++ b/force-app/main/default/lwc/gsVideoHeader/gsVideoHeader.css
@@ -1,14 +1,14 @@
 .title {
-    font-size: 32pt;
-    color: var(--lwc-colorTextLabel);
+    font-size: var(--slds-g-font-scale-8, 42px);
+    color: var(--slds-g-color-on-surface-3, var(--lwc-colorTextLabel));
     font-weight: lighter;
 }
 
 .length {
     margin-top: 5px;
-    font-size: 20pt;
+    font-size: var(--slds-g-font-scale-5, 24px);
     font-weight: lighter;
-    color: var(--lwc-colorTextLabel);
+    color: var(--slds-g-color-on-surface-3, var(--lwc-colorTextLabel));
 }
 
 .labelContainer {
diff --git a/force-app/main/default/lwc/gseuHeader/gseuHeader.css b/force-app/main/default/lwc/gseuHeader/gseuHeader.css
index c5f7cced882..1be77fec702 100644
--- a/force-app/main/default/lwc/gseuHeader/gseuHeader.css
+++ b/force-app/main/default/lwc/gseuHeader/gseuHeader.css
@@ -1,14 +1,14 @@
 .title {
-    font-size: 32pt;
-    color: var(--lwc-colorTextLabel);
+    font-size: var(--slds-g-font-scale-8, 42px);
+    color: var(--slds-g-color-on-surface-3, var(--lwc-colorTextLabel));
     font-weight: lighter;
 }
 
 .length {
     margin-top: 5px;
-    font-size: 20pt;
+    font-size: var(--slds-g-font-scale-5, 24px);
     font-weight: lighter;
-    color: var(--lwc-colorTextLabel);
+    color: var(--slds-g-color-on-surface-3, var(--lwc-colorTextLabel));
 }
 
 .labelContainer {
diff --git a/force-app/main/default/lwc/rd2ChangeEntry/rd2ChangeEntry.css b/force-app/main/default/lwc/rd2ChangeEntry/rd2ChangeEntry.css
index 4c76f1dacd8..a751cdb3247 100644
--- a/force-app/main/default/lwc/rd2ChangeEntry/rd2ChangeEntry.css
+++ b/force-app/main/default/lwc/rd2ChangeEntry/rd2ChangeEntry.css
@@ -1,3 +1,3 @@
 .slds-theme_error {
-    background: #ba0517;
+    background: var(--slds-g-color-error-base-40, #ba0517);
 }
\ No newline at end of file
diff --git a/force-app/main/default/lwc/rd2ElevateCreditCardForm/rd2ElevateCreditCardForm.css b/force-app/main/default/lwc/rd2ElevateCreditCardForm/rd2ElevateCreditCardForm.css
index 043f07e1fe3..c208e5fe717 100644
--- a/force-app/main/default/lwc/rd2ElevateCreditCardForm/rd2ElevateCreditCardForm.css
+++ b/force-app/main/default/lwc/rd2ElevateCreditCardForm/rd2ElevateCreditCardForm.css
@@ -10,20 +10,20 @@
 }
 
 .credit-card-container {
-    border: 1px solid var(--lwc-colorBorder, rgb(216, 221, 230));
-    border-radius: 0.25rem;
+    border: var(--slds-g-sizing-border-1, 1px) solid var(--slds-g-color-border-1, var(--lwc-colorBorder, rgb(216, 221, 230)));
+    border-radius: var(--slds-g-radius-border-2, 0.25rem);
     min-height: 5rem;
-    box-shadow: 0 2px 2px 0 rgba(0, 0, 0, 0.1);
+    box-shadow: none var(--slds-g-sizing-border-2, 2px) var(--slds-g-sizing-border-2, 2px) none var(--slds-g-color-neutral-base-90, #ddd);
 }
 
 .credit-card-header {
-    background-color: var(--lwc-colorBackgroundShade, rgb(224, 229, 238));
+    background-color: var(--slds-g-color-surface-2, var(--lwc-colorBackgroundShade, rgb(224, 229, 238)));
     font-weight: bold;
 }
 
 .hide-card-button {
-    font-size: 0.8125rem;
-    font-weight: 500;
+    font-size: var(--slds-g-font-size-base, 0.8125rem);
+    font-weight: normal;
 }
 
 .fade-in {
diff --git a/force-app/main/default/lwc/rd2ElevateInformation/rd2ElevateInformation.html b/force-app/main/default/lwc/rd2ElevateInformation/rd2ElevateInformation.html
index 7bae55904c2..fd38d60e888 100644
--- a/force-app/main/default/lwc/rd2ElevateInformation/rd2ElevateInformation.html
+++ b/force-app/main/default/lwc/rd2ElevateInformation/rd2ElevateInformation.html
@@ -158,7 +158,7 @@ <h2 slot="title" class="slds-p-top_xx-small" data-qa-locator={qaLocatorHeader}>
                         <template if:true={canEditPaymentInformation}>
                             <lightning-button
                                     variant="base"
-                                    class="slds-button slds-button_small slds-p-top_small slds-p-right_medium"
+                                    class="slds-button slds-p-top_small slds-p-right_medium"
                                     label={labels.updatePaymentInformation}
                                     onclick={openUpdatePaymentInformationModal}
                                     data-qa-locator={qaLocatorUpdatePaymentInformation}>
@@ -166,7 +166,7 @@ <h2 slot="title" class="slds-p-top_xx-small" data-qa-locator={qaLocatorHeader}>
                         </template>
                         <lightning-button
                                 variant="base"
-                                class="slds-button slds-button_small slds-p-top_small"
+                                class="slds-button slds-p-top_small"
                                 label={labels.viewErrorLogLabel}
                                 onclick={navigateToErrorLog}
                                 data-qa-locator={qaLocatorViewErrorLog}>
diff --git a/force-app/main/default/lwc/rd2EntryForm/rd2EntryForm.css b/force-app/main/default/lwc/rd2EntryForm/rd2EntryForm.css
index cc997c66207..bf7453de72f 100644
--- a/force-app/main/default/lwc/rd2EntryForm/rd2EntryForm.css
+++ b/force-app/main/default/lwc/rd2EntryForm/rd2EntryForm.css
@@ -27,13 +27,13 @@
 }
 
 .experienceTitle {
-    font-weight: var(--lwc-fontWeightBold,700);
-    color: var(--lwc-colorTextLabel,#5A5A5A);
+    font-weight: var(--slds-g-font-weight-7, var(--lwc-fontWeightBold,700));
+    color: var(--slds-g-color-on-surface-3, var(--lwc-colorTextLabel,#5A5A5A));
     font-family: var(--lwc-fontFamily,Work Sans);
 }
 
 legend.slds-form-element__legend.slds-form-element__label {
-    font-size: 120%;
+    font-size: var(--slds-g-font-scale-1, 14px);
     white-space: nowrap;
 }
 
diff --git a/force-app/main/default/lwc/rd2RecurringDonation/rd2RecurringDonation.css b/force-app/main/default/lwc/rd2RecurringDonation/rd2RecurringDonation.css
index 6e448e681cb..4b268669af2 100644
--- a/force-app/main/default/lwc/rd2RecurringDonation/rd2RecurringDonation.css
+++ b/force-app/main/default/lwc/rd2RecurringDonation/rd2RecurringDonation.css
@@ -14,7 +14,7 @@
     display: inline;
 }
 .slds-table_header-fixed tbody tr:first-child td, .table_top{
-    border-top: var(--lwc-borderWidthThin,1px) solid var(--lwc-colorBorder,rgb(229, 229, 229));
+    border-top: var(--slds-g-sizing-border-1, var(--lwc-borderWidthThin,1px)) solid var(--slds-g-color-border-1, var(--lwc-colorBorder,rgb(229, 229, 229)));
 }
 .viewMore{
     display: none;
diff --git a/force-app/main/default/lwc/relationshipsNavigator/relationshipsNavigator.css b/force-app/main/default/lwc/relationshipsNavigator/relationshipsNavigator.css
index d7cff6c1633..0f7223f9911 100644
--- a/force-app/main/default/lwc/relationshipsNavigator/relationshipsNavigator.css
+++ b/force-app/main/default/lwc/relationshipsNavigator/relationshipsNavigator.css
@@ -1,9 +1,9 @@
 :host {
-    --sds-c-card-color-background: #F3F3F3;
-    --sds-c-card-header-spacing-block-end: 12px;
-    --sds-c-card-header-spacing-inline-start: 12px;
-    --sds-c-card-header-spacing-inline-end: 12px;
-    --sds-c-card-heading-font-weight: 700;
+    background: var(--slds-g-color-surface-container-2, #F3F3F3);
+    margin-block-end: 12px;
+    margin-inline-start: 12px;
+    margin-inline-end: 12px;
+    font-weight: bold;
 }
 
 .relation-card {
diff --git a/force-app/main/default/lwc/relationshipsTreeGrid/relationshipsTreeGrid.html b/force-app/main/default/lwc/relationshipsTreeGrid/relationshipsTreeGrid.html
index 60215571a2f..c4ad6cc3ba1 100644
--- a/force-app/main/default/lwc/relationshipsTreeGrid/relationshipsTreeGrid.html
+++ b/force-app/main/default/lwc/relationshipsTreeGrid/relationshipsTreeGrid.html
@@ -12,7 +12,7 @@
         ></lightning-tree-grid>
     </template>
     <template if:false={hasData}>
-        <div class="slds-p-vertical_medium slds-color__background_gray-1 slds-border_top">
+        <div class="slds-p-vertical_medium slds-border_top">
             <c-util-illustration
                 size="small"
                 variant="going-camping"
diff --git a/force-app/main/default/lwc/utilAlertBanner/utilAlertBanner.html b/force-app/main/default/lwc/utilAlertBanner/utilAlertBanner.html
index 7365ce0c3ae..a7458a0b24c 100644
--- a/force-app/main/default/lwc/utilAlertBanner/utilAlertBanner.html
+++ b/force-app/main/default/lwc/utilAlertBanner/utilAlertBanner.html
@@ -4,7 +4,7 @@
             <lightning-layout-item size="12">
                 <div class={alertTheme} role="alert">
                     <span class="slds-assistive-text">{alertAssistText}</span>
-                    <span class="slds-icon_container slds-icon-utility-error slds-m-right_x-small">
+                    <span class="slds-icon_container slds-m-right_x-small">
                         <lightning-icon icon-name={alertIcon} variant={alertVariant} size={alertSize}></lightning-icon>
                     </span>
                     <h2>{alertMessage}</h2>
diff --git a/force-app/main/default/lwc/utilCard/utilCard.css b/force-app/main/default/lwc/utilCard/utilCard.css
index 4aac2609186..d96bd4c6acd 100644
--- a/force-app/main/default/lwc/utilCard/utilCard.css
+++ b/force-app/main/default/lwc/utilCard/utilCard.css
@@ -1,3 +1,3 @@
 .slds-card_extension_active {
-    border: 2px solid #1589ee;
+    border: var(--slds-g-radius-border-1, 2px) solid var(--slds-g-color-brand-base-60, #1589ee);
 }
\ No newline at end of file
diff --git a/force-app/main/default/lwc/utilSearchableCombobox/utilSearchableCombobox.css b/force-app/main/default/lwc/utilSearchableCombobox/utilSearchableCombobox.css
index 434fa17ba1b..d724aba4c42 100644
--- a/force-app/main/default/lwc/utilSearchableCombobox/utilSearchableCombobox.css
+++ b/force-app/main/default/lwc/utilSearchableCombobox/utilSearchableCombobox.css
@@ -4,10 +4,10 @@
     transform: translateY(0);
     clip: rect(0px, 2000px, 2000px, -10px);
     transition: opacity .2s ease-in-out,transform .2s ease-in-out,clip .2s ease-in-out;
-    border: 1px solid rgb(221, 219, 218);
-    border-radius: 4px;
-    background-color: rgb(255, 255, 255);
-    box-shadow: 0 2px 7px rgba(0, 0, 0, .07);
+    border: var(--slds-g-sizing-border-1, 1px) solid var(--slds-g-color-neutral-base-90, rgb(221, 219, 218));
+    border-radius: var(--slds-g-radius-border-2, 4px);
+    background-color: var(--slds-g-color-disabled-container-1, rgb(255, 255, 255));
+    box-shadow: none var(--slds-g-sizing-border-2, 2px) var(--slds-g-sizing-border-4, 4px) var(--slds-g-color-neutral-base-90, #ddd);
     z-index: 7000;
     overflow: hidden;
     overflow-y: auto;
@@ -24,6 +24,6 @@
 }
 
 .custom-search-result-box > p:hover {
-    background-color: rgb(243, 242, 242);
+    background-color: var(--slds-g-color-surface-2, rgb(243, 242, 242));
     cursor: pointer;
 }
\ No newline at end of file
diff --git a/force-app/main/default/lwc/utilStencil/utilStencil.css b/force-app/main/default/lwc/utilStencil/utilStencil.css
index cc77511c382..ab7b2715132 100644
--- a/force-app/main/default/lwc/utilStencil/utilStencil.css
+++ b/force-app/main/default/lwc/utilStencil/utilStencil.css
@@ -1,15 +1,15 @@
 td.stencil {
-    border-left: 1px solid rgb(221, 219, 218);
+    border-left: var(--slds-g-sizing-border-1, 1px) solid var(--slds-g-color-neutral-base-90, rgb(221, 219, 218));
 }
 
 td:first-child {
-    border-left: 1px solid transparent;
+    border-left: var(--slds-g-sizing-border-1, 1px) solid transparent;
 }
 
 td.stencil div {
     height: 6px;
     margin: 13px auto;
-    border-radius: 1rem;
-    background: rgb(243, 242, 242);
+    border-radius: var(--slds-g-radius-border-4, 1rem);
+    background: var(--slds-g-color-surface-2, rgb(243, 242, 242));
     width: 75%;
 }
\ No newline at end of file

From a2af4fca61e72266643600c7596833120416b34d Mon Sep 17 00:00:00 2001
From: Luke Parrott <lparrott@salesforce.com>
Date: Thu, 19 Dec 2024 14:17:39 -0600
Subject: [PATCH 2/5] Additional Kondo fixes

---
 .../BGE_ConfigurationWizard.cmp               |  6 +--
 .../CRLP_RollupsContainer.cmp                 |  4 +-
 .../CRLP_RollupsContainer.css                 |  2 +-
 .../aura/HH_AutoComplete/HH_AutoComplete.cmp  | 34 +++++++--------
 .../HH_AutoCompleteOption.cmp                 |  8 ++--
 .../aura/HH_Container/HH_Container.cmp        |  2 +-
 .../aura/autocomplete/autocomplete.cmp        | 42 ++++++++++---------
 .../autocompleteOption/autocompleteOption.cmp |  2 +-
 .../pageNotification/pageNotification.css     |  2 +-
 .../rd2StatusMappingSettings.js               |  2 +-
 .../utilPageLevelMessage.js                   |  2 +-
 11 files changed, 52 insertions(+), 54 deletions(-)

diff --git a/force-app/main/default/aura/BGE_ConfigurationWizard/BGE_ConfigurationWizard.cmp b/force-app/main/default/aura/BGE_ConfigurationWizard/BGE_ConfigurationWizard.cmp
index 5d3a91e4cf7..cb11bad821c 100644
--- a/force-app/main/default/aura/BGE_ConfigurationWizard/BGE_ConfigurationWizard.cmp
+++ b/force-app/main/default/aura/BGE_ConfigurationWizard/BGE_ConfigurationWizard.cmp
@@ -122,7 +122,7 @@
                         <aura:if isTrue="{!greaterthan(v.batchInfo.recordCount,0)}">
                             <lightning:layout horizontalAlign="center">
                                 <lightning:layoutItem size="12" class="slds-grid slds-grid_align-center slds-p-bottom_medium">
-                                    <div class="slds-notify slds-notify_alert slds-theme_alert-texture slds-theme_warning" role="alert">
+                                    <div class="slds-notify_alert slds-theme_warning" role="alert">
                                         <span class="slds-assistive-text">{!$Label.c.PageMessagesWarning}</span>
                                         <lightning:icon iconName="utility:warning" alternativeText="warning" class="iconContainer"/>
                                         <h2>
@@ -169,7 +169,7 @@
                         <aura:if isTrue="{!greaterthan(v.batchInfo.recordCount,0)}">
                             <lightning:layout horizontalAlign="center">
                                 <lightning:layoutItem size="12" class="slds-grid slds-grid_align-center slds-p-bottom_medium">
-                                    <div class="slds-notify slds-notify_alert slds-theme_alert-texture slds-theme_warning" role="alert">
+                                    <div class="slds-notify_alert slds-theme_warning" role="alert">
                                         <span class="slds-assistive-text">{!$Label.c.PageMessagesWarning}</span>
                                         <lightning:icon iconName="utility:warning" alternativeText="warning" class="iconContainer"/>
                                         <h2>
@@ -269,7 +269,7 @@
                             <aura:if isTrue="{!greaterthan(v.batchInfo.recordCount,0)}">
                                 <lightning:layout horizontalAlign="center">
                                     <lightning:layoutItem size="12" class="slds-grid slds-grid_align-center slds-p-bottom_medium">
-                                        <div class="slds-notify slds-notify_alert slds-theme_alert-texture slds-theme_warning" role="alert">
+                                        <div class="slds-notify_alert slds-theme_warning" role="alert">
                                             <span class="slds-assistive-text">{!$Label.c.PageMessagesWarning}</span>
                                             <lightning:icon iconName="utility:warning" alternativeText="warning" class="iconContainer"/>
                                             <h2>
diff --git a/force-app/main/default/aura/CRLP_RollupsContainer/CRLP_RollupsContainer.cmp b/force-app/main/default/aura/CRLP_RollupsContainer/CRLP_RollupsContainer.cmp
index 52ef4af46c7..347f484e9fa 100644
--- a/force-app/main/default/aura/CRLP_RollupsContainer/CRLP_RollupsContainer.cmp
+++ b/force-app/main/default/aura/CRLP_RollupsContainer/CRLP_RollupsContainer.cmp
@@ -82,7 +82,7 @@
 
         <!--START TOAST-->
         <div class="slds-notify_container slds-float_left">
-            <div class="{! 'slds-notify slds-notify_toast slds-theme_' + v.toastStatus + ' ' + v.toastHideClass}"
+            <div class="{! 'slds-notify_toast slds-theme_' + v.toastStatus + ' ' + v.toastHideClass}"
                  role="alert">
                 <lightning:icon iconName="{!'utility:' + v.toastStatus}" class="slds-p-right_small" variant="inverse"
                                 size="small" alternativeText="{!v.notificationText.alternativeText}"/>
@@ -127,7 +127,7 @@
         <!-- START ACCESS DISABLED MESSAGE -->
         <aura:if isTrue="{! !and(v.isCRLPEnabled, v.isSystemAdminUser)}">
             <div class="slds-p-around_medium">
-                <div class="slds-notify slds-notify_toast slds-theme_warning">
+                <div class="slds-notify_toast slds-theme_warning">
                     <lightning:icon iconName="utility:block_visitor" class="slds-p-right_small" variant="inverse"
                                     size="small" alternativeText="{!v.notificationText.alternativeText}"/>
                     <div class="slds-notify__content">
diff --git a/force-app/main/default/aura/CRLP_RollupsContainer/CRLP_RollupsContainer.css b/force-app/main/default/aura/CRLP_RollupsContainer/CRLP_RollupsContainer.css
index db3a615a0c1..9e3d4dcf31b 100644
--- a/force-app/main/default/aura/CRLP_RollupsContainer/CRLP_RollupsContainer.css
+++ b/force-app/main/default/aura/CRLP_RollupsContainer/CRLP_RollupsContainer.css
@@ -5,7 +5,7 @@
     padding: .25em 0em .25em 0em;
     line-height: 19.5px;
     text-align: left;
-    font-size: 13px;
+    font-size: var(--slds-g-font-size-base, 13px);
     background-color: transparent;
 }
 /*lightning table links hover*/
diff --git a/force-app/main/default/aura/HH_AutoComplete/HH_AutoComplete.cmp b/force-app/main/default/aura/HH_AutoComplete/HH_AutoComplete.cmp
index d212dde29a2..e0cd9f451fa 100644
--- a/force-app/main/default/aura/HH_AutoComplete/HH_AutoComplete.cmp
+++ b/force-app/main/default/aura/HH_AutoComplete/HH_AutoComplete.cmp
@@ -29,27 +29,21 @@
         </aura:set>
 
         <aura:set attribute="listFooter">
-            <div class="slds-lookup__item">
-                <ul class="slds-lookup__list">
-                    <li id="newContact" class="slds-lookup__item" tabindex="0" onclick="{!c.handleNewContact}" onkeydown="{!c.handleKeyPress}" role="listitem"  data-qa-locator="newContact">
-                        <span role="option">
-                            <div class="slds-media slds-tile slds-hint-parent">
-                                <div class="slds-media__figure">
-                                    <lightning:icon iconName="utility:add"
-                                        class="slds-icon_x-small" size="small"/>
-                                </div>
-                                <div class="slds-media__body">
-                                    <div class="slds-tile__detail slds-text-body_small">
-                                        <ul>
-                                            <li><ui:outputText value="{!$Label.npo02.NewContact}" /></li>
-                                        </ul>
-                                    </div>
-                                </div>
+            <li id="newContact" class="slds-listbox__item" tabindex="0" onclick="{!c.handleNewContact}" onkeydown="{!c.handleKeyPress}" role="listitem"  data-qa-locator="newContact">
+                <span role="option">
+                    <div class="slds-media slds-tile slds-hint-parent slds-listbox__option slds-listbox__option_entity">
+                        <div class="slds-media__figure slds-listbox__option-icon">
+                            <lightning:icon iconName="utility:add"
+                                class="slds-media__figure slds-listbox__option-icon slds-icon_container" size="small"/>
+                        </div>
+                        <div class="slds-media__body">
+                            <div class="slds-text-body_small slds-listbox__option-text slds-listbox__option-text_entity">
+                                <ui:outputText value="{!$Label.npo02.NewContact}" />
                             </div>
-                        </span>
-                    </li>
-                </ul>
-            </div>
+                        </div>
+                    </div>
+                </span>
+            </li>
         </aura:set>
         
         <aura:set attribute="loadingIndicator">
diff --git a/force-app/main/default/aura/HH_AutoCompleteOption/HH_AutoCompleteOption.cmp b/force-app/main/default/aura/HH_AutoCompleteOption/HH_AutoCompleteOption.cmp
index 61327dd3f92..990047c4943 100644
--- a/force-app/main/default/aura/HH_AutoCompleteOption/HH_AutoCompleteOption.cmp
+++ b/force-app/main/default/aura/HH_AutoCompleteOption/HH_AutoCompleteOption.cmp
@@ -1,10 +1,10 @@
 <aura:component extends="c:autocompleteOption" >
     <aura:registerEvent name="keypressEvent" type="c:HH_KeypressEvent"/>
     <aura:handler event="c:HH_NewFocussedElement" action="{!c.handleNewFocussedElement}"/>
-    <li class="slds-lookup__item" role="listitem" tabindex="0" onkeydown="{!c.handleKeyPress}" id="{!v.value.Id}" onclick="{!c.handleClick}" data-qa-locator="{!'Add ' + v.value.Name}">
+    <li class="slds-listbox__item" role="listitem" tabindex="0" onkeydown="{!c.handleKeyPress}" id="{!v.value.Id}" onclick="{!c.handleClick}" data-qa-locator="{!'Add ' + v.value.Name}">
         <span role="option">
-            <div class="slds-media slds-tile slds-hint-parent">
-                <div class="slds-media__figure">
+            <div class="slds-media slds-tile slds-hint-parent slds-listbox__option slds-listbox__option_entity">
+                <div class="slds-media__figure slds-listbox__option-icon">
                     <lightning:icon iconName="{!'standard:' + (!empty(v.value.HHId__c) ? 'household' : 'contact')}"
                         class="slds-icon_small" size="small"/>
                 </div>
@@ -15,7 +15,7 @@
                             class="slds-shrink-none" size="large"
                             alternativeText="{!$Label.npo02.Add + ' ' + v.value.Name}" ariaLabel="{!$Label.npo02.Add + ' ' + v.value.Name}" />
                     </div>
-                    <div class="slds-tile__detail slds-text-body_small">
+                    <div class="slds-tile__detail slds-text-body_small slds-listbox__option-text slds-listbox__option-text_entity">
                         <ul>
                             <aura:if isTrue="{!v.value.npo02__Household__r.Name != null}" >
                                 <li>{!v.value.npo02__Household__r.Name}</li>
diff --git a/force-app/main/default/aura/HH_Container/HH_Container.cmp b/force-app/main/default/aura/HH_Container/HH_Container.cmp
index 9c34f93e7c4..4f1d8efe4be 100644
--- a/force-app/main/default/aura/HH_Container/HH_Container.cmp
+++ b/force-app/main/default/aura/HH_Container/HH_Container.cmp
@@ -105,7 +105,7 @@
                 <div class="slds-p-bottom_small">
                     <div class="slds-grid">
                         <div class="slds-col slds-text-heading_label slds-p-around_x-small">{!$Label.npo02.HouseholdMembers}</div>
-                        <div class="slds-col slds-text-align_right slds-p-around_x-small">
+                        <div class="slds-col slds-p-around_x-small">
                             <!-- the autocomplete component for finding and adding contacts -->
                             <c:HH_AutoComplete aura:id="HHAutoComplete" hhId="{!v.hhId}"
                                                namespacePrefix="{!v.namespacePrefix}"
diff --git a/force-app/main/default/aura/autocomplete/autocomplete.cmp b/force-app/main/default/aura/autocomplete/autocomplete.cmp
index ff5ffbb50c5..fabedf303f8 100644
--- a/force-app/main/default/aura/autocomplete/autocomplete.cmp
+++ b/force-app/main/default/aura/autocomplete/autocomplete.cmp
@@ -33,39 +33,43 @@
     <aura:registerEvent name="newFocussedElement" type="c:HH_NewFocussedElement"/>
     <aura:registerEvent name="reachFooter" type="c:HH_ReachFooter"/>
     
-    <div class="slds" aura:id="autocomplete">
+    <div class="slds-combobox_container" aura:id="autocomplete">
         <div
-             class="{!'slds-lookup ' + (and(!empty(v.value), !empty(v.displayValue)) ? 'slds-has-selection' : '')}"
+             class="{!'' + (and(!empty(v.value), !empty(v.displayValue)) ? 'slds-has-selection' : '')}"
              data-select="single"
              data-scope="single"
              data-typeahead="true">
-            <div class="slds-form-element">
+            <div class="slds-combobox slds-dropdown-trigger slds-dropdown-trigger_click">
                 <aura:if isTrue="{!!empty(v.label)}">
                     <span class="slds-form-element__label slds-float_left" id="inputLabel" >{!v.label}</span>
                 </aura:if>
                 <div class="slds-form-element__control slds-input-has-icon slds-input-has-icon_right" onfocusin="{!c.handleFocusInput}" aria-labelledby="inputLabel">
-                    <lightning:icon iconName="utility:search" 
-                        class="slds-input__icon slds-icon-text-default" size="x-small"/>
                     <ui:inputText aura:id="input"
-                                  class="{!'slds-input ' + (and(!empty(v.value), !empty(v.displayValue)) ? 'slds-hide' : '')}"
+                                  class="{!'slds-combobox__input slds-input ' + (and(!empty(v.value), !empty(v.displayValue)) ? 'slds-hide' : '')}"
                                   placeholder="{!v.placeholder}"
                                   value="{!v.displayValue}"
                                   updateOn="keyup"
                                   keyup="{!c.handleKeypressOnInput}"
                                   />
+                    <span class="slds-icon_container slds-icon-utility-search slds-input__icon slds-input__icon_right">
+                        <lightning:icon iconName="utility:search"
+                                    class="slds-icon slds-icon slds-icon_x-small slds-icon-text-default"
+                                    size="x-small"
+                                    />
+                    </span>
                 </div>
             </div>
 
-            <div class="{!'slds-lookup__menu' + (v.isListVisible ? ' slds-show' : ' slds-hide')}" role="listbox" aura:id="list" tabindex="-1" onfocusin="{!c.handleListFocus}" onfocusout="{!c.handleListBlur}" onfocus="{!c.handleListFocus}" onblur="{!c.handleListBlur}">
-                <aura:if isTrue="{!v.showListHeader}">
-                    <div class="slds-lookup__item">
-                        <span>
-                            <lightning:icon iconName="utility:search" class="slds-icon-text-default" size="small"/>
-                            &quot;{!v.keyword}&quot; {!if(!empty(v.searchContext), v.searchContext, '')}
-                        </span>
-                    </div>
-                </aura:if>
-                <ul aura:id="ullist" tabindex="-1" class="slds-lookup__list">
+            <div class="{!'slds-dropdown slds-dropdown_length-with-icon-7 slds-dropdown_fluid' + (v.isListVisible ? ' slds-show' : ' slds-hide')}" role="listbox" aura:id="list" tabindex="-1" onfocusin="{!c.handleListFocus}" onfocusout="{!c.handleListBlur}" onfocus="{!c.handleListFocus}" onblur="{!c.handleListBlur}">
+                <ul aura:id="ullist" tabindex="-1" class="slds-listbox slds-listbox_vertical">
+                    <aura:if isTrue="{!v.showListHeader}">
+                        <li class="slds-listbox__item">
+                            <span class="slds-media slds-listbox__option slds-listbox__option_entity slds-listbox__option_term">
+                                <lightning:icon iconName="utility:search" class="slds-media__figure slds-listbox__option-icon" size="small"/>
+                                &quot;{!v.keyword}&quot; {!if(!empty(v.searchContext), v.searchContext, '')}
+                            </span>
+                        </li>
+                    </aura:if>
                     <aura:if isTrue="{!v.showLoadingIndicator}">
                         {!v.loadingIndicator}
                     </aura:if>
@@ -75,10 +79,10 @@
                             {!v.emptyListContent}
                         </aura:set>
                     </aura:if>
+                    <aura:if isTrue="{!v.showListFooter}">
+                        {!v.listFooter}
+                    </aura:if>
                 </ul>
-                <aura:if isTrue="{!v.showListFooter}">
-                    {!v.listFooter}
-                </aura:if>
             </div>
         </div>
     </div>
diff --git a/force-app/main/default/aura/autocompleteOption/autocompleteOption.cmp b/force-app/main/default/aura/autocompleteOption/autocompleteOption.cmp
index b43efedbdcd..d213b54ed38 100644
--- a/force-app/main/default/aura/autocompleteOption/autocompleteOption.cmp
+++ b/force-app/main/default/aura/autocompleteOption/autocompleteOption.cmp
@@ -6,7 +6,7 @@
     <aura:registerEvent name="optionSelected" type="c:autocompleteSelectListOption"/>
 
     <aura:attribute name="body" type="Aura.Component[]">
-        <li class="slds-lookup__item">
+        <li class="slds-listbox__item">
             <ui:button class="slds-button" press="{!c.handleClick}">
                 <aura:if isTrue="{!and(!empty(v.iconSprite), !empty(v.iconName))}">
                     <lightning:icon iconName="{!v.iconSprite + ':' + v.iconName}" size="small"/>
diff --git a/force-app/main/default/aura/pageNotification/pageNotification.css b/force-app/main/default/aura/pageNotification/pageNotification.css
index 29d1b4ee798..56c4cb3a111 100644
--- a/force-app/main/default/aura/pageNotification/pageNotification.css
+++ b/force-app/main/default/aura/pageNotification/pageNotification.css
@@ -1,3 +1,3 @@
 .THIS .errorFont {	
-    color: #C23934;
+    color: var(--slds-g-color-error-1, #C23934);
 }
\ No newline at end of file
diff --git a/force-app/main/default/lwc/rd2StatusMappingSettings/rd2StatusMappingSettings.js b/force-app/main/default/lwc/rd2StatusMappingSettings/rd2StatusMappingSettings.js
index a6ba9ac4e31..0684e4d33b4 100755
--- a/force-app/main/default/lwc/rd2StatusMappingSettings/rd2StatusMappingSettings.js
+++ b/force-app/main/default/lwc/rd2StatusMappingSettings/rd2StatusMappingSettings.js
@@ -362,7 +362,7 @@ export default class rd2StatusMappingSettings extends LightningElement {
     * @description Toast message notification formatting
     */
     get notificationClass() {
-        let classNames = 'slds-notify slds-notify_extension slds-notify_toast ';
+        let classNames = 'slds-notify_extension slds-notify_toast ';
         switch (this.message.variant) {
             case toastVariant.SUCCESS:
                 classNames += 'slds-theme_success';
diff --git a/force-app/main/default/lwc/utilPageLevelMessage/utilPageLevelMessage.js b/force-app/main/default/lwc/utilPageLevelMessage/utilPageLevelMessage.js
index 0a7a07ee3e3..f38c701d44d 100644
--- a/force-app/main/default/lwc/utilPageLevelMessage/utilPageLevelMessage.js
+++ b/force-app/main/default/lwc/utilPageLevelMessage/utilPageLevelMessage.js
@@ -47,7 +47,7 @@ export default class utilPageLevelMessage extends LightningElement {
     }
 
     get notificationClass() {
-        let classNames = "slds-notify slds-notify_extension slds-notify_toast ";
+        let classNames = "slds-notify_extension slds-notify_toast ";
         switch (this.variant) {
             case SUCCESS:
                 classNames += THEME_SUCCESS;

From 83e69c74513a0e10d6d59b8e21ed031ad7658020 Mon Sep 17 00:00:00 2001
From: Luke Parrott <lparrott@salesforce.com>
Date: Thu, 19 Dec 2024 17:02:10 -0600
Subject: [PATCH 3/5] Updating Alert classes for Kondo

---
 force-app/main/default/lwc/geModalPrompt/geModalPrompt.js     | 2 +-
 force-app/main/default/lwc/utilAlertBanner/utilAlertBanner.js | 2 +-
 force-app/main/default/lwc/utilPrompt/utilPrompt.js           | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/force-app/main/default/lwc/geModalPrompt/geModalPrompt.js b/force-app/main/default/lwc/geModalPrompt/geModalPrompt.js
index 990b196a4c9..34fd29285dd 100755
--- a/force-app/main/default/lwc/geModalPrompt/geModalPrompt.js
+++ b/force-app/main/default/lwc/geModalPrompt/geModalPrompt.js
@@ -13,7 +13,7 @@ export default class geModalPrompt extends LightningElement {
         let allowedVariants = ['warning', 'shade', 'inverse', 'alt-inverse', 
             'success', 'info', 'error', 'offline', 'default'];
 
-        let baseClass = ['slds-box', 'slds-theme_alert-texture', 'slds-box_extension'];
+        let baseClass = ['slds-box', 'slds-box_extension'];
 
         if (isEmpty(this.variant) || !allowedVariants.includes(this.variant)) {
             baseClass.push('slds-theme_default');
diff --git a/force-app/main/default/lwc/utilAlertBanner/utilAlertBanner.js b/force-app/main/default/lwc/utilAlertBanner/utilAlertBanner.js
index 5bdaed51ad2..0fa5356ebaf 100644
--- a/force-app/main/default/lwc/utilAlertBanner/utilAlertBanner.js
+++ b/force-app/main/default/lwc/utilAlertBanner/utilAlertBanner.js
@@ -1,7 +1,7 @@
 import { LightningElement, api } from 'lwc';
 import { isEmpty } from 'c/utilCommon';
 
-const defaultClass = 'slds-notify slds-notify_alert slds-theme_alert-texture slds-theme_';
+const defaultClass = 'slds-notify_alert slds-theme_';
 
 export default class AlertBanner extends LightningElement {
     /**
diff --git a/force-app/main/default/lwc/utilPrompt/utilPrompt.js b/force-app/main/default/lwc/utilPrompt/utilPrompt.js
index 89061dcbb2c..4e6228577c1 100644
--- a/force-app/main/default/lwc/utilPrompt/utilPrompt.js
+++ b/force-app/main/default/lwc/utilPrompt/utilPrompt.js
@@ -25,7 +25,7 @@ export default class utilPrompt extends LightningElement {
     @api confirmButtonTitle;
     @api hasBackDrop;
     @api position;
-    _themeClass = 'slds-modal__header slds-theme_alert-texture ';
+    _themeClass = 'slds-modal__header ';
 
     get promptTheme() {
        switch (this.variant) {

From 4d092d8f26bb6fdfaaeb3de6b2ac9e16938173cf Mon Sep 17 00:00:00 2001
From: Luke Parrott <lparrott@salesforce.com>
Date: Fri, 20 Dec 2024 10:22:21 -0600
Subject: [PATCH 4/5] Additional Kondo fixes after testing

---
 .../lwc/geGatewaySelectWidget/geGatewaySelectWidget.html  | 8 ++++----
 force-app/main/default/lwc/rd2EntryForm/rd2EntryForm.html | 4 +++-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/force-app/main/default/lwc/geGatewaySelectWidget/geGatewaySelectWidget.html b/force-app/main/default/lwc/geGatewaySelectWidget/geGatewaySelectWidget.html
index de115f0d133..a6a98561bbf 100644
--- a/force-app/main/default/lwc/geGatewaySelectWidget/geGatewaySelectWidget.html
+++ b/force-app/main/default/lwc/geGatewaySelectWidget/geGatewaySelectWidget.html
@@ -27,7 +27,7 @@
                                                        variant="bare"
                                                        icon-name="utility:chevrondown"
                                                        onclick={toggleSelectGatewayControls}
-                                                       class="slds-m-left_xxx-small"
+                                                       class="slds-m-left_xx-small"
                                                        data-qa-locator="ga-show-button-icon">
                                 </lightning-button-icon>
                             </div>
@@ -48,7 +48,7 @@
                                                        variant="bare"
                                                        icon-name="utility:chevronup"
                                                        onclick={toggleSelectGatewayControls}
-                                                       class="slds-m-left_xxx-small"
+                                                       class="slds-m-left_xx-small"
                                                        data-qa-locator="ga-hide-button-icon">
                                 </lightning-button-icon>
                             </div>
@@ -82,7 +82,7 @@
                                                        variant="bare"
                                                        icon-name="utility:chevrondown"
                                                        onclick={toggleSelectGatewayControls}
-                                                       class="slds-m-left_xxx-small"
+                                                       class="slds-m-left_xx-small"
                                                        data-qa-locator="pm-show-button-icon">
                                 </lightning-button-icon>
                             </div>
@@ -103,7 +103,7 @@
                                                        variant="bare"
                                                        icon-name="utility:chevronup"
                                                        onclick={toggleSelectGatewayControls}
-                                                       class="slds-m-left_xxx-small"
+                                                       class="slds-m-left_xx-small"
                                                        data-qa-locator="pm-hide-button-icon">
                                 </lightning-button-icon>
                             </div>
diff --git a/force-app/main/default/lwc/rd2EntryForm/rd2EntryForm.html b/force-app/main/default/lwc/rd2EntryForm/rd2EntryForm.html
index de2da969ef5..cdd07b5d68a 100644
--- a/force-app/main/default/lwc/rd2EntryForm/rd2EntryForm.html
+++ b/force-app/main/default/lwc/rd2EntryForm/rd2EntryForm.html
@@ -11,7 +11,9 @@
         <div class="slds-modal__container">
             <header class="slds-modal__header slds-clearfix">
                 <lightning-button-icon
-                    class="slds-modal__close"
+                    class="slds-button slds-button_icon slds-modal__close closeIcon"
+                    variant="bare"
+                    size="large"
                     title={customLabels.closeButtonLabel}
                     icon-name="utility:close"
                     icon-class="slds-button_icon-inverse"

From e66e5655359e6f59254d458ef852f9912abe92d7 Mon Sep 17 00:00:00 2001
From: Luke Parrott <lparrott@salesforce.com>
Date: Fri, 3 Jan 2025 14:50:37 -0600
Subject: [PATCH 5/5] Additional Kondo Fixes

---
 .../geDonationMatchingOpportunityCard.css           |  4 ----
 .../geDonationMatchingPaymentCard.css               |  2 --
 .../main/default/lwc/geListView/geListView.css      |  4 +---
 force-app/main/default/lwc/geListView/geListView.js |  9 +++++++++
 .../default/lwc/geModalPrompt/geModalPrompt.css     |  1 -
 .../geModalRecurringDonation.css                    |  1 -
 .../geTemplateBuilderFormField.css                  |  9 ++++-----
 .../geTemplateBuilderFormField.html                 |  4 ++--
 .../geTemplateBuilderFormField.js                   |  2 +-
 .../geTemplateBuilderFormSection.css                |  4 +---
 .../geTemplateBuilderWidget.html                    |  2 +-
 .../main/default/lwc/geTemplates/geTemplates.css    |  3 ---
 force-app/main/default/lwc/utilInput/utilInput.css  |  8 ++++++++
 force-app/main/default/lwc/utilInput/utilInput.html | 13 +++++++------
 force-app/main/default/lwc/utilInput/utilInput.js   |  2 +-
 15 files changed, 35 insertions(+), 33 deletions(-)

diff --git a/force-app/main/default/lwc/geDonationMatchingOpportunityCard/geDonationMatchingOpportunityCard.css b/force-app/main/default/lwc/geDonationMatchingOpportunityCard/geDonationMatchingOpportunityCard.css
index 90e148d659e..2c1ebf99492 100644
--- a/force-app/main/default/lwc/geDonationMatchingOpportunityCard/geDonationMatchingOpportunityCard.css
+++ b/force-app/main/default/lwc/geDonationMatchingOpportunityCard/geDonationMatchingOpportunityCard.css
@@ -40,16 +40,12 @@
     width: 100%;
     padding: 0;
     margin: 0;
-    border-radius: none;
     padding-top: 0.25rem;
     padding-bottom: 0.25rem;
-    border: none;
-    border-radius: var(--slds-g-radius-border-2, 0.25rem);
 }
 
 .slds-border_extension-bottom {
     border-bottom: var(--slds-g-sizing-border-1, 1px) solid var(--slds-g-color-border-1, var(--lwc-colorBorder, rgb(221, 219, 218)));
-    border-radius: none;
 }
 
 .slds-button:disabled {
diff --git a/force-app/main/default/lwc/geDonationMatchingPaymentCard/geDonationMatchingPaymentCard.css b/force-app/main/default/lwc/geDonationMatchingPaymentCard/geDonationMatchingPaymentCard.css
index 5065384b2e9..2f71190b677 100644
--- a/force-app/main/default/lwc/geDonationMatchingPaymentCard/geDonationMatchingPaymentCard.css
+++ b/force-app/main/default/lwc/geDonationMatchingPaymentCard/geDonationMatchingPaymentCard.css
@@ -40,7 +40,6 @@
     width: 100%;
     padding: 0;
     margin: 0;
-    border-radius: none;
     padding-top: 0.25rem;
     padding-bottom: 0.25rem;
     border: none;
@@ -49,5 +48,4 @@
 
 .slds-border_extension-bottom {
     border-bottom: var(--slds-g-sizing-border-1, 1px) solid var(--slds-g-color-border-1, var(--lwc-colorBorder, rgb(221, 219, 218)));
-    border-radius: none;
 }
\ No newline at end of file
diff --git a/force-app/main/default/lwc/geListView/geListView.css b/force-app/main/default/lwc/geListView/geListView.css
index 6a6037184c3..bf1eb5f8902 100644
--- a/force-app/main/default/lwc/geListView/geListView.css
+++ b/force-app/main/default/lwc/geListView/geListView.css
@@ -6,8 +6,6 @@
 }
 
 .slds-page-header_extension {
-    background: var(--slds-g-color-surface-container-1, var(--lwc-colorBackgroundAlt, rgb(255, 255, 255)));
+    background: none;
     border-bottom: var(--slds-g-sizing-border-1, 1px) solid var(--slds-g-color-neutral-base-90, var(--lwc-colorBorderSeparatorAlt, rgb(221, 219, 218)));
-    border-bottom-left-radius: none;
-    border-bottom-right-radius: none;
 }
\ No newline at end of file
diff --git a/force-app/main/default/lwc/geListView/geListView.js b/force-app/main/default/lwc/geListView/geListView.js
index 9503a6086ad..0128c509dd4 100755
--- a/force-app/main/default/lwc/geListView/geListView.js
+++ b/force-app/main/default/lwc/geListView/geListView.js
@@ -286,6 +286,15 @@ export default class geListView extends LightningElement {
             });
 
         this.isLoading = false;
+
+        console.log('Test 1');
+        let style = document.createElement('style');
+        style.innerText = '.slds-table_header-fixed_container{border: 1px solid red;}';
+        let dt = this.template.querySelector('lightning-datatable');
+        if(dt) {
+            dt.appendChild(style);
+        }
+        console.log('Test 2');
     }
 
     /*******************************************************************************
diff --git a/force-app/main/default/lwc/geModalPrompt/geModalPrompt.css b/force-app/main/default/lwc/geModalPrompt/geModalPrompt.css
index b4b11223b6e..1164a841092 100644
--- a/force-app/main/default/lwc/geModalPrompt/geModalPrompt.css
+++ b/force-app/main/default/lwc/geModalPrompt/geModalPrompt.css
@@ -1,4 +1,3 @@
 .slds-box_extension {
     border: none;
-    border-radius: none;
 }
\ No newline at end of file
diff --git a/force-app/main/default/lwc/geModalRecurringDonation/geModalRecurringDonation.css b/force-app/main/default/lwc/geModalRecurringDonation/geModalRecurringDonation.css
index b4b11223b6e..1164a841092 100644
--- a/force-app/main/default/lwc/geModalRecurringDonation/geModalRecurringDonation.css
+++ b/force-app/main/default/lwc/geModalRecurringDonation/geModalRecurringDonation.css
@@ -1,4 +1,3 @@
 .slds-box_extension {
     border: none;
-    border-radius: none;
 }
\ No newline at end of file
diff --git a/force-app/main/default/lwc/geTemplateBuilderFormField/geTemplateBuilderFormField.css b/force-app/main/default/lwc/geTemplateBuilderFormField/geTemplateBuilderFormField.css
index 2624df6ff29..1d28d620cde 100644
--- a/force-app/main/default/lwc/geTemplateBuilderFormField/geTemplateBuilderFormField.css
+++ b/force-app/main/default/lwc/geTemplateBuilderFormField/geTemplateBuilderFormField.css
@@ -1,12 +1,11 @@
-.slds-card_extension {
-    box-shadow: none var(--slds-g-sizing-border-2, 2px) var(--slds-g-sizing-border-2, 2px) none var(--slds-g-color-neutral-base-90, #ddd);
-    border: var(--slds-g-sizing-border-1, 1px) solid var(--slds-g-color-neutral-base-90, rgb(221, 219, 218));
-}
-
 .slds-card_extension-widget {
     background-color: var(--slds-g-color-surface-3, #ECEBEA);
 }
 
 .vertical-align-center {
     margin: auto 0;
+}
+
+.input-padding {
+    padding: 0 4px 4px 4px;
 }
\ No newline at end of file
diff --git a/force-app/main/default/lwc/geTemplateBuilderFormField/geTemplateBuilderFormField.html b/force-app/main/default/lwc/geTemplateBuilderFormField/geTemplateBuilderFormField.html
index a61b2c1d872..e95320fe238 100644
--- a/force-app/main/default/lwc/geTemplateBuilderFormField/geTemplateBuilderFormField.html
+++ b/force-app/main/default/lwc/geTemplateBuilderFormField/geTemplateBuilderFormField.html
@@ -4,7 +4,7 @@
             <div class="slds-grid slds-grid_vertical-align-end">
                 <template if:false={isWidget}>
                     <div class="slds-size_5-of-12 slds-p-right_small">
-                        <lightning-input class="slds-truncate"
+                        <lightning-input class="slds-truncate input-padding"
                                          data-name="customLabel"
                                          field-level-help={labelHelpText}
                                          label={field.label}
@@ -35,7 +35,7 @@
                             </c-util-input>
                         </template>
                     </div>
-                    <div class="slds-size_1-of-12 slds-p-left_large slds-p-bottom_x-small">
+                    <div class="slds-size_1-of-12 slds-p-left_large slds-p-bottom_small">
                         <template if:true={showRequiredCheckbox}>
                             <lightning-input aria-label={labelGeAssistiveRequireField}
                                              aria-describedby="requiredCheckboxDescription"
diff --git a/force-app/main/default/lwc/geTemplateBuilderFormField/geTemplateBuilderFormField.js b/force-app/main/default/lwc/geTemplateBuilderFormField/geTemplateBuilderFormField.js
index 5eefd4dee59..bf32d324184 100644
--- a/force-app/main/default/lwc/geTemplateBuilderFormField/geTemplateBuilderFormField.js
+++ b/force-app/main/default/lwc/geTemplateBuilderFormField/geTemplateBuilderFormField.js
@@ -113,7 +113,7 @@ export default class geTemplateBuilderFormField extends LightningElement {
         if (this.field.elementType === WIDGET) {
             return 'slds-size_1-of-12 vertical-align-center'
         } else {
-            return 'slds-size_1-of-12 slds-p-bottom_x-small';
+            return 'slds-size_1-of-12 slds-p-bottom_small';
         }
     }
 
diff --git a/force-app/main/default/lwc/geTemplateBuilderFormSection/geTemplateBuilderFormSection.css b/force-app/main/default/lwc/geTemplateBuilderFormSection/geTemplateBuilderFormSection.css
index 50e416b51da..8d1d02ef01a 100644
--- a/force-app/main/default/lwc/geTemplateBuilderFormSection/geTemplateBuilderFormSection.css
+++ b/force-app/main/default/lwc/geTemplateBuilderFormSection/geTemplateBuilderFormSection.css
@@ -1,12 +1,9 @@
 .slds-card_extension {
-    box-shadow: none var(--slds-g-sizing-border-2, 2px) var(--slds-g-sizing-border-2, 2px) none var(--slds-g-color-neutral-base-90, #ddd);
     border: var(--slds-g-radius-border-1, 2px) solid var(--slds-g-color-neutral-base-90, rgb(221, 219, 218));
-    transition: box-shadow 0.3s cubic-bezier(.25,.8,.25,1);
 }
 
 .slds-card_extension:hover {
     cursor: pointer;
-    box-shadow: none var(--slds-g-sizing-border-3, 3px) var(--slds-g-sizing-border-3, 3px) var(--slds-g-color-neutral-base-90, #ddd), none var(--slds-g-sizing-border-3, 3px) var(--slds-g-sizing-border-3, 3px) var(--slds-g-color-neutral-base-90, #ddd);
 }
 
 .slds-card_extension_active {
@@ -21,6 +18,7 @@
     border: var(--slds-g-radius-border-4, 1rem) solid transparent;
     border-right-color: var(--slds-g-color-brand-base-60, #1589ee);
     border-top-color: var(--slds-g-color-brand-base-60, #1589ee);
+    border-top-right-radius: var(--slds-g-radius-border-2, 0.25rem);
 }
 
 .slds-icon_container_extension {
diff --git a/force-app/main/default/lwc/geTemplateBuilderWidget/geTemplateBuilderWidget.html b/force-app/main/default/lwc/geTemplateBuilderWidget/geTemplateBuilderWidget.html
index d1954c61567..d4a2bd1f085 100755
--- a/force-app/main/default/lwc/geTemplateBuilderWidget/geTemplateBuilderWidget.html
+++ b/force-app/main/default/lwc/geTemplateBuilderWidget/geTemplateBuilderWidget.html
@@ -1,6 +1,6 @@
 <template>
     <lightning-layout>
-        <lightning-layout-item size="12" class="slds-p-left_small">
+        <lightning-layout-item size="12" class="slds-p-left_small slds-p-vertical_small">
             <lightning-layout>
                 <template if:true={isAllocations}>
                     <lightning-layout-item size="12">
diff --git a/force-app/main/default/lwc/geTemplates/geTemplates.css b/force-app/main/default/lwc/geTemplates/geTemplates.css
index a20581f99ac..c947969637f 100644
--- a/force-app/main/default/lwc/geTemplates/geTemplates.css
+++ b/force-app/main/default/lwc/geTemplates/geTemplates.css
@@ -1,7 +1,4 @@
 .slds-card_extension {
     background: var(--slds-g-color-disabled-container-1, #fff);
-    border: var(--slds-g-sizing-border-1, 1px) solid var(--slds-g-color-neutral-base-90, #dddbda);
-    border-radius: var(--slds-g-radius-border-2, .25rem);
     background-clip: padding-box;
-    box-shadow: none var(--slds-g-sizing-border-2, 2px) var(--slds-g-sizing-border-2, 2px) none var(--slds-g-color-neutral-base-90, #ddd);
 }
\ No newline at end of file
diff --git a/force-app/main/default/lwc/utilInput/utilInput.css b/force-app/main/default/lwc/utilInput/utilInput.css
index bd610d2e7f5..9f6cc8f56e1 100644
--- a/force-app/main/default/lwc/utilInput/utilInput.css
+++ b/force-app/main/default/lwc/utilInput/utilInput.css
@@ -1,3 +1,11 @@
 .slds-form-element_hidden label {
     display: none;
+}
+
+.input-padding {
+    padding-bottom: 4px;
+}
+
+.combo-adjust {
+    top: -4px;
 }
\ No newline at end of file
diff --git a/force-app/main/default/lwc/utilInput/utilInput.html b/force-app/main/default/lwc/utilInput/utilInput.html
index 82cd67ad650..f7d5f51f8ab 100755
--- a/force-app/main/default/lwc/utilInput/utilInput.html
+++ b/force-app/main/default/lwc/utilInput/utilInput.html
@@ -9,7 +9,7 @@
     <template if:false={isWidget}>
         <template if:true={isLightningRichText}>
             <lightning-input-rich-text aria-label="default value"
-                                       class="slds-p-horizontal_xx-small"
+                                       class="slds-p-horizontal_xx-small input-padding"
                                        data-id='inputComponent'
                                        data-name="defaultValue"
                                        formats={richTextFormats}
@@ -30,7 +30,7 @@
                                 data-id='inputComponent'
                                 label={uiLabel}
                                 required={isRequired}
-                                class="slds-m-around_none"
+                                class="slds-m-around_none input-padding"
                                 data-name="defaultValue"
                                 onfocusout={handleValueChange}
                                 onclick={stopPropagation}
@@ -49,6 +49,7 @@
                                 options={picklistValues}
                                 data-qa-locator={qaLocatorPicklist}
                                 required={isRequired}
+                                class="combo-adjust"
                                 variant={variant}>
             </lightning-combobox>
         </template>
@@ -59,7 +60,7 @@
                              label={uiLabel}
                              required={isRequired}
                              checked={fieldValue}
-                             class="slds-m-top_small"
+                             class="slds-m-top_small input-padding"
                              data-name="defaultValue"
                              onchange={handleValueChange}
                              onclick={stopPropagation}
@@ -82,7 +83,7 @@
                                                onchange={handleValueChange}
                                                required={isRequired}
                                                variant='label-hidden'
-                                               class="help-text-hidden"
+                                               class="help-text-hidden input-padding"
                                                value={fieldValue}
                                                data-qa-locator={qaLocatorLookup}>
                         </lightning-input-field>
@@ -96,7 +97,7 @@
                              data-id='inputComponent'
                              label={uiLabel}
                              required={isRequired}
-                             class="slds-m-around_none"
+                             class="slds-m-around_none input-padding"
                              data-name="defaultValue"
                              onchange={handleValueChange}
                              onclick={stopPropagation}
@@ -113,7 +114,7 @@
                              data-id='inputComponent'
                              label={uiLabel}
                              required={isRequired}
-                             class="slds-m-around_none"
+                             class="slds-m-around_none input-padding"
                              data-name="defaultValue"
                              onfocusout={handleValueChange}
                              onclick={stopPropagation}
diff --git a/force-app/main/default/lwc/utilInput/utilInput.js b/force-app/main/default/lwc/utilInput/utilInput.js
index ba03e8fc906..177cc21ba4e 100755
--- a/force-app/main/default/lwc/utilInput/utilInput.js
+++ b/force-app/main/default/lwc/utilInput/utilInput.js
@@ -195,7 +195,7 @@ export default class utilInput extends LightningElement {
         } else if (this.variant === LABEL_STACKED) {
             return 'slds-form-element slds-form-element_stacked';
         } else if (this.variant === LABEL_HIDDEN) {
-            return 'slds-form-element slds-form-element_hidden';
+            return 'slds-form-element slds-form-element_hidden combo-adjust';
         }
     }