diff --git a/package-lock.json b/package-lock.json
index 0a647ae..fa10ac6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -13,7 +13,7 @@
         "@capacitor/ios": "^2.5.0",
         "@hotwax/app-version-info": "^1.0.0",
         "@hotwax/apps-theme": "^1.2.6",
-        "@hotwax/dxp-components": "^1.11.0",
+        "@hotwax/dxp-components": "^1.12.0",
         "@hotwax/oms-api": "^1.10.0",
         "@ionic/core": "~7.6.0",
         "@ionic/vue": "~7.6.0",
@@ -2795,68 +2795,22 @@
       "integrity": "sha512-zpUjGoY7LBlKeiP0V7tonrmoey8HQ5THQmyixQ+IDtrjmEJNBjynW/Ef3gC0FUNNPuVqxWPZdT5CVgaETLGTwg=="
     },
     "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": "6.7.5",
-      "resolved": "https://registry.npmjs.org/@ionic/core/-/core-6.7.5.tgz",
-      "integrity": "sha512-zRkRn+h/Vs3xt/EVgBdShMKDyeGOM4RU31NPF2icfu3CUTH+VrMV569MUnNjYvd1Lu2xK90pYy4TaicSWmC1Pw==",
-      "dependencies": {
-        "@stencil/core": "^2.18.0",
-        "ionicons": "^6.1.3",
-        "tslib": "^2.1.0"
-      }
-    },
-    "node_modules/@hotwax/dxp-components/node_modules/@ionic/vue": {
-      "version": "6.7.5",
-      "resolved": "https://registry.npmjs.org/@ionic/vue/-/vue-6.7.5.tgz",
-      "integrity": "sha512-6JBEaHCT2vVUzYqyfBiEUN8Wo7FezxY5Y3n+HGqI61J4qVay+8IxZRTYeX+O72QglbYOkzvfjE6SgS25oS+S9A==",
-      "dependencies": {
-        "@ionic/core": "6.7.5",
-        "ionicons": "^6.1.3"
-      }
-    },
-    "node_modules/@hotwax/dxp-components/node_modules/@stencil/core": {
-      "version": "2.22.3",
-      "resolved": "https://registry.npmjs.org/@stencil/core/-/core-2.22.3.tgz",
-      "integrity": "sha512-kmVA0M/HojwsfkeHsifvHVIYe4l5tin7J5+DLgtl8h6WWfiMClND5K3ifCXXI2ETDNKiEk21p6jql3Fx9o2rng==",
-      "bin": {
-        "stencil": "bin/stencil"
-      },
-      "engines": {
-        "node": ">=12.10.0",
-        "npm": ">=6.0.0"
-      }
-    },
-    "node_modules/@hotwax/dxp-components/node_modules/ionicons": {
-      "version": "6.1.3",
-      "resolved": "https://registry.npmjs.org/ionicons/-/ionicons-6.1.3.tgz",
-      "integrity": "sha512-ptzz38dd/Yq+PgjhXegh7yhb/SLIk1bvL9vQDtLv1aoSc7alO6mX2DIMgcKYzt9vrNWkRu1f9Jr78zIFFyOXqw==",
-      "dependencies": {
-        "@stencil/core": "^2.18.0"
-      }
-    },
-    "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",
@@ -3893,33 +3847,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",
diff --git a/package.json b/package.json
index a9aab0b..325c91e 100644
--- a/package.json
+++ b/package.json
@@ -17,7 +17,7 @@
     "@capacitor/ios": "^2.5.0",
     "@hotwax/app-version-info": "^1.0.0",
     "@hotwax/apps-theme": "^1.2.6",
-    "@hotwax/dxp-components": "^1.11.0",
+    "@hotwax/dxp-components": "^1.12.0",
     "@hotwax/oms-api": "^1.10.0",
     "@ionic/core": "~7.6.0",
     "@ionic/vue": "~7.6.0",
diff --git a/src/components/Picklist-detail-item.vue b/src/components/Picklist-detail-item.vue
index 4dd5a9d..c9646a5 100644
--- a/src/components/Picklist-detail-item.vue
+++ b/src/components/Picklist-detail-item.vue
@@ -1,7 +1,7 @@
 <template>
   <ion-item :id="picklistItem.id" :class="picklistItem.id === lastScannedId ? 'scanned-item' : '' " :key="picklistItem.id" v-for="picklistItem in picklistItems"  @click="picklistItem.isChecked = !picklistItem.isChecked" lines="none" >
     <ion-thumbnail slot="start">
-      <ShopifyImg :src="getProduct(picklistItem.productId).mainImageUrl" size="small" />
+      <DxpShopifyImg :src="getProduct(picklistItem.productId).mainImageUrl" size="small" />
     </ion-thumbnail>  
     <ion-checkbox v-if="picklistItem.statusId !== 'PICKLIST_COMPLETED' && picklistItem.statusId !== 'PICKLIST_PICKED'" :modelValue="picklistItem.isChecked">
       <ion-label>
@@ -19,7 +19,7 @@
 import { IonCheckbox, IonItem, IonLabel, IonThumbnail } from '@ionic/vue';
 import { computed, defineComponent } from 'vue';
 import { mapGetters, useStore } from 'vuex';
-import { getProductIdentificationValue, ShopifyImg, useProductIdentificationStore } from '@hotwax/dxp-components';
+import { getProductIdentificationValue, DxpShopifyImg, useProductIdentificationStore } from '@hotwax/dxp-components';
 
 export default defineComponent({
   name: 'PicklistDetailItem',
@@ -28,7 +28,7 @@ export default defineComponent({
     IonItem, 
     IonLabel,
     IonThumbnail,
-    ShopifyImg
+    DxpShopifyImg
   },
   props: ['picklistItems', 'lastScannedId'],
   computed: {
diff --git a/src/locales/en.json b/src/locales/en.json
index 92b3c41..9eab32f 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -44,13 +44,15 @@
   "Picklists": "Picklists",
   "Please allow camera access in your settings": "Please allow camera access in your settings",
   "product barcode": "product barcode",
+  "Primary": "Primary",
   "Product name": "Product name",
   "Product not found": "Product not found",
   "Product not found in remaining items": "Product not found in remaining items",
   "Reason:": "Reason:",
   "Scan": "Scan",
-  "Select all" : "Select all",
   "Search time zones": "Search time zones",
+  "Secondary": "Secondary",
+  "Select all" : "Select all",
   "Select time zone": "Select time zone",
   "Select facility": "Select facility",
   "Settings": "Settings",
diff --git a/src/views/Settings.vue b/src/views/Settings.vue
index 5d5b849..2c793fe 100644
--- a/src/views/Settings.vue
+++ b/src/views/Settings.vue
@@ -33,7 +33,7 @@
         <h1>{{ $t('OMS') }}</h1>
       </div>
       <section>
-        <OmsInstanceNavigator />
+        <DxpOmsInstanceNavigator />
 
         <ion-card>
           <ion-card-header>
@@ -60,7 +60,7 @@
         <p class="overline">{{ "Built: " + getDateTime(appInfo.builtTime) }}</p>
       </div>
       <section>
-        <ProductIdentifier />
+        <DxpProductIdentifier />
 
         <ion-card>
           <ion-card-header>