diff --git a/src/components/Meta/Favicon.tsx b/src/components/Meta/Favicon.tsx
index 19a2694..384fd65 100644
--- a/src/components/Meta/Favicon.tsx
+++ b/src/components/Meta/Favicon.tsx
@@ -10,7 +10,7 @@ const MetaFavicons = () => {
       <link rel="icon" href="/favicon.ico" sizes="any" />
       <link rel="icon" href="/favicon.svg" type="image/svg+xml" />
       <link rel="apple-touch-icon" href="/apple-touch-icon.png" />
-      <link rel="manifest" href="/favicon/manifest.webmanifest"></link>
+      <link rel="manifest" href="/manifest/manifest.webmanifest"></link>
     </Head>
   )
 }
diff --git a/src/components/ThemeSwitch/index.tsx b/src/components/ThemeSwitch/index.tsx
index 39c0f42..ad23d15 100644
--- a/src/components/ThemeSwitch/index.tsx
+++ b/src/components/ThemeSwitch/index.tsx
@@ -12,11 +12,6 @@ export default function ThemeSwitch() {
       <Head>
         <meta name="theme-color" content={themeColor} />
         <meta name="msapplication-TileColor" content={themeColor} />
-        {/* <link
-          rel="mask-icon"
-          href="/favicon/safari-pinned-tab.svg"
-          color={themeColor}
-        /> */}
         <meta
           name="apple-mobile-web-app-status-bar-style"
           content="black-translucent"
diff --git a/src/hooks/useDarkMode.ts b/src/hooks/useDarkMode.ts
index f3d8b6d..24741e1 100644
--- a/src/hooks/useDarkMode.ts
+++ b/src/hooks/useDarkMode.ts
@@ -25,18 +25,26 @@ function getDarkMode() {
 }
 
 export default function useDarkMode() {
-  const [darkMode, setDarkMode] = useState(getDarkMode())
+  const [darkMode, setDarkMode] = useState<boolean>()
   const [themeColor, setThemeColor] = useState<string>()
 
   const toggleDarkMode = useCallback(() => {
     setDarkMode(!darkMode)
   }, [darkMode])
 
+  //
+  // Init
+  //
+  useEffect(() => {
+    const prefersDark = getDarkMode()
+    setDarkMode(prefersDark)
+  }, [])
+
   //
   // Do things when darkMode changes
   //
   useEffect(() => {
-    const bodyClassList = document.body.classList
+    const bodyClassList = document.querySelector('body').classList
     bodyClassList.toggle('dark')
     bodyClassList.toggle('light')
     setThemeColor(darkMode === true ? '#1d2224' : '#e7eef4')
