diff --git a/.github/workflows/pull-request-lint-check.yaml b/.github/workflows/pull-request-lint-check.yaml
index 0c04e87..001df9e 100644
--- a/.github/workflows/pull-request-lint-check.yaml
+++ b/.github/workflows/pull-request-lint-check.yaml
@@ -3,7 +3,7 @@ name: Lint Check
 on:
   pull_request:
     branches:
-      - never
+      - develop
 
 jobs:
   lint-check:
diff --git a/css/dashboardWidgets.css b/css/dashboardWidgets.css
index c68e871..c7d50fd 100644
--- a/css/dashboardWidgets.css
+++ b/css/dashboardWidgets.css
@@ -1,6 +1,4 @@
 /* import icons css file */
-@import "../src/services/icons/icons.css";
-
 .icon-zaken-widget {
   background-image: url("../img/app-dark.svg");
   filter: var(--background-invert-if-dark);
diff --git a/src/services/icons/icons.css b/css/icons.css
similarity index 99%
rename from src/services/icons/icons.css
rename to css/icons.css
index 46f847e..bdf2f0b 100644
--- a/src/services/icons/icons.css
+++ b/css/icons.css
@@ -1,26 +1,26 @@
-/* progress close */
-.icon-progress-close-dark {
-  background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAyNCAyNCI+DQogICAgPHBhdGgNCiAgICAgICAgZD0iTTEzIDIuMDNWNC4wNUMxNy4zOSA0LjU5IDIwLjUgOC41OCAxOS45NiAxMi45N0MxOS41IDE2LjYxIDE2LjY0IDE5LjUgMTMgMTkuOTNWMjEuOTNDMTguNSAyMS4zOCAyMi41IDE2LjUgMjEuOTUgMTFDMjEuNSA2LjI1IDE3LjczIDIuNSAxMyAyLjAzTTExIDIuMDZDOS4wNSAyLjI1IDcuMTkgMyA1LjY3IDQuMjZMNy4xIDUuNzRDOC4yMiA0Ljg0IDkuNTcgNC4yNiAxMSA0LjA2VjIuMDZNNC4yNiA1LjY3QzMgNy4xOSAyLjI1IDkuMDQgMi4wNSAxMUg0LjA1QzQuMjQgOS41OCA0LjggOC4yMyA1LjY5IDcuMUw0LjI2IDUuNjdNMi4wNiAxM0MyLjI2IDE0Ljk2IDMuMDMgMTYuODEgNC4yNyAxOC4zM0w1LjY5IDE2LjlDNC44MSAxNS43NyA0LjI0IDE0LjQyIDQuMDYgMTNIMi4wNk03LjEgMTguMzdMNS42NyAxOS43NEM3LjE4IDIxIDkuMDQgMjEuNzkgMTEgMjJWMjBDOS41OCAxOS44MiA4LjIzIDE5LjI1IDcuMSAxOC4zN00xNC41OSA4TDEyIDEwLjU5TDkuNDEgOEw4IDkuNDFMMTAuNTkgMTJMOCAxNC41OUw5LjQxIDE2TDEyIDEzLjQxTDE0LjU5IDE2TDE2IDE0LjU5TDEzLjQxIDEyTDE2IDkuNDFMMTQuNTkgOFoiDQogICAgICAgIHN0eWxlPSJmaWxsLW9wYWNpdHk6LjU7ZmlsbC1ydWxlOm5vbnplcm8iIGZpbGw9IiMwMDAwMDAiIC8+DQo8L3N2Zz4=);
-}
-
-.icon-progress-close-light {
-  background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAyNCAyNCI+DQogICAgPHBhdGgNCiAgICAgICAgZD0iTTEzIDIuMDNWNC4wNUMxNy4zOSA0LjU5IDIwLjUgOC41OCAxOS45NiAxMi45N0MxOS41IDE2LjYxIDE2LjY0IDE5LjUgMTMgMTkuOTNWMjEuOTNDMTguNSAyMS4zOCAyMi41IDE2LjUgMjEuOTUgMTFDMjEuNSA2LjI1IDE3LjczIDIuNSAxMyAyLjAzTTExIDIuMDZDOS4wNSAyLjI1IDcuMTkgMyA1LjY3IDQuMjZMNy4xIDUuNzRDOC4yMiA0Ljg0IDkuNTcgNC4yNiAxMSA0LjA2VjIuMDZNNC4yNiA1LjY3QzMgNy4xOSAyLjI1IDkuMDQgMi4wNSAxMUg0LjA1QzQuMjQgOS41OCA0LjggOC4yMyA1LjY5IDcuMUw0LjI2IDUuNjdNMi4wNiAxM0MyLjI2IDE0Ljk2IDMuMDMgMTYuODEgNC4yNyAxOC4zM0w1LjY5IDE2LjlDNC44MSAxNS43NyA0LjI0IDE0LjQyIDQuMDYgMTNIMi4wNk03LjEgMTguMzdMNS42NyAxOS43NEM3LjE4IDIxIDkuMDQgMjEuNzkgMTEgMjJWMjBDOS41OCAxOS44MiA4LjIzIDE5LjI1IDcuMSAxOC4zN00xNC41OSA4TDEyIDEwLjU5TDkuNDEgOEw4IDkuNDFMMTAuNTkgMTJMOCAxNC41OUw5LjQxIDE2TDEyIDEzLjQxTDE0LjU5IDE2TDE2IDE0LjU5TDEzLjQxIDEyTDE2IDkuNDFMMTQuNTkgOFoiDQogICAgICAgIHN0eWxlPSJmaWxsLXJ1bGU6bm9uemVybyIgZmlsbD0iI2ZmZmZmZiIgLz4NCjwvc3ZnPg==);
-}
-
-/* pencil */
-.icon-pencil-dark {
-  background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAyNCAyNCI+PHBhdGggZD0iTTIwLjcxLDcuMDRDMjEuMSw2LjY1IDIxLjEsNiAyMC43MSw1LjYzTDE4LjM3LDMuMjlDMTgsMi45IDE3LjM1LDIuOSAxNi45NiwzLjI5TDE1LjEyLDUuMTJMMTguODcsOC44N00zLDE3LjI1VjIxSDYuNzVMMTcuODEsOS45M0wxNC4wNiw2LjE4TDMsMTcuMjVaIiAvPjwvc3ZnPg==);
-}
-
-.icon-pencil-light {
-  background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAyNCAyNCI+PHBhdGggZD0iTTIwLjcxLDcuMDRDMjEuMSw2LjY1IDIxLjEsNiAyMC43MSw1LjYzTDE4LjM3LDMuMjlDMTgsMi45IDE3LjM1LDIuOSAxNi45NiwzLjI5TDE1LjEyLDUuMTJMMTguODcsOC44N00zLDE3LjI1VjIxSDYuNzVMMTcuODEsOS45M0wxNC4wNiw2LjE4TDMsMTcuMjVaIiBmaWxsPSIjZmZmZmZmIiAvPjwvc3ZnPg==);
-}
-
-/* CalendarCheckOutline */
-.icon-calendar-check-outline-dark {
-  background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAyNCAyNCI+PHBhdGggZD0iTTE5IDNIMThWMUgxNlYzSDhWMUg2VjNINUMzLjkgMyAzIDMuOSAzIDVWMTlDMyAyMC4xMSAzLjkgMjEgNSAyMUgxOUMyMC4xMSAyMSAyMSAyMC4xMSAyMSAxOVY1QzIxIDMuOSAyMC4xMSAzIDE5IDNNMTkgMTlINVY5SDE5VjE5TTUgN1Y1SDE5VjdINU0xMC41NiAxNy40NkwxNi41IDExLjUzTDE1LjQzIDEwLjQ3TDEwLjU2IDE1LjM0TDguNDUgMTMuMjNMNy4zOSAxNC4yOUwxMC41NiAxNy40NloiIC8+PC9zdmc+);
-}
-
-.icon-calendar-check-outline-light {
-  background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAyNCAyNCI+PHBhdGggZD0iTTE5IDNIMThWMUgxNlYzSDhWMUg2VjNINUMzLjkgMyAzIDMuOSAzIDVWMTlDMyAyMC4xMSAzLjkgMjEgNSAyMUgxOUMyMC4xMSAyMSAyMSAyMC4xMSAyMSAxOVY1QzIxIDMuOSAyMC4xMSAzIDE5IDNNMTkgMTlINVY5SDE5VjE5TTUgN1Y1SDE5VjdINU0xMC41NiAxNy40NkwxNi41IDExLjUzTDE1LjQzIDEwLjQ3TDEwLjU2IDE1LjM0TDguNDUgMTMuMjNMNy4zOSAxNC4yOUwxMC41NiAxNy40NloiIGZpbGw9IiNmZmZmZmYiIC8+PC9zdmc+);
-}
+/* progress close */
+.icon-progress-close-dark {
+  background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAyNCAyNCI+DQogICAgPHBhdGgNCiAgICAgICAgZD0iTTEzIDIuMDNWNC4wNUMxNy4zOSA0LjU5IDIwLjUgOC41OCAxOS45NiAxMi45N0MxOS41IDE2LjYxIDE2LjY0IDE5LjUgMTMgMTkuOTNWMjEuOTNDMTguNSAyMS4zOCAyMi41IDE2LjUgMjEuOTUgMTFDMjEuNSA2LjI1IDE3LjczIDIuNSAxMyAyLjAzTTExIDIuMDZDOS4wNSAyLjI1IDcuMTkgMyA1LjY3IDQuMjZMNy4xIDUuNzRDOC4yMiA0Ljg0IDkuNTcgNC4yNiAxMSA0LjA2VjIuMDZNNC4yNiA1LjY3QzMgNy4xOSAyLjI1IDkuMDQgMi4wNSAxMUg0LjA1QzQuMjQgOS41OCA0LjggOC4yMyA1LjY5IDcuMUw0LjI2IDUuNjdNMi4wNiAxM0MyLjI2IDE0Ljk2IDMuMDMgMTYuODEgNC4yNyAxOC4zM0w1LjY5IDE2LjlDNC44MSAxNS43NyA0LjI0IDE0LjQyIDQuMDYgMTNIMi4wNk03LjEgMTguMzdMNS42NyAxOS43NEM3LjE4IDIxIDkuMDQgMjEuNzkgMTEgMjJWMjBDOS41OCAxOS44MiA4LjIzIDE5LjI1IDcuMSAxOC4zN00xNC41OSA4TDEyIDEwLjU5TDkuNDEgOEw4IDkuNDFMMTAuNTkgMTJMOCAxNC41OUw5LjQxIDE2TDEyIDEzLjQxTDE0LjU5IDE2TDE2IDE0LjU5TDEzLjQxIDEyTDE2IDkuNDFMMTQuNTkgOFoiDQogICAgICAgIHN0eWxlPSJmaWxsLW9wYWNpdHk6LjU7ZmlsbC1ydWxlOm5vbnplcm8iIGZpbGw9IiMwMDAwMDAiIC8+DQo8L3N2Zz4=);
+}
+
+.icon-progress-close-light {
+  background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAyNCAyNCI+DQogICAgPHBhdGgNCiAgICAgICAgZD0iTTEzIDIuMDNWNC4wNUMxNy4zOSA0LjU5IDIwLjUgOC41OCAxOS45NiAxMi45N0MxOS41IDE2LjYxIDE2LjY0IDE5LjUgMTMgMTkuOTNWMjEuOTNDMTguNSAyMS4zOCAyMi41IDE2LjUgMjEuOTUgMTFDMjEuNSA2LjI1IDE3LjczIDIuNSAxMyAyLjAzTTExIDIuMDZDOS4wNSAyLjI1IDcuMTkgMyA1LjY3IDQuMjZMNy4xIDUuNzRDOC4yMiA0Ljg0IDkuNTcgNC4yNiAxMSA0LjA2VjIuMDZNNC4yNiA1LjY3QzMgNy4xOSAyLjI1IDkuMDQgMi4wNSAxMUg0LjA1QzQuMjQgOS41OCA0LjggOC4yMyA1LjY5IDcuMUw0LjI2IDUuNjdNMi4wNiAxM0MyLjI2IDE0Ljk2IDMuMDMgMTYuODEgNC4yNyAxOC4zM0w1LjY5IDE2LjlDNC44MSAxNS43NyA0LjI0IDE0LjQyIDQuMDYgMTNIMi4wNk03LjEgMTguMzdMNS42NyAxOS43NEM3LjE4IDIxIDkuMDQgMjEuNzkgMTEgMjJWMjBDOS41OCAxOS44MiA4LjIzIDE5LjI1IDcuMSAxOC4zN00xNC41OSA4TDEyIDEwLjU5TDkuNDEgOEw4IDkuNDFMMTAuNTkgMTJMOCAxNC41OUw5LjQxIDE2TDEyIDEzLjQxTDE0LjU5IDE2TDE2IDE0LjU5TDEzLjQxIDEyTDE2IDkuNDFMMTQuNTkgOFoiDQogICAgICAgIHN0eWxlPSJmaWxsLXJ1bGU6bm9uemVybyIgZmlsbD0iI2ZmZmZmZiIgLz4NCjwvc3ZnPg==);
+}
+
+/* pencil */
+.icon-pencil-dark {
+  background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAyNCAyNCI+PHBhdGggZD0iTTIwLjcxLDcuMDRDMjEuMSw2LjY1IDIxLjEsNiAyMC43MSw1LjYzTDE4LjM3LDMuMjlDMTgsMi45IDE3LjM1LDIuOSAxNi45NiwzLjI5TDE1LjEyLDUuMTJMMTguODcsOC44N00zLDE3LjI1VjIxSDYuNzVMMTcuODEsOS45M0wxNC4wNiw2LjE4TDMsMTcuMjVaIiAvPjwvc3ZnPg==);
+}
+
+.icon-pencil-light {
+  background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAyNCAyNCI+PHBhdGggZD0iTTIwLjcxLDcuMDRDMjEuMSw2LjY1IDIxLjEsNiAyMC43MSw1LjYzTDE4LjM3LDMuMjlDMTgsMi45IDE3LjM1LDIuOSAxNi45NiwzLjI5TDE1LjEyLDUuMTJMMTguODcsOC44N00zLDE3LjI1VjIxSDYuNzVMMTcuODEsOS45M0wxNC4wNiw2LjE4TDMsMTcuMjVaIiBmaWxsPSIjZmZmZmZmIiAvPjwvc3ZnPg==);
+}
+
+/* CalendarCheckOutline */
+.icon-calendar-check-outline-dark {
+  background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAyNCAyNCI+PHBhdGggZD0iTTE5IDNIMThWMUgxNlYzSDhWMUg2VjNINUMzLjkgMyAzIDMuOSAzIDVWMTlDMyAyMC4xMSAzLjkgMjEgNSAyMUgxOUMyMC4xMSAyMSAyMSAyMC4xMSAyMSAxOVY1QzIxIDMuOSAyMC4xMSAzIDE5IDNNMTkgMTlINVY5SDE5VjE5TTUgN1Y1SDE5VjdINU0xMC41NiAxNy40NkwxNi41IDExLjUzTDE1LjQzIDEwLjQ3TDEwLjU2IDE1LjM0TDguNDUgMTMuMjNMNy4zOSAxNC4yOUwxMC41NiAxNy40NloiIC8+PC9zdmc+);
+}
+
+.icon-calendar-check-outline-light {
+  background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAyNCAyNCI+PHBhdGggZD0iTTE5IDNIMThWMUgxNlYzSDhWMUg2VjNINUMzLjkgMyAzIDMuOSAzIDVWMTlDMyAyMC4xMSAzLjkgMjEgNSAyMUgxOUMyMC4xMSAyMSAyMSAyMC4xMSAyMSAxOVY1QzIxIDMuOSAyMC4xMSAzIDE5IDNNMTkgMTlINVY5SDE5VjE5TTUgN1Y1SDE5VjdINU0xMC41NiAxNy40NkwxNi41IDExLjUzTDE1LjQzIDEwLjQ3TDEwLjU2IDE1LjM0TDguNDUgMTMuMjNMNy4zOSAxNC4yOUwxMC41NiAxNy40NloiIGZpbGw9IiNmZmZmZmYiIC8+PC9zdmc+);
+}
diff --git a/lib/Dashboard/ContactmomentenWidget.php b/lib/Dashboard/ContactmomentenWidget.php
index 0db3049..a967c83 100644
--- a/lib/Dashboard/ContactmomentenWidget.php
+++ b/lib/Dashboard/ContactmomentenWidget.php
@@ -65,5 +65,6 @@ public function load(): void
     {
         Util::addScript(Application::APP_ID, Application::APP_ID . '-contactmomentenWidget');
         Util::addStyle(Application::APP_ID, 'dashboardWidgets');
+        Util::addStyle(Application::APP_ID, 'icons');
     }
 }
diff --git a/lib/Dashboard/OpenZakenWidget.php b/lib/Dashboard/OpenZakenWidget.php
index edab96d..f0c4325 100644
--- a/lib/Dashboard/OpenZakenWidget.php
+++ b/lib/Dashboard/OpenZakenWidget.php
@@ -65,5 +65,6 @@ public function load(): void
     {
         Util::addScript(Application::APP_ID, Application::APP_ID . '-openZakenWidget');
         Util::addStyle(Application::APP_ID, 'dashboardWidgets');
+        Util::addStyle(Application::APP_ID, 'icons');
     }
 }
diff --git a/lib/Dashboard/OrganisatiesWidget.php b/lib/Dashboard/OrganisatiesWidget.php
index 4ca9e72..a8eb542 100644
--- a/lib/Dashboard/OrganisatiesWidget.php
+++ b/lib/Dashboard/OrganisatiesWidget.php
@@ -65,5 +65,6 @@ public function load(): void
     {
         Util::addScript(Application::APP_ID, Application::APP_ID . '-organisatiesWidget');
         Util::addStyle(Application::APP_ID, 'dashboardWidgets');
+        Util::addStyle(Application::APP_ID, 'icons');
     }
 }
diff --git a/lib/Dashboard/PersonenWidget.php b/lib/Dashboard/PersonenWidget.php
index 2b9ffcb..0216472 100644
--- a/lib/Dashboard/PersonenWidget.php
+++ b/lib/Dashboard/PersonenWidget.php
@@ -65,5 +65,6 @@ public function load(): void
     {
         Util::addScript(Application::APP_ID, Application::APP_ID . '-personenWidget');
         Util::addStyle(Application::APP_ID, 'dashboardWidgets');
+        Util::addStyle(Application::APP_ID, 'icons');
     }
 }
diff --git a/lib/Dashboard/TakenWidget.php b/lib/Dashboard/TakenWidget.php
index f912353..cd4fca9 100644
--- a/lib/Dashboard/TakenWidget.php
+++ b/lib/Dashboard/TakenWidget.php
@@ -65,5 +65,6 @@ public function load(): void
     {
         Util::addScript(Application::APP_ID, Application::APP_ID . '-takenWidget');
         Util::addStyle(Application::APP_ID, 'dashboardWidgets');
+        Util::addStyle(Application::APP_ID, 'icons');
     }
 }
diff --git a/lib/Dashboard/ZakenWidget.php b/lib/Dashboard/ZakenWidget.php
index eae18d1..59f7962 100644
--- a/lib/Dashboard/ZakenWidget.php
+++ b/lib/Dashboard/ZakenWidget.php
@@ -65,5 +65,6 @@ public function load(): void
     {
         Util::addScript(Application::APP_ID, Application::APP_ID . '-zakenWidget');
         Util::addStyle(Application::APP_ID, 'dashboardWidgets');
+        Util::addStyle(Application::APP_ID, 'icons');
     }
 }
diff --git a/src/modals/rollen/AddRol.vue b/src/modals/rollen/AddRol.vue
index 50924c1..f4b7c68 100644
--- a/src/modals/rollen/AddRol.vue
+++ b/src/modals/rollen/AddRol.vue
@@ -83,7 +83,7 @@ export default {
 					const self = this
 					setTimeout(function() {
 						self.succes = false
-						store.setModal(false)
+						navigationStore.setModal(false)
 					}, 2000)
 				})
 				.catch((err) => {
diff --git a/src/modals/rollen/EditRol.vue b/src/modals/rollen/EditRol.vue
index ae85118..a12a20e 100644
--- a/src/modals/rollen/EditRol.vue
+++ b/src/modals/rollen/EditRol.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { navigationStore } from '../../store/store.js'
+import { navigationStore, rolStore } from '../../store/store.js'
 </script>
 
 <template>
@@ -59,13 +59,13 @@ export default {
 	},
 	updated() {
 		if (navigationStore.modal === 'editRol' && this.hasUpdated) {
-			if (this.rol === store.rolItem) return
+			if (this.rol === rolStore.rolItem) return
 			this.hasUpdated = false
 		}
 		if (navigationStore.modal === 'editRol' && !this.hasUpdated) {
-			this.fetchData(store.rolId)
+			this.fetchData(rolStore.rolId)
 			this.hasUpdated = true
-			this.rol = store.rolItem
+			this.rol = rolStore.rolItem
 		}
 	},
 	methods: {
@@ -87,7 +87,7 @@ export default {
 					const self = this
 					setTimeout(function() {
 						self.succes = false
-						store.setModal(false)
+						navigationStore.setModal(false)
 					}, 2000)
 				})
 				.catch((err) => {
@@ -101,7 +101,7 @@ export default {
 		},
 		editRol() {
 			fetch(
-				`/index.php/apps/zaakafhandelapp/api/objects/rollen/${store.rolId}`,
+				`/index.php/apps/zaakafhandelapp/api/objects/rollen/${rolStore.rolId}`,
 				{
 					method: 'PUT',
 					headers: {
diff --git a/src/store/modules/berichten.spec.js b/src/store/modules/berichten.spec.js
index 4a1afcb..a6486fd 100644
--- a/src/store/modules/berichten.spec.js
+++ b/src/store/modules/berichten.spec.js
@@ -1,35 +1,35 @@
 /* eslint-disable no-console */
 import { setActivePinia, createPinia } from 'pinia'
 
-import { useZaakStore } from './zaken.js'
-import { Zaak, mockZaak } from '../../entities/index.js'
+import { useBerichtStore } from './berichten.js'
+import { Bericht, mockBericht } from '../../entities/index.js'
 
-describe('Zaak Store', () => {
+describe('Bericht Store', () => {
 	beforeEach(() => {
 		setActivePinia(createPinia())
 	})
 
 	it('sets zaak item correctly', () => {
-		const store = useZaakStore()
+		const store = useBerichtStore()
 
-		store.setZaakItem(mockZaak()[0])
+		store.setBerichtItem(mockBericht()[0])
 
-		expect(store.zaakItem).toBeInstanceOf(Zaak)
-		expect(store.zaakItem).toEqual(mockZaak()[0])
+		expect(store.berichtItem).toBeInstanceOf(Bericht)
+		expect(store.berichtItem).toEqual(mockBericht()[0])
 
-		expect(store.zaakItem.validate().success).toBe(true)
+		expect(store.berichtItem.validate().success).toBe(true)
 	})
 
 	it('sets zaken list correctly', () => {
-		const store = useZaakStore()
+		const store = useBerichtStore()
 
-		store.setZakenList(mockZaak())
+		store.setBerichtList(mockBericht())
 
-		expect(store.zakenList).toHaveLength(mockZaak().length)
+		expect(store.berichtList).toHaveLength(mockBericht().length)
 
-		store.zakenList.forEach((item, index) => {
-			expect(item).toBeInstanceOf(Zaak)
-			expect(item).toEqual(mockZaak()[index])
+		store.berichtList.forEach((item, index) => {
+			expect(item).toBeInstanceOf(Bericht)
+			expect(item).toEqual(mockBericht()[index])
 			expect(item.validate().success).toBe(true)
 		})
 	})
diff --git a/src/store/modules/besluiten.ts b/src/store/modules/besluiten.ts
index 8095aae..75c51ca 100644
--- a/src/store/modules/besluiten.ts
+++ b/src/store/modules/besluiten.ts
@@ -23,7 +23,6 @@ export const useBesluitStore = defineStore('besluiten', {
 		/**
 		 * Fetch a single besluit item by its ID.
 		 *
-		 * @param zaakId - The ID of the zaak the besluit belongs to
 		 * @param id - The ID of the besluit item to fetch.
 		 * @param options - Options for fetching the besluit item. (default: `{}`)
 		 * @throws If the HTTP request fails.
diff --git a/src/store/modules/contactmoment.ts b/src/store/modules/contactmoment.ts
index 5b118bc..5b5d7dc 100644
--- a/src/store/modules/contactmoment.ts
+++ b/src/store/modules/contactmoment.ts
@@ -36,7 +36,7 @@ export const useContactMomentStore = defineStore('contactmomenten', {
 		 *
 		 * @param search - Optional search query to filter the contact moments list. (default: `null`)
 		 * @param notClosed - Optional boolean to filter out closed contact moments from the contact moments list. (default: `false`)
-		 * @param user
+		 * @param user - Optional user ID to filter the contact moments list. (default: `null`)
 		 * @throws If the HTTP request fails.
 		 * @return {Promise<{ response: Response, data: TContactMoment[], entities: ContactMoment[] }>} The response, raw data, and entities.
 		 */
diff --git a/src/store/modules/klanten.spec.js b/src/store/modules/klanten.spec.js
index 4a1afcb..dd37177 100644
--- a/src/store/modules/klanten.spec.js
+++ b/src/store/modules/klanten.spec.js
@@ -1,35 +1,35 @@
 /* eslint-disable no-console */
 import { setActivePinia, createPinia } from 'pinia'
 
-import { useZaakStore } from './zaken.js'
-import { Zaak, mockZaak } from '../../entities/index.js'
+import { useKlantStore } from './klanten.js'
+import { Klant, mockKlant } from '../../entities/index.js'
 
-describe('Zaak Store', () => {
+describe('Klant Store', () => {
 	beforeEach(() => {
 		setActivePinia(createPinia())
 	})
 
-	it('sets zaak item correctly', () => {
-		const store = useZaakStore()
+	it('sets klant item correctly', () => {
+		const store = useKlantStore()
 
-		store.setZaakItem(mockZaak()[0])
+		store.setKlantItem(mockKlant()[0])
 
-		expect(store.zaakItem).toBeInstanceOf(Zaak)
-		expect(store.zaakItem).toEqual(mockZaak()[0])
+		expect(store.klantItem).toBeInstanceOf(Klant)
+		expect(store.klantItem).toEqual(mockKlant()[0])
 
-		expect(store.zaakItem.validate().success).toBe(true)
+		expect(store.klantItem.validate().success).toBe(true)
 	})
 
 	it('sets zaken list correctly', () => {
-		const store = useZaakStore()
+		const store = useKlantStore()
 
-		store.setZakenList(mockZaak())
+		store.setKlantList(mockKlant())
 
-		expect(store.zakenList).toHaveLength(mockZaak().length)
+		expect(store.klantList).toHaveLength(mockKlant().length)
 
-		store.zakenList.forEach((item, index) => {
-			expect(item).toBeInstanceOf(Zaak)
-			expect(item).toEqual(mockZaak()[index])
+		store.klantList.forEach((item, index) => {
+			expect(item).toBeInstanceOf(Klant)
+			expect(item).toEqual(mockKlant()[index])
 			expect(item.validate().success).toBe(true)
 		})
 	})
diff --git a/src/store/modules/navigation.spec.js b/src/store/modules/navigation.spec.js
index d54f1c0..509daed 100644
--- a/src/store/modules/navigation.spec.js
+++ b/src/store/modules/navigation.spec.js
@@ -1,7 +1,7 @@
 /* eslint-disable no-console */
 import { setActivePinia, createPinia } from 'pinia'
 
-import { useNavigationStore } from './navigation.js'
+import { useNavigationStore } from './navigation.ts'
 
 describe('Navigation Store', () => {
 	beforeEach(() => {
diff --git a/src/views/berichten/ZaakBerichten.vue b/src/views/berichten/ZaakBerichten.vue
index 20d1fa5..ababc2b 100644
--- a/src/views/berichten/ZaakBerichten.vue
+++ b/src/views/berichten/ZaakBerichten.vue
@@ -62,7 +62,6 @@ import { NcListItem, NcActionButton, NcLoadingIcon } from '@nextcloud/vue'
 // Icons
 import ChatOutline from 'vue-material-design-icons/ChatOutline.vue'
 import Eye from 'vue-material-design-icons/Eye.vue'
-import Pencil from 'vue-material-design-icons/Pencil.vue'
 import TrashCanOutline from 'vue-material-design-icons/TrashCanOutline.vue'
 
 export default {
diff --git a/src/views/besluiten/BesluitDetails.vue b/src/views/besluiten/BesluitDetails.vue
index 843c99e..65ef347 100644
--- a/src/views/besluiten/BesluitDetails.vue
+++ b/src/views/besluiten/BesluitDetails.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { navigationStore } from '../../store/store.js'
+import { besluitStore } from '../../store/store.js'
 </script>
 
 <template>
@@ -55,7 +55,7 @@ export default {
 	},
 	// First time the is no emit so lets grap it directly
 	mounted() {
-		this.fetchData(store.besluitItem)
+		this.fetchData(besluitStore.besluitItem)
 	},
 	methods: {
 		fetchData(besluitId) {
diff --git a/src/views/besluiten/BesluitenIndex.vue b/src/views/besluiten/BesluitenIndex.vue
index a736dab..2158ee4 100644
--- a/src/views/besluiten/BesluitenIndex.vue
+++ b/src/views/besluiten/BesluitenIndex.vue
@@ -30,8 +30,7 @@ import { navigationStore } from '../../store/store.js'
 import { NcAppContent, NcEmptyContent, NcButton } from '@nextcloud/vue'
 import BesluitenList from './BesluitenList.vue'
 import BesluitDetails from './BesluitDetails.vue'
-// eslint-disable-next-line n/no-missing-import
-import BriefcaseAccountOutline from 'vue-material-design-icons/BriefcaseAccountOutline'
+import BriefcaseAccountOutline from 'vue-material-design-icons/BriefcaseAccountOutline.vue'
 
 export default {
 	name: 'BesluitenIndex',
diff --git a/src/views/besluiten/BesluitenList.vue b/src/views/besluiten/BesluitenList.vue
index d556718..68ac8e6 100644
--- a/src/views/besluiten/BesluitenList.vue
+++ b/src/views/besluiten/BesluitenList.vue
@@ -1,7 +1,3 @@
-<script setup>
-import { navigationStore } from '../../store/store.js'
-</script>
-
 <template>
 	<NcAppContentList>
 		<ul>
@@ -70,10 +66,10 @@ import { navigationStore } from '../../store/store.js'
 </template>
 <script>
 import { NcListItem, NcActionButton, NcAppContentList, NcTextField, NcLoadingIcon } from '@nextcloud/vue'
-// eslint-disable-next-line n/no-missing-import
-import Magnify from 'vue-material-design-icons/Magnify'
-// eslint-disable-next-line n/no-missing-import
-import BriefcaseAccountOutline from 'vue-material-design-icons/BriefcaseAccountOutline'
+
+import Magnify from 'vue-material-design-icons/Magnify.vue'
+
+import BriefcaseAccountOutline from 'vue-material-design-icons/BriefcaseAccountOutline.vue'
 
 export default {
 	name: 'BesluitenList',
diff --git a/src/views/documenten/DocumentDetails.vue b/src/views/documenten/DocumentDetails.vue
index 6b64ce5..b9d61a1 100644
--- a/src/views/documenten/DocumentDetails.vue
+++ b/src/views/documenten/DocumentDetails.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { navigationStore } from '../../store/store.js'
+import { documentStore } from '../../store/store.js'
 </script>
 
 <template>
@@ -55,7 +55,7 @@ export default {
 	},
 	// First time the is no emit so lets grap it directly
 	mounted() {
-		this.fetchData(store.documentItem)
+		this.fetchData(documentStore.documentItem)
 	},
 	methods: {
 		fetchData(documentId) {
diff --git a/src/views/documenten/DocumentenIndex.vue b/src/views/documenten/DocumentenIndex.vue
index 14d66ec..52882c1 100644
--- a/src/views/documenten/DocumentenIndex.vue
+++ b/src/views/documenten/DocumentenIndex.vue
@@ -30,8 +30,8 @@ import { navigationStore } from '../../store/store.js'
 import { NcAppContent, NcEmptyContent, NcButton } from '@nextcloud/vue'
 import DocumentenList from './DocumentenList.vue'
 import DocumentDetails from './DocumentDetails.vue'
-// eslint-disable-next-line n/no-missing-import
-import BriefcaseAccountOutline from 'vue-material-design-icons/BriefcaseAccountOutline'
+
+import BriefcaseAccountOutline from 'vue-material-design-icons/BriefcaseAccountOutline.vue'
 
 export default {
 	name: 'DocumentenIndex',
diff --git a/src/views/documenten/DocumentenList.vue b/src/views/documenten/DocumentenList.vue
index b7d4712..2a54e2c 100644
--- a/src/views/documenten/DocumentenList.vue
+++ b/src/views/documenten/DocumentenList.vue
@@ -70,10 +70,10 @@ import { navigationStore, berichtStore } from '../../store/store.js'
 </template>
 <script>
 import { NcListItem, NcActionButton, NcAppContentList, NcTextField, NcLoadingIcon } from '@nextcloud/vue'
-// eslint-disable-next-line n/no-missing-import
-import Magnify from 'vue-material-design-icons/Magnify'
-// eslint-disable-next-line n/no-missing-import
-import BriefcaseAccountOutline from 'vue-material-design-icons/BriefcaseAccountOutline'
+
+import Magnify from 'vue-material-design-icons/Magnify.vue'
+
+import BriefcaseAccountOutline from 'vue-material-design-icons/BriefcaseAccountOutline.vue'
 
 export default {
 	name: 'DocumentenList',
diff --git a/src/views/documenten/ZaakDocumenten.vue b/src/views/documenten/ZaakDocumenten.vue
index e2ea81a..7159dd4 100644
--- a/src/views/documenten/ZaakDocumenten.vue
+++ b/src/views/documenten/ZaakDocumenten.vue
@@ -50,8 +50,8 @@ import { navigationStore, documentStore } from '../../store/store.js'
 
 <script>
 import { NcListItem, NcActionButton, NcLoadingIcon } from '@nextcloud/vue'
-// eslint-disable-next-line n/no-missing-import
-import FileDocumentOutline from 'vue-material-design-icons/FileDocumentOutline'
+
+import FileDocumentOutline from 'vue-material-design-icons/FileDocumentOutline.vue'
 import TrashCanOutline from 'vue-material-design-icons/TrashCanOutline.vue'
 import Pencil from 'vue-material-design-icons/Pencil.vue'
 
diff --git a/src/views/resultaten/ResultaatDetails.vue b/src/views/resultaten/ResultaatDetails.vue
index 8f5c62c..21fea7d 100644
--- a/src/views/resultaten/ResultaatDetails.vue
+++ b/src/views/resultaten/ResultaatDetails.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { navigationStore } from '../../store/store.js'
+import { resultaatStore } from '../../store/store.js'
 </script>
 
 <template>
@@ -54,7 +54,7 @@ export default {
 		},
 	},
 	mounted() {
-		this.fetchData(store.resultaatItem)
+		this.fetchData(resultaatStore.resultaatItem)
 	},
 	methods: {
 		fetchData(resultaatId) {
diff --git a/src/views/resultaten/ResultatenIndex.vue b/src/views/resultaten/ResultatenIndex.vue
index 290922c..fd20042 100644
--- a/src/views/resultaten/ResultatenIndex.vue
+++ b/src/views/resultaten/ResultatenIndex.vue
@@ -30,8 +30,8 @@ import { navigationStore } from '../../store/store.js'
 import { NcAppContent, NcEmptyContent, NcButton } from '@nextcloud/vue'
 import ResultatenList from './ResultatenList.vue'
 import ResultaatDetails from './ResultaatDetails.vue'
-// eslint-disable-next-line n/no-missing-import
-import BriefcaseAccountOutline from 'vue-material-design-icons/BriefcaseAccountOutline'
+
+import BriefcaseAccountOutline from 'vue-material-design-icons/BriefcaseAccountOutline.vue'
 
 export default {
 	name: 'ResultatenIndex',
diff --git a/src/views/resultaten/ResultatenList.vue b/src/views/resultaten/ResultatenList.vue
index d02bdf4..b3a1397 100644
--- a/src/views/resultaten/ResultatenList.vue
+++ b/src/views/resultaten/ResultatenList.vue
@@ -1,7 +1,3 @@
-<script setup>
-import { navigationStore } from '../../store/store.js'
-</script>
-
 <template>
 	<NcAppContentList>
 		<ul>
@@ -72,10 +68,10 @@ import { navigationStore } from '../../store/store.js'
 </template>
 <script>
 import { NcListItem, NcActionButton, NcAppContentList, NcTextField, NcLoadingIcon } from '@nextcloud/vue'
-// eslint-disable-next-line n/no-missing-import
-import Magnify from 'vue-material-design-icons/Magnify'
-// eslint-disable-next-line n/no-missing-import
-import BriefcaseAccountOutline from 'vue-material-design-icons/BriefcaseAccountOutline'
+
+import Magnify from 'vue-material-design-icons/Magnify.vue'
+
+import BriefcaseAccountOutline from 'vue-material-design-icons/BriefcaseAccountOutline.vue'
 
 export default {
 	name: 'ResultatenList',
diff --git a/src/views/rollen/RolDetails.vue b/src/views/rollen/RolDetails.vue
index 72ec0aa..4f992cd 100644
--- a/src/views/rollen/RolDetails.vue
+++ b/src/views/rollen/RolDetails.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { navigationStore } from '../../store/store.js'
+import { rolStore } from '../../store/store.js'
 </script>
 
 <template>
@@ -55,7 +55,7 @@ export default {
 	},
 	// First time the is no emit so lets grap it directly
 	mounted() {
-		this.fetchData(store.rolItem.id)
+		this.fetchData(rolStore.rolItem.id)
 	},
 	methods: {
 		fetchData(rolId) {
diff --git a/src/views/rollen/RollenIndex.vue b/src/views/rollen/RollenIndex.vue
index 797dcd8..9f8e249 100644
--- a/src/views/rollen/RollenIndex.vue
+++ b/src/views/rollen/RollenIndex.vue
@@ -30,8 +30,8 @@ import { navigationStore } from '../../store/store.js'
 import { NcAppContent, NcEmptyContent, NcButton } from '@nextcloud/vue'
 import RollenList from './RollenList.vue'
 import RolDetails from './RolDetails.vue'
-// eslint-disable-next-line n/no-missing-import
-import ChatOutline from 'vue-material-design-icons/ChatOutline'
+
+import ChatOutline from 'vue-material-design-icons/ChatOutline.vue'
 
 export default {
 	name: 'RollenIndex',
diff --git a/src/views/rollen/RollenList.vue b/src/views/rollen/RollenList.vue
index 638c36f..166f4d2 100644
--- a/src/views/rollen/RollenList.vue
+++ b/src/views/rollen/RollenList.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { navigationStore } from '../../store/store.js'
+import { navigationStore, rolStore } from '../../store/store.js'
 </script>
 
 <template>
@@ -67,10 +67,10 @@ import { navigationStore } from '../../store/store.js'
 </template>
 <script>
 import { NcListItem, NcActionButton, NcAppContentList, NcTextField, NcLoadingIcon } from '@nextcloud/vue'
-// eslint-disable-next-line n/no-missing-import
-import Magnify from 'vue-material-design-icons/Magnify'
-// eslint-disable-next-line n/no-missing-import
-import ChatOutline from 'vue-material-design-icons/ChatOutline'
+
+import Magnify from 'vue-material-design-icons/Magnify.vue'
+
+import ChatOutline from 'vue-material-design-icons/ChatOutline.vue'
 
 export default {
 	name: 'RollenList',
@@ -95,8 +95,8 @@ export default {
 	},
 	methods: {
 		editRol(rol) {
-			store.setRolItem(rol)
-			store.setRolId(rol.id)
+			rolStore.setRolItem(rol)
+			rolStore.setRolId(rol.id)
 			navigationStore.setModal('editRol')
 		},
 		fetchData(newPage) {
diff --git a/src/views/rollen/ZaakRollen.vue b/src/views/rollen/ZaakRollen.vue
index 1807174..7c0171c 100644
--- a/src/views/rollen/ZaakRollen.vue
+++ b/src/views/rollen/ZaakRollen.vue
@@ -57,8 +57,8 @@ import { navigationStore, rolStore } from '../../store/store.js'
 </template>
 <script>
 import { NcListItem, NcActionButton, NcLoadingIcon } from '@nextcloud/vue'
-// eslint-disable-next-line n/no-missing-import
-import BriefcaseAccountOutline from 'vue-material-design-icons/BriefcaseAccountOutline'
+
+import BriefcaseAccountOutline from 'vue-material-design-icons/BriefcaseAccountOutline.vue'
 
 export default {
 	name: 'ZaakRollen',
diff --git a/src/views/settings/Settings.vue b/src/views/settings/Settings.vue
index 1a9dbd4..f6e63cd 100644
--- a/src/views/settings/Settings.vue
+++ b/src/views/settings/Settings.vue
@@ -239,7 +239,7 @@ export default {
 				{ id: 'zaaktypen', title: 'Zaaktypen', description: 'Configureer de opslag voor zaaktypen', helpLink: 'https://example.com/help/zaaktypen' },
 				{ id: 'contactmomenten', title: 'Contactmomenten', description: 'Configureer de opslag voor contactmomenten', helpLink: 'https://example.com/help/contactmomenten' },
 				{ id: 'medewerkers', title: 'Medewerkers', description: 'Configureer de opslag voor medewerkers', helpLink: 'https://example.com/help/medewerkers' },
-				{ id: 'rollen', title: 'Rollen', description: 'Configureer de opslag voor rollen', helpLink: 'https://example.com/help/rollen' }
+				{ id: 'rollen', title: 'Rollen', description: 'Configureer de opslag voor rollen', helpLink: 'https://example.com/help/rollen' },
 			],
 		}
 	},
diff --git a/src/views/statussen/StatusDetails.vue b/src/views/statussen/StatusDetails.vue
index f4d7293..d71b546 100644
--- a/src/views/statussen/StatusDetails.vue
+++ b/src/views/statussen/StatusDetails.vue
@@ -1,7 +1,3 @@
-<script setup>
-import { navigationStore } from '../../store/store.js'
-</script>
-
 <template>
 	<div class="detailContainer">
 		<div v-if="!loading" id="app-content">
@@ -43,6 +39,7 @@ export default {
 		return {
 			zaak: [],
 			loading: false,
+			statusItem: [],
 		}
 	},
 	watch: {
@@ -54,7 +51,7 @@ export default {
 		},
 	},
 	mounted() {
-		this.fetchData(store.statusItem)
+		this.fetchData(this.statusItem)
 	},
 	methods: {
 		fetchData(statusId) {
diff --git a/src/views/statussen/StatussenList.vue b/src/views/statussen/StatussenList.vue
index 3ef82c1..070d080 100644
--- a/src/views/statussen/StatussenList.vue
+++ b/src/views/statussen/StatussenList.vue
@@ -1,7 +1,3 @@
-<script setup>
-import { navigationStore } from '../../store/store.js'
-</script>
-
 <template>
 	<NcAppContentList>
 		<ul>
@@ -70,10 +66,8 @@ import { navigationStore } from '../../store/store.js'
 </template>
 <script>
 import { NcListItem, NcActionButton, NcAppContentList, NcTextField, NcLoadingIcon } from '@nextcloud/vue'
-// eslint-disable-next-line n/no-missing-import
-import Magnify from 'vue-material-design-icons/Magnify'
-// eslint-disable-next-line n/no-missing-import
-import BriefcaseAccountOutline from 'vue-material-design-icons/BriefcaseAccountOutline'
+import Magnify from 'vue-material-design-icons/Magnify.vue'
+import BriefcaseAccountOutline from 'vue-material-design-icons/BriefcaseAccountOutline.vue'
 
 export default {
 	name: 'StatussenList',
diff --git a/src/views/taken/TakenIndex.vue b/src/views/taken/TakenIndex.vue
index 02e1320..1a8debf 100644
--- a/src/views/taken/TakenIndex.vue
+++ b/src/views/taken/TakenIndex.vue
@@ -35,7 +35,7 @@ import TakenList from './TakenList.vue'
 import TaakDetails from './TaakDetails.vue'
 
 // icons
-import CalendarMonthOutline from 'vue-material-design-icons/CalendarMonthOutline'
+import CalendarMonthOutline from 'vue-material-design-icons/CalendarMonthOutline.vue'
 
 export default {
 	name: 'TakenIndex',
diff --git a/src/views/zaken/ZakenZaken.vue b/src/views/zaken/ZakenZaken.vue
index b6f5d48..0bbfb0d 100644
--- a/src/views/zaken/ZakenZaken.vue
+++ b/src/views/zaken/ZakenZaken.vue
@@ -48,8 +48,8 @@ import { zaakStore } from '../../store/store.js'
 </template>
 <script>
 import { NcListItem, NcActionButton, NcLoadingIcon } from '@nextcloud/vue'
-// eslint-disable-next-line n/no-missing-import
-import BriefcaseAccountOutline from 'vue-material-design-icons/BriefcaseAccountOutline'
+
+import BriefcaseAccountOutline from 'vue-material-design-icons/BriefcaseAccountOutline.vue'
 
 export default {
 	name: 'ZakenZaken',