diff --git a/apps/client/src/services/load_results.ts b/apps/client/src/services/load_results.ts
index 9ff053185..11f9a1a11 100644
--- a/apps/client/src/services/load_results.ts
+++ b/apps/client/src/services/load_results.ts
@@ -1,4 +1,4 @@
-import type { AttachmentRow } from "../../../becca/entities/rows.js";
+import type { AttachmentRow } from "@triliumnext/commons";
 import type { AttributeType } from "../entities/fattribute.js";
 import type { EntityChange } from "../server_types.js";
 
diff --git a/apps/client/src/widgets/buttons/calendar.ts b/apps/client/src/widgets/buttons/calendar.ts
index a8b2d4542..30c16432d 100644
--- a/apps/client/src/widgets/buttons/calendar.ts
+++ b/apps/client/src/widgets/buttons/calendar.ts
@@ -10,8 +10,8 @@ import type { EventData } from "../../components/app_context.js";
 import dayjs, { Dayjs } from "dayjs";
 import utc from "dayjs/plugin/utc.js";
 import isSameOrAfter from "dayjs/plugin/isSameOrAfter.js";
-import type BAttribute from "../../../../becca/entities/battribute.js";
 import "../../../stylesheets/calendar.css";
+import { AttributeRow } from "@triliumnext/commons";
 
 dayjs.extend(utc);
 dayjs.extend(isSameOrAfter);
@@ -217,7 +217,7 @@ export default class CalendarWidget extends RightDropdownButtonWidget {
             this.weekNoteEnable = false;
             return;
         }
-        const noteAttributes = await server.get<BAttribute[]>(`notes/${noteId}/attributes`);
+        const noteAttributes = await server.get<AttributeRow[]>(`notes/${noteId}/attributes`);
 
         for (const attribute of noteAttributes) {
             if (attribute.name === 'enableWeekNote') {
diff --git a/apps/client/src/widgets/floating_buttons/help_button.spec.ts b/apps/client/src/widgets/floating_buttons/help_button.spec.ts
index bc954f27d..9015d7d75 100644
--- a/apps/client/src/widgets/floating_buttons/help_button.spec.ts
+++ b/apps/client/src/widgets/floating_buttons/help_button.spec.ts
@@ -1,7 +1,7 @@
 import { describe, expect, it } from "vitest";
 import { byBookType, byNoteType } from "./help_button.js";
 import fs from "fs";
-import type { HiddenSubtreeItem } from "../../../../services/hidden_subtree.js";
+import type { HiddenSubtreeItem } from "@triliumnext/commons";
 
 describe("Help button", () => {
     it("All help notes are accessible", () => {
diff --git a/apps/client/src/widgets/type_widgets/canvas.ts b/apps/client/src/widgets/type_widgets/canvas.ts
index abaebd692..369585936 100644
--- a/apps/client/src/widgets/type_widgets/canvas.ts
+++ b/apps/client/src/widgets/type_widgets/canvas.ts
@@ -2,7 +2,6 @@ import TypeWidget from "./type_widget.js";
 import utils from "../../services/utils.js";
 import linkService from "../../services/link.js";
 import server from "../../services/server.js";
-import asset_path from "../../../../services/asset_path.js";
 import type FNote from "../../entities/fnote.js";
 import type { ExcalidrawElement, Theme } from "@excalidraw/excalidraw/element/types";
 import type { AppState, BinaryFileData, ExcalidrawImperativeAPI, ExcalidrawProps, LibraryItem, SceneData } from "@excalidraw/excalidraw/types";
@@ -10,6 +9,7 @@ import type { JSX } from "react";
 import type React from "react";
 import type { Root } from "react-dom/client";
 import "@excalidraw/excalidraw/index.css";
+import asset_path from "../../asset_path.js";
 
 const TPL = /*html*/`
     <div class="canvas-widget note-detail-canvas note-detail-printable note-detail">