diff --git a/config/default.json b/config/default.json
index 7fa3a7245c..e5323cdc81 100644
--- a/config/default.json
+++ b/config/default.json
@@ -7,8 +7,11 @@
       "useOutputCacheTagging": false,
       "useOutputCache": false,
       "outputCacheDefaultTtl": 86400,
-      "availableCacheTags": ["product", "category", "home", "checkout", "page-not-found", "compare", "my-account", "P", "C"],
-      "invalidateCacheKey": "aeSu7aip"
+      "availableCacheTags": ["product", "category", "home", "checkout", "page-not-found", "compare", "my-account", "P", "C", "error"],
+      "invalidateCacheKey": "aeSu7aip",
+      "dynamicConfigReload": false,
+      "dynamicConfigExclude": ["ssr", "storeViews", "entities", "localForage", "shipping", "boost", "query"],
+      "dynamicConfigInclude": []
     },
     "console": {
       "verbosityLevel": "only-errors"
@@ -37,7 +40,7 @@
         "basic": "dist/index.basic.html"
       },
       "executeMixedinAsyncData": true,
-      "initialStateFilter": ["config", "__DEMO_MODE__", "version", "storeView"],
+      "initialStateFilter": ["__DEMO_MODE__", "version", "storeView"],
       "useInitialStateFilter": true
     },
     "defaultStoreCode": "",
diff --git a/core/app.ts b/core/app.ts
index abe406ec33..30935094fa 100755
--- a/core/app.ts
+++ b/core/app.ts
@@ -2,7 +2,7 @@ import Vue from 'vue'
 import { sync } from 'vuex-router-sync'
 import VueObserveVisibility from 'vue-observe-visibility'
 import { union } from 'lodash-es'
-import config from 'config'
+import buildTimeConfig from 'config'
 import VueLazyload from 'vue-lazyload'
 import Vuelidate from 'vuelidate'
 import Meta from 'vue-meta'
@@ -28,23 +28,63 @@ import { InMemoryCache } from 'apollo-cache-inmemory'
 import VueApollo from 'vue-apollo'
 
 import { takeOverConsole } from '@vue-storefront/core/helpers/log'
-if (config.console.verbosityLevel !== 'display-everything') {
-  takeOverConsole(config.console.verbosityLevel)
+if (buildTimeConfig.console.verbosityLevel !== 'display-everything') {
+  takeOverConsole(buildTimeConfig.console.verbosityLevel)
 }
 
-const httpLink = new HttpLink({
-    uri: config.server.protocol + '://' + config.graphql.host + ':' + config.graphql.port + '/graphql'
-})
-
-const apolloClient = new ApolloClient({
+export function createApp (ssrContext, config): { app: Vue, router: any, store: any } {
+  sync(store, router)
+  store.state.version = '1.4.0'
+  store.state.config = config
+  store.state.__DEMO_MODE__ = (config.demomode === true) ? true : false
+
+  if(ssrContext) Vue.prototype.$ssrRequestContext = ssrContext
+
+  if (!store.state.config) store.state.config = buildTimeConfig // if provided from SSR, don't replace it
+  const storeModules = Object.assign(coreModules, themeModules || {})
+  
+  for (const moduleName of Object.keys(storeModules)) {
+    console.debug('Registering Vuex module', moduleName)
+    store.registerModule(moduleName, storeModules[moduleName])
+  }
+  
+  const storeView = prepareStoreView(null) // prepare the default storeView
+  store.state.storeView = storeView
+  // store.state.shipping.methods = shippingMethods
+  
+  Vue.use(Vuelidate)
+  Vue.use(VueLazyload, {attempt: 2})
+  Vue.use(Meta)
+  Vue.use(VueObserveVisibility)
+  
+  require('theme/plugins')
+  const pluginsObject = plugins()
+  Object.keys(pluginsObject).forEach(key => {
+    Vue.use(pluginsObject[key])
+  })
+  
+  const mixinsObject = mixins()
+  Object.keys(mixinsObject).forEach(key => {
+    Vue.mixin(mixinsObject[key])
+  })
+  
+  const filtersObject = filters()
+  Object.keys(filtersObject).forEach(key => {
+    Vue.filter(key, filtersObject[key])
+  })
+  const httpLink = new HttpLink({
+    uri: store.state.config.server.protocol + '://' + store.state.config.graphql.host + ':' + store.state.config.graphql.port + '/graphql'
+  })
+  
+  const apolloClient = new ApolloClient({
     link: httpLink,
     cache: new InMemoryCache(),
     connectToDevTools: true
-})
-
-let loading = 0
-
-const apolloProvider = new VueApollo({
+  })
+  
+  let loading = 0
+  
+  const apolloProvider = new VueApollo({
     clients: {
         a: apolloClient
     },
@@ -60,49 +100,10 @@ const apolloProvider = new VueApollo({
         console.log('Global error handler')
         console.error(error)
     }
-})
-
-Vue.use(VueApollo)
-// End declare Apollo graphql client
-
-store.state.version = '1.3.0'
-store.state.__DEMO_MODE__ = (config.demomode === true) ? true : false
-store.state.config = config
-
-const storeModules = Object.assign(coreModules, themeModules || {})
-
-for (const moduleName of Object.keys(storeModules)) {
-  console.debug('Registering Vuex module', moduleName)
-  store.registerModule(moduleName, storeModules[moduleName])
-}
-
-const storeView = prepareStoreView(null) // prepare the default storeView
-store.state.storeView = storeView
-// store.state.shipping.methods = shippingMethods
-
-Vue.use(Vuelidate)
-Vue.use(VueLazyload, {attempt: 2})
-Vue.use(Meta)
-Vue.use(VueObserveVisibility)
-
-require('theme/plugins')
-const pluginsObject = plugins()
-Object.keys(pluginsObject).forEach(key => {
-  Vue.use(pluginsObject[key])
-})
-
-const mixinsObject = mixins()
-Object.keys(mixinsObject).forEach(key => {
-  Vue.mixin(mixinsObject[key])
-})
-
-const filtersObject = filters()
-Object.keys(filtersObject).forEach(key => {
-  Vue.filter(key, filtersObject[key])
-})
-
-export function createApp (serverContext = null): { app: Vue, router: any, store: any } {
-  sync(store, router)
+  })
+  
+  Vue.use(VueApollo)
+  // End declare Apollo graphql client    
   const app = new Vue({
     router,
     store,
@@ -115,11 +116,10 @@ export function createApp (serverContext = null): { app: Vue, router: any, store
     app,
     router,
     store,
-    config,
-    serverContext
+    store.state.config,
+    ssrContext
   )
-
-  registerTheme(config.theme, app, router, store)
+  registerTheme(buildTimeConfig.theme, app, router, store, store.state.config, ssrContext)
 
   app.$emit('application-after-init', app)
 
diff --git a/core/client-entry.ts b/core/client-entry.ts
index ad421e4b56..241fbf9fcb 100755
--- a/core/client-entry.ts
+++ b/core/client-entry.ts
@@ -5,6 +5,7 @@ import { union } from 'lodash-es'
 import { createApp } from '@vue-storefront/core/app'
 import EventBus from '@vue-storefront/core/plugins/event-bus'
 
+import buildTimeConfig from 'config'
 import { execute } from '@vue-storefront/store/lib/task'
 import UniversalStorage from '@vue-storefront/store/lib/storage'
 import i18n from '@vue-storefront/i18n'
@@ -15,14 +16,12 @@ require('@vue-storefront/core/service-worker-registration') // register the serv
 
 declare var window: any
 
-const { app, router, store } = createApp()
-
-const config = store.state.config
+const config = Object.assign(buildTimeConfig, window.__INITIAL_STATE__.config ? window.__INITIAL_STATE__.config : buildTimeConfig)
+const { app, router, store } = createApp(null, config)
 
 let storeCode = null // select the storeView by prefetched vuex store state (prefetched serverside)
 if (window.__INITIAL_STATE__) {
-  store.replaceState(Object.assign({}, store.state, window.__INITIAL_STATE__))
-  store.state.requestContext.outputCacheTags = new Set<string>()
+  store.replaceState(Object.assign({}, store.state, window.__INITIAL_STATE__, { config: buildTimeConfig }))
 }
 if (config.storeViews.multistore === true) {
   if ((storeCode = store.state.user.current_storecode)) {
@@ -64,7 +63,7 @@ function _ssrHydrateSubcomponents (components, next, to) {
 }
 router.onReady(() => {
   router.beforeResolve((to, from, next) => {
-    store.state.requestContext.outputCacheTags = new Set<string>()
+    if (Vue.prototype.$ssrRequestContext) Vue.prototype.$ssrRequestContext.output.cacheTags = new Set<string>()
     const matched = router.getMatchedComponents(to)
     const prevMatched = router.getMatchedComponents(from)
     if (to) { // this is from url
diff --git a/core/components/ProductBundleOptions.js b/core/components/ProductBundleOptions.js
index bbb28d3fe7..7642fcb9c1 100644
--- a/core/components/ProductBundleOptions.js
+++ b/core/components/ProductBundleOptions.js
@@ -2,7 +2,6 @@ import { mapMutations } from 'vuex'
 import * as types from '@vue-storefront/store/mutation-types'
 import rootStore from '@vue-storefront/store'
 import i18n from '@vue-storefront/i18n'
-import config from 'config'
 
 function _defaultOptionValue (co, field = 'id') {
   if (co.product_links && co.product_links.length) {
@@ -51,12 +50,12 @@ export default {
 
     this.setupInputFields()
 
-    if (config.usePriceTiers) {
+    if (rootStore.state.config.usePriceTiers) {
       this.$bus.$on('product-after-setup-associated', this.setupInputFields)
     }
   },
   beforeDestroy () {
-    if (config.usePriceTiers) {
+    if (rootStore.state.usePriceTiers) {
       this.$bus.$off('product-after-setup-associated', this.setupInputFields)
     }
   },
diff --git a/core/components/ProductGallery.js b/core/components/ProductGallery.js
index 5662bb6c1e..d268956558 100644
--- a/core/components/ProductGallery.js
+++ b/core/components/ProductGallery.js
@@ -1,6 +1,6 @@
 import { Carousel, Slide } from 'vue-carousel'
 import VueOffline from 'vue-offline'
-import config from 'config'
+import store from '@vue-storefront/store'
 
 export default {
   name: 'ProductGallery',
@@ -60,8 +60,8 @@ export default {
       }
     },
     selectVariant () {
-      if (config.products.gallery.mergeConfigurableChildren) {
-        let option = this.configuration[config.products.gallery.variantsGroupAttribute]
+      if (store.state.config.products.gallery.mergeConfigurableChildren) {
+        let option = this.configuration[store.state.config.products.gallery.variantsGroupAttribute]
         if (typeof option !== 'undefined' && option !== null) {
           let index = this.gallery.findIndex(obj => obj.id && Number(obj.id) === Number(option.id))
           this.navigate(index)
diff --git a/core/components/SortBy.js b/core/components/SortBy.js
index 51cdde83dc..05cdd60218 100644
--- a/core/components/SortBy.js
+++ b/core/components/SortBy.js
@@ -1,4 +1,4 @@
-import config from 'config'
+import store from '@vue-storefront/store'
 export default {
   name: 'SortBy',
   data () {
@@ -18,7 +18,7 @@ export default {
   },
   computed: {
     sortByAttribute () {
-      return config.products.sortByAttributes
+      return store.state.config.products.sortByAttributes
     }
   }
 }
diff --git a/core/components/blocks/Footer/Footer.js b/core/components/blocks/Footer/Footer.js
index 7c24fcab22..9df932a3fc 100644
--- a/core/components/blocks/Footer/Footer.js
+++ b/core/components/blocks/Footer/Footer.js
@@ -1,10 +1,10 @@
-import config from 'config'
+import rootStore from '@vue-storefront/store'
 
 export default {
   name: 'MainFooter',
   computed: {
     multistoreEnabled () {
-      return config.storeViews.multistore
+      return rootStore.state.config.storeViews.multistore
     }
   }
 }
diff --git a/core/lib/extensions.js b/core/lib/extensions.js
index 2c0cfdd2b1..967643fc53 100644
--- a/core/lib/extensions.js
+++ b/core/lib/extensions.js
@@ -1,8 +1,8 @@
-export default function registerExtensions (extensions, app, router, store, config, serverContext = null) {
+export default function registerExtensions (extensions, app, router, store, config, ssrContext = null) {
   for (let extEntryPoint of extensions) {
     if (extEntryPoint !== null) {
       if (extEntryPoint.default) extEntryPoint = extEntryPoint.default
-      let extDescriptor = extEntryPoint(app, router, store, config, serverContext) // register module
+      let extDescriptor = extEntryPoint(app, router, store, config, ssrContext) // register module
       if (extDescriptor != null) {
         console.debug('Loaded', extDescriptor.EXTENSION_KEY)
         app.$emit('application-after-registerExtensions', extDescriptor)
diff --git a/core/lib/themes.js b/core/lib/themes.js
index 99c3800e47..5a206f342b 100644
--- a/core/lib/themes.js
+++ b/core/lib/themes.js
@@ -30,10 +30,10 @@ export function extendStore (coreStore, extendStore) {
   return merge(coreStore, extendStore)
 }
 
-export function registerTheme (themeName, app, routes, store) {
+export function registerTheme (themeName, app, routes, store, config, ssrContext) {
   let themeEntryPoint = require('theme/index.js')
   if (themeEntryPoint != null && themeEntryPoint.hasOwnProperty('default')) {
-    themeEntryPoint.default(app, routes, store) // register theme
+    themeEntryPoint.default(app, routes, store, config, ssrContext) // register theme
   } else {
     throw new Error('Wrong theme name: ' + themeName)
   }
diff --git a/core/mixins/thumbnail/index.js b/core/mixins/thumbnail/index.js
index 991bc7aa61..6cf8446370 100644
--- a/core/mixins/thumbnail/index.js
+++ b/core/mixins/thumbnail/index.js
@@ -1,4 +1,4 @@
-import config from 'config'
+import store from '@vue-storefront/store'
 
 export const thumbnail = {
   methods: {
@@ -9,7 +9,7 @@ export const thumbnail = {
      * @param {Int} height
      */
     getThumbnail (relativeUrl, width, height) {
-      return relativeUrl && relativeUrl.indexOf('no_selection') < 0 ? `${config.images.baseUrl}${parseInt(width)}/${parseInt(height)}/resize${relativeUrl}` : config.images.productPlaceholder || ''
+      return relativeUrl && relativeUrl.indexOf('no_selection') < 0 ? `${store.state.config.images.baseUrl}${parseInt(width)}/${parseInt(height)}/resize${relativeUrl}` : store.state.config.images.productPlaceholder || ''
     }
   }
 }
diff --git a/core/modules/offline-order/features/cancelOrders.ts b/core/modules/offline-order/features/cancelOrders.ts
index 14a7d46e34..5867d98957 100644
--- a/core/modules/offline-order/features/cancelOrders.ts
+++ b/core/modules/offline-order/features/cancelOrders.ts
@@ -7,7 +7,7 @@
  * Part of [Offline order API Module](https://github.com/DivanteLtd/vue-storefront/tree/master/doc/api-modules)
  */
 import * as localForage from 'localforage'
-import config from 'config'
+import store from '@vue-storefront/store'
 
 import EventBus from '@vue-storefront/core/plugins/event-bus'
 import UniversalStorage from '@vue-storefront/store/lib/storage'
@@ -18,7 +18,7 @@ export const cancelOrders = {
       const ordersCollection = new UniversalStorage(localForage.createInstance({
         name: 'shop',
         storeName: 'orders',
-        driver: localForage[config.localForage.defaultDrivers['orders']]
+        driver: localForage[store.state.config.localForage.defaultDrivers['orders']]
       }))
 
       ordersCollection.iterate((order, id, iterationNumber) => {
diff --git a/core/modules/offline-order/features/confirmOrders.ts b/core/modules/offline-order/features/confirmOrders.ts
index 408558dc89..72f67acee1 100644
--- a/core/modules/offline-order/features/confirmOrders.ts
+++ b/core/modules/offline-order/features/confirmOrders.ts
@@ -7,13 +7,13 @@
  * Part of [Offline order API Module](https://github.com/DivanteLtd/vue-storefront/tree/master/doc/api-modules)
  */
 import EventBus from '@vue-storefront/core/plugins/event-bus'
-import config from 'config'
+import store from '@vue-storefront/store'
 
 export const confirmOrders = {
   methods: {
     confirmOrders () {
-      EventBus.$emit('order/PROCESS_QUEUE', { config: config })
-      EventBus.$emit('sync/PROCESS_QUEUE', { config: config })
+      EventBus.$emit('order/PROCESS_QUEUE', { config: store.state.config })
+      EventBus.$emit('sync/PROCESS_QUEUE', { config: store.state.config })
       this.$store.dispatch('cart/load')
       EventBus.$emit('modal-hide', 'modal-order-confirmation')
     }
diff --git a/core/modules/offline-order/helpers/onNetworkStatusChange.ts b/core/modules/offline-order/helpers/onNetworkStatusChange.ts
index 343ef83a6f..1609b5677c 100644
--- a/core/modules/offline-order/helpers/onNetworkStatusChange.ts
+++ b/core/modules/offline-order/helpers/onNetworkStatusChange.ts
@@ -1,5 +1,5 @@
 import * as localForage from 'localforage'
-import config from 'config'
+import store from '@vue-storefront/store'
 
 import EventBus from '@vue-storefront/core/plugins/event-bus'
 
@@ -10,11 +10,11 @@ export function onNetworkStatusChange (store) {
   console.log('Are we online: ' + navigator.onLine)
 
   if (typeof navigator !== 'undefined' && navigator.onLine) {
-    EventBus.$emit('sync/PROCESS_QUEUE', { config: config }) // process checkout queue
+    EventBus.$emit('sync/PROCESS_QUEUE', { config: store.state.config }) // process checkout queue
     store.dispatch('cart/load')
 
-    if (config.orders.offline_orders.automatic_transmission_enabled || store.getters['checkout/isThankYouPage']) {
-      EventBus.$emit('order/PROCESS_QUEUE', { config: config }) // process checkout queue
+    if (store.state.config.orders.offline_orders.automatic_transmission_enabled || store.getters['checkout/isThankYouPage']) {
+      EventBus.$emit('order/PROCESS_QUEUE', { config: store.state.config }) // process checkout queue
       // store.dispatch('cart/serverPull', { forceClientState: false })
     } else {
       const ordersToConfirm = []
@@ -22,7 +22,7 @@ export function onNetworkStatusChange (store) {
       const ordersCollection = new UniversalStorage(localForage.createInstance({
         name: 'shop',
         storeName: 'orders',
-        driver: localForage[config.localForage.defaultDrivers['orders']]
+        driver: localForage[store.state.config.localForage.defaultDrivers['orders']]
       }))
 
       ordersCollection.iterate((order, id, iterationNumber) => {
diff --git a/core/modules/product/queries/common.js b/core/modules/product/queries/common.js
index 5b69c0dee7..dc487bbec1 100644
--- a/core/modules/product/queries/common.js
+++ b/core/modules/product/queries/common.js
@@ -1,20 +1,20 @@
 import SearchQuery from 'core/store/lib/search/searchQuery'
-import config from 'config'
+import store from '@vue-storefront/store'
 
 export function prepareQuery ({queryText = '', filters = [], queryConfig = ''}) {
   let query = new SearchQuery()
   // prepare filters and searchText
   if (filters.length === 0 && queryConfig !== '') {
     // try get filters from config
-    if (config.hasOwnProperty('query') && config.query.hasOwnProperty(queryConfig) && config.query[queryConfig].hasOwnProperty('filter')) {
-      filters = config.query[queryConfig].filter
+    if (store.state.config.hasOwnProperty('query') && store.state.config.query.hasOwnProperty(queryConfig) && store.state.config.query[queryConfig].hasOwnProperty('filter')) {
+      filters = store.state.config.query[queryConfig].filter
     }
   }
 
   if (queryText === '') {
     // try to get searchText from config
-    if (config.hasOwnProperty('query') && config.query.hasOwnProperty(queryConfig) && config.query[queryConfig].hasOwnProperty('searchText')) {
-      queryText = config.query[queryConfig].searchText
+    if (store.state.config.hasOwnProperty('query') && store.state.config.query.hasOwnProperty(queryConfig) && store.state.config.query[queryConfig].hasOwnProperty('searchText')) {
+      queryText = store.state.config.query[queryConfig].searchText
     }
   }
 
diff --git a/core/modules/product/queries/related.js b/core/modules/product/queries/related.js
index d12ef2c0a2..d3246a9fe1 100644
--- a/core/modules/product/queries/related.js
+++ b/core/modules/product/queries/related.js
@@ -1,5 +1,5 @@
 import SearchQuery from 'core/store/lib/search/searchQuery'
-import config from 'config'
+import store from '@vue-storefront/store'
 
 export function prepareRelatedQuery (key, sku) {
   let relatedProductsQuery = new SearchQuery()
@@ -10,7 +10,7 @@ export function prepareRelatedQuery (key, sku) {
     .applyFilter({key: 'visibility', value: {'in': [2, 3, 4]}})
     .applyFilter({key: 'status', value: {'in': [0, 1, 2]}}) // @TODO Check if status 2 (disabled) was set not by occasion here
 
-  if (config.products.listOutOfStockProducts === false) {
+  if (store.state.config.products.listOutOfStockProducts === false) {
     relatedProductsQuery = relatedProductsQuery.applyFilter({key: 'stock.is_in_stock', value: {'eq': true}})
   }
 
diff --git a/core/modules/product/queries/searchPanel.js b/core/modules/product/queries/searchPanel.js
index 3dd7363545..8d03f46fb5 100644
--- a/core/modules/product/queries/searchPanel.js
+++ b/core/modules/product/queries/searchPanel.js
@@ -1,5 +1,5 @@
 import SearchQuery from 'core/store/lib/search/searchQuery'
-import config from 'config'
+import store from '@vue-storefront/store'
 
 export function prepareQuickSearchQuery (queryText) {
   let searchQuery = new SearchQuery()
@@ -9,7 +9,7 @@ export function prepareQuickSearchQuery (queryText) {
     .applyFilter({key: 'visibility', value: {'in': [3, 4]}})
     .applyFilter({key: 'status', value: {'in': [0, 1]}})/* 2 = disabled, 3 = out of stock */
 
-  if (config.products.listOutOfStockProducts === false) {
+  if (store.state.config.products.listOutOfStockProducts === false) {
     searchQuery = searchQuery.applyFilter({key: 'stock.is_in_stock', value: {'eq': true}})
   }
 
diff --git a/core/pages/Category.js b/core/pages/Category.js
index 15d0d5d794..c6d1bfe63d 100644
--- a/core/pages/Category.js
+++ b/core/pages/Category.js
@@ -1,7 +1,7 @@
 import Vue from 'vue'
 import toString from 'lodash-es/toString'
 
-import config from 'config'
+import store from '@vue-storefront/store'
 import EventBus from '@vue-storefront/core/plugins/event-bus'
 import { baseFilterProductsQuery, buildFilterProductsQuery } from '@vue-storefront/store/helpers'
 import { htmlDecode } from '@vue-storefront/core/filters/html-decode'
@@ -71,22 +71,22 @@ export default {
       route: route,
       current: 0,
       perPage: 50,
-      sort: config.entities.productList.sort,
-      filters: config.products.defaultFilters,
-      includeFields: config.entities.optimize && Vue.prototype.$isServer ? config.entities.productList.includeFields : null,
-      excludeFields: config.entities.optimize && Vue.prototype.$isServer ? config.entities.productList.excludeFields : null,
+      sort: store.state.config.entities.productList.sort,
+      filters: store.state.config.products.defaultFilters,
+      includeFields: store.state.config.entities.optimize && Vue.prototype.$isServer ? store.state.config.entities.productList.includeFields : null,
+      excludeFields: store.state.config.entities.optimize && Vue.prototype.$isServer ? store.state.config.entities.productList.excludeFields : null,
       append: false
     }
   },
-  asyncData ({ store, route }) { // this is for SSR purposes to prefetch data
+  asyncData ({ store, route, context }) { // this is for SSR purposes to prefetch data
     return new Promise((resolve, reject) => {
       console.log('Entering asyncData for Category root ' + new Date())
-      store.state.requestContext.outputCacheTags.add(`category`)
-      const defaultFilters = config.products.defaultFilters
-      store.dispatch('category/list', { includeFields: config.entities.optimize && Vue.prototype.$isServer ? config.entities.category.includeFields : null }).then((categories) => {
+      if (context) context.output.cacheTags.add(`category`)
+      const defaultFilters = store.state.config.products.defaultFilters
+      store.dispatch('category/list', { includeFields: store.state.config.entities.optimize && Vue.prototype.$isServer ? store.state.config.entities.category.includeFields : null }).then((categories) => {
         store.dispatch('attribute/list', { // load filter attributes for this specific category
           filterValues: defaultFilters, // TODO: assign specific filters/ attribute codes dynamicaly to specific categories
-          includeFields: config.entities.optimize && Vue.prototype.$isServer ? config.entities.attribute.includeFields : null
+          includeFields: store.state.config.entities.optimize && Vue.prototype.$isServer ? store.state.config.entities.attribute.includeFields : null
         }).catch(err => {
           console.error(err)
           reject(err)
@@ -126,7 +126,7 @@ export default {
   beforeMount () {
     this.$bus.$on('filter-changed-category', this.onFilterChanged)
     this.$bus.$on('list-change-sort', this.onSortOrderChanged)
-    if (config.usePriceTiers) {
+    if (store.state.config.usePriceTiers) {
       this.$bus.$on('user-after-loggedin', this.onUserPricesRefreshed)
       this.$bus.$on('user-after-logout', this.onUserPricesRefreshed)
     }
@@ -139,7 +139,7 @@ export default {
   beforeDestroy () {
     this.$bus.$off('list-change-sort', this.onSortOrderChanged)
     this.$bus.$off('filter-changed-category', this.onFilterChanged)
-    if (config.usePriceTiers) {
+    if (store.state.config.usePriceTiers) {
       this.$bus.$off('user-after-loggedin', this.onUserPricesRefreshed)
       this.$bus.$off('user-after-logout', this.onUserPricesRefreshed)
     }
@@ -216,7 +216,7 @@ export default {
           this.$router.push('/')
         } else {
           this.pagination.current = 0
-          let searchProductQuery = baseFilterProductsQuery(this.$store.state.category.current, config.products.defaultFilters)
+          let searchProductQuery = baseFilterProductsQuery(this.$store.state.category.current, store.state.config.products.defaultFilters)
           this.$bus.$emit('current-category-changed', this.$store.state.category.current_path)
           let query = this.$store.state.category.current_product_query
           query = Object.assign(query, { // base prototype from the asyncData is being used here
@@ -236,7 +236,7 @@ export default {
       })
     },
     onUserPricesRefreshed () {
-      const defaultFilters = config.products.defaultFilters
+      const defaultFilters = store.state.config.products.defaultFilters
       this.$store.dispatch('category/single', {
         key: 'slug',
         value: this.$route.params.slug
diff --git a/core/pages/Checkout.js b/core/pages/Checkout.js
index 48cf66c5bf..e9f57e82d4 100644
--- a/core/pages/Checkout.js
+++ b/core/pages/Checkout.js
@@ -1,6 +1,6 @@
 import Vue from 'vue'
 import i18n from '@vue-storefront/i18n'
-import config from 'config'
+import store from '@vue-storefront/store'
 import VueOfflineMixin from 'vue-offline/mixin'
 
 import Composite from '@vue-storefront/core/mixins/composite'
@@ -268,8 +268,8 @@ export default {
     // This method checks if there exists a mapping of chosen payment method to one of Magento's payment methods.
     getPaymentMethod () {
       let paymentMethod = this.payment.paymentMethod
-      if (config.orders.payment_methods_mapping.hasOwnProperty(paymentMethod)) {
-        paymentMethod = config.orders.payment_methods_mapping[paymentMethod]
+      if (store.state.config.orders.payment_methods_mapping.hasOwnProperty(paymentMethod)) {
+        paymentMethod = store.state.config.orders.payment_methods_mapping[paymentMethod]
       }
       return paymentMethod
     },
@@ -357,9 +357,9 @@ export default {
       meta: this.$route.meta.description ? [{ vmid: 'description', description: this.$route.meta.description }] : []
     }
   },
-  asyncData ({ store, route }) { // this is for SSR purposes to prefetch data
+  asyncData ({ store, route, context }) { // this is for SSR purposes to prefetch data
     return new Promise((resolve, reject) => {
-      store.state.requestContext.outputCacheTags.add(`checkout`)
+      if (context) context.output.cacheTags.add(`checkout`)
       resolve()
     })
   }
diff --git a/core/pages/Compare.js b/core/pages/Compare.js
index 114612990e..aa61987eb9 100644
--- a/core/pages/Compare.js
+++ b/core/pages/Compare.js
@@ -42,9 +42,9 @@ export default {
       meta: this.$route.meta.description ? [{ vmid: 'description', description: this.$route.meta.description }] : []
     }
   },
-  asyncData ({ store, route }) { // this is for SSR purposes to prefetch data
+  asyncData ({ store, route, context }) { // this is for SSR purposes to prefetch data
     return new Promise((resolve, reject) => {
-      store.state.requestContext.outputCacheTags.add(`compare`)
+      if (context) context.output.cacheTags.add(`compare`)
       resolve()
     })
   }
diff --git a/core/pages/Error.js b/core/pages/Error.js
new file mode 100644
index 0000000000..9fd66c0fac
--- /dev/null
+++ b/core/pages/Error.js
@@ -0,0 +1,21 @@
+import i18n from '@vue-storefront/i18n'
+import Composite from '@vue-storefront/core/mixins/composite'
+
+export default {
+  name: 'Error',
+  mixins: [Composite],
+  asyncData ({ store, route, context }) { // this is for SSR purposes to prefetch data
+    return new Promise((resolve, reject) => {
+      console.log('Entering asyncData for Error page ' + new Date())
+      if (context) {
+        context.output.cacheTags.add(`error`)
+      }
+    })
+  },
+  metaInfo () {
+    return {
+      title: this.$route.meta.title || i18n.t('Internal Server Error 500'),
+      meta: this.$route.meta.description ? [{ vmid: 'description', description: this.$route.meta.description }] : []
+    }
+  }
+}
diff --git a/core/pages/Home.js b/core/pages/Home.js
index 8c3cc3f115..6fbc6670ec 100644
--- a/core/pages/Home.js
+++ b/core/pages/Home.js
@@ -13,9 +13,9 @@ export default {
       rootCategories: 'category/list'
     })
   },
-  asyncData ({ store, route }) { // this is for SSR purposes to prefetch data
+  asyncData ({ store, route, context }) { // this is for SSR purposes to prefetch data
     return new Promise((resolve, reject) => {
-      store.state.requestContext.outputCacheTags.add(`home`)
+      if (context) context.output.cacheTags.add(`home`)
       console.log('Entering asyncData for Home root ' + new Date())
       EventBus.$emitFilter('home-after-load', { store: store, route: route }).then((results) => {
         return resolve()
diff --git a/core/pages/MyAccount.js b/core/pages/MyAccount.js
index b5eecd50f0..6f48e227aa 100644
--- a/core/pages/MyAccount.js
+++ b/core/pages/MyAccount.js
@@ -67,9 +67,9 @@ export default {
       meta: this.$route.meta.description ? [{ vmid: 'description', description: this.$route.meta.description }] : []
     }
   },
-  asyncData ({ store, route }) { // this is for SSR purposes to prefetch data
+  asyncData ({ store, route, context }) { // this is for SSR purposes to prefetch data
     return new Promise((resolve, reject) => {
-      store.state.requestContext.outputCacheTags.add(`my-account`)
+      if (context) context.output.cacheTags.add(`my-account`)
       resolve()
     })
   }
diff --git a/core/pages/PageNotFound.js b/core/pages/PageNotFound.js
index e841e6a469..230f46e443 100644
--- a/core/pages/PageNotFound.js
+++ b/core/pages/PageNotFound.js
@@ -8,10 +8,10 @@ import Composite from '@vue-storefront/core/mixins/composite'
 export default {
   name: 'PageNotFound',
   mixins: [Composite],
-  asyncData ({ store, route }) { // this is for SSR purposes to prefetch data
+  asyncData ({ store, route, context }) { // this is for SSR purposes to prefetch data
     return new Promise((resolve, reject) => {
       console.log('Entering asyncData for PageNotFound ' + new Date())
-      store.state.requestContext.outputCacheTags.add(`page-not-found`)
+      if (context) context.output.cacheTags.add(`page-not-found`)
       let ourBestsellersQuery = prepareQuery({ queryConfig: 'bestSellers' })
       store.dispatch('category/list', {}).then(categories => {
         store.dispatch('product/list', {
diff --git a/core/pages/Product.js b/core/pages/Product.js
index dd0f164f62..3155ec5936 100644
--- a/core/pages/Product.js
+++ b/core/pages/Product.js
@@ -1,7 +1,7 @@
 import { mapGetters } from 'vuex'
 
 import i18n from '@vue-storefront/i18n'
-import config from 'config'
+import store from '@vue-storefront/store'
 import EventBus from '@vue-storefront/core/plugins/event-bus'
 import { htmlDecode, stripHTML } from '@vue-storefront/core/filters'
 import { currentStoreView } from '@vue-storefront/store/lib/multistore'
@@ -61,9 +61,9 @@ export default {
       return currentStoreView()
     }
   },
-  asyncData ({ store, route }) { // this is for SSR purposes to prefetch data
+  asyncData ({ store, route, context }) { // this is for SSR purposes to prefetch data
     EventBus.$emit('product-before-load', { store: store, route: route })
-    store.state.requestContext.outputCacheTags.add(`product`)
+    if (context) context.output.cacheTags.add(`product`)
     return store.dispatch('product/fetchAsync', { parentSku: route.params.parentSku, childSku: route && route.params && route.params.childSku ? route.params.childSku : null })
   },
   watch: {
@@ -75,7 +75,7 @@ export default {
     this.$bus.$off('product-after-priceupdate', this.onAfterPriceUpdate)
     this.$bus.$off('product-after-customoptions')
     this.$bus.$off('product-after-bundleoptions')
-    if (config.usePriceTiers) {
+    if (store.state.usePriceTiers) {
       this.$bus.$off('user-after-loggedin', this.onUserPricesRefreshed)
       this.$bus.$off('user-after-logout', this.onUserPricesRefreshed)
     }
@@ -86,7 +86,7 @@ export default {
     this.$bus.$on('filter-changed-product', this.onAfterFilterChanged)
     this.$bus.$on('product-after-customoptions', this.onAfterCustomOptionsChanged)
     this.$bus.$on('product-after-bundleoptions', this.onAfterBundleOptionsChanged)
-    if (config.usePriceTiers) {
+    if (store.state.config.usePriceTiers) {
       this.$bus.$on('user-after-loggedin', this.onUserPricesRefreshed)
       this.$bus.$on('user-after-logout', this.onUserPricesRefreshed)
     }
@@ -181,7 +181,7 @@ export default {
         selectDefaultVariant: true,
         fallbackToDefaultWhenNoAvailable: false
       }).then((selectedVariant) => {
-        if (config.products.setFirstVarianAsDefaultInURL) {
+        if (store.state.config.products.setFirstVarianAsDefaultInURL) {
           this.$router.push({params: { childSku: selectedVariant.sku }})
         }
         if (!selectedVariant) {
diff --git a/core/plugins/config/index.js b/core/plugins/config/index.js
index f1f8989881..b1c8a45502 100644
--- a/core/plugins/config/index.js
+++ b/core/plugins/config/index.js
@@ -1,4 +1,5 @@
-import config from 'config'
+import store from '@vue-storefront/store'
+const config = store.state.config
 
 const ConfigPlugin = {
   install (Vue) {
diff --git a/core/scripts/server.js b/core/scripts/server.js
index 4f82eb18f3..c31422d306 100755
--- a/core/scripts/server.js
+++ b/core/scripts/server.js
@@ -3,7 +3,7 @@ const path = require('path')
 const express = require('express')
 const rootPath = require('app-root-path').path
 const resolve = file => path.resolve(rootPath, file)
-const config = require('config')
+let config = require('config')
 const TagCache = require('redis-tag-cache').default
 const utils = require('./server/utils')
 const compile = require('lodash.template')
@@ -126,9 +126,7 @@ app.get('*', (req, res, next) => {
     if (err && err.code === 404) {
       res.redirect('/page-not-found')
     } else {
-      // Render Error Page or Redirect
-      // TODO: Add error page handler
-      res.status(500).end('500 | Internal Server Error. Check Server console for details.')
+      res.redirect('/error')
       console.error(`Error during render : ${req.url}`)
       console.error(err)
       next()
@@ -150,38 +148,49 @@ app.get('*', (req, res, next) => {
           '  </html>')
       return next()
     }
+    if (config.server.dynamicConfigReload) {
+      delete require.cache[require.resolve('config')]
+      config = require('config') // reload config
+    }
     const context = {
       url: req.url,
-      renderPrepend: (context) => { return '' }, // these functions can be replaced in the Vue components to append or prepend some content AFTER all other things are rendered. So in this function You may call: renderPrepend() { return context.renderStyles() } to attach styles
-      renderAppend: (context) => { return '' },
-      serverOutputTemplate: 'default',
+      output: {
+        prepend: (context) => { return '' }, // these functions can be replaced in the Vue components to append or prepend some content AFTER all other things are rendered. So in this function You may call: output.prepend() { return context.renderStyles() } to attach styles
+        append: (context) => { return '' },
+        template: 'default',
+        cacheTags: null
+      },
+      server: {
+        app: app,
+        response: res,
+        request: req
+      },
       meta: null,
-      currentRoute: null/** will be set by Vue */,
-      storeCode: req.header('x-vs-store-code') ? req.header('x-vs-store-code') : process.env.STORE_CODE,
-      app: app,
-      response: res,
-      request: req
+      vs: {
+        config: config,
+        storeCode: req.header('x-vs-store-code') ? req.header('x-vs-store-code') : process.env.STORE_CODE
+      }
     }
     renderer.renderToString(context).then(output => {
       if (!res.get('content-type')) {
         res.setHeader('Content-Type', 'text/html')
       }
       let tagsArray = []
-      if (config.server.useOutputCacheTagging) {
-        tagsArray = Array.from(context.state.requestContext.outputCacheTags)
+      if (config.server.useOutputCacheTagging && context.output.cacheTags !== null) {
+        tagsArray = Array.from(context.output.cacheTags)
         const cacheTags = tagsArray.join(' ')
         res.setHeader('X-VS-Cache-Tags', cacheTags)
         console.log(`cache tags for the request: ${cacheTags}`)
       }
-      const contentPrepend = (typeof context.renderPrepend === 'function') ? context.renderPrepend(context) : ''
-      const contentAppend = (typeof context.renderAppend === 'function') ? context.renderAppend(context) : ''
+      const contentPrepend = (typeof context.output.prepend === 'function') ? context.output.prepend(context) : ''
+      const contentAppend = (typeof context.output.append === 'function') ? context.output.append(context) : ''
 
       output = contentPrepend + output + contentAppend
-      if (context.serverOutputTemplate) { // case when we've got the template name back from vue app
-        if (templatesCache[context.serverOutputTemplate]) { // please look at: https://github.com/vuejs/vue/blob/79cabadeace0e01fb63aa9f220f41193c0ca93af/src/server/template-renderer/index.js#L87 for reference
-          output = templatesCache[context.serverOutputTemplate](context).replace('<!--vue-ssr-outlet-->', output)
+      if (context.output.template) { // case when we've got the template name back from vue app
+        if (templatesCache[context.output.template]) { // please look at: https://github.com/vuejs/vue/blob/79cabadeace0e01fb63aa9f220f41193c0ca93af/src/server/template-renderer/index.js#L87 for reference
+          output = templatesCache[context.output.template](context).replace('<!--vue-ssr-outlet-->', output)
         } else {
-          throw new Error(`The given template name ${context.serverOutputTemplate} does not exist`)
+          throw new Error(`The given template name ${context.output.template} does not exist`)
         }
       }
       if (config.server.useOutputCache && cache) {
diff --git a/core/scripts/server/utils.js b/core/scripts/server/utils.js
index ba9c66ebbb..e1c952e976 100644
--- a/core/scripts/server/utils.js
+++ b/core/scripts/server/utils.js
@@ -1,5 +1,5 @@
 /** Creates a api status call and sends it thru to Express Response object.
- * @param {express.Response} res Express HTTP Response
+ * @param {expressserver.response} res Express HTTP Response
  * @param {number} [code=200] Status code to send on success
  * @param {json} [result='OK'] Text message or result information object
  */
diff --git a/core/server-entry.ts b/core/server-entry.ts
index a62371c8ab..fb0770e256 100755
--- a/core/server-entry.ts
+++ b/core/server-entry.ts
@@ -3,8 +3,9 @@ import { union } from 'lodash-es'
 import { createApp } from '@vue-storefront/core/app'
 import { HttpError } from '@vue-storefront/core/lib/exceptions'
 import { prepareStoreView, storeCodeFromRoute } from '@vue-storefront/store/lib/multistore'
-import config from 'config' // can not be obtained from rootStore as this entry is loaded erlier than app.ts
 import omit from 'lodash-es/omit'
+import pick from 'lodash-es/pick'
+import buildTimeConfig from 'config'
 
 function _commonErrorHandler (err, reject) {
   if (err.message.indexOf('query returned empty result') > 0) {
@@ -24,11 +25,24 @@ function _ssrHydrateSubcomponents (components, store, router, resolve, reject, a
       })
     }
   })).then(() => {
-    if (config.ssr.useInitialStateFilter) {
-      context.state = omit(store.state, config.ssr.initialStateFilter)
+    if (buildTimeConfig.ssr.useInitialStateFilter) {
+      context.state = omit(store.state, store.state.config.ssr.initialStateFilter)
     } else {
       context.state = store.state
     }
+    if (!buildTimeConfig.server.dynamicConfigReload) { // if dynamic config reload then we're sending config along with the request
+      context.state = omit(store.state, ['config'])
+    } else {
+      const excludeFromConfig = buildTimeConfig.server.dynamicConfigExclude
+      const includeFromConfig = buildTimeConfig.server.dynamicConfigInclude
+      console.log(excludeFromConfig, includeFromConfig)
+      if (includeFromConfig && includeFromConfig.length > 0) {
+        context.state.config = pick(context.state.config, includeFromConfig)
+      }
+      if (excludeFromConfig && excludeFromConfig.length > 0) {
+        context.state.config = omit(context.state.config, excludeFromConfig)
+      }
+    }
     resolve(app)
   }).catch(err => {
     _commonErrorHandler(err, reject)
@@ -37,17 +51,16 @@ function _ssrHydrateSubcomponents (components, store, router, resolve, reject, a
 
 export default context => {
   return new Promise((resolve, reject) => {
-    const { app, router, store } = createApp(context)
+    const { app, router, store } = createApp(context, context.vs && context.vs.config ? context.vs.config : buildTimeConfig)
 
     const meta = (app as any).$meta()
     router.push(context.url)
     context.meta = meta
     router.onReady(() => {
-      store.state.requestContext.outputCacheTags = new Set<string>()
+      context.output.cacheTags = new Set<string>()
       if (store.state.config.storeViews.multistore === true) {
-        let storeCode = context.storeCode // this is from http header or env variable
+        let storeCode = context.vs.storeCode // this is from http header or env variable
         if (router.currentRoute) { // this is from url
-          context.currentRoute = router.currentRoute
           storeCode = storeCodeFromRoute(router.currentRoute)
         }
         if (storeCode !== '' && storeCode !== null) {
diff --git a/core/store/index.ts b/core/store/index.ts
index 41cb338bf0..f4c45747b5 100644
--- a/core/store/index.ts
+++ b/core/store/index.ts
@@ -40,10 +40,7 @@ const state = {
   twoStageCachingDisabled: false,
   userTokenInvalidated: null,
   userTokenInvalidateAttemptsCount: 0,
-  userTokenInvalidateLock: 0,
-  requestContext: {
-    outputCacheTags: new Set<string>()
-  }
+  userTokenInvalidateLock: 0
 }
 
 const mutations = {
diff --git a/core/store/lib/search.ts b/core/store/lib/search.ts
index 775cf8890f..bc33699603 100644
--- a/core/store/lib/search.ts
+++ b/core/store/lib/search.ts
@@ -2,14 +2,15 @@ import Vue from 'vue'
 import { currentStoreView } from './multistore'
 import { sha1 } from 'object-hash'
 import rootStore from '../'
-import config from 'config'
 import SearchAdapterFactory from './search/adapter/factory'
 import Request from '../types/search/Request'
 import Response from '../types/search/Response'
 
-const factory = new SearchAdapterFactory()
-let adapterName = config.server.api
-let searchAdapter = factory.getSearchAdapter(adapterName)
+function getSearchAdapter(config) {
+  const factory = new SearchAdapterFactory()
+  let adapterName = config.server.api
+  return factory.getSearchAdapter(adapterName)
+}
 
 export function isOnline () {
   if (typeof navigator !== 'undefined') {
@@ -28,6 +29,7 @@ export function isOnline () {
  * @return {Promise}
  */
 export function quickSearchByQuery ({ query, start = 0, size = 50, entityType = 'product', sort = '', storeCode = null, excludeFields = null, includeFields = null }): Promise<Response> {
+  const searchAdapter = getSearchAdapter(rootStore.state.config)
   if (size <= 0) size = 50
   if (start < 0) start = 0
 
diff --git a/core/store/lib/search/adapter/api/searchAdapter.ts b/core/store/lib/search/adapter/api/searchAdapter.ts
index efae8c713e..5a0f942152 100644
--- a/core/store/lib/search/adapter/api/searchAdapter.ts
+++ b/core/store/lib/search/adapter/api/searchAdapter.ts
@@ -7,7 +7,6 @@ import { currentStoreView, prepareStoreView } from '../../../multistore'
 import SearchQuery from 'core/store/lib/search/searchQuery'
 import HttpQuery from 'core/store/types/search/HttpQuery'
 import Response from 'core/store/types/search/Response'
-import config from 'config'
 
 export class SearchAdapter {
   public entities: any
@@ -28,7 +27,7 @@ export class SearchAdapter {
     if (Request.searchQuery instanceof SearchQuery) {
       ElasticsearchQueryBody = prepareElasticsearchQueryBody(Request.searchQuery)
       if (Request.searchQuery.getSearchText() !== '') {
-        ElasticsearchQueryBody['min_score'] = config.elasticsearch.min_score
+        ElasticsearchQueryBody['min_score'] = rootStore.state.config.elasticsearch.min_score
       }      
     } else {
       // backward compatibility for old themes uses bodybuilder
diff --git a/core/store/lib/search/adapter/factory.js b/core/store/lib/search/adapter/factory.js
index 7cfe85f0ae..c9d703a445 100644
--- a/core/store/lib/search/adapter/factory.js
+++ b/core/store/lib/search/adapter/factory.js
@@ -1,10 +1,10 @@
 'use strict'
-import config from 'config'
+import store from '@vue-storefront/store'
 
 export default class SearchAdapterFactory {
   getSearchAdapter (adapterName = '') {
     if (adapterName === '') {
-      adapterName = config.server.api
+      adapterName = store.state.config.server.api
     }
 
     const {SearchAdapter} = require(`./${adapterName}/searchAdapter`)
diff --git a/core/store/lib/search/boost.js b/core/store/lib/search/boost.js
index ff95e2c99b..cadf06e88d 100644
--- a/core/store/lib/search/boost.js
+++ b/core/store/lib/search/boost.js
@@ -1,11 +1,11 @@
-import config from 'config'
+import store from '@vue-storefront/store'
 
 export default function getBoosts (attribute = '') {
   let boosts = [
   ]
 
-  if (config.boost) {
-    boosts = config.boost
+  if (store.state.boost) {
+    boosts = store.state.config.boost
   }
 
   if (boosts.hasOwnProperty(attribute)) {
diff --git a/core/store/lib/search/mapping.js b/core/store/lib/search/mapping.js
index f012fcf4fe..d104872173 100644
--- a/core/store/lib/search/mapping.js
+++ b/core/store/lib/search/mapping.js
@@ -1,11 +1,11 @@
-import config from 'config'
+import store from '@vue-storefront/store'
 
 export default function getMapping (attribute, entityType = 'products') {
   let mapping = [
   ]
 
-  if (config.hasOwnProperty(entityType) && config[entityType].hasOwnProperty('filterFieldMapping')) {
-    mapping = config[entityType].filterFieldMapping
+  if (store.state.config.hasOwnProperty(entityType) && store.state.config[entityType].hasOwnProperty('filterFieldMapping')) {
+    mapping = store.state.config[entityType].filterFieldMapping
   }
 
   if (mapping.hasOwnProperty(attribute)) {
diff --git a/core/store/lib/search/searchQuery.js b/core/store/lib/search/searchQuery.js
index 15890814ff..27ea8dfd5c 100644
--- a/core/store/lib/search/searchQuery.js
+++ b/core/store/lib/search/searchQuery.js
@@ -5,7 +5,6 @@ class SearchQuery {
     this._availableFilters = []
     this._appliedFilters = []
     this._searchText = ''
-    console.debug('create SearchQuery object')
   }
 
   /**
diff --git a/core/store/modules/category/actions.ts b/core/store/modules/category/actions.ts
index a2f3ab7f18..b6a93dc2f5 100644
--- a/core/store/modules/category/actions.ts
+++ b/core/store/modules/category/actions.ts
@@ -84,8 +84,8 @@ const actions: ActionTree<CategoryState, RootState> = {
         if (setCurrentCategory) {
           commit(types.CATEGORY_UPD_CURRENT_CATEGORY, mainCategory)
         }
-        if (populateRequestCacheTags && mainCategory) {
-          rootStore.state.requestContext.outputCacheTags.add(`C${mainCategory.id}`)
+        if (populateRequestCacheTags && mainCategory && Vue.prototype.$ssrRequestContext) {
+          Vue.prototype.$ssrRequestContext.output.cacheTags.add(`C${mainCategory.id}`)
         }        
         if (setCurrentCategoryPath) {
           let currentPath = []
diff --git a/core/store/modules/product/actions.ts b/core/store/modules/product/actions.ts
index 27f3641adb..ec67022307 100644
--- a/core/store/modules/product/actions.ts
+++ b/core/store/modules/product/actions.ts
@@ -260,8 +260,8 @@ const actions: ActionTree<ProductState, RootState> = {
     return quickSearchByQuery({ query, start, size, entityType, sort, excludeFields, includeFields }).then((resp) => {
       if (resp.items && resp.items.length) { // preconfigure products; eg: after filters
         for (let product of resp.items) {
-          if (populateRequestCacheTags) {
-            rootStore.state.requestContext.outputCacheTags.add(`P${product.id}`)
+          if (populateRequestCacheTags && Vue.prototype.$ssrRequestContext) {
+            Vue.prototype.$ssrRequestContext.output.cacheTags.add(`P${product.id}`)
           }
           product.errors = {} // this is an object to store validation result for custom options and others
           product.info = {}
diff --git a/core/store/modules/shipping/index.ts b/core/store/modules/shipping/index.ts
index e34dc5673f..79b98294e4 100644
--- a/core/store/modules/shipping/index.ts
+++ b/core/store/modules/shipping/index.ts
@@ -1,12 +1,12 @@
 import { Module } from 'vuex'
 import RootState from '../../types/RootState'
 import ShippingState from './types/ShippingState'
-import config from 'config'
+import buildTimeConfig from 'config'
 
 const shipping: Module<ShippingState, RootState> = {
   namespaced: true,
   state: {
-    methods: config.shipping.methods
+    methods: buildTimeConfig.shipping.methods
   },
   mutations: {
     addMethod (state, shippingMethods) {
diff --git a/core/store/types/RootState.ts b/core/store/types/RootState.ts
index f73660fdab..827253a5b8 100644
--- a/core/store/types/RootState.ts
+++ b/core/store/types/RootState.ts
@@ -29,8 +29,5 @@ export default interface RootState {
   twoStageCachingDisabled: boolean,
   userTokenInvalidated: string | null,
   userTokenInvalidateAttemptsCount: number,
-  userTokenInvalidateLock: number,
-  requestContext: {
-    outputCacheTags: Set<string>
-  }
+  userTokenInvalidateLock: number
 }
diff --git a/doc/Config docs.md b/doc/Config docs.md
index f05270cb3a..afe9c7cee8 100644
--- a/doc/Config docs.md	
+++ b/doc/Config docs.md	
@@ -8,7 +8,7 @@ The structure of these files is exactly the same! Vue Storefront does kind of `O
 
 **Note:** Please take a look at the `node-config` docs as the library is open for some other ways to modify the configuration (using for example the `ENV` variables).
 
-**Note:** Currently, the configuration files are being processed by the webpack during the build process. This means that whenever You apply some configuration changes You shall re-build the app - even when using the `yarn dev` mode. 
+**Note:** By default the configuration is being bundled by webpack and can not be modified without re-compiling Vue Storefront. This limitation can by however solved with VS 1.4 - special config variable. Now the config can be reloaded on-fly with each server request if `config.server.dynamicConfigReload` is set to true. However in that case the config is added to `window.__INITIAL_STATE__` with the responses.
 
 ## Vue Storefront configuration file - explained
 
diff --git a/doc/Layouts and advanced output operations.md b/doc/Layouts and advanced output operations.md
index 274f9bb85d..4c6d8e9fae 100644
--- a/doc/Layouts and advanced output operations.md	
+++ b/doc/Layouts and advanced output operations.md	
@@ -21,9 +21,9 @@ What we've changed is **You can now select which html template + layout Your app
 ## Changelog
 
 The changes we've introduced: 
-- now distinct routes can set `context.serverOutputTemplate` in `asyncData` method. By doing so You can skip using `dist/index.html` (which contains typical HTML5 elements - like `<head ...`). This is important when we're going to generate AMPHTML pages (that can not contain any `<script>` tags) - either xml files - You name it
+- now distinct routes can set `context.output.template` in `asyncData` method. By doing so You can skip using `dist/index.html` (which contains typical HTML5 elements - like `<head ...`). This is important when we're going to generate AMPHTML pages (that can not contain any `<script>` tags) - either xml files - You name it
 - distinct routes can set `meta.layout` and by doing so switch the previously constant App.vue layout file - this is what @mercs600 proposed some time ago in slightly changed form
-- You've got access to server `context` object in `asyncData` and two new features - `renderPrepend` and `renderAppend` have been created to allow You control the rendering flow of the template
+- You've got access to server `context` object in `asyncData` and two new features - `output.prepend` and `output.append` have been created to allow You control the rendering flow of the template
 
 ## Templates
 
@@ -75,8 +75,8 @@ Vue component to render the XML:
 export default {
   name: 'RawOutputExample',
   asyncData ({ store, route, context }) {
-    context.response.setHeader('Content-Type', 'text/xml')
-    context.serverOutputTemplate = ''
+    contextserver.response.setHeader('Content-Type', 'text/xml')
+    context.output.template = ''
     return new Promise((resolve, reject) => {
       resolve()
     })
@@ -95,11 +95,11 @@ export default {
 The key part is:
 
 ```js
-    context.response.setHeader('Content-Type', 'text/xml')
-    context.serverOutputTemplate = ''
+    contextserver.response.setHeader('Content-Type', 'text/xml')
+    context.output.template = ''
 ```
 These two statements:
-- set the HTTP header (by accessing ExpressJS response object - `context.response`. There is also `context.request` and `context.app` - the ExpressJS application)- set `serverOutputTemplate` to none which will cause to skip the HTML template rendering at all.
+- set the HTTP header (by accessing ExpressJS response object - `contextserver.response`. There is also `contextserver.request` and `context.app` - the ExpressJS application)- set `output.template` to none which will cause to skip the HTML template rendering at all.
 
 ### Switching off layout + injecting dynamic content
 Example URL: `http://localhost:3000/append-prepend.html`
@@ -120,11 +120,11 @@ Vue component to render the XML:
 export default {
   name: 'NoJSExample',
   asyncData ({ store, route, context }) {
-    context.serverOutputTemplate = ''
-    context.renderAppend = (context) => {
+    context.output.template = ''
+    context.output.append = (context) => {
       return '<div>This content has been dynamically appended</div>'
     }
-    context.renderPrepend = (context) => {
+    context.output.prepend = (context) => {
       return '<div>this content has been dynamically prepended</div>'
     }
     return new Promise((resolve, reject) => {
@@ -145,22 +145,22 @@ export default {
 The key part is:
 
 ```js
-    context.serverOutputTemplate = ''
-    context.renderAppend = (context) => {
+    context.output.template = ''
+    context.output.append = (context) => {
       return '<div>This content has been dynamically appended</div>'
     }
-    context.renderPrepend = (context) => {
+    context.output.prepend = (context) => {
       return '<div>this content has been dynamically prepended</div>'
     }    
 ```
 These two statements:
-- set `serverOutputTemplate` to none which will cause to skip the HTML template rendering at all.
-- adds the `renderAppend` and `renderPrepend` methods to the server context.
+- set `output.template` to none which will cause to skip the HTML template rendering at all.
+- adds the `output.append` and `output.prepend` methods to the server context.
 
 The output will be generated with this logic:
 ```js
-    const contentPrepend = (typeof context.renderPrepend === 'function') ? context.renderPrepend(context) : ''
-    const contentAppend = (typeof context.renderAppend === 'function') ? context.renderAppend(context) : ''
+    const contentPrepend = (typeof context.output.prepend === 'function') ? context.output.prepend(context) : ''
+    const contentAppend = (typeof context.output.append === 'function') ? context.output.append(context) : ''
     output = contentPrepend + output + contentAppend
 ```
 
diff --git a/doc/SSR Cache.md b/doc/SSR Cache.md
index 4b371b38e2..b029063b12 100644
--- a/doc/SSR Cache.md	
+++ b/doc/SSR Cache.md	
@@ -77,9 +77,9 @@ If You're adding new type of page (`core/pages`) and `config.server.useOutputCac
 After doing so, please add the `asyncData` method to Your page code assigning the right tag (please take a look at `core/pages/Home.js` for instance):
 
 ```js
-  asyncData ({ store, route }) { // this is for SSR purposes to prefetch data
+  asyncData ({ store, route, context }) { // this is for SSR purposes to prefetch data
     return new Promise((resolve, reject) => {
-      store.state.requestContext.outputCacheTags.add(`home`)
+      if (context) context.output.cacheTags.add(`home`)
       console.log('Entering asyncData for Home root ' + new Date())
       EventBus.$emitFilter('home-after-load', { store: store, route: route }).then((results) => {
         return resolve()
@@ -94,7 +94,7 @@ After doing so, please add the `asyncData` method to Your page code assigning th
 This line:
 
 ```js
-      store.state.requestContext.outputCacheTags.add(`home`)
+     if (context) context.output.cacheTags.add(`home`)
 ```
 
 ... is in charge of assigning the specific tag with current HTTP request output.
diff --git a/src/extensions/magento2-cms/components/CmsData.vue b/src/extensions/magento2-cms/components/CmsData.vue
index 960376a698..f0d537abab 100644
--- a/src/extensions/magento2-cms/components/CmsData.vue
+++ b/src/extensions/magento2-cms/components/CmsData.vue
@@ -7,7 +7,7 @@
 </template>
 
 <script>
-import config from 'config'
+import store from '@vue-storefront/store'
 import { currentStoreView } from '@vue-storefront/store/lib/multistore'
 
 export default {
@@ -59,18 +59,18 @@ export default {
   },
   data () {
     return {
-      isMultistoreEnable: config.storeViews.multistore
+      isMultistoreEnable: store.state.config.storeViews.multistore
     }
   },
   methods: {
     getEndpointPath () {
       let url
       if (this.id) {
-        url = (config.cms.endpoint)
+        url = (store.state.config.cms.endpoint)
           .replace('{{type}}', this.type)
           .replace('{{cmsId}}', this.id)
       } else if (this.identifier) {
-        url = (config.cms.endpointIdentifier)
+        url = (store.state.config.cms.endpointIdentifier)
           .replace('{{type}}', this.type)
           .replace('{{cmsIdentifier}}', this.identifier)
           .replace('{{storeId}}', this.storeView)
diff --git a/src/extensions/raw-output-example/index.js b/src/extensions/raw-output-example/index.js
index 1489fc9b79..afc49353b2 100755
--- a/src/extensions/raw-output-example/index.js
+++ b/src/extensions/raw-output-example/index.js
@@ -3,7 +3,7 @@ import extensionRoutes from './router'
 
 const EXTENSION_KEY = 'raw_content_extension'
 
-export default function (app, router, store, config, serverContext) {
+export default function (app, router, store, config, ssrContext) {
   router.addRoutes(extensionRoutes) // add custom routes
   store.registerModule(EXTENSION_KEY, extensionStore) // add custom store
 
diff --git a/src/extensions/raw-output-example/pages/NoJSExample.vue b/src/extensions/raw-output-example/pages/NoJSExample.vue
index dc0d38f785..1e09d70888 100755
--- a/src/extensions/raw-output-example/pages/NoJSExample.vue
+++ b/src/extensions/raw-output-example/pages/NoJSExample.vue
@@ -6,11 +6,11 @@
 export default {
   name: 'NoJSExample',
   asyncData ({ store, route, context }) {
-    context.serverOutputTemplate = 'basic'
-    context.renderAppend = (context) => {
+    context.output.template = 'basic'
+    context.output.append = (context) => {
       return '<div>This content has been dynamically appended</div>'
     }
-    context.renderPrepend = (context) => {
+    context.output.prepend = (context) => {
       return '<div>this content has been dynamically prepended</div>'
     }
     return new Promise((resolve, reject) => {
diff --git a/src/extensions/raw-output-example/pages/NoLayoutAppendPrependExample.vue b/src/extensions/raw-output-example/pages/NoLayoutAppendPrependExample.vue
index e4c5cc486a..ec0ed77d9d 100755
--- a/src/extensions/raw-output-example/pages/NoLayoutAppendPrependExample.vue
+++ b/src/extensions/raw-output-example/pages/NoLayoutAppendPrependExample.vue
@@ -6,11 +6,11 @@
 export default {
   name: 'NoJSExample',
   asyncData ({ store, route, context }) {
-    context.serverOutputTemplate = ''
-    context.renderAppend = (context) => {
+    context.output.template = ''
+    context.output.append = (context) => {
       return '<div>This content has been dynamically appended</div>'
     }
-    context.renderPrepend = (context) => {
+    context.output.prepend = (context) => {
       return '<div>this content has been dynamically prepended</div>'
     }
     return new Promise((resolve, reject) => {
diff --git a/src/extensions/raw-output-example/pages/RawOutputExample.vue b/src/extensions/raw-output-example/pages/RawOutputExample.vue
index f742098eb1..5033610f6e 100755
--- a/src/extensions/raw-output-example/pages/RawOutputExample.vue
+++ b/src/extensions/raw-output-example/pages/RawOutputExample.vue
@@ -8,8 +8,8 @@
 export default {
   name: 'RawOutputExample',
   asyncData ({ store, route, context }) {
-    context.response.setHeader('Content-Type', 'text/xml')
-    context.serverOutputTemplate = ''
+    context.server.response.setHeader('Content-Type', 'text/xml')
+    context.output.template = ''
     return new Promise((resolve, reject) => {
       resolve()
     })
diff --git a/src/themes/default-amp/pages/Category.vue b/src/themes/default-amp/pages/Category.vue
new file mode 100644
index 0000000000..3451b6e547
--- /dev/null
+++ b/src/themes/default-amp/pages/Category.vue
@@ -0,0 +1,153 @@
+<template>
+  <div id="category">
+    <header class="bg-cl-secondary py35 pl20">
+      <div class="container">
+        <breadcrumbs :routes="breadcrumbs.routes" :active-route="category.name" />
+        <div class="row middle-sm">
+          <h1 class="col-sm-9 category-title mb10"> {{ category.name }} </h1>
+        </div>
+      </div>
+    </header>
+    <div class="container pb60">
+      <div class="row m0 pt15">
+        <p class="col-xs-12 hidden-md m0 px20 cl-secondary">{{ productsCounter }} items</p>
+        <div class="col-md-9 pt20 px10 border-box products-list">
+          <div v-if="isCategoryEmpty" class="hidden-xs">
+            <h4 data-testid="noProductsInfo">{{ $t('No products found!') }}</h4>
+            <p>{{ $t('Please change Your search criteria and try again. If still not finding anything relevant, please visit the Home page and try out some of our bestsellers!') }}</p>
+          </div>
+          <product-listing columns="3" :products="products" />
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import Category from '@vue-storefront/core/pages/Category' // theme = default/base theme
+import ProductListing from 'theme/components/core/ProductListing.vue'
+import Breadcrumbs from 'theme/components/core/Breadcrumbs.vue'
+// import builder from 'bodybuilder'
+
+export default {
+  components: {
+    ProductListing,
+    Breadcrumbs
+  },
+  data () {
+    return {
+      mobileFilters: false
+    }
+  },
+  asyncData ({ store, route, context }) { // this is for SSR purposes to prefetch data - and it's always executed before parent component methods
+    context.output.template = 'basic'
+    return new Promise((resolve, reject) => {
+      store.state.category.current_product_query = Object.assign(store.state.category.current_product_query, { // this is just an example how can you modify the search criteria in child components
+        sort: 'updated_at:desc'
+        // searchProductQuery: builder().query('range', 'price', { 'gt': 0 }).andFilter('range', 'visibility', { 'gte': 2, 'lte': 4 }) // this is an example on how to modify the ES query, please take a look at the @vue-storefront/core/helpers for refernce on how to build valid query
+      })
+      resolve()
+    })
+  },
+  methods: {
+    openFilters () {
+      this.mobileFilters = true
+    },
+    closeFilters () {
+      this.mobileFilters = false
+    }
+  },
+  mixins: [Category]
+}
+</script>
+
+<style lang="scss" scoped>
+  .category-filters {
+    width: 242px;
+  }
+
+  .mobile-filters {
+    display: none;
+    overflow: auto;
+  }
+
+  .mobile-filters-button {
+    display: none;
+  }
+
+  .mobile-sorting {
+    display: none;
+  }
+
+  .category-title {
+    line-height: 65px;
+  }
+
+  @media (max-width: 64em) {
+    .products-list {
+      max-width: 530px;
+    }
+  }
+
+  @media (max-width: 770px) {
+    .category-title {
+      margin: 0;
+      font-size: 36px;
+      line-height: 40px;
+    }
+
+    .products-list {
+      width: 100%;
+      max-width: none;
+    }
+
+    .mobile-filters {
+      display: block;
+    }
+
+    .mobile-filters-button {
+      display: block;
+      height: 45px;
+    }
+
+    .sorting {
+      display: none;
+    }
+
+    .mobile-sorting {
+      display: block;
+    }
+
+    .category-filters {
+      display: none;
+    }
+
+    .product-listing {
+      justify-content: center;;
+    }
+
+    .mobile-filters {
+      position: fixed;
+      background-color: #F2F2F2;
+      z-index: 5;
+      padding: 0 40px;
+      left: 0;
+      width: 100vw;
+      height: 100vh;
+      top: 0;
+      box-sizing: border-box;
+    }
+
+    .mobile-filters-body {
+      padding-top: 50px;
+    }
+  }
+
+  .close-container {
+    left: 0;
+  }
+
+  .close {
+    margin-left: auto;
+  }
+</style>
diff --git a/src/themes/default-amp/pages/Product.vue b/src/themes/default-amp/pages/Product.vue
new file mode 100644
index 0000000000..0cabbc8ad5
--- /dev/null
+++ b/src/themes/default-amp/pages/Product.vue
@@ -0,0 +1,353 @@
+<template>
+  <div id="product" itemscope itemtype="http://schema.org/Product">
+    <section class="bg-cl-secondary px20 product-top-section">
+      <div class="container">
+        <section class="row m0 between-xs">
+          <div class="col-xs-12 col-md-6 center-xs middle-xs image">
+            <product-gallery
+              :gallery="gallery"
+              :offline="offlineImage"
+              :configuration="configuration"
+              :product="product"
+            />
+          </div>
+          <div class="col-xs-12 col-md-5 data">
+            <breadcrumbs
+              class="pt40 pb20 hidden-xs"
+              :routes="breadcrumbs.routes"
+              :active-route="breadcrumbs.name"
+            />
+            <h1 class="mb20 mt0 cl-mine-shaft product-name" data-testid="productName" itemprop="name">
+              {{ product.name | htmlDecode }}
+            </h1>
+            <div class="mb20 uppercase cl-secondary">
+              sku: {{ product.sku }}
+            </div>
+            <div itemprop="offers" itemscope itemtype="http://schema.org/Offer">
+              <meta itemprop="priceCurrency" :content="currentStore.i18n.currencyCode">
+              <meta itemprop="price" :content="parseFloat(product.priceInclTax).toFixed(2)">
+              <div
+                class="mb40 price serif"
+                v-if="product.type_id !== 'grouped'"
+              >
+                <div
+                  class="h3 cl-secondary"
+                  v-if="product.special_price && product.priceInclTax && product.originalPriceInclTax"
+                >
+                  <span class="h2 cl-mine-shaft weight-700">
+                    {{ product.priceInclTax * product.qty | price }}
+                  </span>&nbsp;
+                  <span class="price-original h3">
+                    {{ product.originalPriceInclTax * product.qty | price }}
+                  </span>
+                </div>
+                <div
+                  class="h2 cl-mine-shaft weight-700"
+                  v-if="!product.special_price && product.priceInclTax"
+                >
+                  {{ product.priceInclTax * product.qty | price }}
+                </div>
+              </div>
+              <div
+                class="cl-primary variants"
+                v-if="product.type_id =='configurable' && !loading"
+              >
+                <div class="error" v-if="product.errors && Object.keys(product.errors).length > 0">
+                  {{ product.errors | formatProductMessages }}
+                </div>
+              </div>
+            </div>
+            <product-links
+              v-if="product.type_id =='grouped' && !loading"
+              :products="product.product_links"
+            />
+            <product-bundle-options
+              v-if="product.bundle_options && product.bundle_options.length > 0 && !loading"
+              :product="product"
+            />
+            <product-custom-options
+              v-else-if="product.custom_options && product.custom_options.length > 0 && !loading"
+              :product="product"
+            />
+            <div class="row m0">
+              <a
+                class="col-xs-12 col-sm-4 col-md-6"
+              >{{ $t('Add to cart') }}</a>
+            </div>
+          </div>
+        </section>
+      </div>
+    </section>
+    <section class="container px15 pt50 pb35 cl-accent details">
+      <h2 class="h3 m0 mb10 serif lh20 details-title">
+        {{ $t('Product details') }}
+      </h2>
+      <div
+        class="h4 details-wrapper"
+        :class="{'details-wrapper--open': detailsOpen}"
+      >
+        <div class="row between-md m0">
+          <div class="col-xs-12 col-sm-6">
+            <div
+              class="lh30 h5"
+              itemprop="description"
+              v-html="product.description"
+            />
+          </div>
+          <div class="col-xs-12 col-sm-5">
+            <ul class="attributes p0 pt5 m0">
+              <product-attribute
+                :key="attr.attribute_code"
+                v-for="attr in customAttributes"
+                :product="product"
+                :attribute="attr"
+                empty-placeholder="N/A"
+              />
+            </ul>
+          </div>
+        </div>
+      </div>
+    </section>
+    <related-products
+      type="upsell"
+      :heading="$t('We found other products you might like')"
+    />
+    <related-products type="related" />
+  </div>
+</template>
+
+<script>
+import Product from '@vue-storefront/core/pages/Product'
+
+import RelatedProducts from 'theme/components/core/blocks/Product/Related.vue'
+import GenericSelector from 'theme/components/core/GenericSelector'
+import ColorSelector from 'theme/components/core/ColorSelector.vue'
+import SizeSelector from 'theme/components/core/SizeSelector.vue'
+import Breadcrumbs from 'theme/components/core/Breadcrumbs.vue'
+import ProductAttribute from 'theme/components/core/ProductAttribute.vue'
+import ProductTile from 'theme/components/core/ProductTile.vue'
+import ProductLinks from 'theme/components/core/ProductLinks.vue'
+import ProductCustomOptions from 'theme/components/core/ProductCustomOptions.vue'
+import ProductBundleOptions from 'theme/components/core/ProductBundleOptions.vue'
+import ProductGallery from 'theme/components/core/ProductGallery'
+import PromotedOffers from 'theme/components/theme/blocks/PromotedOffers/PromotedOffers'
+import focusClean from 'theme/components/theme/directives/focusClean'
+
+export default {
+  components: {
+    Breadcrumbs,
+    ColorSelector,
+    GenericSelector,
+    ProductAttribute,
+    ProductBundleOptions,
+    ProductCustomOptions,
+    ProductGallery,
+    ProductLinks,
+    ProductTile,
+    PromotedOffers,
+    RelatedProducts,
+    SizeSelector
+  },
+  mixins: [Product],
+  data () {
+    return {
+      detailsOpen: false
+    }
+  },
+  directives: { focusClean },
+  computed: {
+    favoriteIcon () {
+      return this.isOnWishlist ? 'favorite' : 'favorite_border'
+    }
+  },
+  methods: {
+    showDetails (event) {
+      this.detailsOpen = true
+      event.target.classList.add('hidden')
+    }
+  },
+  asyncData ({ store, route, context }) {
+    console.log('DUPIKA')
+    context.output.template = 'basic'
+    context.renderHead = (context) => {
+      return '<script async src="https://cdn.ampproject.org/v0.js"><' + '/script>'
+    }
+    return new Promise((resolve, reject) => {
+      resolve()
+    })
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+@import '~theme/css/variables/colors';
+@import '~theme/css/helpers/functions/color';
+$color-primary: color(primary);
+$color-tertiary: color(tertiary);
+$color-secondary: color(secondary);
+$color-white: color(white);
+$bg-secondary: color(secondary, $colors-background);
+
+.breadcrumbs {
+  @media (max-width: 767px) {
+    margin: 15px 0;
+    padding: 15px 0 0 15px;
+  }
+}
+
+.error {
+  color: red;
+  font-weight: bold;
+  padding-bottom: 15px;
+}
+.data {
+  @media (max-width: 767px) {
+    border-bottom: 1px solid $bg-secondary;
+  }
+}
+
+.image {
+  @media (max-width: 1023px) {
+    margin-bottom: 20px;
+  }
+}
+
+.product-name {
+  @media (max-width: 767px) {
+    font-size: 36px;
+  }
+}
+
+.price {
+  @media (max-width: 767px) {
+    color: $color-primary;
+  }
+}
+
+.variants-label {
+  @media (max-width: 767px) {
+    font-size: 14px;
+  }
+}
+
+.variants-wrapper {
+  @media (max-width: 767px) {
+    padding-bottom: 30px;
+  }
+
+ .sizes {
+    @media (max-width: 767px) {
+      width: 100%;
+    }
+  }
+
+  .size-guide {
+    height: 40px;
+    @media (max-width: 767px) {
+      width: 100%;
+      margin-left: 0;
+    }
+  }
+}
+
+.product-top-section {
+  @media (max-width: 767px) {
+    padding: 0;
+    background-color: $color-white;
+  }
+}
+
+.add-to-buttons {
+  @media (max-width: 767px) {
+    padding-top: 30px;
+    margin-bottom: 40px;
+  }
+}
+
+.details {
+  @media (max-width: 767px) {
+    padding: 50px 15px 15px;
+  }
+}
+
+.details-title {
+  padding: 0 8px;
+
+  @media (max-width: 767px) {
+    font-size: 18px;
+    margin: 0;
+  }
+}
+
+.details-wrapper {
+  @media (max-width: 767px) {
+    position: relative;
+    max-height: 140px;
+    overflow: hidden;
+    transition: all 0.3s ease;
+    font-size: 14px;
+  }
+
+  &--open {
+    max-height: none;
+  }
+}
+
+.details-overlay {
+  @media (max-width: 767px) {
+    position: absolute;
+    height: 75%;
+    bottom: 0;
+    left: 0;
+    width: 100%;
+    margin: 0;
+    cursor: pointer;
+    background: linear-gradient(rgba($color-white, 0), rgba($color-white, 1));
+    &.hidden {
+      display: none;
+    }
+  }
+}
+
+.price-original {
+  text-decoration: line-through;
+}
+
+.action {
+  &:hover {
+    color: $color-tertiary;
+  }
+}
+
+.attributes {
+  list-style-type: none;
+}
+
+.fade-enter-active,
+.fade-leave-active {
+  transition: opacity 0.3s;
+}
+
+.fade-enter,
+.fade-leave-to /* .fade-leave-active below version 2.1.8 */ {
+  opacity: 0;
+}
+
+.product-image {
+  mix-blend-mode: multiply;
+  width: 460px;
+}
+
+.qty-input {
+  border-style: solid;
+  border-width: 0 0 1px 0;
+  width: 90px;
+}
+
+.qty-label {
+  margin-bottom: 12px;
+  cursor: pointer;
+  font-size: 14px;
+}
+
+</style>
diff --git a/src/themes/default-amp/router/index.js b/src/themes/default-amp/router/index.js
new file mode 100644
index 0000000000..3ec5198c7f
--- /dev/null
+++ b/src/themes/default-amp/router/index.js
@@ -0,0 +1,29 @@
+// import router from '@vue-storefront/core/router'
+// uncomment if you want to modify the router e.g. add before/after hooks
+import Category from '../pages/Category.vue'
+import Product from '../pages/Product.vue'
+
+import store from '@vue-storefront/store'
+
+let routes = [
+]
+if (!store.state.config.products.useShortCatalogUrls) {
+  routes = routes.concat([{ name: 'virtual-product-amp', path: '/amp/p/:parentSku/:slug', component: Product, meta: { layout: 'minimal' } }, // :sku param can be marked as optional with ":sku?" (https://github.com/vuejs/vue-router/blob/dev/examples/route-matching/app.js#L16), but it requires a lot of work to adjust the rest of the site
+    { name: 'bundle-product-amp', path: '/amp/p/:parentSku/:slug', component: Product, meta: { layout: 'minimal' } }, // :sku param can be marked as optional with ":sku?" (https://github.com/vuejs/vue-router/blob/dev/examples/route-matching/app.js#L16), but it requires a lot of work to adjust the rest of the site
+    { name: 'simple-product-amp', path: '/amp/p/:parentSku/:slug', component: Product, meta: { layout: 'minimal' } }, // :sku param can be marked as optional with ":sku?" (https://github.com/vuejs/vue-router/blob/dev/examples/route-matching/app.js#L16), but it requires a lot of work to adjust the rest of the site
+    { name: 'downloadable-product-amp', path: '/amp/p/:parentSku/:slug', component: Product, meta: { layout: 'minimal' } }, // :sku param can be marked as optional with ":sku?" (https://github.com/vuejs/vue-router/blob/dev/examples/route-matching/app.js#L16), but it requires a lot of work to adjust the rest of the site
+    { name: 'grouped-product-amp', path: '/amp/p/:parentSku/:slug', component: Product, meta: { layout: 'minimal' } }, // :sku param can be marked as optional with ":sku?" (https://github.com/vuejs/vue-router/blob/dev/examples/route-matching/app.js#L16), but it requires a lot of work to adjust the rest of the site
+    { name: 'configurable-product-amp', path: '/amp/p/:parentSku/:slug/:childSku', component: Product, meta: { layout: 'minimal' } }, // :sku param can be marked as optional with ":sku?" (https://github.com/vuejs/vue-router/blob/dev/examples/route-matching/app.js#L16), but it requires a lot of work to adjust the rest of the site
+    { name: 'product-amp', path: '/amp/p/:parentSku/:slug/:childSku', component: Product, meta: { layout: 'minimal' } }])// :sku param can be marked as optional with ":sku?" (https://github.com/vuejs/vue-router/blob/dev/examples/route-matching/app.js#L16), but it requires a lot of work to adjust the rest of the site
+  // { name: 'category', path: '/amp/c/:slug', component: Category }])
+} else {
+  routes = routes.concat([{ name: 'virtual-product-amp', path: '/amp/:parentSku/:slug', component: Product, meta: { layout: 'minimal' } }, // :sku param can be marked as optional with ":sku?" (https://github.com/vuejs/vue-router/blob/dev/examples/route-matching/app.js#L16), but it requires a lot of work to adjust the rest of the site
+    { name: 'bundle-product-amp', path: '/amp/:parentSku/:slug', component: Product, meta: { layout: 'minimal' } }, // :sku param can be marked as optional with ":sku?" (https://github.com/vuejs/vue-router/blob/dev/examples/route-matching/app.js#L16), but it requires a lot of work to adjust the rest of the site
+    { name: 'simple-product-amp', path: '/amp/:parentSku/:slug', component: Product, meta: { layout: 'minimal' } }, // :sku param can be marked as optional with ":sku?" (https://github.com/vuejs/vue-router/blob/dev/examples/route-matching/app.js#L16), but it requires a lot of work to adjust the rest of the site
+    { name: 'downloadable-product-amp', path: '/amp/:parentSku/:slug', component: Product, meta: { layout: 'minimal' } }, // :sku param can be marked as optional with ":sku?" (https://github.com/vuejs/vue-router/blob/dev/examples/route-matching/app.js#L16), but it requires a lot of work to adjust the rest of the site
+    { name: 'grouped-product-amp', path: '/amp/:parentSku/:slug', component: Product, meta: { layout: 'minimal' } }, // :sku param can be marked as optional with ":sku?" (https://github.com/vuejs/vue-router/blob/dev/examples/route-matching/app.js#L16), but it requires a lot of work to adjust the rest of the site
+    { name: 'configurable-product-amp', path: '/amp/:parentSku/:slug/:childSku', component: Product, meta: { layout: 'minimal' } }, // :sku param can be marked as optional with ":sku?" (https://github.com/vuejs/vue-router/blob/dev/examples/route-matching/app.js#L16), but it requires a lot of work to adjust the rest of the site
+    { name: 'product-amp', path: '/amp/:parentSku/:slug/:childSku', component: Product, meta: { layout: 'minimal' } }, // :sku param can be marked as optional with ":sku?" (https://github.com/vuejs/vue-router/blob/dev/examples/route-matching/app.js#L16), but it requires a lot of work to adjust the rest of the site
+    { name: 'category-amp', path: '/amp/:slug', component: Category, meta: { layout: 'minimal' } }])
+}
+export default routes
diff --git a/src/themes/default/components/core/ProductTile.vue b/src/themes/default/components/core/ProductTile.vue
index 29a3aaa4fb..3f793da9b3 100644
--- a/src/themes/default/components/core/ProductTile.vue
+++ b/src/themes/default/components/core/ProductTile.vue
@@ -57,7 +57,6 @@
 </template>
 
 <script>
-import config from 'config'
 import rootStore from '@vue-storefront/store'
 import ProductTile from '@vue-storefront/core/components/ProductTile'
 
@@ -78,7 +77,7 @@ export default {
     },
     visibilityChanged (isVisible, entry) {
       if (isVisible) {
-        if (config.products.configurableChildrenStockPrefetchDynamic && config.products.filterUnavailableVariants) {
+        if (rootStore.state.config.products.configurableChildrenStockPrefetchDynamic && rootStore.products.filterUnavailableVariants) {
           const skus = [this.product.sku]
           if (this.product.type_id === 'configurable' && this.product.configurable_children && this.product.configurable_children.length > 0) {
             for (const confChild of this.product.configurable_children) {
diff --git a/src/themes/default/components/core/blocks/Product/Related.vue b/src/themes/default/components/core/blocks/Product/Related.vue
index a4f57f5238..ce6290ef24 100644
--- a/src/themes/default/components/core/blocks/Product/Related.vue
+++ b/src/themes/default/components/core/blocks/Product/Related.vue
@@ -21,7 +21,7 @@ import ProductListing from 'theme/components/core/ProductListing'
 
 import { prepareRelatedQuery } from '@vue-storefront/core/modules/product/queries/related'
 import i18n from '@vue-storefront/i18n'
-import config from 'config'
+import store from '@vue-storefront/store'
 
 export default {
   name: 'Related',
@@ -42,13 +42,13 @@ export default {
   created () {
     this.$bus.$on('product-after-load', this.refreshList)
 
-    if (config.usePriceTiers) {
+    if (store.state.config.usePriceTiers) {
       this.$bus.$on('user-after-loggedin', this.refreshList)
       this.$bus.$on('user-after-logout', this.refreshList)
     }
   },
   beforeDestroy () {
-    if (config.usePriceTiers) {
+    if (store.state.config.usePriceTiers) {
       this.$bus.$off('user-after-loggedin', this.refreshList)
       this.$bus.$off('user-after-logout', this.refreshList)
     }
diff --git a/src/themes/default/components/core/blocks/Switcher/Language.vue b/src/themes/default/components/core/blocks/Switcher/Language.vue
index cc709e47c4..6d5af3a812 100644
--- a/src/themes/default/components/core/blocks/Switcher/Language.vue
+++ b/src/themes/default/components/core/blocks/Switcher/Language.vue
@@ -23,7 +23,7 @@
 </template>
 <script>
 import Modal from 'theme/components/core/Modal.vue'
-import config from 'config'
+import store from '@vue-storefront/store'
 export default {
   components: {
     Modal
@@ -35,14 +35,14 @@ export default {
   },
   computed: {
     storeViews () {
-      return config.storeViews
+      return store.state.config.storeViews
     },
     config () {
-      return config
+      return store.state.config
     },
     enableColumns () {
-      var enableStoreViews = Object.keys(config.storeViews).filter((key) => {
-        var value = config.storeViews[key]
+      var enableStoreViews = Object.keys(store.state.config.storeViews).filter((key) => {
+        var value = store.state.config.storeViews[key]
         return (typeof value === 'object' && value.disabled === false)
       })
       return enableStoreViews.length > this.minCountryPerColumn
diff --git a/src/themes/default/index.js b/src/themes/default/index.js
index b6a88a0450..07ea6f31ba 100644
--- a/src/themes/default/index.js
+++ b/src/themes/default/index.js
@@ -1,8 +1,7 @@
 import { setupMultistoreRoutes } from '@vue-storefront/store/lib/multistore'
-import config from 'config'
 import routes from './router'
 
-export default function (app, router, store) {
+export default function (app, router, store, config, ssrContext) {
   // if youre' runing multistore setup this is copying the routed above adding the 'storeCode' prefix to the urls and the names of the routes
   // You can do it on your own and then be able to customize the components used for example for German storeView checkout
   // To do so please execlude the desired storeView from the config.storeViews.mapStoreUrlsFor and map the urls by Your own like:
diff --git a/src/themes/default/pages/Error.vue b/src/themes/default/pages/Error.vue
new file mode 100644
index 0000000000..d1e6155b74
--- /dev/null
+++ b/src/themes/default/pages/Error.vue
@@ -0,0 +1,45 @@
+<template>
+  <div id="page_not_found">
+    <section class="bg-cl-secondary py35 px20">
+      <div class="container">
+        <h2>
+          {{ $t("Something went wrong ...") }}
+        </h2>
+      </div>
+    </section>
+    <section class="bg-cl-primary py35 px20">
+      <div class="container">
+        <div class="lh16 h5 weight-400">
+          <p>
+            {{ $t("We've noticed Internal Server Error while rendering this request.") }}
+          </p>
+          <p>
+            {{ $t('If you need an assistance you can drop us a line on') }}
+            <router-link :to="localizedRoute('/')" class="cl-secondary no-underline">
+              {{ $t('a chat') }}
+            </router-link>
+            {{ $t('or write to us through') }}
+            <router-link :to="localizedRoute('/contact')" class="cl-secondary no-underline">
+              {{ $t('a contact page') }}
+            </router-link>.
+          </p>
+        </div>
+      </div>
+    </section>
+  </div>
+</template>
+
+<script>
+import Error from '@vue-storefront/core/pages/Error'
+
+export default {
+  name: 'Error',
+  mixins: [Error]
+}
+</script>
+
+<style scoped>
+  a {
+    text-decoration: underline;
+  }
+</style>
diff --git a/src/themes/default/pages/Home.vue b/src/themes/default/pages/Home.vue
index bd9b87a162..defeb69921 100755
--- a/src/themes/default/pages/Home.vue
+++ b/src/themes/default/pages/Home.vue
@@ -34,9 +34,6 @@
 // 3rd party dependecies
 import { prepareQuery } from '@vue-storefront/core/modules/product/queries/common'
 
-// Core dependecies
-import config from 'config'
-
 // Core pages
 import Home from '@vue-storefront/core/pages/Home'
 
@@ -86,6 +83,7 @@ export default {
     }
   },
   asyncData ({ store, route }) { // this is for SSR purposes to prefetch data
+    const config = store.state.config
     return new Promise((resolve, reject) => {
       console.log('Entering asyncData for Home ' + new Date())
 
diff --git a/src/themes/default/router/index.js b/src/themes/default/router/index.js
index 5960e9dfe9..ed38f23e81 100644
--- a/src/themes/default/router/index.js
+++ b/src/themes/default/router/index.js
@@ -10,8 +10,7 @@ import PageNotFound from 'theme/pages/PageNotFound.vue'
 import MyAccount from 'theme/pages/MyAccount.vue'
 import CustomCmsPage from 'theme/pages/CustomCmsPage.vue'
 import CmsData from '@vue-storefront/extension-magento2-cms/components/CmsData'
-
-import config from 'config'
+import store from '@vue-storefront/store'
 
 let routes = [
   { name: 'home', path: '/', component: Home, alias: '/pwa.html' },
@@ -37,10 +36,11 @@ let routes = [
   { name: 'contact', path: '/contact', component: Static, props: {page: 'contact', title: 'Contact'} },
   { name: 'compare', path: '/compare', component: Compare, props: {title: 'Compare Products'} },
   { name: 'page-not-found', path: '/page-not-found', component: PageNotFound },
+  { name: 'error', path: '/error', component: Error, meta: { layout: 'empty' } },
   { name: 'custom-cms-page', path: '/custom-cms-page', component: CustomCmsPage },
   { name: 'cms-page-sync', path: '/cms-page-sync', component: CmsData, props: {identifier: 'about-us', type: 'Page', sync: true} }
 ]
-if (!config.products.useShortCatalogUrls) {
+if (!store.state.config.products.useShortCatalogUrls) {
   routes = routes.concat([{ name: 'virtual-product', path: '/p/:parentSku/:slug', component: Product }, // :sku param can be marked as optional with ":sku?" (https://github.com/vuejs/vue-router/blob/dev/examples/route-matching/app.js#L16), but it requires a lot of work to adjust the rest of the site
     { name: 'bundle-product', path: '/p/:parentSku/:slug', component: Product }, // :sku param can be marked as optional with ":sku?" (https://github.com/vuejs/vue-router/blob/dev/examples/route-matching/app.js#L16), but it requires a lot of work to adjust the rest of the site
     { name: 'simple-product', path: '/p/:parentSku/:slug', component: Product }, // :sku param can be marked as optional with ":sku?" (https://github.com/vuejs/vue-router/blob/dev/examples/route-matching/app.js#L16), but it requires a lot of work to adjust the rest of the site
diff --git a/src/themes/theme-starter/index.js b/src/themes/theme-starter/index.js
index b6a88a0450..07ea6f31ba 100644
--- a/src/themes/theme-starter/index.js
+++ b/src/themes/theme-starter/index.js
@@ -1,8 +1,7 @@
 import { setupMultistoreRoutes } from '@vue-storefront/store/lib/multistore'
-import config from 'config'
 import routes from './router'
 
-export default function (app, router, store) {
+export default function (app, router, store, config, ssrContext) {
   // if youre' runing multistore setup this is copying the routed above adding the 'storeCode' prefix to the urls and the names of the routes
   // You can do it on your own and then be able to customize the components used for example for German storeView checkout
   // To do so please execlude the desired storeView from the config.storeViews.mapStoreUrlsFor and map the urls by Your own like:
diff --git a/src/themes/theme-starter/router/index.js b/src/themes/theme-starter/router/index.js
index b64a098f56..95aeb20f48 100644
--- a/src/themes/theme-starter/router/index.js
+++ b/src/themes/theme-starter/router/index.js
@@ -3,13 +3,13 @@
 import Home from 'theme/pages/Home.vue'
 import Product from 'theme/pages/Product.vue'
 import Category from 'theme/pages/Category.vue'
-import config from 'config'
+import store from '@vue-storefront/store'
 
 let routes = [
   { path: '/', component: Home, name: 'home' }
 ]
 
-if (!config.products.useShortCatalogUrls) {
+if (!store.state.config.products.useShortCatalogUrls) {
   routes = routes.concat([{ name: 'virtual-product', path: '/p/:parentSku/:slug', component: Product }, // :sku param can be marked as optional with ":sku?" (https://github.com/vuejs/vue-router/blob/dev/examples/route-matching/app.js#L16), but it requires a lot of work to adjust the rest of the site
     { name: 'bundle-product', path: '/p/:parentSku/:slug', component: Product }, // :sku param can be marked as optional with ":sku?" (https://github.com/vuejs/vue-router/blob/dev/examples/route-matching/app.js#L16), but it requires a lot of work to adjust the rest of the site
     { name: 'simple-product', path: '/p/:parentSku/:slug', component: Product }, // :sku param can be marked as optional with ":sku?" (https://github.com/vuejs/vue-router/blob/dev/examples/route-matching/app.js#L16), but it requires a lot of work to adjust the rest of the site