diff --git a/package-lock.json b/package-lock.json
index 419d9ead..19bce483 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -12,7 +12,7 @@
         "@capacitor/core": "^2.4.7",
         "@hotwax/app-version-info": "^1.0.0",
         "@hotwax/apps-theme": "^1.1.0",
-        "@hotwax/dxp-components": "^1.11.0",
+        "@hotwax/dxp-components": "^1.12.1",
         "@hotwax/oms-api": "^1.10.0",
         "@ionic/core": "6.7.5",
         "@ionic/vue": "6.7.5",
@@ -2790,24 +2790,66 @@
       "integrity": "sha512-3Vec4pGWJVs6vDbL/pO5hYqoF1zn2w8liXuleqDJ7waI2R5JuF2eaJmYcUQETnk/DZIg47bDdyOSxihQltB2Ow=="
     },
     "node_modules/@hotwax/dxp-components": {
-      "version": "1.11.0",
-      "resolved": "https://registry.npmjs.org/@hotwax/dxp-components/-/dxp-components-1.11.0.tgz",
-      "integrity": "sha512-z9UNzi1veT8Aj8Y1WWAGBGOR+I0s6A58qrsFj+L3LkpxTkq6zGN/JS80tTv29obEeeOfONm6XyLHvNOM6TFKyA==",
+      "version": "1.12.1",
+      "resolved": "https://registry.npmjs.org/@hotwax/dxp-components/-/dxp-components-1.12.1.tgz",
+      "integrity": "sha512-5soKaVBFd7klZnHBCi68j4CZwTlrBCzvPsyd+wHMbenezU+lOwMK0ftdWXrQcQPedeGdVtQXvvgSPWnLL310bg==",
       "dependencies": {
         "@hotwax/oms-api": "^1.8.1",
-        "@ionic/core": "^6.7.5",
-        "@ionic/vue": "^6.7.5",
-        "@types/vue-barcode-reader": "^0.0.0",
+        "@ionic/core": "^7.6.0",
+        "@ionic/vue": "^7.6.0",
         "firebase": "^10.3.1",
         "luxon": "^3.3.0",
         "pinia": "2.0.36",
         "pinia-plugin-persistedstate": "^3.1.0",
         "register-service-worker": "^1.7.2",
         "vue": "^3.3.4",
-        "vue-barcode-reader": "^1.0.3",
         "vue-i18n": "^9.2.2"
       }
     },
+    "node_modules/@hotwax/dxp-components/node_modules/@ionic/core": {
+      "version": "7.7.4",
+      "resolved": "https://registry.npmjs.org/@ionic/core/-/core-7.7.4.tgz",
+      "integrity": "sha512-zThio3ZfbTu+3eM6QBdyeEk5OBc7M0ApFwSlP/G7rrFVcTPm12FNvG9VPD+aN5NwnYy0EsV3hlMkxbawoqjVLw==",
+      "dependencies": {
+        "@stencil/core": "^4.12.2",
+        "ionicons": "^7.2.2",
+        "tslib": "^2.1.0"
+      }
+    },
+    "node_modules/@hotwax/dxp-components/node_modules/@ionic/vue": {
+      "version": "7.7.4",
+      "resolved": "https://registry.npmjs.org/@ionic/vue/-/vue-7.7.4.tgz",
+      "integrity": "sha512-THrMMoQHU2Ym+JaTj/dm/FV8FyB7ZXmc6kierZ/+BSvOncIekla8Afe6Qk2c2U1afOPos0MBINf9xXkwxnHfIw==",
+      "dependencies": {
+        "@ionic/core": "7.7.4",
+        "ionicons": "^7.0.0"
+      }
+    },
+    "node_modules/@hotwax/dxp-components/node_modules/@stencil/core": {
+      "version": "4.12.5",
+      "resolved": "https://registry.npmjs.org/@stencil/core/-/core-4.12.5.tgz",
+      "integrity": "sha512-vSyFjY7XSEx0ufa9SebOd437CvnneaTXlCpuGDhjUDxAjGBlu6ie5qHyubobVGBth//aErc6wZPHc6W75Vp3iQ==",
+      "bin": {
+        "stencil": "bin/stencil"
+      },
+      "engines": {
+        "node": ">=16.0.0",
+        "npm": ">=7.10.0"
+      }
+    },
+    "node_modules/@hotwax/dxp-components/node_modules/ionicons": {
+      "version": "7.2.2",
+      "resolved": "https://registry.npmjs.org/ionicons/-/ionicons-7.2.2.tgz",
+      "integrity": "sha512-I3iYIfc9Q9FRifWyFSwTAvbEABWlWY32i0sAVDDPGYnaIZVugkLCZFbEcrphW6ixVPg8tt1oLwalo/JJwbEqnA==",
+      "dependencies": {
+        "@stencil/core": "^4.0.3"
+      }
+    },
+    "node_modules/@hotwax/dxp-components/node_modules/tslib": {
+      "version": "2.6.2",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz",
+      "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q=="
+    },
     "node_modules/@hotwax/dxp-components/node_modules/vue-i18n": {
       "version": "9.8.0",
       "resolved": "https://registry.npmjs.org/vue-i18n/-/vue-i18n-9.8.0.tgz",
@@ -3860,33 +3902,6 @@
       "integrity": "sha512-ScaPdn1dQczgbl0QFTeTOmVHFULt394XJgOQNoyVhZ6r2vLnMLJfBPd53SB52T/3G36VI1/g2MZaX0cwDuXsfw==",
       "dev": true
     },
-    "node_modules/@types/vue-barcode-reader": {
-      "version": "0.0.0",
-      "resolved": "https://registry.npmjs.org/@types/vue-barcode-reader/-/vue-barcode-reader-0.0.0.tgz",
-      "integrity": "sha512-yngQhd35qGjCxMXWIqsAtF7qmxe0qUYRVd9qW5I/CcRPWDdBpqVkHnQSh6ro5BIBl3NQ3ppky7kMKS4pr+XwCQ==",
-      "dependencies": {
-        "vue": "^2.0.0"
-      }
-    },
-    "node_modules/@types/vue-barcode-reader/node_modules/@vue/compiler-sfc": {
-      "version": "2.7.15",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-2.7.15.tgz",
-      "integrity": "sha512-FCvIEevPmgCgqFBH7wD+3B97y7u7oj/Wr69zADBf403Tui377bThTjBvekaZvlRr4IwUAu3M6hYZeULZFJbdYg==",
-      "dependencies": {
-        "@babel/parser": "^7.18.4",
-        "postcss": "^8.4.14",
-        "source-map": "^0.6.1"
-      }
-    },
-    "node_modules/@types/vue-barcode-reader/node_modules/vue": {
-      "version": "2.7.15",
-      "resolved": "https://registry.npmjs.org/vue/-/vue-2.7.15.tgz",
-      "integrity": "sha512-a29fsXd2G0KMRqIFTpRgpSbWaNBK3lpCTOLuGLEDnlHWdjB8fwl6zyYZ8xCrqkJdatwZb4mGHiEfJjnw0Q6AwQ==",
-      "dependencies": {
-        "@vue/compiler-sfc": "2.7.15",
-        "csstype": "^3.1.0"
-      }
-    },
     "node_modules/@types/webpack-env": {
       "version": "1.18.4",
       "resolved": "https://registry.npmjs.org/@types/webpack-env/-/webpack-env-1.18.4.tgz",
@@ -5295,26 +5310,6 @@
       "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==",
       "dev": true
     },
-    "node_modules/@zxing/library": {
-      "version": "0.19.3",
-      "resolved": "https://registry.npmjs.org/@zxing/library/-/library-0.19.3.tgz",
-      "integrity": "sha512-RUv5svewpDoD0ymXleOP8yVTO5BLkR0zn5coGC/Vs1671u0OBJ4xdtR8WVWf08OcvrieEMHdSfQY3ZKtqII/hg==",
-      "dependencies": {
-        "ts-custom-error": "^3.2.1"
-      },
-      "engines": {
-        "node": ">= 10.4.0"
-      },
-      "optionalDependencies": {
-        "@zxing/text-encoding": "~0.9.0"
-      }
-    },
-    "node_modules/@zxing/text-encoding": {
-      "version": "0.9.0",
-      "resolved": "https://registry.npmjs.org/@zxing/text-encoding/-/text-encoding-0.9.0.tgz",
-      "integrity": "sha512-U/4aVJ2mxI0aDNI8Uq0wEhMgY+u4CNtEb0om3+y3+niDAsoTCOB33UF0sxpzqzdqXLqmvc+vZyAt4O8pPdfkwA==",
-      "optional": true
-    },
     "node_modules/abbrev": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-2.0.0.tgz",
@@ -15830,14 +15825,6 @@
       "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==",
       "dev": true
     },
-    "node_modules/ts-custom-error": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/ts-custom-error/-/ts-custom-error-3.3.1.tgz",
-      "integrity": "sha512-5OX1tzOjxWEgsr/YEUWSuPrQ00deKLh6D7OTWcvNHm12/7QPyRh8SYpyWvA4IZv8H/+GQWQEh/kwo95Q9OVW1A==",
-      "engines": {
-        "node": ">=14.0.0"
-      }
-    },
     "node_modules/ts-loader": {
       "version": "9.5.1",
       "resolved": "https://registry.npmjs.org/ts-loader/-/ts-loader-9.5.1.tgz",
@@ -16394,14 +16381,6 @@
         }
       }
     },
-    "node_modules/vue-barcode-reader": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/vue-barcode-reader/-/vue-barcode-reader-1.0.3.tgz",
-      "integrity": "sha512-z4mv7+ai/8vECppBTb00tHnyFMMx6W1rAaQe+v214ihoaWK9iGrn8ZZsmgSxf3lwnrtGaibLdkonTtMrGsO+dA==",
-      "dependencies": {
-        "@zxing/library": "^0.19.1"
-      }
-    },
     "node_modules/vue-cli-plugin-i18n": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/vue-cli-plugin-i18n/-/vue-cli-plugin-i18n-1.0.1.tgz",
diff --git a/package.json b/package.json
index f190bb8f..b2caaa09 100644
--- a/package.json
+++ b/package.json
@@ -16,7 +16,7 @@
     "@capacitor/core": "^2.4.7",
     "@hotwax/app-version-info": "^1.0.0",
     "@hotwax/apps-theme": "^1.1.0",
-    "@hotwax/dxp-components": "^1.11.0",
+    "@hotwax/dxp-components": "^1.12.1",
     "@hotwax/oms-api": "^1.10.0",
     "@ionic/core": "6.7.5",
     "@ionic/vue": "6.7.5",
diff --git a/src/components/MissingSkuModal.vue b/src/components/MissingSkuModal.vue
index 4ee2db8e..98d8213d 100644
--- a/src/components/MissingSkuModal.vue
+++ b/src/components/MissingSkuModal.vue
@@ -43,7 +43,7 @@
         <ion-list v-if="segmentSelected === 'completed'">
           <ion-item v-for="item in getCompletedItems()" :key="item.shopifyProductSKU">
             <ion-thumbnail slot="start">
-              <ShopifyImg :src="item.imageUrl" size="small" />
+              <DxpShopifyImg :src="item.imageUrl" size="small" />
             </ion-thumbnail>
             <ion-label>
               <p class="overline">{{ item.parentProductName }}</p>
@@ -92,7 +92,7 @@ import { closeOutline, saveOutline } from 'ionicons/icons';
 import { defineComponent } from "@vue/runtime-core";
 import { mapGetters, useStore } from "vuex";
 import { ref } from "vue";
-import { ShopifyImg } from "@hotwax/dxp-components";
+import { DxpShopifyImg } from "@hotwax/dxp-components";
 
 export default defineComponent({
   name: "MissingSkuModal",
@@ -117,7 +117,7 @@ export default defineComponent({
   IonTitle,
   IonThumbnail,
   IonToolbar,
-  ShopifyImg
+  DxpShopifyImg
   },
   data(){
     return {
diff --git a/src/components/PurchaseOrderDetail.vue b/src/components/PurchaseOrderDetail.vue
index c4cabeed..1bdaeced 100644
--- a/src/components/PurchaseOrderDetail.vue
+++ b/src/components/PurchaseOrderDetail.vue
@@ -26,7 +26,7 @@
         <div class="list-item">
           <ion-item lines="none">
             <ion-thumbnail slot="start">
-              <ShopifyImg :src="item.imageUrl" size="small" />
+              <DxpShopifyImg :src="item.imageUrl" size="small" />
             </ion-thumbnail>
             <ion-label class="ion-text-wrap">
               <h3>{{ item.pseudoId }}</h3>
@@ -55,7 +55,7 @@
   </div>     
 </template>
 <script lang="ts"> 
-import { ShopifyImg } from "@hotwax/dxp-components";
+import { DxpShopifyImg } from "@hotwax/dxp-components";
 import {
   IonCheckbox,
   IonThumbnail,
@@ -82,7 +82,7 @@ export default defineComponent({
     IonIcon,
     IonItem,
     IonLabel,
-    ShopifyImg
+    DxpShopifyImg
   },
   props: {
     purchaseOrders: {
diff --git a/src/locales/en.json b/src/locales/en.json
index b7222b36..55cad8aa 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -12,6 +12,7 @@
   "Backorder": "Backorder",
   "Blank": "Blank",
   "Buffer days": "Buffer days",
+  "Built: ": "Built: {builtDateTime}",
   "Bulk adjustment": "Bulk adjustment",
   "Buffer quantity": "Buffer quantity",
   "cancel": "cancel",
@@ -168,6 +169,7 @@
   "Upload a file": "Upload a file",
   "Upload purchase order": "Upload purchase order",
   "Username": "Username",
+  "Version: ": "Version: {appVersion}",
   "View all date time formats supported by the HotWax Import app.": "View all date time formats supported by the HotWax Import app.",
   "View": "View",
   "Would you like to update your time zone to . Your profile is currently set to . This setting can always be changed from the settings menu.": "Would you like to update your time zone to {localTimeZone}. Your profile is currently set to {profileTimeZone}. This setting can always be changed from the settings menu."
diff --git a/src/locales/index.ts b/src/locales/index.ts
new file mode 100644
index 00000000..0102fa05
--- /dev/null
+++ b/src/locales/index.ts
@@ -0,0 +1,5 @@
+import en from './en.json';
+
+export default {
+  'en-US': en
+};
\ No newline at end of file
diff --git a/src/main.ts b/src/main.ts
index 3a0eae26..49febdf9 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -33,6 +33,7 @@ import logger from './logger';
 import { dxpComponents } from '@hotwax/dxp-components'
 import { login, logout, loader } from './user-utils';
 import { getConfig, initialise } from '@hotwax/oms-api';
+import localeMessages from './locales';
 
 const app = createApp(App)
   .use(IonicVue, {
@@ -51,7 +52,8 @@ const app = createApp(App)
     loader,
     appLoginUrl: process.env.VUE_APP_LOGIN_URL as string,
     getConfig,
-    initialise
+    initialise,
+    localeMessages
   });
 
 // Filters are removed in Vue 3 and global filter introduced https://v3.vuejs.org/guide/migration/filters.html#global-filters
diff --git a/src/views/InventoryReview.vue b/src/views/InventoryReview.vue
index 51150423..9274420b 100644
--- a/src/views/InventoryReview.vue
+++ b/src/views/InventoryReview.vue
@@ -58,7 +58,7 @@
           <div class="list-item">
             <ion-item lines="none">
               <ion-thumbnail slot="start">
-                <ShopifyImg :src="item.imageUrl" size="small" />
+                <DxpShopifyImg :src="item.imageUrl" size="small" />
               </ion-thumbnail>
               <ion-label class="ion-text-wrap">
                 <h3>{{ item.pseudoId }}</h3>
@@ -95,9 +95,8 @@
 </template>   
 <script lang="ts">
 import { UploadService } from "@/services/UploadService";
-import { ShopifyImg } from "@hotwax/dxp-components"; 
+import { DxpShopifyImg } from "@hotwax/dxp-components"; 
 import ProductPopover from '@/components/ProductPopover.vue'
-import BulkInventoryAdjustmentModal from '@/components/BulkInventoryAdjustmentModal.vue'
 import MissingFacilitiesModal from '@/components/MissingFacilitiesModal.vue'
 import { defineComponent } from 'vue';
 import { mapGetters, useStore } from "vuex";
@@ -110,7 +109,7 @@ import { businessOutline, calculatorOutline, chevronForwardOutline, ellipsisVert
 export default defineComponent({
   name: 'InventoryDetail',
   components: {
-    ShopifyImg,
+    DxpShopifyImg,
     IonCard,
     IonCardContent,
     IonPage,
diff --git a/src/views/Settings.vue b/src/views/Settings.vue
index 47c40d23..f52bd784 100644
--- a/src/views/Settings.vue
+++ b/src/views/Settings.vue
@@ -37,21 +37,12 @@
       </div>
 
       <section>
-        <OmsInstanceNavigator />
+        <DxpOmsInstanceNavigator />
       </section>
 
       <hr />
 
-      <div class="section-header">
-        <h1>
-          {{ $t('App') }}
-          <p class="overline" >{{ "Version: " + appVersion }}</p>
-        </h1>
-        <div class="ion-text-end">
-          <p class="overline">{{ "Built: " + getDateTime(appInfo.builtTime) }}</p>
-          <ion-button v-if="pwaState.updateExists" @click="refreshApp()" fill="outline" color="dark" size="small">{{ $t("Update") }}</ion-button>
-        </div>
-      </div>
+      <DxpAppVersionInfo />
       
       <section>
         <ion-card>
@@ -142,8 +133,6 @@ export default defineComponent({
       sampleDateTime: '',
       dateTimeFormat: '',
       defaultDateTimeFormat: process.env.VUE_APP_DATE_FORMAT ? process.env.VUE_APP_DATE_FORMAT : 'MM/dd/yyyy',
-      appInfo: (process.env.VUE_APP_VERSION_INFO ? JSON.parse(process.env.VUE_APP_VERSION_INFO) : {}) as any,
-      appVersion: ""
     };
   },
   computed: {
@@ -156,7 +145,6 @@ export default defineComponent({
   mounted(){
     this.dateTimeFormat = this.currentDateTimeFormat
     this.parseSampleDateTime();
-    this.appVersion = this.appInfo.branch ? (this.appInfo.branch + "-" + this.appInfo.revision) : this.appInfo.tag;
   },
   methods: {
     updateDateTimeFormat(){
@@ -184,14 +172,6 @@ export default defineComponent({
     },
     goToLaunchpad() {
       window.location.href = `${process.env.VUE_APP_LOGIN_URL}`
-    },
-    getDateTime(time: any) {
-      return DateTime.fromMillis(time).toLocaleString(DateTime.DATETIME_MED);
-    },
-    refreshApp() {
-      this.store.dispatch('user/updatePwaState', { registration: this.pwaState.registration, updateExists: false });
-      if (!this.pwaState.registration || !this.pwaState.registration.waiting) return
-      this.pwaState.registration.waiting.postMessage({ type: 'SKIP_WAITING' })
     }
   },
   setup(){
diff --git a/tsconfig.json b/tsconfig.json
index bc100c11..60af2769 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -6,6 +6,7 @@
     "jsx": "preserve",
     "importHelpers": true,
     "moduleResolution": "node",
+    "resolveJsonModule": true,
     "skipLibCheck": true,
     "esModuleInterop": true,
     "allowSyntheticDefaultImports": true,