diff --git a/package-lock.json b/package-lock.json
index c1a108055..343d23645 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -24,6 +24,8 @@
         "markdown-it": "12.3.2",
         "markdown-it-decorate": "1.2.2",
         "openseadragon": "^4.1.0",
+        "pinia": "2.1.7",
+        "pinia-plugin-persistedstate": "3.2.1",
         "socket.io-client": "4.7.5",
         "svg-overlay": "github:openseadragon/svg-overlay",
         "uuid": "3.4.0",
@@ -37,8 +39,6 @@
         "vue-matomo": "^4.2.0",
         "vue-router": "3.1.5",
         "vue-slider-component": "^3.1.1",
-        "vuex": "3.1.2",
-        "vuex-persistedstate": "2.7.0",
         "webfontloader": "1.6.28"
       },
       "devDependencies": {
@@ -12233,6 +12233,11 @@
       "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=",
       "dev": true
     },
+    "node_modules/@vue/devtools-api": {
+      "version": "6.6.1",
+      "resolved": "https://registry.npmjs.org/@vue/devtools-api/-/devtools-api-6.6.1.tgz",
+      "integrity": "sha512-LgPscpE3Vs0x96PzSSB4IGVSZXZBZHpfxs+ZA1d+VEPwHdOXowy/Y2CsvCAIFrf+ssVU1pD1jidj505EpUnfbA=="
+    },
     "node_modules/@vue/eslint-config-airbnb": {
       "version": "5.3.0",
       "resolved": "https://registry.npmjs.org/@vue/eslint-config-airbnb/-/eslint-config-airbnb-5.3.0.tgz",
@@ -17045,6 +17050,7 @@
       "version": "4.2.2",
       "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz",
       "integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==",
+      "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -27916,6 +27922,64 @@
         "node": ">=6"
       }
     },
+    "node_modules/pinia": {
+      "version": "2.1.7",
+      "resolved": "https://registry.npmjs.org/pinia/-/pinia-2.1.7.tgz",
+      "integrity": "sha512-+C2AHFtcFqjPih0zpYuvof37SFxMQ7OEG2zV9jRI12i9BOy3YQVAHwdKtyyc8pDcDyIc33WCIsZaCFWU7WWxGQ==",
+      "dependencies": {
+        "@vue/devtools-api": "^6.5.0",
+        "vue-demi": ">=0.14.5"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/posva"
+      },
+      "peerDependencies": {
+        "@vue/composition-api": "^1.4.0",
+        "typescript": ">=4.4.4",
+        "vue": "^2.6.14 || ^3.3.0"
+      },
+      "peerDependenciesMeta": {
+        "@vue/composition-api": {
+          "optional": true
+        },
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/pinia-plugin-persistedstate": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/pinia-plugin-persistedstate/-/pinia-plugin-persistedstate-3.2.1.tgz",
+      "integrity": "sha512-MK++8LRUsGF7r45PjBFES82ISnPzyO6IZx3CH5vyPseFLZCk1g2kgx6l/nW8pEBKxxd4do0P6bJw+mUSZIEZUQ==",
+      "peerDependencies": {
+        "pinia": "^2.0.0"
+      }
+    },
+    "node_modules/pinia/node_modules/vue-demi": {
+      "version": "0.14.8",
+      "resolved": "https://registry.npmjs.org/vue-demi/-/vue-demi-0.14.8.tgz",
+      "integrity": "sha512-Uuqnk9YE9SsWeReYqK2alDI5YzciATE0r2SkA6iMAtuXvNTMNACJLJEXNXaEy94ECuBe4Sk6RzRU80kjdbIo1Q==",
+      "hasInstallScript": true,
+      "bin": {
+        "vue-demi-fix": "bin/vue-demi-fix.js",
+        "vue-demi-switch": "bin/vue-demi-switch.js"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/antfu"
+      },
+      "peerDependencies": {
+        "@vue/composition-api": "^1.0.0-rc.1",
+        "vue": "^3.0.0-0 || ^2.6.0"
+      },
+      "peerDependenciesMeta": {
+        "@vue/composition-api": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/pinkie": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
@@ -31955,12 +32019,6 @@
       "dev": true,
       "optional": true
     },
-    "node_modules/shvl": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/shvl/-/shvl-2.0.0.tgz",
-      "integrity": "sha512-WbpzSvI5XgVGJ3A4ySGe8hBxj0JgJktfnoLhhJmvITDdK21WPVWwgG8GPlYEh4xqdti3Ff7PJ5G0QrRAjNS0Ig==",
-      "deprecated": "older versions vulnerable to prototype pollution"
-    },
     "node_modules/side-channel": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
@@ -33915,7 +33973,7 @@
       "version": "4.9.4",
       "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.4.tgz",
       "integrity": "sha512-Uz+dTXYzxXXbsFpM86Wh3dKCxrQqUcVMxwU54orwlJjOpO3ao8L7j5lH+dWfTwgCwIuM9GQ2kvVotzYJMXTBZg==",
-      "dev": true,
+      "devOptional": true,
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"
@@ -35005,25 +35063,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/vuex": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/vuex/-/vuex-3.1.2.tgz",
-      "integrity": "sha512-ha3jNLJqNhhrAemDXcmMJMKf1Zu4sybMPr9KxJIuOpVcsDQlTBYLLladav2U+g1AvdYDG5Gs0xBTb0M5pXXYFQ=="
-    },
-    "node_modules/vuex-persistedstate": {
-      "version": "2.7.0",
-      "resolved": "https://registry.npmjs.org/vuex-persistedstate/-/vuex-persistedstate-2.7.0.tgz",
-      "integrity": "sha512-mpko65DUMBY4mF4sSGsgrqjE7fwO373LFZeuNrC55glRuBBAK4dkgzjr4j4Bij7WtMoKuo2t2w0NGenjauISaQ==",
-      "deprecated": "Package no longer supported. Contact Support at https://www.npmjs.com/support for more info.",
-      "dependencies": {
-        "deepmerge": "^4.2.2",
-        "shvl": "^2.0.0"
-      },
-      "peerDependencies": {
-        "vue": "^2.0.0",
-        "vuex": "^2.0.0 || ^3.0.0"
-      }
-    },
     "node_modules/w3c-hr-time": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz",
@@ -45264,6 +45303,11 @@
         }
       }
     },
+    "@vue/devtools-api": {
+      "version": "6.6.1",
+      "resolved": "https://registry.npmjs.org/@vue/devtools-api/-/devtools-api-6.6.1.tgz",
+      "integrity": "sha512-LgPscpE3Vs0x96PzSSB4IGVSZXZBZHpfxs+ZA1d+VEPwHdOXowy/Y2CsvCAIFrf+ssVU1pD1jidj505EpUnfbA=="
+    },
     "@vue/eslint-config-airbnb": {
       "version": "5.3.0",
       "resolved": "https://registry.npmjs.org/@vue/eslint-config-airbnb/-/eslint-config-airbnb-5.3.0.tgz",
@@ -49147,7 +49191,8 @@
     "deepmerge": {
       "version": "4.2.2",
       "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz",
-      "integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg=="
+      "integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==",
+      "dev": true
     },
     "default-browser-id": {
       "version": "1.0.4",
@@ -57730,6 +57775,29 @@
       "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
       "dev": true
     },
+    "pinia": {
+      "version": "2.1.7",
+      "resolved": "https://registry.npmjs.org/pinia/-/pinia-2.1.7.tgz",
+      "integrity": "sha512-+C2AHFtcFqjPih0zpYuvof37SFxMQ7OEG2zV9jRI12i9BOy3YQVAHwdKtyyc8pDcDyIc33WCIsZaCFWU7WWxGQ==",
+      "requires": {
+        "@vue/devtools-api": "^6.5.0",
+        "vue-demi": ">=0.14.5"
+      },
+      "dependencies": {
+        "vue-demi": {
+          "version": "0.14.8",
+          "resolved": "https://registry.npmjs.org/vue-demi/-/vue-demi-0.14.8.tgz",
+          "integrity": "sha512-Uuqnk9YE9SsWeReYqK2alDI5YzciATE0r2SkA6iMAtuXvNTMNACJLJEXNXaEy94ECuBe4Sk6RzRU80kjdbIo1Q==",
+          "requires": {}
+        }
+      }
+    },
+    "pinia-plugin-persistedstate": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/pinia-plugin-persistedstate/-/pinia-plugin-persistedstate-3.2.1.tgz",
+      "integrity": "sha512-MK++8LRUsGF7r45PjBFES82ISnPzyO6IZx3CH5vyPseFLZCk1g2kgx6l/nW8pEBKxxd4do0P6bJw+mUSZIEZUQ==",
+      "requires": {}
+    },
     "pinkie": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
@@ -60863,11 +60931,6 @@
       "dev": true,
       "optional": true
     },
-    "shvl": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/shvl/-/shvl-2.0.0.tgz",
-      "integrity": "sha512-WbpzSvI5XgVGJ3A4ySGe8hBxj0JgJktfnoLhhJmvITDdK21WPVWwgG8GPlYEh4xqdti3Ff7PJ5G0QrRAjNS0Ig=="
-    },
     "side-channel": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
@@ -62436,7 +62499,7 @@
       "version": "4.9.4",
       "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.4.tgz",
       "integrity": "sha512-Uz+dTXYzxXXbsFpM86Wh3dKCxrQqUcVMxwU54orwlJjOpO3ao8L7j5lH+dWfTwgCwIuM9GQ2kvVotzYJMXTBZg==",
-      "dev": true
+      "devOptional": true
     },
     "uberproto": {
       "version": "2.0.6",
@@ -63259,20 +63322,6 @@
       "integrity": "sha512-4gDntzrifFnCEvyoO8PqyJDmguXgVPxKiIxrBKjIowvL9l+N66196+72XVYR8BBf1Uv1Fgt3bGevJ+sEmxfZzw==",
       "dev": true
     },
-    "vuex": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/vuex/-/vuex-3.1.2.tgz",
-      "integrity": "sha512-ha3jNLJqNhhrAemDXcmMJMKf1Zu4sybMPr9KxJIuOpVcsDQlTBYLLladav2U+g1AvdYDG5Gs0xBTb0M5pXXYFQ=="
-    },
-    "vuex-persistedstate": {
-      "version": "2.7.0",
-      "resolved": "https://registry.npmjs.org/vuex-persistedstate/-/vuex-persistedstate-2.7.0.tgz",
-      "integrity": "sha512-mpko65DUMBY4mF4sSGsgrqjE7fwO373LFZeuNrC55glRuBBAK4dkgzjr4j4Bij7WtMoKuo2t2w0NGenjauISaQ==",
-      "requires": {
-        "deepmerge": "^4.2.2",
-        "shvl": "^2.0.0"
-      }
-    },
     "w3c-hr-time": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz",
diff --git a/package.json b/package.json
index 04e70850b..43ee2be85 100644
--- a/package.json
+++ b/package.json
@@ -49,9 +49,9 @@
     "vue-matomo": "^4.2.0",
     "vue-router": "3.1.5",
     "vue-slider-component": "^3.1.1",
-    "vuex": "3.1.2",
-    "vuex-persistedstate": "2.7.0",
-    "webfontloader": "1.6.28"
+    "webfontloader": "1.6.28",
+    "pinia": "2.1.7",
+    "pinia-plugin-persistedstate": "3.2.1"
   },
   "devDependencies": {
     "@babel/core": "^7.20.7",
diff --git a/src/App.vue b/src/App.vue
index 7e8aabbc4..3e5c23167 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -43,6 +43,10 @@ import { CommonQueryParameters } from './router/util'
 import { joinFiltersWithItems, optimizeFilters, serializeFilters } from './logic/filters'
 import { searchQueryGetter } from './logic/queryParams'
 import { filtersItems } from './services'
+import { mapStores } from 'pinia'
+import { useSettingsStore } from '@/stores/settings'
+import { useUserStore } from '@/stores/user'
+import { useNotificationsStore } from '@/stores/notifications'
 
 export default {
   name: 'app',
@@ -71,6 +75,7 @@ export default {
     },
   },
   computed: {
+    ...mapStores(useSettingsStore, useUserStore, useNotificationsStore),
     searchQuery: {
       ...searchQueryGetter(),
     },
@@ -80,14 +85,14 @@ export default {
       return this.searchQuery.filters
     },
     termsAgreed() {
-      console.info('Terms agreement:', this.$store.state.settings.termsAgreed)
-      if (this.$store.state.user.userData) {
+      console.info('Terms agreement:', this.settingsStore.termsAgreed)
+      if (this.userStore.userData) {
         return true
       }
-      return this.$store.state.settings.termsAgreed
+      return this.settingsStore.termsAgreed
     },
     is_locked() {
-      return this.$store.state.processingLocked
+      return this.notificationsStore.processingLocked
     },
   },
   methods: {
diff --git a/src/components/Autocomplete.vue b/src/components/Autocomplete.vue
index 3aea7e44c..3d9b88104 100644
--- a/src/components/Autocomplete.vue
+++ b/src/components/Autocomplete.vue
@@ -106,7 +106,10 @@
 
 <script>
 import ClickOutside from 'vue-click-outside'
+import { mapStores } from 'pinia'
 import FilterFactory from '@/models/FilterFactory'
+import { useAutocompleteStore } from '@/stores/autocomplete'
+import { useUserStore } from '@/stores/user'
 import Explorer from './Explorer'
 
 const AVAILABLE_TYPES = ['mention', 'newspaper', 'topic', 'location', 'person', 'collection']
@@ -149,8 +152,9 @@ export default {
     },
   },
   computed: {
+    ...mapStores(useAutocompleteStore, useUserStore),
     user() {
-      return this.$store.getters['user/user']
+      return this.userStore.user
     },
     staticSuggestions() {
       return this.initialSuggestions.concat(this.recentSuggestions).map((d, idx) => ({
@@ -258,27 +262,21 @@ export default {
       this.showSuggestions = this.q.length > 0
       // debugger;
       if (this.q.length) {
-        this.$store.dispatch('autocomplete/SUGGEST_RECENT_QUERY', this.q).then(res => {
-          this.recentSuggestions = res.map(d => ({
-            ...d,
-            type: 'string',
-          }))
-        })
+        const res = this.autocompleteStore.suggestRecentQuery(this.q)
+        this.recentSuggestions = res.map(d => ({
+          ...d,
+          type: 'string',
+        }))
       }
 
       if (this.q.length > 1) {
-        this.$store
-          .dispatch('autocomplete/SEARCH', {
-            q: this.q.trim(),
-          })
+        this.autocompleteStore
+          .search(this.q.trim())
           .then(res => {
             this.suggestions = [...res, ...this.collectionSuggestions]
           })
         if (this.user) {
-          this.$store
-            .dispatch('autocomplete/SUGGEST_COLLECTIONS', {
-              q: this.q.trim(),
-            })
+          this.autocompleteStore.suggestCollections(this.q.trim())
             .then(res => {
               this.collectionSuggestions = res
               this.suggestions = [...res, ...this.suggestions]
@@ -308,9 +306,7 @@ export default {
       } else if (['string', 'title', 'mention'].includes(type)) {
         const sq = String(q || item.name || this.q || '').trim()
         if (sq.length) {
-          this.$store.dispatch('autocomplete/SAVE_RECENT_QUERY', {
-            q: sq,
-          })
+          this.autocompleteStore.saveRecentQuery(sq)
           this.$emit(
             'submit',
             FilterFactory.create({
diff --git a/src/components/CollectionDetailPage.vue b/src/components/CollectionDetailPage.vue
index d00473528..2eaa1a22f 100644
--- a/src/components/CollectionDetailPage.vue
+++ b/src/components/CollectionDetailPage.vue
@@ -237,6 +237,7 @@
 </template>
 
 <script>
+import { mapStores } from 'pinia'
 import { protobuf } from 'impresso-jscommons'
 import Collection from '@/models/Collection';
 import SearchResultsListItem from '@/components/modules/SearchResultsListItem';
@@ -261,6 +262,9 @@ import { exporter as exporterService,
 import RadioGroup from '@/components/layout/RadioGroup.vue';
 import Modal from '@/components/base/Modal.vue'
 import { hide } from '@floating-ui/vue';
+import { useCollectionsStore } from '@/stores/collections'
+import { useSettingsStore } from '@/stores/settings'
+
 
 const QueryParameters = Object.freeze({
   RecommendersSettings: 'rs',
@@ -302,6 +306,7 @@ export default {
     Modal,
   },
   computed: {
+    ...mapStores(useCollectionsStore, useSettingsStore),
     displayStyleOptions() {
       return [
         {value: 'list', text: this.$t('display_button_list')},
@@ -334,19 +339,19 @@ export default {
     },
     collections: {
       get() {
-        return this.$store.getters['collections/collections'];
+        return this.collectionsStore.collections
       },
     },
     displayStyle: {
       get() {
-        const style = this.$store.state.search.displayStyle
+        const style = this.settingsStore.searchDisplayStyle
         if (['list', 'tiles'].includes(style)) {
           return style
         }
         return 'list'
       },
       set(displayStyle) {
-        this.$store.commit('search/UPDATE_SEARCH_DISPLAY_STYLE', displayStyle);
+        this.settingsStore.updateSearchDisplayStyle(displayStyle)
       },
     },
     tabs() {
@@ -481,27 +486,26 @@ export default {
       });
     },
     remove(collection) {
-      this.$store.dispatch('collections/DELETE_COLLECTION', collection.uid).then(() => {
-        this.$store.dispatch('collections/LOAD_COLLECTIONS').then(() => {
-          this.$router.push({
-            name: 'collections',
-          });
-        });
-      });
+      this.collectionsStore
+        .deleteCollection(collection.uid)
+        .then(() => this.collectionsStore.loadCollections())
+        .then(() => this.$router.push({ name: 'collections' }))
     },
     save(collection) {
       if (collection.uid) {
-        this.$store.dispatch('collections/EDIT_COLLECTION', {
+        this.collectionsStore.editCollection({
           uid: collection.uid,
           name: collection.name,
           description: collection.description,
         }).then((res) => {
           const idx = this.collections.findIndex(c => c.uid === res.uid);
-          this.collections[idx].name = res.name;
-          this.collections[idx].description = res.description;
+          if (idx >= 0 && this.collections[idx]) {
+            this.collections[idx].name = res.name;
+            this.collections[idx].description = res.description;
+          }
         });
       } else {
-        this.$store.dispatch('collections/ADD_COLLECTION', {
+        this.collectionsStore.addCollection({
           name: collection.name,
           description: collection.description,
         }).then((res) => {
@@ -539,10 +543,11 @@ export default {
     },
     loadTimeline() {
       this.isTimelineLoading = true;
-      return this.$store.dispatch('collections/LOAD_TIMELINE', this.$route.params.collection_uid).then((values) => {
-        this.timevalues = values;
-        this.isTimelineLoading = false;
-      });
+      return this.collectionsStore.loadTimeline(this.$route.params.collection_uid)
+        .then((values) => {
+          this.timevalues = values;
+          this.isTimelineLoading = false;
+        });
     },
     loadFacets(type) {
       return searchFacetsService.get(type, {
diff --git a/src/components/CollectionTagger.vue b/src/components/CollectionTagger.vue
index a0c738494..62b4a7857 100644
--- a/src/components/CollectionTagger.vue
+++ b/src/components/CollectionTagger.vue
@@ -37,8 +37,11 @@
 </template>
 
 <script>
+import { mapStores } from 'pinia'
 import Icon from 'vue-awesome/components/Icon';
 import 'vue-awesome/icons/times';
+import { useCollectionsStore } from '@/stores/collections'
+import { userUserStore } from '@/stores/user'
 
 export default {
   data: () => ({
@@ -51,19 +54,18 @@ export default {
     item: Object,
   },
   computed: {
+    ...mapStores(useCollectionsStore, userUserStore),
     collections: {
       get() {
-        return this.$store.getters['collections/collections'];
+        return this.collectionsStore.collections
       },
     },
     collectionsSortOrder: {
       get() {
-        return this.$store.getters['collections/collectionsSortOrder'];
+        return this.collectionsStore.collectionsSortOrder
       },
       set(collectionsSortOrder) {
-        this.$store.commit('collections/SET_COLLECTIONS_SORT_ORDER', {
-          collectionsSortOrder,
-        });
+        this.collectionsStore.setCollectionsSortOrder(collectionsSortOrder)
       },
     },
   },
@@ -76,23 +78,23 @@ export default {
 
       if (idx >= 0) {
         this.item.collections.splice(idx, 1);
-        this.$store.dispatch('collections/REMOVE_COLLECTION_ITEM', {
+        this.collectionsStore.removeCollectionItem({
           collection,
           item: this.item,
-        });
+        })
       } else {
         this.item.collections.push(collection);
-        this.$store.dispatch('collections/ADD_COLLECTION_ITEM', {
+        this.collectionsStore.addCollectionItem({
           collection,
           item: this.item,
-        });
+        })
       }
     },
     toggle() {
       this.show = !this.show;
     },
     isLoggedIn() {
-      return this.$store.state.user.userData;
+      return this.userStore.userData
     },
   },
   components: {
diff --git a/src/components/EntitiesDetailPage.vue b/src/components/EntitiesDetailPage.vue
index 02ea781ca..c01886016 100644
--- a/src/components/EntitiesDetailPage.vue
+++ b/src/components/EntitiesDetailPage.vue
@@ -167,6 +167,10 @@ import ArticleItem from '@/components/modules/lists/ArticleItem';
 import MentionItem from '@/components/modules/lists/MentionItem';
 import StackedBarsPanel from '@/components/modules/vis/StackedBarsPanel';
 import { searchFacets as searchFacetsService } from '@/services';
+import { mapStores } from 'pinia'
+import { useEntitiesStore } from '@/stores/entities'
+import { useSettingsStore } from '@/stores/settings'
+import { useUserStore } from '@/stores/user'
 
 const TAB_ARTICLES = 'articles';
 const TAB_MENTIONS = 'mentions';
@@ -201,6 +205,7 @@ export default {
     StackedBarsPanel,
   },
   computed: {
+    ...mapStores(useEntitiesStore, useSettingsStore, useUserStore),
     startYear() {
       return window.impressoDocumentsYearSpan.firstYear;
     },
@@ -279,9 +284,6 @@ export default {
         ...common,
       ];
     },
-    countMentions() {
-      return this.$store.state.mentions.pagination.totalRows;
-    },
     tabs() {
       return [
         {
@@ -310,7 +312,7 @@ export default {
       return null;
     },
     activeLanguageCode() {
-      return this.$store.state.settings.language_code;
+      return this.settingsStore.language_code
     },
     bbox() {
       if (!this.entity.wikidata) {
@@ -323,10 +325,10 @@ export default {
   },
   methods: {
     getEntity() {
-      return this.$store.dispatch('entities/LOAD_DETAIL', this.$route.params.entity_id);
+      return this.entitiesStore.loadDetail(this.$route.params.entity_id);
     },
     async loadFacets() {
-      this.$store.dispatch('entities/LOAD_TIMELINE', this.$route.params.entity_id).then((values) => {
+      this.entitiesStore.loadTimeline(this.$route.params.entity_id).then((values) => {
         this.timevalues = values;
       });
       this.facets = [];
@@ -351,7 +353,7 @@ export default {
       return this.loadFacets();
     },
     loadArticles(page = 1) {
-      return this.$store.dispatch('entities/LOAD_ENTITY_ARTICLES', {
+      return this.entitiesStore.loadEntityArticles({
         page,
         orderBy: this.currentOrderBy,
         filters: [
@@ -370,7 +372,7 @@ export default {
       });
     },
     loadMentions(page = 1) {
-      return this.$store.dispatch('entities/LOAD_ENTITY_MENTIONS', {
+      return this.entitiesStore.loadEntityMentions({
         page,
         orderBy: this.currentOrderBy,
         filters: [
@@ -409,7 +411,7 @@ export default {
       return numYear;
     },
     isLoggedIn() {
-      return this.$store.state.user.userData;
+      return this.userStore.userData
     },
   },
   watch: {
diff --git a/src/components/EntitiesExplorerPage.vue b/src/components/EntitiesExplorerPage.vue
index 10b1799be..e8439d24e 100644
--- a/src/components/EntitiesExplorerPage.vue
+++ b/src/components/EntitiesExplorerPage.vue
@@ -195,6 +195,7 @@ import {
 import { getQueryParameter } from '@/router/util'
 import { SupportedFiltersByContext } from '@/logic/filters'
 import SearchQuery from '@/models/SearchQuery'
+import { searchFacets as searchFacetsService } from '@/services'
 
 /**
  * @typedef {import('@/models').Filter} Filter
@@ -545,7 +546,12 @@ export default {
 
       try {
         this.isTimelineLoading = true;
-        this.timevalues = await this.$store.dispatch('search/LOAD_TIMELINE', {filters})
+        this.timevalues = await searchFacetsService.get('year', {
+          query: {
+            filters,
+            limit: 500,
+          },
+        }).then(res => Helpers.timeline.fromBuckets(res.buckets))
       } finally {
         this.isTimelineLoading = false;
       }
diff --git a/src/components/FaqPage.vue b/src/components/FaqPage.vue
index 4badfc7a8..cf01f025e 100644
--- a/src/components/FaqPage.vue
+++ b/src/components/FaqPage.vue
@@ -29,6 +29,8 @@
 
 <script>
 import content from '@/assets/faqpage.json';
+import { mapStores } from 'pinia'
+import { useSettingsStore } from '@/stores/settings'
 
 const ApiVersionLine = apiVersion => `
 API: v${apiVersion.version},
@@ -44,6 +46,7 @@ Revision <a href="https://github.com/impresso/impresso-frontend/commit/${process
 
 export default {
   computed: {
+    ...mapStores(useSettingsStore),
     faq: {
       get() {
         const faqContent = content[this.activeLanguageCode];
@@ -52,7 +55,7 @@ export default {
       },
     },
     activeLanguageCode() {
-      return this.$store.state.settings.language_code;
+      return this.settingsStore.language_code
     },
   },
   methods: {
diff --git a/src/components/HomePage2020.vue b/src/components/HomePage2020.vue
index 688a8e69d..e46479426 100644
--- a/src/components/HomePage2020.vue
+++ b/src/components/HomePage2020.vue
@@ -174,7 +174,7 @@
             </b-col>
             <b-col lg="6" md="12">
               <div class="py-3 pr-3">
-                
+
                 <p>
                   <b
                     >How to explore the newspapers with persons or locations? <br />What are topics
@@ -255,6 +255,8 @@ import Recipe from './Recipe'
 import { optimizeFilters, serializeFilters } from '@/logic/filters'
 // import SearchQuery from '@/models/SearchQuery';
 import content from '@/assets/homepage.json'
+import { mapStores } from 'pinia'
+import { useUserStore } from '@/stores/user'
 
 const AllowedFilterTypes = [
   'accessRight',
@@ -300,6 +302,7 @@ export default {
     },
   },
   computed: {
+    ...mapStores(useUserStore),
     /** @returns {Filter[]} */
     enrichedFilters() {
       return this.filtersWithItems.length
@@ -317,7 +320,7 @@ export default {
     },
 
     user() {
-      return this.$store.getters['user/user']
+      return this.userStore.user
     },
     computedRecipesWithQuery() {
       return this.recipes.filter(recipe => recipe.query)
diff --git a/src/components/HomePageSplash.vue b/src/components/HomePageSplash.vue
index accc0be46..493ff2b8b 100644
--- a/src/components/HomePageSplash.vue
+++ b/src/components/HomePageSplash.vue
@@ -29,9 +29,6 @@ export default {
   methods: {
     onSuggestion(suggestion) {
       throw new Error(`This handler needs to be updated to add filters to current search query: ${suggestion}`)
-      // this.$store.commit('search/CLEAR');
-      // this.$store.commit('search/ADD_FILTER', suggestion);
-      // this.$store.dispatch('search/PUSH_SEARCH_PARAMS');
     },
   },
   components: {
diff --git a/src/components/IssuePage.vue b/src/components/IssuePage.vue
index 61a162c37..09882ca1c 100644
--- a/src/components/IssuePage.vue
+++ b/src/components/IssuePage.vue
@@ -183,7 +183,12 @@ import InfoButton from './base/InfoButton';
 import { toCanonicalFilter, SupportedFiltersByContext } from '../logic/filters'
 import { mapSearchQuery } from '@/logic/queryParams'
 import RadioGroup from '@/components/layout/RadioGroup.vue';
-
+import { mapStores } from 'pinia'
+import { useEntitiesStore } from '@/stores/entities'
+import { useIssueStore } from '@/stores/issue'
+import { useUserStore } from '@/stores/user'
+import { search as searchService } from '@/services'
+import Article from '@/models/Article';
 
 export default {
   data: () => ({
@@ -226,6 +231,7 @@ export default {
     window.removeEventListener('keydown', this.keyDown);
   },
   computed: {
+    ...mapStores(useEntitiesStore, useIssueStore, useUserStore),
     modeOptions() {
       return [
         { value: 'image', text: this.$t('facsimileView'), iconName: 'image' },
@@ -247,10 +253,10 @@ export default {
       return false;
     },
     currentUser() {
-      return this.$store.getters['user/user'];
+      return this.userStore.user
     },
     issue() {
-      return this.$store.state.issue.issue;
+      return this.issueStore.issue
     },
     isTocReady() {
       return this.issue && this.page && this.isTocLoaded;
@@ -288,19 +294,21 @@ export default {
     mode: {
       get() {
         // no article°uid? image without a doubt
-        return this.$route.params.article_uid ? this.$store.state.issue.viewerMode : 'image';
+        return this.$route.params.article_uid ?
+          this.issueStore.viewerMode :
+          'image';
       },
       set(mode) {
-        this.$store.commit('issue/UPDATE_VIEWER_MODE', mode);
+        this.issueStore.updateViewerMode(mode)
         this.init();
       },
     },
     showOutlines: {
       get() {
-        return this.$store.state.issue.showOutlines;
+        return this.issueStore.showOutlines;
       },
       set(showOutlines) {
-        this.$store.commit('issue/UPDATE_OUTLINES', showOutlines);
+        this.issueStore.updateOutlines(showOutlines)
       },
     },
     filters: {
@@ -610,27 +618,27 @@ export default {
     },
     loadIssue({ uid }) {
       // console.info('...loading issue', uid);
-      return this.$store.dispatch('issue/LOAD_ISSUE', uid);
+      return this.issueStore.loadIssue(uid);
     },
     loadPage({ uid }) {
       // console.info('...loading page', uid);
-      return this.$store.dispatch('issue/LOAD_PAGE', uid);
+      return this.issueStore.loadPage(uid);
     },
     loadPageTopics({ uid }) {
       // console.info('...loading marginalia topics', uid);
-      return this.$store.dispatch('entities/LOAD_PAGE_TOPICS', uid);
+      return this.entitiesStore.loadPageTopics(uid);
     },
     loadPageEntities({ uid }) {
       // console.info('...loading marginalia named entities', uid);
-      return this.$store.dispatch('entities/LOAD_PAGE_ENTITIES', uid);
+      return this.entitiesStore.loadPageEntities(uid);
     },
     loadArticle({ uid }) {
       // console.info('...loading article', uid);
-      return this.$store.dispatch('issue/LOAD_ARTICLE', uid);
+      return this.issueStore.loadArticle(uid);
     },
     loadToC() {
       // console.info('...loading ToC', this.issue.uid);
-      return this.$store.dispatch('issue/LOAD_TABLE_OF_CONTENTS')
+      return this.issueStore.loadTableOfContents()
         .then((articles) => {
           this.tocArticles = articles;
           this.isTocLoaded = true;
@@ -672,17 +680,29 @@ export default {
         // console.info('-> search() skip, q is empty.');
         return;
       }
-      this.$store.dispatch('search/GET_SEARCH_RESULTS', {
+
+      const query = {
         filters: filters.map(toCanonicalFilter),
-        orderBy: 'id',
-        groupBy: 'raw',
+        facets: [],
+        group_by: 'raw',
         page: this.matchesCurrentPage,
+        limit: 12,
+        order_by: 'id',
+      }
+
+      searchService.find({
+        query,
+      }).then((res) => {
+        if (query.groupBy === 'articles') {
+          res.data = res.data.map(result => new Article(result));
+        }
+        return res;
       }).then((result) => {
         this.isSearchLoaded = true;
         this.matches = result.data;
         this.matchesTotalRows = result.total;
         // console.info('-> search() success for q:', this.q);
-      });
+      })
     },
     selectArticle() {
       const self = this;
diff --git a/src/components/Monitor.vue b/src/components/Monitor.vue
index 1a6ef154d..c2de0dbf0 100644
--- a/src/components/Monitor.vue
+++ b/src/components/Monitor.vue
@@ -98,7 +98,8 @@
 </template>
 
 <script>
-import { mapActions, mapState } from 'vuex'
+import { mapState, mapActions, mapStores } from 'pinia'
+import { useMonitorStore } from '@/stores/monitor'
 import Ellipsis from './modules/Ellipsis';
 import Timeline from './modules/Timeline';
 import WikidataBlock from './modules/WikidataBlock';
@@ -115,7 +116,7 @@ import { containsFilter } from '@/logic/filters'
  * Display info about the current selected item.
  * Trigger from inside a component:
        ```
-       this.$store.dispatch('monitor/ACTIVATE', {
+       this.monitorStore.activate({
           item: {...},
           type: '...facet type...',
           filters: [...],
@@ -160,8 +161,8 @@ export default {
     switchTab(tab) {
       this.tab = tab;
     },
-    ...mapActions('monitor', {
-      fadeOut: 'HIDE'
+    ...mapActions(useMonitorStore, {
+      fadeOut: 'hide'
     }),
     /**
      * @param {string} context
@@ -179,7 +180,7 @@ export default {
 
       if (!isAlreadyIncluded) {
         const updatedFilters = [...this.searchQueryFilters].concat(newFilter)
-        await this.$store.dispatch('monitor/UPDATE_FILTERS', updatedFilters);
+        await this.monitorStore.updateFilters(updatedFilters)
       }
       this.fadeOut();
     },
@@ -188,7 +189,8 @@ export default {
     }
   },
   computed: {
-    ...mapState('monitor', [
+    ...mapStores(useMonitorStore),
+    ...mapState(useMonitorStore, [
       'type',
       'item',
       'isActive',
@@ -198,11 +200,12 @@ export default {
       'groupBy',
       'isPending'
     ]),
-    ...mapState('monitor', {
+    ...mapState(useMonitorStore, {
       itemTimeline: 'timeline',
       searchQueryFilters: 'filters',
+      applyCurrentSearchFiltersValue: 'applyCurrentSearchFilters'
     }),
-    ...mapState('monitor', {
+    ...mapState(useMonitorStore, {
       filterModificationsEnabled: state => !state.disableFilterModification
     }),
     /** @returns {[number, number] | []} */
@@ -299,12 +302,12 @@ export default {
     applyCurrentSearchFilters: {
       /** @returns {boolean} */
       get() {
-        return this.$store.state.monitor.applyCurrentSearchFilters;
+        return this.applyCurrentSearchFiltersValue
       },
       /** @param {boolean} val */
       set(val) {
-        this.$store.dispatch('monitor/SET_APPLY_CURRENT_SEARCH_FILTERS', val);
-        this.$store.dispatch('monitor/LOAD_ITEM_TIMELINE');
+        this.monitorStore.setApplyCurrentSearchFilters(val)
+        this.monitorStore.loadItemTimeline()
       },
     },
   },
diff --git a/src/components/NewspapersDetailPage.vue b/src/components/NewspapersDetailPage.vue
index 15676dc01..efd887999 100644
--- a/src/components/NewspapersDetailPage.vue
+++ b/src/components/NewspapersDetailPage.vue
@@ -163,6 +163,8 @@ import {
   searchFacets as searchFacetsService,
   newspapers as newspapersService,
 } from '@/services'
+import Helpers from '@/plugins/Helpers';
+
 
 const OrderByOptions = ['-date', 'date']
 const OrderByDefault = '-date'
@@ -305,13 +307,16 @@ export default {
       this.page = page
     },
     loadTimeline() {
-      return this.$store
-        .dispatch('search/LOAD_TIMELINE', {
+      return searchFacetsService.get('year', {
+        query: {
           filters: [{ type: 'newspaper', q: [this.newspaperUid] }],
-        })
-        .then(values => {
-          this.timevalues = values
-        })
+          limit: 500,
+        },
+      })
+      .then(res => Helpers.timeline.fromBuckets(res.buckets))
+      .then(values => {
+        this.timevalues = values
+      })
     },
     async loadFacets() {
       this.facets = []
diff --git a/src/components/NewspapersLines.vue b/src/components/NewspapersLines.vue
index b1f59c1f4..1faa671aa 100644
--- a/src/components/NewspapersLines.vue
+++ b/src/components/NewspapersLines.vue
@@ -57,6 +57,8 @@
 <script>
 import * as d3 from 'd3';
 import Tooltip from './modules/tooltips/Tooltip';
+import { mapStores } from 'pinia'
+import { useMonitorStore } from '@/stores/monitor'
 
 export default {
   model: {
@@ -156,7 +158,7 @@ export default {
       this.tooltip.isActive = false;
     },
     selectNewspaper(item) {
-      this.$store.dispatch('monitor/ACTIVATE', {
+      this.monitorStore.activate({
         item,
         type: 'newspaper',
         disableFilterModification: true
@@ -218,6 +220,7 @@ export default {
     window.removeEventListener('resize', this.onResize);
   },
   computed: {
+    ...mapStores(useMonitorStore),
     tooltipProperties() {
       if (!this.tooltip.item || !this.tooltip.item.properties) {
         return '';
diff --git a/src/components/SelectionMonitor.vue b/src/components/SelectionMonitor.vue
index 5a6a4d76c..9fb6d087b 100644
--- a/src/components/SelectionMonitor.vue
+++ b/src/components/SelectionMonitor.vue
@@ -192,6 +192,8 @@ import SelectionMonitorFilter from './SelectionMonitorFilter.vue'
 import ListOfItems from './ListOfItems.vue'
 import TextReusePassageItem from './modules/lists/TextReusePassageItem.vue'
 import { defineComponent } from 'vue'
+import { mapStores } from 'pinia'
+import { useSelectionMonitorStore } from '@/stores/selectionMonitor'
 
 /**
  * SelectionMonitor component is initialized in App.vue and it is always available.
@@ -223,6 +225,7 @@ export default defineComponent({
     TextReusePassageItem,
   },
   computed: {
+    ...mapStores(useSelectionMonitorStore),
     supportedFilters() {
       return this.filters.filter(filter =>
         SupportedFiltersByIndex[this.monitor.searchIndex].includes(filter.type),
@@ -298,13 +301,13 @@ export default defineComponent({
       }
     },
     isActive() {
-      return this.$store.state.selectionMonitor.isActive
+      return this.selectionMonitorStore.isActive
     },
     applyCurrentSearchFiltersOnInit() {
-      return this.$store.state.selectionMonitor.applyCurrentSearchFilters
+      return this.selectionMonitorStore.applyCurrentSearchFilters
     },
     monitor() {
-      return this.$store.state.selectionMonitor
+      return this.selectionMonitorStore
     },
     /** @returns {string} */
     statsLabel() {
@@ -361,7 +364,7 @@ export default defineComponent({
       this.additionalFilters = [newFilter]
     },
     hide() {
-      this.$store.dispatch('selectionMonitor/hide')
+      this.selectionMonitorStore.hide()
     },
     applyFilter() {
       if (!this.monitorFilterExists) {
diff --git a/src/components/TermsOfUsePage.vue b/src/components/TermsOfUsePage.vue
index 737d231ca..1f3780340 100644
--- a/src/components/TermsOfUsePage.vue
+++ b/src/components/TermsOfUsePage.vue
@@ -11,21 +11,24 @@
 
 <script>
 import content from '@/assets/disclaimer.json';
+import { mapStores } from 'pinia'
+import { useSettingsStore } from '@/stores/settings'
 
 export default {
   methods: {
     agreeTerms() {
-      this.$store.dispatch('settings/ACCEPT_TERMS_OF_USE');
+      this.settingsStore.acceptTermsOfUse()
     },
   },
   computed: {
+    ...mapStores(useSettingsStore),
     content: {
       get() {
         return content[this.activeLanguageCode];
       },
     },
     activeLanguageCode() {
-      return this.$store.state.settings.language_code;
+      return this.settingsStore.language_code
     },
   },
 };
diff --git a/src/components/TextReuseExplorerPage.vue b/src/components/TextReuseExplorerPage.vue
index d986026d4..01f5e999d 100644
--- a/src/components/TextReuseExplorerPage.vue
+++ b/src/components/TextReuseExplorerPage.vue
@@ -86,7 +86,7 @@
             />
           </b-nav-item>
 
-          <li class="navbar-text p-0 d-flex align-items-center ml-3"></li>
+          <li class="navbar-text p-0 d-flex align-items-center ml-3"> </li>
         </template>
       </b-tabs>
     </template>
@@ -113,8 +113,7 @@
       <template v-slot:header>
         <b-navbar-nav class="d-flex flex-row pt-1">
           <li class="navbar-text ml-3 mr-2 text-muted">
-            <label>{{ $t('sortBy') }}</label>
-          </li>
+            <label>{{ $t('sortBy') }}</label></li>
           <li class="navbar-text mr-1">
             <i-dropdown
               v-model="orderBy"
@@ -127,8 +126,8 @@
               class="mr-auto"
               size="sm"
               variant="outline-primary"
-            ></i-dropdown>
-          </li>
+            ></i-dropdown
+          ></li>
         </b-navbar-nav>
       </template>
       <template v-slot:default>
@@ -220,7 +219,8 @@
 </template>
 
 <script>
-import { mapActions } from 'vuex'
+import { mapActions } from 'pinia'
+import { useNotificationsStore } from '@/stores/notifications'
 import InfoButton from '@/components/base/InfoButton'
 import Ellipsis from '@/components/modules/Ellipsis'
 import List from '@/components/modules/lists/List'
@@ -240,6 +240,8 @@ import AddToCollection from './modules/collections/AddToCollection'
 import ConfirmModal from './modules/collections/ConfirmModal.vue'
 import ItemLabel from './modules/lists/ItemLabel.vue'
 import { hide } from '@floating-ui/vue'
+import { mapStores } from 'pinia'
+import { useUserStore } from '@/stores/user'
 
 const supportedSearchIndexFilters = filter =>
   SupportedFiltersByContext.textReusePassages.includes(filter.type)
@@ -315,7 +317,7 @@ export default {
     hideCreateCollectionModal() {
       this.isCreateCollectionModalVisible = false
     },
-    ...mapActions('notifications', ['addNotification']),
+    ...mapActions(useNotificationsStore, ['addNotification']),
     summaryUpdatedHandler(summary) {
       this.summary = summary
     },
@@ -428,7 +430,7 @@ export default {
       this.addNotification({
         title: 'Success',
         message: 'Collection created',
-        type: 'success',
+        type: 'success'
       })
       this.selectedCollection = collection
       this.saveArticlesInSelectedCollection()
@@ -463,16 +465,15 @@ export default {
             this.addNotification({
               title: 'Error',
               message: 'You cannot add to this collection',
-              type: 'error',
+              type: 'error'
             })
             return
           } else if ((err.code = 501)) {
             // too many jobs...
             this.addNotification({
               title: 'Please wait...',
-              message:
-                'Please wait, you already have a job running. Check its completion in the running tabs.',
-              type: 'error',
+              message: 'Please wait, you already have a job running. Check its completion in the running tabs.',
+              type: 'error'
             })
           }
         })
@@ -493,8 +494,9 @@ export default {
     },
   },
   computed: {
+    ...mapStores(useUserStore),
     isLoggedIn() {
-      return this.$store.state.user.userData
+      return this.userStore.userData
     },
     paginationCurrentPage: mapPagination(),
     supportedFilters() {
diff --git a/src/components/TheHeader.vue b/src/components/TheHeader.vue
index d4e8d6376..2829e6e12 100644
--- a/src/components/TheHeader.vue
+++ b/src/components/TheHeader.vue
@@ -7,8 +7,7 @@
         aria-valuemin="0"
         aria-valuemax="100"
         aria-valuenow="100"
-        :style="`width: ${100}%;`"
-      ></div>
+        :style="`width: ${100}%;`"></div>
     </div>
     <b-navbar
       id="TheHeader"
@@ -218,6 +217,11 @@ import JobItem from '@/components/modules/lists/JobItem'
 import Pagination from '@/components/modules/Pagination'
 import Logo from '@/components/Logo'
 import { searchQueryGetter, searchQueryHashGetter } from '@/logic/queryParams'
+import { mapStores } from 'pinia'
+import { useJobsStore } from '@/stores/jobs'
+import { useSettingsStore } from '@/stores/settings'
+import { useUserStore } from '@/stores/user'
+import { useNotificationsStore } from '@/stores/notifications'
 
 Icon.register({
   slack: {
@@ -265,12 +269,13 @@ export default {
   }),
   // mounted() {
   //   if (this.user) {
-  //     this.$store.dispatch('jobs/LOAD_JOBS').then(() => {
+  //     this.jobsStore.loadJobs().then(() => {
   //       console.info('Jobs loaded.');
   //     });
   //   }
   // },
   computed: {
+    ...mapStores(useJobsStore, useSettingsStore, useUserStore, useNotificationsStore),
     searchQueryHash: searchQueryHashGetter(),
     searchQuery: searchQueryGetter(),
     loginRouteParams() {
@@ -296,41 +301,36 @@ export default {
       return this.searchQuery.countActiveItems()
     },
     jobs() {
-      return this.$store.state.jobs.items
+      return this.jobsStore.items
     },
     jobsPaginationTotalRows() {
-      return this.$store.state.jobs.totalItems
+      return this.jobsStore.totalItems
     },
     runningJobs() {
       return this.jobs.filter(d => d.status === 'RUN')
     },
-    currentSearchResults() {
-      return this.$store.state.search.paginationTotalRows
-    },
     activeLanguageCode() {
-      return this.$store.state.settings.language_code
+      return this.settingsStore.language_code
     },
     showAlert() {
+      const messages = this.notificationsStore.errorMessages
       if (
-        this.$store.state.errorMessages.length &&
+        messages.length &&
         !this.user &&
-        this.$store.state.errorMessages[0].name === 'NotAuthenticated'
+        messages[0].name === 'NotAuthenticated'
       ) {
         return false
       }
-      return this.$store.state.errorMessages.length > 0
+      return messages.length > 0
     },
     errorMessages() {
-      return this.$store.state.errorMessages
+      return this.notificationsStore.errorMessages
     },
     processingStatus() {
-      return this.$store.state.processingStatus
+      return this.notificationsStore.processingStatus
     },
     user() {
-      return this.$store.getters['user/user']
-    },
-    headerTitle() {
-      return this.$store.getters.headerTitle
+      return this.userStore.user
     },
     userFullName() {
       const name = `${this.user.firstname} ${this.user.lastname}`.trim()
@@ -361,7 +361,7 @@ export default {
       return style
     },
     connectivityStatus() {
-      return this.$store.state.connectivityStatus
+      return this.notificationsStore.connectivityStatus
     },
     version() {
       return window.impressoFrontendVersion
@@ -373,16 +373,14 @@ export default {
   },
   methods: {
     updateLastNotificationDate() {
-      this.$store.dispatch('settings/UPDATE_LAST_NOTIFICATION_DATE', new Date())
+      this.settingsStore.updateLastNotificationDate()
     },
     test() {
-      return this.$store.dispatch('jobs/TEST')
+      return this.jobsStore.createTestJob()
     },
     selectLanguage(languageCode) {
       window.app.$i18n.locale = languageCode
-      this.$store.commit('settings/SET_LANGUAGE', {
-        language_code: languageCode,
-      })
+      this.settingsStore.setLanguageCode(languageCode)
     },
     getRouteWithSearchQuery(route, additionalQueryParameters = {}) {
       return {
@@ -399,7 +397,7 @@ export default {
     jobsPaginationCurrentPage: {
       handler(page) {
         if (this.user) {
-          this.$store.dispatch('jobs/LOAD_JOBS', {
+          this.jobsStore.loadJobs({
             page,
             limit: this.jobsPaginationPerPage,
           })
@@ -410,7 +408,7 @@ export default {
     user: {
       handler(user) {
         if (user) {
-          this.$store.dispatch('jobs/LOAD_JOBS', {
+          this.jobsStore.loadJobs({
             page: 1,
             limit: this.jobsPaginationPerPage,
           })
@@ -424,7 +422,9 @@ export default {
             .map(d => d.lastModifiedDate.getTime())
             .sort()
             .pop()
-          if (this.$store.getters['settings/lastNotificationDate'] - lastModifiedDate < 0) {
+          const lastNotificationDate = this.settingsStore.lastNotificationDateAsDate
+
+          if (lastNotificationDate - lastModifiedDate < 0) {
             console.info(
               'Stored settings.lastNotificationDate is behind a job lastModifiedDate, show job dropdown.',
             )
diff --git a/src/components/TopicDetailPage.vue b/src/components/TopicDetailPage.vue
index ed2819506..502fb608a 100644
--- a/src/components/TopicDetailPage.vue
+++ b/src/components/TopicDetailPage.vue
@@ -128,12 +128,18 @@ import Topic from '@/models/Topic';
 import Facet from '@/models/Facet';
 import Pagination from './modules/Pagination';
 import ArticleItem from './modules/lists/ArticleItem';
+import Article from '@/models/Article'
 import Ellipsis from './modules/Ellipsis';
 import Timeline from './modules/Timeline';
 import StackedBarsPanel from '@/components/modules/vis/StackedBarsPanel';
 import { searchQueryHashGetter, mapFilters } from '@/logic/queryParams'
 import { containsFilter } from '@/logic/filters'
-import { searchFacets as searchFacetsService } from '@/services'
+import {
+  searchFacets as searchFacetsService,
+  search as searchService,
+  topics as topicsService,
+} from '@/services'
+import Helpers from '@/plugins/Helpers';
 
 const TAB_ARTICLES = 'articles';
 const TAB_OVERVIEW = 'overview';
@@ -245,32 +251,42 @@ export default {
       }
     },
     async loadTimeline() {
-      return this.$store.dispatch('search/LOAD_TIMELINE', {
-        filters: [
-          {
+      return searchFacetsService.get('year', {
+        query: {
+          filters: {
             q: this.$route.params.topic_uid,
             type: 'topic',
           },
-        ],
-      }).then((values) => {
+          limit: 500,
+        },
+      })
+      .then(res => Helpers.timeline.fromBuckets(res.buckets))
+      .then((values) => {
         this.timevalues = values;
-      });
+      })
     },
 
     async getArticles({
       page = 1,
     } = {}) {
       // console.info('getArticles page', page);
-      const response = await this.$store.dispatch('search/LOAD_ARTICLES', {
-        filters: [
-          {
-            type: 'topic',
-            q: this.$route.params.topic_uid,
-          },
-        ],
-        orderBy: this.orderBy,
-        page,
-      });
+      const response = await searchService.find({
+        query: {
+          page,
+          limit: 10,
+          filters: [
+            {
+              type: 'topic',
+              q: this.$route.params.topic_uid,
+            },
+          ],
+          order_by: this.orderBy,
+          group_by: 'articles',
+        },
+      }).then(res => ({
+        ...res,
+        data: res.data.map(d => new Article(d)),
+      }))
       // sres et articles
       this.articles = response.data;
       // set other data
@@ -295,7 +311,8 @@ export default {
       immediate: true,
       async handler({ params, query }) {
         // always reload entity
-        this.topic = await this.$store.dispatch('topics/LOAD_TOPIC', params.topic_uid);
+        this.topic = await topicsService.get(params.topic_uid, { fl: 'id' })
+          .then(result => new Topic(result))
         this.total = +this.topic.countItems;
         // set active tab
         const tabIdx = this.tabs.findIndex(d => d.name === query.tab);
diff --git a/src/components/TopicsExplorerPage.vue b/src/components/TopicsExplorerPage.vue
index fa43e760f..85d30581e 100644
--- a/src/components/TopicsExplorerPage.vue
+++ b/src/components/TopicsExplorerPage.vue
@@ -86,6 +86,8 @@ import TopicsExplorerTooltip from '@/components/modules/tooltips/TopicsExplorerT
 import {topicsGraph} from '@/services';
 import { serializeFilters } from '@/logic/filters';
 import { CommonQueryParameters } from '@/router/util';
+import { mapStores } from 'pinia'
+import { useTopicsStore } from '@/stores/topics'
 
 export default {
   props: {
@@ -131,6 +133,7 @@ export default {
     timerUnselectLink: 0,
   }),
   computed: {
+    ...mapStores(useTopicsStore),
     countActiveFilters() {
       return this.filters
         .filter(d => !['hasTextContents'].includes(d.type)).length;
@@ -148,13 +151,13 @@ export default {
       ];
     },
     itemsFiltered() {
-      return this.$store.state.topics.items;
+      return this.topicsStore.items
     },
     itemsVisualized() {
-      return this.$store.state.topics.visualizedItems;
+      return this.topicsStore.visualizedItems
     },
     visualizedItemsIndex() {
-      return this.$store.state.topics.visualizedItemsIndex;
+      return this.topicsStore.visualizedItemsIndex
     },
     isZoomed() {
       const { k, x, y} = this.zoomTransform;
@@ -266,7 +269,7 @@ export default {
     },
     handleToggleHighlighted(item) {
       console.info('handleToggleHighlighted', item);
-      this.$store.dispatch('topics/TOGGLE_VISUALIZED_ITEM', item).then((isHighlighted) => {
+      this.topicsStore.toggleVisualizedItem(item).then((isHighlighted) => {
         if (isHighlighted && this.graph) {
           this.graph.zoomTo(item);
         }
diff --git a/src/components/TopicsPage.vue b/src/components/TopicsPage.vue
index 4b54d001a..9fb111658 100644
--- a/src/components/TopicsPage.vue
+++ b/src/components/TopicsPage.vue
@@ -80,6 +80,8 @@ import TopicItem from './modules/lists/TopicItem';
 import SearchQuery from '@/models/SearchQuery';
 import { searchQueryGetter, searchQuerySetter } from '@/logic/queryParams';
 import { SupportedFiltersByContext } from '@/logic/filters';
+import { mapStores } from 'pinia'
+import { useTopicsStore } from '@/stores/topics'
 
 /**
  * @param {import('@/models').Filter} filter
@@ -95,15 +97,16 @@ export default {
     tab: 'list',
   }),
   computed: {
+    ...mapStores(useTopicsStore),
     isLoading() {
-      return this.$store.state.topics.isLoading;
+      return this.topicsStore.isLoading
     },
     applyCurrentSearchFilters: {
       get() {
-        return this.$store.state.topics.applyCurrentSearchFilters === true;
+        return this.topicsStore.applyCurrentSearchFilters === true;
       },
       set(value) {
-        this.$store.dispatch('topics/UPDATE_APPLY_CURRENT_SEARCH_FILTERS', value);
+        this.topicsStore.updateApplyCurrentSearchFilters(value);
         this.loadTopics();
       },
     },
@@ -134,23 +137,23 @@ export default {
     },
     visualizedTopics() {
       // list of visualized topics;
-      return this.$store.state.topics.visualizedItems;
+      return this.topicsStore.visualizedItems;
     },
     topics() {
-      return this.$store.state.topics.items;
+      return this.topicsStore.items;
     },
     limit: {
       get() {
-        return this.$store.state.topics.pagination.perPage;
+        return this.topicsStore.pagination.perPage;
       },
       set(v) {
-        this.$store.dispatch('topics/LOAD_TOPICS', {
+        this.topicsStore.loadTopics({
           limit: v,
-        });
+        })
       },
     },
     paginationList() {
-      return this.$store.state.topics.pagination;
+      return this.topicsStore.pagination;
     },
     topicModelOptions() {
       return [{
@@ -162,7 +165,7 @@ export default {
       })));
     },
     limitOptions() {
-      const total = Math.max(this.$store.state.topics.pagination.totalRows, 50);
+      const total = Math.max(this.topicsStore.pagination.totalRows, 50);
       return [
         50, 100, 150, 200, 250, 300, 350, 400,
       ].filter(d => d <= total).map(d => ({
@@ -193,26 +196,26 @@ export default {
 
     topicModel: {
       get() {
-        return this.$store.state.topics.topicModel;
+        return this.topicsStore.topicModel;
       },
       set(val) {
-        this.$store.commit('topics/UPDATE_TOPIC_MODEL', val);
+        this.topicsStore.updateTopicModel(val);
       },
     },
 
     orderBy: {
       get() {
-        return this.$store.state.topics.orderBy;
+        return this.topicsStore.orderBy;
       },
       set(val) {
-        this.$store.commit('topics/UPDATE_ORDER_BY', val);
+        this.topicsStore.updateOrderBy(val);
       },
     },
 
   },
   methods: {
     resetVisualisedItems() {
-      this.$store.dispatch('topics/RESET_VISUALIZED_ITEM');
+      this.topicsStore.resetVisualizedItem();
     },
     changeQ(value) {
       if (value.trim().length > 1) {
@@ -260,7 +263,7 @@ export default {
       if (this.q && this.q.length > 1) {
         params.q = this.q;
       }
-      this.$store.dispatch('topics/LOAD_TOPICS', params).then((response) => {
+      this.topicsStore.loadTopics(params).then((response) => {
         if (response.info.facets && response.info.facets.topicmodel) {
           this.topicModels = response.info.facets.topicmodel.buckets || [];
         } else {
@@ -277,9 +280,9 @@ export default {
     },
     toggleVisualized(item, checked) {
       if (checked) {
-        this.$store.dispatch('topics/ADD_VISUALIZED_ITEM', item)
+        this.topicsStore.addVisualizedItem(item);
       } else {
-        this.$store.dispatch('topics/REMOVE_VISUALIZED_ITEM', item)
+        this.topicsStore.removeVisualizedItem(item);
       }
     },
     initQ(q) {
diff --git a/src/components/UserLoginPage.vue b/src/components/UserLoginPage.vue
index 0291b7886..11ea0a94c 100644
--- a/src/components/UserLoginPage.vue
+++ b/src/components/UserLoginPage.vue
@@ -65,6 +65,9 @@
 </template>
 
 <script>
+import { mapStores } from 'pinia'
+import { useUserStore } from '@/stores/user'
+
 export default {
   data: () => ({
     email: '',
@@ -79,15 +82,15 @@ export default {
       this.error = false
       const path = this.$route.query.redirect || window.redirect || '/'
 
-      this.$store
-        .dispatch('user/LOGIN', {
+      this.userStore
+        .login({
           email: this.email,
           password: this.password,
         })
         .then(() => {
           this.$router.push({
             path,
-            ...this.$store.getters.redirectionParams,
+            ...this.userStore.redirectionParams,
           })
         })
         .catch(err => {
@@ -99,14 +102,13 @@ export default {
     },
   },
   computed: {
+    ...mapStores(useUserStore),
     rememberCredentials: {
       get() {
-        return this.$store.state.user.rememberCredentials
+        return this.userStore.rememberCredentials
       },
       set(val) {
-        this.$store.commit('user/SET_REMEMBER_CREDENTIALS', {
-          remember: val,
-        })
+        this.userStore.setRememberCredentials(val)
       },
     },
   },
diff --git a/src/components/base/InfoButton.vue b/src/components/base/InfoButton.vue
index d97c32114..c0c24e569 100644
--- a/src/components/base/InfoButton.vue
+++ b/src/components/base/InfoButton.vue
@@ -36,6 +36,7 @@
 import { computed, defineProps, getCurrentInstance, ref } from 'vue'
 import { useFloating } from '@floating-ui/vue';
 import { useClickOutside } from '@/composables/useClickOutside'
+import { useSettingsStore } from '@/stores/settings'
 
 import faqContent from '@/assets/faqpage.json'
 
@@ -67,8 +68,8 @@ const props = defineProps({
 
 const show = ref(false)
 
-const store = computed(() => getCurrentInstance()?.proxy.$store)
-const activeLanguageCode = computed(() => store.value?.state.settings.language_code)
+const store = useSettingsStore()
+const activeLanguageCode = computed(() => store.language_code)
 const content = computed(() => FaqContentsMap[activeLanguageCode.value][props.name] || { title: props.name })
 
 
diff --git a/src/components/base/Toaster.vue b/src/components/base/Toaster.vue
index 9d1aed223..d4b6b572a 100644
--- a/src/components/base/Toaster.vue
+++ b/src/components/base/Toaster.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="position-fixed" style="z-index: 10000; right: 0; bottom: 0;">
     <Toast
-      v-for="notification in notifications"
+      v-for="notification in store.notifications"
       :key="notification.id"
       :notification="notification"
       @close="removeNotification(notification.id)"
@@ -11,15 +11,11 @@
 
 
 <script setup lang="ts">
+import { useNotificationsStore } from '@/stores/notifications'
 import Toast from '@/components/base/Toast.vue'
-import store from '@/store'
-import { toRef, watch } from 'vue'
 
-const removeNotification = (id: string) => store.dispatch('notifications/removeNotification', id)
-const notifications = toRef(store.state['notifications'], 'notifications')
+const store = useNotificationsStore()
 
-watch(notifications, v => {
-  console.log('*** notifications changed ***', v)
-}, { immediate: true })
+const removeNotification = (id: string) => store.removeNotification(id)
 
 </script>
diff --git a/src/components/modals/CookieDisclaimer.vue b/src/components/modals/CookieDisclaimer.vue
index 348b503b8..315b91b4c 100644
--- a/src/components/modals/CookieDisclaimer.vue
+++ b/src/components/modals/CookieDisclaimer.vue
@@ -11,10 +11,13 @@
 </template>
 
 <script>
+import { mapStores } from 'pinia'
+import { useSettingsStore } from '@/stores/settings'
+
 export default {
   methods: {
     accept() {
-      this.$store.dispatch('settings/ACCEPT_COOKIES')
+      this.settingsStore.setCookiesAccepted(true)
       if (window._paq) {
         console.info('[CookieDisclaimer] Matomo: Remembering cookie consent was given')
         // accept matomo cookies
@@ -27,8 +30,9 @@ export default {
     },
   },
   computed: {
+    ...mapStores(useSettingsStore),
     cookiesAccepted() {
-      return this.$store.state.settings.cookiesAccepted
+      return this.settingsStore.cookiesAccepted
     },
   },
 }
diff --git a/src/components/modals/CopyToClipboard.vue b/src/components/modals/CopyToClipboard.vue
index 420717dfc..1cfd6f310 100644
--- a/src/components/modals/CopyToClipboard.vue
+++ b/src/components/modals/CopyToClipboard.vue
@@ -262,11 +262,12 @@
 </template>
 
 <script>
+import { mapActions } from 'pinia'
+import { useNotificationsStore } from '@/stores/notifications'
 import Partner from '@/models/Partner'
 import { newspapers as NewspapersService } from '@/services'
 import RadioGroup from '@/components/layout/RadioGroup.vue';
 import Modal from '@/components/base/Modal.vue'
-import { mapActions } from 'vuex'
 
 export default {
   data: () => ({
@@ -394,7 +395,7 @@ export default {
       this.isModalVisible = false
       this.$emit('closed')
     },
-    ...mapActions('notifications', ['addNotification']),
+    ...mapActions(useNotificationsStore, ['addNotification']),
     debounceInput(value, prop) {
       clearTimeout(this.delayTimer)
       this.delayTimer = setTimeout(() => {
diff --git a/src/components/modals/DisclaimerNotice.vue b/src/components/modals/DisclaimerNotice.vue
index edaf81318..267cd3b27 100644
--- a/src/components/modals/DisclaimerNotice.vue
+++ b/src/components/modals/DisclaimerNotice.vue
@@ -18,6 +18,8 @@
 <script>
 import Modal from '@/components/base/Modal.vue'
 import content from '@/assets/disclaimer.json';
+import { mapStores } from 'pinia'
+import { useSettingsStore } from '@/stores/settings'
 
 export default {
   data: () => ({
@@ -28,17 +30,18 @@ export default {
   },
   methods: {
     agreeTerms() {
-      this.$store.dispatch('settings/ACCEPT_TERMS_OF_USE');
+      this.settingsStore.acceptTermsOfUse()
     },
   },
   computed: {
+    ...mapStores(useSettingsStore),
     content: {
       get() {
         return content[this.activeLanguageCode];
       },
     },
     activeLanguageCode() {
-      return this.$store.state.settings.language_code;
+      return this.settingsStore.language_code
     },
   },
   components: {
diff --git a/src/components/modals/StatusIndicator.vue b/src/components/modals/StatusIndicator.vue
index 10613f11b..6b13fe902 100644
--- a/src/components/modals/StatusIndicator.vue
+++ b/src/components/modals/StatusIndicator.vue
@@ -9,9 +9,6 @@
 
 export default {
   computed: {
-    status() {
-      return this.$store.state.processing_message;
-    },
   },
 };
 </script>
diff --git a/src/components/modules/CollectionAddTo.vue b/src/components/modules/CollectionAddTo.vue
index d97f0d9e5..99aa89a26 100644
--- a/src/components/modules/CollectionAddTo.vue
+++ b/src/components/modules/CollectionAddTo.vue
@@ -21,7 +21,10 @@
 </template>
 
 <script>
-import CollectionAddToList from './CollectionAddToList'
+import { mapStores } from 'pinia'
+import CollectionAddToList from './CollectionAddToList';
+import { useCollectionsStore } from '@/stores/collections'
+import { useUserStore } from '@/stores/user'
 
 export default {
   data: () => ({
@@ -38,13 +41,16 @@ export default {
   methods: {
     fetch() {
       if (this.isLoggedIn()) {
-        return this.$store.dispatch('collections/LOAD_COLLECTIONS')
+        return this.collectionsStore.loadCollections()
       }
       return {}
     },
     isLoggedIn() {
-      return this.$store.state.user.userData
+      return this.userStore.userData
     },
   },
-}
+  computed: {
+    ...mapStores(useCollectionsStore, useUserStore),
+  },
+};
 </script>
diff --git a/src/components/modules/CollectionAddToList.vue b/src/components/modules/CollectionAddToList.vue
index 58db13a9c..fad840706 100644
--- a/src/components/modules/CollectionAddToList.vue
+++ b/src/components/modules/CollectionAddToList.vue
@@ -70,6 +70,10 @@
 </template>
 
 <script>
+import { mapStores } from 'pinia'
+import { useCollectionsStore } from '@/stores/collections'
+import { useUserStore } from '@/stores/user'
+
 export default {
   data: () => ({
     show: false,
@@ -85,6 +89,7 @@ export default {
     this.focusInput()
   },
   computed: {
+    ...mapStores(useCollectionsStore, useUserStore),
     filteredCollections() {
       return this.collections.filter(collection => {
         const searchRegex = new RegExp(this.inputString, 'i')
@@ -93,13 +98,13 @@ export default {
     },
     collections: {
       get() {
-        return this.$store.getters['collections/collections']
+        return this.collectionsStore.collections
       },
     },
   },
   methods: {
     fetch() {
-      return this.$store.dispatch('collections/LOAD_COLLECTIONS')
+      return this.collectionsStore.loadCollections()
     },
     focusInput() {
       this.$refs.inputString.focus()
@@ -142,41 +147,34 @@ export default {
 
       if (!checked) {
         // add items to collection
-        this.$store
-          .dispatch('collections/ADD_COLLECTION_ITEMS', {
-            items: itemsFiltered,
-            collection,
-            contentType: 'article',
-          })
-          .then(() => {
-            itemsFiltered.forEach(item => {
-              item.collections.push(collection)
-            })
+        this.collectionsStore.addCollectionItems({
+          items: itemsFiltered,
+          collection,
+          contentType: 'article',
+        }).then(() => {
+          itemsFiltered.forEach(item => {
+            item.collections.push(collection)
           })
+        })
       } else {
         // remove items from collection
-        this.$store
-          .dispatch('collections/REMOVE_COLLECTION_ITEMS', {
-            items: itemsFiltered,
-            collection,
-            contentType: 'article',
-          })
-          .then(() => {
-            itemsFiltered.forEach(item => {
-              const idx = item.collections.findIndex(c => c.uid === collection.uid)
-              item.collections.splice(idx, 1)
-            })
+        this.collectionsStore.removeCollectionItems({
+          items: itemsFiltered,
+          collection,
+          contentType: 'article',
+        }).then(() => {
+          itemsFiltered.forEach(item => {
+            const idx = item.collections.findIndex(c => c.uid === collection.uid)
+            item.collections.splice(idx, 1)
           })
+        })
       } // end remove items from collection
     },
     addCollection(collectionName) {
       if (this.isDisabled) {
         return
       }
-      this.$store
-        .dispatch('collections/ADD_COLLECTION', {
-          name: collectionName,
-        })
+      this.collectionsStore.addCollection({ name: collectionName })
         .then(collection => {
           this.toggleActive(collection)
           this.inputString = ''
@@ -193,7 +191,7 @@ export default {
         })
     },
     isLoggedIn() {
-      return this.$store.state.user.userData
+      return this.userStore.userData
     },
   },
 }
diff --git a/src/components/modules/CollectionList.vue b/src/components/modules/CollectionList.vue
index b01ca9612..d26a0102c 100644
--- a/src/components/modules/CollectionList.vue
+++ b/src/components/modules/CollectionList.vue
@@ -100,7 +100,9 @@
 </template>
 
 <script>
+import { mapStores } from 'pinia'
 import Pagination from './Pagination';
+import { useCollectionsStore } from '@/stores/collections'
 
 export default {
   props: {
@@ -120,38 +122,39 @@ export default {
     Pagination,
   },
   computed: {
+    ...mapStores(useCollectionsStore),
     paginationPerPage: {
       get() {
-        return this.$store.state.collections.collectionsPaginationPerPage;
+        return this.collectionsStore.collectionsPaginationPerPage
       },
     },
     paginationCurrentPage: {
       get() {
-        return this.$store.state.collections.collectionsPaginationCurrentPage;
+        return this.collectionsStore.collectionsPaginationCurrentPage
       },
       set(val) {
-        this.$store.commit('collections/UPDATE_PAGINATION_LIST_CURRENT_PAGE', val);
+        this.collectionsStore.updatePaginationListCurrentPage(val)
       },
     },
     paginationTotalRows: {
       get() {
-        return this.$store.state.collections.collectionsPaginationTotalRows;
+        return this.collectionsStore.collectionsPaginationTotalRows
       },
     },
     orderBy: {
       get() {
-        return this.$store.state.collections.collectionsOrderBy;
+        return this.collectionsStore.collectionsSortOrder
       },
       set(val) {
-        this.$store.commit('collections/SET_COLLECTIONS_SORT_ORDER', val);
+        this.collectionsStore.setCollectionsSortOrder(val)
       },
     },
     collectionsQ: {
       get() {
-        return this.$store.state.collections.collectionsQ;
+        return this.collectionsStore.collectionsQ
       },
       set(val) {
-        this.$store.commit('collections/SET_COLLECTIONS_Q', val);
+        this.collectionsStore.setCollectionsQ(val)
       },
     },
     orderByOptions: {
@@ -190,14 +193,14 @@ export default {
     },
     collections: {
       get() {
-        return this.$store.getters['collections/collections'];
+        return this.collectionsStore.collections
       },
     },
   },
   methods: {
     fetch() {
       this.fetching = true;
-      this.$store.dispatch('collections/LOAD_COLLECTIONS').then(() => {
+      this.collectionsStore.loadCollections().then(() => {
         this.fetching = false;
       });
     },
@@ -233,7 +236,7 @@ export default {
     addCollection(collectionName) {
       this.inputNew = '';
       this.onInputNew();
-      this.$store.dispatch('collections/ADD_COLLECTION', {
+      this.collectionsStore.addCollection({
         name: collectionName.trim(),
       }).then((res) => {
         this.fetch();
@@ -256,7 +259,7 @@ export default {
   watch: {
     orderBy: {
       handler(val) {
-        this.$store.commit('collections/SET_COLLECTIONS_SORT_ORDER', val);
+        this.collectionsStore.setCollectionsSortOrder(val)
         this.paginationCurrentPage = 1;
         this.fetch();
       },
diff --git a/src/components/modules/EmbeddingsSearch.vue b/src/components/modules/EmbeddingsSearch.vue
index 16bc4f564..8d91be318 100644
--- a/src/components/modules/EmbeddingsSearch.vue
+++ b/src/components/modules/EmbeddingsSearch.vue
@@ -55,6 +55,8 @@
 
 <script>
 import { embeddings as embeddingsService } from '@/services'
+import { mapStores } from 'pinia'
+import { useEmbeddingsStore } from '@/stores/embeddings'
 
 export default {
   data: () => ({
@@ -78,6 +80,7 @@ export default {
     filter: Object,
   },
   computed: {
+    ...mapStores(useEmbeddingsStore),
     filterQuery() {
       if (this.filter && Array.isArray(this.filter.q)) {
         const q = this.filter.q
@@ -91,18 +94,18 @@ export default {
     },
     limitEmbeddings: {
       get() {
-        return this.$store.state.embeddings.limit
+        return this.embeddingsStore.limit
       },
       set(limitEmbeddings) {
-        this.$store.commit('embeddings/UPDATE_LIMIT', limitEmbeddings)
+        this.embeddingsStore.updateLimit(limitEmbeddings)
       },
     },
     languageEmbeddings: {
       get() {
-        return this.$store.state.embeddings.language
+        return this.embeddingsStore.language
       },
       set(languageEmbeddings) {
-        this.$store.commit('embeddings/UPDATE_LANGUAGE', languageEmbeddings)
+        this.embeddingsStore.updateLanguage(languageEmbeddings)
       },
     },
     serviceQuery() {
diff --git a/src/components/modules/FilterFacetYear.vue b/src/components/modules/FilterFacetYear.vue
index 4c1daf5c3..a2e3836f9 100644
--- a/src/components/modules/FilterFacetYear.vue
+++ b/src/components/modules/FilterFacetYear.vue
@@ -100,11 +100,9 @@ export default {
     expanded: {
       get() {
         return true;
-        // return this.$store.state.search.filterFacetYearExpanded;
       },
       set(/* val */) {
         // Since getter is not used - setter is not needed
-        // this.$store.commit('search/UPDATE_FILTER_FACET_YEAR_EXPANDED', val);
       },
     },
   },
diff --git a/src/components/modules/FilterImageUpload.vue b/src/components/modules/FilterImageUpload.vue
index a55ab6383..4e8470ba2 100644
--- a/src/components/modules/FilterImageUpload.vue
+++ b/src/components/modules/FilterImageUpload.vue
@@ -56,15 +56,12 @@ export default {
       this.handler.$emit('dispatch', (pond) => {
         pond.onprocessfile = (error, file) => {
           console.info('File processed', file.filename, file.fileType, file.serverId);
-          this.$store.commit('searchImages/UPDATE_SIMILAR_TO_UPLOADED', file.serverId);
-          this.$store.commit('searchImages/UPDATE_SIMILAR_TO', false);
           this.loadImage(file.serverId);
         };
       });
     },
     remove() {
       this.image = false;
-      this.$store.commit('searchImages/UPDATE_SIMILAR_TO_UPLOADED', false);
       this.$emit('remove');
       this.handler.$emit('destroy');
       this.init();
diff --git a/src/components/modules/IssueViewerText.vue b/src/components/modules/IssueViewerText.vue
index e4c0729fe..cfd2bf936 100644
--- a/src/components/modules/IssueViewerText.vue
+++ b/src/components/modules/IssueViewerText.vue
@@ -104,6 +104,7 @@
 </template>
 
 <script>
+import { mapStores } from 'pinia'
 import Icon from 'vue-awesome/components/Icon'
 import { articlesSuggestions, articleTextReusePassages } from '@/services'
 import CollectionAddTo from './CollectionAddTo'
@@ -111,6 +112,9 @@ import SearchResultsSimilarItem from './SearchResultsSimilarItem'
 import ArticleItem from './lists/ArticleItem'
 import AnnotatedText from './AnnotatedText'
 import InfoButton from '@/components/base/InfoButton'
+import { articles as articlesService } from '@/services'
+import Article from '@/models/Article'
+import { useCollectionsStore } from '@/stores/collections'
 
 import {
   getNamedEntitiesFromArticleResponse,
@@ -155,6 +159,7 @@ export default {
     })
   },
   computed: {
+    ...mapStores(useCollectionsStore),
     articlePages() {
       if (!this.article.pages || !this.article.pages.length) {
         return this.$t('no_page_info')
@@ -247,8 +252,8 @@ export default {
     onRemoveCollection(collection, item) {
       const idx = item.collections.findIndex(c => c.uid === collection.uid)
       if (idx !== -1) {
-        this.$store
-          .dispatch('collections/REMOVE_COLLECTION_ITEM', {
+        this.collectionsStore
+          .removeCollectionItem({
             collection,
             item,
           })
@@ -313,7 +318,7 @@ export default {
           : Promise.resolve([])
 
         const [article, textReusePassages] = await Promise.all([
-          this.$store.dispatch('articles/LOAD_ARTICLE', articleUid),
+          articlesService.get(articleUid).then(d => new Article(d)),
           trPromise,
         ])
         this.article = article
diff --git a/src/components/modules/ItemSelector.vue b/src/components/modules/ItemSelector.vue
index 3bce4003d..9ae6aa2af 100644
--- a/src/components/modules/ItemSelector.vue
+++ b/src/components/modules/ItemSelector.vue
@@ -7,6 +7,9 @@
 </template>
 
 <script>
+import { mapStores } from 'pinia'
+import { useSelectionMonitorStore } from '@/stores/selectionMonitor'
+
 /**
  * Item selector component: given a specific item, display it on the Monitor component
  * <item-selector :uid="your-item.uid" :type="person" :search-index="search" >
@@ -52,7 +55,7 @@ export default {
         type: this.type,
       }
       if (!this.defaultClickActionDisabled) {
-        this.$store.dispatch('selectionMonitor/show', {
+        this.selectionMonitorStore.show({
           item: this.item,
           searchIndex: this.searchIndex,
           type: this.type,
@@ -66,6 +69,9 @@ export default {
       })
     },
   },
+  computed: {
+    ...mapStores(useSelectionMonitorStore),
+  }
 }
 </script>
 
diff --git a/src/components/modules/SearchResultsListItem.vue b/src/components/modules/SearchResultsListItem.vue
index 4904a3b00..47a6fd01a 100644
--- a/src/components/modules/SearchResultsListItem.vue
+++ b/src/components/modules/SearchResultsListItem.vue
@@ -109,11 +109,14 @@
 </template>
 
 <script>
+import { mapStores } from 'pinia'
 import CollectionAddTo from './CollectionAddTo'
 import ArticleItem from './lists/ArticleItem'
 import LazyOpenSeadragonArticlePageViewer from './vis/LazyOpenSeadragonArticlePageViewer'
 import CopyToClipboard from '../modals/CopyToClipboard'
 import IIIFFragment from '../IIIFFragment.vue'
+import { useCollectionsStore } from '@/stores/collections'
+import { useUserStore } from '@/stores/user'
 
 const RegionOverlayClass = 'overlay-region selected'
 const MatchOverlayClass = 'overlay-match'
@@ -146,6 +149,7 @@ export default {
     },
   },
   computed: {
+    ...mapStores(useCollectionsStore, useUserStore),
     pageViewerOptions() {
       return {
         tileSources: [this.article.pages[0]?.iiif],
@@ -210,8 +214,8 @@ export default {
     onRemoveCollection(collection, item) {
       const idx = item.collections.findIndex(c => c.uid === collection.uid)
       if (idx !== -1) {
-        this.$store
-          .dispatch('collections/REMOVE_COLLECTION_ITEM', {
+        this.collectionsStore
+          .removeCollectionItem({
             collection,
             item,
           })
@@ -231,7 +235,7 @@ export default {
       if (this.article.accessRight === 'OpenPublic') {
         return true
       }
-      return this.$store.state.user.userData
+      return this.userStore.userData
     },
     showModalShareArticle() {
       this.showModalShare = true
diff --git a/src/components/modules/TableOfContents.vue b/src/components/modules/TableOfContents.vue
index 382b8aaab..7e2ab7e4c 100644
--- a/src/components/modules/TableOfContents.vue
+++ b/src/components/modules/TableOfContents.vue
@@ -78,12 +78,14 @@
 </template>
 
 <script>
-
+import { mapStores } from 'pinia'
 import ArticleItem from './lists/ArticleItem';
 import ImageItem from './lists/ImageItem';
 
 import CopyToClipboard from '../modals/CopyToClipboard';
 import { getAuthenticationBearer } from '@/services';
+import { useCollectionsStore } from '@/stores/collections'
+import { useUserStore } from '@/stores/user'
 
 export default {
   data: () => ({
@@ -118,8 +120,9 @@ export default {
     CopyToClipboard,
   },
   computed: {
+    ...mapStores(useCollectionsStore, useUserStore),
     isLoggedIn() {
-      return this.$store.state.user.userData;
+      return this.userStore.userData
     },
   },
   methods: {
@@ -180,7 +183,7 @@ export default {
     onRemoveCollection(collection, item) {
       const idx = item.collections.findIndex(c => (c.uid === collection.uid));
       if (idx !== -1) {
-        this.$store.dispatch('collections/REMOVE_COLLECTION_ITEM', {
+        this.collectionsStore.removeCollectionItem({
           collection,
           item,
         }).then(() => {
diff --git a/src/components/modules/WikidataBlock.vue b/src/components/modules/WikidataBlock.vue
index bc941565e..489ea8e46 100644
--- a/src/components/modules/WikidataBlock.vue
+++ b/src/components/modules/WikidataBlock.vue
@@ -44,6 +44,9 @@
 </template>
 
 <script>
+import { mapStores } from 'pinia'
+import { useSettingsStore } from '@/stores/settings'
+
 export default {
   props: {
     item: {
@@ -56,6 +59,7 @@ export default {
     },
   },
   computed: {
+    ...mapStores(useSettingsStore),
     geoCoordinates() {
       return [
         this.$n(parseInt(this.item.wikidata.coordinates.latitude * 100000, 10) / 100000),
@@ -82,7 +86,7 @@ export default {
       return null;
     },
     currentLanguage() {
-      return this.$store.state.settings.language_code;
+      return this.settingsStore.language_code
     },
     description() {
       return this.getTranslation(this.item.wikidata.descriptions);
diff --git a/src/components/modules/collections/AddToCollection.vue b/src/components/modules/collections/AddToCollection.vue
index cf4c4b5c8..e48ac21b6 100644
--- a/src/components/modules/collections/AddToCollection.vue
+++ b/src/components/modules/collections/AddToCollection.vue
@@ -78,6 +78,8 @@ import List from '../lists/List.vue'
 import { collections as collectionService } from '@/services'
 import Collection from '@/models/Collection'
 import ItemLabel from '../lists/ItemLabel.vue'
+import { mapStores } from 'pinia'
+import { useUserStore } from '@/stores/user'
 
 export default {
   name: 'AddToCollection',
@@ -106,8 +108,9 @@ export default {
     }
   },
   computed: {
+    ...mapStores(useUserStore),
     isLoggedIn() {
-      return !!this.$store.state.user.userData
+      return !!this.userStore.userData
     },
     paginationList() {
       return {
diff --git a/src/components/modules/collections/recommendations/NamedEntitiesRecommendationsPanel.vue b/src/components/modules/collections/recommendations/NamedEntitiesRecommendationsPanel.vue
index 20329d882..4e4aab988 100644
--- a/src/components/modules/collections/recommendations/NamedEntitiesRecommendationsPanel.vue
+++ b/src/components/modules/collections/recommendations/NamedEntitiesRecommendationsPanel.vue
@@ -36,6 +36,8 @@
 <script>
 import ItemLabel from '@/components/modules/lists/ItemLabel'
 import ItemSelector from '@/components/modules/ItemSelector'
+import { mapStores } from 'pinia'
+import { useMonitorStore } from '@/stores/monitor'
 
 export default {
   components: {
@@ -49,6 +51,7 @@ export default {
     }
   },
   computed: {
+    ...mapStores(useMonitorStore),
     /** @returns {boolean} */
     hasRecommendations() {
       return Object.keys(this.recommendations).length > 0
@@ -85,7 +88,7 @@ export default {
      * @param {any} params
      */
     handleItemClicked({ params }) {
-      this.$store.dispatch('monitor/ACTIVATE', {
+      this.monitorStore.activate({
         ...params,
         filters: [],
         disableFilterModification: true
@@ -104,4 +107,4 @@ export default {
     }
   }
 }
-</i18n>
\ No newline at end of file
+</i18n>
diff --git a/src/components/modules/collections/recommendations/TextReuseClustersRecommendationsPanel.vue b/src/components/modules/collections/recommendations/TextReuseClustersRecommendationsPanel.vue
index 0a9f8052a..da9a69e24 100644
--- a/src/components/modules/collections/recommendations/TextReuseClustersRecommendationsPanel.vue
+++ b/src/components/modules/collections/recommendations/TextReuseClustersRecommendationsPanel.vue
@@ -21,6 +21,8 @@
 <script>
 import ItemLabel from '@/components/modules/lists/ItemLabel'
 import ItemSelector from '@/components/modules/ItemSelector'
+import { mapStores } from 'pinia'
+import { useMonitorStore } from '@/stores/monitor'
 
 const idToName = id => {
   const parts = id.split('-')
@@ -39,6 +41,7 @@ export default {
     }
   },
   computed: {
+    ...mapStores(useMonitorStore),
     /** @returns {boolean} */
     hasRecommendations() {
       return Object.keys(this.recommendations).length > 0
@@ -63,7 +66,7 @@ export default {
      * @param {any} params
      */
     handleItemClicked({ params }) {
-      this.$store.dispatch('monitor/ACTIVATE', {
+      this.monitorStore.activate({
         ...params,
         filters: [],
         disableFilterModification: true
diff --git a/src/components/modules/collections/recommendations/TopicsRecommendationsPanel.vue b/src/components/modules/collections/recommendations/TopicsRecommendationsPanel.vue
index eaaf5951a..d092a56da 100644
--- a/src/components/modules/collections/recommendations/TopicsRecommendationsPanel.vue
+++ b/src/components/modules/collections/recommendations/TopicsRecommendationsPanel.vue
@@ -21,6 +21,8 @@
 <script>
 import ItemLabel from '@/components/modules/lists/ItemLabel'
 import ItemSelector from '@/components/modules/ItemSelector'
+import { mapStores } from 'pinia'
+import { useMonitorStore } from '@/stores/monitor'
 
 export default {
   components: {
@@ -34,6 +36,7 @@ export default {
     }
   },
   computed: {
+    ...mapStores(useMonitorStore),
     /** @returns {boolean} */
     hasRecommendations() {
       return Object.keys(this.recommendations).length > 0
@@ -62,7 +65,7 @@ export default {
      * @param {any} params
      */
     handleItemClicked({ params }) {
-      this.$store.dispatch('monitor/ACTIVATE', {
+      this.monitorStore.activate({
         ...params,
         filters: [],
         disableFilterModification: true
diff --git a/src/components/modules/lists/ClusterItem.vue b/src/components/modules/lists/ClusterItem.vue
index 30814e104..9b1e013e5 100644
--- a/src/components/modules/lists/ClusterItem.vue
+++ b/src/components/modules/lists/ClusterItem.vue
@@ -32,6 +32,9 @@
 </template>
 
 <script>
+import { mapStores } from 'pinia'
+import { useSelectionMonitorStore } from '@/stores/selectionMonitor'
+
 import ClusterDetailsPanel from '@/components/modules/textReuse/ClusterDetailsPanel'
 
 import TextReusePassageItemLabel from './TextReusePassageItemLabel'
@@ -64,7 +67,7 @@ export default {
       //   >
       //     {{ $t('seeTextReuseCluster') }}
       //   </ItemSelector>
-      this.$store.dispatch('selectionMonitor/show', {
+      this.selectionMonitorStore.show({
         type: 'textReusePassage',
         item: this.textReusePassageItem,
         context: 'textReuse',
@@ -77,6 +80,7 @@ export default {
     },
   },
   computed: {
+    ...mapStores(useSelectionMonitorStore),
     textReusePassageItem() {
       return {
         id: this.item.textSampleArticle.id,
diff --git a/src/components/modules/lists/TextReusePassageItem.vue b/src/components/modules/lists/TextReusePassageItem.vue
index 06483ad2e..a480dfd28 100644
--- a/src/components/modules/lists/TextReusePassageItem.vue
+++ b/src/components/modules/lists/TextReusePassageItem.vue
@@ -33,6 +33,8 @@
 <script>
 import Ellipsis from '../Ellipsis'
 import TextReusePassageItemLabel from './TextReusePassageItemLabel'
+import { mapStores } from 'pinia'
+import { useSelectionMonitorStore } from '@/stores/selectionMonitor'
 
 export default {
   components: {
@@ -62,7 +64,7 @@ export default {
       //   >
       //     {{ $t('seeTextReuseCluster') }}
       //   </ItemSelector>
-      this.$store.dispatch('selectionMonitor/show', {
+      this.selectionMonitorStore.show({
         type: 'textReusePassage',
         item: this.item,
         context: 'textReuse',
@@ -75,6 +77,7 @@ export default {
     },
   },
   computed: {
+    ...mapStores(useSelectionMonitorStore),
     textReuseClusterSummary() {
       const clusterSizeLabel = this.$tc(
         'numbers.clusterSize',
diff --git a/src/components/modules/lists/TopicItem.vue b/src/components/modules/lists/TopicItem.vue
index 1f5bd6e05..b9e666362 100644
--- a/src/components/modules/lists/TopicItem.vue
+++ b/src/components/modules/lists/TopicItem.vue
@@ -17,12 +17,15 @@
 
 <script>
 import ItemSelector from '../ItemSelector';
+import { mapStores } from 'pinia'
+import { useTopicsStore } from '@/stores/topics'
 
 export default {
   props: {
     item: Object,
   },
   computed: {
+    ...mapStores(useTopicsStore),
     label() {
       const countlabel = this.$tc('numbers.articles', this.item.countItems, {
         n: this.$n(this.item.countItems),
@@ -34,15 +37,15 @@ export default {
       // return this.item.matches.map(m => m.join(' · ')).join('<br>');
     },
     visualized() {
-      return typeof this.$store.state.topics.visualizedItemsIndex[this.item.uid] != 'undefined';
+      return this.topicsStore.visualizedItemsIndex[this.item.uid] != null
     },
   },
   methods: {
     toggleVisualized() {
       if (!this.visualized) {
-        this.$store.dispatch('topics/ADD_VISUALIZED_ITEM', this.item);
+        this.topicsStore.addVisualizedItem(this.item);
       } else {
-        this.$store.dispatch('topics/REMOVE_VISUALIZED_ITEM', this.item);
+        this.topicsStore.removeVisualizedItem(this.item);
       }
     },
   },
diff --git a/src/components/modules/searchQueriesComparison/SideBySideFacetsPanel.vue b/src/components/modules/searchQueriesComparison/SideBySideFacetsPanel.vue
index 91db6237c..90532d56e 100644
--- a/src/components/modules/searchQueriesComparison/SideBySideFacetsPanel.vue
+++ b/src/components/modules/searchQueriesComparison/SideBySideFacetsPanel.vue
@@ -67,6 +67,8 @@
 import FacetOverviewPanel from '@/components/modules/searchQueriesComparison/FacetOverviewPanel';
 import LoadingIndicator from '@/components/modules/LoadingIndicator';
 import { ComparableTypes } from '@/logic/queryComparison'
+import { mapStores } from 'pinia'
+import { useMonitorStore } from '@/stores/monitor'
 
 /**
  * @typedef {import('../../../models').Bucket} Bucket
@@ -175,7 +177,7 @@ export default {
       const comparable = this.comparables[comparableIndex]
       const filters = comparable?.filters ?? comparable?.query?.filters
 
-      this.$store.dispatch('monitor/ACTIVATE', {
+      this.monitorStore.activate({
         item,
         type,
         filters,
@@ -206,6 +208,7 @@ export default {
     }
   },
   computed: {
+    ...mapStores(useMonitorStore),
     /**
      * The span of the domain to fit the widest result on timeline.
      * @returns {[number, number]}
diff --git a/src/components/modules/textReuse/TextReuseStatistics.vue b/src/components/modules/textReuse/TextReuseStatistics.vue
index 0a6b6ba2f..2808e100c 100644
--- a/src/components/modules/textReuse/TextReuseStatistics.vue
+++ b/src/components/modules/textReuse/TextReuseStatistics.vue
@@ -100,6 +100,8 @@
 
 <script lang="ts">
 import { defineComponent } from 'vue'
+import { mapStores } from 'pinia'
+import { useSelectionMonitorStore } from '@/stores/selectionMonitor'
 
 import PowerVisBase from '@/components/modules/vis/PowerVisBase.vue'
 import Tooltip from '@/components/modules/tooltips/Tooltip.vue'
@@ -311,7 +313,7 @@ export default defineComponent({
     handleItemClicked({ item }) {
       if (!item) return
       console.debug('handleItemClicked', item.term)
-      this.$store.dispatch('selectionMonitor/show', {
+      this.selectionMonitorStore.show({
         item: {
           name: item.term,
           uid: item.term,
@@ -322,6 +324,7 @@ export default defineComponent({
     },
   },
   computed: {
+    ...mapStores(useSelectionMonitorStore),
     // get visualisation type from URL parameters
     visualisation: {
       get() {
diff --git a/src/components/modules/tooltips/TopicsExplorerTooltip.vue b/src/components/modules/tooltips/TopicsExplorerTooltip.vue
index 11ce7aaec..3f796d054 100644
--- a/src/components/modules/tooltips/TopicsExplorerTooltip.vue
+++ b/src/components/modules/tooltips/TopicsExplorerTooltip.vue
@@ -43,6 +43,9 @@
 import Topic from '@/models/Topic';
 import { serializeFilters } from '@/logic/filters';
 import { CommonQueryParameters } from '@/router/util';
+import { mapStores } from 'pinia'
+import { useMonitorStore } from '@/stores/monitor'
+import { topics as topicsService } from '@/services'
 
 export default {
   model: {
@@ -64,6 +67,7 @@ export default {
     isLoading: false,
   }),
   computed: {
+    ...mapStores(useMonitorStore),
     searchRouteLink() {
       return {
         name: 'search',
@@ -94,17 +98,19 @@ export default {
         return;
       }
       this.isLoading = true;
-      this.$store.dispatch('topics/LOAD_TOPIC', this.tooltip.item.uid).then((item) => {
-        this.isLoading = false;
-        this.tooltip.isActive = false;
-        this.$store.dispatch('monitor/ACTIVATE', {
-          item,
-          type: 'topic',
-          disableFilterModification: true
+      topicsService.get(this.tooltip.item.uid, { fl: 'id' })
+        .then(result => new Topic(result))
+        .then((item) => {
+          this.isLoading = false;
+          this.tooltip.isActive = false;
+          this.monitorStore.activate({
+            item,
+            type: 'topic',
+            disableFilterModification: true
+          });
+        }).catch(() => {
+          this.isLoading = true;
         });
-      }).catch(() => {
-        this.isLoading = true;
-      });
     },
   },
 };
diff --git a/src/main.js b/src/main.js
index 6a36a448f..799ad84a5 100644
--- a/src/main.js
+++ b/src/main.js
@@ -3,6 +3,9 @@
 import Vue from 'vue'
 import VueI18n from 'vue-i18n'
 import VueGtag from 'vue-gtag'
+import { createPinia, PiniaVuePlugin } from 'pinia'
+import { createPersistedState } from 'pinia-plugin-persistedstate'
+
 
 import Helpers from '@/plugins/Helpers'
 import ImpressoLayout from '@/plugins/Layout'
@@ -19,12 +22,14 @@ import './assets/legacy/bootstrap-vue.css'
 
 import App from './App'
 import router from './router'
-import store from './store'
 import messages from './i18n/messages'
 import dateTimeFormats from './i18n/dateTimeFormats'
 import numberFormats from '@/i18n/numberFormats'
+import { useSettingsStore } from './stores/settings'
+import { useUserStore } from './stores/user'
+import { useNotificationsStore } from './stores/notifications'
 
-// Vue.use(BootstrapVue)
+Vue.use(PiniaVuePlugin)
 Vue.use(BootstrapVueLegacyComponents)
 Vue.use(VueI18n)
 // custom created plugins
@@ -34,6 +39,11 @@ Vue.use(ImpressoLayout)
 Vue.use(MetaTags, { suffix: 'impresso' })
 Vue.use(Navigation)
 
+const pinia = createPinia()
+pinia.use(createPersistedState({
+  key: id => `__impresso__${id}`,
+}))
+
 if (process.env.VUE_APP_GA_TRACKING_ID) {
   Vue.use(
     VueGtag,
@@ -46,25 +56,35 @@ if (process.env.VUE_APP_GA_TRACKING_ID) {
   )
 }
 Vue.config.productionTip = process.env.NODE_ENV === 'production'
-Vue.config.errorHandler = error =>
-  store.dispatch('DISPLAY_ERROR', {
+Vue.config.errorHandler = error => {
+  const notificationsStore = useNotificationsStore()
+  notificationsStore.displayError({
     error,
     origin: 'Vue.config.errorHandler',
   })
+}
+
 
 window.addEventListener('unhandledrejection', event => {
   if (event.reason) {
-    store.dispatch('DISPLAY_ERROR', {
+    const notificationsStore = useNotificationsStore()
+    notificationsStore.displayError({
       error: event.reason,
       origin: 'unhandledrejection',
     })
   }
 })
 
+// pinia cannot be used without a Vue instance
+// creating an instance here that won't be used
+// anywhere later
+const _throwawayApp = new Vue({ pinia })
+const settingsStore = useSettingsStore()
+
 // Create VueI18n instance with options
 const i18n = new VueI18n({
   fallbackLocale: 'en',
-  locale: store.state.settings.language_code,
+  locale: settingsStore.language_code,
   messages,
   dateTimeFormats,
   numberFormats,
@@ -106,13 +126,17 @@ Promise.race([
     if (err.code === 401) {
       // eslint-disable-next-line
       console.debug('[main] Not authenticated (status 401):', err.message)
-      if (store.state.user) {
+      const userStore = useUserStore()
+
+      if (userStore.user) {
         // eslint-disable-next-line
         console.debug(
           '[main] Authentication failed ... but an user is present in logalStorage. Force logging out.',
         )
-        store.dispatch('user/LOGOUT')
-        store.dispatch('DISPLAY_ERROR', {
+        userStore.logout()
+
+        const notificationsStore = useNotificationsStore()
+        notificationsStore.displayError({
           error: err,
           origin: 'services.app.reAuthenticate',
         })
@@ -166,11 +190,6 @@ Promise.race([
         '\n - features:',
         features,
       )
-      // eslint-disable-next-line
-      console.debug(
-        '[main] App latest notification date:',
-        store.state.settings.lastNotificationDate,
-      )
       window.impressoFrontendVersion = process.env.VUE_APP_GIT_TAG
       window.impressoFrontendRevision = process.env.VUE_APP_GIT_REVISION
       window.impressoFrontendBranch = process.env.VUE_APP_GIT_BRANCH
@@ -218,7 +237,7 @@ Promise.race([
         el: '#app',
         i18n,
         router,
-        store,
+        pinia,
         template: '<App/>',
         components: {
           App,
diff --git a/src/pages/Collections.vue b/src/pages/Collections.vue
index b4bc92a1f..9dbf97e70 100644
--- a/src/pages/Collections.vue
+++ b/src/pages/Collections.vue
@@ -20,7 +20,9 @@
 </template>
 
 <script>
+import { mapStores } from 'pinia'
 import CollectionList from '@/components/modules/CollectionList';
+import { useCollectionsStore } from '@/stores/collections'
 
 export default {
   components: {
@@ -35,9 +37,10 @@ export default {
     },
   },
   computed: {
+    ...mapStores(useCollectionsStore),
     paginationTotalRows: {
       get() {
-        return this.$store.state.collections.collectionsPaginationTotalRows;
+        return this.collectionsStore.collectionsPaginationTotalRows
       },
     },
   },
diff --git a/src/pages/IssueViewerPage.vue b/src/pages/IssueViewerPage.vue
index fe582831c..fe29a130b 100644
--- a/src/pages/IssueViewerPage.vue
+++ b/src/pages/IssueViewerPage.vue
@@ -226,6 +226,9 @@ import IssueViewerBookmarker from '@/components/IssueViewerBookmarker'
 import IssueViewerTableOfContents from '@/components/IssueViewerTableOfContents'
 import CollectionAddTo from '@/components/modules/CollectionAddTo';
 import WithTooltip from '@/components/base/WithTooltip.vue'
+import { mapStores } from 'pinia'
+import { useEntitiesStore } from '@/stores/entities'
+import { useUserStore } from '@/stores/user'
 
 
 /**
@@ -292,6 +295,7 @@ export default {
     window.removeEventListener('keydown', this.keyDown);
   },
   computed: {
+    ...mapStores(useEntitiesStore, useUserStore),
     applyCurrentSearchFilters: mapApplyCurrentSearchFilters(),
     searchQuery: {
       ...searchQueryGetter(),
@@ -453,7 +457,7 @@ export default {
     },
     /** @returns {import('@/models/User').default} */
     currentUser() {
-      return this.$store.getters['user/user'];
+      return this.userStore.user
     },
     /** @returns {boolean} */
     isContentAvailable() {
@@ -639,8 +643,8 @@ export default {
       if (this.issue == null) return
       if (this.pagesMarginalia[pageIndex] == null) {
         const results = await Promise.all([
-          this.$store.dispatch('entities/LOAD_PAGE_TOPICS', this.pageId),
-          this.$store.dispatch('entities/LOAD_PAGE_ENTITIES', this.pageId)
+          this.entitiesStore.loadPageTopics(this.pageId),
+          this.entitiesStore.loadPageEntities(this.pageId)
         ])
 
         const topicsSection = {
diff --git a/src/pages/PasswordChange.vue b/src/pages/PasswordChange.vue
index 13b0a4bfe..792d306ce 100644
--- a/src/pages/PasswordChange.vue
+++ b/src/pages/PasswordChange.vue
@@ -76,8 +76,10 @@
 </template>
 
 <script>
+import { mapActions } from 'pinia'
+import { useNotificationsStore } from '@/stores/notifications'
+
 import { passwordReset as passwordResetService } from '@/services'
-import { mapActions } from 'vuex'
 
 const PasswordRegex = /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[_\-@$!%*?&])[A-Za-z\d@$!%*?&_\-]{8,}$/
 
@@ -95,7 +97,7 @@ export default {
     }
   },
   methods: {
-    ...mapActions('notifications', ['addNotification']),
+    ...mapActions(useNotificationsStore, ['addNotification']),
     onSubmit(e) {
       e.stopPropagation()
       e.preventDefault()
@@ -144,7 +146,6 @@ export default {
           setTimeout(() => {
             this.$router.push({ name: 'home' })
           }, 1500)
-          // this.$router.push({ name: 'login', ...this.$store.getters.redirectionParams })
         })
         .catch(error => {
           console.log('[PasswordChange] error', error.message)
diff --git a/src/pages/Search.vue b/src/pages/Search.vue
index 0a329b829..9c8cedddb 100644
--- a/src/pages/Search.vue
+++ b/src/pages/Search.vue
@@ -142,7 +142,7 @@
         :title="$tc('add_n_to_collection', selectedItems.length)"
         :show="isModalVisible('nameSelectionCollection')"
         @shown="nameSelectedCollectionOnShown()"
-      >
+        >
         <collection-add-to-list :items="selectedItems" />
       </Modal>
 
@@ -154,7 +154,7 @@
         @close="hideModal('nameCollection')"
         @ok="createQueryCollection()"
         @shown="nameCollectionOnShown()"
-      >
+        >
         <form v-on:submit.stop.prevent="createQueryCollection()">
           <label for="inputName">Name</label>
           <b-form-input
@@ -245,6 +245,7 @@
 </template>
 
 <script>
+import { mapStores } from 'pinia'
 import Autocomplete from '@/components/Autocomplete'
 import Pagination from '@/components/modules/Pagination'
 import SearchResultsListItem from '@/components/modules/SearchResultsListItem'
@@ -271,6 +272,8 @@ import {
   exporter as exporterService,
   collectionsItems as collectionsItemsService,
 } from '@/services'
+import { useCollectionsStore } from '@/stores/collections'
+import { useUserStore } from '@/stores/user'
 
 const AllowedFilterTypes = SupportedFiltersByContext.search
 
@@ -307,6 +310,7 @@ export default {
     visibleModal: null,
   }),
   computed: {
+    ...mapStores(useCollectionsStore, useUserStore),
     searchQuery: {
       ...searchQueryGetter(),
       ...searchQuerySetter({
@@ -345,7 +349,7 @@ export default {
       },
     },
     isLoggedIn() {
-      return this.$store.state.user.userData
+      return this.userStore.userData
     },
     orderBy: {
       get() {
@@ -466,7 +470,7 @@ export default {
       })
     },
     nameSelectedCollectionOnShown() {
-      return this.$store.dispatch('collections/LOAD_COLLECTIONS')
+      return this.collectionsStore.loadCollections()
     },
     onSummary(msg) {
       this.inputDescription = msg
@@ -529,17 +533,17 @@ export default {
     createQueryCollection() {
       if (!this.nameCollectionOkDisabled) {
         this.hideModal('nameCollection')
-        this.$store
-          .dispatch('collections/ADD_COLLECTION', {
+        return this.collectionsStore
+          .addCollection({
             name: this.inputName,
             description: this.inputDescription,
           })
           .then(collection => {
-            const payload = {
+            return searchService.create({
+              group_by: 'articles',
               filters: this.filters.map(getFilterQuery),
-              collectionUid: collection.uid,
-            }
-            this.$store.dispatch('search/CREATE_COLLECTION_FROM_QUERY', payload)
+              collection_uid: collection.uid,
+            })
           })
       }
     },
diff --git a/src/pages/SearchImages.vue b/src/pages/SearchImages.vue
index e9ada3988..ecb1eef78 100644
--- a/src/pages/SearchImages.vue
+++ b/src/pages/SearchImages.vue
@@ -135,6 +135,8 @@ import FilterFactory from '@/models/FilterFactory';
 import Image from '@/models/Image';
 import SearchQuery, { getFilterQuery } from '@/models/SearchQuery';
 import FacetModel from '@/models/Facet';
+import { useUserStore } from '@/stores/user'
+import { mapStores } from 'pinia'
 
 const AllowedFilterTypes = [
   'newspaper',
@@ -191,6 +193,7 @@ export default {
     }
   },
   computed: {
+    ...mapStores(useUserStore),
     searchQuery: {
       ...searchQueryGetter(),
       ...searchQuerySetter({
@@ -250,11 +253,6 @@ export default {
         );
       },
     },
-    // searchResults: {
-    //   get() {
-    //     return this.$store.getters['searchImages/results'];
-    //   },
-    // },
     orderByOptions: {
       get() {
         return [
@@ -300,7 +298,7 @@ export default {
       },
     },
     isLoggedIn() {
-      return this.$store.state.user.userData;
+      return this.userStore.userData
     },
     serviceQuery: {
       get() {
@@ -391,20 +389,12 @@ export default {
     isChecked(item) {
       return (this.selectedItems.findIndex(c => (c.uid === item.uid)) !== -1);
     },
-    // onInputPagination(page = 1) {
-    //   this.$store.dispatch('searchImages/SET_RANDOM_PAGE', false);
-    //   this.search(page);
-    // },
     onClearSelection() {
       this.selectedItems = [];
     },
     onClickSearch(image) {
       console.info('.onClickSearch, image:', image);
       this.similarToImageUid = image.uid;
-    //   this.$store.commit('searchImages/UPDATE_SIMILAR_TO_UPLOADED', false);
-    //   this.similarToImage = image;
-    //   this.$store.commit('searchImages/UPDATE_SIMILAR_TO', image.uid);
-    //   this.search(1);
     },
     onRemoveSimilarTo() {
       console.info('onRemoveSimilarTo');
diff --git a/src/pages/SearchNgrams.vue b/src/pages/SearchNgrams.vue
index 33c0ba97d..dcf755b85 100644
--- a/src/pages/SearchNgrams.vue
+++ b/src/pages/SearchNgrams.vue
@@ -149,6 +149,8 @@
 
 <script>
 import { serializeFilters, optimizeFilters, toCanonicalFilter } from '@/logic/filters'
+import { useUserStore } from '@/stores/user'
+import { mapStores } from 'pinia'
 
 import FacetModel from '@/models/Facet'
 import SearchSidebar from '@/components/modules/SearchSidebar'
@@ -327,6 +329,7 @@ export default {
     },
   },
   computed: {
+    ...mapStores(useUserStore),
     /** @type {import('vue').ComputedOptions<string[]>} */
     unigrams: {
       /** @returns {string[]} */
@@ -406,7 +409,7 @@ export default {
       },
     },
     isLoggedIn() {
-      return this.$store.state.user.userData
+      return this.userStore.userData
     },
     /** @returns {{ ngram: string, values: number[], total: number }[]} */
     trends() {
diff --git a/src/pages/TextReuse.vue b/src/pages/TextReuse.vue
index 0122ec4a4..d64ba3e40 100644
--- a/src/pages/TextReuse.vue
+++ b/src/pages/TextReuse.vue
@@ -126,6 +126,8 @@ import FilterFactory from '@/models/FilterFactory'
 import { facetToTimelineValues } from '@/logic/facets'
 import FilterTimeline from '@/components/modules/FilterTimeline'
 import InfoButton from '@/components/base/InfoButton.vue'
+import { mapStores } from 'pinia'
+import { useSelectionMonitorStore } from '@/stores/selectionMonitor'
 
 /**
  * @typedef {import('../models').Filter} Filter
@@ -174,6 +176,7 @@ export default {
     },
   },
   computed: {
+    ...mapStores(useSelectionMonitorStore),
     allowedFilters() {
       return this.filters.filter(({ type }) => SupportedFiltersByContext.textReuse.includes(type))
     },
@@ -301,7 +304,7 @@ export default {
      */
     handleFacetFiltersClicked(filter) {
       if (filter.type === 'textReuseClusterLexicalOverlap') {
-        this.$store.dispatch('selectionMonitor/show', {
+        this.selectionMonitorStore.show({
           item: {
             ...filter,
             q: [String(filter.q[0]), String(parseInt(filter.q[0], 10) + 0.999)],
@@ -314,7 +317,7 @@ export default {
         return
       }
       // open selection monitor
-      this.$store.dispatch('selectionMonitor/show', {
+      this.selectionMonitorStore.show({
         item: filter,
         searchIndex: 'tr_passages',
         type: filter.type,
diff --git a/src/pages/User.vue b/src/pages/User.vue
index 4e18a8369..a09c9ca6a 100644
--- a/src/pages/User.vue
+++ b/src/pages/User.vue
@@ -193,6 +193,8 @@ import { ValidationProvider, ValidationObserver, extend } from 'vee-validate';
 import { required, email, confirmed, min, regex } from 'vee-validate/dist/rules';
 import { PasswordRegex } from '@/logic/user';
 import Modal from '@/components/base/Modal.vue';
+import { mapStores } from 'pinia'
+import { useUserStore } from '@/stores/user'
 
 extend('required', {
   ...required,
@@ -258,7 +260,7 @@ export default {
     onSubmitChangePassword() {
       this.passwordSubmitted = false;
       this.passwordSubmittedError = '';
-      this.$store.dispatch('user/CHANGE_PASSWORD', {
+      this.userStore.changePassword({
         uid: this.user.uid,
         previousPassword: this.previousPassword,
         newPassword: this.newPassword,
@@ -279,7 +281,7 @@ export default {
     },
     onSubmit() {
       this.userSubmitted = false;
-      this.$store.dispatch('user/UPDATE_CURRENT_USER', this.user).then((user) => {
+      this.userStore.updateCurrentUser(this.user).then((user) => {
         this.userSubmittedSuccess = true;
         this.user = user;
       }).catch((err) => {
@@ -293,7 +295,7 @@ export default {
       this.showDeleteConfirmationDialog();
     },
     handleDeleteUserAfterConfirmation() {
-      this.$store.dispatch('user/REMOVE_CURRENT_USER', this.user);
+      console.error('TODO: Implement user deletion')
     },
     onGeneratePattern() {
       this.user.colors = [];
@@ -313,6 +315,7 @@ export default {
     },
   },
   computed: {
+    ...mapStores(useUserStore),
     patternAsText: {
       get() {
         if (this.user) {
@@ -326,7 +329,7 @@ export default {
     },
   },
   async mounted() {
-    this.user = await this.$store.dispatch('user/GET_CURRENT_USER');
+    this.user = await this.userStore.getCurrentUser()
     console.info('UserPage mounted.',  this.user);
     if (this.user && this.user.pattern.length === 0) this.onGeneratePattern();
   },
diff --git a/src/router/index.js b/src/router/index.js
index db946b7f3..8f0358b54 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -21,7 +21,8 @@ import PowerUserVisualisation from '../pages/PowerUserVisualisation'
 
 import IssueViewerPage from '../pages/IssueViewerPage'
 import { getShortArticleId } from '@/logic/ids'
-import store from '../store'
+import { useUserStore } from '@/stores/user'
+import { useNotificationsStore } from '@/stores/notifications'
 
 Vue.use(Router)
 
@@ -117,7 +118,8 @@ const router = new Router({
       name: 'logout',
       component: UserLoginPage,
       beforeEnter: () => {
-        store.dispatch('user/LOGOUT').then(
+        const userStore = useUserStore()
+        userStore.logout().then(
           () => {},
           err => {
             this.error = this.$t(err.message)
@@ -492,13 +494,16 @@ router.beforeEach((to, from, next) => {
     console.warn('[router/index] Matomo not loaded')
   }
   // clean yellow alert error messages
-  store.dispatch('CLEAN_ERROR_MESSAGE')
+  const notificationsStore = useNotificationsStore()
+  notificationsStore.cleanErrorMessage()
   if (to.name === 'login' && from.name && from.name !== 'login') {
-    store
-      .dispatch('SET_REDIRECTION_ROUTE', {
-        ...from,
-      })
-      .then(next)
+    const userStore = useUserStore()
+    userStore.setRedirectionRoute({
+      name: from.name,
+      path: from.path,
+      query: from.query,
+    })
+    next()
   } else if (to.meta.requiresAuth === false) {
     next()
   } else {
diff --git a/src/services/index.js b/src/services/index.js
index 5e9e2619f..97501fd18 100644
--- a/src/services/index.js
+++ b/src/services/index.js
@@ -8,6 +8,8 @@ import articlesSuggestionsHooks from './hooks/articlesSuggestions'
 import uploadedImagesHooks from './hooks/uploadedImages'
 import imagesHooks from './hooks/images'
 import NamesService from './names'
+import { useJobsStore } from '@/stores/jobs'
+import { useNotificationsStore } from '@/stores/notifications'
 
 // e.g io api base is http://localhost
 // and path is  something like /path/to/socket.io defined in the backend
@@ -35,7 +37,8 @@ app.configure(
 socket.on('reconnect', () => {
   app.reAuthenticate()
   if (window.app && window.app.$store) {
-    window.app.$store.dispatch('DISPLAY_CONNECTIVITY_STATUS', true)
+    const notificationsStore = useNotificationsStore()
+    notificationsStore.displayConnectivityStatus(true)
   }
 }) // https://github.com/feathersjs/feathers-authentication/issues/272#issuecomment-240937322
 
@@ -43,8 +46,9 @@ socket.on('connect_error', err => {
   if (window.app && window.app.$store) {
     err.message = `Could not connect to the API: ${err.message}`
     console.error(err)
-    window.app.$store.dispatch('DISPLAY_CONNECTIVITY_STATUS', false)
-    window.app.$store.commit('LOCK_SCREEN', false)
+    const notificationsStore = useNotificationsStore()
+    notificationsStore.displayConnectivityStatus(false)
+    notificationsStore.lockScreen(false)
   }
 })
 
@@ -58,9 +62,10 @@ app.hooks({
       context => {
         const route = `${context.path}.${context.method}`
         if (window.app && window.app.$store) {
-          window.app.$store.dispatch('UPDATE_PROCESSING_ACTIVITY', { route, status: 'LOADING' })
+          const notificationsStore = useNotificationsStore()
+          notificationsStore.updateProcessingActivity({ route, status: 'LOADING' })
           if (needsLockScreen(route) && context.params.lock !== false) {
-            window.app.$store.commit('LOCK_SCREEN', true)
+            notificationsStore.lockScreen(true)
           }
         }
       },
@@ -71,9 +76,10 @@ app.hooks({
       context => {
         const route = `${context.path}.${context.method}`
         if (window.app && window.app.$store) {
-          window.app.$store.dispatch('UPDATE_PROCESSING_ACTIVITY', { route, status: 'DONE' })
+          const notificationsStore = useNotificationsStore()
+          notificationsStore.updateProcessingActivity({ route, status: 'DONE' })
           if (needsLockScreen(route)) {
-            window.app.$store.commit('LOCK_SCREEN', false)
+            notificationsStore.lockScreen(false)
           }
         }
       },
@@ -84,6 +90,8 @@ app.hooks({
       context => {
         const route = `${context.path}.${context.method}`
         if (window.app && window.app.$store) {
+          const notificationsStore = useNotificationsStore()
+
           // handle not authenticated error when removing authentication
           if (context.params.ignoreErrors) {
             console.warn(
@@ -108,14 +116,14 @@ app.hooks({
           } else if (!silentErrorCodes.includes(context.error.code)) {
             // eslint-disable-next-line no-console
             console.warn('app.hooks.error.all', context.error)
-            window.app.$store.dispatch('DISPLAY_ERROR', {
+            notificationsStore.displayError({
               error: context.error,
               origin: 'app.hooks.error.all',
             })
           }
-          window.app.$store.dispatch('UPDATE_PROCESSING_ACTIVITY', { route, status: 'DONE' })
+          notificationsStore.updateProcessingActivity({ route, status: 'DONE' })
           if (needsLockScreen(route)) {
-            window.app.$store.commit('LOCK_SCREEN', false)
+            notificationsStore.lockScreen(false)
           }
         }
       },
@@ -130,8 +138,9 @@ app.service('logs').on('created', payload => {
     if (payload.collection) {
       extra.collection = payload.collection
     }
-    if (window.app && window.app.$store) {
-      window.app.$store.dispatch('jobs/UPDATE_JOB', {
+    if (window.app) {
+      const jobsStore = useJobsStore()
+      jobsStore.updateJob({
         ...payload.job,
         progress: payload.progress,
         extra,
diff --git a/src/store/Articles.js b/src/store/Articles.js
deleted file mode 100644
index a55cb883f..000000000
--- a/src/store/Articles.js
+++ /dev/null
@@ -1,14 +0,0 @@
-/* eslint-disable no-unused-vars */
-import { articles } from '@/services';
-import Article from '@/models/Article';
-
-
-export default {
-  namespaced: true,
-  actions: {
-    LOAD_ARTICLE(context, uid) {
-      return articles.get(uid)
-        .then(d => new Article(d));
-    },
-  },
-};
diff --git a/src/store/Autocomplete.js b/src/store/Autocomplete.js
deleted file mode 100644
index 809a9b06c..000000000
--- a/src/store/Autocomplete.js
+++ /dev/null
@@ -1,76 +0,0 @@
-import SuggestionFactory from '@/models/SuggestionFactory';
-import SuggestionCollection from '@/models/SuggestionCollection';
-
-import * as services from '@/services';
-
-const normalize = s => s.normalize('NFD').replace(/[\u0300-\u036f]/g, '').toLowerCase();
-
-export default {
-  namespaced: true,
-  state: {
-    queries: [],
-    // queries, translitted without any accent.
-    searchableQueries: [],
-  },
-  mutations: {
-    ADD_QUERY(state, q) {
-      if (!state.queries.includes(q)) {
-        state.queries.push(q);
-      }
-    },
-  },
-  actions: {
-    SAVE_RECENT_QUERY({ commit }, { q }) {
-      if (typeof q === 'string' && q.trim().length) {
-        commit('ADD_QUERY', q);
-      }
-    },
-    SUGGEST_RECENT_QUERY({ state }, q) {
-      const nq = normalize(q);
-      const candidates = [];
-      state.queries.filter(d => typeof d === 'string').forEach((d) => {
-        const idx = normalize(d).indexOf(nq);
-        if (idx > -1) {
-          candidates.push({
-            h: [
-              d.substr(0, idx),
-              '<b>',
-              d.substr(idx, q.length),
-              '</b>',
-              d.substr(idx + q.length),
-            ].join(''),
-            q: d,
-            r: q.length / d.length,
-          });
-        }
-      });
-      return candidates.sort((a, b) => b.r - a.r).slice(0, 3);
-    },
-    SEARCH(context, { q }) {
-      return services.suggestions.find({
-        query: {
-          q,
-          // we just want 9 results because we add the original string totalling 10 suggestions
-          limit: 9,
-        },
-      }).then(({ data }) => data.map(d => SuggestionFactory.create(d)).filter(Boolean));
-    },
-    SUGGEST_COLLECTIONS(context, { q }) {
-      return services.collections.find({
-        query: {
-          limit: 3,
-          q,
-        },
-      }).then((co) => {
-        return co.data.map(d => {
-          return new SuggestionCollection({
-            item: d,
-            h: d.name,
-            q: d.uid,
-            type: 'collection',
-          });
-        });
-      });
-    },
-  },
-};
diff --git a/src/store/Collections.js b/src/store/Collections.js
deleted file mode 100644
index 7c6f4813b..000000000
--- a/src/store/Collections.js
+++ /dev/null
@@ -1,254 +0,0 @@
-import * as services from '@/services';
-import Collection from '@/models/Collection';
-import Article from '@/models/Article';
-import Helpers from '@/plugins/Helpers';
-import Facet from '@/models/Facet';
-
-export default {
-  namespaced: true,
-  state: {
-    collections: [],
-    collectionItems: [],
-    orderBy: '-dateAdded', // dateAdded, itemDate, -itemDate
-    paginationPerPage: 12,
-    paginationCurrentPage: 1,
-    paginationTotalRows: 0,
-    collectionsOrderBy: '-date', // '-date', 'date', '-size', 'size'
-    collectionsQ: '',
-    collectionsPaginationPerPage: 20,
-    collectionsPaginationCurrentPage: 1,
-    collectionsPaginationTotalRows: 0,
-  },
-  getters: {
-    collections(state) {
-      return state.collections.map((collection) => {
-        if (collection instanceof Collection) {
-          return collection;
-        }
-
-        return new Collection(collection);
-      });
-    },
-    collectionItems(state) {
-      return state.collectionItems.map((a) => {
-        if (a instanceof Article) {
-          return a;
-        }
-
-        return new Article(a);
-      });
-    },
-  },
-  mutations: {
-    UPDATE_ITEMS_ORDER_BY(state, orderBy) {
-      state.orderBy = orderBy;
-    },
-    UPDATE_COLLECTIONS(state, collections) {
-      state.collections = collections;
-    },
-    UPDATE_COLLECTION_ITEMS(state, items) {
-      state.collectionItems = items;
-    },
-    UPDATE_PAGINATION_CURRENT_PAGE(state, page) {
-      state.paginationCurrentPage = parseInt(page, 10);
-    },
-    UPDATE_PAGINATION_TOTAL_ROWS(state, payload) {
-      state.paginationTotalRows = payload.paginationTotalRows;
-    },
-    UPDATE_PAGINATION_LIST_CURRENT_PAGE(state, page) {
-      state.collectionsPaginationCurrentPage = parseInt(page, 10);
-    },
-    UPDATE_PAGINATION_LIST_TOTAL_ROWS(state, total) {
-      state.collectionsPaginationTotalRows = parseInt(total, 10);
-    },
-    SET_COLLECTIONS_SORT_ORDER(state, orderBy) {
-      state.collectionsOrderBy = orderBy;
-    },
-    SET_COLLECTIONS_Q(state, q) {
-      state.collectionsQ = q;
-    },
-  },
-  actions: {
-    LOAD_COLLECTION(context, collection) {
-      return Promise.all([
-        services.collections.get(collection.uid, {}),
-        services.collectionsItems.find({
-          query: {
-            collection_uids: [collection.uid],
-            resolve: 'item',
-            page: context.state.paginationCurrentPage,
-            limit: context.state.paginationPerPage,
-            // TODO Uncomment the following line when service is ready
-            // order_by: context.state.orderBy,
-          },
-        }),
-      ]).then((results) => {
-        const loadedCollection = new Collection(results[0]);
-        const articles = [];
-        results[1].data.forEach((a) => {
-          if (!(a.item instanceof Article)) {
-            articles.push(new Article(a.item));
-          }
-        });
-        context.commit('UPDATE_COLLECTION_ITEMS', articles);
-        context.commit('UPDATE_PAGINATION_TOTAL_ROWS', {
-          paginationTotalRows: results[1].total,
-        });
-
-        return loadedCollection;
-      });
-    },
-    LOAD_COLLECTIONS_ITEMS(context) {
-      return Promise.all([
-        services.collectionsItems.find({
-          query: {
-            resolve: 'item',
-            page: context.state.paginationCurrentPage,
-            limit: context.state.paginationPerPage,
-            // TODO Uncomment the following line when service is ready
-            // order_by: context.state.orderBy,
-          },
-        }),
-      ]).then((results) => {
-        const articles = [];
-        results[0].data.forEach((a) => {
-          if (!(a.item instanceof Article)) {
-            articles.push(new Article(a.item));
-          }
-        });
-        context.commit('UPDATE_COLLECTION_ITEMS', articles);
-        context.commit('UPDATE_PAGINATION_TOTAL_ROWS', {
-          paginationTotalRows: results[0].total,
-        });
-
-        return articles;
-      });
-    },
-    LOAD_COLLECTIONS(context) {
-      // console.log(context);
-      return new Promise((resolve) => {
-        services.collections.find({
-          query: {
-            page: context.state.collectionsPaginationCurrentPage,
-            limit: context.state.collectionsPaginationPerPage,
-            order_by: context.state.collectionsOrderBy,
-            q: context.state.collectionsQ,
-          },
-        }).then((results) => {
-          context.commit('UPDATE_COLLECTIONS', results.data.map(result => new Collection({
-            countArticles: result.count_articles,
-            countEntities: result.count_entities,
-            countIssues: result.count_issues,
-            countPages: result.count_pages,
-            creationDate: result.creation_date,
-            lastModifiedDate: result.last_modified_date,
-            ...result,
-          })));
-          // context.commit('SET_COLLECTIONS_SORT_ORDER', {});
-          context.commit('UPDATE_PAGINATION_LIST_TOTAL_ROWS', results.total);
-          resolve(results);
-        });
-      });
-    },
-    LOAD_TIMELINE(context, collectionId) {
-      const query = {
-        filters: [{
-          type: 'collection',
-          q: collectionId,
-        }],
-        // group_by: 'articles',
-        limit: 100000,
-      };
-      return services.searchFacets.get('year', {
-        query,
-      }).then(res => Helpers.timeline.fromBuckets(res.buckets));
-    },
-    LOAD_FACETS(context, payload) {
-      const facetType = payload.type;
-      const query = {
-        filters: [{
-          type: 'collection',
-          q: payload.q,
-        }],
-        // group_by: 'articles',
-      };
-      return services.searchFacets.get(facetType, {
-        query,
-      }).then((facetType) => new Facet(facetType));
-    },
-    EDIT_COLLECTION(context, payload) {
-      return new Promise((resolve) => {
-        services.collections.patch(payload.uid, {
-          name: payload.name,
-          description: payload.description,
-        }).then(res => resolve(res));
-      });
-    },
-    ADD_COLLECTION(context, payload) {
-      return services.collections.create({
-        name: payload.name,
-        description: payload.description
-      })
-    },
-    DELETE_COLLECTION(context, uid) {
-      return new Promise((resolve) => {
-        services.collections.remove(uid).then(res => resolve(res));
-      });
-    },
-    ADD_COLLECTION_ITEM(context, {
-      item,
-      collection,
-      contentType,
-    }) {
-      return services.collectionsItems.create({
-        collection_uid: collection.uid,
-        items: [{
-          content_type: contentType,
-          uid: item.uid,
-        }],
-      });
-    },
-    ADD_COLLECTION_ITEMS(context, {
-      items,
-      collection,
-      contentType,
-    }) {
-      return services.collectionsItems.create({
-        collection_uid: collection.uid,
-        items: items.map(item => ({
-          uid: item.uid,
-          content_type: contentType,
-        })),
-      });
-    },
-    REMOVE_COLLECTION_ITEM(context, {
-      item,
-      collection,
-    }) {
-      const contentType = item.constructor.name.toLowerCase();
-
-      return services.collectionsItems.remove(null, {
-        query: {
-          collection_uid: collection.uid,
-          items: [{
-            content_type: contentType,
-            uid: item.uid,
-          }],
-        },
-      });
-    },
-    REMOVE_COLLECTION_ITEMS(context, {
-      items,
-      collection,
-    }) {
-      return services.collectionsItems.remove(null, {
-        query: {
-          collection_uid: collection.uid,
-          items: items.map(item => ({
-            uid: item.uid,
-          })),
-        },
-      });
-    },
-  },
-};
diff --git a/src/store/Embeddings.js b/src/store/Embeddings.js
deleted file mode 100644
index 4cd4750ea..000000000
--- a/src/store/Embeddings.js
+++ /dev/null
@@ -1,15 +0,0 @@
-export default {
-  namespaced: true,
-  state: {
-    language: 'fr',
-    limit: 25,
-  },
-  mutations: {
-    UPDATE_LANGUAGE(state, language) {
-      state.language = language;
-    },
-    UPDATE_LIMIT(state, limit) {
-      state.limit = limit;
-    },
-  }
-}
diff --git a/src/store/Entities.js b/src/store/Entities.js
deleted file mode 100644
index 5e3484a74..000000000
--- a/src/store/Entities.js
+++ /dev/null
@@ -1,170 +0,0 @@
-import * as services from '@/services';
-import Entity from '@/models/Entity';
-import Article from '@/models/Article';
-import Mention from '@/models/Mention';
-import Helpers from '@/plugins/Helpers';
-import Facet from '@/models/Facet';
-
-export default {
-  namespaced: true,
-  state: {
-    orderBy: '-count',
-    items: [],
-    query: '',
-    isLoading: false,
-    applyCurrentSearchFilters: true,
-    pagination: {
-      perPage: 10,
-      currentPage: 1,
-      totalRows: 0,
-    },
-  },
-  getters: {},
-  mutations: {
-    UPDATE_QUERY(state, query) {
-      state.query = query;
-      console.info('update q', query);
-    },
-    UPDATE_ENTITIES(state, items) {
-      state.items = items;
-    },
-    UPDATE_ORDER_BY(state, orderBy) {
-      state.orderBy = orderBy;
-    },
-    UPDATE_PAGINATION(state, pagination) {
-      state.pagination = {
-        ...state.pagination,
-        ...pagination,
-      };
-    },
-    UPDATE_IS_LOADING(state, value) {
-      state.isLoading = value;
-    },
-    UPDATE_APPLY_CURRENT_SEARCH_FILTERS(state, value) {
-      state.applyCurrentSearchFilters = value;
-    },
-  },
-  actions: {
-    UPDATE_IS_LOADING({ commit }, value) {
-      commit('UPDATE_IS_LOADING', value);
-    },
-    UPDATE_APPLY_CURRENT_SEARCH_FILTERS({ commit }, value) {
-      commit('UPDATE_APPLY_CURRENT_SEARCH_FILTERS', value);
-    },
-    UPDATE_ORDER_BY({ commit }, value) {
-      commit('UPDATE_ORDER_BY', value);
-    },
-    LOAD_ENTITIES({ state, commit }, { page = 1, q = '' } = {}) {
-      commit('UPDATE_PAGINATION', {
-        currentPage: page,
-      });
-      const query = {
-        limit: state.pagination.perPage,
-        order_by: state.orderBy,
-        page: state.pagination.currentPage,
-      };
-      if (q.length) {
-        query.q = q.split('*').concat(['*']).join('');
-      }
-      console.info('entities/LOAD_ENTITIES loading query:', query);
-      return services.entities.find({
-        query,
-      }).then((res) => {
-        console.info('entities/LOAD_ENTITIES', res);
-        const items = res.data.map(result => new Entity({
-          ...result,
-        }));
-        commit('UPDATE_ENTITIES', items);
-        commit('UPDATE_PAGINATION', {
-          totalRows: res.total,
-        });
-        return items;
-      });
-    },
-    LOAD_ENTITY_ARTICLES(context, { page = 1, filters = [], orderBy = '-relevance' } = []) {
-      const query = {
-        page,
-        filters,
-        order_by: orderBy,
-        group_by: 'articles',
-      };
-      return services.search.find({
-        query,
-      }).then(res => ({
-        ...res,
-        data: res.data.map(d => new Article(d)),
-      }));
-    },
-    LOAD_ENTITY_MENTIONS(context, { page = 1, filters = [], orderBy = '-relevance', faster = 'on' } = []) {
-      const query = {
-        faster,
-        page,
-        filters,
-        order_by: orderBy,
-      };
-      console.info('entities/LOAD_ENTITY_MENTIONS query:', query);
-
-      return services.mentions.find({
-        query,
-      }).then((res) => {
-        console.info('entities/LOAD_ENTITY_MENTIONS SUCCESS? receved:', res);
-        return res;
-      }).then(res => ({
-        ...res,
-        data: res.data.map((d) => {
-          const mention = new Mention(d);
-          if (mention.article) {
-            mention.article = new Article(mention.article);
-          }
-          return mention;
-        }),
-      }));
-    },
-    LOAD_DETAIL(context, entityId) {
-      return services.entities.get(entityId, {}).then((res) => {
-        console.info('entities/LOAD_DETAIL success:', res);
-        return new Entity(res);
-      });
-    },
-    LOAD_TIMELINE(context, entityId) {
-      const query = {
-        filters: [{
-          type: 'entity',
-          q: entityId,
-        }],
-        // group_by: 'articles',
-      };
-      return services.searchFacets.get('year', {
-        query,
-      }).then(res => Helpers.timeline.fromBuckets(res.buckets));
-    },
-    LOAD_PAGE_TOPICS(context, pageId) {
-      const query = {
-        filters: [{
-          type: 'page',
-          q: pageId,
-        }],
-        // group_by: 'articles',
-      };
-      return services.searchFacets.get('topic', {
-        query,
-      }).then((topic) => new Facet(topic));
-    },
-    LOAD_PAGE_ENTITIES(context, pageId) {
-      const query = {
-        facets: ['location', 'person'],
-        filters: [{
-          type: 'page',
-          q: pageId,
-        }],
-        // group_by: 'articles',
-      };
-      return services.searchFacets.find({
-        query,
-      }).then((response) => [
-        new Facet(response.data[0]),
-        new Facet(response.data[1]),
-      ]);
-    },
-  },
-};
diff --git a/src/store/Issue.js b/src/store/Issue.js
deleted file mode 100644
index eda937faf..000000000
--- a/src/store/Issue.js
+++ /dev/null
@@ -1,191 +0,0 @@
-import * as services from '@/services';
-import Issue from '@/models/Issue';
-import Page from '@/models/Page';
-import Article from '@/models/Article';
-import ArticleBase from '@/models/ArticleBase';
-import { mapFilters } from '@/logic/queryParams'
-
-const getFilters = mapFilters().get
-
-export default {
-  namespaced: true,
-  state: {
-    showOutlines: false,
-    viewerMode: 'text', // text or image
-    pagesIndex: {},
-    issue: null,
-  },
-  mutations: {
-    UPDATE_VIEWER_MODE(state, viewerMode) {
-      state.viewerMode = viewerMode;
-    },
-    UPDATE_OUTLINES(state, showOutlines) {
-      state.showOutlines = showOutlines;
-    },
-    SET_ISSUE(state, issue) {
-      state.issue = issue;
-    },
-    SET_ISSUE_ARTICLES(state, articles) {
-      state.issue.articles = articles;
-    },
-    SET_PAGE_INDEX(state) {
-      // create or reset page index to quickly get access to the desired page
-      state.pagesIndex = {};
-      state.issue.pages.forEach((page, i) => {
-        state.pagesIndex[page.uid] = i;
-      });
-      console.info('>>> store.issue.SET_PAGE_INDEX', state.issue.pages.length);
-    },
-    SET_PAGE_ARTICLE(state, { pageIdx, articleIdx }) {
-      state.issue.pages[pageIdx].articles.push(state.issue.articles[articleIdx]);
-    },
-  },
-  actions: {
-    SEARCH_PAGE(context, uid) {
-      return services.search.find({
-        query: {
-          group_by: 'articles',
-          filters: getFilters().concat([
-            {
-              type: 'page',
-              q: uid,
-            },
-          ]),
-          limit: 2,
-        },
-      }).then(result => result.data);
-    },
-    SEARCH_UIDS(context, uids) {
-      return services.search.find({
-        query: {
-          group_by: 'articles',
-          filters: getFilters().concat([
-            {
-              type: 'uid',
-              q: uids,
-            },
-          ]),
-          limit: 2,
-        },
-      }).then(result => result.data);
-    },
-    LOAD_ISSUE({ commit }, uid) {
-      return services.issues.get(uid, {}).then((d) => {
-        const issue = new Issue(d);
-        commit('SET_ISSUE', issue);
-        // create or reset page index to quickly get access to the desired page
-        const pagesIndex = {};
-        issue.pages.forEach((page, i) => {
-          pagesIndex[page.uid] = i;
-        });
-        commit('SET_PAGE_INDEX', pagesIndex);
-        return issue;
-      });
-    },
-    LOAD_ISSUES(context, {
-      page = 1,
-      orderBy = '-date',
-      limit,
-      filters = [],
-    } = {}) {
-      return services.issues.find({
-        query: { filters, page, limit, order_by: orderBy },
-      }).then(res => ({
-        ...res,
-        data: res.data.map(d => new Issue(d)),
-      }));
-    },
-    LOAD_PAGE(context, uid) {
-      return Promise.all([
-        services.pages.get(uid, {}).catch((err) => {
-          console.error('Error in `store/issue/LOAD_PAGE` pages.get(', uid, ')', err.name);
-          throw err;
-        }),
-        services.articles.find({
-          query: {
-            filters: [{
-              type: 'page',
-              q: uid,
-            }],
-            limit: 500,
-          },
-        }),
-      ]).then(([page, articles]) => new Page({
-        ...page,
-        articles: articles.data.map(article => new Article(article)),
-        articlesEntities: page.articlesEntities,
-        articlesTags: page.articlesTags,
-      }))
-        .catch((err) => {
-          console.error(err);
-        });
-    },
-    LOAD_ARTICLE(context, uid) {
-      return services.articles.get(uid).then(d => new Article(d));
-    },
-    LOAD_TABLE_OF_CONTENTS({ commit, state }) {
-      const tocPromise = services.tableOfContents.get(state.issue.uid, {})
-        .then(({ articles }) => articles.map(d => new ArticleBase(d)));
-
-      const imagesPromise = services.images.find({
-        query: {
-          filters: [{
-            type: 'issue',
-            q: state.issue.uid,
-          }],
-          order_by: 'id',
-          limit: 500,
-        },
-      }).then(({ data }) => data).catch((err) => {
-        // forward to service
-        console.error(err);
-        return [];
-      });
-
-      return Promise.all([tocPromise, imagesPromise]).then(([articles, images]) => {
-        // articles are sorted by id
-        const uids = articles.map(d => d.uid);
-        // merge the table of images into the table of articles
-        images.forEach((image) => {
-          if (image.article) {
-            const idx = uids.indexOf(image.article.uid || image.article);
-            if (idx !== -1) {
-              articles[idx].images.push(new Article(image));
-            }
-          } else {
-            // it will be inserted later in the right page
-            console.info('Image added as article, no article has been attached to it:', image);
-            articles.push(new Article(image));
-          }
-        });
-
-        commit('SET_ISSUE_ARTICLES', articles);
-        // refresh table of contents
-        for (let i = 0, l = articles.length; i < l; i += 1) {
-          for (let ii = 0, ll = articles[i].pages.length; ii < ll; ii += 1) {
-            const pageUid = articles[i].pages[ii].uid;
-            if (state.pagesIndex[pageUid] > -1) {
-              commit('SET_PAGE_ARTICLE', {
-                pageIdx: state.pagesIndex[pageUid],
-                articleIdx: i,
-              });
-            } else {
-              console.info('state.pagesIndex', state.pagesIndex);
-              console.error(`page nout found on issue: '${pageUid}', skipping`);
-            }
-          }
-        }
-        // merge the table of images into the table of articles
-        // for (let i = 0; i < values[0].pages.length; i += 1) {
-        //   for (let j = 0; j < values[0].pages[i].articles.length; j += 1) {
-        //     values[0].pages[i].articles[j].images =
-        //       values[1].data.filter(image =>
-        //       image.article === values[0].pages[i].articles[j].uid)
-        //       .map(image => new Article(image));
-        //   }
-        // }
-        return articles;
-      });
-    },
-  },
-};
diff --git a/src/store/Jobs.js b/src/store/Jobs.js
deleted file mode 100644
index 493524e75..000000000
--- a/src/store/Jobs.js
+++ /dev/null
@@ -1,84 +0,0 @@
-/* eslint-disable no-unused-vars */
-import { jobs as jobsService } from '@/services'
-import Job from '@/models/Job'
-
-export default {
-  namespaced: true,
-  state: {
-    data: [],
-    items: [],
-    itemsIndex: {},
-    totalItems: 0,
-  },
-  mutations: {
-    CHANGE_ITEM_AT_INDEX(state, { idx, status, progress, task }) {
-      state.items[idx].status = status
-      if (typeof progress !== 'undefined') {
-        state.items[idx].progress = progress
-      }
-      if (typeof task !== 'undefined') {
-        state.items[idx].task = task
-      }
-    },
-    SET_ITEMS(state, items) {
-      state.items = items
-    },
-    SET_TOTAL_ITEMS(state, total) {
-      state.totalItems = total
-    },
-  },
-  actions: {
-    TEST() {
-      return jobsService.create({})
-    },
-    UPDATE_JOB({ commit, state, dispatch }, job) {
-      const idx = state.items.findIndex(d => d.id === job.id)
-      if (idx > -1) {
-        commit('CHANGE_ITEM_AT_INDEX', {
-          status: job.status,
-          progress: job.progress,
-          task: job.task,
-          idx,
-        })
-      } else {
-        // reload
-        dispatch('LOAD_JOBS')
-      }
-    },
-    LOAD_JOBS({ commit }, { page = 1, limit = 4 } = {}) {
-      return jobsService
-        .find({
-          query: {
-            page,
-            limit,
-          },
-        })
-        .then(({ data, total }) => {
-          commit(
-            'SET_ITEMS',
-            data.map(
-              d =>
-                new Job({
-                  ...d,
-                  progress: d.extra ? d.extra.progress : 0,
-                }),
-            ),
-          )
-          commit('SET_TOTAL_ITEMS', total)
-        })
-    },
-    PATCH_JOB({ commit, state }, job) {
-      return jobsService.patch(job.id, job).then(res => {
-        const idx = state.items.findIndex(d => d.id === job.id)
-        if (idx !== -1) {
-          // update live:
-          commit('CHANGE_ITEM_AT_INDEX', {
-            idx,
-            status: res.status,
-          })
-        }
-        return res
-      })
-    },
-  },
-}
diff --git a/src/store/Monitor.js b/src/store/Monitor.js
deleted file mode 100644
index 5377c67cf..000000000
--- a/src/store/Monitor.js
+++ /dev/null
@@ -1,174 +0,0 @@
-import * as services from '@/services';
-import Helpers from '@/plugins/Helpers';
-import Entity from '@/models/Entity';
-import Topic from '@/models/Topic';
-
-const DEFAULT_SEARCH_NAMESPACE = 'search';
-
-const serviceByType = {
-  person: 'entities',
-  location: 'entities',
-};
-
-export default {
-  namespaced: true,
-  state: {
-    isActive: false,
-    isPending: false,
-    isPendingTimeline: false,
-    applyCurrentSearchFilters: true,
-    item: null,
-    type: null,
-    itemCountRelated: -1,
-    uid: '',
-    searchQueryNamespace: DEFAULT_SEARCH_NAMESPACE,
-    timeline: [],
-    groupBy: 'articles',
-    subtitle: undefined,
-    disableFilterModification: false,
-    filters: []
-  },
-  mutations: {
-    SET_IS_ACTIVE(state, value) {
-      state.isActive = !!value;
-    },
-    SET_ITEM(state, item) {
-      state.item = item; // update item
-      state.isPending = false;
-    },
-    SET_ITEM_TIMELINE(state, timeline) {
-      state.timeline = timeline;
-      state.isPendingTimeline = false;
-    },
-    SET_ITEM_COUNT_RELATED(state, n) {
-      state.itemCountRelated = parseInt(n, 10);
-    },
-    SET_PENDING_ITEM(state, item) {
-      state.item = item;
-      state.isPending = true;
-    },
-    RESET_TIMELINE(state) {
-      state.timeline = [];
-      state.isPendingTimeline = true;
-    },
-    SET_APPLY_CURRENT_SEARCH_FILTERS(state, value) {
-      state.applyCurrentSearchFilters = value;
-    },
-    SET_ITEM_TYPE(state, type) {
-      state.type = type;
-    },
-    /**
-     * @param {object} state
-     * @param {{
-     *  subtitle: string | undefined
-     *  disableFilterModification: boolean
-     *  filters: import('@/models').Filter[]
-     * }} param
-     */
-    SET_ACTIVATION_PARAMETERS(state, { subtitle, disableFilterModification, filters }) {
-      state.subtitle = subtitle
-      state.disableFilterModification = disableFilterModification
-      state.filters = filters
-    },
-    UPDATE_FILTERS(state, filters) {
-      state.filters = filters
-    }
-  },
-  actions: {
-    HIDE({ commit }) { commit('SET_IS_ACTIVE', false) },
-    SET_APPLY_CURRENT_SEARCH_FILTERS({ commit }, value) {
-      commit('SET_APPLY_CURRENT_SEARCH_FILTERS', value);
-    },
-    LOAD_ITEM_TIMELINE({ state, commit }) {
-      commit('RESET_TIMELINE');
-      let filters = [
-        {
-          type: state.type,
-          q: state.item.uid,
-        },
-      ];
-      // if user asked to get details in current search:
-      if (state.applyCurrentSearchFilters) {
-        filters = filters.concat(state.filters);
-      }
-      // fetch article timeline related to the given type
-      return services.search.find({
-        lock: false,
-        query: {
-          group_by: state.groupBy,
-          filters,
-          facets: 'year',
-          limit: 0,
-        },
-        limit: 0,
-      }).then((res) => {
-        commit('SET_ITEM_COUNT_RELATED', res.total);
-        if (res.info.facets && res.info.facets.year) {
-          commit('SET_ITEM_TIMELINE', Helpers.timeline.fromBuckets(res.info.facets.year.buckets));
-        }
-      });
-    },
-    SET_ITEM({ commit, dispatch }, { item, type }) {
-      commit('SET_IS_ACTIVE', true);
-      commit('SET_PENDING_ITEM', item);
-      commit('SET_ITEM_TYPE', type);
-      // add item resolution promise to the promise chain
-      if (serviceByType[type]) {
-        return Promise.all([
-          dispatch('LOAD_ITEM_TIMELINE'),
-          services[serviceByType[type]].get(item.uid).then((res) => {
-            if (['location', 'person'].indexOf(type) !== -1) {
-              commit('SET_ITEM', new Entity(res));
-            } else if (type === 'topic') {
-              commit('SET_ITEM', new Topic(res));
-            } else {
-              commit('SET_ITEM', res);
-            }
-          }),
-        ]).catch((err) => {
-          console.error(err);
-        });
-      }
-      // if there is no item to fetch, just get the timeline data.
-      commit('SET_ITEM', item);
-      return dispatch('LOAD_ITEM_TIMELINE');
-    },
-    /**
-     * @typedef {{
-     *  item: import('@/models').Entity,
-     *  type: string,
-     *  filters: import('@/models').Filter[]
-     *  filtersUpdatedCallback: (filters: import('@/models').Filter) => void
-     *  subtitle?: string
-     *  disableFilterModification?: boolean
-     * }} ActivateParams
-     * @param {import('vuex').ActionContext} param0
-     * @param {ActivateParams} param1
-     */
-    ACTIVATE({ commit, dispatch }, {
-      item,
-      type,
-      filters = [],
-      filtersUpdatedCallback = () => {},
-      subtitle = undefined,
-      disableFilterModification = false
-    }) {
-
-      const unsubscribe = this.subscribeAction(({ type, payload }) => {
-        if (type === 'monitor/UPDATE_FILTERS') filtersUpdatedCallback(payload)
-        if (type === 'monitor/HIDE') {
-          unsubscribe()
-        }
-      })
-      commit('SET_ACTIVATION_PARAMETERS', {
-        subtitle,
-        disableFilterModification,
-        filters
-      })
-      return dispatch('SET_ITEM', { item, type })
-    },
-    UPDATE_FILTERS({ commit }, filters) {
-      commit('UPDATE_FILTERS', filters)
-    }
-  },
-};
diff --git a/src/store/Notifications.ts b/src/store/Notifications.ts
deleted file mode 100644
index a66472c20..000000000
--- a/src/store/Notifications.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-import { v4 } from 'uuid'
-import { Module } from 'vuex'
-
-interface Notification {
-  title: string;
-  message: string;
-  type: 'success' | 'error';
-}
-
-export interface StoredNotification extends Notification {
-  id: string;
-}
-
-export interface NotificationsState {
-  notifications: StoredNotification[]
-}
-export type NoticiationsModule = Module<NotificationsState, any>
-
-export default {
-  namespaced: true,
-  state: () => ({
-    notifications: [],
-  }) as NotificationsState,
-  actions: {
-    addNotification({ state }, notification: Notification) {
-      const id = v4();
-      state.notifications = [...state.notifications, { ...notification, id }]
-      setTimeout(() => {
-        state.notifications = state.notifications.filter(n => n.id !== id);
-      }, 5000)
-      console.log('notification', state.notifications);
-    },
-    removeNotification({ state }, id: string) {
-      state.notifications = state.notifications.filter(n => n.id !== id);
-    }
-  }
-} as NoticiationsModule
diff --git a/src/store/Search.js b/src/store/Search.js
deleted file mode 100644
index cf3672ba9..000000000
--- a/src/store/Search.js
+++ /dev/null
@@ -1,512 +0,0 @@
-import { protobuf } from 'impresso-jscommons';
-import * as services from '@/services';
-import Article from '@/models/Article';
-import QueryComponent from '@/models/QueryComponent';
-import SearchQuery from '@/models/SearchQuery';
-import Facet from '@/models/Facet';
-import Helpers from '@/plugins/Helpers';
-import router from '../router';
-
-/**
- * NOTE: Most of this store is not used and will be downsized/removed soon.
- */
-
-export default {
-  namespaced: true,
-  state: {
-    search: new SearchQuery({
-      filters: [{ type: 'hasTextContents' }],
-    }),
-    currentSearchHash: '',
-    currentSearchIsPristine: true,
-    searches: [],
-    results: [],
-    facets: [
-      new Facet({
-        type: 'year',
-      }),
-      new Facet({
-        type: 'type',
-      }),
-      new Facet({
-        type: 'collection',
-      }),
-      new Facet({
-        type: 'country',
-      }),
-      new Facet({
-        type: 'person',
-        operators: ['OR', 'AND'],
-      }),
-      new Facet({
-        type: 'location',
-        operators: ['OR', 'AND'],
-      }),
-      new Facet({
-        type: 'language',
-      }),
-      new Facet({
-        type: 'newspaper',
-      }),
-      new Facet({
-        type: 'topic',
-        operators: ['OR', 'AND'],
-      }),
-      new Facet({
-        type: 'accessRight',
-      }),
-      new Facet({
-        type: 'partner',
-      }),
-    ],
-    facetTypes: ['person', 'location', 'year', 'newspaper', 'language', 'topic', 'collection', 'accessRight', 'partner'], // this also sets the order of the filters
-    orderBy: '-relevance', // -relevance, date, -date
-    orderByOptions: ['-relevance', 'date', '-date'],
-    groupBy: 'articles', // issues, pages, articles, sentences
-    displayStyle: 'list',
-    paginationPerPage: 12,
-    paginationCurrentPage: 1,
-    paginationTotalRows: 0,
-    queryComponents: [],
-    filterFacetYearExpanded: false,
-    isLoadingResults: false,
-  },
-  getters: {
-    getSearches(state) {
-      return state.searches;
-    },
-    getSearchesReversed(state) {
-      return state.searches.slice().reverse();
-    },
-    getSearch(state) {
-      return state.search instanceof SearchQuery ? state.search : new SearchQuery(state.search);
-    },
-    getCurrentSearch(state) {
-      return state.search;
-    },
-    getCurrentSearchHash(state) {
-      return state.search.getSerialized({ serializer: 'protobuf' });
-    },
-    countActiveFilters(state) {
-      return state.search.countActiveFilters();
-    },
-    results(state) {
-      return state.results.map((result) => {
-        if (result instanceof Article) {
-          return result;
-        }
-
-        return new Article(result);
-      });
-    },
-    facets(state) {
-      return state.facets;
-    },
-  },
-  mutations: {
-    // general settings
-    UPDATE_SEARCH_QUERY_FILTERS(state, filters) {
-      state.search.updateFilters(filters);
-    },
-    UPDATE_SEARCH_ORDER_BY(state, orderBy) {
-      state.orderBy = orderBy;
-    },
-    UPDATE_SEARCH_GROUP_BY(state, groupBy) {
-      state.groupBy = groupBy;
-    },
-    UPDATE_SEARCH_DISPLAY_STYLE(state, displayStyle) {
-      state.displayStyle = displayStyle;
-    },
-    UPDATE_PAGINATION_PER_PAGE(state, paginationPerPage) {
-      state.paginationPerPage = parseInt(paginationPerPage, 10);
-    },
-    // pagination
-    UPDATE_PAGINATION_CURRENT_PAGE(state, page) {
-      state.paginationCurrentPage = parseInt(page, 10);
-    },
-    UPDATE_PAGINATION_TOTAL_ROWS(state, payload) {
-      state.paginationTotalRows = payload.paginationTotalRows;
-    },
-    UPDATE_QUERY_COMPONENTS(state, queryComponents) {
-      state.search.enrichFilters(queryComponents);
-      state.queryComponents = queryComponents.map(d => new QueryComponent(d));
-    },
-    UPDATE_FILTER_FACET_YEAR_EXPANDED(state, expanded) {
-      state.filterFacetYearExpanded = expanded;
-    },
-    ADD_FILTER(state, filter) {
-      state.search.addFilter({ ...filter });
-      state.currentSearchHash = state.search.getSerialized({ serializer: 'protobuf' });
-    },
-    INITIALIZE_FILTERS(state, filters) {
-      filters.forEach(d => state.search.addFilter(d));
-      state.currentSearchHash = state.search.getSerialized({ serializer: 'protobuf' });
-    },
-    REMOVE_FILTER(state, filter) {
-      state.search.removeFilter(filter);
-      state.currentSearchHash = state.search.getSerialized({ serializer: 'protobuf' });
-    },
-    RESET_FILTER(state, type) {
-      state.search.resetFilter(type);
-      state.currentSearchHash = state.search.getSerialized({ serializer: 'protobuf' });
-    },
-    UPDATE_FILTER(state, { filter, q, op, context, precision, distance }) {
-      state.search.updateFilter({ filter, q, op, context, precision, distance });
-    },
-    UPDATE_FILTER_ITEM(state, { filter, item, uid }) {
-      state.search.updateFilterItem({ filter, item, uid });
-    },
-    STORE_SEARCH(state) {
-      state.searches.push(state.search);
-      state.search = new SearchQuery(state.search);
-    },
-    CLEAR(state) {
-      state.search = new SearchQuery();
-      state.results = [];
-      state.paginationCurrentPage = 1;
-      state.paginationTotalRows = 0;
-    },
-    LOAD_SEARCH(state, id) {
-      if (state.searches.length) {
-        // load last search
-        let searchData = state.searches[state.searches.length - 1];
-
-        // or if id is set then load search with specifici uuid
-        if (id) {
-          searchData = state.searches.find(search => search.uuid === id);
-        }
-
-        state.search = new SearchQuery(searchData);
-      }
-    },
-    CLEAR_RESULTS(state) {
-      state.results = [];
-    },
-    UPDATE_RESULTS(state, results) {
-      state.results = results;
-    },
-    UPDATE_IS_LOADING(state, isLoadingResults) {
-      state.isLoadingResults = Boolean(isLoadingResults);
-    },
-    UPDATE_FACET(state, { type, numBuckets, buckets }) {
-      const facet = state.facets.find(d => d.type === type);
-      if (facet) {
-        facet.numBuckets = numBuckets;
-        if (type === 'year') {
-          // sort bucket differently
-          const sortedBuckets = buckets.sort((a, b) => parseInt(a.val, 10) - parseInt(b.val, 10));
-          facet.setBuckets(sortedBuckets);
-        } else {
-          facet.setBuckets(buckets);
-        }
-      } else {
-        console.error('Could not find any `facet` having type:', type);
-      }
-    },
-    UPDATE_FACET_BUCKETS(state, { type, buckets }) {
-      const facet = state.facets.find(d => d.type === type);
-      if (facet) {
-        facet.buckets = buckets;
-      } else {
-        console.error('Could not find any `facet` having type:', type);
-      }
-    },
-    UPDATE_FILTER_IS_FRONT(state, value) {
-      state.search.isFront = value;
-    },
-    UPDATE_FILTER_HAS_TEXT_CONTENTS(state, value) {
-      state.search.hasTextContents = value;
-    },
-    UPDATE_SEARCH_IS_PRISTINE(state, value) {
-      state.currentSearchIsPristine = Boolean(value);
-    },
-    MERGE_FILTER_AT_INDEX(state, { index, filter }) {
-      state.search.mergeFilterAtIndex(filter, index)
-    }
-  },
-  actions: {
-    UPDATE_SEARCH_QUERY_FILTERS({ commit }, filters) {
-      commit('UPDATE_SEARCH_QUERY_FILTERS', filters)
-    },
-    /**
-     * Print search params to current URL
-     * @param {[type]} context [description]
-     */
-    PUSH_SEARCH_PARAMS({ state, commit }, { routeName = 'search', page = 0 } = {}) {
-      if (page > 0) {
-        commit('UPDATE_PAGINATION_CURRENT_PAGE', page);
-      }
-      const query = {
-        sq: state.search.getSerialized({
-          serializer: 'protobuf',
-        }),
-        f: JSON.stringify(state.search.getFilters()),
-        // facets: state.facetTypes,
-        g: state.groupBy,
-        p: state.paginationCurrentPage,
-        // limit: state.paginationPerPage,
-        o: state.orderBy,
-      };
-      console.info('@PUSH_SEARCH_PARAMS', query);
-      router.push({ name: routeName, query });
-    },
-    PULL_SEARCH_PARAMS({ commit, dispatch }, query) {
-      if (query.g && ['articles'].indexOf(query.g) !== -1) {
-        commit('UPDATE_SEARCH_GROUP_BY', query.g);
-      }
-      if (query.o && ['-relevance', 'date', '-date'].indexOf(query.o) !== -1) {
-        commit('UPDATE_SEARCH_ORDER_BY', query.o);
-      }
-      if (query.p && !isNaN(query.p)) {
-        commit('UPDATE_PAGINATION_CURRENT_PAGE', parseInt(query.p, 10));
-      }
-      console.info('@PULL_SEARCH_PARAMS', query);
-      if (query.f) {
-        try {
-          // try to PARSE json filters
-          commit('UPDATE_SEARCH_QUERY_FILTERS', JSON.parse(query.f));
-        } catch (err) {
-          if (err.name === 'SyntaxError') {
-            console.warn('SyntaxError. Cannot parse query filters:', query.f);
-          } else {
-            console.error(err);
-          }
-        }
-      }
-      // do search!
-      dispatch('SEARCH');
-    },
-    ADD_FILTER_TO_CURRENT_SEARCH({ state, commit, dispatch }, filter) {
-      if (!state.search.filtersIndex[filter.type]) {
-        commit('ADD_FILTER', filter);
-      } else {
-        console.warn('still TODO behaviour of ADD_FILTER_TO_CURRENT_SEARCH', filter);
-        commit('ADD_FILTER', filter);
-      }
-      dispatch('PUSH_SEARCH_PARAMS');
-    },
-    ADD_OR_REPLACE_FILTER(context, filter) {
-      console.warn('ADD_OR_REPLACE_FILTER', 'deprecated', filter);
-      // const index = context.state.search.filters.findIndex(item => item.type === filter.type);
-      // if (index > -1) {
-      //   context.commit('UPDATE_FILTER', {
-      //     index,
-      //     filter,
-      //   });
-      // } else {
-      //   context.commit('ADD_FILTER', filter);
-      // }
-    },
-    CREATE_COLLECTION_FROM_QUERY(context, { filters, collectionUid }) {
-      return new Promise((resolve) => {
-        services.search.create({
-          group_by: 'articles',
-          filters: filters,
-          collection_uid: collectionUid,
-        }).then(res => resolve(res));
-      });
-    },
-    EXPORT_FROM_QUERY(context, payload) {
-      // console.info(context, services.exporter.methods.create);
-      const filters = payload.filters || context.getters.getSearch.getFilters();
-      return new Promise((resolve) => {
-        services.exporter.create({
-          description: payload.description,
-        }, {
-          query: {
-            group_by: 'articles',
-            filters,
-            format: 'csv',
-          },
-        }).then(res => resolve(res));
-      });
-    },
-    EXPORT_FROM_UIDS(context, { filters }) {
-      return services.exporter.create({}, {
-        query: {
-          group_by: 'articles',
-          format: 'csv',
-          filters,
-        },
-      });
-    },
-    LOAD_SEARCH_FACETS(context, { facets, limit = 5, offset = 0 } = {}) {
-      const query = {
-        facets,
-        filters: context.getters.getSearch.getFilters(),
-        group_by: context.state.groupBy,
-        limit,
-        offset,
-      };
-      console.info('Search/LOAD_SEARCH_FACETS query:', query);
-      return services.searchFacets.find({
-        query,
-      }).then((results) => {
-        results.data.forEach((facet) => {
-          context.commit('UPDATE_FACET', facet);
-        });
-      });
-    },
-    GET_SEARCH_RESULTS({ state }, { groupBy, orderBy, page, limit, filters = [], facets = [], } = {}) {
-      const query = {
-        filters,
-        facets,
-        group_by: groupBy || state.groupBy,
-        page: page || state.paginationCurrentPage,
-        limit: limit || state.paginationPerPage,
-        order_by: orderBy || state.orderBy,
-      };
-      return services.search.find({
-        query,
-      }).then((res) => {
-        if (query.groupBy === 'articles') {
-          res.data = res.data.map(result => new Article(result));
-        }
-        return res;
-      });
-    },
-    SEARCH({ state, dispatch, commit, getters }, { filters = [], page } = {}) {
-      commit('UPDATE_IS_LOADING', true);
-      const facets = ['year', 'language', 'newspaper', 'type', 'country', 'topic'];
-      const query = {
-        // concat temporary filters, if any
-        filters: getters.getSearch.getFilters().concat(filters),
-        facets,
-        group_by: state.groupBy,
-        page: page || state.paginationCurrentPage,
-        limit: state.paginationPerPage,
-        order_by: state.orderBy,
-      };
-
-      return services.search.find({
-        query,
-      }).then((res) => {
-        commit('UPDATE_IS_LOADING', false);
-        commit('UPDATE_RESULTS', res.data.map(result => new Article(result)));
-        commit('UPDATE_PAGINATION_TOTAL_ROWS', {
-          paginationTotalRows: res.total,
-        });
-
-        if (this.state.user.userData) {
-          const itemuids = res.data.map(item => item.uid);
-
-          if (state.facets.find(f => f.type === 'collection').numBuckets > 0) {
-            services.collectionsItems.find({
-              query: { item_uids: itemuids, limit: 100 },
-            }).then((cs) => {
-              state.results.forEach((re) => {
-                cs.data.forEach((c) => {
-                  if (c.itemId === re.uid) {
-                    re.collections = c.collections;
-                  }
-                });
-              });
-              // console.log(state.results);
-            });
-          }
-        }
-
-        commit('UPDATE_QUERY_COMPONENTS', res.info.queryComponents);
-        // register facets
-        if (res.total) {
-          facets.forEach((type) => {
-            if (res.info.facets[type]) {
-              commit('UPDATE_FACET', {
-                type,
-                buckets: res.info.facets[type].buckets,
-                numBuckets: res.info.facets[type].numBuckets,
-              });
-            }
-          });
-        }
-      }).then(() => Promise.all([
-        // launch search facets
-        dispatch('LOAD_SEARCH_FACETS', {
-          facets: [
-            'person',
-            'location',
-          ],
-        }),
-        // if there's a user
-        dispatch('LOAD_SEARCH_FACETS', {
-          facets: [
-            'collection',
-          ],
-        }),
-        dispatch('LOAD_SEARCH_FACETS', {
-          facets: [
-            'accessRight',
-            'partner',
-          ],
-        }),
-      ].filter(d => d)))
-        .catch((err) => {
-          console.error('ERROR in "$store.search/SEARCH" services.search:', err);
-        })
-        .finally(() => {
-          commit('UPDATE_IS_LOADING', false);
-        });
-    },
-    UPDATE_QUERY_COMPONENTS({ commit }, components) {
-      commit('UPDATE_QUERY_COMPONENTS', components);
-    },
-    RESET_FILTER({ commit }, { type }) {
-      commit('RESET_FILTER', type);
-    },
-    ADD_FILTER({ commit }, { filter }) {
-      commit('ADD_FILTER', filter);
-    },
-    REMOVE_FILTER({ commit }, { filter }) {
-      commit('REMOVE_FILTER', filter);
-    },
-    UPDATE_FILTER({ commit }, message) {
-      commit('UPDATE_FILTER', message);
-    },
-    UPDATE_FILTER_ITEM({ commit }, message) {
-      commit('UPDATE_FILTER_ITEM', message);
-    },
-    MERGE_FILTER_AT_INDEX({ commit }, message) {
-      commit('MERGE_FILTER_AT_INDEX', message)
-    },
-    LOAD_TIMELINE(context, { filters = [], granularity = 'year' } = {}) {
-      return services.searchFacets.get(granularity, {
-        query: {
-          filters,
-          // group_by: 'articles',
-          limit: 500,
-        },
-      }).then(res => Helpers.timeline.fromBuckets(res.buckets));
-    },
-    LOAD_ARTICLES(context, {
-      page = 1,
-      limit = 10,
-      filters = [],
-      orderBy = '-relevance',
-    } = {}) {
-      return services.search.find({
-        query: {
-          page,
-          limit,
-          filters,
-          order_by: orderBy,
-          group_by: 'articles',
-        },
-      }).then(res => ({
-        ...res,
-        data: res.data.map(d => new Article(d)),
-      }));
-    },
-    INIT({ state, commit }) {
-      if (state.currentSearchIsPristine) {
-        const { filters } = protobuf.searchQuery.deserialize(state.currentSearchHash);
-        if (Array.isArray(filters)) {
-          commit('UPDATE_SEARCH_IS_PRISTINE', true);
-          commit('INITIALIZE_FILTERS', filters);
-        }
-        console.info('search/INIT, initial searchQuery instance:', state.search);
-      } else {
-        console.warn('search/INIT already initialized, skip.');
-      }
-    },
-  },
-};
diff --git a/src/store/SearchImages.js b/src/store/SearchImages.js
deleted file mode 100644
index 595405f02..000000000
--- a/src/store/SearchImages.js
+++ /dev/null
@@ -1,312 +0,0 @@
-import * as services from '@/services';
-import Image from '@/models/Image';
-import QueryComponent from '@/models/QueryComponent';
-import SearchQuery from '@/models/SearchQuery';
-// import Collection from '@/models/Collection';
-import Facet from '@/models/Facet';
-// import FilterFactory from '@/models/FilterFactory';
-import router from '../router';
-
-export default {
-  namespaced: true,
-  state: {
-    search: new SearchQuery(),
-    imageSearches: [],
-    results: [],
-    facets: [
-      new Facet({
-        type: 'year',
-      }),
-      new Facet({
-        type: 'newspaper',
-      }),
-    ],
-    orderBy: '-date', // relevance, -relevance, date, -date
-    groupBy: 'images', // issues, pages, articles, sentences
-    displayStyle: 'images',
-    paginationPerPage: 12,
-    paginationCurrentPage: 1,
-    paginationTotalRows: 0,
-    queryComponents: [],
-    facetTypes: ['year', 'newspaper'], // this also sets the order of the filters
-    filterFacetYearExpanded: false,
-    similarTo: false,
-    similarToUploaded: false,
-    applyRandomPage: true,
-  },
-  getters: {
-    getSearches(state) {
-      return state.imageSearches;
-    },
-    getSearchesReversed(state) {
-      return state.imageSearches.slice().reverse();
-    },
-    getSearch(state) {
-      return state.search instanceof SearchQuery ?
-        state.search : new SearchQuery(state.search);
-    },
-    results(state) {
-      return state.results.map((result) => {
-        if (result instanceof Image) {
-          return result;
-        }
-
-        return new Image(result);
-      });
-    },
-    facets(state) {
-      return state.facets;
-    },
-  },
-  mutations: {
-    // general settings
-    UPDATE_SEARCH_QUERY_FILTERS(state, filters) {
-      state.search.updateFilters(filters);
-    },
-    UPDATE_SEARCH_ORDER_BY(state, orderBy) {
-      state.orderBy = orderBy;
-    },
-    UPDATE_SEARCH_GROUP_BY(state, groupBy) {
-      state.groupBy = groupBy;
-    },
-    UPDATE_SEARCH_DISPLAY_STYLE(state, displayStyle) {
-      state.displayStyle = displayStyle;
-    },
-    UPDATE_PAGINATION_PER_PAGE(state, paginationPerPage) {
-      state.paginationPerPage = parseInt(paginationPerPage, 10);
-    },
-    UPDATE_SIMILAR_TO(state, imageUid) {
-      state.similarTo = imageUid;
-    },
-    UPDATE_SIMILAR_TO_UPLOADED(state, similarToUploaded) {
-      state.similarToUploaded = similarToUploaded;
-    },
-    // pagination
-    UPDATE_PAGINATION_CURRENT_PAGE(state, page) {
-      state.paginationCurrentPage = parseInt(page, 10);
-    },
-    UPDATE_PAGINATION_TOTAL_ROWS(state, payload) {
-      state.paginationTotalRows = payload.paginationTotalRows;
-    },
-    UPDATE_QUERY_COMPONENTS(state, queryComponents) {
-      state.search.enrichFilters(queryComponents);
-      state.queryComponents = queryComponents.map(d => new QueryComponent(d));
-    },
-    UPDATE_FILTER_FACET_YEAR_EXPANDED(state, expanded) {
-      state.filterFacetYearExpanded = expanded;
-    },
-    ADD_FILTER(state, filter) {
-      state.search.addFilter(filter);
-    },
-    REMOVE_FILTER(state, filter) {
-      state.search.removeFilter(filter);
-    },
-    RESET_FILTER(state, type) {
-      state.search.resetFilter(type);
-    },
-    UPDATE_FILTER(state, { filter, q, op, context, precision, distance }) {
-      state.search.updateFilter({ filter, q, op, context, precision, distance });
-    },
-    UPDATE_FILTER_ITEM(state, { filter, item, uid }) {
-      state.search.updateFilterItem({ filter, item, uid });
-    },
-    MERGE_FILTER_AT_INDEX(state, { index, filter }) {
-      state.search.mergeFilterAtIndex(filter, index)
-    },
-    STORE_SEARCH(state) {
-      state.imageSearches.push(state.search);
-      state.search = new SearchQuery(state.search);
-    },
-    CLEAR(state) {
-      state.search = new SearchQuery();
-      state.results = [];
-      state.facets = [];
-      state.paginationCurrentPage = 1;
-      state.paginationTotalRows = 0;
-    },
-    LOAD_SEARCH(state, id) {
-      if (state.imageSearches.length) {
-        // load last search
-        let searchData = state.imageSearches[state.imageSearches.length - 1];
-
-        // or if id is set then load search with specific uuid
-        if (id) {
-          searchData = state.imageSearches.find(search => search.uuid === id);
-        }
-
-        state.search = new SearchQuery(searchData);
-      }
-    },
-    CLEAR_RESULTS(state) {
-      state.results = [];
-    },
-    UPDATE_RESULTS(state, results) {
-      state.results = results;
-    },
-    CLEAR_FACETS(state) {
-      state.facets = [];
-    },
-    UPDATE_FACET(state, { type, numBuckets, buckets }) {
-      const facet = state.facets.find(d => d.type === type);
-      if (facet) {
-        facet.numBuckets = numBuckets;
-        if (type === 'year') {
-          // sort bucket differently
-          const sortedBuckets = buckets.sort((a, b) => parseInt(a.val, 10) - parseInt(b.val, 10));
-          facet.setBuckets(sortedBuckets);
-        } else {
-          facet.setBuckets(buckets);
-        }
-      } else {
-        console.error('Could not find any `facet` having type:', type);
-      }
-    },
-    UPDATE_FILTER_IS_FRONT(state, value) {
-      state.search.isFront = value;
-    },
-    // UPDATE_FILTER_HAS_TEXT_CONTENTS(state, value) {
-    //   state.search.hasTextContents = value;
-    // },
-    SET_RANDOM_PAGE(state, value) {
-      state.applyRandomPage = Boolean(value);
-    },
-  },
-  actions: {
-    UPDATE_SEARCH_QUERY_FILTERS({ commit }, filters) {
-      commit('UPDATE_SEARCH_QUERY_FILTERS', filters)
-    },
-    /**
-     * Print search params to current URL
-     * @param {[type]} context [description]
-     */
-    PUSH_SEARCH_PARAMS({ state }) {
-      const query = {
-        o: state.orderBy,
-        p: state.paginationCurrentPage,
-      };
-      if (state.applyRandomPage) {
-        query.random = (new Date()).toUTCString();
-      }
-      const filters = state.search.getFilters();
-
-      if (filters.length) {
-        query.f = JSON.stringify(filters);
-      }
-
-      if (state.similarToUploaded) {
-        query.u = state.similarToUploaded;
-      } else if (state.similarTo) {
-        query.i = state.similarTo;
-      }
-      // check if query has changed.
-      // if (router.currentRoute.name === 'searchImages' && JSON.stringify(router.currentRoute.query) === JSON.stringify(query)) {
-      //   console.info('@PUSH_SEARCH_PARAMS: same route as before, do nothing.');
-      // } else {
-      //   console.info('@PUSH_SEARCH_PARAMS: printing url...', query);
-      //   router.push({ name: 'searchImages', query });
-      // }
-      router.push({ name: 'searchImages', query });
-    },
-    PULL_SEARCH_PARAMS(context, query) {
-      if (query.o && ['date', '-date'].indexOf(query.o) !== -1) {
-        context.commit('UPDATE_SEARCH_ORDER_BY', query.o);
-      }
-      if (query.p && !isNaN(query.p)) {
-        context.commit('UPDATE_PAGINATION_CURRENT_PAGE', parseInt(query.p, 10));
-      }
-      context.commit('SET_RANDOM_PAGE', Boolean(query.random));
-      if (query.u) {
-        context.commit('UPDATE_SIMILAR_TO_UPLOADED', query.u);
-      } else if (query.i) {
-        context.commit('UPDATE_SIMILAR_TO', query.i);
-      }
-      // parse filters here.
-      try {
-        context.commit('UPDATE_SEARCH_QUERY_FILTERS', JSON.parse(query.f));
-      } catch (err) {
-        console.info(err);
-      }
-      console.info('SearchImages/PULL_SEARCH_PARAMS', query);
-      context.dispatch('SEARCH');
-    },
-    ADD_OR_REPLACE_FILTER(context, filter) {
-      console.error('ADD_OR_REPLACE_FILTER', 'deprecated', filter);
-    },
-    CREATE_COLLECTION_FROM_QUERY(context, collectionUid) {
-      return new Promise((resolve) => {
-        services.search.create({}, {
-          query: {
-            collection_uid: collectionUid,
-            group_by: 'articles',
-            filters: context.getters.getSearch.getFilters(),
-          },
-        }).then(res => resolve(res));
-      });
-    },
-    EXPORT_FROM_QUERY(context, payload) {
-      return new Promise((resolve) => {
-        services.exporter.create({
-          description: payload.description,
-        }, {
-          query: {
-            group_by: 'articles',
-            filters: context.getters.getSearch.getFilters(),
-            format: 'csv',
-          },
-        }).then(res => resolve(res));
-      });
-    },
-    UPDATE_FILTER({ commit }, message) {
-      commit('UPDATE_FILTER', message);
-    },
-    MERGE_FILTER_AT_INDEX({ commit }, message) {
-      commit('MERGE_FILTER_AT_INDEX', message)
-    },
-    SET_RANDOM_PAGE({ commit }, value) {
-      commit('SET_RANDOM_PAGE', value);
-    },
-    UPDATE_PAGINATION_CURRENT_PAGE({ commit }, page) {
-      commit('UPDATE_PAGINATION_CURRENT_PAGE', page);
-    },
-    SEARCH({ state, commit, getters }, { filters = [] } = {}) {
-      const query = {
-        filters: getters.getSearch.getFilters().filter(d => [
-          'newspaper',
-          'isFront',
-          'daterange',
-          'title',
-        ].includes(d.type)).concat(filters),
-        facets: state.facetTypes,
-        group_by: state.groupBy,
-        page: state.paginationCurrentPage,
-        limit: state.paginationPerPage,
-        order_by: state.orderBy,
-        similarTo: state.similarTo,
-        similarToUploaded: state.similarToUploaded,
-        randomPage: state.applyRandomPage ? 'true' : 'false',
-      };
-      return services.images.find({
-        query,
-      }).then((res) => {
-        commit('UPDATE_RESULTS', res.data.map(result => new Image(result)));
-        commit('UPDATE_PAGINATION_TOTAL_ROWS', {
-          paginationTotalRows: res.total,
-        });
-        commit('UPDATE_PAGINATION_CURRENT_PAGE', Math.round(res.offset / res.limit) + 1);
-        commit('UPDATE_QUERY_COMPONENTS', res.info.queryComponents);
-        // update facets
-        if (res.total) {
-          state.facetTypes.forEach((type) => {
-            if (res.info.facets[type]) {
-              commit('UPDATE_FACET', {
-                type,
-                buckets: res.info.facets[type].buckets,
-                numBuckets: res.info.facets[type].numBuckets,
-              });
-            }
-          });
-        }
-      });
-    },
-  },
-};
diff --git a/src/store/SelectionMonitor.js b/src/store/SelectionMonitor.js
deleted file mode 100644
index 7a266a104..000000000
--- a/src/store/SelectionMonitor.js
+++ /dev/null
@@ -1,71 +0,0 @@
-export default {
-  namespaced: true,
-  state: {
-    isActive: false,
-    applyCurrentSearchFilters: false,
-    // item that is currently selected
-    item: null,
-    // items that are currently selected
-    items: [],
-    // search query namespace, see SupportedFiltersByContext
-    searchIndex: 'search',
-    // `overview` or `filter` or `detail` or very specific scopes, like `comparePassages`
-    // they are used to compose the title label
-    scope: 'overview',
-    type: null,
-    displayTimeline: true,
-    displayActionButtons: true,
-    debug: false,
-  },
-  mutations: {
-    SET_SELECTION(
-      state,
-      {
-        item,
-        type,
-        searchIndex = 'search',
-        scope = 'overview',
-        items = [],
-        applyCurrentSearchFilters = false,
-        displayTimeline = true,
-        displayActionButtons = true,
-        displayCurrentSearchFilters = true,
-      },
-    ) {
-      state.isActive = true
-      state.item = item
-      state.items = items
-      state.searchIndex = searchIndex
-      state.scope = scope
-      state.type = type
-      state.applyCurrentSearchFilters = applyCurrentSearchFilters
-      state.displayTimeline = displayTimeline
-      state.displayActionButtons = displayActionButtons
-      state.displayCurrentSearchFilters = displayCurrentSearchFilters
-    },
-    CLEAR_SELECTION(state) {
-      state.isActive = false
-      state.item = null
-      state.items = []
-      state.searchIndex = 'search'
-      state.scope = 'overview'
-      state.type = null
-      state.applyCurrentSearchFilters = false
-      state.displayTimeline = true
-      state.displayActionButtons = true
-      state.displayCurrentSearchFilters = true
-    },
-  },
-  actions: {
-    // searchIndex is the namespace of the search query.
-    // see SupportedFiltersBysearchIndex
-    show({ commit }, payload) {
-      // eslint-disable-next-line no-console
-      console.debug('store.SelectionMonitor.show', payload)
-      commit('SET_SELECTION', payload)
-    },
-    hide({ commit }) {
-      commit('CLEAR_SELECTION')
-    },
-  },
-}
diff --git a/src/store/Settings.js b/src/store/Settings.js
deleted file mode 100644
index 19b1e0393..000000000
--- a/src/store/Settings.js
+++ /dev/null
@@ -1,41 +0,0 @@
-export default {
-  namespaced: true,
-  state: {
-    language_code: 'en',
-    termsAgreed: false,
-    cookiesAccepted: false,
-    lastNotificationDate: (new Date(0)).toISOString(),
-  },
-  getters: {
-    lastNotificationDate(state) {
-      return new Date(state.lastNotificationDate);
-    },
-  },
-  mutations: {
-    SET_LANGUAGE(state, payload) {
-      state.language_code = payload.language_code;
-    },
-    SET_TERMS_AGREED(state, value) {
-      state.termsAgreed = Boolean(value);
-    },
-    SET_COOKIES_ACCEPTED(state, value) {
-      state.cookiesAccepted = Boolean(value);
-    },
-    SET_LAST_NOTIFICATION_DATE(state) {
-      state.lastNotificationDate = (new Date()).toISOString();
-    },
-  },
-  actions: {
-    ACCEPT_TERMS_OF_USE({ commit }) {
-      console.info('settings/ACCEPT_TERMS_OF_USE');
-      commit('SET_TERMS_AGREED', true);
-    },
-    ACCEPT_COOKIES({ commit }) {
-      commit('SET_COOKIES_ACCEPTED', true);
-    },
-    UPDATE_LAST_NOTIFICATION_DATE({ commit }) {
-      console.info('@settings/UPDATE_LAST_NOTIFICATION_DATE');
-      commit('SET_LAST_NOTIFICATION_DATE');
-    },
-  },
-};
diff --git a/src/store/Topics.js b/src/store/Topics.js
deleted file mode 100644
index 552287954..000000000
--- a/src/store/Topics.js
+++ /dev/null
@@ -1,254 +0,0 @@
-import * as services from '@/services';
-import Topic from '@/models/Topic';
-
-
-export default {
-  namespaced: true,
-  state: {
-    orderBy: '-name',
-    topicModel: '*',
-    items: [],
-    visualizedItems: [],
-    itemsIndex: {},
-    visualizedItemsIndex: {},
-    applyCurrentSearchFilters: true,
-    isLoading: false,
-    pagination: {
-      perPage: 200,
-      currentPage: 1,
-      totalRows: 0,
-    },
-    // graph below
-    graphLinks: {
-      byCommonWords: [],
-      byCommonArticles: [],
-    },
-    graphLinkMode: 'byCommonArticles',
-    graphNodes: [],
-  },
-  mutations: {
-    UPDATE_ORDER_BY(state, orderBy) {
-      state.orderBy = orderBy;
-    },
-    UPDATE_TOPIC_MODEL(state, topicModel) {
-      state.topicModel = topicModel;
-    },
-    UPDATE_ITEMS(state, items) {
-      state.items = items;
-      state.itemsIndex = {};
-      items.forEach((d, k) => {
-        if (state.visualizedItemsIndex[d.uid]) {
-          items[k].visualized = true;
-        }
-        state.itemsIndex[d.uid] = k;
-      });
-    },
-    UPDATE_PAGINATION(state, pagination) {
-      state.pagination = {
-        ...state.pagination,
-        ...pagination,
-      };
-    },
-    UPDATE_GRAPH_LINKS(state, { byCommonWords, byCommonArticles }) {
-      state.graphLinks = { byCommonWords, byCommonArticles };
-    },
-    UPDATE_GRAPH_NODES(state, graphNodes) {
-      state.graphNodes = graphNodes;
-    },
-    UPDATE_GRAPH_LINK_MODE(state, mode) {
-      state.graphLinkMode = mode;
-    },
-    ADD_VISUALIZED_ITEM(state, item) {
-      if (typeof state.visualizedItemsIndex[item.uid] !== 'undefined') {
-        return;
-      }
-      state.visualizedItemsIndex = {
-        ...state.visualizedItemsIndex,
-        [item.uid]: state.visualizedItems.length,
-      };
-      // copy the item, we don't want to loose it.
-      const clonedTopic = new Topic({ ...item });
-      state.visualizedItems.push(clonedTopic);
-    },
-    REMOVE_VISUALIZED_ITEM(state, item) {
-      if (typeof state.visualizedItemsIndex[item.uid] === 'undefined') {
-        return;
-      }
-      const idx = state.visualizedItemsIndex[item.uid];
-      state.visualizedItems.splice(idx, 1);
-      // reset visualizedItemsIndex.
-      state.visualizedItemsIndex = {};
-      state.visualizedItems.forEach((d, k) => {
-        state.visualizedItemsIndex[d.uid] = k;
-      });
-    },
-    RESET_VISUALIZED_ITEM(state) {
-      state.visualizedItemsIndex = {};
-      state.visualizedItems = [];
-    },
-    UPDATE_APPLY_CURRENT_SEARCH_FILTERS(state, value) {
-      state.applyCurrentSearchFilters = value;
-    },
-  },
-  actions: {
-    UPDATE_APPLY_CURRENT_SEARCH_FILTERS({ commit }, value) {
-      commit('UPDATE_APPLY_CURRENT_SEARCH_FILTERS', value);
-    },
-    CHANGE_GRAPH_LINK_MODE({ commit }, mode) {
-      commit('UPDATE_GRAPH_LINK_MODE', mode);
-    },
-    TOGGLE_VISUALIZED_ITEM({ commit, state }, item) {
-      if (typeof state.visualizedItemsIndex[item.uid] !== 'undefined') {
-        commit('REMOVE_VISUALIZED_ITEM', item);
-        return false;
-      }
-      commit('ADD_VISUALIZED_ITEM', item);
-      return true;
-    },
-    ADD_VISUALIZED_ITEM({ commit, state }, item) {
-      commit('ADD_VISUALIZED_ITEM', item);
-      commit('UPDATE_GRAPH_NODES', state.visualizedItems);
-    },
-    REMOVE_VISUALIZED_ITEM({ commit }, item) {
-      commit('REMOVE_VISUALIZED_ITEM', item);
-    },
-    RESET_VISUALIZED_ITEM({ commit }) {
-      commit('RESET_VISUALIZED_ITEM');
-    },
-    LOAD_TOPICS_GRAPH({ commit }, { filters }) {
-      console.info('topics/LOAD_TOPICS_GRAPH with filters:', filters);
-      return services.topicsGraph.find({
-        query: {
-          filters,
-        },
-      }).then(({ nodes, links }) => {
-        console.info('topics/LOAD_TOPICS_GRAPH results:', nodes, links);
-        commit('UPDATE_GRAPH_LINKS', {
-          byCommonArticles: links,
-          byCommonWords: [],
-        });
-        commit('UPDATE_GRAPH_NODES', nodes);
-      });
-    },
-    // EX_LOAD_TOPICS_GRAPH({ commit }) {
-    //   return services.topics.find({
-    //     query: {
-    //       limit: 500,
-    //     },
-    //   }).then((results) => {
-    //     // temporary hack
-    //     // temporary hack: random connections between nodes...
-    //     const graphNodes = [];
-    //     const byCommonWords = [];
-    //     const byCommonArticles = [];
-    //     // console.info('link type', linkType, results.data.length);
-    //     const limit = 25;
-    //     const minWordsIncommon = 3;
-    //
-    //     for (let i = 0, l = results.data.length; i < l; i += 1) {
-    //       const t = new Topic(results.data[i]);
-    //       const relatedIndex = {};
-    //       // remap relatedTopics
-    //       t.relatedTopics.forEach((d) => {
-    //         relatedIndex[d.uid] = d.w;
-    //       });
-    //       t.id = t.uid;
-    //       t.degree = 0;
-    //
-    //       for (let j = i + 1; j < l; j += 1) {
-    //         if (relatedIndex[results.data[j].uid]) {
-    //           byCommonArticles.push({
-    //             id: [i, j].join('-'),
-    //             source: i,
-    //             target: j,
-    //             w: relatedIndex[results.data[j].uid],
-    //           });
-    //         }
-    //         const common = results.data[i].words
-    //           .filter((wi, k) => k < limit && results.data[j].words
-    //             .filter((wj, kj) => kj < limit)
-    //             .find(wj => wi.w === wj.w));
-    //         if (common.length > minWordsIncommon - 1) {
-    //           // console.info('combine', i, j, common);
-    //           byCommonWords.push({
-    //             id: [i, j].join('-'),
-    //             source: i,
-    //             target: j,
-    //             w: common.length,
-    //             c: common,
-    //           });
-    //           t.degree += 1;
-    //         }
-    //       }
-    //
-    //       graphNodes.push(t);
-    //     }
-    //
-    //     commit('UPDATE_GRAPH_LINKS', {
-    //       byCommonArticles,
-    //       byCommonWords,
-    //     });
-    //     commit('UPDATE_GRAPH_NODES', graphNodes);
-    //     // console.info('links', links);
-    //     return {
-    //       nodes: graphNodes,
-    //       links: {
-    //         byCommonArticles,
-    //         byCommonWords,
-    //       },
-    //     };
-    //   });
-    // },
-    LOAD_TOPICS({ commit }, {
-      page = 1,
-      limit,
-      q,
-      facets,
-      filters = [],
-    } = {}) {
-      const query = {
-        limit,
-        page,
-      };
-
-      if (filters.length) {
-        query.filters = filters;
-      }
-      if (q && q.length > 1) {
-        query.q = `${q.split('*').join('')}*`;
-      }
-      if (facets) {
-        query.facets = facets;
-      }
-
-      if (limit) {
-        commit('UPDATE_PAGINATION', {
-          perPage: limit,
-        });
-      }
-      // console.info('topics/LOAD_TOPICS query:', query);
-      return services.topics.find({
-        query,
-      }).then((res) => {
-        // console.info('topics/LOAD_TOPICS res:', res);
-        const data = res.data.map(d => new Topic(d, {
-          highlight: query.q ? q.split('*').join('') : '',
-        }));
-        commit('UPDATE_ITEMS', data);
-        commit('UPDATE_PAGINATION', {
-          currentPage: page,
-          totalRows: res.total,
-        });
-        return {
-          ...res,
-          data,
-        };
-      });
-    },
-    LOAD_TOPIC(context, uid) {
-      return services.topics.get(uid, {
-        fl: 'id',
-      }).then(result => new Topic(result));
-    },
-  },
-};
diff --git a/src/store/User.js b/src/store/User.js
deleted file mode 100644
index ccaefc490..000000000
--- a/src/store/User.js
+++ /dev/null
@@ -1,78 +0,0 @@
-import * as services from '@/services';
-import User from '@/models/User';
-// import router from '@/router';
-
-export default {
-  namespaced: true,
-  state: {
-    rememberCredetials: false,
-    userData: false,
-  },
-  getters: {
-    user(state) {
-      return state.userData;
-    },
-  },
-  mutations: {
-    SET_REMEMBER_CREDENTIALS(state, payload) {
-      state.rememberCredetials = payload.remember;
-    },
-    SET_USER(state, payload) {
-      state.userData = payload;
-    },
-    CLEAR_USER(state) {
-      state.userData = false;
-    },
-  },
-  actions: {
-    LOGOUT(context) {
-      return services.app.logout().catch((err) => {
-        console.error('error in store/User/LOGOUT');
-        console.error(err);
-      }).finally(() => {
-        const expiredDate = new Date(-1)
-        document.cookie = 'feathers-jwt=; expires=' + expiredDate.toUTCString() + '; path=/';
-        context.commit('CLEAR_USER');
-      });
-    },
-    GET_CURRENT_USER() {
-      return services.me.find().then(d => new User(d));
-    },
-    CHANGE_PASSWORD(context, { uid, previousPassword, newPassword}) {
-      return services.me.patch(uid, { previousPassword, newPassword }, {
-        ignoreErrors: true,
-      });
-    },
-    UPDATE_CURRENT_USER({ commit }, user) {
-      return services.me.update(user.uid, user, {
-        ignoreErrors: true,
-      }).then((d) => {
-        const user = new User(d);
-        commit('SET_USER', user);
-        return user;
-      });
-    },
-    LOGIN({ commit }, { email, password }) {
-      return services.app.authenticate({
-        strategy: 'local',
-        email,
-        password,
-      }).then((res) => {
-        console.info('Authentication response:', res);
-        return res;
-      }).then(({ user }) => {
-        console.info('LOGIN: user', user.username, 'logged in!');
-        // don't save cookie
-        // const expiredDate = new Date(authentication?.payload?.exp * 1000)
-        // document.cookie = 'feathers-jwt=' + accessToken + '; expires=' + expiredDate.toUTCString() + '; path=/';
-        services.app.set('user', user);
-        commit('SET_USER', new User({
-          ...user,
-          picture: user.profile.picture,
-          pattern: user.profile.pattern,
-        }));
-        return user;
-      });
-    },
-  },
-};
diff --git a/src/store/index.js b/src/store/index.js
deleted file mode 100644
index e6bab5419..000000000
--- a/src/store/index.js
+++ /dev/null
@@ -1,243 +0,0 @@
-import Vue from 'vue'
-import Vuex, { Store } from 'vuex'
-import createPersistedState from 'vuex-persistedstate'
-import { errorCollector } from '@/services'
-
-import settings from './Settings'
-import collections from './Collections'
-import user from './User'
-import search from './Search'
-import searchImages from './SearchImages'
-import autocomplete from './Autocomplete'
-import issue from './Issue'
-import articles from './Articles'
-import topics from './Topics'
-import jobs from './Jobs'
-import entities from './Entities'
-import embeddings from './Embeddings'
-import monitor from './Monitor'
-import selectionMonitor from './SelectionMonitor'
-import notifications from './Notifications'
-
-Vue.use(Vuex)
-
-const ERRORS_DO_NOT_DISPLAY = ['NavigationDuplicated'] // error names not to display to the user
-const ERRORS_DO_NOT_FORWARD = ['BadGateway', 'TransportError', 'NotAuthenticated', 'BadRequest'] // error to avoid loopholes
-
-let processingTimer // timeout object
-
-export default new Store({
-  modules: {
-    articles,
-    settings,
-    search,
-    searchImages,
-    autocomplete,
-    user,
-    issue,
-    collections,
-    topics,
-    jobs,
-    entities,
-    embeddings,
-    monitor,
-    selectionMonitor,
-    notifications,
-  },
-  state: {
-    processingStatus: false,
-    processingLocked: false,
-    processing_message: '',
-    error_message: '',
-    // error message handling,
-    errorMessages: [],
-    errorMessagesIndex: [],
-    // processing queue
-    processingActivities: [],
-    processingActivitiesIndex: [],
-    header_title: '',
-    header_subtitle: '',
-    connectivityStatus: true,
-    redirectionParams: {},
-  },
-  getters: {
-    headerTitle(state) {
-      let title = ''
-
-      if (state.header_title.length > 0 && state.header_subtitle.length > 0) {
-        title = `<span class="title">${state.header_title}</span> / <span class="subtitle">${state.header_subtitle}</span>`
-      } else if (state.header_subtitle.length > 0) {
-        title = `<span class="subtitle">${state.header_subtitle}</span>`
-      } else if (state.header_title.length > 0) {
-        title = `<span class="title">${state.header_title}</span>`
-      }
-
-      return title
-    },
-    redirectionParams(state) {
-      return state.redirectionParams
-    },
-  },
-  mutations: {
-    SET_HEADER_TITLE(state, payload) {
-      state.header_title = String(payload.title || '')
-      state.header_subtitle = String(payload.subtitle || '')
-    },
-    LOCK_SCREEN(state, status) {
-      state.processingLocked = status
-    },
-    SET_PROCESSING(state, status) {
-      if (processingTimer) {
-        clearTimeout(processingTimer)
-      }
-      if (status) {
-        state.processingStatus = status
-      } else {
-        processingTimer = setTimeout(() => {
-          state.processingStatus = false
-        }, 500)
-      }
-    },
-    SET_REDIRECTION_ROUTE(state, params) {
-      state.redirectionParams = params
-    },
-    SET_ERROR_MESSAGE(state, message) {
-      state.error_message = message
-    },
-    PUSH_ERROR_MESSAGE(state, { route, message, code, name }) {
-      const hash = JSON.stringify([...route, code, name])
-      if (!state.errorMessagesIndex.includes(hash)) {
-        state.errorMessagesIndex.push(hash)
-        state.errorMessages.push({ route, message, code, name })
-      }
-    },
-    CLEAN_ERROR_MESSAGE(state) {
-      state.errorMessagesIndex = []
-      state.errorMessages = []
-    },
-    SET_CONNECTIVITY_STATUS(state, status) {
-      state.connectivityStatus = status
-    },
-    PUSH_PROCESSING_ACTIVITY(state, { route, status }) {
-      const idx = state.processingActivitiesIndex.indexOf(route)
-      if (idx < 0) {
-        state.processingActivitiesIndex.push(route)
-        state.processingActivities.push({ route, status, c: 1 })
-      } else {
-        state.processingActivities[idx].c += 1
-      }
-    },
-    REMOVE_PROCESSING_ACTIVITY(state, { route }) {
-      const idx = state.processingActivitiesIndex.indexOf(route)
-      if (idx > -1) {
-        state.processingActivities.splice(idx, 1)
-        state.processingActivitiesIndex.splice(idx, 1)
-      }
-    },
-  },
-  actions: {
-    SET_REDIRECTION_ROUTE({ commit }, params) {
-      console.info('/SET_REDIRECTION_ROUTE', params)
-      commit('SET_REDIRECTION_ROUTE', params)
-    },
-    UPDATE_PROCESSING_ACTIVITY({ state, commit }, { route, status }) {
-      if (status === 'LOADING') {
-        commit('PUSH_PROCESSING_ACTIVITY', { route, status })
-      } else if (status === 'LONG') {
-        commit('PUSH_PROCESSING_ACTIVITY', { route, status })
-      } else if (status === 'DONE') {
-        commit('REMOVE_PROCESSING_ACTIVITY', { route, status })
-      }
-      // console.info('current activities:', state.processingActivitiesIndex.length, state.processingActivitiesIndex);
-      // check active ones
-      commit('SET_PROCESSING', !!state.processingActivitiesIndex.length)
-    },
-    DISPLAY_CONNECTIVITY_STATUS({ commit }, status) {
-      commit('SET_CONNECTIVITY_STATUS', Boolean(status))
-    },
-    CLEAN_ERROR_MESSAGE({ commit }) {
-      commit('CLEAN_ERROR_MESSAGE')
-    },
-    async DISPLAY_ERROR({ commit }, { error, origin = '' }) {
-      const errorRoute = []
-      // get error route if possible
-      if (error.hook) {
-        try {
-          errorRoute.push(error.hook.path)
-          errorRoute.push(error.hook.method)
-        } catch (e) {
-          console.warn(e)
-        }
-      }
-      console.error(
-        `[Unexpected error ${error.name}]: ${errorRoute.join('.')} (origin:${origin})`,
-        error.code,
-        error.name,
-        error.message,
-        error,
-      )
-      if (errorRoute.length && errorRoute[0] === 'errors-collector') {
-        console.info(
-          'Error',
-          error.name,
-          'at',
-          errorRoute,
-          'has not been dispatched. Source: errors-collector. Risk of loopholes',
-        )
-      } else {
-        if (!ERRORS_DO_NOT_DISPLAY.includes(error.name)) {
-          commit('PUSH_ERROR_MESSAGE', {
-            route: errorRoute,
-            message: error.message,
-            code: error.code,
-            name: error.name,
-          })
-        }
-
-        // do not force if BadGateway or polling error (risk of having endless and useless loops)
-        if (ERRORS_DO_NOT_FORWARD.filter(d => d === error.name || d === error.type).length) {
-          console.info(
-            'Error',
-            error.name,
-            'at',
-            errorRoute,
-            'has not been dispatched, risk of loopholes',
-          )
-        } else {
-          await errorCollector
-            .create({
-              uri: errorRoute.length ? errorRoute.join('.') : 'N/A',
-              ...error,
-            })
-            .catch(err => {
-              console.error('[Unexpected error in sending the error]', err)
-            })
-        }
-      }
-    },
-  },
-  plugins: [
-    createPersistedState({
-      key: 'impresso',
-      paths: [
-        'settings.termsAgreed',
-        'settings.cookiesAccepted',
-        'settings.lastNotificationDate',
-        'settings.language_code',
-        'search.searches',
-        'search.currentSearchHash',
-        'search.displaySortBy',
-        'search.displaySortOrder',
-        'search.displayStyle',
-        'search.filterFacetYearExpanded',
-        'user.rememberCredetials',
-        'user.userData',
-        'collections.collectionsSortOrder',
-        'issue.viewerMode',
-        'issue.showOutlines',
-        'newspapers.orderBy',
-        'autocomplete.queries',
-      ],
-    }),
-  ],
-})
diff --git a/src/stores/autocomplete.ts b/src/stores/autocomplete.ts
new file mode 100644
index 000000000..fcb7a9e40
--- /dev/null
+++ b/src/stores/autocomplete.ts
@@ -0,0 +1,89 @@
+import SuggestionCollection from '@/models/SuggestionCollection'
+import SuggestionFactory from '@/models/SuggestionFactory'
+import { collections as collectionsService, suggestions as suggestionsService } from '@/services'
+import { defineStore } from 'pinia'
+
+interface State {
+  queries: string[]
+  searchableQueries: string[]
+}
+
+export const useAutocompleteStore = defineStore('autocomplete', {
+  state: (): State => ({
+    queries: [],
+    searchableQueries: [],
+  }),
+  getters: {},
+  actions: {
+    saveRecentQuery(query: string) {
+      if (typeof query !== 'string') return
+      const trimmedQuery = query.trim()
+      if (trimmedQuery.length === 0) return
+      if (this.queries.includes(trimmedQuery)) return
+
+      this.queries.push(trimmedQuery)
+    },
+    suggestRecentQuery(query: string) {
+      const nq = normalize(query)
+      const candidates: { h: string; q: string; r: number }[] = []
+      this.queries
+        .filter(d => typeof d === 'string')
+        .forEach(d => {
+          const idx = normalize(d).indexOf(nq)
+          if (idx > -1) {
+            candidates.push({
+              h: [
+                d.substr(0, idx),
+                '<b>',
+                d.substr(idx, query.length),
+                '</b>',
+                d.substr(idx + query.length),
+              ].join(''),
+              q: d,
+              r: query.length / d.length,
+            })
+          }
+        })
+      return candidates.sort((a, b) => b.r - a.r).slice(0, 3)
+    },
+    search(query: string) {
+      return suggestionsService
+        .find({
+          query: {
+            q: query,
+            // we just want 9 results because we add the original string totalling 10 suggestions
+            limit: 9,
+          },
+        })
+        .then(({ data }) => data.map(d => SuggestionFactory.create(d)).filter(Boolean))
+    },
+    suggestCollections(query: string) {
+      return collectionsService
+        .find({
+          query: {
+            limit: 3,
+            q: query,
+          },
+        })
+        .then(co => {
+          return co.data.map(d => {
+            return new SuggestionCollection({
+              item: d,
+              h: d.name,
+              q: d.uid,
+              type: 'collection',
+            })
+          })
+        })
+    },
+  },
+  persist: {
+    paths: ['queries'],
+  },
+})
+
+const normalize = (s: string) =>
+  s
+    .normalize('NFD')
+    .replace(/[\u0300-\u036f]/g, '')
+    .toLowerCase()
diff --git a/src/stores/collections.ts b/src/stores/collections.ts
new file mode 100644
index 000000000..cb3d35f0d
--- /dev/null
+++ b/src/stores/collections.ts
@@ -0,0 +1,180 @@
+import Collection from '@/models/Collection';
+import Helpers from '@/plugins/Helpers';
+import {
+  collectionsItems as collectionsItemsService,
+  collections as collectionsService,
+  searchFacets as searchFacetsService
+} from '@/services';
+import { defineStore } from 'pinia';
+
+type SortOrder = '-date' | 'date' | '-size' | 'size'
+
+interface State {
+  collectionsValue: (Collection | object)[]
+  collectionsPaginationCurrentPage: number
+  collectionsOrderBy: SortOrder
+  collectionsQ: string
+  collectionsPaginationPerPage: number
+  collectionsPaginationTotalRows: number
+}
+
+interface AddCollectionDetails {
+  name: string
+  description: string
+}
+
+interface EditCollectionDetails extends AddCollectionDetails {
+  uid: string
+}
+
+interface AddCollectionItemDetails {
+  item: { uid: string }
+  collection: { uid: string }
+  contentType: string
+}
+
+interface AddCollectionItemsDetails {
+  items: { uid: string }[]
+  collection: { uid: string }
+  contentType: string
+}
+
+interface RemoveCollectionItemDetails {
+  item: { uid: string, }
+  collection: { uid: string }
+}
+
+interface RemoveCollectionItemsDetails {
+  items: { uid: string, }[]
+  collection: { uid: string }
+}
+
+const paginationPerPage = 20
+
+export const useCollectionsStore = defineStore('collections', {
+  state: (): State => ({
+    collectionsValue: [],
+    collectionsPaginationCurrentPage: 1,
+    collectionsOrderBy: '-date',
+    collectionsQ: '',
+    collectionsPaginationPerPage: paginationPerPage,
+    collectionsPaginationTotalRows: 0,
+  }),
+  getters: {
+    collections: (state) => {
+      return state.collectionsValue.map((collection) => {
+        if (collection instanceof Collection) {
+          return collection;
+        }
+        return new Collection(collection);
+      })
+    },
+  },
+  actions: {
+    loadCollections() {
+      return new Promise((resolve) => {
+        collectionsService.find({
+          query: {
+            page: this.collectionsPaginationCurrentPage,
+            limit: paginationPerPage,
+            order_by: this.collectionsOrderBy,
+            q: this.collectionsQ,
+          },
+        }).then((results) => {
+          this.collectionsValue = results.data.map(result => new Collection({
+            countArticles: result.count_articles,
+            countEntities: result.count_entities,
+            countIssues: result.count_issues,
+            countPages: result.count_pages,
+            creationDate: result.creation_date,
+            lastModifiedDate: result.last_modified_date,
+            ...result,
+          }))
+          this.collectionsPaginationTotalRows = results.total
+          resolve(results)
+        });
+      });
+    },
+    loadTimeline(collectionId: string) {
+      const query = {
+        filters: [{
+          type: 'collection',
+          q: collectionId,
+        }],
+        // group_by: 'articles',
+        limit: 100000,
+      };
+      return searchFacetsService.get('year', {
+        query,
+      }).then(res => Helpers.timeline.fromBuckets(res.buckets));
+    },
+    editCollection({ uid, name, description }: EditCollectionDetails) {
+      return collectionsService.patch(uid, {
+        name,
+        description,
+      })
+    },
+    addCollection({ name, description }: AddCollectionDetails) {
+      return collectionsService.create({
+        name,
+        description,
+      })
+    },
+    deleteCollection(uid: string) {
+      return collectionsService.remove(uid)
+    },
+    addCollectionItem({ item, collection, contentType }: AddCollectionItemDetails) {
+      return collectionsItemsService.create({
+        collection_uid: collection.uid,
+        items: [{
+          content_type: contentType,
+          uid: item.uid,
+        }],
+      })
+    },
+    addCollectionItems({items, collection, contentType }: AddCollectionItemsDetails) {
+      return collectionsItemsService.create({
+        collection_uid: collection.uid,
+        items: items.map(item => ({
+          uid: item.uid,
+          content_type: contentType,
+        })),
+      })
+    },
+    removeCollectionItem({ item, collection }: RemoveCollectionItemDetails) {
+      const contentType = item.constructor.name.toLowerCase();
+
+      return collectionsItemsService.remove(null, {
+        query: {
+          collection_uid: collection.uid,
+          items: [{
+            content_type: contentType,
+            uid: item.uid,
+          }],
+        },
+      })
+    },
+    removeCollectionItems({ items, collection }: RemoveCollectionItemsDetails) {
+      return collectionsItemsService.remove(null, {
+        query: {
+          collection_uid: collection.uid,
+          items: items.map(item => ({
+            uid: item.uid,
+          })),
+        },
+      })
+    },
+    updatePaginationListCurrentPage(page: number | string) {
+      this.collectionsPaginationCurrentPage = typeof page === 'string' ? parseInt(page, 10) : page
+    },
+    setCollectionsSortOrder(sortOrder: SortOrder) {
+      this.collectionsOrderBy = sortOrder
+    },
+    setCollectionsQ(q: string) {
+      this.collectionsQ = q
+    }
+  },
+  persist: {
+    paths: ['collectionsSortOrder'],
+  },
+})
diff --git a/src/stores/embeddings.ts b/src/stores/embeddings.ts
new file mode 100644
index 000000000..82f0a8eee
--- /dev/null
+++ b/src/stores/embeddings.ts
@@ -0,0 +1,25 @@
+import { defineStore } from 'pinia'
+
+interface State {
+  language: string
+  limit: number
+}
+
+export const useEmbeddingsStore = defineStore('embeddings', {
+  state: (): State => ({
+    language: 'fr',
+    limit: 25,
+  }),
+  getters: {},
+  actions: {
+    updateLanguage(language: string) {
+      this.language = language
+    },
+    updateLimit(limit: number) {
+      this.limit = limit
+    },
+  },
+  persist: {
+    paths: [],
+  },
+})
diff --git a/src/stores/entities.ts b/src/stores/entities.ts
new file mode 100644
index 000000000..23ee45172
--- /dev/null
+++ b/src/stores/entities.ts
@@ -0,0 +1,113 @@
+import { defineStore } from 'pinia'
+import {
+  search as searchService,
+  mentions as mentionsService,
+  entities as entitiesService,
+  searchFacets as searchFacetsService,
+} from '@/services'
+import Article from '@/models/Article'
+import Mention from '@/models/Mention'
+import Entity from '@/models/Entity'
+import Facet from '@/models/Facet'
+import Helpers from '@/plugins/Helpers'
+
+interface State {}
+
+interface LoadRequest {
+  page?: number
+  filters?: object[]
+  orderBy?: string
+  faster?: string
+}
+
+export const useEntitiesStore = defineStore('entities', {
+  state: (): State => ({}),
+  getters: {},
+  actions: {
+    loadEntityArticles({ page = 1, filters = [], orderBy = '-relevance' }: LoadRequest = {}) {
+      const query = {
+        page,
+        filters,
+        order_by: orderBy,
+        group_by: 'articles',
+      };
+      return searchService.find({
+        query,
+      }).then(res => ({
+        ...res,
+        data: res.data.map(d => new Article(d)),
+      }));
+    },
+    loadEntityMentions({ page = 1, filters = [], orderBy = '-relevance', faster = 'on' }: LoadRequest = {}) {
+      const query = {
+        faster,
+        page,
+        filters,
+        order_by: orderBy,
+      };
+
+      return mentionsService.find({
+        query,
+      }).then((res) => {
+        return res;
+      }).then(res => ({
+        ...res,
+        data: res.data.map((d) => {
+          const mention = new Mention(d);
+          if (mention.article) {
+            mention.article = new Article(mention.article);
+          }
+          return mention;
+        }),
+      }));
+    },
+    loadDetail(entityId: string) {
+      return entitiesService.get(entityId, {}).then((res) => {
+        return new Entity(res);
+      });
+    },
+    loadTimeline(entityId: string) {
+      const query = {
+        filters: [{
+          type: 'entity',
+          q: entityId,
+        }],
+        // group_by: 'articles',
+      };
+      return searchFacetsService.get('year', {
+        query,
+      }).then(res => Helpers.timeline.fromBuckets(res.buckets));
+    },
+    loadPageTopics(pageId: string) {
+      const query = {
+        filters: [{
+          type: 'page',
+          q: pageId,
+        }],
+        // group_by: 'articles',
+      };
+      return searchFacetsService.get('topic', {
+        query,
+      }).then((topic) => new Facet(topic));
+    },
+    loadPageEntities(pageId: string) {
+      const query = {
+        facets: ['location', 'person'],
+        filters: [{
+          type: 'page',
+          q: pageId,
+        }],
+        // group_by: 'articles',
+      };
+      return searchFacetsService.find({
+        query,
+      }).then((response) => [
+        new Facet(response.data[0]),
+        new Facet(response.data[1]),
+      ]);
+    },
+  },
+  persist: {
+    paths: [],
+  },
+})
diff --git a/src/stores/issue.ts b/src/stores/issue.ts
new file mode 100644
index 000000000..fd3a1e665
--- /dev/null
+++ b/src/stores/issue.ts
@@ -0,0 +1,143 @@
+import { defineStore } from 'pinia'
+import {
+  issues as issuesService,
+  pages as pagesService,
+  articles as articlesService,
+  tableOfContents as tableOfContentsService,
+  images as imagesService,
+} from '@/services'
+import Issue from '@/models/Issue'
+import Page from '@/models/Page'
+import Article from '@/models/Article'
+import ArticleBase from '@/models/ArticleBase'
+
+type ViewerMode = 'text' | 'image'
+
+interface State {
+  showOutlines: boolean
+  viewerMode: ViewerMode
+  pagesIndex: Record<string, number>
+  issue: Issue | null
+}
+
+export const useIssueStore = defineStore('issue', {
+  state: (): State => ({
+    showOutlines: false,
+    viewerMode: 'text',
+    pagesIndex: {},
+    issue: null,
+  }),
+  getters: {},
+  actions: {
+    updateViewerMode(mode: ViewerMode) {
+      this.viewerMode = mode
+    },
+    updateOutlines(showOutlines: boolean) {
+      this.showOutlines = showOutlines
+    },
+    loadIssue(uid: string) {
+      return issuesService.get(uid, {}).then((d) => {
+        const issue = new Issue(d);
+        this.issue = issue
+
+        // create or reset page index to quickly get access to the desired page
+        const pagesIndex = {};
+        issue.pages.forEach((page, i) => {
+          pagesIndex[page.uid] = i;
+        });
+        this.pagesIndex = pagesIndex
+      });
+    },
+    loadPage(uid: string) {
+      return Promise.all([
+        pagesService.get(uid, {}).catch((err) => {
+          console.error('Error in `store/issue/LOAD_PAGE` pages.get(', uid, ')', err.name);
+          throw err;
+        }),
+        articlesService.find({
+          query: {
+            filters: [{
+              type: 'page',
+              q: uid,
+            }],
+            limit: 500,
+          },
+        }),
+      ]).then(([page, articles]) => new Page({
+        ...page,
+        articles: articles.data.map(article => new Article(article)),
+        articlesEntities: page.articlesEntities,
+        articlesTags: page.articlesTags,
+      }))
+        .catch((err) => {
+          console.error(err);
+        });
+    },
+    loadArticle(uid: string) {
+      return articlesService.get(uid).then(d => new Article(d));
+    },
+    loadTableOfContents() {
+      if (this.issue == null) {
+        throw new Error('Issue not loaded, skipping table of contents')
+      }
+      const tocPromise = tableOfContentsService.get(this.issue.uid, {})
+        .then(({ articles }) => articles.map(d => new ArticleBase(d)));
+
+      const imagesPromise = imagesService.find({
+        query: {
+          filters: [{
+            type: 'issue',
+            q: this.issue.uid,
+          }],
+          order_by: 'id',
+          limit: 500,
+        },
+      }).then(({ data }) => data).catch((err) => {
+        // forward to service
+        console.error(err);
+        return [];
+      });
+
+      return Promise.all([tocPromise, imagesPromise]).then(([articles, images]) => {
+        // articles are sorted by id
+        const uids = articles.map(d => d.uid);
+        // merge the table of images into the table of articles
+        images.forEach((image) => {
+          if (image.article) {
+            const idx = uids.indexOf(image.article.uid || image.article);
+            if (idx !== -1) {
+              articles[idx].images.push(new Article(image));
+            }
+          } else {
+            // it will be inserted later in the right page
+            console.info('Image added as article, no article has been attached to it:', image);
+            articles.push(new Article(image));
+          }
+        });
+
+        if (this.issue == null) throw new Error('Issue not loaded, skipping table of contents');
+
+        this.issue.articles = articles;
+        // refresh table of contents
+        for (let i = 0, l = articles.length; i < l; i += 1) {
+          for (let ii = 0, ll = articles[i].pages.length; ii < ll; ii += 1) {
+            const pageUid = articles[i].pages[ii].uid;
+            if (this.pagesIndex[pageUid] > -1) {
+              const pageIdx = this.pagesIndex[pageUid];
+              const articleIdx = i;
+
+              this.issue.pages[pageIdx].articles.push(this.issue.articles[articleIdx]);
+            } else {
+              console.info('state.pagesIndex', this.pagesIndex);
+              console.error(`page nout found on issue: '${pageUid}', skipping`);
+            }
+          }
+        }
+        return articles;
+      });
+    },
+  },
+  persist: {
+    paths: ['viewerMode', 'showOutlines'],
+  },
+})
diff --git a/src/stores/jobs.ts b/src/stores/jobs.ts
new file mode 100644
index 000000000..146550965
--- /dev/null
+++ b/src/stores/jobs.ts
@@ -0,0 +1,60 @@
+import { defineStore } from 'pinia'
+import { jobs as jobsService } from '@/services'
+import Job from '@/models/Job'
+
+interface State {
+  items: Job[]
+  totalItems: number
+}
+
+export const useJobsStore = defineStore('jobs', {
+  state: (): State => ({
+    items: [],
+    totalItems: 0,
+  }),
+  getters: {},
+  actions: {
+    createTestJob() {
+      return jobsService.create({})
+    },
+    updateJob(job: Job) {
+      const idx = this.items.findIndex(d => d.id === job.id)
+      if (idx > -1) {
+        this.items[idx].status = job.status
+
+        if (typeof job.progress !== 'undefined') {
+          this.items[idx].progress = job.progress
+        }
+
+        if (typeof job.task !== 'undefined') {
+          this.items[idx].task = job.task
+        }
+        return Promise.resolve()
+      } else {
+        // reload
+        return this.loadJobs()
+      }
+    },
+    loadJobs({ page = 1, limit = 4 }: { page?: number, limit?: number } = {}) {
+      return jobsService
+        .find({
+          query: {
+            page,
+            limit,
+          },
+        })
+        .then(({ data, total }) => {
+          this.items = data.map(
+            d => new Job({
+              ...d,
+              progress: d.extra ? d.extra.progress : 0,
+            }),
+          )
+          this.totalItems = total
+        })
+    },
+  },
+  persist: {
+    paths: [],
+  },
+})
diff --git a/src/stores/monitor.ts b/src/stores/monitor.ts
new file mode 100644
index 000000000..e1a343c92
--- /dev/null
+++ b/src/stores/monitor.ts
@@ -0,0 +1,146 @@
+import { defineStore } from 'pinia'
+import {
+  search as searchService,
+  entities as entitiesService
+} from '@/services'
+import Helpers from '@/plugins/Helpers'
+import Entity from '@/models/Entity'
+import Topic from '@/models/Topic'
+
+interface Filter {
+  q?: string, type?: string
+}
+
+interface ActivateParameters {
+  item: { uid: string }
+  type: string
+  filters?: Filter[]
+  filtersUpdatedCallback?: (any) => void
+  subtitle?: string
+  disableFilterModification?: boolean
+}
+
+interface State {
+  applyCurrentSearchFilters: boolean
+  filters: Filter[]
+  timeline: object[]
+  isPendingTimeline: boolean
+  type?: string
+  item?: { uid: string }
+  groupBy: 'articles'
+  itemCountRelated: number
+  isActive: boolean
+  subtitle?: string
+  disableFilterModification: boolean
+  isPending?: boolean
+}
+
+export const useMonitorStore = defineStore('monitor', {
+  state: (): State => ({
+    applyCurrentSearchFilters: true,
+    filters: [],
+    timeline: [],
+    isPendingTimeline: false,
+    groupBy: 'articles',
+    itemCountRelated: -1,
+    isActive: false,
+    subtitle: undefined,
+    disableFilterModification: false,
+    isPending: false,
+  }),
+  getters: {},
+  actions: {
+    hide() { this.isActive = false },
+    setApplyCurrentSearchFilters(value: boolean) {
+      this.applyCurrentSearchFilters = value;
+    },
+    updateFilters(filters: Filter[]) {
+      this.filters = filters
+    },
+    loadItemTimeline() {
+      // reset timeline
+      this.timeline = [];
+      this.isPendingTimeline = true;
+
+      let filters: Filter[] = [
+        {
+          type: this.type,
+          q: this.item?.uid,
+        },
+      ];
+      // if user asked to get details in current search:
+      if (this.applyCurrentSearchFilters) {
+        filters = filters.concat(this.filters);
+      }
+      // fetch article timeline related to the given type
+      return searchService.find({
+        lock: false,
+        query: {
+          group_by: this.groupBy,
+          filters,
+          facets: 'year',
+          limit: 0,
+        },
+        limit: 0,
+      }).then((res) => {
+        this.itemCountRelated = res.total;
+        if (res.info.facets && res.info.facets.year) {
+          this.timeline = Helpers.timeline.fromBuckets(res.info.facets.year.buckets);
+        }
+      }).finally(() => { this.isPendingTimeline = false });
+    },
+    activate({
+      item,
+      type,
+      filters = [],
+      filtersUpdatedCallback = () => {},
+      subtitle = undefined,
+      disableFilterModification = false
+    }: ActivateParameters) {
+
+      const unsubscribe = this.$onAction(({ name, args }) => {
+        if (name === 'updateFilters') filtersUpdatedCallback(args)
+        if (name === 'hide') unsubscribe()
+      })
+
+      this.subtitle = subtitle
+      this.disableFilterModification = disableFilterModification
+      this.filters = filters
+
+      this.setItem({ item, type })
+    },
+    setItem({ item, type }: { item: { uid: string }, type: string }) {
+      this.isActive = true
+      this.item = item
+      this.type = type
+
+      this.isPending = true
+
+      // add item resolution promise to the promise chain
+      if (['persion', 'location'].includes(type)) {
+        return Promise.all([
+          this.loadItemTimeline(),
+          entitiesService.get(item.uid).then((res) => {
+            if (['location', 'person'].indexOf(type) !== -1) {
+              this.item = new Entity(res)
+            } else if (type === 'topic') {
+              this.item = new Topic(res)
+            } else {
+              this.item = res
+            }
+          }),
+        ]).catch((err) => {
+          console.error(err);
+        }).finally(() => { this.isPending = false })
+      }
+      // if there is no item to fetch, just get the timeline data.
+      this.item = item
+      this.isPending = false
+
+      return this.loadItemTimeline()
+    },
+  },
+  persist: {
+    paths: [],
+  },
+})
diff --git a/src/stores/notifications.ts b/src/stores/notifications.ts
new file mode 100644
index 000000000..bae84f93c
--- /dev/null
+++ b/src/stores/notifications.ts
@@ -0,0 +1,180 @@
+import { defineStore } from 'pinia'
+import { v4 } from 'uuid'
+import { FeathersError } from '@feathersjs/errors'
+import { errorCollector } from '@/services'
+
+interface HookErrorMixin {
+  hook: { path: string; method: string }
+}
+
+const ERRORS_DO_NOT_DISPLAY = ['NavigationDuplicated'] // error names not to display to the user
+const ERRORS_DO_NOT_FORWARD = ['BadGateway', 'TransportError', 'NotAuthenticated', 'BadRequest'] // error to avoid loopholes
+
+
+interface Notification {
+  title: string;
+  message: string;
+  type: 'success' | 'error';
+}
+
+export interface StoredNotification extends Notification {
+  id: string;
+}
+
+interface ErrorMessage {
+  route: string[]
+  message: string
+  code: number
+  name: string
+}
+
+interface ProcessingActivity {
+  route: string
+  status: string
+  c: number
+}
+
+interface State {
+  notifications: StoredNotification[]
+  // error message handling,
+  errorMessages: ErrorMessage[]
+  errorMessagesIndex: string[]
+  // status
+  connectivityStatus: boolean
+  processingLocked: boolean
+  // processing queue
+  processingActivities: ProcessingActivity[]
+  processingActivitiesIndex: string[]
+  _processingTimer?: NodeJS.Timeout
+  processingStatus: boolean
+}
+
+
+export const useNotificationsStore = defineStore('notifications', {
+  state: (): State => ({
+    notifications: [],
+    errorMessages: [],
+    errorMessagesIndex: [],
+    connectivityStatus: true,
+    processingLocked: false,
+    processingActivities: [],
+    processingActivitiesIndex: [],
+    processingStatus: false,
+  }),
+  getters: {},
+  actions: {
+    addNotification(notification: Notification) {
+      const id = v4();
+      this.notifications = [...this.notifications, { ...notification, id }]
+      setTimeout(() => {
+        this.notifications = this.notifications.filter(n => n.id !== id);
+      }, 5000)
+      console.log('notification', this.notifications);
+    },
+    removeNotification(id: string) {
+      this.notifications = this.notifications.filter(n => n.id !== id);
+    },
+    async displayError({ error, origin = '' }: { error: FeathersError; origin?: string }) {
+      const errorRoute: string[] = []
+      // get error route if possible
+      if ((error as any as HookErrorMixin).hook) {
+        const hookError = error as any as HookErrorMixin
+        try {
+          errorRoute.push(hookError.hook.path)
+          errorRoute.push(hookError.hook.method)
+        } catch (e) {
+          console.warn(e)
+        }
+      }
+      console.error(
+        `[Unexpected error ${error.name}]: ${errorRoute.join('.')} (origin:${origin})`,
+        error.code,
+        error.name,
+        error.message,
+        error,
+      )
+      if (errorRoute.length && errorRoute[0] === 'errors-collector') {
+        console.info(
+          'Error',
+          error.name,
+          'at',
+          errorRoute,
+          'has not been dispatched. Source: errors-collector. Risk of loopholes',
+        )
+      } else {
+        if (!ERRORS_DO_NOT_DISPLAY.includes(error.name)) {
+          const hash = JSON.stringify([...errorRoute, error.code, error.name])
+          if (!this.errorMessagesIndex.includes(hash)) {
+            this.errorMessagesIndex.push(hash)
+            this.errorMessages.push({ route: errorRoute, message: error.message, code: error.code, name: error.name })
+          }
+        }
+
+        // do not force if BadGateway or polling error (risk of having endless and useless loops)
+        if (ERRORS_DO_NOT_FORWARD.filter(d => d === error.name || d === (error as any).type).length) {
+          console.info(
+            'Error',
+            error.name,
+            'at',
+            errorRoute,
+            'has not been dispatched, risk of loopholes',
+          )
+        } else {
+          await errorCollector
+            .create({
+              uri: errorRoute.length ? errorRoute.join('.') : 'N/A',
+              ...error,
+            })
+            .catch(err => {
+              console.error('[Unexpected error in sending the error]', err)
+            })
+        }
+      }
+    },
+    cleanErrorMessage() {
+      this.errorMessagesIndex = []
+      this.errorMessages = []
+    },
+    displayConnectivityStatus(status: boolean) {
+      this.connectivityStatus = status
+    },
+    lockScreen(status: boolean) {
+      this.processingLocked = status
+    },
+    updateProcessingActivity({ route, status }: { route: string, status: 'LOADING' | 'LONG' | 'DONE' }) {
+      if (['LOADING', 'LONG'].includes(status)) {
+        // add
+        const idx = this.processingActivitiesIndex.indexOf(route)
+        if (idx < 0) {
+          this.processingActivitiesIndex.push(route)
+          this.processingActivities.push({ route, status, c: 1 })
+        } else {
+          this.processingActivities[idx].c += 1
+        }
+      } else if (status === 'DONE') {
+        // remove
+        const idx = this.processingActivitiesIndex.indexOf(route)
+        if (idx > -1) {
+          this.processingActivities.splice(idx, 1)
+          this.processingActivitiesIndex.splice(idx, 1)
+        }
+      }
+
+      const isProcessing = !!this.processingActivitiesIndex.length
+
+      if (this._processingTimer) {
+        clearTimeout(this._processingTimer)
+      }
+      if (isProcessing) {
+        this.processingStatus = isProcessing
+      } else {
+        this._processingTimer = setTimeout(() => {
+          this.processingStatus = false
+        }, 500)
+      }
+    },
+  },
+  persist: {
+    paths: [],
+  },
+})
diff --git a/src/stores/selectionMonitor.ts b/src/stores/selectionMonitor.ts
new file mode 100644
index 000000000..f91f52185
--- /dev/null
+++ b/src/stores/selectionMonitor.ts
@@ -0,0 +1,66 @@
+import { defineStore } from 'pinia'
+
+interface State {
+  isActive: boolean
+  applyCurrentSearchFilters: boolean
+  item: any
+  items: any[]
+  searchIndex: string
+  scope: string
+  type: string | null
+  displayTimeline: boolean
+  displayActionButtons: boolean
+  debug: boolean
+  displayCurrentSearchFilters: boolean
+}
+
+export const useSelectionMonitorStore = defineStore('selectionMonitor', {
+  state: (): State => ({
+    isActive: false,
+    applyCurrentSearchFilters: false,
+    // item that is currently selected
+    item: null,
+    // items that are currently selected
+    items: [],
+    // search query namespace, see SupportedFiltersByContext
+    searchIndex: 'search',
+    // `overview` or `filter` or `detail` or very specific scopes, like `comparePassages`
+    // they are used to compose the title label
+    scope: 'overview',
+    type: null,
+    displayTimeline: true,
+    displayActionButtons: true,
+    debug: false,
+    displayCurrentSearchFilters: false
+  }),
+  getters: {},
+  actions: {
+    show(payload?: Partial<State>) {
+      this.isActive = payload?.isActive ?? true;
+      this.item = payload?.item ?? null;
+      this.items = payload?.items ?? [];
+      this.searchIndex = payload?.searchIndex ?? 'search';
+      this.scope = payload?.scope ?? 'overview';
+      this.type = payload?.type ?? null;
+      this.applyCurrentSearchFilters = payload?.applyCurrentSearchFilters ?? false;
+      this.displayTimeline = payload?.displayTimeline ?? true;
+      this.displayActionButtons = payload?.displayActionButtons ?? true;
+      this.displayCurrentSearchFilters = payload?.displayCurrentSearchFilters ?? false;
+    },
+    hide() {
+      this.isActive = false
+      this.item = null
+      this.items = []
+      this.searchIndex = 'search'
+      this.scope = 'overview'
+      this.type = null
+      this.applyCurrentSearchFilters = false
+      this.displayTimeline = true
+      this.displayActionButtons = true
+      this.displayCurrentSearchFilters = true
+    },
+  },
+  persist: {
+    paths: [],
+  },
+})
diff --git a/src/stores/settings.ts b/src/stores/settings.ts
new file mode 100644
index 000000000..22ab62e9d
--- /dev/null
+++ b/src/stores/settings.ts
@@ -0,0 +1,50 @@
+import { defineStore } from 'pinia'
+
+interface State {
+  lastNotificationDate: string
+  language_code: string
+  cookiesAccepted: boolean
+  termsAgreed: boolean
+  searchDisplayStyle: string
+}
+
+export const useSettingsStore = defineStore('settings', {
+  state: (): State => ({
+    lastNotificationDate: (new Date(0)).toISOString(),
+    language_code: 'en',
+    cookiesAccepted: false,
+    termsAgreed: false,
+    searchDisplayStyle: 'list'
+  }),
+  getters: {
+    lastNotificationDateAsDate(state) {
+      return new Date(state.lastNotificationDate);
+    }
+  },
+  actions: {
+    updateLastNotificationDate(date? : Date) {
+      this.lastNotificationDate = date != null ? date.toISOString() : (new Date()).toISOString();
+    },
+    setLanguageCode(code: string) {
+      this.language_code = code;
+    },
+    setCookiesAccepted(accepted: boolean) {
+      this.cookiesAccepted = accepted;
+    },
+    acceptTermsOfUse() {
+      this.termsAgreed = true;
+    },
+    updateSearchDisplayStyle(style: string) {
+      this.searchDisplayStyle = style;
+    }
+  },
+  persist: {
+    paths: [
+      'termsAgreed',
+      'cookiesAccepted',
+      'lastNotificationDate',
+      'language_code',
+      'searchDisplayStyle',
+    ],
+  },
+})
diff --git a/src/stores/topics.ts b/src/stores/topics.ts
new file mode 100644
index 000000000..46603784d
--- /dev/null
+++ b/src/stores/topics.ts
@@ -0,0 +1,146 @@
+import { defineStore } from 'pinia'
+import { topics as topicsService } from '@/services'
+import Topic from '@/models/Topic'
+
+interface State {
+  pagination: {
+    perPage: number
+    currentPage: number
+    totalRows: number
+  }
+  items: any[],
+  itemsIndex: Record<string, any>
+  visualizedItemsIndex: Record<string, boolean>
+  isLoading: boolean
+  applyCurrentSearchFilters: boolean
+  orderBy: string
+  topicModel: string
+  visualizedItems: any[]
+}
+
+interface LoadTopicsArgs {
+  page?: number
+  limit?: number
+  q?: string
+  facets?: string[]
+  filters?: any[]
+}
+
+export const useTopicsStore = defineStore('topics', {
+  state: (): State => ({
+    pagination: {
+      perPage: 200,
+      currentPage: 1,
+      totalRows: 0,
+    },
+    items: [],
+    itemsIndex: {},
+    visualizedItemsIndex: {},
+    isLoading: false,
+    applyCurrentSearchFilters: true,
+    orderBy: '-name',
+    topicModel: '*',
+    visualizedItems: [],
+  }),
+  getters: {},
+  actions: {
+    loadTopics({
+      page = 1,
+      limit,
+      q,
+      facets,
+      filters = [],
+    }: LoadTopicsArgs = {}) {
+      const query: Record<string, any> = {
+        limit,
+        page,
+      };
+
+      if (filters?.length) {
+        query.filters = filters;
+      }
+      if (q && q.length > 1) {
+        query.q = `${q.split('*').join('')}*`;
+      }
+      if (facets) {
+        query.facets = facets;
+      }
+
+      if (limit) {
+        this.pagination.perPage = limit;
+      }
+      // console.info('topics/LOAD_TOPICS query:', query);
+      return topicsService.find({
+        query,
+      }).then((res) => {
+        const data = res.data.map(d => new Topic(d, {
+          highlight: query.q ? q?.split('*')?.join('') : '',
+        }));
+
+        this.items = data;
+        this.itemsIndex = {};
+        data.forEach((d, k) => {
+          if (this.visualizedItemsIndex[d.uid]) {
+            data[k].visualized = true;
+          }
+          this.itemsIndex[d.uid] = k;
+        });
+
+        this.pagination.currentPage = page;
+        this.pagination.totalRows = res.total;
+        return {
+          ...res,
+          data,
+        };
+      });
+    },
+    updateApplyCurrentSearchFilters(value: boolean) {
+      this.applyCurrentSearchFilters = value
+    },
+    updateTopicModel(topicModel: string) {
+      this.topicModel = topicModel;
+    },
+    updateOrderBy(orderBy: string) {
+      this.orderBy = orderBy;
+    },
+    resetVisualizedItem() {
+      this.visualizedItemsIndex = {};
+      this.visualizedItems = [];
+    },
+    addVisualizedItem(item: any) {
+      if (this.visualizedItemsIndex[item.uid] != null) {
+        return;
+      }
+      this.visualizedItemsIndex = {
+        ...this.visualizedItemsIndex,
+        [item.uid]: this.visualizedItems.length,
+      };
+      // copy the item, we don't want to loose it.
+      const clonedTopic = new Topic({ ...item });
+      this.visualizedItems.push(clonedTopic);
+    },
+    removeVisualizedItem(item: any) {
+      if (this.visualizedItemsIndex[item.uid] == null) {
+        return;
+      }
+      const idx = this.visualizedItemsIndex[item.uid];
+      this.visualizedItems.splice(idx as any, 1);
+      // reset visualizedItemsIndex.
+      this.visualizedItemsIndex = {};
+      this.visualizedItems.forEach((d, k) => {
+        this.visualizedItemsIndex[d.uid] = k as any;
+      });
+    },
+    async toggleVisualizedItem(item: any) {
+      if (typeof this.visualizedItemsIndex[item.uid] !== 'undefined') {
+        this.removeVisualizedItem(item);
+        return false;
+      }
+      this.addVisualizedItem(item);
+      return true;
+    }
+  },
+  persist: {
+    paths: [],
+  },
+})
diff --git a/src/stores/user.ts b/src/stores/user.ts
new file mode 100644
index 000000000..bf2d470e5
--- /dev/null
+++ b/src/stores/user.ts
@@ -0,0 +1,84 @@
+import { defineStore } from 'pinia'
+import { app, me as meService } from '@/services';
+import User from '@/models/User';
+
+interface State {
+  userData: User | false
+  rememberCredentials: boolean
+  redirectionParams: any
+}
+
+export const useUserStore = defineStore('user', {
+  state: (): State => ({
+    userData: false,
+    rememberCredentials: false,
+    redirectionParams: {},
+  }),
+  getters: {
+    user(state) {
+      return state.userData;
+    },
+  },
+  actions: {
+    logout() {
+      return (app as any).logout()
+        .catch((err) => {
+          console.error('error in store/User/LOGOUT');
+          console.error(err);
+        })
+        .finally(() => {
+          const expiredDate = new Date(-1)
+          document.cookie = 'feathers-jwt=; expires=' + expiredDate.toUTCString() + '; path=/';
+          this.userData = false
+        })
+    },
+    login({ email, password }: { email: string, password: string }) {
+      return (app as any).authenticate({
+        strategy: 'local',
+        email,
+        password,
+      }).then((res) => {
+        console.info('Authentication response:', res);
+        return res;
+      }).then(({ user }) => {
+        console.info('LOGIN: user', user.username, 'logged in!');
+        // don't save cookie
+        // const expiredDate = new Date(authentication?.payload?.exp * 1000)
+        // document.cookie = 'feathers-jwt=' + accessToken + '; expires=' + expiredDate.toUTCString() + '; path=/';
+        app.set('user', user);
+        this.userData = new User({
+          ...user,
+          picture: user.profile.picture,
+          pattern: user.profile.pattern,
+        });
+        return user;
+      });
+    },
+    setRememberCredentials(remember: boolean) {
+      this.rememberCredentials = remember;
+    },
+    getCurrentUser() {
+      return meService.find().then(d => new User(d));
+    },
+    changePassword({ uid, previousPassword, newPassword}: { uid: string, previousPassword: string, newPassword: string }) {
+      return meService.patch(uid, { previousPassword, newPassword }, {
+        ignoreErrors: true,
+      });
+    },
+    updateCurrentUser(user: User) {
+      return meService.update(user.uid, user, {
+        ignoreErrors: true,
+      }).then((d) => {
+        const user = new User(d);
+        this.userData = user
+        return user;
+      });
+    },
+    setRedirectionRoute(params) {
+      this.redirectionParams = params
+    },
+  },
+  persist: {
+    paths: ['rememberCredentials', 'userData'],
+  },
+})
diff --git a/src/widget/main.js b/src/widget/main.js
index 7e5fab047..780f06b15 100644
--- a/src/widget/main.js
+++ b/src/widget/main.js
@@ -1,12 +1,10 @@
 import Vue from 'vue';
 import App from './App';
 import router from './router';
-import store from './store';
 
 Vue.config.productionTip = false;
 
 new Vue({
   router,
-  store,
   render: (h) => h(App),
 }).$mount('#app');
diff --git a/src/widget/store/index.js b/src/widget/store/index.js
deleted file mode 100644
index f3653614b..000000000
--- a/src/widget/store/index.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import Vue from 'vue'
-import Vuex, { Store } from 'vuex'
-
-Vue.use(Vuex)
-
-export default new Store({
-  state: {},
-  mutations: {},
-  actions: {},
-  modules: {},
-})
diff --git a/vue.config.js b/vue.config.js
index 6136614c4..b0239097f 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -88,4 +88,15 @@ module.exports = {
     },
   },
   publicPath: getPublicPath(),
+  configureWebpack: {
+    module: {
+      rules: [
+        {
+          test: /\.mjs$/,
+          include: /node_modules/,
+          type: "javascript/auto"
+        }
+      ]
+    }
+  }
 }