diff --git a/apps/server/src/services/keyboard_actions.ts b/apps/server/src/services/keyboard_actions.ts
index 78723da3d..35bfd9b6f 100644
--- a/apps/server/src/services/keyboard_actions.ts
+++ b/apps/server/src/services/keyboard_actions.ts
@@ -3,7 +3,7 @@
 import optionService from "./options.js";
 import log from "./log.js";
 import { isElectron, isMac } from "./utils.js";
-import type { KeyboardShortcut } from "./keyboard_actions_interface.js";
+import type { KeyboardShortcut } from "@triliumnext/commons";
 import { t } from "i18next";
 
 function getDefaultKeyboardActions() {
diff --git a/apps/server/src/services/options_init.ts b/apps/server/src/services/options_init.ts
index b4092367f..1289958c0 100644
--- a/apps/server/src/services/options_init.ts
+++ b/apps/server/src/services/options_init.ts
@@ -1,11 +1,10 @@
 import optionService from "./options.js";
-import type { OptionMap, OptionNames } from "./options_interface.js";
 import appInfo from "./app_info.js";
 import { randomSecureToken, isWindows } from "./utils.js";
 import log from "./log.js";
 import dateUtils from "./date_utils.js";
 import keyboardActions from "./keyboard_actions.js";
-import type { KeyboardShortcutWithRequiredActionName } from "./keyboard_actions_interface.js";
+import type { KeyboardShortcutWithRequiredActionName, OptionMap, OptionNames } from "@triliumnext/commons";
 import { DEFAULT_ALLOWED_TAGS } from "./html_sanitizer.js";
 
 function initDocumentOptions() {
diff --git a/apps/server/src/services/tray.ts b/apps/server/src/services/tray.ts
index fa3d91ede..c7dfbfe9c 100644
--- a/apps/server/src/services/tray.ts
+++ b/apps/server/src/services/tray.ts
@@ -10,7 +10,7 @@ import type BNote from "../becca/entities/bnote.js";
 import type BRecentNote from "../becca/entities/brecent_note.js";
 import cls from "./cls.js";
 import date_notes from "./date_notes.js";
-import type { KeyboardActionNames } from "./keyboard_actions_interface.js";
+import type { KeyboardActionNames } from "@triliumnext/commons";
 import optionService from "./options.js";
 import { isDev, isMac } from "./utils.js";
 import windowService from "./window.js";