diff --git a/packages/feedback/src/FeedbackForm.svelte b/packages/feedback/src/FeedbackForm.svelte
index 3896316ea..22f337729 100644
--- a/packages/feedback/src/FeedbackForm.svelte
+++ b/packages/feedback/src/FeedbackForm.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import type { CreateFeedbackInput } from './feedback';
+	import type { CreateFeedbackInput } from './api';
 
 	interface Props {
 		onSubmit: (input: CreateFeedbackInput) => Promise<void>;
diff --git a/packages/feedback/src/FeedbackPage.svelte b/packages/feedback/src/FeedbackPage.svelte
index 097c17ae2..10825389a 100644
--- a/packages/feedback/src/FeedbackPage.svelte
+++ b/packages/feedback/src/FeedbackPage.svelte
@@ -1,9 +1,7 @@
 <script lang="ts">
-	import type {
-		FeedbackService,
-		Feedback,
-		CreateFeedbackInput,
-	} from './createFeedbackService';
+	import type { FeedbackService } from './createFeedbackService';
+	import type { Feedback } from './feedback';
+	import type { CreateFeedbackInput } from './api';
 	import FeedbackForm from './FeedbackForm.svelte';
 	import FeedbackList from './FeedbackList.svelte';
 
diff --git a/packages/help/src/components/HelpSearch.svelte b/packages/help/src/components/HelpSearch.svelte
index e387eaf10..99981bdd9 100644
--- a/packages/help/src/components/HelpSearch.svelte
+++ b/packages/help/src/components/HelpSearch.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import type { HelpSearchProps } from '../ui-types';
-	import type { SearchResult } from '../content';
+	import type { SearchResult } from '../search-types';
 	import { createSearcher } from '../search-engine';
 
 	let { content, translations, placeholder, onResultSelect }: HelpSearchProps = $props();
diff --git a/packages/help/src/pages/HelpPage.svelte b/packages/help/src/pages/HelpPage.svelte
index 336b30cb5..dbe44af17 100644
--- a/packages/help/src/pages/HelpPage.svelte
+++ b/packages/help/src/pages/HelpPage.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
-	import type { HelpPageProps, HelpSection } from '../types.js';
-	import type { SearchResult } from './content';
+	import type { HelpPageProps, HelpSection } from '../ui-types';
+	import type { SearchResult } from '../search-types';
 	import HelpSearch from '../components/HelpSearch.svelte';
 	import FAQSection from '../components/FAQSection.svelte';
 	import FeaturesOverview from '../components/FeaturesOverview.svelte';
diff --git a/packages/help/src/translations.ts b/packages/help/src/translations.ts
index e6c116852..8fac37e70 100644
--- a/packages/help/src/translations.ts
+++ b/packages/help/src/translations.ts
@@ -3,7 +3,7 @@
  * Apps can use these directly or override individual fields.
  */
 
-import type { HelpPageTranslations } from './types.js';
+import type { HelpPageTranslations } from './ui-types';
 
 export const defaultTranslationsDE: HelpPageTranslations = {
 	title: 'Hilfe & Support',
diff --git a/packages/help/src/ui-types.ts b/packages/help/src/ui-types.ts
index 8878d4ad1..e3322a076 100644
--- a/packages/help/src/ui-types.ts
+++ b/packages/help/src/ui-types.ts
@@ -2,7 +2,8 @@
  * Component Props and Translation Types
  */
 
-import type { HelpContent, SearchResult } from './content';
+import type { HelpContent } from './content';
+import type { SearchResult } from './search-types';
 
 // ============================================================================
 // Translation Types
diff --git a/packages/shared-auth-ui/src/stores/createAuthStore.svelte.ts b/packages/shared-auth-ui/src/stores/createAuthStore.svelte.ts
index 7485e721a..b154cc6d9 100644
--- a/packages/shared-auth-ui/src/stores/createAuthStore.svelte.ts
+++ b/packages/shared-auth-ui/src/stores/createAuthStore.svelte.ts
@@ -15,7 +15,7 @@
  * ```
  */
 
-import type { AuthServiceAdapter, AuthResult, BaseUser } from './types';
+import type { AuthServiceAdapter, AuthResult, BaseUser } from './store-types';
 
 /**
  * Create a Svelte 5 runes-based auth store
diff --git a/packages/shared-ui/src/index.ts b/packages/shared-ui/src/index.ts
index e6624c60f..5878ff09d 100644
--- a/packages/shared-ui/src/index.ts
+++ b/packages/shared-ui/src/index.ts
@@ -183,7 +183,13 @@ export {
 	createInputBarSettingsStore,
 	getInputBarSettingsStore,
 } from './quick-input';
-export type { QuickInputItem, QuickAction, CreatePreview, InputBarSettings } from './quick-input';
+export type {
+	QuickInputItem,
+	QuickAction,
+	CreatePreview,
+	HighlightPattern,
+	InputBarSettings,
+} from './quick-input';
 
 // Pages
 export { default as AppsPage } from './pages/AppsPage.svelte';
diff --git a/packages/shared-ui/src/navigation/PillNavigation.svelte b/packages/shared-ui/src/navigation/PillNavigation.svelte
index 39af517ae..8f098c42f 100644
--- a/packages/shared-ui/src/navigation/PillNavigation.svelte
+++ b/packages/shared-ui/src/navigation/PillNavigation.svelte
@@ -7,15 +7,14 @@
 		PillTabGroupConfig,
 		PillTagSelectorConfig,
 		PillAppItem,
+		SpotlightAction,
+		ContentSearcher,
 	} from './types';
 	import PillDropdown from './PillDropdown.svelte';
 	import PillTabGroup from './PillTabGroup.svelte';
 	import PillTagSelector from './PillTagSelector.svelte';
 	import AppDrawer from './AppDrawer.svelte';
-	import GlobalSpotlight, {
-		type SpotlightAction,
-		type ContentSearcher,
-	} from './GlobalSpotlight.svelte';
+	import GlobalSpotlight from './GlobalSpotlight.svelte';
 	import { createGlobalSpotlightState } from './useGlobalSpotlight.svelte';
 	// Phosphor Icons (via shared-icons)
 	import {
diff --git a/packages/subscriptions/src/CostCard.svelte b/packages/subscriptions/src/CostCard.svelte
index 0ff2a8e9a..a6a761fba 100644
--- a/packages/subscriptions/src/CostCard.svelte
+++ b/packages/subscriptions/src/CostCard.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import type { CostItem } from './plans';
+	import type { CostItem } from './usage';
 
 	interface Props {
 		costs: CostItem[];
diff --git a/packages/subscriptions/src/UsageCard.svelte b/packages/subscriptions/src/UsageCard.svelte
index 0fd90ca74..e643f7a12 100644
--- a/packages/subscriptions/src/UsageCard.svelte
+++ b/packages/subscriptions/src/UsageCard.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import type { UsageData } from './plans';
+	import type { UsageData } from './usage';
 
 	interface Props {
 		title?: string;
diff --git a/packages/subscriptions/src/pages/SubscriptionPage.svelte b/packages/subscriptions/src/pages/SubscriptionPage.svelte
index 0fa267c92..f679aec1f 100644
--- a/packages/subscriptions/src/pages/SubscriptionPage.svelte
+++ b/packages/subscriptions/src/pages/SubscriptionPage.svelte
@@ -1,11 +1,6 @@
 <script lang="ts">
-	import type {
-		SubscriptionPlan,
-		ManaPackage,
-		UsageData,
-		CostItem,
-		BillingCycle,
-	} from './plans';
+	import type { SubscriptionPlan, ManaPackage, BillingCycle } from '../plans';
+	import type { UsageData, CostItem } from '../usage';
 	import BillingToggle from '../BillingToggle.svelte';
 	import SubscriptionCard from '../SubscriptionCard.svelte';
 	import PackageCard from '../PackageCard.svelte';