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;