diff --git a/components/SideBarDrawer.js b/components/SideBarDrawer.js
index 4d5108cd..6e0c6150 100644
--- a/components/SideBarDrawer.js
+++ b/components/SideBarDrawer.js
@@ -15,6 +15,7 @@ const SideBarDrawer = ({
   showOnPC = false
 }) => {
   const router = useRouter()
+
   useEffect(() => {
     const sideBarDrawerRouteListener = () => {
       switchSideDrawerVisible(false)
@@ -38,10 +39,10 @@ const SideBarDrawer = ({
     )
 
     if (showStatus) {
-      sideBarDrawer?.classList.replace('-ml-96', 'ml-0')
+      sideBarDrawer?.classList.replace('translate-x-[-100%]', 'translate-x-0')
       sideBarDrawerBackground?.classList.replace('hidden', 'block')
     } else {
-      sideBarDrawer?.classList.replace('ml-0', '-ml-96')
+      sideBarDrawer?.classList.replace('translate-x-0', 'translate-x-[-100%]')
       sideBarDrawerBackground?.classList.replace('block', 'hidden')
     }
   }
@@ -49,22 +50,21 @@ const SideBarDrawer = ({
   return (
     <div
       id='sidebar-wrapper'
-      className={` block ${showOnPC ? '' : 'lg:hidden'} top-0`}>
+      className={`block ${showOnPC ? '' : 'lg:hidden'} top-0`}>
       <div
         id='sidebar-drawer'
-        className={`${className} ${isOpen ? 'ml-0 w-96 visible' : '-ml-96 max-w-side invisible'} bg-white dark:bg-gray-900 flex flex-col duration-300 fixed h-full left-0 overflow-y-scroll scroll-hidden top-0 z-30`}>
+        className={`${className} ${isOpen ? 'translate-x-0 opacity-100' : 'translate-x-[-100%] opacity-0'} transform transition-transform duration-300 ease-in-out bg-white dark:bg-gray-900 flex flex-col fixed h-full left-0 overflow-y-scroll top-0 z-30`}>
         {children}
       </div>
 
       {/* 背景蒙版 */}
       <div
         id='sidebar-drawer-background'
-        onClick={() => {
-          switchSideDrawerVisible(false)
-        }}
-        className={`${isOpen ? 'block' : 'hidden'} animate__animated animate__fadeIn fixed top-0 duration-300 left-0 z-20 w-full h-full bg-black/70`}
+        onClick={() => switchSideDrawerVisible(false)}
+        className={`${isOpen ? 'block' : 'hidden'} fixed top-0 left-0 z-20 w-full h-full bg-black/70 transition-opacity duration-300`}
       />
     </div>
   )
 }
+
 export default SideBarDrawer
diff --git a/components/ThemeSwitch.js b/components/ThemeSwitch.js
index 732f8493..9675f63e 100644
--- a/components/ThemeSwitch.js
+++ b/components/ThemeSwitch.js
@@ -64,7 +64,7 @@ const ThemeSwitch = () => {
       </Draggable>
 
       <SideBarDrawer
-        className='p-10'
+        className='p-10  max-w-3xl 2xl:max-w-5xl'
         isOpen={sideBarVisible}
         showOnPC={true}
         onClose={() => {
@@ -98,7 +98,7 @@ const ThemeSwitch = () => {
         <div> Click below to switch the theme.</div>
 
         {/* 陈列所有主题 */}
-        <div>
+        <div className='grid lg:grid-cols-2 gap-6'>
           {THEMES?.map(t => {
             return (
               <div