diff --git a/src/entities/Font/index.ts b/src/entities/Font/index.ts
index 2c92962..8601a70 100644
--- a/src/entities/Font/index.ts
+++ b/src/entities/Font/index.ts
@@ -1,3 +1,14 @@
+// Proxy API (PRIMARY)
+export {
+    fetchProxyFontById,
+    fetchProxyFonts,
+} from './api/proxy/proxyFonts';
+export type {
+    ProxyFontsParams,
+    ProxyFontsResponse,
+} from './api/proxy/proxyFonts';
+
+// Fontshare API (DEPRECATED)
 export {
     fetchAllFontshareFonts,
     fetchFontshareFontBySlug,
@@ -7,6 +18,8 @@ export type {
     FontshareParams,
     FontshareResponse,
 } from './api/fontshare/fontshare';
+
+// Google Fonts API (DEPRECATED)
 export {
     fetchGoogleFontFamily,
     fetchGoogleFonts,
@@ -61,13 +74,17 @@ export type {
 
 export {
     appliedFontsManager,
-    createFontshareStore,
+    createUnifiedFontStore,
     fetchFontshareFontsQuery,
-    fontshareStore,
     selectedFontsStore,
+    unifiedFontStore,
 } from './model';
 
-// Stores
+// Stores (DEPRECATED)
+export {
+    createFontshareStore,
+    fontshareStore,
+} from './model';
 export {
     createGoogleFontsStore,
     GoogleFontsStore,
diff --git a/src/entities/Font/model/index.ts b/src/entities/Font/model/index.ts
index b1ce8a1..45b2e78 100644
--- a/src/entities/Font/model/index.ts
+++ b/src/entities/Font/model/index.ts
@@ -38,8 +38,15 @@ export { fetchFontshareFontsQuery } from './services';
 
 export {
     appliedFontsManager,
+    createUnifiedFontStore,
+    selectedFontsStore,
+    type UnifiedFontStore,
+    unifiedFontStore,
+} from './store';
+
+// DEPRECATED: Fontshare store (kept for backward compatibility)
+export {
     createFontshareStore,
     type FontshareStore,
     fontshareStore,
-    selectedFontsStore,
-} from './store';
+} from './store/fontshareStore.svelte';
diff --git a/src/features/GetFonts/ui/SuggestedFonts/SuggestedFonts.svelte b/src/features/GetFonts/ui/SuggestedFonts/SuggestedFonts.svelte
index 0a60c68..d4e4a14 100644
--- a/src/features/GetFonts/ui/SuggestedFonts/SuggestedFonts.svelte
+++ b/src/features/GetFonts/ui/SuggestedFonts/SuggestedFonts.svelte
@@ -6,11 +6,11 @@
 import {
     FontListItem,
     FontVirtualList,
-    fontshareStore,
+    unifiedFontStore,
 } from '$entities/Font';
 </script>
 
-<FontVirtualList items={fontshareStore.fonts}>
+<FontVirtualList items={unifiedFontStore.fonts}>
     {#snippet children({ item: font, isVisible, proximity })}
         <FontListItem {font} {isVisible} {proximity} />
     {/snippet}
diff --git a/src/widgets/FontSearch/ui/FontSearch/FontSearch.svelte b/src/widgets/FontSearch/ui/FontSearch/FontSearch.svelte
index 10a0ae5..fd58cc1 100644
--- a/src/widgets/FontSearch/ui/FontSearch/FontSearch.svelte
+++ b/src/widgets/FontSearch/ui/FontSearch/FontSearch.svelte
@@ -4,7 +4,7 @@
     Combines search input with font list display
 -->
 <script lang="ts">
-import { fontshareStore } from '$entities/Font';
+import { unifiedFontStore } from '$entities/Font';
 import {
     FilterControls,
     Filters,
@@ -38,7 +38,7 @@ onMount(() => {
      * We "plug" this manager into the global store.
      * addBinding returns a function that removes this binding when the component unmounts.
      */
-    const unbind = fontshareStore.addBinding(() => mapManagerToParams(filterManager));
+    const unbind = unifiedFontStore.addBinding(() => mapManagerToParams(filterManager));
 
     return unbind;
 });