diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
new file mode 100644
index 000000000..7c356e7a1
--- /dev/null
+++ b/.github/workflows/docs.yml
@@ -0,0 +1,31 @@
+name: Docs
+
+# Docs build check is defined once, centrally, in PyAutoHeart's reusable
+# workflow (Heart owns all health/readiness checking). This thin caller
+# builds the Sphinx docs on PRs and fails on warning-count regression
+# against docs/sphinx_warning_baseline.txt.
+
+on:
+  push:
+    branches: [main]
+    paths:
+      - "docs/**"
+      - "autofit/**"
+      - "pyproject.toml"
+      - ".readthedocs.yaml"
+      - ".github/workflows/docs.yml"
+  pull_request:
+    paths:
+      - "docs/**"
+      - "autofit/**"
+      - "pyproject.toml"
+      - ".readthedocs.yaml"
+      - ".github/workflows/docs.yml"
+  workflow_dispatch:
+
+jobs:
+  docs:
+    uses: PyAutoLabs/PyAutoHeart/.github/workflows/docs-build.yml@main
+    with:
+      package: autofit
+    secrets: inherit
diff --git a/.gitignore b/.gitignore
index 31493376d..77e0b0f33 100644
--- a/.gitignore
+++ b/.gitignore
@@ -295,3 +295,4 @@ test_autofit/output/non_linear/dynesty/dynesty_static[nlive_150__bound_multi_vol
 
 test_autofit/tools/files/aggregator/phase/
 test_autofit/tools/files/aggregator/phase_completed/
+docs/api/_autosummary
diff --git a/docs/conf.py b/docs/conf.py
index 8321da9a7..9932e28a1 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -43,6 +43,7 @@
     "sphinx.ext.napoleon",
     "sphinx.ext.viewcode",
     "numpydoc",
+    "sphinx_autodoc_typehints",
     # External stuff
     "myst_parser",
     "sphinx_copybutton",
@@ -51,6 +52,9 @@
 ]
 templates_path = ["_templates"]
 
+set_type_checking_flag = True  # Enable 'expensive' imports for sphinx_autodoc_typehints
+add_module_names = False  # Remove namespaces from class/method signatures
+
 # -- Options for extlinks ----------------------------------------------------
 
 extlinks = {
@@ -78,14 +82,19 @@
 myst_heading_anchors = 3
 
 autosummary_generate = True
+autosummary_imported_members = True
 autodoc_member_order = "bysource"
-autodoc_default_flags = ["members"]
-
-autoclass_content = "both"
+autodoc_default_options = {
+    "members": True,
+    "undoc-members": True,
+    "show-inheritance": True,
+}
+autodoc_class_signature = "separated"
+autoclass_content = "init"
 
 numpydoc_show_class_members = False
 numpydoc_show_inherited_class_members = False
-numpydoc_class_members_toctree = False
+numpydoc_class_members_toctree = True
 
 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.
@@ -109,18 +118,12 @@
 # pygments_dark_style = "monokai"
 add_function_parentheses = False
 
-html_context = {
-    "menu_links_name": "Repository",
-    "doc_path": "docs",
-    "github_project": "pyautofit",
-    "github_repo": "pyautofit",
-    "github_version": "master",
-}
 language = "en"
 
-html_static_path = ["_static"]
-html_css_files = ["pied-piper-admonition.css"]
-
 from sphinx.builders.html import StandaloneHTMLBuilder
 
 StandaloneHTMLBuilder.supported_image_types = ["image/gif", "image/png", "image/jpeg"]
+
+typehints_fully_qualified = False
+always_document_param_types = False
+typehints_document_rtype = False
diff --git a/docs/requirements.txt b/docs/requirements.txt
deleted file mode 100644
index 3feeb5ffe..000000000
--- a/docs/requirements.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-anesthetic==2.8.1
-corner==2.2.1
-decorator>=4.2.1
-dill>=0.3.1.1
-dynesty==2.1.2
-typing-inspect>=0.4.0
-emcee>=3.0.2
-gprof2dot==2021.2.21
-matplotlib
-networkx
-numpydoc>=1.0.0
-
-h5py>=2.10.0
-SQLAlchemy==1.3.20
-scipy>=1.5.1
-astunparse==1.6.3
-threadpoolctl>=3.1.0,<=3.2.0
-autoconf
-timeout-decorator==0.5.0
-sphinx
-xxhash<=3.4.1
-pyvis==0.3.2
-furo
-myst-parser
-sphinx_copybutton
-sphinx_design
-sphinx_inline_tabs
\ No newline at end of file
diff --git a/docs/sphinx_warning_baseline.txt b/docs/sphinx_warning_baseline.txt
new file mode 100644
index 000000000..3fdcd7c44
--- /dev/null
+++ b/docs/sphinx_warning_baseline.txt
@@ -0,0 +1 @@
+67
diff --git a/readthedocs.yml b/readthedocs.yml
deleted file mode 100644
index 2c9c24e6d..000000000
--- a/readthedocs.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-version: 2
-
-build:
-  os: ubuntu-22.04
-  tools:
-    python: "3.11"
-
-python:
-  install:
-    - method: pip
-      path: .
-      extra_requirements:
-        - docs
-
-sphinx:
-  configuration: docs/conf.py
\ No newline at end of file