diff --git a/.github/workflows/conda_ci.yml b/.github/workflows/conda_ci.yml
index 15b2935..7651c50 100644
--- a/.github/workflows/conda_ci.yml
+++ b/.github/workflows/conda_ci.yml
@@ -6,12 +6,11 @@ on:
   push:
     branches: ["master"]
 
-permissions:
-  contents: read
-
 jobs:
   tests:
     name: "Conda"
+    permissions:
+      contents: read
     runs-on: ubuntu-22.04
     defaults:
       run:
diff --git a/.github/workflows/docs_test_action.yml b/.github/workflows/docs_test_action.yml
index 761b41f..39ae450 100644
--- a/.github/workflows/docs_test_action.yml
+++ b/.github/workflows/docs_test_action.yml
@@ -9,11 +9,10 @@ on:
       - 'imgbot'
   pull_request:
 
-permissions:
-  contents: read
-
 jobs:
   docs:
+    permissions:
+      contents: read
     runs-on: ubuntu-latest
     steps:
       - name: Checkout 🛎️
diff --git a/.github/workflows/flake8.yml b/.github/workflows/flake8.yml
index 5e67c5c..1ecb7b9 100644
--- a/.github/workflows/flake8.yml
+++ b/.github/workflows/flake8.yml
@@ -10,12 +10,11 @@ on:
       - 'imgbot'
   pull_request:
 
-permissions:
-  contents: read
-
 jobs:
   Run:
     name: "Flake8"
+    permissions:
+      contents: read
     runs-on: "ubuntu-22.04"
 
     steps:
diff --git a/.github/workflows/mypy.yml b/.github/workflows/mypy.yml
index 4c22a52..b889816 100644
--- a/.github/workflows/mypy.yml
+++ b/.github/workflows/mypy.yml
@@ -10,11 +10,10 @@ on:
       - 'imgbot'
   pull_request:
 
-permissions:
-  contents: read
-
 jobs:
   Run:
+    permissions:
+      contents: read
     name: "mypy / ${{ matrix.os }}"
     runs-on: ${{ matrix.os }}
 
diff --git a/.github/workflows/octocheese.yml b/.github/workflows/octocheese.yml
index 280b181..d280e42 100644
--- a/.github/workflows/octocheese.yml
+++ b/.github/workflows/octocheese.yml
@@ -6,11 +6,10 @@ on:
   schedule:
     - cron: 0 12 * * *
 
-permissions:
-  contents: write
-
 jobs:
   Run:
+    permissions:
+      contents: write
     runs-on: ubuntu-latest
     steps:
       - uses: domdfcoding/octocheese@master
diff --git a/.github/workflows/python_ci.yml b/.github/workflows/python_ci.yml
index 4b95a3a..44bdca2 100644
--- a/.github/workflows/python_ci.yml
+++ b/.github/workflows/python_ci.yml
@@ -11,13 +11,11 @@ on:
 
   pull_request:
 
-permissions:
-  actions: write
-  issues: write
-  contents: read
-
 jobs:
   tests:
+    permissions:
+      actions: write
+      contents: read
     name: "windows-2022 / Python ${{ matrix.config.python-version }}"
     runs-on: "windows-2022"
     continue-on-error: ${{ matrix.config.experimental }}
diff --git a/.github/workflows/python_ci_linux.yml b/.github/workflows/python_ci_linux.yml
index eb7e771..e67e6a0 100644
--- a/.github/workflows/python_ci_linux.yml
+++ b/.github/workflows/python_ci_linux.yml
@@ -12,13 +12,11 @@ on:
       - '*'
   pull_request:
 
-permissions:
-  actions: write
-  issues: write
-  contents: read
-
 jobs:
   tests:
+    permissions:
+      actions: write
+      contents: read
     name: "ubuntu-22.04 / Python ${{ matrix.config.python-version }}"
     runs-on: "ubuntu-22.04"
     continue-on-error: ${{ matrix.config.experimental }}
@@ -85,6 +83,9 @@ jobs:
 
   Coverage:
     needs: tests
+    permissions:
+      actions: write
+      contents: read
     runs-on: "ubuntu-22.04"
     steps:
       - name: Checkout 🛎️
@@ -134,7 +135,10 @@ jobs:
 
   Deploy:
     needs: tests
-
+    permissions:
+      actions: write
+      issues: write
+      contents: read
     runs-on: "ubuntu-22.04"
     steps:
       - name: Checkout 🛎️
@@ -179,6 +183,8 @@ jobs:
 
   Conda:
     needs: deploy
+    permissions:
+      contents: read
     runs-on: ubuntu-22.04
     if: startsWith(github.ref, 'refs/tags/') || (startsWith(github.event.head_commit.message, 'Bump version') != true)
     steps:
diff --git a/.github/workflows/python_ci_macos.yml b/.github/workflows/python_ci_macos.yml
index 6d3b388..3eb67ba 100644
--- a/.github/workflows/python_ci_macos.yml
+++ b/.github/workflows/python_ci_macos.yml
@@ -11,13 +11,11 @@ on:
 
   pull_request:
 
-permissions:
-  actions: write
-  issues: write
-  contents: read
-
 jobs:
   tests:
+    permissions:
+      actions: write
+      contents: read
     name: "macos-${{ matrix.config.os-ver }} / Python ${{ matrix.config.python-version }}"
     runs-on: "macos-${{ matrix.config.os-ver }}"
     continue-on-error: ${{ matrix.config.experimental }}
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index a3a931b..898cfc4 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -18,7 +18,6 @@ repos:
     - id: check-added-large-files
     - id: check-ast
     - id: fix-byte-order-marker
-    - id: check-byte-order-marker
     - id: check-case-conflict
     - id: check-executables-have-shebangs
     - id: check-json
@@ -85,9 +84,11 @@ repos:
    hooks:
     - id: formate
       exclude: ^(doc-source/conf|__pkginfo__|setup)\.(_)?py$
+      additional_dependencies:
+       - formate-trailing-commas>=0.1.0
 
  - repo: https://github.com/python-coincidence/dep_checker
-   rev: v0.8.0
+   rev: v0.9.0
    hooks:
     - id: dep_checker
       args:
diff --git a/.style.yapf b/.style.yapf
index e64be7c..9378f04 100644
--- a/.style.yapf
+++ b/.style.yapf
@@ -312,7 +312,7 @@ split_before_dict_set_generator=True
 #
 #   foo = ('This is a really long string: {}, {}, {}, {}'
 #          .format(a, b, c, d))
-split_before_dot=False
+split_before_dot=True
 
 # Split after the opening paren which surrounds an expression if it doesn't
 # fit on a single line.
diff --git a/formate.toml b/formate.toml
index 7ed444a..d6b7b3d 100644
--- a/formate.toml
+++ b/formate.toml
@@ -12,6 +12,12 @@ priority = 30
 [hooks.yapf.kwargs]
 yapf_style = ".style.yapf"
 
+[hooks.trailing_commas]
+priority = 21
+
+[hooks.trailing_commas.kwargs]
+format_ImportFrom = false
+
 [hooks.isort]
 priority = 50
 
@@ -27,30 +33,6 @@ lines_between_types = 0
 use_parentheses = true
 remove_redundant_aliases = true
 default_section = "THIRDPARTY"
-known_third_party = [
-    "backports_entry_points_selectable",
-    "click",
-    "coincidence",
-    "colorama",
-    "coverage",
-    "coverage_pyver_pragma",
-    "deprecation_alias",
-    "domdf_python_tools",
-    "github",
-    "importlib_metadata",
-    "mistletoe",
-    "mypy",
-    "psutil",
-    "pytest",
-    "pytest_cov",
-    "pytest_mypy_plugins",
-    "pytest_mypy_plugins_shim",
-    "pytest_randomly",
-    "pytest_regressions",
-    "pytest_timeout",
-    "requests",
-    "typing_extensions",
-]
 known_first_party = [ "consolekit",]
 
 [config]
diff --git a/tox.ini b/tox.ini
index e2d3297..4910c98 100644
--- a/tox.ini
+++ b/tox.ini
@@ -121,7 +121,7 @@ deps =
     flake8-strftime>=0.1.1
     flake8-typing-imports>=1.10.0
     flake8-params>=0.1.0
-    git+https://github.com/python-formate/flake8-commas.git@2.1.0-python-formate.0
+    git+https://github.com/python-formate/flake8-commas.git@4.0.0-python-formate.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