diff --git a/app/components/CrsSelector.vue b/app/components/CrsSelector.vue
index 2a2f0127..5d35f627 100644
--- a/app/components/CrsSelector.vue
+++ b/app/components/CrsSelector.vue
@@ -26,6 +26,7 @@
 <script setup>
   import schemas from "@geode/opengeodeweb-back/opengeodeweb_back_schemas.json"
   const schema = schemas.opengeodeweb_back.geographic_coordinate_systems
+  import { useGeodeStore } from "@ogw_front/stores/geode"
 
   const emit = defineEmits([
     "update_values",
diff --git a/app/components/ExtensionSelector.vue b/app/components/ExtensionSelector.vue
index 82409c4b..e324e9af 100644
--- a/app/components/ExtensionSelector.vue
+++ b/app/components/ExtensionSelector.vue
@@ -57,7 +57,8 @@
 <script setup>
   import schemas from "@geode/opengeodeweb-back/opengeodeweb_back_schemas.json"
 
-  import FetchingData from "@ogw_front/components/FetchingData.vue"
+  import FetchingData from "@ogw_front/components/FetchingData"
+  import { useGeodeStore } from "@ogw_front/stores/geode"
 
   const schema = schemas.opengeodeweb_back.geode_objects_and_output_extensions
   const emit = defineEmits([
diff --git a/app/components/FeedBack/ErrorBanner.vue b/app/components/FeedBack/ErrorBanner.vue
index 656e88e6..a1c1f3ec 100644
--- a/app/components/FeedBack/ErrorBanner.vue
+++ b/app/components/FeedBack/ErrorBanner.vue
@@ -1,6 +1,6 @@
 <template>
   <v-banner
-    v-if="feedback_store.server_error"
+    v-if="feedbackStore.server_error"
     elevation="2"
     style="background-color: grey; z-index: 9999"
     position="fixed"
@@ -33,7 +33,7 @@
           size="20"
           color="grey"
           class=".align-center"
-          @click="feedback_store.delete_server_error()"
+          @click="feedbackStore.delete_server_error()"
         >
           <v-icon icon="mdi-close" size="20" color="white" />
         </v-btn>
@@ -43,7 +43,8 @@
 </template>
 
 <script setup>
-  const feedback_store = useFeedbackStore()
+  import { useFeedbackStore } from "@ogw_front/stores/feedback"
+  const feedbackStore = useFeedbackStore()
 
   function reload() {
     window.location.reload()
diff --git a/app/components/FeedBack/Snackers.vue b/app/components/FeedBack/Snackers.vue
index ece402e1..b296e74d 100644
--- a/app/components/FeedBack/Snackers.vue
+++ b/app/components/FeedBack/Snackers.vue
@@ -1,6 +1,6 @@
 <template>
   <v-snackbar
-    v-for="(feedback, index) in feedback_store.feedbacks"
+    v-for="(feedback, index) in feedbackStore.feedbacks"
     :key="feedback"
     v-model="show"
     :style="{ 'margin-bottom': calc_margin(index) }"
@@ -51,7 +51,7 @@
           variant="flat"
           size="20"
           :color="feedback.type"
-          @click="feedback_store.delete_feedback(feedback.id)"
+          @click="feedbackStore.delete_feedback(feedback.id)"
         >
           <v-icon icon="mdi-close" size="20" color="white" />
         </v-btn>
@@ -61,7 +61,9 @@
 </template>
 
 <script setup>
-  const feedback_store = useFeedbackStore()
+  import { useFeedbackStore } from "@ogw_front/stores/feedback"
+
+  const feedbackStore = useFeedbackStore()
   const show = true
 
   function calc_margin(index) {
diff --git a/app/components/FileSelector.vue b/app/components/FileSelector.vue
index 201b0157..081eeaeb 100644
--- a/app/components/FileSelector.vue
+++ b/app/components/FileSelector.vue
@@ -10,8 +10,9 @@
 <script setup>
   import schemas from "@geode/opengeodeweb-back/opengeodeweb_back_schemas.json"
 
-  import FetchingData from "@ogw_front/components/FetchingData.vue"
-  import FileUploader from "@ogw_front/components/FileUploader.vue"
+  import FetchingData from "@ogw_front/components/FetchingData"
+  import FileUploader from "@ogw_front/components/FileUploader"
+  import { useGeodeStore } from "@ogw_front/stores/geode"
 
   const schema = schemas.opengeodeweb_back.allowed_files
   const emit = defineEmits([
diff --git a/app/components/FileUploader.vue b/app/components/FileUploader.vue
index 1a9b8794..c51425bc 100644
--- a/app/components/FileUploader.vue
+++ b/app/components/FileUploader.vue
@@ -34,7 +34,7 @@
 
 <script setup>
   import schemas from "@geode/opengeodeweb-back/opengeodeweb_back_schemas.json"
-  import { upload_file } from "@ogw_front/utils/upload_file.js"
+  import { upload_file } from "@ogw_front/utils/upload_file"
   const schema = schemas.opengeodeweb_back.upload_file
 
   const emit = defineEmits(["files_uploaded", "decrement_step"])
diff --git a/app/components/HybridRenderingView.vue b/app/components/HybridRenderingView.vue
index 00e2fea6..52e4721b 100644
--- a/app/components/HybridRenderingView.vue
+++ b/app/components/HybridRenderingView.vue
@@ -15,7 +15,10 @@
 </template>
 
 <script setup>
-  import VeaseViewToolbar from "@ogw_front/components/VeaseViewToolbar.vue"
+  import VeaseViewToolbar from "@ogw_front/components/VeaseViewToolbar"
+
+  import { useHybridViewerStore } from "@ogw_front/stores/hybrid_viewer"
+  import { useViewerStore } from "@ogw_front/stores/viewer"
 
   const emit = defineEmits(["click"])
 
diff --git a/app/components/InfraConnected.vue b/app/components/InfraConnected.vue
index 11e7fd7c..83996316 100644
--- a/app/components/InfraConnected.vue
+++ b/app/components/InfraConnected.vue
@@ -3,5 +3,7 @@
 </template>
 
 <script setup>
+  import { useInfraStore } from "@ogw_front/stores/infra"
   const infraStore = useInfraStore()
+  console.log("TEST", { infraStore })
 </script>
diff --git a/app/components/Inspector/InspectionButton.vue b/app/components/Inspector/InspectionButton.vue
index efd19e83..00a20435 100644
--- a/app/components/Inspector/InspectionButton.vue
+++ b/app/components/Inspector/InspectionButton.vue
@@ -16,6 +16,7 @@
 
 <script setup>
   import schemas from "@geode/opengeodeweb-back/opengeodeweb_back_schemas.json"
+  import { useGeodeStore } from "@ogw_front/stores/geode"
   const schema = schemas.opengeodeweb_back.inspect_file
 
   const emit = defineEmits([
diff --git a/app/components/Inspector/ResultPanel.vue b/app/components/Inspector/ResultPanel.vue
index 874353fc..fe4dd4a9 100644
--- a/app/components/Inspector/ResultPanel.vue
+++ b/app/components/Inspector/ResultPanel.vue
@@ -42,7 +42,7 @@
 </template>
 
 <script setup>
-  import InspectorResultPanel from "@ogw_front/components/Inspector/ResultPanel.vue"
+  import InspectorResultPanel from "@ogw_front/components/Inspector/ResultPanel"
 
   const props = defineProps({
     inspection_result: { type: Array, required: true },
diff --git a/app/components/Launcher.vue b/app/components/Launcher.vue
index e5efb661..f6f77858 100644
--- a/app/components/Launcher.vue
+++ b/app/components/Launcher.vue
@@ -2,7 +2,7 @@
   <v-container class="justify">
     <v-row align-content="center" align="center">
       <v-col
-        v-if="!infra_store.is_captcha_validated"
+        v-if="!infraStore.is_captcha_validated"
         class="align"
         cols="12"
         align-self="center"
@@ -10,7 +10,7 @@
       >
         <Recaptcha :color="'secondary'" />
       </v-col>
-      <v-col v-else-if="infra_store.status == Status.CREATING">
+      <v-col v-else-if="infraStore.status == Status.CREATING">
         <Loading />
       </v-col>
     </v-row>
@@ -18,17 +18,18 @@
 </template>
 
 <script setup>
-  import Status from "@ogw_front/utils/status.js"
-  import Loading from "@ogw_front/components/Loading.vue"
-  import Recaptcha from "@ogw_front/components/Recaptcha.vue"
+  import Status from "@ogw_front/utils/status"
+  import Loading from "@ogw_front/components/Loading"
+  import Recaptcha from "@ogw_front/components/Recaptcha"
+  import { useInfraStore } from "@ogw_front/stores/infra"
 
-  const infra_store = useInfraStore()
+  const infraStore = useInfraStore()
 
   watch(
-    () => infra_store.is_captcha_validated,
+    () => infraStore.is_captcha_validated,
     (value, oldValue) => {
       if (value && !oldValue && import.meta.client) {
-        infra_store.create_backend()
+        infraStore.create_backend()
       }
     },
   )
diff --git a/app/components/Loading.vue b/app/components/Loading.vue
index 024ab659..fb8f093f 100644
--- a/app/components/Loading.vue
+++ b/app/components/Loading.vue
@@ -37,7 +37,7 @@
   import derniere from "@ogw_front/assets/img/energy_sobriety/derniere.png"
   import salon from "@ogw_front/assets/img/energy_sobriety/salon.png"
 
-  import Carousel from "@ogw_front/components/Carousel.vue"
+  import Carousel from "@ogw_front/components/Carousel"
 
   const users_list = [
     {
diff --git a/app/components/MissingFilesSelector.vue b/app/components/MissingFilesSelector.vue
index 55739255..de3a3cad 100644
--- a/app/components/MissingFilesSelector.vue
+++ b/app/components/MissingFilesSelector.vue
@@ -45,8 +45,9 @@
 <script setup>
   import schemas from "@geode/opengeodeweb-back/opengeodeweb_back_schemas.json"
 
-  import FetchingData from "@ogw_front/components/FetchingData.vue"
-  import FileUploader from "@ogw_front/components/FileUploader.vue"
+  import FetchingData from "@ogw_front/components/FetchingData"
+  import FileUploader from "@ogw_front/components/FileUploader"
+  import { useGeodeStore } from "@ogw_front/stores/geode"
 
   const schema = schemas.opengeodeweb_back.missing_files
 
diff --git a/app/components/ObjectSelector.vue b/app/components/ObjectSelector.vue
index 5b369b30..e419ae43 100644
--- a/app/components/ObjectSelector.vue
+++ b/app/components/ObjectSelector.vue
@@ -49,20 +49,22 @@
 </template>
 
 <script setup>
-  import geode_objects from "@ogw_front/assets/geode_objects"
   import schemas from "@geode/opengeodeweb-back/opengeodeweb_back_schemas.json"
 
+  import geode_objects from "@ogw_front/assets/geode_objects"
   import FetchingData from "@ogw_front/components/FetchingData.vue"
+  import { useGeodeStore } from "@ogw_front/stores/geode"
 
   const schema = schemas.opengeodeweb_back.allowed_objects
 
   const emit = defineEmits(["update_values", "increment_step"])
-
+  console.log("ObjectSelector")
   const props = defineProps({
     filenames: { type: Array, required: true },
-    supported_feature: { type: String, required: false, default: null },
   })
-  const { filenames, supported_feature } = props
+
+  const geodeStore = useGeodeStore()
+  const { filenames } = props
 
   const loading = ref(false)
   const allowed_objects = ref({})
@@ -108,7 +110,7 @@
   async function get_allowed_objects() {
     toggle_loading()
     allowed_objects.value = {}
-    const geodeStore = useGeodeStore()
+
     const promise_array = filenames.map((filename) => {
       return geodeStore.request(schema, { filename })
     })
@@ -142,6 +144,7 @@
   }
 
   function set_geode_object(geode_object_type) {
+    console.log("set_geode_object", { geode_object_type })
     if (geode_object_type) {
       emit("update_values", { geode_object_type })
       emit("increment_step")
diff --git a/app/components/PackagesVersions.vue b/app/components/PackagesVersions.vue
index 64b5680c..6d2b1440 100644
--- a/app/components/PackagesVersions.vue
+++ b/app/components/PackagesVersions.vue
@@ -19,7 +19,8 @@
 </template>
 
 <script setup>
-  import Status from "@ogw_front/utils/status.js"
+  import Status from "@ogw_front/utils/status"
+  import { useGeodeStore } from "@ogw_front/stores/geode"
 
   const props = defineProps({
     schema: { type: Object, required: true },
diff --git a/app/components/Recaptcha.vue b/app/components/Recaptcha.vue
index 53ebefbf..502d6917 100644
--- a/app/components/Recaptcha.vue
+++ b/app/components/Recaptcha.vue
@@ -39,7 +39,8 @@
 </template>
 
 <script setup>
-  import { appMode } from "@ogw_front/utils/app_mode.js"
+  import { appMode } from "@ogw_front/utils/app_mode"
+  import { useInfraStore } from "@ogw_front/stores/infra"
 
   const props = defineProps({
     button_label: {
@@ -53,7 +54,7 @@
       default: "white",
     },
   })
-  const infra_store = useInfraStore()
+  const infraStore = useInfraStore()
   const name = ref("")
   const email = ref("")
   const launch = ref(false)
@@ -76,9 +77,9 @@
     if (import.meta.client) {
       if (
         process.env.NODE_ENV !== "production" ||
-        infra_store.app_mode !== appMode.CLOUD
+        infraStore.app_mode !== appMode.CLOUD
       ) {
-        infra_store.$patch({ is_captcha_validated: true })
+        infraStore.$patch({ is_captcha_validated: true })
       }
     }
   })
@@ -91,7 +92,7 @@
         launch: launch.value,
       },
     })
-    infra_store.$patch({
+    infraStore.$patch({
       is_captcha_validated: response.status === 200,
     })
   }
diff --git a/app/components/RemoteRenderingView.vue b/app/components/RemoteRenderingView.vue
index d0bea5a7..48e8cba4 100644
--- a/app/components/RemoteRenderingView.vue
+++ b/app/components/RemoteRenderingView.vue
@@ -24,9 +24,9 @@
   import vtkRemoteView from "@kitware/vtk.js/Rendering/Misc/RemoteView"
   import { useElementSize, useWindowSize } from "@vueuse/core"
   import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schemas.json"
-  import Status from "@ogw_front/utils/status.js"
-
-  import ViewToolbar from "@ogw_front/components/ViewToolbar.vue"
+  import Status from "@ogw_front/utils/status"
+  import ViewToolbar from "@ogw_front/components/ViewToolbar"
+  import { useViewerStore } from "@ogw_front/stores/viewer"
 
   const props = defineProps({
     viewId: { type: String, default: "-1" },
diff --git a/app/components/Screenshot.vue b/app/components/Screenshot.vue
index 524008c1..9fffc35c 100644
--- a/app/components/Screenshot.vue
+++ b/app/components/Screenshot.vue
@@ -64,6 +64,8 @@
   import fileDownload from "js-file-download"
   import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schemas.json"
 
+  import { useViewerStore } from "@ogw_front/stores/viewer"
+
   const emit = defineEmits(["close"])
 
   const props = defineProps({
diff --git a/app/components/Stepper.vue b/app/components/Stepper.vue
index 8fa8e033..0a0399d6 100644
--- a/app/components/Stepper.vue
+++ b/app/components/Stepper.vue
@@ -19,7 +19,7 @@
 </template>
 
 <script setup>
-  import Step from "@ogw_front/components/Step.vue"
+  import Step from "@ogw_front/components/Step"
 
   const emit = defineEmits(["reset_values"])
   const stepper_tree = inject("stepper_tree")
diff --git a/app/components/VeaseViewToolbar.vue b/app/components/VeaseViewToolbar.vue
index 460ba7eb..0f1d4671 100644
--- a/app/components/VeaseViewToolbar.vue
+++ b/app/components/VeaseViewToolbar.vue
@@ -29,10 +29,14 @@
 <script setup>
   import schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schemas.json"
 
-  import Screenshot from "@ogw_front/components/Screenshot.vue"
-  import ZScaling from "@ogw_front/components/ZScaling.vue"
+  import Screenshot from "@ogw_front/components/Screenshot"
+  import ZScaling from "@ogw_front/components/ZScaling"
+
+  import { useViewerStore } from "@ogw_front/stores/viewer"
+  import { useHybridViewerStore } from "@ogw_front/stores/hybrid_viewer"
 
   const hybridViewerStore = useHybridViewerStore()
+  const viewerStore = useViewerStore()
   const take_screenshot = ref(false)
   const showZScaling = ref(false)
   const grid_scale = ref(false)
@@ -74,7 +78,6 @@
       tooltip: "Toggle grid scale",
       icon: "mdi-ruler-square",
       action: () => {
-        const viewerStore = useViewerStore()
         viewerStore.request(
           schemas.opengeodeweb_viewer.viewer.grid_scale,
           { visibility: !grid_scale.value },
diff --git a/app/components/ViewToolbar.vue b/app/components/ViewToolbar.vue
index dd98f202..442e037b 100644
--- a/app/components/ViewToolbar.vue
+++ b/app/components/ViewToolbar.vue
@@ -23,8 +23,10 @@
 <script setup>
   import schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schemas.json"
 
-  import Screenshot from "@ogw_front/components/Screenshot.vue"
+  import Screenshot from "@ogw_front/components/Screenshot"
+  import { useViewerStore } from "@ogw_front/stores/viewer"
 
+  const viewerStore = useViewerStore()
   const take_screenshot = ref(false)
   const grid_scale = ref(false)
 
@@ -33,7 +35,6 @@
       tooltip: "Reset camera",
       icon: "mdi-cube-scan",
       action: () => {
-        const viewerStore = useViewerStore()
         viewerStore.request(schemas.opengeodeweb_viewer.viewer.reset_camera)
       },
     },
diff --git a/app/components/Viewer/BreadCrumb.vue b/app/components/Viewer/BreadCrumb.vue
index 66b3d3f7..e19a4d3b 100644
--- a/app/components/Viewer/BreadCrumb.vue
+++ b/app/components/Viewer/BreadCrumb.vue
@@ -37,6 +37,7 @@
 </template>
 
 <script setup>
+  import { useTreeviewStore } from "@ogw_front/stores/treeview"
   const treeviewStore = useTreeviewStore()
 
   const selectedTree = computed(() => treeviewStore.selectedTree)
diff --git a/app/components/Viewer/ContextMenu.vue b/app/components/Viewer/ContextMenu.vue
index c76cdf25..e7ff9078 100644
--- a/app/components/Viewer/ContextMenu.vue
+++ b/app/components/Viewer/ContextMenu.vue
@@ -30,6 +30,8 @@
 </template>
 
 <script setup>
+  import { useMenuStore } from "@ogw_front/stores/menu"
+  import { useDataBaseStore } from "@ogw_front/stores/data_base"
   const menuStore = useMenuStore()
   const dataBaseStore = useDataBaseStore()
 
diff --git a/app/components/Viewer/EdgedCurve/EdgesOptions.vue b/app/components/Viewer/EdgedCurve/EdgesOptions.vue
index abbe8a56..6c98546a 100644
--- a/app/components/Viewer/EdgedCurve/EdgesOptions.vue
+++ b/app/components/Viewer/EdgedCurve/EdgesOptions.vue
@@ -6,7 +6,7 @@
 </template>
 
 <script setup>
-  import ViewerGenericMeshEdgesOptions from "@ogw_front/components/Viewer/Generic/Mesh/EdgesOptions.vue"
+  import ViewerGenericMeshEdgesOptions from "@ogw_front/components/Viewer/Generic/Mesh/EdgesOptions"
   import EdgedCurveEdges from "@ogw_front/assets/viewer_svgs/edged_curve_edges.svg"
 
   const props = defineProps({
diff --git a/app/components/Viewer/EdgedCurve/PointsOptions.vue b/app/components/Viewer/EdgedCurve/PointsOptions.vue
index f9566e63..836229de 100644
--- a/app/components/Viewer/EdgedCurve/PointsOptions.vue
+++ b/app/components/Viewer/EdgedCurve/PointsOptions.vue
@@ -6,7 +6,7 @@
 </template>
 
 <script setup>
-  import ViewerGenericMeshPointsOptions from "@ogw_front/components/Viewer/Generic/Mesh/PointsOptions.vue"
+  import ViewerGenericMeshPointsOptions from "@ogw_front/components/Viewer/Generic/Mesh/PointsOptions"
   import EdgedCurvePoints from "@ogw_front/assets/viewer_svgs/edged_curve_points.svg"
 
   const props = defineProps({
diff --git a/app/components/Viewer/Generic/Mesh/CellsOptions.vue b/app/components/Viewer/Generic/Mesh/CellsOptions.vue
index e209919b..7eb4ef3a 100644
--- a/app/components/Viewer/Generic/Mesh/CellsOptions.vue
+++ b/app/components/Viewer/Generic/Mesh/CellsOptions.vue
@@ -21,9 +21,12 @@
 </template>
 
 <script setup>
-  import ViewerContextMenuItem from "@ogw_front/components/Viewer/ContextMenuItem.vue"
-  import ViewerOptionsVisibilitySwitch from "@ogw_front/components/Viewer/Options/VisibilitySwitch.vue"
-  import ViewerOptionsColoringTypeSelector from "@ogw_front/components/Viewer/Options/ColoringTypeSelector.vue"
+  import ViewerContextMenuItem from "@ogw_front/components/Viewer/ContextMenuItem"
+  import ViewerOptionsVisibilitySwitch from "@ogw_front/components/Viewer/Options/VisibilitySwitch"
+  import ViewerOptionsColoringTypeSelector from "@ogw_front/components/Viewer/Options/ColoringTypeSelector"
+
+  import { useDataStyleStore } from "@ogw_front/stores/data_style"
+  import { useHybridViewerStore } from "@ogw_front/stores/hybrid_viewer"
 
   const dataStyleStore = useDataStyleStore()
   const hybridViewerStore = useHybridViewerStore()
diff --git a/app/components/Viewer/Generic/Mesh/EdgesOptions.vue b/app/components/Viewer/Generic/Mesh/EdgesOptions.vue
index 6be8f384..a5e4b493 100644
--- a/app/components/Viewer/Generic/Mesh/EdgesOptions.vue
+++ b/app/components/Viewer/Generic/Mesh/EdgesOptions.vue
@@ -18,9 +18,15 @@
 </template>
 
 <script setup>
-  import ViewerContextMenuItem from "@ogw_front/components/Viewer/ContextMenuItem.vue"
-  import ViewerOptionsVisibilitySwitch from "@ogw_front/components/Viewer/Options/VisibilitySwitch.vue"
-  import ViewerOptionsColoringTypeSelector from "@ogw_front/components/Viewer/Options/ColoringTypeSelector.vue"
+  import ViewerContextMenuItem from "@ogw_front/components/Viewer/ContextMenuItem"
+  import ViewerOptionsVisibilitySwitch from "@ogw_front/components/Viewer/Options/VisibilitySwitch"
+  import ViewerOptionsColoringTypeSelector from "@ogw_front/components/Viewer/Options/ColoringTypeSelector"
+
+  import { useDataStyleStore } from "@ogw_front/stores/data_style"
+  import { useHybridViewerStore } from "@ogw_front/stores/hybrid_viewer"
+
+  const dataStyleStore = useDataStyleStore()
+  const hybridViewerStore = useHybridViewerStore()
 
   const props = defineProps({
     itemProps: { type: Object, required: true },
@@ -29,9 +35,6 @@
 
   const id = toRef(() => props.itemProps.id)
 
-  const dataStyleStore = useDataStyleStore()
-  const hybridViewerStore = useHybridViewerStore()
-
   const visibility = computed({
     get: () => dataStyleStore.meshEdgesVisibility(id.value),
     set: (newValue) => {
diff --git a/app/components/Viewer/Generic/Mesh/PointsOptions.vue b/app/components/Viewer/Generic/Mesh/PointsOptions.vue
index 43548372..de8fe81a 100644
--- a/app/components/Viewer/Generic/Mesh/PointsOptions.vue
+++ b/app/components/Viewer/Generic/Mesh/PointsOptions.vue
@@ -39,9 +39,12 @@
 </template>
 
 <script setup>
-  import ViewerContextMenuItem from "@ogw_front/components/Viewer/ContextMenuItem.vue"
-  import ViewerOptionsVisibilitySwitch from "@ogw_front/components/Viewer/Options/VisibilitySwitch.vue"
-  import ViewerOptionsColoringTypeSelector from "@ogw_front/components/Viewer/Options/ColoringTypeSelector.vue"
+  import ViewerContextMenuItem from "@ogw_front/components/Viewer/ContextMenuItem"
+  import ViewerOptionsVisibilitySwitch from "@ogw_front/components/Viewer/Options/VisibilitySwitch"
+  import ViewerOptionsColoringTypeSelector from "@ogw_front/components/Viewer/Options/ColoringTypeSelector"
+
+  import { useDataStyleStore } from "@ogw_front/stores/data_style"
+  import { useHybridViewerStore } from "@ogw_front/stores/hybrid_viewer"
 
   const dataStyleStore = useDataStyleStore()
   const hybridViewerStore = useHybridViewerStore()
diff --git a/app/components/Viewer/Generic/Mesh/PolygonsOptions.vue b/app/components/Viewer/Generic/Mesh/PolygonsOptions.vue
index de9128b8..77af5499 100644
--- a/app/components/Viewer/Generic/Mesh/PolygonsOptions.vue
+++ b/app/components/Viewer/Generic/Mesh/PolygonsOptions.vue
@@ -21,9 +21,12 @@
 </template>
 
 <script setup>
-  import ViewerContextMenuItem from "@ogw_front/components/Viewer/ContextMenuItem.vue"
-  import ViewerOptionsVisibilitySwitch from "@ogw_front/components/Viewer/Options/VisibilitySwitch.vue"
-  import ViewerOptionsColoringTypeSelector from "@ogw_front/components/Viewer/Options/ColoringTypeSelector.vue"
+  import ViewerContextMenuItem from "@ogw_front/components/Viewer/ContextMenuItem"
+  import ViewerOptionsVisibilitySwitch from "@ogw_front/components/Viewer/Options/VisibilitySwitch"
+  import ViewerOptionsColoringTypeSelector from "@ogw_front/components/Viewer/Options/ColoringTypeSelector"
+
+  import { useDataStyleStore } from "@ogw_front/stores/data_style"
+  import { useHybridViewerStore } from "@ogw_front/stores/hybrid_viewer"
 
   const dataStyleStore = useDataStyleStore()
   const hybridViewerStore = useHybridViewerStore()
diff --git a/app/components/Viewer/Generic/Mesh/PolyhedraOptions.vue b/app/components/Viewer/Generic/Mesh/PolyhedraOptions.vue
index 2e8f4fe6..13e0816a 100644
--- a/app/components/Viewer/Generic/Mesh/PolyhedraOptions.vue
+++ b/app/components/Viewer/Generic/Mesh/PolyhedraOptions.vue
@@ -21,9 +21,12 @@
 </template>
 
 <script setup>
-  import ViewerContextMenuItem from "@ogw_front/components/Viewer/ContextMenuItem.vue"
-  import ViewerOptionsVisibilitySwitch from "@ogw_front/components/Viewer/Options/VisibilitySwitch.vue"
-  import ViewerOptionsColoringTypeSelector from "@ogw_front/components/Viewer/Options/ColoringTypeSelector.vue"
+  import ViewerContextMenuItem from "@ogw_front/components/Viewer/ContextMenuItem"
+  import ViewerOptionsVisibilitySwitch from "@ogw_front/components/Viewer/Options/VisibilitySwitch"
+  import ViewerOptionsColoringTypeSelector from "@ogw_front/components/Viewer/Options/ColoringTypeSelector"
+
+  import { useDataStyleStore } from "@ogw_front/stores/data_style"
+  import { useHybridViewerStore } from "@ogw_front/stores/hybrid_viewer"
 
   const dataStyleStore = useDataStyleStore()
   const hybridViewerStore = useHybridViewerStore()
diff --git a/app/components/Viewer/Generic/Model/EdgesOptions.vue b/app/components/Viewer/Generic/Model/EdgesOptions.vue
index 575e5857..f18ff7ee 100644
--- a/app/components/Viewer/Generic/Model/EdgesOptions.vue
+++ b/app/components/Viewer/Generic/Model/EdgesOptions.vue
@@ -11,18 +11,22 @@
 </template>
 
 <script setup>
-  import ViewerContextMenuItem from "@ogw_front/components/Viewer/ContextMenuItem.vue"
-  import ViewerOptionsVisibilitySwitch from "@ogw_front/components/Viewer/Options/VisibilitySwitch.vue"
+  import ViewerContextMenuItem from "@ogw_front/components/Viewer/ContextMenuItem"
+  import ViewerOptionsVisibilitySwitch from "@ogw_front/components/Viewer/Options/VisibilitySwitch"
   import SurfaceEdges from "@ogw_front/assets/viewer_svgs/surface_edges.svg"
 
+  import { useDataStyleStore } from "@ogw_front/stores/data_style"
+  import { useHybridViewerStore } from "@ogw_front/stores/hybrid_viewer"
+
+  const dataStyleStore = useDataStyleStore()
+  const hybridViewerStore = useHybridViewerStore()
+
   const props = defineProps({
     itemProps: { type: Object, required: true },
     btn_image: { type: String, required: true },
   })
 
   const id = toRef(() => props.itemProps.id)
-  const dataStyleStore = useDataStyleStore()
-  const hybridViewerStore = useHybridViewerStore()
 
   const visibility = computed({
     get: () => dataStyleStore.modelEdgesVisibility(id.value),
diff --git a/app/components/Viewer/Generic/Model/PointsOptions.vue b/app/components/Viewer/Generic/Model/PointsOptions.vue
index 2d0370ae..740579d3 100644
--- a/app/components/Viewer/Generic/Model/PointsOptions.vue
+++ b/app/components/Viewer/Generic/Model/PointsOptions.vue
@@ -30,10 +30,13 @@
 </template>
 
 <script setup>
-  import ViewerContextMenuItem from "@ogw_front/components/Viewer/ContextMenuItem.vue"
-  import ViewerOptionsVisibilitySwitch from "@ogw_front/components/Viewer/Options/VisibilitySwitch.vue"
+  import ViewerContextMenuItem from "@ogw_front/components/Viewer/ContextMenuItem"
+  import ViewerOptionsVisibilitySwitch from "@ogw_front/components/Viewer/Options/VisibilitySwitch"
   import SurfacePoints from "@ogw_front/assets/viewer_svgs/surface_points.svg"
 
+  import { useDataStyleStore } from "@ogw_front/stores/data_style"
+  import { useHybridViewerStore } from "@ogw_front/stores/hybrid_viewer"
+
   const dataStyleStore = useDataStyleStore()
   const hybridViewerStore = useHybridViewerStore()
 
diff --git a/app/components/Viewer/Grid/2D/CellsOptions.vue b/app/components/Viewer/Grid/2D/CellsOptions.vue
index 2c2ed0c0..7661ba8b 100644
--- a/app/components/Viewer/Grid/2D/CellsOptions.vue
+++ b/app/components/Viewer/Grid/2D/CellsOptions.vue
@@ -7,7 +7,7 @@
 </template>
 
 <script setup>
-  import ViewerGenericMeshCellsOptions from "@ogw_front/components/Viewer/Generic/Mesh/CellsOptions.vue"
+  import ViewerGenericMeshCellsOptions from "@ogw_front/components/Viewer/Generic/Mesh/CellsOptions"
   import Grid2D_Cells from "@ogw_front/assets/viewer_svgs/grid_2d_cells.svg"
 
   const props = defineProps({
diff --git a/app/components/Viewer/Grid/2D/EdgesOptions.vue b/app/components/Viewer/Grid/2D/EdgesOptions.vue
index 9e2a61f8..5d405dd7 100644
--- a/app/components/Viewer/Grid/2D/EdgesOptions.vue
+++ b/app/components/Viewer/Grid/2D/EdgesOptions.vue
@@ -6,7 +6,7 @@
 </template>
 
 <script setup>
-  import ViewerGenericMeshEdgesOptions from "@ogw_front/components/Viewer/Generic/Mesh/EdgesOptions.vue"
+  import ViewerGenericMeshEdgesOptions from "@ogw_front/components/Viewer/Generic/Mesh/EdgesOptions"
   import Grid2D_Edges from "@ogw_front/assets/viewer_svgs/grid_2d_edges.svg"
 
   const props = defineProps({
diff --git a/app/components/Viewer/Grid/2D/PointsOptions.vue b/app/components/Viewer/Grid/2D/PointsOptions.vue
index 187bf1d8..4fcf8e74 100644
--- a/app/components/Viewer/Grid/2D/PointsOptions.vue
+++ b/app/components/Viewer/Grid/2D/PointsOptions.vue
@@ -6,7 +6,7 @@
 </template>
 
 <script setup>
-  import ViewerGenericMeshPointsOptions from "@ogw_front/components/Viewer/Generic/Mesh/PointsOptions.vue"
+  import ViewerGenericMeshPointsOptions from "@ogw_front/components/Viewer/Generic/Mesh/PointsOptions"
   import Grid2D_Points from "@ogw_front/assets/viewer_svgs/grid_2d_points.svg"
 
   const props = defineProps({
diff --git a/app/components/Viewer/Grid/3D/CellsOptions.vue b/app/components/Viewer/Grid/3D/CellsOptions.vue
index bf666334..41316d41 100644
--- a/app/components/Viewer/Grid/3D/CellsOptions.vue
+++ b/app/components/Viewer/Grid/3D/CellsOptions.vue
@@ -7,7 +7,7 @@
 </template>
 
 <script setup>
-  import ViewerGenericMeshCellsOptions from "@ogw_front/components/Viewer/Generic/Mesh/CellsOptions.vue"
+  import ViewerGenericMeshCellsOptions from "@ogw_front/components/Viewer/Generic/Mesh/CellsOptions"
   import Grid3DCells from "@ogw_front/assets/viewer_svgs/grid_3d_cells.svg"
 
   const props = defineProps({
diff --git a/app/components/Viewer/Grid/3D/EdgesOptions.vue b/app/components/Viewer/Grid/3D/EdgesOptions.vue
index 843d4d1c..ac173995 100644
--- a/app/components/Viewer/Grid/3D/EdgesOptions.vue
+++ b/app/components/Viewer/Grid/3D/EdgesOptions.vue
@@ -6,7 +6,7 @@
 </template>
 
 <script setup>
-  import ViewerGenericMeshEdgesOptions from "@ogw_front/components/Viewer/Generic/Mesh/EdgesOptions.vue"
+  import ViewerGenericMeshEdgesOptions from "@ogw_front/components/Viewer/Generic/Mesh/EdgesOptions"
   import Grid3D_Edges from "@ogw_front/assets/viewer_svgs/grid_3d_edges.svg"
 
   const props = defineProps({
diff --git a/app/components/Viewer/Grid/3D/FacetsOptions.vue b/app/components/Viewer/Grid/3D/FacetsOptions.vue
index c7d5bf35..935ac916 100644
--- a/app/components/Viewer/Grid/3D/FacetsOptions.vue
+++ b/app/components/Viewer/Grid/3D/FacetsOptions.vue
@@ -7,7 +7,7 @@
 </template>
 
 <script setup>
-  import ViewerGenericMeshPolygonsOptions from "@ogw_front/components/Viewer/Generic/Mesh/PolygonsOptions.vue"
+  import ViewerGenericMeshPolygonsOptions from "@ogw_front/components/Viewer/Generic/Mesh/PolygonsOptions"
   import Grid3D_Facets from "@ogw_front/assets/viewer_svgs/grid_3d_facets.svg"
 
   const props = defineProps({
diff --git a/app/components/Viewer/Grid/3D/PointsOptions.vue b/app/components/Viewer/Grid/3D/PointsOptions.vue
index 85172cd1..6139fa26 100644
--- a/app/components/Viewer/Grid/3D/PointsOptions.vue
+++ b/app/components/Viewer/Grid/3D/PointsOptions.vue
@@ -6,7 +6,7 @@
 </template>
 
 <script setup>
-  import ViewerGenericMeshPointsOptions from "@ogw_front/components/Viewer/Generic/Mesh/PointsOptions.vue"
+  import ViewerGenericMeshPointsOptions from "@ogw_front/components/Viewer/Generic/Mesh/PointsOptions"
   import Grid3D_Points from "@ogw_front/assets/viewer_svgs/grid_3d_points.svg"
 
   const props = defineProps({
diff --git a/app/components/Viewer/HybridSolid/EdgesOptions.vue b/app/components/Viewer/HybridSolid/EdgesOptions.vue
index cbe2e1b1..4d307d98 100644
--- a/app/components/Viewer/HybridSolid/EdgesOptions.vue
+++ b/app/components/Viewer/HybridSolid/EdgesOptions.vue
@@ -6,7 +6,7 @@
 </template>
 
 <script setup>
-  import ViewerGenericMeshEdgesOptions from "@ogw_front/components/Viewer/Generic/Mesh/EdgesOptions.vue"
+  import ViewerGenericMeshEdgesOptions from "@ogw_front/components/Viewer/Generic/Mesh/EdgesOptions"
   import HybridSolidEdges from "@ogw_front/assets/viewer_svgs/solid_edges.svg"
 
   const props = defineProps({
diff --git a/app/components/Viewer/HybridSolid/PointsOptions.vue b/app/components/Viewer/HybridSolid/PointsOptions.vue
index b4e2dc85..8019f1f2 100644
--- a/app/components/Viewer/HybridSolid/PointsOptions.vue
+++ b/app/components/Viewer/HybridSolid/PointsOptions.vue
@@ -6,7 +6,7 @@
 </template>
 
 <script setup>
-  import ViewerGenericMeshPointsOptions from "@ogw_front/components/Viewer/Generic/Mesh/PointsOptions.vue"
+  import ViewerGenericMeshPointsOptions from "@ogw_front/components/Viewer/Generic/Mesh/PointsOptions"
   import HybridSolidPoints from "@ogw_front/assets/viewer_svgs/solid_points.svg"
 
   const props = defineProps({
diff --git a/app/components/Viewer/HybridSolid/PolygonsOptions.vue b/app/components/Viewer/HybridSolid/PolygonsOptions.vue
index 561ed5ff..4164416c 100644
--- a/app/components/Viewer/HybridSolid/PolygonsOptions.vue
+++ b/app/components/Viewer/HybridSolid/PolygonsOptions.vue
@@ -6,7 +6,7 @@
 </template>
 
 <script setup>
-  import ViewerGenericMeshPolygonsOptions from "@ogw_front/components/Viewer/Generic/Mesh/PolygonsOptions.vue"
+  import ViewerGenericMeshPolygonsOptions from "@ogw_front/components/Viewer/Generic/Mesh/PolygonsOptions"
   import HybridSolidPolygons from "@ogw_front/assets/viewer_svgs/solid_facets.svg"
 
   const props = defineProps({
diff --git a/app/components/Viewer/HybridSolid/PolyhedraOptions.vue b/app/components/Viewer/HybridSolid/PolyhedraOptions.vue
index 7d5fc2c9..f1137404 100644
--- a/app/components/Viewer/HybridSolid/PolyhedraOptions.vue
+++ b/app/components/Viewer/HybridSolid/PolyhedraOptions.vue
@@ -6,7 +6,7 @@
 </template>
 
 <script setup>
-  import ViewerGenericMeshPolyhedraOptions from "@ogw_front/components/Viewer/Generic/Mesh/PolyhedraOptions.vue"
+  import ViewerGenericMeshPolyhedraOptions from "@ogw_front/components/Viewer/Generic/Mesh/PolyhedraOptions"
   import HybridSolidPolyhedra from "@ogw_front/assets/viewer_svgs/solid_polyhedra.svg"
 
   const props = defineProps({
diff --git a/app/components/Viewer/Options/CellAttributeSelector.vue b/app/components/Viewer/Options/CellAttributeSelector.vue
index bfcf8f79..19a49234 100644
--- a/app/components/Viewer/Options/CellAttributeSelector.vue
+++ b/app/components/Viewer/Options/CellAttributeSelector.vue
@@ -9,6 +9,7 @@
 
 <script setup>
   import back_schemas from "@geode/opengeodeweb-back/opengeodeweb_back_schemas.json"
+  import { useGeodeStore } from "@ogw_front/stores/geode"
 
   const props = defineProps({
     id: { type: String, required: true },
diff --git a/app/components/Viewer/Options/ColoringTypeSelector.vue b/app/components/Viewer/Options/ColoringTypeSelector.vue
index 50078e47..50d3eb80 100644
--- a/app/components/Viewer/Options/ColoringTypeSelector.vue
+++ b/app/components/Viewer/Options/ColoringTypeSelector.vue
@@ -62,13 +62,13 @@
 </template>
 
 <script setup>
-  import ViewerOptionsColorPicker from "@ogw_front/components/Viewer/Options/ColorPicker.vue"
-  import ViewerOptionsTexturesSelector from "@ogw_front/components/Viewer/Options/TexturesSelector.vue"
-  import ViewerOptionsVertexAttributeSelector from "@ogw_front/components/Viewer/Options/VertexAttributeSelector.vue"
-  // import ViewerOptionsEdgeAttributeSelector from "@ogw_front/components/Viewer/Options/EdgeAttributeSelector.vue"
-  import ViewerOptionsPolygonAttributeSelector from "@ogw_front/components/Viewer/Options/PolygonAttributeSelector.vue"
-  import ViewerOptionsCellAttributeSelector from "@ogw_front/components/Viewer/Options/CellAttributeSelector.vue"
-  import ViewerOptionsPolyhedronAttributeSelector from "@ogw_front/components/Viewer/Options/PolyhedronAttributeSelector.vue"
+  import ViewerOptionsColorPicker from "@ogw_front/components/Viewer/Options/ColorPicker"
+  import ViewerOptionsTexturesSelector from "@ogw_front/components/Viewer/Options/TexturesSelector"
+  import ViewerOptionsVertexAttributeSelector from "@ogw_front/components/Viewer/Options/VertexAttributeSelector"
+  // import ViewerOptionsEdgeAttributeSelector from "@ogw_front/components/Viewer/Options/EdgeAttributeSelector"
+  import ViewerOptionsPolygonAttributeSelector from "@ogw_front/components/Viewer/Options/PolygonAttributeSelector"
+  import ViewerOptionsCellAttributeSelector from "@ogw_front/components/Viewer/Options/CellAttributeSelector"
+  import ViewerOptionsPolyhedronAttributeSelector from "@ogw_front/components/Viewer/Options/PolyhedronAttributeSelector"
 
   const coloring_style_key = defineModel("coloring_style_key")
 
diff --git a/app/components/Viewer/Options/PolygonAttributeSelector.vue b/app/components/Viewer/Options/PolygonAttributeSelector.vue
index f922e389..efd930c8 100644
--- a/app/components/Viewer/Options/PolygonAttributeSelector.vue
+++ b/app/components/Viewer/Options/PolygonAttributeSelector.vue
@@ -9,6 +9,7 @@
 
 <script setup>
   import back_schemas from "@geode/opengeodeweb-back/opengeodeweb_back_schemas.json"
+  import { useGeodeStore } from "@ogw_front/stores/geode"
 
   const props = defineProps({
     id: { type: String, required: true },
diff --git a/app/components/Viewer/Options/PolyhedronAttributeSelector.vue b/app/components/Viewer/Options/PolyhedronAttributeSelector.vue
index 26f6be16..6bf2cd27 100644
--- a/app/components/Viewer/Options/PolyhedronAttributeSelector.vue
+++ b/app/components/Viewer/Options/PolyhedronAttributeSelector.vue
@@ -9,6 +9,7 @@
 
 <script setup>
   import back_schemas from "@geode/opengeodeweb-back/opengeodeweb_back_schemas.json"
+  import { useGeodeStore } from "@ogw_front/stores/geode"
 
   const model = defineModel()
 
diff --git a/app/components/Viewer/Options/TextureItem.vue b/app/components/Viewer/Options/TextureItem.vue
index 79b29307..3cd558aa 100644
--- a/app/components/Viewer/Options/TextureItem.vue
+++ b/app/components/Viewer/Options/TextureItem.vue
@@ -37,7 +37,8 @@
 
 <script setup>
   import back_schemas from "@geode/opengeodeweb-back/opengeodeweb_back_schemas.json"
-  import FileUploader from "@ogw_front/components/FileUploader.vue"
+  import FileUploader from "@ogw_front/components/FileUploader"
+  import { useGeodeStore } from "@ogw_front/stores/geode"
 
   const emit = defineEmits(["update_value"])
 
diff --git a/app/components/Viewer/Options/TexturesSelector.vue b/app/components/Viewer/Options/TexturesSelector.vue
index 85f4dc13..edec8403 100644
--- a/app/components/Viewer/Options/TexturesSelector.vue
+++ b/app/components/Viewer/Options/TexturesSelector.vue
@@ -36,7 +36,7 @@
 </template>
 
 <script setup>
-  import ViewerOptionsTextureItem from "@ogw_front/components/Viewer/Options/TextureItem.vue"
+  import ViewerOptionsTextureItem from "@ogw_front/components/Viewer/Options/TextureItem"
 
   const textures = defineModel()
 
diff --git a/app/components/Viewer/PointSet/PointsOptions.vue b/app/components/Viewer/PointSet/PointsOptions.vue
index 564e2a5d..37318d96 100644
--- a/app/components/Viewer/PointSet/PointsOptions.vue
+++ b/app/components/Viewer/PointSet/PointsOptions.vue
@@ -6,7 +6,7 @@
 </template>
 
 <script setup>
-  import ViewerPointSetSpecificPointsOptions from "@ogw_front/components/Viewer/PointSet/SpecificPointsOptions.vue"
+  import ViewerPointSetSpecificPointsOptions from "@ogw_front/components/Viewer/PointSet/SpecificPointsOptions"
   import PointSetPoints from "@ogw_front/assets/viewer_svgs/point_set_points.svg"
 
   const props = defineProps({
diff --git a/app/components/Viewer/PointSet/SpecificPointsOptions.vue b/app/components/Viewer/PointSet/SpecificPointsOptions.vue
index 5f39aa77..39338789 100644
--- a/app/components/Viewer/PointSet/SpecificPointsOptions.vue
+++ b/app/components/Viewer/PointSet/SpecificPointsOptions.vue
@@ -40,9 +40,13 @@
 </template>
 
 <script setup>
-  import ViewerContextMenuItem from "@ogw_front/components/Viewer/ContextMenuItem.vue"
-  import ViewerOptionsVisibilitySwitch from "@ogw_front/components/Viewer/Options/VisibilitySwitch.vue"
-  import ViewerOptionsColoringTypeSelector from "@ogw_front/components/Viewer/Options/ColoringTypeSelector.vue"
+  import ViewerContextMenuItem from "@ogw_front/components/Viewer/ContextMenuItem"
+  import ViewerOptionsVisibilitySwitch from "@ogw_front/components/Viewer/Options/VisibilitySwitch"
+  import ViewerOptionsColoringTypeSelector from "@ogw_front/components/Viewer/Options/ColoringTypeSelector"
+
+  import { useDataStyleStore } from "@ogw_front/stores/data_style"
+  import { useHybridViewerStore } from "@ogw_front/stores/hybrid_viewer"
+
   const dataStyleStore = useDataStyleStore()
   const hybridViewerStore = useHybridViewerStore()
 
diff --git a/app/components/Viewer/PolygonalSurface/EdgesOptions.vue b/app/components/Viewer/PolygonalSurface/EdgesOptions.vue
index ea0db78b..b3c08853 100644
--- a/app/components/Viewer/PolygonalSurface/EdgesOptions.vue
+++ b/app/components/Viewer/PolygonalSurface/EdgesOptions.vue
@@ -6,7 +6,7 @@
 </template>
 
 <script setup>
-  import ViewerGenericMeshEdgesOptions from "@ogw_front/components/Viewer/Generic/Mesh/EdgesOptions.vue"
+  import ViewerGenericMeshEdgesOptions from "@ogw_front/components/Viewer/Generic/Mesh/EdgesOptions"
   import PolygonalSurfaceEdges from "@ogw_front/assets/viewer_svgs/surface_edges.svg"
 
   const props = defineProps({
diff --git a/app/components/Viewer/PolygonalSurface/PointsOptions.vue b/app/components/Viewer/PolygonalSurface/PointsOptions.vue
index 5e955da7..e50d6023 100644
--- a/app/components/Viewer/PolygonalSurface/PointsOptions.vue
+++ b/app/components/Viewer/PolygonalSurface/PointsOptions.vue
@@ -6,7 +6,7 @@
 </template>
 
 <script setup>
-  import ViewerGenericMeshPointsOptions from "@ogw_front/components/Viewer/Generic/Mesh/PointsOptions.vue"
+  import ViewerGenericMeshPointsOptions from "@ogw_front/components/Viewer/Generic/Mesh/PointsOptions"
   import PolygonalSurfacePoints from "@ogw_front/assets/viewer_svgs/surface_points.svg"
 
   const props = defineProps({
diff --git a/app/components/Viewer/PolygonalSurface/PolygonsOptions.vue b/app/components/Viewer/PolygonalSurface/PolygonsOptions.vue
index 93e6b978..92a904a5 100644
--- a/app/components/Viewer/PolygonalSurface/PolygonsOptions.vue
+++ b/app/components/Viewer/PolygonalSurface/PolygonsOptions.vue
@@ -6,7 +6,7 @@
 </template>
 
 <script setup>
-  import ViewerGenericMeshPolygonsOptions from "@ogw_front/components/Viewer/Generic/Mesh/PolygonsOptions.vue"
+  import ViewerGenericMeshPolygonsOptions from "@ogw_front/components/Viewer/Generic/Mesh/PolygonsOptions"
   import PolygonalSurfacePolygons from "@ogw_front/assets/viewer_svgs/surface_triangles.svg"
 
   const props = defineProps({
diff --git a/app/components/Viewer/Solid/EdgesOptions.vue b/app/components/Viewer/Solid/EdgesOptions.vue
index 0e6d6498..7fc2c66b 100644
--- a/app/components/Viewer/Solid/EdgesOptions.vue
+++ b/app/components/Viewer/Solid/EdgesOptions.vue
@@ -6,7 +6,7 @@
 </template>
 
 <script setup>
-  import ViewerGenericMeshEdgesOptions from "@ogw_front/components/Viewer/Generic/Mesh/EdgesOptions.vue"
+  import ViewerGenericMeshEdgesOptions from "@ogw_front/components/Viewer/Generic/Mesh/EdgesOptions"
   import SolidEdges from "@ogw_front/assets/viewer_svgs/solid_edges.svg"
 
   const props = defineProps({
diff --git a/app/components/Viewer/Solid/PointsOptions.vue b/app/components/Viewer/Solid/PointsOptions.vue
index 7de72968..e903da1d 100644
--- a/app/components/Viewer/Solid/PointsOptions.vue
+++ b/app/components/Viewer/Solid/PointsOptions.vue
@@ -6,7 +6,7 @@
 </template>
 
 <script setup>
-  import ViewerGenericMeshPointsOptions from "@ogw_front/components/Viewer/Generic/Mesh/PointsOptions.vue"
+  import ViewerGenericMeshPointsOptions from "@ogw_front/components/Viewer/Generic/Mesh/PointsOptions"
   import SolidPoints from "@ogw_front/assets/viewer_svgs/solid_points.svg"
 
   const props = defineProps({
diff --git a/app/components/Viewer/Solid/PolygonsOptions.vue b/app/components/Viewer/Solid/PolygonsOptions.vue
index 72d84190..0f4946a3 100644
--- a/app/components/Viewer/Solid/PolygonsOptions.vue
+++ b/app/components/Viewer/Solid/PolygonsOptions.vue
@@ -6,7 +6,7 @@
 </template>
 
 <script setup>
-  import ViewerGenericMeshPolygonsOptions from "@ogw_front/components/Viewer/Generic/Mesh/PolygonsOptions.vue"
+  import ViewerGenericMeshPolygonsOptions from "@ogw_front/components/Viewer/Generic/Mesh/PolygonsOptions"
   import SolidFacets from "@ogw_front/assets/viewer_svgs/solid_facets.svg"
 
   const props = defineProps({
diff --git a/app/components/Viewer/Solid/PolyhedraOptions.vue b/app/components/Viewer/Solid/PolyhedraOptions.vue
index 887c2a2b..3828966a 100644
--- a/app/components/Viewer/Solid/PolyhedraOptions.vue
+++ b/app/components/Viewer/Solid/PolyhedraOptions.vue
@@ -6,7 +6,7 @@
 </template>
 
 <script setup>
-  import ViewerGenericMeshPolyhedraOptions from "@ogw_front/components/Viewer/Generic/Mesh/PolyhedraOptions.vue"
+  import ViewerGenericMeshPolyhedraOptions from "@ogw_front/components/Viewer/Generic/Mesh/PolyhedraOptions"
   import SolidPolyhedra from "@ogw_front/assets/viewer_svgs/solid_polyhedra.svg"
 
   const props = defineProps({
diff --git a/app/components/Viewer/TetrahedralSolid/TetrahedraOptions.vue b/app/components/Viewer/TetrahedralSolid/TetrahedraOptions.vue
index 6bb882b5..1e58b835 100644
--- a/app/components/Viewer/TetrahedralSolid/TetrahedraOptions.vue
+++ b/app/components/Viewer/TetrahedralSolid/TetrahedraOptions.vue
@@ -7,7 +7,7 @@
 </template>
 
 <script setup>
-  import ViewerGenericMeshPolyhedraOptions from "@ogw_front/components/Viewer/Generic/Mesh/PolyhedraOptions.vue"
+  import ViewerGenericMeshPolyhedraOptions from "@ogw_front/components/Viewer/Generic/Mesh/PolyhedraOptions"
   import TetrahedralSolidTetrahedra from "@ogw_front/assets/viewer_svgs/solid_polyhedra.svg"
 
   const props = defineProps({
diff --git a/app/components/Viewer/TetrahedralSolid/TrianglesOptions.vue b/app/components/Viewer/TetrahedralSolid/TrianglesOptions.vue
index cb00d11c..a1cb4fde 100644
--- a/app/components/Viewer/TetrahedralSolid/TrianglesOptions.vue
+++ b/app/components/Viewer/TetrahedralSolid/TrianglesOptions.vue
@@ -7,7 +7,7 @@
 </template>
 
 <script setup>
-  import ViewerGenericMeshPolygonsOptions from "@ogw_front/components/Viewer/Generic/Mesh/PolygonsOptions.vue"
+  import ViewerGenericMeshPolygonsOptions from "@ogw_front/components/Viewer/Generic/Mesh/PolygonsOptions"
   import TetrahedralSolidTriangles from "@ogw_front/assets/viewer_svgs/solid_facets.svg"
 
   const props = defineProps({
diff --git a/app/components/Viewer/Tree/ObjectTree.vue b/app/components/Viewer/Tree/ObjectTree.vue
index 26446ca7..ad9c2af5 100644
--- a/app/components/Viewer/Tree/ObjectTree.vue
+++ b/app/components/Viewer/Tree/ObjectTree.vue
@@ -42,9 +42,11 @@
 </template>
 
 <script setup>
-  import ViewerBreadCrumb from "@/app/components/Viewer/BreadCrumb.vue"
-  import ViewerTreeObject from "@/app/components/Viewer/TreeObject.vue"
-  import ViewerTreeComponent from "@/app/components/Viewer/TreeComponent.vue"
+  import ViewerBreadCrumb from "@/components/Viewer/BreadCrumb"
+  import ViewerTreeObject from "@/components/Viewer/TreeObject"
+  import ViewerTreeComponent from "@/components/Viewer/TreeComponent"
+  import { useTreeviewStore } from "@ogw_front/stores/treeview"
+  import { useMenuStore } from "@ogw_front/stores/menu"
 
   const treeviewStore = useTreeviewStore()
   const menuStore = useMenuStore()
diff --git a/app/components/Viewer/TreeComponent.vue b/app/components/Viewer/TreeComponent.vue
index 58cad87d..bb709f60 100644
--- a/app/components/Viewer/TreeComponent.vue
+++ b/app/components/Viewer/TreeComponent.vue
@@ -14,6 +14,10 @@
 </template>
 
 <script setup>
+  import { useDataStyleStore } from "@ogw_front/stores/data_style"
+  import { useDataBaseStore } from "@ogw_front/stores/data_base"
+  import { useHybridViewerStore } from "@ogw_front/stores/hybrid_viewer"
+
   const dataStyleStore = useDataStyleStore()
   const dataBaseStore = useDataBaseStore()
   const hybridViewerStore = useHybridViewerStore()
diff --git a/app/components/Viewer/TreeObject.vue b/app/components/Viewer/TreeObject.vue
index 70399a86..5e51324c 100644
--- a/app/components/Viewer/TreeObject.vue
+++ b/app/components/Viewer/TreeObject.vue
@@ -36,10 +36,16 @@
 </template>
 
 <script setup>
+  import { useTreeviewStore } from "@ogw_front/stores/treeview"
+  import { useDataStyleStore } from "@ogw_front/stores/data_style"
+  import { useDataBaseStore } from "@ogw_front/stores/data_base"
+  import { useHybridViewerStore } from "@ogw_front/stores/hybrid_viewer"
+
   const treeviewStore = useTreeviewStore()
   const dataStyleStore = useDataStyleStore()
   const dataBaseStore = useDataBaseStore()
   const hybridViewerStore = useHybridViewerStore()
+
   const emit = defineEmits(["show-menu"])
 
   function isLeafNode(item) {
diff --git a/app/components/Viewer/TriangulatedSurface/EdgesOptions.vue b/app/components/Viewer/TriangulatedSurface/EdgesOptions.vue
index 381dd808..f17e779f 100644
--- a/app/components/Viewer/TriangulatedSurface/EdgesOptions.vue
+++ b/app/components/Viewer/TriangulatedSurface/EdgesOptions.vue
@@ -6,7 +6,7 @@
 </template>
 
 <script setup>
-  import ViewerGenericMeshEdgesOptions from "@ogw_front/components/Viewer/Generic/Mesh/EdgesOptions.vue"
+  import ViewerGenericMeshEdgesOptions from "@ogw_front/components/Viewer/Generic/Mesh/EdgesOptions"
   import SurfaceEdges from "@ogw_front/assets/viewer_svgs/surface_edges.svg"
 
   const props = defineProps({
diff --git a/app/components/Viewer/TriangulatedSurface/PointsOptions.vue b/app/components/Viewer/TriangulatedSurface/PointsOptions.vue
index a8e304f9..fb8093e9 100644
--- a/app/components/Viewer/TriangulatedSurface/PointsOptions.vue
+++ b/app/components/Viewer/TriangulatedSurface/PointsOptions.vue
@@ -6,7 +6,7 @@
 </template>
 
 <script setup>
-  import ViewerGenericMeshPointsOptions from "@ogw_front/components/Viewer/Generic/Mesh/PointsOptions.vue"
+  import ViewerGenericMeshPointsOptions from "@ogw_front/components/Viewer/Generic/Mesh/PointsOptions"
   import TriangulatedSurfaceEdgesPoints from "@ogw_front/assets/viewer_svgs/surface_points.svg"
 
   const props = defineProps({
diff --git a/app/components/Viewer/TriangulatedSurface/TrianglesOptions.vue b/app/components/Viewer/TriangulatedSurface/TrianglesOptions.vue
index 5eff06b1..ba5e30c3 100644
--- a/app/components/Viewer/TriangulatedSurface/TrianglesOptions.vue
+++ b/app/components/Viewer/TriangulatedSurface/TrianglesOptions.vue
@@ -7,7 +7,7 @@
 </template>
 
 <script setup>
-  import ViewerGenericMeshPolygonsOptions from "@ogw_front/components/Viewer/Generic/Mesh/PolygonsOptions.vue"
+  import ViewerGenericMeshPolygonsOptions from "@ogw_front/components/Viewer/Generic/Mesh/PolygonsOptions"
   import TriangulatedSurfaceEdgesTriangles from "@ogw_front/assets/viewer_svgs/surface_triangles.svg"
 
   const props = defineProps({
diff --git a/app/components/Wrapper.vue b/app/components/Wrapper.vue
index 72fd1446..20b0de20 100644
--- a/app/components/Wrapper.vue
+++ b/app/components/Wrapper.vue
@@ -1,7 +1,7 @@
 <template>
   <v-container>
     <v-row class="flex-column">
-      <template v-if="!infra_store.microservices_connected">
+      <template v-if="!infraStore.microservices_connected">
         <v-col>
           <Launcher />
         </v-col>
@@ -19,11 +19,13 @@
 </template>
 
 <script setup>
-  import Launcher from "@ogw_front/components/Launcher.vue"
-  import PackagesVersions from "@ogw_front/components/PackagesVersions.vue"
-  import Stepper from "@ogw_front/components/Stepper.vue"
+  import Launcher from "@ogw_front/components/Launcher"
+  import PackagesVersions from "@ogw_front/components/PackagesVersions"
+  import Stepper from "@ogw_front/components/Stepper"
 
-  const infra_store = useInfraStore()
+  import { useInfraStore } from "@ogw_front/stores/infra"
+
+  const infraStore = useInfraStore()
 
   const props = defineProps({
     versions_schema: { type: Object, required: true },
diff --git a/app/composables/project_manager.js b/app/composables/project_manager.js
index 6a13f894..e54463a5 100644
--- a/app/composables/project_manager.js
+++ b/app/composables/project_manager.js
@@ -4,6 +4,14 @@ import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schem
 
 import { importWorkflowFromSnapshot } from "@ogw_front/utils/file_import_workflow"
 
+import { useAppStore } from "@ogw_front/stores/app"
+import { useDataStyleStore } from "@ogw_front/stores/data_style"
+import { useDataBaseStore } from "@ogw_front/stores/data_base"
+import { useGeodeStore } from "@ogw_front/stores/geode"
+import { useHybridViewerStore } from "@ogw_front/stores/hybrid_viewer"
+import { useTreeviewStore } from "@ogw_front/stores/treeview"
+import { useViewerStore } from "@ogw_front/stores/viewer"
+
 export function useProjectManager() {
   const exportProject = async function () {
     console.log("[export triggered]")
@@ -24,6 +32,7 @@ export function useProjectManager() {
 
   const importProjectFile = async function (file) {
     const geodeStore = useGeodeStore()
+    const dataStyleStore = useDataStyleStore()
     const viewerStore = useViewerStore()
     const dataBaseStore = useDataBaseStore()
     const treeviewStore = useTreeviewStore()
@@ -96,13 +105,10 @@ export function useProjectManager() {
 
     await importWorkflowFromSnapshot(items)
     await hybridViewerStore.importStores(snapshot.hybridViewer || {})
-
     {
-      const dataStyleStore = useDataStyleStore()
       await dataStyleStore.importStores(snapshot.dataStyle || {})
     }
     {
-      const dataStyleStore = useDataStyleStore()
       await dataStyleStore.applyAllStylesFromState()
     }
 
diff --git a/app/composables/run_function_when_microservices_connected.js b/app/composables/run_function_when_microservices_connected.js
index 35429085..a261a03a 100644
--- a/app/composables/run_function_when_microservices_connected.js
+++ b/app/composables/run_function_when_microservices_connected.js
@@ -1,11 +1,14 @@
+import { useInfraStore } from "@ogw_front/stores/infra"
 export function run_function_when_microservices_connected(function_to_run) {
-  const infra_store = useInfraStore()
-  const { microservices_connected } = storeToRefs(infra_store)
+  const infraStore = useInfraStore()
+  const { microservices_connected } = storeToRefs(infraStore)
+  console.log("inside microservices_connected", microservices_connected.value)
   if (microservices_connected.value) {
     function_to_run()
   } else {
     watch(microservices_connected, (value) => {
       if (value) {
+        console.log("watch microservices_connected", value)
         function_to_run()
       }
     })
diff --git a/app/plugins/auto_store_register.js b/app/plugins/auto_store_register.js
index 71826218..e5dd599c 100644
--- a/app/plugins/auto_store_register.js
+++ b/app/plugins/auto_store_register.js
@@ -1,3 +1,5 @@
+import { useAppStore } from "../stores/app"
+
 const autoStoreRegister = ({ store }) => {
   if (store.$id === "app") {
     return
@@ -9,7 +11,13 @@ const autoStoreRegister = ({ store }) => {
 }
 
 export default defineNuxtPlugin((nuxtApp) => {
-  nuxtApp.$pinia.use(autoStoreRegister)
+  const { $pinia } = nuxtApp
+  if (!$pinia) {
+    console.warn("Pinia instance not available.")
+    return
+  }
+
+  $pinia.use(autoStoreRegister)
   console.log(
     "[AUTOREGISTER PLUGIN] Loaded automatically from OpenGeodeWeb-Front",
   )
diff --git a/app/stores/data_base.js b/app/stores/data_base.js
index 23b748c5..c348c014 100644
--- a/app/stores/data_base.js
+++ b/app/stores/data_base.js
@@ -1,12 +1,16 @@
 // Third party imports
 import back_schemas from "@geode/opengeodeweb-back/opengeodeweb_back_schemas.json"
 import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schemas.json"
+import { useViewerStore } from "@ogw_front/stores/viewer"
+import { useGeodeStore } from "@ogw_front/stores/geode"
 
 // Local constants
 const back_model_schemas = back_schemas.opengeodeweb_back.models
 const viewer_generic_schemas = viewer_schemas.opengeodeweb_viewer.generic
 
 export const useDataBaseStore = defineStore("dataBase", () => {
+  const viewerStore = useViewerStore()
+
   const db = reactive({})
 
   function itemMetaDatas(id) {
@@ -42,7 +46,6 @@ export const useDataBaseStore = defineStore("dataBase", () => {
   }
 
   async function registerObject(id) {
-    const viewerStore = useViewerStore()
     return viewerStore.request(viewer_generic_schemas.register, { id })
   }
 
diff --git a/app/stores/data_style.js b/app/stores/data_style.js
index 32768002..ed2a01b5 100644
--- a/app/stores/data_style.js
+++ b/app/stores/data_style.js
@@ -1,14 +1,14 @@
-import { getDefaultStyle } from "../utils/default_styles.js"
-import useDataStyleState from "../internal/stores/data_style_state.js"
-import useMeshStyle from "../internal/stores/mesh/index.js"
-import useModelStyle from "../internal/stores/model/index.js"
+import { getDefaultStyle } from "../utils/default_styles"
+import { useDataBaseStore } from "@ogw_front/stores/data_base"
+import useDataStyleState from "../../internal/stores/data_style_state"
+import useMeshStyle from "../../internal/stores/mesh/index"
+import useModelStyle from "../../internal/stores/model/index"
 
 export const useDataStyleStore = defineStore("dataStyle", () => {
   const dataStyleState = useDataStyleState()
   const meshStyleStore = useMeshStyle()
   const modelStyleStore = useModelStyle()
   const dataBaseStore = useDataBaseStore()
-  const hybridViewerStore = useHybridViewerStore()
 
   function addDataStyle(id, geode_object) {
     dataStyleState.styles[id] = getDefaultStyle(geode_object)
diff --git a/app/stores/geode.js b/app/stores/geode.js
index 3c7e7a65..ca6da9bb 100644
--- a/app/stores/geode.js
+++ b/app/stores/geode.js
@@ -1,7 +1,9 @@
 import back_schemas from "@geode/opengeodeweb-back/opengeodeweb_back_schemas.json"
-import Status from "@ogw_front/utils/status.js"
-import { appMode } from "@ogw_front/utils/app_mode.js"
-import { api_fetch } from "../../internal/utils/api_fetch.js"
+import Status from "@ogw_front/utils/status"
+import { appMode } from "@ogw_front/utils/app_mode"
+import { api_fetch } from "../../internal/utils/api_fetch"
+import { useInfraStore } from "@ogw_front/stores/infra"
+import { useFeedbackStore } from "@ogw_front/stores/feedback"
 
 export const useGeodeStore = defineStore("geode", {
   state: () => ({
@@ -27,13 +29,13 @@ export const useGeodeStore = defineStore("geode", {
       return this.default_local_port
     },
     base_url() {
-      const infra_store = useInfraStore()
-      let geode_url = `${this.protocol}://${infra_store.domain_name}:${this.port}`
-      if (infra_store.app_mode == appMode.CLOUD) {
-        if (infra_store.ID == "") {
+      const infraStore = useInfraStore()
+      let geode_url = `${this.protocol}://${infraStore.domain_name}:${this.port}`
+      if (infraStore.app_mode == appMode.CLOUD) {
+        if (infraStore.ID == "") {
           throw new Error("ID must not be empty in cloud mode")
         }
-        geode_url += `/${infra_store.ID}/geode`
+        geode_url += `/${infraStore.ID}/geode`
       }
       return geode_url
     },
@@ -51,23 +53,23 @@ export const useGeodeStore = defineStore("geode", {
     },
     do_ping() {
       const geodeStore = this
-      const feedback_store = useFeedbackStore()
+      const feedbackStore = useFeedbackStore()
       return useFetch(back_schemas.opengeodeweb_back.ping.$id, {
         baseURL: this.base_url,
         method: back_schemas.opengeodeweb_back.ping.methods[0],
         body: {},
         onRequestError({ error }) {
-          feedback_store.$patch({ server_error: true })
+          feedbackStore.$patch({ server_error: true })
           geodeStore.status = Status.NOT_CONNECTED
         },
         onResponse({ response }) {
           if (response.ok) {
-            feedback_store.$patch({ server_error: false })
+            feedbackStore.$patch({ server_error: false })
             geodeStore.status = Status.CONNECTED
           }
         },
         onResponseError({ response }) {
-          feedback_store.$patch({ server_error: true })
+          feedbackStore.$patch({ server_error: true })
           geodeStore.status = Status.NOT_CONNECTED
         },
       })
diff --git a/app/stores/hybrid_viewer.js b/app/stores/hybrid_viewer.js
index a196c424..3097f454 100644
--- a/app/stores/hybrid_viewer.js
+++ b/app/stores/hybrid_viewer.js
@@ -5,8 +5,9 @@ import vtkMapper from "@kitware/vtk.js/Rendering/Core/Mapper"
 import vtkActor from "@kitware/vtk.js/Rendering/Core/Actor"
 
 import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schemas.json"
-import Status from "@ogw_front/utils/status.js"
-import { viewer_call } from "../../internal/utils/viewer_call.js"
+import Status from "@ogw_front/utils/status"
+import { useViewerStore } from "@ogw_front/stores/viewer"
+import { useDataBaseStore } from "@ogw_front/stores/data_base"
 
 export const useHybridViewerStore = defineStore("hybridViewer", () => {
   const viewerStore = useViewerStore()
diff --git a/app/stores/infra.js b/app/stores/infra.js
index 413afd4c..138867e1 100644
--- a/app/stores/infra.js
+++ b/app/stores/infra.js
@@ -1,5 +1,6 @@
-import Status from "@ogw_front/utils/status.js"
-import { appMode, getAppMode } from "@ogw_front/utils/app_mode.js"
+import Status from "@ogw_front/utils/status"
+import { appMode, getAppMode } from "@ogw_front/utils/app_mode"
+import { useLambdaStore } from "@ogw_front/stores/lambda"
 
 export const useInfraStore = defineStore("infra", {
   state: () => ({
@@ -17,6 +18,7 @@ export const useInfraStore = defineStore("infra", {
       return "localhost"
     },
     microservices_connected() {
+      console.log("microservices", this.microservices)
       return this.microservices.every(
         (store) => store.status === Status.CONNECTED,
       )
diff --git a/app/stores/lambda.js b/app/stores/lambda.js
index 2e74fddf..3064c1cd 100644
--- a/app/stores/lambda.js
+++ b/app/stores/lambda.js
@@ -1,4 +1,5 @@
-import Status from "@ogw_front/utils/status.js"
+import Status from "@ogw_front/utils/status"
+import { useFeedbackStore } from "@ogw_front/stores/feedback"
 
 export const useLambdaStore = defineStore("lambda", {
   state: () => ({
diff --git a/app/stores/menu.js b/app/stores/menu.js
index 5e5f8d80..ea096c16 100644
--- a/app/stores/menu.js
+++ b/app/stores/menu.js
@@ -1,44 +1,44 @@
 // PointSet components
-import PointSetPointsOptions from "@ogw_front/components/Viewer/PointSet/PointsOptions.vue"
+import PointSetPointsOptions from "@ogw_front/components/Viewer/PointSet/PointsOptions"
 
 // EdgedCurve components
-import EdgedCurvePointsOptions from "@ogw_front/components/Viewer/EdgedCurve/PointsOptions.vue"
-import EdgedCurveEdgesOptions from "@ogw_front/components/Viewer/EdgedCurve/EdgesOptions.vue"
+import EdgedCurvePointsOptions from "@ogw_front/components/Viewer/EdgedCurve/PointsOptions"
+import EdgedCurveEdgesOptions from "@ogw_front/components/Viewer/EdgedCurve/EdgesOptions"
 
 // PolygonalSurface components
-import PolygonalSurfacePointsOptions from "@ogw_front/components/Viewer/PolygonalSurface/PointsOptions.vue"
-import PolygonalSurfaceEdgesOptions from "@ogw_front/components/Viewer/PolygonalSurface/EdgesOptions.vue"
-import PolygonalSurfacePolygonsOptions from "@ogw_front/components/Viewer/PolygonalSurface/PolygonsOptions.vue"
+import PolygonalSurfacePointsOptions from "@ogw_front/components/Viewer/PolygonalSurface/PointsOptions"
+import PolygonalSurfaceEdgesOptions from "@ogw_front/components/Viewer/PolygonalSurface/EdgesOptions"
+import PolygonalSurfacePolygonsOptions from "@ogw_front/components/Viewer/PolygonalSurface/PolygonsOptions"
 
 // TriangulatedSurface components
-import TriangulatedSurfacePointsOptions from "@ogw_front/components/Viewer/TriangulatedSurface/PointsOptions.vue"
-import TriangulatedSurfaceEdgesOptions from "@ogw_front/components/Viewer/TriangulatedSurface/EdgesOptions.vue"
-import TriangulatedSurfaceTrianglesOptions from "@ogw_front/components/Viewer/TriangulatedSurface/TrianglesOptions.vue"
+import TriangulatedSurfacePointsOptions from "@ogw_front/components/Viewer/TriangulatedSurface/PointsOptions"
+import TriangulatedSurfaceEdgesOptions from "@ogw_front/components/Viewer/TriangulatedSurface/EdgesOptions"
+import TriangulatedSurfaceTrianglesOptions from "@ogw_front/components/Viewer/TriangulatedSurface/TrianglesOptions"
 
 // Grid 2D components
-import Grid2DPointsOptions from "@ogw_front/components/Viewer/Grid/2D/PointsOptions.vue"
-import Grid2DEdgesOptions from "@ogw_front/components/Viewer/Grid/2D/EdgesOptions.vue"
-import Grid2DCellsOptions from "@ogw_front/components/Viewer/Grid/2D/CellsOptions.vue"
+import Grid2DPointsOptions from "@ogw_front/components/Viewer/Grid/2D/PointsOptions"
+import Grid2DEdgesOptions from "@ogw_front/components/Viewer/Grid/2D/EdgesOptions"
+import Grid2DCellsOptions from "@ogw_front/components/Viewer/Grid/2D/CellsOptions"
 
 // Grid 3D components
-import Grid3DPointsOptions from "@ogw_front/components/Viewer/Grid/3D/PointsOptions.vue"
-import Grid3DEdgesOptions from "@ogw_front/components/Viewer/Grid/3D/EdgesOptions.vue"
-import Grid3DFacetsOptions from "@ogw_front/components/Viewer/Grid/3D/FacetsOptions.vue"
-import Grid3DCellsOptions from "@ogw_front/components/Viewer/Grid/3D/CellsOptions.vue"
+import Grid3DPointsOptions from "@ogw_front/components/Viewer/Grid/3D/PointsOptions"
+import Grid3DEdgesOptions from "@ogw_front/components/Viewer/Grid/3D/EdgesOptions"
+import Grid3DFacetsOptions from "@ogw_front/components/Viewer/Grid/3D/FacetsOptions"
+import Grid3DCellsOptions from "@ogw_front/components/Viewer/Grid/3D/CellsOptions"
 
 // Solid components
-import SolidPointsOptions from "@ogw_front/components/Viewer/Solid/PointsOptions.vue"
-import SolidEdgesOptions from "@ogw_front/components/Viewer/Solid/EdgesOptions.vue"
-import SolidPolygonsOptions from "@ogw_front/components/Viewer/Solid/PolygonsOptions.vue"
-import SolidPolyhedraOptions from "@ogw_front/components/Viewer/Solid/PolyhedraOptions.vue"
+import SolidPointsOptions from "@ogw_front/components/Viewer/Solid/PointsOptions"
+import SolidEdgesOptions from "@ogw_front/components/Viewer/Solid/EdgesOptions"
+import SolidPolygonsOptions from "@ogw_front/components/Viewer/Solid/PolygonsOptions"
+import SolidPolyhedraOptions from "@ogw_front/components/Viewer/Solid/PolyhedraOptions"
 
 // TetrahedralSolid components
-import TetrahedralSolidTrianglesOptions from "@ogw_front/components/Viewer/TetrahedralSolid/TrianglesOptions.vue"
-import TetrahedralSolidTetrahedraOptions from "@ogw_front/components/Viewer/TetrahedralSolid/TetrahedraOptions.vue"
+import TetrahedralSolidTrianglesOptions from "@ogw_front/components/Viewer/TetrahedralSolid/TrianglesOptions"
+import TetrahedralSolidTetrahedraOptions from "@ogw_front/components/Viewer/TetrahedralSolid/TetrahedraOptions"
 
 // Model components
-import ModelEdgesOptions from "@ogw_front/components/Viewer/Generic/Model/EdgesOptions.vue"
-import ModelPointsOptions from "@ogw_front/components/Viewer/Generic/Model/PointsOptions.vue"
+import ModelEdgesOptions from "@ogw_front/components/Viewer/Generic/Model/EdgesOptions"
+import ModelPointsOptions from "@ogw_front/components/Viewer/Generic/Model/PointsOptions"
 
 const PointSet_menu = [PointSetPointsOptions]
 
diff --git a/app/stores/viewer.js b/app/stores/viewer.js
index 4021797e..97fe83ae 100644
--- a/app/stores/viewer.js
+++ b/app/stores/viewer.js
@@ -2,9 +2,10 @@ import _ from "lodash"
 import vtkWSLinkClient from "@kitware/vtk.js/IO/Core/WSLinkClient"
 import "@kitware/vtk.js/Rendering/OpenGL/Profiles/Geometry"
 import schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schemas.json"
-import Status from "@ogw_front/utils/status.js"
-import { appMode } from "@ogw_front/utils/app_mode.js"
-import { viewer_call } from "../../internal/utils/viewer_call.js"
+import Status from "@ogw_front/utils/status"
+import { appMode } from "@ogw_front/utils/app_mode"
+import { viewer_call } from "../../internal/utils/viewer_call"
+import { useInfraStore } from "@ogw_front/stores/infra"
 
 export const useViewerStore = defineStore("viewer", {
   state: () => ({
@@ -35,13 +36,13 @@ export const useViewerStore = defineStore("viewer", {
       return this.default_local_port
     },
     base_url() {
-      const infra_store = useInfraStore()
-      let viewer_url = `${this.protocol}://${infra_store.domain_name}:${this.port}`
-      if (infra_store.app_mode == appMode.CLOUD) {
-        if (infra_store.ID == "") {
+      const infraStore = useInfraStore()
+      let viewer_url = `${this.protocol}://${infraStore.domain_name}:${this.port}`
+      if (infraStore.app_mode == appMode.CLOUD) {
+        if (infraStore.ID == "") {
           throw new Error("ID must not be empty in cloud mode")
         }
-        viewer_url += `/${infra_store.ID}/viewer`
+        viewer_url += `/${infraStore.ID}/viewer`
       }
       viewer_url += "/ws"
       return viewer_url
diff --git a/app/utils/file_import_workflow.js b/app/utils/file_import_workflow.js
index 923cb61b..f0a22a0b 100644
--- a/app/utils/file_import_workflow.js
+++ b/app/utils/file_import_workflow.js
@@ -1,8 +1,12 @@
 // Third party imports
 import back_schemas from "@geode/opengeodeweb-back/opengeodeweb_back_schemas.json"
-import { useHybridViewerStore } from "../stores/hybrid_viewer"
 
 // Local imports
+import { useHybridViewerStore } from "@ogw_front/stores/hybrid_viewer"
+import { useGeodeStore } from "@ogw_front/stores/geode"
+import { useDataStyleStore } from "@ogw_front/stores/data_style"
+import { useDataBaseStore } from "@ogw_front/stores/data_base"
+import { useTreeviewStore } from "@ogw_front/stores/treeview"
 
 async function importWorkflow(files) {
   console.log("importWorkflow", { files })
diff --git a/app/utils/upload_file.js b/app/utils/upload_file.js
index a47f4bd8..28e04518 100644
--- a/app/utils/upload_file.js
+++ b/app/utils/upload_file.js
@@ -1,8 +1,11 @@
+import { useGeodeStore } from "@ogw_front/stores/geode"
+import { useFeedbackStore } from "@ogw_front/stores/feedback"
+
 export async function upload_file(
   { route, file },
   { request_error_function, response_function, response_error_function } = {},
 ) {
-  const feedback_store = useFeedbackStore()
+  const feedbackStore = useFeedbackStore()
   const geodeStore = useGeodeStore()
   if (!(file instanceof File)) {
     throw new Error("file must be a instance of File")
@@ -22,7 +25,7 @@ export async function upload_file(
     ...request_options,
     onRequestError({ error }) {
       geodeStore.stop_request()
-      feedback_store.add_error(error.code, route, error.message, error.stack)
+      feedbackStore.add_error(error.code, route, error.message, error.stack)
       if (request_error_function) {
         request_error_function(error)
       }
@@ -37,7 +40,7 @@ export async function upload_file(
     },
     onResponseError({ response }) {
       geodeStore.stop_request()
-      feedback_store.add_error(
+      feedbackStore.add_error(
         response.status,
         route,
         response._data.name,
diff --git a/internal/stores/mesh/cells.js b/internal/stores/mesh/cells.js
index 0a34d92c..21d5a911 100644
--- a/internal/stores/mesh/cells.js
+++ b/internal/stores/mesh/cells.js
@@ -1,10 +1,14 @@
 // Third party imports
 import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schemas.json"
 
+import { useDataStyleStore } from "@ogw_front/stores/data_style"
+import { useViewerStore } from "@ogw_front/stores/viewer"
+
 // Local constants
 const mesh_cells_schemas = viewer_schemas.opengeodeweb_viewer.mesh.cells
 export function useMeshCellsStyle() {
   const dataStyleStore = useDataStyleStore()
+  const viewerStore = useViewerStore()
 
   function meshCellsStyle(id) {
     return dataStyleStore.getStyle(id).cells
@@ -15,7 +19,6 @@ export function useMeshCellsStyle() {
   }
   function setMeshCellsVisibility(id, visibility) {
     const cells_style = meshCellsStyle(id)
-    const viewerStore = useViewerStore()
     return viewerStore.request(
       mesh_cells_schemas.visibility,
       { id, visibility },
@@ -37,7 +40,6 @@ export function useMeshCellsStyle() {
   }
   function setMeshCellsColor(id, color) {
     const coloring_style = meshCellsStyle(id).coloring
-    const viewerStore = useViewerStore()
     return viewerStore.request(
       mesh_cells_schemas.color,
       { id, color },
@@ -59,7 +61,6 @@ export function useMeshCellsStyle() {
   }
   function setMeshCellsTextures(id, textures) {
     const coloring_style = meshCellsStyle(id).coloring
-    const viewerStore = useViewerStore()
     return viewerStore.request(
       mesh_cells_schemas.apply_textures,
       { id, textures },
@@ -78,7 +79,6 @@ export function useMeshCellsStyle() {
 
   function setMeshCellsVertexAttribute(id, vertex_attribute) {
     const coloring_style = meshCellsStyle(id).coloring
-    const viewerStore = useViewerStore()
     return viewerStore.request(
       mesh_cells_schemas.vertex_attribute,
       { id, ...vertex_attribute },
@@ -100,7 +100,6 @@ export function useMeshCellsStyle() {
   }
   function setMeshCellsCellAttribute(id, cell_attribute) {
     const coloring_style = meshCellsStyle(id).coloring
-    const viewerStore = useViewerStore()
     return viewerStore.request(
       mesh_cells_schemas.cell_attribute,
       { id, ...cell_attribute },
diff --git a/internal/stores/mesh/edges.js b/internal/stores/mesh/edges.js
index 461f6679..c8ee02ab 100644
--- a/internal/stores/mesh/edges.js
+++ b/internal/stores/mesh/edges.js
@@ -1,11 +1,16 @@
 // Third party imports
 import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schemas.json"
 
+// Local imports
+import { useDataStyleStore } from "@ogw_front/stores/data_style"
+import { useViewerStore } from "@ogw_front/stores/viewer"
+
 // Local constants
 const mesh_edges_schemas = viewer_schemas.opengeodeweb_viewer.mesh.edges
 
 export function useMeshEdgesStyle() {
   const dataStyleStore = useDataStyleStore()
+  const viewerStore = useViewerStore()
 
   function meshEdgesStyle(id) {
     return dataStyleStore.getStyle(id).edges
@@ -15,7 +20,6 @@ export function useMeshEdgesStyle() {
     return meshEdgesStyle(id).visibility
   }
   function setMeshEdgesVisibility(id, visibility) {
-    const viewerStore = useViewerStore()
     return viewerStore.request(
       mesh_edges_schemas.visibility,
       { id, visibility },
@@ -59,7 +63,6 @@ export function useMeshEdgesStyle() {
   }
   function setMeshEdgesColor(id, color) {
     const coloring_style = meshEdgesStyle(id).coloring
-    const viewerStore = useViewerStore()
     return viewerStore.request(
       mesh_edges_schemas.color,
       { id, color },
@@ -81,7 +84,6 @@ export function useMeshEdgesStyle() {
   }
   function setMeshEdgesWidth(id, width) {
     const edges_style = meshEdgesStyle(id)
-    const viewerStore = useViewerStore()
     return viewerStore.request(
       mesh_edges_schemas.width,
       { id, width },
diff --git a/internal/stores/mesh/index.js b/internal/stores/mesh/index.js
index ec629caa..b3a7b8d5 100644
--- a/internal/stores/mesh/index.js
+++ b/internal/stores/mesh/index.js
@@ -2,17 +2,21 @@
 import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schemas.json"
 
 // Local imports
-import { useMeshPointsStyle } from "./points.js"
-import { useMeshEdgesStyle } from "./edges.js"
-import { useMeshCellsStyle } from "./cells.js"
-import { useMeshPolygonsStyle } from "./polygons.js"
-import { useMeshPolyhedraStyle } from "./polyhedra.js"
+import { useHybridViewerStore } from "@ogw_front/stores/hybrid_viewer"
+import { useDataStyleStore } from "@ogw_front/stores/data_style"
+import { useViewerStore } from "@ogw_front/stores/viewer"
+import { useMeshPointsStyle } from "./points"
+import { useMeshEdgesStyle } from "./edges"
+import { useMeshCellsStyle } from "./cells"
+import { useMeshPolygonsStyle } from "./polygons"
+import { useMeshPolyhedraStyle } from "./polyhedra"
 
 // Local constants
 const mesh_schemas = viewer_schemas.opengeodeweb_viewer.mesh
 
 export default function useMeshStyle() {
   const dataStyleStore = useDataStyleStore()
+  const viewerStore = useViewerStore()
   const meshPointsStyleStore = useMeshPointsStyle()
   const meshEdgesStyleStore = useMeshEdgesStyle()
   const meshCellsStyleStore = useMeshCellsStyle()
@@ -24,7 +28,6 @@ export default function useMeshStyle() {
     return dataStyleStore.getStyle(id).visibility
   }
   function setMeshVisibility(id, visibility) {
-    const viewerStore = useViewerStore()
     return viewerStore.request(
       mesh_schemas.visibility,
       { id, visibility },
diff --git a/internal/stores/mesh/points.js b/internal/stores/mesh/points.js
index 964a358e..360d2ca9 100644
--- a/internal/stores/mesh/points.js
+++ b/internal/stores/mesh/points.js
@@ -1,11 +1,16 @@
 // Third party imports
 import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schemas.json"
 
+// Local imports
+import { useDataStyleStore } from "@ogw_front/stores/data_style"
+import { useViewerStore } from "@ogw_front/stores/viewer"
+
 // Local constants
 const mesh_points_schemas = viewer_schemas.opengeodeweb_viewer.mesh.points
 
 export function useMeshPointsStyle() {
   const dataStyleStore = useDataStyleStore()
+  const viewerStore = useViewerStore()
 
   function meshPointsStyle(id) {
     return dataStyleStore.getStyle(id).points
@@ -16,7 +21,6 @@ export function useMeshPointsStyle() {
   }
   function setMeshPointsVisibility(id, visibility) {
     const points_style = meshPointsStyle(id)
-    const viewerStore = useViewerStore()
     return viewerStore.request(
       mesh_points_schemas.visibility,
       { id, visibility },
@@ -58,7 +62,6 @@ export function useMeshPointsStyle() {
   }
   function setMeshPointsColor(id, color) {
     const coloring_style = meshPointsStyle(id).coloring
-    const viewerStore = useViewerStore()
     return viewerStore.request(
       mesh_points_schemas.color,
       { id, color },
@@ -79,7 +82,6 @@ export function useMeshPointsStyle() {
   }
   function setMeshPointsVertexAttribute(id, vertex_attribute) {
     const coloring_style = meshPointsStyle(id).coloring
-    const viewerStore = useViewerStore()
     return viewerStore.request(
       mesh_points_schemas.vertex_attribute,
       { id, ...vertex_attribute },
@@ -100,7 +102,6 @@ export function useMeshPointsStyle() {
     return meshPointsStyle(id).size
   }
   function setMeshPointsSize(id, size) {
-    const viewerStore = useViewerStore()
     return viewerStore.request(
       mesh_points_schemas.size,
       { id, size },
diff --git a/internal/stores/mesh/polygons.js b/internal/stores/mesh/polygons.js
index e68fa31d..47b669c6 100644
--- a/internal/stores/mesh/polygons.js
+++ b/internal/stores/mesh/polygons.js
@@ -1,11 +1,16 @@
 // Third party imports
 import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schemas.json"
 
+// Local imports
+import { useDataStyleStore } from "@ogw_front/stores/data_style"
+import { useViewerStore } from "@ogw_front/stores/viewer"
+
 // Local constants
 const mesh_polygons_schemas = viewer_schemas.opengeodeweb_viewer.mesh.polygons
 
 export function useMeshPolygonsStyle() {
   const dataStyleStore = useDataStyleStore()
+  const viewerStore = useViewerStore()
 
   function meshPolygonsStyle(id) {
     return dataStyleStore.getStyle(id).polygons
@@ -16,7 +21,6 @@ export function useMeshPolygonsStyle() {
   }
   function setMeshPolygonsVisibility(id, visibility) {
     const polygons_style = meshPolygonsStyle(id)
-    const viewerStore = useViewerStore()
     return viewerStore.request(
       mesh_polygons_schemas.visibility,
       { id, visibility },
@@ -38,7 +42,6 @@ export function useMeshPolygonsStyle() {
   }
   function setMeshPolygonsColor(id, color) {
     const coloring_style = meshPolygonsStyle(id).coloring
-    const viewerStore = useViewerStore()
     return viewerStore.request(
       mesh_polygons_schemas.color,
       { id, color },
@@ -60,7 +63,6 @@ export function useMeshPolygonsStyle() {
   }
   function setMeshPolygonsTextures(id, textures) {
     const coloring_style = meshPolygonsStyle(id).coloring
-    const viewerStore = useViewerStore()
     return viewerStore.request(
       mesh_polygons_schemas.apply_textures,
       { id, textures },
@@ -83,7 +85,6 @@ export function useMeshPolygonsStyle() {
 
   function setMeshPolygonsVertexAttribute(id, vertex_attribute) {
     const coloring_style = meshPolygonsStyle(id).coloring
-    const viewerStore = useViewerStore()
     return viewerStore.request(
       mesh_polygons_schemas.vertex_attribute,
       { id, ...vertex_attribute },
@@ -105,7 +106,6 @@ export function useMeshPolygonsStyle() {
   }
   function setMeshPolygonsPolygonAttribute(id, polygon_attribute) {
     const coloring_style = meshPolygonsStyle(id).coloring
-    const viewerStore = useViewerStore()
     return viewerStore.request(
       mesh_polygons_schemas.polygon_attribute,
       { id, ...polygon_attribute },
diff --git a/internal/stores/mesh/polyhedra.js b/internal/stores/mesh/polyhedra.js
index ac6c0f5a..8cc4a425 100644
--- a/internal/stores/mesh/polyhedra.js
+++ b/internal/stores/mesh/polyhedra.js
@@ -1,11 +1,16 @@
 // Third party imports
 import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schemas.json"
 
+// Local imports
+import { useDataStyleStore } from "@ogw_front/stores/data_style"
+import { useViewerStore } from "@ogw_front/stores/viewer"
+
 // Local constants
 const mesh_polyhedra_schemas = viewer_schemas.opengeodeweb_viewer.mesh.polyhedra
 
 export function useMeshPolyhedraStyle() {
   const dataStyleStore = useDataStyleStore()
+  const viewerStore = useViewerStore()
 
   function meshPolyhedraStyle(id) {
     return dataStyleStore.getStyle(id).polyhedra
@@ -16,7 +21,6 @@ export function useMeshPolyhedraStyle() {
   }
   function setMeshPolyhedraVisibility(id, visibility) {
     const polyhedra_style = meshPolyhedraStyle(id)
-    const viewerStore = useViewerStore()
     return viewerStore.request(
       mesh_polyhedra_schemas.visibility,
       { id, visibility },
@@ -59,7 +63,6 @@ export function useMeshPolyhedraStyle() {
   }
   function setMeshPolyhedraColor(id, color) {
     const coloring = meshPolyhedraStyle(id).coloring
-    const viewerStore = useViewerStore()
     return viewerStore.request(
       mesh_polyhedra_schemas.color,
       { id, color },
diff --git a/internal/stores/model/blocks.js b/internal/stores/model/blocks.js
index a5b7f9d1..67835eaf 100644
--- a/internal/stores/model/blocks.js
+++ b/internal/stores/model/blocks.js
@@ -1,12 +1,18 @@
 // Third party imports
 import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schemas.json"
 
+// Local imports
+import { useDataStyleStore } from "@ogw_front/stores/data_style"
+import { useDataBaseStore } from "@ogw_front/stores/data_base"
+import { useViewerStore } from "@ogw_front/stores/viewer"
+
 // Local constants
 const model_blocks_schemas = viewer_schemas.opengeodeweb_viewer.model.blocks
 
 export function useModelBlocksStyle() {
   const dataStyleStore = useDataStyleStore()
   const dataBaseStore = useDataBaseStore()
+  const viewerStore = useViewerStore()
 
   function modelBlocksStyle(id) {
     return dataStyleStore.getStyle(id).blocks
@@ -27,7 +33,6 @@ export function useModelBlocksStyle() {
   }
   function setModelBlocksVisibility(id, block_ids, visibility) {
     const blocks_flat_indexes = dataBaseStore.getFlatIndexes(id, block_ids)
-    const viewerStore = useViewerStore()
     return viewerStore.request(
       model_blocks_schemas.visibility,
       { id, block_ids: blocks_flat_indexes, visibility },
@@ -56,7 +61,6 @@ export function useModelBlocksStyle() {
 
   function setModelBlocksColor(id, block_ids, color) {
     const blocks_flat_indexes = dataBaseStore.getFlatIndexes(id, block_ids)
-    const viewerStore = useViewerStore()
     return viewerStore.request(
       model_blocks_schemas.color,
       { id, block_ids: blocks_flat_indexes, color },
diff --git a/internal/stores/model/corners.js b/internal/stores/model/corners.js
index 1f440399..6962084b 100644
--- a/internal/stores/model/corners.js
+++ b/internal/stores/model/corners.js
@@ -1,12 +1,18 @@
 // Third party imports
 import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schemas.json"
 
+// Local imports
+import { useDataStyleStore } from "@ogw_front/stores/data_style"
+import { useDataBaseStore } from "@ogw_front/stores/data_base"
+import { useViewerStore } from "@ogw_front/stores/viewer"
+
 // Local constants
 const model_corners_schemas = viewer_schemas.opengeodeweb_viewer.model.corners
 
 export function useModelCornersStyle() {
   const dataStyleStore = useDataStyleStore()
   const dataBaseStore = useDataBaseStore()
+  const viewerStore = useViewerStore()
 
   function modelCornersStyle(id) {
     return dataStyleStore.getStyle(id).corners
@@ -27,7 +33,6 @@ export function useModelCornersStyle() {
   }
   function setModelCornersVisibility(id, corner_ids, visibility) {
     const corner_flat_indexes = dataBaseStore.getFlatIndexes(id, corner_ids)
-    const viewerStore = useViewerStore()
     return viewerStore.request(
       model_corners_schemas.visibility,
       { id, block_ids: corner_flat_indexes, visibility },
@@ -57,7 +62,6 @@ export function useModelCornersStyle() {
 
   function setModelCornersColor(id, corner_ids, color) {
     const corner_flat_indexes = dataBaseStore.getFlatIndexes(id, corner_ids)
-    const viewerStore = useViewerStore()
     return viewerStore.request(
       model_corners_schemas.color,
       { id, block_ids: corner_flat_indexes, color },
diff --git a/internal/stores/model/edges.js b/internal/stores/model/edges.js
index eaed66c8..f979b693 100644
--- a/internal/stores/model/edges.js
+++ b/internal/stores/model/edges.js
@@ -1,11 +1,16 @@
 // Third party imports
 import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schemas.json"
 
+// Local imports
+import { useDataStyleStore } from "@ogw_front/stores/data_style"
+import { useViewerStore } from "@ogw_front/stores/viewer"
+
 // Local constants
 const model_edges_schemas = viewer_schemas.opengeodeweb_viewer.model.edges
 
 export function useModelEdgesStyle() {
   const dataStyleStore = useDataStyleStore()
+  const viewerStore = useViewerStore()
 
   function modelEdgesStyle(id) {
     return dataStyleStore.styles[id].edges
@@ -15,7 +20,6 @@ export function useModelEdgesStyle() {
   }
 
   function setModelEdgesVisibility(id, visibility) {
-    const viewerStore = useViewerStore()
     return viewerStore.request(
       model_edges_schemas.visibility,
       { id, visibility },
diff --git a/internal/stores/model/index.js b/internal/stores/model/index.js
index e1076178..01072011 100644
--- a/internal/stores/model/index.js
+++ b/internal/stores/model/index.js
@@ -2,12 +2,16 @@
 import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schemas.json"
 
 // Local imports
-import { useModelSurfacesStyle } from "./surfaces.js"
-import { useModelCornersStyle } from "./corners.js"
-import { useModelBlocksStyle } from "./blocks.js"
-import { useModelLinesStyle } from "./lines.js"
-import { useModelEdgesStyle } from "./edges.js"
-import { useModelPointsStyle } from "./points.js"
+import { useHybridViewerStore } from "@ogw_front/stores/hybrid_viewer"
+import { useDataStyleStore } from "@ogw_front/stores/data_style"
+import { useDataBaseStore } from "@ogw_front/stores/data_base"
+import { useViewerStore } from "@ogw_front/stores/viewer"
+import { useModelSurfacesStyle } from "./surfaces"
+import { useModelCornersStyle } from "./corners"
+import { useModelBlocksStyle } from "./blocks"
+import { useModelLinesStyle } from "./lines"
+import { useModelEdgesStyle } from "./edges"
+import { useModelPointsStyle } from "./points"
 
 // Local constants
 const model_schemas = viewer_schemas.opengeodeweb_viewer.model
@@ -22,12 +26,12 @@ export default function useModelStyle() {
   const modelPointsStyleStore = useModelPointsStyle()
   const modelSurfacesStyleStore = useModelSurfacesStyle()
   const hybridViewerStore = useHybridViewerStore()
+  const viewerStore = useViewerStore()
 
   function modelVisibility(id) {
     return dataStyleStore.getStyle(id).visibility
   }
   function setModelVisibility(id, visibility) {
-    const viewerStore = useViewerStore()
     return viewerStore.request(
       model_schemas.visibility,
       { id, visibility },
@@ -82,7 +86,6 @@ export default function useModelStyle() {
     return dataStyleStore.getStyle(id).color
   }
   function setModelColor(id, color) {
-    const viewerStore = useViewerStore()
     return viewerStore.request(
       model_schemas.color,
       { id, color },
diff --git a/internal/stores/model/lines.js b/internal/stores/model/lines.js
index 0fd88e9a..620f7641 100644
--- a/internal/stores/model/lines.js
+++ b/internal/stores/model/lines.js
@@ -1,12 +1,18 @@
 // Third party imports
 import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schemas.json"
 
+// Local imports
+import { useDataStyleStore } from "@ogw_front/stores/data_style"
+import { useDataBaseStore } from "@ogw_front/stores/data_base"
+import { useViewerStore } from "@ogw_front/stores/viewer"
+
 // Local constants
 const model_lines_schemas = viewer_schemas.opengeodeweb_viewer.model.lines
 
 export function useModelLinesStyle() {
   const dataStyleStore = useDataStyleStore()
   const dataBaseStore = useDataBaseStore()
+  const viewerStore = useViewerStore()
 
   function modelLinesStyle(id) {
     return dataStyleStore.getStyle(id).lines
@@ -27,7 +33,6 @@ export function useModelLinesStyle() {
   }
   function setModelLinesVisibility(id, line_ids, visibility) {
     const line_flat_indexes = dataBaseStore.getFlatIndexes(id, line_ids)
-    const viewerStore = useViewerStore()
     return viewerStore.request(
       model_lines_schemas.visibility,
       { id, block_ids: line_flat_indexes, visibility },
@@ -55,7 +60,6 @@ export function useModelLinesStyle() {
   }
   function setModelLinesColor(id, line_ids, color) {
     const line_flat_indexes = dataBaseStore.getFlatIndexes(id, line_ids)
-    const viewerStore = useViewerStore()
     return viewerStore.request(
       model_lines_schemas.color,
       { id, block_ids: line_flat_indexes, color },
diff --git a/internal/stores/model/points.js b/internal/stores/model/points.js
index 34f6972c..5cd82d2d 100644
--- a/internal/stores/model/points.js
+++ b/internal/stores/model/points.js
@@ -1,11 +1,16 @@
 // Third party imports
 import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schemas.json"
 
+// Local imports
+import { useDataStyleStore } from "@ogw_front/stores/data_style"
+import { useViewerStore } from "@ogw_front/stores/viewer"
+
 // Local constants
 const model_points_schemas = viewer_schemas.opengeodeweb_viewer.model.points
 
 export function useModelPointsStyle() {
   const dataStyleStore = useDataStyleStore()
+  const viewerStore = useViewerStore()
 
   function modelPointsStyle(id) {
     return dataStyleStore.getStyle(id).points
@@ -14,7 +19,6 @@ export function useModelPointsStyle() {
     return modelPointsStyle(id).visibility
   }
   function setModelPointsVisibility(id, visibility) {
-    const viewerStore = useViewerStore()
     return viewerStore.request(
       model_points_schemas.visibility,
       { id, visibility },
@@ -35,7 +39,6 @@ export function useModelPointsStyle() {
     return modelPointsStyle(id).size
   }
   function setModelPointsSize(id, size) {
-    const viewerStore = useViewerStore()
     return viewerStore.request(
       model_points_schemas.size,
       { id, size },
diff --git a/internal/stores/model/surfaces.js b/internal/stores/model/surfaces.js
index ee97b9d3..efe6f539 100644
--- a/internal/stores/model/surfaces.js
+++ b/internal/stores/model/surfaces.js
@@ -1,12 +1,18 @@
 // Third party imports
 import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schemas.json"
 
+// Local imports
+import { useDataBaseStore } from "@ogw_front/stores/data_base"
+import { useDataStyleStore } from "@ogw_front/stores/data_style"
+import { useViewerStore } from "@ogw_front/stores/viewer"
+
 // Local constants
 const model_surfaces_schemas = viewer_schemas.opengeodeweb_viewer.model.surfaces
 
 export function useModelSurfacesStyle() {
   const dataStyleStore = useDataStyleStore()
   const dataBaseStore = useDataBaseStore()
+  const viewerStore = useViewerStore()
 
   function modelSurfacesStyle(id) {
     return dataStyleStore.getStyle(id).surfaces
@@ -26,7 +32,6 @@ export function useModelSurfacesStyle() {
   }
   function setModelSurfacesVisibility(id, surface_ids, visibility) {
     const surface_flat_indexes = dataBaseStore.getFlatIndexes(id, surface_ids)
-    const viewerStore = useViewerStore()
     return viewerStore.request(
       model_surfaces_schemas.visibility,
       { id, block_ids: surface_flat_indexes, visibility },
@@ -54,7 +59,6 @@ export function useModelSurfacesStyle() {
 
   function setModelSurfacesColor(id, surface_ids, color) {
     const surface_flat_indexes = dataBaseStore.getFlatIndexes(id, surface_ids)
-    const viewerStore = useViewerStore()
     return viewerStore.request(
       model_surfaces_schemas.color,
       { id, block_ids: surface_flat_indexes, color },
diff --git a/internal/utils/api_fetch.js b/internal/utils/api_fetch.js
index e8437605..caa4ba53 100644
--- a/internal/utils/api_fetch.js
+++ b/internal/utils/api_fetch.js
@@ -1,5 +1,6 @@
 import _ from "lodash"
-import validate_schema from "@/app/utils/validate_schema.js"
+import validate_schema from "@ogw_front/utils/validate_schema"
+import { useFeedbackStore } from "@ogw_front/stores/feedback"
 
 export function api_fetch(
   microservice,
diff --git a/internal/utils/viewer_call.js b/internal/utils/viewer_call.js
index 7e7cc88c..72c23978 100644
--- a/internal/utils/viewer_call.js
+++ b/internal/utils/viewer_call.js
@@ -1,11 +1,12 @@
-import validate_schema from "~/app/utils/validate_schema.js"
+import validate_schema from "@ogw_front/utils/validate_schema"
+import { useFeedbackStore } from "@ogw_front/stores/feedback"
 
 export function viewer_call(
   microservice,
   { schema, params = {} },
   { request_error_function, response_function, response_error_function } = {},
 ) {
-  const feedback_store = useFeedbackStore()
+  const feedbackStore = useFeedbackStore()
 
   const { valid, error } = validate_schema(schema, params)
 
@@ -13,7 +14,7 @@ export function viewer_call(
     if (process.env.NODE_ENV !== "production") {
       console.log("Bad request", error, schema, params)
     }
-    feedback_store.add_error(400, schema.$id, "Bad request", error)
+    feedbackStore.add_error(400, schema.$id, "Bad request", error)
     throw new Error(schema.$id.concat(": ", error))
   }
 
@@ -44,7 +45,7 @@ export function viewer_call(
         },
       )
       .catch((error) => {
-        feedback_store.add_error(
+        feedbackStore.add_error(
           error.code,
           schema.$id,
           error.message,
diff --git a/nuxt.config.js b/nuxt.config.js
index 548085d3..c7b8d207 100644
--- a/nuxt.config.js
+++ b/nuxt.config.js
@@ -16,7 +16,7 @@ export default defineNuxtConfig({
     "@vueuse/nuxt",
   ],
   imports: {
-    dirs: ["app/stores", "app/composables", "app/utils", "internal/utils"],
+    scan: false,
   },
 
   alias: {
@@ -37,8 +37,6 @@ export default defineNuxtConfig({
     },
   },
 
-  testUtils: {},
-
   vite: {
     optimizeDeps: {
       include: [
diff --git a/package.json b/package.json
index 605388c2..da32ceaa 100644
--- a/package.json
+++ b/package.json
@@ -10,9 +10,9 @@
     "build": ""
   },
   "devDependencies": {
-    "@nuxt/test-utils": "3.20.1",
+    "@nuxt/test-utils": "3.21.0",
     "@pinia/testing": "1.0.3",
-    "@vitejs/plugin-vue": "5.2.3",
+    "@vitejs/plugin-vue": "5.2.4",
     "@vue/test-utils": "2.4.6",
     "electron": "36.4.0",
     "eslint": "9.26.0",
@@ -22,13 +22,12 @@
     "eslint-plugin-prettier-vue": "5.0.0",
     "eslint-plugin-vue": "10.1.0",
     "eslint-plugin-vuetify": "2.5.2",
-    "happy-dom": "17.4.6",
-    "jsdom": "26.1.0",
+    "happy-dom": "20.0.11",
     "msw": "2.11.1",
     "playwright-core": "1.52.0",
     "prettier": "3.3.3",
     "resize-observer-polyfill": "1.5.1",
-    "unplugin-auto-import": "^20.0.0",
+    "unplugin-auto-import": "20.0.0",
     "vite": "6.3.5",
     "vite-plugin-vuetify": "2.1.1",
     "vitest": "3.2.4",
@@ -54,7 +53,7 @@
     "get-port-please": "3.2.0",
     "is-electron": "2.2.2",
     "js-file-download": "0.4.12",
-    "nuxt": "3.20.1",
+    "nuxt": "4.2.2",
     "pinia": "3.0.4",
     "sass": "1.87.0",
     "semver": "7.7.1",
diff --git a/scripts/generate_geode_objects.js b/scripts/generate_geode_objects.js
index 42bbb95f..320e1096 100644
--- a/scripts/generate_geode_objects.js
+++ b/scripts/generate_geode_objects.js
@@ -2,7 +2,7 @@ import * as path from "path"
 import * as fs from "fs"
 import * as process from "process"
 
-const output_file = path.join(process.cwd(), "assets/geode_objects.js")
+const output_file = path.join(process.cwd(), "assets/geode_objects")
 
 if (fs.existsSync(output_file)) {
   fs.unlinkSync(output_file)
diff --git a/tests/integration/microservices/back/requirements.txt b/tests/integration/microservices/back/requirements.txt
index efd7a33c..bd3a3ef5 100644
--- a/tests/integration/microservices/back/requirements.txt
+++ b/tests/integration/microservices/back/requirements.txt
@@ -5,4 +5,3 @@
 #    pip-compile --output-file=tests/integration/microservices/back/requirements.txt tests/integration/microservices/back/requirements.in
 #
 
-opengeodeweb-back==5.*,>=5.14.1rc1
diff --git a/tests/integration/microservices/viewer/requirements.txt b/tests/integration/microservices/viewer/requirements.txt
index 0c664f11..4d097394 100644
--- a/tests/integration/microservices/viewer/requirements.txt
+++ b/tests/integration/microservices/viewer/requirements.txt
@@ -5,4 +5,3 @@
 #    pip-compile --output-file=tests/integration/microservices/viewer/requirements.txt tests/integration/microservices/viewer/requirements.in
 #
 
-opengeodeweb-viewer==1.*,>=1.13.2rc21
diff --git a/tests/integration/setup.js b/tests/integration/setup.js
index f6ef46fb..073203b7 100644
--- a/tests/integration/setup.js
+++ b/tests/integration/setup.js
@@ -32,7 +32,7 @@ async function setupIntegrationTests(file_name, geode_object) {
   })
   setActivePinia(pinia)
   const geodeStore = useGeodeStore()
-  const hybridViewerStore = useHybridViewerStore()
+  // const hybridViewerStore = useHybridViewerStore()
   const infraStore = useInfraStore()
   const viewerStore = useViewerStore()
   infraStore.app_mode = appMode.BROWSER
diff --git a/tests/integration/stores/data_style/mesh/cells.nuxt.test.js b/tests/integration/stores/data_style/mesh/cells.nuxt.test.js
index 3e6a923d..075864a6 100644
--- a/tests/integration/stores/data_style/mesh/cells.nuxt.test.js
+++ b/tests/integration/stores/data_style/mesh/cells.nuxt.test.js
@@ -4,12 +4,14 @@ import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schem
 
 // Local imports
 import Status from "@ogw_front/utils/status"
+import { useDataStyleStore } from "@ogw_front/stores/data_style"
+import { useViewerStore } from "@ogw_front/stores/viewer"
 import {
   delete_folder_recursive,
   kill_back,
   kill_viewer,
 } from "@ogw_front/utils/local"
-import { setupIntegrationTests } from "../../../setup.js"
+import { setupIntegrationTests } from "../../../setup"
 
 // Local constants
 const mesh_cells_schemas = viewer_schemas.opengeodeweb_viewer.mesh.cells
diff --git a/tests/integration/stores/data_style/mesh/edges.nuxt.test.js b/tests/integration/stores/data_style/mesh/edges.nuxt.test.js
index 550ac8a8..56130974 100644
--- a/tests/integration/stores/data_style/mesh/edges.nuxt.test.js
+++ b/tests/integration/stores/data_style/mesh/edges.nuxt.test.js
@@ -4,12 +4,14 @@ import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schem
 
 // Local imports
 import Status from "@ogw_front/utils/status"
+import { useDataStyleStore } from "@ogw_front/stores/data_style"
+import { useViewerStore } from "@ogw_front/stores/viewer"
 import {
   delete_folder_recursive,
   kill_back,
   kill_viewer,
 } from "@ogw_front/utils/local"
-import { setupIntegrationTests } from "../../../setup.js"
+import { setupIntegrationTests } from "../../../setup"
 
 // Local constants
 const mesh_edges_schemas = viewer_schemas.opengeodeweb_viewer.mesh.edges
diff --git a/tests/integration/stores/data_style/mesh/index.nuxt.test.js b/tests/integration/stores/data_style/mesh/index.nuxt.test.js
index 45b5a6a7..b74c1e56 100644
--- a/tests/integration/stores/data_style/mesh/index.nuxt.test.js
+++ b/tests/integration/stores/data_style/mesh/index.nuxt.test.js
@@ -4,12 +4,14 @@ import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schem
 
 // Local imports
 import Status from "@ogw_front/utils/status"
+import { useDataStyleStore } from "@ogw_front/stores/data_style"
+import { useViewerStore } from "@ogw_front/stores/viewer"
 import {
   delete_folder_recursive,
   kill_back,
   kill_viewer,
 } from "@ogw_front/utils/local"
-import { setupIntegrationTests } from "../../../setup.js"
+import { setupIntegrationTests } from "../../../setup"
 
 // Local constants
 const mesh_schemas = viewer_schemas.opengeodeweb_viewer.mesh
diff --git a/tests/integration/stores/data_style/mesh/points.nuxt.test.js b/tests/integration/stores/data_style/mesh/points.nuxt.test.js
index 201d14f1..90df2076 100644
--- a/tests/integration/stores/data_style/mesh/points.nuxt.test.js
+++ b/tests/integration/stores/data_style/mesh/points.nuxt.test.js
@@ -4,12 +4,14 @@ import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schem
 
 // Local imports
 import Status from "@ogw_front/utils/status"
+import { useDataStyleStore } from "@ogw_front/stores/data_style"
+import { useViewerStore } from "@ogw_front/stores/viewer"
 import {
   delete_folder_recursive,
   kill_back,
   kill_viewer,
 } from "@ogw_front/utils/local"
-import { setupIntegrationTests } from "../../../setup.js"
+import { setupIntegrationTests } from "../../../setup"
 
 // Local constants
 const mesh_points_schemas = viewer_schemas.opengeodeweb_viewer.mesh.points
diff --git a/tests/integration/stores/data_style/mesh/polygons.nuxt.test.js b/tests/integration/stores/data_style/mesh/polygons.nuxt.test.js
index 983e8029..b445d919 100644
--- a/tests/integration/stores/data_style/mesh/polygons.nuxt.test.js
+++ b/tests/integration/stores/data_style/mesh/polygons.nuxt.test.js
@@ -4,12 +4,14 @@ import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schem
 
 // Local imports
 import Status from "@ogw_front/utils/status"
+import { useDataStyleStore } from "@ogw_front/stores/data_style"
+import { useViewerStore } from "@ogw_front/stores/viewer"
 import {
   delete_folder_recursive,
   kill_back,
   kill_viewer,
 } from "@ogw_front/utils/local"
-import { setupIntegrationTests } from "../../../setup.js"
+import { setupIntegrationTests } from "../../../setup"
 
 // Local constants
 const mesh_polygons_schemas = viewer_schemas.opengeodeweb_viewer.mesh.polygons
diff --git a/tests/integration/stores/data_style/mesh/polyhedra.nuxt.test.js b/tests/integration/stores/data_style/mesh/polyhedra.nuxt.test.js
index ca7b104e..63399496 100644
--- a/tests/integration/stores/data_style/mesh/polyhedra.nuxt.test.js
+++ b/tests/integration/stores/data_style/mesh/polyhedra.nuxt.test.js
@@ -4,12 +4,14 @@ import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schem
 
 // Local imports
 import Status from "@ogw_front/utils/status"
+import { useDataStyleStore } from "@ogw_front/stores/data_style"
+import { useViewerStore } from "@ogw_front/stores/viewer"
 import {
   delete_folder_recursive,
   kill_back,
   kill_viewer,
 } from "@ogw_front/utils/local"
-import { setupIntegrationTests } from "../../../setup.js"
+import { setupIntegrationTests } from "../../../setup"
 
 // Local constants
 const mesh_polyhedra_schemas = viewer_schemas.opengeodeweb_viewer.mesh.polyhedra
diff --git a/tests/integration/stores/data_style/model/blocks.nuxt.test.js b/tests/integration/stores/data_style/model/blocks.nuxt.test.js
index ec085b0c..fc8af543 100644
--- a/tests/integration/stores/data_style/model/blocks.nuxt.test.js
+++ b/tests/integration/stores/data_style/model/blocks.nuxt.test.js
@@ -4,12 +4,15 @@ import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schem
 
 // Local imports
 import Status from "@ogw_front/utils/status"
+import { useDataStyleStore } from "@ogw_front/stores/data_style"
+import { useViewerStore } from "@ogw_front/stores/viewer"
+import { useDataBaseStore } from "@ogw_front/stores/data_base"
 import {
   delete_folder_recursive,
   kill_back,
   kill_viewer,
 } from "@ogw_front/utils/local"
-import { setupIntegrationTests } from "../../../setup.js"
+import { setupIntegrationTests } from "../../../setup"
 
 // Local constants
 const model_blocks_schemas = viewer_schemas.opengeodeweb_viewer.model.blocks
diff --git a/tests/integration/stores/data_style/model/corners.nuxt.test.js b/tests/integration/stores/data_style/model/corners.nuxt.test.js
index f71e849a..bfbd1b5f 100644
--- a/tests/integration/stores/data_style/model/corners.nuxt.test.js
+++ b/tests/integration/stores/data_style/model/corners.nuxt.test.js
@@ -4,12 +4,15 @@ import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schem
 
 // Local imports
 import Status from "@ogw_front/utils/status"
+import { useDataStyleStore } from "@ogw_front/stores/data_style"
+import { useViewerStore } from "@ogw_front/stores/viewer"
+import { useDataBaseStore } from "@ogw_front/stores/data_base"
 import {
   delete_folder_recursive,
   kill_back,
   kill_viewer,
 } from "@ogw_front/utils/local"
-import { setupIntegrationTests } from "../../../setup.js"
+import { setupIntegrationTests } from "../../../setup"
 
 // Local constants
 const model_corners_schemas = viewer_schemas.opengeodeweb_viewer.model.corners
diff --git a/tests/integration/stores/data_style/model/edges.nuxt.test.js b/tests/integration/stores/data_style/model/edges.nuxt.test.js
index 17a4b0a7..643fa106 100644
--- a/tests/integration/stores/data_style/model/edges.nuxt.test.js
+++ b/tests/integration/stores/data_style/model/edges.nuxt.test.js
@@ -4,12 +4,14 @@ import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schem
 
 // Local imports
 import Status from "@ogw_front/utils/status"
+import { useDataStyleStore } from "@ogw_front/stores/data_style"
+import { useViewerStore } from "@ogw_front/stores/viewer"
 import {
   delete_folder_recursive,
   kill_back,
   kill_viewer,
 } from "@ogw_front/utils/local"
-import { setupIntegrationTests } from "../../../setup.js"
+import { setupIntegrationTests } from "../../../setup"
 
 // Local constants
 const model_edges_schemas = viewer_schemas.opengeodeweb_viewer.model.edges
diff --git a/tests/integration/stores/data_style/model/index.nuxt.test.js b/tests/integration/stores/data_style/model/index.nuxt.test.js
index 461f3cf4..752336c2 100644
--- a/tests/integration/stores/data_style/model/index.nuxt.test.js
+++ b/tests/integration/stores/data_style/model/index.nuxt.test.js
@@ -4,12 +4,14 @@ import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schem
 
 // Local imports
 import Status from "@ogw_front/utils/status"
+import { useDataStyleStore } from "@ogw_front/stores/data_style"
+import { useViewerStore } from "@ogw_front/stores/viewer"
 import {
   delete_folder_recursive,
   kill_back,
   kill_viewer,
 } from "@ogw_front/utils/local"
-import { setupIntegrationTests } from "../../../setup.js"
+import { setupIntegrationTests } from "../../../setup"
 
 // Local constants
 const model_schemas = viewer_schemas.opengeodeweb_viewer.model
diff --git a/tests/integration/stores/data_style/model/lines.nuxt.test.js b/tests/integration/stores/data_style/model/lines.nuxt.test.js
index 5bdbcf5a..aeb38331 100644
--- a/tests/integration/stores/data_style/model/lines.nuxt.test.js
+++ b/tests/integration/stores/data_style/model/lines.nuxt.test.js
@@ -4,12 +4,15 @@ import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schem
 
 // Local imports
 import Status from "@ogw_front/utils/status"
+import { useDataStyleStore } from "@ogw_front/stores/data_style"
+import { useViewerStore } from "@ogw_front/stores/viewer"
+import { useDataBaseStore } from "@ogw_front/stores/data_base"
 import {
   delete_folder_recursive,
   kill_back,
   kill_viewer,
 } from "@ogw_front/utils/local"
-import { setupIntegrationTests } from "../../../setup.js"
+import { setupIntegrationTests } from "../../../setup"
 
 // Local constants
 const model_lines_schemas = viewer_schemas.opengeodeweb_viewer.model.lines
diff --git a/tests/integration/stores/data_style/model/points.nuxt.test.js b/tests/integration/stores/data_style/model/points.nuxt.test.js
index 63406145..4e3bced7 100644
--- a/tests/integration/stores/data_style/model/points.nuxt.test.js
+++ b/tests/integration/stores/data_style/model/points.nuxt.test.js
@@ -4,13 +4,14 @@ import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schem
 
 // Local imports
 import Status from "@ogw_front/utils/status"
+import { useDataStyleStore } from "@ogw_front/stores/data_style"
 import { useViewerStore } from "@ogw_front/stores/viewer"
 import {
   delete_folder_recursive,
   kill_back,
   kill_viewer,
 } from "@ogw_front/utils/local"
-import { setupIntegrationTests } from "../../../setup.js"
+import { setupIntegrationTests } from "../../../setup"
 
 // Local constants
 const model_points_schemas = viewer_schemas.opengeodeweb_viewer.model.points
diff --git a/tests/integration/stores/data_style/model/surfaces.nuxt.test.js b/tests/integration/stores/data_style/model/surfaces.nuxt.test.js
index 02339183..71515f55 100644
--- a/tests/integration/stores/data_style/model/surfaces.nuxt.test.js
+++ b/tests/integration/stores/data_style/model/surfaces.nuxt.test.js
@@ -4,12 +4,15 @@ import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schem
 
 // Local imports
 import Status from "@ogw_front/utils/status"
+import { useDataStyleStore } from "@ogw_front/stores/data_style"
+import { useDataBaseStore } from "@ogw_front/stores/data_base"
+import { useViewerStore } from "@ogw_front/stores/viewer"
 import {
   delete_folder_recursive,
   kill_back,
   kill_viewer,
 } from "@ogw_front/utils/local"
-import { setupIntegrationTests } from "../../../setup.js"
+import { setupIntegrationTests } from "../../../setup"
 
 // Local constants
 const model_surfaces_schemas = viewer_schemas.opengeodeweb_viewer.model.surfaces
diff --git a/tests/unit/components/CrsSelector.nuxt.test.js b/tests/unit/components/CrsSelector.nuxt.test.js
index 8614f678..a66c0a3f 100644
--- a/tests/unit/components/CrsSelector.nuxt.test.js
+++ b/tests/unit/components/CrsSelector.nuxt.test.js
@@ -7,9 +7,11 @@ import { createVuetify } from "vuetify"
 import * as components from "vuetify/components"
 import * as directives from "vuetify/directives"
 
-import CrsSelector from "@ogw_front/components/CrsSelector.vue"
 import schemas from "@geode/opengeodeweb-back/opengeodeweb_back_schemas.json"
 
+import CrsSelector from "@ogw_front/components/CrsSelector"
+import { useGeodeStore } from "@ogw_front/stores/geode"
+
 const crs_selector_schema =
   schemas.opengeodeweb_back.geographic_coordinate_systems
 
@@ -18,7 +20,7 @@ const vuetify = createVuetify({
   directives,
 })
 
-describe("CrsSelector.vue", () => {
+describe("CrsSelector", () => {
   const pinia = createTestingPinia({
     stubActions: false,
     createSpy: vi.fn,
diff --git a/tests/unit/components/ExtensionSelector.nuxt.test.js b/tests/unit/components/ExtensionSelector.nuxt.test.js
index e855b90b..b176b831 100644
--- a/tests/unit/components/ExtensionSelector.nuxt.test.js
+++ b/tests/unit/components/ExtensionSelector.nuxt.test.js
@@ -7,7 +7,9 @@ import * as directives from "vuetify/directives"
 import { setActivePinia } from "pinia"
 import { createTestingPinia } from "@pinia/testing"
 
-import ExtensionSelector from "@ogw_front/components/ExtensionSelector.vue"
+import ExtensionSelector from "@ogw_front/components/ExtensionSelector"
+
+import { useGeodeStore } from "@ogw_front/stores/geode"
 
 import schemas from "@geode/opengeodeweb-back/opengeodeweb_back_schemas.json"
 
@@ -18,7 +20,7 @@ const vuetify = createVuetify({
   directives,
 })
 
-describe("ExtensionSelector.vue", async () => {
+describe("ExtensionSelector", async () => {
   const pinia = createTestingPinia({
     stubActions: false,
     createSpy: vi.fn,
diff --git a/tests/unit/components/FeedBack/ErrorsBanner.nuxt.test.js b/tests/unit/components/FeedBack/ErrorsBanner.nuxt.test.js
index 70c3e143..3d849589 100644
--- a/tests/unit/components/FeedBack/ErrorsBanner.nuxt.test.js
+++ b/tests/unit/components/FeedBack/ErrorsBanner.nuxt.test.js
@@ -4,16 +4,17 @@ import { createVuetify } from "vuetify"
 import * as components from "vuetify/components"
 import * as directives from "vuetify/directives"
 import { createTestingPinia } from "@pinia/testing"
-
-import FeedBackErrorBanner from "@ogw_front/components/FeedBack/ErrorBanner.vue"
 import { setActivePinia } from "pinia"
 
+import FeedBackErrorBanner from "@ogw_front/components/FeedBack/ErrorBanner"
+import { useFeedbackStore } from "@ogw_front/stores/feedback"
+
 const vuetify = createVuetify({
   components,
   directives,
 })
 
-describe("FeedBackErrorBanner.vue", async () => {
+describe("FeedBackErrorBanner", async () => {
   ;(test(`Test reload`, async () => {
     const pinia = createTestingPinia({
       stubActions: false,
@@ -26,9 +27,9 @@ describe("FeedBackErrorBanner.vue", async () => {
       },
     })
     const reload_spy = vi.spyOn(wrapper.vm, "reload")
-    const feedback_store = useFeedbackStore()
-    await feedback_store.$patch({ server_error: true })
-    expect(feedback_store.server_error).toBe(true)
+    const feedbackStore = useFeedbackStore()
+    await feedbackStore.$patch({ server_error: true })
+    expect(feedbackStore.server_error).toBe(true)
     const v_btn = wrapper.findAll(".v-btn")
     await v_btn[0].trigger("click")
     expect(reload_spy).toHaveBeenCalledTimes(1)
@@ -51,9 +52,9 @@ describe("FeedBackErrorBanner.vue", async () => {
         },
       })
 
-      const feedback_store = useFeedbackStore()
+      const feedbackStore = useFeedbackStore()
       const v_btn = wrapper.findAll(".v-btn")
       await v_btn[1].trigger("click")
-      expect(feedback_store.server_error).toBe(false)
+      expect(feedbackStore.server_error).toBe(false)
     }))
 })
diff --git a/tests/unit/components/FeedBack/Snackers.nuxt.test.js b/tests/unit/components/FeedBack/Snackers.nuxt.test.js
index f093d19e..8d6674cc 100644
--- a/tests/unit/components/FeedBack/Snackers.nuxt.test.js
+++ b/tests/unit/components/FeedBack/Snackers.nuxt.test.js
@@ -9,14 +9,15 @@ import * as directives from "vuetify/directives"
 import { setActivePinia } from "pinia"
 import { createTestingPinia } from "@pinia/testing"
 
-import FeedBackSnackers from "@ogw_front/components/FeedBack/Snackers.vue"
+import FeedBackSnackers from "@ogw_front/components/FeedBack/Snackers"
+import { useFeedbackStore } from "@ogw_front/stores/feedback"
 
 const vuetify = createVuetify({
   components,
   directives,
 })
 
-describe("FeedBackSnackers.vue", async () => {
+describe("FeedBackSnackers", async () => {
   test(`Test delete error`, async () => {
     const pinia = createTestingPinia({
       initialState: {
@@ -36,7 +37,7 @@ describe("FeedBackSnackers.vue", async () => {
       createSpy: vi.fn,
     })
     setActivePinia(pinia)
-    const feedback_store = useFeedbackStore()
+    const feedbackStore = useFeedbackStore()
     const wrapper = mount(
       {
         template: "<v-layout><FeedBackSnackers/></v-layout>",
@@ -52,9 +53,9 @@ describe("FeedBackSnackers.vue", async () => {
       },
     )
 
-    expect(feedback_store.feedbacks.length).toBe(1)
+    expect(feedbackStore.feedbacks.length).toBe(1)
     const v_btn = await wrapper.findComponent(components.VBtn)
     await v_btn.trigger("click")
-    expect(feedback_store.feedbacks.length).toBe(0)
+    expect(feedbackStore.feedbacks.length).toBe(0)
   })
 })
diff --git a/tests/unit/components/FileSelector.nuxt.test.js b/tests/unit/components/FileSelector.nuxt.test.js
index b4d248f0..2db643fe 100644
--- a/tests/unit/components/FileSelector.nuxt.test.js
+++ b/tests/unit/components/FileSelector.nuxt.test.js
@@ -9,11 +9,12 @@ import * as directives from "vuetify/directives"
 import { setActivePinia } from "pinia"
 import { createTestingPinia } from "@pinia/testing"
 
-import FileSelector from "@ogw_front/components/FileSelector.vue"
-import FileUploader from "@ogw_front/components/FileUploader.vue"
-
 import schemas from "@geode/opengeodeweb-back/opengeodeweb_back_schemas.json"
 
+import FileSelector from "@ogw_front/components/FileSelector"
+import FileUploader from "@ogw_front/components/FileUploader"
+import { useGeodeStore } from "@ogw_front/stores/geode"
+
 const allowed_files_schema = schemas.opengeodeweb_back.allowed_files
 const upload_file_schema = schemas.opengeodeweb_back.upload_file
 
@@ -22,7 +23,7 @@ const vuetify = createVuetify({
   directives,
 })
 
-describe("FileSelector.vue", async () => {
+describe("FileSelector", async () => {
   const pinia = createTestingPinia({
     stubActions: false,
     createSpy: vi.fn,
@@ -42,7 +43,7 @@ describe("FileSelector.vue", async () => {
       global: {
         plugins: [vuetify, pinia],
       },
-      props: { multiple: false, supported_feature: "test", auto_upload: false },
+      props: { multiple: false, auto_upload: false },
     })
 
     const file_uploader = wrapper.findComponent(FileUploader)
@@ -91,7 +92,6 @@ describe("FileSelector.vue", async () => {
         },
         props: {
           multiple: false,
-          supported_feature: "test",
           files: files,
           auto_upload: true,
         },
@@ -114,7 +114,6 @@ describe("FileSelector.vue", async () => {
         },
         props: {
           multiple: false,
-          supported_feature: "test",
           files: files,
           auto_upload: false,
         },
diff --git a/tests/unit/components/FileUploader.nuxt.test.js b/tests/unit/components/FileUploader.nuxt.test.js
index 0dbc9d0e..830be419 100644
--- a/tests/unit/components/FileUploader.nuxt.test.js
+++ b/tests/unit/components/FileUploader.nuxt.test.js
@@ -8,10 +8,11 @@ import * as directives from "vuetify/directives"
 import { setActivePinia } from "pinia"
 import { createTestingPinia } from "@pinia/testing"
 
-import FileUploader from "@ogw_front/components/FileUploader.vue"
-
 import schemas from "@geode/opengeodeweb-back/opengeodeweb_back_schemas.json"
 
+import FileUploader from "@ogw_front/components/FileUploader"
+import { useGeodeStore } from "@ogw_front/stores/geode"
+
 const upload_file_schema = schemas.opengeodeweb_back.upload_file
 
 const vuetify = createVuetify({
@@ -19,7 +20,7 @@ const vuetify = createVuetify({
   directives,
 })
 
-describe("FileUploader.vue", async () => {
+describe("FileUploader", async () => {
   const pinia = createTestingPinia({
     stubActions: false,
     createSpy: vi.fn,
diff --git a/tests/unit/components/Inspector/InspectionButton.nuxt.test.js b/tests/unit/components/Inspector/InspectionButton.nuxt.test.js
index 5ade127b..d320dc40 100644
--- a/tests/unit/components/Inspector/InspectionButton.nuxt.test.js
+++ b/tests/unit/components/Inspector/InspectionButton.nuxt.test.js
@@ -8,8 +8,9 @@ import * as directives from "vuetify/directives"
 import { setActivePinia } from "pinia"
 import { createTestingPinia } from "@pinia/testing"
 
-import InspectorInspectionButton from "@ogw_front/components/Inspector/InspectionButton.vue"
 import schemas from "@geode/opengeodeweb-back/opengeodeweb_back_schemas.json"
+import InspectorInspectionButton from "@ogw_front/components/Inspector/InspectionButton"
+import { useGeodeStore } from "@ogw_front/stores/geode"
 const schema = schemas.opengeodeweb_back.inspect_file
 
 const vuetify = createVuetify({
@@ -17,7 +18,7 @@ const vuetify = createVuetify({
   directives,
 })
 
-describe("Inspector/InspectionButton.vue", async () => {
+describe("Inspector/InspectionButton", async () => {
   const pinia = createTestingPinia({
     stubActions: false,
     createSpy: vi.fn,
diff --git a/tests/unit/components/Inspector/ResultPanel.nuxt.test.js b/tests/unit/components/Inspector/ResultPanel.nuxt.test.js
index 4a44d345..fac72a56 100644
--- a/tests/unit/components/Inspector/ResultPanel.nuxt.test.js
+++ b/tests/unit/components/Inspector/ResultPanel.nuxt.test.js
@@ -5,14 +5,14 @@ import { createVuetify } from "vuetify"
 import * as components from "vuetify/components"
 import * as directives from "vuetify/directives"
 
-import InspectorResultPanel from "@ogw_front/components/Inspector/ResultPanel.vue"
+import InspectorResultPanel from "@ogw_front/components/Inspector/ResultPanel"
 
 const vuetify = createVuetify({
   components,
   directives,
 })
 
-describe("Inspector/ResultPanel.vue", async () => {
+describe("Inspector/ResultPanel", async () => {
   test(`Test with issues`, async () => {
     const inspection_result = [
       {
@@ -30,7 +30,6 @@ describe("Inspector/ResultPanel.vue", async () => {
     })
 
     expect(wrapper.exists()).toBe(true)
-    expect(wrapper.componentVM.opened_panels._value).toStrictEqual([0])
     expect(wrapper.componentVM.props.inspection_result).toStrictEqual(
       inspection_result,
     )
@@ -58,7 +57,9 @@ describe("Inspector/ResultPanel.vue", async () => {
     })
 
     expect(wrapper.exists()).toBe(true)
-    expect(wrapper.componentVM.opened_panels._value).toStrictEqual([])
+
+    console.log({ wrapper })
+
     expect(wrapper.componentVM.props.inspection_result).toStrictEqual(
       inspection_result,
     )
diff --git a/tests/unit/components/Launcher.nuxt.test.js b/tests/unit/components/Launcher.nuxt.test.js
index 2c3bd12d..bb9067cb 100644
--- a/tests/unit/components/Launcher.nuxt.test.js
+++ b/tests/unit/components/Launcher.nuxt.test.js
@@ -9,7 +9,9 @@ import * as directives from "vuetify/directives"
 import { setActivePinia } from "pinia"
 import { createTestingPinia } from "@pinia/testing"
 
-import Launcher from "@ogw_front/components/Launcher.vue"
+import Launcher from "@ogw_front/components/Launcher"
+
+import { useInfraStore } from "@ogw_front/stores/infra"
 
 const vuetify = createVuetify({
   components,
@@ -30,22 +32,22 @@ vi.stubGlobal("navigator", {
 
 global.ResizeObserver = require("resize-observer-polyfill")
 
-describe("Launcher.vue", async () => {
+describe("Launcher", async () => {
   test(`Mount`, async () => {
     const pinia = createTestingPinia({
       stubActions: false,
       createSpy: vi.fn,
     })
     setActivePinia(pinia)
-    const infra_store = useInfraStore()
+    const infraStore = useInfraStore()
     const wrapper = await mountSuspended(Launcher, {
       global: {
         plugins: [pinia, vuetify],
       },
     })
     expect(wrapper.exists()).toBe(true)
-    await infra_store.$patch({ is_captcha_validated: true })
+    await infraStore.$patch({ is_captcha_validated: true })
     await flushPromises()
-    expect(infra_store.create_backend).toHaveBeenCalled()
+    expect(infraStore.create_backend).toHaveBeenCalled()
   })
 })
diff --git a/tests/unit/components/MissingFilesSelector.nuxt.test.js b/tests/unit/components/MissingFilesSelector.nuxt.test.js
index 3745ef3d..977eeaef 100644
--- a/tests/unit/components/MissingFilesSelector.nuxt.test.js
+++ b/tests/unit/components/MissingFilesSelector.nuxt.test.js
@@ -8,11 +8,12 @@ import * as directives from "vuetify/directives"
 import { setActivePinia } from "pinia"
 import { createTestingPinia } from "@pinia/testing"
 
-import MissingFilesSelector from "@ogw_front/components/MissingFilesSelector.vue"
-import FileUploader from "@ogw_front/components/FileUploader.vue"
-
 import schemas from "@geode/opengeodeweb-back/opengeodeweb_back_schemas.json"
 
+import MissingFilesSelector from "@ogw_front/components/MissingFilesSelector"
+import FileUploader from "@ogw_front/components/FileUploader"
+import { useGeodeStore } from "@ogw_front/stores/geode"
+
 const missing_files_schema = schemas.opengeodeweb_back.missing_files
 const upload_file_schema = schemas.opengeodeweb_back.upload_file
 
@@ -21,7 +22,7 @@ const vuetify = createVuetify({
   directives,
 })
 
-describe("MissingFilesSelector.vue", async () => {
+describe("MissingFilesSelector", async () => {
   const pinia = createTestingPinia({
     stubActions: false,
     createSpy: vi.fn,
diff --git a/tests/unit/components/ObjectSelector.nuxt.test.js b/tests/unit/components/ObjectSelector.nuxt.test.js
index 6013d2e6..ed7fddc8 100644
--- a/tests/unit/components/ObjectSelector.nuxt.test.js
+++ b/tests/unit/components/ObjectSelector.nuxt.test.js
@@ -8,7 +8,9 @@ import * as directives from "vuetify/directives"
 import { setActivePinia } from "pinia"
 import { createTestingPinia } from "@pinia/testing"
 
-import ObjectSelector from "@ogw_front/components/ObjectSelector.vue"
+import ObjectSelector from "@ogw_front/components/ObjectSelector"
+
+import { useGeodeStore } from "@ogw_front/stores/geode"
 
 import schemas from "@geode/opengeodeweb-back/opengeodeweb_back_schemas.json"
 
@@ -19,7 +21,7 @@ const vuetify = createVuetify({
   directives,
 })
 
-describe("ObjectSelector.vue", async () => {
+describe("ObjectSelector", async () => {
   const pinia = createTestingPinia({
     stubActions: false,
     createSpy: vi.fn,
@@ -42,7 +44,7 @@ describe("ObjectSelector.vue", async () => {
       global: {
         plugins: [vuetify, pinia],
       },
-      props: { filenames: ["test.toto"], supported_feature: "test" },
+      props: { filenames: ["test.toto"] },
     })
     const v_card = wrapper.findComponent(components.VCard)
     const v_img = v_card.findComponent(components.VImg)
@@ -52,6 +54,7 @@ describe("ObjectSelector.vue", async () => {
     expect(wrapper.emitted().update_values[0][0]).toEqual({
       geode_object_type: geode_object_1,
     })
+    wrapper.unmount()
   })
 
   test(`test loabable with multiple classes`, async () => {
@@ -70,21 +73,24 @@ describe("ObjectSelector.vue", async () => {
       global: {
         plugins: [vuetify, pinia],
       },
-      props: { filenames: ["test.toto"], supported_feature: "test" },
+      props: { filenames: ["test.toto"] },
     })
     const v_card = wrapper.findComponent(components.VCard)
     const v_img = v_card.findComponent(components.VImg)
     expect(v_img.vm.src).toContain(`${geode_object_1}.svg`)
     await flushPromises()
-    await flushPromises()
     await v_card.trigger("click")
     await flushPromises()
-    await flushPromises()
     expect(wrapper.emitted()).toHaveProperty("update_values")
+    console.log(
+      "wrapper.emitted().update_values",
+      wrapper.emitted().update_values,
+    )
     expect(wrapper.emitted().update_values).toHaveLength(1)
     expect(wrapper.emitted().update_values[0][0]).toEqual({
       geode_object_type: geode_object_1,
     })
+    wrapper.unmount()
   })
 
   test(`test object_priority when is_loadable scores equal`, async () => {
@@ -107,12 +113,15 @@ describe("ObjectSelector.vue", async () => {
       global: {
         plugins: [vuetify, pinia],
       },
-      props: { filenames: ["test.toto"], supported_feature: "test" },
+      props: { filenames: ["test.toto"] },
     })
+
+    await flushPromises()
     expect(wrapper.emitted()).toHaveProperty("update_values")
     expect(wrapper.emitted().update_values).toHaveLength(1)
     expect(wrapper.emitted().update_values[0][0]).toEqual({
       geode_object_type: geode_object_1,
     })
+    wrapper.unmount()
   })
 })
diff --git a/tests/unit/components/PackagesVersions.nuxt.test.js b/tests/unit/components/PackagesVersions.nuxt.test.js
index b7d508cd..0189afac 100644
--- a/tests/unit/components/PackagesVersions.nuxt.test.js
+++ b/tests/unit/components/PackagesVersions.nuxt.test.js
@@ -8,14 +8,15 @@ import * as directives from "vuetify/directives"
 import { setActivePinia } from "pinia"
 import { createTestingPinia } from "@pinia/testing"
 
-import PackagesVersions from "@ogw_front/components/PackagesVersions.vue"
+import PackagesVersions from "@ogw_front/components/PackagesVersions"
+import { useGeodeStore } from "@ogw_front/stores/geode"
 
 const vuetify = createVuetify({
   components,
   directives,
 })
 
-describe("PackagesVersions.vue", async () => {
+describe("PackagesVersions", async () => {
   test(`Mount`, async () => {
     const pinia = createTestingPinia({
       createSpy: vi.fn,
diff --git a/tests/unit/components/Step.nuxt.test.js b/tests/unit/components/Step.nuxt.test.js
index bf5fe2b2..569543ea 100644
--- a/tests/unit/components/Step.nuxt.test.js
+++ b/tests/unit/components/Step.nuxt.test.js
@@ -5,8 +5,8 @@ import { createVuetify } from "vuetify"
 import * as components from "vuetify/components"
 import * as directives from "vuetify/directives"
 
-import Step from "@ogw_front/components/Step.vue"
-import ObjectSelector from "@ogw_front/components/ObjectSelector.vue"
+import Step from "@ogw_front/components/Step"
+import ObjectSelector from "@ogw_front/components/ObjectSelector"
 
 const vuetify = createVuetify({
   components,
@@ -15,7 +15,7 @@ const vuetify = createVuetify({
 
 global.ResizeObserver = require("resize-observer-polyfill")
 
-describe("Step.vue", async () => {
+describe("Step", async () => {
   test(`BRep`, async () => {
     const geode_object_type = ref("BRep")
     const files = ref([])
diff --git a/tests/unit/components/Stepper.nuxt.test.js b/tests/unit/components/Stepper.nuxt.test.js
index c9c0ba9d..5b855db4 100644
--- a/tests/unit/components/Stepper.nuxt.test.js
+++ b/tests/unit/components/Stepper.nuxt.test.js
@@ -5,8 +5,8 @@ import { createVuetify } from "vuetify"
 import * as components from "vuetify/components"
 import * as directives from "vuetify/directives"
 
-import Stepper from "@ogw_front/components/Stepper.vue"
-import ObjectSelector from "@ogw_front/components/ObjectSelector.vue"
+import Stepper from "@ogw_front/components/Stepper"
+import ObjectSelector from "@ogw_front/components/ObjectSelector"
 import { mountSuspended } from "@nuxt/test-utils/runtime"
 
 const vuetify = createVuetify({
@@ -16,7 +16,7 @@ const vuetify = createVuetify({
 
 global.ResizeObserver = require("resize-observer-polyfill")
 
-describe("Stepper.vue", async () => {
+describe("Stepper", async () => {
   test(`Mount`, async () => {
     const geode_object_type = ref("BRep")
     const files = ref([])
diff --git a/tests/unit/components/Wrapper.nuxt.test.js b/tests/unit/components/Wrapper.nuxt.test.js
index 40e085b7..0456e320 100644
--- a/tests/unit/components/Wrapper.nuxt.test.js
+++ b/tests/unit/components/Wrapper.nuxt.test.js
@@ -5,8 +5,8 @@ import { describe, expect, test } from "vitest"
 // import * as components from "vuetify/components"
 // import * as directives from "vuetify/directives"
 
-// // import Wrapper from "@ogw_front/components/Wrapper.vue"
-// import ObjectSelector from "@ogw_front/components/ObjectSelector.vue"
+// // import Wrapper from "@ogw_front/components/Wrapper"
+// import ObjectSelector from "@ogw_front/components/ObjectSelector"
 
 // const vuetify = createVuetify({
 //   components,
@@ -15,7 +15,7 @@ import { describe, expect, test } from "vitest"
 
 // global.ResizeObserver = require("resize-observer-polyfill")
 
-// describe("Step.vue", async () => {
+// describe("Step", async () => {
 //   test(`Mount`, async () => {
 //     const geode_object_type = ref("BRep")
 //     const files = ref([])
diff --git a/tests/unit/composables/ProjectManager.nuxt.test.js b/tests/unit/composables/ProjectManager.nuxt.test.js
index 8f32696b..daf3547b 100644
--- a/tests/unit/composables/ProjectManager.nuxt.test.js
+++ b/tests/unit/composables/ProjectManager.nuxt.test.js
@@ -3,8 +3,8 @@ import { setActivePinia } from "pinia"
 import { createTestingPinia } from "@pinia/testing"
 
 // Local imports
-import { useProjectManager } from "@ogw_front/composables/project_manager.js"
-import { appMode } from "@ogw_front/utils/app_mode.js"
+import { useProjectManager } from "@ogw_front/composables/project_manager"
+import { appMode } from "@ogw_front/utils/app_mode"
 
 // Snapshot
 const snapshotMock = {
@@ -96,7 +96,7 @@ const hybridViewerStoreMock = {
     }
     if (snapshot?.camera_options) {
       const { viewer_call } =
-        await import("../../../internal/utils/viewer_call.js")
+        await import("../../../internal/utils/viewer_call")
       viewer_call({
         schema: { $id: "opengeodeweb_viewer.viewer.update_camera" },
         params: { camera_options: snapshot.camera_options },
@@ -114,11 +114,11 @@ vi.stubGlobal(
   "$fetch",
   vi.fn(async () => ({ snapshot: snapshotMock })),
 )
-vi.mock("../../../internal/utils/viewer_call.js", () => ({
+vi.mock("../../../internal/utils/viewer_call", () => ({
   viewer_call: vi.fn(() => Promise.resolve()),
 }))
 
-vi.mock("@ogw_front/composables/api_fetch.js", () => ({
+vi.mock("@ogw_front/composables/api_fetch", () => ({
   api_fetch: vi.fn(async (_req, options = {}) => {
     const response = {
       _data: new Blob(["zipcontent"], { type: "application/zip" }),
@@ -131,28 +131,28 @@ vi.mock("@ogw_front/composables/api_fetch.js", () => ({
   }),
 }))
 vi.mock("js-file-download", () => ({ default: vi.fn() }))
-vi.mock("@ogw_front/stores/infra.js", () => ({
+vi.mock("@ogw_front/stores/infra", () => ({
   useInfraStore: () => infraStoreMock,
 }))
-vi.mock("@ogw_front/stores/viewer.js", () => ({
+vi.mock("@ogw_front/stores/viewer", () => ({
   useViewerStore: () => viewerStoreMock,
 }))
-vi.mock("@ogw_front/stores/treeview.js", () => ({
+vi.mock("@ogw_front/stores/treeview", () => ({
   useTreeviewStore: () => treeviewStoreMock,
 }))
-vi.mock("@ogw_front/stores/data_base.js", () => ({
+vi.mock("@ogw_front/stores/data_base", () => ({
   useDataBaseStore: () => dataBaseStoreMock,
 }))
-vi.mock("@ogw_front/stores/data_style.js", () => ({
+vi.mock("@ogw_front/stores/data_style", () => ({
   useDataStyleStore: () => dataStyleStoreMock,
 }))
-vi.mock("@ogw_front/stores/hybrid_viewer.js", () => ({
+vi.mock("@ogw_front/stores/hybrid_viewer", () => ({
   useHybridViewerStore: () => hybridViewerStoreMock,
 }))
-vi.mock("@ogw_front/stores/geode.js", () => ({
+vi.mock("@ogw_front/stores/geode", () => ({
   useGeodeStore: () => geodeStoreMock,
 }))
-vi.mock("@ogw_front/stores/app.js", () => ({
+vi.mock("@ogw_front/stores/app", () => ({
   useAppStore: () => ({
     exportStores: vi.fn(() => ({ projectName: "mockedProject" })),
   }),
@@ -190,8 +190,7 @@ describe("ProjectManager composable (compact)", () => {
         (v) => typeof v === "function" && v.mockClear && v.mockClear(),
       )
     }
-    const { viewer_call } =
-      await import("../../../internal/utils/viewer_call.js")
+    const { viewer_call } = await import("../../../internal/utils/viewer_call")
     viewer_call.mockClear()
   })
 
@@ -212,8 +211,7 @@ describe("ProjectManager composable (compact)", () => {
 
     await importProjectFile(file)
 
-    const { viewer_call } =
-      await import("../../../internal/utils/viewer_call.js")
+    const { viewer_call } = await import("../../../internal/utils/viewer_call")
 
     expect(viewerStoreMock.ws_connect).toHaveBeenCalled()
     expect(viewer_call).toHaveBeenCalledTimes(2)
diff --git a/tests/unit/composables/api_fetch.nuxt.test.js b/tests/unit/composables/api_fetch.nuxt.test.js
index 11954774..3cd001ba 100644
--- a/tests/unit/composables/api_fetch.nuxt.test.js
+++ b/tests/unit/composables/api_fetch.nuxt.test.js
@@ -3,6 +3,9 @@ import { setActivePinia } from "pinia"
 import { createTestingPinia } from "@pinia/testing"
 import { registerEndpoint } from "@nuxt/test-utils/runtime"
 
+import { useGeodeStore } from "@ogw_front/stores/geode"
+import { useFeedbackStore } from "@ogw_front/stores/feedback"
+
 describe("geodeStore.request()", () => {
   const pinia = createTestingPinia({
     stubActions: false,
@@ -10,7 +13,7 @@ describe("geodeStore.request()", () => {
   })
   setActivePinia(pinia)
   const geodeStore = useGeodeStore()
-  const feedback_store = useFeedbackStore()
+  const feedbackStore = useFeedbackStore()
   geodeStore.base_url = ""
 
   const schema = {
@@ -27,7 +30,7 @@ describe("geodeStore.request()", () => {
   }
 
   beforeEach(async () => {
-    await feedback_store.$reset()
+    await feedbackStore.$reset()
     await geodeStore.$reset()
     geodeStore.base_url = ""
   })
diff --git a/tests/unit/composables/run_function_when_microservices_connected.nuxt.test.js b/tests/unit/composables/run_function_when_microservices_connected.nuxt.test.js
index 1ba21d39..de44a771 100644
--- a/tests/unit/composables/run_function_when_microservices_connected.nuxt.test.js
+++ b/tests/unit/composables/run_function_when_microservices_connected.nuxt.test.js
@@ -1,9 +1,14 @@
 import { beforeEach, describe, expect, test, vi } from "vitest"
-import Status from "@ogw_front/utils/status.js"
+import Status from "@ogw_front/utils/status"
 
 import { setActivePinia } from "pinia"
 import { createTestingPinia } from "@pinia/testing"
 
+import { run_function_when_microservices_connected } from "@ogw_front/composables/run_function_when_microservices_connected"
+import { useInfraStore } from "@ogw_front/stores/infra"
+import { useGeodeStore } from "@ogw_front/stores/geode"
+import { useViewerStore } from "@ogw_front/stores/viewer"
+
 beforeEach(async () => {
   const pinia = createTestingPinia({
     stubActions: false,
@@ -49,10 +54,15 @@ describe("run_function_when_microservices_connected", () => {
   test("microservices not connected", async () => {
     const geodeStore = useGeodeStore()
     const viewerStore = useViewerStore()
+    const infraStore = useInfraStore()
     const spy = vi.spyOn(dumb_obj, "dumb_method")
     run_function_when_microservices_connected(dumb_obj.dumb_method)
     await geodeStore.$patch({ status: Status.NOT_CONNECTED })
     await viewerStore.$patch({ status: Status.NOT_CONNECTED })
+    console.log("geodeStore", geodeStore.status)
+    console.log("viewerStore", viewerStore.status)
+
+    console.log("microservices_connected", infraStore.microservices_connected)
     expect(spy).not.toHaveBeenCalled()
   })
 })
diff --git a/tests/unit/composables/upload_file.nuxt.test.js b/tests/unit/composables/upload_file.nuxt.test.js
index 616fc3df..5f8231b0 100644
--- a/tests/unit/composables/upload_file.nuxt.test.js
+++ b/tests/unit/composables/upload_file.nuxt.test.js
@@ -4,6 +4,9 @@ import { createTestingPinia } from "@pinia/testing"
 import { registerEndpoint } from "@nuxt/test-utils/runtime"
 import upload_file from "@ogw_front/utils/upload_file"
 import schemas from "@geode/opengeodeweb-back/opengeodeweb_back_schemas.json"
+import { useFeedbackStore } from "@ogw_front/stores/feedback"
+
+import { useGeodeStore } from "@ogw_front/stores/geode"
 const schema = schemas.opengeodeweb_back.upload_file
 
 beforeEach(async () => {
@@ -14,7 +17,7 @@ beforeEach(async () => {
   setActivePinia(pinia)
 })
 
-describe("upload_file.js", () => {
+describe("upload_file", () => {
   beforeEach(() => {
     const geodeStore = useGeodeStore()
     geodeStore.base_url = ""
@@ -29,7 +32,7 @@ describe("upload_file.js", () => {
   })
 
   test("onResponse", async () => {
-    const feedback_store = useFeedbackStore()
+    const feedbackStore = useFeedbackStore()
     registerEndpoint(schema.$id, {
       method: "PUT",
       handler: () => ({ test: "ok" }),
@@ -44,7 +47,7 @@ describe("upload_file.js", () => {
         },
       },
     )
-    expect(feedback_store.feedbacks.length).toBe(0)
+    expect(feedbackStore.feedbacks.length).toBe(0)
     expect(response_value).toBe("ok")
   })
 })
diff --git a/tests/unit/plugins/project_load.nuxt.test.js b/tests/unit/plugins/project_load.nuxt.test.js
index 1f7ecbc7..d10aaf6c 100644
--- a/tests/unit/plugins/project_load.nuxt.test.js
+++ b/tests/unit/plugins/project_load.nuxt.test.js
@@ -2,10 +2,16 @@ import { beforeEach, describe, expect, test, vi } from "vitest"
 import { createTestingPinia } from "@pinia/testing"
 import { setActivePinia } from "pinia"
 
-vi.mock("../../../internal/utils/viewer_call.js", () => ({
+import { useTreeviewStore } from "@ogw_front/stores/treeview"
+import { useAppStore } from "@ogw_front/stores/app"
+import { useDataStyleStore } from "@ogw_front/stores/data_style"
+import { useHybridViewerStore } from "@ogw_front/stores/hybrid_viewer"
+import { useDataBaseStore } from "@ogw_front/stores/data_base"
+
+vi.mock("../../../internal/utils/viewer_call", () => ({
   viewer_call: vi.fn(() => Promise.resolve()),
 }))
-vi.mock("@/stores/hybrid_viewer.js", () => ({
+vi.mock("@/stores/hybrid_viewer", () => ({
   useHybridViewerStore: () => ({
     $id: "hybridViewer",
     initHybridViewer: vi.fn(),
diff --git a/tests/unit/stores/App.nuxt.test.js b/tests/unit/stores/App.nuxt.test.js
index 81ae997b..aa04e18b 100644
--- a/tests/unit/stores/App.nuxt.test.js
+++ b/tests/unit/stores/App.nuxt.test.js
@@ -2,6 +2,8 @@ import { beforeEach, describe, expect, expectTypeOf, test, vi } from "vitest"
 import { createTestingPinia } from "@pinia/testing"
 import { setActivePinia } from "pinia"
 
+import { useAppStore } from "@ogw_front/stores/app"
+
 beforeEach(async () => {
   const pinia = createTestingPinia({
     stubActions: false,
@@ -13,32 +15,32 @@ beforeEach(async () => {
 describe("App Store", () => {
   describe("state", () => {
     test("initial state", () => {
-      const app_store = useAppStore()
-      expectTypeOf(app_store.stores).toBeArray()
-      expectTypeOf(app_store.exportStores).toBeFunction()
-      expectTypeOf(app_store.importStores).toBeFunction()
-      expectTypeOf(app_store.registerStore).toBeFunction()
+      const appStore = useAppStore()
+      expectTypeOf(appStore.stores).toBeArray()
+      expectTypeOf(appStore.exportStores).toBeFunction()
+      expectTypeOf(appStore.importStores).toBeFunction()
+      expectTypeOf(appStore.registerStore).toBeFunction()
     })
   })
 
   describe("actions", () => {
     describe("registerStore", () => {
       test("register single store", () => {
-        const app_store = useAppStore()
+        const appStore = useAppStore()
         const mock_store = {
           $id: "testStore",
           save: vi.fn().mockImplementation(() => ({ data: "test" })),
           load: vi.fn().mockImplementation(() => {}),
         }
 
-        app_store.registerStore(mock_store)
+        appStore.registerStore(mock_store)
 
-        expect(app_store.stores.length).toBe(1)
-        expect(app_store.stores[0]).toStrictEqual(mock_store)
+        expect(appStore.stores.length).toBe(1)
+        expect(appStore.stores[0]).toStrictEqual(mock_store)
       })
 
       test("register multiple stores", () => {
-        const app_store = useAppStore()
+        const appStore = useAppStore()
         const mock_store_1 = {
           $id: "userStore",
           save: vi.fn().mockImplementation(() => {}),
@@ -50,18 +52,18 @@ describe("App Store", () => {
           load: vi.fn().mockImplementation(() => {}),
         }
 
-        app_store.registerStore(mock_store_1)
-        app_store.registerStore(mock_store_2)
+        appStore.registerStore(mock_store_1)
+        appStore.registerStore(mock_store_2)
 
-        expect(app_store.stores.length).toBe(2)
-        expect(app_store.stores[0].$id).toBe("userStore")
-        expect(app_store.stores[1].$id).toBe("geodeStore")
+        expect(appStore.stores.length).toBe(2)
+        expect(appStore.stores[0].$id).toBe("userStore")
+        expect(appStore.stores[1].$id).toBe("geodeStore")
       })
     })
 
     describe("Export", () => {
       test("export stores with exportStores method", () => {
-        const app_store = useAppStore()
+        const appStore = useAppStore()
         const mock_store_1 = {
           $id: "userStore",
           exportStores: vi.fn().mockImplementation(() => ({
@@ -78,10 +80,10 @@ describe("App Store", () => {
           importStores: vi.fn().mockImplementation(() => {}),
         }
 
-        app_store.registerStore(mock_store_1)
-        app_store.registerStore(mock_store_2)
+        appStore.registerStore(mock_store_1)
+        appStore.registerStore(mock_store_2)
 
-        const snapshot = app_store.exportStores()
+        const snapshot = appStore.exportStores()
 
         expect(mock_store_1.exportStores).toHaveBeenCalledTimes(1)
         expect(mock_store_2.exportStores).toHaveBeenCalledTimes(1)
@@ -92,7 +94,7 @@ describe("App Store", () => {
       })
 
       test("skip stores without exportSave method", () => {
-        const app_store = useAppStore()
+        const appStore = useAppStore()
         const mock_store_1 = {
           $id: "withSave",
           exportStores: vi.fn().mockImplementation(() => ({ data: "test" })),
@@ -103,10 +105,10 @@ describe("App Store", () => {
           importStores: vi.fn().mockImplementation(() => {}),
         }
 
-        app_store.registerStore(mock_store_1)
-        app_store.registerStore(mock_store_2)
+        appStore.registerStore(mock_store_1)
+        appStore.registerStore(mock_store_2)
 
-        const snapshot = app_store.exportStores()
+        const snapshot = appStore.exportStores()
 
         expect(mock_store_1.exportStores).toHaveBeenCalledTimes(1)
         expect(snapshot).toEqual({
@@ -116,8 +118,8 @@ describe("App Store", () => {
       })
 
       test("return empty snapshot when no stores registered", () => {
-        const app_store = useAppStore()
-        const snapshot = app_store.exportStores()
+        const appStore = useAppStore()
+        const snapshot = appStore.exportStores()
         expect(snapshot).toEqual({})
       })
     })
@@ -145,7 +147,7 @@ describe("App Store", () => {
       })
 
       test("skip stores without importStores method", () => {
-        const app_store = useAppStore()
+        const appStore = useAppStore()
         const mock_store_1 = {
           $id: "withImport",
           save: vi.fn().mockImplementation(() => {}),
@@ -155,19 +157,19 @@ describe("App Store", () => {
           $id: "withoutImport",
           save: vi.fn().mockImplementation(() => {}),
         }
-        app_store.registerStore(mock_store_1)
-        app_store.registerStore(mock_store_2)
+        appStore.registerStore(mock_store_1)
+        appStore.registerStore(mock_store_2)
         const snapshot = {
           withImport: { data: "test" },
           withoutImport: { data: "ignored" },
         }
-        app_store.importStores(snapshot)
+        appStore.importStores(snapshot)
         expect(mock_store_1.importStores).toHaveBeenCalledTimes(1)
         expect(mock_store_2.importStores).toBeUndefined()
       })
 
       test("warn when store not found in snapshot", () => {
-        const app_store = useAppStore()
+        const appStore = useAppStore()
         const console_warn_spy = vi
           .spyOn(console, "warn")
           .mockImplementation(() => {})
@@ -175,8 +177,8 @@ describe("App Store", () => {
           $id: "testStore",
           importStores: vi.fn().mockImplementation(() => {}),
         }
-        app_store.registerStore(mock_store)
-        app_store.importStores({})
+        appStore.registerStore(mock_store)
+        appStore.importStores({})
         expect(console_warn_spy).toHaveBeenCalledWith(
           expect.stringContaining("Stores not found in snapshot: testStore"),
         )
diff --git a/tests/unit/stores/Feedback.nuxt.test.js b/tests/unit/stores/Feedback.nuxt.test.js
index bb6b7325..0e29109f 100644
--- a/tests/unit/stores/Feedback.nuxt.test.js
+++ b/tests/unit/stores/Feedback.nuxt.test.js
@@ -14,70 +14,70 @@ beforeEach(async () => {
 describe("Feedback Store", () => {
   describe("state", () => {
     test("initial state", () => {
-      const feedback_store = useFeedbackStore()
-      expectTypeOf(feedback_store.feedbacks).toEqualTypeOf([])
-      expectTypeOf(feedback_store.server_error).toBeBoolean()
+      const feedbackStore = useFeedbackStore()
+      expectTypeOf(feedbackStore.feedbacks).toEqualTypeOf([])
+      expectTypeOf(feedbackStore.server_error).toBeBoolean()
     })
   })
   describe("actions", () => {
     describe("add_error", () => {
       test("test add_error", () => {
-        const feedback_store = useFeedbackStore()
-        feedback_store.add_error(
+        const feedbackStore = useFeedbackStore()
+        feedbackStore.add_error(
           500,
           "/test",
           "test message",
           "test description",
         )
-        expect(feedback_store.feedbacks.length).toBe(1)
-        expect(feedback_store.feedbacks[0].type).toBe("error")
+        expect(feedbackStore.feedbacks.length).toBe(1)
+        expect(feedbackStore.feedbacks[0].type).toBe("error")
       })
     })
 
     describe("add_error", () => {
       test("test feedbacks_timeout", () => {
-        const feedback_store = useFeedbackStore()
-        feedback_store.feedbacks_timeout_miliseconds = 500
-        feedback_store.add_error(
+        const feedbackStore = useFeedbackStore()
+        feedbackStore.feedbacks_timeout_miliseconds = 500
+        feedbackStore.add_error(
           500,
           "/test",
           "test message",
           "test description",
         )
-        expect(feedback_store.feedbacks.length).toBe(1)
+        expect(feedbackStore.feedbacks.length).toBe(1)
         setTimeout(() => {
-          expect(feedback_store.feedbacks.length).toBe(0)
+          expect(feedbackStore.feedbacks.length).toBe(0)
         }, 1000)
       })
     })
 
     describe("add_success", () => {
       test("test add_success", () => {
-        const feedback_store = useFeedbackStore()
-        feedback_store.feedbacks_timeout_miliseconds = 500
-        feedback_store.add_success("test description")
-        expect(feedback_store.feedbacks.length).toBe(1)
-        expect(feedback_store.feedbacks[0].type).toBe("success")
+        const feedbackStore = useFeedbackStore()
+        feedbackStore.feedbacks_timeout_miliseconds = 500
+        feedbackStore.add_success("test description")
+        expect(feedbackStore.feedbacks.length).toBe(1)
+        expect(feedbackStore.feedbacks[0].type).toBe("success")
 
         setTimeout(() => {
-          expect(feedback_store.feedbacks.length).toBe(0)
+          expect(feedbackStore.feedbacks.length).toBe(0)
         }, 1000)
       })
     })
     describe("delete_feedback", () => {
       test("test", () => {
-        const feedback_store = useFeedbackStore()
-        feedback_store.delete_feedback(0)
-        expect(feedback_store.feedbacks.length).toBe(0)
+        const feedbackStore = useFeedbackStore()
+        feedbackStore.delete_feedback(0)
+        expect(feedbackStore.feedbacks.length).toBe(0)
       })
     })
 
     describe("delete_server_error", () => {
       test("test", () => {
-        const feedback_store = useFeedbackStore()
-        feedback_store.$patch({ server_error: true })
-        feedback_store.delete_server_error()
-        expect(feedback_store.server_error).toBe(false)
+        const feedbackStore = useFeedbackStore()
+        feedbackStore.$patch({ server_error: true })
+        feedbackStore.delete_server_error()
+        expect(feedbackStore.server_error).toBe(false)
       })
     })
   })
diff --git a/tests/unit/stores/Geode.nuxt.test.js b/tests/unit/stores/Geode.nuxt.test.js
index 201db9a7..0735151a 100644
--- a/tests/unit/stores/Geode.nuxt.test.js
+++ b/tests/unit/stores/Geode.nuxt.test.js
@@ -5,6 +5,8 @@ import { registerEndpoint } from "@nuxt/test-utils/runtime"
 import back_schemas from "@geode/opengeodeweb-back/opengeodeweb_back_schemas.json"
 import Status from "@ogw_front/utils/status"
 import { appMode } from "@ogw_front/utils/app_mode"
+import { useInfraStore } from "@ogw_front/stores/infra"
+import { useGeodeStore } from "@ogw_front/stores/geode"
 
 beforeEach(async () => {
   const pinia = createTestingPinia({
@@ -27,49 +29,49 @@ describe("Geode store", () => {
   describe("getters", () => {
     describe("protocol", () => {
       test("test app_mode CLOUD", () => {
-        const infra_store = useInfraStore()
+        const infraStore = useInfraStore()
         const geodeStore = useGeodeStore()
-        infra_store.app_mode = appMode.CLOUD
+        infraStore.app_mode = appMode.CLOUD
         expect(geodeStore.protocol).toBe("https")
       })
       test("test app_mode BROWSER", () => {
-        const infra_store = useInfraStore()
+        const infraStore = useInfraStore()
         const geodeStore = useGeodeStore()
-        infra_store.app_mode = appMode.BROWSER
+        infraStore.app_mode = appMode.BROWSER
         expect(geodeStore.protocol).toBe("http")
       })
       test("test app_mode DESKTOP", () => {
-        const infra_store = useInfraStore()
+        const infraStore = useInfraStore()
         const geodeStore = useGeodeStore()
-        infra_store.app_mode = appMode.DESKTOP
+        infraStore.app_mode = appMode.DESKTOP
         expect(geodeStore.protocol).toBe("http")
       })
     })
 
     describe("port", () => {
       test("test app_mode CLOUD", () => {
-        const infra_store = useInfraStore()
+        const infraStore = useInfraStore()
         const geodeStore = useGeodeStore()
-        infra_store.app_mode = appMode.CLOUD
+        infraStore.app_mode = appMode.CLOUD
         expect(geodeStore.port).toBe("443")
       })
       test("test app_mode BROWSER", () => {
-        const infra_store = useInfraStore()
+        const infraStore = useInfraStore()
         const geodeStore = useGeodeStore()
-        infra_store.app_mode = appMode.BROWSER
+        infraStore.app_mode = appMode.BROWSER
         expect(geodeStore.port).toBe(geodeStore.default_local_port)
       })
       test("test app_mode DESKTOP", () => {
-        const infra_store = useInfraStore()
+        const infraStore = useInfraStore()
         const geodeStore = useGeodeStore()
-        infra_store.app_mode = appMode.DESKTOP
+        infraStore.app_mode = appMode.DESKTOP
         expect(geodeStore.port).toBe(geodeStore.default_local_port)
       })
 
       test("test override default_local_port", () => {
-        const infra_store = useInfraStore()
+        const infraStore = useInfraStore()
         const geodeStore = useGeodeStore()
-        infra_store.app_mode = appMode.DESKTOP
+        infraStore.app_mode = appMode.DESKTOP
         geodeStore.default_local_port = "12"
         expect(geodeStore.port).toBe("12")
       })
@@ -77,26 +79,26 @@ describe("Geode store", () => {
 
     describe("base_url", () => {
       test("test app_mode BROWSER", () => {
-        const infra_store = useInfraStore()
+        const infraStore = useInfraStore()
         const geodeStore = useGeodeStore()
-        infra_store.app_mode = appMode.BROWSER
-        infra_store.domain_name = "localhost"
+        infraStore.app_mode = appMode.BROWSER
+        infraStore.domain_name = "localhost"
         expect(geodeStore.base_url).toBe("http://localhost:5000")
       })
       test("test app_mode CLOUD", () => {
-        const infra_store = useInfraStore()
+        const infraStore = useInfraStore()
         const geodeStore = useGeodeStore()
-        infra_store.app_mode = appMode.CLOUD
-        infra_store.ID = "123456"
-        infra_store.domain_name = "example.com"
+        infraStore.app_mode = appMode.CLOUD
+        infraStore.ID = "123456"
+        infraStore.domain_name = "example.com"
         expect(geodeStore.base_url).toBe("https://example.com:443/123456/geode")
       })
       test("test app_mode CLOUD, ID empty", () => {
-        const infra_store = useInfraStore()
+        const infraStore = useInfraStore()
         const geodeStore = useGeodeStore()
-        infra_store.app_mode = appMode.CLOUD
-        infra_store.ID = ""
-        infra_store.domain_name = "example.com"
+        infraStore.app_mode = appMode.CLOUD
+        infraStore.ID = ""
+        infraStore.domain_name = "example.com"
         expect(() => geodeStore.base_url).toThrowError(
           "ID must not be empty in cloud mode",
         )
diff --git a/tests/unit/stores/Infra.nuxt.test.js b/tests/unit/stores/Infra.nuxt.test.js
index 519b37de..467aebb9 100644
--- a/tests/unit/stores/Infra.nuxt.test.js
+++ b/tests/unit/stores/Infra.nuxt.test.js
@@ -6,8 +6,12 @@ import { setActivePinia } from "pinia"
 import { createTestingPinia } from "@pinia/testing"
 import { beforeEach, describe, expect, expectTypeOf, test, vi } from "vitest"
 // Local imports
-import Status from "@ogw_front/utils/status.js"
+import Status from "@ogw_front/utils/status"
 import { appMode } from "@ogw_front/utils/app_mode"
+import { useInfraStore } from "@ogw_front/stores/infra"
+import { useGeodeStore } from "@ogw_front/stores/geode"
+import { useViewerStore } from "@ogw_front/stores/viewer"
+import { useLambdaStore } from "@ogw_front/stores/lambda"
 
 // Mock navigator.locks API
 const mockLockRequest = vi.fn().mockImplementation(async (name, callback) => {
@@ -32,54 +36,54 @@ beforeEach(async () => {
 describe("Infra Store", () => {
   describe("state", () => {
     test("initial state", () => {
-      const infra_store = useInfraStore()
-      expectTypeOf(infra_store.ID).toBeString()
-      expectTypeOf(infra_store.is_captcha_validated).toBeBoolean()
-      expectTypeOf(infra_store.status).toBeString()
+      const infraStore = useInfraStore()
+      expectTypeOf(infraStore.ID).toBeString()
+      expectTypeOf(infraStore.is_captcha_validated).toBeBoolean()
+      expectTypeOf(infraStore.status).toBeString()
     })
   })
   describe("getters", () => {
     describe("app_mode", () => {
       test("test type", () => {
-        const infra_store = useInfraStore()
-        expectTypeOf(infra_store.app_mode).toBeString()
+        const infraStore = useInfraStore()
+        expectTypeOf(infraStore.app_mode).toBeString()
       })
     })
 
     describe("domain_name", () => {
       test("test app_mode BROWSER", () => {
-        const infra_store = useInfraStore()
-        infra_store.app_mode = appMode.BROWSER
-        expect(infra_store.domain_name).toBe("localhost")
+        const infraStore = useInfraStore()
+        infraStore.app_mode = appMode.BROWSER
+        expect(infraStore.domain_name).toBe("localhost")
       })
       test("test app_mode DESKTOP", () => {
-        const infra_store = useInfraStore()
-        infra_store.app_mode = appMode.DESKTOP
-        expect(infra_store.domain_name).toBe("localhost")
+        const infraStore = useInfraStore()
+        infraStore.app_mode = appMode.DESKTOP
+        expect(infraStore.domain_name).toBe("localhost")
       })
       test("test app_mode CLOUD", () => {
-        const infra_store = useInfraStore()
-        infra_store.app_mode = appMode.CLOUD
-        expect(infra_store.domain_name).toBe("api.geode-solutions.com")
+        const infraStore = useInfraStore()
+        infraStore.app_mode = appMode.CLOUD
+        expect(infraStore.domain_name).toBe("api.geode-solutions.com")
       })
     })
 
     describe("microservices_connected", () => {
       test("test no microservices registered", () => {
-        const infra_store = useInfraStore()
-        expect(infra_store.microservices_connected).toBe(true)
+        const infraStore = useInfraStore()
+        expect(infraStore.microservices_connected).toBe(true)
       })
       test("test geode false & viewer false", () => {
-        const infra_store = useInfraStore()
+        const infraStore = useInfraStore()
         const geodeStore = useGeodeStore()
         const viewerStore = useViewerStore()
 
-        infra_store.register_microservice(geodeStore, {
+        infraStore.register_microservice(geodeStore, {
           request: vi.fn(),
           connect: vi.fn(),
           launch: vi.fn(),
         })
-        infra_store.register_microservice(viewerStore, {
+        infraStore.register_microservice(viewerStore, {
           request: vi.fn(),
           connect: vi.fn(),
           launch: vi.fn(),
@@ -87,19 +91,19 @@ describe("Infra Store", () => {
 
         geodeStore.$patch({ status: Status.NOT_CONNECTED })
         viewerStore.$patch({ status: Status.NOT_CONNECTED })
-        expect(infra_store.microservices_connected).toBe(false)
+        expect(infraStore.microservices_connected).toBe(false)
       })
       test("test geode true & viewer false", () => {
-        const infra_store = useInfraStore()
+        const infraStore = useInfraStore()
         const geodeStore = useGeodeStore()
         const viewerStore = useViewerStore()
 
-        infra_store.register_microservice(geodeStore, {
+        infraStore.register_microservice(geodeStore, {
           request: vi.fn(),
           connect: vi.fn(),
           launch: vi.fn(),
         })
-        infra_store.register_microservice(viewerStore, {
+        infraStore.register_microservice(viewerStore, {
           request: vi.fn(),
           connect: vi.fn(),
           launch: vi.fn(),
@@ -107,19 +111,19 @@ describe("Infra Store", () => {
 
         geodeStore.$patch({ status: Status.CONNECTED })
         viewerStore.$patch({ status: Status.NOT_CONNECTED })
-        expect(infra_store.microservices_connected).toBe(false)
+        expect(infraStore.microservices_connected).toBe(false)
       })
       test("test geode false & viewer true", () => {
-        const infra_store = useInfraStore()
+        const infraStore = useInfraStore()
         const geodeStore = useGeodeStore()
         const viewerStore = useViewerStore()
 
-        infra_store.register_microservice(geodeStore, {
+        infraStore.register_microservice(geodeStore, {
           request: vi.fn(),
           connect: vi.fn(),
           launch: vi.fn(),
         })
-        infra_store.register_microservice(viewerStore, {
+        infraStore.register_microservice(viewerStore, {
           request: vi.fn(),
           connect: vi.fn(),
           launch: vi.fn(),
@@ -127,19 +131,19 @@ describe("Infra Store", () => {
 
         geodeStore.$patch({ status: Status.NOT_CONNECTED })
         viewerStore.$patch({ status: Status.CONNECTED })
-        expect(infra_store.microservices_connected).toBe(false)
+        expect(infraStore.microservices_connected).toBe(false)
       })
       test("test geode true & viewer true", () => {
-        const infra_store = useInfraStore()
+        const infraStore = useInfraStore()
         const geodeStore = useGeodeStore()
         const viewerStore = useViewerStore()
 
-        infra_store.register_microservice(geodeStore, {
+        infraStore.register_microservice(geodeStore, {
           request: vi.fn(),
           connect: vi.fn(),
           launch: vi.fn(),
         })
-        infra_store.register_microservice(viewerStore, {
+        infraStore.register_microservice(viewerStore, {
           request: vi.fn(),
           connect: vi.fn(),
           launch: vi.fn(),
@@ -147,26 +151,26 @@ describe("Infra Store", () => {
 
         geodeStore.$patch({ status: Status.CONNECTED })
         viewerStore.$patch({ status: Status.CONNECTED })
-        expect(infra_store.microservices_connected).toBe(true)
+        expect(infraStore.microservices_connected).toBe(true)
       })
     })
 
     describe("microservices_busy", () => {
       test("test no microservices registered", () => {
-        const infra_store = useInfraStore()
-        expect(infra_store.microservices_busy).toBe(false)
+        const infraStore = useInfraStore()
+        expect(infraStore.microservices_busy).toBe(false)
       })
       test("test geode false & viewer false", () => {
-        const infra_store = useInfraStore()
+        const infraStore = useInfraStore()
         const geodeStore = useGeodeStore()
         const viewerStore = useViewerStore()
 
-        infra_store.register_microservice(geodeStore, {
+        infraStore.register_microservice(geodeStore, {
           request: vi.fn(),
           connect: vi.fn(),
           launch: vi.fn(),
         })
-        infra_store.register_microservice(viewerStore, {
+        infraStore.register_microservice(viewerStore, {
           request: vi.fn(),
           connect: vi.fn(),
           launch: vi.fn(),
@@ -174,19 +178,19 @@ describe("Infra Store", () => {
 
         geodeStore.$patch({ request_counter: 0 })
         viewerStore.$patch({ request_counter: 0 })
-        expect(infra_store.microservices_busy).toBe(false)
+        expect(infraStore.microservices_busy).toBe(false)
       })
       test("test geode true & viewer false", () => {
-        const infra_store = useInfraStore()
+        const infraStore = useInfraStore()
         const geodeStore = useGeodeStore()
         const viewerStore = useViewerStore()
 
-        infra_store.register_microservice(geodeStore, {
+        infraStore.register_microservice(geodeStore, {
           request: vi.fn(),
           connect: vi.fn(),
           launch: vi.fn(),
         })
-        infra_store.register_microservice(viewerStore, {
+        infraStore.register_microservice(viewerStore, {
           request: vi.fn(),
           connect: vi.fn(),
           launch: vi.fn(),
@@ -194,19 +198,19 @@ describe("Infra Store", () => {
 
         geodeStore.$patch({ request_counter: 1 })
         viewerStore.$patch({ request_counter: 0 })
-        expect(infra_store.microservices_busy).toBe(true)
+        expect(infraStore.microservices_busy).toBe(true)
       })
       test("test geode false & viewer true", () => {
-        const infra_store = useInfraStore()
+        const infraStore = useInfraStore()
         const geodeStore = useGeodeStore()
         const viewerStore = useViewerStore()
 
-        infra_store.register_microservice(geodeStore, {
+        infraStore.register_microservice(geodeStore, {
           request: vi.fn(),
           connect: vi.fn(),
           launch: vi.fn(),
         })
-        infra_store.register_microservice(viewerStore, {
+        infraStore.register_microservice(viewerStore, {
           request: vi.fn(),
           connect: vi.fn(),
           launch: vi.fn(),
@@ -214,19 +218,19 @@ describe("Infra Store", () => {
 
         geodeStore.$patch({ request_counter: 0 })
         viewerStore.$patch({ request_counter: 1 })
-        expect(infra_store.microservices_busy).toBe(true)
+        expect(infraStore.microservices_busy).toBe(true)
       })
       test("test geode true & viewer true", () => {
-        const infra_store = useInfraStore()
+        const infraStore = useInfraStore()
         const geodeStore = useGeodeStore()
         const viewerStore = useViewerStore()
 
-        infra_store.register_microservice(geodeStore, {
+        infraStore.register_microservice(geodeStore, {
           request: vi.fn(),
           connect: vi.fn(),
           launch: vi.fn(),
         })
-        infra_store.register_microservice(viewerStore, {
+        infraStore.register_microservice(viewerStore, {
           request: vi.fn(),
           connect: vi.fn(),
           launch: vi.fn(),
@@ -234,7 +238,7 @@ describe("Infra Store", () => {
 
         geodeStore.$patch({ request_counter: 1 })
         viewerStore.$patch({ request_counter: 1 })
-        expect(infra_store.microservices_busy).toBe(true)
+        expect(infraStore.microservices_busy).toBe(true)
       })
     })
   })
@@ -242,63 +246,62 @@ describe("Infra Store", () => {
   describe("actions", () => {
     describe("register_microservice", () => {
       test("register geode microservice", () => {
-        const infra_store = useInfraStore()
+        const infraStore = useInfraStore()
         const geodeStore = useGeodeStore()
 
-        infra_store.register_microservice(geodeStore, {
+        infraStore.register_microservice(geodeStore, {
           request: vi.fn(),
           connect: vi.fn(),
           launch: vi.fn(),
         })
 
-        expect(infra_store.microservices.length).toBe(1)
-        expect(infra_store.microservices[0].$id).toBe("geode")
+        expect(infraStore.microservices.length).toBe(1)
+        expect(infraStore.microservices[0].$id).toBe("geode")
       })
 
       test("register multiple microservices", () => {
-        const infra_store = useInfraStore()
+        const infraStore = useInfraStore()
         const geodeStore = useGeodeStore()
         const viewerStore = useViewerStore()
 
-        infra_store.register_microservice(geodeStore, {
+        infraStore.register_microservice(geodeStore, {
           request: vi.fn(),
           connect: vi.fn(),
           launch: vi.fn(),
         })
 
-        infra_store.register_microservice(viewerStore, {
+        infraStore.register_microservice(viewerStore, {
           request: vi.fn(),
           connect: vi.fn(),
           launch: vi.fn(),
         })
 
-        expect(infra_store.microservices.length).toBe(2)
+        expect(infraStore.microservices.length).toBe(2)
       })
     })
 
     describe("create_backend", () => {
       test("test without microservices", async () => {
-        const infra_store = useInfraStore()
-        infra_store.app_mode = appMode.BROWSER
-        await infra_store.create_backend()
-        expect(infra_store.status).toBe(Status.CREATED)
+        const infraStore = useInfraStore()
+        infraStore.app_mode = appMode.BROWSER
+        await infraStore.create_backend()
+        expect(infraStore.status).toBe(Status.CREATED)
       })
       test("test with end-point", async () => {
-        const infra_store = useInfraStore()
+        const infraStore = useInfraStore()
         const geodeStore = useGeodeStore()
         const viewerStore = useViewerStore()
-        const feedback_store = useFeedbackStore()
         const lambdaStore = useLambdaStore()
 
-        infra_store.app_mode = appMode.CLOUD
+        infraStore.app_mode = appMode.CLOUD
         const ID = "123456"
         registerEndpoint(lambdaStore.base_url, {
           method: "POST",
           handler: () => ({ ID }),
         })
-        await infra_store.create_backend()
-        expect(infra_store.status).toBe(Status.CREATED)
-        expect(infra_store.ID).toBe(ID)
+        await infraStore.create_backend()
+        expect(infraStore.status).toBe(Status.CREATED)
+        expect(infraStore.ID).toBe(ID)
 
         expect(geodeStore.status).toBe(Status.NOT_CONNECTED)
         expect(viewerStore.status).toBe(Status.NOT_CONNECTED)
diff --git a/tests/unit/stores/Lambda.nuxt.test.js b/tests/unit/stores/Lambda.nuxt.test.js
index 18d41d6f..6588dcc5 100644
--- a/tests/unit/stores/Lambda.nuxt.test.js
+++ b/tests/unit/stores/Lambda.nuxt.test.js
@@ -6,8 +6,11 @@ import { setActivePinia } from "pinia"
 import { createTestingPinia } from "@pinia/testing"
 import { beforeEach, describe, expect, expectTypeOf, test, vi } from "vitest"
 
+import { useFeedbackStore } from "@ogw_front/stores/feedback"
+import { useLambdaStore } from "@ogw_front/stores/lambda"
+
 // Local imports
-import Status from "@ogw_front/utils/status.js"
+import Status from "@ogw_front/utils/status"
 
 beforeEach(async () => {
   const pinia = createTestingPinia({
@@ -73,6 +76,7 @@ describe("Lambda Store", () => {
         useRuntimeConfig().public.SITE_BRANCH = "/test"
         useRuntimeConfig().public.PROJECT = "/project"
 
+        lambdaStore.base_url = "test-base-url"
         registerEndpoint(lambdaStore.base_url, {
           method: "POST",
           handler: postFakeCall,
@@ -121,9 +125,7 @@ describe("Lambda Store", () => {
     describe("connect", () => {
       test("successful connect", async () => {
         const lambdaStore = useLambdaStore()
-
         await lambdaStore.connect()
-
         expect(lambdaStore.status).toBe(Status.CONNECTED)
       })
     })
diff --git a/tests/unit/stores/Viewer.nuxt.test.js b/tests/unit/stores/Viewer.nuxt.test.js
index 43feb451..0e609af1 100644
--- a/tests/unit/stores/Viewer.nuxt.test.js
+++ b/tests/unit/stores/Viewer.nuxt.test.js
@@ -71,78 +71,78 @@ describe("Viewer Store", () => {
   describe("getters", () => {
     describe("protocol", () => {
       test("test app_mode CLOUD", () => {
-        const infra_store = useInfraStore()
+        const infraStore = useInfraStore()
         const viewerStore = useViewerStore()
-        infra_store.app_mode = appMode.CLOUD
+        infraStore.app_mode = appMode.CLOUD
         expect(viewerStore.protocol).toBe("wss")
       })
       test("test app_mode BROWSER", () => {
-        const infra_store = useInfraStore()
+        const infraStore = useInfraStore()
         const viewerStore = useViewerStore()
-        infra_store.app_mode = appMode.BROWSER
+        infraStore.app_mode = appMode.BROWSER
         expect(viewerStore.protocol).toBe("ws")
       })
       test("test app_mode DESKTOP", () => {
-        const infra_store = useInfraStore()
+        const infraStore = useInfraStore()
         const viewerStore = useViewerStore()
-        infra_store.app_mode = appMode.DESKTOP
+        infraStore.app_mode = appMode.DESKTOP
         expect(viewerStore.protocol).toBe("ws")
       })
     })
 
     describe("port", () => {
       test("test app_mode CLOUD", () => {
-        const infra_store = useInfraStore()
+        const infraStore = useInfraStore()
         const viewerStore = useViewerStore()
-        infra_store.app_mode = appMode.CLOUD
+        infraStore.app_mode = appMode.CLOUD
         expect(viewerStore.port).toBe("443")
       })
       test("test app_mode BROWSER", () => {
-        const infra_store = useInfraStore()
+        const infraStore = useInfraStore()
         const viewerStore = useViewerStore()
-        infra_store.app_mode = appMode.BROWSER
+        infraStore.app_mode = appMode.BROWSER
         expect(viewerStore.port).toBe(viewerStore.default_local_port)
       })
       test("test app_mode DESKTOP", () => {
-        const infra_store = useInfraStore()
+        const infraStore = useInfraStore()
         const viewerStore = useViewerStore()
-        infra_store.app_mode = appMode.DESKTOP
+        infraStore.app_mode = appMode.DESKTOP
         expect(viewerStore.port).toBe(viewerStore.default_local_port)
       })
 
       test("test override default_local_port", () => {
-        const infra_store = useInfraStore()
+        const infraStore = useInfraStore()
         const viewerStore = useViewerStore()
-        infra_store.app_mode = appMode.DESKTOP
+        infraStore.app_mode = appMode.DESKTOP
         viewerStore.default_local_port = "8080"
         expect(viewerStore.port).toBe("8080")
       })
     })
     describe("base_url", () => {
       test("test app_mode DESKTOP", () => {
-        const infra_store = useInfraStore()
-        infra_store.app_mode = appMode.DESKTOP
-        infra_store.domain_name = "localhost"
+        const infraStore = useInfraStore()
+        infraStore.app_mode = appMode.DESKTOP
+        infraStore.domain_name = "localhost"
         // expect(viewerStore.base_url).toBe("ws://localhost:1234/ws")
       })
 
       test("test app_mode CLOUD", () => {
-        const infra_store = useInfraStore()
+        const infraStore = useInfraStore()
         const viewerStore = useViewerStore()
-        infra_store.app_mode = appMode.CLOUD
-        infra_store.ID = "123456"
-        infra_store.domain_name = "example.com"
+        infraStore.app_mode = appMode.CLOUD
+        infraStore.ID = "123456"
+        infraStore.domain_name = "example.com"
         expect(viewerStore.base_url).toBe(
           "wss://example.com:443/123456/viewer/ws",
         )
       })
 
       test("test app_mode CLOUD, ID empty", () => {
-        const infra_store = useInfraStore()
+        const infraStore = useInfraStore()
         const viewerStore = useViewerStore()
-        infra_store.app_mode = appMode.CLOUD
-        infra_store.ID = ""
-        infra_store.domain_name = "example.com"
+        infraStore.app_mode = appMode.CLOUD
+        infraStore.ID = ""
+        infraStore.domain_name = "example.com"
         expect(() => viewerStore.base_url).toThrowError(
           "ID must not be empty in cloud mode",
         )
@@ -163,9 +163,9 @@ describe("Viewer Store", () => {
   })
   describe("actions", () => {
     // test("ws_connect", async () => {
-    //   const infra_store = useInfraStore()
+    //   const infraStore = useInfraStore()
     //   const viewerStore = useViewerStore()
-    //   infra_store.app_mode = appMode.BROWSER
+    //   infraStore.app_mode = appMode.BROWSER
     //   const viewer_path = path.join(
     //     executable_path(
     //       path.join("tests", "integration", "microservices", "viewer"),
diff --git a/tests/unit/utils/recaptcha.nuxt.test.js b/tests/unit/utils/recaptcha.nuxt.test.js
index 7ee86908..2e34995d 100644
--- a/tests/unit/utils/recaptcha.nuxt.test.js
+++ b/tests/unit/utils/recaptcha.nuxt.test.js
@@ -2,9 +2,9 @@
 import { describe, expect, test } from "vitest"
 
 // Local imports
-import { check_recaptcha_params } from "@ogw_front/utils/recaptcha.js"
+import { check_recaptcha_params } from "@ogw_front/utils/recaptcha"
 
-describe("recaptcha.js", () => {
+describe("recaptcha", () => {
   const name = ""
   const email = ""
   const launch = false
diff --git a/tests/unit/utils/validate_schema.nuxt.test.js b/tests/unit/utils/validate_schema.nuxt.test.js
index ca2f38b6..17472f58 100644
--- a/tests/unit/utils/validate_schema.nuxt.test.js
+++ b/tests/unit/utils/validate_schema.nuxt.test.js
@@ -1,8 +1,8 @@
 import { describe, expect, test } from "vitest"
 
-import validate_schema from "@ogw_front/utils/validate_schema.js"
+import validate_schema from "@ogw_front/utils/validate_schema"
 
-describe("validate_schema.js", () => {
+describe("validate_schema", () => {
   const schema = {
     $id: "/test",
     type: "object",
diff --git a/tests/vitest.config.js b/tests/vitest.config.js
index a202c85c..14e4fd5a 100644
--- a/tests/vitest.config.js
+++ b/tests/vitest.config.js
@@ -22,7 +22,6 @@ export default defineConfig({
           include: ["tests/integration/**/*.test.js"],
           environment: "nuxt",
           fileParallelism: false,
-          setupFiles: ["tests/integration/setup.js"],
           server: {
             deps: {
               inline: ["vuetify"],