diff --git a/.editorconfig b/.editorconfig
index ff481f7a24543b6c81dd030f62c5dd8977553a88..f06c895ef6d880bd3a51a58bf0ec9eba184de36e 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -14,15 +14,6 @@ insert_final_newline = true
 trim_trailing_whitespace = true
 charset = utf-8
 
-# Python files
-[*.py]
-indent_size = 4
-# isort plugin configuration
-known_first_party = invenio_theme_tuw
-multi_line_output = 2
-default_section = THIRDPARTY
-skip = .eggs
-
 # RST files (used by sphinx)
 [*.rst]
 indent_size = 4
diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/MANIFEST.in b/MANIFEST.in
index 8a664a266a8240de64beabd86cd40458080ea94a..0cdbbba2ec857c50047c23a3766cc0f05fc4d400 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -17,6 +17,7 @@
 exclude sonar-project.properties
 exclude .gitlab-ci.yml
 
+include .git-blame-ignore-revs
 include .dockerignore
 include .editorconfig
 include .tx/config
diff --git a/docs/conf.py b/docs/conf.py
index d968b0d5b8660241cfb5723c9a187d7e8a8bef01..7dcdab6a722fc92078007cd770005a33873b8c58 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -7,10 +7,10 @@
 
 """Sphinx configuration."""
 
-from invenio_theme_tuw import __version__
-
 import sphinx.environment
 
+from invenio_theme_tuw import __version__
+
 # -- General configuration ------------------------------------------------
 
 # If your documentation needs a minimal Sphinx version, state it here.
@@ -45,9 +45,9 @@ source_suffix = ".rst"
 master_doc = "index"
 
 # General information about the project.
-project = u"Invenio-Theme-TUW"
-copyright = u"2020, TU Wien"
-author = u"TU Wien"
+project = "Invenio-Theme-TUW"
+copyright = "2020, TU Wien"
+author = "TU Wien"
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
@@ -242,8 +242,8 @@ latex_documents = [
     (
         master_doc,
         "invenio-theme-tuw.tex",
-        u"invenio-theme-tuw Documentation",
-        u"TU Wien",
+        "invenio-theme-tuw Documentation",
+        "TU Wien",
         "manual",
     ),
 ]
@@ -274,7 +274,7 @@ latex_documents = [
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
 man_pages = [
-    (master_doc, "invenio-theme-tuw", u"invenio-theme-tuw Documentation", [author], 1)
+    (master_doc, "invenio-theme-tuw", "invenio-theme-tuw Documentation", [author], 1)
 ]
 
 # If true, show URL addresses after external links.
@@ -290,7 +290,7 @@ texinfo_documents = [
     (
         master_doc,
         "invenio-theme-tuw",
-        u"Invenio-Theme-TUW Documentation",
+        "Invenio-Theme-TUW Documentation",
         author,
         "invenio-theme-tuw",
         "TU Wien theme for Invenio (RDM).",
diff --git a/pytest.ini b/pytest.ini
deleted file mode 100644
index 625cc0909b403de61316aec78af66e5035e746e5..0000000000000000000000000000000000000000
--- a/pytest.ini
+++ /dev/null
@@ -1,10 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# Copyright (C) 2020 - 2021 TU Wien.
-#
-# Invenio-Theme-TUW is free software; you can redistribute it and/or modify
-# it under the terms of the MIT License; see LICENSE file for more details.
-
-[pytest]
-addopts = --isort --pydocstyle --pycodestyle --doctest-glob="*.rst" --doctest-modules --cov=invenio_theme_tuw --cov-report=term-missing
-testpaths = docs tests invenio_theme_tuw
diff --git a/setup.cfg b/setup.cfg
index a7c08572171331c765e9be59ff4337f0da8967cf..caa6aeea366de8a88a21aaeb1e16d11bda61dfe3 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -40,6 +40,7 @@ install_requires =
 
 [options.extras_require]
 tests =
+    pytest-black>=0.3.0,<0.3.10
     pytest-invenio>=1.4.0
     Sphinx>=4
 # Kept for backwards compatibility
@@ -95,10 +96,8 @@ max-line-length = 88
 extend-ignore = E203
 
 [isort]
-multi_line_output = 3
-include_trailing_comma = True
-force_grid_wrap = 0
-use_parentheses = True
-ensure_newline_before_comments = True
-line_length = 88
+profile=black
 
+[tool:pytest]
+addopts = --black --isort --pydocstyle --doctest-glob="*.rst" --doctest-modules --cov=invenio_theme_tuw --cov-report=term-missing
+testpaths = docs tests invenio_theme_tuw