diff --git a/sfGpsDs/main/default/lwc/sfGpsDsOnClickOutside/sfGpsDsOnClickOutside.js b/sfGpsDs/main/default/lwc/sfGpsDsOnClickOutside/sfGpsDsOnClickOutside.js
index 075b63ce..bccb201a 100644
--- a/sfGpsDs/main/default/lwc/sfGpsDsOnClickOutside/sfGpsDsOnClickOutside.js
+++ b/sfGpsDs/main/default/lwc/sfGpsDsOnClickOutside/sfGpsDsOnClickOutside.js
@@ -69,6 +69,7 @@ export default class {
               if (!e._sfGpsDsOnClickOutside)
                 e._sfGpsDsOnClickOutside = new Set();
               e._sfGpsDsOnClickOutside.add(uuid);
+              console.log("tag", uuid);
             }
           },
           handler: (e) => {
@@ -92,13 +93,14 @@ export default class {
   }
 
   /* unbind must be called only once in the disconnectedCallback method */
+  /* or whenever the referenced object disappears from the DOM */
   unbind(pel, ref) {
     const el = pel.refs[ref];
 
     if (this._sfGpsDsOnClickOutside[ref]) {
       this._sfGpsDsOnClickOutside[ref].forEach(({ event, tagger, handler }) => {
         document.removeEventListener(event, handler, false);
-        el.removeEventListener(event, tagger, false);
+        if (el) el.removeEventListener(event, tagger, false);
       });
 
       delete this._sfGpsDsOnClickOutside[ref];
diff --git a/sfGpsDs/main/default/lwc/sfGpsDsOnWindowResize/sfGpsDsOnWindowResize.js b/sfGpsDs/main/default/lwc/sfGpsDsOnWindowResize/sfGpsDsOnWindowResize.js
index 2faab7a9..80d52cf5 100644
--- a/sfGpsDs/main/default/lwc/sfGpsDsOnWindowResize/sfGpsDsOnWindowResize.js
+++ b/sfGpsDs/main/default/lwc/sfGpsDsOnWindowResize/sfGpsDsOnWindowResize.js
@@ -23,7 +23,7 @@ export default class {
     if (this._sfGpsDsOnWindowResize) {
       window.removeEventListener(
         "resize",
-        this._sfGpsDsOnWindowResizehandler.handler,
+        this._sfGpsDsOnWindowResize.handler,
         false
       );
       delete this._sfGpsDsOnWindowResize;
diff --git a/sfGpsDsAuNsw/main/default/lwc/sfGpsDsAuNswAccordion/lwc/sfGpsDsAuNswAccordionComm/sfGpsDsAuNswAccordionComm.js b/sfGpsDsAuNsw/main/default/lwc/sfGpsDsAuNswAccordion/lwc/sfGpsDsAuNswAccordionComm/sfGpsDsAuNswAccordionComm.js
index ececb777..ffa65f64 100644
--- a/sfGpsDsAuNsw/main/default/lwc/sfGpsDsAuNswAccordion/lwc/sfGpsDsAuNswAccordionComm/sfGpsDsAuNswAccordionComm.js
+++ b/sfGpsDsAuNsw/main/default/lwc/sfGpsDsAuNswAccordion/lwc/sfGpsDsAuNswAccordionComm/sfGpsDsAuNswAccordionComm.js
@@ -28,8 +28,6 @@ export default class SfGpsDsAuNswAccordionComm extends SfGpsDsLwc {
   @api content;
   @api className;
 
-  _rendered = false;
-
   renderedCallback() {
     replaceInnerHtml(this.refs.markdown, this.content);
   }
diff --git a/sfGpsDsAuNsw/main/default/lwc/sfGpsDsAuNswBreadcrumbs/lwc/sfGpsDsAuNswBreadcrumbsComm/sfGpsDsAuNswBreadcrumbsComm.html b/sfGpsDsAuNsw/main/default/lwc/sfGpsDsAuNswBreadcrumbs/lwc/sfGpsDsAuNswBreadcrumbsComm/sfGpsDsAuNswBreadcrumbsComm.html
index e00c27c4..35f19a31 100644
--- a/sfGpsDsAuNsw/main/default/lwc/sfGpsDsAuNswBreadcrumbs/lwc/sfGpsDsAuNswBreadcrumbsComm/sfGpsDsAuNswBreadcrumbsComm.html
+++ b/sfGpsDsAuNsw/main/default/lwc/sfGpsDsAuNswBreadcrumbs/lwc/sfGpsDsAuNswBreadcrumbsComm/sfGpsDsAuNswBreadcrumbsComm.html
@@ -9,6 +9,7 @@
     lwc:else
     label={label}
     items={_itemsArray}
+    link-component={linkComponent}
     class-name={className}
   >
   </c-sf-gps-ds-au-nsw-breadcrumbs>
diff --git a/sfGpsDsAuNsw/main/default/lwc/sfGpsDsAuNswBreadcrumbs/lwc/sfGpsDsAuNswBreadcrumbsRecordComm/sfGpsDsAuNswBreadcrumbsRecordComm.html b/sfGpsDsAuNsw/main/default/lwc/sfGpsDsAuNswBreadcrumbs/lwc/sfGpsDsAuNswBreadcrumbsRecordComm/sfGpsDsAuNswBreadcrumbsRecordComm.html
index e00c27c4..35f19a31 100644
--- a/sfGpsDsAuNsw/main/default/lwc/sfGpsDsAuNswBreadcrumbs/lwc/sfGpsDsAuNswBreadcrumbsRecordComm/sfGpsDsAuNswBreadcrumbsRecordComm.html
+++ b/sfGpsDsAuNsw/main/default/lwc/sfGpsDsAuNswBreadcrumbs/lwc/sfGpsDsAuNswBreadcrumbsRecordComm/sfGpsDsAuNswBreadcrumbsRecordComm.html
@@ -9,6 +9,7 @@
     lwc:else
     label={label}
     items={_itemsArray}
+    link-component={linkComponent}
     class-name={className}
   >
   </c-sf-gps-ds-au-nsw-breadcrumbs>
diff --git a/sfGpsDsAuNsw/main/default/lwc/sfGpsDsAuNswButton/lwc/sfGpsDsAuNswButtonComm/sfGpsDsAuNswButtonComm.html b/sfGpsDsAuNsw/main/default/lwc/sfGpsDsAuNswButton/lwc/sfGpsDsAuNswButtonComm/sfGpsDsAuNswButtonComm.html
index 62680783..f3ee0eb3 100644
--- a/sfGpsDsAuNsw/main/default/lwc/sfGpsDsAuNswButton/lwc/sfGpsDsAuNswButtonComm/sfGpsDsAuNswButtonComm.html
+++ b/sfGpsDsAuNsw/main/default/lwc/sfGpsDsAuNswButton/lwc/sfGpsDsAuNswButtonComm/sfGpsDsAuNswButtonComm.html
@@ -17,6 +17,7 @@
       icon-name={iconName}
       mobile-full-width={_mobileFullWidth}
       class-name={className}
+      onclick={handleClick}
     >
     </c-sf-gps-ds-au-nsw-button>
     <c-sf-gps-ds-au-nsw-button
@@ -30,7 +31,6 @@
       icon-name={iconName}
       mobile-full-width={_mobileFullWidth}
       class-name={className}
-      onclick={handleClick}
     >
       {_link.text}
     </c-sf-gps-ds-au-nsw-button>
diff --git a/sfGpsDsAuNsw/main/default/lwc/sfGpsDsAuNswCard/lwc/.osfilegen.json b/sfGpsDsAuNsw/main/default/lwc/sfGpsDsAuNswCard/lwc/.osfilegen.json
index 77cefc2b..e45b7d0d 100644
--- a/sfGpsDsAuNsw/main/default/lwc/sfGpsDsAuNswCard/lwc/.osfilegen.json
+++ b/sfGpsDsAuNsw/main/default/lwc/sfGpsDsAuNswCard/lwc/.osfilegen.json
@@ -45,7 +45,7 @@
     "target": "!Os",
     "!.html": {
       "target": "!Os.html",
-      "c-sf-gps-ds-spinner": "c-sf-gps-ds-spinner-os",
+      "c-sf-gps-ds-au-nsw-loader": "c-sf-gps-ds-au-nsw-loader-os",
       "c-sf-gps-ds-au-nsw-card-comm": "c-sf-gps-ds-au-nsw-card-comm-os",
       "c-sf-gps-ds-empty": "c-sf-gps-ds-empty-os",
       "c-sf-gps-ds-configuration-error": "c-sf-gps-ds-configuration-error-os"
diff --git a/sfGpsDsAuNsw/main/default/lwc/sfGpsDsAuNswCard/lwc/sfGpsDsAuNswCardCollectionComm/sfGpsDsAuNswCardCollectionComm.html b/sfGpsDsAuNsw/main/default/lwc/sfGpsDsAuNswCard/lwc/sfGpsDsAuNswCardCollectionComm/sfGpsDsAuNswCardCollectionComm.html
index 6c1d3b04..f1e0798d 100644
--- a/sfGpsDsAuNsw/main/default/lwc/sfGpsDsAuNswCard/lwc/sfGpsDsAuNswCardCollectionComm/sfGpsDsAuNswCardCollectionComm.html
+++ b/sfGpsDsAuNsw/main/default/lwc/sfGpsDsAuNswCard/lwc/sfGpsDsAuNswCardCollectionComm/sfGpsDsAuNswCardCollectionComm.html
@@ -6,7 +6,7 @@
   </c-sf-gps-ds-configuration-error>
 
   <template lwc:else>
-    <c-sf-gps-ds-spinner lwc:if={_isLoading}> </c-sf-gps-ds-spinner>
+    <c-sf-gps-ds-au-nsw-loader lwc:if={_isLoading}> </c-sf-gps-ds-au-nsw-loader>
     <div lwc:else class={computedClassName}>
       <template for:each={_items} for:item="card">
         <div key={card.index} class={computedColClassName}>
diff --git a/sfGpsDsAuNsw/main/default/lwc/sfGpsDsAuNswCard/lwc/sfGpsDsAuNswCardComm/sfGpsDsAuNswCardComm.js-meta.xml b/sfGpsDsAuNsw/main/default/lwc/sfGpsDsAuNswCard/lwc/sfGpsDsAuNswCardComm/sfGpsDsAuNswCardComm.js-meta.xml
index 209288e2..f9130d66 100644
--- a/sfGpsDsAuNsw/main/default/lwc/sfGpsDsAuNswCard/lwc/sfGpsDsAuNswCardComm/sfGpsDsAuNswCardComm.js-meta.xml
+++ b/sfGpsDsAuNsw/main/default/lwc/sfGpsDsAuNswCard/lwc/sfGpsDsAuNswCardComm/sfGpsDsAuNswCardComm.js-meta.xml
@@ -52,6 +52,7 @@
         type="String"
         label="Date"
         description="Specifies a date context for the content, e.g. a publication date - in ISO8601 format."
+        editor="c/sfGpsDsStringCpe"
       />
       <property
         name="dateStyle"
@@ -65,24 +66,28 @@
         type="String"
         label="Image source"
         description="Allows for different content to stand out and provide additional context - as an URL."
+        editor="c/sfGpsDsStringCpe"
       />
       <property
         name="imageAlt"
         type="String"
         label="Image alt"
         description="Specifies an alternate text for the image, if the image cannot be displayed."
+        editor="c/sfGpsDsStringCpe"
       />
       <property
         name="tag"
         type="String"
         label="Tag"
         description="Indicates the category of a topic or theme to further group content."
+        editor="c/sfGpsDsStringCpe"
       />
       <property
         name="className"
         type="String"
         label="Class name"
         description="Additional CSS class to be applied."
+        editor="c/sfGpsDsStringCpe"
       />
     </targetConfig>
   </targetConfigs>
diff --git a/sfGpsDsAuNsw/main/default/lwc/sfGpsDsAuNswCardCarousel/lwc/sfGpsDsAuNswCardCarouselComm/sfGpsDsAuNswCardCarouselComm.html b/sfGpsDsAuNsw/main/default/lwc/sfGpsDsAuNswCardCarousel/lwc/sfGpsDsAuNswCardCarouselComm/sfGpsDsAuNswCardCarouselComm.html
index 221a00bc..1a51ee08 100644
--- a/sfGpsDsAuNsw/main/default/lwc/sfGpsDsAuNswCardCarousel/lwc/sfGpsDsAuNswCardCarouselComm/sfGpsDsAuNswCardCarouselComm.html
+++ b/sfGpsDsAuNsw/main/default/lwc/sfGpsDsAuNswCardCarousel/lwc/sfGpsDsAuNswCardCarouselComm/sfGpsDsAuNswCardCarouselComm.html
@@ -6,7 +6,7 @@
   </c-sf-gps-ds-configuration-error>
 
   <template lwc:else>
-    <c-sf-gps-ds-spinner lwc:if={_isLoading}> </c-sf-gps-ds-spinner>
+    <c-sf-gps-ds-au-nsw-loader lwc:if={_isLoading}> </c-sf-gps-ds-au-nsw-loader>
 
     <c-sf-gps-ds-empty lwc:if={isEmpty} title="No matching content">
     </c-sf-gps-ds-empty>
diff --git a/sfGpsDsAuNsw/main/default/lwc/sfGpsDsAuNswContentBlock/lwc/.osfilegen.json b/sfGpsDsAuNsw/main/default/lwc/sfGpsDsAuNswContentBlock/lwc/.osfilegen.json
index c18f016b..f9a76d70 100644
--- a/sfGpsDsAuNsw/main/default/lwc/sfGpsDsAuNswContentBlock/lwc/.osfilegen.json
+++ b/sfGpsDsAuNsw/main/default/lwc/sfGpsDsAuNswContentBlock/lwc/.osfilegen.json
@@ -28,7 +28,7 @@
     },
     "!.html": {
       "target": "!Os.html",
-      "c-sf-gps-ds-spinner": "c-sf-gps-ds-spinner-os",
+      "c-sf-gps-ds-au-nsw-loader": "c-sf-gps-ds-au-nsw-loader-os",
       "c-sf-gps-ds-au-nsw-content-block-comm": "c-sf-gps-ds-au-nsw-content-block-comm-os",
       "c-sf-gps-ds-empty": "c-sf-gps-ds-empty-os",
       "c-sf-gps-ds-configuration-error": "c-sf-gps-ds-configuration-error-os"
diff --git a/sfGpsDsAuNsw/main/default/lwc/sfGpsDsAuNswContentBlock/lwc/sfGpsDsAuNswContentBlockCollectionComm/sfGpsDsAuNswContentBlockCollectionComm.html b/sfGpsDsAuNsw/main/default/lwc/sfGpsDsAuNswContentBlock/lwc/sfGpsDsAuNswContentBlockCollectionComm/sfGpsDsAuNswContentBlockCollectionComm.html
index 385c26f3..0c3c8c7a 100644
--- a/sfGpsDsAuNsw/main/default/lwc/sfGpsDsAuNswContentBlock/lwc/sfGpsDsAuNswContentBlockCollectionComm/sfGpsDsAuNswContentBlockCollectionComm.html
+++ b/sfGpsDsAuNsw/main/default/lwc/sfGpsDsAuNswContentBlock/lwc/sfGpsDsAuNswContentBlockCollectionComm/sfGpsDsAuNswContentBlockCollectionComm.html
@@ -1,5 +1,5 @@
 <template>
-  <c-sf-gps-ds-spinner lwc:if={_isLoading}> </c-sf-gps-ds-spinner>
+  <c-sf-gps-ds-au-nsw-loader lwc:if={_isLoading}> </c-sf-gps-ds-au-nsw-loader>
 
   <c-sf-gps-ds-configuration-error
     lwc:if={_sfGpsDsErrors}
diff --git a/sfGpsDsAuNsw/main/default/lwc/sfGpsDsAuNswFooter/lwc/sfGpsDsAuNswLowerFooterIp/sfGpsDsAuNswLowerFooterIp.html b/sfGpsDsAuNsw/main/default/lwc/sfGpsDsAuNswFooter/lwc/sfGpsDsAuNswLowerFooterIp/sfGpsDsAuNswLowerFooterIp.html
index ea12794c..e1e637eb 100644
--- a/sfGpsDsAuNsw/main/default/lwc/sfGpsDsAuNswFooter/lwc/sfGpsDsAuNswLowerFooterIp/sfGpsDsAuNswLowerFooterIp.html
+++ b/sfGpsDsAuNsw/main/default/lwc/sfGpsDsAuNswFooter/lwc/sfGpsDsAuNswLowerFooterIp/sfGpsDsAuNswLowerFooterIp.html
@@ -6,7 +6,7 @@
   </c-sf-gps-ds-configuration-error>
 
   <template lwc:else>
-    <c-sf-gps-ds-spinner lwc:if={_isLoading}> </c-sf-gps-ds-spinner>
+    <c-sf-gps-ds-au-nsw-loader lwc:if={_isLoading}> </c-sf-gps-ds-au-nsw-loader>
 
     <c-sf-gps-ds-au-nsw-lower-footer
       lwc:else
diff --git a/sfGpsDsAuNsw/main/default/lwc/sfGpsDsAuNswFooter/lwc/sfGpsDsAuNswUpperFooterIp/sfGpsDsAuNswUpperFooterIp.html b/sfGpsDsAuNsw/main/default/lwc/sfGpsDsAuNswFooter/lwc/sfGpsDsAuNswUpperFooterIp/sfGpsDsAuNswUpperFooterIp.html
index 27cac342..6b47f0a2 100644
--- a/sfGpsDsAuNsw/main/default/lwc/sfGpsDsAuNswFooter/lwc/sfGpsDsAuNswUpperFooterIp/sfGpsDsAuNswUpperFooterIp.html
+++ b/sfGpsDsAuNsw/main/default/lwc/sfGpsDsAuNswFooter/lwc/sfGpsDsAuNswUpperFooterIp/sfGpsDsAuNswUpperFooterIp.html
@@ -6,7 +6,7 @@
   </c-sf-gps-ds-configuration-error>
 
   <template lwc:else>
-    <c-sf-gps-ds-spinner lwc:if={_isLoading}> </c-sf-gps-ds-spinner>
+    <c-sf-gps-ds-au-nsw-loader lwc:if={_isLoading}></c-sf-gps-ds-au-nsw-loader>
     <c-sf-gps-ds-au-nsw-upper-footer
       lwc:else
       items={_items}
diff --git a/sfGpsDsAuNsw/main/default/lwc/sfGpsDsAuNswForm/lwc/sfGpsDsAuNswFormFileOsN/sfGpsDsAuNswFormFileOsN.html b/sfGpsDsAuNsw/main/default/lwc/sfGpsDsAuNswForm/lwc/sfGpsDsAuNswFormFileOsN/sfGpsDsAuNswFormFileOsN.html
index c7ec31d4..20e2fc78 100644
--- a/sfGpsDsAuNsw/main/default/lwc/sfGpsDsAuNswForm/lwc/sfGpsDsAuNswFormFileOsN/sfGpsDsAuNswFormFileOsN.html
+++ b/sfGpsDsAuNsw/main/default/lwc/sfGpsDsAuNswForm/lwc/sfGpsDsAuNswFormFileOsN/sfGpsDsAuNswFormFileOsN.html
@@ -1,13 +1,8 @@
 <template>
   <!-- Spinner -->
   <template lwc:if={isPageLoading}>
-    <omnistudio-spinner
-      variant="brand"
-      alternative-text="Loading..."
-      theme={_theme}
-      size="medium"
-    >
-    </omnistudio-spinner>
+    <c-sf-gps-ds-au-nsw-loader-os label="Loading..." size="md">
+    </c-sf-gps-ds-au-nsw-loader-os>
   </template>
 
   <div class={_containerClasses} aria-labelledby="fileUpload">
diff --git a/sfGpsDsAuNsw/main/default/lwc/sfGpsDsAuNswForm/lwc/sfGpsDsAuNswFormLookupOsN/sfGpsDsAuNswFormLookupOsN.html b/sfGpsDsAuNsw/main/default/lwc/sfGpsDsAuNswForm/lwc/sfGpsDsAuNswFormLookupOsN/sfGpsDsAuNswFormLookupOsN.html
index 1afa3dac..3ab16071 100644
--- a/sfGpsDsAuNsw/main/default/lwc/sfGpsDsAuNswForm/lwc/sfGpsDsAuNswFormLookupOsN/sfGpsDsAuNswFormLookupOsN.html
+++ b/sfGpsDsAuNsw/main/default/lwc/sfGpsDsAuNswForm/lwc/sfGpsDsAuNswFormLookupOsN/sfGpsDsAuNswFormLookupOsN.html
@@ -146,13 +146,11 @@
     </span>
 
     <template lwc:if={isPageLoading}>
-      <omnistudio-spinner
-        variant="brand"
-        alternative-text={allCustomLabelsUtil.OmniSpinnerTextLoading}
-        theme="slds"
-        size="small"
+      <c-sf-gps-ds-au-nsw-loader-os
+        label={allCustomLabelsUtil.OmniSpinnerTextLoading}
+        size="sm"
       >
-      </omnistudio-spinner>
+      </c-sf-gps-ds-au-nsw-loader-os>
     </template>
   </div>
 </template>
diff --git a/sfGpsDsAuNsw/main/default/lwc/sfGpsDsAuNswLinkList/lwc/.osfilegen.json b/sfGpsDsAuNsw/main/default/lwc/sfGpsDsAuNswLinkList/lwc/.osfilegen.json
index 33969c8b..c4ca0827 100644
--- a/sfGpsDsAuNsw/main/default/lwc/sfGpsDsAuNswLinkList/lwc/.osfilegen.json
+++ b/sfGpsDsAuNsw/main/default/lwc/sfGpsDsAuNswLinkList/lwc/.osfilegen.json
@@ -5,7 +5,8 @@
       "target": "!Os.html",
       "c-sf-gps-ds-au-nsw-link-list": "c-sf-gps-ds-au-nsw-link-list-os",
       "c-sf-gps-ds-empty": "c-sf-gps-ds-empty-os",
-      "c-sf-gps-ds-configuration-error": "c-sf-gps-ds-configuration-error-os"
+      "c-sf-gps-ds-configuration-error": "c-sf-gps-ds-configuration-error-os",
+      "c-sf-gps-ds-au-nsw-loader": "c-sf-gps-ds-au-nsw-loader-os"
     },
     "!.js": {
       "target": "!Os.js",
diff --git a/sfGpsDsAuNsw/main/default/lwc/sfGpsDsAuNswLinkList/lwc/sfGpsDsAuNswLinkCollectionComm/sfGpsDsAuNswLinkCollectionComm.html b/sfGpsDsAuNsw/main/default/lwc/sfGpsDsAuNswLinkList/lwc/sfGpsDsAuNswLinkCollectionComm/sfGpsDsAuNswLinkCollectionComm.html
index 41306d60..51bb37e8 100644
--- a/sfGpsDsAuNsw/main/default/lwc/sfGpsDsAuNswLinkList/lwc/sfGpsDsAuNswLinkCollectionComm/sfGpsDsAuNswLinkCollectionComm.html
+++ b/sfGpsDsAuNsw/main/default/lwc/sfGpsDsAuNswLinkList/lwc/sfGpsDsAuNswLinkCollectionComm/sfGpsDsAuNswLinkCollectionComm.html
@@ -5,11 +5,18 @@
   >
   </c-sf-gps-ds-configuration-error>
 
-  <template lwc:else>
-    <c-sf-gps-ds-au-nsw-link-list links={_items} class-name={className}>
-    </c-sf-gps-ds-au-nsw-link-list>
+  <c-sf-gps-ds-au-nsw-loader lwc:elseif={_isLoading}>
+  </c-sf-gps-ds-au-nsw-loader>
 
+  <template lwc:else>
     <c-sf-gps-ds-empty lwc:if={isEmpty} title="No matching content">
     </c-sf-gps-ds-empty>
+
+    <c-sf-gps-ds-au-nsw-link-list
+      lwc:else
+      links={_items}
+      class-name={className}
+    >
+    </c-sf-gps-ds-au-nsw-link-list>
   </template>
 </template>
diff --git a/sfGpsDsAuNsw/main/default/lwc/sfGpsDsAuNswLinkList/lwc/sfGpsDsAuNswLinkCollectionComm/sfGpsDsAuNswLinkCollectionComm.js b/sfGpsDsAuNsw/main/default/lwc/sfGpsDsAuNswLinkList/lwc/sfGpsDsAuNswLinkCollectionComm/sfGpsDsAuNswLinkCollectionComm.js
index fd4205d5..0703de49 100644
--- a/sfGpsDsAuNsw/main/default/lwc/sfGpsDsAuNswLinkList/lwc/sfGpsDsAuNswLinkCollectionComm/sfGpsDsAuNswLinkCollectionComm.js
+++ b/sfGpsDsAuNsw/main/default/lwc/sfGpsDsAuNswLinkList/lwc/sfGpsDsAuNswLinkCollectionComm/sfGpsDsAuNswLinkCollectionComm.js
@@ -12,6 +12,56 @@ import SfGpsDsIpLwc from "c/sfGpsDsIpLwc";
 export default class SfGpsDsAuNswLinkCollectionComm extends NavigationMixin(
   SfGpsDsIpLwc
 ) {
+  @api
+  get mode() {
+    return super.mode;
+  }
+
+  set mode(value) {
+    super.mode = value;
+
+    if (value === "Demo") {
+      /* eslint-disable no-unused-vars */
+      let cbp = this.communityBasePath;
+
+      this._items = this.mapIpData([
+        {
+          actionType: "ExternalLink",
+          actionValue: "https://www.nsw.gov.au/accessibility-statement",
+          imageUrl: null,
+          label: "Accessibility statement",
+          subMenu: [],
+          target: "CurrentWindow"
+        },
+        {
+          actionType: "ExternalLink",
+          actionValue: "https://www.nsw.gov.au/nsw-government/copyright",
+          imageUrl: null,
+          label: "Copyright",
+          subMenu: [],
+          target: "CurrentWindow"
+        },
+        {
+          actionType: "ExternalLink",
+          actionValue: "https://www.nsw.gov.au/nsw-government/disclaimer",
+          imageUrl: null,
+          label: "Disclaimer",
+          subMenu: [],
+          target: "CurrentWindow"
+        }
+      ]);
+    }
+  }
+
+  @api
+  get navigationDevName() {
+    return super.navigationDevName;
+  }
+
+  set navigationDevName(value) {
+    super.navigationDevName = value;
+  }
+
   @api
   get ipName() {
     return super.ipName;
@@ -50,10 +100,11 @@ export default class SfGpsDsAuNswLinkCollectionComm extends NavigationMixin(
       data = [data];
     }
 
-    return data.map((item) => ({
+    return data.map((item, index) => ({
       ...item,
-      text: item.text,
-      url: item.url
+      index: item.index || `item-${index + 1}`,
+      text: item.text || item.label,
+      url: item.url || item.actionValue
     }));
   }
 
diff --git a/sfGpsDsAuNsw/main/default/lwc/sfGpsDsAuNswLinkList/lwc/sfGpsDsAuNswLinkCollectionComm/sfGpsDsAuNswLinkCollectionComm.js-meta.xml b/sfGpsDsAuNsw/main/default/lwc/sfGpsDsAuNswLinkList/lwc/sfGpsDsAuNswLinkCollectionComm/sfGpsDsAuNswLinkCollectionComm.js-meta.xml
index bf30d9ea..ba716c18 100644
--- a/sfGpsDsAuNsw/main/default/lwc/sfGpsDsAuNswLinkList/lwc/sfGpsDsAuNswLinkCollectionComm/sfGpsDsAuNswLinkCollectionComm.js-meta.xml
+++ b/sfGpsDsAuNsw/main/default/lwc/sfGpsDsAuNswLinkList/lwc/sfGpsDsAuNswLinkCollectionComm/sfGpsDsAuNswLinkCollectionComm.js-meta.xml
@@ -9,11 +9,26 @@
   </targets>
   <targetConfigs>
     <targetConfig targets="lightningCommunity__Default">
+      <property
+        name="mode"
+        type="String"
+        label="Mode"
+        datasource="Demo,Experience Cloud Navigation,Integration Procedure"
+        default="Experience Cloud Navigation"
+      />
+      <property
+        name="navigationDevName"
+        type="String"
+        label="Navigation name"
+        description="Pick the nav when mode is set to Experience Cloud Navigation."
+        editor="c/sfGpsDsNavigationCpe"
+      />
       <property
         name="ipName"
         type="String"
         label="Integration procedure name"
         description="Name of the Integration procedure mapping content to this list."
+        editor="c/sfGpsDsStringCpe"
       />
       <property
         name="inputJSON"
@@ -21,6 +36,7 @@
         label="Input JSON"
         description="JSON formatted input parameters for the Integration procedure."
         default="{}"
+        editor="c/sfGpsDsStringCpe"
       />
       <property
         name="optionsJSON"
@@ -28,12 +44,14 @@
         label="Options JSON"
         description="JSON formatted options for the Integration procedure."
         default="{}"
+        editor="c/sfGpsDsStringCpe"
       />
       <property
         name="className"
         type="String"
         label="Class name"
         description="Additional CSS class to be applied."
+        editor="c/sfGpsDsStringCpe"
       />
     </targetConfig>
   </targetConfigs>
diff --git a/sfGpsDsAuNsw/main/default/lwc/sfGpsDsAuNswLinkList/lwc/sfGpsDsAuNswLinkListComm/sfGpsDsAuNswLinkListComm.js b/sfGpsDsAuNsw/main/default/lwc/sfGpsDsAuNswLinkList/lwc/sfGpsDsAuNswLinkListComm/sfGpsDsAuNswLinkListComm.js
index 5f26be6b..745e44d8 100644
--- a/sfGpsDsAuNsw/main/default/lwc/sfGpsDsAuNswLinkList/lwc/sfGpsDsAuNswLinkListComm/sfGpsDsAuNswLinkListComm.js
+++ b/sfGpsDsAuNsw/main/default/lwc/sfGpsDsAuNswLinkList/lwc/sfGpsDsAuNswLinkListComm/sfGpsDsAuNswLinkListComm.js
@@ -6,13 +6,10 @@
  */
 
 import { api, track } from "lwc";
-import { NavigationMixin } from "lightning/navigation";
 import SfGpsDsLwc from "c/sfGpsDsLwc";
 import mdEngine from "c/sfGpsDsMarkdown";
 
-export default class SfGpsDsAuNswLinkListComm extends NavigationMixin(
-  SfGpsDsLwc
-) {
+export default class SfGpsDsAuNswLinkListComm extends SfGpsDsLwc {
   @api title;
   @api firstChild;
   @api className;
diff --git a/sfGpsDsAuNsw/main/default/lwc/sfGpsDsAuNswListView/lwc/sfGpsDsAuNswListViewComm/sfGpsDsAuNswListViewComm.html b/sfGpsDsAuNsw/main/default/lwc/sfGpsDsAuNswListView/lwc/sfGpsDsAuNswListViewComm/sfGpsDsAuNswListViewComm.html
index 16f2a869..2d26cbe5 100644
--- a/sfGpsDsAuNsw/main/default/lwc/sfGpsDsAuNswListView/lwc/sfGpsDsAuNswListViewComm/sfGpsDsAuNswListViewComm.html
+++ b/sfGpsDsAuNsw/main/default/lwc/sfGpsDsAuNswListView/lwc/sfGpsDsAuNswListViewComm/sfGpsDsAuNswListViewComm.html
@@ -10,7 +10,7 @@
       <div class={titleClassName}>{_name}</div>
 
       <template lwc:if={_isLoading}>
-        <c-sf-gps-ds-spinner></c-sf-gps-ds-spinner>
+        <c-sf-gps-ds-au-nsw-loader></c-sf-gps-ds-au-nsw-loader>
       </template>
 
       <template lwc:if={_records}>
diff --git a/sfGpsDsAuNsw/main/default/lwc/sfGpsDsAuNswLoader/lwc/.cssgen.json b/sfGpsDsAuNsw/main/default/lwc/sfGpsDsAuNswLoader/lwc/.cssgen.json
new file mode 100644
index 00000000..4a5d7eea
--- /dev/null
+++ b/sfGpsDsAuNsw/main/default/lwc/sfGpsDsAuNswLoader/lwc/.cssgen.json
@@ -0,0 +1,3 @@
+{
+  "sfGpsDsAuNswLoader/loader": []
+}
diff --git a/sfGpsDsAuNsw/main/default/lwc/sfGpsDsAuNswLoader/lwc/.osfilegen.json b/sfGpsDsAuNsw/main/default/lwc/sfGpsDsAuNswLoader/lwc/.osfilegen.json
new file mode 100644
index 00000000..7ad969ec
--- /dev/null
+++ b/sfGpsDsAuNsw/main/default/lwc/sfGpsDsAuNswLoader/lwc/.osfilegen.json
@@ -0,0 +1,22 @@
+{
+  "sfGpsDsAuNswLoader": {
+    "target": "!Os",
+    "loader.gen.css": {
+      "target": "loader.gen.css"
+    },
+    "!.css": {
+      "target": "!Os.css"
+    },
+    "!.html": {
+      "target": "!Os.html"
+    },
+    "!.js": {
+      "target": "!Os.js",
+      "sfGpsDsHelpers": "sfGpsDsHelpersOs"
+    },
+    "!.js-meta.xml": {
+      "target": "!Os.js-meta.xml",
+      "<isExposed>false</isExposed>": "<isExposed>true</isExposed>\n  <runtimeNamespace>omnistudio</runtimeNamespace>"
+    }
+  }
+}
diff --git a/sfGpsDsAuNsw/main/default/lwc/sfGpsDsAuNswLoader/lwc/sfGpsDsAuNswLoader/__tests__/sfGpsDsAuNswLoader.test.js b/sfGpsDsAuNsw/main/default/lwc/sfGpsDsAuNswLoader/lwc/sfGpsDsAuNswLoader/__tests__/sfGpsDsAuNswLoader.test.js
new file mode 100644
index 00000000..8670a430
--- /dev/null
+++ b/sfGpsDsAuNsw/main/default/lwc/sfGpsDsAuNswLoader/lwc/sfGpsDsAuNswLoader/__tests__/sfGpsDsAuNswLoader.test.js
@@ -0,0 +1,78 @@
+import { createElement } from "lwc";
+import SfGpsDsAuNswLoader from "c/sfGpsDsAuNswLoader";
+
+const tag = "c-sf-gps-ds-au-nsw-loader";
+const spinnerSpanSelector = "span[aria-hidden]";
+
+describe("c-sf-gps-ds-au-nsw-loader", () => {
+  afterEach(() => {
+    // The jsdom instance is shared across test cases in a single file so reset the DOM
+    while (document.body.firstChild) {
+      document.body.removeChild(document.body.firstChild);
+    }
+  });
+
+  it("renders as expected with default values", () => {
+    // Arrange
+    const element = createElement(tag, {
+      is: SfGpsDsAuNswLoader
+    });
+
+    const setTitle = "Loading...";
+    element.title = setTitle;
+
+    // Act
+    document.body.appendChild(element);
+
+    // Assert
+    const observedTitle = element.title;
+    expect(observedTitle).toBe(setTitle);
+
+    const observedSize = element.size;
+    expect(observedSize).toBe("xl");
+
+    const iconSpan = element.shadowRoot.querySelector(spinnerSpanSelector);
+    expect(iconSpan).not.toBeNull();
+    expect(iconSpan.className).toBe("nsw-loader__circle");
+  });
+
+  it("renders as expected with md size", () => {
+    // Arrange
+    const element = createElement(tag, {
+      is: SfGpsDsAuNswLoader
+    });
+
+    const setTitle = "Fetching goodness...";
+    const setSize = "md";
+
+    element.title = setTitle;
+    element.size = setSize;
+
+    // Act
+    document.body.appendChild(element);
+
+    // Assert
+    const observedTitle = element.title;
+    expect(observedTitle).toBe(setTitle);
+
+    const observedSize = element.size;
+    expect(observedSize).toBe(setSize);
+
+    const iconSpan = element.shadowRoot.querySelector(spinnerSpanSelector);
+    expect(iconSpan).not.toBeNull();
+    expect(iconSpan.classList).toContain("nsw-loader__circle");
+    expect(iconSpan.classList).toContain("nsw-loader__circle--md");
+  });
+
+  it("is accessible", async () => {
+    const element = createElement(tag, {
+      is: SfGpsDsAuNswLoader
+    });
+
+    element.title = "Loading...";
+
+    document.body.appendChild(element);
+
+    await expect(element).toBeAccessible();
+  });
+});
diff --git a/sfGpsDsAuNsw/main/default/lwc/sfGpsDsAuNswLoader/lwc/sfGpsDsAuNswLoader/loader.scss b/sfGpsDsAuNsw/main/default/lwc/sfGpsDsAuNswLoader/lwc/sfGpsDsAuNswLoader/loader.scss
new file mode 100644
index 00000000..a98bd1ed
--- /dev/null
+++ b/sfGpsDsAuNsw/main/default/lwc/sfGpsDsAuNswLoader/lwc/sfGpsDsAuNswLoader/loader.scss
@@ -0,0 +1,5 @@
+@import "nsw-design-system/src/global/scss/settings/settings";
+@import "nsw-design-system/src/global/scss/base/functions";
+@import "nsw-design-system/src/global/scss/base/mixins";
+
+@import "nsw-design-system/src/components/loader/loader";
diff --git a/sfGpsDsAuNsw/main/default/lwc/sfGpsDsAuNswLoader/lwc/sfGpsDsAuNswLoader/sfGpsDsAuNswLoader.css b/sfGpsDsAuNsw/main/default/lwc/sfGpsDsAuNswLoader/lwc/sfGpsDsAuNswLoader/sfGpsDsAuNswLoader.css
new file mode 100644
index 00000000..a54be70d
--- /dev/null
+++ b/sfGpsDsAuNsw/main/default/lwc/sfGpsDsAuNswLoader/lwc/sfGpsDsAuNswLoader/sfGpsDsAuNswLoader.css
@@ -0,0 +1 @@
+@import "./loader.gen.css";
diff --git a/sfGpsDsAuNsw/main/default/lwc/sfGpsDsAuNswLoader/lwc/sfGpsDsAuNswLoader/sfGpsDsAuNswLoader.html b/sfGpsDsAuNsw/main/default/lwc/sfGpsDsAuNswLoader/lwc/sfGpsDsAuNswLoader/sfGpsDsAuNswLoader.html
new file mode 100644
index 00000000..a3be48ca
--- /dev/null
+++ b/sfGpsDsAuNsw/main/default/lwc/sfGpsDsAuNswLoader/lwc/sfGpsDsAuNswLoader/sfGpsDsAuNswLoader.html
@@ -0,0 +1,6 @@
+<template>
+  <div class={computedClassName}>
+    <span aria-hidden="true" class={computedSpanClassName}></span>
+    <span role="status" class="nsw-loader__label">{label}</span>
+  </div>
+</template>
diff --git a/sfGpsDsAuNsw/main/default/lwc/sfGpsDsAuNswLoader/lwc/sfGpsDsAuNswLoader/sfGpsDsAuNswLoader.js b/sfGpsDsAuNsw/main/default/lwc/sfGpsDsAuNswLoader/lwc/sfGpsDsAuNswLoader/sfGpsDsAuNswLoader.js
new file mode 100644
index 00000000..78e45cd4
--- /dev/null
+++ b/sfGpsDsAuNsw/main/default/lwc/sfGpsDsAuNswLoader/lwc/sfGpsDsAuNswLoader/sfGpsDsAuNswLoader.js
@@ -0,0 +1,45 @@
+import { LightningElement, api } from "lwc";
+import { computeClass, normaliseString } from "c/sfGpsDsHelpers";
+
+const SIZE_SM = "sm";
+const SIZE_MD = "md";
+const SIZE_LG = "lg";
+const SIZE_XL = "xl";
+const SIZE_VALUES = [SIZE_LG, SIZE_MD, SIZE_SM, SIZE_XL];
+const SIZE_DEFAULT = SIZE_XL;
+
+export default class SfGpsDsAuNswLoader extends LightningElement {
+  @api label;
+  @api className;
+
+  _sizeOriginal = SIZE_XL;
+  _size = SIZE_XL;
+
+  @api get size() {
+    return this._sizeOriginal;
+  }
+
+  set size(value) {
+    this._sizeOriginal = value;
+    this._size = normaliseString(value, {
+      validValues: SIZE_VALUES,
+      fallbackValue: SIZE_DEFAULT
+    });
+  }
+
+  get computedSpanClassName() {
+    return computeClass({
+      "nsw-loader__circle": true,
+      "nsw-loader__circle--sm": this.size === SIZE_SM,
+      "nsw-loader__circle--md": this.size === SIZE_MD,
+      "nsw-loader__circle--lg": this.size === SIZE_LG
+    });
+  }
+
+  get computedClassName() {
+    return computeClass({
+      "nsw-loader": true,
+      [this.className]: this.className
+    });
+  }
+}
diff --git a/sfGpsDsAuNsw/main/default/lwc/sfGpsDsAuNswLoader/lwc/sfGpsDsAuNswLoader/sfGpsDsAuNswLoader.js-meta.xml b/sfGpsDsAuNsw/main/default/lwc/sfGpsDsAuNswLoader/lwc/sfGpsDsAuNswLoader/sfGpsDsAuNswLoader.js-meta.xml
new file mode 100644
index 00000000..0bef279d
--- /dev/null
+++ b/sfGpsDsAuNsw/main/default/lwc/sfGpsDsAuNswLoader/lwc/sfGpsDsAuNswLoader/sfGpsDsAuNswLoader.js-meta.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<LightningComponentBundle xmlns="http://soap.sforce.com/2006/04/metadata">
+    <apiVersion>61.0</apiVersion>
+    <isExposed>false</isExposed>
+</LightningComponentBundle>
diff --git a/sfGpsDsAuNsw/main/default/lwc/sfGpsDsAuNswLoader/lwc/sfGpsDsAuNswLoaderComm/__tests__/sfGpsDsAuNswLoaderComm.test.js b/sfGpsDsAuNsw/main/default/lwc/sfGpsDsAuNswLoader/lwc/sfGpsDsAuNswLoaderComm/__tests__/sfGpsDsAuNswLoaderComm.test.js
new file mode 100644
index 00000000..596afb04
--- /dev/null
+++ b/sfGpsDsAuNsw/main/default/lwc/sfGpsDsAuNswLoader/lwc/sfGpsDsAuNswLoaderComm/__tests__/sfGpsDsAuNswLoaderComm.test.js
@@ -0,0 +1,25 @@
+import { createElement } from "lwc";
+import SfGpsDsAuNswLoaderComm from "c/sfGpsDsAuNswLoaderComm";
+
+describe("c-sf-gps-ds-au-nsw-loader-comm", () => {
+  afterEach(() => {
+    // The jsdom instance is shared across test cases in a single file so reset the DOM
+    while (document.body.firstChild) {
+      document.body.removeChild(document.body.firstChild);
+    }
+  });
+
+  it("TODO: test case generated by CLI command, please fill in test logic", () => {
+    // Arrange
+    const element = createElement("c-sf-gps-ds-au-nsw-loader-comm", {
+      is: SfGpsDsAuNswLoaderComm
+    });
+
+    // Act
+    document.body.appendChild(element);
+
+    // Assert
+    // const div = element.shadowRoot.querySelector('div');
+    expect(1).toBe(1);
+  });
+});
diff --git a/sfGpsDsAuNsw/main/default/lwc/sfGpsDsAuNswLoader/lwc/sfGpsDsAuNswLoaderComm/sfGpsDsAuNswLoaderComm.html b/sfGpsDsAuNsw/main/default/lwc/sfGpsDsAuNswLoader/lwc/sfGpsDsAuNswLoaderComm/sfGpsDsAuNswLoaderComm.html
new file mode 100644
index 00000000..038b9fff
--- /dev/null
+++ b/sfGpsDsAuNsw/main/default/lwc/sfGpsDsAuNswLoader/lwc/sfGpsDsAuNswLoaderComm/sfGpsDsAuNswLoaderComm.html
@@ -0,0 +1,15 @@
+<template>
+  <c-sf-gps-ds-configuration-error
+    lwc:if={_sfGpsDsErrors}
+    errors={_sfGpsDsErrors}
+  >
+  </c-sf-gps-ds-configuration-error>
+
+  <c-sf-gps-ds-au-nsw-loader
+    lwc:else
+    label={label}
+    size={size}
+    class-name={className}
+  >
+  </c-sf-gps-ds-au-nsw-loader>
+</template>
diff --git a/sfGpsDsAuNsw/main/default/lwc/sfGpsDsAuNswLoader/lwc/sfGpsDsAuNswLoaderComm/sfGpsDsAuNswLoaderComm.js b/sfGpsDsAuNsw/main/default/lwc/sfGpsDsAuNswLoader/lwc/sfGpsDsAuNswLoaderComm/sfGpsDsAuNswLoaderComm.js
new file mode 100644
index 00000000..dba60359
--- /dev/null
+++ b/sfGpsDsAuNsw/main/default/lwc/sfGpsDsAuNswLoader/lwc/sfGpsDsAuNswLoaderComm/sfGpsDsAuNswLoaderComm.js
@@ -0,0 +1,8 @@
+import { api } from "lwc";
+import SfGpsDsLwc from "c/sfGpsDsLwc";
+
+export default class SfGpsDsAuNswLoaderComm extends SfGpsDsLwc {
+  @api label;
+  @api size;
+  @api className;
+}
diff --git a/sfGpsDsAuNsw/main/default/lwc/sfGpsDsAuNswLoader/lwc/sfGpsDsAuNswLoaderComm/sfGpsDsAuNswLoaderComm.js-meta.xml b/sfGpsDsAuNsw/main/default/lwc/sfGpsDsAuNswLoader/lwc/sfGpsDsAuNswLoaderComm/sfGpsDsAuNswLoaderComm.js-meta.xml
new file mode 100644
index 00000000..09a5d03f
--- /dev/null
+++ b/sfGpsDsAuNsw/main/default/lwc/sfGpsDsAuNswLoader/lwc/sfGpsDsAuNswLoaderComm/sfGpsDsAuNswLoaderComm.js-meta.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<LightningComponentBundle xmlns="http://soap.sforce.com/2006/04/metadata">
+  <apiVersion>61.0</apiVersion>
+  <isExposed>true</isExposed>
+  <masterLabel>NSW DS Loader (Demo)</masterLabel>
+  <targets>
+    <target>lightningCommunity__Page</target>
+    <target>lightningCommunity__Default</target>
+  </targets>
+  <targetConfigs>
+    <targetConfig targets="lightningCommunity__Default">
+      <property
+        name="label"
+        type="String"
+        label="Label"
+        description="Provides an explanation for the wait time to the user."
+        required="true"
+        default="Loading"
+      />
+      <property
+        name="size"
+        type="String"
+        label="Size"
+        datasource="sm,md,lg,xl"
+        required="true"
+        default="xl"
+      />
+      <property
+        name="className"
+        type="String"
+        label="Class name"
+        description="Additional CSS class to be applied."
+      />
+    </targetConfig>
+  </targetConfigs>
+</LightningComponentBundle>
diff --git a/sfGpsDsAuNsw/main/default/lwc/sfGpsDsAuNswLoader/lwc/sfGpsDsAuNswLoaderComm/sfGpsDsAuNswLoaderComm.svg b/sfGpsDsAuNsw/main/default/lwc/sfGpsDsAuNswLoader/lwc/sfGpsDsAuNswLoaderComm/sfGpsDsAuNswLoaderComm.svg
new file mode 100644
index 00000000..901ce7f4
--- /dev/null
+++ b/sfGpsDsAuNsw/main/default/lwc/sfGpsDsAuNswLoader/lwc/sfGpsDsAuNswLoaderComm/sfGpsDsAuNswLoaderComm.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 -960 960 960" width="24px" fill="#000000"><path d="M480-80q-82 0-155-31.5t-127.5-86Q143-252 111.5-325T80-480q0-83 31.5-155.5t86-127Q252-817 325-848.5T480-880q17 0 28.5 11.5T520-840q0 17-11.5 28.5T480-800q-133 0-226.5 93.5T160-480q0 133 93.5 226.5T480-160q133 0 226.5-93.5T800-480q0-17 11.5-28.5T840-520q17 0 28.5 11.5T880-480q0 82-31.5 155t-86 127.5q-54.5 54.5-127 86T480-80Z"/></svg>
\ No newline at end of file
diff --git a/sfGpsDsAuNsw/main/default/lwc/sfGpsDsAuNswPagination/lwc/.osfilegen.json b/sfGpsDsAuNsw/main/default/lwc/sfGpsDsAuNswPagination/lwc/.osfilegen.json
index bc8f923f..115f9bea 100644
--- a/sfGpsDsAuNsw/main/default/lwc/sfGpsDsAuNswPagination/lwc/.osfilegen.json
+++ b/sfGpsDsAuNsw/main/default/lwc/sfGpsDsAuNswPagination/lwc/.osfilegen.json
@@ -1,8 +1,8 @@
 {
-  "sfGpsDsAuNswProgressIndicator": {
+  "sfGpsDsAuNswPagination": {
     "target": "!Os",
-    "progress-indicator.gen.css": {
-      "target": "progress-indicator.gen.css"
+    "pagination.gen.css": {
+      "target": "pagination.gen.css"
     },
     "!.css": {
       "target": "!Os.css",
@@ -20,11 +20,11 @@
       "<isExposed>false</isExposed>": "<isExposed>true</isExposed>\n  <runtimeNamespace>omnistudio</runtimeNamespace>"
     }
   },
-  "sfGpsDsAuNswProgressIndicatorComm": {
+  "sfGpsDsAuNswPaginationComm": {
     "target": "!Os",
     "!.html": {
       "target": "!Os.html",
-      "c-sf-gps-ds-au-nsw-progress-indicator": "c-sf-gps-ds-au-nsw-progress-indicator-os",
+      "c-sf-gps-ds-au-nsw-pagination": "c-sf-gps-ds-au-nsw-pagination-os",
       "c-sf-gps-ds-configuration-error": "c-sf-gps-ds-configuration-error-os"
     },
     "!.js": {
diff --git a/sfGpsDsAuNsw/main/default/lwc/sfGpsDsAuNswTable/lwc/sfGpsDsAuNswTableComm/sfGpsDsAuNswTableComm.html b/sfGpsDsAuNsw/main/default/lwc/sfGpsDsAuNswTable/lwc/sfGpsDsAuNswTableComm/sfGpsDsAuNswTableComm.html
index 164ed83e..3761e67e 100644
--- a/sfGpsDsAuNsw/main/default/lwc/sfGpsDsAuNswTable/lwc/sfGpsDsAuNswTableComm/sfGpsDsAuNswTableComm.html
+++ b/sfGpsDsAuNsw/main/default/lwc/sfGpsDsAuNswTable/lwc/sfGpsDsAuNswTableComm/sfGpsDsAuNswTableComm.html
@@ -6,7 +6,7 @@
   </c-sf-gps-ds-configuration-error>
 
   <template lwc:else>
-    <c-sf-gps-ds-spinner lwc:if={_isLoading}> </c-sf-gps-ds-spinner>
+    <c-sf-gps-ds-au-nsw-loader lwc:if={_isLoading}> </c-sf-gps-ds-au-nsw-loader>
 
     <template lwc:else>
       <c-sf-gps-ds-au-nsw-results-bar