diff --git a/computes/templates/computes/instances.html b/computes/templates/computes/instances.html
index bdac072..e6416c5 100644
--- a/computes/templates/computes/instances.html
+++ b/computes/templates/computes/instances.html
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 {% load i18n %}
-{% load staticfiles %}
+{% load static %}
 {% load icons %}
 {% block title %}{% trans "Instances" %} - {{ compute.name }}{% endblock %}
 {% block style %}
diff --git a/computes/templates/overview.html b/computes/templates/overview.html
index 2894ebb..bddaa83 100644
--- a/computes/templates/overview.html
+++ b/computes/templates/overview.html
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 {% load i18n %}
-{% load staticfiles %}
+{% load static %}
 {% load icons %}
 
 {% block title %}{% trans "Overview" %} - {{ compute.name }}{% endblock %}
diff --git a/computes/urls.py b/computes/urls.py
index 6e43695..15f6331 100644
--- a/computes/urls.py
+++ b/computes/urls.py
@@ -1,4 +1,4 @@
-from secrets.views import secrets
+from virtsecrets.views import secrets
 
 from django.urls import include, path
 # from instances.views import create_instance, create_instance_select_type
diff --git a/conf/requirements.txt b/conf/requirements.txt
index 8d13382..235cd22 100644
--- a/conf/requirements.txt
+++ b/conf/requirements.txt
@@ -1,4 +1,4 @@
-Django==2.2.22
+Django==3.2.4
 django-bootstrap4==3.0.1
 django-icons==4.0.0
 django-login-required-middleware==0.6.1
diff --git a/console/templates/console-base.html b/console/templates/console-base.html
index 7875f7e..8627cec 100644
--- a/console/templates/console-base.html
+++ b/console/templates/console-base.html
@@ -1,4 +1,4 @@
-{% load staticfiles %}
+{% load static %}
 {% load i18n %}
 <html>
 
diff --git a/console/templates/console-spice-full.html b/console/templates/console-spice-full.html
index da7dae1..0dfed9f 100644
--- a/console/templates/console-spice-full.html
+++ b/console/templates/console-spice-full.html
@@ -24,7 +24,7 @@
 -->
 {% extends "console-base.html" %}
 {% load i18n %}
-{% load staticfiles %}
+{% load static %}
 
 {% block head %}
 <title>WebVirtCloud - Spice Client - Full</title>
diff --git a/console/templates/console-spice-lite.html b/console/templates/console-spice-lite.html
index a984063..469c971 100644
--- a/console/templates/console-spice-lite.html
+++ b/console/templates/console-spice-lite.html
@@ -24,7 +24,7 @@
 -->
 {% extends "console-base.html" %}
 {% load i18n %}
-{% load staticfiles %}
+{% load static %}
 
 {% block head %}
 <title>WebVirtCloud - Spice - Lite</title>
diff --git a/console/templates/console-vnc-full.html b/console/templates/console-vnc-full.html
index 05bf5b4..fae93e5 100755
--- a/console/templates/console-vnc-full.html
+++ b/console/templates/console-vnc-full.html
@@ -1,6 +1,6 @@
 {% extends "console-base.html" %}
 {% load i18n %}
-{% load staticfiles %}
+{% load static %}
 
 {% block head %}
 <!--
diff --git a/console/templates/console-vnc-lite.html b/console/templates/console-vnc-lite.html
index 5d8547e..3da589a 100755
--- a/console/templates/console-vnc-lite.html
+++ b/console/templates/console-vnc-lite.html
@@ -1,6 +1,6 @@
 {% extends "console-base.html" %}
 {% load i18n %}
-{% load staticfiles %}
+{% load static %}
 
 {% block head %}
 <!--
diff --git a/instances/templates/allinstances.html b/instances/templates/allinstances.html
index 8a71a44..c126fa1 100644
--- a/instances/templates/allinstances.html
+++ b/instances/templates/allinstances.html
@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 {% load i18n %}
 {% load icons %}
-{% load staticfiles %}
+{% load static %}
 {% block title %}{% trans "Instances" %}{% endblock %}
 {% block style %}
     <link rel="stylesheet" href="{% static 'css/sortable-theme-bootstrap.css' %}" />
diff --git a/instances/templates/create_instance_w1.html b/instances/templates/create_instance_w1.html
index 522da69..540a1ac 100644
--- a/instances/templates/create_instance_w1.html
+++ b/instances/templates/create_instance_w1.html
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 {% load i18n %}
-{% load staticfiles %}
+{% load static %}
 
 {% block title %}{% trans "Create new instance" %} - {% trans "Select Type" %}{% endblock %}
 
diff --git a/instances/templates/create_instance_w2.html b/instances/templates/create_instance_w2.html
index 301f552..89f9a8d 100644
--- a/instances/templates/create_instance_w2.html
+++ b/instances/templates/create_instance_w2.html
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 {% load i18n %}
-{% load staticfiles %}
+{% load static %}
 {% load icons %}
 {% block title %}{% trans "Create new instance" %}{% endblock %}
 
diff --git a/instances/templates/instance.html b/instances/templates/instance.html
index 161fe93..891a9eb 100644
--- a/instances/templates/instance.html
+++ b/instances/templates/instance.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load i18n %}
 
 {% block title %}{% trans "Instance" %} - {{ instance.name }}{% endblock %}
diff --git a/interfaces/templates/interfaces.html b/interfaces/templates/interfaces.html
index 413691f..d6ec05c 100644
--- a/interfaces/templates/interfaces.html
+++ b/interfaces/templates/interfaces.html
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 {% load i18n %}
-{% load staticfiles %}
+{% load static %}
 
 {% block title %}{% trans "Interfaces" %} - {{ compute.name }}{% endblock %}
 
diff --git a/networks/templates/network.html b/networks/templates/network.html
index 7672038..471b767 100644
--- a/networks/templates/network.html
+++ b/networks/templates/network.html
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 {% load i18n %}
-{% load staticfiles %}
+{% load static %}
 
 {% block title %}{% trans "Network" %} - {{ pool }}{% endblock %}
 
diff --git a/nwfilters/templates/nwfilter.html b/nwfilters/templates/nwfilter.html
index 2034cdb..894f35a 100644
--- a/nwfilters/templates/nwfilter.html
+++ b/nwfilters/templates/nwfilter.html
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 {% load i18n %}
-{% load staticfiles %}
+{% load static %}
 
 {% block title %}{% trans "NWFilter" %}: {{ name }}{% endblock %}
 
diff --git a/nwfilters/templates/nwfilters.html b/nwfilters/templates/nwfilters.html
index 73d75de..3a7f1bf 100644
--- a/nwfilters/templates/nwfilters.html
+++ b/nwfilters/templates/nwfilters.html
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 {% load i18n %}
-{% load staticfiles %}
+{% load static %}
 
 {% block title %}{% trans "NWFilters" %} - {{ compute.name }}{% endblock %}
 
diff --git a/storages/templates/storage.html b/storages/templates/storage.html
index 8a6bd46..bfcd7a7 100644
--- a/storages/templates/storage.html
+++ b/storages/templates/storage.html
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 {% load i18n %}
-{% load staticfiles %}
+{% load static %}
 {% block title %}{{ compute }} - {% trans "Storage" %}: {{ pool }}{% endblock %}
 {% block style %}
     <link rel="stylesheet" href="{% static "css/sortable-theme-bootstrap.css" %}"/>
diff --git a/secrets/__init__.py b/virtsecrets/__init__.py
similarity index 100%
rename from secrets/__init__.py
rename to virtsecrets/__init__.py
diff --git a/secrets/forms.py b/virtsecrets/forms.py
similarity index 100%
rename from secrets/forms.py
rename to virtsecrets/forms.py
diff --git a/secrets/migrations/__init__.py b/virtsecrets/migrations/__init__.py
similarity index 100%
rename from secrets/migrations/__init__.py
rename to virtsecrets/migrations/__init__.py
diff --git a/secrets/models.py b/virtsecrets/models.py
similarity index 100%
rename from secrets/models.py
rename to virtsecrets/models.py
diff --git a/secrets/templates/create_secret_block.html b/virtsecrets/templates/create_secret_block.html
similarity index 100%
rename from secrets/templates/create_secret_block.html
rename to virtsecrets/templates/create_secret_block.html
diff --git a/secrets/templates/secrets.html b/virtsecrets/templates/secrets.html
similarity index 99%
rename from secrets/templates/secrets.html
rename to virtsecrets/templates/secrets.html
index 7536032..74d8fbf 100644
--- a/secrets/templates/secrets.html
+++ b/virtsecrets/templates/secrets.html
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 {% load i18n %}
-{% load staticfiles %}
+{% load static %}
 {% block title %}{% trans "Secrets" %} - {{ compute.name }}{% endblock %}
 
 {% block style %}
diff --git a/secrets/tests.py b/virtsecrets/tests.py
similarity index 100%
rename from secrets/tests.py
rename to virtsecrets/tests.py
diff --git a/secrets/views.py b/virtsecrets/views.py
similarity index 97%
rename from secrets/views.py
rename to virtsecrets/views.py
index 3bcee54..d7804c6 100644
--- a/secrets/views.py
+++ b/virtsecrets/views.py
@@ -1,4 +1,4 @@
-from secrets.forms import AddSecret
+from virtsecrets.forms import AddSecret
 
 from admin.decorators import superuser_only
 from computes.models import Compute
@@ -13,7 +13,7 @@ from libvirt import (
     VIR_SECRET_USAGE_TYPE_VOLUME,
     libvirtError,
 )
-from vrtManager.secrets import wvmSecrets
+from vrtManager.virtsecrets import wvmSecrets
 
 
 @superuser_only
diff --git a/vrtManager/secrets.py b/vrtManager/virtsecrets.py
similarity index 100%
rename from vrtManager/secrets.py
rename to vrtManager/virtsecrets.py
diff --git a/webvirtcloud/settings.py.template b/webvirtcloud/settings.py.template
index 74be031..cc0312a 100644
--- a/webvirtcloud/settings.py.template
+++ b/webvirtcloud/settings.py.template
@@ -3,10 +3,10 @@ Django settings for webvirtcloud project.
 
 """
 
-import os
+from pathlib import Path
 
-# Build paths inside the project like this: os.path.join(BASE_DIR, ...)
-BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+# Build paths inside the project like this: BASE_DIR / 'subdir'.
+BASE_DIR = Path(__file__).resolve().parent.parent
 
 SECRET_KEY = ""
 
@@ -63,7 +63,7 @@ TEMPLATES = [
     {
         "BACKEND": "django.template.backends.django.DjangoTemplates",
         "DIRS": [
-            os.path.join(BASE_DIR, "templates"),
+            Path.joinpath(BASE_DIR, "templates"),
         ],
         "APP_DIRS": True,
         "OPTIONS": {
@@ -83,6 +83,7 @@ TEMPLATES = [
 
 WSGI_APPLICATION = "webvirtcloud.wsgi.application"
 
+
 # Settings for django-icons
 DJANGO_ICONS = {
 
@@ -96,19 +97,20 @@ DJANGO_ICONS = {
     },
 }
 
+
 # Database
 # https://docs.djangoproject.com/en/3.0/ref/settings/#databases
 
 DATABASES = {
     "default": {
         "ENGINE": "django.db.backends.sqlite3",
-        "NAME": os.path.join(BASE_DIR, "db.sqlite3"),
+        "NAME": Path.joinpath(BASE_DIR, "db.sqlite3"),
     }
 }
 
 AUTHENTICATION_BACKENDS = [
     "django.contrib.auth.backends.ModelBackend",
-    "webvirtcloud.ldapbackend.LdapAuthenticationBackend",
+    #"webvirtcloud.ldapbackend.LdapAuthenticationBackend",
 ]
 
 LOGIN_URL = "/accounts/login/"
@@ -128,13 +130,35 @@ USE_TZ = True
 STATIC_URL = "/static/"
 
 STATICFILES_DIRS = [
-    os.path.join(BASE_DIR, "static"),
+    Path.joinpath(BASE_DIR, "static"),
 ]
 
+
+# Default primary key field type
+# https://docs.djangoproject.com/en/3.2/ref/settings/#default-auto-field
+
+DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'
+
+
 LOCALE_PATHS = [
     "locale/",
 ]
 
+
+# Settings for django-icons
+DJANGO_ICONS = {
+
+    'DEFAULTS': {
+        'renderer': 'fontawesome4',
+    },
+
+    'RENDERERS': {
+        'fontawesome4': 'FontAwesome4Renderer',
+        'bootstrap3': 'Bootstrap3Renderer',
+    },
+}
+
+
 LOGGING = {
     "version": 1,
     "disable_existing_loggers": False,
@@ -150,6 +174,7 @@ LOGGING = {
     },
 }
 
+
 #
 # WebVirtCloud settings
 #
@@ -223,10 +248,15 @@ ALLOW_EMPTY_PASSWORD = False
 NEW_USER_DEFAULT_INSTANCES = []
 SHOW_PROFILE_EDIT_PASSWORD = True
 
+
+# OTP Config
 OTP_ENABLED = False
 
 LOGIN_REQUIRED_IGNORE_VIEW_NAMES = ["accounts:login", "accounts:email_otp"]
 
+# LDAP Config
+#
+
 LDAP_ENABLED = False
 LDAP_URL = ''
 LDAP_PORT = 389
