diff --git a/.github/workflows/lighthouserc.json b/.github/workflows/lighthouserc.json
deleted file mode 100644
index 8038c2b..0000000
--- a/.github/workflows/lighthouserc.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "ci": {
-    "collect": {
-      "numberOfRuns": 3
-    },
-    "assert": {
-      "preset": "lighthouse:recommended",
-      "assertions": {
-        "font-display": "off",
-        "dom-size": "off",
-        "color-contrast": "off"
-      }
-    }
-  }
-}
diff --git a/src/components/Layout.jsx b/src/components/Layout.jsx
index 80662d7..5acb6f3 100644
--- a/src/components/Layout.jsx
+++ b/src/components/Layout.jsx
@@ -4,6 +4,7 @@ import posed, { PoseGroup } from 'react-pose'
 import { fadeIn } from './atoms/Transitions'
 import Typekit from './atoms/Typekit'
 import HostnameCheck from './atoms/HostnameCheck'
+import ThemeSwitch from './molecules/ThemeSwitch'
 import Header from './organisms/Header'
 import Footer from './organisms/Footer'
 import styles from './Layout.module.css'
@@ -39,6 +40,7 @@ export default function Layout({ children, location }) {
     <>
       <Typekit />
       <HostnameCheck allowedHosts={allowedHosts} />
+      <ThemeSwitch />
 
       <PoseGroup animateOnMount={process.env.NODE_ENV !== 'test' && true}>
         <RoutesContainer
diff --git a/src/components/organisms/Header.jsx b/src/components/organisms/Header.jsx
index 604f7fb..2529a04 100644
--- a/src/components/organisms/Header.jsx
+++ b/src/components/organisms/Header.jsx
@@ -2,7 +2,7 @@ import React from 'react'
 import PropTypes from 'prop-types'
 import Networks from '../molecules/Networks'
 import Availability from '../molecules/Availability'
-import ThemeSwitch from '../molecules/ThemeSwitch'
+
 import LogoUnit from '../molecules/LogoUnit'
 import styles from './Header.module.css'
 import { useMeta } from '../../hooks/use-meta'
@@ -16,17 +16,14 @@ export default function Header({ minimal, hide }) {
   const { availability } = useMeta()
 
   return (
-    <>
-      <ThemeSwitch />
-      <header className={minimal ? styles.minimal : styles.header}>
-        {!hide && (
-          <>
-            <LogoUnit minimal={minimal} />
-            <Networks hide={minimal} />
-            <Availability hide={minimal && !availability.status} />
-          </>
-        )}
-      </header>
-    </>
+    <header className={minimal ? styles.minimal : styles.header}>
+      {!hide && (
+        <>
+          <LogoUnit minimal={minimal} />
+          <Networks hide={minimal} />
+          <Availability hide={minimal && !availability.status} />
+        </>
+      )}
+    </header>
   )
 }