diff --git a/hooks/index.ts b/hooks/index.ts
index 4fef74331..1d80ae99b 100644
--- a/hooks/index.ts
+++ b/hooks/index.ts
@@ -90,7 +90,29 @@ export { useDecrement } from './useDecrement'
 export { useIncrement } from './useIncrement'
 export { useAsyncCallback } from './useAsyncCallback'
 
-// App utilities
-export { useAppDispatch, useAppSelector, createAppStore } from './hooks'
-export { ToastContext } from './ToastContext'
-export { I18nNavigation } from './I18nNavigation'
+// API & data hooks
+export { useAuth } from './use-auth'
+export { useBlobStorage } from './use-blob-storage'
+export { useCachedData } from './use-cached-data'
+export { useDBAL } from './use-dbal'
+export { useKVStore } from './use-kv-store'
+export { useMobile } from './use-mobile'
+export { useRestAPI } from './use-rest-api'
+export { useAsyncData } from './useAsyncData'
+export { useAutoRefresh } from './useAutoRefresh'
+export { useCodeEditor } from './useCodeEditor'
+export { useFileTree } from './useFileTree'
+export { useGitHubFetcher } from './useGitHubFetcher'
+export { useKV } from './useKV'
+export { useLevelRouting } from './useLevelRouting'
+export { usePackageActions } from './usePackageActions'
+export { usePackageDetails } from './usePackageDetails'
+export { usePackages } from './usePackages'
+export { useResolvedUser } from './useResolvedUser'
+export { useUserActions } from './useUserActions'
+export { useUserForm } from './useUserForm'
+export { useUsers } from './useUsers'
+export { useWorkflow } from './useWorkflow'
+
+// Re-export types
+export type { AuthUser } from './use-auth'