diff --git a/admin_interface/admin.py b/admin_interface/admin.py
index 313b064..f474fd9 100644
--- a/admin_interface/admin.py
+++ b/admin_interface/admin.py
@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 
+from django.contrib import admin
+
 from admin_interface.compat import gettext_lazy as _
 from admin_interface.models import Theme
 
-from django.contrib import admin
-
 
 class ThemeAdmin(admin.ModelAdmin):
 
diff --git a/admin_interface/apps.py b/admin_interface/apps.py
index ac7eacf..ffeafdc 100644
--- a/admin_interface/apps.py
+++ b/admin_interface/apps.py
@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 
-from admin_interface.compat import gettext_lazy as _
-
 from django.apps import AppConfig
 from django.db.models.signals import post_migrate
 
+from admin_interface.compat import gettext_lazy as _
+
 
 class AdminInterfaceConfig(AppConfig):
 
diff --git a/admin_interface/migrations/0001_initial.py b/admin_interface/migrations/0001_initial.py
index b96b05e..d86ba93 100644
--- a/admin_interface/migrations/0001_initial.py
+++ b/admin_interface/migrations/0001_initial.py
@@ -2,9 +2,8 @@
 
 from __future__ import unicode_literals
 
-from django.db import models, migrations
-
 import colorfield.fields
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
diff --git a/admin_interface/migrations/0002_add_related_modal.py b/admin_interface/migrations/0002_add_related_modal.py
index 8d7c50e..7d2292f 100644
--- a/admin_interface/migrations/0002_add_related_modal.py
+++ b/admin_interface/migrations/0002_add_related_modal.py
@@ -2,9 +2,8 @@
 
 from __future__ import unicode_literals
 
-from django.db import migrations, models
-
 import colorfield.fields
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
diff --git a/admin_interface/migrations/0003_add_logo_color.py b/admin_interface/migrations/0003_add_logo_color.py
index 9336d38..086efef 100644
--- a/admin_interface/migrations/0003_add_logo_color.py
+++ b/admin_interface/migrations/0003_add_logo_color.py
@@ -3,7 +3,6 @@
 from __future__ import unicode_literals
 
 import colorfield.fields
-
 from django.db import migrations, models
 
 
diff --git a/admin_interface/migrations/0006_bytes_to_str.py b/admin_interface/migrations/0006_bytes_to_str.py
index 1829f23..6a81fd6 100644
--- a/admin_interface/migrations/0006_bytes_to_str.py
+++ b/admin_interface/migrations/0006_bytes_to_str.py
@@ -3,7 +3,6 @@
 from __future__ import unicode_literals
 
 import colorfield.fields
-
 from django.db import migrations, models
 
 
diff --git a/admin_interface/migrations/0011_add_environment_options.py b/admin_interface/migrations/0011_add_environment_options.py
index e84e648..b96a5f8 100644
--- a/admin_interface/migrations/0011_add_environment_options.py
+++ b/admin_interface/migrations/0011_add_environment_options.py
@@ -3,7 +3,6 @@
 from __future__ import unicode_literals
 
 import colorfield.fields
-
 from django.db import migrations, models
 
 
diff --git a/admin_interface/migrations/0012_update_verbose_names.py b/admin_interface/migrations/0012_update_verbose_names.py
index 9b3e6a6..c5e22f7 100644
--- a/admin_interface/migrations/0012_update_verbose_names.py
+++ b/admin_interface/migrations/0012_update_verbose_names.py
@@ -3,7 +3,6 @@
 from __future__ import unicode_literals
 
 import colorfield.fields
-
 from django.db import migrations
 
 
diff --git a/admin_interface/migrations/0020_module_selected_colors.py b/admin_interface/migrations/0020_module_selected_colors.py
index 436a101..7f69ef5 100644
--- a/admin_interface/migrations/0020_module_selected_colors.py
+++ b/admin_interface/migrations/0020_module_selected_colors.py
@@ -2,11 +2,10 @@
 
 from __future__ import unicode_literals
 
+import colorfield.fields
 from django.db import migrations
 from django.db.models import F
 
-import colorfield.fields
-
 
 def default_link_selected(apps, schema_editor):
     Theme = apps.get_model("admin_interface", "Theme")
diff --git a/admin_interface/migrations/0021_file_extension_validator.py b/admin_interface/migrations/0021_file_extension_validator.py
index b9b9214..1b9846c 100644
--- a/admin_interface/migrations/0021_file_extension_validator.py
+++ b/admin_interface/migrations/0021_file_extension_validator.py
@@ -2,10 +2,10 @@
 
 from __future__ import unicode_literals
 
-from admin_interface.compat import FileExtensionValidator
-
 from django.db import migrations, models
 
+from admin_interface.compat import FileExtensionValidator
+
 
 class Migration(migrations.Migration):
 
diff --git a/admin_interface/migrations/0026_theme_list_filter_highlight.py b/admin_interface/migrations/0026_theme_list_filter_highlight.py
index d64375c..9f126c0 100644
--- a/admin_interface/migrations/0026_theme_list_filter_highlight.py
+++ b/admin_interface/migrations/0026_theme_list_filter_highlight.py
@@ -6,13 +6,13 @@ from django.db import migrations, models
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('admin_interface', '0025_theme_language_chooser_control'),
+        ("admin_interface", "0025_theme_language_chooser_control"),
     ]
 
     operations = [
         migrations.AddField(
-            model_name='theme',
-            name='list_filter_highlight',
-            field=models.BooleanField(default=True, verbose_name='highlight active'),
+            model_name="theme",
+            name="list_filter_highlight",
+            field=models.BooleanField(default=True, verbose_name="highlight active"),
         ),
     ]
diff --git a/admin_interface/migrations/0027_theme_list_filter_removal_links.py b/admin_interface/migrations/0027_theme_list_filter_removal_links.py
index f9a2a9a..860e21b 100644
--- a/admin_interface/migrations/0027_theme_list_filter_removal_links.py
+++ b/admin_interface/migrations/0027_theme_list_filter_removal_links.py
@@ -6,13 +6,16 @@ from django.db import migrations, models
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('admin_interface', '0026_theme_list_filter_highlight'),
+        ("admin_interface", "0026_theme_list_filter_highlight"),
     ]
 
     operations = [
         migrations.AddField(
-            model_name='theme',
-            name='list_filter_removal_links',
-            field=models.BooleanField(default=False, verbose_name='quick remove links for active filters at top of sidebar'),
+            model_name="theme",
+            name="list_filter_removal_links",
+            field=models.BooleanField(
+                default=False,
+                verbose_name="quick remove links for active filters at top of sidebar",
+            ),
         ),
     ]
diff --git a/admin_interface/models.py b/admin_interface/models.py
index 34a7e47..7ed731c 100644
--- a/admin_interface/models.py
+++ b/admin_interface/models.py
@@ -2,16 +2,15 @@
 
 from __future__ import unicode_literals
 
-from admin_interface.cache import del_cached_active_theme
-from admin_interface.compat import FileExtensionValidator, force_str, gettext_lazy as _
-
 from colorfield.fields import ColorField
-
 from django.db import models
 from django.db.models.signals import post_delete, post_save, pre_save
-
 from six import python_2_unicode_compatible
 
+from admin_interface.cache import del_cached_active_theme
+from admin_interface.compat import FileExtensionValidator, force_str
+from admin_interface.compat import gettext_lazy as _
+
 
 @python_2_unicode_compatible
 class Theme(models.Model):
@@ -341,8 +340,8 @@ class Theme(models.Model):
         default=True, verbose_name=_("sticky position")
     )
     list_filter_removal_links = models.BooleanField(
-        default=False, verbose_name=_(
-            "quick remove links for active filters at top of sidebar")
+        default=False,
+        verbose_name=_("quick remove links for active filters at top of sidebar"),
     )
 
     foldable_apps = models.BooleanField(default=True, verbose_name=_("foldable apps"))
diff --git a/admin_interface/templatetags/admin_interface_tags.py b/admin_interface/templatetags/admin_interface_tags.py
index 62eb520..6ee25cc 100644
--- a/admin_interface/templatetags/admin_interface_tags.py
+++ b/admin_interface/templatetags/admin_interface_tags.py
@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
 
-import django
 import hashlib
 import re
 
+import django
 from django import template
 from django.conf import settings
 from django.template.loader import get_template
@@ -14,7 +14,6 @@ from admin_interface.compat import NoReverseMatch, reverse
 from admin_interface.models import Theme
 from admin_interface.version import __version__
 
-
 register = template.Library()
 
 if django.VERSION < (1, 9):
diff --git a/setup.py b/setup.py
index eea51fc..5611fa1 100644
--- a/setup.py
+++ b/setup.py
@@ -1,9 +1,10 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-from setuptools import find_packages, setup
+import os
+import sys
 
-import os, sys
+from setuptools import find_packages, setup
 
 exec(open("admin_interface/version.py").read())
 
diff --git a/tests/settings.py b/tests/settings.py
index ff83efc..c2eec7e 100644
--- a/tests/settings.py
+++ b/tests/settings.py
@@ -2,9 +2,10 @@
 
 from __future__ import unicode_literals
 
-import django
 import os
 
+import django
+
 BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 
 SECRET_KEY = "django-admin-interface"
diff --git a/tests/test_models.py b/tests/test_models.py
index 387f43e..d69e450 100644
--- a/tests/test_models.py
+++ b/tests/test_models.py
@@ -2,12 +2,12 @@
 
 from __future__ import unicode_literals
 
-from django.conf import settings
-from django.test import TestCase
-
 import random
 import shutil
 
+from django.conf import settings
+from django.test import TestCase
+
 from admin_interface.models import Theme
 
 
@@ -21,7 +21,7 @@ class AdminInterfaceModelsTestCase(TestCase):
     def __test_active_theme(self):
         theme = Theme.get_active_theme()
         print(theme)
-        self.assertTrue(theme != None)
+        self.assertTrue(theme is not None)
         self.assertTrue(theme.active)
         self.assertEqual(Theme.objects.filter(active=True).count(), 1)
 
diff --git a/tests/test_settings.py b/tests/test_settings.py
index cac8171..d795638 100644
--- a/tests/test_settings.py
+++ b/tests/test_settings.py
@@ -5,7 +5,7 @@ from __future__ import unicode_literals
 import django
 from django.conf import settings
 from django.core.exceptions import ImproperlyConfigured
-from django.test import override_settings, TestCase
+from django.test import TestCase, override_settings
 
 from admin_interface.settings import check_installed_apps
 
diff --git a/tests/test_templatetags.py b/tests/test_templatetags.py
index e05ece7..3f50193 100644
--- a/tests/test_templatetags.py
+++ b/tests/test_templatetags.py
@@ -2,9 +2,9 @@
 
 from __future__ import unicode_literals
 
-from django.test import override_settings, TestCase
-from django.test.client import RequestFactory
 from django.template import Context, Template
+from django.test import TestCase, override_settings
+from django.test.client import RequestFactory
 
 from admin_interface.models import Theme
 from admin_interface.templatetags import admin_interface_tags as templatetags
diff --git a/tests/urls.py b/tests/urls.py
index 1f5603f..9114d88 100644
--- a/tests/urls.py
+++ b/tests/urls.py
@@ -6,11 +6,12 @@ import django
 from django.contrib import admin
 
 if django.VERSION < (2, 0):
-    from django.conf.urls import include, url as re_path
+    from django.conf.urls import include
+    from django.conf.urls import url as re_path
 else:
     from django.urls import include, re_path
-from django.conf.urls.i18n import i18n_patterns
 
+from django.conf.urls.i18n import i18n_patterns
 
 urlpatterns = []
 urlpatterns += [