@@ -1,2 +1,3 @@
-sphinx==1.5.6
-sphinx_rtd_theme
+sphinx==1.6.1
+git+https://github.com/python/python-docs-theme.git#egg=python-docs-theme
+git+https://github.com/pypa/pypa-docs-theme.git#egg=pypa-docs-theme
@@ -5,7 +5,7 @@
   appveyor.html#support-script, appveyor.html#support-scripts, appveyor.html#supporting-windows-using-appveyor,
   appveyor.html#testing-with-tox, contribute.html, contribute.html#audience, contribute.html#contribute-to-this-guide,
   contribute.html#contributing-style-guide, contribute.html#conventions-and-mechanics,
-  contribute.html#purpose, contribute.html#rtd-search-form, contribute.html#scope,
+  contribute.html#purpose, contribute.html#scope,
   contribute.html#style-guide, contribute.html#voice-and-tone, current.html, current.html#installation-tool-recommendations,
   current.html#packaging-tool-recommendations, current.html#tool-recommendations,
   deployment.html, deployment.html#application-bundles, deployment.html#application-deployment,
@@ -15,15 +15,14 @@
   discussions/deploying-python-applications.html#configuration-management, discussions/deploying-python-applications.html#contents,
   discussions/deploying-python-applications.html#deploying-python-applications, discussions/deploying-python-applications.html#os-packaging-installers,
   discussions/deploying-python-applications.html#overview, discussions/deploying-python-applications.html#pynsist,
-  discussions/deploying-python-applications.html#rtd-search-form, discussions/deploying-python-applications.html#supporting-multiple-hardware-platforms,
+  discussions/deploying-python-applications.html#supporting-multiple-hardware-platforms,
   discussions/deploying-python-applications.html#windows, discussions/index.html,
-  discussions/index.html#discussions, discussions/index.html#rtd-search-form, discussions/install-requires-vs-requirements.html,
+  discussions/index.html#discussions, discussions/install-requires-vs-requirements.html,
   discussions/install-requires-vs-requirements.html#contents, discussions/install-requires-vs-requirements.html#install-requires,
   discussions/install-requires-vs-requirements.html#install-requires-vs-requirements-files,
-  discussions/install-requires-vs-requirements.html#requirements-files, discussions/install-requires-vs-requirements.html#rtd-search-form,
+  discussions/install-requires-vs-requirements.html#requirements-files,
   discussions/pip-vs-easy-install.html, discussions/pip-vs-easy-install.html#pip-vs-easy-install,
-  discussions/pip-vs-easy-install.html#rtd-search-form, discussions/wheel-vs-egg.html,
-  discussions/wheel-vs-egg.html#rtd-search-form, discussions/wheel-vs-egg.html#wheel-vs-egg,
+  discussions/wheel-vs-egg.html, discussions/wheel-vs-egg.html#wheel-vs-egg,
   distributing.html, distributing.html#author, distributing.html#choosing-a-versioning-scheme,
   distributing.html#classifiers, distributing.html#configuring-your-project, distributing.html#console-scripts,
   distributing.html#contents, distributing.html#create-an-account, distributing.html#data-files,
@@ -46,7 +45,7 @@
   extensions.html#building-binary-extensions, extensions.html#contents, extensions.html#disadvantages,
   extensions.html#implementing-binary-extensions, extensions.html#publishing-binary-extensions,
   extensions.html#setting-up-a-build-environment-on-windows, extensions.html#use-cases,
-  glossary.html, glossary.html#glossary, glossary.html#rtd-search-form, glossary.html#term-binary-distribution,
+  glossary.html, glossary.html#glossary, glossary.html#term-binary-distribution,
   glossary.html#term-built-distribution, glossary.html#term-distribution-package,
   glossary.html#term-egg, glossary.html#term-extension-module, glossary.html#term-import-package,
   glossary.html#term-known-good-set-kgs, glossary.html#term-module, glossary.html#term-package-index,
@@ -57,59 +56,59 @@
   glossary.html#term-source-distribution-or-sdist, glossary.html#term-system-package,
   glossary.html#term-version-specifier, glossary.html#term-virtual-environment, glossary.html#term-wheel,
   glossary.html#term-working-set, guides/creating-and-discovering-plugins.html, guides/creating-and-discovering-plugins.html#creating-and-discovering-plugins,
-  guides/creating-and-discovering-plugins.html#rtd-search-form, guides/creating-and-discovering-plugins.html#using-namespace-packages,
+  guides/creating-and-discovering-plugins.html#using-namespace-packages,
   guides/creating-and-discovering-plugins.html#using-naming-convention, guides/creating-and-discovering-plugins.html#using-package-metadata,
   guides/hosting-your-own-index.html, guides/hosting-your-own-index.html#hosting-your-own-simple-repository,
-  guides/hosting-your-own-index.html#manual-repository, guides/hosting-your-own-index.html#rtd-search-form,
+  guides/hosting-your-own-index.html#manual-repository,
   guides/index-mirrors-and-caches.html, guides/index-mirrors-and-caches.html#caching-with-devpi,
   guides/index-mirrors-and-caches.html#caching-with-pip, guides/index-mirrors-and-caches.html#complete-mirror-with-bandersnatch,
   guides/index-mirrors-and-caches.html#contents, guides/index-mirrors-and-caches.html#package-index-mirrors-and-caches,
-  guides/index-mirrors-and-caches.html#pypi-mirrors-and-caches, guides/index-mirrors-and-caches.html#rtd-search-form,
-  guides/index.html, guides/index.html#guides, guides/index.html#rtd-search-form,
+  guides/index-mirrors-and-caches.html#pypi-mirrors-and-caches,
+  guides/index.html, guides/index.html#guides,
   guides/installing-scientific-packages.html, guides/installing-scientific-packages.html#building-from-source,
   guides/installing-scientific-packages.html#contents, guides/installing-scientific-packages.html#installing-scientific-packages,
   guides/installing-scientific-packages.html#linux-distribution-packages, guides/installing-scientific-packages.html#mac-os-x-installers-and-package-managers,
-  guides/installing-scientific-packages.html#numpy-and-the-science-stack, guides/installing-scientific-packages.html#rtd-search-form,
+  guides/installing-scientific-packages.html#numpy-and-the-science-stack,
   guides/installing-scientific-packages.html#scipy-distributions, guides/installing-scientific-packages.html#spack,
   guides/installing-scientific-packages.html#the-conda-cross-platform-package-manager,
   guides/installing-scientific-packages.html#windows-installers, guides/installing-using-linux-tools.html,
   guides/installing-using-linux-tools.html#arch-linux, guides/installing-using-linux-tools.html#centos-rhel,
   guides/installing-using-linux-tools.html#debian-ubuntu, guides/installing-using-linux-tools.html#fedora,
   guides/installing-using-linux-tools.html#installing-pip-setuptools-wheel-with-linux-package-managers,
-  guides/installing-using-linux-tools.html#opensuse, guides/installing-using-linux-tools.html#rtd-search-form,
+  guides/installing-using-linux-tools.html#opensuse,
   guides/multi-version-installs.html, guides/multi-version-installs.html#multi-version-installs,
-  guides/multi-version-installs.html#rtd-search-form, guides/packaging-binary-extensions.html,
+  guides/packaging-binary-extensions.html,
   guides/packaging-binary-extensions.html#alternatives-for-low-level-system-access,
   guides/packaging-binary-extensions.html#alternatives-to-handcoded-accelerator-modules,
   guides/packaging-binary-extensions.html#alternatives-to-handcoded-wrapper-modules,
   guides/packaging-binary-extensions.html#an-overview-of-binary-extensions, guides/packaging-binary-extensions.html#binary-extensions,
   guides/packaging-binary-extensions.html#building-binary-extensions, guides/packaging-binary-extensions.html#contents,
   guides/packaging-binary-extensions.html#disadvantages, guides/packaging-binary-extensions.html#implementing-binary-extensions,
   guides/packaging-binary-extensions.html#packaging-binary-extensions, guides/packaging-binary-extensions.html#publishing-binary-extensions,
-  guides/packaging-binary-extensions.html#rtd-search-form, guides/packaging-binary-extensions.html#setting-up-a-build-environment-on-windows,
+  guides/packaging-binary-extensions.html#setting-up-a-build-environment-on-windows,
   guides/packaging-binary-extensions.html#use-cases, guides/packaging-namespace-packages.html,
   guides/packaging-namespace-packages.html#creating-a-namespace-package, guides/packaging-namespace-packages.html#native-namespace-packages,
   guides/packaging-namespace-packages.html#packaging-namespace-packages, guides/packaging-namespace-packages.html#pkg-resources-style-namespace-packages,
-  guides/packaging-namespace-packages.html#pkgutil-style-namespace-packages, guides/packaging-namespace-packages.html#rtd-search-form,
-  guides/single-sourcing-package-version.html, guides/single-sourcing-package-version.html#rtd-search-form,
+  guides/packaging-namespace-packages.html#pkgutil-style-namespace-packages,
+  guides/single-sourcing-package-version.html,
   guides/single-sourcing-package-version.html#single-sourcing-the-package-version,
   guides/single-sourcing-package-version.html#single-sourcing-the-version, guides/supporting-multiple-python-versions.html,
   guides/supporting-multiple-python-versions.html#automated-testing-and-continuous-integration,
-  guides/supporting-multiple-python-versions.html#contents, guides/supporting-multiple-python-versions.html#rtd-search-form,
+  guides/supporting-multiple-python-versions.html#contents,
   guides/supporting-multiple-python-versions.html#supporting-multiple-python-versions,
   guides/supporting-multiple-python-versions.html#tools-for-single-source-python-packages,
   guides/supporting-multiple-python-versions.html#what-s-in-which-python, guides/supporting-windows-using-appveyor.html,
   guides/supporting-windows-using-appveyor.html#access-to-the-built-wheels, guides/supporting-windows-using-appveyor.html#adding-appveyor-support-to-your-project,
   guides/supporting-windows-using-appveyor.html#additional-notes, guides/supporting-windows-using-appveyor.html#appveyor-yml,
   guides/supporting-windows-using-appveyor.html#automatically-uploading-wheels, guides/supporting-windows-using-appveyor.html#background,
   guides/supporting-windows-using-appveyor.html#contents, guides/supporting-windows-using-appveyor.html#external-dependencies,
-  guides/supporting-windows-using-appveyor.html#rtd-search-form, guides/supporting-windows-using-appveyor.html#setting-up,
+  guides/supporting-windows-using-appveyor.html#setting-up,
   guides/supporting-windows-using-appveyor.html#support-script, guides/supporting-windows-using-appveyor.html#support-scripts,
   guides/supporting-windows-using-appveyor.html#supporting-windows-using-appveyor,
   guides/supporting-windows-using-appveyor.html#testing-with-tox, guides/tool-recommendations.html,
   guides/tool-recommendations.html#installation-tool-recommendations, guides/tool-recommendations.html#packaging-tool-recommendations,
-  guides/tool-recommendations.html#rtd-search-form, guides/tool-recommendations.html#tool-recommendations,
-  index.html, index.html#python-packaging-user-guide, index.html#rtd-search-form,
+  guides/tool-recommendations.html#tool-recommendations,
+  index.html, index.html#python-packaging-user-guide,
   install_requirements_linux.html, install_requirements_linux.html#arch-linux, install_requirements_linux.html#centos-rhel,
   install_requirements_linux.html#debian-ubuntu, install_requirements_linux.html#fedora,
   install_requirements_linux.html#installing-pip-setuptools-wheel-with-linux-package-managers,
@@ -129,7 +128,7 @@
   key_projects.html#ensurepip, key_projects.html#hashdist, key_projects.html#non-pypa-projects,
   key_projects.html#packaging, key_projects.html#pex, key_projects.html#pip, key_projects.html#project-summaries,
   key_projects.html#projects, key_projects.html#pypa-projects, key_projects.html#python-packaging-user-guide,
-  key_projects.html#rtd-search-form, key_projects.html#setuptools, key_projects.html#spack,
+  key_projects.html#setuptools, key_projects.html#spack,
   key_projects.html#standard-library-projects, key_projects.html#twine, key_projects.html#venv,
   key_projects.html#virtualenv, key_projects.html#warehouse, key_projects.html#wheel,
   mirrors.html, mirrors.html#caching-with-devpi, mirrors.html#caching-with-pip, mirrors.html#complete-mirror-with-bandersnatch,
@@ -165,10 +164,10 @@
   specifications/index.html#description-content-type, specifications/index.html#package-distribution-metadata,
   specifications/index.html#package-index-interfaces, specifications/index.html#platform-compatibility-tags,
   specifications/index.html#provides-extra-multiple-use, specifications/index.html#pypa-specifications,
-  specifications/index.html#recording-installed-distributions, specifications/index.html#rtd-search-form,
+  specifications/index.html#recording-installed-distributions,
   specifications/index.html#simple-repository-api, specifications/index.html#source-distribution-format,
   specifications/index.html#specifications, specifications/index.html#version-specifiers,
-  support.html, support.html#how-to-get-support, support.html#rtd-search-form, tutorial.html,
+  support.html, support.html#how-to-get-support, tutorial.html,
   tutorials/distributing-packages.html, tutorials/distributing-packages.html#author,
   tutorials/distributing-packages.html#choosing-a-versioning-scheme, tutorials/distributing-packages.html#classifiers,
   tutorials/distributing-packages.html#configuring-your-project, tutorials/distributing-packages.html#console-scripts,
@@ -184,7 +183,7 @@
   tutorials/distributing-packages.html#platform-wheels, tutorials/distributing-packages.html#pre-release-versioning,
   tutorials/distributing-packages.html#pure-python-wheels, tutorials/distributing-packages.html#readme-rst,
   tutorials/distributing-packages.html#requirements-for-packaging-and-distributing,
-  tutorials/distributing-packages.html#rtd-search-form, tutorials/distributing-packages.html#scheme-choices,
+  tutorials/distributing-packages.html#scheme-choices,
   tutorials/distributing-packages.html#scripts, tutorials/distributing-packages.html#semantic-versioning-preferred,
   tutorials/distributing-packages.html#serial-versioning, tutorials/distributing-packages.html#setup-args,
   tutorials/distributing-packages.html#setup-cfg, tutorials/distributing-packages.html#setup-name,
@@ -194,7 +193,7 @@
   tutorials/distributing-packages.html#uploading-your-project-to-pypi, tutorials/distributing-packages.html#url,
   tutorials/distributing-packages.html#version, tutorials/distributing-packages.html#wheels,
   tutorials/distributing-packages.html#working-in-development-mode, tutorials/distributing-packages.html#your-package,
-  tutorials/index.html, tutorials/index.html#rtd-search-form, tutorials/index.html#tutorials,
+  tutorials/index.html, tutorials/index.html#tutorials,
   tutorials/installing-packages.html, tutorials/installing-packages.html#contents,
   tutorials/installing-packages.html#creating-and-using-virtual-environments, tutorials/installing-packages.html#creating-virtual-environments,
   tutorials/installing-packages.html#install-pip-setuptools-and-wheel, tutorials/installing-packages.html#installing-from-a-local-src-tree,
@@ -204,6 +203,6 @@
   tutorials/installing-packages.html#installing-prereleases, tutorials/installing-packages.html#installing-requirements,
   tutorials/installing-packages.html#installing-setuptools-extras, tutorials/installing-packages.html#installing-to-the-user-site,
   tutorials/installing-packages.html#optionally-create-a-virtual-environment, tutorials/installing-packages.html#requirements-files,
-  tutorials/installing-packages.html#requirements-for-installing-packages, tutorials/installing-packages.html#rtd-search-form,
+  tutorials/installing-packages.html#requirements-for-installing-packages,
   tutorials/installing-packages.html#source-distributions-vs-wheels, tutorials/installing-packages.html#upgrading-packages,
   tutorials/installing-packages.html#use-pip-for-installing, wheel_egg.html, wheel_egg.html#wheel-vs-egg]
@@ -38,7 +38,7 @@ def find_all_named_anchors(filename):
             if anchor.startswith('index-'):
                 continue
             # Ignore searchbox anchors
-            if anchor == 'searchbox':
+            if anchor in ('searchbox', 'rtd-search-form'):
                 continue
 
             href = '{}#{}'.format(filename, anchor)