diff --git a/.cruft.json b/.cruft.json
index 94ea91ba36e..44cc9aeeee8 100644
--- a/.cruft.json
+++ b/.cruft.json
@@ -1,6 +1,6 @@
 {
   "template": "https://github.com/sunpy/package-template",
-  "commit": "1eff2ed0ff32c123e64b5faacf7c505362cfbb92",
+  "commit": "c79fc5bff74958e24c9a925a330b8d3aa138f4ce",
   "checkout": null,
   "context": {
     "cookiecutter": {
diff --git a/.github/workflows/sub_package_update.yml b/.github/workflows/sub_package_update.yml
index 94a9e7e1ace..067794816d1 100644
--- a/.github/workflows/sub_package_update.yml
+++ b/.github/workflows/sub_package_update.yml
@@ -28,11 +28,6 @@ jobs:
             branch: cruft/update
             commit-message: "Automatic package template update"
             title: Updates from the package template
-          - add-paths: .cruft.json
-            body: reject these changes for this repo.
-            branch: cruft/reject
-            commit-message: "Reject this package template update"
-            title: Reject new updates from package template
 
     steps:
       - uses: actions/checkout@v4
@@ -42,7 +37,7 @@ jobs:
           python-version: "3.11"
 
       - name: Install Cruft
-        run: python -m pip install cruft
+        run: python -m pip install git+https://github.com/Cadair/cruft@patch-p1
 
       - name: Check if update is available
         continue-on-error: false
diff --git a/.gitignore.rej b/.gitignore.rej
new file mode 100644
index 00000000000..bd2d953d5f8
--- /dev/null
+++ b/.gitignore.rej
@@ -0,0 +1,9 @@
+diff a/.gitignore b/.gitignore	(rejected hunks)
+@@ -76,6 +76,7 @@ instance/
+ docs/_build/
+ # automodapi
+ docs/api
++docs/sg_execution_times.rst
+ 
+ # PyBuilder
+ .pybuilder/
diff --git a/.pre-commit-config.yaml.rej b/.pre-commit-config.yaml.rej
new file mode 100644
index 00000000000..b6f05c12953
--- /dev/null
+++ b/.pre-commit-config.yaml.rej
@@ -0,0 +1,19 @@
+diff a/.pre-commit-config.yaml b/.pre-commit-config.yaml	(rejected hunks)
+@@ -1,7 +1,7 @@
+ repos:
+     # This should be before any formatting hooks like isort
+   - repo: https://github.com/astral-sh/ruff-pre-commit
+-    rev: "v0.3.7"
++    rev: "v0.4.8"
+     hooks:
+       - id: ruff
+         args: ["--fix"]
+@@ -26,7 +26,7 @@ repos:
+       - id: mixed-line-ending
+         exclude: ".*(.fits|.fts|.fit|.header|.txt|tca.*)$"
+   - repo: https://github.com/codespell-project/codespell
+-    rev: v2.2.6
++    rev: v2.3.0
+     hooks:
+       - id: codespell
+         args: [ "--write-changes" ]
diff --git a/pytest.ini.rej b/pytest.ini.rej
new file mode 100644
index 00000000000..39e38acbfcb
--- /dev/null
+++ b/pytest.ini.rej
@@ -0,0 +1,19 @@
+diff a/pytest.ini b/pytest.ini	(rejected hunks)
+@@ -14,9 +14,15 @@ norecursedirs =
+     .history
+     sunpy/extern
+ doctest_plus = enabled
+-doctest_optionflags = NORMALIZE_WHITESPACE FLOAT_CMP ELLIPSIS
++doctest_optionflags =
++    NORMALIZE_WHITESPACE
++    FLOAT_CMP
++    ELLIPSIS
+ text_file_format = rst
+-addopts = --doctest-rst -p no:unraisableexception -p no:threadexception
++addopts =
++    --doctest-rst
++    -p no:unraisableexception
++    -p no:threadexception
+ filterwarnings =
+     # Turn all warnings into errors so they do not pass silently.
+     error
diff --git a/tox.ini.rej b/tox.ini.rej
new file mode 100644
index 00000000000..e0c5c9234b6
--- /dev/null
+++ b/tox.ini.rej
@@ -0,0 +1,66 @@
+diff a/tox.ini b/tox.ini	(rejected hunks)
+@@ -12,7 +12,6 @@ envlist =
+ 
+ [testenv]
+ pypi_filter = https://raw.githubusercontent.com/sunpy/sunpy/main/.test_package_pins.txt
+-
+ # Run the tests in a temporary directory to make sure that we don't import
+ # the package from the source tree
+ change_dir = .tmp/{envname}
+@@ -20,7 +19,6 @@ description =
+     run tests
+     oldestdeps: with the oldest supported version of key dependencies
+     devdeps: with the latest developer version of key dependencies
+-
+ pass_env =
+     # A variable to tell tests we are on a CI system
+     CI
+@@ -30,37 +28,35 @@ pass_env =
+     LOCALE_ARCHIVE
+     # If the user has set a LC override we should follow it
+     LC_ALL
+-
+ set_env =
+     MPLBACKEND = agg
+     devdeps: PIP_EXTRA_INDEX_URL = https://pypi.anaconda.org/astropy/simple https://pypi.anaconda.org/scientific-python-nightly-wheels/simple
+-    # Define the base test command here to allow us to add more flags for each tox factor
+-    PYTEST_COMMAND = pytest -vvv -r fEs --pyargs sunpy --cov-report=xml --cov=sunpy --cov-config={toxinidir}/.coveragerc {toxinidir}/docs
+-
+ deps =
+     # For packages which publish nightly wheels this will pull the latest nightly
+     devdeps: numpy>=0.0.dev0
+     # Packages without nightly wheels will be built from source like this
+     # devdeps: git+https://github.com/ndcube/ndcube
+     oldestdeps: minimum_dependencies
+-    pytest-cov
+-
+ # The following indicates which extras_require will be installed
+ extras =
+     tests
+-
+ commands_pre =
+     oldestdeps: minimum_dependencies sunpy --filename requirements-min.txt
+     oldestdeps: pip install -r requirements-min.txt
+     pip freeze --all --no-input
+-
+ commands =
+-    # To run different commands for different factors exclude the factor from the default command like this
+-    # !online: {env:PYTEST_COMMAND} {posargs}
+-    # Then specify a specific one like this
+-    # online: {env:PYTEST_COMMAND} --remote-data=any {posargs}
++    # To amend the pytest command for different factors you can add a line
++    # which starts with a factor like `online: --remote-data=any \`
+     # If you have no factors which require different commands this is all you need:
+-    {env:PYTEST_COMMAND} {posargs}
++    pytest \
++    -vvv \
++    -r fEs \
++    --pyargs sunpy \
++    --cov-report=xml \
++    --cov=sunpy \
++    --cov-config={toxinidir}/.coveragerc \
++    {toxinidir}/docs \
++    {posargs}
+ 
+ [testenv:codestyle]
+ pypi_filter =