diff --git a/src/App.vue b/src/App.vue
index e2eae3f..57fc7e1 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="app_container">
-    <PopUp />
+    <Tooltip />
 
     <transition name="modal-anim">
       <keep-alive>
@@ -36,19 +36,20 @@
 <script lang="ts">
 import { defineComponent } from 'vue';
 import axios from 'axios';
-import { version } from '.././package.json';
 
+import { version } from '.././package.json';
+import { Status } from './typings/common';
 import { useMainStore } from './store/mainStore';
-import popupMixin from './mixins/popupMixin';
+import { useApiStore } from './store/apiStore';
+import { useTooltipStore } from './store/tooltipStore';
 
 import Clock from './components/App/Clock.vue';
 import StatusIndicator from './components/App/StatusIndicator.vue';
 import AppHeader from './components/App/AppHeader.vue';
 import TrainModal from './components/TrainsView/TrainModal.vue';
+import Tooltip from './components/Tooltip/Tooltip.vue';
+
 import StorageManager from './managers/storageManager';
-import PopUp from './components/PopUp/PopUp.vue';
-import { useApiStore } from './store/apiStore';
-import { Status } from './typings/common';
 
 const STORAGE_VERSION_KEY = 'app_version';
 
@@ -58,15 +59,14 @@ export default defineComponent({
     StatusIndicator,
     AppHeader,
     TrainModal,
-    PopUp
+    Tooltip
   },
 
-  mixins: [popupMixin],
-
   data: () => ({
     VERSION: version,
     store: useMainStore(),
     apiStore: useApiStore(),
+    tooltipStore: useTooltipStore(),
 
     currentLang: 'pl',
     releaseURL: '',
@@ -80,7 +80,7 @@ export default defineComponent({
   },
 
   async mounted() {
-    window.addEventListener('mousemove', (e: MouseEvent) => this.handlePopUpEvents(e));
+    window.addEventListener('mousemove', (e: MouseEvent) => this.tooltipStore.handle(e));
   },
 
   methods: {
@@ -142,27 +142,6 @@ export default defineComponent({
       this.apiStore.connectToAPI();
     },
 
-    handlePopUpEvents(e: MouseEvent) {
-      const targetEl = e
-        .composedPath()
-        .find((p) => p instanceof HTMLElement && p.getAttribute('data-popup-key'));
-
-      if (!targetEl || !(targetEl instanceof HTMLElement)) {
-        if (this.store.popUpData.key != null) this.hidePopUp();
-
-        return;
-      }
-
-      const popupComponentKey = targetEl.getAttribute('data-popup-key');
-      const popupContent = targetEl.getAttribute('data-popup-content');
-
-      if (popupComponentKey && popupContent) this.showPopUp(e, popupComponentKey, popupContent);
-      else if (this.store.popUpData.key != null) this.hidePopUp();
-
-      this.store.mousePos.x = e.pageX;
-      this.store.mousePos.y = e.pageY;
-    },
-
     changeLang(lang: string) {
       this.$i18n.locale = lang;
       this.currentLang = lang;
diff --git a/src/components/Global/StockList.vue b/src/components/Global/StockList.vue
index 7535f35..6058fec 100644
--- a/src/components/Global/StockList.vue
+++ b/src/components/Global/StockList.vue
@@ -27,8 +27,8 @@
         <span>
           <img
             :data-mouseover="stockName"
-            data-popup-key="VehiclePreviewPopUp"
-            :data-popup-content="stockName.split(':')[0]"
+            data-tooltip-type="VehiclePreviewTooltip"
+            :data-tooltip-content="stockName.split(':')[0]"
             :src="`https://rj.td2.info.pl/dist/img/thumbnails/${stockName.split(':')[0]}${
               /^EN/.test(stockName) ? 'rb' : ''
             }.png`"
@@ -41,8 +41,8 @@
           <!-- /// Manualne dodawanie miniaturek członów dla kibelków /// -->
           <img
             :data-mouseover="stockName"
-            data-popup-key="VehiclePreviewPopUp"
-            :data-popup-content="stockName.split(':')[0]"
+            data-tooltip-type="VehiclePreviewTooltip"
+            :data-tooltip-content="stockName.split(':')[0]"
             v-if="/^(EN|2EN)/.test(stockName)"
             :src="`https://rj.td2.info.pl/dist/img/thumbnails/${stockName.split(':')[0]}s.png`"
             @error="
@@ -53,8 +53,8 @@
 
           <img
             :data-mouseover="stockName"
-            data-popup-key="VehiclePreviewPopUp"
-            :data-popup-content="stockName.split(':')[0]"
+            data-tooltip-type="VehiclePreviewTooltip"
+            :data-tooltip-content="stockName.split(':')[0]"
             v-if="/^EN71/.test(stockName)"
             :src="`https://rj.td2.info.pl/dist/img/thumbnails/${stockName.split(':')[0]}s.png`"
             @error="
@@ -65,8 +65,8 @@
 
           <img
             :data-mouseover="stockName"
-            data-popup-key="VehiclePreviewPopUp"
-            :data-popup-content="stockName.split(':')[0]"
+            data-tooltip-type="VehiclePreviewTooltip"
+            :data-tooltip-content="stockName.split(':')[0]"
             v-if="/^(EN|2EN)/.test(stockName)"
             :src="`https://rj.td2.info.pl/dist/img/thumbnails/${stockName.split(':')[0]}ra.png`"
             @error="
@@ -120,10 +120,10 @@ export default defineComponent({
         fallbackName += /^\d?EN\d{2}/.test(stockName)
           ? 'ezt'
           : /^SN\d{2}/.test(stockName)
-          ? 'szt'
-          : /^\d?E/.test(stockName)
-          ? 'e'
-          : 's';
+            ? 'szt'
+            : /^\d?E/.test(stockName)
+              ? 'e'
+              : 's';
       } else {
         const isCarPassenger = /(\d{3}a|(Bau|Gor)\d{2}|304C)_/.test(stockName);
 
diff --git a/src/components/JournalView/JournalDispatchers/JournalDispatchersList.vue b/src/components/JournalView/JournalDispatchers/JournalDispatchersList.vue
index 8d1a879..63839ed 100644
--- a/src/components/JournalView/JournalDispatchers/JournalDispatchersList.vue
+++ b/src/components/JournalView/JournalDispatchers/JournalDispatchersList.vue
@@ -43,7 +43,7 @@
                     :to="`/journal/dispatchers?search-dispatcher=${historyItem.dispatcherName}`"
                   >
                     <b
-                      v-if="isDonator(historyItem.dispatcherName)"
+                      v-if="apiStore.donatorsData.includes(historyItem.dispatcherName)"
                       class="text--donator"
                       :title="$t('donations.dispatcher-message')"
                     >
@@ -128,13 +128,13 @@ import { Status } from '../../../typings/common';
 import Loading from '../../Global/Loading.vue';
 import AddDataButton from '../../Global/AddDataButton.vue';
 import dateMixin from '../../../mixins/dateMixin';
-import donatorMixin from '../../../mixins/donatorMixin';
 import styleMixin from '../../../mixins/styleMixin';
+import { useApiStore } from '../../../store/apiStore';
 
 export default defineComponent({
   components: { Loading, AddDataButton },
 
-  mixins: [dateMixin, styleMixin, donatorMixin],
+  mixins: [dateMixin, styleMixin],
 
   props: {
     dispatcherHistory: {
@@ -159,6 +159,7 @@ export default defineComponent({
     return {
       Status,
       store: useMainStore(),
+      apiStore: useApiStore(),
       regions
     };
   },
diff --git a/src/components/JournalView/JournalTimetables/TimetableGeneral.vue b/src/components/JournalView/JournalTimetables/TimetableGeneral.vue
index b966037..ed12ae9 100644
--- a/src/components/JournalView/JournalTimetables/TimetableGeneral.vue
+++ b/src/components/JournalView/JournalTimetables/TimetableGeneral.vue
@@ -24,7 +24,7 @@
       </strong>
 
       <strong
-        v-if="isDonator(timetable.driverName)"
+        v-if="apiStore.donatorsData.includes(timetable.driverName)"
         class="text--donator"
         :title="$t('donations.driver-message')"
       >
@@ -57,8 +57,8 @@
           !timetable.terminated
             ? $t('journal.timetable-active')
             : timetable.fulfilled
-            ? $t('journal.timetable-fulfilled')
-            : `${$t('journal.timetable-abandoned')} ${localeTime(timetable.endDate, $i18n.locale)}`
+              ? $t('journal.timetable-fulfilled')
+              : `${$t('journal.timetable-abandoned')} ${localeTime(timetable.endDate, $i18n.locale)}`
         }}
       </b>
 
@@ -81,10 +81,16 @@ import { API } from '../../../typings/api';
 import dateMixin from '../../../mixins/dateMixin';
 import modalTrainMixin from '../../../mixins/modalTrainMixin';
 import styleMixin from '../../../mixins/styleMixin';
-import donatorMixin from '../../../mixins/donatorMixin';
+import { useApiStore } from '../../../store/apiStore';
 
 export default defineComponent({
-  mixins: [dateMixin, modalTrainMixin, styleMixin, donatorMixin],
+  mixins: [dateMixin, modalTrainMixin, styleMixin],
+
+  data() {
+    return {
+      apiStore: useApiStore()
+    };
+  },
 
   props: {
     timetable: {
diff --git a/src/components/SceneryView/SceneryDispatchersHistory.vue b/src/components/SceneryView/SceneryDispatchersHistory.vue
index c44b301..09531be 100644
--- a/src/components/SceneryView/SceneryDispatchersHistory.vue
+++ b/src/components/SceneryView/SceneryDispatchersHistory.vue
@@ -74,14 +74,13 @@ import { defineComponent, PropType } from 'vue';
 import dateMixin from '../../mixins/dateMixin';
 import Loading from '../Global/Loading.vue';
 import styleMixin from '../../mixins/styleMixin';
-import listObserverMixin from '../../mixins/listObserverMixin';
 import { API } from '../../typings/api';
 import { ActiveScenery, Station, Status } from '../../typings/common';
 import { useApiStore } from '../../store/apiStore';
 
 export default defineComponent({
   name: 'SceneryDispatchersHistory',
-  mixins: [dateMixin, styleMixin, listObserverMixin],
+  mixins: [dateMixin, styleMixin],
   components: { Loading },
   props: {
     station: {
diff --git a/src/components/SceneryView/SceneryInfo/SceneryInfoDispatcher.vue b/src/components/SceneryView/SceneryInfo/SceneryInfoDispatcher.vue
index ea7a538..197e29d 100644
--- a/src/components/SceneryView/SceneryInfo/SceneryInfoDispatcher.vue
+++ b/src/components/SceneryView/SceneryInfo/SceneryInfoDispatcher.vue
@@ -14,7 +14,7 @@
       >
         <span
           class="text--donator"
-          v-if="isDonator(onlineScenery.dispatcherName)"
+          v-if="apiStore.donatorsData.includes(onlineScenery.dispatcherName)"
           :title="$t('donations.dispatcher-message')"
         >
           {{ onlineScenery.dispatcherName }}
@@ -49,11 +49,18 @@ import dateMixin from '../../../mixins/dateMixin';
 import routerMixin from '../../../mixins/routerMixin';
 import styleMixin from '../../../mixins/styleMixin';
 import StationStatusBadge from '../../Global/StationStatusBadge.vue';
-import donatorMixin from '../../../mixins/donatorMixin';
 import { ActiveScenery } from '../../../typings/common';
+import { useApiStore } from '../../../store/apiStore';
 
 export default defineComponent({
-  mixins: [styleMixin, dateMixin, routerMixin, donatorMixin],
+  mixins: [styleMixin, dateMixin, routerMixin],
+
+  data() {
+    return {
+      apiStore: useApiStore()
+    };
+  },
+
   props: {
     onlineScenery: {
       type: Object as PropType<ActiveScenery>,
diff --git a/src/components/SceneryView/SceneryTimetablesHistory.vue b/src/components/SceneryView/SceneryTimetablesHistory.vue
index 0c35eb6..29267d6 100644
--- a/src/components/SceneryView/SceneryTimetablesHistory.vue
+++ b/src/components/SceneryView/SceneryTimetablesHistory.vue
@@ -72,14 +72,13 @@ import { defineComponent, PropType } from 'vue';
 import dateMixin from '../../mixins/dateMixin';
 
 import Loading from '../Global/Loading.vue';
-import listObserverMixin from '../../mixins/listObserverMixin';
 import { API } from '../../typings/api';
 import { ActiveScenery, Station, Status } from '../../typings/common';
 import { useApiStore } from '../../store/apiStore';
 
 export default defineComponent({
   name: 'SceneryTimetablesHistory',
-  mixins: [dateMixin, listObserverMixin],
+  mixins: [dateMixin],
   props: {
     station: {
       type: Object as PropType<Station>
diff --git a/src/components/StationsView/StationTable.vue b/src/components/StationsView/StationTable.vue
index f01a7b1..390fd18 100644
--- a/src/components/StationsView/StationTable.vue
+++ b/src/components/StationsView/StationTable.vue
@@ -123,8 +123,8 @@
                 <b
                   v-if="apiStore.donatorsData.includes(station.onlineInfo.dispatcherName)"
                   @click.stop="openDonationModal"
-                  data-popup-key="DonatorPopUp"
-                  :data-popup-content="$t('donations.dispatcher-message')"
+                  data-tooltip-type="DonatorTooltip"
+                  :data-tooltip-content="$t('donations.dispatcher-message')"
                 >
                   <img src="/images/icon-diamond.svg" alt="" />
                   {{ station.onlineInfo.dispatcherName }}
@@ -257,7 +257,12 @@
               <span>{{ station.onlineInfo?.dispatcherRate ?? '-' }}</span>
             </td>
 
-            <td class="station-spawns" :class="{ inactive: !station.onlineInfo }">
+            <td
+              class="station-spawns"
+              :class="{ inactive: !station.onlineInfo }"
+              data-tooltip-type="TestTooltip"
+              data-tooltip-content="test123"
+            >
               <span>{{ station.onlineInfo?.spawns.length ?? '-' }}</span>
             </td>
 
@@ -307,12 +312,12 @@ import { HeadIdsTypes, headIconsIds, headIds } from '../../scripts/data/stationH
 import StationStatusBadge from '../Global/StationStatusBadge.vue';
 import { Station, Status } from '../../typings/common';
 import { useApiStore } from '../../store/apiStore';
-import popupMixin from '../../mixins/popupMixin';
+import { useTooltipStore } from '../../store/tooltipStore';
 
 export default defineComponent({
   emits: ['toggleDonationModal'],
   components: { Loading, StationStatusBadge },
-  mixins: [styleMixin, dateMixin, popupMixin],
+  mixins: [styleMixin, dateMixin],
 
   data: () => ({
     headIconsIds,
@@ -333,6 +338,7 @@ export default defineComponent({
   setup() {
     const mainStore = useMainStore();
     const apiStore = useApiStore();
+    const tooltipStore = useTooltipStore();
 
     const stationFiltersStore = useStationFiltersStore();
 
@@ -340,7 +346,8 @@ export default defineComponent({
       Status: Status.Data,
       stationFiltersStore,
       mainStore,
-      apiStore
+      apiStore,
+      tooltipStore
     };
   },
 
@@ -364,7 +371,7 @@ export default defineComponent({
     openDonationModal(e: Event) {
       this.$emit('toggleDonationModal', true);
       this.mainStore.modalLastClickedTarget = e.target;
-      this.hidePopUp();
+      this.tooltipStore.hide();
     },
 
     openForumSite(e: Event, url: string | undefined) {
diff --git a/src/components/PopUp/TrainCommentsPopUp.vue b/src/components/Tooltip/BaseTooltip.vue
similarity index 69%
rename from src/components/PopUp/TrainCommentsPopUp.vue
rename to src/components/Tooltip/BaseTooltip.vue
index 08156d7..940db0f 100644
--- a/src/components/PopUp/TrainCommentsPopUp.vue
+++ b/src/components/Tooltip/BaseTooltip.vue
@@ -1,24 +1,24 @@
 <template>
-  <div class="popup-content">
-    <span>{{ store.popUpData.content }}</span>
+  <div class="tooltip-content">
+    <span>{{ tooltipStore.content }}</span>
   </div>
 </template>
 
 <script lang="ts">
 import { defineComponent } from 'vue';
-import { useMainStore } from '../../store/mainStore';
+import { useTooltipStore } from '../../store/tooltipStore';
 
 export default defineComponent({
   data() {
     return {
-      store: useMainStore()
+      tooltipStore: useTooltipStore()
     };
   }
 });
 </script>
 
 <style lang="scss" scoped>
-.popup-content {
+.tooltip-content {
   display: flex;
   justify-content: center;
   align-items: center;
diff --git a/src/components/PopUp/DonatorPopUp.vue b/src/components/Tooltip/DonatorTooltip.vue
similarity index 70%
rename from src/components/PopUp/DonatorPopUp.vue
rename to src/components/Tooltip/DonatorTooltip.vue
index cbf3dbf..7357d1c 100644
--- a/src/components/PopUp/DonatorPopUp.vue
+++ b/src/components/Tooltip/DonatorTooltip.vue
@@ -1,25 +1,25 @@
 <template>
-  <div class="popup-content">
+  <div class="tooltip-content">
     <img src="/images/icon-diamond.svg" alt="" />
-    <span>{{ store.popUpData.content }}</span>
+    <span>{{ tooltipStore.content }}</span>
   </div>
 </template>
 
 <script lang="ts">
 import { defineComponent } from 'vue';
-import { useMainStore } from '../../store/mainStore';
+import { useTooltipStore } from '../../store/tooltipStore';
 
 export default defineComponent({
   data() {
     return {
-      store: useMainStore()
+      tooltipStore: useTooltipStore()
     };
   }
 });
 </script>
 
 <style lang="scss" scoped>
-.popup-content {
+.tooltip-content {
   gap: 0.5em;
 
   padding: 0.5em;
diff --git a/src/components/PopUp/PopUp.vue b/src/components/Tooltip/Tooltip.vue
similarity index 58%
rename from src/components/PopUp/PopUp.vue
rename to src/components/Tooltip/Tooltip.vue
index c6efa40..5e07200 100644
--- a/src/components/PopUp/PopUp.vue
+++ b/src/components/Tooltip/Tooltip.vue
@@ -1,29 +1,30 @@
 <template>
-  <div class="popup" v-show="store.popUpData.key" ref="preview">
-    <component v-if="store.popUpData.key" :is="store.popUpData.key" />
+  <div class="tooltip" v-show="tooltipStore.type" ref="preview">
+    <component v-if="tooltipStore.type" :is="tooltipStore.type" />
   </div>
 </template>
 
 <script lang="ts">
 import { defineComponent } from 'vue';
-import DonatorPopUp from './DonatorPopUp.vue';
-import TrainCommentsPopUp from './TrainCommentsPopUp.vue';
-import VehiclePreviewPopUp from './VehiclePreviewPopUp.vue';
-import { useMainStore } from '../../store/mainStore';
+import { useTooltipStore } from '../../store/tooltipStore';
+import DonatorTooltip from './DonatorTooltip.vue';
+import VehiclePreviewTooltip from './VehiclePreviewTooltip.vue';
+import BaseTooltip from './BaseTooltip.vue';
 
 export default defineComponent({
-  components: { DonatorPopUp, TrainCommentsPopUp, VehiclePreviewPopUp },
+  components: { DonatorTooltip, VehiclePreviewTooltip, BaseTooltip },
 
   data() {
     return {
-      store: useMainStore()
+      tooltipStore: useTooltipStore()
     };
   },
 
   watch: {
-    'store.mousePos': {
+    'tooltipStore.mousePos': {
       deep: true,
-      handler(val: typeof this.store.mousePos) {
+      // [x, y]
+      handler(val: [number, number]) {
         this.$nextTick(() => {
           const previewEl = this.$refs['preview'] as HTMLElement;
           const clientWidth = document.body.clientWidth;
@@ -35,21 +36,21 @@ export default defineComponent({
           if (clientWidth < 500) {
             previewEl.style.left = '50%';
             translateX = '-50%';
-          } else if (val.x <= boxWidth / 2) {
+          } else if (val[0] <= boxWidth / 2) {
             previewEl.style.left = '0';
             translateX = '0px';
-          } else if (val.x >= clientWidth - boxWidth / 2) {
+          } else if (val[0] >= clientWidth - boxWidth / 2) {
             previewEl.style.left = '100%';
             translateX = '-100%';
           } else {
-            previewEl.style.left = `${val.x}px`;
+            previewEl.style.left = `${val[0]}px`;
             translateX = '-50%';
           }
 
-          previewEl.style.top = `${val.y}px`;
+          previewEl.style.top = `${val[1]}px`;
 
           const isOutside =
-            val.y + previewEl.getBoundingClientRect().height + 30 >=
+            val[1] + previewEl.getBoundingClientRect().height + 30 >=
             window.innerHeight + window.scrollY;
 
           if (isOutside) translateY = 'calc(-100% - 30px)';
@@ -62,7 +63,7 @@ export default defineComponent({
 </script>
 
 <style lang="scss" scoped>
-.popup {
+.tooltip {
   position: absolute;
   z-index: 250;
   max-width: 400px;
diff --git a/src/components/PopUp/VehiclePreviewPopUp.vue b/src/components/Tooltip/VehiclePreviewTooltip.vue
similarity index 77%
rename from src/components/PopUp/VehiclePreviewPopUp.vue
rename to src/components/Tooltip/VehiclePreviewTooltip.vue
index 5f748dc..95bce86 100644
--- a/src/components/PopUp/VehiclePreviewPopUp.vue
+++ b/src/components/Tooltip/VehiclePreviewTooltip.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="popup-content">
+  <div class="tooltip-content">
     <div v-if="imageState == 'loading'" class="loading-info">
       {{ $t('vehicle-preview.loading') }}
     </div>
@@ -7,29 +7,29 @@
     <div v-if="imageState == 'error'">{{ $t('vehicle-preview.error') }}</div>
 
     <img
-      v-if="store.popUpData.key"
+      v-if="tooltipStore.type"
       @load="onImageLoad"
       @error="onImageError"
       width="300"
       height="176"
       class="rounded-md w-full h-auto"
-      :src="`https://static.spythere.eu/images/${store.popUpData.content}--300px.jpg`"
+      :src="`https://static.spythere.eu/images/${tooltipStore.content}--300px.jpg`"
     />
 
     <div class="vehicle-name" v-if="imageState != 'error'">
-      {{ store.popUpData.content.replace(/_/g, ' ') }}
+      {{ tooltipStore.content.replace(/_/g, ' ') }}
     </div>
   </div>
 </template>
 
 <script lang="ts">
 import { defineComponent } from 'vue';
-import { useMainStore } from '../../store/mainStore';
+import { useTooltipStore } from '../../store/tooltipStore';
 
 export default defineComponent({
   data() {
     return {
-      store: useMainStore(),
+      tooltipStore: useTooltipStore(),
       imageState: 'loading'
     };
   },
@@ -53,9 +53,7 @@ export default defineComponent({
 </script>
 
 <style lang="scss" scoped>
-.popup-content {
-  // min-w-[300px] min-h-[200px] p-2 bg-slate-800 rounded-md
-
+.tooltip-content {
   width: 300px;
   min-height: 200px;
   background-color: #333;
diff --git a/src/components/TrainsView/TrainInfo.vue b/src/components/TrainsView/TrainInfo.vue
index 5cbc7c2..66edfb0 100644
--- a/src/components/TrainsView/TrainInfo.vue
+++ b/src/components/TrainsView/TrainInfo.vue
@@ -45,8 +45,8 @@
           <div class="train-driver">
             <b
               v-if="apiStore.donatorsData.includes(train.driverName)"
-              data-popup-key="DonatorPopUp"
-              :data-popup-content="$t('donations.driver-message')"
+              data-tooltip-type="DonatorTooltip"
+              :data-tooltip-content="$t('donations.driver-message')"
             >
               {{ train.driverName }}
               <img src="/images/icon-diamond.svg" alt="donator diamond icon" />
@@ -74,8 +74,8 @@
         <strong>{{ train.timetableData.route.replace('|', ' - ') }}</strong>
         <span
           v-if="getSceneriesWithComments(train.timetableData).length > 0"
-          data-popup-key="TrainCommentsPopUp"
-          :data-popup-content="`${$t('trains.timetable-comments')} (${getSceneriesWithComments(
+          data-tooltip-type="BaseTooltip"
+          :data-tooltip-content="`${$t('trains.timetable-comments')} (${getSceneriesWithComments(
             train.timetableData
           )})`"
         >
diff --git a/src/locales/en.json b/src/locales/en.json
index cf037bc..e1b3331 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -182,7 +182,8 @@
       "addons": "ADDITIONAL PROGRAMS",
       "blockades": "BLOCK SIGNALLING",
       "status": "ONLINE STATUS",
-      "timetables": "ACTIVE TIMETABLES"
+      "timetables": "ACTIVE TIMETABLES",
+      "spawns": "OPEN SPAWNS"
     },
 
     "all-available": "ALL AVAILABLE",
@@ -242,6 +243,7 @@
       "routes-2t-cat": "MIN. CATENARY DOUBLE TRACK ROUTES",
       "routes-2t-other": "MIN. OTHER DOUBLE TRACK ROUTES"
     },
+
     "authors-search": "SEARCH BY AUTHOR NAME (other filters apply):",
     "authors-placeholder": "Enter the author nickname...",
     "authors-button-title": "Search",
diff --git a/src/locales/pl.json b/src/locales/pl.json
index 106cb86..238051b 100644
--- a/src/locales/pl.json
+++ b/src/locales/pl.json
@@ -179,7 +179,8 @@
       "addons": "SZCZEGÓŁY",
       "blockades": "BLOKADY LINIOWE",
       "status": "STATUS ONLINE",
-      "timetables": "AKTYWNE ROZKŁADY JAZDY"
+      "timetables": "AKTYWNE ROZKŁADY JAZDY",
+      "spawns": "OTWARTE SPAWNY"
     },
 
     "all-available": "WSZYSTKIE DOSTĘPNE",
@@ -222,7 +223,6 @@
     "semaphores": "KSZTAŁTOWA",
     "mixed": "MIESZANA",
     "historical": "HISTORYCZNA",
-
     "free": "WOLNA",
     "occupied": "ZAJĘTA",
 
diff --git a/src/mixins/donatorMixin.ts b/src/mixins/donatorMixin.ts
deleted file mode 100644
index 58d26b1..0000000
--- a/src/mixins/donatorMixin.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { defineComponent } from 'vue';
-import { useApiStore } from '../store/apiStore';
-
-export default defineComponent({
-  data() {
-    return {
-      apiStore: useApiStore()
-    };
-  },
-
-  methods: {
-    isDonator(name: string) {
-      return this.apiStore.donatorsData.includes(name);
-    }
-  }
-});
diff --git a/src/mixins/listObserverMixin.ts b/src/mixins/listObserverMixin.ts
deleted file mode 100644
index cd1dd68..0000000
--- a/src/mixins/listObserverMixin.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import { defineComponent } from 'vue';
-
-export default defineComponent({
-  data: () => ({
-    observer: null as IntersectionObserver | null,
-    observerTarget: null as Element | null
-  }),
-
-  methods: {
-    mountObserver(actionFunction: () => void, target: Element) {
-      this.observer = new IntersectionObserver(
-        (entries) => {
-          if (entries[0].intersectionRatio > 0.5) actionFunction();
-        },
-        { threshold: 0.2 }
-      );
-
-      this.observer.observe(target);
-    },
-
-    unmountObserver() {
-      if (!this.observerTarget) return;
-
-      this.observer?.unobserve(this.observerTarget);
-    }
-  }
-});
diff --git a/src/mixins/modalTrainMixin.ts b/src/mixins/modalTrainMixin.ts
index 0935a76..5c80dc3 100644
--- a/src/mixins/modalTrainMixin.ts
+++ b/src/mixins/modalTrainMixin.ts
@@ -1,10 +1,12 @@
 import { defineComponent } from 'vue';
 import { useMainStore } from '../store/mainStore';
+import { useTooltipStore } from '../store/tooltipStore';
 
 export default defineComponent({
   data() {
     return {
-      store: useMainStore()
+      store: useMainStore(),
+      tooltipStore: useTooltipStore()
     };
   },
 
@@ -17,7 +19,7 @@ export default defineComponent({
 
     closeModal() {
       this.store.chosenModalTrainId = undefined;
-      this.store.popUpData.key = null;
+      this.tooltipStore.hide();
 
       setTimeout(() => {
         (this.store.modalLastClickedTarget as any)?.focus();
diff --git a/src/mixins/popupMixin.ts b/src/mixins/popupMixin.ts
deleted file mode 100644
index 8a16b65..0000000
--- a/src/mixins/popupMixin.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import { defineComponent } from 'vue';
-import { useMainStore } from '../store/mainStore';
-import { PopUpType, popupKeys } from '../store/typings';
-
-const isPopUp = (v: any): v is PopUpType => popupKeys.includes(v);
-
-export default defineComponent({
-  data() {
-    return {
-      store: useMainStore()
-    };
-  },
-
-  methods: {
-    showPopUp(e: MouseEvent, componentKey: string, value?: string) {
-      if (!isPopUp(componentKey)) return;
-
-      this.store.popUpData['key'] = componentKey;
-      this.store.popUpData['content'] = value ?? '';
-    },
-
-    hidePopUp() {
-      this.store.popUpData['key'] = null;
-      this.store.popUpData['content'] = '';
-    }
-  }
-});
diff --git a/src/store/mainStore.ts b/src/store/mainStore.ts
index dbda7fc..537e396 100644
--- a/src/store/mainStore.ts
+++ b/src/store/mainStore.ts
@@ -29,10 +29,7 @@ export const useMainStore = defineStore('mainStore', {
 
       chosenModalTrainId: undefined,
 
-      modalLastClickedTarget: null,
-
-      mousePos: { x: 0, y: 0 },
-      popUpData: { key: null, content: '' }
+      modalLastClickedTarget: null
     }) as MainStoreState,
 
   getters: {
diff --git a/src/store/stationFiltersStore.ts b/src/store/stationFiltersStore.ts
index 1e545a6..f3b570b 100644
--- a/src/store/stationFiltersStore.ts
+++ b/src/store/stationFiltersStore.ts
@@ -54,9 +54,7 @@ const filterInitStates: Filter = {
   withoutActiveTimetables: false,
   maxVmax: 200,
   minVmax: 0,
-
   authors: '',
-
   onlineFromHours: 0
 };
 
diff --git a/src/store/tooltipStore.ts b/src/store/tooltipStore.ts
new file mode 100644
index 0000000..b82577a
--- /dev/null
+++ b/src/store/tooltipStore.ts
@@ -0,0 +1,52 @@
+import { defineStore } from 'pinia';
+
+const isTooltip = (v: any): v is TooltipType => tooltipKeys.includes(v);
+
+export const tooltipKeys = ['DonatorTooltip', 'BaseTooltip', 'VehiclePreviewTooltip'] as const;
+
+export type TooltipType = (typeof tooltipKeys)[number];
+
+export const useTooltipStore = defineStore('tooltipStore', {
+  state: () => ({
+    mousePos: [0, 0],
+    type: null as TooltipType | null,
+    content: ''
+  }),
+
+  actions: {
+    show(_e: MouseEvent, type: string, value?: string) {
+      if (!isTooltip(type)) return;
+
+      console.log(type, value);
+
+      this.type = type;
+      this.content = value ?? '';
+    },
+
+    hide() {
+      this.type = null;
+      this.content = '';
+    },
+
+    handle(e: MouseEvent) {
+      const targetEl = e
+        .composedPath()
+        .find((p) => p instanceof HTMLElement && p.getAttribute('data-tooltip-type'));
+
+      if (!targetEl || !(targetEl instanceof HTMLElement)) {
+        if (this.type != null) this.hide();
+
+        return;
+      }
+
+      const tooltipType = targetEl.getAttribute('data-tooltip-type');
+      const tooltipContent = targetEl.getAttribute('data-tooltip-content');
+
+      if (tooltipType && tooltipContent) this.show(e, tooltipType, tooltipContent);
+      else if (this.type != null) this.hide();
+
+      this.mousePos[0] = e.pageX;
+      this.mousePos[1] = e.pageY;
+    }
+  }
+});
diff --git a/src/store/typings.ts b/src/store/typings.ts
index 7860510..289f5f9 100644
--- a/src/store/typings.ts
+++ b/src/store/typings.ts
@@ -1,8 +1,5 @@
 import { API } from '../typings/api';
-import { Availability, Station, StationRoutesInfo, Status, Train } from '../typings/common';
-
-export const popupKeys = ['DonatorPopUp', 'TrainCommentsPopUp', 'VehiclePreviewPopUp'] as const;
-export type PopUpType = (typeof popupKeys)[number];
+import { Availability, StationRoutesInfo, Status } from '../typings/common';
 
 export interface MainStoreState {
   region: { id: string; value: string; name: string };
@@ -15,8 +12,6 @@ export interface MainStoreState {
   driverStatsStatus: Status.Data;
   chosenModalTrainId?: string;
   modalLastClickedTarget: EventTarget | null;
-  mousePos: { x: number; y: number };
-  popUpData: { key: PopUpType | null; content: string };
 }
 
 export interface StationJSONData {
diff --git a/src/store/utils.ts b/src/store/utils.ts
index a0b86c2..43c131c 100644
--- a/src/store/utils.ts
+++ b/src/store/utils.ts
@@ -4,7 +4,9 @@ import {
   Train,
   ScheduledTrain,
   Station,
-  StationTrain
+  StationTrain,
+  ScenerySpawn,
+  ScenerySpawnType
 } from '../typings/common';
 
 export function getLocoURL(locoType: string): string {
@@ -36,7 +38,7 @@ export function getStatusTimestamp(stationStatus: any): number {
   return -1;
 }
 
-export function parseSpawns(spawnString: string | null) {
+export function parseSpawns(spawnString: string | null): ScenerySpawn[] {
   if (!spawnString) return [];
   if (spawnString === 'NO_SPAWN') return [];
 
@@ -46,7 +48,15 @@ export function parseSpawns(spawnString: string | null) {
     const spawnLength = parseInt(spawnArray[2]);
     const isElectrified = spawnArray[3] == 'True';
 
-    return { spawnName, spawnLength, isElectrified };
+    let spawnType: ScenerySpawnType = /EZT|POS|OSOB|PAS/i.test(spawnName)
+      ? 'passenger'
+      : /TOW/i.test(spawnName)
+        ? 'freight'
+        : /LUZ/i.test(spawnName)
+          ? 'loco'
+          : 'all';
+
+    return { spawnName, spawnLength, isElectrified, spawnType };
   });
 }
 
diff --git a/src/typings/common.ts b/src/typings/common.ts
index cfd711a..4bc710c 100644
--- a/src/typings/common.ts
+++ b/src/typings/common.ts
@@ -1,4 +1,5 @@
 export type Availability = 'default' | 'unavailable' | 'nonPublic' | 'abandoned' | 'nonDefault';
+export type ScenerySpawnType = 'passenger' | 'freight' | 'loco' | 'all';
 
 export enum StopStatus {
   ARRIVING = 'arriving',
@@ -138,21 +139,17 @@ export interface ActiveScenery {
   region: string;
   maxUsers: number;
   currentUsers: number;
-  spawns: { spawnName: string; spawnLength: number; isElectrified: boolean }[];
+  spawns: ScenerySpawn[];
   dispatcherName: string;
   dispatcherRate: number;
   dispatcherId: number;
   dispatcherExp: number;
   dispatcherIsSupporter: boolean;
-
   dispatcherStatus: Status.ActiveDispatcher | number;
   dispatcherTimestamp: number | null;
-
   isOnline: boolean;
-
   stationTrains?: StationTrain[];
   scheduledTrains?: ScheduledTrain[];
-
   scheduledTrainCount: {
     all: number;
     confirmed: number;
@@ -160,6 +157,13 @@ export interface ActiveScenery {
   };
 }
 
+export interface ScenerySpawn {
+  spawnName: string;
+  spawnLength: number;
+  isElectrified: boolean;
+  spawnType: ScenerySpawnType;
+}
+
 export interface StationTrain {
   driverName: string;
   driverId: number;