diff --git a/.github/workflows/qodana_code_quality.yml_ b/.github/workflows/qodana_code_quality.yml
similarity index 100%
rename from .github/workflows/qodana_code_quality.yml_
rename to .github/workflows/qodana_code_quality.yml
diff --git a/package.json b/package.json
index 4ec67e51..444ad60d 100644
--- a/package.json
+++ b/package.json
@@ -49,7 +49,6 @@
     "@types/pouchdb": "^6.4.2",
     "@types/rangy": "^0.0.38",
     "@types/sanitize-html": "^2.9.0",
-    "@xenova/transformers": "^2.12.1",
     "axios": "^1.3.4",
     "buffer": "^6.0.3",
     "date-fns": "^3.1.0",
diff --git a/qodana.yaml b/qodana.yaml
index eec2f044..b1a43524 100644
--- a/qodana.yaml
+++ b/qodana.yaml
@@ -20,7 +20,7 @@ profile:
 #plugins:
 #  - id: <plugin.id> #(plugin id can be found at https://plugins.jetbrains.com)
 #Specify Qodana linter for analysis (Applied in CI/CD pipeline)
-linter: jetbrains/qodana-jvm:latest
+linter: jetbrains/qodana:latest
 include:
   - name: DuplicatedCode
   - name: JsCoverageInspection
diff --git a/src-bex/background.ts b/src-bex/background.ts
index a9423703..ab4ea254 100644
--- a/src-bex/background.ts
+++ b/src-bex/background.ts
@@ -19,18 +19,18 @@ chrome.runtime.onInstalled.addListener((callback) => {
   // getting error: "Service worker registration failed. Status code: 15"
   // Analytics.fireEvent('install-' + callback.reason);
   if (callback.reason !== OnInstalledReason.CHROME_UPDATE) {
-      chrome.tabs.create({
-        active: true,
-        url: callback.previousVersion ?
-            "https://tabsets.web.app/#/updatedFrom/" +  callback.previousVersion :
-            "https://tabsets.web.app/#/installed/"
-      })
+    chrome.tabs.create({
+      active: true,
+      url: callback.previousVersion ?
+        "https://tabsets.web.app/#/updatedFrom/" + callback.previousVersion :
+        "https://tabsets.web.app/#/installed/"
+    })
   }
 });
 
 chrome.omnibox.onInputEntered.addListener((text) => {
   const newURL = chrome.runtime.getURL("/www/index.html#/searchresult?t=" + encodeURIComponent(text))
-  chrome.tabs.create({ url: newURL })
+  chrome.tabs.create({url: newURL})
     .catch((err) => console.log("background.js error", err))
 });
 
@@ -88,6 +88,15 @@ chrome.runtime.onStartup.addListener(() => {
   }
 })
 
+chrome.runtime.onConnect.addListener(function (port) {
+  if (port.name === 'tabsetsSidepanel') {
+    //console.log("port3", port)
+    port.onDisconnect.addListener(async () => {
+      //alert('Sidepanel closed.');
+    });
+  }
+});
+
 export default bexBackground((bridge, cons/* , allActiveConnections */) => {
   // bridge.on('some.event', ({data, respond}) => {
   //   console.log('Event receieved, responding...')
@@ -98,7 +107,7 @@ export default bexBackground((bridge, cons/* , allActiveConnections */) => {
   //   bridge.send('highlight.content', { url: tab.url })
   // })
 
-  bridge.on('quasar.detect', ({ data, respond }) => {
+  bridge.on('quasar.detect', ({data, respond}) => {
     console.log("quasar.detect2", data)
     // Let's resolve the `send()` call's promise, this way we can await it on the other side then display a notification.
     respond()
diff --git a/src/App.vue b/src/App.vue
index 2d324c68..5c4e12f4 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -4,21 +4,19 @@
 
 <script setup lang="ts">
 
-//window.global ||= window;
-
 import {LocalStorage, useQuasar} from "quasar";
 import AppService from "src/services/AppService";
 import {useAuthStore} from "stores/authStore";
 import {EventEmitter} from "events";
 import {logtail} from "boot/logtail";
 import {getAuth, isSignInWithEmailLink, onAuthStateChanged, signInWithEmailLink, UserCredential} from "firebase/auth";
-import {CURRENT_USER_EMAIL} from "boot/constants";
+import {CURRENT_USER_EMAIL, CURRENT_USER_ID} from "boot/constants";
+import {useSuggestionsStore} from "stores/suggestionsStore";
+import {StaticSuggestionIdent, Suggestion} from "src/models/Suggestion";
+import {useRoute, useRouter} from "vue-router";
 import {collection, doc, getDoc, getDocs} from "firebase/firestore";
 import {firestore} from "boot/firebase";
 import {Account} from "src/models/Account";
-import {useSuggestionsStore} from "stores/suggestionsStore";
-import {StaticSuggestionIdent, Suggestion} from "src/models/Suggestion";
-import {useRouter} from "vue-router";
 
 const $q = useQuasar()
 const router = useRouter()
@@ -29,57 +27,38 @@ emitter.setMaxListeners(12)
 
 const auth = getAuth();
 
-onAuthStateChanged(auth, (user) => {
+onAuthStateChanged(auth, async (user) => {
   if (user) {
     // User is signed in, see docs for a list of available properties
     // https://firebase.google.com/docs/reference/js/auth.user
-    console.log("%conAuthStateChanged: logged in", "border:1px solid green")
-    useAuthStore().setUser(user)
-
-    getDoc(doc(firestore, "users", user.uid))
-      .then(userDoc => {
-        //console.log("userDoc", userDoc)
-        const userData = userDoc.data()
-        console.log("userData", userData)
-
-        const account = new Account(user.uid, userData)
-
-        getDocs(collection(firestore, "users", user.uid, "subscriptions"))
-          .then((querySnapshot) => {
-            //console.log("querySnapshot", querySnapshot)
-            const products = new Set<string>()
-            querySnapshot.forEach((doc) => {
-              //console.log(doc.id, " => ", doc.data());
-              //key += doc.id + "|"
-              const subscriptionData = doc.data()
-              if (subscriptionData.status === "active") {
-                const items = subscriptionData.items
-                for (const i of items) {
-                  //console.log("checking item", i)
-                  if (i.plan.product) {
-                    products.add(i.plan.product)
-                  }
-                }
-              }
-              account.setProducts(Array.from(products))
-              // TODO we do not need to store that much
-              //account.addSubscription(subscriptionData)
-            })
-            useAuthStore().upsertAccount(account)
-            useAuthStore().setProducts(Array.from(products))
-
-            //AppService.restart("restarted=true")
-            AppService.init($q, router)
-          })
-
-      })
+    console.log("%conAuthStateChanged: about to log in", "border:1px solid green")
+
+    // --- if we do this in useAuthStore.setUser(), we cannot properly run vitest any more
+    const userDoc = await getDoc(doc(firestore, "users", user.uid))
+    const userData = userDoc.data()
+    const account = new Account(user.uid, userData)
+    const querySnapshot = await getDocs(collection(firestore, "users", user.uid, "subscriptions"))
+    const products = new Set<string>()
+    querySnapshot.forEach((doc) => {
+      const subscriptionData = doc.data()
+      if (subscriptionData.data && subscriptionData.data.metadata) {
+        products.add(subscriptionData.data.metadata.product)
+      }
+      account.setProducts(Array.from(products))
+      console.log("hier", account, products)
+
+    })
+    // --- end of statement
 
+    await AppService.init($q, router, true, user, account)
 
   } else {
     // User is signed out
     console.log("%conAuthStateChanged: logged out", "border:1px solid green")
-    useAuthStore().setUser(undefined)
-    AppService.init($q, router)
+    await AppService.init($q, router, true, undefined)
+    if (!router.currentRoute.value.path.startsWith("/mainpanel")) {
+      await router.push("/")
+    }
   }
 });
 
@@ -101,7 +80,7 @@ if (isSignInWithEmailLink(auth, window.location.href)) {
       logtail.info("found email link redirection")
     })
     .catch((error) => {
-      console.error("error", error)
+      console.error("error in email link redirection", error)
       logtail.error("error in email link redirection", error)
       useSuggestionsStore().addSuggestion(Suggestion.getStaticSuggestion(StaticSuggestionIdent.RESTART_SUGGESTED))
     });
@@ -111,7 +90,21 @@ if (isSignInWithEmailLink(auth, window.location.href)) {
 
 $q.dark.set($q.localStorage.getItem('darkMode') || false)
 
-AppService.init($q, router)
+const currentUser = $q.localStorage.getItem(CURRENT_USER_ID)
+if (currentUser) {
+  console.log("current user id found, waiting for auto-login")
+  // we should be logged in any second
+} else {
+
+  setTimeout(() => {
+    // triggers, but app should already have been started, no restart enforced
+    console.debug("app start fallback after 2000ms")
+    AppService.init($q, router, false)
+  }, 2000)
+
+
+}
+
 
 logtail.info("tabsets started", {
   "mode": process.env.MODE,
diff --git a/src/components/SavedPdfs.vue b/src/components/SavedPdfs.vue
index cd666b59..041df831 100644
--- a/src/components/SavedPdfs.vue
+++ b/src/components/SavedPdfs.vue
@@ -14,7 +14,7 @@
             *
           </div>
           <div class="col-9 text-body2 ellipsis">
-            {{ pdf.title }}
+            {{ pdf['title' as keyof object] }}
           </div>
           <div class="col-1">
 <!--            <q-icon name="close" @click.stop="deleteMHtml(pdf)"/>-->
diff --git a/src/components/SidePanelFooter.vue b/src/components/SidePanelFooter.vue
index 540a4514..6ab593f9 100644
--- a/src/components/SidePanelFooter.vue
+++ b/src/components/SidePanelFooter.vue
@@ -59,7 +59,10 @@
         </template>
 
       </div>
-      <div class="col text-right text-black">
+      <div class="col text-right text-black" v-if="useUiStore().appLoading">
+        &nbsp;
+      </div>
+      <div v-else class="col text-right text-black">
         <q-btn icon="o_help" v-if="usePermissionsStore().hasFeature(FeatureIdent.HELP)"
                :class="rightButtonClass()"
                flat
@@ -68,7 +71,7 @@
                @click="openHelpView()">
         </q-btn>
 
-        <q-btn icon="o_settings" v-if="useTabsStore().tabsets.size > 0"
+        <q-btn icon="o_settings" v-if="useTabsStore().tabsets.size > 0 || useAuthStore().isAuthenticated()"
                :class="rightButtonClass()"
                flat
                color="black"
@@ -77,13 +80,14 @@
           <q-tooltip class="tooltip" anchor="top left" self="bottom left">{{ settingsTooltip() }}</q-tooltip>
         </q-btn>
 
-        <q-btn v-if="useWindowsStore().currentWindows.length > 1"
-               icon="o_grid_view"
-               :class="rightButtonClass()"
-               flat
-               color="black"
-               :size="getButtonSize()"
-               @click="toggleShowWindowTable()">
+        <q-btn
+          icon="o_grid_view"
+          data-testid="buttonManageWindows"
+          :class="rightButtonClass()"
+          flat
+          color="black"
+          :size="getButtonSize()"
+          @click="toggleShowWindowTable()">
           <q-tooltip class="tooltip" anchor="top left" self="bottom left">Manage Windows</q-tooltip>
         </q-btn>
 
@@ -95,7 +99,8 @@
             flat
             color="black"
             size="20px">
-            <q-tooltip :delay="2000" anchor="center left" self="center right" class="tooltip-small">Alternative Access</q-tooltip>
+            <q-tooltip :delay="2000" anchor="center left" self="center right"
+                       class="tooltip-small">Alternative Access</q-tooltip>
           </q-icon>
           <q-menu :offset="[0, 7]" fit>
             <q-list dense style="min-width: 200px;min-height:50px">
@@ -125,8 +130,11 @@
           <q-menu :offset="[0, 7]" fit>
             <q-list dense style="min-width: 150px;min-height:50px">
               <q-item clickable v-close-popup>
-                <q-item-section @click="subscribe()">Subscribe</q-item-section>
+                <q-item-section @click="gotoStripe()">Subscriptions</q-item-section>
               </q-item>
+              <!--              <q-item clickable v-close-popup>-->
+              <!--                <q-item-section @click="subscribe()">Subscribe</q-item-section>-->
+              <!--              </q-item>-->
               <q-item clickable v-close-popup>
                 <q-item-section @click="logout()">Logout</q-item-section>
               </q-item>
@@ -152,12 +160,12 @@
 import {SidePanelView, useUiStore} from "src/stores/uiStore";
 import {useTabsStore} from "src/stores/tabsStore";
 import {Tab} from "src/models/Tab";
-import {ref, watch, watchEffect} from "vue";
+import {ref, watchEffect} from "vue";
 import {useRouter} from "vue-router";
 import {usePermissionsStore} from "src/stores/permissionsStore";
 import {FeatureIdent} from "src/models/AppFeature";
 import NavigationService from "src/services/NavigationService";
-import {LocalStorage, openURL, uid, useQuasar} from "quasar";
+import {openURL, uid, useQuasar} from "quasar";
 import {useUtils} from "src/services/Utils";
 import {useWindowsStore} from "src/stores/windowsStore";
 import {useSuggestionsStore} from "stores/suggestionsStore";
@@ -169,10 +177,10 @@ import {ToastType} from "src/models/Toast";
 import SidePanelFooterLeftButtons from "components/helper/SidePanelFooterLeftButtons.vue";
 import {useAuthStore} from "stores/authStore";
 import {Account} from "src/models/Account";
-import {NotificationType, useNotificationHandler} from "src/services/ErrorHandler";
+import {useNotificationHandler} from "src/services/ErrorHandler";
 import SidePanelLoginWidget from "components/helper/SidePanelLoginWidget.vue";
 import SidePanelWindowMarkupTable from "components/helper/SidePanelWindowMarkupTable.vue";
-import {Browser} from '@capacitor/browser';
+import {Window} from "src/models/Window"
 
 const {handleSuccess, handleError} = useNotificationHandler()
 
@@ -199,13 +207,15 @@ const account = ref<Account | undefined>(undefined)
 const randomKey = ref<string>(uid())
 
 watchEffect(() => {
-  account.value = authStore.getAccount()
+  const windowId = useWindowsStore().currentChromeWindow?.id || 0
+  if (useWindowsStore().windowForId(windowId)?.open) {
+    //console.log("setting showWindowTable to ", useWindowsStore().windowForId(windowId)?.open)
+    showWindowTable.value = useWindowsStore().windowForId(windowId)?.open || false
+  }
 })
 
 watchEffect(() => {
-  if (useWindowsStore().currentWindows.length === 1) {
-    showWindowTable.value = false
-  }
+  account.value = authStore.getAccount()
 })
 
 watchEffect(() => {
@@ -238,7 +248,7 @@ watchEffect(() => {
   if (!inBexMode()) {
     return
   }
-  const windowId = useWindowsStore().currentWindow?.id || 0
+  const windowId = useWindowsStore().currentChromeWindow?.id || 0
   currentChromeTab.value = useTabsStore().getCurrentChromeTab(windowId) || useTabsStore().currentChromeTab
 })
 
@@ -343,6 +353,12 @@ const toggleShowWindowTable = () => {
   if (showWindowTable.value) {
     randomKey.value = uid()
   }
+  const windowId = useWindowsStore().currentChromeWindow?.id || 0
+  const currentWindow: Window | undefined = useWindowsStore().windowForId(windowId)
+  if (currentWindow) {
+    currentWindow.open = showWindowTable.value
+    useWindowsStore().upsertTabsetWindow(currentWindow)
+  }
 }
 
 const logout = () => {
@@ -363,6 +379,7 @@ const subscribe = () => router.push("/subscribe")
 
 const offsetBottom = () => ($q.platform.is.capacitor || $q.platform.is.cordova) ? 'margin-bottom:20px;' : ''
 
+const gotoStripe = () => openURL("https://billing.stripe.com/p/login/test_5kA9EHf2Da596HuaEE")
 
 </script>
 
diff --git a/src/components/dialogues/NewTabsetDialog.vue b/src/components/dialogues/NewTabsetDialog.vue
index 94e85585..19465022 100644
--- a/src/components/dialogues/NewTabsetDialog.vue
+++ b/src/components/dialogues/NewTabsetDialog.vue
@@ -1,6 +1,10 @@
 <template>
     <q-dialog ref="dialogRef" @hide="onDialogHide">
-      <NewTabsetDialogBody :space-id="props.spaceId" :from-panel="props.fromPanel"/>
+      <NewTabsetDialogBody
+        :space-id="props.spaceId"
+        :name="props.name"
+        :window-id="props.windowId"
+        :from-panel="props.fromPanel"/>
     </q-dialog>
 </template>
 
@@ -15,6 +19,8 @@ defineEmits([
 
 const props = defineProps({
   spaceId: {type: String, required: false},
+  name: {type: String, default: ""},
+  windowId: {type: Number, required: false},
   fromPanel: {type: Boolean, default: false}
 })
 
diff --git a/src/components/dialogues/RenameWindowDialog.vue b/src/components/dialogues/RenameWindowDialog.vue
new file mode 100644
index 00000000..4179b693
--- /dev/null
+++ b/src/components/dialogues/RenameWindowDialog.vue
@@ -0,0 +1,87 @@
+<template>
+  <q-dialog ref="dialogRef" @hide="onDialogHide">
+    <q-card class="q-dialog-plugin">
+      <q-card-section>
+        <div class="text-h6">Window</div>
+      </q-card-section>
+      <q-card-section>
+        <div class="text-body">You can provide a new name for this window</div>
+      </q-card-section>
+
+      <q-card-section class="q-pt-none">
+        <q-input dense v-model="newWindowName" autofocus @keydown.enter="updateWindow()"
+                 error-message="Please do not use special Characters, maximum length is 32"
+                 :error="!newWindowNameIsValid" />
+<!--        <div class="text-body2 text-warning">{{ newTabsetDialogWarning() }}</div>-->
+      </q-card-section>
+
+      <q-card-actions align="right" class="text-primary">
+        <q-btn label="Cancel" size="sm" color="accent" @click="onDialogCancel"/>
+        <q-btn label="Update" size="sm" color="warning"
+               :disable="disableSubmit()"
+               v-close-popup
+               @click="updateWindow()"/>
+      </q-card-actions>
+
+
+    </q-card>
+  </q-dialog>
+
+</template>
+
+<script lang="ts" setup>
+
+import {computed, ref, watchEffect} from "vue";
+import {useDialogPluginComponent} from "quasar";
+import {useTabsStore} from "src/stores/tabsStore";
+import {STRIP_CHARS_IN_USER_INPUT} from "boot/constants";
+import {useCommandExecutor} from "src/services/CommandExecutor";
+import {RenameWindowCommand} from "src/domain/tabsets/RenameWindow";
+import {ExecutionResult} from "src/domain/ExecutionResult";
+
+defineEmits([
+  ...useDialogPluginComponent.emits
+])
+
+const props = defineProps({
+  windowId: {type: Number, required: true},
+  currentName: {type: String, required: true},
+  index: {type: Number, required: true}
+})
+
+const {dialogRef, onDialogOK, onDialogHide, onDialogCancel} = useDialogPluginComponent()
+
+const tabsStore = useTabsStore()
+
+const newWindowName = ref(props.currentName)
+const newWindowNameExists = ref(false)
+const hideWarning = ref(false)
+
+watchEffect(() => {
+  newWindowNameExists.value = !!tabsStore.nameExistsInContextTabset(newWindowName.value);
+})
+
+const updateWindow = () => useCommandExecutor()
+  .executeFromUi(new RenameWindowCommand(props.windowId, newWindowName.value, props.index))
+  .then((result: ExecutionResult<string>) => {
+    onDialogOK({ name: newWindowName.value })
+  })
+
+// const newTabsetDialogWarning = () => {
+//   return (!hideWarning.value && newWindowName.value !== props.tabsetName && tabsStore.nameExistsInContextTabset(newWindowName.value)) ?
+//     "Tabset already exists" : ""
+// }
+
+const newWindowNameIsValid = computed(() =>
+  newWindowName.value?.length <= 32 && !STRIP_CHARS_IN_USER_INPUT.test(newWindowName.value))
+
+const disableSubmit = (): boolean => {
+  return newWindowName.value.trim().length === 0
+}
+
+</script>
+
+<style lang="sass" scoped>
+.my-input
+  max-width: 250px
+</style>
diff --git a/src/components/dialogues/SuggestionDialog.vue b/src/components/dialogues/SuggestionDialog.vue
index db7983d3..b9a7557e 100644
--- a/src/components/dialogues/SuggestionDialog.vue
+++ b/src/components/dialogues/SuggestionDialog.vue
@@ -13,6 +13,13 @@
         <q-btn label="Later" size="sm" v-close-popup @click="delayDecision">
           <q-tooltip class="tooltip-small" :delay="500">Click here to decide later</q-tooltip>
         </q-btn>
+        <template v-if="suggestion.type === SuggestionType.RESTART">
+          <q-btn label="Restart" size="sm" color="warning" v-close-popup @click="restart()">
+            <q-tooltip class="tooltip-small" :delay="500">Restart Tabsets</q-tooltip>
+          </q-btn>
+        </template>
+        <template v-else>
+
         <q-btn label="Ignore" size="sm" color="negative" v-close-popup @click="ignoreSuggestion">
           <q-tooltip class="tooltip-small" :delay="500">This suggestion will not show up again</q-tooltip>
         </q-btn>
@@ -20,6 +27,7 @@
           <q-tooltip class="tooltip-small" :delay="500">Get Details about this suggestion and decide what to do
           </q-tooltip>
         </q-btn>
+        </template>
       </q-card-actions>
 
 
@@ -36,6 +44,7 @@ import {useRouter} from "vue-router";
 import {useSuggestionsStore} from "src/stores/suggestionsStore";
 import {Suggestion, SuggestionState, SuggestionType} from "src/models/Suggestion";
 import NavigationService from "src/services/NavigationService";
+import AppService from "src/services/AppService";
 
 defineEmits([
   ...useDialogPluginComponent.emits
@@ -91,4 +100,9 @@ const addSuggestion = () => {
   }
 }
 
+const restart = () => {
+  useSuggestionsStore().removeSuggestion(props.suggestion.id)
+  AppService.restart("restarted=true")
+}
+
 </script>
diff --git a/src/components/dialogues/helper/NewTabsetDialogBody.vue b/src/components/dialogues/helper/NewTabsetDialogBody.vue
index 501c0d36..57be7aa3 100644
--- a/src/components/dialogues/helper/NewTabsetDialogBody.vue
+++ b/src/components/dialogues/helper/NewTabsetDialogBody.vue
@@ -4,7 +4,8 @@
 
       <q-card class="q-dialog-plugin" style="max-width:100%">
         <q-card-section>
-          <div class="text-h6">Add Tabset</div>
+          <div class="text-h6" v-if="props.windowId">Save Windows Tabs as Tabset</div>
+          <div class="text-h6" v-else>Add Tabset</div>
         </q-card-section>
 
         <q-card-section class="q-pt-none">
@@ -20,31 +21,31 @@
                        ]"
                    data-testid="newTabsetName"/>
 
-          <template v-if="inBexMode()">
+          <template v-if="inBexMode() && !props.windowId">
             <q-checkbox
-                data-testid="newTabsetAutoAdd"
-                v-model="addAllOpenTabs" label="Add all open tabs"/>&nbsp;
-            <q-icon
-                name="help" color="primary" size="1em">
+              data-testid="newTabsetAutoAdd"
+              v-model="addAllOpenTabs" label="Add all open tabs"/>&nbsp;
+            <q-icon v-if="!props.windowId"
+                    name="help" color="primary" size="1em">
               <q-tooltip>If you select this option, all currently open tabs will be added to your new tabset</q-tooltip>
             </q-icon>
           </template>
         </q-card-section>
 
-        <q-card-section>
+        <q-card-section v-if="!props.windowId">
           <q-select
-              dense
-              options-dense
-              clearable
-              clear-icon="close"
-              label="Open in Window"
-              filled
-              v-model="windowModel"
-              map-options
-              use-input
-              :options="windowOptions"
-              input-debounce="0"
-              @new-value="createWindowOption"
+                    dense
+                    options-dense
+                    clearable
+                    clear-icon="close"
+                    label="Open in Window"
+                    filled
+                    v-model="windowModel"
+                    map-options
+                    use-input
+                    :options="windowOptions"
+                    input-debounce="0"
+                    @new-value="createWindowOption"
           />
         </q-card-section>
 
@@ -56,7 +57,7 @@
         </q-card-section>
 
         <q-card-actions align="right">
-          <DialogButton label="Cancel" color="accent" v-close-popup/>
+          <DialogButton label="Cancel" color="primary" v-close-popup/>
           <DialogButton label="Add"
                         data-testid="newTabsetNameSubmit"
                         type="submit"
@@ -93,17 +94,19 @@ const {inBexMode} = useUtils()
 
 const props = defineProps({
   spaceId: {type: String, required: false},
+  name: {type: String, default: ""},
+  windowId: {type: Number, required: false},
   fromPanel: {type: Boolean, default: false}
 })
 
 const tabsStore = useTabsStore()
 const router = useRouter()
 
-const newTabsetName = ref('')
+const newTabsetName = ref(props.name)
 const isValid = ref(false)
-const addAllOpenTabs = ref(false)
+const addAllOpenTabs = ref(props.windowId !== undefined)
 const theForm = ref<QForm>(null as unknown as QForm)
-const windowModel = ref<string>(null)
+const windowModel = ref<string>(null as unknown as string)
 const windowOptions = ref<string[]>([])
 const theColor = ref<string | undefined>(undefined)
 
@@ -122,9 +125,9 @@ watchEffect(() => {
 const checkIsValid = () => {
   if (theForm.value) {
     theForm.value.validate()
-        .then((res) => {
-          isValid.value = res
-        })
+      .then((res) => {
+        isValid.value = res
+      })
   }
 }
 
@@ -135,30 +138,37 @@ const doesNotExistYet = (val: string) => {
 
 const createNewTabset = () => {
   console.log("createNewTabset", addAllOpenTabs.value, tabsStore.tabs, windowModel.value)
-  const tabsToUse = addAllOpenTabs.value ? tabsStore.tabs : []
+  let tabsToUse = addAllOpenTabs.value ? tabsStore.tabs : []
+  if (props.windowId) {
+    const window:chrome.windows.Window | undefined = useWindowsStore().currentChromeWindow(props.windowId)
+    if (window) {
+      tabsToUse = window.tabs as chrome.tabs.Tab[]
+      windowModel.value = newTabsetName.value
+    }
+  }
   useCommandExecutor()
-      .executeFromUi(new CreateTabsetCommand(newTabsetName.value, tabsToUse, windowModel.value, theColor.value))
-      .then((res) => {
-        if (props.spaceId) {
-          const ts: Tabset = res.result.tabset
-          ts.spaces.push(props.spaceId)
-          useTabsetService().saveTabset(ts)
-        }
-        if (!addAllOpenTabs.value) {
-          TabsetService.createPendingFromBrowserTabs()
-        } else {
-          if (tabsStore.pendingTabset) {
-            // clear pending tabset - why necessary?
-            tabsStore.pendingTabset.tabs = []
-          }
+    .executeFromUi(new CreateTabsetCommand(newTabsetName.value, tabsToUse, windowModel.value, theColor.value))
+    .then((res) => {
+      if (props.spaceId) {
+        const ts: Tabset = res.result.tabset
+        ts.spaces.push(props.spaceId)
+        useTabsetService().saveTabset(ts)
+      }
+      if (!addAllOpenTabs.value) {
+        TabsetService.createPendingFromBrowserTabs()
+      } else {
+        if (tabsStore.pendingTabset) {
+          // clear pending tabset - why necessary?
+          tabsStore.pendingTabset.tabs = []
         }
-        if (!props.fromPanel) {
-          router.push("/tabsets/" + res.result.tabsetId)
-        } else {
-          useUiStore().sidePanelSetActiveView(SidePanelView.MAIN)
-          router.push("/sidepanel?first=")
-        }
-      })
+      }
+      if (!props.fromPanel) {
+        router.push("/tabsets/" + res.result.tabsetId)
+      } else {
+        useUiStore().sidePanelSetActiveView(SidePanelView.MAIN)
+        router.push("/sidepanel?first=")
+      }
+    })
 }
 
 const createWindowOption = (val: any, done: any) => {
diff --git a/src/components/helper/SidePanelWindowMarkupTable.vue b/src/components/helper/SidePanelWindowMarkupTable.vue
index 49e180ce..1c191d69 100644
--- a/src/components/helper/SidePanelWindowMarkupTable.vue
+++ b/src/components/helper/SidePanelWindowMarkupTable.vue
@@ -1,14 +1,28 @@
 <template>
-  <div class="col-12 text-right">
+  <div class="col-12 text-right bg-grey-1">
 
     <Transition name="bounceInLeft" appear>
 
-      <q-markup-table class="q-ma-none" dense flat>
+      <q-markup-table class="q-ma-none bg-grey-2" dense flat>
+        <thead>
         <tr>
-          <th class="text-left" style="border-bottom: 1px solid #efefef">Window Name (editable)</th>
+          <!--          <th></th>-->
+          <th class="text-left" style="border-bottom: 1px solid #efefef">Window Name</th>
           <th class="text-right" style="border-bottom: 1px solid #efefef">#Tabs</th>
-          <th class="text-right" style="border-bottom: 1px solid #efefef">Actions</th>
+          <th class="text-right q-pr-none" style="border-bottom: 1px solid #efefef;text-align:right;">
+            <!--            <q-select dense options-dense borderless :item-aligned="true" style="width:100%"-->
+            <!--                      v-model="windowsToOpen" :options="windowsToOpenOptions" label="Open..."/>-->
+            <span class="text-grey-8 cursor-pointer"><q-icon name="open_in_new" color="primary" class="q-mr-xs"/>Open Window </span>
+            <q-menu :offset="[0, 7]" fit>
+              <q-list dense style="min-width: 250px">
+                <q-item clickable v-close-popup v-for="w in windowsToOpenOptions">
+                  <q-item-section @click="openNewWindow(w)">{{ w['label' as keyof object] }}</q-item-section>
+                </q-item>
+              </q-list>
+            </q-menu>
+          </th>
         </tr>
+        </thead>
 
         <vue-draggable-next
           class="q-ma-none"
@@ -16,31 +30,61 @@
           :list="rows"
           :group="{ name: 'tabs', pull: 'clone' }"
           @change="(event:any) => handleDragAndDrop(event)">
-          <tr v-for="row in rows" style="max-height:15px">
-<!--            <td>{{ row['index' as keyof object] }}</td>-->
-            <td class="text-left" :class="row['focused' as keyof object] ? 'text-bold':''" style="cursor:move">
-              {{ row['name' as keyof object] }}
-              <q-popup-edit v-model="row['name' as keyof object]" v-slot="scope">
-                <q-input v-model="scope.value" dense autofocus counter
-                         @update:model-value="(val:any) => setWindowName(row, val)"
-                         @keyup.enter="scope.set"/>
-              </q-popup-edit>
+          <tr v-for="row in rows"
+              @mouseover="hoveredWindow = row['id' as keyof object]"
+              @mouseleave="hoveredWindow = undefined"
+              style="max-height:15px">
+            <!--            <td>{{ row['index' as keyof object] }}</td>-->
+            <!--            <td>{{ row['state' as keyof object] }}</td>-->
+            <td class="text-left" :class="windowNameRowClass(row)"
+                @dblclick.stop="openRenameWindowDialog(row['id' as keyof object], row['name' as keyof object], row['index' as keyof object])"
+                @click.prevent.stop="openWindow(row['id' as keyof object])">
+              <q-icon v-if="rows.length > 1" name="drag_indicator" class="q-mr-sm" style="cursor:move">
+<!--                <q-tooltip class="tooltip-small" v-if="useSettingsStore().isEnabled('dev')">{{ row['index' as keyof object]}}</q-tooltip>-->
+              </q-icon>
+              <span class="cursor-pointer" :data-testid="'windowDataColumn_name_' + row['id' as keyof object]">
+                {{ row['name' as keyof object] }}
+<!--                <q-tooltip class="tooltip-small" v-if="useSettingsStore().isEnabled('dev')">{{ row['id' as keyof object]}}</q-tooltip>-->
+              </span>
+
             </td>
-            <td>
+            <td :data-testid="'windowDataColumn_tabsCount_' + row['id' as keyof object]">
               {{ row['tabsCount' as keyof object] }}
             </td>
             <td>
-              <q-icon name="open_in_new"
-                      class="q-ml-sm"
-                      :class="useWindowsStore().currentWindow?.id === row['id' as keyof object] ? 'text-grey' : 'text-blue-8 cursor-pointer'"
-                      @click="openWindow(row['id' as keyof object])">
-                <q-tooltip :delay=500 class="tooltip-small">Open this window</q-tooltip>
-              </q-icon>
-              <q-icon name="o_close"
-                      class="q-ml-sm text-red-8 cursor-pointer"
-                      @click="closeWindow(row['id' as keyof object])">
-                <q-tooltip :delay=500 class="tooltip-small">Close this window</q-tooltip>
-              </q-icon>
+              <template v-if="hoveredWindow === row['id' as keyof object]">
+                <q-icon v-if="'minimized' !== row['state' as keyof object]"
+                        name="visibility_off"
+                        class="q-ml-sm text-warning cursor-pointer"
+                        @click="minimizeWindow(row['id' as keyof object])">
+                  <q-tooltip :delay=500 class="tooltip-small">Hide Window</q-tooltip>
+                </q-icon>
+                <!--                <q-icon name="open_in_new"-->
+                <!--                        class="q-ml-sm cursor-pointer"-->
+                <!--                        :class="useWindowsStore().currentChromeWindow?.id === row['id' as keyof object] ? 'text-grey' : 'text-blue-8 cursor-pointer'"-->
+                <!--                        @click="openWindow(row['id' as keyof object])">-->
+                <!--                  <q-tooltip :delay=500 class="tooltip-small">Open this window</q-tooltip>-->
+                <!--                </q-icon>-->
+                <q-icon name="edit"
+                        class="q-ml-sm text-blue-8 cursor-pointer"
+                        @click="openRenameWindowDialog(row['id' as keyof object], row['name' as keyof object], row['index' as keyof object])">
+                  <q-tooltip :delay=500 class="tooltip-small">Edit Window Name</q-tooltip>
+                </q-icon>
+                <q-icon name="o_bookmark_add"
+                        size="xs"
+                        class="q-ml-sm text-warning cursor-pointer"
+                        @click="saveAsTabset(row['id' as keyof object], row['name' as keyof object])">
+                  <q-tooltip :delay=500 class="tooltip-small">Save as Tabset</q-tooltip>
+                </q-icon>
+                <q-icon name="o_close"
+                        class="q-ml-sm text-red-8 cursor-pointer"
+                        @click="closeWindow(row['id' as keyof object])">
+                  <q-tooltip :delay=500 class="tooltip-small">Close this window</q-tooltip>
+                </q-icon>
+              </template>
+              <template v-else>
+                <div>&nbsp;</div>
+              </template>
             </td>
           </tr>
         </vue-draggable-next>
@@ -58,85 +102,163 @@ import {useWindowsStore} from "stores/windowsStore";
 import {onMounted, ref, watch, watchEffect} from "vue";
 import {Window} from "src/models/Window"
 import _ from "lodash";
-import {LocalStorage, QTable} from "quasar";
+import {LocalStorage, QTable, uid, useQuasar} from "quasar";
 import {VueDraggableNext} from 'vue-draggable-next'
+import NewTabsetDialog from "components/dialogues/NewTabsetDialog.vue";
+import {useSpacesStore} from "stores/spacesStore";
+import {useTabsStore} from "stores/tabsStore";
+import {Tabset} from "src/models/Tabset";
+import {useCommandExecutor} from "src/services/CommandExecutor";
+import {RestoreTabsetCommand} from "src/domain/tabsets/RestoreTabset";
+import NavigationService from "src/services/NavigationService";
+import {useUtils} from "src/services/Utils";
+import {useUiStore} from "stores/uiStore";
+import {usePermissionsStore} from "stores/permissionsStore";
+import {useTabsetService} from "src/services/TabsetService2";
+import {useBookmarksStore} from "stores/bookmarksStore";
+import {useDB} from "src/services/usePersistenceService";
+import TabsetService from "src/services/TabsetService";
+import {useSuggestionsStore} from "stores/suggestionsStore";
+import MqttService from "src/services/mqtt/MqttService";
+import AppService from "src/services/AppService";
+import {useNotificationHandler} from "src/services/ErrorHandler";
+import ExportDialog from "components/dialogues/ExportDialog.vue";
+import RenameWindowDialog from "components/dialogues/RenameWindowDialog.vue";
+import {useSettingsStore} from "stores/settingsStore";
+
+const {handleError} = useNotificationHandler()
+const {sendMsg} = useUtils()
 
-const columns = [
-  {name: 'index', field: 'index', label: '#', align: 'left', sortable: false},
-  {name: 'name', field: 'name', required: true, label: 'Window Name (editable)', align: 'left', sortable: false},
-  {name: 'state', field: 'state', label: 'State', align: 'left', sortable: false},
-  {name: 'tabsCount', field: 'tabsCount', required: true, label: '#Tabs', align: 'right', sortable: false},
-  {name: 'windowAction', align: 'center', label: 'Actions', field: 'windowAction', sortable: false}
-]
+const $q = useQuasar()
 
 const rows = ref<object[]>([])
 const currentWindowName = ref('---')
-const tableRef = ref<QTable>(null as unknown as QTable)
+
+const windowsToOpen = ref<string>('')
+const windowsToOpenOptions = ref<object[]>([])
+const hoveredWindow = ref<number | undefined>(undefined)
+
+const windowsUpdatedListener = (message: any, sender: chrome.runtime.MessageSender, sendResponse: any) => {
+  if (message.name === 'window-updated') {
+    console.log("got message 'window-updated'", message.data.initiated, message)
+    useWindowsStore().setup('got window-updated message', true)
+      .then(() => rows.value = calcWindowRows())
+    //useUiStore().windowsChanged = message
+  }
+  return true
+}
 
 onMounted(() => {
   rows.value = calcWindowRows()
 })
 
-watch(() => useWindowsStore().currentWindows, (newWindows, oldWindows) => {
-  console.log("windows changed", newWindows, oldWindows)
+watch(() => useWindowsStore().currentChromeWindows, (newWindows, oldWindows) => {
+  //console.log("windows changed", newWindows, oldWindows)
   rows.value = calcWindowRows()
 })
 
+//console.log("====>: chrome.runtime.onMessage.hasListeners(windowsUpdatedListener)", chrome.runtime.onMessage.hasListener(windowsUpdatedListener))
+chrome.runtime.onMessage.addListener(windowsUpdatedListener)
+
+chrome.tabs.onRemoved.addListener((tabId: number, removeInfo: chrome.tabs.TabRemoveInfo) => {
+  //console.log("***here we are", tabId, removeInfo)
+  useWindowsStore().setup('got window-updated message')
+    .then(() => rows.value = calcWindowRows())
+    .catch((err) => handleError(err))
+})
+
+chrome.tabs.onCreated.addListener((tab: chrome.tabs.Tab) => {
+  //console.log("***here we are2", tab)
+  // useWindowsStore().setup('got window-updated message')
+  //   .then(() => rows.value = calcWindowRows())
+  //   .catch((err) => handleError(err))
+})
+
+chrome.tabs.onUpdated.addListener((tabId: number, changeInfo: chrome.tabs.TabChangeInfo, tab: chrome.tabs.Tab) => {
+  //console.log("***here we are3", tab)
+  useWindowsStore().setup('got window-updated message')
+    .then(() => rows.value = calcWindowRows())
+    .catch((err) => handleError(err))
+})
+
+watchEffect(() => {
+  // adding potentially new windows from 'open in window' logic
+  windowsToOpenOptions.value = [{label: ' > open new Window', value: 'newWindow'}]
+  for (const ts of [...useTabsStore().tabsets.values()] as Tabset[]) {
+    if (ts.window && ts.window !== "current" && ts.window.trim() !== '') {
+      const found = _.find(rows.value, (r: object) => ts.window === r['name' as keyof object])
+      if (!found) {
+        //console.debug (" about to add new window with title", ts.window)
+        windowsToOpenOptions.value.push({
+          label: ts.window,
+          value: ts.id
+        })
+      }
+    }
+  }
+})
+
 watchEffect(() => {
-  const res = useWindowsStore().currentWindow && useWindowsStore().currentWindow.id ?
-    useWindowsStore().windowNameFor(useWindowsStore().currentWindow.id || 0) || 'n/a' :
+  const res = useWindowsStore().currentChromeWindow && useWindowsStore().currentChromeWindow.id ?
+    useWindowsStore().windowNameFor(useWindowsStore().currentChromeWindow.id || 0) || 'n/a' :
     'n/a'
   currentWindowName.value = res
 })
 
+const openNewWindow = (w: object) => {
+  console.log("windows to open set to ", w)
+  const label = w['label' as keyof object] as string
+  const tsId = w['value' as keyof object] as string
+  if (tsId === 'newWindow') {
+    chrome.windows.create()
+    windowsToOpen.value = ''
+  } else if (label && label.trim() !== '') {
+    useCommandExecutor().execute(new RestoreTabsetCommand(tsId, label, false))
+    windowsToOpen.value = ''
+  }
+}
+
 const openWindow = (windowId: number) => {
-  if (useWindowsStore().currentWindow?.id !== windowId) {
+  if (useWindowsStore().currentChromeWindow?.id !== windowId) {
     chrome.windows.update(windowId, {drawAttention: true, focused: true},
       (callback) => {
       })
   }
 }
+const saveAsTabset = (windowId: number, name: string) => {
+  $q.dialog({
+    component: NewTabsetDialog,
+    componentProps: {
+      windowId: windowId,
+      spaceId: useSpacesStore().space?.id,
+      name: name,
+      fromPanel: true
+    }
+  })
+}
 
-const hideWindow = (windowId: number) => {
+const minimizeWindow = (windowId: number) => {
   chrome.windows.update(windowId, {state: "minimized"})
   useWindowsStore().refreshCurrentWindows()
 }
 
-const restoreWindow = (windowId: number) => {
-  if (useWindowsStore().currentWindow?.id !== windowId) {
-    chrome.windows.update(windowId, {state: "normal"})
-    useWindowsStore().refreshCurrentWindows()
-  }
-}
-
 const closeWindow = (windowId: number) => {
   chrome.windows.remove(windowId)
   useWindowsStore().refreshCurrentWindows()
 }
 
 const calcWindowRows = () => {
-  //let index = 100
-  //const usedIndices: number[] = []
-  const result = _.map(useWindowsStore().currentWindows as chrome.windows.Window[], (cw: chrome.windows.Window) => {
-    const windowFromStore: Window | undefined = useWindowsStore().windowForId(cw.id || -1)
-    // if (!windowFromStore || !windowFromStore.index) {
-    //   console.log("found windowfromstore without index", windowFromStore)
-    // }
-    //let indexToUse = windowFromStore && windowFromStore.index ? windowFromStore.index : index++
-    // if (usedIndices.indexOf(indexToUse) >= 0) {
-    //   console.log("found used index", indexToUse, usedIndices)
-    //   indexToUse = 1 + Math.max(...usedIndices)
-    //   useWindowsStore().upsertWindow(cw, windowFromStore?.title, indexToUse)
-    // }
-    // usedIndices.push(indexToUse)
-
-    console.debug(`setting window ${cw.id} ['${windowFromStore?.title}'] (#${cw.tabs?.length} tabs) -> #${windowFromStore?.index}`)
+  //console.log("calculating window Rows")
+  const result = _.map(useWindowsStore().currentChromeWindows as chrome.windows.Window[], (cw: chrome.windows.Window) => {
+    const windowFromStore: Window | undefined = useWindowsStore().windowForId(cw.id || -2)
+
+    // console.debug(`setting window ${cw.id} ['${windowFromStore?.title}'] (#${cw.tabs?.length} tabs, #${windowFromStore?.hostList.size} hosts) -> #${windowFromStore?.index}`)
 
     return {
       id: cw.id,
-      index: windowFromStore?.index || -1,
+      index: windowFromStore?.index || 0,
       tabsCount: cw.tabs?.length || 0,
-      name: useWindowsStore().windowNameFor(cw.id || 0) || cw.id,
+      name: useWindowsStore().windowNameFor(cw.id || 0) || cw.id!.toString(),
       windowHeight: cw['height' as keyof object],
       windowWidth: cw['width' as keyof object],
       focused: cw.focused,
@@ -145,46 +267,31 @@ const calcWindowRows = () => {
       sessionId: cw.sessionId,
       state: cw.state,
       type: cw.type,
-      windowIcon: "*"
+      windowIcon: "*",
+      hostList: windowFromStore?.hostList
     }
   })
 
-  return _.sortBy(result,"index")
-}
-
-
-const setWindowName = (windowRow: object, newName: string) => {
-  if (newName && newName.toString().trim().length > 0) {
-    const id = windowRow['id' as keyof object]
-    chrome.windows.get(id, (cw) => {
-      useWindowsStore().upsertWindow(cw, newName.toString().trim(), windowRow['index' as keyof object])
-      if (useWindowsStore().currentWindow?.id === id) {
-        currentWindowName.value = newName
-        //console.log("setting window name to ", currentWindowName.value)
-        useWindowsStore().currentWindowName = newName
-      }
-    })
-  }
-
+  return _.sortBy(result, "index")
 }
 
 const handleDragAndDrop = async (event: any) => {
   const {moved, added} = event
-  console.log("event!", event)
+
   if (moved) {
-    console.log(`moved event: '${moved.element.id}' ${moved.oldIndex} -> ${moved.newIndex}`, rows.value)
+    console.log(`moved event: '${moved.element.id}' ${moved.oldIndex} -> ${moved.newIndex}`, rows.value, event)
     //useWindowsStore().moveWindow(rows.value, moved.element.id, moved.oldIndex, moved.newIndex)
     const windowIndex = moved.element.id
-    console.log("moving window", windowIndex)
+    //console.log("moving window", windowIndex)
     //const theWindows = getSortedWindows(windowForId);
 
     //console.log("*** theWindows", theWindows)
     const oldIndex = moved.oldIndex
     const newIndex = moved.newIndex
 
-    console.log("moving", windowIndex, oldIndex, newIndex)
+    //console.log("moving", windowIndex, oldIndex, newIndex)
     if (oldIndex >= 0 && rows.value.length > 0) {
-      console.log("old rows", _.map(rows.value, r => r['id' as keyof object] + ":" + r['index' as keyof object]))
+      console.log("old rows", _.map(rows.value, r => r['id' as keyof object] + "("+r['name' as keyof object]+"):" + r['index' as keyof object]))
       const newOrder = _.map(rows.value, r => r['id' as keyof object] as number)
       const startIndex = rows.value[0]['index' as keyof object]
       let index = startIndex
@@ -194,9 +301,37 @@ const handleDragAndDrop = async (event: any) => {
       }
     }
     rows.value = calcWindowRows()
+    sendMsg('window-updated', {initiated: "SidePanelWindowMarkupTable#handleDragAndDrop"})
 
     //useWindowsStore().refreshCurrentWindows()
+  } else {
+    console.log("unhandled event!", event)
+  }
+}
+
+const openRenameWindowDialog = (windowId: number, currentName: string, index: number) => {
+  $q.dialog({component: RenameWindowDialog, componentProps: {windowId, currentName, index}})
+    .onOk((name: string) => {
+      console.log("hier", name)
+      rows.value = calcWindowRows()
+      // if (useWindowsStore().currentChromeWindow?.id === windowId) {
+      //   useWindowsStore().currentWindowName = name
+      //   //sendMsg('window-updated', {initiated: "RenameWindowDialog#updateWindow"})
+      // }
+    })
+}
+
+const windowNameRowClass = (row: any) => {
+  if (useWindowsStore().currentChromeWindow?.id === row['id' as keyof object]) {
+    return row['focused' as keyof object] ? 'text-bold text-primary' : 'text-bold'
   }
+  if (row['focused' as keyof object]) {
+    return 'text-primary'
+  }
+  if (row['state'] === 'minimized') {
+    return 'text-grey-5'
+  }
+  return ''
 }
 
 </script>
@@ -207,4 +342,5 @@ const handleDragAndDrop = async (event: any) => {
   padding-top: 0;
   padding-bottom: 0
 }
+
 </style>
diff --git a/src/components/helper/SidePanelWindowTable.vue b/src/components/helper/SidePanelWindowTable.vue
index ebf2a1a6..78901209 100644
--- a/src/components/helper/SidePanelWindowTable.vue
+++ b/src/components/helper/SidePanelWindowTable.vue
@@ -104,20 +104,20 @@ onMounted(() => {
   rows.value = calcWindowRows()
 })
 
-watch(() => useWindowsStore().currentWindows, (newWindows, oldWindows) => {
+watch(() => useWindowsStore().currentChromeWindows, (newWindows, oldWindows) => {
   console.log("windows changed", newWindows, oldWindows)
   rows.value = calcWindowRows()
 })
 
 watchEffect(() => {
   const res = useWindowsStore().currentWindow && useWindowsStore().currentWindow.id ?
-    useWindowsStore().windowNameFor(useWindowsStore().currentWindow.id || 0) || 'n/a' :
+    useWindowsStore().windowNameFor(useWindowsStore().currentChromeWindow.id || 0) || 'n/a' :
     'n/a'
   currentWindowName.value = res
 })
 
 const openWindow = (windowId: number) => {
-  if (useWindowsStore().currentWindow?.id !== windowId) {
+  if (useWindowsStore().currentChromeWindow?.id !== windowId) {
     chrome.windows.update(windowId, {drawAttention: true, focused: true},
       (callback) => {
       })
@@ -142,7 +142,7 @@ const hideWindow = (windowId: number) => {
 }
 
 const restoreWindow = (windowId: number) => {
-  if (useWindowsStore().currentWindow?.id !== windowId) {
+  if (useWindowsStore().currentChromeWindow?.id !== windowId) {
     chrome.windows.update(windowId, {state: "normal"})
     useWindowsStore().refreshCurrentWindows()
   }
@@ -156,8 +156,8 @@ const closeWindow = (windowId: number) => {
 const calcWindowRows = () => {
   let index = 100
   const usedIndices: number[] = []
-  const result = _.map(useWindowsStore().currentWindows as chrome.windows.Window[], (cw: chrome.windows.Window) => {
-    const windowFromStore: Window | undefined = useWindowsStore().windowForId(cw.id || -1)
+  const result = _.map(useWindowsStore().currentChromeWindows as chrome.windows.Window[], (cw: chrome.windows.Window) => {
+    const windowFromStore: Window | undefined = useWindowsStore().windowForId(cw.id || -3)
     if (!windowFromStore || !windowFromStore.index) {
       console.log("found windowfromstore without index", windowFromStore)
     }
@@ -195,9 +195,9 @@ const calcWindowRows = () => {
 const setWindowName = (windowRow: object, newName: string) => {
   if (newName && newName.toString().trim().length > 0) {
     const id = windowRow['id' as keyof object]
-    chrome.windows.get(id, (cw) => {
+    chrome.windows.get(id, {populate: true}, (cw) => {
       useWindowsStore().upsertWindow(cw, newName.toString().trim(), windowRow['index' as keyof object])
-      if (useWindowsStore().currentWindow?.id === id) {
+      if (useWindowsStore().currentChromeWindow?.id === id) {
         currentWindowName.value = newName
         //console.log("setting window name to ", currentWindowName.value)
         useWindowsStore().currentWindowName = newName
diff --git a/src/css/fonts/Montserrat-Regular.woff2 b/src/css/fonts/Montserrat-Regular.woff2
new file mode 100644
index 00000000..694d308b
Binary files /dev/null and b/src/css/fonts/Montserrat-Regular.woff2 differ
diff --git a/src/css/quasar.variables.scss b/src/css/quasar.variables.scss
index e25458a4..9dbe7f98 100644
--- a/src/css/quasar.variables.scss
+++ b/src/css/quasar.variables.scss
@@ -8,6 +8,11 @@
 // Your own variables (that are declared here) and Quasar's own
 // ones will be available out of the box in your .vue/.scss/.sass files
 
+@import url('https://fonts.googleapis.com/css2?family=Montserrat:ital,wght@0,100;0,300;0,400;0,500;0,700;0,900;1,100;1,300;1,500;1,700;1,900&display=swap');
+
+// Set the default font-family
+//$typography-font-family : 'Montserrat', sans-serif !default;
+
 // It's highly recommended to change the default colors
 // to match your app's branding.
 // Tip: Use the "Theme Builder" on Quasar's documentation website.
diff --git a/src/domain/tabsets/RenameWindow.ts b/src/domain/tabsets/RenameWindow.ts
new file mode 100644
index 00000000..1c46199f
--- /dev/null
+++ b/src/domain/tabsets/RenameWindow.ts
@@ -0,0 +1,43 @@
+import Command from "src/domain/Command";
+import {ExecutionResult} from "src/domain/ExecutionResult";
+import TabsetService from "src/services/TabsetService";
+import {useUtils} from "src/services/Utils";
+import {ListDetailLevel} from "stores/uiStore";
+import {useWindowsStore} from "stores/windowsStore";
+
+const {sendMsg} = useUtils()
+
+
+export class RenameWindowCommand implements Command<string> {
+
+  constructor(
+    public windowId: number,
+    public newName: string,
+    public index: number
+  ) {
+  }
+
+  async execute(): Promise<ExecutionResult<string>> {
+
+    console.log("setWindowName", this.windowId, this.newName)
+    if (this.newName && this.newName.toString().trim().length > 0) {
+
+      const cw = await chrome.windows.get(this.windowId, {populate: true})//,  (cw) => {
+      console.log("cw", cw)
+      return useWindowsStore().upsertWindow(cw, this.newName.toString().trim(), this.index)
+        .then(res => {
+          //sendMsg('tabset-renamed', {tabsetId: this.tabsetId, newName: this.newName, newColor: this.newColor})
+          return this.newName.toString().trim()
+        })
+        .then((newName: any) => Promise.resolve(
+          new ExecutionResult(
+            newName,
+            "Window Name Updated"))
+        )
+        .catch(err => Promise.reject(err))
+    }
+    return Promise.reject("name was not valid")
+  }
+
+
+}
diff --git a/src/domain/tabsets/RestoreTabset.ts b/src/domain/tabsets/RestoreTabset.ts
index c14137b4..729db7d2 100644
--- a/src/domain/tabsets/RestoreTabset.ts
+++ b/src/domain/tabsets/RestoreTabset.ts
@@ -18,9 +18,7 @@ export class RestoreTabsetCommand implements Command<string> {
 
   async execute(): Promise<ExecutionResult<string>> {
     console.log("restoring from tabset", this.tabsetId)
-    const tabsStore = useTabsStore()
     try {
-      //tabsStore.deactivateListeners()
       const tabset = useTabsetService().getTabset(this.tabsetId)
       if (tabset) {
         console.log("found tabset for id", this.tabsetId)
diff --git a/src/layouts/SidePanelLayout.vue b/src/layouts/SidePanelLayout.vue
index 3fafa085..e5d3cfa1 100644
--- a/src/layouts/SidePanelLayout.vue
+++ b/src/layouts/SidePanelLayout.vue
@@ -30,7 +30,7 @@ const location = ref('')
 
 
 useMeta(() => {
-  console.debug("using meta...")
+  //console.debug("using meta...")
   return {
     // @ts-ignore
     title: 'Tabsets Extension...' //+ appVersion
diff --git a/src/models/Account.ts b/src/models/Account.ts
index c352d531..4590dc52 100644
--- a/src/models/Account.ts
+++ b/src/models/Account.ts
@@ -5,7 +5,6 @@ export class Account {
     public id: string,
     public userData: object | undefined,
     public products: string[] = [],
-    public subscriptions: object[] = []
   ) {
     this.created = new Date().getTime()
   }
@@ -13,7 +12,4 @@ export class Account {
   setProducts(products: string[]) {
     this.products = products
   }
-  addSubscription(subscription: object) {
-    this.subscriptions.push(subscription)
-  }
 }
diff --git a/src/models/Window.ts b/src/models/Window.ts
index 410e0c37..ef616189 100644
--- a/src/models/Window.ts
+++ b/src/models/Window.ts
@@ -1,14 +1,21 @@
+import {Tab} from "src/models/Tab";
 
 export class Window {
   created: number
 
   constructor(
       public id: number,
-      public browserWindow: chrome.windows.Window,
+      public browserWindow: chrome.windows.Window | undefined,
       public title: string | undefined = undefined,
-      public index: number = 0) {
+      public index: number = 0,
+      public open = false,
+      public hostList: string[] = []) { // could not use sets due to issues
 
     this.created = new Date().getTime()
   }
 
 }
+
+Window.prototype.toString = function tabToString() {
+  return `Window: {id=${this.id}, browserWindow=${this.browserWindow !== undefined}, title=${this.title}, index=${this.index}, open=${this.open}, #hostList=${this.hostList.length}}`;
+};
diff --git a/src/pages/SettingsPage.vue b/src/pages/SettingsPage.vue
index 3ed82f6e..da597bd0 100644
--- a/src/pages/SettingsPage.vue
+++ b/src/pages/SettingsPage.vue
@@ -623,7 +623,7 @@ watchEffect(() => {
 
 watchEffect(() => {
   // @ts-ignore
-  indexSize.value = searchStore?.getIndex().size()
+  indexSize.value = searchStore?.getIndex()?.size()
 })
 
 watchEffect(() => {
diff --git a/src/pages/SidePanelPage.vue b/src/pages/SidePanelPage.vue
index 579ac6c3..a6675d4c 100644
--- a/src/pages/SidePanelPage.vue
+++ b/src/pages/SidePanelPage.vue
@@ -26,9 +26,51 @@
   </VOnboardingWrapper>
 
   <q-page style="padding-top: 50px">
+
+    <div class="wrap" v-if="useUiStore().appLoading">
+      <div class="loading">
+        <div class="bounceball q-mr-lg"></div>
+        <div class="text">loading tabsets...</div>
+      </div>
+    </div>
+
+    <div class="wrap2" v-if="useAuthStore().isAuthenticated() && useTabsStore().tabsets.size === 0 && !useUiStore().appLoading">
+      <div class="row items-center text-grey-5">how to start?</div>
+      <div style="min-width:300px;border:1px solid #efefef;border-radius:5px">
+        <q-list>
+          <q-item clickable v-ripple>
+            <q-item-section avatar>
+              <SidePanelToolbarButton
+                icon="o_add_circle"
+                color="warning"
+                @click="openNewTabsetDialog()"/>
+            </q-item-section>
+
+            <q-item-section>
+              <q-item-label>New Tabset</q-item-label>
+              <q-item-label caption>Click to create a new tabset</q-item-label>
+            </q-item-section>
+          </q-item>
+
+          <q-item clickable v-ripple>
+            <q-item-section avatar>
+              <SidePanelToolbarButton
+                icon="o_settings"
+                color="black"
+                @click="openOptionsPage()"/>
+            </q-item-section>
+
+            <q-item-section>
+              <q-item-label>Settings</q-item-label>
+              <q-item-label caption>Click here to assign your account</q-item-label>
+            </q-item-section>
+          </q-item>
+        </q-list>
+      </div>
+    </div>
+
     <!-- list of tabs, assuming here we have at least one tabset -->
     <div class="q-ma-none q-pa-none">
-
       <template v-if="suggestTabsetImport()">
 
         <InfoMessageWidget
@@ -208,12 +250,12 @@
             <SidePanelPageTabList
               v-if="tabsetExpanded.get(tabset.id)"
               :tabsCount="useTabsetService().tabsToShow(tabset as Tabset).length"
-              :tabset="tabsetForTabList(tabset as Tabset)" />
+              :tabset="tabsetForTabList(tabset as Tabset)"/>
             <!-- the actual tabs: end -->
 
-            {{ windowLocation }}
-<!--            <br>-->
-<!--            <pre>{{ user?.uid }}</pre>-->
+            <!--            {{ windowLocation }}-->
+            <!--            <br>-->
+            <!--            <pre>{{ user?.uid }}</pre>-->
 
           </div>
         </q-expansion-item>
@@ -237,9 +279,11 @@
         <template v-slot:title v-else>
           <div class="text-subtitle1 text-black">
             {{ toolbarTitle(tabsets as Tabset[]) }}
-            <q-icon v-if="LocalStorage.getItem(SYNC_TYPE) as SyncType === SyncType.GITHUB && useAuthStore().isAuthenticated()"
-                    class="q-ml-none" name="sync" size="12px">
-              <q-tooltip class="tooltip-small">Tabsets synced via {{LocalStorage.getItem(SYNC_GITHUB_URL)}}</q-tooltip>
+            <q-icon
+              v-if="LocalStorage.getItem(SYNC_TYPE) as SyncType === SyncType.GITHUB && useAuthStore().isAuthenticated()"
+              class="q-ml-none" name="sync" size="12px">
+              <q-tooltip class="tooltip-small">Tabsets synced via {{ LocalStorage.getItem(SYNC_GITHUB_URL) }}
+              </q-tooltip>
             </q-icon>
             <q-icon v-if="LocalStorage.getItem(SYNC_TYPE) as SyncType === SyncType.MANAGED_GIT"
                     class="q-ml-none" name="sync" size="12px">
@@ -295,6 +339,7 @@ import getScrollTarget = scroll.getScrollTarget;
 import InfoMessageWidget from "components/widgets/InfoMessageWidget.vue";
 import {SYNC_GITHUB_URL, SYNC_TYPE, TITLE_IDENT} from "boot/constants";
 import AppService from "src/services/AppService";
+import SidePanelToolbarButton from "components/buttons/SidePanelToolbarButton.vue";
 
 const {setVerticalScrollPosition} = scroll
 
@@ -501,7 +546,7 @@ watchEffect(() => {
 })
 
 watchEffect(() => {
-  const windowId = useWindowsStore().currentWindow?.id || 0
+  const windowId = useWindowsStore().currentChromeWindow?.id || 0
   currentChromeTab.value = useTabsStore().getCurrentChromeTab(windowId) || useTabsStore().currentChromeTab
 })
 
@@ -571,6 +616,7 @@ function inIgnoredMessages(message: any) {
   return message.msg === "html2text" ||
     message.msg === "captureThumbnail" ||
     message.msg === "capture-annotation" ||
+    message.name === "window-updated" ||
     message.msg === "html2links"
 }
 
@@ -785,7 +831,7 @@ const toolbarTitle = (tabsets: Tabset[]) => {
       spaceName + ' (' + tabsets.length.toString() + ')' :
       spaceName
   }
-  const title = LocalStorage.getItem(TITLE_IDENT) || 'My Tabsets.'
+  const title = LocalStorage.getItem(TITLE_IDENT) || 'My Tabsets'
   return tabsets.length > 6 ? title + ' (' + tabsets.length.toString() + ')' : title
 }
 
@@ -813,6 +859,7 @@ const showAddTabButton = (tabset: Tabset, currentChromeTab: chrome.tabs.Tab) =>
     currentChromeTab.url !== 'chrome://newtab/' &&
     currentChromeTab.url.indexOf('/www/index.html#/mainpanel/notes/') < 0 &&
     currentChromeTab.url !== '' &&
+    currentChromeTab.url.indexOf('https://tabsets.web.app/?apiKey=') < 0 &&
     tabsStore.currentTabsetId === tabset.id
   //isCurrentTab()
 }
@@ -1004,7 +1051,7 @@ const tabsetSectionName = (tabset: Tabset) => {
 
 </script>
 
-<style>
+<style lang="scss">
 
 .v-enter-active,
 .v-leave-active {
@@ -1067,4 +1114,73 @@ const tabsetSectionName = (tabset: Tabset) => {
   transform: rotate(180deg)
 }
 
+$width: 25px;
+$height: 25px;
+
+$bounce_height: 30px;
+
+body {
+  position: relative;
+  width: 100%;
+  height: 100vh;
+}
+
+.wrap {
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  transform: translate(-50%, -50%);
+}
+
+.wrap2 {
+  position: absolute;
+  top: 30%;
+  left: 50%;
+  transform: translate(-50%, -50%);
+}
+
+.text {
+  color: #000066;
+  font-size: 24px;
+  display: inline-block;
+  margin-left: 5px;
+}
+
+.bounceball {
+  position: relative;
+  display: inline-block;
+  height: 37px;
+  width: $width;
+
+  &:before {
+    position: absolute;
+    content: '';
+    display: block;
+    top: 0;
+    width: $width;
+    height: $height;
+    border-radius: 50%;
+    background-color: #fbae17;
+    transform-origin: 50%;
+    animation: bounce 500ms alternate infinite ease;
+  }
+}
+
+@keyframes bounce {
+  0% {
+    top: $bounce_height;
+    height: 5px;
+    border-radius: 60px 60px 20px 20px;
+    transform: scaleX(2);
+  }
+  35% {
+    height: $height;
+    border-radius: 50%;
+    transform: scaleX(1);
+  }
+  100% {
+    top: 0;
+  }
+}
+
 </style>
diff --git a/src/pages/SidePanelSpacesPage.vue b/src/pages/SidePanelSpacesPage.vue
index 47e4a2d4..d0441a01 100644
--- a/src/pages/SidePanelSpacesPage.vue
+++ b/src/pages/SidePanelSpacesPage.vue
@@ -246,7 +246,7 @@ watchEffect(() => {
 
 watchEffect(() => {
   //currentChromeTab.value = useTabsStore().currentChromeTab
-  const windowId = useWindowsStore().currentWindow?.id || 0
+  const windowId = useWindowsStore().currentChromeWindow?.id || 0
   currentChromeTab.value = useTabsStore().getCurrentChromeTab(windowId) || useTabsStore().currentChromeTab
 })
 
diff --git a/src/pages/SidePanelTabsetPage.vue b/src/pages/SidePanelTabsetPage.vue
index 5563e7dd..1560fe04 100644
--- a/src/pages/SidePanelTabsetPage.vue
+++ b/src/pages/SidePanelTabsetPage.vue
@@ -119,7 +119,7 @@ watchEffect(() => {
 })
 
 watchEffect(() => {
-  const windowId = useWindowsStore().currentWindow?.id || 0
+  const windowId = useWindowsStore().currentChromeWindow?.id || 0
   currentChromeTab.value = useTabsStore().getCurrentChromeTab(windowId) || useTabsStore().currentChromeTab
 })
 
diff --git a/src/pages/helper/PricingCard.vue b/src/pages/helper/PricingCard.vue
index 9a96ea75..e3828465 100644
--- a/src/pages/helper/PricingCard.vue
+++ b/src/pages/helper/PricingCard.vue
@@ -21,7 +21,7 @@
         <div class="text-h5 q-mt-sm q-mb-md text-bold">
           <slot name="price">0 &euro;</slot>
         </div>
-        <div class="text-caption text-grey" style="min-height:140px">
+        <div class="text-caption text-grey" style="min-height:180px">
           <slot name="features" />
         </div>
       </q-card-section>
@@ -47,4 +47,4 @@
 .my-card
   width: 100%
   max-width: 250px
-</style>
\ No newline at end of file
+</style>
diff --git a/src/pages/helper/SharingSettings.vue b/src/pages/helper/SharingSettings.vue
index d4e99a53..6c506d97 100644
--- a/src/pages/helper/SharingSettings.vue
+++ b/src/pages/helper/SharingSettings.vue
@@ -49,15 +49,15 @@
 
       </div>
 
-      <div class="col-3">
-        Installation ID
-      </div>
-      <div class="col-7">
-        {{ installationId }}
-      </div>
-      <div class="col">
+<!--      <div class="col-3">-->
+<!--        Installation ID-->
+<!--      </div>-->
+<!--      <div class="col-7">-->
+<!--        {{ installationId }}-->
+<!--      </div>-->
+<!--      <div class="col">-->
 
-      </div>
+<!--      </div>-->
 
     </div>
 
diff --git a/src/pages/helper/SubscriptionBexSettings.vue b/src/pages/helper/SubscriptionBexSettings.vue
index 8d16b5e7..abf1e2d9 100644
--- a/src/pages/helper/SubscriptionBexSettings.vue
+++ b/src/pages/helper/SubscriptionBexSettings.vue
@@ -16,6 +16,99 @@
     </q-banner>
   </div>
 
+  <div class="q-pa-md q-mt-xl row items-start justify-center q-gutter-md">
+
+    <PricingCard>
+      <template v-slot:overline>For your personal use</template>
+      <template v-slot:title>Basic</template>
+      <template v-slot:price>&nbsp;</template>
+      <template v-slot:teaser>
+        Use the Tabsets Browser Extension in your browser
+      </template>
+      <template v-slot:features>
+        <div class="text-subtitle2 q-mb-md">
+          <q-icon name="shim" class="q-mr-sm"/>
+          Manage
+        </div>
+        <PlanFeature :features="['tabsets', 'bookmarks', 'local in browser']"/>
+      </template>
+      <template v-slot:actions>
+        <q-btn color="grey-5" disable style="width:200px;">
+          Already got it
+        </q-btn>
+      </template>
+    </PricingCard>
+
+    <PricingCard>
+      <template v-slot:overline>Support Tabsets</template>
+      <template v-slot:title>Free</template>
+      <template v-slot:price>0 &euro; <span class="text-body1">/month</span></template>
+      <template v-slot:teaser>
+        Create an account to show your support for tabsets.
+      </template>
+      <template v-slot:features>
+        <div class="text-subtitle2 q-mb-md">
+          <q-icon name="shim" class="q-mr-sm"/>
+          As in 'Basic', plus
+        </div>
+        <PlanFeature :features="['share tabsets publicly','optional newsletter','feature request form','access to experimental features']"/>
+      </template>
+      <template v-slot:actions>
+        <q-btn v-if="!useAuthStore().isAuthenticated"
+               color="primary" class="cursor-pointer" style="width:200px;" @click="router.push('/login')">
+          Sign up for free
+        </q-btn>
+        <q-btn v-else color="grey-5" disable style="width:200px;">
+          Already got it
+        </q-btn>
+      </template>
+    </PricingCard>
+
+    <PricingCard>
+      <template v-slot:overline>Getting more serious</template>
+      <template v-slot:title>Sync</template>
+      <template v-slot:price>1,99 &euro; <span class="text-body1">/month</span></template>
+      <template v-slot:teaser>
+        Synchronize your tabsets across browsers and computers.
+      </template>
+      <template v-slot:features>
+        <div class="text-subtitle2 q-mb-md">
+          <q-icon name="shim" class="q-mr-sm"/>
+          As in 'Free', plus
+        </div>
+        <PlanFeature :features="['synchronized tabsets','PDF generation']"/>
+      </template>
+      <template v-slot:actions>
+        <q-btn color="primary" class="cursor-pointer" style="width:200px;" @click="openPaymentLink()">
+          Choose SYNC
+        </q-btn>
+      </template>
+    </PricingCard>
+
+    <PricingCard>
+      <template v-slot:overline>Collaborate</template>
+      <template v-slot:title>Pro</template>
+      <template v-slot:price><span class="text-body1">not yet available</span></template>
+      <template v-slot:teaser>
+        Collaborate with your team. Synchronize and Share your tabsets.
+      </template>
+      <template v-slot:features>
+        <div class="text-subtitle2 q-mb-md">
+          <q-icon name="shim" class="q-mr-sm"/>
+          As in 'Sync', plus
+        </div>
+        <PlanFeature :features="['offline access','AI features']"/>
+      </template>
+      <template v-slot:actions>
+        <q-btn color="primary" disable style="width:200px;">
+          Choose SYNC
+        </q-btn>
+      </template>
+    </PricingCard>
+
+
+  </div>
+
   <div class="row items-baseline q-ma-md q-gutter-lg">
 
 <!--    <div class="col-3">-->
@@ -28,12 +121,33 @@
 <!--      Authorized as: {{ userCredentials?.user.email || '-&#45;&#45;' }}-->
 <!--    </div>-->
 
+    <div class="col-3">
+      Logged in as
+    </div>
+    <div class="col-7">
+      {{ useAuthStore().user?.email || '---'}}
+    </div>
+    <div class="col"></div>
+
+    <template v-if="!emailVerified && useAuthStore().isAuthenticated()">
+    <div class="col-3">
+      Please verify your email first
+    </div>
+    <div class="col-7">
+      <q-btn label="Verify" @click="verifyEmail()"/>
+    </div>
+    <div class="col"></div>
+    </template>
+
     <template v-if="!subscription">
       <div class="col-3">
-        Subscribe
+        Subscribe (delete)
       </div>
       <div class="col-7">
-        <q-btn label="Subscribe" @click="subscribe()"/>
+<!--        <q-btn label="Subscribe" @click="subscribe()" :disable="!emailVerified" :class="emailVerified ? '':'text-grey-5'"/>-->
+
+
+
       </div>
       <div class="col">{{ claims }}</div>
       <div class="col-3"></div>
@@ -55,7 +169,7 @@
       Subscription ID
     </div>
     <div class="col-7">
-      <q-input type="text" color="primary" filled v-model="subscription" label="">
+      <q-input type="text" color="primary" filled v-model="subscription" label="" :disable="!emailVerified">
         <template v-slot:prepend>
           <q-icon name="o_shopping_bag"/>
         </template>
@@ -71,21 +185,30 @@
 
 import {ref, watchEffect, onMounted} from "vue";
 import {LocalStorage, openURL} from "quasar";
-import {SUBSCRIPTION_ID_IDENT} from "boot/constants";
+import {EMAIL_LINK_REDIRECT_DOMAIN, SUBSCRIPTION_ID_IDENT} from "boot/constants";
 import {FirebaseCall} from "src/services/firebase/FirebaseCall";
 import {getAuth, onAuthStateChanged} from "firebase/auth";
 import {firebaseApp, githubAuthProvider, firestore} from "boot/firebase";
 import {createUserWithEmailAndPassword, signInWithPopup, signInWithRedirect,signInWithEmailLink,sendSignInLinkToEmail, signInWithCredential, UserCredential} from "firebase/auth";
-import {collection, setDoc, doc} from "firebase/firestore";
+import {setDoc, doc} from "firebase/firestore";
+import {useAuthStore} from "../../stores/authStore";
+import {NotificationType, useNotificationHandler} from "src/services/ErrorHandler";
+import {useRouter} from "vue-router";
+import PricingCard from "pages/helper/PricingCard.vue";
+import PlanFeature from "pages/helper/PlanFeature.vue";
 
 const subscription = ref<string>(LocalStorage.getItem(SUBSCRIPTION_ID_IDENT) as string || '')
 
 const userCredentials = ref<UserCredential | undefined>(undefined)
 const claims = ref<object | undefined>(undefined)
+const emailVerified = ref(false)
 
-onMounted(() => {
-  console.log("moutned")
+const { handleError } = useNotificationHandler()
+
+const router = useRouter()
 
+onMounted(() => {
+  emailVerified.value = useAuthStore().user?.emailVerified || false
 })
 
 watchEffect(() => {
@@ -98,7 +221,7 @@ const subscribe = async () => openURL('https://shared.tabsets.net/#/settings?tab
 
 const testSubscription = async () => {
   FirebaseCall.post("/stripe/test-subscription/tabsets", {})
-    .then((res) => {
+    .then((res:any) => {
       console.log("res", res)
       window.location.href = res.data.url
     })
@@ -146,5 +269,38 @@ const authorizeWith = async (githubAuthProvider:any) => {
 
 }
 
+const verifyEmail = () => {
+  const auth = getAuth()
+  const email = useAuthStore().user.email
+  const actionCodeSettings = {
+    url: EMAIL_LINK_REDIRECT_DOMAIN,
+    handleCodeInApp: true,
+  }
+  console.log("sending verification link to", email, actionCodeSettings)
+  sendSignInLinkToEmail(auth, email, actionCodeSettings)
+    .then(() => {
+      // loading.value = false
+      // mailSent.value = true
+      // setTimeout(() => {
+      //     mailSent.value = false
+      //     emits('hideLogin')
+      //   }, 5000
+      // )
+     // window.localStorage.setItem(CURRENT_USER_EMAIL, email.value);
+     // sendMsg('SET_EMAIL_FOR_SIGN_IN', {"email": email.value})
+    })
+    .catch((error) => {
+      //console.error("error", error)
+      handleError(error, NotificationType.TOAST)
+      // loading.value = false
+      // mailSent.value = false
+    });
+
+}
+
+const openPaymentLink = () => {
+  const email = useAuthStore().user?.email || ''
+  openURL('https://buy.stripe.com/test_dR67sT1NC6iq7ew9AA?prefilled_email=' + email)
+}
 
 </script>
diff --git a/src/pages/helper/SubscriptionSettings.vue b/src/pages/helper/SubscriptionSettings.vue
index d76a1cf6..1e249fc3 100644
--- a/src/pages/helper/SubscriptionSettings.vue
+++ b/src/pages/helper/SubscriptionSettings.vue
@@ -27,7 +27,7 @@
       <q-btn label="GitLab" @click="authorizeWith(githubAuthProvider)"/>
     </div>
     <div class="col">
-      Authorized as: {{ userCredentials?.user.email || '---' }}
+      Authorized as: {{ useAuthStore().user?.email || '---' }}
     </div>
 
     <!--    <div class="col-3">-->
@@ -100,11 +100,6 @@ const subscription = ref<string | undefined>()
 const userCredentials = ref<UserCredential | undefined>(undefined)
 const claims = ref<object | undefined>(undefined)
 
-onMounted(() => {
-  console.log("moutned")
-
-})
-
 watchEffect(async () => {
   //const user = getAuth().currentUser
   if (userCredentials.value) {
diff --git a/src/pages/mainpanel/MainPanelCheckSuggestionPage.vue b/src/pages/mainpanel/MainPanelCheckSuggestionPage.vue
index 43292f38..6f27c000 100644
--- a/src/pages/mainpanel/MainPanelCheckSuggestionPage.vue
+++ b/src/pages/mainpanel/MainPanelCheckSuggestionPage.vue
@@ -41,6 +41,7 @@
         {{ suggestion?.msg }}
       </div>
     </div>
+
     <div class="row items-baseline q-ma-md" v-if="suggestion?.data['url' as keyof object]">
       <div class="col-2 ">
         URL
@@ -52,6 +53,15 @@
       </div>
     </div>
 
+<!--    <div class="row items-baseline q-ma-md" v-if="suggestion?.type === SuggestionType.RESTART">-->
+<!--      <div class="col-2 ">-->
+
+<!--      </div>-->
+<!--      <div class="col text-blue cursor-pointer">-->
+<!--        <q-btn label="Restart" @click="restart()"/>-->
+<!--      </div>-->
+<!--    </div>-->
+
     <template v-if="suggestion?.type?.toUpperCase() === 'REDIRECT_HAPPENED_FOR_BOOKMARK' ||
                 suggestion?.type?.toUpperCase() === 'REDIRECT_HAPPENED_FOR_TAB'">
 
@@ -221,6 +231,7 @@ import {UpdateMonitoringCommand} from "src/domain/monitoring/UpdateMonitoringCom
 import {MonitoringType} from "src/models/Monitor";
 import {useUtils} from "src/services/Utils";
 import {NotificationType} from "src/services/ErrorHandler";
+import AppService from "src/services/AppService";
 
 const {sendMsg} = useUtils()
 
@@ -511,4 +522,5 @@ const isMonitoring = () => {
   }
   return false
 }
+
 </script>
diff --git a/src/pages/sidepanel/SidePanelTabInfo.vue_ b/src/pages/sidepanel/SidePanelTabInfo.vue_
index 028cf8de..887797b1 100644
--- a/src/pages/sidepanel/SidePanelTabInfo.vue_
+++ b/src/pages/sidepanel/SidePanelTabInfo.vue_
@@ -52,7 +52,7 @@ watchEffect(() => {
 })
 
 watchEffect(() => {
-  const windowId = useWindowsStore().currentWindow?.id || 0
+  const windowId = useWindowsStore().currentChromeWindow?.id || 0
   currentChromeTab.value = useTabsStore().getCurrentChromeTab(windowId) || useTabsStore().currentChromeTab
 })
 
diff --git a/src/pages/sidepanel/WelcomePage.vue b/src/pages/sidepanel/WelcomePage.vue
index 541cc14d..57834810 100644
--- a/src/pages/sidepanel/WelcomePage.vue
+++ b/src/pages/sidepanel/WelcomePage.vue
@@ -1,9 +1,8 @@
-1
 <template>
-  <q-page style="padding-top: 20px">
+  <q-page>
 
     <div class="q-ma-none q-pa-md fullimageBackground" @click="selected()">
-      <div class="row">
+      <div class="row q-mt-lg">
         <div class="row">
           <div class="col-12 text-caption">
             The Art Of Linking
@@ -21,18 +20,6 @@
             <br>
             Provide a name and add tabs later
           </q-card-section>
-          <!--        <q-card-section class="q-ma-none q-pa-none q-ml-md">-->
-          <!--          <q-icon name="check" color="primary" class="q-mr-xs"/>-->
-          <!--          Create your first tabset:-->
-          <!--        </q-card-section>-->
-          <!--        <q-card-section class="q-ma-none q-pa-none q-ml-md">-->
-          <!--          <q-icon name="check" color="primary" class="q-mr-xs"/>-->
-          <!--          Provide a name...-->
-          <!--        </q-card-section>-->
-          <!--        <q-card-section class="q-ma-none q-pa-none q-ml-md">-->
-          <!--          <q-icon name="check" color="primary" class="q-mr-xs"/>-->
-          <!--          ... and add tabs later-->
-          <!--        </q-card-section>-->
           <q-card-section class="q-pb-none">
             <q-input v-model="tabsetName"
                      dense
@@ -52,18 +39,7 @@
           </q-card-actions>
         </q-card>
       </div>
-      <!--    <div class="q-pa-sm row items-start q-gutter-md">-->
-      <!--      <q-btn label="import tabsets" @click="showImportDialog"></q-btn>-->
-      <!--    </div>-->
-
-      <div v-if="windowLocation !== 'chrome-extension://pndffocijjfpmphlhkoijmpfckjafdpl/www/index.html#/sidepanel/welcome'">
-        {{ windowLocation }}
-      </div>
-
     </div>
-
-
-
   </q-page>
 </template>
 
diff --git a/src/pages/sidepanel/helper/FirstToolbarHelper.vue b/src/pages/sidepanel/helper/FirstToolbarHelper.vue
index 432777a8..85a69d1a 100644
--- a/src/pages/sidepanel/helper/FirstToolbarHelper.vue
+++ b/src/pages/sidepanel/helper/FirstToolbarHelper.vue
@@ -43,7 +43,7 @@
         </div>
 
         <!-- spaces or not, here's the icons on the right side -->
-        <div class="col text-subtitle1 text-right q-ma-none q-pa-none q-pr-sm">
+        <div class="col text-subtitle1 text-right q-ma-none q-pa-none q-pr-sm" v-if="!useUiStore().appLoading">
 
           <slot name="iconsRight">
 
@@ -171,7 +171,7 @@ const stopSession = () => {
 }
 
 // const createWebsiteClipTooltip = () => {
-//   const windowId = useWindowsStore().currentWindow.id || 0
+//   const windowId = useWindowsStore().currentChromeWindow.id || 0
 //   const currentChromeTab = useTabsStore().getCurrentChromeTab(windowId) || useTabsStore().currentChromeTab
 //   return "Create Website Clip for tab " + currentChromeTab.url
 // }
@@ -179,7 +179,7 @@ const stopSession = () => {
 const webClipActive = () => tabsStore.currentChromeTab
 
 // const createClip = () => {
-//   const windowId = useWindowsStore().currentWindow.id || 0
+//   const windowId = useWindowsStore().currentChromeWindow.id || 0
 //   const currentChromeTab = useTabsStore().getCurrentChromeTab(windowId) || useTabsStore().currentChromeTab
 //   if (currentChromeTab && currentChromeTab.id) {
 //     ChromeApi.executeClippingJS(currentChromeTab.id)
diff --git a/src/services/AppService.ts b/src/services/AppService.ts
index 4e8c1b94..2f3c9e06 100644
--- a/src/services/AppService.ts
+++ b/src/services/AppService.ts
@@ -2,7 +2,7 @@ import {usePermissionsStore} from "stores/permissionsStore";
 import ChromeListeners from "src/services/ChromeListeners";
 import ChromeBookmarkListeners from "src/services/ChromeBookmarkListeners";
 import BookmarksService from "src/services/BookmarksService";
-import {LocalStorage, useQuasar} from "quasar";
+import {LocalStorage} from "quasar";
 import IndexedDbPersistenceService from "src/services/IndexedDbPersistenceService";
 import {useNotificationsStore} from "stores/notificationsStore";
 import {useDB} from "src/services/usePersistenceService";
@@ -17,7 +17,7 @@ import {useSettingsStore} from "stores/settingsStore";
 import {useBookmarksStore} from "stores/bookmarksStore";
 import {useWindowsStore} from "src/stores/windowsStore";
 import {useSearchStore} from "stores/searchStore";
-import {Router, useRouter} from "vue-router";
+import {Router} from "vue-router";
 import {useGroupsStore} from "stores/groupsStore";
 import {FeatureIdent} from "src/models/AppFeature";
 import {useMessagesStore} from "src/stores/messagesStore";
@@ -26,20 +26,36 @@ import GitPersistentService from "src/services/persistence/GitPersistentService"
 import {SYNC_GITHUB_URL, SYNC_TYPE} from "boot/constants";
 import {useAuthStore} from "stores/authStore";
 import PersistenceService from "src/services/PersistenceService";
+import {useUiStore} from "stores/uiStore";
+import {User} from "firebase/auth";
+import {Account} from "src/models/Account";
 
 function useGitStore(st: SyncType, su: string | undefined) {
   const isAuthenticated = useAuthStore().isAuthenticated()
-  console.debug("isAuthenticated", isAuthenticated)
+  console.debug("%cisAuthenticated", "font-weight:bold", isAuthenticated)
   return isAuthenticated && st && (st === SyncType.GITHUB || st === SyncType.MANAGED_GIT) && su
 }
 
 class AppService {
 
-  router:Router = null as unknown as Router
+  router: Router = null as unknown as Router
+  initialized = false
 
-  async init(quasar:any, router: Router) {
+  async init(quasar: any, router: Router, forceRestart = false, user: User | undefined = undefined, account: Account | undefined = undefined) {
 
-    console.log("initializing AppService", quasar, router)
+    console.log(`%cinitializing AppService: first start=${!this.initialized}, forceRestart=${forceRestart}, quasar set=${quasar !== undefined}, router set=${router !== undefined}`, forceRestart ? "font-weight:bold" : "")
+
+    if (this.initialized && !forceRestart) {
+      console.debug("stopping AppService initialization; already initialized and not forcing restart")
+      return Promise.resolve()
+    }
+
+    if (this.initialized) {
+      await ChromeListeners.resetListeners()
+      await useWindowsStore().resetListeners()
+    }
+
+    this.initialized = true
 
     const appStore = useAppStore()
     const tabsStore = useTabsStore()
@@ -47,54 +63,57 @@ class AppService {
     const bookmarksStore = useBookmarksStore()
     const messagesStore = useMessagesStore()
     const searchStore = useSearchStore()
+    const uiStore = useUiStore()
     this.router = router
 
+    uiStore.appLoading = true
+
     appStore.init()
 
     // init of stores and some listeners
-    usePermissionsStore().initialize(useDB(quasar).localDb)
-      .then(() => {
-        ChromeListeners.initListeners()
-        ChromeBookmarkListeners.initListeners()
-        bookmarksStore.init()
-        BookmarksService.init()
-      })
+    await usePermissionsStore().initialize(useDB(quasar).localDb)
+    await ChromeListeners.initListeners()
+    ChromeBookmarkListeners.initListeners()
+    await bookmarksStore.init()
+    await BookmarksService.init()
     settingsStore.initialize(quasar.localStorage);
     tabsStore.initialize(quasar.localStorage).catch((err) => console.error("***" + err))
 
     searchStore.init().catch((err) => console.error(err))
 
-    // sync features
-    const syncType = LocalStorage.getItem(SYNC_TYPE) as SyncType || SyncType.NONE
-    const syncUrl = LocalStorage.getItem(SYNC_GITHUB_URL) as string
-    const dbOrGitDb = useGitStore(syncType, syncUrl) ?
-      useDB(undefined).gitDb :
-      useDB(undefined).db
-    console.debug("checking sync config:", syncType, syncUrl, dbOrGitDb)
 
     // init db
-    IndexedDbPersistenceService.init("db")
-      .then(() => {
-
-        // init services
-        useAuthStore().initialize(useDB(undefined).db)
-        useNotificationsStore().initialize(useDB(undefined).db)
-        useSuggestionsStore().init(useDB(undefined).db)
-        messagesStore.initialize(useDB(undefined).db)
-
-        tabsetService.setLocalStorage(localStorage)
-
-        if (useAuthStore().isAuthenticated()) {
-          GitPersistentService.init(syncType, syncUrl)
-            .then((gitInitResult: string) => {
-              console.log("gitInitResult", gitInitResult)
-              this.initCoreSerivces(quasar, dbOrGitDb, this.router)
-            })
-        } else {
-          this.initCoreSerivces(quasar, dbOrGitDb, this.router)
-        }
+    await IndexedDbPersistenceService.init("db")
 
-      })
+    // init services
+    useAuthStore().initialize(useDB(undefined).db)
+    await useAuthStore().setUser(user)
+    if (account) {
+      useAuthStore().upsertAccount(account)
+    }
+    //useAuthStore().setProducts(Array.from(products))
+
+    await useNotificationsStore().initialize(useDB(undefined).db)
+    useSuggestionsStore().init(useDB(undefined).db)
+    await messagesStore.initialize(useDB(undefined).db)
+
+    tabsetService.setLocalStorage(localStorage)
+
+    if (useAuthStore().isAuthenticated()) {
+      // sync features
+      const syncType = LocalStorage.getItem(SYNC_TYPE) as SyncType || SyncType.NONE
+      const syncUrl = LocalStorage.getItem(SYNC_GITHUB_URL) as string
+      const dbOrGitDb = useGitStore(syncType, syncUrl) ?
+        useDB(undefined).gitDb :
+        useDB(undefined).db
+      console.debug("%cchecking sync config:", "font-weight:bold", syncType, syncUrl, dbOrGitDb)
+
+      const gitInitResult = await GitPersistentService.init(syncType, syncUrl)
+      console.log("%cgitInitResult", "font-weight:bold", gitInitResult)
+      await this.initCoreSerivces(quasar, dbOrGitDb, this.router)
+    } else {
+      await this.initCoreSerivces(quasar, useDB(undefined).db, this.router)
+    }
 
 
     useNotificationsStore().bookmarksExpanded = quasar.localStorage.getItem("bookmarks.expanded") || []
@@ -103,14 +122,14 @@ class AppService {
 
 
   restart(ar: string) {
-    console.log(">>> restarting tabsets", window.location.href, ar)
+    console.log("%c>>> restarting tabsets", "font-weight:bold", window.location.href, ar)
     const baseLocation = window.location.href.split("?")[0]
-    console.log(">>> baseLocation", baseLocation)
+    console.log("%c>>> baseLocation", "font-weight:bold", baseLocation)
     if (window.location.href.indexOf("?") < 0) {
       const tsIframe = window.parent.frames[0]
-      //console.log("iframe", tsIframe)
+      //log("iframe", tsIframe)
       if (tsIframe) {
-        console.debug(">>> new window.location.href", baseLocation + "?" + ar)
+        console.debug("%c>>> new window.location.href", "font-weight:bold", baseLocation + "?" + ar)
         tsIframe.location.href = baseLocation + "?" + ar
         //tsIframe.location.href = "https://www.skysail.io"
         tsIframe.location.reload()
@@ -125,29 +144,27 @@ class AppService {
     const groupsStore = useGroupsStore()
     const tabsStore = useTabsStore()
 
-    spacesStore.initialize(dbOrGitDb)
-      .then(() => {
-        useTabsetService().init(dbOrGitDb, false)
-          .then(() => {
-            MHtmlService.init()
-            ChromeApi.init(router)
-
-            if (usePermissionsStore().hasFeature(FeatureIdent.TAB_GROUPS)) {
-              groupsStore.initialize(useDB(undefined).db)
-              groupsStore.initListeners()
-            }
-
-            windowsStore.initialize(useDB(undefined).db)
-            windowsStore.initListeners()
-
-            // tabsets not in bex mode means running on "shared.tabsets.net"
-            // probably running an import ("/imp/:sharedId")
-            // we do not want to go to the welcome back
-            if (tabsStore.tabsets.size === 0 && quasar.platform.is.bex) {
-              router.push("/sidepanel/welcome")
-            }
-          })
-      })
+    await spacesStore.initialize(dbOrGitDb)
+    await useTabsetService().init(dbOrGitDb, false)
+    await MHtmlService.init()
+    ChromeApi.init(router)
+
+    if (usePermissionsStore().hasFeature(FeatureIdent.TAB_GROUPS)) {
+      await groupsStore.initialize(useDB(undefined).db)
+      groupsStore.initListeners()
+    }
+
+    await windowsStore.initialize(useDB(undefined).db)
+    windowsStore.initListeners()
+
+    useUiStore().appLoading = false
+
+    // tabsets not in bex mode means running on "shared.tabsets.net"
+    // probably running an import ("/imp/:sharedId")
+    // we do not want to go to the welcome back
+    if (tabsStore.tabsets.size === 0 && quasar.platform.is.bex && !useAuthStore().isAuthenticated()) {
+      await router.push("/sidepanel/welcome")
+    }
 
 
   }
diff --git a/src/services/BookmarksService.ts b/src/services/BookmarksService.ts
index 381458f1..58f857d2 100644
--- a/src/services/BookmarksService.ts
+++ b/src/services/BookmarksService.ts
@@ -20,7 +20,7 @@ class BookmarksService {
 
 
   async init() {
-    console.debug("initializing BookmarksService")
+    console.debug(" ...initializing BookmarksService")
     useBookmarksStore().loadBookmarks()
       .then(res => {
         useSearchStore().populateFromBookmarks()
diff --git a/src/services/ChromeApi.ts b/src/services/ChromeApi.ts
index d6178284..0200552f 100644
--- a/src/services/ChromeApi.ts
+++ b/src/services/ChromeApi.ts
@@ -101,7 +101,7 @@ class ChromeApi {
       return
     }
 
-    console.debug("initializing ChromeApi")
+    console.debug(" ...initializing ChromeApi")
 
     chrome.alarms.create("housekeeping", {periodInMinutes: CLEANUP_PERIOD_IN_MINUTES})
     chrome.alarms.create("monitoring", {periodInMinutes: MONITORING_PERIOD_IN_MINUTES})
@@ -143,8 +143,8 @@ class ChromeApi {
   }
 
   stopWebRequestListener() {
-    console.debug("removing WebRequestListener if running", chrome.webRequest)
     if (chrome.webRequest) {
+      console.debug("removing WebRequestListener if running", chrome.webRequest)
       chrome.webRequest.onHeadersReceived.removeListener(this.onHeadersReceivedListener)
     }
   }
@@ -153,7 +153,8 @@ class ChromeApi {
     if (process.env.MODE !== 'bex') {
       return
     }
-    console.log("building context menu:", chrome)
+
+    console.debug(" building context menu")
     const tabsStore = useTabsStore()
     if (chrome && chrome.contextMenus) {
       chrome.contextMenus.removeAll(
@@ -190,8 +191,8 @@ class ChromeApi {
                 contexts: ['all']
               })
 
-              console.log("context menu", useWindowsStore().currentWindows)
-              const currentWindows = useWindowsStore().currentWindows
+              console.log("context menu", useWindowsStore().currentChromeWindows)
+              const currentWindows = useWindowsStore().currentChromeWindows
               if (currentWindows.length > 1) {
                 chrome.contextMenus.create({
                   id: 'move_to_window',
@@ -422,7 +423,7 @@ class ChromeApi {
     }
   }
 
-  createChromeWindowObject(id: number, top: number, left: number) {
+  createChromeWindowObject(id: number, top: number, left: number, tabs: chrome.tabs.Tab[] = []) {
     return {
       id,
       alwaysOnTop: false,
@@ -433,7 +434,8 @@ class ChromeApi {
       top: top,
       left: left,
       state: 'normal' as chrome.windows.windowStateEnum,
-      type: 'normal' as chrome.windows.windowTypeEnum
+      type: 'normal' as chrome.windows.windowTypeEnum,
+      tabs
     }
   }
 
diff --git a/src/services/ChromeBookmarkListeners.ts b/src/services/ChromeBookmarkListeners.ts
index 39f60f02..a16eb3a1 100644
--- a/src/services/ChromeBookmarkListeners.ts
+++ b/src/services/ChromeBookmarkListeners.ts
@@ -17,7 +17,7 @@ class ChromeBookmarkListeners {
       {permissions: ["bookmarks"]},
       (res: boolean) => {
         if (res) {
-          console.log("init chrome bookmark listeners")
+          console.debug(" ...init chrome bookmark listeners")
           chrome.bookmarks.onCreated.addListener(this.onCreatedListener)
           chrome.bookmarks.onMoved.addListener(this.onMovedListener)
           chrome.bookmarks.onRemoved.addListener(this.onRemovedListener)
diff --git a/src/services/ChromeListeners.ts b/src/services/ChromeListeners.ts
index 051c9bbf..2f1ac221 100644
--- a/src/services/ChromeListeners.ts
+++ b/src/services/ChromeListeners.ts
@@ -17,13 +17,7 @@ import {useUtils} from "src/services/Utils";
 import {useGroupsStore} from "stores/groupsStore";
 import NavigationService from "src/services/NavigationService";
 import ContentUtils from "src/utils/ContentUtils";
-// @ts-ignore
-import rangy from "rangy/lib/rangy-core.js";
-//import "rangy/lib/rangy-highlighter";
-//import "rangy/lib/rangy-classapplier";
-//import "rangy/lib/rangy-textrange";
 import "rangy/lib/rangy-serializer";
-import {useRoute, useRouter} from "vue-router";
 import {useAuthStore} from "stores/authStore";
 import {EMAIL_LINK_REDIRECT_DOMAIN} from "boot/constants";
 
@@ -37,12 +31,12 @@ const {
   saveThumbnailFor
 } = useTabsetService()
 
-const {sanitize} = useUtils()
+const {sanitize, sendMsg} = useUtils()
 
 async function setCurrentTab() {
   const tabs = await chrome.tabs.query({active: true, lastFocusedWindow: true})
 
-  console.debug("setting current tab", tabs)
+  //console.debug("setting current tab", tabs)
   if (tabs && tabs[0]) {
     useTabsStore().setCurrentChromeTab(tabs[0] as unknown as chrome.tabs.Tab)
   } else {
@@ -57,30 +51,7 @@ async function setCurrentTab() {
 
 function annotationScript(tabId: string, annotations: any[]) {
   console.log("!!! here in annotation script", tabId, annotations)
-//
-//   const
-//     iFrame = document.createElement('iframe'),
-//     defaultFrameHeight = '62px'
-//
-//   iFrame.id = 'bex-app-iframe'
-//   iFrame.width = '100%'
-//  // resetIFrameHeight()
-//
-// // Assign some styling so it looks seamless
-// //   Object.assign(iFrame.style, {
-// //     position: 'fixed',
-// //     top: '0',
-// //     right: '0',
-// //     bottom: '0',
-// //     left: '0',
-// //     border: '0',
-// //     zIndex: '9999999', // Make sure it's on top
-// //     overflow: 'visible'
-// //   })
-//
-//   //iFrame.src = chrome.runtime.getURL('/www/index.html#/annotations/' + tabId)
-//   //document.body.prepend(iFrame)
-//
+
   var l: HTMLLinkElement = document.createElement('link');
   l.setAttribute("href", chrome.runtime.getURL('www/css/ts-content-script.css'))
   l.setAttribute("rel", "stylesheet")
@@ -121,6 +92,7 @@ function inIgnoredMessages(request: any) {
     request.name === 'detail-level-changed' ||
     request.name === 'mqtt-url-changed' ||
     request.name === 'reload-application' ||
+    request.name === 'window-updated' ||
     request.action === 'highlight-annotation'
   //request.name === 'recogito-annotation-created'
 
@@ -151,27 +123,54 @@ class ChromeListeners {
 
   throttleOnePerSecond = throttledQueue(1, 1000, true)
 
+  private onCreatedListener = (tab: chrome.tabs.Tab) => this.onCreated(tab)
+  private onUpdatedListener = (number: number, info: chrome.tabs.TabChangeInfo, tab: chrome.tabs.Tab) => this.onUpdated(number, info, tab)
+  private onMovedListener = (number: number, info: chrome.tabs.TabMoveInfo) => this.onMoved(number, info)
+  private onRemovedListener = (number: number, info: chrome.tabs.TabRemoveInfo) => this.onRemoved(number, info)
+  private onReplacedListener = (n1: number, n2: number) => this.onReplaced(n1, n2)
+  private onActivatedListener = (info: chrome.tabs.TabActiveInfo) => this.onActivated(info)
+  private onAttachedListener = (number: number, info: chrome.tabs.TabAttachInfo) => this.onAttached(number, info)
+  private onDetachedListener = (number: number, info: chrome.tabs.TabDetachInfo) => this.onDetached(number, info)
+  private onHighlightedListener = (info: chrome.tabs.TabHighlightInfo) => this.onHighlighted(info)
+  private onMessageListener = (request: any, sender: chrome.runtime.MessageSender, sendResponse: any) => this.onMessage(request, sender, sendResponse)
+  private onCommandListener = (command: string) => {
+    switch (command) {
+      case 'tabHistoryBack':
+        NavigationService.backOneTab()
+        break
+      case 'tabHistoryForward':
+        NavigationService.forwardOneTab()
+        break
+      case 'search':
+        break
+      default:
+        console.log(`unknown Command: ${command}`);
+        break
+    }
+  }
+
   async initListeners() {
 
     if (process.env.MODE === 'bex') {
-      console.debug("initializing chrome tab listeners")
+
+      console.debug(" ...initializing chrome tab listeners")
 
       chrome.runtime.setUninstallURL("https://tabsets.web.app/#/uninstall")
 
       await setCurrentTab()
 
-      chrome.tabs.onCreated.addListener((tab: chrome.tabs.Tab) => this.onCreated(tab))
-      chrome.tabs.onUpdated.addListener((number, info, tab) => this.onUpdated(number, info, tab))
-      chrome.tabs.onMoved.addListener((number, info) => this.onMoved(number, info))
-      chrome.tabs.onRemoved.addListener((number, info) => this.onRemoved(number, info))
-      chrome.tabs.onReplaced.addListener((n1, n2) => this.onReplaced(n1, n2))
-      chrome.tabs.onActivated.addListener((info) => this.onActivated(info))
-      chrome.tabs.onAttached.addListener((number, info) => this.onAttached(number, info))
-      chrome.tabs.onDetached.addListener((number, info) => this.onDetached(number, info))
-      chrome.tabs.onHighlighted.addListener((info) => this.onHighlighted(info))
+      chrome.tabs.onCreated.addListener(this.onCreatedListener)
+      chrome.tabs.onUpdated.addListener(this.onUpdatedListener)
+      chrome.tabs.onMoved.addListener(this.onMovedListener)
+      chrome.tabs.onRemoved.addListener(this.onRemovedListener)
+      chrome.tabs.onReplaced.addListener(this.onReplacedListener)
+      chrome.tabs.onActivated.addListener(this.onActivatedListener)
+      chrome.tabs.onAttached.addListener(this.onAttachedListener)
+      chrome.tabs.onDetached.addListener(this.onDetachedListener)
+      chrome.tabs.onHighlighted.addListener(this.onHighlightedListener)
       //chrome.tabs.onZoomChange.addListener((info) => this.onZoomChange(info))
 
-      chrome.runtime.onMessage.addListener((request, sender, sendResponse) => this.onMessage(request, sender, sendResponse))
+      chrome.runtime.onMessage.addListener(this.onMessageListener)
 
       // seems to belong in background.ts
       // chrome.runtime.onInstalled.addListener((callback) => {
@@ -185,22 +184,9 @@ class ChromeListeners {
       //   }
       // });
 
-      chrome.commands.onCommand.addListener((command) => {
-        switch (command) {
-          case 'tabHistoryBack':
-            NavigationService.backOneTab()
-            break
-          case 'tabHistoryForward':
-            NavigationService.forwardOneTab()
-            break
-          case 'search':
-            break
-          default:
-            console.log(`unknown Command: ${command}`);
-            break
-        }
-      });
+      chrome.commands.onCommand.addListener(this.onCommandListener);
 
+      // TODO removed listeners as well?
       if (usePermissionsStore().hasFeature(FeatureIdent.NOTIFICATIONS)) {
         chrome.notifications.onButtonClicked.addListener(
           (notificationId, buttonIndex) => {
@@ -213,6 +199,24 @@ class ChromeListeners {
       }
     }
 
+    // https://stackoverflow.com/questions/77089404/chrom-extension-close-event-not-available-on-sidepanel-closure
+    chrome.runtime.connect({ name: 'tabsetsSidepanel' });
+
+  }
+
+  async resetListeners() {
+    console.log(" ...resetting listeners (after re-initialization)")
+    chrome.tabs.onCreated.removeListener(this.onCreatedListener)
+    chrome.tabs.onUpdated.removeListener(this.onUpdatedListener)
+    chrome.tabs.onMoved.removeListener(this.onMovedListener)
+    chrome.tabs.onRemoved.removeListener(this.onRemovedListener)
+    chrome.tabs.onReplaced.removeListener(this.onReplacedListener)
+    chrome.tabs.onActivated.removeListener(this.onActivatedListener)
+    chrome.tabs.onAttached.removeListener(this.onAttachedListener)
+    chrome.tabs.onDetached.removeListener(this.onDetachedListener)
+    chrome.tabs.onHighlighted.removeListener(this.onHighlightedListener)
+    chrome.runtime.onMessage.removeListener(this.onMessageListener)
+    chrome.commands.onCommand.removeListener(this.onCommandListener);
   }
 
   clearWorking() {
@@ -240,7 +244,8 @@ class ChromeListeners {
       return
     }
     this.eventTriggered()
-    console.debug(`onCreated: tab ${tab.id}: >>> ${tab.pendingUrl}`)
+    console.debug(`onCreated: tab ${tab.id}: >>> ${tab.pendingUrl}`, tab)
+    sendMsg('window-updated', {initiated: "ChromeListeners#onCreated"})
     const tabsStore = useTabsStore()
 
     let foundSession = false
@@ -451,14 +456,10 @@ class ChromeListeners {
 
   onRemoved(number: number, info: chrome.tabs.TabRemoveInfo) {
     this.eventTriggered()
-    const tabsStore = useTabsStore()
-    const currentTabset: Tabset = tabsStore.tabsets.get(tabsStore.currentTabsetId) as Tabset || new Tabset("", "", [], [])
-    const index = _.findIndex(currentTabset.tabs, t => t.chromeTabId === number);
-    if (index >= 0) {
-      const updatedTab = currentTabset.tabs.at(index)
-      if (updatedTab) {
-      }
-    }
+    console.log("onRemoved tab event: ", number, info)
+    //useWindowsStore().refreshCurrentWindows()
+    useWindowsStore().refreshTabsetWindow(info.windowId)
+    sendMsg('window-updated', {initiated: "ChromeListeners#onRemoved"})
   }
 
   onReplaced(n1: number, n2: number) {
diff --git a/src/services/IndexedDbPersistenceService.ts b/src/services/IndexedDbPersistenceService.ts
index ea370ad5..339da9a8 100644
--- a/src/services/IndexedDbPersistenceService.ts
+++ b/src/services/IndexedDbPersistenceService.ts
@@ -28,13 +28,18 @@ import {Account} from "src/models/Account";
 class IndexedDbPersistenceService implements PersistenceService {
   private db: IDBPDatabase = null as unknown as IDBPDatabase
 
+  getServiceName(): string {
+    return "IndexedDbPersistenceService"
+  }
+
   async init(dbName: string) {
-    console.log("initializing indexeddb database", dbName)
+    console.log(" ...initializing indexeddb database", dbName)
     this.db = await this.initDatabase(dbName)
     useUiStore().dbReady = true
   }
 
   async loadTabsets(): Promise<any> {
+    console.log(" loading tabsets indexeddb")
     const tabsStore = useTabsStore()
     return await this.db.getAll('tabsets')
       .then((res: any) => res.forEach((r: Tabset) => {
@@ -59,7 +64,7 @@ class IndexedDbPersistenceService implements PersistenceService {
   }
 
   async loadSpaces(): Promise<void> {
-    console.debug("loading spaces...")
+    console.debug(" loading spaces...")
     const spacesStore = useSpacesStore()
     const keys: IDBValidKey[] = await this.db.getAllKeys('spaces')
     _.forEach(keys, key => {
@@ -517,14 +522,63 @@ class IndexedDbPersistenceService implements PersistenceService {
 
   /*** Windows Management ***/
 
-  addWindow(window: Window): Promise<any> {
-    //console.log("%cadding window", "background-color:yellow", window)
-    return this.db.add('windows', window, window.id)
-      .catch((err) => {
-        if (!err.toString().indexOf('Key already exists')) {
-          console.log("error adding window", window, err)
-        }
-      })
+  async addWindow(window: Window): Promise<any> {
+    console.debug("adding window", `id=${window.id}, index=${window.index}, #hostList=${window.hostList.length}`)
+    const existingWindowForWindowId: Window | undefined = await this.db.get('windows', window.id)
+    if (existingWindowForWindowId) {
+
+      const mergedWindow = new Window(
+        window.id,
+        window.browserWindow,
+        existingWindowForWindowId.title,
+        window.index,
+        existingWindowForWindowId.open,
+        window.hostList
+      )
+      console.debug(`merging windows to ${mergedWindow.toString()}`)
+      this.db.put('windows', mergedWindow, window.id).catch((err) => console.error("error", err))
+      return Promise.resolve("not added, updated hostList instead")
+
+      // not bad, simply resolve
+      //console.debug("key already exists")
+      //return Promise.resolve("Key already exists")
+    }
+    //if (!window.title) {
+    // try to find matching window
+    console.log("trying to add new window ", window.toString())
+    const allWindows: Window[] = await this.db.getAll('windows') as Window[]
+    console.log(`adding ${window.toString()} to list [${_.join(_.map(allWindows, w => w.id), ',')}]`)
+    for (const w of allWindows) {
+      console.log("comparing hostLists", window.hostList, w.hostList, typeof w.hostList)
+      const intersection = new Set([...window.hostList].filter(x => (new Set(w.hostList).has(x))));
+      console.log("intersection", intersection, intersection.size === window.hostList.length, intersection.size === w.hostList.length)
+      if (intersection.size === window.hostList.length && intersection.size === w.hostList.length) {
+        // reuse existing
+        const useId = window.id
+        const oldId = w.id
+        window = w
+        window.id = useId
+        console.warn("replacing old window " + oldId + " with " + window.toString())
+
+        // logtail.warn("tabsets started", {
+        //   "mode": process.env.MODE,
+        //   "version": import.meta.env.PACKAGE_VERSION,
+        // })
+
+        await this.db.delete('windows', oldId)
+        break
+      }
+    }
+    //}
+    try {
+      await this.db.add('windows', window, window.id)
+    }
+      //.then((res) => console.log("got res", res))
+    catch (err: any) {
+      if (!err.toString().indexOf('Key already exists')) {
+        console.log("error adding window", window, err)
+      }
+    }
   }
 
   // updateGroup(group: chrome.tabGroups.TabGroup): Promise<any> {
@@ -537,6 +591,7 @@ class IndexedDbPersistenceService implements PersistenceService {
   }
 
   getWindow(windowId: number): Promise<Window | undefined> {
+    //console.log("trying to get window with id", windowId)
     return this.db.get('windows', windowId)
   }
 
@@ -546,7 +601,7 @@ class IndexedDbPersistenceService implements PersistenceService {
   }
 
   async updateWindow(window: Window): Promise<void> {
-    console.log(`updating window #${window.id} => title: '${window.title}', index: ${window.index}`)
+    console.debug(`updating window id=${window.id}, title=${window.title}, index=${window.index}, #hostList=${window.hostList.length}`)
     if (!window.id) {
       return Promise.reject("window.id not set")
     }
@@ -555,19 +610,21 @@ class IndexedDbPersistenceService implements PersistenceService {
       return Promise.reject("could not find window for id " + window.id)
     }
     const asJson = JSON.parse(JSON.stringify(window))
+
     asJson['title'] = window.title
     asJson['index'] = window.index
+    asJson['hostList'] = Array.from(window.hostList)
+
     delete asJson['tabs']
+    console.debug("saving window json as ", asJson)
     await this.db.put('windows', asJson, window.id)
   }
 
   async upsertWindow(window: Window): Promise<void> {
     try {
-      console.log(`about to change window #${window.id}: title='${window.title}', index=${window.index}`)
+      console.log(`about to change window:  id=${window.id}, title=${window.title}, index=${window.index}, open=${window.open}, #hostList=${window.hostList.length}`)
       const asJson = JSON.parse(JSON.stringify(window))
-      //asJson['title'] = name
       delete asJson['tabs']
-      //console.log("storing window", asJson, window.id)
       await this.db.put('windows', asJson, window.id)
     } catch (err) {
       console.log("error renaming window", err)
@@ -585,7 +642,7 @@ class IndexedDbPersistenceService implements PersistenceService {
   }
 
   private async initDatabase(dbName: string): Promise<IDBPDatabase> {
-    console.debug("about to initialize indexedDB")
+    console.debug(" about to initialize indexedDB")
     return await openDB(dbName, INDEX_DB_VERSION, {
       // upgrading see https://stackoverflow.com/questions/50193906/create-index-on-already-existing-objectstore
       upgrade(db) {
diff --git a/src/services/MHtmlService.ts b/src/services/MHtmlService.ts
index 423dab67..0ad755be 100644
--- a/src/services/MHtmlService.ts
+++ b/src/services/MHtmlService.ts
@@ -13,7 +13,7 @@ class MHtmlService {
    * Init, called when extension is loaded (via App.vue)
    */
   async init() {
-    console.debug("init mhtmlService")
+    console.debug(" ...init mhtmlService")
     //await localDb.init();
   }
 
diff --git a/src/services/NavigationService.ts b/src/services/NavigationService.ts
index 231d83bc..5be97007 100644
--- a/src/services/NavigationService.ts
+++ b/src/services/NavigationService.ts
@@ -9,7 +9,6 @@ import {usePermissionsStore} from "stores/permissionsStore";
 import {FeatureIdent} from "src/models/AppFeature";
 import {Suggestion, SuggestionType} from "src/models/Suggestion";
 import {useSuggestionsStore} from "stores/suggestionsStore";
-import TabsetService from "src/services/TabsetService";
 
 class NavigationService {
 
@@ -36,10 +35,10 @@ class NavigationService {
         const createData: any = {url: withUrls}
         if (windowFromDb) {
           const w = windowFromDb.browserWindow
-          createData['left' as keyof object] = w.left//(w.left || 0) < 0 ? 0 : w.left
-          createData['top' as keyof object] = w.top//(w.top || 0) < 0 ? 0 : w.top
-          createData['width' as keyof object] = w.width//(w.width || -1) < 0 ? 600 : w.width
-          createData['height' as keyof object] = w.height//(w.top || -1) < 0 ? 400 : w.height
+          createData['left' as keyof object] = w?.left || 50
+          createData['top' as keyof object] = w?.top || 50 //(w.top || 0) < 0 ? 0 : w.top
+          createData['width' as keyof object] = w?.width || 1200 //(w.width || -1) < 0 ? 600 : w.width
+          createData['height' as keyof object] = w?.height || 800 //(w.top || -1) < 0 ? 400 : w.height
           // window does not exist anymore, remove from 'allWindows'
           await useWindowsStore().removeWindow(windowFromDb.id)
         }
diff --git a/src/services/PersistenceService.ts b/src/services/PersistenceService.ts
index d80f0290..ad853d68 100644
--- a/src/services/PersistenceService.ts
+++ b/src/services/PersistenceService.ts
@@ -14,6 +14,8 @@ import {Account} from "src/models/Account";
 
 interface PersistenceService {
 
+  getServiceName(): string
+
   loadTabsets():Promise<void>
   reloadTabset(tabsetId: string): void
   saveTabset(tabset: Tabset): Promise<any>
diff --git a/src/services/PouchDbPersistenceService.ts b/src/services/PouchDbPersistenceService.ts
index b4ad03b0..7365d1b0 100644
--- a/src/services/PouchDbPersistenceService.ts
+++ b/src/services/PouchDbPersistenceService.ts
@@ -35,6 +35,8 @@ const throttleOne10Millis = throttledQueue(1, 10, true)
  */
 class PouchDbPersistenceService implements PersistenceService {
 
+  getServiceName(): string { return "PouchDbPersistenceService" }
+
   loadCategories(): Promise<any> {
     console.warn("loading categories... - not implemented")
     return Promise.reject("loadCategories not implemented")
diff --git a/src/services/TabsetService2.ts b/src/services/TabsetService2.ts
index 1a8d6179..15a0af2e 100644
--- a/src/services/TabsetService2.ts
+++ b/src/services/TabsetService2.ts
@@ -39,7 +39,7 @@ export function useTabsetService() {
 
   const init = async (providedDb: PersistenceService,
                       doNotInitSearchIndex: boolean = false) => {
-    console.log("initializing tabsetService2", providedDb)
+    console.log(" ...initializing tabsetService2 as", providedDb.getServiceName())
     db = providedDb
 
     useTabsStore().clearTabsets()
@@ -61,7 +61,7 @@ export function useTabsetService() {
 
     useTabsStore().tabsets.forEach(ts => {
       if (ts.sharedId) {
-        console.log("subscribing to topic ", ts.sharedId)
+        //console.log("subscribing to topic ", ts.sharedId)
         MqttService.subscribe(ts.sharedId)
       }
     })
diff --git a/src/services/Utils.ts b/src/services/Utils.ts
index 8a1d5785..e274bfba 100644
--- a/src/services/Utils.ts
+++ b/src/services/Utils.ts
@@ -3,90 +3,106 @@ import sanitizeHtml from "sanitize-html";
 import {Tab} from "src/models/Tab";
 import {useWindowsStore} from "stores/windowsStore";
 import {useTabsStore} from "stores/tabsStore";
+import _ from "lodash";
 
 export function useUtils() {
 
-    const formatDate = (timestamp: number | undefined) =>
-        timestamp ? formatDistance(timestamp, new Date(), {addSuffix: true}) : ""
+  const formatDate = (timestamp: number | undefined) =>
+    timestamp ? formatDistance(timestamp, new Date(), {addSuffix: true}) : ""
 
-    const createDataTestIdentifier = (prefix: string, url: string) =>
-        prefix + "_" + url.replace("https://", "").replaceAll('.', '').replaceAll("/", "")
+  const createDataTestIdentifier = (prefix: string, url: string) =>
+    prefix + "_" + url.replace("https://", "").replaceAll('.', '').replaceAll("/", "")
 
-    const inBexMode = () => process.env.MODE === 'bex'
-    const modeIs = (ident: string) => process.env.MODE === ident
+  const inBexMode = () => process.env.MODE === 'bex'
+  const modeIs = (ident: string) => process.env.MODE === ident
 
-    const normalize = (url: string): string => {
-        try {
-            new URL(url)
-            return url
-        } catch (err) {
-            return "https://" + url
-        }
+  const normalize = (url: string): string => {
+    try {
+      new URL(url)
+      return url
+    } catch (err) {
+      return "https://" + url
     }
+  }
 
-    const sanitize = (input: string): string => {
-        return sanitizeHtml(input, {
-            allowedTags: sanitizeHtml.defaults.allowedTags.concat(['img']),
-            allowedAttributes: sanitizeHtml.defaults.allowedAttributes = {
-                a: ['href', 'name', 'target'],
-                img: ['src', 'srcset', 'alt', 'title', 'width', 'height', 'loading']
-            },
-            allowedSchemesByTag: {
-                img: ['data']
-            }
-        })
-    }
+  const sanitize = (input: string): string => {
+    return sanitizeHtml(input, {
+      allowedTags: sanitizeHtml.defaults.allowedTags.concat(['img']),
+      allowedAttributes: sanitizeHtml.defaults.allowedAttributes = {
+        a: ['href', 'name', 'target'],
+        img: ['src', 'srcset', 'alt', 'title', 'width', 'height', 'loading']
+      },
+      allowedSchemesByTag: {
+        img: ['data']
+      }
+    })
+  }
 
-    const sanitizeAsText = (input: string): string => {
-        return sanitizeHtml(input, {
-            allowedTags: sanitizeHtml.defaults.allowedTags,//.concat(['img']),
-            allowedAttributes: sanitizeHtml.defaults.allowedAttributes = {
-                a: ['href', 'name', 'target']
-            }
-        })
-    }
+  const sanitizeAsText = (input: string): string => {
+    return sanitizeHtml(input, {
+      allowedTags: sanitizeHtml.defaults.allowedTags,//.concat(['img']),
+      allowedAttributes: sanitizeHtml.defaults.allowedAttributes = {
+        a: ['href', 'name', 'target']
+      }
+    })
+  }
 
-    const sendMsg = (msgName: string, data: object = {}) => {
-        if (inBexMode() && chrome) {
-            console.log("sending message", {name: msgName, data})
-            chrome.runtime.sendMessage({
-                name: msgName, data: data
-            }, (callback: any) => {
-                if (callback) {
-                    console.log("got callback", callback)
-                }
-                if (chrome.runtime.lastError) { /* ignore */
-                }
-            });
-        }
-    }
-    const isCurrentTab = (tab: Tab) => {
-        if (!inBexMode() || !tab.url) {
-            return false
-        }
-        const windowId = useWindowsStore().currentWindow?.id || 0
-        const currentChromeTab = useTabsStore().getCurrentChromeTab(windowId) || useTabsStore().currentChromeTab
-        //console.log("checking current tab", currentChromeTab.url, tab.url, currentChromeTab.url === tab.url)
-        if (currentChromeTab?.url === tab.url) {
-            tab.chromeTabId = currentChromeTab.id
-            return true
+  const sendMsg = (msgName: string, data: object = {}) => {
+    if (inBexMode() && chrome) {
+      console.log("sending message", {name: msgName, data})
+      chrome.runtime.sendMessage({
+        name: msgName, data: data
+      }, (callback: any) => {
+        if (callback) {
+          console.log("got callback", callback)
         }
-        //console.log("checking", currentChromeTab.url, "/" + btoa(tab.url || ''), currentChromeTab.url?.indexOf("/" + btoa(tab.url || '')) )
-        if (currentChromeTab?.url && currentChromeTab.url?.indexOf("/" + btoa(tab.url || '')) >= 0) {
-            return true
+        if (chrome.runtime.lastError) { /* ignore */
         }
-        return false
+      });
     }
+  }
+  const isCurrentTab = (tab: Tab) => {
+    if (!inBexMode() || !tab.url) {
+      return false
+    }
+    const windowId = useWindowsStore().currentChromeWindow?.id || 0
+    const currentChromeTab = useTabsStore().getCurrentChromeTab(windowId) || useTabsStore().currentChromeTab
+    //console.log("checking current tab", currentChromeTab.url, tab.url, currentChromeTab.url === tab.url)
+    if (currentChromeTab?.url === tab.url) {
+      tab.chromeTabId = currentChromeTab.id
+      return true
+    }
+    //console.log("checking", currentChromeTab.url, "/" + btoa(tab.url || ''), currentChromeTab.url?.indexOf("/" + btoa(tab.url || '')) )
+    if (currentChromeTab?.url && currentChromeTab.url?.indexOf("/" + btoa(tab.url || '')) >= 0) {
+      return true
+    }
+    return false
+  }
 
-    return {
-        formatDate,
-        createDataTestIdentifier,
-        inBexMode,
-        normalize,
-        modeIs,
-        sanitize,
-        sanitizeAsText,
-        sendMsg,
-        isCurrentTab
+  function urlToHost(url: string): string {
+    try {
+      const theURL = new URL(url)
+      return theURL.host
+    } catch (err) {
+      return null as unknown as string
     }
+  }
+
+  const calcHostList = (tabs: chrome.tabs.Tab[]): string[] => {
+    const stringArray = Array.from(new Set(_.map(tabs, bwTabs => urlToHost(bwTabs.url || ''))))
+    return _.filter(stringArray, (e: string | undefined) => e !== null)
+  }
+
+  return {
+    formatDate,
+    createDataTestIdentifier,
+    inBexMode,
+    normalize,
+    modeIs,
+    sanitize,
+    sanitizeAsText,
+    sendMsg,
+    isCurrentTab,
+    calcHostList
+  }
 }
diff --git a/src/services/persistence/GitPersistentService.ts b/src/services/persistence/GitPersistentService.ts
index a4ee576d..6d34e0bb 100644
--- a/src/services/persistence/GitPersistentService.ts
+++ b/src/services/persistence/GitPersistentService.ts
@@ -61,7 +61,8 @@ async function push(dir: string, proxy: string) {
   log(pushResult)
 }
 
-const log = (s: string, ...args:any[]) => console.log("%c" + s, "color:#8B4000", ...args)
+const log = (s: string, ...args:any[]) => console.log("%c" + s, "color:blue", ...args)
+const debug = (s: string, ...args:any[]) => console.debug("%c" + s, "color:blue", ...args)
 
 class GitPersistenceService implements PersistenceService {
   private db: IDBPDatabase = null as unknown as IDBPDatabase
@@ -71,19 +72,20 @@ class GitPersistenceService implements PersistenceService {
 
   private useProxy = this.genericCorsProxy
 
+  getServiceName(): string { return "GitPersistenceService" }
+
   async init(syncType: SyncType, url: string | undefined) {
+    console.log(" ...initializing GitPersistenceService")
     if (url) {
       if (syncType === SyncType.GITHUB) {
-        log("=== initializing github database ===", url)
+        log("initializing github database", url)
         this.db = await this.initDatabase(url, this.genericCorsProxy)
-        log("=== initializing git database: done ===")
         useUiStore().dbReady = true
         return Promise.resolve("done")
       } else if (syncType === SyncType.MANAGED_GIT) {
         const subscription = LocalStorage.getItem(SUBSCRIPTION_ID_IDENT) as string
-        log("=== initializing managed git ===", url)
+        log("initializing managed git", url)
         this.db = await this.initDatabase("https://tabsets.git/" + subscription, this.tabsetsCorsProxy)
-        log("=== initializing managed git done ===")
         useUiStore().dbReady = true
         return Promise.resolve("done")
       }
@@ -112,11 +114,11 @@ class GitPersistenceService implements PersistenceService {
       }
     }
 
-    // try to get status
-    let status = await git.status({fs, dir: useDir, filepath: 'README.md'})
-    log(status)
-
     try {
+      // try to get status
+      let status = await git.status({fs, dir: useDir, filepath: 'README.md'})
+      log(status)
+
       const cloneDef = {
         fs,
         http,
@@ -158,15 +160,12 @@ class GitPersistenceService implements PersistenceService {
     try {
       const dir = "/" + uid()
       try {
-        //const r = await this.initDatabase( gitRepoUrl, dir, true)
-        //log("got r", r)
-
         const remoteInfoDef = {
           http,
           corsProxy: this.useProxy,
           url: gitRepoUrl,
           onAuthSuccess: () => {
-            log("auth: success")
+            debug("auth: success")
             return Promise.resolve("success!")
           },
           onAuthFailure: () => (log("auth: failure")),
@@ -196,7 +195,6 @@ class GitPersistenceService implements PersistenceService {
    */
 
   async loadTabsets(): Promise<void> {
-    log("=== loading tabsets ===")
     // update from git, then read from fs
     const tabsets: Tabset[] = []
     try {
@@ -295,7 +293,6 @@ class GitPersistenceService implements PersistenceService {
    */
 
   async loadSpaces(): Promise<any> {
-    log("=== loading spaces ===")
     // update from git, then read from fs
     const spaces: Space[] = []
     try {
diff --git a/src/services/storage/LocalStoragePersistenceService.ts b/src/services/storage/LocalStoragePersistenceService.ts
index 57955b4b..5a4026cb 100644
--- a/src/services/storage/LocalStoragePersistenceService.ts
+++ b/src/services/storage/LocalStoragePersistenceService.ts
@@ -22,6 +22,8 @@ export class LocalStoragePersistenceService implements PersistenceService {
     this.quasar = quasar
   }
 
+  getServiceName(): string { return "LocalStoragePersistenceService" }
+
   deleteSpace(spaceId: string): void {
     throw new Error("Method not implemented.");
   }
diff --git a/src/services/stripe/initializeStripe.ts b/src/services/stripe/initializeStripe.ts
index ff7afe54..eeb7776b 100644
--- a/src/services/stripe/initializeStripe.ts
+++ b/src/services/stripe/initializeStripe.ts
@@ -1,12 +1,20 @@
-import {Stripe, loadStripe} from "@stripe/stripe-js"
 
-let stripePromise: Stripe | null
+let stripePromise: any | null
 
 const initializeStripe = async () => {
-  if (!stripePromise) {
-    stripePromise = await loadStripe("pk_test_51Liaq8CRr6mfm8sfWjPJwrWRfcP1DDZxuruR6TaccotBFN4ugOlqpXGvaEcLpLOgfeLrK1hR1eCHLaGFSnxFvder00en9ZYYrd")
+  // initializing only on non-bex (yields error otherwise)
+  if (process.env.MODE !== 'bex') {
+    const stripe = await import ("@stripe/stripe-js")
+    const {loadStripe} = stripe
+    if (!stripePromise) {
+      stripePromise = await loadStripe("pk_test_51Liaq8CRr6mfm8sfWjPJwrWRfcP1DDZxuruR6TaccotBFN4ugOlqpXGvaEcLpLOgfeLrK1hR1eCHLaGFSnxFvder00en9ZYYrd")
+    }
+    return stripePromise
   }
+
   return stripePromise
 }
 
 export default initializeStripe
+
+
diff --git a/src/stores/authStore.ts b/src/stores/authStore.ts
index 3e73b124..11f7c843 100644
--- a/src/stores/authStore.ts
+++ b/src/stores/authStore.ts
@@ -1,18 +1,16 @@
 import {defineStore} from 'pinia';
 import {Subscription} from "src/models/Subscription";
-import {Auth0VueClient} from "@auth0/auth0-vue";
 import {getAuth, signOut, User} from "firebase/auth";
 import {LocalStorage, useQuasar} from "quasar";
-import {useUtils} from "src/services/Utils";
 import PersistenceService from "src/services/PersistenceService";
 import {computed, ref} from "vue";
 import {Account} from "src/models/Account";
 import {CURRENT_USER_ID} from "boot/constants";
 
 export enum AccessItem {
-  SYNC="SYNC",
-  SHARE="SHARE",
-  FEATURE_TOGGLES="FEATURE_TOGGLES"
+  SYNC = "SYNC",
+  SHARE = "SHARE",
+  FEATURE_TOGGLES = "FEATURE_TOGGLES"
 }
 
 export const useAuthStore = defineStore('auth', () => {
@@ -31,6 +29,7 @@ export const useAuthStore = defineStore('auth', () => {
 
   // --- init ---
   function initialize(ps: PersistenceService) {
+    console.debug(" ...initializing AuthStore")
     storage = ps
 
     // check stored user info
@@ -76,8 +75,8 @@ export const useAuthStore = defineStore('auth', () => {
 
   const useAuthRequest = computed(() => {
     const val = authRequest.value
-   // authRequest.value = null as unknown as string
-   // console.log("auth request was nulled, was ", val)
+    // authRequest.value = null as unknown as string
+    // console.log("auth request was nulled, was ", val)
     return val
   })
 
@@ -85,7 +84,7 @@ export const useAuthStore = defineStore('auth', () => {
     return (item: AccessItem): boolean => {
       //console.log("checking access item", item)
       if (!user.value) {
-        console.log("result: no (no user)")
+        //console.log("result: no (no user)")
         return false
       }
       //console.log("checking against products", products.value)
@@ -94,17 +93,22 @@ export const useAuthStore = defineStore('auth', () => {
           return products.value.indexOf("prod_PLJipUG1Zfw7pC") >= 0
         case AccessItem.FEATURE_TOGGLES:
           return true
-        default: return false
+        default:
+          return false
       }
     }
   })
 
   // --- actions ---
-  function setUser(u: User | undefined) {
+  async function setUser(u: User | undefined) {
     if (u) {
       LocalStorage.set(CURRENT_USER_ID, u.uid)
       authenticated.value = true;
       user.value = u;
+
+
+
+
     } else {
       LocalStorage.remove(CURRENT_USER_ID)
       authenticated.value = false;
diff --git a/src/stores/bookmarksStore.ts b/src/stores/bookmarksStore.ts
index 35401524..bce4e2b6 100644
--- a/src/stores/bookmarksStore.ts
+++ b/src/stores/bookmarksStore.ts
@@ -51,7 +51,7 @@ export const  useBookmarksStore = defineStore('bookmarks', {
 
   actions: {
     init() {
-      console.debug("initializing bookmarkStore")
+      console.debug(" ...initializing bookmarkStore")
       if (process.env.MODE !== 'bex') {
         return Promise.resolve()
       }
@@ -62,8 +62,8 @@ export const  useBookmarksStore = defineStore('bookmarks', {
       this.bookmarksNodes = []
       this.bookmarksLeaves = []
       const accessGranted = usePermissionsStore().hasPermission("bookmarks") && usePermissionsStore().hasFeature(FeatureIdent.BOOKMARKS)
-      console.debug("loading bookmarks", accessGranted)//, (new Error()).stack)
       if (accessGranted) {
+        console.debug(" ...loading bookmarks")//, (new Error()).stack)
         // @ts-ignore
         const bookmarks: object[] = await chrome.bookmarks.search({})//, async (bookmarks) => {
         this.bookmarksLeaves = bookmarks
diff --git a/src/stores/groupsStore.ts b/src/stores/groupsStore.ts
index 07de2f24..4781ba1a 100644
--- a/src/stores/groupsStore.ts
+++ b/src/stores/groupsStore.ts
@@ -21,187 +21,188 @@ let storage: PersistenceService = null as unknown as PersistenceService
 
 export const useGroupsStore = defineStore('groups', () => {
 
-    const {inBexMode} = useUtils()
-
-    /**
-     * the map of all 'ever used' Chrome tab groups, even if they are not currently in use,
-     * using the title as key.
-     */
-    const tabGroups = ref<Map<string, chrome.tabGroups.TabGroup>>(new Map())
-
-    /**
-     * the array all actually currently used Chrome tab groups.
-     */
-    const currentTabGroups = ref<chrome.tabGroups.TabGroup[]>([])
-
-    /**
-     * initialize store with
-     * @param providedDb a persistence storage
-     */
-    async function initialize(providedDb: PersistenceService) {
-        console.log("initializing groupsStore")
-        storage = providedDb
-        await init("initialization")
+  const {inBexMode} = useUtils()
+
+  /**
+   * the map of all 'ever used' Chrome tab groups, even if they are not currently in use,
+   * using the title as key.
+   */
+  const tabGroups = ref<Map<string, chrome.tabGroups.TabGroup>>(new Map())
+
+  /**
+   * the array all actually currently used Chrome tab groups.
+   */
+  const currentTabGroups = ref<chrome.tabGroups.TabGroup[]>([])
+
+  /**
+   * initialize store with
+   * @param providedDb a persistence storage
+   */
+  async function initialize(providedDb: PersistenceService) {
+    console.log(" ...initializing groupsStore")
+    storage = providedDb
+    await init("initialization")
+  }
+
+  async function init(trigger: string = "") {
+    if (!inBexMode() || !chrome?.tabGroups) {
+      return
     }
-
-    async function init(trigger: string = "") {
-        if (!inBexMode() || !chrome?.tabGroups) {
-            return
-        }
-        const groups = await chrome.tabGroups.query({})//, (groups) => {
-
+    const groups = await chrome.tabGroups.query({})//, (groups) => {
+
+    currentTabGroups.value = groups
+    console.log("initializing current tab groups with", currentTabGroups.value)
+
+    // adding potentially new groups to storage
+    const res: Promise<any>[] = groups.flatMap((group: chrome.tabGroups.TabGroup) => {
+      return storage.addGroup(group)
+    })
+
+    // setting all (new and older) groups to 'tabGroups'
+    await Promise.all(res)
+    tabGroups.value = new Map()
+    const res2 = await storage.getGroups()
+    res2.forEach(r => tabGroups.value.set(r.title || '', r))
+  }
+
+  // TODO: if groups without title are not tracked at all, this might be unnecessary
+  function onCreated(group: chrome.tabGroups.TabGroup) {
+    console.debug("group: onCreated", group)
+    if (inBexMode() && chrome?.tabGroups && group.title) {
+      chrome.tabGroups.query({}, (groups) => {
         currentTabGroups.value = groups
-        console.log("initializing current tab groups with", currentTabGroups.value)
-
-        // adding potentially new groups to storage
-        const res: Promise<any>[] = groups.flatMap((group: chrome.tabGroups.TabGroup) => {
-            return storage.addGroup(group)
-        })
-
-        // setting all (new and older) groups to 'tabGroups'
-        await Promise.all(res)
-        tabGroups.value = new Map()
-        const res2 = await storage.getGroups()
-        res2.forEach(r => tabGroups.value.set(r.title || '', r))
+      })
     }
+  }
 
-    // TODO: if groups without title are not tracked at all, this might be unnecessary
-    function onCreated(group: chrome.tabGroups.TabGroup) {
-        console.debug("group: onCreated", group)
-        if (inBexMode() && chrome?.tabGroups && group.title) {
-            chrome.tabGroups.query({}, (groups) => {
-                currentTabGroups.value = groups
-            })
-        }
+  async function onUpdated(group: chrome.tabGroups.TabGroup) {
+    console.debug("group: onUpdated", group)
+    if (!inBexMode() || !chrome?.tabGroups) {
+      return Promise.resolve()
     }
+    const groups = await chrome.tabGroups.query({})//, (groups) => {
+    currentTabGroups.value = groups
 
-    async function onUpdated(group: chrome.tabGroups.TabGroup) {
-        console.debug("group: onUpdated", group)
-        if (!inBexMode() || !chrome?.tabGroups) {
-            return Promise.resolve()
-        }
-        const groups = await chrome.tabGroups.query({})//, (groups) => {
-        currentTabGroups.value = groups
-
-        await useGroupsStore().persistGroup(group)
-
-        // update the group names for matching group ids
-        for (const ts of [...useTabsStore().tabsets.values()]) {
-            let matchForTabset = false
-            for (const t of ts.tabs) {
-                for (const g of groups) {
-                    if (t.groupId === g.id && t.groupName !== g.title) {
-                        t.groupName = g.title
-                        matchForTabset = true
-                    }
-                }
-            }
-            if (matchForTabset) {
-                await useTabsetService().saveTabset(ts)
-            }
-        }
+    await useGroupsStore().persistGroup(group)
 
-        // update color changes
+    // update the group names for matching group ids
+    for (const ts of [...useTabsStore().tabsets.values()]) {
+      let matchForTabset = false
+      for (const t of ts.tabs) {
         for (const g of groups) {
-            const tabGroup = findGroup([...tabGroups.value.values()], undefined, g.title)
-            if (tabGroup && tabGroup.color !== g.color) {
-                await storage.updateGroup(g)
-            }
-        }
-    }
-
-    function initListeners() {
-        if (inBexMode() && chrome && chrome.tabGroups) {
-            chrome.tabGroups.onCreated.addListener((group: chrome.tabGroups.TabGroup) => onCreated(group))
-            chrome.tabGroups.onRemoved.addListener((group: chrome.tabGroups.TabGroup) => init("onRemoved"))
-            chrome.tabGroups.onMoved.addListener((group: chrome.tabGroups.TabGroup) => init("onMoved"))
-            chrome.tabGroups.onUpdated.addListener((group: chrome.tabGroups.TabGroup) => onUpdated(group))
+          if (t.groupId === g.id && t.groupName !== g.title) {
+            t.groupName = g.title
+            matchForTabset = true
+          }
         }
+      }
+      if (matchForTabset) {
+        await useTabsetService().saveTabset(ts)
+      }
     }
 
-    function findGroup(groups: chrome.tabGroups.TabGroup[], groupId: number | undefined, groupName: string | undefined) {
-        if (groupId) {
-            for (const g of groups) {
-                if (g.id === groupId) {
-                    return g
-                }
-            }
-        }
-        if (groupName) {
-            for (const g of groups) {
-                if (g.title === groupName) {
-                    return g
-                }
-            }
-        }
-        return undefined
+    // update color changes
+    for (const g of groups) {
+      const tabGroup = findGroup([...tabGroups.value.values()], undefined, g.title)
+      if (tabGroup && tabGroup.color !== g.color) {
+        await storage.updateGroup(g)
+      }
     }
-
-    function groupForName(groupTitle: string | undefined): chrome.tabGroups.TabGroup | undefined {
-        if (inBexMode() && chrome && chrome.tabGroups && groupTitle) {
-            return _.find([...tabGroups.value.values()], g => g.title === groupTitle)
-        }
-        return undefined
+  }
+
+  function initListeners() {
+    if (inBexMode() && chrome && chrome.tabGroups) {
+      console.log(" ...initializing GroupsStore Listeners")
+      chrome.tabGroups.onCreated.addListener((group: chrome.tabGroups.TabGroup) => onCreated(group))
+      chrome.tabGroups.onRemoved.addListener((group: chrome.tabGroups.TabGroup) => init("onRemoved"))
+      chrome.tabGroups.onMoved.addListener((group: chrome.tabGroups.TabGroup) => init("onMoved"))
+      chrome.tabGroups.onUpdated.addListener((group: chrome.tabGroups.TabGroup) => onUpdated(group))
     }
+  }
 
-    function currentGroupForName(groupName: string | undefined = undefined): chrome.tabGroups.TabGroup | undefined {
-        if (inBexMode() && chrome?.tabGroups && groupName) {
-            return findGroup(currentTabGroups.value, undefined, groupName)
+  function findGroup(groups: chrome.tabGroups.TabGroup[], groupId: number | undefined, groupName: string | undefined) {
+    if (groupId) {
+      for (const g of groups) {
+        if (g.id === groupId) {
+          return g
         }
-        return undefined
+      }
     }
-
-    function currentGroupForId(groupId: number): chrome.tabGroups.TabGroup | undefined {
-        if (inBexMode()  && chrome?.tabGroups) {
-            return findGroup(currentTabGroups.value, groupId, undefined)
+    if (groupName) {
+      for (const g of groups) {
+        if (g.title === groupName) {
+          return g
         }
-        return undefined
+      }
     }
+    return undefined
+  }
 
-    /**
-     * persisting a group means adding it making sure it does not exist, but based on its ID
-     * @param group
-     */
-    async function persistGroup(group: chrome.tabGroups.TabGroup) {
-        if (group.title) {
-            console.debug("persisting group", group)
-            const existingGroups = await storage.getGroups()
-            //console.log("got existing groups", existingGroups)
-
-            const index = existingGroups.findIndex(g => {
-                return g.id === group.id && g.title !== group.title
-            })
-            if (index < 0) {
-                // no group exits yet with same id and different title
-                await storage.addGroup(JSON.parse(JSON.stringify(group)) as chrome.tabGroups.TabGroup)
-            } else {
-                const existingGroup = existingGroups[index]
-                console.debug("replacing group", existingGroup, group)
-                await storage.deleteGroupByTitle(existingGroup.title || '')
-                await persistGroup(group)
-            }
-        }
+  function groupForName(groupTitle: string | undefined): chrome.tabGroups.TabGroup | undefined {
+    if (inBexMode() && chrome && chrome.tabGroups && groupTitle) {
+      return _.find([...tabGroups.value.values()], g => g.title === groupTitle)
     }
+    return undefined
+  }
 
-    function updateGroup(group: chrome.tabGroups.TabGroup) {
-        return storage.updateGroup(group)
+  function currentGroupForName(groupName: string | undefined = undefined): chrome.tabGroups.TabGroup | undefined {
+    if (inBexMode() && chrome?.tabGroups && groupName) {
+      return findGroup(currentTabGroups.value, undefined, groupName)
     }
+    return undefined
+  }
 
-    function deleteGroupByTitle(title: string) {
-        tabGroups.value.delete(title)
-        return storage.deleteGroupByTitle(title)
+  function currentGroupForId(groupId: number): chrome.tabGroups.TabGroup | undefined {
+    if (inBexMode() && chrome?.tabGroups) {
+      return findGroup(currentTabGroups.value, groupId, undefined)
     }
-
-    return {
-        initialize,
-        initListeners,
-        groupForName,
-        currentGroupForName,
-        currentGroupForId,
-        tabGroups,
-        currentTabGroups,
-        persistGroup,
-        updateGroup,
-        deleteGroupByTitle
+    return undefined
+  }
+
+  /**
+   * persisting a group means adding it making sure it does not exist, but based on its ID
+   * @param group
+   */
+  async function persistGroup(group: chrome.tabGroups.TabGroup) {
+    if (group.title) {
+      console.debug("persisting group", group)
+      const existingGroups = await storage.getGroups()
+      //console.log("got existing groups", existingGroups)
+
+      const index = existingGroups.findIndex(g => {
+        return g.id === group.id && g.title !== group.title
+      })
+      if (index < 0) {
+        // no group exits yet with same id and different title
+        await storage.addGroup(JSON.parse(JSON.stringify(group)) as chrome.tabGroups.TabGroup)
+      } else {
+        const existingGroup = existingGroups[index]
+        console.debug("replacing group", existingGroup, group)
+        await storage.deleteGroupByTitle(existingGroup.title || '')
+        await persistGroup(group)
+      }
     }
+  }
+
+  function updateGroup(group: chrome.tabGroups.TabGroup) {
+    return storage.updateGroup(group)
+  }
+
+  function deleteGroupByTitle(title: string) {
+    tabGroups.value.delete(title)
+    return storage.deleteGroupByTitle(title)
+  }
+
+  return {
+    initialize,
+    initListeners,
+    groupForName,
+    currentGroupForName,
+    currentGroupForId,
+    tabGroups,
+    currentTabGroups,
+    persistGroup,
+    updateGroup,
+    deleteGroupByTitle
+  }
 })
diff --git a/src/stores/messagesStore.ts b/src/stores/messagesStore.ts
index c9da1735..6bd16aaf 100644
--- a/src/stores/messagesStore.ts
+++ b/src/stores/messagesStore.ts
@@ -3,9 +3,7 @@ import {ref} from "vue";
 import PersistenceService from "src/services/PersistenceService";
 import {useUtils} from "src/services/Utils";
 import {Window} from "src/models/Window";
-import _ from "lodash"
-import throttledQueue from "throttled-queue";
-import {useQuasar} from "quasar";
+import {Message} from "src/models/Message"
 
 /**
  * a pinia store for "Messages".
@@ -26,7 +24,7 @@ export const useMessagesStore = defineStore('messages', () => {
    * @param ps a persistence storage
    */
   async function initialize(providedDb: PersistenceService) {
-    console.log("initializing messagesStore")
+    console.debug(" ...initializing messagesStore")
     storage = providedDb
     setup("initialization")
   }
@@ -35,7 +33,6 @@ export const useMessagesStore = defineStore('messages', () => {
     if (!inBexMode()) {
       return
     }
-    console.debug("init messages with trigger", trigger)
     storage.getMessages()
       .then((ms) => messages.value = ms)
   }
diff --git a/src/stores/notificationsStore.ts b/src/stores/notificationsStore.ts
index 4e91ee5f..e827285d 100644
--- a/src/stores/notificationsStore.ts
+++ b/src/stores/notificationsStore.ts
@@ -8,7 +8,6 @@ import {useUtils} from "src/services/Utils";
 import {useSuggestionsStore} from "stores/suggestionsStore";
 import {StaticSuggestionIdent, Suggestion} from "src/models/Suggestion";
 
-const {inBexMode} = useUtils()
 
 export const useNotificationsStore = defineStore('notifications', () => {
 
@@ -19,6 +18,9 @@ export const useNotificationsStore = defineStore('notifications', () => {
   const updateToVersion = ref('')
   const notifications = ref([] as unknown as Notification[])
 
+  const {inBexMode} = useUtils()
+
+
   /**
    * the (internal) storage for this store to use
    */
@@ -30,7 +32,7 @@ export const useNotificationsStore = defineStore('notifications', () => {
    * @param ps a notifications storage
    */
   async function initialize(ps: PersistenceService) {
-    console.debug("initializing notifications", ps)
+    console.debug(" ...initializing notifications")
     storage = ps
     const newNotifications = await storage.getNotifications(true)
     notifications.value = newNotifications
diff --git a/src/stores/permissionsStore.ts b/src/stores/permissionsStore.ts
index 5c90ea58..4ac8f994 100644
--- a/src/stores/permissionsStore.ts
+++ b/src/stores/permissionsStore.ts
@@ -17,200 +17,195 @@ import PersistenceService from "src/services/PersistenceService";
 
 export const usePermissionsStore = defineStore('permissions', () => {
 
-    const $q = useQuasar()
-    const {sendMsg} = useUtils()
+  const $q = useQuasar()
+  const {sendMsg} = useUtils()
 
-    let storage = null as unknown as PersistenceService
+  let storage = null as unknown as PersistenceService
 
-    // related to chrome permissions
-    const grantedOptionalPermissions = ref<string[] | undefined>([])
-    const grantedOptionalOrigins = ref<string[] | undefined>([])
-    const permissions = ref<chrome.permissions.Permissions | undefined>(undefined)
+  // related to chrome permissions
+  const grantedOptionalPermissions = ref<string[] | undefined>([])
+  const grantedOptionalOrigins = ref<string[] | undefined>([])
+  const permissions = ref<chrome.permissions.Permissions | undefined>(undefined)
 
-    // related to tabsets permissions
-    const activeFeatures = ref<string[]>($q?.localStorage?.getItem('ui.activeFeatures') as string[] || [])
+  // related to tabsets permissions
+  const activeFeatures = ref<string[]>($q?.localStorage?.getItem('ui.activeFeatures') as string[] || [])
 
-    //const inActiveDefaultFeatures = ref<string[]>($q.localStorage?.getItem('ui.inActiveDefaultFeatures') as string[] || [])
+  async function initialize(ps: PersistenceService) {
+    console.debug(" ...initializing PermissionsStore")
+    storage = ps
+    await load()
+  }
 
-    async function initialize(ps: PersistenceService) {
-        storage = ps
-        await load()
+  async function load() {
+    activeFeatures.value = await storage.getActiveFeatures()
+    if (process.env.MODE !== 'bex') {
+      return
     }
-
-    async function load() {
-        activeFeatures.value = await storage.getActiveFeatures()
-        //console.log("initialized active features with", activeFeatures.value)
-        if (process.env.MODE !== 'bex') {
-            return
-        }
-        console.debug("initializing permissions Store")
-
-        if (chrome) { // issues in vitest where chrome is not defined
-            // @ts-ignore
-            permissions.value = await chrome.permissions.getAll()
-            if (permissions.value) {
-                grantedOptionalPermissions.value = permissions.value.permissions ? permissions.value.permissions : []
-                grantedOptionalOrigins.value = permissions.value.origins ? permissions.value.origins : []
-                console.log("initializing permissions Store done")
-            }
-        }
+    if (chrome) { // issues in vitest where chrome is not defined
+      // @ts-ignore
+      permissions.value = await chrome.permissions.getAll()
+      if (permissions.value) {
+        grantedOptionalPermissions.value = permissions.value.permissions ? permissions.value.permissions : []
+        grantedOptionalOrigins.value = permissions.value.origins ? permissions.value.origins : []
+      }
     }
+  }
 
-    const hasPermission = computed(() => {
-        return (permission: string): boolean | undefined => {
-            //console.log("query for permission", permission, grantedOptionalPermissions.value.indexOf(permission) >= 0)
-            return grantedOptionalPermissions.value ? grantedOptionalPermissions.value.indexOf(permission) >= 0 : undefined
-        }
-    })
-
-    const hasAllOrigins = computed(() => {
-        return (): boolean | undefined => {
-            return grantedOptionalOrigins.value ?
-                grantedOptionalOrigins.value.indexOf("*://*/*") >= 0
-                : undefined
-        }
-    })
-
-    async function grantPermission(permission: string): Promise<boolean> {
-        // @ts-ignore
-        const granted: boolean = await chrome.permissions.request({permissions: [permission]})
-        return load()
-            .then(() => Promise.resolve(granted))
+  const hasPermission = computed(() => {
+    return (permission: string): boolean | undefined => {
+      //console.log("query for permission", permission, grantedOptionalPermissions.value.indexOf(permission) >= 0)
+      return grantedOptionalPermissions.value ? grantedOptionalPermissions.value.indexOf(permission) >= 0 : undefined
     }
+  })
 
-    async function grantAllOrigins(): Promise<boolean> {
-        // @ts-ignore
-        const granted: boolean = await chrome.permissions.request({origins: ["*://*/*", "<all_urls>"]})
-        return load()
-            .then(() => Promise.resolve(granted))
+  const hasAllOrigins = computed(() => {
+    return (): boolean | undefined => {
+      return grantedOptionalOrigins.value ?
+        grantedOptionalOrigins.value.indexOf("*://*/*") >= 0
+        : undefined
     }
-
-    async function revokePermission(permission: string): Promise<void> {
+  })
+
+  async function grantPermission(permission: string): Promise<boolean> {
+    // @ts-ignore
+    const granted: boolean = await chrome.permissions.request({permissions: [permission]})
+    return load()
+      .then(() => Promise.resolve(granted))
+  }
+
+  async function grantAllOrigins(): Promise<boolean> {
+    // @ts-ignore
+    const granted: boolean = await chrome.permissions.request({origins: ["*://*/*", "<all_urls>"]})
+    return load()
+      .then(() => Promise.resolve(granted))
+  }
+
+  async function revokePermission(permission: string): Promise<void> {
+    // @ts-ignore
+    await chrome.permissions.remove({permissions: [permission]})
+    await load()
+    return Promise.resolve()
+  }
+
+  async function revokeAllOrigins(): Promise<void> {
+    // @ts-ignore
+    await chrome.permissions.remove({origins: ["*://*/*", "<all_urls>"]})
+    await load()
+    return Promise.resolve()
+  }
+
+  const hasFeature = computed(() => {
+    return (feature: FeatureIdent): boolean => {
+      if (feature === FeatureIdent.SIDE_PANEL) {
         // @ts-ignore
-        await chrome.permissions.remove({permissions: [permission]})
-        await load()
-        return Promise.resolve()
+        return chrome.sidePanel !== undefined
+      }
+      const appFeature = new AppFeatures().getFeature(feature)
+      if (appFeature) {
+        return activeFeatures.value.indexOf(feature.toLowerCase()) >= 0
+      }
+      return false
     }
-
-    async function revokeAllOrigins(): Promise<void> {
-        // @ts-ignore
-        await chrome.permissions.remove({origins: ["*://*/*", "<all_urls>"]})
-        await load()
-        return Promise.resolve()
-    }
-
-    const hasFeature = computed(() => {
-        return (feature: FeatureIdent): boolean => {
-            if (feature === FeatureIdent.SIDE_PANEL) {
-                // @ts-ignore
-                return chrome.sidePanel !== undefined
-            }
-            const appFeature = new AppFeatures().getFeature(feature)
-            if (appFeature) {
-                return activeFeatures.value.indexOf(feature.toLowerCase()) >= 0
-            }
-            return false
+  })
+
+  const featuresCount = computed(() => (): number =>
+    activeFeatures.value.length)
+
+  const activateFeature = computed(() => {
+    return (feature: string): void => {
+      if (activeFeatures.value.indexOf(feature) < 0) {
+        activeFeatures.value.push(feature)
+        storage.saveActiveFeatures(activeFeatures.value)
+
+        // if (FeatureIdent.NEWEST_TABS.toLowerCase() === feature) {
+        //     useSuggestionsStore().inactivateSuggestion(Suggestion.getStaticSuggestion(StaticSuggestionIdent.TRY_NEWEST_TABS_FEATURE))
+        // }
+        if (FeatureIdent.SPACES.toLowerCase() === feature) {
+          useSuggestionsStore().inactivateSuggestion(Suggestion.getStaticSuggestion(StaticSuggestionIdent.TRY_SPACES_FEATURE))
         }
-    })
-
-    const featuresCount = computed(() => (): number =>
-        activeFeatures.value.length)
-
-    const activateFeature = computed(() => {
-        return (feature: string): void => {
-            if (activeFeatures.value.indexOf(feature) < 0) {
-                activeFeatures.value.push(feature)
-                storage.saveActiveFeatures(activeFeatures.value)
-
-                // if (FeatureIdent.NEWEST_TABS.toLowerCase() === feature) {
-                //     useSuggestionsStore().inactivateSuggestion(Suggestion.getStaticSuggestion(StaticSuggestionIdent.TRY_NEWEST_TABS_FEATURE))
-                // }
-                if (FeatureIdent.SPACES.toLowerCase() === feature) {
-                    useSuggestionsStore().inactivateSuggestion(Suggestion.getStaticSuggestion(StaticSuggestionIdent.TRY_SPACES_FEATURE))
-                }
-                if (FeatureIdent.BACKUP.toLowerCase() === feature) {
-                    //useSuggestionsStore().removeSuggestion(StaticSuggestionIdent.TRY_TAB_DETAILS_FEATURE)
-                    useCommandExecutor().executeFromUi(new CreateSpecialTabsetCommand(SpecialTabsetIdent.BACKUP, TabsetType.SPECIAL))
-                }
-                if (FeatureIdent.HELP.toLowerCase() === feature) {
-                    useCommandExecutor().executeFromUi(new CreateSpecialTabsetCommand(SpecialTabsetIdent.HELP, TabsetType.SPECIAL))
-                } else if (FeatureIdent.IGNORE.toLowerCase() === feature) {
-                    //useSuggestionsStore().removeSuggestion(StaticSuggestionIdent.TRY_TAB_DETAILS_FEATURE)
-                    useCommandExecutor().executeFromUi(new CreateSpecialTabsetCommand(SpecialTabsetIdent.IGNORE, TabsetType.SPECIAL))
-                }
-                sendMsg('feature-activated', {feature: feature})
-            }
+        if (FeatureIdent.BACKUP.toLowerCase() === feature) {
+          //useSuggestionsStore().removeSuggestion(StaticSuggestionIdent.TRY_TAB_DETAILS_FEATURE)
+          useCommandExecutor().executeFromUi(new CreateSpecialTabsetCommand(SpecialTabsetIdent.BACKUP, TabsetType.SPECIAL))
         }
-    })
-
-    function deactivateRecursive(feature: string) {
-        console.log("deactivate recursive: ", feature)
-        const deactivatedIdent = feature.toUpperCase() as FeatureIdent
-        const appFeature = new AppFeatures().getFeature(deactivatedIdent)
-
-        //console.log("deactivating normal feature", feature)
-        const index = activeFeatures.value.indexOf(feature)
-        if (index >= 0) {
-            if (FeatureIdent.HELP.toLowerCase() === feature) {
-                useTabsetService().deleteTabset("HELP")
-                // Notify.create({
-                //     color: 'warning',
-                //     message: "The Help pages have been deleted"
-                // })
-            }
-            activeFeatures.value.splice(index, 1)
-            storage.saveActiveFeatures(activeFeatures.value)
-            sendMsg('feature-deactivated', {feature: feature})
-            new AppFeatures().getFeatures().forEach(f => {
-                if (f.requires.findIndex((r: FeatureIdent) => r === deactivatedIdent) >= 0) {
-                    console.log("need to deactivate as well:", f)
-                    deactivateRecursive(f.ident.toLowerCase())
-                }
-            })
-            //console.log("deactivated", feature, activeFeatures.value)
+        if (FeatureIdent.HELP.toLowerCase() === feature) {
+          useCommandExecutor().executeFromUi(new CreateSpecialTabsetCommand(SpecialTabsetIdent.HELP, TabsetType.SPECIAL))
+        } else if (FeatureIdent.IGNORE.toLowerCase() === feature) {
+          //useSuggestionsStore().removeSuggestion(StaticSuggestionIdent.TRY_TAB_DETAILS_FEATURE)
+          useCommandExecutor().executeFromUi(new CreateSpecialTabsetCommand(SpecialTabsetIdent.IGNORE, TabsetType.SPECIAL))
         }
-
+        sendMsg('feature-activated', {feature: feature})
+      }
     }
-
-    const deactivateFeature = computed(() => {
-        return (feature: string): void => {
-            //console.log("deactivating", feature)
-            deactivateRecursive(feature)
+  })
+
+  function deactivateRecursive(feature: string) {
+    console.log("deactivate recursive: ", feature)
+    const deactivatedIdent = feature.toUpperCase() as FeatureIdent
+    const appFeature = new AppFeatures().getFeature(deactivatedIdent)
+
+    //console.log("deactivating normal feature", feature)
+    const index = activeFeatures.value.indexOf(feature)
+    if (index >= 0) {
+      if (FeatureIdent.HELP.toLowerCase() === feature) {
+        useTabsetService().deleteTabset("HELP")
+        // Notify.create({
+        //     color: 'warning',
+        //     message: "The Help pages have been deleted"
+        // })
+      }
+      activeFeatures.value.splice(index, 1)
+      storage.saveActiveFeatures(activeFeatures.value)
+      sendMsg('feature-deactivated', {feature: feature})
+      new AppFeatures().getFeatures().forEach(f => {
+        if (f.requires.findIndex((r: FeatureIdent) => r === deactivatedIdent) >= 0) {
+          console.log("need to deactivate as well:", f)
+          deactivateRecursive(f.ident.toLowerCase())
         }
-    })
-
-    function addActivateFeature(feature: string): boolean {
-        if (activeFeatures.value.indexOf(feature) < 0) {
-            activeFeatures.value.push(feature)
-            return true
-        }
-        return false
+      })
+      //console.log("deactivated", feature, activeFeatures.value)
     }
 
-    function removeActivateFeature(feature: string) {
-        const index = activeFeatures.value.indexOf(feature)
-        if (index >= 0) {
-            activeFeatures.value.splice(index, 1)
-            return true
-        }
-        return false
+  }
+
+  const deactivateFeature = computed(() => {
+    return (feature: string): void => {
+      //console.log("deactivating", feature)
+      deactivateRecursive(feature)
     }
+  })
 
-    return {
-        initialize,
-        load,
-        hasPermission,
-        grantPermission,
-        revokePermission,
-        hasAllOrigins,
-        grantAllOrigins,
-        revokeAllOrigins,
-        permissions,
-        hasFeature,
-        activateFeature,
-        deactivateFeature,
-        featuresCount,
-        addActivateFeature,
-        removeActivateFeature
+  function addActivateFeature(feature: string): boolean {
+    if (activeFeatures.value.indexOf(feature) < 0) {
+      activeFeatures.value.push(feature)
+      return true
+    }
+    return false
+  }
+
+  function removeActivateFeature(feature: string) {
+    const index = activeFeatures.value.indexOf(feature)
+    if (index >= 0) {
+      activeFeatures.value.splice(index, 1)
+      return true
     }
+    return false
+  }
+
+  return {
+    initialize,
+    load,
+    hasPermission,
+    grantPermission,
+    revokePermission,
+    hasAllOrigins,
+    grantAllOrigins,
+    revokeAllOrigins,
+    permissions,
+    hasFeature,
+    activateFeature,
+    deactivateFeature,
+    featuresCount,
+    addActivateFeature,
+    removeActivateFeature
+  }
 })
diff --git a/src/stores/searchStore.ts b/src/stores/searchStore.ts
index 3534b773..17e5b3f9 100644
--- a/src/stores/searchStore.ts
+++ b/src/stores/searchStore.ts
@@ -66,14 +66,16 @@ export const useSearchStore = defineStore('search', () => {
   var urlSet: Set<string> = new Set()
 
   async function init() {
-    console.debug("(re-)initializing searchStore")
+    console.debug(" ...(re-)initializing searchStore")
     urlSet = new Set()
     searchIndex.value = Fuse.createIndex(options.value.keys, [])
     fuse.value = new Fuse([], options.value, searchIndex.value)
   }
 
+  // @ts-ignore
   function getIndex(): Fuse.FuseIndex<SearchDoc> {
-    return fuse.value.getIndex()
+    console.log("hier", fuse.value)
+    return fuse.value ? fuse.value.getIndex() : null
   }
 
   function search(term: string, limit: number | undefined = undefined) {
@@ -188,10 +190,10 @@ export const useSearchStore = defineStore('search', () => {
 
   async function populateFromTabsets() {
     // --- add data from tabs directly, like url and title
-    console.debug("populating search index from tabsets")
+    console.debug(" populating search index from tabsets")
     const minimalIndex: SearchDoc[] = []
     //const res = fuse.value.remove((doc) => true)
-    _.forEach([...useTabsStore().tabsets.values()], (tabset: Tabset) => {
+    _.forEach([...useTabsStore().tabsets.values()] as Tabset[], (tabset: Tabset) => {
         tabset.tabs.forEach((tab: Tab) => {
           if (tab.url) {
             if (urlSet.has(tab.url)) {
@@ -219,7 +221,7 @@ export const useSearchStore = defineStore('search', () => {
       }
     )
 
-    console.debug(`populating search index from tabsets with ${minimalIndex.length} entries`)
+    console.debug(` populating search index from tabsets with ${minimalIndex.length} entries`)
     minimalIndex.forEach((doc: SearchDoc) => {
       const removed = fuse.value.remove((d) => {
         return d.url === doc.url
@@ -236,7 +238,7 @@ export const useSearchStore = defineStore('search', () => {
   }
   async function populateFromBookmarks() {
     // --- add data from bookmarks directly, like url and title
-    console.debug("populating search index from bookmarks")
+    console.debug(" ...populating search index from bookmarks")
     const indexFromBookmarks: SearchDoc[] = []
     _.forEach(useBookmarksStore().bookmarksLeaves, (bookmark: any) => {
         if (bookmark && bookmark.url && !urlSet.has(bookmark.url)) {
@@ -246,7 +248,7 @@ export const useSearchStore = defineStore('search', () => {
         }
       }
     )
-    console.log(`populating search index from bookmarks with ${indexFromBookmarks.length} entries`)
+    console.log(` populating search index from bookmarks with ${indexFromBookmarks.length} entries`)
     indexFromBookmarks.forEach((doc: SearchDoc) => fuse.value.add(doc))
   }
 
@@ -256,7 +258,7 @@ export const useSearchStore = defineStore('search', () => {
    * @param contentPromise
    */
   async function populateFromContent(contentPromise: Promise<any[]>) {
-    console.debug("populating search index from content")
+    console.debug(" populating search index from content")
     // --- add data from stored content
     let count = 0
     let countFiltered = 0
@@ -283,7 +285,7 @@ export const useSearchStore = defineStore('search', () => {
         countFiltered++
       }
     })
-    console.debug(`populating search index from content with ${count} entries (${overwritten} of which overwritten), ${countFiltered} is/are filtered (not in any tab)`)
+    console.debug(` populating search index from content with ${count} entries (${overwritten} of which overwritten), ${countFiltered} is/are filtered (not in any tab)`)
     stats.value.set("content.count", count)
     stats.value.set("content.overwritten", overwritten)
     stats.value.set("content.filtered", countFiltered)
diff --git a/src/stores/settingsStore.ts b/src/stores/settingsStore.ts
index a0523abd..ecbd306b 100644
--- a/src/stores/settingsStore.ts
+++ b/src/stores/settingsStore.ts
@@ -33,7 +33,7 @@ export const useSettingsStore = defineStore('settings', () => {
   watch(thumbnailQuality, (val: Object) => localStorage.set("thumbnailQuality", val))
 
   function initialize(localStorage: any) {
-    console.debug("initializing settingsStore")
+    console.debug(" ...initializing settingsStore")
     const fts: string | undefined = localStorage.getItem("settings")
     if (fts) {
       activeToggles.value = _.map(fts.split(","), e => e.trim())
diff --git a/src/stores/spacesStore.ts b/src/stores/spacesStore.ts
index 23c35a17..97228f5d 100644
--- a/src/stores/spacesStore.ts
+++ b/src/stores/spacesStore.ts
@@ -43,7 +43,7 @@ export const useSpacesStore = defineStore('spaces', () => {
    * @param ps a persistence storage
    */
   async function initialize(ps: PersistenceService) {
-    console.debug("initializing spacesStore", ps)
+    console.debug(" ...initializing spacesStore", ps.getServiceName())
     storage = ps
     await storage.loadSpaces()
   }
diff --git a/src/stores/suggestionsStore.ts b/src/stores/suggestionsStore.ts
index 4536a2b9..5841ee5d 100644
--- a/src/stores/suggestionsStore.ts
+++ b/src/stores/suggestionsStore.ts
@@ -11,7 +11,7 @@ export const useSuggestionsStore = defineStore('suggestions', () => {
     const suggestions = ref<Suggestion[]>([])
 
     function init(providedDb: PersistenceService) {
-        console.debug("initializing SuggestionsService")
+        console.debug(" ...initializing SuggestionsService")
         storage = providedDb
         loadSuggestionsFromDb()
     }
diff --git a/src/stores/tabsStore.ts b/src/stores/tabsStore.ts
index faa4af0d..f687a97c 100644
--- a/src/stores/tabsStore.ts
+++ b/src/stores/tabsStore.ts
@@ -261,7 +261,7 @@ export const useTabsStore = defineStore('tabs', {
 
   actions: {
     async initialize(localStorage: LocalStorage) {
-      console.debug("initializing tabsStore", localStorage)
+      console.debug(" ...initializing tabsStore")
       this.localStorage = localStorage
 
       if ("bex" === process.env.MODE) {
diff --git a/src/stores/uiStore.ts b/src/stores/uiStore.ts
index 4dca7650..743bd4be 100644
--- a/src/stores/uiStore.ts
+++ b/src/stores/uiStore.ts
@@ -148,6 +148,8 @@ export const useUiStore = defineStore('ui', () => {
   const tabsFilter = ref<string | undefined>(undefined)
   const selectedTag = ref<string | undefined>(undefined)
   const tabsetsExpanded = ref<boolean>(false)
+  const appLoading = ref(false)
+  //const windowsChanged =ref<object | undefined>(undefined)
 
   // online offline
   const networkOnline = ref(navigator.onLine)
@@ -331,7 +333,7 @@ export const useUiStore = defineStore('ui', () => {
   function showTabsetDescription(tabsetId: string): boolean {
     // @ts-ignore
     const res = tabsetDescriptionPanelHights.value[tabsetId as keyof object]['show'] as boolean | undefined
-    console.log("got res", res)
+    //console.log("got res", res)
     if (res === undefined) {
       return true
     }
@@ -589,6 +591,7 @@ export const useUiStore = defineStore('ui', () => {
     sharingMqttUrl,
     networkOnline,
     mqttOffline,
-    tabBeingDragged
+    tabBeingDragged,
+    appLoading
   }
 })
diff --git a/src/stores/windowsStore.ts b/src/stores/windowsStore.ts
index 3af31f09..b71902ac 100644
--- a/src/stores/windowsStore.ts
+++ b/src/stores/windowsStore.ts
@@ -25,25 +25,14 @@ function closeTabWithTimeout(timeout: number, tabToCloseId: number | undefined =
   });
 }
 
-class WindowHolder {
-  constructor(
-    public index: number,
-    public cw: chrome.windows.Window,
-    public windowFromStore: Window | undefined) {
-  }
-}
-
-function getSortedWindows(windowForId: (id: number) => (Window | undefined)) {
-  const theWindows: WindowHolder[] = _.sortBy(_.map(useWindowsStore().currentWindows as chrome.windows.Window[], (cw: chrome.windows.Window) => {
-    const windowFromStore: Window | undefined = windowForId(cw.id || -1)
-    return new WindowHolder(windowFromStore?.index || 0, cw, windowFromStore)
-  }), "index")
-  return theWindows;
-}
-
 export const useWindowsStore = defineStore('windows', () => {
 
-  const {inBexMode} = useUtils()
+  const {inBexMode, sendMsg, calcHostList} = useUtils()
+
+  const onCreatedListener = () => setup("onCreated")
+  const onRemovedListener = (windowId: number) => onRemoved(windowId)
+  const onBoundsChangedListener = (window: chrome.windows.Window) => onUpdate(window.id || 0)
+  const onFocusChangedListener = (windowId:number) => { /** noop */ }
 
   /**
    * the map of all 'ever used' Chrome windows, even if they are not currently in use,
@@ -59,14 +48,14 @@ export const useWindowsStore = defineStore('windows', () => {
    *
    * Initialized at start (from chrome.windows.getAll) and on "onCreated" and "onRemoved" events.
    */
-  const currentWindows = ref<chrome.windows.Window[]>([])
+  const currentChromeWindows = ref<chrome.windows.Window[]>([])
 
   /**
    * the result of 'chrome.windows.getCurrent'
    *
    * Initialized at start and on "onCreated" and "onRemoved" events.
    */
-  const currentWindow = ref<chrome.windows.Window>(null as unknown as chrome.windows.Window) //null as unknown as chrome.windows.Window
+  const currentChromeWindow = ref<chrome.windows.Window>(null as unknown as chrome.windows.Window) //null as unknown as chrome.windows.Window
 
   /**
    * updated from 'allWindows' data when currentWindows is set.
@@ -87,101 +76,103 @@ export const useWindowsStore = defineStore('windows', () => {
    * @param providedDb a persistence storage
    */
   async function initialize(providedDb: PersistenceService) {
-    console.log("initializing windowsStore")
+    console.debug(" ...initializing windowsStore")
     storage = providedDb
-    setup("initialization")
+    await setup("initialization")
   }
 
-  function setup(trigger: string = "") {
+  async function setup(trigger: string = "", keepWindowsFromStorage = false) {
     if (!inBexMode()) {
       return
     }
-    console.debug("init chrome windows listeners with trigger", trigger)
-    chrome.windows.getAll({populate: true}, (windows) => {
+    console.debug(" init chrome windows listeners with trigger", trigger)
+    const browserWindows: chrome.windows.Window[] = await chrome.windows.getAll({populate: true})
 
-      currentWindows.value = windows
-      console.debug("initializing current windows with", currentWindows.value.length)
+    currentChromeWindows.value = browserWindows
+    console.debug(` initializing current chrome windows with ${currentChromeWindows.value.length} window(s)`)
 
+    if (!keepWindowsFromStorage) {
       // adding potentially new windows to storage
-      const res: Promise<any>[] = windows.flatMap((window: chrome.windows.Window) => {
-        return storage.addWindow(new Window(window.id || 0, window, undefined))
-      })
+      for (const browserWindow of browserWindows) {
+        const hostList = calcHostList(browserWindow.tabs || [])
+        const newWindow = new Window(browserWindow.id || 0, browserWindow, undefined, 0, false, hostList)
+        await storage.addWindow(newWindow)
+      }
+    }
 
-      // setting all (new and older) windows to 'allWindows'
-      Promise.all(res)
-        .then(() => {
-          allWindows.value = new Map()
-          let index = 0
-          //const usedIndices: number[] = []
-
-          storage.getWindows().then(storedWindows => {
-            const sortedStoredWindows = _.sortBy(storedWindows, "index")
-
-            sortedStoredWindows.forEach(tabsetWindowFromStorage => {
-
-              // index handling
-              const indexFromDb = tabsetWindowFromStorage.index
-              const indicesDiffer = indexFromDb !== index
-              let indexToUse = index++
-
-              if (indicesDiffer) {
-                updateWindowIndex(tabsetWindowFromStorage.id, indexToUse)
-                  .then(() => console.log("done with updating window", tabsetWindowFromStorage.id, indexToUse))
-                  .catch((err) => console.error("error when updating window", tabsetWindowFromStorage.id, indexToUse, err))
-              }
-              tabsetWindowFromStorage.index = indexToUse
-              //usedIndices.push(indexToUse)
-              allWindows.value.set(tabsetWindowFromStorage.id || 0, tabsetWindowFromStorage)
-
-              const inCurrentWindows = windows.find(w => w.id === tabsetWindowFromStorage.id) !== undefined
-
-              //console.debug(`assigned window #${tabsetWindowFromStorage.id} (name: ${tabsetWindowFromStorage.title}): ${indexFromDb} -> ${tabsetWindowFromStorage.index}, open: ${inCurrentWindows}`)
-            })
-            for (const id of allWindows.value.keys()) {
-              const w = allWindows.value.get(id)
-              if (w && w.title) {
-                //console.log("checking", w, )
-                windowSet.value.add(w.title)
-              }
-            }
-            //console.log("%callWindows assigned", "color:green", allWindows.value, windowSet.value)
-
-            chrome.windows.getCurrent({windowTypes: ['normal']}, (window: chrome.windows.Window) => {
-              currentWindow.value = window
-              if (currentWindow.value && currentWindow.value.id) {
-                //console.log("%c******", "color:blue", currentWindow.value.id, windowNameFor(currentWindow.value.id))
-                currentWindowName.value = windowNameFor(currentWindow.value.id)
-              }
-            })
-
-            // add context menus for moving to other window
-            if (chrome && chrome.contextMenus) {
-              chrome.windows.getCurrent().then(currentWindow => {
-                for (const window of currentWindows.value) {
-                  //console.log("da!!!",window,useWindowsStore().windowNameFor(window.id))
-                  // TODO this is always the "default" window
-                  if (currentWindow.id !== window.id) {
-                    chrome.contextMenus.create({
-                      id: 'move_to|' + window.id,
-                      parentId: 'move_to_window',
-                      title: '...to window ' + useWindowsStore().windowNameFor(window.id || 0) || window.id?.toString(),
-                      contexts: ['all']
-                    })
-                  }
-                }
-              })
-            }
-          })
+    // setting all (new and older) windows to 'allWindows':
+    //await Promise.all(res)
+    allWindows.value = new Map()
+    let index = 0
 
-        })
+    const storedWindows: Window[] = await storage.getWindows()
+
+    const sortedStoredWindows = _.sortBy(storedWindows, "index")
+    //sortedStoredWindows.forEach(tabsetWindowFromStorage => {
+    for (const tabsetWindowFromStorage of sortedStoredWindows) {
+
+      // index handling
+      const indexFromDb = tabsetWindowFromStorage.index
+      const indicesDiffer = indexFromDb !== index
+      let indexToUse = index++
+
+      if (indicesDiffer) {
+        try {
+          await updateWindowIndex(tabsetWindowFromStorage.id, indexToUse)
+        }
+          //.then(() => console.log("done with updating window", tabsetWindowFromStorage.id, indexToUse))
+        catch (err) {
+          console.error("error when updating window", tabsetWindowFromStorage.id, indexToUse, err)
+        }
+        tabsetWindowFromStorage.index = indexToUse
+        allWindows.value.set(tabsetWindowFromStorage.id || 0, tabsetWindowFromStorage)
+
+        // const inCurrentWindows = browserWindows.find(w => w.id === tabsetWindowFromStorage.id) !== undefined
+        // console.debug(`assigned window #${tabsetWindowFromStorage.id} (name: ${tabsetWindowFromStorage.title}): ${indexFromDb} -> ${tabsetWindowFromStorage.index}, open: ${inCurrentWindows}`)
+      } else {
+        allWindows.value.set(tabsetWindowFromStorage.id || 0, tabsetWindowFromStorage)
+      }
+      //console.log("allwindows set to ", allWindows.value)
+    }
+    for (const id of allWindows.value.keys()) {
+      const w = allWindows.value.get(id)
+      if (w && w.title) {
+        windowSet.value.add(w.title)
+      }
+    }
+    //console.log("%callWindows assigned", "color:green", allWindows.value, windowSet.value)
+
+    chrome.windows.getCurrent({windowTypes: ['normal']}, (window: chrome.windows.Window) => {
+      currentChromeWindow.value = window
+      if (currentChromeWindow.value && currentChromeWindow.value.id) {
+        //console.log("%c******", "color:blue", currentWindow.value.id, windowNameFor(currentWindow.value.id))
+        currentWindowName.value = windowNameFor(currentChromeWindow.value.id)
+      }
     })
 
+    // add context menus for moving to other window
+    if (chrome && chrome.contextMenus) {
+      //chrome.windows.getCurrent().then(currentWindow => {
+      const currentWindow: chrome.windows.Window = await chrome.windows.getCurrent()//.then(currentWindow => {
+      for (const window of currentChromeWindows.value) {
+        //console.log("da!!!",window,useWindowsStore().windowNameFor(window.id))
+        // TODO this is always the "default" window
+        if (currentWindow.id !== window.id) {
+          chrome.contextMenus.create({
+            id: 'move_to|' + window.id,
+            parentId: 'move_to_window',
+            title: '...to window ' + useWindowsStore().windowNameFor(window.id || 0) || window.id?.toString(),
+            contexts: ['all']
+          })
+        }
+      }
+    }
   }
 
   async function onRemoved(windowId: number) {
     // remove only if window does not have a title
     const w = await storage.getWindow(windowId)
-    console.debug("on removed", w, windowId)
+    //console.debug("on removed", w, windowId)
     if (w && !w.title) {
       await removeWindow(windowId)
     }
@@ -189,37 +180,50 @@ export const useWindowsStore = defineStore('windows', () => {
   }
 
   /**
-   * we've only listening to onFocusChanged or onBoundsChanged (of active windows),
+   * we've only listening onBoundsChanged (of active windows),
    * so title and index should not change!
    * @param windowId
    */
   async function onUpdate(windowId: number) {
     if (windowId >= 0) {
-      const windowFromDb = windowForId(windowId)
-      console.debug(`updating window #${windowId}: title='${windowFromDb?.title}', index=${windowFromDb?.index}`, windowId, windowFromDb)
+      const windowFromDb: Window | undefined = windowForId(windowId)
       if (windowFromDb) {
-        const chromeWindow = await chrome.windows.get(windowId)
-        await storage.updateWindow(new Window(windowId, chromeWindow, windowFromDb.title, windowFromDb.index))
+        console.debug(`updating window #${windowId}: title='${windowFromDb?.title}', index=${windowFromDb?.index}`)
+        const chromeWindow = await chrome.windows.get(windowId, {populate: true})
+        const hostList = calcHostList(chromeWindow.tabs || [])
+        const newWindow = new Window(windowId, chromeWindow, windowFromDb.title, windowFromDb.index, windowFromDb.open, hostList)
+        console.log("updated to ", newWindow.toString())
+        await storage.updateWindow(newWindow)
         refreshCurrentWindows()
+      } else {
+        console.log(`could not update window #${windowId}`)
       }
     }
   }
 
   function initListeners() {
     if (inBexMode()) {
-      chrome.windows.onCreated.addListener(() => setup("onCreated"))
-      chrome.windows.onRemoved.addListener((windowId: number) => onRemoved(windowId))
-      chrome.windows.onFocusChanged.addListener((windowId) => onUpdate(windowId))
-      chrome.windows.onBoundsChanged.addListener((window: chrome.windows.Window) => onUpdate(window.id || 0))
+      console.debug (" ...initializing windowsStore Listeners")
+      chrome.windows.onCreated.addListener(onCreatedListener)
+      chrome.windows.onRemoved.addListener(onRemovedListener)
+      chrome.windows.onFocusChanged.addListener(onFocusChangedListener)
+      chrome.windows.onBoundsChanged.addListener(onBoundsChangedListener)
     }
   }
 
+  async function resetListeners() {
+    chrome.windows.onCreated.removeListener(onCreatedListener)
+    chrome.windows.onRemoved.removeListener(onRemovedListener)
+    chrome.windows.onFocusChanged.removeListener(onFocusChangedListener)
+    chrome.windows.onBoundsChanged.removeListener(onBoundsChangedListener)
+  }
+
   function windowForId(id: number): Window | undefined {
     return allWindows.value.get(id)
   }
 
   function currentWindowForId(id: number): chrome.windows.Window | undefined {
-    return currentWindows.value.find(i => i.id === id)
+    return currentChromeWindows.value.find(i => i.id === id)
   }
 
   function windowNameFor(id: number) {
@@ -243,7 +247,7 @@ export const useWindowsStore = defineStore('windows', () => {
       // console.log("windowFor2", potentialWindowId)
       if (potentialWindowId) {
         try {
-          return await chrome.windows.get(potentialWindowId)
+          return await chrome.windows.get(potentialWindowId, {populate: true})
         } catch (err) {
           return Promise.resolve(undefined)
         }
@@ -269,12 +273,19 @@ export const useWindowsStore = defineStore('windows', () => {
   }
 
   async function upsertWindow(window: chrome.windows.Window, title: string | undefined, index: number = 0) {
-    console.log("upserting window", window.id, title, index)
-    const tabsetsWindow = new Window(window.id || 0, window, title, index)
+    const hostList = calcHostList(window.tabs || [])
+    console.log(`upserting window: id=${window.id}, title=${title}, index=${index}, open=default(false), #hostList=${hostList.length}`)
+    const tabsetsWindow = new Window(window.id || 0, window, title, index, false, hostList)
     if (window.id) {
       allWindows.value.set(window.id, tabsetsWindow)
     }
     await storage.upsertWindow(tabsetsWindow)
+    sendMsg('window-updated', {initiated: "WindowsStore#upsertWindow"})
+  }
+
+  async function upsertTabsetWindow(window: Window) {
+    console.debug(`upserting window: id=${window.id}, title=${window.title}, index=${window.index}, open=${window.open}, #hostList=${window.hostList.length}`)
+    await storage.upsertWindow(window)
   }
 
   async function removeWindow(windowId: number) {
@@ -333,9 +344,9 @@ export const useWindowsStore = defineStore('windows', () => {
   }
 
   function refreshCurrentWindows() {
-    console.log("refreshCurrentWindows")
+    console.debug("refreshCurrentWindows")
     chrome.windows.getAll({populate: true}, (windows) => {
-      currentWindows.value = windows
+      currentChromeWindows.value = windows
     })
   }
 
@@ -349,18 +360,35 @@ export const useWindowsStore = defineStore('windows', () => {
           allWindow.index = indexToUse
         }
         return storage.updateWindow(w)
+          //.then(() => sendMsg('window-updated', {initiated: "WindowsStore#updateWindowIndex"}))
       } else {
         return Promise.reject("window for #" + windowId + " not found")
       }
     })
+  }
+
+  async function refreshTabsetWindow(windowId: number) {
+    try {
+      console.log("refreshing tabset window", windowId)
+      const tabsetWindow = await storage.getWindow(windowId)
+      const chromeWindow = await chrome.windows.get(windowId, {populate: true})
+      if (tabsetWindow && chromeWindow) {
+        tabsetWindow.hostList = calcHostList(chromeWindow.tabs || [])
+        await storage.updateWindow(tabsetWindow)
+      }
+    } catch (err) {
+      console.error("got error", err)
+    }
 
   }
 
   return {
     initialize,
     initListeners,
-    currentWindows,
-    currentWindow,
+    resetListeners,
+    setup,
+    currentChromeWindows,
+    currentChromeWindow,
     currentWindowName,
     windowFor,
     windowNameFor,
@@ -374,7 +402,10 @@ export const useWindowsStore = defineStore('windows', () => {
     removeWindowByTitle,
     refreshCurrentWindows,
     windowForId,
+    updateWindowIndex,
+    allWindows,
+    upsertTabsetWindow,
     currentWindowForId,
-    updateWindowIndex
+    refreshTabsetWindow
   }
 })
diff --git a/test/vitest/__tests__/components/SidePanelFooter.test.ts b/test/vitest/__tests__/components/SidePanelFooter.test.ts
new file mode 100644
index 00000000..802b1fc7
--- /dev/null
+++ b/test/vitest/__tests__/components/SidePanelFooter.test.ts
@@ -0,0 +1,164 @@
+import {installQuasarPlugin} from '@quasar/quasar-app-extension-testing-unit-vitest';
+import {DOMWrapper, mount, shallowMount, VueWrapper} from '@vue/test-utils';
+import {afterEach, beforeAll, beforeEach, describe, expect, it, vi} from 'vitest';
+import {createPinia, setActivePinia} from "pinia";
+import SidePanelFooter from "components/SidePanelFooter.vue";
+import ChromeApi from "src/services/ChromeApi";
+import PersistenceService from "src/services/PersistenceService";
+import {useDB} from "src/services/usePersistenceService";
+import {useQuasar} from "quasar";
+import IndexedDbPersistenceService from "src/services/IndexedDbPersistenceService";
+import {useTabsetService} from "src/services/TabsetService2";
+import {useWindowsStore} from "stores/windowsStore";
+
+installQuasarPlugin();
+
+async function setupStores(db: PersistenceService) {
+  await useWindowsStore().initialize(db)
+  useWindowsStore().initListeners()
+}
+
+describe('SidePanelFooter', () => {
+
+  const skysailChromeTab = ChromeApi.createChromeTabObject(
+    "title", "https://www.skysail.io/some-subpage", "favicon")
+
+  let db = null as unknown as PersistenceService
+  let wrapper: VueWrapper<any, any> = null as unknown as VueWrapper
+  let manageWindowsButton: DOMWrapper<Element> = null as unknown as DOMWrapper<Element>
+
+  const tab1 = ChromeApi.createChromeTabObject("skysail", "https://www.skysail.io")
+  const window100: chrome.windows.Window = ChromeApi.createChromeWindowObject(100, 17, 28, [tab1])
+
+  let currentWindows: any[]
+
+  beforeAll(() => {
+    // https://vitest.dev/guide/browser.html
+    // @ts-ignore - needed as 'chrome' is undefined in vitest
+    global.chrome = undefined
+    // global.browser = browser
+    db = useDB(useQuasar()).localDb
+  })
+
+  beforeEach(async () => {
+    setActivePinia(createPinia())
+    await IndexedDbPersistenceService.init("db")
+    db = useDB(undefined).db
+    // await usePermissionsStore().initialize(new LocalStoragePersistenceService(useQuasar()))
+    await useTabsetService().init(db)
+
+    const chromeMock = {
+      commands: {
+        onCommand: {
+          addListener: vi.fn(() => {
+            return [];
+          }),
+        }
+      },
+      tabs: {
+        query: vi.fn(() => {
+        }),
+        onCreated: {
+          addListener: vi.fn((tab: chrome.tabs.Tab) => {
+            console.log("mocking chrome.windows.onCreated.addListener", tab)
+          })
+        },
+        onUpdated: {
+          addListener: vi.fn((tabId: number, updateInfo: chrome.tabs.TabChangeInfo) => {
+            console.log("mocking chrome.windows.onUpdated.addListener", tabId)
+          })
+        },
+        onRemoved: {
+          addListener: vi.fn((tabId: number, removeInfo: chrome.tabs.TabRemoveInfo) => {
+            console.log("mocking chrome.windows.onRemoved.addListener", tabId)
+          })
+        }
+      },
+      runtime: {
+        sendMessage: vi.fn(() => {
+        }),
+        onMessage: {
+          addListener: vi.fn((message: any, sender: chrome.runtime.MessageSender, sendResponse: any) => {
+            console.log("mocking chrome.windows.onCreated.addListener", message)
+            //onCreatedListener = listener
+            return true
+          })
+        }
+      },
+      windows: {
+        getAll: vi.fn((options, callback) => {
+          console.log("mocking chrome.windows.getAll", currentWindows.length)
+          //callback(currentWindows);
+          return Promise.resolve(currentWindows)
+        }),
+        getCurrent: vi.fn((options, callback) => {
+          //console.log("mocking chrome.windows.getCurrent")
+          callback(window100)
+        }),
+        onCreated: {
+          addListener: vi.fn((listener) => {
+            //console.log("mocking chrome.windows.onCreated.addListener", listener)
+            //onCreatedListener = listener
+          })
+        },
+        onRemoved: {
+          addListener: vi.fn((listener) => {
+            //console.log("mocking chrome.windows.onRemoved.addListener", listener)
+            // onRemovedListener = listener
+          })
+        },
+        onFocusChanged: {
+          addListener: vi.fn((listener) => {
+            console.log("mocking chrome.windows.onFocusChanged.addListener", listener)
+            //onFocusChangedListener = listener
+          })
+        },
+        onBoundsChanged: {
+          addListener: vi.fn((listener) => {
+            //console.log("mocking chrome.windows.onBoundsChanged.addListener", listener)
+            //callback(undefined)
+          })
+        }
+      }
+    };
+
+    vi.stubGlobal('chrome', chromeMock);
+
+    wrapper = mount(SidePanelFooter);
+
+    manageWindowsButton = wrapper.find('[data-testid=buttonManageWindows]')
+
+  })
+
+  afterEach(async () => {
+    db.clear("tabsets")
+    db.clear("windows")
+  })
+
+  it('should be mounted', async () => {
+    expect(wrapper.text()).toContain("grid_viewlogin");
+    expect(wrapper.text()).not.toContain("Open Window");
+  });
+
+  it('should show window markup table when window management button is clicked', async () => {
+    currentWindows = [window100]
+    await setupStores(db)
+
+    await manageWindowsButton.trigger('click')
+
+    expect(wrapper.text()).toContain("Open Window");
+    const cellWithNameForWindowId100 = wrapper.find('[data-testid=windowDataColumn_name_100]')
+    expect(cellWithNameForWindowId100.text()).toBe("100")
+    const cellWithTabsCountForWindowId100 = wrapper.find('[data-testid=windowDataColumn_tabsCount_100]')
+    expect(cellWithTabsCountForWindowId100.text()).toBe("1")
+
+    const windows = await db.getWindows()
+    console.log("windows", windows)
+    expect(windows.length).toBe(1)
+    expect(windows[0].id).toBe(100)
+    expect(windows[0].index).toBe(0)
+    expect(windows[0].open).toBe(true)
+    expect(windows[0].hostList).toStrictEqual(['www.skysail.io'])
+  });
+
+})
diff --git a/test/vitest/__tests__/domain/groups/DeleteChromeGroupCommand.test.ts b/test/vitest/__tests__/domain/groups/DeleteChromeGroupCommand.test.ts
index 1fb80fd3..0939da3a 100644
--- a/test/vitest/__tests__/domain/groups/DeleteChromeGroupCommand.test.ts
+++ b/test/vitest/__tests__/domain/groups/DeleteChromeGroupCommand.test.ts
@@ -2,10 +2,7 @@ import {installQuasarPlugin} from '@quasar/quasar-app-extension-testing-unit-vit
 import {afterEach, beforeEach, describe, expect, it, vi} from 'vitest';
 import {createPinia, setActivePinia} from "pinia";
 import IndexedDbPersistenceService from "src/services/IndexedDbPersistenceService";
-import {AddTabToTabsetCommand} from "src/domain/tabs/AddTabToTabset";
-import {CreateTabsetCommand} from "src/domain/tabsets/CreateTabset";
 import {useDB} from "src/services/usePersistenceService";
-import {useTabsStore} from "stores/tabsStore";
 import PersistenceService from "src/services/PersistenceService";
 import {useTabsetService} from "src/services/TabsetService2";
 import {DeleteChromeGroupCommand} from "src/domain/groups/DeleteChromeGroupCommand";
diff --git a/test/vitest/__tests__/stores/windowsStore.test.ts b/test/vitest/__tests__/stores/windowsStore.test.ts
index 6cc48f97..b38ce8db 100644
--- a/test/vitest/__tests__/stores/windowsStore.test.ts
+++ b/test/vitest/__tests__/stores/windowsStore.test.ts
@@ -12,156 +12,242 @@ installQuasarPlugin();
 
 vi.mock('vue-router')
 
-describe('WindowsStore', () => {
-
-    let db = null as unknown as PersistenceService
-
-    let onCreatedListener = null as unknown as ((window: chrome.windows.Window) => Promise<void>)
-    let onRemovedListener = null as unknown as ((windowId: number) => Promise<void>)
-    let onFocusChangedListener = null as unknown as ((windowId: number) => Promise<void>)
-
-    beforeEach(async () => {
-        setActivePinia(createPinia())
-        await IndexedDbPersistenceService.init("db")
-        db = useDB(undefined).db
-        await useTabsetService().init(db)
-
-        const window100 = ChromeApi.createChromeWindowObject(100,17,28)
-        const currentWindows = [
-            window100
-        ]
-        // https://groups.google.com/a/chromium.org/g/chromium-extensions/c/hssoAlvluW8
-        const chromeMock = {
-            windows: {
-                getAll: vi.fn((callback) => {
-                    console.log("mocking chrome.windows.getAll")
-                    callback(currentWindows);
-                }),
-                getCurrent: vi.fn((options, callback) => {
-                    console.log("mocking chrome.windows.getCurrent")
-                    callback(window100)
-                }),
-                getLastFocused: vi.fn((options, callback) => {
-                    console.log("mocking chrome.windows.getLastFocused")
-                    callback(window100)
-                }),
-                get: vi.fn((windowId, queryOptions, callback) => {
-                    console.log("mocking chrome.windows.get", windowId, queryOptions)
-                    window100.left = 33
-                    return window100
-                }),
-                onCreated: {
-                    addListener: vi.fn((listener) => {
-                        console.log("mocking chrome.windows.onCreated.addListener", listener)
-                        onCreatedListener = listener
-                    })
-                },
-                onRemoved: {
-                    addListener: vi.fn((listener) => {
-                        console.log("mocking chrome.windows.onRemoved.addListener", listener)
-                        onRemovedListener = listener
-                    })
-                },
-                onFocusChanged: {
-                    addListener: vi.fn((listener) => {
-                        console.log("mocking chrome.windows.onFocusChanged.addListener", listener)
-                        onFocusChangedListener = listener
-                    })
-                },
-                onBoundsChanged: {
-                    addListener: vi.fn((listener) => {
-                        console.log("mocking chrome.windows.onBoundsChanged.addListener", listener)
-                        //callback(undefined)
-                    })
-                }
-            },
-            runtime: {
-                sendMessage: vi.fn(() => {})
-            }
-        };
-
-        vi.stubGlobal('chrome', chromeMock);
-
-        await useWindowsStore().initialize(db)
-        useWindowsStore().initListeners()
-
-    })
-
-    afterEach(async() => {
-        db.clear("tabsets")
-        db.clear("windows")
-    })
-
-    it('initializes correctly', async () => {
-        const windows = await  db.getWindows()
-        expect(windows.length).toBe(1)
-        expect(windows[0].id).toBe(100)
-
-        const window = await db.getWindow(100)
-        expect(window?.id).toBe(100)
-
-        expect(useWindowsStore().currentWindow.id).toBe(100)
-    })
-
-    it('upsertWindow saves new title', async () => {
-        const window = await db.getWindow(100)
-        if (window) {
-            await useWindowsStore().upsertWindow(window.browserWindow, "theTitle")
-            const updatedWindow = await db.getWindow(100)
-            expect(updatedWindow?.title).toBe("theTitle")
-        } else {
-            expect(true).toBeFalsy()
-        }
-    })
-
-    // it('onRemoved removes window without title', async () => {
-    //     await onRemovedListener(100)
-    //     const window100FromDb = await db.getWindow(100)
-    //     expect(window100FromDb).toBe(undefined)
-    // })
-
-    it('onRemoved does not remove window with title', async () => {
-        const window = await db.getWindow(100)
-        if (window) {
-            await useWindowsStore().upsertWindow(window.browserWindow, "theTitle")
-            await onRemovedListener(100)
-            const window100FromDb = await db.getWindow(100)
-            expect(window100FromDb?.id).toBe(100)
-        } else {
-            expect(true).toBeFalsy()
-        }
-    })
-
-    it('onFocusChanged updates browserWindow', async () => {
-        await onFocusChangedListener(100)
-        const window100FromDb = await db.getWindow(100)
-        // 33 is a 'magic number' assigned
-        expect(window100FromDb?.browserWindow.left).toBe(33)
-    })
-
-    it('onCreate', async () => {
-
-        const window: chrome.windows.Window = ChromeApi.createChromeWindowObject(1000, 0,0)
-        //onCreatedListener(window)
-        // await useWindowsStore().persistGroup(ChromeApi.createChromeTabGroupObject(1, "groupName", 'grey' as chrome.tabGroups.ColorEnum))
-
-        //const groups = await  db.getGroups()
-        // expect(groups.length).toBe(1)
-    })
-
-    // it('persists group with changing title', async () => {
-    //     await useGroupsStore().initialize(db)
-    //     await useGroupsStore().persistGroup(ChromeApi.createChromeTabGroupObject(1, "ab", 'grey' as chrome.tabGroups.ColorEnum))
-    //     await useGroupsStore().persistGroup(ChromeApi.createChromeTabGroupObject(1, "abc", 'grey' as chrome.tabGroups.ColorEnum))
-    //
-    //     const groups = await  db.getGroups()
-    //     expect(groups.length).toBe(1)
-    //     expect(groups[0].title).toBe("abc")
-    // })
-
-
+let onCreatedListener = null as unknown as ((window: chrome.windows.Window) => Promise<void>)
+let onRemovedListener = null as unknown as ((windowId: number) => Promise<void>)
+let onFocusChangedListener = null as unknown as ((windowId: number) => Promise<void>)
+
+let currentWindows: any[]
+
+async function setupMocks(currentWindow: any) {
+  //console.log("setupMocks with current windows", currentWindows)
+  // https://groups.google.com/a/chromium.org/g/chromium-extensions/c/hssoAlvluW8
+  const chromeMock = {
+    windows: {
+      getAll: vi.fn((options, callback) => {
+        console.log("mocking chrome.windows.getAll", currentWindows.length)
+        //callback(currentWindows);
+        return Promise.resolve(currentWindows)
+      }),
+      getCurrent: vi.fn((options, callback) => {
+        //console.log("mocking chrome.windows.getCurrent")
+        callback(currentWindow)
+      }),
+      getLastFocused: vi.fn((options, callback) => {
+        //console.log("mocking chrome.windows.getLastFocused")
+        callback(currentWindow)
+      }),
+      get: vi.fn((windowId, queryOptions, callback) => {
+        console.log("mocking chrome.windows.get", windowId, queryOptions)
+        currentWindow.left = 33
+        return currentWindow
+      }),
+      onCreated: {
+        addListener: vi.fn((listener) => {
+          onCreatedListener = listener
+        })
+      },
+      onRemoved: {
+        addListener: vi.fn((listener) => {
+          onRemovedListener = listener
+        })
+      },
+      onFocusChanged: {
+        addListener: vi.fn((listener) => {
+          console.log("mocking chrome.windows.onFocusChanged.addListener", listener)
+          onFocusChangedListener = listener
+        })
+      },
+      onBoundsChanged: {
+        addListener: vi.fn((listener) => {
+        })
+      }
+    },
+    runtime: {
+      sendMessage: vi.fn(() => {
+      })
+    }
+  };
+
+  vi.stubGlobal('chrome', chromeMock);
+}
+
+async function setupStores(db: PersistenceService) {
+  await useWindowsStore().initialize(db)
+  useWindowsStore().initListeners()
+}
 
+describe('WindowsStore', () => {
 
+  let db = null as unknown as PersistenceService
+
+  const tab1 = ChromeApi.createChromeTabObject("skysail", "https://www.skysail.io")
+  const tab2 = ChromeApi.createChromeTabObject("tabsets", "https://www.tabsets.net")
+
+  const window100: chrome.windows.Window = ChromeApi.createChromeWindowObject(100, 17, 28, [tab1, tab2])
+  const window200: chrome.windows.Window = ChromeApi.createChromeWindowObject(200, 17, 28, [tab2])
+
+  //const currentWindows = [window100, window200]
+
+  beforeEach(async () => {
+    setActivePinia(createPinia())
+    await IndexedDbPersistenceService.init("db")
+    db = useDB(undefined).db
+    await useTabsetService().init(db)
+  })
+
+  afterEach(async () => {
+    db.clear("tabsets")
+    db.clear("windows")
+  })
+
+  it('initializing correctly with multiple windows and indices differing', async () => {
+
+    currentWindows = [window100, window200]
+    await setupMocks(window100)
+    await setupStores(db)
+
+    const windows = await db.getWindows()
+    expect(windows.length).toBe(2)
+    expect(windows[0].id).toBe(100)
+    expect(windows[1].id).toBe(200)
+
+    const window = await db.getWindow(100)
+    expect(window?.id).toBe(100)
+    expect(window?.index).toBe(0)
+    expect(window?.hostList).toStrictEqual(['www.skysail.io', 'www.tabsets.net'])
+    expect(useWindowsStore().currentChromeWindow.id).toBe(100)
+
+    const w200 = await db.getWindow(200)
+    expect(w200?.id).toBe(200)
+    expect(w200?.index).toBe(1)
+    expect(w200?.hostList).toStrictEqual(['www.tabsets.net'])
+
+  })
+
+  it('upsertWindow saves new title', async () => {
+    currentWindows = [window100, window200]
+    await setupMocks(window100)
+    await setupStores(db)
+
+    const window = await db.getWindow(100)
+    if (window) {
+      await useWindowsStore().upsertWindow(window.browserWindow!, "theTitle")
+      const updatedWindow = await db.getWindow(100)
+      expect(updatedWindow?.title).toBe("theTitle")
+    } else {
+      expect(true).toBeFalsy()
+    }
+  })
+
+  it('onRemoved does not remove window with title', async () => {
+    currentWindows = [window100, window200]
+    await setupMocks(window100)
+    await setupStores(db)
+
+    const window = await db.getWindow(100)
+    if (window) {
+      await useWindowsStore().upsertWindow(window.browserWindow!, "theTitle")
+      await onRemovedListener(100)
+      const window100FromDb = await db.getWindow(100)
+      expect(window100FromDb?.id).toBe(100)
+    } else {
+      expect(true).toBeFalsy()
+    }
+  })
+
+  // it('onFocusChanged updates browserWindow', async () => {
+  //   currentWindows = [window100, window200]
+  //   await setupMocks(window100)
+  //   await setupStores(db)
+  //
+  //   const t = await db.getWindow(100)
+  //   // console.log("t", t)
+  //   console.log("t", useWindowsStore().allWindows)
+  //   console.log("==============")
+  //   await onFocusChangedListener(100)
+  //   console.log("==============")
+  //
+  //   const window100FromDb = await db.getWindow(100)
+  //   // 33 is a 'magic number' assigned
+  //   expect(window100FromDb?.browserWindow?.left).toBe(33)
+  // })
+
+  it('onCreate yields new window', async () => {
+    const window: chrome.windows.Window = ChromeApi.createChromeWindowObject(1000, 0, 0)
+    currentWindows = [window100, window200, window]
+    await setupMocks(window100)
+    await setupStores(db)
+    await onCreatedListener(window)
+    // await useWindowsStore().persistGroup(ChromeApi.createChromeTabGroupObject(1, "groupName", 'grey' as chrome.tabGroups.ColorEnum))
+    //const groups = await  db.getGroups()
+    // expect(groups.length).toBe(1)
+    const window1000FromDb = await db.getWindow(1000)
+    expect(window1000FromDb?.id).toBe(1000)
+    expect(window1000FromDb?.browserWindow?.left).toBe(0)
+    expect(window1000FromDb?.index).toBe(2)
+  })
+
+  it('onCreate keeps existing titles', async () => {
+    currentWindows = [window100, window200]
+    await setupMocks(window100)
+    await setupStores(db)
+
+    const window100FromDb = await db.getWindow(100)
+    if (!window100FromDb) {
+      expect(true).toBeFalsy()
+    }
+    // @ts-ignore
+    await useWindowsStore().upsertWindow(window100FromDb?.browserWindow, "theTitle")
+
+    const window: chrome.windows.Window = ChromeApi.createChromeWindowObject(1000, 0, 0)
+    currentWindows = [window100, window200, window]
+    await setupMocks(window100)
+    await onCreatedListener(window)
+    const updatedWindow100 = await db.getWindow(100)
+    expect(updatedWindow100?.title).toBe("theTitle")
+  })
+
+  it('onCreate reuses existing window when matched', async () => {
+    const windowWithSameTabsAsWindow100: chrome.windows.Window = ChromeApi.createChromeWindowObject(1000, 0, 0, [tab1, tab2])
+    currentWindows = [window100, window200]
+    await setupMocks(window100)
+    await setupStores(db)
+
+    const w100 = await db.getWindow(100)
+    if (w100) {
+      w100.title = "theTitle"
+      await db.updateWindow(w100)
+    }
+
+    console.log("==============")
+    currentWindows = [window100, window200, windowWithSameTabsAsWindow100]
+    await onCreatedListener(windowWithSameTabsAsWindow100) // should 'reuse' existing window100
+    console.log("==============")
+    const updatedWindow1000 = await db.getWindow(1000)
+    expect(updatedWindow1000?.title).toBe("theTitle")
+    expect((await db.getWindows()).length).toBe(2)
+  })
+
+  // it('tabset with open-in-window setting is added', async () => {
+  //
+  //   currentWindows = [window100]
+  //   await setupMocks(window100)
+  //   await useCommandExecutor().execute(new CreateTabsetCommand("tsName", [], 'open-in-window'))
+  //   await setupStores(db)
+  //
+  //   const windowsFromDb  = await db.getWindows()
+  //   expect(windowsFromDb.length).toBe(2)
+  // })
+
+  // it('persists group with changing title', async () => {
+  //     await useGroupsStore().initialize(db)
+  //     await useGroupsStore().persistGroup(ChromeApi.createChromeTabGroupObject(1, "ab", 'grey' as chrome.tabGroups.ColorEnum))
+  //     await useGroupsStore().persistGroup(ChromeApi.createChromeTabGroupObject(1, "abc", 'grey' as chrome.tabGroups.ColorEnum))
+  //
+  //     const groups = await  db.getGroups()
+  //     expect(groups.length).toBe(1)
+  //     expect(groups[0].title).toBe("abc")
+  // })
 
 
 });
diff --git a/vitest.config.ts b/vitest.config.ts
index 099744ca..71d0a36c 100644
--- a/vitest.config.ts
+++ b/vitest.config.ts
@@ -9,6 +9,7 @@ export default defineConfig({
     environment: 'happy-dom',
     setupFiles: 'test/vitest/setup-file.ts',
     testTimeout: 50000,
+    hookTimeout: 50000,
     include: [
       // Matches vitest tests in any subfolder of 'src' or into 'test/vitest/__tests__'
       // Matches all files with extension 'js', 'jsx', 'ts' and 'tsx'
diff --git a/yarn.lock b/yarn.lock
index 48365034..e86bba75 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -32,7 +32,7 @@
     "@auth0/auth0-spa-js" "^2.1.3"
     vue "^3.2.41"
 
-"@babel/code-frame@^7.10.4", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.21.4", "@babel/code-frame@^7.22.13", "@babel/code-frame@^7.23.5":
+"@babel/code-frame@^7.10.4", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.21.4", "@babel/code-frame@^7.23.5":
   version "7.23.5"
   resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.23.5.tgz#9009b69a8c602293476ad598ff53e4562e15c244"
   integrity sha512-CgH3s1a96LipHCmSUmYFPwY7MNx8C3avkq7i4Wl3cfa662ldtUe4VM1TPXX70pfmrlWTb6jLqTYrZyT2ZTJBgA==
@@ -46,20 +46,20 @@
   integrity sha512-uU27kfDRlhfKl+w1U6vp16IuvSLtjAxdArVXPa9BvLkrr7CYIsxH5adpHObeAGY/41+syctUWOZ140a2Rvkgjw==
 
 "@babel/core@^7.11.1", "@babel/core@^7.12.0":
-  version "7.23.7"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.23.7.tgz#4d8016e06a14b5f92530a13ed0561730b5c6483f"
-  integrity sha512-+UpDgowcmqe36d4NwqvKsyPMlOLNGMsfMmQ5WGCu+siCe3t3dfe9njrzGfdN4qq+bcNUt0+Vw6haRxBOycs4dw==
+  version "7.23.9"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.23.9.tgz#b028820718000f267870822fec434820e9b1e4d1"
+  integrity sha512-5q0175NOjddqpvvzU+kDiSOAk4PfdO6FvwCWoQ6RO7rTzEe8vlo+4HVfcnAREhD4npMs0e9uZypjTwzZPCf/cw==
   dependencies:
     "@ampproject/remapping" "^2.2.0"
     "@babel/code-frame" "^7.23.5"
     "@babel/generator" "^7.23.6"
     "@babel/helper-compilation-targets" "^7.23.6"
     "@babel/helper-module-transforms" "^7.23.3"
-    "@babel/helpers" "^7.23.7"
-    "@babel/parser" "^7.23.6"
-    "@babel/template" "^7.22.15"
-    "@babel/traverse" "^7.23.7"
-    "@babel/types" "^7.23.6"
+    "@babel/helpers" "^7.23.9"
+    "@babel/parser" "^7.23.9"
+    "@babel/template" "^7.23.9"
+    "@babel/traverse" "^7.23.9"
+    "@babel/types" "^7.23.9"
     convert-source-map "^2.0.0"
     debug "^4.1.0"
     gensync "^1.0.0-beta.2"
@@ -101,10 +101,10 @@
     lru-cache "^5.1.1"
     semver "^6.3.1"
 
-"@babel/helper-create-class-features-plugin@^7.18.6", "@babel/helper-create-class-features-plugin@^7.22.15", "@babel/helper-create-class-features-plugin@^7.23.7":
-  version "7.23.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.23.7.tgz#b2e6826e0e20d337143655198b79d58fdc9bd43d"
-  integrity sha512-xCoqR/8+BoNnXOY7RVSgv6X+o7pmT5q1d+gGcRlXYkI+9B31glE4jeejhKVpA04O1AtzOt7OSQ6VYKP5FcRl9g==
+"@babel/helper-create-class-features-plugin@^7.18.6", "@babel/helper-create-class-features-plugin@^7.22.15", "@babel/helper-create-class-features-plugin@^7.23.9":
+  version "7.23.9"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.23.9.tgz#fddfdf51fca28f23d16b9e3935a4732690acfad6"
+  integrity sha512-B2L9neXTIyPQoXDm+NtovPvG6VOLWnaXu3BIeVDWwdKFgG30oNa6CqVGiJPDWQwIAK49t9gnQI9c6K6RzabiKw==
   dependencies:
     "@babel/helper-annotate-as-pure" "^7.22.5"
     "@babel/helper-environment-visitor" "^7.22.20"
@@ -125,17 +125,6 @@
     regexpu-core "^5.3.1"
     semver "^6.3.1"
 
-"@babel/helper-define-polyfill-provider@^0.4.4":
-  version "0.4.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.4.4.tgz#64df615451cb30e94b59a9696022cffac9a10088"
-  integrity sha512-QcJMILQCu2jm5TFPGA3lCpJJTeEP+mqeXooG/NZbg/h5FTFi6V0+99ahlRsW8/kRLyb24LZVCCiclDedhLKcBA==
-  dependencies:
-    "@babel/helper-compilation-targets" "^7.22.6"
-    "@babel/helper-plugin-utils" "^7.22.5"
-    debug "^4.1.1"
-    lodash.debounce "^4.0.8"
-    resolve "^1.14.2"
-
 "@babel/helper-define-polyfill-provider@^0.5.0":
   version "0.5.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.5.0.tgz#465805b7361f461e86c680f1de21eaf88c25901b"
@@ -267,14 +256,14 @@
     "@babel/template" "^7.22.15"
     "@babel/types" "^7.22.19"
 
-"@babel/helpers@^7.23.7":
-  version "7.23.8"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.23.8.tgz#fc6b2d65b16847fd50adddbd4232c76378959e34"
-  integrity sha512-KDqYz4PiOWvDFrdHLPhKtCThtIcKVy6avWD2oG4GEvyQ+XDZwHD4YQd+H2vNMnq2rkdxsDkU82T+Vk8U/WXHRQ==
+"@babel/helpers@^7.23.9":
+  version "7.23.9"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.23.9.tgz#c3e20bbe7f7a7e10cb9b178384b4affdf5995c7d"
+  integrity sha512-87ICKgU5t5SzOT7sBMfCOZQ2rHjRU+Pcb9BoILMYz600W6DkVRLFBPwQ18gwUVvggqXivaUakpnxWQGbpywbBQ==
   dependencies:
-    "@babel/template" "^7.22.15"
-    "@babel/traverse" "^7.23.7"
-    "@babel/types" "^7.23.6"
+    "@babel/template" "^7.23.9"
+    "@babel/traverse" "^7.23.9"
+    "@babel/types" "^7.23.9"
 
 "@babel/highlight@^7.23.4":
   version "7.23.4"
@@ -285,10 +274,10 @@
     chalk "^2.4.2"
     js-tokens "^4.0.0"
 
-"@babel/parser@^7.22.15", "@babel/parser@^7.23.6":
-  version "7.23.6"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.23.6.tgz#ba1c9e512bda72a47e285ae42aff9d2a635a9e3b"
-  integrity sha512-Z2uID7YJ7oNvAI20O9X0bblw7Qqs8Q2hFy0R9tAfnfLkp5MW0UH9eUvnDSnFwKZ0AvgS1ucqR4KzvVHgnke1VQ==
+"@babel/parser@^7.23.6", "@babel/parser@^7.23.9":
+  version "7.23.9"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.23.9.tgz#7b903b6149b0f8fa7ad564af646c4c38a77fc44b"
+  integrity sha512-9tcKgqKbs3xGJ+NtKF2ndOBBLVwPjl1SHxPQkd36r3Dlirw3xWUeGaTbqr7uGZcTaxkVNwc+03SVP7aCdWrTlA==
 
 "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.23.3":
   version "7.23.3"
@@ -323,11 +312,11 @@
     "@babel/helper-plugin-utils" "^7.18.6"
 
 "@babel/plugin-proposal-decorators@^7.4.4":
-  version "7.23.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.23.7.tgz#1d827902cbd3d9054e54fb2f2056cdd1eaa0e368"
-  integrity sha512-b1s5JyeMvqj7d9m9KhJNHKc18gEJiSyVzVX3bwbiPalQBQpuvfPh6lA9F7Kk/dWH0TIiXRpB9yicwijY6buPng==
+  version "7.23.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.23.9.tgz#126d947d62ee72022ec46813983c6dd861456fa3"
+  integrity sha512-hJhBCb0+NnTWybvWq2WpbCYDOcflSbx0t+BYP65e5R9GVnukiDTi+on5bFkk4p7QGuv190H6KfNiV9Knf/3cZA==
   dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.23.7"
+    "@babel/helper-create-class-features-plugin" "^7.23.9"
     "@babel/helper-plugin-utils" "^7.22.5"
     "@babel/plugin-syntax-decorators" "^7.23.3"
 
@@ -532,10 +521,10 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-async-generator-functions@^7.23.7":
-  version "7.23.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.23.7.tgz#3aa0b4f2fa3788b5226ef9346cf6d16ec61f99cd"
-  integrity sha512-PdxEpL71bJp1byMG0va5gwQcXHxuEYC/BgI/e88mGTtohbZN28O5Yit0Plkkm/dBzCF/BxmbNcses1RH1T+urA==
+"@babel/plugin-transform-async-generator-functions@^7.23.9":
+  version "7.23.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.23.9.tgz#9adaeb66fc9634a586c5df139c6240d41ed801ce"
+  integrity sha512-8Q3veQEDGe14dTYuwagbRtwxQDnytyg1JFu4/HwEMETeofocrB0U0ejBJIXoeG/t2oXZ8kzCyI0ZZfbT80VFNQ==
   dependencies:
     "@babel/helper-environment-visitor" "^7.22.20"
     "@babel/helper-plugin-utils" "^7.22.5"
@@ -714,10 +703,10 @@
     "@babel/helper-plugin-utils" "^7.22.5"
     "@babel/helper-simple-access" "^7.22.5"
 
-"@babel/plugin-transform-modules-systemjs@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.23.3.tgz#fa7e62248931cb15b9404f8052581c302dd9de81"
-  integrity sha512-ZxyKGTkF9xT9YJuKQRo19ewf3pXpopuYQd8cDXqNzc3mUNbOME0RKMoZxviQk74hwzfQsEe66dE92MaZbdHKNQ==
+"@babel/plugin-transform-modules-systemjs@^7.23.9":
+  version "7.23.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.23.9.tgz#105d3ed46e4a21d257f83a2f9e2ee4203ceda6be"
+  integrity sha512-KDlPRM6sLo4o1FkiSlXoAa8edLXFsKKIda779fbLrvmeuc3itnjCtaO6RrtoaANsIJANj+Vk1zqbZIMhkCAHVw==
   dependencies:
     "@babel/helper-hoist-variables" "^7.22.5"
     "@babel/helper-module-transforms" "^7.23.3"
@@ -847,15 +836,15 @@
     "@babel/helper-plugin-utils" "^7.22.5"
 
 "@babel/plugin-transform-runtime@^7.9.0":
-  version "7.23.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.23.7.tgz#52bbd20054855beb9deae3bee9ceb05289c343e6"
-  integrity sha512-fa0hnfmiXc9fq/weK34MUV0drz2pOL/vfKWvN7Qw127hiUPabFCUMgAbYWcchRzMJit4o5ARsK/s+5h0249pLw==
+  version "7.23.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.23.9.tgz#2c64d0680fc8e09e1dfe8fd5c646fe72abd82004"
+  integrity sha512-A7clW3a0aSjm3ONU9o2HAILSegJCYlEZmOhmBRReVtIpY/Z/p7yIZ+wR41Z+UipwdGuqwtID/V/dOdZXjwi9gQ==
   dependencies:
     "@babel/helper-module-imports" "^7.22.15"
     "@babel/helper-plugin-utils" "^7.22.5"
-    babel-plugin-polyfill-corejs2 "^0.4.7"
-    babel-plugin-polyfill-corejs3 "^0.8.7"
-    babel-plugin-polyfill-regenerator "^0.5.4"
+    babel-plugin-polyfill-corejs2 "^0.4.8"
+    babel-plugin-polyfill-corejs3 "^0.9.0"
+    babel-plugin-polyfill-regenerator "^0.5.5"
     semver "^6.3.1"
 
 "@babel/plugin-transform-shorthand-properties@^7.23.3":
@@ -926,9 +915,9 @@
     "@babel/helper-plugin-utils" "^7.22.5"
 
 "@babel/preset-env@^7.11.0", "@babel/preset-env@^7.19.0", "@babel/preset-env@^7.9.0":
-  version "7.23.8"
-  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.23.8.tgz#7d6f8171ea7c221ecd28059e65ad37c20e441e3e"
-  integrity sha512-lFlpmkApLkEP6woIKprO6DO60RImpatTQKtz4sUcDjVcK8M8mQ4sZsuxaTMNOZf0sqAq/ReYW1ZBHnOQwKpLWA==
+  version "7.23.9"
+  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.23.9.tgz#beace3b7994560ed6bf78e4ae2073dff45387669"
+  integrity sha512-3kBGTNBBk9DQiPoXYS0g0BYlwTQYUTifqgKTjxUwEUkduRT2QOa0FPGBJ+NROQhGyYO5BuTJwGvBnqKDykac6A==
   dependencies:
     "@babel/compat-data" "^7.23.5"
     "@babel/helper-compilation-targets" "^7.23.6"
@@ -957,7 +946,7 @@
     "@babel/plugin-syntax-top-level-await" "^7.14.5"
     "@babel/plugin-syntax-unicode-sets-regex" "^7.18.6"
     "@babel/plugin-transform-arrow-functions" "^7.23.3"
-    "@babel/plugin-transform-async-generator-functions" "^7.23.7"
+    "@babel/plugin-transform-async-generator-functions" "^7.23.9"
     "@babel/plugin-transform-async-to-generator" "^7.23.3"
     "@babel/plugin-transform-block-scoped-functions" "^7.23.3"
     "@babel/plugin-transform-block-scoping" "^7.23.4"
@@ -979,7 +968,7 @@
     "@babel/plugin-transform-member-expression-literals" "^7.23.3"
     "@babel/plugin-transform-modules-amd" "^7.23.3"
     "@babel/plugin-transform-modules-commonjs" "^7.23.3"
-    "@babel/plugin-transform-modules-systemjs" "^7.23.3"
+    "@babel/plugin-transform-modules-systemjs" "^7.23.9"
     "@babel/plugin-transform-modules-umd" "^7.23.3"
     "@babel/plugin-transform-named-capturing-groups-regex" "^7.22.5"
     "@babel/plugin-transform-new-target" "^7.23.3"
@@ -1005,9 +994,9 @@
     "@babel/plugin-transform-unicode-regex" "^7.23.3"
     "@babel/plugin-transform-unicode-sets-regex" "^7.23.3"
     "@babel/preset-modules" "0.1.6-no-external-plugins"
-    babel-plugin-polyfill-corejs2 "^0.4.7"
-    babel-plugin-polyfill-corejs3 "^0.8.7"
-    babel-plugin-polyfill-regenerator "^0.5.4"
+    babel-plugin-polyfill-corejs2 "^0.4.8"
+    babel-plugin-polyfill-corejs3 "^0.9.0"
+    babel-plugin-polyfill-regenerator "^0.5.5"
     core-js-compat "^3.31.0"
     semver "^6.3.1"
 
@@ -1026,25 +1015,25 @@
   integrity sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA==
 
 "@babel/runtime@^7.10.2", "@babel/runtime@^7.11.2", "@babel/runtime@^7.21.0", "@babel/runtime@^7.23.8", "@babel/runtime@^7.8.4", "@babel/runtime@^7.9.0":
-  version "7.23.8"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.23.8.tgz#8ee6fe1ac47add7122902f257b8ddf55c898f650"
-  integrity sha512-Y7KbAP984rn1VGMbGqKmBLio9V7y5Je9GvU4rQPCPinCyNfUcToxIXl06d59URp/F3LwinvODxab5N/G6qggkw==
+  version "7.23.9"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.23.9.tgz#47791a15e4603bb5f905bc0753801cf21d6345f7"
+  integrity sha512-0CX6F+BI2s9dkUqr08KFrAIZgNFj75rdBU/DjCyYLIaV/quFjkk6T+EJ2LkZHyZTbEV4L5p97mNkUsHl2wLFAw==
   dependencies:
     regenerator-runtime "^0.14.0"
 
-"@babel/template@^7.22.15":
-  version "7.22.15"
-  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.22.15.tgz#09576efc3830f0430f4548ef971dde1350ef2f38"
-  integrity sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==
+"@babel/template@^7.22.15", "@babel/template@^7.23.9":
+  version "7.23.9"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.23.9.tgz#f881d0487cba2828d3259dcb9ef5005a9731011a"
+  integrity sha512-+xrD2BWLpvHKNmX2QbpdpsBaWnRxahMwJjO+KZk2JOElj5nSmKezyS1B4u+QbHMTX69t4ukm6hh9lsYQ7GHCKA==
   dependencies:
-    "@babel/code-frame" "^7.22.13"
-    "@babel/parser" "^7.22.15"
-    "@babel/types" "^7.22.15"
+    "@babel/code-frame" "^7.23.5"
+    "@babel/parser" "^7.23.9"
+    "@babel/types" "^7.23.9"
 
-"@babel/traverse@^7.23.7":
-  version "7.23.7"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.23.7.tgz#9a7bf285c928cb99b5ead19c3b1ce5b310c9c305"
-  integrity sha512-tY3mM8rH9jM0YHFGyfC0/xf+SB5eKUu7HPj7/k3fpi9dAlsMc5YbQvDi0Sh2QTPXqMhyaAtzAr807TIyfQrmyg==
+"@babel/traverse@^7.23.9":
+  version "7.23.9"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.23.9.tgz#2f9d6aead6b564669394c5ce0f9302bb65b9d950"
+  integrity sha512-I/4UJ9vs90OkBtY6iiiTORVMyIhJ4kAVmsKo9KFc8UOxMeUfi2hvtIBsET5u9GizXE6/GFSuKCTNfgCswuEjRg==
   dependencies:
     "@babel/code-frame" "^7.23.5"
     "@babel/generator" "^7.23.6"
@@ -1052,15 +1041,15 @@
     "@babel/helper-function-name" "^7.23.0"
     "@babel/helper-hoist-variables" "^7.22.5"
     "@babel/helper-split-export-declaration" "^7.22.6"
-    "@babel/parser" "^7.23.6"
-    "@babel/types" "^7.23.6"
+    "@babel/parser" "^7.23.9"
+    "@babel/types" "^7.23.9"
     debug "^4.3.1"
     globals "^11.1.0"
 
-"@babel/types@^7.22.15", "@babel/types@^7.22.19", "@babel/types@^7.22.5", "@babel/types@^7.23.0", "@babel/types@^7.23.6", "@babel/types@^7.4.4":
-  version "7.23.6"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.23.6.tgz#be33fdb151e1f5a56877d704492c240fc71c7ccd"
-  integrity sha512-+uarb83brBzPKN38NX1MkB6vb6+mwvR6amUulqAE7ccQw1pEl+bCia9TbdG1lsnFP7lZySvUn37CHyXQdfTwzg==
+"@babel/types@^7.22.15", "@babel/types@^7.22.19", "@babel/types@^7.22.5", "@babel/types@^7.23.0", "@babel/types@^7.23.6", "@babel/types@^7.23.9", "@babel/types@^7.4.4":
+  version "7.23.9"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.23.9.tgz#1dd7b59a9a2b5c87f8b41e52770b5ecbf492e002"
+  integrity sha512-dQjSq/7HaSjRM43FFGnv5keM2HsxpmyV1PfaSVm0nzzjwwTmjOe6J4bC8e3+pTEIgHaHj+1ZlLThRJ2auc/w1Q==
   dependencies:
     "@babel/helper-string-parser" "^7.23.4"
     "@babel/helper-validator-identifier" "^7.22.20"
@@ -1775,11 +1764,6 @@
     protobufjs "^7.2.4"
     yargs "^17.7.2"
 
-"@huggingface/jinja@^0.1.0":
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/@huggingface/jinja/-/jinja-0.1.2.tgz#073fa0a68ef481a1806b0186bbafd8013e586fbe"
-  integrity sha512-x5mpbfJt1nKmVep5WNP5VjNsjWApWNj8pPYI+uYMkBWH9bWUJmQmHt2lbf0VCoQd54Oq3XuFEh/UyoVh7rPxmg==
-
 "@idraw/board@^0.3.1":
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/@idraw/board/-/board-0.3.1.tgz#7879815f8ce52a8aa1a3227224c1691648ac6452"
@@ -2063,11 +2047,11 @@
     "@jridgewell/sourcemap-codec" "^1.4.14"
 
 "@ljharb/through@^2.3.11":
-  version "2.3.11"
-  resolved "https://registry.yarnpkg.com/@ljharb/through/-/through-2.3.11.tgz#783600ff12c06f21a76cc26e33abd0b1595092f9"
-  integrity sha512-ccfcIDlogiXNq5KcbAwbaO7lMh3Tm1i3khMPYpxlK8hH/W53zN81KM9coerRLOnTGu3nfXIniAmQbRI9OxbC0w==
+  version "2.3.12"
+  resolved "https://registry.yarnpkg.com/@ljharb/through/-/through-2.3.12.tgz#c418c43060eee193adce48b15c2206096a28e9ea"
+  integrity sha512-ajo/heTlG3QgC8EGP6APIejksVAYt4ayz4tqoP3MolFELzcH1x1fzwEYRJTPO0IELutZ5HQ0c26/GqAYy79u3g==
   dependencies:
-    call-bind "^1.0.2"
+    call-bind "^1.0.5"
 
 "@logtail/browser@^0.4.19":
   version "0.4.19"
@@ -2590,9 +2574,9 @@
   integrity sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==
 
 "@types/express-serve-static-core@^4.17.33":
-  version "4.17.41"
-  resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.41.tgz#5077defa630c2e8d28aa9ffc2c01c157c305bef6"
-  integrity sha512-OaJ7XLaelTgrvlZD8/aa0vvvxZdUmlCn6MtWeB7TkiKW70BQLc9XEPpDLPdbo52ZhXUCrznlWdCHWxJWtdyajA==
+  version "4.17.42"
+  resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.42.tgz#2a276952acc73d1b8dc63fd4210647abbc553a71"
+  integrity sha512-ckM3jm2bf/MfB3+spLPWYPUH573plBFwpOhqQ2WottxYV85j1HQFlxmnTq57X1yHY9awZPig06hL/cLMgNWHIQ==
   dependencies:
     "@types/node" "*"
     "@types/qs" "*"
@@ -2684,11 +2668,6 @@
   resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.202.tgz#f09dbd2fb082d507178b2f2a5c7e74bd72ff98f8"
   integrity sha512-OvlIYQK9tNneDlS0VN54LLd5uiPCBOp7gS5Z0f1mjoJYBrtStzgmJBxONW3U6OZqdtNzZPmn9BS/7WI7BFFcFQ==
 
-"@types/long@^4.0.1":
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/@types/long/-/long-4.0.2.tgz#b74129719fc8d11c01868010082d483b7545591a"
-  integrity sha512-MqTGEo5bj5t157U6fA/BiDynNkn0YknVdh48CMPkTSpFTVmvao5UQmm7uEF6xBEo7qIMAlY/JSleYaE6VOdpaA==
-
 "@types/mime@*":
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/@types/mime/-/mime-3.0.4.tgz#2198ac274de6017b44d941e00261d5bc6a0e0a45"
@@ -2705,16 +2684,16 @@
   integrity sha512-nG96G3Wp6acyAgJqGasjODb+acrI7KltPiRxzHPXnP3NgI28bpQDRv53olbqGXbfcgF5aiiHmO3xpwEpS5Ld9g==
 
 "@types/node@*", "@types/node@>=12.12.47", "@types/node@>=13.7.0", "@types/node@^20.1.0", "@types/node@^20.1.1", "@types/node@^20.4.10":
-  version "20.11.6"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.11.6.tgz#6adf4241460e28be53836529c033a41985f85b6e"
-  integrity sha512-+EOokTnksGVgip2PbYbr3xnR7kZigh4LbybAfBAw5BpnQ+FqBYUsvCEjYd70IXKlbohQ64mzEYmMtlWUY8q//Q==
+  version "20.11.7"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.11.7.tgz#cb49aedd758c978c30806d0c38b520ed2a3df6e0"
+  integrity sha512-GPmeN1C3XAyV5uybAf4cMLWT9fDWcmQhZVtMFu7OR32WjrqGG+Wnk2V1d0bmtUyE/Zy1QJ9BxyiTih9z8Oks8A==
   dependencies:
     undici-types "~5.26.4"
 
 "@types/node@^18.11.18":
-  version "18.19.9"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-18.19.9.tgz#6c2624c3a05bfa3a2735c533f95597ffacbb5608"
-  integrity sha512-oZFKlC8l5YtzGQNT4zC2PiSSKzQVZ8bAwwd+EYdPLtyk0nSEq6O16SkK+rkkT2eflDAbormJgEF3QnH3oDrTSw==
+  version "18.19.10"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-18.19.10.tgz#4de314ab66faf6bc8ba691021a091ddcdf13a158"
+  integrity sha512-IZD8kAM02AW1HRDTPOlz3npFava678pr8Ie9Vp8uRhBROXAv8MXT2pCnGZZAKYdromsNQLHQcfWQ6EOatVLtqA==
   dependencies:
     undici-types "~5.26.4"
 
@@ -2965,9 +2944,9 @@
   integrity sha512-ScaPdn1dQczgbl0QFTeTOmVHFULt394XJgOQNoyVhZ6r2vLnMLJfBPd53SB52T/3G36VI1/g2MZaX0cwDuXsfw==
 
 "@types/uuid@^9.0.1":
-  version "9.0.7"
-  resolved "https://registry.yarnpkg.com/@types/uuid/-/uuid-9.0.7.tgz#b14cebc75455eeeb160d5fe23c2fcc0c64f724d8"
-  integrity sha512-WUtIVRUZ9i5dYXefDEAI7sh9/O7jGvHg7Df/5O/gtH3Yabe5odI3UWopVR1qbPXQtvOxWu3mM4XxlYeZtMWF4g==
+  version "9.0.8"
+  resolved "https://registry.yarnpkg.com/@types/uuid/-/uuid-9.0.8.tgz#7545ba4fc3c003d6c756f651f3bf163d8f0f29ba"
+  integrity sha512-jg+97EGIcY9AGHJJRaaPVgetKDsrTgbRjQ5Msgjh/DQKEFl0DtyRr/VCOyD1T2R1MNeWPK/u7JoGhlDZnKBAfA==
 
 "@types/which@^2.0.1":
   version "2.0.2"
@@ -3192,26 +3171,26 @@
   integrity sha512-KzfPTxVaWfB+eGcGdbSf4CWdaXcGDqckoeXUh7SB3fZdEtzPCK2Vq9B/lRRL3yutax/LWITz+SwvgyOxz5V75g==
 
 "@vue/test-utils@^2.4.1":
-  version "2.4.3"
-  resolved "https://registry.yarnpkg.com/@vue/test-utils/-/test-utils-2.4.3.tgz#d86786d809f918c77fb9e1fafaa2438af37c17d3"
-  integrity sha512-F4K7mF+ad++VlTrxMJVRnenKSJmO6fkQt2wpRDiKDesQMkfpniGWsqEi/JevxGBo2qEkwwjvTUAoiGJLNx++CA==
+  version "2.4.4"
+  resolved "https://registry.yarnpkg.com/@vue/test-utils/-/test-utils-2.4.4.tgz#36ba31f90332fb25a5ab2e553652c21d33057094"
+  integrity sha512-8jkRxz8pNhClAf4Co4ZrpAoFISdvT3nuSkUlY6Ys6rmTpw3DMWG/X3mw3gQ7QJzgCZO9f+zuE2kW57fi09MW7Q==
   dependencies:
     js-beautify "^1.14.9"
     vue-component-type-helpers "^1.8.21"
 
 "@wdio/cli@^8.13.5":
-  version "8.29.0"
-  resolved "https://registry.yarnpkg.com/@wdio/cli/-/cli-8.29.0.tgz#303b31fde355857f512cf396f98c848a31b77d3c"
-  integrity sha512-BOdX4qsos3gd4KS3DH17fE+Q7enAtVjiq372WHxFgAjXb4p95/ERGvfNKFWPrtsGwNQ7xOuxAajdW8kmGdXmuQ==
+  version "8.29.1"
+  resolved "https://registry.yarnpkg.com/@wdio/cli/-/cli-8.29.1.tgz#f262a9c13a69a6696c37d508dfbb7dd13896947c"
+  integrity sha512-WWRTf0g0O+ovTTvS1kEhZ/svX32M7jERuuMF1MaldKCi7rZwHsQqOyJD+fO1UDjuxqS96LHSGsZn0auwUfCTXA==
   dependencies:
     "@types/node" "^20.1.1"
     "@vitest/snapshot" "^1.2.1"
-    "@wdio/config" "8.29.0"
-    "@wdio/globals" "8.29.0"
+    "@wdio/config" "8.29.1"
+    "@wdio/globals" "8.29.1"
     "@wdio/logger" "8.28.0"
     "@wdio/protocols" "8.24.12"
-    "@wdio/types" "8.29.0"
-    "@wdio/utils" "8.29.0"
+    "@wdio/types" "8.29.1"
+    "@wdio/utils" "8.29.1"
     async-exit-hook "^2.0.1"
     chalk "^5.2.0"
     chokidar "^3.5.3"
@@ -3226,29 +3205,29 @@
     lodash.union "^4.6.0"
     read-pkg-up "^10.0.0"
     recursive-readdir "^2.2.3"
-    webdriverio "8.29.0"
+    webdriverio "8.29.1"
     yargs "^17.7.2"
 
-"@wdio/config@8.29.0":
-  version "8.29.0"
-  resolved "https://registry.yarnpkg.com/@wdio/config/-/config-8.29.0.tgz#e3ba42d30fcc7e0f84e9def2b034afcc0ebcea75"
-  integrity sha512-MxrKSBCd8req5vtfFbqM24j+dVAQOM57hHerm4pLwP1QW/vDLdrD6sP2swp7DIndxkedkofO3DzR1RVgEiEryw==
+"@wdio/config@8.29.1":
+  version "8.29.1"
+  resolved "https://registry.yarnpkg.com/@wdio/config/-/config-8.29.1.tgz#16ba58e8a16db11f6f8e6a8391c9a28a400a1df6"
+  integrity sha512-zNUac4lM429HDKAitO+fdlwUH1ACQU8lww+DNVgUyuEb86xgVdTqHeiJr/3kOMJAq9IATeE7mDtYyyn6HPm1JA==
   dependencies:
     "@wdio/logger" "8.28.0"
-    "@wdio/types" "8.29.0"
-    "@wdio/utils" "8.29.0"
+    "@wdio/types" "8.29.1"
+    "@wdio/utils" "8.29.1"
     decamelize "^6.0.0"
     deepmerge-ts "^5.0.0"
     glob "^10.2.2"
     import-meta-resolve "^4.0.0"
 
-"@wdio/globals@8.29.0", "@wdio/globals@^8.27.0":
-  version "8.29.0"
-  resolved "https://registry.yarnpkg.com/@wdio/globals/-/globals-8.29.0.tgz#3c815112504a13e260104af146388fc54145ac22"
-  integrity sha512-xQaU8JEvbCgYXFL96w+yjgbxcXppyuqEgXEWZV/v0oRnff1lWpcaQUO9RriAt/tM4OpCVgKvwG1D4ap3wsCIFw==
+"@wdio/globals@8.29.1", "@wdio/globals@^8.27.0":
+  version "8.29.1"
+  resolved "https://registry.yarnpkg.com/@wdio/globals/-/globals-8.29.1.tgz#98d3d10e2fc5abb5c810d3c1c55a364a73ff8056"
+  integrity sha512-F+fPnX75f44/crZDfQ2FYSino/IMIdbnQGLIkaH0VnoljVJIHuxnX4y5Zqr4yRgurL9DsZaH22cLHrPXaHUhPg==
   optionalDependencies:
     expect-webdriverio "^4.9.3"
-    webdriverio "8.29.0"
+    webdriverio "8.29.1"
 
 "@wdio/logger@8.28.0", "@wdio/logger@^8.16.17", "@wdio/logger@^8.24.12":
   version "8.28.0"
@@ -3272,21 +3251,21 @@
   dependencies:
     "@types/node" "^20.1.0"
 
-"@wdio/types@8.29.0":
-  version "8.29.0"
-  resolved "https://registry.yarnpkg.com/@wdio/types/-/types-8.29.0.tgz#c2b5bb061515fa47cee5857158dbd2efa345d7f8"
-  integrity sha512-jNOmYRHAfGBxx3a9ojnt0mWeiePT5zfafsvW2tdbwH0FyLG/S0tzJN7nB2g3ErG6xaRTf93SZu12Z4lytHDd+w==
+"@wdio/types@8.29.1":
+  version "8.29.1"
+  resolved "https://registry.yarnpkg.com/@wdio/types/-/types-8.29.1.tgz#b0b8ca9817d3c0fa2b7c9dd53288afff308c0fd5"
+  integrity sha512-rZYzu+sK8zY1PjCEWxNu4ELJPYKDZRn7HFcYNgR122ylHygfldwkb5TioI6Pn311hQH/S+663KEeoq//Jb0f8A==
   dependencies:
     "@types/node" "^20.1.0"
 
-"@wdio/utils@8.29.0":
-  version "8.29.0"
-  resolved "https://registry.yarnpkg.com/@wdio/utils/-/utils-8.29.0.tgz#b21fbf507bf13ead88b6fef97d94d19459fa98c5"
-  integrity sha512-NiJ8FqbzdxvBD+YvqAh4c+IJdwxjqpf/LgfGZH8hiFApJb9pfdSlOoaY9jKxEJBJMgENaDaDaOIyuUzN/+X6tw==
+"@wdio/utils@8.29.1":
+  version "8.29.1"
+  resolved "https://registry.yarnpkg.com/@wdio/utils/-/utils-8.29.1.tgz#297edac0ff65b66fc44c662e71bc7992f7b282f9"
+  integrity sha512-Dm91DKL/ZKeZ2QogWT8Twv0p+slEgKyB/5x9/kcCG0Q2nNa+tZedTjOhryzrsPiWc+jTSBmjGE4katRXpJRFJg==
   dependencies:
     "@puppeteer/browsers" "^1.6.0"
     "@wdio/logger" "8.28.0"
-    "@wdio/types" "8.29.0"
+    "@wdio/types" "8.29.1"
     decamelize "^6.0.0"
     deepmerge-ts "^5.1.0"
     edgedriver "^5.3.5"
@@ -3298,17 +3277,6 @@
     split2 "^4.2.0"
     wait-port "^1.0.4"
 
-"@xenova/transformers@^2.12.1":
-  version "2.14.0"
-  resolved "https://registry.yarnpkg.com/@xenova/transformers/-/transformers-2.14.0.tgz#6fe128957e64377ca4fca910e77f6092f3f3512a"
-  integrity sha512-rQ3O7SW5EM64b6XFZGx3XQ2cfiroefxUwU9ShfSpEZyhd082GvwNJJKndxgaukse1hZP1JUDoT0DfjDiq4IZiw==
-  dependencies:
-    "@huggingface/jinja" "^0.1.0"
-    onnxruntime-web "1.14.0"
-    sharp "^0.32.0"
-  optionalDependencies:
-    onnxruntime-node "1.14.0"
-
 "@xmldom/xmldom@^0.8.8":
   version "0.8.10"
   resolved "https://registry.yarnpkg.com/@xmldom/xmldom/-/xmldom-0.8.10.tgz#a1337ca426aa61cef9fe15b5b28e340a72f6fa99"
@@ -3692,9 +3660,9 @@ aws4@^1.8.0:
   integrity sha512-NmWvPnx0F1SfrQbYwOi7OeaNGokp9XhzNioJ/CSBs8Qa4vxug81mhJEAVZwxXuBmYB5KDRfMq/F3RR0BIU7sWg==
 
 axios@^1.3.4:
-  version "1.6.5"
-  resolved "https://registry.yarnpkg.com/axios/-/axios-1.6.5.tgz#2c090da14aeeab3770ad30c3a1461bc970fb0cd8"
-  integrity sha512-Ii012v05KEVuUoFWmMW/UQv9aRIc3ZwkWDcM+h5Il8izZCtRVpDUfwpoFf7eOtajT3QiGR4yDUx7lPqHJULgbg==
+  version "1.6.7"
+  resolved "https://registry.yarnpkg.com/axios/-/axios-1.6.7.tgz#7b48c2e27c96f9c68a2f8f31e2ab19f59b06b0a7"
+  integrity sha512-/hDJGff6/c7u0hDkvkGxR/oy6CbCs8ziCsC7SqmhjfozqiJGc8Z11wrv9z9lYfY4K8l+H9TpjcMDX0xOZmx+RA==
   dependencies:
     follow-redirects "^1.15.4"
     form-data "^4.0.0"
@@ -3731,7 +3699,7 @@ babel-plugin-module-resolver@^5.0.0:
     reselect "^4.1.7"
     resolve "^1.22.1"
 
-babel-plugin-polyfill-corejs2@^0.4.7:
+babel-plugin-polyfill-corejs2@^0.4.8:
   version "0.4.8"
   resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.8.tgz#dbcc3c8ca758a290d47c3c6a490d59429b0d2269"
   integrity sha512-OtIuQfafSzpo/LhnJaykc0R/MMnuLSSVjVYy9mHArIZ9qTCSZ6TpWCuEKZYVoN//t8HqBNScHrOtCrIK5IaGLg==
@@ -3740,15 +3708,15 @@ babel-plugin-polyfill-corejs2@^0.4.7:
     "@babel/helper-define-polyfill-provider" "^0.5.0"
     semver "^6.3.1"
 
-babel-plugin-polyfill-corejs3@^0.8.7:
-  version "0.8.7"
-  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.8.7.tgz#941855aa7fdaac06ed24c730a93450d2b2b76d04"
-  integrity sha512-KyDvZYxAzkC0Aj2dAPyDzi2Ym15e5JKZSK+maI7NAwSqofvuFglbSsxE7wUOvTg9oFVnHMzVzBKcqEb4PJgtOA==
+babel-plugin-polyfill-corejs3@^0.9.0:
+  version "0.9.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.9.0.tgz#9eea32349d94556c2ad3ab9b82ebb27d4bf04a81"
+  integrity sha512-7nZPG1uzK2Ymhy/NbaOWTg3uibM2BmGASS4vHS4szRZAIR8R6GwA/xAujpdrXU5iyklrimWnLWU+BLF9suPTqg==
   dependencies:
-    "@babel/helper-define-polyfill-provider" "^0.4.4"
-    core-js-compat "^3.33.1"
+    "@babel/helper-define-polyfill-provider" "^0.5.0"
+    core-js-compat "^3.34.0"
 
-babel-plugin-polyfill-regenerator@^0.5.4:
+babel-plugin-polyfill-regenerator@^0.5.5:
   version "0.5.5"
   resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.5.5.tgz#8b0c8fc6434239e5d7b8a9d1f832bb2b0310f06a"
   integrity sha512-OJGYZlhLqBh2DDHeqAxWB1XIvr49CxiJ2gIt61/PU55CQK4Z58OzMqjDe1zwQdQk+rBYsRc+1rJmdajM3gimHg==
@@ -4038,9 +4006,9 @@ camelcase@^5.0.0:
   integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
 
 caniuse-lite@^1.0.30001565, caniuse-lite@^1.0.30001578:
-  version "1.0.30001579"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001579.tgz#45c065216110f46d6274311a4b3fcf6278e0852a"
-  integrity sha512-u5AUVkixruKHJjw/pj9wISlcMpgFWzSrczLZbrqBSxukQixmg0SJ5sZTpvaFvxU0HoQKd4yoyAogyrAz9pzJnA==
+  version "1.0.30001580"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001580.tgz#e3c76bc6fe020d9007647044278954ff8cd17d1e"
+  integrity sha512-mtj5ur2FFPZcCEpXFy8ADXbDACuNFXg6mxVDqp7tqooX6l3zwm+d8EPoeOSIFRDvHs8qu7/SLFOGniULkcH2iA==
 
 canvas@^2.11.0:
   version "2.11.2"
@@ -4256,32 +4224,16 @@ color-name@1.1.3:
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
   integrity sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==
 
-color-name@^1.0.0, color-name@~1.1.4:
+color-name@~1.1.4:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
   integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
 
-color-string@^1.9.0:
-  version "1.9.1"
-  resolved "https://registry.yarnpkg.com/color-string/-/color-string-1.9.1.tgz#4467f9146f036f855b764dfb5bf8582bf342c7a4"
-  integrity sha512-shrVawQFojnZv6xM40anx4CkoDP+fZsw/ZerEMsW/pyzsRbElpsL/DBVW7q3ExxwusdNXI3lXpuhEZkzs8p5Eg==
-  dependencies:
-    color-name "^1.0.0"
-    simple-swizzle "^0.2.2"
-
 color-support@^1.1.2:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/color-support/-/color-support-1.1.3.tgz#93834379a1cc9a0c61f82f52f0d04322251bd5a2"
   integrity sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==
 
-color@^4.2.3:
-  version "4.2.3"
-  resolved "https://registry.yarnpkg.com/color/-/color-4.2.3.tgz#d781ecb5e57224ee43ea9627560107c0e0c6463a"
-  integrity sha512-1rXeuUUiGGrykh+CeBdu5Ie7OJwinCgQY0bc7GCRxy5xVHy+moaqkpL/jqQq0MtQOeYcrqEz4abc5f0KtU7W4A==
-  dependencies:
-    color-convert "^2.0.1"
-    color-string "^1.9.0"
-
 combined-stream@^1.0.6, combined-stream@^1.0.8, combined-stream@~1.0.6:
   version "1.0.8"
   resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
@@ -4436,7 +4388,7 @@ cookie@0.5.0:
   resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.5.0.tgz#d1f5d71adec6558c58f389987c366aa47e994f8b"
   integrity sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==
 
-core-js-compat@^3.31.0, core-js-compat@^3.33.1, core-js-compat@^3.6.5:
+core-js-compat@^3.31.0, core-js-compat@^3.34.0, core-js-compat@^3.6.5:
   version "3.35.1"
   resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.35.1.tgz#215247d7edb9e830efa4218ff719beb2803555e2"
   integrity sha512-sftHa5qUJY3rs9Zht1WEnmkvXputCyDBczPnr7QDgL8n3qrF3CMXY4VPSYtOLLiOUJcah2WNXREd48iOl6mQIw==
@@ -4751,7 +4703,7 @@ destroy@1.2.0:
   resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.2.0.tgz#4803735509ad8be552934c67df614f94e66fa015"
   integrity sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==
 
-detect-libc@^2.0.0, detect-libc@^2.0.2:
+detect-libc@^2.0.0:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-2.0.2.tgz#8ccf2ba9315350e1241b88d0ac3b0e1fbd99605d"
   integrity sha512-UX6sGumvvqSaXgdKGUsgZWqcUyIXZ/vZTrlRT/iobiKhGL0zL4d3osHj3uqllWJK+i+sixDS/3COVEOFbupFyw==
@@ -4936,14 +4888,14 @@ electron-packager@^17.1.1:
     yargs-parser "^21.1.1"
 
 electron-to-chromium@^1.4.601:
-  version "1.4.644"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.644.tgz#76d9d0a58d9ea05dc675fd7358414efa1116f752"
-  integrity sha512-zOnPndwz3u1sVFSyBcRWcn0529Kz+jr+tDxN9iP69I3CpC5wlvYmjLrK2O7TEsg2oDDoUqooeXqbiHLvXvl6Lg==
+  version "1.4.647"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.647.tgz#3c8d4815e5ed2fbdd37f4ab7333cd9f8fc56d53a"
+  integrity sha512-Z/fTNGwc45WrYQhPaEcz5tAJuZZ8G7S/DBnhS6Kgp4BxnS40Z/HqlJ0hHg3Z79IGVzuVartIlTcjw/cQbPLgOw==
 
 electron@^28.1.0:
-  version "28.1.4"
-  resolved "https://registry.yarnpkg.com/electron/-/electron-28.1.4.tgz#3e1772521d19a8c70162c6c86deb3e57bb28721f"
-  integrity sha512-WE6go611KOhtH6efRPMnVC7FE7DCKnQ3ZyHFeI1DbaCy8OU4UjZ8/CZGcuZmZgRdxSBEHoHdgaJkWRHZzF0FOg==
+  version "28.2.0"
+  resolved "https://registry.yarnpkg.com/electron/-/electron-28.2.0.tgz#ecf7097d4a1e47dd08111c0229a9d03c44f485ad"
+  integrity sha512-22SylXQQ9IHtwLw4D+Z4Si7OUpeDtpHfJVTjy3yv53iLg5zJKKPOCWT4ZwgYGHQZ0eldyBrYBHF/P9FPd2CcVQ==
   dependencies:
     "@electron/get" "^2.0.0"
     "@types/node" "^18.11.18"
@@ -5834,11 +5786,6 @@ flat@^5.0.2:
   resolved "https://registry.yarnpkg.com/flat/-/flat-5.0.2.tgz#8ca6fe332069ffa9d324c327198c598259ceb241"
   integrity sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==
 
-flatbuffers@^1.12.0:
-  version "1.12.0"
-  resolved "https://registry.yarnpkg.com/flatbuffers/-/flatbuffers-1.12.0.tgz#72e87d1726cb1b216e839ef02658aa87dcef68aa"
-  integrity sha512-c7CZADjRcl6j0PlvFy0ZqXQ67qSEZfrVPynmnL+2zPc+NtMvrF8Y0QceMo7QqnSPc7+uWjUIAbvCQ5WIKlMVdQ==
-
 flatted@^3.2.7:
   version "3.2.9"
   resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.9.tgz#7eb4c67ca1ba34232ca9d2d93e9886e611ad7daf"
@@ -6054,9 +6001,9 @@ gauge@^3.0.0:
     wide-align "^1.1.2"
 
 geckodriver@^4.2.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/geckodriver/-/geckodriver-4.3.0.tgz#8586e80ddd23e5d5cd47382d9f6897051ca12ea3"
-  integrity sha512-QfpvxFsMORwKpvnLslkHCr3NTCczHAvkte6+pQGsiUZXKBe6mO4TTb727b+9KMVSK6XZqhR6ZwImKdP+F5vS6A==
+  version "4.3.1"
+  resolved "https://registry.yarnpkg.com/geckodriver/-/geckodriver-4.3.1.tgz#e1b373ca17a9fcbcc9d4e0830f2a50dc94fc83ea"
+  integrity sha512-ol7JLsj55o5k+z7YzeSy2mdJROXMAxIa+uzr3A1yEMr5HISqQOTslE3ZeARcxR4jpAY3fxmHM+sq32qbe/eXfA==
   dependencies:
     "@wdio/logger" "^8.24.12"
     decamelize "^6.0.0"
@@ -6295,11 +6242,6 @@ grapheme-splitter@^1.0.2:
   resolved "https://registry.yarnpkg.com/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz#9cf3a665c6247479896834af35cf1dbb4400767e"
   integrity sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==
 
-guid-typescript@^1.0.9:
-  version "1.0.9"
-  resolved "https://registry.yarnpkg.com/guid-typescript/-/guid-typescript-1.0.9.tgz#e35f77003535b0297ea08548f5ace6adb1480ddc"
-  integrity sha512-Y8T4vYhEfwJOTbouREvG+3XDsjr8E3kIr7uf+JZ0BYloFsttiHU0WfvANVsR7TxNUJa/WpCnw/Ino/p+DeBhBQ==
-
 happy-dom@^11.0.6:
   version "11.2.0"
   resolved "https://registry.yarnpkg.com/happy-dom/-/happy-dom-11.2.0.tgz#4b476deb71707bc7c231e6545cd62a81ef2cf689"
@@ -6582,9 +6524,9 @@ immediate@3.3.0:
   integrity sha512-HR7EVodfFUdQCTIeySw+WDRFJlPcLOJbXfwwZ7Oom6tjsvZ3bOkCDJHehQC3nxJrv7+f9XecwazynjU8e4Vw3Q==
 
 immutable@^4.0.0:
-  version "4.3.4"
-  resolved "https://registry.yarnpkg.com/immutable/-/immutable-4.3.4.tgz#2e07b33837b4bb7662f288c244d1ced1ef65a78f"
-  integrity sha512-fsXeu4J4i6WNWSikpI88v/PcVflZz+6kMhUfIwc5SY+poQRPnaf5V7qds6SUyUN3cVxEzuCab7QIoLOQ+DQ1wA==
+  version "4.3.5"
+  resolved "https://registry.yarnpkg.com/immutable/-/immutable-4.3.5.tgz#f8b436e66d59f99760dc577f5c99a4fd2a5cc5a0"
+  integrity sha512-8eabxkth9gZatlwl5TBuJnCsoTADlL6ftEr7A4qgdaTsPyreilDSnUk57SO+jfKcNtxPa22U5KK6DSeAYhpBJw==
 
 import-meta-resolve@^4.0.0:
   version "4.0.0"
@@ -6704,11 +6646,6 @@ is-arrayish@^0.2.1:
   resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
   integrity sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==
 
-is-arrayish@^0.3.1:
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.3.2.tgz#4574a2ae56f7ab206896fb431eaeed066fdf8f03"
-  integrity sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==
-
 is-bigint@^1.0.1:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.4.tgz#08147a1875bc2b32005d41ccd8291dffc6691df3"
@@ -7365,11 +7302,11 @@ local-pkg@^0.4.3:
   integrity sha512-SFppqq5p42fe2qcZQqqEOiVRXl+WCP1MdT6k7BDEW1j++sp5fIY+/fdRQitvKgB5BrBcmrs5m/L0v2FrU5MY1g==
 
 locate-app@^2.1.0:
-  version "2.2.12"
-  resolved "https://registry.yarnpkg.com/locate-app/-/locate-app-2.2.12.tgz#c9be3bb27f73114eb1262fed80b18ecc9c77e57f"
-  integrity sha512-Q7XVm5cLhLZ5NmulTLRLATC2V33bU/OIyOg+xe7rrEh0l5i/SqS7UJ1jClH466hsn/vRH80RMGssTuEXcEtFxg==
+  version "2.2.13"
+  resolved "https://registry.yarnpkg.com/locate-app/-/locate-app-2.2.13.tgz#6caa36eccc9c0970fd1763f82eb65af5c7fb8b5e"
+  integrity sha512-1jp6iRFrHKBj9vq6Idb0cSjly+KnCIMbxZ2BBKSEzIC4ZJosv47wnLoiJu2EgOAdjhGvNcy/P2fbDCS/WziI8g==
   dependencies:
-    n12 "1.8.15"
+    n12 "1.8.16"
     type-fest "2.13.0"
     userhome "1.0.0"
 
@@ -7509,14 +7446,9 @@ loglevel-plugin-prefix@^0.8.4:
   integrity sha512-WpG9CcFAOjz/FtNht+QJeGpvVl/cdR6P0z6OcXSkr8wFJOsV2GRj2j10JLfjuA4aYkcKCNIEqRGCyTife9R8/g==
 
 loglevel@^1.6.0:
-  version "1.8.1"
-  resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.8.1.tgz#5c621f83d5b48c54ae93b6156353f555963377b4"
-  integrity sha512-tCRIJM51SHjAayKwC+QAg8hT8vg6z7GSgLJKGvzuPb1Wc+hLzqtuVLxp6/HzSPOozuK+8ErAhy7U/sVzw8Dgfg==
-
-long@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/long/-/long-4.0.0.tgz#9a7b71cfb7d361a194ea555241c92f7468d5bf28"
-  integrity sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA==
+  version "1.9.1"
+  resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.9.1.tgz#d63976ac9bcd03c7c873116d41c2a85bafff1be7"
+  integrity sha512-hP3I3kCrDIMuRwAwHltphhDM1r8i55H33GgqjXbrisuJhF4kRhW1dNuxsRklp4bXl8DSdLaNLuiL4A/LWRfxvg==
 
 long@^5.0.0:
   version "5.2.3"
@@ -7546,9 +7478,9 @@ lowercase-keys@^3.0.0:
   integrity sha512-ozCC6gdQ+glXOQsveKD0YsDy8DSQFjDTz4zyzEHNV5+JP5D62LmfDZ6o1cycFx9ouG940M5dE8C8CTewdj2YWQ==
 
 lru-cache@^10.0.1, "lru-cache@^9.1.1 || ^10.0.0":
-  version "10.1.0"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-10.1.0.tgz#2098d41c2dc56500e6c88584aa656c84de7d0484"
-  integrity sha512-/1clY/ui8CzjKFyjdvwPWJUYKiFVXG2I2cY0ssG7h4+hwk+XOIX7ZSG9Q7TW8TW3Kp3BUSqgFWBLgL4PJ+Blag==
+  version "10.2.0"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-10.2.0.tgz#0bd445ca57363465900f4d1f9bd8db343a4d95c3"
+  integrity sha512-2bIM8x+VAf6JT4bKAljS1qUWgMsqZRPGJS6FSahIMPVvctcNhyVp7AJu7quxOW9jwkryBReKZY5tY5JYv2n/7Q==
 
 lru-cache@^5.1.1:
   version "5.1.1"
@@ -7874,10 +7806,10 @@ mz@^2.7.0:
     object-assign "^4.0.1"
     thenify-all "^1.0.0"
 
-n12@1.8.15:
-  version "1.8.15"
-  resolved "https://registry.yarnpkg.com/n12/-/n12-1.8.15.tgz#e215e05281674a572fe80eea16814ddf34bfbb6c"
-  integrity sha512-NfEtjNrmF/cU9IEg2qE138WGX/cklVfUqduWzIRs0mkRvLXo8mxm7y5ufqUCg3z1bulc83LgRwehhAnTApBHKw==
+n12@1.8.16:
+  version "1.8.16"
+  resolved "https://registry.yarnpkg.com/n12/-/n12-1.8.16.tgz#08c631cecb42d5f64e202c8235d38a0ff56d7528"
+  integrity sha512-CZqHAqbzS0UsaUGkMsL+lMaYLyFr1+/ea+pD8dMziqSjkcuWVWDtgWx9phyfT7C3llqQ2+LwnStSb5afggBMfA==
 
 nan@^2.17.0:
   version "2.18.0"
@@ -7895,9 +7827,9 @@ napi-build-utils@^1.0.1:
   integrity sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg==
 
 native-run@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/native-run/-/native-run-2.0.0.tgz#58d4d41855141ec877aa7322bd9af4bae4c31eeb"
-  integrity sha512-NKOoSLt3Xi7EDxo62ii7i6IBpQ8EAOwli8EZooPWeAUPP9Vwsptm5khbeSKBSjlIE4XOtuG24QJQEGqy//HFbA==
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/native-run/-/native-run-2.0.1.tgz#a9b213c32824b007cbdd0279e0edd3c24bcc2f7a"
+  integrity sha512-XfG1FBZLM50J10xH9361whJRC9SHZ0Bub4iNRhhI61C8Jv0e1ud19muex6sNKB51ibQNUJNuYn25MuYET/rE6w==
   dependencies:
     "@ionic/utils-fs" "^3.1.7"
     "@ionic/utils-terminal" "^2.3.4"
@@ -7949,11 +7881,6 @@ node-addon-api@^4.3.0:
   resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-4.3.0.tgz#52a1a0b475193e0928e98e0426a0d1254782b77f"
   integrity sha512-73sE9+3UaLYYFmDsFZnqCInzPyh3MqIwZO9cw58yIqAZhONrrabrYyYe3TuIqtIiOuTXVhsGau8hcrhhwSsDIQ==
 
-node-addon-api@^6.1.0:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-6.1.0.tgz#ac8470034e58e67d0c6f1204a18ae6995d9c0d76"
-  integrity sha512-+eawOlIgy680F0kBzPUNFhMZGtJ1YmqM6l4+Crf4IkImjYrO/mqPwRMh352g23uIaQKFItcQ64I7KMaJxHgAVA==
-
 node-domexception@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/node-domexception/-/node-domexception-1.0.0.tgz#6888db46a1f71c0b76b3f7555016b63fe64766e5"
@@ -8127,37 +8054,6 @@ onetime@^6.0.0:
   dependencies:
     mimic-fn "^4.0.0"
 
-onnx-proto@^4.0.4:
-  version "4.0.4"
-  resolved "https://registry.yarnpkg.com/onnx-proto/-/onnx-proto-4.0.4.tgz#2431a25bee25148e915906dda0687aafe3b9e044"
-  integrity sha512-aldMOB3HRoo6q/phyB6QRQxSt895HNNw82BNyZ2CMh4bjeKv7g/c+VpAFtJuEMVfYLMbRx61hbuqnKceLeDcDA==
-  dependencies:
-    protobufjs "^6.8.8"
-
-onnxruntime-common@~1.14.0:
-  version "1.14.0"
-  resolved "https://registry.yarnpkg.com/onnxruntime-common/-/onnxruntime-common-1.14.0.tgz#2bb5dac5261269779aa5fb6536ca379657de8bf6"
-  integrity sha512-3LJpegM2iMNRX2wUmtYfeX/ytfOzNwAWKSq1HbRrKc9+uqG/FsEA0bbKZl1btQeZaXhC26l44NWpNUeXPII7Ew==
-
-onnxruntime-node@1.14.0:
-  version "1.14.0"
-  resolved "https://registry.yarnpkg.com/onnxruntime-node/-/onnxruntime-node-1.14.0.tgz#c4ae6c355cfae7d83abaf36dd39a905c4a010217"
-  integrity sha512-5ba7TWomIV/9b6NH/1x/8QEeowsb+jBEvFzU6z0T4mNsFwdPqXeFUM7uxC6QeSRkEbWu3qEB0VMjrvzN/0S9+w==
-  dependencies:
-    onnxruntime-common "~1.14.0"
-
-onnxruntime-web@1.14.0:
-  version "1.14.0"
-  resolved "https://registry.yarnpkg.com/onnxruntime-web/-/onnxruntime-web-1.14.0.tgz#c8cee538781b1d4c1c6b043934f4a3e6ddf1466e"
-  integrity sha512-Kcqf43UMfW8mCydVGcX9OMXI2VN17c0p6XvR7IPSZzBf/6lteBzXHvcEVWDPmCKuGombl997HgLqj91F11DzXw==
-  dependencies:
-    flatbuffers "^1.12.0"
-    guid-typescript "^1.0.9"
-    long "^4.0.0"
-    onnx-proto "^4.0.4"
-    onnxruntime-common "~1.14.0"
-    platform "^1.3.6"
-
 open@^8.4.0:
   version "8.4.2"
   resolved "https://registry.yarnpkg.com/open/-/open-8.4.2.tgz#5b5ffe2a8f793dcd2aad73e550cb87b59cb084f9"
@@ -8508,11 +8404,6 @@ pkg-up@^3.1.0:
   dependencies:
     find-up "^3.0.0"
 
-platform@^1.3.6:
-  version "1.3.6"
-  resolved "https://registry.yarnpkg.com/platform/-/platform-1.3.6.tgz#48b4ce983164b209c2d45a107adb31f473a6e7a7"
-  integrity sha512-fnWVljUchTro6RiCFvCXBbNhJc2NijN7oIQxbwsyL0buWJPG85v81ehlHI9fXrJsMNgTofEoWIQeClKpgxFLrg==
-
 playwright-core@1.41.1:
   version "1.41.1"
   resolved "https://registry.yarnpkg.com/playwright-core/-/playwright-core-1.41.1.tgz#9c152670010d9d6f970f34b68e3e935d3c487431"
@@ -8611,7 +8502,7 @@ pouchdb-browser@^8.0.1:
     uuid "8.3.2"
     vuvuzela "1.0.3"
 
-prebuild-install@^7.0.1, prebuild-install@^7.1.1:
+prebuild-install@^7.0.1:
   version "7.1.1"
   resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-7.1.1.tgz#de97d5b34a70a0c81334fd24641f2a1702352e45"
   integrity sha512-jAXscXWMcCK8GgCoHOfIr0ODh5ai8mj63L2nWrjuAgXE6tDyYGnx4/8o/rCgU+B4JSyZBKbeZqzhtwtC3ovxjw==
@@ -8686,25 +8577,6 @@ proto-list@~1.2.1:
   resolved "https://registry.yarnpkg.com/proto-list/-/proto-list-1.2.4.tgz#212d5bfe1318306a420f6402b8e26ff39647a849"
   integrity sha512-vtK/94akxsTMhe0/cbfpR+syPuszcuwhqVjJq26CuNDgFGj682oRBXOP5MJpv2r7JtE8MsiepGIqvvOTBwn2vA==
 
-protobufjs@^6.8.8:
-  version "6.11.4"
-  resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-6.11.4.tgz#29a412c38bf70d89e537b6d02d904a6f448173aa"
-  integrity sha512-5kQWPaJHi1WoCpjTGszzQ32PG2F4+wRY6BmAT4Vfw56Q2FZ4YZzK20xUYQH4YkfehY1e6QSICrJquM6xXZNcrw==
-  dependencies:
-    "@protobufjs/aspromise" "^1.1.2"
-    "@protobufjs/base64" "^1.1.2"
-    "@protobufjs/codegen" "^2.0.4"
-    "@protobufjs/eventemitter" "^1.1.0"
-    "@protobufjs/fetch" "^1.1.0"
-    "@protobufjs/float" "^1.0.2"
-    "@protobufjs/inquire" "^1.1.0"
-    "@protobufjs/path" "^1.1.2"
-    "@protobufjs/pool" "^1.1.0"
-    "@protobufjs/utf8" "^1.1.0"
-    "@types/long" "^4.0.1"
-    "@types/node" ">=13.7.0"
-    long "^4.0.0"
-
 protobufjs@^7.2.4:
   version "7.2.6"
   resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-7.2.6.tgz#4a0ccd79eb292717aacf07530a07e0ed20278215"
@@ -8807,9 +8679,9 @@ qs@~6.5.2:
   integrity sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==
 
 quasar@^2.13.1:
-  version "2.14.2"
-  resolved "https://registry.yarnpkg.com/quasar/-/quasar-2.14.2.tgz#794d8434eb449549fc8455aaec9bc14b71a57c98"
-  integrity sha512-f5KliWtM5BEuFsDU4yvuP+dlVIWZNrGu5VpWFsxzjpoykcP4B2HIOUiCl3mx2NCqERHd4Ts0aeioRkt9TTeExA==
+  version "2.14.3"
+  resolved "https://registry.yarnpkg.com/quasar/-/quasar-2.14.3.tgz#0956f6bcdc9ce5a76728e1d7b235e9ce963f1d89"
+  integrity sha512-7WzbtZxykLn2ic5oNpepZ2ZjDVpmxyVD4KC9rWe+Ia+4Er61svGr4jOuttN+Ok7IerLSCmKIRyjQMgasF60rFA==
 
 query-selector-shadow-dom@^1.0.0:
   version "1.0.1"
@@ -9525,20 +9397,6 @@ shallow-clone@^3.0.0:
   dependencies:
     kind-of "^6.0.2"
 
-sharp@^0.32.0:
-  version "0.32.6"
-  resolved "https://registry.yarnpkg.com/sharp/-/sharp-0.32.6.tgz#6ad30c0b7cd910df65d5f355f774aa4fce45732a"
-  integrity sha512-KyLTWwgcR9Oe4d9HwCwNM2l7+J0dUQwn/yf7S0EnTtb0eVS4RxO0eUSvxPtzT4F3SY+C4K6fqdv/DO27sJ/v/w==
-  dependencies:
-    color "^4.2.3"
-    detect-libc "^2.0.2"
-    node-addon-api "^6.1.0"
-    prebuild-install "^7.1.1"
-    semver "^7.5.4"
-    simple-get "^4.0.1"
-    tar-fs "^3.0.4"
-    tunnel-agent "^0.6.0"
-
 shebang-command@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea"
@@ -9615,13 +9473,6 @@ simple-get@^4.0.0, simple-get@^4.0.1:
     once "^1.3.1"
     simple-concat "^1.0.0"
 
-simple-swizzle@^0.2.2:
-  version "0.2.2"
-  resolved "https://registry.yarnpkg.com/simple-swizzle/-/simple-swizzle-0.2.2.tgz#a4da6b635ffcccca33f70d17cb92592de95e557a"
-  integrity sha512-JA//kQgZtbuY83m+xT+tXJkmJncGMTFT+C+g2h2R9uxkYIrE2yy9sgmcLhCnw57/WSD+Eh3J97FPEDFnbXnDUg==
-  dependencies:
-    is-arrayish "^0.3.1"
-
 sirv@^2.0.3:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/sirv/-/sirv-2.0.4.tgz#5dd9a725c578e34e449f332703eb2a74e46a29b0"
@@ -10756,35 +10607,35 @@ web-streams-polyfill@^3.0.3:
   resolved "https://registry.yarnpkg.com/web-streams-polyfill/-/web-streams-polyfill-3.3.2.tgz#32e26522e05128203a7de59519be3c648004343b"
   integrity sha512-3pRGuxRF5gpuZc0W+EpwQRmCD7gRqcDOMt688KmdlDAgAyaB1XlN0zq2njfDNm44XVdIouE7pZ6GzbdyH47uIQ==
 
-webdriver@8.29.0:
-  version "8.29.0"
-  resolved "https://registry.yarnpkg.com/webdriver/-/webdriver-8.29.0.tgz#485592e4eb980aaaedbf01b2df15f7dbe97149eb"
-  integrity sha512-6vWTaj7beboU83LU5XyfLGiwoG8rcFSKeEOxVO9VjBp8c9QML9K21ODrlsgJKHhPiKQp0epnjwWedJgr57LkRA==
+webdriver@8.29.1:
+  version "8.29.1"
+  resolved "https://registry.yarnpkg.com/webdriver/-/webdriver-8.29.1.tgz#85f636b9d5e86f50b6b9da01ea1caff89fbed176"
+  integrity sha512-D3gkbDUxFKBJhNHRfMriWclooLbNavVQC1MRvmENAgPNKaHnFn+M+WtP9K2sEr0XczLGNlbOzT7CKR9K5UXKXA==
   dependencies:
     "@types/node" "^20.1.0"
     "@types/ws" "^8.5.3"
-    "@wdio/config" "8.29.0"
+    "@wdio/config" "8.29.1"
     "@wdio/logger" "8.28.0"
     "@wdio/protocols" "8.24.12"
-    "@wdio/types" "8.29.0"
-    "@wdio/utils" "8.29.0"
+    "@wdio/types" "8.29.1"
+    "@wdio/utils" "8.29.1"
     deepmerge-ts "^5.1.0"
     got "^12.6.1"
     ky "^0.33.0"
     ws "^8.8.0"
 
-webdriverio@8.29.0, webdriverio@^8.27.0:
-  version "8.29.0"
-  resolved "https://registry.yarnpkg.com/webdriverio/-/webdriverio-8.29.0.tgz#da0efa5b2c1dad8b849d4b490cc63c46a8917370"
-  integrity sha512-/04fUBQ8lrn+5wMaMqMsSenuqpCIe+9bAUTEQnyd0u04LJ+foeSGtv/jYbNZLhrQA2CfiwW6ozsEQnHO9pBFcg==
+webdriverio@8.29.1, webdriverio@^8.27.0:
+  version "8.29.1"
+  resolved "https://registry.yarnpkg.com/webdriverio/-/webdriverio-8.29.1.tgz#6765f1f2869fc4929e6c49a6ff5498d076505608"
+  integrity sha512-NZK95ivXCqdPraB3FHMw6ByxnCvtgFXkjzG2l3Oq5z0IuJS2aMow3AKFIyiuG6is/deGCe+Tb8eFTCqak7UV+w==
   dependencies:
     "@types/node" "^20.1.0"
-    "@wdio/config" "8.29.0"
+    "@wdio/config" "8.29.1"
     "@wdio/logger" "8.28.0"
     "@wdio/protocols" "8.24.12"
     "@wdio/repl" "8.24.12"
-    "@wdio/types" "8.29.0"
-    "@wdio/utils" "8.29.0"
+    "@wdio/types" "8.29.1"
+    "@wdio/utils" "8.29.1"
     archiver "^6.0.0"
     aria-query "^5.0.0"
     css-shorthand-properties "^1.1.1"
@@ -10801,7 +10652,7 @@ webdriverio@8.29.0, webdriverio@^8.27.0:
     resq "^1.9.1"
     rgb2hex "0.2.5"
     serialize-error "^11.0.1"
-    webdriver "8.29.0"
+    webdriver "8.29.1"
 
 webidl-conversions@^3.0.0:
   version "3.0.1"