diff --git a/.github/workflows/docs_test_action.yml b/.github/workflows/docs_test_action.yml
index 331606e..81c4025 100644
--- a/.github/workflows/docs_test_action.yml
+++ b/.github/workflows/docs_test_action.yml
@@ -29,7 +29,7 @@ jobs:
               - '!tests/**'
 
       - name: Install and Build 🔧
-        uses: sphinx-toolbox/sphinx-action@sphinx-3.3.1
+        uses: sphinx-toolbox/sphinx-action@sphinx-3.3.1-py39
         if: steps.changes.outputs.code == 'true'
         with:
           pre-build-command: python -m pip install tox
diff --git a/.github/workflows/flake8.yml b/.github/workflows/flake8.yml
index 0a8c0c3..5e67c5c 100644
--- a/.github/workflows/flake8.yml
+++ b/.github/workflows/flake8.yml
@@ -16,7 +16,7 @@ permissions:
 jobs:
   Run:
     name: "Flake8"
-    runs-on: "ubuntu-20.04"
+    runs-on: "ubuntu-22.04"
 
     steps:
       - name: Checkout 🛎️
@@ -35,7 +35,7 @@ jobs:
         if: steps.changes.outputs.code == 'true'
         uses: "actions/setup-python@v5"
         with:
-          python-version: "3.8"
+          python-version: "3.9"
 
       - name: Install dependencies 🔧
         if: steps.changes.outputs.code == 'true'
diff --git a/.github/workflows/mypy.yml b/.github/workflows/mypy.yml
index 10c6f30..4c22a52 100644
--- a/.github/workflows/mypy.yml
+++ b/.github/workflows/mypy.yml
@@ -20,7 +20,7 @@ jobs:
 
     strategy:
       matrix:
-        os: ['ubuntu-20.04', 'windows-2019']
+        os: ['ubuntu-22.04', 'windows-2022']
       fail-fast: false
 
     steps:
@@ -40,7 +40,7 @@ jobs:
         if: steps.changes.outputs.code == 'true'
         uses: "actions/setup-python@v5"
         with:
-          python-version: "3.8"
+          python-version: "3.9"
 
       - name: Install dependencies 🔧
         run: |
diff --git a/.github/workflows/python_ci.yml b/.github/workflows/python_ci.yml
index 9bf82cb..6a4a193 100644
--- a/.github/workflows/python_ci.yml
+++ b/.github/workflows/python_ci.yml
@@ -18,8 +18,8 @@ permissions:
 
 jobs:
   tests:
-    name: "windows-2019 / Python ${{ matrix.config.python-version }}"
-    runs-on: "windows-2019"
+    name: "windows-2022 / Python ${{ matrix.config.python-version }}"
+    runs-on: "windows-2022"
     continue-on-error: ${{ matrix.config.experimental }}
     env:
       USING_COVERAGE: '3.8,3.9,3.10,3.11,3.12,3.13'
@@ -33,7 +33,7 @@ jobs:
           - {python-version: "3.10", testenvs: "py310,build", experimental: False}
           - {python-version: "3.11", testenvs: "py311,build", experimental: False}
           - {python-version: "3.12", testenvs: "py312,build", experimental: False}
-          - {python-version: "3.13", testenvs: "py313-dev,build", experimental: True}
+          - {python-version: "3.13", testenvs: "py313,build", experimental: False}
 
     steps:
       - name: Checkout 🛎️
@@ -74,3 +74,4 @@ jobs:
         with:
           name: "coverage-${{ matrix.config.python-version }}"
           path: .coverage
+          include-hidden-files: true
diff --git a/.github/workflows/python_ci_linux.yml b/.github/workflows/python_ci_linux.yml
index 39c0bb1..eb9006f 100644
--- a/.github/workflows/python_ci_linux.yml
+++ b/.github/workflows/python_ci_linux.yml
@@ -19,8 +19,8 @@ permissions:
 
 jobs:
   tests:
-    name: "ubuntu-20.04 / Python ${{ matrix.config.python-version }}"
-    runs-on: "ubuntu-20.04"
+    name: "ubuntu-22.04 / Python ${{ matrix.config.python-version }}"
+    runs-on: "ubuntu-22.04"
     continue-on-error: ${{ matrix.config.experimental }}
     env:
       USING_COVERAGE: '3.8,3.9,3.10,3.11,3.12,3.13'
@@ -34,7 +34,7 @@ jobs:
           - {python-version: "3.10", testenvs: "py310,build", experimental: False}
           - {python-version: "3.11", testenvs: "py311,build", experimental: False}
           - {python-version: "3.12", testenvs: "py312,build", experimental: False}
-          - {python-version: "3.13", testenvs: "py313-dev,build", experimental: True}
+          - {python-version: "3.13", testenvs: "py313,build", experimental: False}
 
     steps:
       - name: Checkout 🛎️
@@ -76,11 +76,12 @@ jobs:
         with:
           name: "coverage-${{ matrix.config.python-version }}"
           path: .coverage
+          include-hidden-files: true
 
 
   Coverage:
     needs: tests
-    runs-on: "ubuntu-20.04"
+    runs-on: "ubuntu-22.04"
     steps:
       - name: Checkout 🛎️
         uses: "actions/checkout@v4"
@@ -118,6 +119,7 @@ jobs:
         with:
           name: "combined-coverage"
           path: .coverage
+          include-hidden-files: true
 
       - name: "Upload Combined Coverage to Coveralls"
         if: ${{ steps.show.outcome != 'failure' }}
diff --git a/.github/workflows/python_ci_macos.yml b/.github/workflows/python_ci_macos.yml
index 982bdb0..387c6b2 100644
--- a/.github/workflows/python_ci_macos.yml
+++ b/.github/workflows/python_ci_macos.yml
@@ -18,8 +18,8 @@ permissions:
 
 jobs:
   tests:
-    name: "macos-13 / Python ${{ matrix.config.python-version }}"
-    runs-on: "macos-13"
+    name: "macos-${{ matrix.config.os-ver }} / Python ${{ matrix.config.python-version }}"
+    runs-on: "macos-${{ matrix.config.os-ver }}"
     continue-on-error: ${{ matrix.config.experimental }}
     env:
       USING_COVERAGE: '3.8,3.9,3.10,3.11,3.12,3.13'
@@ -28,12 +28,12 @@ jobs:
       fail-fast: False
       matrix:
         config:
-          - {python-version: "3.8", testenvs: "py38,build", experimental: False}
-          - {python-version: "3.9", testenvs: "py39,build", experimental: False}
-          - {python-version: "3.10", testenvs: "py310,build", experimental: False}
-          - {python-version: "3.11", testenvs: "py311,build", experimental: False}
-          - {python-version: "3.12", testenvs: "py312,build", experimental: False}
-          - {python-version: "3.13", testenvs: "py313-dev,build", experimental: True}
+          - {python-version: "3.8", os-ver: "14", testenvs: "py38,build", experimental: False}
+          - {python-version: "3.9", os-ver: "14", testenvs: "py39,build", experimental: False}
+          - {python-version: "3.10", os-ver: "14", testenvs: "py310,build", experimental: False}
+          - {python-version: "3.11", os-ver: "14", testenvs: "py311,build", experimental: False}
+          - {python-version: "3.12", os-ver: "14", testenvs: "py312,build", experimental: False}
+          - {python-version: "3.13", os-ver: "14", testenvs: "py313,build", experimental: False}
 
     steps:
       - name: Checkout 🛎️
@@ -74,3 +74,4 @@ jobs:
         with:
           name: "coverage-${{ matrix.config.python-version }}"
           path: .coverage
+          include-hidden-files: true
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 83c084a..c4895df 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -8,7 +8,7 @@ ci:
 
 repos:
  - repo: https://github.com/repo-helper/pyproject-parser
-   rev: v0.11.1
+   rev: v0.13.0
    hooks:
     - id: reformat-pyproject
 
@@ -62,11 +62,11 @@ repos:
     - id: rst-inline-touching-normal
 
  - repo: https://github.com/asottile/pyupgrade
-   rev: v2.12.0
+   rev: v3.3.0
    hooks:
     - id: pyupgrade
       args:
-       - --py36-plus
+       - --py38-plus
        - --keep-runtime-typing
 
  - repo: https://github.com/Lucas-C/pre-commit-hooks
@@ -81,7 +81,7 @@ repos:
     - id: snippet-fmt
 
  - repo: https://github.com/python-formate/formate
-   rev: v0.7.0
+   rev: v0.8.0
    hooks:
     - id: formate
       exclude: ^(doc-source/conf|__pkginfo__|setup)\.(_)?py$
diff --git a/.readthedocs.yml b/.readthedocs.yml
index e928b70..83fc025 100644
--- a/.readthedocs.yml
+++ b/.readthedocs.yml
@@ -13,7 +13,7 @@ python:
    - requirements: requirements.txt
    - requirements: doc-source/requirements.txt
 build:
-  os: ubuntu-20.04
+  os: ubuntu-22.04
   tools:
     python: '3.9'
   jobs:
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index d1650c1..ca2988d 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -38,11 +38,11 @@ Automated tests
 -------------------
 
 Tests are run with ``tox`` and ``pytest``.
-To run tests for a specific Python version, such as Python 3.6:
+To run tests for a specific Python version, such as Python 3.10:
 
 .. code-block:: bash
 
-	$ tox -e py36
+	$ tox -e py310
 
 
 To run tests for all Python versions, simply run:
diff --git a/README.rst b/README.rst
index 2152736..fbdb4d2 100644
--- a/README.rst
+++ b/README.rst
@@ -81,7 +81,7 @@ esp-parser
 	:target: https://github.com/domdfmodding/esp-parser/commit/master
 	:alt: GitHub last commit
 
-.. |maintained| image:: https://img.shields.io/maintenance/yes/2024
+.. |maintained| image:: https://img.shields.io/maintenance/yes/2025
 	:alt: Maintenance
 
 .. end shields
diff --git a/doc-source/contributing.rst b/doc-source/contributing.rst
index 8e070f2..fced690 100644
--- a/doc-source/contributing.rst
+++ b/doc-source/contributing.rst
@@ -38,11 +38,11 @@ Automated tests
 -------------------
 
 Tests are run with ``tox`` and ``pytest``.
-To run tests for a specific Python version, such as Python 3.6:
+To run tests for a specific Python version, such as Python 3.10:
 
 .. prompt:: bash
 
-	tox -e py36
+	tox -e py310
 
 
 To run tests for all Python versions, simply run:
diff --git a/doc-source/index.rst b/doc-source/index.rst
index 736c4e8..250b2e0 100644
--- a/doc-source/index.rst
+++ b/doc-source/index.rst
@@ -82,7 +82,7 @@ esp-parser
 		:last-commit:
 		:alt: GitHub last commit
 
-	.. |maintained| maintained-shield:: 2024
+	.. |maintained| maintained-shield:: 2025
 		:alt: Maintenance
 
 .. end shields
diff --git a/doc-source/requirements.txt b/doc-source/requirements.txt
index e783b0e..6826c25 100644
--- a/doc-source/requirements.txt
+++ b/doc-source/requirements.txt
@@ -1,8 +1,10 @@
 attr-utils>=1.1.0
 default-values>=0.6.0
+docutils<0.22
 domdf-sphinx-theme>=0.3.0
 extras-require>=0.5.0
 html-section>=0.3.0
+roman>=4.0
 seed-intersphinx-mapping>=1.2.2
 sphinx>=3.0.3
 sphinx-copybutton>=0.2.12
diff --git a/pyproject.toml b/pyproject.toml
index 9385982..328f6a6 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -33,7 +33,7 @@ platforms = [ "Windows", "macOS", "Linux",]
 
 [tool.whey]
 base-classifiers = []
-python-versions = [ "3.8", "3.9", "3.10", "3.11", "3.12",]
+python-versions = [ "3.8", "3.9", "3.10", "3.11", "3.12", "3.13",]
 python-implementations = [ "CPython",]
 platforms = [ "Windows", "macOS", "Linux",]
 license-key = "MIT"
@@ -132,7 +132,7 @@ autodoc_exclude_members = [
 ]
 
 [tool.mypy]
-python_version = "3.8"
+python_version = "3.9"
 namespace_packages = true
 check_untyped_defs = true
 warn_unused_ignores = true
diff --git a/tox.ini b/tox.ini
index 155800d..cf97833 100644
--- a/tox.ini
+++ b/tox.ini
@@ -22,7 +22,7 @@
 #     * pytest
 
 [tox]
-envlist = py38, py39, py310, py311, py312, py313-dev, mypy, build
+envlist = py38, py39, py310, py311, py312, py313, mypy, build
 skip_missing_interpreters = True
 isolated_build = True
 requires =
@@ -32,9 +32,9 @@ requires =
     virtualenv!=20.16.0
 
 [envlists]
-test = py38, py39, py310, py311, py312, py313-dev
+test = py38, py39, py310, py311, py312, py313
 qa = mypy, lint
-cov = py38, coverage
+cov = py39, coverage
 
 [testenv]
 setenv =
@@ -51,12 +51,11 @@ setenv =
     PYTHONDEVMODE=1
     PIP_DISABLE_PIP_VERSION_CHECK=1
 
-[testenv:py313-dev]
+[testenv:py313]
 download = True
 setenv =
     PYTHONDEVMODE=1
     PIP_DISABLE_PIP_VERSION_CHECK=1
-    UNSAFE_PYO3_SKIP_VERSION_CHECK=1
 
 [testenv:py312]
 download = True
@@ -67,7 +66,7 @@ setenv =
 [testenv:docs]
 setenv = SHOW_TODOS = 1
 passenv = SPHINX_BUILDER
-basepython = python3.8
+basepython = python3.9
 changedir = {toxinidir}/doc-source
 deps = -r{toxinidir}/doc-source/requirements.txt
 commands = sphinx-build -M {env:SPHINX_BUILDER:html} . ./build {posargs}
@@ -91,7 +90,7 @@ commands =
     check-wheel-contents dist/
 
 [testenv:lint]
-basepython = python3.8
+basepython = python3.9
 changedir = {toxinidir}
 ignore_errors = True
 skip_install = True
@@ -111,17 +110,18 @@ deps =
     flake8-sphinx-links>=0.0.4
     flake8-strftime>=0.1.1
     flake8-typing-imports>=1.10.0
+    git+https://github.com/domdfcoding/restructuredtext-lint.git@fix-deprecations
     git+https://github.com/domdfcoding/flake8-rst-docstrings-sphinx.git
     git+https://github.com/domdfcoding/flake8-rst-docstrings.git
     git+https://github.com/python-formate/flake8-unused-arguments.git@magic-methods
     git+https://github.com/python-formate/flake8-missing-annotations.git
-    pydocstyle>=6.0.0
+    git+https://github.com/domdfcoding/pydocstyle.git@stub-functions
     pygments>=2.7.1
     importlib_metadata<4.5.0; python_version<'3.8'
 commands = python3 -m flake8_rst_docstrings_sphinx esp_parser tests --allow-toolbox {posargs}
 
 [testenv:perflint]
-basepython = python3.8
+basepython = python3.9
 changedir = {toxinidir}
 ignore_errors = True
 skip_install = True
@@ -129,7 +129,7 @@ deps = perflint
 commands = python3 -m perflint esp_parser {posargs}
 
 [testenv:mypy]
-basepython = python3.8
+basepython = python3.9
 ignore_errors = True
 changedir = {toxinidir}
 deps =
@@ -138,7 +138,7 @@ deps =
 commands = mypy esp_parser tests {posargs}
 
 [testenv:pyup]
-basepython = python3.8
+basepython = python3.9
 skip_install = True
 ignore_errors = True
 changedir = {toxinidir}
@@ -146,7 +146,7 @@ deps = pyupgrade-directories
 commands = pyup_dirs esp_parser tests --py36-plus --recursive
 
 [testenv:coverage]
-basepython = python3.8
+basepython = python3.9
 skip_install = True
 ignore_errors = True
 whitelist_externals = /bin/bash