diff --git a/src/entities/Font/model/const/const.ts b/src/entities/Font/model/const/const.ts
index 0bebbcd..472a309 100644
--- a/src/entities/Font/model/const/const.ts
+++ b/src/entities/Font/model/const/const.ts
@@ -1,5 +1,5 @@
 import type { ControlModel } from '$shared/lib';
-import type { ControlId } from '..';
+import type { ControlId } from '../types/typography';
 
 /**
  * Font size constants
diff --git a/src/entities/Font/model/store/index.ts b/src/entities/Font/model/store/index.ts
index 9091e93..3ef8061 100644
--- a/src/entities/Font/model/store/index.ts
+++ b/src/entities/Font/model/store/index.ts
@@ -1,5 +1,5 @@
 // Applied fonts manager
-export { appliedFontsManager } from './appliedFontsStore/appliedFontsStore.svelte';
+export * from './appliedFontsStore/appliedFontsStore.svelte';
 
 // Batch font store
 export { BatchFontStore } from './batchFontStore.svelte';
diff --git a/src/entities/Font/model/types/index.ts b/src/entities/Font/model/types/index.ts
index 930dd25..28ef772 100644
--- a/src/entities/Font/model/types/index.ts
+++ b/src/entities/Font/model/types/index.ts
@@ -33,3 +33,4 @@ export type {
 } from './store';
 
 export * from './store/appliedFonts';
+export * from './typography';
diff --git a/src/entities/Font/model/types/typography.ts b/src/entities/Font/model/types/typography.ts
new file mode 100644
index 0000000..19104a2
--- /dev/null
+++ b/src/entities/Font/model/types/typography.ts
@@ -0,0 +1 @@
+export type ControlId = 'font_size' | 'font_weight' | 'line_height' | 'letter_spacing';
diff --git a/src/features/SetupFont/lib/settingsManager/settingsManager.svelte.ts b/src/features/SetupFont/lib/settingsManager/settingsManager.svelte.ts
index 50accf6..f096ddb 100644
--- a/src/features/SetupFont/lib/settingsManager/settingsManager.svelte.ts
+++ b/src/features/SetupFont/lib/settingsManager/settingsManager.svelte.ts
@@ -11,6 +11,7 @@
  */
 
 import {
+    type ControlId,
     DEFAULT_FONT_SIZE,
     DEFAULT_FONT_WEIGHT,
     DEFAULT_LETTER_SPACING,
@@ -25,7 +26,6 @@ import {
     createTypographyControl,
 } from '$shared/lib';
 import { SvelteMap } from 'svelte/reactivity';
-import { type ControlId } from '../../model';
 
 type ControlOnlyFields<T extends string = string> = Omit<ControlModel<T>, keyof ControlDataModel>;
 
diff --git a/src/features/SetupFont/model/index.ts b/src/features/SetupFont/model/index.ts
index 7497623..204e237 100644
--- a/src/features/SetupFont/model/index.ts
+++ b/src/features/SetupFont/model/index.ts
@@ -1,4 +1 @@
-export {
-    type ControlId,
-    typographySettingsStore,
-} from './state/typographySettingsStore';
+export { typographySettingsStore } from './state/typographySettingsStore';
diff --git a/src/features/SetupFont/model/state/typographySettingsStore.ts b/src/features/SetupFont/model/state/typographySettingsStore.ts
index bb377a6..592b355 100644
--- a/src/features/SetupFont/model/state/typographySettingsStore.ts
+++ b/src/features/SetupFont/model/state/typographySettingsStore.ts
@@ -1,7 +1,6 @@
 import { DEFAULT_TYPOGRAPHY_CONTROLS_DATA } from '$entities/Font';
 import { createTypographySettingsManager } from '../../lib';
 
-export type ControlId = 'font_size' | 'font_weight' | 'line_height' | 'letter_spacing';
 export const typographySettingsStore = createTypographySettingsManager(
     DEFAULT_TYPOGRAPHY_CONTROLS_DATA,
     'glyphdiff:comparison:typography',