diff --git a/README.rst b/README.rst
index d3d9f088db4f8b976f3f55852715762280bb93c0..3a2b2d8ecfcdba6ffaa4f3f2e275cb85feb709de 100644
--- a/README.rst
+++ b/README.rst
@@ -1,7 +1,7 @@
 Project Hosting Moved
 =====================
 
-This project can now be found at https://whetstone.privatestorage.io/opensource/PrivateStorageio
+This project can now be found at https://whetstone.privatestorage.io/privatestorage/PrivateStorageio
 
 PrivateStorageio
 ================
@@ -13,8 +13,8 @@ Documentation
 
 There is documentation for:
 
-* Operators/Admins: ``docs/ops/README.rst``
-* Developers: ``docs/dev/README.rst``
+* Operators/Admins: `<docs/source/ops/README.rst>`_
+* Developers: `<docs/source/dev/README.rst>`_
 
 The documentation can be built using this command::
 
diff --git a/docs/source/conf.py b/docs/source/conf.py
index 36b62a34aae4ecea544e5f0527c85809106057a8..66aa921e2ba799e1b1b4d8e7a778ab07ee07a73b 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -86,7 +86,6 @@ html_theme_options = {
     'logo': 'logo-ps.svg',
     'description': "&nbsp;", # ugly hack to get some white space below the logo
     'fixed_sidebar': True,
-    'extra_nav_links': {"Fork me on GitHub": "https://github.com/PrivateStorageio/PrivateStorageio"},
 }
 
 # Add any paths that contain custom static files (such as style sheets) here,
diff --git a/docs/source/dev/README.rst b/docs/source/dev/README.rst
index 904e8b3be07bdcc1473a3c1fe22afe8ffb0e15a2..3722ebd03b10bacaf459820d1f59bc7ccb07396b 100644
--- a/docs/source/dev/README.rst
+++ b/docs/source/dev/README.rst
@@ -28,7 +28,7 @@ The system tests boot QEMU VMs which prevents them from running on CI at this ti
 The build requires > 10 GB of disk space,
 and the VMs might be timing out on slow or busy machines.
 If you run into timeouts,
-try `raising the number of retries <https://github.com/PrivateStorageio/PrivateStorageio/blob/e8233d2/nixos/modules/tests/run-introducer.py#L55-L62>`_.
+try `raising the number of retries <https://whetstone.privatestorage.io/privatestorage/PrivateStorageio/-/blob/e8233d2/nixos/modules/tests/run-introducer.py#L55-62>`_.
 
 It is also possible go through the testing script interactively - useful for debugging::
 
@@ -36,7 +36,7 @@ It is also possible go through the testing script interactively - useful for deb
 
 This will give you a result symlink in the current directory.
 Inside that is bin/nixos-test-driver which gives you a kind of REPL for interacting with the VMs.
-The kind of `Perl in this testScript <https://github.com/PrivateStorageio/PrivateStorageio/blob/78881a3/nixos/modules/tests/private-storage.nix#L180>`_ is what you can enter into this REPL.
+The kind of `Python in this testScript <https://whetstone.privatestorage.io/privatestorage/PrivateStorageio/-/blob/78881a3/nixos/modules/tests/private-storage.nix#L180>`_ is what you can enter into this REPL.
 Consult the `official documentation on NixOS Tests <https://nixos.org/manual/nixos/stable/index.html#sec-nixos-tests>`_ for more information.
 
 Architecture overview
@@ -48,8 +48,5 @@ Architecture overview
 .. include::
       ../../../morph/grid/local/README.rst
 
-
-
-
 .. _Nix: https://nixos.org/nix
 
diff --git a/nixos/modules/tests/private-storage.nix b/nixos/modules/tests/private-storage.nix
index 0d5fc75b64f56f6d6856cca9e5be007a79bd5312..55d28bbfab525990898ce59b41fd1a739141fee9 100644
--- a/nixos/modules/tests/private-storage.nix
+++ b/nixos/modules/tests/private-storage.nix
@@ -14,7 +14,7 @@ let
     "ssh" "-oStrictHostKeyChecking=no" "-i" "/tmp/ssh_key" "${username}@${hostname}" ":"
   ];
 
-  # Separate helper programs so we can write as little perl inside a string
+  # Separate helper programs so we can write as little python inside a string
   # inside a nix expression as possible.
   run-introducer = ./run-introducer.py;
   run-client = ./run-client.py;
@@ -72,11 +72,11 @@ let
     networking.dhcpcd.enable = false;
   };
 
-  # Return a Perl program fragment to run a shell command on one of the nodes.
+  # Return a python program fragment to run a shell command on one of the nodes.
   # The first argument is the name of the node.  The second is a list of the
   # argv to run.
   #
-  # The program's output is piped to systemd-cat and the Perl fragment
+  # The program's output is piped to systemd-cat and the python fragment
   # evaluates to success if the command exits with a success status.
   runOnNode = node: argv:
     let