diff --git a/themes/fukasawa/LayoutCategoryIndex.js b/themes/fukasawa/LayoutCategoryIndex.js
index e44e86dc..9e9cdd9c 100644
--- a/themes/fukasawa/LayoutCategoryIndex.js
+++ b/themes/fukasawa/LayoutCategoryIndex.js
@@ -4,7 +4,7 @@ import LayoutBase from './LayoutBase'
 
 export const LayoutCategoryIndex = (props) => {
   const { locale } = useGlobal()
-  const { categories } = props
+  const { categoryOptions } = props
   return (
     <LayoutBase {...props}>
       <div className='bg-white dark:bg-gray-700 px-10 py-10 shadow'>
@@ -12,7 +12,7 @@ export const LayoutCategoryIndex = (props) => {
           <i className='mr-4 fas fa-th' />{locale.COMMON.CATEGORY}:
         </div>
         <div id='category-list' className='duration-200 flex flex-wrap'>
-          {categories && categories.map(category => {
+          {categoryOptions?.map(category => {
             return (
               <Link
                 key={category.name}
diff --git a/themes/fukasawa/LayoutTagIndex.js b/themes/fukasawa/LayoutTagIndex.js
index d49d032e..eb1d690b 100644
--- a/themes/fukasawa/LayoutTagIndex.js
+++ b/themes/fukasawa/LayoutTagIndex.js
@@ -4,12 +4,12 @@ import LayoutBase from './LayoutBase'
 
 export const LayoutTagIndex = (props) => {
   const { locale } = useGlobal()
-  const { tags } = props
+  const { tagOptions } = props
   return <LayoutBase {...props} >
     <div className='bg-white dark:bg-gray-700 px-10 py-10 shadow'>
       <div className='dark:text-gray-200 mb-5'><i className='mr-4 fas fa-tag'/>{locale.COMMON.TAGS}:</div>
       <div id='tags-list' className='duration-200 flex flex-wrap'>
-        { tags.map(tag => {
+        { tagOptions.map(tag => {
           return <div key={tag.name} className='p-2'><TagItem key={tag.name} tag={tag} /></div>
         }) }
       </div>
diff --git a/themes/fukasawa/components/AsideLeft.js b/themes/fukasawa/components/AsideLeft.js
index 9b438bd4..adec77fa 100644
--- a/themes/fukasawa/components/AsideLeft.js
+++ b/themes/fukasawa/components/AsideLeft.js
@@ -9,9 +9,9 @@ import { useRouter } from 'next/router'
 import DarkModeButton from '@/components/DarkModeButton'
 
 function AsideLeft (props) {
-  const { tags, currentTag, categories, currentCategory, post, slot, siteInfo } = props
+  const { tagOptions, currentTag, categoryOptions, currentCategory, post, slot, siteInfo } = props
   const router = useRouter()
-  return <div className='relative w-72 bg-white dark:bg-hexo-black-gray min-h-screen px-10 py-14 hidden lg:block relative z-10'>
+  return <div className='relative w-72 bg-white dark:bg-hexo-black-gray min-h-screen px-10 py-14 hidden lg:block z-10'>
     <Logo {...props}/>
 
     <section className='flex flex-col text-gray-600'>
@@ -31,12 +31,12 @@ function AsideLeft (props) {
 
     {router.asPath !== '/tag' && <section className='flex flex-col'>
       <hr className='w-12 my-8 ' />
-      <GroupTag tags={tags} currentTag={currentTag}/>
+      <GroupTag tags={tagOptions} currentTag={currentTag}/>
     </section>}
 
     {router.asPath !== '/category' && <section className='flex flex-col'>
       <hr className='w-12 my-8 ' />
-      <GroupCategory categories={categories} currentCategory={currentCategory}/>
+      <GroupCategory categories={categoryOptions} currentCategory={currentCategory}/>
     </section>}
 
     <section className='flex flex-col'>