diff --git a/apps/server/src/routes/api/fonts.ts b/apps/server/src/routes/api/fonts.ts
index 9bdc3aa5b..dc24be874 100644
--- a/apps/server/src/routes/api/fonts.ts
+++ b/apps/server/src/routes/api/fonts.ts
@@ -1,6 +1,6 @@
 import type { Request, Response } from "express";
 import optionService from "../../services/options.js";
-import type { OptionMap } from "../../services/options_interface.js";
+import type { OptionMap } from "@triliumnext/commons";
 
 const SYSTEM_SANS_SERIF = [
     "system-ui",
diff --git a/apps/server/src/routes/api/options.ts b/apps/server/src/routes/api/options.ts
index c7e48c432..0e9071992 100644
--- a/apps/server/src/routes/api/options.ts
+++ b/apps/server/src/routes/api/options.ts
@@ -7,7 +7,7 @@ import ValidationError from "../../errors/validation_error.js";
 import type { Request } from "express";
 import { changeLanguage, getLocales } from "../../services/i18n.js";
 import { listSyntaxHighlightingThemes } from "../../services/code_block_theme.js";
-import type { OptionNames } from "../../services/options_interface.js";
+import type { OptionNames } from "@triliumnext/commons";
 
 // options allowed to be updated directly in the Options dialog
 const ALLOWED_OPTIONS = new Set<OptionNames>([
diff --git a/apps/server/src/services/backup.ts b/apps/server/src/services/backup.ts
index 0a3df78e7..6c833c4ca 100644
--- a/apps/server/src/services/backup.ts
+++ b/apps/server/src/services/backup.ts
@@ -9,7 +9,7 @@ import syncMutexService from "./sync_mutex.js";
 import cls from "./cls.js";
 import sql from "./sql.js";
 import path from "path";
-import type { OptionNames } from "./options_interface.js";
+import type { OptionNames } from "@triliumnext/commons";
 
 type BackupType = "daily" | "weekly" | "monthly";
 
diff --git a/apps/server/src/services/encryption/totp_encryption.ts b/apps/server/src/services/encryption/totp_encryption.ts
index bf079cc9d..6d6de51e8 100644
--- a/apps/server/src/services/encryption/totp_encryption.ts
+++ b/apps/server/src/services/encryption/totp_encryption.ts
@@ -2,7 +2,7 @@ import optionService from "../options.js";
 import myScryptService from "./my_scrypt.js";
 import { randomSecureToken, toBase64 } from "../utils.js";
 import dataEncryptionService from "./data_encryption.js";
-import type { OptionNames } from "../options_interface.js";
+import type { OptionNames } from "@triliumnext/commons";
 
 const TOTP_OPTIONS: Record<string, OptionNames> = {
     SALT: "totpEncryptionSalt",
diff --git a/apps/server/src/services/llm/index_service.ts b/apps/server/src/services/llm/index_service.ts
index 1fa1c9615..8d4adae9d 100644
--- a/apps/server/src/services/llm/index_service.ts
+++ b/apps/server/src/services/llm/index_service.ts
@@ -17,7 +17,7 @@ import providerManager from "./providers/providers.js";
 import { ContextExtractor } from "./context/index.js";
 import eventService from "../events.js";
 import type { NoteEmbeddingContext } from "./embeddings/embeddings_interface.js";
-import type { OptionDefinitions } from "../options_interface.js";
+import type { OptionDefinitions } from "@triliumnext/commons";
 import sql from "../sql.js";
 import sqlInit from "../sql_init.js";
 import { CONTEXT_PROMPTS } from './constants/llm_prompt_constants.js';
diff --git a/apps/server/src/services/llm/providers/providers.ts b/apps/server/src/services/llm/providers/providers.ts
index 478d441a5..5fcd4286a 100644
--- a/apps/server/src/services/llm/providers/providers.ts
+++ b/apps/server/src/services/llm/providers/providers.ts
@@ -8,7 +8,7 @@ import { NormalizationStatus } from "../embeddings/embeddings_interface.js";
 import { OpenAIEmbeddingProvider } from "../embeddings/providers/openai.js";
 import { OllamaEmbeddingProvider } from "../embeddings/providers/ollama.js";
 import { VoyageEmbeddingProvider } from "../embeddings/providers/voyage.js";
-import type { OptionDefinitions } from "../../options_interface.js";
+import type { OptionDefinitions } from "@triliumnext/commons";
 import type { ChatCompletionOptions } from '../ai_interface.js';
 import type { OpenAIOptions, AnthropicOptions, OllamaOptions, ModelMetadata } from './provider_options.js';
 import {
diff --git a/apps/server/src/services/options.ts b/apps/server/src/services/options.ts
index 27853b4aa..f6e575c19 100644
--- a/apps/server/src/services/options.ts
+++ b/apps/server/src/services/options.ts
@@ -15,7 +15,7 @@
 import becca from "../becca/becca.js";
 import BOption from "../becca/entities/boption.js";
 import type { OptionRow } from "@triliumnext/commons";
-import type { FilterOptionsByType, OptionDefinitions, OptionMap, OptionNames } from "./options_interface.js";
+import type { FilterOptionsByType, OptionDefinitions, OptionMap, OptionNames } from "@triliumnext/commons";
 import sql from "./sql.js";
 
 function getOptionOrNull(name: OptionNames): string | null {