diff --git a/packages/app/src/cores/api/api.core.js b/packages/app/src/cores/api/api.core.js
index d3f4d8e1..7d9e278b 100755
--- a/packages/app/src/cores/api/api.core.js
+++ b/packages/app/src/cores/api/api.core.js
@@ -1,4 +1,4 @@
-import Core from "evite/src/core"
+import { Core } from "vessel"
 
 import createClient from "comty.js"
 
diff --git a/packages/app/src/cores/contextMenu/context_menu.core.js b/packages/app/src/cores/contextMenu/context_menu.core.js
index 9b160e63..8a59a24e 100755
--- a/packages/app/src/cores/contextMenu/context_menu.core.js
+++ b/packages/app/src/cores/contextMenu/context_menu.core.js
@@ -1,6 +1,6 @@
 import React from "react"
-import Core from "evite/src/core"
-import EventEmitter from "evite/src/internals/EventEmitter"
+
+import { Core, EventBus } from "vessel"
 
 import ContextMenu from "./components/contextMenu"
 
@@ -15,7 +15,7 @@ export default class ContextMenuCore extends Core {
         ...PostCardContext,
     }
 
-    eventBus = new EventEmitter()
+    eventBus = new EventBus()
 
     async onInitialize() {
         if (app.isMobile) {
diff --git a/packages/app/src/cores/ffmpeg/ffmpeg.core.js b/packages/app/src/cores/ffmpeg/ffmpeg.core.js
index 580fc84d..9b1a54dc 100644
--- a/packages/app/src/cores/ffmpeg/ffmpeg.core.js
+++ b/packages/app/src/cores/ffmpeg/ffmpeg.core.js
@@ -1,4 +1,4 @@
-import Core from "evite/src/core"
+import { Core } from "vessel"
 import { FFmpeg } from "@ffmpeg/ffmpeg"
 import { fetchFile, toBlobURL } from "@ffmpeg/util"
 import isURL from "@utils/isURL"
diff --git a/packages/app/src/cores/haptics/haptics.core.js b/packages/app/src/cores/haptics/haptics.core.js
index 9ee0904f..4c2a640c 100755
--- a/packages/app/src/cores/haptics/haptics.core.js
+++ b/packages/app/src/cores/haptics/haptics.core.js
@@ -1,4 +1,4 @@
-import Core from "evite/src/core"
+import { Core } from "vessel"
 import { Haptics } from "@capacitor/haptics"
 
 const vibrationPatterns = {
diff --git a/packages/app/src/cores/i18n/i18n.core.js b/packages/app/src/cores/i18n/i18n.core.js
index a196eae1..21324124 100755
--- a/packages/app/src/cores/i18n/i18n.core.js
+++ b/packages/app/src/cores/i18n/i18n.core.js
@@ -1,4 +1,4 @@
-import Core from "evite/src/core"
+import { Core } from "vessel"
 import i18n from "i18next"
 import { initReactI18next } from "react-i18next"
 
diff --git a/packages/app/src/cores/nfc/nfc.core.js b/packages/app/src/cores/nfc/nfc.core.js
index 6d274157..d0ecef1e 100755
--- a/packages/app/src/cores/nfc/nfc.core.js
+++ b/packages/app/src/cores/nfc/nfc.core.js
@@ -1,4 +1,4 @@
-import Core from "evite/src/core"
+import { Core } from "vessel"
 import TapShareDialog from "@components/TapShare/Dialog"
 
 const RecordTypes = {
diff --git a/packages/app/src/cores/notifications/notifications.core.js b/packages/app/src/cores/notifications/notifications.core.js
index 2776e29d..f6111b02 100755
--- a/packages/app/src/cores/notifications/notifications.core.js
+++ b/packages/app/src/cores/notifications/notifications.core.js
@@ -1,4 +1,4 @@
-import Core from "evite/src/core"
+import { Core } from "vessel"
 
 import NotificationUI from "./ui"
 import NotificationFeedback from "./feedback"
diff --git a/packages/app/src/cores/player/player.bkp.js b/packages/app/src/cores/player/player.bkp.js
index 356bbe17..2af3d41b 100755
--- a/packages/app/src/cores/player/player.bkp.js
+++ b/packages/app/src/cores/player/player.bkp.js
@@ -1,5 +1,4 @@
-import Core from "evite/src/core"
-import EventEmitter from "evite/src/internals/EventEmitter"
+import { Core, EventBus } from "vessel"
 import { Observable } from "object-observer"
 import { FastAverageColor } from "fast-average-color"
 
@@ -46,7 +45,7 @@ export default class Player extends Core {
 
     audioProcessors = []
 
-    eventBus = new EventEmitter()
+    eventBus = new EventBus()
 
     fac = new FastAverageColor()
 
@@ -765,7 +764,7 @@ export default class Player extends Core {
             return false
         }
 
-        
+
         // if time is provided, seek to that time
         if (typeof time === "number") {
             this.console.log(`Seeking to ${time} | Duration: ${this.track_instance.media.duration}`)
diff --git a/packages/app/src/cores/player/player.core.js b/packages/app/src/cores/player/player.core.js
index 5fe57d79..066528e4 100755
--- a/packages/app/src/cores/player/player.core.js
+++ b/packages/app/src/cores/player/player.core.js
@@ -1,5 +1,4 @@
-import Core from "evite/src/core"
-import EventEmitter from "evite/src/internals/EventEmitter"
+import { Core, EventBus } from "vessel"
 import { Observable } from "object-observer"
 import { FastAverageColor } from "fast-average-color"
 
@@ -45,7 +44,7 @@ export default class Player extends Core {
 
     audioProcessors = []
 
-    eventBus = new EventEmitter()
+    eventBus = new EventBus()
 
     fac = new FastAverageColor()
 
@@ -385,7 +384,7 @@ export default class Player extends Core {
 
         this.track_instance.audio.muted = this.state.muted
         this.track_instance.audio.loop = this.state.playback_mode === "repeat"
-        
+
         this.track_instance.gainNode.gain.value = this.state.volume
 
         // try to preload next audio
diff --git a/packages/app/src/cores/remoteStorage/chunkedUpload.js b/packages/app/src/cores/remoteStorage/chunkedUpload.js
index e88e4fc0..7a934d0a 100644
--- a/packages/app/src/cores/remoteStorage/chunkedUpload.js
+++ b/packages/app/src/cores/remoteStorage/chunkedUpload.js
@@ -1,4 +1,4 @@
-import EventBus from "evite/src/internals/eventBus"
+import { EventBus } from "vessel"
 import SessionModel from "@models/session"
 
 export default class ChunkedUpload {
diff --git a/packages/app/src/cores/remoteStorage/remoteStorage.core.js b/packages/app/src/cores/remoteStorage/remoteStorage.core.js
index 62810b5b..a8d0590e 100755
--- a/packages/app/src/cores/remoteStorage/remoteStorage.core.js
+++ b/packages/app/src/cores/remoteStorage/remoteStorage.core.js
@@ -1,4 +1,4 @@
-import Core from "evite/src/core"
+import { Core } from "vessel"
 
 import ChunkedUpload from "./chunkedUpload"
 
diff --git a/packages/app/src/cores/settings/settings.core.js b/packages/app/src/cores/settings/settings.core.js
index 136c59fd..814e7d48 100755
--- a/packages/app/src/cores/settings/settings.core.js
+++ b/packages/app/src/cores/settings/settings.core.js
@@ -1,4 +1,4 @@
-import Core from "evite/src/core"
+import { Core } from "vessel"
 import store from "store"
 import { Observable } from "rxjs"
 
diff --git a/packages/app/src/cores/sfx/sfx.core.js b/packages/app/src/cores/sfx/sfx.core.js
index 51841fc8..7e50f60d 100755
--- a/packages/app/src/cores/sfx/sfx.core.js
+++ b/packages/app/src/cores/sfx/sfx.core.js
@@ -1,4 +1,4 @@
-import Core from "evite/src/core"
+import { Core } from "vessel"
 import { Howl } from "howler"
 import axios from "axios"
 import store from "store"
diff --git a/packages/app/src/cores/shortcuts/shortcuts.core.js b/packages/app/src/cores/shortcuts/shortcuts.core.js
index f31f6230..87459cd3 100755
--- a/packages/app/src/cores/shortcuts/shortcuts.core.js
+++ b/packages/app/src/cores/shortcuts/shortcuts.core.js
@@ -1,4 +1,4 @@
-import Core from "evite/src/core"
+import { Core } from "vessel"
 
 export default class ShortcutsCore extends Core {
     static namespace = "shortcuts"
diff --git a/packages/app/src/cores/style/style.core.jsx b/packages/app/src/cores/style/style.core.jsx
index 47b594f6..7e9665d4 100755
--- a/packages/app/src/cores/style/style.core.jsx
+++ b/packages/app/src/cores/style/style.core.jsx
@@ -1,5 +1,5 @@
 import React from "react"
-import Core from "evite/src/core"
+import { Core } from "vessel"
 
 import { ConfigProvider, theme } from "antd"
 import store from "store"
diff --git a/packages/app/src/cores/sync/sync.core.js b/packages/app/src/cores/sync/sync.core.js
index e407b1a6..4dcb5fbc 100755
--- a/packages/app/src/cores/sync/sync.core.js
+++ b/packages/app/src/cores/sync/sync.core.js
@@ -1,4 +1,4 @@
-import Core from "evite/src/core"
+import { Core } from "vessel"
 import SyncModel from "comty.js/models/sync"
 
 export default class SyncCore extends Core {
diff --git a/packages/app/src/cores/tasksQueue/tasksQueue.core.js b/packages/app/src/cores/tasksQueue/tasksQueue.core.js
index a0e3fff1..12fea202 100755
--- a/packages/app/src/cores/tasksQueue/tasksQueue.core.js
+++ b/packages/app/src/cores/tasksQueue/tasksQueue.core.js
@@ -1,4 +1,4 @@
-import Core from "evite/src/core"
+import { Core } from "vessel"
 import { Observable } from "object-observer"
 
 export default class TasksQueue extends Core {
diff --git a/packages/app/src/cores/widgets/widgets.core.js b/packages/app/src/cores/widgets/widgets.core.js
index a4a0489d..1b38cdf7 100755
--- a/packages/app/src/cores/widgets/widgets.core.js
+++ b/packages/app/src/cores/widgets/widgets.core.js
@@ -1,4 +1,4 @@
-import Core from "evite/src/core"
+import { Core } from "vessel"
 import store from "store"
 
 export default class WidgetsCore extends Core {
diff --git a/packages/app/src/cores/windows/windows.core.jsx b/packages/app/src/cores/windows/windows.core.jsx
index a7915a7d..9f6861a4 100644
--- a/packages/app/src/cores/windows/windows.core.jsx
+++ b/packages/app/src/cores/windows/windows.core.jsx
@@ -1,5 +1,5 @@
 import React from "react"
-import Core from "evite/src/core"
+import { Core } from "vessel"
 
 import { createRoot } from "react-dom/client"