diff --git a/next.config.js b/next.config.js
index 726eaae4..876411f4 100644
--- a/next.config.js
+++ b/next.config.js
@@ -68,6 +68,7 @@ module.exports = withBundleAnalyzer({
     //   })
     // }
 
+    console.log(path.resolve(__dirname, 'themes', THEME))
     // 动态主题：添加 resolve.alias 配置，将动态路径映射到实际路径
     config.resolve.alias['@theme-components'] = path.resolve(__dirname, 'themes', THEME)
 
diff --git a/themes/fukasawa/index.js b/themes/fukasawa/index.js
index 58968469..8b5764e6 100644
--- a/themes/fukasawa/index.js
+++ b/themes/fukasawa/index.js
@@ -1,14 +1,14 @@
 import CONFIG_FUKA from './config_fuka'
-import { LayoutIndex } from './LayoutIndex'
-import { LayoutSearch } from './LayoutSearch'
-import { LayoutArchive } from './LayoutArchive'
-import { LayoutSlug } from './LayoutSlug'
-import { Layout404 } from './Layout404'
-import { LayoutCategory } from './LayoutCategory'
-import { LayoutCategoryIndex } from './LayoutCategoryIndex'
-import { LayoutPage } from './LayoutPage'
-import { LayoutTag } from './LayoutTag'
-import { LayoutTagIndex } from './LayoutTagIndex'
+import LayoutIndex from './LayoutIndex'
+import LayoutSearch from './LayoutSearch'
+import LayoutArchive from './LayoutArchive'
+import LayoutSlug from './LayoutSlug'
+import Layout404 from './Layout404'
+import LayoutCategory from './LayoutCategory'
+import LayoutCategoryIndex from './LayoutCategoryIndex'
+import LayoutPage from './LayoutPage'
+import LayoutTag from './LayoutTag'
+import LayoutTagIndex from './LayoutTagIndex'
 
 export {
   CONFIG_FUKA as THEME_CONFIG,
diff --git a/themes/gitbook/index.js b/themes/gitbook/index.js
index feffe394..039b93c8 100644
--- a/themes/gitbook/index.js
+++ b/themes/gitbook/index.js
@@ -1,14 +1,14 @@
 import CONFIG_GITBOOK from './config_gitbook'
-import { LayoutIndex } from './LayoutIndex'
-import { LayoutSearch } from './LayoutSearch'
-import { LayoutArchive } from './LayoutArchive'
-import { LayoutSlug } from './LayoutSlug'
-import { Layout404 } from './Layout404'
-import { LayoutCategory } from './LayoutCategory'
-import { LayoutCategoryIndex } from './LayoutCategoryIndex'
-import { LayoutPage } from './LayoutPage'
-import { LayoutTag } from './LayoutTag'
-import { LayoutTagIndex } from './LayoutTagIndex'
+import LayoutIndex from './LayoutIndex'
+import LayoutSearch from './LayoutSearch'
+import LayoutArchive from './LayoutArchive'
+import LayoutSlug from './LayoutSlug'
+import Layout404 from './Layout404'
+import LayoutCategory from './LayoutCategory'
+import LayoutCategoryIndex from './LayoutCategoryIndex'
+import LayoutPage from './LayoutPage'
+import LayoutTag from './LayoutTag'
+import LayoutTagIndex from './LayoutTagIndex'
 
 export {
   CONFIG_GITBOOK as THEME_CONFIG,
diff --git a/themes/hexo/index.js b/themes/hexo/index.js
index 8528d5da..24d3ef05 100644
--- a/themes/hexo/index.js
+++ b/themes/hexo/index.js
@@ -1,14 +1,14 @@
 import CONFIG_HEXO from './config_hexo'
-import { LayoutIndex } from './LayoutIndex'
-import { LayoutSearch } from './LayoutSearch'
-import { LayoutArchive } from './LayoutArchive'
-import { LayoutSlug } from './LayoutSlug'
-import { Layout404 } from './Layout404'
-import { LayoutCategory } from './LayoutCategory'
-import { LayoutCategoryIndex } from './LayoutCategoryIndex'
-import { LayoutPage } from './LayoutPage'
-import { LayoutTag } from './LayoutTag'
-import { LayoutTagIndex } from './LayoutTagIndex'
+import LayoutIndex from './LayoutIndex'
+import LayoutSearch from './LayoutSearch'
+import LayoutArchive from './LayoutArchive'
+import LayoutSlug from './LayoutSlug'
+import Layout404 from './Layout404'
+import LayoutCategory from './LayoutCategory'
+import LayoutCategoryIndex from './LayoutCategoryIndex'
+import LayoutPage from './LayoutPage'
+import LayoutTag from './LayoutTag'
+import LayoutTagIndex from './LayoutTagIndex'
 
 export {
   CONFIG_HEXO as THEME_CONFIG,
diff --git a/themes/matery/index.js b/themes/matery/index.js
new file mode 100644
index 00000000..c767fcd3
--- /dev/null
+++ b/themes/matery/index.js
@@ -0,0 +1,25 @@
+import CONFIG_MATERY from './config_matery'
+import LayoutIndex from './LayoutIndex'
+import LayoutSearch from './LayoutSearch'
+import LayoutArchive from './LayoutArchive'
+import LayoutSlug from './LayoutSlug'
+import Layout404 from './Layout404'
+import LayoutCategory from './LayoutCategory'
+import LayoutCategoryIndex from './LayoutCategoryIndex'
+import LayoutPage from './LayoutPage'
+import LayoutTag from './LayoutTag'
+import LayoutTagIndex from './LayoutTagIndex'
+
+export {
+  CONFIG_MATERY as THEME_CONFIG,
+  LayoutIndex,
+  LayoutSearch,
+  LayoutArchive,
+  LayoutSlug,
+  Layout404,
+  LayoutCategory,
+  LayoutCategoryIndex,
+  LayoutPage,
+  LayoutTag,
+  LayoutTagIndex
+}
diff --git a/themes/matery/indexj.js b/themes/matery/indexj.js
deleted file mode 100644
index 528e1e80..00000000
--- a/themes/matery/indexj.js
+++ /dev/null
@@ -1,25 +0,0 @@
-import CONFIG_MATERY from './config_matery'
-import { LayoutIndex } from './LayoutIndex'
-import { LayoutSearch } from './LayoutSearch'
-import { LayoutArchive } from './LayoutArchive'
-import { LayoutSlug } from './LayoutSlug'
-import { Layout404 } from './Layout404'
-import { LayoutCategory } from './LayoutCategory'
-import { LayoutCategoryIndex } from './LayoutCategoryIndex'
-import { LayoutPage } from './LayoutPage'
-import { LayoutTag } from './LayoutTag'
-import { LayoutTagIndex } from './LayoutTagIndex'
-
-export {
-  CONFIG_MATERY as THEME_CONFIG,
-  LayoutIndex,
-  LayoutSearch,
-  LayoutArchive,
-  LayoutSlug,
-  Layout404,
-  LayoutCategory,
-  LayoutCategoryIndex,
-  LayoutPage,
-  LayoutTag,
-  LayoutTagIndex
-}
diff --git a/themes/medium/index.js b/themes/medium/index.js
index 81961c58..cd3239ec 100644
--- a/themes/medium/index.js
+++ b/themes/medium/index.js
@@ -1,14 +1,14 @@
 import CONFIG_MEDIUM from './config_medium'
-import { LayoutIndex } from './LayoutIndex'
-import { LayoutSearch } from './LayoutSearch'
-import { LayoutArchive } from './LayoutArchive'
-import { LayoutSlug } from './LayoutSlug'
-import { Layout404 } from './Layout404'
-import { LayoutCategory } from './LayoutCategory'
-import { LayoutCategoryIndex } from './LayoutCategoryIndex'
-import { LayoutPage } from './LayoutPage'
-import { LayoutTag } from './LayoutTag'
-import { LayoutTagIndex } from './LayoutTagIndex'
+import LayoutIndex from './LayoutIndex'
+import LayoutSearch from './LayoutSearch'
+import LayoutArchive from './LayoutArchive'
+import LayoutSlug from './LayoutSlug'
+import Layout404 from './Layout404'
+import LayoutCategory from './LayoutCategory'
+import LayoutCategoryIndex from './LayoutCategoryIndex'
+import LayoutPage from './LayoutPage'
+import LayoutTag from './LayoutTag'
+import LayoutTagIndex from './LayoutTagIndex'
 
 export {
   CONFIG_MEDIUM as THEME_CONFIG,
diff --git a/themes/next/LayoutIndex.js b/themes/next/LayoutIndex.js
index 31cfee1c..441a5660 100644
--- a/themes/next/LayoutIndex.js
+++ b/themes/next/LayoutIndex.js
@@ -18,8 +18,7 @@ export const LayoutIndex = (props) => {
   >
     {BLOG.POST_LIST_STYLE !== 'page'
       ? <BlogPostListScroll {...props} showSummary={true} />
-      : <BlogPostListPage
-export default LayoutIndex{...props} />
+      : <BlogPostListPage {...props} />
     }
   </LayoutBase>
 }
diff --git a/themes/next/index.js b/themes/next/index.js
index 45286719..a1ca8401 100644
--- a/themes/next/index.js
+++ b/themes/next/index.js
@@ -1,14 +1,14 @@
 import CONFIG_NEXT from './config_next'
-import { LayoutIndex } from './LayoutIndex'
-import { LayoutSearch } from './LayoutSearch'
-import { LayoutArchive } from './LayoutArchive'
-import { LayoutSlug } from './LayoutSlug'
-import { Layout404 } from './Layout404'
-import { LayoutCategory } from './LayoutCategory'
-import { LayoutCategoryIndex } from './LayoutCategoryIndex'
-import { LayoutPage } from './LayoutPage'
-import { LayoutTag } from './LayoutTag'
-import { LayoutTagIndex } from './LayoutTagIndex'
+import LayoutIndex from './LayoutIndex'
+import LayoutSearch from './LayoutSearch'
+import LayoutArchive from './LayoutArchive'
+import LayoutSlug from './LayoutSlug'
+import Layout404 from './Layout404'
+import LayoutCategory from './LayoutCategory'
+import LayoutCategoryIndex from './LayoutCategoryIndex'
+import LayoutPage from './LayoutPage'
+import LayoutTag from './LayoutTag'
+import LayoutTagIndex from './LayoutTagIndex'
 
 export {
   CONFIG_NEXT as THEME_CONFIG,
diff --git a/themes/nobelium/index.js b/themes/nobelium/index.js
index dda0f1a2..66ee12c8 100644
--- a/themes/nobelium/index.js
+++ b/themes/nobelium/index.js
@@ -1,14 +1,14 @@
 import CONFIG_NOBELIUM from './config_nobelium'
-import { LayoutIndex } from './LayoutIndex'
-import { LayoutSearch } from './LayoutSearch'
-import { LayoutArchive } from './LayoutArchive'
-import { LayoutSlug } from './LayoutSlug'
-import { Layout404 } from './Layout404'
-import { LayoutCategory } from './LayoutCategory'
-import { LayoutCategoryIndex } from './LayoutCategoryIndex'
-import { LayoutPage } from './LayoutPage'
-import { LayoutTag } from './LayoutTag'
-import { LayoutTagIndex } from './LayoutTagIndex'
+import LayoutIndex from './LayoutIndex'
+import LayoutSearch from './LayoutSearch'
+import LayoutArchive from './LayoutArchive'
+import LayoutSlug from './LayoutSlug'
+import Layout404 from './Layout404'
+import LayoutCategory from './LayoutCategory'
+import LayoutCategoryIndex from './LayoutCategoryIndex'
+import LayoutPage from './LayoutPage'
+import LayoutTag from './LayoutTag'
+import LayoutTagIndex from './LayoutTagIndex'
 
 export {
   CONFIG_NOBELIUM as THEME_CONFIG,
diff --git a/themes/simple/index.js b/themes/simple/index.js
index 7e560470..91775a1d 100644
--- a/themes/simple/index.js
+++ b/themes/simple/index.js
@@ -1,14 +1,14 @@
 import CONFIG_SIMPLE from './config_simple'
-import { LayoutIndex } from './LayoutIndex'
-import { LayoutSearch } from './LayoutSearch'
-import { LayoutArchive } from './LayoutArchive'
-import { LayoutSlug } from './LayoutSlug'
-import { Layout404 } from './Layout404'
-import { LayoutCategory } from './LayoutCategory'
-import { LayoutCategoryIndex } from './LayoutCategoryIndex'
-import { LayoutPage } from './LayoutPage'
-import { LayoutTag } from './LayoutTag'
-import { LayoutTagIndex } from './LayoutTagIndex'
+import LayoutIndex from './LayoutIndex'
+import LayoutSearch from './LayoutSearch'
+import LayoutArchive from './LayoutArchive'
+import LayoutSlug from './LayoutSlug'
+import Layout404 from './Layout404'
+import LayoutCategory from './LayoutCategory'
+import LayoutCategoryIndex from './LayoutCategoryIndex'
+import LayoutPage from './LayoutPage'
+import LayoutTag from './LayoutTag'
+import LayoutTagIndex from './LayoutTagIndex'
 
 export {
   CONFIG_SIMPLE as THEME_CONFIG,