diff --git a/.flake8 b/.flake8
deleted file mode 100644
index 15525dce..00000000
--- a/.flake8
+++ /dev/null
@@ -1,5 +0,0 @@
-[flake8]
-ignore = E133,E221,E226,E228,E241,W503,ANN101,ANN102,ANN401
-per-file-ignores=tests/*:ANN
-max-line-length = 99
-exclude = docs/*
diff --git a/pyproject.toml b/pyproject.toml
index de8d28ef..84841ec3 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -32,17 +32,36 @@ dependencies = [
 ]
 dynamic = ["version"]
 
-[tool.setuptools.dynamic]
-version = {attr = "novelwriter.__version__"}
-
 [project.urls]
 Homepage = "https://novelwriter.io"
 Documentation = "https://docs.novelwriter.io"
 Repository = "https://github.com/vkbo/novelWriter"
 Issues = "https://github.com/vkbo/novelWriter/issues"
 
+[project.gui-scripts]
+novelwriter = "novelwriter:main"
+
+[tool.setuptools.dynamic]
+version = {attr = "novelwriter.__version__"}
+
 [tool.setuptools.packages.find]
 include = ["novelwriter*"]
 
-[project.gui-scripts]
-novelwriter = "novelwriter:main"
+[tool.isort]
+py_version="38"
+line_length = 99
+wrap_length = 79
+multi_line_output = 5
+force_grid_wrap = 0
+lines_between_types = 1
+forced_separate = ["tests.*"]
+
+[tool.flake8]
+max-line-length = 99
+ignore = ["E133", "E221", "E226", "E228", "E241", "W503", "ANN101", "ANN102", "ANN401"]
+per-file-ignores = ["tests/*:ANN"]
+exclude = ["docs/*"]
+
+[tool.autopep8]
+max_line_length = 99
+ignore = ["E133", "E221", "E226", "E228", "E241", "W503"]
diff --git a/requirements-dev.txt b/requirements-dev.txt
index baf54924..0e13adfc 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -1,3 +1,4 @@
 flake8
 flake8-pep585
+flake8-pyproject
 flake8-annotations