diff --git a/docs/_static/NSF-Unidata_lockup_horizontal_2024_darkmode_v3.png b/docs/_static/NSF-Unidata_lockup_horizontal_2024_darkmode_v3.png
new file mode 100644
index 0000000000..fa6f5d4371
Binary files /dev/null and b/docs/_static/NSF-Unidata_lockup_horizontal_2024_darkmode_v3.png differ
diff --git a/docs/_static/theme-unidata.css b/docs/_static/theme-unidata.css
index 483ac5b8fe..dc5be528d5 100644
--- a/docs/_static/theme-unidata.css
+++ b/docs/_static/theme-unidata.css
@@ -1,6 +1,17 @@
 /* Define "Unidata Blue" RGB values */
 html {
-    --unidata-blue-rgb: 6, 119, 143;
+    --unidata-blue-rgb: rgb(6, 119, 143);
+    --unidata-teal-rgb: rgb(69, 166, 169);
+}
+
+html[data-theme="light"] {
+    --pst-color-primary: var(--unidata-blue-rgb);
+    --pst-color-secondary: var(--unidata-teal-rgb);
+}
+
+html[data-theme="dark"] {
+    --pst-color-primary: var(--unidata-blue-rgb);
+    --pst-color-secondary: var(--unidata-teal-rgb);
 }
 
 /* Header and heading font style */
@@ -10,32 +21,20 @@ html {
 
 /* Header colors */
 .bd-header {
-    background: rgb(var(--unidata-blue-rgb)) !important;
+    background: var(--unidata-blue-rgb) !important;
 }
 
-.theme-switch-button {
-    border-color: rgb(var(--unidata-blue-rgb)) !important;
-}
-
-.bd-header .navbar-nav>.nav-item>.nav-link, 
+.bd-header .navbar-nav>.nav-item>.nav-link,
 .bd-header .dropdown-toggle,
 .bd-header .pst-navbar-icon,
 .bd-header .btn {
     color: #fff !important;
- }
-
-.version-switcher__button {
-    border-color: #fff !important;
 }
 
 .search-button {
     padding: 0 0 0;
 }
 
-.navbar-nav .dropdown-menu {
-    background-color: var(--pst-color-background);
-}
-
 /* Increase contrast of links in code snippets */
 div[class^="highlight"] a {
     background-color: rgb(var(--unidata-blue-rgb), 0.2);
diff --git a/docs/conf.py b/docs/conf.py
index f0d500c8f7..3e37813987 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -276,7 +276,7 @@
     'github_user': 'Unidata',
     'github_repo': 'MetPy',
     'github_version': 'main',  # Make changes to the main branch
-    'default_mode': 'light',
+    'default_mode': 'auto',
 }
 
 # Add any paths that contain custom themes here, relative to this directory.
diff --git a/docs/index.rst b/docs/index.rst
index f84aaf9012..04bbe5f595 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -84,7 +84,13 @@ Our up-to-date references for grants and funding can be found
 `here <https://github.com/Unidata/MetPy/blob/main/CITATION.cff>`_.
 
 .. image:: _static/NSF-Unidata_lockup_horizontal_2024.png
-   :class: no-scaled-link
+   :class: no-scaled-link only-light
+   :align: center
+   :height: 100px
+   :alt: NSF Unidata logo
+
+.. image:: _static/NSF-Unidata_lockup_horizontal_2024_darkmode_v3.png
+   :class: no-scaled-link only-dark
    :align: center
    :height: 100px
    :alt: NSF Unidata logo