diff --git a/docs/conf.py b/docs/conf.py
index eb98a0a3..d00eca1b 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -13,4 +13,3 @@
 
 # -- Options for HTML output -------------------------------------------------
 html_theme = "sunpy"
-html_static_path = ["_static"]
diff --git a/src/sunpy_sphinx_theme/theme/sunpy/components/navbar_center.html b/src/sunpy_sphinx_theme/theme/sunpy/components/navbar_center.html
index 81375c31..898f43bd 100644
--- a/src/sunpy_sphinx_theme/theme/sunpy/components/navbar_center.html
+++ b/src/sunpy_sphinx_theme/theme/sunpy/components/navbar_center.html
@@ -25,7 +25,7 @@
               </ul>
           </li>
         {% else %}
-          <li class="nav-item ms-2"><a class="nav-link" role="button" href="{{ pathto(*navlink[1:]) }}">{{ navlink[0] }}</a></li>
+          <li class="nav-item ms-2"><a class="nav-link" role="button" href="{{ sst_pathto(*navlink[1:]) }}">{{ navlink[0] }}</a></li>
         {% endif %}
       {%- endfor %}
     {% endif %}
diff --git a/tox.ini b/tox.ini
index be70e772..4bffc208 100644
--- a/tox.ini
+++ b/tox.ini
@@ -28,7 +28,7 @@ commands =
 [testenv:sunpy-docs]
 changedir = .tmp/{envname}
 commands =
-    /bin/bash -c "git -C sunpy pull || git clone https://github.com/Cadair/sunpy --branch sphinx-book-theme"
+    /bin/bash -c "git -C sunpy pull || git clone https://github.com/sunpy/sunpy"
     python -m pip install -v -e "sunpy/.[all,docs]"
     sphinx-build --color -b html sunpy/docs sunpy/docs/_build/html -D plot_gallery=0 {posargs}
     python -c 'import pathlib; print("Documentation available under file://\{0\}".format(pathlib.Path("./sunpy/docs") / "_build" / "html" / "index.html"))'
@@ -36,7 +36,7 @@ commands =
 [testenv:website]
 changedir = .tmp/{envname}
 commands =
-    /bin/bash -c "git -C sunpy.org pull || git clone --recurse-submodules https://github.com/sunpy/sunpy.org --branch sphinx-book-theme"
+    /bin/bash -c "git -C sunpy.org pull || git clone --recurse-submodules https://github.com/sunpy/sunpy.org"
     python -m pip install -r "sunpy.org/requirements.txt"
     sphinx-build --color -b html sunpy.org/ sunpy.org/_build/html {posargs}
     python -c 'import pathlib; print("Documentation available under file://\{0\}".format(pathlib.Path("./sunpy.org") / "_build" / "html" / "index.html"))'