diff --git a/plugins/plugin-content-update/src/client/clientConfig.ts b/plugins/plugin-content-update/src/client/clientConfig.ts
deleted file mode 100644
index bad236a4..00000000
--- a/plugins/plugin-content-update/src/client/clientConfig.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { defineClientConfig } from 'vuepress/client'
-import type { ClientConfig } from 'vuepress/client'
-import { Content } from './components/Content.js'
-
-export default defineClientConfig({
-  enhance({ app }) {
-    if (app._context.components.Content)
-      delete app._context.components.Content
-
-    app.component('Content', Content)
-  },
-}) as ClientConfig
diff --git a/plugins/plugin-content-update/src/node/plugin.ts b/plugins/plugin-content-update/src/node/plugin.ts
index 6d041dee..cff5534a 100644
--- a/plugins/plugin-content-update/src/node/plugin.ts
+++ b/plugins/plugin-content-update/src/node/plugin.ts
@@ -6,6 +6,6 @@ const __dirname = getDirname(import.meta.url)
 export function contentUpdatePlugin(): Plugin {
   return {
     name: '@vuepress-plume/plugin-content-update',
-    clientConfigFile: path.resolve(__dirname, '../client/clientConfig.js'),
+    clientConfigFile: path.resolve(__dirname, '../client/config.js'),
   }
 }
diff --git a/plugins/plugin-iconify/src/client/components/Iconify.vue b/plugins/plugin-iconify/src/client/components/Iconify.vue
index 977b8dc6..cd675ccb 100644
--- a/plugins/plugin-iconify/src/client/components/Iconify.vue
+++ b/plugins/plugin-iconify/src/client/components/Iconify.vue
@@ -4,7 +4,7 @@ import { ClientOnly } from 'vuepress/client'
 import type { IconifyRenderMode } from '@iconify/vue'
 import type { StyleValue } from 'vue'
 import { computed, toRefs } from 'vue'
-import { useIconify } from '../composables/iconify.js'
+import { useIconify } from '../composables/index.js'
 
 const props = withDefaults(
   defineProps<{
@@ -31,13 +31,13 @@ const { name } = toRefs(props)
 const { icon, loaded } = useIconify(name)
 
 const size = computed(() => {
-  const size = props.size || __VUEPRESS_PLUGIN_ICONIFY_DEFAULT_SIZE__
+  const size = props.size || __VP_ICONIFY_SIZE__
   if (String(Number(size)) === size)
     return `${size}px`
 
   return size
 })
-const color = computed(() => props.color || __VUEPRESS_PLUGIN_ICONIFY_DEFAULT_COLOR__)
+const color = computed(() => props.color || __VP_ICONIFY_COLOR__)
 
 const bind = computed<any>(() => ({
   icon: icon.value,
@@ -55,8 +55,8 @@ const bind = computed<any>(() => ({
 </script>
 
 <script lang="ts">
-declare const __VUEPRESS_PLUGIN_ICONIFY_DEFAULT_SIZE__: string
-declare const __VUEPRESS_PLUGIN_ICONIFY_DEFAULT_COLOR__: string
+declare const __VP_ICONIFY_SIZE__: string
+declare const __VP_ICONIFY_COLOR__: string
 </script>
 
 <template>
diff --git a/plugins/plugin-iconify/src/client/composables/index.ts b/plugins/plugin-iconify/src/client/composables/index.ts
new file mode 100644
index 00000000..be30fbe9
--- /dev/null
+++ b/plugins/plugin-iconify/src/client/composables/index.ts
@@ -0,0 +1 @@
+export * from './iconify.js'
diff --git a/plugins/plugin-iconify/src/client/clientConfig.ts b/plugins/plugin-iconify/src/client/config.ts
similarity index 65%
rename from plugins/plugin-iconify/src/client/clientConfig.ts
rename to plugins/plugin-iconify/src/client/config.ts
index bd9bc0ec..f132faf2 100644
--- a/plugins/plugin-iconify/src/client/clientConfig.ts
+++ b/plugins/plugin-iconify/src/client/config.ts
@@ -2,10 +2,10 @@ import { defineClientConfig } from 'vuepress/client'
 import type { ClientConfig } from 'vuepress/client'
 import Iconify from './components/Iconify.vue'
 
-declare const __VUEPRESS_PLUGIN_ICONIFY_COMPONENT_NAME__: string
+declare const __VP_ICONIFY_NAME__: string
 export default defineClientConfig({
   enhance({ app }) {
-    const name = __VUEPRESS_PLUGIN_ICONIFY_COMPONENT_NAME__ || 'Iconify'
+    const name = __VP_ICONIFY_NAME__ || 'Iconify'
     app.component(name, Iconify)
   },
 }) as ClientConfig
diff --git a/plugins/plugin-iconify/src/client/index.ts b/plugins/plugin-iconify/src/client/index.ts
deleted file mode 100644
index d801584f..00000000
--- a/plugins/plugin-iconify/src/client/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export * from './composables/iconify.js'
-export * from '../shared/index.js'
diff --git a/plugins/plugin-iconify/src/node/index.ts b/plugins/plugin-iconify/src/node/index.ts
index c71fd217..b7f9afcd 100644
--- a/plugins/plugin-iconify/src/node/index.ts
+++ b/plugins/plugin-iconify/src/node/index.ts
@@ -1,6 +1,6 @@
 import { iconifyPlugin } from './plugin.js'
 
 export * from './plugin.js'
-export * from '../shared/index.js'
 
+/** @deprecated 请使用 具名导出 替代 默认导出 */
 export default iconifyPlugin
diff --git a/plugins/plugin-iconify/src/node/plugin.ts b/plugins/plugin-iconify/src/node/plugin.ts
index d04fd4e9..72d5417d 100644
--- a/plugins/plugin-iconify/src/node/plugin.ts
+++ b/plugins/plugin-iconify/src/node/plugin.ts
@@ -1,24 +1,24 @@
 import type { Plugin } from 'vuepress/core'
 import { getDirname, path } from 'vuepress/utils'
-import type { IconifyOptions } from '../shared/index.js'
+
+export interface IconifyPluginOptions {
+  componentName?: string
+  color?: string
+  size?: string | number
+}
 
 export function iconifyPlugin({
   componentName = 'Iconify',
   size = '1em',
   color = 'currentColor',
-}: IconifyOptions = {}): Plugin {
-  return () => {
-    return {
-      name: '@vuepress-plume/plugin-iconify',
-      define: {
-        __VUEPRESS_PLUGIN_ICONIFY_COMPONENT_NAME__: componentName,
-        __VUEPRESS_PLUGIN_ICONIFY_DEFAULT_SIZE__: size,
-        __VUEPRESS_PLUGIN_ICONIFY_DEFAULT_COLOR__: color,
-      },
-      clientConfigFile: path.resolve(
-        getDirname(import.meta.url),
-        '../client/clientConfig.js',
-      ),
-    }
+}: IconifyPluginOptions = {}): Plugin {
+  return {
+    name: '@vuepress-plume/plugin-iconify',
+    define: {
+      __VP_ICONIFY_NAME__: componentName,
+      __VP_ICONIFY_SIZE__: size,
+      __VP_ICONIFY_COLOR__: color,
+    },
+    clientConfigFile: path.resolve(getDirname(import.meta.url), '../client/config.js'),
   }
 }
diff --git a/plugins/plugin-iconify/src/shared/index.ts b/plugins/plugin-iconify/src/shared/index.ts
deleted file mode 100644
index d26698d3..00000000
--- a/plugins/plugin-iconify/src/shared/index.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export interface IconifyOptions {
-  componentName?: string
-  color?: string
-  size?: string | number
-}
diff --git a/plugins/plugin-md-power/src/node/prepareConfigFile.ts b/plugins/plugin-md-power/src/node/prepareConfigFile.ts
index e4c62dd5..518275cf 100644
--- a/plugins/plugin-md-power/src/node/prepareConfigFile.ts
+++ b/plugins/plugin-md-power/src/node/prepareConfigFile.ts
@@ -51,18 +51,11 @@ export async function prepareConfigFile(app: App, options: MarkdownPowerPluginOp
     enhances.add(`app.component('CodeRepl', CodeRepl)`)
   }
 
-  // enhances.add(`if (__VUEPRESS_SSR__) return`)
-
   if (options.caniuse) {
     imports.add(`import CanIUse from '${CLIENT_FOLDER}components/CanIUse.vue'`)
     enhances.add(`app.component('CanIUseViewer', CanIUse)`)
   }
 
-  // if (options.caniuse) {
-  //   imports.add(`import { setupCanIUse } from '${CLIENT_FOLDER}composables/setupCanIUse.js'`)
-  //   enhances.add(`router.afterEach(() => setupCanIUse())`)
-  // }
-
   return app.writeTemp(
     'md-power/config.js',
     `\
diff --git a/plugins/plugin-search/src/client/components/SearchBox.vue b/plugins/plugin-search/src/client/components/SearchBox.vue
index ed03394a..ebeb0173 100644
--- a/plugins/plugin-search/src/client/components/SearchBox.vue
+++ b/plugins/plugin-search/src/client/components/SearchBox.vue
@@ -23,10 +23,9 @@ import {
 import Mark from 'mark.js/src/vanilla.js'
 import { useFocusTrap } from '@vueuse/integrations/useFocusTrap'
 import MiniSearch, { type SearchResult } from 'minisearch'
-import { useSearchIndex } from '../composables/index.js'
+import { useLocale, useSearchIndex } from '../composables/index.js'
 import type { SearchBoxLocales, SearchOptions } from '../../shared/index.js'
-import { LRUCache } from '../utils/lru.js'
-import { useLocale } from '../composables/locale.js'
+import { LRUCache } from '../utils/index.js'
 import SearchIcon from './icons/SearchIcon.vue'
 import ClearIcon from './icons/ClearIcon.vue'
 import BackIcon from './icons/BackIcon.vue'
diff --git a/plugins/plugin-search/src/client/components/SearchButton.vue b/plugins/plugin-search/src/client/components/SearchButton.vue
index 44252e63..69bdee0a 100644
--- a/plugins/plugin-search/src/client/components/SearchButton.vue
+++ b/plugins/plugin-search/src/client/components/SearchButton.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup>
 import { toRef } from 'vue'
 import type { SearchBoxLocales } from '../../shared/index.js'
-import { useLocale } from '../composables/locale.js'
+import { useLocale } from '../composables/index.js'
 
 const props = defineProps<{
   locales: SearchBoxLocales
diff --git a/plugins/plugin-search/src/client/composables/index.ts b/plugins/plugin-search/src/client/composables/index.ts
index f7bc56cf..9bbe85c5 100644
--- a/plugins/plugin-search/src/client/composables/index.ts
+++ b/plugins/plugin-search/src/client/composables/index.ts
@@ -1 +1,2 @@
 export * from './searchIndex.js'
+export * from './locale.js'
diff --git a/plugins/plugin-search/src/client/utils/index.ts b/plugins/plugin-search/src/client/utils/index.ts
new file mode 100644
index 00000000..60cb7c08
--- /dev/null
+++ b/plugins/plugin-search/src/client/utils/index.ts
@@ -0,0 +1 @@
+export * from './lru.js'
diff --git a/theme/src/client/components/Blog/VPBlog.vue b/theme/src/client/components/Blog/VPBlog.vue
index 503eba21..5e814d4c 100644
--- a/theme/src/client/components/Blog/VPBlog.vue
+++ b/theme/src/client/components/Blog/VPBlog.vue
@@ -7,7 +7,7 @@ import VPBlogTags from '@theme/Blog/VPBlogTags.vue'
 import VPBlogCategories from '@theme/Blog/VPBlogCategories.vue'
 import VPBlogNav from '@theme/Blog/VPBlogNav.vue'
 import VPTransitionFadeSlideY from '@theme/VPTransitionFadeSlideY.vue'
-import { useData } from '../../composables/data.js'
+import { useData } from '../../composables/index.js'
 
 const { theme, page } = useData()
 </script>
diff --git a/theme/src/client/components/Blog/VPBlogArchives.vue b/theme/src/client/components/Blog/VPBlogArchives.vue
index 71d6b47a..8b11ef5d 100644
--- a/theme/src/client/components/Blog/VPBlogArchives.vue
+++ b/theme/src/client/components/Blog/VPBlogArchives.vue
@@ -1,7 +1,6 @@
 <script lang="ts" setup>
 import VPShortPostList from '@theme/Blog/VPShortPostList.vue'
-import { useBlogNavTitle } from '../../composables/blog-extract.js'
-import { useArchives } from '../../composables/blog-archives.js'
+import { useArchives, useBlogNavTitle } from '../../composables/index.js'
 
 const title = useBlogNavTitle('archive')
 const { archives } = useArchives()
diff --git a/theme/src/client/components/Blog/VPBlogAside.vue b/theme/src/client/components/Blog/VPBlogAside.vue
index 322136ae..7777b033 100644
--- a/theme/src/client/components/Blog/VPBlogAside.vue
+++ b/theme/src/client/components/Blog/VPBlogAside.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup>
 import VPBlogNav from '@theme/Blog/VPBlogNav.vue'
 import VPBlogProfile from '@theme/Blog/VPBlogProfile.vue'
-import { useData } from '../../composables/data.js'
+import { useData } from '../../composables/index.js'
 
 const { theme } = useData()
 </script>
diff --git a/theme/src/client/components/Blog/VPBlogCategories.vue b/theme/src/client/components/Blog/VPBlogCategories.vue
index 8a38336e..b43c6a41 100644
--- a/theme/src/client/components/Blog/VPBlogCategories.vue
+++ b/theme/src/client/components/Blog/VPBlogCategories.vue
@@ -1,7 +1,6 @@
 <script setup lang="ts">
 import VPCategories from '@theme/Blog/VPCategories.vue'
-import { useBlogCategory } from '../../composables/blog-category.js'
-import { useBlogNavTitle } from '../../composables/blog-extract.js'
+import { useBlogCategory, useBlogNavTitle } from '../../composables/index.js'
 
 const title = useBlogNavTitle('category')
 const { categories } = useBlogCategory()
diff --git a/theme/src/client/components/Blog/VPBlogExtract.vue b/theme/src/client/components/Blog/VPBlogExtract.vue
index ac746369..d3100331 100644
--- a/theme/src/client/components/Blog/VPBlogExtract.vue
+++ b/theme/src/client/components/Blog/VPBlogExtract.vue
@@ -4,8 +4,7 @@ import { computed, ref, watch } from 'vue'
 import { useRoute, withBase } from 'vuepress/client'
 import { isLinkHttp } from 'vuepress/shared'
 import VPLink from '@theme/VPLink.vue'
-import { useBlogExtract } from '../../composables/blog-extract.js'
-import { useData } from '../../composables/data.js'
+import { useBlogExtract, useData } from '../../composables/index.js'
 import { inBrowser } from '../../utils/index.js'
 
 const { theme } = useData()
diff --git a/theme/src/client/components/Blog/VPBlogNav.vue b/theme/src/client/components/Blog/VPBlogNav.vue
index a6f0e2b0..96b9f7b8 100644
--- a/theme/src/client/components/Blog/VPBlogNav.vue
+++ b/theme/src/client/components/Blog/VPBlogNav.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup>
 import { useRoute } from 'vuepress/client'
 import VPLink from '@theme/VPLink.vue'
-import { useBlogExtract } from '../../composables/blog-extract.js'
+import { useBlogExtract } from '../../composables/index.js'
 
 const props = defineProps<{
   isLocal?: boolean
diff --git a/theme/src/client/components/Blog/VPBlogProfile.vue b/theme/src/client/components/Blog/VPBlogProfile.vue
index 396e570e..2a621072 100644
--- a/theme/src/client/components/Blog/VPBlogProfile.vue
+++ b/theme/src/client/components/Blog/VPBlogProfile.vue
@@ -3,7 +3,7 @@ import { computed } from 'vue'
 import { withBase } from 'vuepress/client'
 import { isLinkHttp } from 'vuepress/shared'
 import VPSocialLinks from '@theme/VPSocialLinks.vue'
-import { useData } from '../../composables/data.js'
+import { useData } from '../../composables/index.js'
 
 const { theme } = useData()
 const profile = computed(() => theme.value.profile)
diff --git a/theme/src/client/components/Blog/VPBlogTags.vue b/theme/src/client/components/Blog/VPBlogTags.vue
index 4ce6edb1..8a46de2c 100644
--- a/theme/src/client/components/Blog/VPBlogTags.vue
+++ b/theme/src/client/components/Blog/VPBlogTags.vue
@@ -1,7 +1,6 @@
 <script lang="ts" setup>
 import VPShortPostList from '@theme/Blog/VPShortPostList.vue'
-import { useBlogNavTitle } from '../../composables/blog-extract.js'
-import { useTags } from '../../composables/blog-tags.js'
+import { useBlogNavTitle, useTags } from '../../composables/index.js'
 
 const { tags, currentTag, postList, handleTagClick } = useTags()
 const title = useBlogNavTitle('tag')
diff --git a/theme/src/client/components/Blog/VPCategories.vue b/theme/src/client/components/Blog/VPCategories.vue
index ab1f6e91..0effde64 100644
--- a/theme/src/client/components/Blog/VPCategories.vue
+++ b/theme/src/client/components/Blog/VPCategories.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup>
 import VPLink from '@theme/VPLink.vue'
 import VPCategoriesGroup from '@theme/Blog/VPCategoriesGroup.vue'
-import type { BlogCategoryItem, BlogCategoryItemWithPost } from '../../composables/blog-category.js'
+import type { BlogCategoryItem, BlogCategoryItemWithPost } from '../../composables/index.js'
 
 defineProps < {
   items: (BlogCategoryItem | BlogCategoryItemWithPost)[]
diff --git a/theme/src/client/components/Blog/VPCategoriesGroup.vue b/theme/src/client/components/Blog/VPCategoriesGroup.vue
index b845f7f4..f20ba528 100644
--- a/theme/src/client/components/Blog/VPCategoriesGroup.vue
+++ b/theme/src/client/components/Blog/VPCategoriesGroup.vue
@@ -2,7 +2,7 @@
 import { useRoute } from 'vuepress/client'
 import { onMounted, ref, watch } from 'vue'
 import VPCategories from '@theme/Blog/VPCategories.vue'
-import type { BlogCategoryItem } from '../../composables/blog-category.js'
+import type { BlogCategoryItem } from '../../composables/index.js'
 
 const props = defineProps<{
   item: BlogCategoryItem
diff --git a/theme/src/client/components/Blog/VPPagination.vue b/theme/src/client/components/Blog/VPPagination.vue
index fa7698a2..c20e9d7f 100644
--- a/theme/src/client/components/Blog/VPPagination.vue
+++ b/theme/src/client/components/Blog/VPPagination.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { useData } from '../../composables/data.js'
+import { useData } from '../../composables/index.js'
 
 defineProps<{
   page: number
diff --git a/theme/src/client/components/Blog/VPPostItem.vue b/theme/src/client/components/Blog/VPPostItem.vue
index 4bba88d0..9b2f2d25 100644
--- a/theme/src/client/components/Blog/VPPostItem.vue
+++ b/theme/src/client/components/Blog/VPPostItem.vue
@@ -2,7 +2,7 @@
 import { computed } from 'vue'
 import VPLink from '@theme/VPLink.vue'
 import type { PlumeThemeBlogPostItem } from '../../../shared/index.js'
-import { useTagColors } from '../../composables/tag-colors.js'
+import { useTagColors } from '../../composables/index.js'
 
 const props = defineProps<{
   post: PlumeThemeBlogPostItem
diff --git a/theme/src/client/components/Blog/VPPostList.vue b/theme/src/client/components/Blog/VPPostList.vue
index cacd3135..bb876238 100644
--- a/theme/src/client/components/Blog/VPPostList.vue
+++ b/theme/src/client/components/Blog/VPPostList.vue
@@ -2,7 +2,7 @@
 import VPTransitionDrop from '@theme/VPTransitionDrop.vue'
 import VPPostItem from '@theme/Blog/VPPostItem.vue'
 import VPPagination from '@theme/Blog/VPPagination.vue'
-import { usePostListControl } from '../../composables/blog-post-list.js'
+import { usePostListControl } from '../../composables/index.js'
 
 const {
   postList,
diff --git a/theme/src/client/components/Home/VPHome.vue b/theme/src/client/components/Home/VPHome.vue
index 3637abac..72074433 100644
--- a/theme/src/client/components/Home/VPHome.vue
+++ b/theme/src/client/components/Home/VPHome.vue
@@ -6,7 +6,7 @@ import VPHomeFeatures from '@theme/Home/VPHomeFeatures.vue'
 import VPHomeTextImage from '@theme/Home/VPHomeTextImage.vue'
 import VPHomeProfile from '@theme/Home/VPHomeProfile.vue'
 import VPHomeCustom from '@theme/Home/VPHomeCustom.vue'
-import { useData } from '../../composables/data.js'
+import { useData } from '../../composables/index.js'
 
 const components: Record<string, Component<any, any, any>> = {
   'banner': VPHomeBanner,
diff --git a/theme/src/client/components/Home/VPHomeBanner.vue b/theme/src/client/components/Home/VPHomeBanner.vue
index c61de58f..f75f4e0c 100644
--- a/theme/src/client/components/Home/VPHomeBanner.vue
+++ b/theme/src/client/components/Home/VPHomeBanner.vue
@@ -4,7 +4,7 @@ import { isLinkHttp } from 'vuepress/shared'
 import { computed } from 'vue'
 import VPButton from '@theme/VPButton.vue'
 import type { PlumeThemeHomeBanner } from '../../../shared/index.js'
-import { useData } from '../../composables/data.js'
+import { useData } from '../../composables/index.js'
 
 const props = defineProps<PlumeThemeHomeBanner>()
 
diff --git a/theme/src/client/components/Home/VPHomeBox.vue b/theme/src/client/components/Home/VPHomeBox.vue
index 508b2126..f242444f 100644
--- a/theme/src/client/components/Home/VPHomeBox.vue
+++ b/theme/src/client/components/Home/VPHomeBox.vue
@@ -3,7 +3,7 @@ import { withBase } from 'vuepress/client'
 import { computed, normalizeClass } from 'vue'
 import { isLinkHttp } from 'vuepress/shared'
 import type { PlumeHomeConfigBase } from '../../../shared/index.js'
-import { useDarkMode } from '../../composables/dark-mode.js'
+import { useDarkMode } from '../../composables/index.js'
 
 const props = defineProps<PlumeHomeConfigBase & {
   containerClass?: any
diff --git a/theme/src/client/components/Home/VPHomeHero.vue b/theme/src/client/components/Home/VPHomeHero.vue
index 91106e13..b900c6eb 100644
--- a/theme/src/client/components/Home/VPHomeHero.vue
+++ b/theme/src/client/components/Home/VPHomeHero.vue
@@ -3,8 +3,7 @@ import { withBase } from 'vuepress/client'
 import { isLinkHttp } from 'vuepress/shared'
 import { computed, ref } from 'vue'
 import VPButton from '@theme/VPButton.vue'
-import { useData } from '../../composables/data.js'
-import { useHomeHeroTintPlate } from '../../composables/home.js'
+import { useData, useHomeHeroTintPlate } from '../../composables/index.js'
 import type { PlumeThemeHomeHero } from '../../../shared/index.js'
 
 const props = defineProps<PlumeThemeHomeHero>()
diff --git a/theme/src/client/components/Home/VPHomeProfile.vue b/theme/src/client/components/Home/VPHomeProfile.vue
index 2e09b21a..90d5fa3a 100644
--- a/theme/src/client/components/Home/VPHomeProfile.vue
+++ b/theme/src/client/components/Home/VPHomeProfile.vue
@@ -3,7 +3,7 @@ import { computed } from 'vue'
 import VPImage from '@theme/VPImage.vue'
 import VPHomeBox from '@theme/Home/VPHomeBox.vue'
 import type { PlumeThemeHomeProfile } from '../../../shared/index.js'
-import { useData } from '../../composables/data.js'
+import { useData } from '../../composables/index.js'
 
 const props = defineProps<PlumeThemeHomeProfile>()
 
diff --git a/theme/src/client/components/Nav/VPNav.vue b/theme/src/client/components/Nav/VPNav.vue
index 43d6a1ff..4f724bd9 100644
--- a/theme/src/client/components/Nav/VPNav.vue
+++ b/theme/src/client/components/Nav/VPNav.vue
@@ -2,8 +2,7 @@
 import { computed, provide, watchEffect } from 'vue'
 import VPNavbar from '@theme/Nav/VPNavBar.vue'
 import VPNavScreen from '@theme/Nav/VPNavScreen.vue'
-import { useNav } from '../../composables/nav.js'
-import { useData } from '../../composables/data.js'
+import { useData, useNav } from '../../composables/index.js'
 import { inBrowser } from '../../utils/index.js'
 
 const { page, frontmatter } = useData()
diff --git a/theme/src/client/components/Nav/VPNavBar.vue b/theme/src/client/components/Nav/VPNavBar.vue
index e7339ed7..797d0156 100644
--- a/theme/src/client/components/Nav/VPNavBar.vue
+++ b/theme/src/client/components/Nav/VPNavBar.vue
@@ -9,8 +9,7 @@ import VPNavBarSearch from '@theme/Nav/VPNavBarSearch.vue'
 import VPNavBarSocialLinks from '@theme/Nav/VPNavBarSocialLinks.vue'
 import VPNavBarTitle from '@theme/Nav/VPNavBarTitle.vue'
 import VPNavBarTranslations from '@theme/Nav/VPNavBarTranslations.vue'
-import { useData } from '../../composables/data.js'
-import { useSidebar } from '../../composables/sidebar.js'
+import { useData, useSidebar } from '../../composables/index.js'
 
 const props = defineProps<{
   isScreenOpen: boolean
diff --git a/theme/src/client/components/Nav/VPNavBarAppearance.vue b/theme/src/client/components/Nav/VPNavBarAppearance.vue
index d6b64bf4..88d08313 100644
--- a/theme/src/client/components/Nav/VPNavBarAppearance.vue
+++ b/theme/src/client/components/Nav/VPNavBarAppearance.vue
@@ -1,6 +1,6 @@
 <script lang="ts" setup>
 import VPSwitchAppearance from '@theme/VPSwitchAppearance.vue'
-import { useData } from '../../composables/data.js'
+import { useData } from '../../composables/index.js'
 
 const { theme } = useData()
 </script>
diff --git a/theme/src/client/components/Nav/VPNavBarExtra.vue b/theme/src/client/components/Nav/VPNavBarExtra.vue
index d2411bdf..1974e468 100644
--- a/theme/src/client/components/Nav/VPNavBarExtra.vue
+++ b/theme/src/client/components/Nav/VPNavBarExtra.vue
@@ -4,8 +4,7 @@ import VPFlyout from '@theme/VPFlyout.vue'
 import VPMenuLink from '@theme/VPMenuLink.vue'
 import VPSocialLinks from '@theme/VPSocialLinks.vue'
 import VPSwitchAppearance from '@theme/VPSwitchAppearance.vue'
-import { useLangs } from '../../composables/langs.js'
-import { useData } from '../../composables/data.js'
+import { useData, useLangs } from '../../composables/index.js'
 
 const { theme } = useData()
 const { localeLinks, currentLang } = useLangs()
diff --git a/theme/src/client/components/Nav/VPNavBarMenu.vue b/theme/src/client/components/Nav/VPNavBarMenu.vue
index e9d7b100..abb66318 100644
--- a/theme/src/client/components/Nav/VPNavBarMenu.vue
+++ b/theme/src/client/components/Nav/VPNavBarMenu.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup>
 import VPNavBarMenuGroup from '@theme/Nav/VPNavBarMenuGroup.vue'
 import VPNavBarMenuLink from '@theme/Nav/VPNavBarMenuLink.vue'
-import { useNavbarData } from '../../composables/nav.js'
+import { useNavbarData } from '../../composables/index.js'
 
 const navbar = useNavbarData()
 </script>
diff --git a/theme/src/client/components/Nav/VPNavBarMenuGroup.vue b/theme/src/client/components/Nav/VPNavBarMenuGroup.vue
index 3607de88..2cb1c293 100644
--- a/theme/src/client/components/Nav/VPNavBarMenuGroup.vue
+++ b/theme/src/client/components/Nav/VPNavBarMenuGroup.vue
@@ -5,9 +5,9 @@ import VPFlyout from '@theme/VPFlyout.vue'
 import type {
   ResolvedNavItem,
   ResolvedNavItemWithChildren,
-} from '../../../shared/resolved/navbar.js'
+} from '../../../shared/index.js'
 import { isActive } from '../../utils/index.js'
-import { useData } from '../../composables/data.js'
+import { useData } from '../../composables/index.js'
 
 const props = defineProps<{
   item: ResolvedNavItemWithChildren
diff --git a/theme/src/client/components/Nav/VPNavBarMenuLink.vue b/theme/src/client/components/Nav/VPNavBarMenuLink.vue
index e3fbb59a..02adb70c 100644
--- a/theme/src/client/components/Nav/VPNavBarMenuLink.vue
+++ b/theme/src/client/components/Nav/VPNavBarMenuLink.vue
@@ -2,9 +2,9 @@
 import { resolveRouteFullPath } from 'vuepress/client'
 import VPLink from '@theme/VPLink.vue'
 import VPIcon from '@theme/VPIcon.vue'
-import type { ResolvedNavItemWithLink } from '../../../shared/resolved/navbar.js'
+import type { ResolvedNavItemWithLink } from '../../../shared/index.js'
 import { isActive } from '../../utils/index.js'
-import { useData } from '../../composables/data.js'
+import { useData } from '../../composables/index.js'
 
 defineProps<{
   item: ResolvedNavItemWithLink
diff --git a/theme/src/client/components/Nav/VPNavBarSocialLinks.vue b/theme/src/client/components/Nav/VPNavBarSocialLinks.vue
index cfcc965e..b4cd55e6 100644
--- a/theme/src/client/components/Nav/VPNavBarSocialLinks.vue
+++ b/theme/src/client/components/Nav/VPNavBarSocialLinks.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup>
 import { computed } from 'vue'
 import VPSocialLinks from '@theme/VPSocialLinks.vue'
-import { useData } from '../../composables/data.js'
+import { useData } from '../../composables/index.js'
 
 const { theme } = useData()
 
diff --git a/theme/src/client/components/Nav/VPNavBarTitle.vue b/theme/src/client/components/Nav/VPNavBarTitle.vue
index 21386f12..83ab522c 100644
--- a/theme/src/client/components/Nav/VPNavBarTitle.vue
+++ b/theme/src/client/components/Nav/VPNavBarTitle.vue
@@ -2,8 +2,7 @@
 import { useRouteLocale } from 'vuepress/client'
 import VPLink from '@theme/VPLink.vue'
 import VPImage from '@theme/VPImage.vue'
-import { useSidebar } from '../../composables/sidebar.js'
-import { useData } from '../../composables/data.js'
+import { useData, useSidebar } from '../../composables/index.js'
 
 const { theme, site } = useData()
 const { hasSidebar } = useSidebar()
diff --git a/theme/src/client/components/Nav/VPNavBarTranslations.vue b/theme/src/client/components/Nav/VPNavBarTranslations.vue
index faad7feb..e351634f 100644
--- a/theme/src/client/components/Nav/VPNavBarTranslations.vue
+++ b/theme/src/client/components/Nav/VPNavBarTranslations.vue
@@ -1,8 +1,7 @@
 <script lang="ts" setup>
 import VPFlyout from '@theme/VPFlyout.vue'
 import VPMenuLink from '@theme/VPMenuLink.vue'
-import { useLangs } from '../../composables/langs.js'
-import { useData } from '../../composables/data.js'
+import { useData, useLangs } from '../../composables/index.js'
 
 const { theme } = useData()
 const { currentLang, localeLinks } = useLangs()
diff --git a/theme/src/client/components/Nav/VPNavScreenAppearance.vue b/theme/src/client/components/Nav/VPNavScreenAppearance.vue
index 8824b0cf..e1018b9d 100644
--- a/theme/src/client/components/Nav/VPNavScreenAppearance.vue
+++ b/theme/src/client/components/Nav/VPNavScreenAppearance.vue
@@ -1,6 +1,6 @@
 <script lang="ts" setup>
 import VPSwitchAppearance from '@theme/VPSwitchAppearance.vue'
-import { useData } from '../../composables/data.js'
+import { useData } from '../../composables/index.js'
 
 const { theme } = useData()
 </script>
diff --git a/theme/src/client/components/Nav/VPNavScreenMenu.vue b/theme/src/client/components/Nav/VPNavScreenMenu.vue
index e964facc..6e6913e0 100644
--- a/theme/src/client/components/Nav/VPNavScreenMenu.vue
+++ b/theme/src/client/components/Nav/VPNavScreenMenu.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup>
 import VPNavScreenMenuGroup from '@theme/Nav/VPNavScreenMenuGroup.vue'
 import VPNavScreenMenuLink from '@theme/Nav/VPNavScreenMenuLink.vue'
-import { useNavbarData } from '../../composables/nav.js'
+import { useNavbarData } from '../../composables/index.js'
 
 const navbar = useNavbarData()
 </script>
diff --git a/theme/src/client/components/Nav/VPNavScreenMenuGroupLink.vue b/theme/src/client/components/Nav/VPNavScreenMenuGroupLink.vue
index df86918a..f9146659 100644
--- a/theme/src/client/components/Nav/VPNavScreenMenuGroupLink.vue
+++ b/theme/src/client/components/Nav/VPNavScreenMenuGroupLink.vue
@@ -2,7 +2,7 @@
 import { inject } from 'vue'
 import VPLink from '@theme/VPLink.vue'
 import VPIcon from '@theme/VPIcon.vue'
-import type { ResolvedNavItemWithLink } from '../../../shared/resolved/navbar.js'
+import type { ResolvedNavItemWithLink } from '../../../shared/index.js'
 
 defineProps<{
   item: ResolvedNavItemWithLink
diff --git a/theme/src/client/components/Nav/VPNavScreenMenuLink.vue b/theme/src/client/components/Nav/VPNavScreenMenuLink.vue
index 9abb78c5..064b5994 100644
--- a/theme/src/client/components/Nav/VPNavScreenMenuLink.vue
+++ b/theme/src/client/components/Nav/VPNavScreenMenuLink.vue
@@ -2,7 +2,7 @@
 import { inject } from 'vue'
 import VPLink from '@theme/VPLink.vue'
 import VPIcon from '@theme/VPIcon.vue'
-import type { ResolvedNavItemWithLink } from '../../../shared/resolved/navbar.js'
+import type { ResolvedNavItemWithLink } from '../../../shared/index.js'
 
 defineProps<{
   item: ResolvedNavItemWithLink
diff --git a/theme/src/client/components/Nav/VPNavScreenSocialLinks.vue b/theme/src/client/components/Nav/VPNavScreenSocialLinks.vue
index 81369dd9..030376b1 100644
--- a/theme/src/client/components/Nav/VPNavScreenSocialLinks.vue
+++ b/theme/src/client/components/Nav/VPNavScreenSocialLinks.vue
@@ -1,6 +1,6 @@
 <script lang="ts" setup>
 import VPSocialLinks from '@theme/VPSocialLinks.vue'
-import { useData } from '../../composables/data.js'
+import { useData } from '../../composables/index.js'
 
 const { theme } = useData()
 </script>
diff --git a/theme/src/client/components/Nav/VPNavScreenTranslations.vue b/theme/src/client/components/Nav/VPNavScreenTranslations.vue
index b91dba74..9e1ba12c 100644
--- a/theme/src/client/components/Nav/VPNavScreenTranslations.vue
+++ b/theme/src/client/components/Nav/VPNavScreenTranslations.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { ref } from 'vue'
 import VPLink from '@theme/VPLink.vue'
-import { useLangs } from '../../composables/langs.js'
+import { useLangs } from '../../composables/index.js'
 
 const { localeLinks, currentLang } = useLangs()
 const isOpen = ref(false)
diff --git a/theme/src/client/components/VPBackToTop.vue b/theme/src/client/components/VPBackToTop.vue
index bdd4c814..1564930b 100644
--- a/theme/src/client/components/VPBackToTop.vue
+++ b/theme/src/client/components/VPBackToTop.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup>
 import { useElementSize, useWindowScroll, useWindowSize } from '@vueuse/core'
 import { computed, onMounted, ref, shallowRef, watch } from 'vue'
-import { useData } from '../composables/data.js'
+import { useData } from '../composables/index.js'
 
 const body = shallowRef<HTMLElement | null>()
 const { height: bodyHeight } = useElementSize(body)
diff --git a/theme/src/client/components/VPButton.vue b/theme/src/client/components/VPButton.vue
index a54c72ae..a099b8db 100644
--- a/theme/src/client/components/VPButton.vue
+++ b/theme/src/client/components/VPButton.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { computed, toRef } from 'vue'
 import { useRouter, withBase } from 'vuepress/client'
-import { useLink } from '../composables/link.js'
+import { useLink } from '../composables/index.js'
 
 interface Props {
   tag?: string
diff --git a/theme/src/client/components/VPContent.vue b/theme/src/client/components/VPContent.vue
index 5011fbdf..a4e59a18 100644
--- a/theme/src/client/components/VPContent.vue
+++ b/theme/src/client/components/VPContent.vue
@@ -5,9 +5,8 @@ import VPDoc from '@theme/VPDoc.vue'
 import VPPage from '@theme/VPPage.vue'
 import VPHome from '@theme/Home/VPHome.vue'
 import VPFriends from '@theme/VPFriends.vue'
-import { useData, useSidebar } from '../composables/index.js'
+import { useBlogPageData, useData, useSidebar } from '../composables/index.js'
 import { inBrowser } from '../utils/index.js'
-import { useBlogPageData } from '../composables/page.js'
 
 const props = defineProps<{
   isNotFound?: boolean
diff --git a/theme/src/client/components/VPDoc.vue b/theme/src/client/components/VPDoc.vue
index fe2104b8..6346705e 100644
--- a/theme/src/client/components/VPDoc.vue
+++ b/theme/src/client/components/VPDoc.vue
@@ -6,11 +6,13 @@ import VPDocAside from '@theme/VPDocAside.vue'
 import VPDocFooter from '@theme/VPDocFooter.vue'
 import VPEncryptPage from '@theme/VPEncryptPage.vue'
 import VPDocMeta from '@theme/VPDocMeta.vue'
-import { useEncrypt } from '../composables/encrypt.js'
-import { useSidebar } from '../composables/sidebar.js'
-import { useData } from '../composables/data.js'
-import { useHeaders } from '../composables/outline.js'
-import { useBlogPageData } from '../composables/page.js'
+import {
+  useBlogPageData,
+  useData,
+  useEncrypt,
+  useHeaders,
+  useSidebar,
+} from '../composables/index.js'
 
 const { page, theme, frontmatter, isDark } = useData()
 const route = useRoute()
diff --git a/theme/src/client/components/VPDocAsideOutline.vue b/theme/src/client/components/VPDocAsideOutline.vue
index 9638f02c..a07fca8a 100644
--- a/theme/src/client/components/VPDocAsideOutline.vue
+++ b/theme/src/client/components/VPDocAsideOutline.vue
@@ -1,8 +1,7 @@
 <script lang="ts" setup>
 import { computed, ref } from 'vue'
 import VPDocOutlineItem from '@theme/VPDocOutlineItem.vue'
-import { useActiveAnchor, useHeaders } from '../composables/outline.js'
-import { useData } from '../composables/data.js'
+import { useActiveAnchor, useData, useHeaders } from '../composables/index.js'
 
 const { theme } = useData()
 
diff --git a/theme/src/client/components/VPDocFooter.vue b/theme/src/client/components/VPDocFooter.vue
index 7b5f4431..fac0cdc8 100644
--- a/theme/src/client/components/VPDocFooter.vue
+++ b/theme/src/client/components/VPDocFooter.vue
@@ -1,11 +1,13 @@
 <script lang="ts" setup>
 import { computed } from 'vue'
 import VPLink from '@theme/VPLink.vue'
-import { useContributors } from '../composables/contributors.js'
-import { useEditLink } from '../composables/edit-link.js'
-import { useLastUpdated } from '../composables/latest-updated.js'
-import { usePrevNext } from '../composables/prev-next.js'
-import { useData } from '../composables/data.js'
+import {
+  useContributors,
+  useData,
+  useEditLink,
+  useLastUpdated,
+  usePrevNext,
+} from '../composables/index.js'
 
 const { theme, frontmatter } = useData()
 const editLink = useEditLink()
diff --git a/theme/src/client/components/VPDocMeta.vue b/theme/src/client/components/VPDocMeta.vue
index 57b06582..5a313628 100644
--- a/theme/src/client/components/VPDocMeta.vue
+++ b/theme/src/client/components/VPDocMeta.vue
@@ -2,10 +2,12 @@
 import { computed } from 'vue'
 import { useReadingTimeLocale } from '@vuepress/plugin-reading-time/client'
 import VPLink from '@theme/VPLink.vue'
-import { useData } from '../composables/data.js'
-import { useTagColors } from '../composables/tag-colors.js'
-import { useBlogPageData } from '../composables/page.js'
-import { useBlogExtract } from '../composables/blog-extract.js'
+import {
+  useBlogExtract,
+  useBlogPageData,
+  useData,
+  useTagColors,
+} from '../composables/index.js'
 
 const { page, frontmatter: matter } = useData<'post'>()
 const { isBlogPost } = useBlogPageData()
diff --git a/theme/src/client/components/VPDocOutlineItem.vue b/theme/src/client/components/VPDocOutlineItem.vue
index c9a84b09..676be346 100644
--- a/theme/src/client/components/VPDocOutlineItem.vue
+++ b/theme/src/client/components/VPDocOutlineItem.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import type { MenuItem } from '../composables/outline.js'
+import type { MenuItem } from '../composables/index.js'
 
 defineProps<{
   headers: MenuItem[]
diff --git a/theme/src/client/components/VPEncryptForm.vue b/theme/src/client/components/VPEncryptForm.vue
index 8a305973..74fbc831 100644
--- a/theme/src/client/components/VPEncryptForm.vue
+++ b/theme/src/client/components/VPEncryptForm.vue
@@ -1,7 +1,6 @@
 <script setup lang="ts">
 import { ref } from 'vue'
-import { useData } from '../composables/data.js'
-import { useEncryptCompare } from '../composables/encrypt.js'
+import { useData, useEncryptCompare } from '../composables/index.js'
 
 const props = defineProps<{
   global?: boolean
diff --git a/theme/src/client/components/VPEncryptGlobal.vue b/theme/src/client/components/VPEncryptGlobal.vue
index 98703859..33d8968f 100644
--- a/theme/src/client/components/VPEncryptGlobal.vue
+++ b/theme/src/client/components/VPEncryptGlobal.vue
@@ -2,7 +2,7 @@
 import { computed } from 'vue'
 import VPFooter from '@theme/VPFooter.vue'
 import VPEncryptForm from '@theme/VPEncryptForm.vue'
-import { useData } from '../composables/data.js'
+import { useData } from '../composables/index.js'
 
 const { theme, site } = useData()
 
diff --git a/theme/src/client/components/VPEncryptPage.vue b/theme/src/client/components/VPEncryptPage.vue
index 47432168..d1da1bac 100644
--- a/theme/src/client/components/VPEncryptPage.vue
+++ b/theme/src/client/components/VPEncryptPage.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import VPEncryptForm from '@theme/VPEncryptForm.vue'
-import { useData } from '../composables/data.js'
+import { useData } from '../composables/index.js'
 
 const { theme } = useData()
 </script>
diff --git a/theme/src/client/components/VPFlyout.vue b/theme/src/client/components/VPFlyout.vue
index ce0c8f66..59d5499c 100644
--- a/theme/src/client/components/VPFlyout.vue
+++ b/theme/src/client/components/VPFlyout.vue
@@ -2,7 +2,7 @@
 import { ref } from 'vue'
 import VPIcon from '@theme/VPIcon.vue'
 import VPMenu from '@theme/VPMenu.vue'
-import { useFlyout } from '../composables/flyout.js'
+import { useFlyout } from '../composables/index.js'
 
 defineProps<{
   prefixIcon?: string | { svg: string }
diff --git a/theme/src/client/components/VPFooter.vue b/theme/src/client/components/VPFooter.vue
index 515a66d6..1bf70314 100644
--- a/theme/src/client/components/VPFooter.vue
+++ b/theme/src/client/components/VPFooter.vue
@@ -1,8 +1,7 @@
 <script setup lang="ts">
 import { useCssVar } from '@vueuse/core'
 import { onMounted, ref } from 'vue'
-import { useData } from '../composables/data.js'
-import { useSidebar } from '../composables/sidebar.js'
+import { useData, useSidebar } from '../composables/index.js'
 import { inBrowser } from '../utils/index.js'
 
 const { theme } = useData()
diff --git a/theme/src/client/components/VPFriends.vue b/theme/src/client/components/VPFriends.vue
index 63ff5800..791266b2 100644
--- a/theme/src/client/components/VPFriends.vue
+++ b/theme/src/client/components/VPFriends.vue
@@ -3,8 +3,7 @@ import { computed } from 'vue'
 import VPLink from '@theme/VPLink.vue'
 import VPFriendsItem from '@theme/VPFriendsItem.vue'
 import VPFriendsGroup from '@theme/VPFriendsGroup.vue'
-import { useEditLink } from '../composables/edit-link.js'
-import { useData } from '../composables/data.js'
+import { useData, useEditLink } from '../composables/index.js'
 
 const editLink = useEditLink()
 const { frontmatter: matter } = useData<'friends'>()
diff --git a/theme/src/client/components/VPFriendsItem.vue b/theme/src/client/components/VPFriendsItem.vue
index 6fb9bb65..0af3d3df 100644
--- a/theme/src/client/components/VPFriendsItem.vue
+++ b/theme/src/client/components/VPFriendsItem.vue
@@ -3,7 +3,7 @@ import { isPlainObject } from '@vuepress/helper/client'
 import { computed } from 'vue'
 import VPLink from '@theme/VPLink.vue'
 import type { FriendsItem } from '../../shared/index'
-import { useDarkMode } from '../composables/dark-mode.js'
+import { useDarkMode } from '../composables/index.js'
 import VPSocialLinks from './VPSocialLinks.vue'
 
 const props = defineProps<{
diff --git a/theme/src/client/components/VPLink.vue b/theme/src/client/components/VPLink.vue
index 0f31ec12..b37e5946 100644
--- a/theme/src/client/components/VPLink.vue
+++ b/theme/src/client/components/VPLink.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup>
 import { computed, toRef } from 'vue'
 import { useRouter, withBase } from 'vuepress/client'
-import { useLink } from '../composables/link.js'
+import { useLink } from '../composables/index.js'
 
 const props = defineProps<{
   tag?: string
diff --git a/theme/src/client/components/VPLocalNav.vue b/theme/src/client/components/VPLocalNav.vue
index 3119d167..b0d534ba 100644
--- a/theme/src/client/components/VPLocalNav.vue
+++ b/theme/src/client/components/VPLocalNav.vue
@@ -2,10 +2,7 @@
 import { useWindowScroll } from '@vueuse/core'
 import { computed, onMounted, ref } from 'vue'
 import VPLocalNavOutlineDropdown from '@theme/VPLocalNavOutlineDropdown.vue'
-import { useSidebar } from '../composables/sidebar.js'
-import { useHeaders } from '../composables/outline.js'
-import { useData } from '../composables/data.js'
-import { useBlogPageData } from '../composables/page.js'
+import { useBlogPageData, useData, useHeaders, useSidebar } from '../composables/index.js'
 
 const props = defineProps<{
   open: boolean
diff --git a/theme/src/client/components/VPLocalNavOutlineDropdown.vue b/theme/src/client/components/VPLocalNavOutlineDropdown.vue
index 572e0362..9d6e1409 100644
--- a/theme/src/client/components/VPLocalNavOutlineDropdown.vue
+++ b/theme/src/client/components/VPLocalNavOutlineDropdown.vue
@@ -2,8 +2,8 @@
 import { onClickOutside } from '@vueuse/core'
 import { nextTick, ref, watch } from 'vue'
 import VPDocOutlineItem from '@theme/VPDocOutlineItem.vue'
-import type { MenuItem } from '../composables/outline.js'
-import { useData } from '../composables/data.js'
+import type { MenuItem } from '../composables/index.js'
+import { useData } from '../composables/index.js'
 
 const props = defineProps<{
   headers: MenuItem[]
diff --git a/theme/src/client/components/VPMenuLink.vue b/theme/src/client/components/VPMenuLink.vue
index 22cd7a6a..c66b8387 100644
--- a/theme/src/client/components/VPMenuLink.vue
+++ b/theme/src/client/components/VPMenuLink.vue
@@ -2,7 +2,7 @@
 import VPLink from '@theme/VPLink.vue'
 import VPIcon from '@theme/VPIcon.vue'
 import { resolveRouteFullPath } from 'vuepress/client'
-import { useData } from '../composables/data.js'
+import { useData } from '../composables/index.js'
 import { isActive } from '../utils/index.js'
 
 defineProps<{
diff --git a/theme/src/client/components/VPSidebar.vue b/theme/src/client/components/VPSidebar.vue
index da2e5bc3..3531deae 100644
--- a/theme/src/client/components/VPSidebar.vue
+++ b/theme/src/client/components/VPSidebar.vue
@@ -4,7 +4,7 @@ import { onMounted, ref, watch } from 'vue'
 import { useRoutePath } from 'vuepress/client'
 import VPSidebarGroup from '@theme/VPSidebarGroup.vue'
 import VPTransitionFadeSlideY from '@theme/VPTransitionFadeSlideY.vue'
-import { useSidebar } from '../composables/sidebar.js'
+import { useSidebar } from '../composables/index.js'
 import { inBrowser } from '../utils/index.js'
 
 const props = defineProps<{
diff --git a/theme/src/client/components/VPSidebarGroup.vue b/theme/src/client/components/VPSidebarGroup.vue
index 28ebb46b..502b9179 100644
--- a/theme/src/client/components/VPSidebarGroup.vue
+++ b/theme/src/client/components/VPSidebarGroup.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { onBeforeUnmount, onMounted, ref } from 'vue'
-import type { ResolvedSidebarItem } from '../../shared/resolved/sidebar.js'
-import VPSidebarItem from './VPSidebarItem.vue'
+import VPSidebarItem from '@theme/VPSidebarItem.vue'
+import type { ResolvedSidebarItem } from '../../shared/index.js'
 
 defineProps<{
   items: ResolvedSidebarItem[]
diff --git a/theme/src/client/components/VPSidebarItem.vue b/theme/src/client/components/VPSidebarItem.vue
index a18eee2b..29ddd419 100644
--- a/theme/src/client/components/VPSidebarItem.vue
+++ b/theme/src/client/components/VPSidebarItem.vue
@@ -2,8 +2,8 @@
 import { computed } from 'vue'
 import VPLink from '@theme/VPLink.vue'
 import VPIcon from '@theme/VPIcon.vue'
-import { useSidebarControl } from '../composables/sidebar.js'
-import type { ResolvedSidebarItem } from '../../shared/resolved/sidebar.js'
+import { useSidebarControl } from '../composables/index.js'
+import type { ResolvedSidebarItem } from '../../shared/index.js'
 
 const props = defineProps<{
   item: ResolvedSidebarItem
diff --git a/theme/src/client/components/VPSwitchAppearance.vue b/theme/src/client/components/VPSwitchAppearance.vue
index 1690093f..6991ec30 100644
--- a/theme/src/client/components/VPSwitchAppearance.vue
+++ b/theme/src/client/components/VPSwitchAppearance.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup>
 import { inject, ref, watchPostEffect } from 'vue'
 import VPSwitch from '@theme/VPSwitch.vue'
-import { useData } from '../composables/data.js'
+import { useData } from '../composables/index.js'
 
 const checked = ref(false)
 const { theme, isDark } = useData()
diff --git a/theme/src/client/components/VPTransitionDrop.vue b/theme/src/client/components/VPTransitionDrop.vue
index a4d53ac8..51ed6d0c 100644
--- a/theme/src/client/components/VPTransitionDrop.vue
+++ b/theme/src/client/components/VPTransitionDrop.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { computed } from 'vue'
-import { useData } from '../composables/data.js'
+import { useData } from '../composables/index.js'
 
 interface Props {
   delay?: number
diff --git a/theme/src/client/components/VPTransitionFadeSlideY.vue b/theme/src/client/components/VPTransitionFadeSlideY.vue
index 6e209635..74708171 100644
--- a/theme/src/client/components/VPTransitionFadeSlideY.vue
+++ b/theme/src/client/components/VPTransitionFadeSlideY.vue
@@ -1,7 +1,6 @@
 <script lang="ts" setup>
 import { computed } from 'vue'
-import { useScrollPromise } from '../composables/scroll-promise.js'
-import { useData } from '../composables/data.js'
+import { useData, useScrollPromise } from '../composables/index.js'
 
 const { theme } = useData()
 const { resolve: onBeforeEnter, pending: onBeforeLeave } = useScrollPromise()
diff --git a/theme/src/client/composables/index.ts b/theme/src/client/composables/index.ts
index 70b308fb..162d5cb1 100644
--- a/theme/src/client/composables/index.ts
+++ b/theme/src/client/composables/index.ts
@@ -1,9 +1,13 @@
 export * from './theme-data.js'
 export * from './dark-mode.js'
 export * from './data.js'
+
 export * from './scroll-promise.js'
 export * from './scroll-behavior.js'
 
+export * from './langs.js'
+export * from './flyout.js'
+export * from './nav.js'
 export * from './sidebar.js'
 export * from './aside.js'
 export * from './outline.js'
@@ -13,6 +17,8 @@ export * from './edit-link.js'
 export * from './latest-updated.js'
 export * from './contributors.js'
 
+export * from './home.js'
+
 export * from './blog-data.js'
 export * from './blog-post-list.js'
 export * from './blog-extract.js'
@@ -28,4 +34,5 @@ export * from './encrypt.js'
 export * from './link.js'
 export * from './locale.js'
 export * from './route-query.js'
+
 export * from './watermark.js'
diff --git a/theme/src/client/composables/latest-updated.ts b/theme/src/client/composables/latest-updated.ts
index 38affb90..cadfde91 100644
--- a/theme/src/client/composables/latest-updated.ts
+++ b/theme/src/client/composables/latest-updated.ts
@@ -1,6 +1,6 @@
 import { usePageLang } from 'vuepress/client'
 import { computed, onMounted, ref, watchEffect } from 'vue'
-import { useData } from '../composables/data.js'
+import { useData } from './data.js'
 
 export function useLastUpdated() {
   const { theme, page, frontmatter } = useData()
diff --git a/theme/src/client/composables/nav.ts b/theme/src/client/composables/nav.ts
index d85763a8..6c638319 100644
--- a/theme/src/client/composables/nav.ts
+++ b/theme/src/client/composables/nav.ts
@@ -1,11 +1,12 @@
 import type { Ref } from 'vue'
 import { computed, ref, watch } from 'vue'
 import { useRoute } from 'vuepress/client'
-import type { NavItem } from '../../shared/index.js'
 import type {
+  NavItem,
   ResolvedNavItem,
   ResolvedNavItemWithLink,
-} from '../../shared/resolved/navbar.js'
+} from '../../shared/index.js'
+
 import { normalizeLink, resolveNavLink } from '../utils/index.js'
 import { useData } from './data.js'
 
diff --git a/theme/src/client/composables/sidebar.ts b/theme/src/client/composables/sidebar.ts
index 26783262..7f8fcc3c 100644
--- a/theme/src/client/composables/sidebar.ts
+++ b/theme/src/client/composables/sidebar.ts
@@ -20,8 +20,7 @@ import {
 } from 'vue'
 import { sidebar as sidebarRaw } from '@internal/sidebar'
 import { isActive, normalizeLink, normalizePrefix, resolveNavLink } from '../utils/index.js'
-import type { Sidebar, SidebarItem } from '../../shared/index.js'
-import type { ResolvedSidebarItem } from '../../shared/resolved/sidebar.js'
+import type { ResolvedSidebarItem, Sidebar, SidebarItem } from '../../shared/index.js'
 import { useData } from './data.js'
 import { useEncrypt } from './encrypt.js'
 
diff --git a/theme/src/client/layouts/Layout.vue b/theme/src/client/layouts/Layout.vue
index 98d4c8d1..f7b13ed3 100644
--- a/theme/src/client/layouts/Layout.vue
+++ b/theme/src/client/layouts/Layout.vue
@@ -10,9 +10,7 @@ import VPSkipLink from '@theme/VPSkipLink.vue'
 import VPFooter from '@theme/VPFooter.vue'
 import VPBackToTop from '@theme/VPBackToTop.vue'
 import VPEncryptGlobal from '@theme/VPEncryptGlobal.vue'
-import { useCloseSidebarOnEscape, useSidebar } from '../composables/sidebar.js'
-import { useEncrypt } from '../composables/encrypt.js'
-import { useData } from '../composables/data.js'
+import { useCloseSidebarOnEscape, useData, useEncrypt, useSidebar } from '../composables/index.js'
 
 const {
   isOpen: isSidebarOpen,
diff --git a/theme/src/client/layouts/NotFound.vue b/theme/src/client/layouts/NotFound.vue
index 3c6dc20e..47e5a2c1 100644
--- a/theme/src/client/layouts/NotFound.vue
+++ b/theme/src/client/layouts/NotFound.vue
@@ -3,7 +3,7 @@ import { useRouteLocale, withBase } from 'vuepress/client'
 import VPNav from '@theme/Nav/VPNav.vue'
 import VPSkipLink from '@theme/VPSkipLink.vue'
 import VPFooter from '@theme/VPFooter.vue'
-import { useData } from '../composables/data.js'
+import { useData } from '../composables/index.js'
 
 const root = useRouteLocale()
 const { theme } = useData()
diff --git a/theme/src/client/utils/index.ts b/theme/src/client/utils/index.ts
index b49b7f7c..4dcc2683 100644
--- a/theme/src/client/utils/index.ts
+++ b/theme/src/client/utils/index.ts
@@ -3,3 +3,4 @@ export * from './dom.js'
 export * from './resolveEditLink.js'
 export * from './resolveRepoType.js'
 export * from './resolveNavLink.js'
+export * from './animate.js'
diff --git a/theme/src/client/utils/resolveNavLink.ts b/theme/src/client/utils/resolveNavLink.ts
index 89c828fd..d885e492 100644
--- a/theme/src/client/utils/resolveNavLink.ts
+++ b/theme/src/client/utils/resolveNavLink.ts
@@ -5,7 +5,7 @@ import {
   isLinkAbsolute,
   isLinkWithProtocol,
 } from '@vuepress/helper/client'
-import type { ResolvedNavItemWithLink } from '../../shared/resolved/navbar.js'
+import type { ResolvedNavItemWithLink } from '../../shared/index.js'
 
 /**
  * Resolve NavLink props from string
diff --git a/theme/src/node/autoFrontmatter/generator.ts b/theme/src/node/autoFrontmatter/generator.ts
index c59a5801..06cf7039 100644
--- a/theme/src/node/autoFrontmatter/generator.ts
+++ b/theme/src/node/autoFrontmatter/generator.ts
@@ -10,8 +10,8 @@ import type {
   AutoFrontmatterArray,
   AutoFrontmatterMarkdownFile,
   AutoFrontmatterObject,
-} from '../../shared/auto-frontmatter.js'
-import type { PlumeThemeLocaleOptions } from '../../shared/index.js'
+  PlumeThemeLocaleOptions,
+} from '../../shared/index.js'
 import { readMarkdown, readMarkdownList } from './readFile.js'
 import { resolveOptions } from './resolveOptions.js'
 
diff --git a/theme/src/node/autoFrontmatter/readFile.ts b/theme/src/node/autoFrontmatter/readFile.ts
index 7bd38710..f62967f4 100644
--- a/theme/src/node/autoFrontmatter/readFile.ts
+++ b/theme/src/node/autoFrontmatter/readFile.ts
@@ -1,6 +1,6 @@
 import { fs, path } from 'vuepress/utils'
 import fg from 'fast-glob'
-import type { AutoFrontmatterMarkdownFile } from '../../shared/auto-frontmatter.js'
+import type { AutoFrontmatterMarkdownFile } from '../../shared/index.js'
 
 export async function readMarkdownList(
   sourceDir: string,
diff --git a/theme/src/node/defineConfig.ts b/theme/src/node/defineConfig.ts
index 426e5b30..fadb97f0 100644
--- a/theme/src/node/defineConfig.ts
+++ b/theme/src/node/defineConfig.ts
@@ -1,9 +1,4 @@
-import type {
-  NoteItem,
-  NotesOptions,
-} from '../shared/notes.js'
-import type { NavItem } from '../shared/index.js'
-import type { ThemeConfig } from '../shared/theme-data.js'
+import type { NavItem, NoteItem, NotesOptions, ThemeConfig } from '../shared/index.js'
 
 export function definePlumeNotesConfig(notes: NotesOptions): NotesOptions {
   return notes
diff --git a/theme/src/node/loadConfig/compiler.ts b/theme/src/node/loadConfig/compiler.ts
index 04d7ce2c..b0c0c956 100644
--- a/theme/src/node/loadConfig/compiler.ts
+++ b/theme/src/node/loadConfig/compiler.ts
@@ -4,7 +4,7 @@ import process from 'node:process'
 import { pathToFileURL } from 'node:url'
 import { build } from 'esbuild'
 import { importFileDefault } from 'vuepress/utils'
-import type { ThemeConfig } from '../../shared/theme-data.js'
+import type { ThemeConfig } from '../../shared/index.js'
 import { hash } from '../utils/index.js'
 
 export async function compiler(configPath?: string,
diff --git a/theme/src/node/loadConfig/loader.ts b/theme/src/node/loadConfig/loader.ts
index 88b7f405..4e7e3d15 100644
--- a/theme/src/node/loadConfig/loader.ts
+++ b/theme/src/node/loadConfig/loader.ts
@@ -3,8 +3,7 @@ import type { FSWatcher } from 'chokidar'
 import { path } from 'vuepress/utils'
 import { watch } from 'chokidar'
 import { deepMerge } from '@pengzhanbo/utils'
-import type { ThemeConfig } from '../../shared/theme-data.js'
-import type { AutoFrontmatter, PlumeThemeEncrypt, PlumeThemeLocaleOptions } from '../../shared/index.js'
+import type { AutoFrontmatter, PlumeThemeEncrypt, PlumeThemeLocaleOptions, ThemeConfig } from '../../shared/index.js'
 import { resolveLocaleOptions } from '../config/resolveLocaleOptions.js'
 import { findConfigPath } from './findConfigPath.js'
 import { compiler } from './compiler.js'
diff --git a/theme/src/node/plugins/getPlugins.ts b/theme/src/node/plugins/getPlugins.ts
index a9568fcd..1be808c9 100644
--- a/theme/src/node/plugins/getPlugins.ts
+++ b/theme/src/node/plugins/getPlugins.ts
@@ -4,7 +4,6 @@ import { docsearchPlugin } from '@vuepress/plugin-docsearch'
 import { gitPlugin } from '@vuepress/plugin-git'
 import { photoSwipePlugin } from '@vuepress/plugin-photo-swipe'
 import { nprogressPlugin } from '@vuepress/plugin-nprogress'
-import { baiduTongjiPlugin } from '@vuepress-plume/plugin-baidu-tongji'
 import { iconifyPlugin } from '@vuepress-plume/plugin-iconify'
 import { shikiPlugin } from '@vuepress-plume/plugin-shikiji'
 import { commentPlugin } from '@vuepress/plugin-comment'
@@ -149,10 +148,6 @@ export function getPlugins({
     plugins.push(commentPlugin(pluginOptions.comment))
   }
 
-  if (pluginOptions.baiduTongji !== false && pluginOptions.baiduTongji?.key && isProd) {
-    plugins.push(baiduTongjiPlugin(pluginOptions.baiduTongji))
-  }
-
   if (pluginOptions.sitemap !== false && hostname && isProd) {
     plugins.push(sitemapPlugin({ hostname }))
   }
diff --git a/theme/src/node/prepare/prepareSidebar.ts b/theme/src/node/prepare/prepareSidebar.ts
index b331dbfe..69974f7f 100644
--- a/theme/src/node/prepare/prepareSidebar.ts
+++ b/theme/src/node/prepare/prepareSidebar.ts
@@ -8,12 +8,12 @@ import {
 import type {
   PlumeThemeLocaleOptions,
   PlumeThemePageData,
+  ResolvedSidebarItem,
   Sidebar,
   SidebarItem,
   ThemeIcon,
 } from '../../shared/index.js'
 import { normalizeLink, resolveContent, writeTemp } from '../utils/index.js'
-import type { ResolvedSidebarItem } from '../../shared/resolved/sidebar.js'
 
 export async function prepareSidebar(app: App, localeOptions: PlumeThemeLocaleOptions) {
   const sidebar = getAllSidebar(localeOptions)
diff --git a/theme/src/node/theme.ts b/theme/src/node/theme.ts
index 239ca5b3..00595025 100644
--- a/theme/src/node/theme.ts
+++ b/theme/src/node/theme.ts
@@ -71,11 +71,12 @@ export function plumeTheme(options: PlumeThemeOptions = {}): Theme {
         await setupPage(app, localeOptions)
       },
 
-      onPrepared: (app) => {
+      onPrepared: async (app) => {
         onConfigChange(({ localeOptions }) => {
           prepareThemeData(app, localeOptions)
           prepareData(app)
         })
+        await waitForConfigLoaded()
       },
 
       onWatched: (app, watchers) => {
diff --git a/theme/src/node/utils/path.ts b/theme/src/node/utils/path.ts
index 82525cf3..240aa26d 100644
--- a/theme/src/node/utils/path.ts
+++ b/theme/src/node/utils/path.ts
@@ -3,7 +3,7 @@ import { ensureEndingSlash, ensureLeadingSlash, isLinkAbsolute, isLinkWithProtoc
 
 const __dirname = getDirname(import.meta.url)
 
-export const resolve = (...args: string[]) => path.resolve(__dirname, '../../', ...args)
+export const resolve = (...args: string[]) => path.resolve(__dirname, '../', ...args)
 export const templates = (url: string) => resolve('../templates', url)
 
 const RE_SLASH = /(\\|\/)+/g
diff --git a/theme/src/shared/index.ts b/theme/src/shared/index.ts
index 056fb3cd..81adf244 100644
--- a/theme/src/shared/index.ts
+++ b/theme/src/shared/index.ts
@@ -3,8 +3,9 @@ export * from './frontmatter/index.js'
 export * from './options/index.js'
 export * from './page-data.js'
 export * from './blog.js'
-export * from './sidebar.js'
-export * from './navbar.js'
 export * from './notes.js'
 export * from './auto-frontmatter.js'
 export * from './theme-data.js'
+export * from './sidebar.js'
+export * from './navbar.js'
+export * from './resolved/index.js'
diff --git a/theme/src/shared/options/plugins.ts b/theme/src/shared/options/plugins.ts
index 1daa63fa..8bc1cac5 100644
--- a/theme/src/shared/options/plugins.ts
+++ b/theme/src/shared/options/plugins.ts
@@ -1,6 +1,5 @@
 import type { DocsearchOptions } from '@vuepress/plugin-docsearch'
 import type { SearchPluginOptions } from '@vuepress-plume/plugin-search'
-import type { BaiduTongjiOptions } from '@vuepress-plume/plugin-baidu-tongji'
 import type { ShikiPluginOptions } from '@vuepress-plume/plugin-shikiji'
 import type { CommentPluginOptions } from '@vuepress/plugin-comment'
 import type { MarkdownEnhancePluginOptions } from 'vuepress-plugin-md-enhance'
@@ -57,7 +56,11 @@ export interface PlumeThemePluginOptions {
 
   seo?: false
 
-  baiduTongji?: false | BaiduTongjiOptions
+  /**
+   * @deprecated
+   * 请使用 [@vuepress/plugin-baidu-analytics](https://ecosystem.vuejs.press/zh/plugins/analytics/baidu-analytics.html) 代替
+   */
+  baiduTongji?: never
 
   /**
    * @deprecated 使用 `autoFrontmatter` 代替
diff --git a/theme/src/shared/resolved/index.ts b/theme/src/shared/resolved/index.ts
new file mode 100644
index 00000000..0afff9c6
--- /dev/null
+++ b/theme/src/shared/resolved/index.ts
@@ -0,0 +1,2 @@
+export * from './navbar.js'
+export * from './sidebar.js'