diff --git a/apps/edit-docs/package.json b/apps/edit-docs/package.json
index da53d66d60..eb46c4ca32 100644
--- a/apps/edit-docs/package.json
+++ b/apps/edit-docs/package.json
@@ -9,6 +9,7 @@
   },
   "devDependencies": {
     "@triliumnext/client": "workspace:*",
+    "@triliumnext/core": "workspace:*",
     "@triliumnext/desktop": "workspace:*",
     "@types/fs-extra": "11.0.4",
     "copy-webpack-plugin": "14.0.0",
diff --git a/apps/edit-docs/src/edit-demo.ts b/apps/edit-docs/src/edit-demo.ts
index 62ea490142..2f058d6123 100644
--- a/apps/edit-docs/src/edit-demo.ts
+++ b/apps/edit-docs/src/edit-demo.ts
@@ -34,8 +34,8 @@ async function setOptions() {
 }
 
 async function registerHandlers() {
-    const events = (await import("@triliumnext/server/src/services/events.js")).default;
-    const eraseService = (await import("@triliumnext/server/src/services/erase.js")).default;
+    const { events } = await import("@triliumnext/core");
+    const { erase: eraseService } = await import("@triliumnext/core");
     const debouncer = debounce(async () => {
         console.log("Exporting data");
         eraseService.eraseUnusedAttachmentsNow();
diff --git a/apps/edit-docs/src/edit-docs.ts b/apps/edit-docs/src/edit-docs.ts
index 40163330d0..e35d217728 100644
--- a/apps/edit-docs/src/edit-docs.ts
+++ b/apps/edit-docs/src/edit-docs.ts
@@ -125,7 +125,7 @@ async function main() {
     await initializeDatabase(true);
 
     // Wait for becca to be loaded before importing data
-    const beccaLoader = await import("@triliumnext/server/src/becca/becca_loader.js");
+    const { becca_loader: beccaLoader } = await import("@triliumnext/core");
     await beccaLoader.beccaLoaded;
 
     cls.init(async () => {
@@ -252,8 +252,8 @@ async function cleanUpMeta(outputPath: string, minify: boolean) {
 }
 
 async function registerHandlers() {
-    const events = (await import("@triliumnext/server/src/services/events.js")).default;
-    const eraseService = (await import("@triliumnext/server/src/services/erase.js")).default;
+    const { events } = await import("@triliumnext/core");
+    const { erase: eraseService } = await import("@triliumnext/core");
     const debouncer = debounce(async () => {
         eraseService.eraseUnusedAttachmentsNow();
 
diff --git a/apps/edit-docs/tsconfig.app.json b/apps/edit-docs/tsconfig.app.json
index b9e17115a0..ab40ca633c 100644
--- a/apps/edit-docs/tsconfig.app.json
+++ b/apps/edit-docs/tsconfig.app.json
@@ -23,6 +23,9 @@
     "eslint.config.mjs"
   ],
   "references": [
+    {
+      "path": "../../packages/trilium-core/tsconfig.lib.json"
+    },
     {
       "path": "../server/tsconfig.app.json"
     },
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 7ab86f9c63..2b11c79afb 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -739,6 +739,9 @@ importers:
       '@triliumnext/client':
         specifier: workspace:*
         version: link:../client
+      '@triliumnext/core':
+        specifier: workspace:*
+        version: link:../../packages/trilium-core
       '@triliumnext/desktop':
         specifier: workspace:*
         version: link:../desktop
@@ -17536,6 +17539,8 @@ snapshots:
       '@ckeditor/ckeditor5-ui': 47.6.1
       '@ckeditor/ckeditor5-utils': 47.6.1
       ckeditor5: 47.6.1
+    transitivePeerDependencies:
+      - supports-color
 
   '@ckeditor/ckeditor5-export-word@47.6.1':
     dependencies:
@@ -17665,8 +17670,6 @@ snapshots:
       '@ckeditor/ckeditor5-widget': 47.6.1
       ckeditor5: 47.6.1
       es-toolkit: 1.39.5
-    transitivePeerDependencies:
-      - supports-color
 
   '@ckeditor/ckeditor5-icons@47.6.1': {}
 
@@ -17684,8 +17687,6 @@ snapshots:
       '@ckeditor/ckeditor5-widget': 47.6.1
       ckeditor5: 47.6.1
       es-toolkit: 1.39.5
-    transitivePeerDependencies:
-      - supports-color
 
   '@ckeditor/ckeditor5-import-word@47.6.1':
     dependencies:
@@ -17698,6 +17699,8 @@ snapshots:
       '@ckeditor/ckeditor5-ui': 47.6.1
       '@ckeditor/ckeditor5-utils': 47.6.1
       ckeditor5: 47.6.1
+    transitivePeerDependencies:
+      - supports-color
 
   '@ckeditor/ckeditor5-indent@47.6.1':
     dependencies: