diff --git a/.env.example b/.env.example
index 5ef8ad1..49567a8 100644
--- a/.env.example
+++ b/.env.example
@@ -1,27 +1,29 @@
-STORE_ENV=dev
-STORE_URL=http://localhost:3000
-NUXT_APP_ENV=development
-NUXT_APP_PORT=3000
-MAGENTO_GRAPHQL=https://{YOUR_SITE_FRONT_URL}/graphql
-MAGENTO_EXTERNAL_CHECKOUT=false
-MAGENTO_EXTERNAL_CHECKOUT_URL=https://{YOUR_SITE_FRONT_URL}
-MAGENTO_EXTERNAL_CHECKOUT_SYNC_PATH=/vue/cart/sync
-MAGENTO_BASE_URL={YOUR_SITE_FRONT_URL}
-IMAGE_PROVIDER={YOUR_IMAGE_PROVIDER}
-IMAGE_PROVIDER_BASE_URL={YOUR_IMAGE_PROVIDER_BASE_URL}
-MAGENTO_BASE_URL={YOUR_SITE_FRONT_URL}
-IMAGE_PROVIDER={YOUR_IMAGE_PROVIDER}
-IMAGE_PROVIDER_BASE_URL={YOUR_IMAGE_PROVIDER_BASE_URL}
-REDIS__HOST=127.0.0.1
-REDIS__PORT=6379
-REDIS_PASSWORD=
-REDIS__KEY_PREFIX=
-REDIS__CACHE_INVALIDATE_URL=/cache-invalidate
-REDIS__ENABLED=false
-RECAPTCHA_ENABLED=true
-RECAPTCHA_HIDE_BADGE=false
-RECAPTCHA_VERSION=3
-RECAPTCHA_SITE_KEY=
-RECAPTCHA_SECRET_KEY=
-RECAPTCHA_SIZE=invisible
-RECAPTCHA_MIN_SCORE=0.5
+VSF_NUXT_APP_ENV=development
+VSF_NUXT_APP_PORT=3000
+
+VSF_STORE_URL=http://localhost:3000
+
+VSF_MAGENTO_BASE_URL={YOUR_SITE_FRONT_URL}
+VSF_MAGENTO_GRAPHQL_URL=https://{YOUR_SITE_FRONT_URL}/graphql
+
+VSF_MAGENTO_EXTERNAL_CHECKOUT_ENABLED=false
+VSF_MAGENTO_EXTERNAL_CHECKOUT_URL=https://{YOUR_SITE_FRONT_URL}
+VSF_MAGENTO_EXTERNAL_CHECKOUT_SYNC_PATH=/vue/cart/sync
+
+VSF_IMAGE_PROVIDER=cloudinary
+VSF_IMAGE_PROVIDER_BASE_URL=https://res-4.cloudinary.com/{YOUR_ID}/image/upload/
+VSF_IMAGE_PROVIDER_DOMAIN=https://res-4.cloudinary.com
+
+VSF_REDIS_ENABLED=false
+VSF_REDIS_HOST=127.0.0.1
+VSF_REDIS_PORT=6379
+VSF_REDIS_KEY_PREFIX=
+VSF_REDIS_CACHE_INVALIDATE_URL=/cache-invalidate
+
+VSF_RECAPTCHA_ENABLED=false
+VSF_RECAPTCHA_SITE_KEY=
+VSF_RECAPTCHA_SECRET_KEY=
+VSF_RECAPTCHA_HIDE_BADGE=
+VSF_RECAPTCHA_SIZE=invisible
+VSF_RECAPTCHA_MIN_SCORE=0.5
+VSF_RECAPTCHA_VERSION=3
diff --git a/.gitignore b/.gitignore
index 0751876..a9a70a5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -93,6 +93,5 @@ sw.*
*.swp
version
-.env
-!config/example.json
-config/*.json
+.env.*
+!.env.example
diff --git a/.yarnrc.yml b/.yarnrc.yml
new file mode 100644
index 0000000..3186f3f
--- /dev/null
+++ b/.yarnrc.yml
@@ -0,0 +1 @@
+nodeLinker: node-modules
diff --git a/README.md b/README.md
index 348d406..c5247cf 100644
--- a/README.md
+++ b/README.md
@@ -2,16 +2,6 @@
-### Stay connected
-
-[](https://github.com/vuestorefront/vue-storefront)
-[](https://twitter.com/vuestorefront)
-[](https://www.youtube.com/c/VueStorefront)
-[](https://discord.vuestorefront.io)
-
-[](#contributors-)
-
-
# Magento 2.x theme
### Vue Storefront 2 integration with Magento
@@ -109,5 +99,4 @@ Thanks go to these wonderful people 🙌:
-
This project follows the [all-contributors](https://github.com/all-contributors/all-contributors) specification. Contributions of any kind welcome!
diff --git a/components/AppFooter.vue b/components/AppFooter.vue
index 1594992..1a0b304 100644
--- a/components/AppFooter.vue
+++ b/components/AppFooter.vue
@@ -72,7 +72,7 @@
import {
SfFooter, SfList, SfImage, SfMenuItem,
} from '@storefront-ui/vue';
-import { addBasePath } from '@vue-storefront/core';
+import { addBasePath } from '~/helpers/addBasePath';
export default {
components: {
diff --git a/components/AppHeader.vue b/components/AppHeader.vue
index caf4820..0c279e3 100644
--- a/components/AppHeader.vue
+++ b/components/AppHeader.vue
@@ -2,23 +2,14 @@
Your review was submitted!
{{ error.addReview }}
- {{ $t('You haven’t searched for items yet') }} -
-- {{ $t('Let’s start now – we’ll help you') }} -
-+
{{ userAddress.firstName }} {{ userAddress.lastName }}
{{ userAddress.street }}, {{ userAddress.streetNumber }}
@@ -19,32 +17,29 @@ > {{ userAddress.phone }} - {{ $t(isDefaultShippingText) }} {{ $t(isDefaultBillingText) }} - +