diff --git a/src/App.vue b/src/App.vue
index 73af824e..e862e0ad 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -4,19 +4,14 @@
 
 <script setup lang="ts">
 
-import {LocalStorage, setCssVar, useQuasar} from "quasar";
+import {setCssVar, 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, CURRENT_USER_ID} from "boot/constants";
-import {useSuggestionsStore} from "stores/suggestionsStore";
-import {StaticSuggestionIdent, Suggestion} from "src/models/Suggestion";
+import {onAuthStateChanged} from "firebase/auth";
+import {CURRENT_USER_ID} from "boot/constants";
 import {useRouter} from "vue-router";
-import {collection, doc, getDoc, getDocs} from "firebase/firestore";
-import {Account, UserData} from "src/models/Account";
-import FirebaseService from "src/services/firebase/FirebaseService";
+import FirebaseServices from "src/services/firebase/FirebaseServices";
 import {useNotificationHandler} from "src/services/ErrorHandler";
 
 const $q = useQuasar()
@@ -28,8 +23,8 @@ const {handleError} = useNotificationHandler()
 const emitter = new EventEmitter()
 emitter.setMaxListeners(12)
 
-FirebaseService.init()
-const auth = FirebaseService.getAuth()
+FirebaseServices.init()
+const auth = FirebaseServices.getAuth()
 
 onAuthStateChanged(auth, async (user) => {
   if (user) {
@@ -58,31 +53,6 @@ onAuthStateChanged(auth, async (user) => {
   }
 });
 
-if (isSignInWithEmailLink(auth, window.location.href)) {
-
-  console.log("%cfound sign-in-with-email-link location", window.location.href)
-
-  const emailForSignIn = LocalStorage.getItem(CURRENT_USER_EMAIL) as string
-
-  console.log(">>> isSignInWithEmailLink", emailForSignIn)
-  signInWithEmailLink(auth, emailForSignIn, window.location.href)
-    .then((result: UserCredential) => {
-      console.log(">>> result", result)
-      //chrome.runtime.sendMessage({ type: 'SET_EMAIL_FOR_SIGN_IN', "email":"email" });
-      useAuthStore().setUser(result.user)
-      //useAuthStore().authenticated = true
-
-
-      logtail.info("found email link redirection")
-    })
-    .catch((error) => {
-      console.error("error in email link redirection", error)
-      logtail.error("error in email link redirection", error)
-      useSuggestionsStore().addSuggestion(Suggestion.getStaticSuggestion(StaticSuggestionIdent.RESTART_SUGGESTED))
-    });
-
-}
-
 const useDarkMode: string = $q.localStorage.getItem('darkMode') || "false" as string
 if (useDarkMode === "true") {
   $q.dark.set(true)
@@ -109,20 +79,14 @@ 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,
-  "version": import.meta.env.PACKAGE_VERSION,
-})
+logtail.info(`tabsets started: mode=${process.env.MODE}, version=${import.meta.env.PACKAGE_VERSION}`)
 
 </script>
diff --git a/src/boot/firebaseConnection.ts b/src/boot/firebaseConnection.ts
index c2fa5496..4db4b36a 100644
--- a/src/boot/firebaseConnection.ts
+++ b/src/boot/firebaseConnection.ts
@@ -1,6 +1,6 @@
 //import FirebaseService from '../services/firebase/FirebaseService'
 
-import FirebaseService from "src/services/firebase/FirebaseService";
+import FirebaseService from "src/services/firebase/FirebaseServices";
 import {boot} from "quasar/wrappers";
 
 // export default async () => {
diff --git a/src/components/SidePanelFooter.vue b/src/components/SidePanelFooter.vue
index 1aecd36f..8545bae7 100644
--- a/src/components/SidePanelFooter.vue
+++ b/src/components/SidePanelFooter.vue
@@ -121,7 +121,7 @@
           </q-menu>
         </span>
 
-        <span class="q-my-xs q-ml-xs q-mr-none cursor-pointer" v-if="authStore.isAuthenticated()">
+        <span class="q-my-xs q-ml-xs q-mr-none cursor-pointer" v-if="authStore.isAuthenticated() && useSettingsStore().isEnabled('dev')">
           <q-avatar size="18px" v-if="authStore.user?.photoURL">
             <q-img :src="authStore.user.photoURL"/>
             <q-tooltip :delay="2000" anchor="center left" self="center right" class="tooltip-small">You're logged in as {{
@@ -149,7 +149,7 @@
 
           </q-menu>
         </span>
-        <q-btn v-else
+        <q-btn v-else-if="useSettingsStore().isEnabled('dev')"
                icon="login"
                :class="rightButtonClass()"
                flat
@@ -189,6 +189,7 @@ import SidePanelLoginWidget from "components/helper/SidePanelLoginWidget.vue";
 import SidePanelWindowMarkupTable from "components/helper/SidePanelWindowMarkupTable.vue";
 import SidePanelStatsMarkupTable from "components/helper/SidePanelStatsMarkupTable.vue"
 import {Window} from "src/models/Window"
+import {useSettingsStore} from "stores/settingsStore";
 
 const {handleSuccess, handleError} = useNotificationHandler()
 
diff --git a/src/components/helper/SidePanelStatsMarkupTable.vue b/src/components/helper/SidePanelStatsMarkupTable.vue
index 71c2267b..bb99815f 100644
--- a/src/components/helper/SidePanelStatsMarkupTable.vue
+++ b/src/components/helper/SidePanelStatsMarkupTable.vue
@@ -10,10 +10,16 @@
           <span v-if="!statsSnapshot"
                 class="cursor-pointer"
                 @click="saveStatsSnapshot()"><q-icon name="save" class="q-mr-xs"/>Save snapshot
+            <q-tooltip class="tooltip-small">
+              Store the current numbers for comparison
+            </q-tooltip>
           </span>
-          <span v-else
-                class="cursor-pointer"><q-icon name="restart_alt" class="q-mr-xs cursor-pointer"
-                                               @click="saveStatsSnapshot()"/>{{ snapshotDate() }}
+          <span v-else>
+                <span class="cursor-pointer">
+                  <q-icon name="restart_alt" class="q-mr-xs cursor-pointer" @click="saveStatsSnapshot()">
+                    <q-tooltip class="tooltip-small">Reset Snapshot Counters</q-tooltip>
+                  </q-icon>
+                </span>{{ snapshotDate() }}
           </span>
         </th>
         <th style="max-width:20px">
@@ -23,7 +29,7 @@
       </thead>
 
       <tbody>
-      <tr v-for="row in rows" style="max-height:15px">
+      <tr v-for="row in rows" :key="row['id' as keyof object]" style="max-height:15px">
         <td class="text-left">
             <span class="cursor-pointer" :data-testid="'windowDataColumn_name_' + row['id' as keyof object]">
                 {{ row['name' as keyof object] }}
@@ -82,15 +88,15 @@ const devMode = ref<boolean>(settingsStore.isEnabled('dev'))
 
 onMounted(() => {
   statsSnapshot.value = localstorage.getItem("stats") as object || undefined
-  rows.value = calcWindowRows()
+  rows.value = calcStatsRows()
 })
 
 watch(() => useWindowsStore().currentChromeWindows, (newWindows, oldWindows) => {
-  rows.value = calcWindowRows()
+  rows.value = calcStatsRows()
 })
 
 watch(() => useTabsStore().allTabsCount, (a,b) => {
-  rows.value = calcWindowRows()
+  rows.value = calcStatsRows()
 })
 
 
@@ -102,14 +108,14 @@ watchEffect(() => {
 })
 
 watch(() => useTabsStore().tabsCount, (a, b) => {
-  rows.value = calcWindowRows()
+  rows.value = calcStatsRows()
 })
 
 watch(() => useWindowsStore().currentChromeWindows, (a, b) => {
-  rows.value = calcWindowRows()
+  rows.value = calcStatsRows()
 })
 
-const calcWindowRows = () => {
+const calcStatsRows = () => {
   return [
     {name: 'Tabs', count: useTabsStore().allTabsCount, snapshot: getFromSnapshot('Tabs')},
     {name: 'Tabsets', count: useTabsStore().tabsets.size, snapshot: getFromSnapshot('Tabsets')},
@@ -127,11 +133,13 @@ const calcWindowRows = () => {
 }
 
 const saveStatsSnapshot = () => {
-  localstorage.set("stats", {
+  const newStats = {
     date: new Date().getTime().toString(),
-    values: calcWindowRows()
-  })
-  rows.value = calcWindowRows()
+    values: calcStatsRows()
+  }
+  localstorage.set("stats", newStats)
+  statsSnapshot.value = newStats
+  rows.value = calcStatsRows()
 }
 
 const getFromSnapshot = (ident: string) => {
@@ -150,8 +158,11 @@ const getFromSnapshot = (ident: string) => {
 }
 
 const snapshotDate = () => {
-  const tstamp: string = statsSnapshot.value['date' as keyof object] as string
-  return date.formatDate(Number(tstamp), 'DD.MM.YY HH:mm')
+  if (statsSnapshot.value) {
+    const tstamp: string = statsSnapshot.value['date' as keyof object] as string
+    return date.formatDate(Number(tstamp), 'DD.MM.YY HH:mm')
+  }
+  return "---"
 }
 
 </script>
diff --git a/src/models/AppFeatures.ts b/src/models/AppFeatures.ts
index f8da2fee..3211514c 100644
--- a/src/models/AppFeatures.ts
+++ b/src/models/AppFeatures.ts
@@ -5,7 +5,7 @@ import {AppFeature, FeatureIdent, FeatureType} from "src/models/AppFeature"
 
 export class AppFeatures {
   features: AppFeature[] = [
-    new AppFeature(FeatureIdent.HELP, FeatureType.EXPERIMENTAL, 'Help Pages', 'o_help', ['bex']),
+    //new AppFeature(FeatureIdent.HELP, FeatureType.EXPERIMENTAL, 'Help Pages', 'o_help', ['bex']),
 
     new AppFeature(FeatureIdent.BOOKMARKS, FeatureType.OPTIONAL, 'Bookmarks', 'o_bookmarks', ['bex'])
       .setActivateCommands([new GrantPermissionCommand('bookmarks')])
@@ -75,7 +75,7 @@ export class AppFeatures {
     new AppFeature(FeatureIdent.TAB_HELPER, FeatureType.EXPERIMENTAL, 'Tab Helper', 'o_article', ['bex']),
 
     new AppFeature(FeatureIdent.AUTO_TAB_SWITCHER, FeatureType.EXPERIMENTAL, 'Auto Tab Switcher', 'o_switch_left', ['bex']),
-    new AppFeature(FeatureIdent.TABS_AS_TREE, FeatureType.EXPERIMENTAL, 'Tabs in Tree View', 'o_account_tree', ['all']),
+    //new AppFeature(FeatureIdent.TABS_AS_TREE, FeatureType.EXPERIMENTAL, 'Tabs in Tree View', 'o_account_tree', ['all']),
     new AppFeature(FeatureIdent.TABSET_SUBFOLDER, FeatureType.EXPERIMENTAL, 'Subfolder for Tabsets', 'o_folder', ['all']),
     new AppFeature(FeatureIdent.TABSETS_SHARING, FeatureType.EXPERIMENTAL, 'Sharing Tabsets', 'o_ios_share', ['all'])
   ]
diff --git a/src/pages/SettingsPage.vue b/src/pages/SettingsPage.vue
index 2f09b19e..818c3094 100644
--- a/src/pages/SettingsPage.vue
+++ b/src/pages/SettingsPage.vue
@@ -30,11 +30,12 @@
       <!--      <q-tab name="ignored" label="Ignored Urls"/>-->
       <q-tab name="archived" label="Archived Tabsets"
              v-if="usePermissionsStore().hasFeature(FeatureIdent.ARCHIVE_TABSET)"/>
-      <q-tab name="search" label="Search Engine" v-if="devEnabled"/>
+      <q-tab name="search" label="Search Engine" v-if="useSettingsStore().isEnabled('dev')"/>
       <q-tab name="importExport" label="Import/Export"/>
-      <q-tab name="internals" label="Internals" v-if="devEnabled"/>
-      <q-tab name="featureToggles" label="Feature Toggles"
-             :class="useAuthStore().userMayAccess(AccessItem.FEATURE_TOGGLES) ? 'text-primary':'text-grey'"/>
+      <q-tab name="internals" label="Internals" v-if="useSettingsStore().isEnabled('dev')"/>
+<!--      <q-tab name="featureToggles" label="Feature Toggles"-->
+<!--             :class="useAuthStore().userMayAccess(AccessItem.FEATURE_TOGGLES) ? 'text-primary':'text-grey'"/>-->
+      <q-tab name="featureToggles" label="Feature Toggles" />
     </q-tabs>
   </div>
 
@@ -147,7 +148,7 @@
         </div>
       </div>
 
-      <div class="row items-baseline q-ma-md q-gutter-md" v-if="devEnabled">
+      <div class="row items-baseline q-ma-md q-gutter-md" v-if="useSettingsStore().isEnabled('dev')">
         <div class="col-3">
           New Version Simulation
         </div>
@@ -159,7 +160,7 @@
         </div>
       </div>
 
-      <div class="row items-baseline q-ma-md q-gutter-md" v-if="devEnabled">
+      <div class="row items-baseline q-ma-md q-gutter-md" v-if="useSettingsStore().isEnabled('dev')">
         <div class="col-3">
           New Suggestion Simulation
         </div>
@@ -385,34 +386,7 @@
   </div>
 
   <div v-if="tab === 'featureToggles'">
-
-    <div class="q-pa-md q-gutter-sm">
-
-      <q-banner v-if="!useAuthStore().userMayAccess(AccessItem.FEATURE_TOGGLES)" rounded style="border:1px solid orange">
-        To use feature toggles, you need to have a (free) account.
-      </q-banner>
-      <template v-else>
-        <q-banner rounded style="border:1px solid orange">Switch on experimental features (or off). These feature toggles
-          are meant for developers
-          only as they might break functionality and/or destroy data. Once they are considered 'safe enough', they will
-          be
-          available at the
-          "experimental features" view on the left.
-        </q-banner>
-
-        <div class="row q-pa-md">
-          <div class="col-3"><b>Developer Mode</b></div>
-          <div class="col-3">activates a couple of experimental features and debug insights. You should only use this
-            if you can live with loosing data.
-          </div>
-          <div class="col-1"></div>
-          <div class="col-5">
-            <q-toggle v-model="devEnabled" @click="updateSettings('dev', devEnabled)"/>
-          </div>
-        </div>
-      </template>
-    </div>
-
+      <FeatureToggleSettings />
   </div>
 
 </template>
@@ -461,6 +435,7 @@ import {AccessItem, useAuthStore} from "stores/authStore";
 import SharingSettings from "pages/helper/SharingSettings.vue";
 import AccountSettings from "pages/helper/AccountSettings.vue";
 import InfoLine from "pages/helper/InfoLine.vue";
+import FeatureToggleSettings from "pages/helper/FeatureToggleSettings.vue";
 
 const {sendMsg, inBexMode} = useUtils()
 
@@ -477,7 +452,6 @@ useUiStore().rightDrawerSetActiveTab(DrawerTabs.FEATURES)
 const view = ref('grid')
 const indexSize = ref(0)
 
-const devEnabled = ref<boolean>(settingsStore.isEnabled('dev'))
 const ddgEnabled = ref<boolean>(!settingsStore.isEnabled('noDDG'))
 const ignoreExtensionsEnabled = ref<boolean>(!settingsStore.isEnabled('extensionsAsTabs'))
 const permissionsList = ref<string[]>([])
@@ -526,7 +500,6 @@ let suggestionsCounter = 0
 
 watchEffect(() => {
   //console.log("watching settingsStore.activeToggles...", settingsStore.activeToggles)
-  devEnabled.value = settingsStore.isEnabled('dev')
   ddgEnabled.value = settingsStore.isEnabled('noDDG')
   ignoreExtensionsEnabled.value = settingsStore.isEnabled('extensionsAsTabs')
 })
@@ -669,12 +642,5 @@ const simulateStaticSuggestion = () => {
 
 const setTab = (a: any) => tab.value = a['tab' as keyof object]
 
-const updateSettings = (ident: string, val: boolean) => {
-  console.log("settings updated to", ident, val)
-  settingsStore.setFeatureToggle(ident, val)
-}
-
-const stageIdentifier = () => process.env.TABSETS_STAGE !== 'PRD' ? '(' + process.env.TABSETS_STAGE + ')' : ''
-
 </script>
 
diff --git a/src/pages/SidePanelPage.vue b/src/pages/SidePanelPage.vue
index 4f84f565..c24fe8ba 100644
--- a/src/pages/SidePanelPage.vue
+++ b/src/pages/SidePanelPage.vue
@@ -1,29 +1,29 @@
 <template>
-  <VOnboardingWrapper ref="wrapper" :steps="steps">
-    <template #default="{ previous, next, step, exit, isFirst, isLast, index }">
-      <VOnboardingStep>
-        <div class="welcome-tooltip-container">
-          <div class="tooltip">
-            <div class="row">
-              <div class="col-12 q-ma-none q-my-sm">
-                <span class="text-subtitle1" v-if="step.content.title">{{ step.content.title }}</span>
-              </div>
-            </div>
-            <div class="row">
-              <div class="col-12 q-ma-none text-caption">
-                <span v-if="step.content.description">{{ step.content.description }}</span>
-              </div>
-            </div>
-            <div class="row">
-              <div class="col-12 q-ma-none text-right">
-                <q-btn label="got it" flat dense @click="finish()"/>
-              </div>
-            </div>
-          </div>
-        </div>
-      </VOnboardingStep>
-    </template>
-  </VOnboardingWrapper>
+<!--  <VOnboardingWrapper ref="wrapper" :steps="steps">-->
+<!--    <template #default="{ previous, next, step, exit, isFirst, isLast, index }">-->
+<!--      <VOnboardingStep>-->
+<!--        <div class="welcome-tooltip-container">-->
+<!--          <div class="tooltip">-->
+<!--            <div class="row">-->
+<!--              <div class="col-12 q-ma-none q-my-sm">-->
+<!--                <span class="text-subtitle1" v-if="step.content.title">{{ step.content.title }}</span>-->
+<!--              </div>-->
+<!--            </div>-->
+<!--            <div class="row">-->
+<!--              <div class="col-12 q-ma-none text-caption">-->
+<!--                <span v-if="step.content.description">{{ step.content.description }}</span>-->
+<!--              </div>-->
+<!--            </div>-->
+<!--            <div class="row">-->
+<!--              <div class="col-12 q-ma-none text-right">-->
+<!--                <q-btn label="got it" flat dense @click="finish()"/>-->
+<!--              </div>-->
+<!--            </div>-->
+<!--          </div>-->
+<!--        </div>-->
+<!--      </VOnboardingStep>-->
+<!--    </template>-->
+<!--  </VOnboardingWrapper>-->
 
   <q-page style="padding-top: 50px">
 
@@ -34,40 +34,40 @@
       </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>
-              <Transition appear>
-                <SidePanelToolbarButton
-                  icon="o_add_circle"
-                  color="warning"/>
-              </Transition>
-            </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"/>
-            </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>
+<!--    <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>-->
+<!--              <Transition appear>-->
+<!--                <SidePanelToolbarButton-->
+<!--                  icon="o_add_circle"-->
+<!--                  color="warning"/>-->
+<!--              </Transition>-->
+<!--            </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"/>-->
+<!--            </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">
diff --git a/src/pages/SidePanelSearchPage.vue b/src/pages/SidePanelSearchPage.vue
index e5e2724c..aade7094 100644
--- a/src/pages/SidePanelSearchPage.vue
+++ b/src/pages/SidePanelSearchPage.vue
@@ -27,7 +27,7 @@
     </div>
 
     <!-- place QPageSticky at end of page -->
-    <q-page-sticky expand position="top">
+    <q-page-sticky expand position="top" class="darkInDarkMode brightInBrightMode">
 
       <FirstToolbarHelper
           :show-search-box="true"
diff --git a/src/pages/SidePanelSpacesPage.vue b/src/pages/SidePanelSpacesPage.vue
index e50768cc..2ab017f6 100644
--- a/src/pages/SidePanelSpacesPage.vue
+++ b/src/pages/SidePanelSpacesPage.vue
@@ -107,7 +107,7 @@
     </div>
 
     <!-- place QPageSticky at end of page -->
-    <q-page-sticky expand position="top">
+    <q-page-sticky expand position="top" class="darkInDarkMode brightInBrightMode">
 
       <FirstToolbarHelper
           @was-clicked="useUiStore().sidePanelSetActiveView(SidePanelView.MAIN)"
diff --git a/src/pages/SidePanelTabsetPage.vue b/src/pages/SidePanelTabsetPage.vue
index fdc01e42..31bb9894 100644
--- a/src/pages/SidePanelTabsetPage.vue
+++ b/src/pages/SidePanelTabsetPage.vue
@@ -13,7 +13,7 @@
     </div>
 
     <!-- place QPageSticky at end of page -->
-    <q-page-sticky expand position="top">
+    <q-page-sticky expand position="top" class="darkInDarkMode brightInBrightMode">
 
       <FirstToolbarHelper>
 
diff --git a/src/pages/SubscribePage.vue b/src/pages/SubscribePage.vue
index 891c1a7c..6720662b 100644
--- a/src/pages/SubscribePage.vue
+++ b/src/pages/SubscribePage.vue
@@ -26,7 +26,7 @@
       </PricingCard>
     </div>
 
-    <q-page-sticky expand position="top">
+    <q-page-sticky expand position="top" class="darkInDarkMode brightInBrightMode">
 
       <FirstToolbarHelper
         :showSearchBox="false">
diff --git a/src/pages/TryPro.vue b/src/pages/TryPro.vue
deleted file mode 100644
index 45c18657..00000000
--- a/src/pages/TryPro.vue
+++ /dev/null
@@ -1,57 +0,0 @@
-<template>
-  <q-page padding>
-
-    <div class="text-h5 q-ma-md">
-      Tabsets vs Tabsets Pro
-    </div>
-
-    <div class="text-body1 q-ma-md">
-      <span class="text-body1 text-dark">Tabsets</span> is a browser extension which helps you organize your tabs.<br><br>
-      Your data is stored locally in the browser you are using and you cannot access it
-      from anywhere else.
-    </div>
-    <div class="text-body1 q-ma-md">
-      <span class="text-body1 text-dark">Tabsets Pro</span> offers the same features as <span class="text-body1 text-dark">Tabsets</span>, and adds:
-      <ul>
-        <li>Cloud Storage</li>
-        <li>Tabsets Sharing (Planned)</li>
-        <li>Bookmarks Integration (Planned)</li>
-        <li>Advanced Search (Planned)</li>
-      </ul>
-    </div>
-
-    <div class="text-h5 q-ma-md">
-      Cloud Storage
-    </div>
-
-    <div class="text-body1 q-ma-md">
-      Your data - that is your tabsets - is stored in the cloud. So it is possible, once you login, to access your
-      information from any chrome browser from anywhere.
-    </div>
-
-    <div>
-
-      <div class="text-h5 q-ma-md">
-        Get started with <span class="text-dark">Tabsets Pro</span>
-      </div>
-
-      <div class="text-body1 q-ma-md">
-        Click <span class="cursor-pointer text-blue" @click="router.push('/register')"><u>here</u></span> to create a new account.<br><br>
-        You can test it for free for 14 days and then decide if you want to keep it or get back to <span class="text-body1 text-dark">Tabsets Free</span>.
-        <br><br>
-        If you want to keep it, the cost is at 0,99 € per Month.
-      </div>
-    </div>
-
-<!--    <fab></fab>-->
-  </q-page>
-
-</template>
-
-<script setup lang="ts">
-import {useTabsStore} from "src/stores/tabsStore"
-import {useRouter} from "vue-router";
-
-const tabsStore = useTabsStore()
-const router = useRouter()
-</script>
diff --git a/src/pages/helper/FeatureToggleSettings.vue b/src/pages/helper/FeatureToggleSettings.vue
new file mode 100644
index 00000000..8239b9e2
--- /dev/null
+++ b/src/pages/helper/FeatureToggleSettings.vue
@@ -0,0 +1,50 @@
+<template>
+  <div class="q-pa-md q-gutter-sm">
+
+
+<!--    <q-banner v-if="!useAuthStore().userMayAccess(AccessItem.FEATURE_TOGGLES)" rounded style="border:1px solid orange">-->
+<!--      To use feature toggles, you need to have a (free) account.-->
+<!--    </q-banner>-->
+<!--    <template v-else>-->
+      <q-banner rounded style="border:1px solid orange">Switch on experimental features (or off). These feature toggles
+        are meant for developers
+        only as they might break functionality and/or destroy data. Once they are considered 'safe enough', they will
+        be
+        available at the
+        "experimental features" view on the left.
+      </q-banner>
+
+      <div class="row q-pa-md">
+        <div class="col-3"><b>Developer Mode</b></div>
+        <div class="col-3">activates a couple of experimental features and debug insights. You should only use this
+          if you can live with loosing data.
+        </div>
+        <div class="col-1"></div>
+        <div class="col-5">
+          <q-toggle v-model="devEnabled" @click="updateSettings('dev', devEnabled)"/>
+        </div>
+      </div>
+<!--    </template>-->
+  </div>
+</template>
+
+<script lang="ts" setup>
+
+import {AccessItem, useAuthStore} from "stores/authStore";
+import {ref, watchEffect} from "vue";
+import {useSettingsStore} from "stores/settingsStore";
+
+const settingsStore = useSettingsStore()
+
+const devEnabled = ref<boolean>(settingsStore.isEnabled('dev'))
+
+watchEffect(() => {
+  devEnabled.value = settingsStore.isEnabled('dev')
+})
+
+const updateSettings = (ident: string, val: boolean) => {
+  console.log("settings updated to", ident, val)
+  settingsStore.setFeatureToggle(ident, val)
+}
+
+</script>
diff --git a/src/pages/helper/SubscriptionBexSettings.vue b/src/pages/helper/SubscriptionBexSettings.vue
index e1b018a0..49212dff 100644
--- a/src/pages/helper/SubscriptionBexSettings.vue
+++ b/src/pages/helper/SubscriptionBexSettings.vue
@@ -195,7 +195,7 @@ import {NotificationType, useNotificationHandler} from "src/services/ErrorHandle
 import {useRouter} from "vue-router";
 import PricingCard from "pages/helper/PricingCard.vue";
 import PlanFeature from "pages/helper/PlanFeature.vue";
-import FirebaseService from "src/services/firebase/FirebaseService";
+import FirebaseServices from "src/services/firebase/FirebaseServices";
 
 const subscription = ref<string>(LocalStorage.getItem(SUBSCRIPTION_ID_IDENT) as string || '')
 
diff --git a/src/pages/helper/SubscriptionSettings.vue b/src/pages/helper/SubscriptionSettings.vue
index 654c08b9..a1520543 100644
--- a/src/pages/helper/SubscriptionSettings.vue
+++ b/src/pages/helper/SubscriptionSettings.vue
@@ -89,7 +89,7 @@ import {collection, setDoc, doc, getDocs} from "firebase/firestore";
 import userHasClaim from "src/services/stripe/isUserPremium";
 import {createCheckoutSession} from "src/services/stripe/createCheckoutSession";
 import {useAuthStore} from "stores/authStore";
-import FirebaseService from "src/services/firebase/FirebaseService";
+import FirebaseServices from "src/services/firebase/FirebaseServices";
 
 const {inBexMode} = useUtils()
 
@@ -121,7 +121,7 @@ const subscribe = async () => {
 }
 
 const authorizeWith = async (githubAuthProvider:any) => {
-  const auth = FirebaseService.getAuth()
+  const auth = FirebaseServices.getAuth()
   console.log("auth", auth)
   //createUserWithEmailAndPassword(auth, "email", "password")
   const credentials: UserCredential = await signInWithPopup(auth, githubAuthProvider)
@@ -130,7 +130,7 @@ const authorizeWith = async (githubAuthProvider:any) => {
   userCredentials.value = credentials
 
   try {
-    await setDoc(doc(FirebaseService.getFirestore(), "users", credentials.user.uid), {
+    await setDoc(doc(FirebaseServices.getFirestore(), "users", credentials.user.uid), {
       uid: credentials.user.uid,
       email: credentials.user.email,
       name: credentials.user.displayName,
@@ -146,7 +146,7 @@ const authorizeWith = async (githubAuthProvider:any) => {
 
 const getSubscriptionKey = async () => {
   console.log("getting subscription key", claims.value)
-  const firestore = FirebaseService.getFirestore()
+  const firestore = FirebaseServices.getFirestore()
   const querySnapshot = await getDocs(collection(firestore, "users", userCredentials.value?.user.uid, "subscriptions"))
   console.log("querySnapshot", querySnapshot)
   let key = ""
diff --git a/src/pages/helper/SyncingSettings.vue b/src/pages/helper/SyncingSettings.vue
index ca70af4d..4838b124 100644
--- a/src/pages/helper/SyncingSettings.vue
+++ b/src/pages/helper/SyncingSettings.vue
@@ -244,7 +244,7 @@ import {useAuthStore} from "stores/authStore";
 import {useRouter} from "vue-router";
 import NavigationService from "src/services/NavigationService";
 import {doc, updateDoc} from "firebase/firestore";
-import FirebaseService from "src/services/firebase/FirebaseService";
+import FirebaseServices from "src/services/firebase/FirebaseServices";
 import {useSettingsStore} from "stores/settingsStore";
 import {useTabsStore} from "stores/tabsStore";
 import {useTabsetService} from "src/services/TabsetService2";
@@ -325,7 +325,7 @@ const startGitSyncing = async () => {
 
 const updateSyncing = async () => {
   try {
-    await updateDoc(doc(FirebaseService.getFirestore(), "users", useAuthStore().user.uid), {sync: {type: tempSyncOption.value}})
+    await updateDoc(doc(FirebaseServices.getFirestore(), "users", useAuthStore().user.uid), {sync: {type: tempSyncOption.value}})
     LocalStorage.set(SYNC_TYPE, tempSyncOption.value)
     sendMsg('reload-application')
     handleSuccess(new ExecutionResult<string>("done", "done"))
diff --git a/src/pages/sidepanel/SidePanelBookmarksPage.vue b/src/pages/sidepanel/SidePanelBookmarksPage.vue
index 95019d17..5e7dcf5b 100644
--- a/src/pages/sidepanel/SidePanelBookmarksPage.vue
+++ b/src/pages/sidepanel/SidePanelBookmarksPage.vue
@@ -13,7 +13,7 @@
     </div>
 
     <!-- place QPageSticky at end of page -->
-    <q-page-sticky expand position="top">
+    <q-page-sticky expand position="top" class="darkInDarkMode brightInBrightMode">
       <FirstToolbarHelper title="Bookmarks">
 
         <template v-slot:iconsRight>
diff --git a/src/pages/sidepanel/SidePanelByDomainList.vue b/src/pages/sidepanel/SidePanelByDomainList.vue
index 48eb7ae5..dd8e13d8 100644
--- a/src/pages/sidepanel/SidePanelByDomainList.vue
+++ b/src/pages/sidepanel/SidePanelByDomainList.vue
@@ -24,7 +24,7 @@
     </div>
 
     <!-- place QPageSticky at end of page -->
-    <q-page-sticky expand position="top">
+    <q-page-sticky expand position="top" class="darkInDarkMode brightInBrightMode">
       <FirstToolbarHelper title="Domain List">
 
         <template v-slot:iconsRight>
diff --git a/src/pages/sidepanel/SidePanelByDomainPage.vue b/src/pages/sidepanel/SidePanelByDomainPage.vue
index 38f40d6b..6f030df0 100644
--- a/src/pages/sidepanel/SidePanelByDomainPage.vue
+++ b/src/pages/sidepanel/SidePanelByDomainPage.vue
@@ -2,7 +2,7 @@
 
   <div class="q-ma-none">
 
-    <q-toolbar class="text-primary lightgrey">
+    <q-toolbar>
       <div class="row fit">
         <q-toolbar-title>
           <div class="row">
diff --git a/src/pages/sidepanel/SidePanelMessagesPage.vue b/src/pages/sidepanel/SidePanelMessagesPage.vue
index 5673d2eb..9dbd2d80 100644
--- a/src/pages/sidepanel/SidePanelMessagesPage.vue
+++ b/src/pages/sidepanel/SidePanelMessagesPage.vue
@@ -11,7 +11,7 @@
     </div>
 
     <!-- place QPageSticky at end of page -->
-    <q-page-sticky expand position="top">
+    <q-page-sticky expand position="top" class="darkInDarkMode brightInBrightMode">
       <FirstToolbarHelper title="Messages">
 
         <template v-slot:iconsRight>
diff --git a/src/pages/sidepanel/SidePanelNewestTabsPage.vue b/src/pages/sidepanel/SidePanelNewestTabsPage.vue
index 2735a555..ae55316a 100644
--- a/src/pages/sidepanel/SidePanelNewestTabsPage.vue
+++ b/src/pages/sidepanel/SidePanelNewestTabsPage.vue
@@ -29,7 +29,7 @@
     </div>
 
     <!-- place QPageSticky at end of page -->
-    <q-page-sticky expand position="top">
+    <q-page-sticky expand position="top" class="darkInDarkMode brightInBrightMode">
 
       <FirstToolbarHelper title="Newest Tabs">
 
diff --git a/src/pages/sidepanel/SidePanelOpenTabsListViewer.vue b/src/pages/sidepanel/SidePanelOpenTabsListViewer.vue
index b35297aa..69935ced 100644
--- a/src/pages/sidepanel/SidePanelOpenTabsListViewer.vue
+++ b/src/pages/sidepanel/SidePanelOpenTabsListViewer.vue
@@ -88,7 +88,7 @@
     </div>
 
     <!-- place QPageSticky at end of page -->
-    <q-page-sticky expand position="top">
+    <q-page-sticky expand position="top" class="darkInDarkMode brightInBrightMode">
       <FirstToolbarHelper title="Open Tabs">
 
         <template v-slot:iconsRight>
diff --git a/src/pages/sidepanel/SidePanelRssListViewer.vue b/src/pages/sidepanel/SidePanelRssListViewer.vue
index e3a4d350..ce8a4e47 100644
--- a/src/pages/sidepanel/SidePanelRssListViewer.vue
+++ b/src/pages/sidepanel/SidePanelRssListViewer.vue
@@ -38,7 +38,7 @@
     </div>
 
     <!-- place QPageSticky at end of page -->
-    <q-page-sticky expand position="top">
+    <q-page-sticky expand position="top" class="darkInDarkMode brightInBrightMode">
       <FirstToolbarHelper title="RSS Feeds" :show-back-button="true"/>
     </q-page-sticky>
 
diff --git a/src/pages/sidepanel/SidePanelTabsAsTreePage.vue b/src/pages/sidepanel/SidePanelTabsAsTreePage.vue
index f7e46874..05a2ceaa 100644
--- a/src/pages/sidepanel/SidePanelTabsAsTreePage.vue
+++ b/src/pages/sidepanel/SidePanelTabsAsTreePage.vue
@@ -13,7 +13,7 @@
     </div>
 
     <!-- place QPageSticky at end of page -->
-    <q-page-sticky expand position="top">
+    <q-page-sticky expand position="top" class="darkInDarkMode brightInBrightMode">
       <FirstToolbarHelper title="Tabs As Tree">
 
         <template v-slot:iconsRight>
diff --git a/src/pages/sidepanel/SidePanelTagsListViewer.vue b/src/pages/sidepanel/SidePanelTagsListViewer.vue
index 24e10a51..64a5bce6 100644
--- a/src/pages/sidepanel/SidePanelTagsListViewer.vue
+++ b/src/pages/sidepanel/SidePanelTagsListViewer.vue
@@ -17,7 +17,7 @@
     </div>
 
     <!-- place QPageSticky at end of page -->
-    <q-page-sticky expand position="top">
+    <q-page-sticky expand position="top" class="darkInDarkMode brightInBrightMode">
 
       <FirstToolbarHelper title="Tags List">
         <template v-slot:iconsRight>
diff --git a/src/pages/sidepanel/SidePanelTagsPage.vue b/src/pages/sidepanel/SidePanelTagsPage.vue
index b90d41b7..a9ae5184 100644
--- a/src/pages/sidepanel/SidePanelTagsPage.vue
+++ b/src/pages/sidepanel/SidePanelTagsPage.vue
@@ -16,7 +16,7 @@
 
 
     <!-- place QPageSticky at end of page -->
-    <q-page-sticky expand position="top">
+    <q-page-sticky expand position="top" class="darkInDarkMode brightInBrightMode">
 
       <FirstToolbarHelper :title="useUiStore().selectedTag + ' (Tags List)'">
 
diff --git a/src/pages/sidepanel/SidePanelTop10Page.vue b/src/pages/sidepanel/SidePanelTop10Page.vue
index 11ce46f9..1f5a5ecb 100644
--- a/src/pages/sidepanel/SidePanelTop10Page.vue
+++ b/src/pages/sidepanel/SidePanelTop10Page.vue
@@ -37,7 +37,7 @@
     </div>
 
     <!-- place QPageSticky at end of page -->
-    <q-page-sticky expand position="top">
+    <q-page-sticky expand position="top" class="darkInDarkMode brightInBrightMode">
 
       <FirstToolbarHelper title="'Top 10' Tabs">
 
diff --git a/src/router/routes.ts b/src/router/routes.ts
index 601d37f0..783b3ecd 100644
--- a/src/router/routes.ts
+++ b/src/router/routes.ts
@@ -194,11 +194,6 @@ const routes: RouteRecordRaw[] = [
     component: () => import('layouts/PlainLayout.vue'),
     children: [{path: '', component: () => import('pages/AboutPage.vue')}],
   },
-  {
-    path: '/trypro',
-    component: () => import('layouts/DefaultLayout.vue'),
-    children: [{path: '', component: () => import('pages/TryPro.vue')}],
-  },
   {
     path: '/settings',
     component: () => import('layouts/DefaultLayout.vue'),
diff --git a/src/services/TabsetService.ts b/src/services/TabsetService.ts
index 75f3336a..c3c2cd11 100644
--- a/src/services/TabsetService.ts
+++ b/src/services/TabsetService.ts
@@ -565,64 +565,64 @@ class TabsetService {
   async share(tabsetId: string, sharing: TabsetSharing, sharedId: string | undefined, sharedBy: string | undefined): Promise<TabsetSharing | void> {
     console.log(`setting property 'sharing' to ${sharing} for  ${tabsetId} with sharingId ${sharedId}`)
     const ts = getTabset(tabsetId)
-    if (ts) {
-      const oldSharing = ts.sharing
-      ts.sharing = sharing
-      ts.sharedBy = sharedBy
-      ts.view = "list"
-      ts.mqttUrl = useUiStore().sharingMqttUrl
-
-      if (sharing === TabsetSharing.UNSHARED) {
-        console.log("deleting share for tabset", ts.sharedId)
-        return FirebaseCall.delete("/share/public/" + ts.sharedId)
-          .then(() => {
-            ts.sharedBy = undefined
-            ts.sharedId = undefined
-            console.log("unshared tabset", ts)
-            saveTabset(ts)
-          })
-      }
-
-      console.log("setting author and avatar for comments")
-      for (const tab of ts.tabs) {
-        for (const c of tab.comments) {
-          console.log("found comment", c.author, c)
-          if (c.author === "<me>") {
-            c.author = useUiStore().sharingAuthor || '---'
-            c.avatar = useUiStore().sharingAvatar
-          }
-        }
-      }
-
-      console.log("setting thumbnails as images")
-      for (const tab of ts.tabs) {
-        const thumb = await this.getThumbnailFor(tab)
-        if (thumb) {
-          if (thumb && thumb['thumbnail' as keyof object]) {
-            tab.image = thumb['thumbnail' as keyof object]
-          }
-        }
-      }
-
-      if (sharedId) {
-        ts.sharedAt = new Date().getTime()
-        return FirebaseCall.put("/share/public/" + sharedId, ts)
-          .then((res: any) => {
-            //ts.sharedId = res.data.sharedId
-            return saveTabset(ts)
-              .then(() => oldSharing)
-          })
-      } else {
-        ts.sharedAt = new Date().getTime()
-        return FirebaseCall.post("/share/public", ts)
-          .then((res: any) => {
-            console.log("setting shared id to ", res.data.sharedId)
-            ts.sharedId = res.data.sharedId
-            return saveTabset(ts)
-              .then(() => oldSharing)
-          })
-      }
-    }
+    // if (ts) {
+    //   const oldSharing = ts.sharing
+    //   ts.sharing = sharing
+    //   ts.sharedBy = sharedBy
+    //   ts.view = "list"
+    //   ts.mqttUrl = useUiStore().sharingMqttUrl
+    //
+    //   if (sharing === TabsetSharing.UNSHARED) {
+    //     console.log("deleting share for tabset", ts.sharedId)
+    //     return FirebaseCall.delete("/share/public/" + ts.sharedId)
+    //       .then(() => {
+    //         ts.sharedBy = undefined
+    //         ts.sharedId = undefined
+    //         console.log("unshared tabset", ts)
+    //         saveTabset(ts)
+    //       })
+    //   }
+    //
+    //   console.log("setting author and avatar for comments")
+    //   for (const tab of ts.tabs) {
+    //     for (const c of tab.comments) {
+    //       console.log("found comment", c.author, c)
+    //       if (c.author === "<me>") {
+    //         c.author = useUiStore().sharingAuthor || '---'
+    //         c.avatar = useUiStore().sharingAvatar
+    //       }
+    //     }
+    //   }
+    //
+    //   console.log("setting thumbnails as images")
+    //   for (const tab of ts.tabs) {
+    //     const thumb = await this.getThumbnailFor(tab)
+    //     if (thumb) {
+    //       if (thumb && thumb['thumbnail' as keyof object]) {
+    //         tab.image = thumb['thumbnail' as keyof object]
+    //       }
+    //     }
+    //   }
+    //
+    //   if (sharedId) {
+    //     ts.sharedAt = new Date().getTime()
+    //     return FirebaseCall.put("/share/public/" + sharedId, ts)
+    //       .then((res: any) => {
+    //         //ts.sharedId = res.data.sharedId
+    //         return saveTabset(ts)
+    //           .then(() => oldSharing)
+    //       })
+    //   } else {
+    //     ts.sharedAt = new Date().getTime()
+    //     return FirebaseCall.post("/share/public", ts)
+    //       .then((res: any) => {
+    //         console.log("setting shared id to ", res.data.sharedId)
+    //         ts.sharedId = res.data.sharedId
+    //         return saveTabset(ts)
+    //           .then(() => oldSharing)
+    //       })
+    //   }
+    // }
     return Promise.reject("could not change sharing : " + tabsetId)
   }
 
diff --git a/src/services/firebase/FirebaseService.ts b/src/services/firebase/FirebaseService.ts
deleted file mode 100644
index fc64f8e8..00000000
--- a/src/services/firebase/FirebaseService.ts
+++ /dev/null
@@ -1,66 +0,0 @@
-import firebase from 'firebase/compat/app';
-import 'firebase/compat/auth';
-import 'firebase/compat/firestore';
-import {getAuth} from "firebase/auth";
-import {getFirestore} from 'firebase/firestore';
-
-class FirebaseService {
-
-  initialized = false
-
-  // private firebaseApp: any;
-
-  // constructor(props:object) {
-  //   this.firebaseApp = firebase.initializeApp(props)
-  // }
-
-  // firebaseApp: any
-  //
-  // //const firebaseAuth = getAuth(firebaseApp);
-  // //const firestore = getFirestore(firebaseApp)
-  //
-  // auth = () => {
-  //   //return firebase.auth()
-  // }
-  //
-  // fBInit = (config: any) => {
-  //   this.firebaseApp = firebase.initializeApp(config)
-  //   return this.firebaseApp
-  // }
-  //private firebaseApp: FirebaseApp;
-
-  // fBInit(config: { apiKey: any; appId: any; projectId: any; authDomain: any }) {
-  //    return firebase.initializeApp(config)
-  // //   //  return this.firebaseApp
-  // }
-
-  // static fBInit(config: { apiKey: any; appId: any; projectId: any; authDomain: any }) {
-  //   return firebase.initializeApp(config)
-  // }
-  // getAuth() {
-  //   return null//this.firebaseApp.getAuth()
-  // }
-  private firebaseApp: firebase.app.App = null as unknown as firebase.app.App
-
-  init() {
-    this.firebaseApp = firebase.initializeApp({
-      apiKey: process.env.FIREBASE_API_KEY,
-      authDomain: process.env.FIREBASE_AUTH_DOMAIN,
-      projectId: process.env.FIREBASE_PROJECT_ID,
-      appId: process.env.FIREBASE_APP_ID
-    })
-   // console.log("=====>", this.firebaseApp)
-  }
-
-  getAuth() {
-    //console.log("=====>", this.firebaseApp)
-    return getAuth(this.firebaseApp);
-  }
-
-  getFirestore() {
-    //console.log("=====>", this.firebaseApp)
-    return getFirestore(this.firebaseApp)
-  }
-}
-
-export default new FirebaseService();
diff --git a/src/services/firebase/FirebaseServices.ts b/src/services/firebase/FirebaseServices.ts
new file mode 100644
index 00000000..47ef4dcd
--- /dev/null
+++ b/src/services/firebase/FirebaseServices.ts
@@ -0,0 +1,42 @@
+import firebase from 'firebase/compat/app';
+import 'firebase/compat/auth';
+import 'firebase/compat/firestore';
+import {getAuth, Auth} from "firebase/auth";
+import {getFirestore, Firestore, initializeFirestore, persistentLocalCache, persistentMultipleTabManager  } from 'firebase/firestore';
+import {getMessaging} from "firebase/messaging";
+
+class FirebaseServices {
+
+  private firebaseApp: firebase.app.App = null as unknown as firebase.app.App
+  private auth: Auth = null as unknown as Auth
+  private firestore: Firestore = null as unknown as Firestore
+
+  init() {
+    this.firebaseApp = firebase.initializeApp({
+      apiKey: process.env.FIREBASE_API_KEY,
+      authDomain: process.env.FIREBASE_AUTH_DOMAIN,
+      projectId: process.env.FIREBASE_PROJECT_ID,
+      appId: process.env.FIREBASE_APP_ID
+    })
+    this.auth = getAuth(this.firebaseApp)
+    // https://firebase.google.com/docs/firestore/manage-data/enable-offline#web-modular-api
+    initializeFirestore(this.firebaseApp, {localCache:
+        persistentLocalCache({tabManager: persistentMultipleTabManager()})
+    })
+    this.firestore = getFirestore(this.firebaseApp)
+  }
+
+  getAuth() {
+    return this.auth
+  }
+
+  getFirestore() {
+    return this.firestore
+  }
+
+  getMessaging() {
+    return getMessaging(this.firebaseApp)
+  }
+}
+
+export default new FirebaseServices();
diff --git a/src/services/persistence/FirestorePersistenceService.ts b/src/services/persistence/FirestorePersistenceService.ts
index 528e6abe..c525bd1b 100644
--- a/src/services/persistence/FirestorePersistenceService.ts
+++ b/src/services/persistence/FirestorePersistenceService.ts
@@ -19,22 +19,22 @@ import {useAuthStore} from "stores/authStore";
 import {Account} from "src/models/Account";
 import {collection, deleteDoc, doc, getDocs, setDoc} from "firebase/firestore";
 import {useTabsStore} from "stores/tabsStore";
-import FirebaseService from "src/services/firebase/FirebaseService";
+import FirebaseServices from "src/services/firebase/FirebaseServices";
 
 function tabsetDoc(tabsetId: string) {
-  return doc(FirebaseService.getFirestore(), "users", useAuthStore().user.uid, "tabsets", tabsetId)
+  return doc(FirebaseServices.getFirestore(), "users", useAuthStore().user.uid, "tabsets", tabsetId)
 }
 
 function tabsetCollection() {
-  return collection(FirebaseService.getFirestore(), "users", useAuthStore().user.uid, "tabsets")
+  return collection(FirebaseServices.getFirestore(), "users", useAuthStore().user.uid, "tabsets")
 }
 
 function spaceDoc(spaceId: string) {
-  return doc(FirebaseService.getFirestore(), "users", useAuthStore().user.uid, "spaces", spaceId)
+  return doc(FirebaseServices.getFirestore(), "users", useAuthStore().user.uid, "spaces", spaceId)
 }
 
 function spacesCollection() {
-  return collection(FirebaseService.getFirestore(), "users", useAuthStore().user.uid, "spaces")
+  return collection(FirebaseServices.getFirestore(), "users", useAuthStore().user.uid, "spaces")
 }
 
 class FirestorePersistenceService implements PersistenceService {
diff --git a/src/services/stripe/createCheckoutSession.ts b/src/services/stripe/createCheckoutSession.ts
index b846139b..bf4a3652 100644
--- a/src/services/stripe/createCheckoutSession.ts
+++ b/src/services/stripe/createCheckoutSession.ts
@@ -1,11 +1,11 @@
 import getStripe from "./initializeStripe"
 import {collection, getDoc, doc, onSnapshot, setDoc, addDoc} from "firebase/firestore";
-import FirebaseService from "src/services/firebase/FirebaseService";
+import FirebaseServices from "src/services/firebase/FirebaseServices";
 //import {firestore} from "boot/firebase";
 
 export async function createCheckoutSession(uid: string) {
   //     await setDoc(doc(firestore, "users", credentials.user.uid), {
-  const cos = collection(FirebaseService.getFirestore(), "users", uid, "checkout_sessions")
+  const cos = collection(FirebaseServices.getFirestore(), "users", uid, "checkout_sessions")
   const checkoutSessionData = {
     price:"price_1OWd4pCRr6mfm8sfBfcpGMtl",
     // success_url: window.location.origin,
diff --git a/src/services/stripe/isUserPremium.ts b/src/services/stripe/isUserPremium.ts
index d4837017..d52aeebd 100644
--- a/src/services/stripe/isUserPremium.ts
+++ b/src/services/stripe/isUserPremium.ts
@@ -1,10 +1,10 @@
 import {getAuth} from "firebase/auth";
-import FirebaseService from "src/services/firebase/FirebaseService";
+import FirebaseServices from "src/services/firebase/FirebaseServices";
 // import {firebaseApp} from "boot/firebase";
 
 export default async function userHasClaim(claim: string): Promise<boolean> {
   console.log("checking claim", claim)
-  const auth = FirebaseService.getAuth()
+  const auth = FirebaseServices.getAuth()
   const idToken = auth.currentUser?.getIdToken()
   if (!idToken) {
     console.log("no id token found")
diff --git a/src/stores/authStore.ts b/src/stores/authStore.ts
index df1e7631..aa4332f8 100644
--- a/src/stores/authStore.ts
+++ b/src/stores/authStore.ts
@@ -7,7 +7,7 @@ import {computed, ref} from "vue";
 import {Account, UserData} from "src/models/Account";
 import {CURRENT_USER_ID} from "boot/constants";
 import {collection, doc, getDoc, getDocs} from "firebase/firestore";
-import FirebaseService from "src/services/firebase/FirebaseService";
+import FirebaseServices from "src/services/firebase/FirebaseServices";
 
 export enum AccessItem {
   SYNC = "SYNC",
@@ -108,11 +108,11 @@ export const useAuthStore = defineStore('auth', () => {
       authenticated.value = true;
       user.value = u;
 
-      const userDoc = await getDoc(doc(FirebaseService.getFirestore(), "users", u.uid))
+      const userDoc = await getDoc(doc(FirebaseServices.getFirestore(), "users", u.uid))
       const userData = userDoc.data() as UserData
       const account = new Account(u.uid, userData)
       console.log("created account object", account)
-      const querySnapshot = await getDocs(collection(FirebaseService.getFirestore(), "users", u.uid, "subscriptions"))
+      const querySnapshot = await getDocs(collection(FirebaseServices.getFirestore(), "users", u.uid, "subscriptions"))
       const products = new Set<string>()
       querySnapshot.forEach((doc) => {
         const subscriptionData = doc.data()
diff --git a/src/stores/windowsStore.ts b/src/stores/windowsStore.ts
index b8ce7c85..1ff0f10f 100644
--- a/src/stores/windowsStore.ts
+++ b/src/stores/windowsStore.ts
@@ -354,7 +354,7 @@ export const useWindowsStore = defineStore('windows', () => {
   }
 
   async function updateWindowIndex(windowId: number, indexToUse: number) {
-    console.log("updating window index", windowId, indexToUse)
+    //console.log("updating window index", windowId, indexToUse)
     return storage.getWindow(windowId).then(w => {
       if (w) {
         w.index = indexToUse