diff --git a/lib/global.js b/lib/global.js
index 95c9614a..a080f270 100644
--- a/lib/global.js
+++ b/lib/global.js
@@ -72,7 +72,8 @@ export function GlobalContextProvider({ children }) {
     const currentIndex = THEMES.indexOf(theme)
     const newIndex = currentIndex < THEMES.length - 1 ? currentIndex + 1 : 0
     const newTheme = THEMES[newIndex]
-    const query = { ...router.query, theme: newTheme }
+    const query = router.query
+    query.theme = newTheme
     router.push({ pathname: router.pathname, query })
     return newTheme
   }
diff --git a/themes/heo/components/NavBar.js b/themes/heo/components/NavBar.js
index aed5b4b4..af69384a 100644
--- a/themes/heo/components/NavBar.js
+++ b/themes/heo/components/NavBar.js
@@ -146,7 +146,7 @@ const NavBar = props => {
                 <div className='flex flex-shrink-0 justify-center items-center space-x-1'>
                     <RandomPostButton {...props} />
                     <SearchButton />
-                    {!JSON.parse(BLOG.THEME_SWITCH) && <DarkModeButton {...props} />}
+                    {!JSON.parse(BLOG.THEME_SWITCH) && <div className='hidden md:block'><DarkModeButton {...props} /></div>}
                     <ReadingProgress />
 
                     {/* 移动端菜单按钮 */}
diff --git a/themes/medium/index.js b/themes/medium/index.js
index ae1c34f2..72b27314 100644
--- a/themes/medium/index.js
+++ b/themes/medium/index.js
@@ -78,9 +78,9 @@ const LayoutBase = props => {
                                 appear={true}
                                 enter="transition ease-in-out duration-700 transform order-first"
                                 enterFrom="opacity-0 translate-y-16"
-                                enterTo="opacity-100 translate-y-0"
+                                enterTo="opacity-100"
                                 leave="transition ease-in-out duration-300 transform"
-                                leaveFrom="opacity-100 translate-y-0"
+                                leaveFrom="opacity-100"
                                 leaveTo="opacity-0 -translate-y-16"
                                 unmount={false}
                             >
diff --git a/themes/next/index.js b/themes/next/index.js
index c59c7279..931c7de7 100644
--- a/themes/next/index.js
+++ b/themes/next/index.js
@@ -95,9 +95,9 @@ const LayoutBase = (props) => {
                         appear={true}
                         enter="transition ease-in-out duration-700 transform order-first"
                         enterFrom="opacity-0 translate-y-16"
-                        enterTo="opacity-100 translate-y-0"
+                        enterTo="opacity-100"
                         leave="transition ease-in-out duration-300 transform"
-                        leaveFrom="opacity-100 translate-y-0"
+                        leaveFrom="opacity-100"
                         leaveTo="opacity-0 -translate-y-16"
                         unmount={false}
                     >