diff --git a/doc_src/cmds/type.rst b/doc_src/cmds/type.rst
index aaf966dac..a7f8cdb37 100644
--- a/doc_src/cmds/type.rst
+++ b/doc_src/cmds/type.rst
@@ -23,9 +23,9 @@ The following options are available:
 
 - ``-t`` or ``--type`` prints ``function``, ``builtin``, or ``file`` if ``NAME`` is a shell function, builtin, or disk file, respectively.
 
-- ``-p`` or ``--path`` prints the path to ``NAME`` if ``NAME`` resolves to an executable file in $:envvar:`PATH`, the path to the script containing the definition of the function ``NAME`` if ``NAME`` resolves to a function loaded from a file on disk (i.e. not interactively defined at the prompt), or nothing otherwise.
+- ``-p`` or ``--path`` prints the path to ``NAME`` if ``NAME`` resolves to an executable file in :envvar:`PATH`, the path to the script containing the definition of the function ``NAME`` if ``NAME`` resolves to a function loaded from a file on disk (i.e. not interactively defined at the prompt), or nothing otherwise.
 
-- ``-P`` or ``--force-path`` returns the path to the executable file ``NAME``, presuming ``NAME`` is found in the $:envvar:`PATH` environment variable, or nothing otherwise. ``--force-path`` explicitly resolves only the path to executable files in  :envvar:`PATH`, regardless of whether ``$NAME`` is shadowed by a function or builtin with the same name.
+- ``-P`` or ``--force-path`` returns the path to the executable file ``NAME``, presuming ``NAME`` is found in the :envvar:`PATH` environment variable, or nothing otherwise. ``--force-path`` explicitly resolves only the path to executable files in  :envvar:`PATH`, regardless of whether ``$NAME`` is shadowed by a function or builtin with the same name.
 
 - ``-q`` or ``--query`` suppresses all output; this is useful when testing the exit status. For compatibility with old fish versions this is also ``--quiet``.
 
diff --git a/doc_src/language.rst b/doc_src/language.rst
index 86d646aec..d85e90c70 100644
--- a/doc_src/language.rst
+++ b/doc_src/language.rst
@@ -1,4 +1,5 @@
-.. _language:
+
+f.. _language:
 
 The fish language
 =================
@@ -743,7 +744,7 @@ This can be quite useful. For example, if you want to go through all the files i
 
     for file in $PATH/*
 
-Because :envvar:`PATH` is a list, this expands to all the files in all the directories in it. And if there are no directories in $:envvar:`PATH`, the right answer here is to expand to no files.
+Because :envvar:`PATH` is a list, this expands to all the files in all the directories in it. And if there are no directories in :envvar:`PATH`, the right answer here is to expand to no files.
 
 .. _expand-index-range:
 
@@ -1157,7 +1158,7 @@ When a list is exported as an environment variable, it is either space or colon
     smurf=blue small
     smurf_PATH=forest:mushroom
 
-Fish automatically creates lists from all environment variables whose name ends in ``PATH`` (like $:envvar:`PATH`, $:envvar:`CDPATH` or $:envvar:`MANPATH`), by splitting them on colons. Other variables are not automatically split.
+Fish automatically creates lists from all environment variables whose name ends in ``PATH`` (like :envvar:`PATH`, :envvar:`CDPATH` or :envvar:`MANPATH`), by splitting them on colons. Other variables are not automatically split.
 
 Lists can be inspected with the :ref:`count <cmd-count>` or the :ref:`contains <cmd-contains>` commands::
 
diff --git a/doc_src/python_docs_theme/static/pydoctheme.css b/doc_src/python_docs_theme/static/pydoctheme.css
index 61526b590..05cf885d2 100644
--- a/doc_src/python_docs_theme/static/pydoctheme.css
+++ b/doc_src/python_docs_theme/static/pydoctheme.css
@@ -374,6 +374,12 @@ kbd {
   padding: 0.1em 0.3em;
 }
 
+.internal.reference:link {
+    text-decoration: underline;
+}
+.std-envvar::before {
+    content: "$";
+}
 .footnote, .footnote-reference {
     background-color: #ddddea;
     font-size: 90%;