diff --git a/actions/bind b/actions/bind
index ca3908c0f..7f0977f50 100755
--- a/actions/bind
+++ b/actions/bind
@@ -8,8 +8,8 @@ import argparse
 from pathlib import Path
 
 from plinth import action_utils
-from plinth.modules.bind import CONFIG_FILE, DEFAULT_CONFIG, ZONES_DIR
-from plinth.modules.bind import set_forwarders, set_dnssec
+from plinth.modules.bind import (CONFIG_FILE, DEFAULT_CONFIG, ZONES_DIR,
+                                 set_dnssec, set_forwarders)
 
 
 def parse_arguments():
diff --git a/actions/ejabberd b/actions/ejabberd
index ae97b4b17..7867df160 100755
--- a/actions/ejabberd
+++ b/actions/ejabberd
@@ -15,9 +15,10 @@ import sys
 from distutils.version import LooseVersion as LV
 from pathlib import Path
 
-from plinth import action_utils
 from ruamel.yaml import YAML, scalarstring
 
+from plinth import action_utils
+
 EJABBERD_CONFIG = '/etc/ejabberd/ejabberd.yml'
 EJABBERD_BACKUP = '/var/log/ejabberd/ejabberd.dump'
 EJABBERD_BACKUP_NEW = '/var/log/ejabberd/ejabberd_new.dump'
diff --git a/actions/minetest b/actions/minetest
index 669a970f5..f66ef048b 100755
--- a/actions/minetest
+++ b/actions/minetest
@@ -5,6 +5,7 @@ Configuration helper for Minetest server.
 """
 
 import argparse
+
 import augeas
 
 from plinth import action_utils
diff --git a/actions/packages b/actions/packages
index d9415f5eb..53d2afa7d 100755
--- a/actions/packages
+++ b/actions/packages
@@ -14,9 +14,9 @@ from collections import defaultdict
 from importlib import import_module
 
 import apt.cache
-
 import apt_inst
 import apt_pkg
+
 from plinth import cfg
 from plinth.action_utils import (apt_hold_freedombox, is_package_manager_busy,
                                  run_apt_command)
diff --git a/actions/test_path b/actions/test_path
index 2b299eec7..71b85ce88 100755
--- a/actions/test_path
+++ b/actions/test_path
@@ -6,4 +6,5 @@ Helper to test whether action scripts use the correct PYTHONPATH.
 """
 
 import plinth
+
 print(plinth.__file__)
diff --git a/actions/upgrades b/actions/upgrades
index 5278c403c..4edcb1be4 100755
--- a/actions/upgrades
+++ b/actions/upgrades
@@ -19,9 +19,9 @@ from plinth.action_utils import (apt_hold, apt_hold_flag, apt_hold_freedombox,
                                  is_package_manager_busy, run_apt_command,
                                  service_daemon_reload, service_restart)
 from plinth.modules.apache.components import check_url
-from plinth.modules.snapshot import (is_apt_snapshots_enabled, is_supported as
-                                     snapshot_is_supported, load_augeas as
-                                     snapshot_load_augeas)
+from plinth.modules.snapshot import is_apt_snapshots_enabled
+from plinth.modules.snapshot import is_supported as snapshot_is_supported
+from plinth.modules.snapshot import load_augeas as snapshot_load_augeas
 from plinth.modules.upgrades import (BACKPORTS_SOURCES_LIST, SOURCES_LIST,
                                      get_current_release, is_backports_current)
 
diff --git a/actions/wordpress b/actions/wordpress
index ee2afe868..45397027e 100755
--- a/actions/wordpress
+++ b/actions/wordpress
@@ -13,6 +13,7 @@ import string
 import subprocess
 
 import augeas
+
 from plinth import action_utils
 from plinth.modules.wordpress import PUBLIC_ACCESS_FILE
 
diff --git a/plinth/clients.py b/plinth/clients.py
index b52c19694..01da5cb63 100644
--- a/plinth/clients.py
+++ b/plinth/clients.py
@@ -3,9 +3,10 @@
 Utility methods for providing client information.
 """
 
-from django.utils.functional import Promise
 from enum import Enum
 
+from django.utils.functional import Promise
+
 
 class Desktop_OS(Enum):
     GNU_LINUX = 'gnu-linux'
diff --git a/plinth/kvstore.py b/plinth/kvstore.py
index 32ecef9ca..48911387e 100644
--- a/plinth/kvstore.py
+++ b/plinth/kvstore.py
@@ -7,6 +7,7 @@ Simple key/value store using Django models
 def get(key):
     """Return the value of a key"""
     from plinth.models import KVStore
+
     # pylint: disable-msg=E1101
     return KVStore.objects.get(pk=key).value
 
diff --git a/plinth/migrations/0003_merge_firstboot_completed_fields.py b/plinth/migrations/0003_merge_firstboot_completed_fields.py
index 6f6b4a0c8..ee5275ac9 100644
--- a/plinth/migrations/0003_merge_firstboot_completed_fields.py
+++ b/plinth/migrations/0003_merge_firstboot_completed_fields.py
@@ -7,6 +7,7 @@ and only use the new entry 'firstboot_completed' instead.
 from __future__ import unicode_literals
 
 from django.db import migrations
+
 from plinth.models import KVStore
 
 
diff --git a/plinth/migrations/0004_userprofile.py b/plinth/migrations/0004_userprofile.py
index 9dd6a868c..92636950b 100644
--- a/plinth/migrations/0004_userprofile.py
+++ b/plinth/migrations/0004_userprofile.py
@@ -2,10 +2,11 @@
 # Generated by Django 1.10.5 on 2018-01-29 10:21
 from __future__ import unicode_literals
 
-from django.conf import settings
-from django.db import migrations, models
 import django.db.models.deletion
+from django.conf import settings
 from django.contrib.auth.models import User
+from django.db import migrations, models
+
 from plinth.models import UserProfile
 
 
diff --git a/plinth/modules/apache/tests/test_uws.py b/plinth/modules/apache/tests/test_uws.py
index 64b4e4ebb..035874012 100644
--- a/plinth/modules/apache/tests/test_uws.py
+++ b/plinth/modules/apache/tests/test_uws.py
@@ -3,9 +3,9 @@
 Test module for (U)ser (Web) (S)ites.
 """
 
-from plinth.modules.apache import (uws_directory_of_user, uws_url_of_user,
-                                   uws_directory_of_url, uws_url_of_directory,
-                                   user_of_uws_directory, user_of_uws_url)
+from plinth.modules.apache import (user_of_uws_directory, user_of_uws_url,
+                                   uws_directory_of_url, uws_directory_of_user,
+                                   uws_url_of_directory, uws_url_of_user)
 
 
 def test_uws_namings():
diff --git a/plinth/modules/avahi/tests/test_functional.py b/plinth/modules/avahi/tests/test_functional.py
index 114dd0328..b73c6a29a 100644
--- a/plinth/modules/avahi/tests/test_functional.py
+++ b/plinth/modules/avahi/tests/test_functional.py
@@ -4,6 +4,7 @@ Functional, browser based tests for avahi app.
 """
 
 import pytest
+
 from plinth.tests import functional
 
 pytestmark = [pytest.mark.system, pytest.mark.essential, pytest.mark.avahi]
diff --git a/plinth/modules/backups/tests/test_functional.py b/plinth/modules/backups/tests/test_functional.py
index b3b285850..fe068ded1 100644
--- a/plinth/modules/backups/tests/test_functional.py
+++ b/plinth/modules/backups/tests/test_functional.py
@@ -10,6 +10,7 @@ import urllib.parse
 
 import pytest
 import requests
+
 from plinth.tests import functional
 
 pytestmark = [pytest.mark.system, pytest.mark.backups]
diff --git a/plinth/modules/bepasty/views.py b/plinth/modules/bepasty/views.py
index 3af4d8125..70bfff588 100644
--- a/plinth/modules/bepasty/views.py
+++ b/plinth/modules/bepasty/views.py
@@ -17,7 +17,6 @@ from plinth.views import AppView
 
 from .forms import AddPasswordForm, SetDefaultPermissionsForm
 
-
 # i18n for permission comments
 PERMISSION_COMMENTS_STRINGS = {
     'admin': _('admin'),
diff --git a/plinth/modules/cockpit/tests/test_functional.py b/plinth/modules/cockpit/tests/test_functional.py
index ccf3d0244..c110fc4e2 100644
--- a/plinth/modules/cockpit/tests/test_functional.py
+++ b/plinth/modules/cockpit/tests/test_functional.py
@@ -4,6 +4,7 @@ Functional, browser based tests for cockpit app.
 """
 
 import pytest
+
 from plinth.tests import functional
 
 pytestmark = [pytest.mark.system, pytest.mark.essential, pytest.mark.cockpit]
diff --git a/plinth/modules/ejabberd/tests/conftest.py b/plinth/modules/ejabberd/tests/conftest.py
index 599814073..ce5488342 100644
--- a/plinth/modules/ejabberd/tests/conftest.py
+++ b/plinth/modules/ejabberd/tests/conftest.py
@@ -10,6 +10,7 @@ import types
 from unittest.mock import MagicMock, patch
 
 import pytest
+
 from plinth.modules import ejabberd
 
 current_directory = pathlib.Path(__file__).parent
diff --git a/plinth/modules/email_server/audit/__init__.py b/plinth/modules/email_server/audit/__init__.py
index c3e03b90e..c543f483d 100644
--- a/plinth/modules/email_server/audit/__init__.py
+++ b/plinth/modules/email_server/audit/__init__.py
@@ -3,12 +3,6 @@
 Provides diagnosis and repair of email server configuration issues
 """
 
-from . import domain
-from . import home
-from . import ldap
-from . import models
-from . import rcube
-from . import spam
-from . import tls
+from . import domain, home, ldap, models, rcube, spam, tls
 
 __all__ = ['domain', 'home', 'ldap', 'models', 'rcube', 'spam', 'tls']
diff --git a/plinth/modules/email_server/urls.py b/plinth/modules/email_server/urls.py
index 5e12fefa1..7769dddc5 100644
--- a/plinth/modules/email_server/urls.py
+++ b/plinth/modules/email_server/urls.py
@@ -1,9 +1,10 @@
 # SPDX-License-Identifier: AGPL-3.0-or-later
 from django.urls import path
-from plinth.utils import non_admin_view
 from stronghold.decorators import public
-from . import views
 
+from plinth.utils import non_admin_view
+
+from . import views
 
 urlpatterns = [
     path('apps/email_server/', views.EmailServerView.as_view(), name='index'),
diff --git a/plinth/modules/i2p/tests/test_functional.py b/plinth/modules/i2p/tests/test_functional.py
index cde14aa8d..57a83ef0b 100644
--- a/plinth/modules/i2p/tests/test_functional.py
+++ b/plinth/modules/i2p/tests/test_functional.py
@@ -4,6 +4,7 @@ Functional, browser based tests for i2p app.
 """
 
 import pytest
+
 from plinth.tests import functional
 
 pytestmark = [pytest.mark.apps, pytest.mark.i2p]
diff --git a/plinth/modules/i2p/urls.py b/plinth/modules/i2p/urls.py
index cab9dcb84..c51cde644 100644
--- a/plinth/modules/i2p/urls.py
+++ b/plinth/modules/i2p/urls.py
@@ -4,6 +4,7 @@ URLs for the I2P module.
 """
 
 from django.conf.urls import url
+
 from plinth.modules.i2p import views
 
 urlpatterns = [url(r'^apps/i2p/$', views.I2PAppView.as_view(), name='index')]
diff --git a/plinth/modules/infinoted/tests/test_functional.py b/plinth/modules/infinoted/tests/test_functional.py
index eab534960..15c8c42d2 100644
--- a/plinth/modules/infinoted/tests/test_functional.py
+++ b/plinth/modules/infinoted/tests/test_functional.py
@@ -4,6 +4,7 @@ Functional, browser based tests for infinoted app.
 """
 
 import pytest
+
 from plinth.tests import functional
 
 pytestmark = [pytest.mark.apps, pytest.mark.infinoted]
diff --git a/plinth/modules/jsxc/tests/test_functional.py b/plinth/modules/jsxc/tests/test_functional.py
index f482a82c7..53492cad0 100644
--- a/plinth/modules/jsxc/tests/test_functional.py
+++ b/plinth/modules/jsxc/tests/test_functional.py
@@ -4,6 +4,7 @@ Functional, browser based tests for jsxc app.
 """
 
 import pytest
+
 from plinth.tests import functional
 
 pytestmark = [pytest.mark.apps, pytest.mark.jsxc]
diff --git a/plinth/modules/matrixsynapse/tests/test_functional.py b/plinth/modules/matrixsynapse/tests/test_functional.py
index 3d13bc553..74a3efb95 100644
--- a/plinth/modules/matrixsynapse/tests/test_functional.py
+++ b/plinth/modules/matrixsynapse/tests/test_functional.py
@@ -4,6 +4,7 @@ Functional, browser based tests for matrixsynapse app.
 """
 
 import pytest
+
 from plinth.tests import functional
 
 pytestmark = [pytest.mark.apps, pytest.mark.matrixsynapse]
diff --git a/plinth/modules/mediawiki/tests/conftest.py b/plinth/modules/mediawiki/tests/conftest.py
index 72729133a..3fc899692 100644
--- a/plinth/modules/mediawiki/tests/conftest.py
+++ b/plinth/modules/mediawiki/tests/conftest.py
@@ -3,9 +3,9 @@
 Common test fixtures for MediaWiki.
 """
 
-import shutil
 import importlib
 import pathlib
+import shutil
 import types
 from unittest.mock import patch
 
diff --git a/plinth/modules/mediawiki/tests/test_functional.py b/plinth/modules/mediawiki/tests/test_functional.py
index c26a72bc0..8e0e8bad6 100644
--- a/plinth/modules/mediawiki/tests/test_functional.py
+++ b/plinth/modules/mediawiki/tests/test_functional.py
@@ -7,9 +7,10 @@ import pathlib
 from urllib.parse import urlparse
 
 import requests
+from pytest_bdd import given, parsers, scenarios, then, when
+
 from plinth.tests import functional
 from plinth.tests.functional import config
-from pytest_bdd import given, parsers, scenarios, then, when
 
 scenarios('mediawiki.feature')
 
diff --git a/plinth/modules/minetest/tests/test_functional.py b/plinth/modules/minetest/tests/test_functional.py
index 8bad3e900..9d364cc00 100644
--- a/plinth/modules/minetest/tests/test_functional.py
+++ b/plinth/modules/minetest/tests/test_functional.py
@@ -4,6 +4,7 @@ Functional, browser based tests for minetest app.
 """
 
 import pytest
+
 from plinth.tests import functional
 
 pytestmark = [pytest.mark.apps, pytest.mark.minetest]
diff --git a/plinth/modules/minidlna/tests/test_functional.py b/plinth/modules/minidlna/tests/test_functional.py
index 85d106ce9..26b49ca06 100644
--- a/plinth/modules/minidlna/tests/test_functional.py
+++ b/plinth/modules/minidlna/tests/test_functional.py
@@ -4,6 +4,7 @@ Functional, browser based tests for minidlna app.
 """
 
 import pytest
+
 from plinth.tests import functional
 
 pytestmark = [pytest.mark.apps, pytest.mark.minidlna]
diff --git a/plinth/modules/pagekite/urls.py b/plinth/modules/pagekite/urls.py
index c1c132196..fa60feaf4 100644
--- a/plinth/modules/pagekite/urls.py
+++ b/plinth/modules/pagekite/urls.py
@@ -5,7 +5,7 @@ URLs for the PageKite module
 
 from django.conf.urls import url
 
-from .views import (ConfigurationView, AddCustomServiceView, DeleteServiceView)
+from .views import AddCustomServiceView, ConfigurationView, DeleteServiceView
 
 urlpatterns = [
     url(r'^sys/pagekite/$', ConfigurationView.as_view(), name='index'),
diff --git a/plinth/modules/performance/tests/test_functional.py b/plinth/modules/performance/tests/test_functional.py
index 3f7e7a70e..0dd84c033 100644
--- a/plinth/modules/performance/tests/test_functional.py
+++ b/plinth/modules/performance/tests/test_functional.py
@@ -4,6 +4,7 @@ Functional, browser based tests for performance app.
 """
 
 import pytest
+
 from plinth.tests import functional
 
 pytestmark = [pytest.mark.system, pytest.mark.performance]
diff --git a/plinth/modules/samba/tests/test_views.py b/plinth/modules/samba/tests/test_views.py
index f0bc5592e..42f97733f 100644
--- a/plinth/modules/samba/tests/test_views.py
+++ b/plinth/modules/samba/tests/test_views.py
@@ -10,6 +10,7 @@ from unittest.mock import patch
 import pytest
 from django import urls
 from django.contrib.messages.storage.fallback import FallbackStorage
+
 from plinth import module_loader
 from plinth.errors import ActionError
 from plinth.modules.samba import views
diff --git a/plinth/modules/sso/urls.py b/plinth/modules/sso/urls.py
index 1cec8a3af..6a9364795 100644
--- a/plinth/modules/sso/urls.py
+++ b/plinth/modules/sso/urls.py
@@ -4,10 +4,11 @@ URLs for the Single Sign On module.
 """
 
 from django.conf.urls import url
+from stronghold.decorators import public
+
+from plinth.utils import non_admin_view
 
 from .views import SSOLoginView, refresh
-from stronghold.decorators import public
-from plinth.utils import non_admin_view
 
 urlpatterns = [
     url(r'^accounts/sso/login/$', public(SSOLoginView.as_view()),
diff --git a/plinth/modules/storage/tests/test_functional.py b/plinth/modules/storage/tests/test_functional.py
index 0d7741f04..3125d8a3d 100644
--- a/plinth/modules/storage/tests/test_functional.py
+++ b/plinth/modules/storage/tests/test_functional.py
@@ -3,7 +3,6 @@
 Functional, browser based tests for storage app.
 """
 import pytest
-
 from pytest_bdd import given, parsers, scenarios, then
 
 from plinth.tests import functional
diff --git a/plinth/modules/wordpress/tests/test_functional.py b/plinth/modules/wordpress/tests/test_functional.py
index 4e33c2e8a..8a594a5b4 100644
--- a/plinth/modules/wordpress/tests/test_functional.py
+++ b/plinth/modules/wordpress/tests/test_functional.py
@@ -4,6 +4,7 @@ Functional, browser based tests for WordPress.
 """
 
 import pytest
+
 from plinth.tests import functional
 
 
diff --git a/plinth/tests/test_actions.py b/plinth/tests/test_actions.py
index 27633a97d..f45cb1b2b 100644
--- a/plinth/tests/test_actions.py
+++ b/plinth/tests/test_actions.py
@@ -13,9 +13,9 @@ import shutil
 import tempfile
 from unittest.mock import patch
 
+import apt_pkg
 import pytest
 
-import apt_pkg
 from plinth import cfg
 from plinth.actions import _log_command as log_command
 from plinth.actions import run, superuser_run