diff --git a/.flake8 b/.flake8
index c0e7ee10b..951d63f65 100644
--- a/.flake8
+++ b/.flake8
@@ -1,8 +1,8 @@
 [flake8]
-exclude = */docs/*,*/.tox/*,*/.venv/*,*/.pycharm_helpers/*,*/migrations/*,docs/*,fabfile.py,*/__init__.py,django_project/core/settings/*.py
+exclude = */docs/*,*/.tox/*,*/.venv/*,*/.pycharm_helpers/*,*/migrations/*,docs/*,fabfile.py,*/__init__.py,django_project/core/settings/*.py,venv/*
 max-line-length = 79
 
 # E12x continuation line indentation
 # E251 no spaces around keyword / parameter equals
 # E303 too many blank lines (3)
-ignore = E125,E126,E251,E303,W504,W60,F405
+ignore = E125,E126,E251,E303,W504,W60,F405,E501
diff --git a/.github/workflows/build-push-images-latest.yaml b/.github/workflows/build-push-images-latest.yaml
index 684759eb5..8fd163aef 100644
--- a/.github/workflows/build-push-images-latest.yaml
+++ b/.github/workflows/build-push-images-latest.yaml
@@ -70,10 +70,10 @@ jobs:
             type=gha,scope=prod
           cache-to: type=gha,scope=prod
 
-      - name: Run docker-compose services
+      - name: Run docker compose services
         working-directory: deployment
         run: |
-          echo "Override docker-compose for testing purposes"
+          echo "Override docker compose for testing purposes"
           cp .env.example .env
           cp docker-compose.test.yml docker-compose.override.yml
           make up
@@ -84,14 +84,14 @@ jobs:
       - name: Run Coverage test
         working-directory: deployment
         run: |
-          cat << EOF | docker-compose exec -T devweb bash
+          cat << EOF | docker compose exec -T devweb bash
           python manage.py makemigrations
           python manage.py migrate
           python manage.py collectstatic --noinput --verbosity 0
           coverage run manage.py test
           coverage xml
           EOF
-          docker cp projecta_devweb_1:/home/web/django_project/coverage.xml ../coverage.xml
+          docker cp projecta-devweb-1:/home/web/django_project/coverage.xml ../coverage.xml
 
       # - name: Upload coverage to codecov
       #   uses: codecov/codecov-action@v2
diff --git a/deployment/.env.example b/deployment/.env.example
index feca9a5a5..277e04857 100644
--- a/deployment/.env.example
+++ b/deployment/.env.example
@@ -43,6 +43,32 @@ HTTPS_PORT=443
 TEST_HTTP_PORT=61202
 SSH_PORT=61203
 
+# Volumes
+MEDIA_VOLUME=./media
+STATIC_VOLUME=./static
+BACKUPS_VOLUME=./backups
+
+# VALID_DOMAIN
+VALID_DOMAIN=["localhost", "changelog.kartoza.com", "staging.changelog.kartoza.com","changelog.qgis.org", "staging.changelog.qgis.org"]
+
+# Email
+EMAIL_BACKEND='django.core.mail.backends.smtp.EmailBackend'
+EMAIL_HOST=''
+EMAIL_PORT=25
+EMAIL_USE_TLS=True
+EMAIL_HOST_USER=''
+EMAIL_HOST_PASSWORD=''
+EMAIL_SUBJECT_PREFIX=''
+MAILDOMAIN=''
+SERVER_EMAIL=''
+ADMIN_EMAIL=''
+DEFAULT_FROM_EMAIL=''
+
+# Stripe
+STRIPE_LIVE_SECRET_KEY='sk_live_key'
+STRIPE_LIVE_PUBLIC_KEY='pk_live_key'
+STRIPE_LIVE_MODE=True
+DJSTRIPE_WEBHOOK_SECRET='whsec_'
 # SENTRY
 SENTRY_DSN=''
-SENTRY_RATE=0.2
\ No newline at end of file
+SENTRY_RATE=0.2
diff --git a/deployment/Makefile b/deployment/Makefile
index 69adeba48..dddd11c6a 100644
--- a/deployment/Makefile
+++ b/deployment/Makefile
@@ -11,7 +11,7 @@ build:
 	@echo "------------------------------------------------------------------"
 	@echo "Building in production mode"
 	@echo "------------------------------------------------------------------"
-	@docker-compose build uwsgi
+	@docker compose build uwsgi
 
 # Add synonymous target
 up: web
@@ -21,13 +21,11 @@ web:
 	@echo "------------------------------------------------------------------"
 	@echo "Running in production mode"
 	@echo "------------------------------------------------------------------"
-	@docker-compose up -d web
+	@docker compose up -d web
 	@# Dont confuse this with the dbbackup make command below
 	@# This one runs the postgis-backup cron container
 	@# We add --no-recreate so that it does not destroy & recreate the db container
-	@docker-compose up --no-recreate --no-deps -d dbbackups
-	@docker-compose up -d btsync-db
-	@docker-compose up -d btsync-media
+	@docker compose up --no-recreate --no-deps -d dbbackups
 
 permissions:
 	# Probably we want something more granular here....
@@ -48,14 +46,14 @@ db:
 	@echo "------------------------------------------------------------------"
 	@echo "Running db in production mode"
 	@echo "------------------------------------------------------------------"
-	@docker-compose up -d db
+	@docker compose up -d db
 
 wait-db:
-	@docker-compose exec -T db su - postgres -c "until pg_isready; do sleep 5; done"
+	@docker compose exec -T db su - postgres -c "until pg_isready; do sleep 5; done"
 
 create-test-db:
-	@docker-compose exec -T db su - postgres -c "psql -c 'create database test_db;'"
-	@docker-compose exec -T db su - postgres -c "psql -d test_db -c 'create extension postgis;'"
+	@docker compose exec -T db su - postgres -c "psql -c 'create database test_db;'"
+	@docker compose exec -T db su - postgres -c "psql -d test_db -c 'create extension postgis;'"
 
 nginx:
 	@echo
@@ -65,7 +63,7 @@ nginx:
 	@echo "In a production environment you will typically use nginx running"
 	@echo "on the host rather if you have a multi-site host."
 	@echo "------------------------------------------------------------------"
-	@docker-compose up -d nginx
+	@docker compose up -d nginx
 	@echo "Site should now be available at http://localhost"
 
 migrate:
@@ -79,26 +77,26 @@ migrate:
 	@# We add the '-' prefix to the next line as the migration may fail
 	@# but we want to continue anyway.
 	@#We need to migrate accounts first as it has a reference to user model
-	-@docker-compose exec uwsgi python manage.py migrate auth
-	@docker-compose exec uwsgi python manage.py migrate
+	-@docker compose exec uwsgi python manage.py migrate auth
+	@docker compose exec uwsgi python manage.py migrate
 
 update-migrations:
 	@echo
 	@echo "------------------------------------------------------------------"
 	@echo "Running update migrations in production mode"
 	@echo "------------------------------------------------------------------"
-	@docker-compose exec uwsgi python manage.py makemigrations
+	@docker compose exec uwsgi python manage.py makemigrations
 
 collectstatic:
 	@echo
 	@echo "------------------------------------------------------------------"
 	@echo "Collecting static in production mode"
 	@echo "------------------------------------------------------------------"
-	#@docker-compose run uwsgi python manage.py collectstatic --noinput
+	#@docker compose run uwsgi python manage.py collectstatic --noinput
 	#We need to run collect static in the same context as the running
 	# uwsgi container it seems so I use docker exec here
 	# no -it flag so we can run over remote shell
-	@docker-compose exec uwsgi python manage.py collectstatic --noinput
+	@docker compose exec uwsgi python manage.py collectstatic --noinput
 
 reload:
 	@echo
@@ -106,23 +104,21 @@ reload:
 	@echo "Reload django project in production mode"
 	@echo "------------------------------------------------------------------"
 	# no -it flag so we can run over remote shell
-	@docker-compose exec uwsgi touch /tmp/django.pid
+	@docker compose exec uwsgi touch /tmp/django.pid
 
 status:
 	@echo
 	@echo "------------------------------------------------------------------"
 	@echo "Show status for all containers"
 	@echo "------------------------------------------------------------------"
-	@docker-compose ps
+	@docker compose ps
 
 kill:
 	@echo
 	@echo "------------------------------------------------------------------"
 	@echo "Killing in production mode"
 	@echo "------------------------------------------------------------------"
-	@docker-compose kill
-	@docker-compose kill btsync-db
-	@docker-compose kill btsync-media
+	@docker compose kill
 
 rm: dbbackup rm-only
 
@@ -136,59 +132,59 @@ rm-only: kill
 	@echo "------------------------------------------------------------------"
 	@echo "Removing production instance!!! "
 	@echo "------------------------------------------------------------------"
-	@docker-compose down
+	@docker compose down
 
 logs:
 	@echo
 	@echo "------------------------------------------------------------------"
 	@echo "Showing uwsgi logs in production mode"
 	@echo "------------------------------------------------------------------"
-	@docker-compose logs -f --tail=50 uwsgi
+	@docker compose logs -f --tail=50 uwsgi
 
 dblogs:
 	@echo
 	@echo "------------------------------------------------------------------"
 	@echo "Showing db logs in production mode"
 	@echo "------------------------------------------------------------------"
-	@docker-compose logs -f --tail=50 db
+	@docker compose logs -f --tail=50 db
 
 nginxlogs:
 	@echo
 	@echo "------------------------------------------------------------------"
 	@echo "Showing nginx logs in production mode"
 	@echo "------------------------------------------------------------------"
-	@docker-compose logs -f --tail=50 web
+	@docker compose logs -f --tail=50 web
 
 shell:
 	@echo
 	@echo "------------------------------------------------------------------"
 	@echo "Shelling in in production mode"
 	@echo "------------------------------------------------------------------"
-	@docker-compose exec uwsgi /bin/bash
+	@docker compose exec uwsgi /bin/bash
 
 superuser:
 	@echo
 	@echo "------------------------------------------------------------------"
 	@echo "Creating a superuser in production mode"
 	@echo "------------------------------------------------------------------"
-	@docker-compose exec uwsgi python manage.py createsuperuser
+	@docker compose exec uwsgi python manage.py createsuperuser
 
 dbbash:
 	@echo
 	@echo "------------------------------------------------------------------"
 	@echo "Bashing in to production database"
 	@echo "------------------------------------------------------------------"
-	@docker-compose exec db /bin/bash
+	@docker compose exec db /bin/bash
 
 dbsnapshot:
 	@echo
 	@echo "------------------------------------------------------------------"
 	@echo "Grab a quick snapshot of the database and place in the host filesystem"
 	@echo "------------------------------------------------------------------"
-	@docker-compose exec -e COMPOSE_PROJECT_NAME -e DATABASE_NAME db /bin/bash -c 'PGPASSWORD="$${PASS}" pg_dump -Fc -h localhost -U "$${USERNAME}" -f "/tmp/$${COMPOSE_PROJECT_NAME}-snapshot.dmp" $${DATABASE_NAME}'
-	@source .env; CONTAINER=`docker-compose ps -q db`; \
+	@docker compose exec -e COMPOSE_PROJECT_NAME -e DATABASE_NAME db /bin/bash -c 'PGPASSWORD="$${PASS}" pg_dump -Fc -h localhost -U "$${USERNAME}" -f "/tmp/$${COMPOSE_PROJECT_NAME}-snapshot.dmp" $${DATABASE_NAME}'
+	@source .env; CONTAINER=`docker compose ps -q db`; \
 	 docker cp "$${CONTAINER}:/tmp/$${COMPOSE_PROJECT_NAME}-snapshot.dmp" .
-	@docker-compose exec -e COMPOSE_PROJECT_NAME db /bin/bash -c 'rm /tmp/$${COMPOSE_PROJECT_NAME}-snapshot.dmp'
+	@docker compose exec -e COMPOSE_PROJECT_NAME db /bin/bash -c 'rm /tmp/$${COMPOSE_PROJECT_NAME}-snapshot.dmp'
 	@ls -lahtr *.dmp
 
 dbschema:
@@ -196,14 +192,14 @@ dbschema:
 	@echo "------------------------------------------------------------------"
 	@echo "Print the database schema to stdio"
 	@echo "------------------------------------------------------------------"
-	@docker-compose exec -e DATABASE_NAME db /bin/bash -c 'PGPASSWORD="$${PASS}" pg_dump -s -h localhost -U "$${USERNAME}" -d "$${DATABASE_NAME}"'
+	@docker compose exec -e DATABASE_NAME db /bin/bash -c 'PGPASSWORD="$${PASS}" pg_dump -s -h localhost -U "$${USERNAME}" -d "$${DATABASE_NAME}"'
 
 dbshell:
 	@echo
 	@echo "------------------------------------------------------------------"
 	@echo "Shelling in in production database"
 	@echo "------------------------------------------------------------------"
-	@docker-compose exec -e DATABASE_NAME db /bin/bash -c 'PGPASSWORD="$${PASS}" psql -h localhost -U "$${USERNAME}" -d "$${DATABASE_NAME}"'
+	@docker compose exec -e DATABASE_NAME db /bin/bash -c 'PGPASSWORD="$${PASS}" psql -h localhost -U "$${USERNAME}" -d "$${DATABASE_NAME}"'
 
 dbrestore:
 	@echo
@@ -212,17 +208,17 @@ dbrestore:
 	@echo "------------------------------------------------------------------"
 	@# - prefix causes command to continue even if it fails
 	@echo "stopping uwsgi container"
-	@docker-compose stop uwsgi
+	@docker compose stop uwsgi
 	@source .env; echo "dropping $$DATABASE_NAME"
-	@docker-compose exec -e DATABASE_NAME db bash -c 'su - postgres -c "dropdb $${DATABASE_NAME}"'
+	-@docker compose exec -e DATABASE_NAME db bash -c 'su - postgres -c "dropdb --force $${DATABASE_NAME}"'
 	@source .env; echo "creating $$DATABASE_NAME"
-	@docker-compose exec -e DATABASE_NAME db bash -c 'su - postgres -c "createdb -O docker -T template_postgis $${DATABASE_NAME}"'
+	-@docker compose exec -e DATABASE_NAME db bash -c 'su - postgres -c "createdb -O docker -T template1 $${DATABASE_NAME}"'
 	@source .env; echo "restoring $$DATABASE_NAME"
 	@# Because we pipe from one docker command to another and we are going
 	@# to execute this Make command from a remote server at times, we need to using use interactive mode (-i)
 	@# in the first command and not use terminal (-t) in the second. Please do not change these!
-	@docker-compose exec -e DATABASE_NAME db /bin/bash -c 'pg_restore /backups/latest.dmp | su - postgres -c "psql $${DATABASE_NAME}"'
-	@docker-compose start uwsgi
+	-@docker compose exec -e DATABASE_NAME db bash -c 'su - postgres -c "pg_restore -c /backups/latest.dmp -d gis"'
+	@docker compose start uwsgi
 	@echo "starting uwsgi container"
 
 dbbackup:
@@ -234,9 +230,9 @@ dbbackup:
 	@echo "------------------------------------------------------------------"
 	@# - prefix causes command to continue even if it fails
 	@# Explicitly don't use -it so we can call this make target over a remote ssh session
-	@docker-compose exec dbbackups /backups.sh
-	@docker-compose exec dbbackups cat /var/log/cron.log | tail -2 | head -1 | awk '{print $4}'
-	@docker-compose exec -e COMPOSE_PROJECT_NAME -w /backups db /bin/bash -c 'ln -sf `date +%Y`/`date +%B`/PG_$${COMPOSE_PROJECT_NAME}_gis.`date +%d-%B-%Y`.dmp latest.dmp'
+	@docker compose exec dbbackups /backups.sh
+	@docker compose exec dbbackups cat /var/log/cron.log | tail -2 | head -1 | awk '{print $4}'
+	@docker compose exec -e COMPOSE_PROJECT_NAME -w /backups db /bin/bash -c 'ln -sf `date +%Y`/`date +%B`/PG_$${COMPOSE_PROJECT_NAME}_gis.`date +%d-%B-%Y`.dmp latest.dmp'
 	@source .env; echo "Backup should be at: backups/`date +%Y`/`date +%B`/PG_$${COMPOSE_PROJECT_NAME}_gis.`date +%d-%B-%Y`.dmp"
 
 sentry:
@@ -244,21 +240,21 @@ sentry:
 	@echo "--------------------------"
 	@echo "Running sentry production mode"
 	@echo "--------------------------"
-	@docker-compose up -d sentry
+	@docker compose up -d sentry
 
 maillogs:
 	@echo
 	@echo "------------------------------------------------------------------"
 	@echo "Showing smtp logs in production mode"
 	@echo "------------------------------------------------------------------"
-	@docker-compose exec smtp tail -f /var/log/mail.log
+	@docker compose exec smtp tail -f /var/log/mail.log
 
 mailerrorlogs:
 	@echo
 	@echo "------------------------------------------------------------------"
 	@echo "Showing smtp error logs in production mode"
 	@echo "------------------------------------------------------------------"
-	@docker-compose exec smtp tail -f /var/log/mail.err
+	@docker compose exec smtp tail -f /var/log/mail.err
 
 mediasync:
 	@echo
@@ -267,8 +263,6 @@ mediasync:
 	@echo "------------------------------------------------------------------"
 	@rsync -av --progress changelog.kartoza.com:/home/projecta/deployment/media/ media
 	@rsync -av --progress changelog.kartoza.com:/home/projecta/django_project/core/settings/secret.py ../django_project/core/settings/
-	@rsync -av --progress changelog.kartoza.com:/home/projecta/deployment/btsync-db.env btsync-db.env.PRODUCTION
-	@rsync -av --progress changelog.kartoza.com:/home/projecta/deployment/btsync-media.env btsync-media.env.PRODUCTION
 
 dbsync:
 	@echo
@@ -316,14 +310,14 @@ devweb: db
 	@echo "------------------------------------------------------------------"
 	@echo "Running in DEVELOPMENT mode"
 	@echo "------------------------------------------------------------------"
-	@docker-compose up --no-deps -d devweb
+	@docker compose up --no-deps -d devweb
 
 devweb-runserver: devweb
 	@echo
 	@echo "------------------------------------------------------------------"
 	@echo "Running in DEVELOPMENT mode"
 	@echo "------------------------------------------------------------------"
-	@docker-compose exec devweb python manage.py runserver 0.0.0.0:8080
+	@docker compose exec devweb python manage.py runserver 0.0.0.0:8080
 
 test-local: devweb flake8 coverage
 
@@ -332,7 +326,7 @@ build-devweb: db
 	@echo "------------------------------------------------------------------"
 	@echo "Building devweb"
 	@echo "------------------------------------------------------------------"
-	@docker-compose build devweb
+	@docker compose build devweb
 
 # Run pep8 style checking
 #http://pypi.python.org/pypi/pep8
@@ -352,22 +346,22 @@ coverage:
 	@echo "-----------"
 	@echo "coverage local test"
 	@echo "-----------"
-	@docker-compose exec devweb coverage run manage.py test --settings=core.settings.test_docker
-	@docker-compose exec devweb coverage report
+	@docker compose exec devweb coverage run manage.py test --settings=core.settings.test_docker
+	@docker compose exec devweb coverage report
 
 update-translation-strings:
 	@echo
 	@echo "------------------------------------------------------------------"
 	@echo "Update strings for translation."
 	@echo "------------------------------------------------------------------"
-	@docker-compose exec uwsgi python manage.py makemessages
+	@docker compose exec uwsgi python manage.py makemessages
 
 compile-translation-strings:
 	@echo
 	@echo "------------------------------------------------------------------"
 	@echo "Compile strings for translation."
 	@echo "------------------------------------------------------------------"
-	@docker-compose exec uwsgi python manage.py compilemessages
+	@docker compose exec uwsgi python manage.py compilemessages
 
 push-translation-source:
 	@echo
diff --git a/deployment/docker-compose.override.example.yml b/deployment/docker-compose.override.example.yml
index 0bbe695f4..eb6b990d6 100644
--- a/deployment/docker-compose.override.example.yml
+++ b/deployment/docker-compose.override.example.yml
@@ -1,7 +1,6 @@
 ## docker-compose override recipe sample
 ## Intended to be used to override default recipe for development environment
 ## Copy paste it as docker-compose.override.yml to use
-version: '3'
 volumes:
   postgres-data:
     driver_opts:
diff --git a/deployment/docker-compose.test.yml b/deployment/docker-compose.test.yml
index dd1a1547f..c76196681 100644
--- a/deployment/docker-compose.test.yml
+++ b/deployment/docker-compose.test.yml
@@ -1,4 +1,3 @@
-version: '3'
 services:
   uwsgi: &uwsgi-common
     image: ${APP_IMAGE}:prod
diff --git a/deployment/docker-compose.yml b/deployment/docker-compose.yml
index 535f9c78b..a154a7e2b 100644
--- a/deployment/docker-compose.yml
+++ b/deployment/docker-compose.yml
@@ -6,7 +6,6 @@
 # docker-compose up -d web
 #
 # See accompanying Make commands for easy collectstatic etc.
-version: '3'
 volumes:
   postgres-data:
   db-backups:
@@ -15,30 +14,33 @@ volumes:
   reports-data:
   nginx-conf:
 services:
-  smtp:
-    image: catatnight/postfix
-    hostname: postfix
-    environment:
-      # You could change this to something more suitable
-      - maildomain=kartoza.com
-      - smtp_user=noreply:docker
-    restart: unless-stopped
+  # smtp:
+  #   image: catatnight/postfix
+  #   hostname: postfix
+  #   environment:
+  #     # You could change this to something more suitable
+  #     - maildomain=kartoza.com
+  #     - smtp_user=noreply:docker
+  #   restart: unless-stopped
 
   db:
-    image: kartoza/postgis:9.6-2.4
+    image: kartoza/postgis:16-3.4
     volumes:
       - postgres-data:/var/lib/postgresql
       - db-backups:/backups
     environment:
-      - USERNAME=${DATABASE_USERNAME}
-      - PASS=${DATABASE_PASSWORD}
+      - POSTGRES_USER=${DATABASE_USERNAME}
+      - POSTGRES_PASS=${DATABASE_PASSWORD}
       - ALLOW_IP_RANGE=0.0.0.0/0
     restart: unless-stopped
     ports:
       - "7543:5432"
 
   uwsgi: &uwsgi-common
-    image: kartoza/projecta-uwsgi
+    build:
+      context: ${PWD}/../
+      dockerfile: deployment/docker/Dockerfile
+      target: prod
     environment:
       - DATABASE_NAME=${DATABASE_NAME}
       - DATABASE_USERNAME=${DATABASE_USERNAME}
@@ -47,6 +49,22 @@ services:
       - DJANGO_SETTINGS_MODULE=${DJANGO_SETTINGS_MODULE}
       - VIRTUAL_HOST=${VIRTUAL_HOST}
       - VIRTUAL_PORT=${VIRTUAL_PORT}
+      - VALID_DOMAIN=${VALID_DOMAIN}
+      - EMAIL_BACKEND=${EMAIL_BACKEND}
+      - EMAIL_HOST=${EMAIL_HOST}
+      - EMAIL_PORT=${EMAIL_PORT}
+      - EMAIL_USE_TLS=${EMAIL_USE_TLS}
+      - EMAIL_HOST_USER=${EMAIL_HOST_USER:-automation}
+      - EMAIL_HOST_PASSWORD=${EMAIL_HOST_PASSWORD}
+      - EMAIL_SUBJECT_PREFIX=${EMAIL_SUBJECT_PREFIX}
+      - MAILDOMAIN=${MAILDOMAIN}
+      - DEFAULT_FROM_EMAIL=${DEFAULT_FROM_EMAIL}
+      - STRIPE_LIVE_SECRET_KEY=${STRIPE_LIVE_SECRET_KEY}
+      - STRIPE_LIVE_PUBLIC_KEY=${STRIPE_LIVE_PUBLIC_KEY}
+      - STRIPE_LIVE_MODE=${STRIPE_LIVE_MODE}
+      - DJSTRIPE_WEBHOOK_SECRET=${DJSTRIPE_WEBHOOK_SECRET}
+      - SERVER_EMAIL=${SERVER_EMAIL}
+      - ADMIN_EMAIL=${ADMIN_EMAIL}
       - SENTRY_DSN=${SENTRY_DSN}
       - SENTRY_RATE=${SENTRY_RATE}
     volumes:
@@ -55,6 +73,7 @@ services:
       - reports-data:/home/web/reports
     links:
       - db:db
+      # - smtp:smtp
     restart: unless-stopped
     user: root
     logging:
@@ -64,7 +83,7 @@ services:
         max-file: "10"
 
   dbbackups:
-    image: kartoza/pg-backup:9.6
+    image: kartoza/pg-backup:16-3.4
     hostname: pg-backups
     volumes:
       - db-backups:/backups
@@ -76,10 +95,10 @@ services:
       - DUMPPREFIX=${DUMPPREFIX}
       # These are all defaults anyway, but setting explicitly in
       # case we ever want to ever use different credentials
-      - PGUSER=${DATABASE_USERNAME}
-      - PGPASSWORD=${DATABASE_PASSWORD}
-      - PGPORT=5432
-      - PGHOST=${DATABASE_HOST}
+      - POSTGRES_USER=${DATABASE_USERNAME}
+      - POSTGRES_PASS=${DATABASE_PASSWORD}
+      - POSTGRES_PORT=5432
+      - POSTGRES_HOST=${DATABASE_HOST}
       - PGDATABASE=${DATABASE_NAME}
     restart: unless-stopped
 
@@ -104,19 +123,10 @@ services:
   # from prod environment if wanted
   devweb:
     <<: *uwsgi-common
+    build:
+      context: ${PWD}/../
+      dockerfile: dockerize/docker/Dockerfile
+      target: dev
 
-  btsync-db:
-    # BTSync backups for database dumps
-    image: kartoza/btsync
-    volumes:
-      # We mount RW so that we can use remove peer to clean up old backups off the server
-      - db-backups:/web:rw
-
-  btsync-media:
-    # BTSync backups for django media
-    image: kartoza/btsync
-    volumes:
-      # We mount RO as we do not really want peers to change this data
-      - media-data:/web:ro
 
 
diff --git a/deployment/docker/Dockerfile b/deployment/docker/Dockerfile
index a69acc9d8..207bda32b 100644
--- a/deployment/docker/Dockerfile
+++ b/deployment/docker/Dockerfile
@@ -1,6 +1,6 @@
 #--------- Generic stuff all our Dockerfiles should start with so we get caching ------------
 # Note this base image is based on debian
-FROM python:3.10 as prod
+FROM python:3.12-slim as prod
 MAINTAINER Tim Sutton<tim@kartoza.com>
 
 RUN  export DEBIAN_FRONTEND=noninteractive
@@ -9,7 +9,7 @@ RUN  dpkg-divert --local --rename --add /sbin/initctl
 
 # Pandoc needed to generate rst dumps, uic compressor needed for django-pipeline
 RUN apt-get update -y && \
-    apt-get -y install python3-gdal python3-geoip sudo curl rpl && \
+    apt-get -y install python3-gdal python3-geoip sudo curl rpl wget && \
     apt-get -y --force-yes install yui-compressor gettext && \
     apt-get -y --purge autoremove make libc-dev musl-dev g++ && \
     apt-get install -y nodejs npm && \
@@ -18,14 +18,15 @@ RUN apt-get update -y && \
     apt-get autoremove -y && \
     rm -rf /var/lib/apt/lists/* /root/.npm /root/.cache && \
     rm -rf ~/.cache/pip
-RUN wget https://github.com/jgm/pandoc/releases/download/1.17.1/pandoc-1.17.1-2-amd64.deb
-RUN dpkg -i pandoc-1.17.1-2-amd64.deb && rm pandoc-1.17.1-2-amd64.deb
+RUN wget https://github.com/jgm/pandoc/releases/download/3.2/pandoc-3.2-1-amd64.deb
+RUN dpkg -i pandoc-3.2-1-amd64.deb && rm pandoc-3.2-1-amd64.deb
 
 # Added because of issue with building cryptography.io using pip
 # This flag disabled rust build, but only for this particular version
 # In the future, we may have to include rust toolchain in the Dockerfile
 ENV CRYPTOGRAPHY_DONT_BUILD_RUST=1
 
+RUN apt-get update -y && apt-get -y install git build-essential libpangocairo-1.0-0
 ADD deployment/docker/REQUIREMENTS.txt /REQUIREMENTS.txt
 ADD deployment/docker/uwsgi.conf /uwsgi.conf
 ADD django_project /home/web/django_project
diff --git a/deployment/docker/REQUIREMENTS-dev.txt b/deployment/docker/REQUIREMENTS-dev.txt
index 50267d864..5ef552784 100644
--- a/deployment/docker/REQUIREMENTS-dev.txt
+++ b/deployment/docker/REQUIREMENTS-dev.txt
@@ -1,8 +1,8 @@
 django-nose
 coverage
-pep8>=1.5.7,<1.6
+pep8
 pylint
-flake8==3.7.9
+flake8
 factory_boy
 
 # documentation
diff --git a/deployment/docker/REQUIREMENTS.txt b/deployment/docker/REQUIREMENTS.txt
index 201566abb..d87dc5809 100644
--- a/deployment/docker/REQUIREMENTS.txt
+++ b/deployment/docker/REQUIREMENTS.txt
@@ -1,50 +1,52 @@
-Django==3.2.13
-
-psycopg2-binary==2.8.6
-django-countries==7.3.2
-django-crispy-forms==1.8.1
-django-braces==1.15.0
-django-model-utils==4.2.0
-django-pipeline==2.0.8
-git+https://github.com/dimasciput/django-pure-pagination.git
-django-reversion==5.0.0
-markdown==3.1.1
-
-easy-thumbnails==2.8.1
-django-widget-tweaks==1.3
-raven==6.10.0
-requests==2.27.1
-django-hashedfilenamestorage==2.3
-# pypandoc is an interface for pandoc converter
-pypandoc==1.4
-beautifulsoup4==4.11.1
-# disqus
-django-disqus==0.5
 # custom slugify
-awesome-slugify==1.6.5
-#translation management tool
-django-rosetta==0.9.8
+awesome-slugify~=1.6
+beautifulsoup4~=4.12
+crispy-bootstrap3~=2024.1
+Django~=4.2
+git+https://github.com/Xpirix/dj-stripe.git@django4_update
+django-allauth~=0.63
+django-braces~=1.15
+# disqus
+django-disqus~=0.5
+django-colorfield~=0.11
+django-countries~=7.6
+django-crispy-forms~=2.1
+django-datatables-view~=1.20
 # youtube embed
-django-embed-video==1.4.3
-django-grappelli==2.13.2
-pytz==2020.5
-django-allauth==0.50.0
-# support special characters
-Unidecode==0.4.20
-Pillow==9.1.0
-reportlab==3.6.9
-xhtml2pdf==0.2.7
-django-modeltranslation==0.16.1
-django-colorfield==0.3.2
-WeasyPrint==0.42.3
-djangorestframework==3.11.2
-django-simple-history==3.0.0
-dj-stripe==2.1.1
-django-preferences==1.0.0
-pinax-notifications==6.0.0
-pinax-templates==2.0.2
+django-embed-video~=1.4
+easy-thumbnails~=2.8
+django-grappelli~=4.0
+# Update for Django 4, the original package is broken
+git+https://github.com/Xpirix/django-hashedfilenamestorage.git
+django-modeltranslation~=0.18
+django-model-utils~=4.5
+django-pipeline~=3.1
+django-preferences~=1.0
+git+https://github.com/dimasciput/django-pure-pagination.git
+django-reversion~=5.0
+#translation management tool
+django-rosetta~=0.10
+django-simple-history~=3.5
 # rich text editor
-django-tinymce==3.4.0
-django-datatables-view==1.19.1
-
-sentry-sdk~=2.2
\ No newline at end of file
+django-tinymce~=4.0
+django-widget-tweaks~=1.5
+djangorestframework~=3.15
+markdown~=3.6
+Pillow~=10.3
+# Update for Django 4, the original package is broken
+git+https://github.com/Xpirix/pinax-notifications.git
+pinax-templates~=3.0
+# pypandoc is an interface for pandoc converter
+pypandoc~=1.13
+psycopg2-binary~=2.9
+pytz~=2024.1
+raven~=6.10
+reportlab~=4.0
+requests~=2.32
+# support special characters
+Unidecode~=0.4
+WeasyPrint~=62.1
+xhtml2pdf~=0.2
+sentry-sdk~=2.2
+setuptools~=75.1
+pyjwt~=2.8
\ No newline at end of file
diff --git a/deployment/sites-enabled/default.conf b/deployment/sites-enabled/default.conf
index 70c91fe52..0189f1e57 100644
--- a/deployment/sites-enabled/default.conf
+++ b/deployment/sites-enabled/default.conf
@@ -33,7 +33,7 @@ server {
     }
 
     # max upload size, adjust to taste
-    client_max_body_size 15M;
+    client_max_body_size 100M;
     # Django media
     location /media  {
         # your Django project's media files - amend as required
diff --git a/django_project/.version b/django_project/.version
index 2bf1c1ccf..4a36342fc 100644
--- a/django_project/.version
+++ b/django_project/.version
@@ -1 +1 @@
-2.3.1
+3.0.0
diff --git a/django_project/base/admin.py b/django_project/base/admin.py
index e70b39833..2e2a3432f 100644
--- a/django_project/base/admin.py
+++ b/django_project/base/admin.py
@@ -15,7 +15,7 @@
 from django.contrib.flatpages.admin import FlatPageAdmin
 from django.contrib.flatpages.models import FlatPage
 from preferences.admin import PreferencesAdmin
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 import reversion
 from .models import (
     Project,
diff --git a/django_project/base/forms.py b/django_project/base/forms.py
index 93cd90142..83607a802 100644
--- a/django_project/base/forms.py
+++ b/django_project/base/forms.py
@@ -4,7 +4,7 @@
 from django.contrib.auth.models import User
 from django.contrib.flatpages.forms import FlatpageForm
 from django.forms import inlineformset_factory
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from crispy_forms.helper import FormHelper
 from crispy_forms.layout import (
     Layout,
diff --git a/django_project/base/migrations/0008_alter_project_accent_color.py b/django_project/base/migrations/0008_alter_project_accent_color.py
new file mode 100644
index 000000000..3b58538b8
--- /dev/null
+++ b/django_project/base/migrations/0008_alter_project_accent_color.py
@@ -0,0 +1,19 @@
+# Generated by Django 4.2.13 on 2024-05-23 13:03
+
+import colorfield.fields
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('base', '0007_project_external_reviewer_invitation'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='project',
+            name='accent_color',
+            field=colorfield.fields.ColorField(blank=True, default='#FF0000', help_text='A color represent the project color', image_field=None, max_length=25, null=True, samples=None),
+        ),
+    ]
diff --git a/django_project/base/models/custom_domain.py b/django_project/base/models/custom_domain.py
index c7576f05a..e15c5a5e0 100644
--- a/django_project/base/models/custom_domain.py
+++ b/django_project/base/models/custom_domain.py
@@ -1,7 +1,7 @@
 # coding=utf-8
 from django.contrib.auth.models import User
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from base.models import Project, Organisation
 
 
diff --git a/django_project/base/models/organisation.py b/django_project/base/models/organisation.py
index f66b55fc0..4d256326a 100644
--- a/django_project/base/models/organisation.py
+++ b/django_project/base/models/organisation.py
@@ -1,7 +1,7 @@
 # coding=utf-8
 from django.contrib.auth.models import User
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 
 class Organisation(models.Model):
diff --git a/django_project/base/models/project.py b/django_project/base/models/project.py
index 647cda8e2..4ca634905 100644
--- a/django_project/base/models/project.py
+++ b/django_project/base/models/project.py
@@ -8,7 +8,7 @@
 from django.utils.text import slugify
 from django.conf.global_settings import MEDIA_ROOT
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from changes.models.version import Version
 from core.settings.contrib import STOP_WORDS
 from django.contrib.auth.models import User
diff --git a/django_project/base/templates/custom_domain/list.html b/django_project/base/templates/custom_domain/list.html
index a2ad6ba70..b37f005b4 100644
--- a/django_project/base/templates/custom_domain/list.html
+++ b/django_project/base/templates/custom_domain/list.html
@@ -62,13 +62,13 @@ <h1 class="text-muted">
         </h1>
     </div>
 
-    {% ifequal num_domains 0 %}
+    {% if num_domains == 0 %}
         {% if unapproved %}
             <h3>All organisation are approved.</h3>
         {% else %}
             <h3>No organisation are defined.</h3>
         {% endif %}
-    {% endifequal %}
+    {% endif %}
 
     {% for domain in domains %}
         <li class="row order" style="list-style-type: none; margin-top:10px; margin-left: 10px; margin-right: 1px" id="{{ domain.id }}-{{ domain.name }}">
diff --git a/django_project/base/templates/organisation/list.html b/django_project/base/templates/organisation/list.html
index 637fa1abb..37d10993a 100644
--- a/django_project/base/templates/organisation/list.html
+++ b/django_project/base/templates/organisation/list.html
@@ -60,13 +60,13 @@ <h1 class="text-muted">
         </h1>
     </div>
 
-    {% ifequal num_organisations 0 %}
+    {% if num_organisations == 0 %}
         {% if unapproved %}
             <h3>All organisation are approved.</h3>
         {% else %}
             <h3>No organisation are defined.</h3>
         {% endif %}
-    {% endifequal %}
+    {% endif %}
 
     {% for organisation in organisations %}
         <li class="row order" style="list-style-type: none; margin-top:10px; margin-left: 10px; margin-right: 1px" id="{{ organisation.id }}-{{ organisation.name }}">
diff --git a/django_project/base/templates/project/list.html b/django_project/base/templates/project/list.html
index b9660b47a..796afcc4e 100644
--- a/django_project/base/templates/project/list.html
+++ b/django_project/base/templates/project/list.html
@@ -89,12 +89,12 @@ <h2 class="text-muted">
         {% endif %}
       </h2>
     </div>
-    {% ifequal num_projects 0 %}
+    {% if num_projects == 0 %}
       <h3>
         No projects are defined, but you can
         <a href="{% url "project-create" %}">create one here</a>.
       </h3>
-    {% endifequal %}
+    {% endif %}
     {% for project in projects %}
       {% include 'project/includes/project-panel.html' %}
     {%  endfor %}
diff --git a/django_project/base/templatetags/custom_markup.py b/django_project/base/templatetags/custom_markup.py
index 60d4fd134..e33093f94 100644
--- a/django_project/base/templatetags/custom_markup.py
+++ b/django_project/base/templatetags/custom_markup.py
@@ -2,7 +2,7 @@
 from django import template
 from django.contrib.staticfiles import finders
 from django.template.defaultfilters import stringfilter
-from django.utils.encoding import force_text as force_unicode
+from django.utils.encoding import force_str as force_unicode
 from django.utils.safestring import mark_safe
 
 register = template.Library()
diff --git a/django_project/base/urls.py b/django_project/base/urls.py
index 1c996a265..b6e013abd 100644
--- a/django_project/base/urls.py
+++ b/django_project/base/urls.py
@@ -1,6 +1,6 @@
 # coding=utf-8
 """Urls for changelog application."""
-from django.conf.urls import url
+from django.urls import re_path as url
 from django.views.static import serve
 from django.conf import settings
 
@@ -46,110 +46,110 @@
 
 urlpatterns = [
     # basic app views
-    url(regex='^$',
+    url(r'^$',
         view=ProjectListView.as_view(),
         name='home'),
 
-    url(regex='^profile/$',
+    url(r'^profile/$',
         view=UserDetailView.as_view(),
         name='user-profile'),
-    url(regex='^edit-profile/(?P<pk>[\w-]+)/$',
+    url(r'^edit-profile/(?P<pk>[\w-]+)/$',
         view=UserUpdateView.as_view(),
         name='edit-profile'),
 
     # Custom domain management
-    url(regex='^domain-not-found/$',
+    url(r'^domain-not-found/$',
         view=DomainNotFound.as_view(),
         name='domain-not-found'),
-    url(regex='^register-domain/$',
+    url(r'^register-domain/$',
         view=RegisterDomainView.as_view(),
         name='register-domain'),
-    url(regex='^domain-success/$',
+    url(r'^domain-success/$',
         view=DomainThankYouView.as_view(),
         name='domain-registered'),
-    url(regex='^domain-list/$',
+    url(r'^domain-list/$',
         view=DomainListView.as_view(),
         name='domain-list'),
-    url(regex='^pending-list-domain/$',
+    url(r'^pending-list-domain/$',
         view=PendingDomainListView.as_view(),
         name='domain-pending-list'),
-    url(regex='^domain-approve/(?P<pk>[\w-]+)/$',
+    url(r'^domain-approve/(?P<pk>[\w-]+)/$',
         view=ApproveDomainView.as_view(),
         name='domain-approve'),
-    url(regex='^domain/(?P<pk>[\w-]+)/delete/$',
+    url(r'^domain/(?P<pk>[\w-]+)/delete/$',
         view=DomainDeleteView.as_view(),
         name='domain-delete'),
-    url(regex='^domain/(?P<pk>[\w-]+)/update/$',
+    url(r'^domain/(?P<pk>[\w-]+)/update/$',
         view=DomainUpdateView.as_view(),
         name='domain-update'),
 
     # Organisation management
-    url(regex='^create-organisation/$',
+    url(r'^create-organisation/$',
         view=CreateOrganisationView.as_view(),
         name='create-organisation'),
-    url(regex='^list-organisation/$',
+    url(r'^list-organisation/$',
         view=OrganisationListView.as_view(),
         name='list-organisation'),
-    url(regex='^pending-list-organisation/$',
+    url(r'^pending-list-organisation/$',
         view=PendingOrganisationListView.as_view(),
         name='pending-list-organisation'),
-    url(regex='^approve-organisation/(?P<pk>[\w-]+)/$',
+    url(r'^approve-organisation/(?P<pk>[\w-]+)/$',
         view=ApproveOrganisationView.as_view(),
         name='approve-organisation'),
-    url(regex='^organisation/(?P<pk>[\w-]+)/delete/$',
+    url(r'^organisation/(?P<pk>[\w-]+)/delete/$',
         view=OrganisationDeleteView.as_view(),
         name='organisation-delete'),
-    url(regex='^organisation/(?P<pk>[\w-]+)/update/$',
+    url(r'^organisation/(?P<pk>[\w-]+)/update/$',
         view=OrganisationUpdateView.as_view(),
         name='organisation-update'),
 
     # Project management
-    url(regex='^pending-project/list/$',
+    url(r'^pending-project/list/$',
         view=PendingProjectListView.as_view(),
         name='pending-project-list'),
-    url(regex='^approve-project/(?P<slug>[\w-]+)/$',
+    url(r'^approve-project/(?P<slug>[\w-]+)/$',
         view=ApproveProjectView.as_view(),
         name='project-approve'),
-    url(regex='^project/list/$',
+    url(r'^project/list/$',
         view=ProjectListView.as_view(),
         name='project-list'),
-    url(regex='^project/preview-certificate/$',
+    url(r'^project/preview-certificate/$',
         view=preview_certificate,
         name='preview-certificate-project'),
-    url(regex='^(?P<slug>[\w-]+)/$',
+    url(r'^(?P<slug>[\w-]+)/$',
         view=ProjectDetailView.as_view(),
         name='project-detail'),
-    url(regex='^(?P<slug>[\w-]+)/ballots/$',
+    url(r'^(?P<slug>[\w-]+)/ballots/$',
         view=ProjectBallotListView.as_view(),
         name='project-ballot-list'),
-    url(regex='^project/(?P<slug>[\w-]+)/delete/$',
+    url(r'^project/(?P<slug>[\w-]+)/delete/$',
         view=ProjectDeleteView.as_view(),
         name='project-delete'),
-    url(regex='^project/create/$',
+    url(r'^project/create/$',
         view=ProjectCreateView.as_view(),
         name='project-create'),
-    url(regex='^project/(?P<slug>[\w-]+)/update/$',
+    url(r'^project/(?P<slug>[\w-]+)/update/$',
         view=ProjectUpdateView.as_view(),
         name='project-update'),
-    url(regex='^project/github-repo/$',
+    url(r'^project/github-repo/$',
         view=GithubProjectView.as_view(),
         name='github-repo-view'),
-    url(regex='^project/get-github-repo/$',
+    url(r'^project/get-github-repo/$',
         view=GithubListView.as_view(),
         name='get-github-repo'),
-    url(regex='^project/get-github-repo-org/(?P<org>[\w-]+)/$',
+    url(r'^project/get-github-repo-org/(?P<org>[\w-]+)/$',
         view=GithubListView.as_view(),
         name='get-github-repo-org'),
-    url(regex='^project/get-github-orgs/$',
+    url(r'^project/get-github-orgs/$',
         view=GithubOrgsView.as_view(),
         name='get-github-orgs'),
-    url(regex='^project/submit-github-repo/$',
+    url(r'^project/submit-github-repo/$',
         view=GithubSubmitView.as_view(),
         name='submit-github-repo'),
-    url(regex='^(?P<slug>[\w-]+)/sponsorship-programme/$',
+    url(r'^(?P<slug>[\w-]+)/sponsorship-programme/$',
         view=project_sponsor_programme,
         name='sponsor-programme'),
-    url(regex='^stripe-intent/(?P<amount>[\d-]+)/$',
+    url(r'^stripe-intent/(?P<amount>[\d-]+)/$',
         view=StripeIntent.as_view(),
         name='stripe-intent'),
 
diff --git a/django_project/base/views/project.py b/django_project/base/views/project.py
index 4c85a0334..3f8748ed3 100644
--- a/django_project/base/views/project.py
+++ b/django_project/base/views/project.py
@@ -163,7 +163,7 @@ def get_object(self, queryset=None):
         return obj
 
 
-class ProjectDeleteView(LoginRequiredMixin, ProjectMixin, DeleteView):
+class ProjectDeleteView(LoginRequiredMixin, DeleteView):
     context_object_name = 'project'
     template_name = 'project/delete.html'
 
diff --git a/django_project/certification/migrations/0025_alter_historicalcertifyingorganisation_options_and_more.py b/django_project/certification/migrations/0025_alter_historicalcertifyingorganisation_options_and_more.py
new file mode 100644
index 000000000..78cc4b186
--- /dev/null
+++ b/django_project/certification/migrations/0025_alter_historicalcertifyingorganisation_options_and_more.py
@@ -0,0 +1,40 @@
+# Generated by Django 4.2.13 on 2024-05-23 13:03
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('certification', '0024_auto_20220605_0612'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='historicalcertifyingorganisation',
+            options={'get_latest_by': ('history_date', 'history_id'), 'ordering': ('-history_date', '-history_id'), 'verbose_name': 'historical certifying organisation', 'verbose_name_plural': 'historical certifying organisations'},
+        ),
+        migrations.AlterModelOptions(
+            name='historicalcertifyingorganisationcertificate',
+            options={'get_latest_by': ('history_date', 'history_id'), 'ordering': ('-history_date', '-history_id'), 'verbose_name': 'historical certifying organisation certificate', 'verbose_name_plural': 'historical certifying organisation certificates'},
+        ),
+        migrations.AlterModelOptions(
+            name='historicalchecklist',
+            options={'get_latest_by': ('history_date', 'history_id'), 'ordering': ('-history_date', '-history_id'), 'verbose_name': 'historical checklist', 'verbose_name_plural': 'historical checklists'},
+        ),
+        migrations.AlterField(
+            model_name='historicalcertifyingorganisation',
+            name='history_date',
+            field=models.DateTimeField(db_index=True),
+        ),
+        migrations.AlterField(
+            model_name='historicalcertifyingorganisationcertificate',
+            name='history_date',
+            field=models.DateTimeField(db_index=True),
+        ),
+        migrations.AlterField(
+            model_name='historicalchecklist',
+            name='history_date',
+            field=models.DateTimeField(db_index=True),
+        ),
+    ]
diff --git a/django_project/certification/models/attendee.py b/django_project/certification/models/attendee.py
index 73b48bf1f..556e66be0 100644
--- a/django_project/certification/models/attendee.py
+++ b/django_project/certification/models/attendee.py
@@ -5,7 +5,7 @@
 
 from django.urls import reverse
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from django.utils.text import slugify
 from django.contrib.auth.models import User
 from core.settings.contrib import STOP_WORDS
diff --git a/django_project/certification/models/certificate.py b/django_project/certification/models/certificate.py
index c8277a608..a96fc9db5 100644
--- a/django_project/certification/models/certificate.py
+++ b/django_project/certification/models/certificate.py
@@ -6,7 +6,7 @@
 from django.urls import reverse
 from django.db import models
 from django.contrib.auth.models import User
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from .course import Course
 from .attendee import Attendee
 
diff --git a/django_project/certification/models/certificate_type.py b/django_project/certification/models/certificate_type.py
index 8647a4014..20fcc5e16 100644
--- a/django_project/certification/models/certificate_type.py
+++ b/django_project/certification/models/certificate_type.py
@@ -1,7 +1,7 @@
 """Certificate type model for certification app"""
 
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from base.models.project import Project
 
diff --git a/django_project/certification/models/certifying_organisation.py b/django_project/certification/models/certifying_organisation.py
index bdd6f20b0..c64481d6b 100644
--- a/django_project/certification/models/certifying_organisation.py
+++ b/django_project/certification/models/certifying_organisation.py
@@ -10,7 +10,7 @@
 from django.core.validators import validate_email
 from django.db import models
 from django.utils.text import slugify
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from core.settings.contrib import STOP_WORDS
 from unidecode import unidecode
 from django.contrib.auth.models import User
diff --git a/django_project/certification/models/checklist.py b/django_project/certification/models/checklist.py
index 7a37e7a78..e206695c0 100644
--- a/django_project/certification/models/checklist.py
+++ b/django_project/certification/models/checklist.py
@@ -1,5 +1,5 @@
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from simple_history.models import HistoricalRecords
 
 ORGANIZATION_OWNER = 'organization_owner'
diff --git a/django_project/certification/models/course.py b/django_project/certification/models/course.py
index 46bbfc8bd..09f5c044d 100644
--- a/django_project/certification/models/course.py
+++ b/django_project/certification/models/course.py
@@ -10,7 +10,7 @@
 from django.db import models
 from django.contrib.auth.models import User
 from django.utils.text import slugify
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 import logging
 from unidecode import unidecode
 from core.settings.contrib import STOP_WORDS
diff --git a/django_project/certification/models/course_convener.py b/django_project/certification/models/course_convener.py
index 6dc2c0750..27deb8af2 100644
--- a/django_project/certification/models/course_convener.py
+++ b/django_project/certification/models/course_convener.py
@@ -9,7 +9,7 @@
 from django.db import models
 from django.contrib.auth.models import User
 from django.utils.text import slugify
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from core.settings.contrib import STOP_WORDS
 from unidecode import unidecode
 from certification.models.certifying_organisation import CertifyingOrganisation
diff --git a/django_project/certification/models/course_type.py b/django_project/certification/models/course_type.py
index b3ac310e8..7e5863efc 100644
--- a/django_project/certification/models/course_type.py
+++ b/django_project/certification/models/course_type.py
@@ -6,7 +6,7 @@
 from django.urls import reverse
 from django.db import models
 from django.contrib.auth.models import User
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from core.settings.contrib import STOP_WORDS
 from unidecode import unidecode
 from django.utils.text import slugify
diff --git a/django_project/certification/models/organisation_certificate.py b/django_project/certification/models/organisation_certificate.py
index f5b792e6d..539624a04 100644
--- a/django_project/certification/models/organisation_certificate.py
+++ b/django_project/certification/models/organisation_certificate.py
@@ -8,7 +8,7 @@
 from django.urls import reverse
 from django.db import models
 from django.contrib.auth.models import User
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from simple_history.models import HistoricalRecords
 from .certifying_organisation import CertifyingOrganisation
 
diff --git a/django_project/certification/models/status.py b/django_project/certification/models/status.py
index f18a32bc5..c9b39b7e3 100644
--- a/django_project/certification/models/status.py
+++ b/django_project/certification/models/status.py
@@ -2,7 +2,7 @@
 """Model for status of the certifying organisation."""
 
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from base.models.project import Project
 
 
diff --git a/django_project/certification/models/training_center.py b/django_project/certification/models/training_center.py
index c76a85fd2..6e9f73843 100644
--- a/django_project/certification/models/training_center.py
+++ b/django_project/certification/models/training_center.py
@@ -4,7 +4,7 @@
 """
 
 from django.urls import reverse
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from django.contrib.auth.models import User
 from django.contrib.gis.db import models
 from .certifying_organisation import (
diff --git a/django_project/certification/serializers/rest_framework_gis/fields.py b/django_project/certification/serializers/rest_framework_gis/fields.py
index cf815c780..499585c1e 100644
--- a/django_project/certification/serializers/rest_framework_gis/fields.py
+++ b/django_project/certification/serializers/rest_framework_gis/fields.py
@@ -4,7 +4,7 @@
 from django.contrib.gis.geos import GEOSGeometry, GEOSException
 from django.contrib.gis.gdal import GDALException
 from django.core.exceptions import ValidationError
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from rest_framework.fields import Field, SerializerMethodField
 
 
diff --git a/django_project/certification/templates/certifying_organisation/detail.html b/django_project/certification/templates/certifying_organisation/detail.html
index 5077c2b09..fc5230fd1 100644
--- a/django_project/certification/templates/certifying_organisation/detail.html
+++ b/django_project/certification/templates/certifying_organisation/detail.html
@@ -572,7 +572,7 @@ <h2 class="custom-heading">Courses</h2>
 
     <div class="menu-wrapper menu-wrapper-body" style="padding: 25px">
     <tr><td>
-    {% ifequal num_course 0 %}
+    {% if num_course == 0 %}
     <div class="menu-details">
     <table>
     <tr><td>
@@ -672,7 +672,7 @@ <h5>No courses are defined, but you can <a
     {%  endfor %}
 
     </table>
-    {% endifequal %}
+    {% endif %}
     </div>
     </div>
 
@@ -709,11 +709,11 @@ <h2 class="custom-heading">Training Centers</h2>
     <div class="menu-details">
     <table>
     <tr><td>
-    {% ifequal num_trainingcenter 0 %}
+    {% if num_trainingcenter == 0 %}
         <h5>No training center are defined, but you can <a
                     class="btn btn-default btn-mini"
                     href='{% url "trainingcenter-create" project_slug=certifyingorganisation.project.slug organisation_slug=certifyingorganisation.slug %}'>register one</a>.</h5>
-    {% endifequal %}
+    {% endif %}
     </td></tr>
 
     {% for trainingcenter in trainingcenters %}
@@ -777,11 +777,11 @@ <h2 class="custom-heading">Course Types</h2>
     <div class="menu-details">
     <table>
     <tr><td>
-    {% ifequal num_coursetype 0 %}
+    {% if num_coursetype == 0 %}
         <h5>No course types are defined, but you can <a
                     class="btn btn-default btn-mini"
                     href='{% url 'coursetype-create' project_slug=certifyingorganisation.project.slug organisation_slug=certifyingorganisation.slug %}'>create one</a>.</h5>
-    {% endifequal %}
+    {% endif %}
     </td></tr>
 
     {% for coursetype in coursetypes %}
@@ -842,11 +842,11 @@ <h2 class="custom-heading">Course Conveners</h2>
     <div class="menu-details">
     <table>
     <tr><td>
-    {% ifequal num_courseconvener 0 %}
+    {% if num_courseconvener == 0 %}
         <h5>No course convener are defined, but you can <a
                     class="btn btn-default btn-mini"
                     href='{% url "courseconvener-create" project_slug=certifyingorganisation.project.slug organisation_slug=certifyingorganisation.slug %}'>register one</a>.</h5>
-    {% endifequal %}
+    {% endif %}
     </td></tr>
 
     {% for courseconvener in courseconveners %}
diff --git a/django_project/certification/templates/certifying_organisation/list.html b/django_project/certification/templates/certifying_organisation/list.html
index 2b7103906..e67be4169 100644
--- a/django_project/certification/templates/certifying_organisation/list.html
+++ b/django_project/certification/templates/certifying_organisation/list.html
@@ -78,13 +78,13 @@ <h1 class="text-muted">
         </h1>
     </div>
 
-    {% ifequal num_certifyingorganisations 0 %}
+    {% if num_certifyingorganisations == 0 %}
         {% if unapproved %}
             <h3>All certifying organisation are approved.</h3>
         {% else %}
             <h3>No certifying organisation are defined.</h3>
         {% endif %}
-    {% endifequal %}
+    {% endif %}
 
     {% include 'certifying_organisation/includes/certifying-organisation-datatable.html' with approved=True %}
 
diff --git a/django_project/certification/templates/certifying_organisation/pending-list.html b/django_project/certification/templates/certifying_organisation/pending-list.html
index 9fd7bf330..9fa678f1c 100644
--- a/django_project/certification/templates/certifying_organisation/pending-list.html
+++ b/django_project/certification/templates/certifying_organisation/pending-list.html
@@ -58,7 +58,7 @@ <h1 class="text-muted">
             {% endif %}
         </h1>
     </div>
-    {% ifequal num_certifyingorganisations 0 %}
+    {% if num_certifyingorganisations == 0 %}
         {% if unapproved %}
             <h3>All certifying organisations are approved.</h3>
         {% else %}
@@ -66,7 +66,7 @@ <h3>No certifying organisations are defined, but you can <a
                     class="btn btn-default btn-mini"
                     href='{% url "certifyingorganisation-create" project_slug %}'>create one</a>.</h3>
         {% endif %}
-    {% endifequal %}
+    {% endif %}
 
     {% include 'certifying_organisation/includes/certifying-organisation-datatable.html' with approved=False %}
 
diff --git a/django_project/certification/templates/certifying_organisation/rejected-list.html b/django_project/certification/templates/certifying_organisation/rejected-list.html
index 159931333..effc9989d 100644
--- a/django_project/certification/templates/certifying_organisation/rejected-list.html
+++ b/django_project/certification/templates/certifying_organisation/rejected-list.html
@@ -54,9 +54,9 @@ <h1 class="text-muted">
         </h1>
     </div>
 
-    {% ifequal num_certifyingorganisations 0 %}
+    {% if num_certifyingorganisations == 0 %}
         <h3>No certifying organisations are rejected.</h3>
-    {% endifequal %}
+    {% endif %}
 
     {% for certifyingorganisation in certifyingorganisations %}
         <div class="col-lg-10">
diff --git a/django_project/certification/tests/views/test_certifying_organisation_views.py b/django_project/certification/tests/views/test_certifying_organisation_views.py
index 22763ae2d..d95ce6d56 100644
--- a/django_project/certification/tests/views/test_certifying_organisation_views.py
+++ b/django_project/certification/tests/views/test_certifying_organisation_views.py
@@ -451,6 +451,6 @@ def test_update_status_command(self):
         call_command('set_status_existing_organisation', stdout=out)
         self.certifying_organisation.refresh_from_db()
         self.pending_certifying_organisation.refresh_from_db()
-        self.assertEquals(self.certifying_organisation.status.name, 'Approved')
-        self.assertEquals(
+        self.assertEqual(self.certifying_organisation.status.name, 'Approved')
+        self.assertEqual(
             self.pending_certifying_organisation.status.name, 'Pending')
diff --git a/django_project/certification/tests/views/test_credit_systems.py b/django_project/certification/tests/views/test_credit_systems.py
index 77dbea9b6..e937e1b14 100644
--- a/django_project/certification/tests/views/test_credit_systems.py
+++ b/django_project/certification/tests/views/test_credit_systems.py
@@ -63,7 +63,7 @@ def test_issue_certificate_with_credit(self):
 
         response = certificate_create.form_valid(form)
         is_paid = form['is_paid'].value()
-        self.assertEquals(response.status_code, 302)
+        self.assertEqual(response.status_code, 302)
 
         # Newly created object test
         certificate = \
@@ -71,11 +71,11 @@ def test_issue_certificate_with_credit(self):
         certificate.is_paid = is_paid
 
         # Test remaining credits in the organisation
-        self.assertEquals(
+        self.assertEqual(
             certificate.course.certifying_organisation.organisation_credits, 7)
 
         # Test status of the certificate
-        self.assertEquals(certificate.is_paid, True)
+        self.assertEqual(certificate.is_paid, True)
 
         # Add another attendee
         course_attendee2 = CourseAttendeeF.create(course=self.course)
@@ -94,17 +94,17 @@ def test_issue_certificate_with_credit(self):
             )
         response = certificate_create.form_valid(form2)
         is_paid = form2['is_paid'].value()
-        self.assertEquals(response.status_code, 302)
+        self.assertEqual(response.status_code, 302)
 
         # Newly created object test
         certificate2 = \
             Certificate.objects.get(attendee=course_attendee2.attendee)
         certificate2.is_paid = is_paid
 
-        self.assertEquals(
+        self.assertEqual(
             certificate2.course.certifying_organisation.organisation_credits,
             4)
-        self.assertEquals(certificate2.is_paid, True)
+        self.assertEqual(certificate2.is_paid, True)
 
     def test_issue_certificate_without_credit(self):
         """Test when the organisation has no credit available."""
@@ -131,14 +131,14 @@ def test_issue_certificate_without_credit(self):
 
         response = certificate_create.form_valid(form)
         is_paid = form['is_paid'].value()
-        self.assertEquals(response.status_code, 302)
+        self.assertEqual(response.status_code, 302)
 
         # Newly created object test
         certificate = \
             Certificate.objects.get(attendee=self.course_attendee.attendee)
         certificate.is_paid = is_paid
 
-        self.assertEquals(
+        self.assertEqual(
             certificate.course.certifying_organisation.organisation_credits,
             -3)
-        self.assertEquals(certificate.is_paid, False)
+        self.assertEqual(certificate.is_paid, False)
diff --git a/django_project/certification/urls.py b/django_project/certification/urls.py
index dc297ce9d..09cdb471e 100644
--- a/django_project/certification/urls.py
+++ b/django_project/certification/urls.py
@@ -1,7 +1,7 @@
 # coding=utf-8
 """Urls for certification apps."""
 
-from django.conf.urls import url
+from django.urls import re_path as url
 
 from .api_views.checklist import UpdateChecklistReviewer
 from .views import (
@@ -104,293 +104,217 @@
 
 urlpatterns = [
     # About page
-    url(regex='^(?P<project_slug>[\w-]+)/about/$',
+    url(r'^(?P<project_slug>[\w-]+)/about/$',
         view=AboutView.as_view(),
         name='about'),
 
     # Certifying Organisation management
-    url(regex='^(?P<project_slug>[\w-]+)/pending-certifyingorganisation/'
-              'list/$',
+    url(r'^(?P<project_slug>[\w-]+)/pending-certifyingorganisation/list/$',
         view=PendingCertifyingOrganisationListView.as_view(),
         name='pending-certifyingorganisation-list'),
-    url(regex='^(?P<project_slug>[\w-]+)/'
-              'certifyingorganisation-json/$',
+    url(r'^(?P<project_slug>[\w-]+)/certifyingorganisation-json/$',
         view=CertifyingOrganisationJson.as_view(),
         name='certifyingorganisation-list-json'),
-    url(regex='^(?P<project_slug>[\w-]+)/approve-certifyingorganisation/'
-              '(?P<slug>[\w-]+)/$',
+    url(r'^(?P<project_slug>[\w-]+)/approve-certifyingorganisation/(?P<slug>[\w-]+)/$',
         view=ApproveCertifyingOrganisationView.as_view(),
         name='certifyingorganisation-approve'),
-    url(regex='^(?P<project_slug>[\w-]+)/reject-certifyingorganisation/'
-              '(?P<slug>[\w-]+)/$',
+    url(r'^(?P<project_slug>[\w-]+)/reject-certifyingorganisation/(?P<slug>[\w-]+)/$',
         view=reject_certifying_organisation,
         name='certifyingorganisation-reject'),
-    url(regex='^(?P<project_slug>[\w-]+)/update-status-certifyingorganisation/'
-              '(?P<slug>[\w-]+)/$',
+    url(r'^(?P<project_slug>[\w-]+)/update-status-certifyingorganisation/(?P<slug>[\w-]+)/$',
         view=UpdateStatusOrganisation.as_view(),
         name='certifyingorganisation-update-status'),
-    url(regex='^(?P<project_slug>[\w-]+)/'
-              'certifyingorganisation/rejected-list/$',
+    url(r'^(?P<project_slug>[\w-]+)/certifyingorganisation/rejected-list/$',
         view=RejectedCertifyingOrganisationListView.as_view(),
         name='certifyingorganisation-rejected-list'),
-    url(regex='^(?P<project_slug>[\w-]+)/certifyingorganisation/list/$',
+    url(r'^(?P<project_slug>[\w-]+)/certifyingorganisation/list/$',
         view=CertifyingOrganisationListView.as_view(),
         name='certifyingorganisation-list'),
-    url(regex='^(?P<project_slug>[\w-]+)/certifyingorganisation/'
-              '(?P<slug>[\w-]+)/$',
+    url(r'^(?P<project_slug>[\w-]+)/certifyingorganisation/(?P<slug>[\w-]+)/$',
         view=CertifyingOrganisationDetailView.as_view(),
         name='certifyingorganisation-detail'),
-    url(regex='^(?P<project_slug>[\w-]+)/certifyingorganisation/'
-              '(?P<slug>[\w-]+)/delete/$',
+    url(r'^(?P<project_slug>[\w-]+)/certifyingorganisation/(?P<slug>[\w-]+)/delete/$',
         view=CertifyingOrganisationDeleteView.as_view(),
         name='certifyingorganisation-delete'),
-    url(regex='^(?P<project_slug>[\w-]+)/create-certifyingorganisation/$',
+    url(r'^(?P<project_slug>[\w-]+)/create-certifyingorganisation/$',
         view=CertifyingOrganisationCreateView.as_view(),
         name='certifyingorganisation-create'),
-    url(regex='^(?P<project_slug>[\w-]+)/certifyingorganisation/'
-              '(?P<slug>[\w-]+)/update/$',
+    url(r'^(?P<project_slug>[\w-]+)/certifyingorganisation/(?P<slug>[\w-]+)/update/$',
         view=CertifyingOrganisationUpdateView.as_view(),
         name='certifyingorganisation-update'),
 
     # Course Type.
-    url(regex='^(?P<project_slug>[\w-]+)/certifyingorganisation/'
-              '(?P<organisation_slug>[\w-]+)/create-coursetype/$',
+    url(r'^(?P<project_slug>[\w-]+)/certifyingorganisation/(?P<organisation_slug>[\w-]+)/create-coursetype/$',
         view=CourseTypeCreateView.as_view(),
         name='coursetype-create'),
-    url(regex='^(?P<project_slug>[\w-]+)/certifyingorganisation/'
-              '(?P<organisation_slug>[\w-]+)/coursetype/'
-              '(?P<pk>[0-9]+)/update/$',
+    url(r'^(?P<project_slug>[\w-]+)/certifyingorganisation/(?P<organisation_slug>[\w-]+)/coursetype/(?P<pk>[0-9]+)/update/$',
         view=CourseTypeUpdateView.as_view(),
         name='coursetype-update'),
-    url(regex='^(?P<project_slug>[\w-]+)/certifyingorganisation/'
-              '(?P<organisation_slug>[\w-]+)/coursetype/'
-              '(?P<pk>[0-9]+)/delete/$',
+    url(r'^(?P<project_slug>[\w-]+)/certifyingorganisation/(?P<organisation_slug>[\w-]+)/coursetype/(?P<pk>[0-9]+)/delete/$',
         view=CourseTypeDeleteView.as_view(),
         name='coursetype-delete'),
-    url(regex='^(?P<project_slug>[\w-]+)/certifyingorganisation/'
-              '(?P<organisation_slug>[\w-]+)/coursetype/(?P<pk>[0-9]+)/$',
+    url(r'^(?P<project_slug>[\w-]+)/certifyingorganisation/(?P<organisation_slug>[\w-]+)/coursetype/(?P<pk>[0-9]+)/$',
         view=CourseTypeDetailView.as_view(),
         name='coursetype-detail'),
 
     # Course convener.
-    url(regex='^(?P<project_slug>[\w-]+)/certifyingorganisation/'
-              '(?P<organisation_slug>[\w-]+)/create-courseconvener/',
+    url(r'^(?P<project_slug>[\w-]+)/certifyingorganisation/(?P<organisation_slug>[\w-]+)/create-courseconvener/',
         view=CourseConvenerCreateView.as_view(),
         name='courseconvener-create'),
-    url(regex='^(?P<project_slug>[\w-]+)/certifyingorganisation/'
-              '(?P<organisation_slug>[\w-]+)/convener/'
-              '(?P<slug>[\w-]+)/delete/$',
+    url(r'^(?P<project_slug>[\w-]+)/certifyingorganisation/(?P<organisation_slug>[\w-]+)/convener/(?P<slug>[\w-]+)/delete/$',
         view=CourseConvenerDeleteView.as_view(),
         name='courseconvener-delete'),
-    url(regex='^(?P<project_slug>[\w-]+)/certifyingorganisation/'
-              '(?P<organisation_slug>[\w-]+)/convener/'
-              '(?P<slug>[\w-]+)/update/$',
+    url(r'^(?P<project_slug>[\w-]+)/certifyingorganisation/(?P<organisation_slug>[\w-]+)/convener/(?P<slug>[\w-]+)/update/$',
         view=CourseConvenerUpdateView.as_view(),
         name='courseconvener-update'),
 
     # Training Center management
-    url(regex='^(?P<project_slug>[\w-]+)/certifyingorganisation/'
-              '(?P<organisation_slug>[\w-]+)/create-trainingcenter/$',
+    url(r'^(?P<project_slug>[\w-]+)/certifyingorganisation/(?P<organisation_slug>[\w-]+)/create-trainingcenter/$',
         view=TrainingCenterCreateView.as_view(),
         name='trainingcenter-create'),
-    url(regex='^(?P<project_slug>[\w-]+)/certifyingorganisation/'
-              '(?P<organisation_slug>[\w-]+)/trainingcenter/'
-              '(?P<slug>[\w-]+)/$',
+    url(r'^(?P<project_slug>[\w-]+)/certifyingorganisation/(?P<organisation_slug>[\w-]+)/trainingcenter/(?P<slug>[\w-]+)/$',
         view=TrainingCenterDetailView.as_view(),
         name='trainingcenter-detail'),
-    url(regex='^(?P<project_slug>[\w-]+)/certifyingorganisation/'
-              '(?P<organisation_slug>[\w-]+)/trainingcenter/'
-              '(?P<slug>[\w-]+)/delete/$',
+    url(r'^(?P<project_slug>[\w-]+)/certifyingorganisation/(?P<organisation_slug>[\w-]+)/trainingcenter/(?P<slug>[\w-]+)/delete/$',
         view=TrainingCenterDeleteView.as_view(),
         name='trainingcenter-delete'),
-    url(regex='^(?P<project_slug>[\w-]+)/certifyingorganisation/'
-              '(?P<organisation_slug>[\w-]+)/trainingcenter/'
-              '(?P<slug>[\w-]+)/update/$',
+    url(r'^(?P<project_slug>[\w-]+)/certifyingorganisation/(?P<organisation_slug>[\w-]+)/trainingcenter/(?P<slug>[\w-]+)/update/$',
         view=TrainingCenterUpdateView.as_view(),
         name='trainingcenter-update'),
 
     # Attendee.
-    url(regex='^(?P<project_slug>[\w-]+)/certifyingorganisation/'
-              '(?P<organisation_slug>[\w-]+)/course/'
-              '(?P<slug>[\w-]+)/create-attendee/$',
+    url(r'^(?P<project_slug>[\w-]+)/certifyingorganisation/(?P<organisation_slug>[\w-]+)/course/(?P<slug>[\w-]+)/create-attendee/$',
         view=AttendeeCreateView.as_view(),
         name='attendee-create'),
-    url(regex='^(?P<project_slug>[\w-]+)/certifyingorganisation/'
-              '(?P<organisation_slug>[\w-]+)/course/'
-              '(?P<course_slug>[\w-]+)/attendee/(?P<pk>[\w-]+)/update/$',
+    url(r'^(?P<project_slug>[\w-]+)/certifyingorganisation/(?P<organisation_slug>[\w-]+)/course/(?P<course_slug>[\w-]+)/attendee/(?P<pk>[\w-]+)/update/$',
         view=AttendeeUpdateView.as_view(),
         name='attendee-update'),
 
-    url(regex='^(?P<project_slug>[\w-]+)/certifyingorganisation/'
-              '(?P<organisation_slug>[\w-]+)/course/'
-              '(?P<slug>[\w-]+)/upload/$',
+    url(r'^(?P<project_slug>[\w-]+)/certifyingorganisation/(?P<organisation_slug>[\w-]+)/course/(?P<slug>[\w-]+)/upload/$',
         view=CsvUploadView.as_view(),
         name='upload-attendee'),
 
     # Course Attendee.
-    url(regex='^(?P<project_slug>[\w-]+)/certifyingorganisation/'
-              '(?P<organisation_slug>[\w-]+)/course/'
-              '(?P<slug>[\w-]+)/create-courseattendee/$',
+    url(r'^(?P<project_slug>[\w-]+)/certifyingorganisation/(?P<organisation_slug>[\w-]+)/course/(?P<slug>[\w-]+)/create-courseattendee/$',
         view=CourseAttendeeCreateView.as_view(),
         name='courseattendee-create'),
 
-    url(regex='^(?P<project_slug>[\w-]+)/certifyingorganisation/'
-              '(?P<organisation_slug>[\w-]+)/course/'
-              '(?P<course_slug>[\w-]+)/courseattendee/'
-              '(?P<pk>[\w-]+)/delete/$',
+    url(r'^(?P<project_slug>[\w-]+)/certifyingorganisation/(?P<organisation_slug>[\w-]+)/course/(?P<course_slug>[\w-]+)/courseattendee/(?P<pk>[\w-]+)/delete/$',
         view=CourseAttendeeDeleteView.as_view(),
         name='courseattendee-delete'),
 
     # Certificate for certifying organisation
-    url(regex='^(?P<project_slug>[\w-]+)/organisationcertificate/'
-              '(?P<organisation_slug>[\w-]+)/issue/$',
+    url(r'^(?P<project_slug>[\w-]+)/organisationcertificate/(?P<organisation_slug>[\w-]+)/issue/$',
         view=OrganisationCertificateCreateView.as_view(),
         name='issue-certificate-organisation'),
-    url(regex='^(?P<project_slug>[\w-]+)/organisationcertificate/'
-              '(?P<organisation_slug>[\w-]+)/print/$',
+    url(r'^(?P<project_slug>[\w-]+)/organisationcertificate/(?P<organisation_slug>[\w-]+)/print/$',
         view=organisation_certificate_pdf_view,
         name='print-certificate-organisation'),
-    url(regex='^(?P<project_slug>[\w-]+)/organisationcertificate/'
-              '(?P<id>[\w-]+)/$',
+    url(r'^(?P<project_slug>[\w-]+)/organisationcertificate/(?P<id>[\w-]+)/$',
         view=OrganisationCertificateDetailView.as_view(),
         name='detail-certificate-organisation'),
 
     # Certificate Type and Checklist.
-    url(regex='^(?P<project_slug>[\w-]+)/certification-management/$',
+    url(r'^(?P<project_slug>[\w-]+)/certification-management/$',
         view=CertificationManagementView.as_view(),
         name='certification-management-view'),
-    url(regex='^(?P<project_slug>[\w-]+)/activate-checklist/$',
+    url(r'^(?P<project_slug>[\w-]+)/activate-checklist/$',
         view=ActivateChecklist.as_view(),
         name='activate-checklist'),
-    url(regex='^(?P<project_slug>[\w-]+)/archive-checklist/$',
+    url(r'^(?P<project_slug>[\w-]+)/archive-checklist/$',
         view=ArchiveChecklist.as_view(),
         name='archive-checklist'),
-    url(regex='^(?P<project_slug>[\w-]+)/update-checklist-order/$',
+    url(r'^(?P<project_slug>[\w-]+)/update-checklist-order/$',
         view=UpdateChecklistOrder.as_view(),
         name='update-checklist-order'),
-    url(regex='^(?P<project_slug>[\w-]+)/certificate-types/update/$',
+    url(r'^(?P<project_slug>[\w-]+)/certificate-types/update/$',
         view=update_project_certificate_view,
         name='certificate-type-update'),
-    url(regex='^(?P<project_slug>[\w-]+)/certificate-checklist/create/',
+    url(r'^(?P<project_slug>[\w-]+)/certificate-checklist/create/',
         view=CertificateChecklistCreateView.as_view(),
         name='certificate-checklist-create'),
-    url(regex='^(?P<project_slug>[\w-]+)/update-checklist-reviewer/'
-              '(?P<slug>[\w-]+)/',
+    url(r'^(?P<project_slug>[\w-]+)/update-checklist-reviewer/(?P<slug>[\w-]+)/',
         view=UpdateChecklistReviewer.as_view(),
         name='update-checklist-reviewer'),
-    url(regex='^(?P<project_slug>[\w-]+)/invite-external-reviewer/'
-              '(?P<slug>[\w-]+)/',
+    url(r'^(?P<project_slug>[\w-]+)/invite-external-reviewer/(?P<slug>[\w-]+)/',
         view=InviteReviewerApiView.as_view(),
         name='invite-external-reviewer'),
-    url(regex='^(?P<project_slug>[\w-]+)/update-external-reviewer-text/',
+    url(r'^(?P<project_slug>[\w-]+)/update-external-reviewer-text/',
         view=UpdateExternalReviewerText.as_view(),
         name='update-external-reviewer-text'),
 
     # Certificate.
-    url(regex='^(?P<project_slug>[\w-]+)/certifyingorganisation/'
-              '(?P<organisation_slug>[\w-]+)/course/'
-              '(?P<course_slug>[\w-]+)/courseattendee/'
-              '(?P<pk>[\w-]+)/create-certificate/$',
+    url(r'^(?P<project_slug>[\w-]+)/certifyingorganisation/(?P<organisation_slug>[\w-]+)/course/(?P<course_slug>[\w-]+)/courseattendee/(?P<pk>[\w-]+)/create-certificate/$',
         view=CertificateCreateView.as_view(),
         name='certificate-create'),
-    url(regex='^(?P<project_slug>[\w-]+)/certifyingorganisation/'
-              '(?P<organisation_slug>[\w-]+)/course/'
-              '(?P<course_slug>[\w-]+)/courseattendee/'
-              '(?P<pk>[\w-]+)/update-certificate-status/$',
+    url(r'^(?P<project_slug>[\w-]+)/certifyingorganisation/(?P<organisation_slug>[\w-]+)/course/(?P<course_slug>[\w-]+)/courseattendee/(?P<pk>[\w-]+)/update-certificate-status/$',
         view=update_paid_status,
         name='paid-certificate'),
-    url(regex='^(?P<project_slug>[\w-]+)/certifyingorganisation/'
-              '(?P<organisation_slug>[\w-]+)/top-up/$',
+    url(r'^(?P<project_slug>[\w-]+)/certifyingorganisation/(?P<organisation_slug>[\w-]+)/top-up/$',
         view=TopUpView.as_view(),
         name='top-up'),
-    url(regex='^(?P<project_slug>[\w-]+)/certificate/'
-              '(?P<id>[\w-]+)/$',
+    url(r'^(?P<project_slug>[\w-]+)/certificate/(?P<id>[\w-]+)/$',
         view=CertificateDetailView.as_view(),
         name='certificate-details'),
-    url(r'^(?P<project_slug>[\w-]+)/certifyingorganisation/'
-        '(?P<organisation_slug>[\w-]+)/course/'
-        '(?P<course_slug>[\w-]+)/print/(?P<pk>[\w-]+)/$',
+    url(r'^(?P<project_slug>[\w-]+)/certifyingorganisation/(?P<organisation_slug>[\w-]+)/course/(?P<course_slug>[\w-]+)/print/(?P<pk>[\w-]+)/$',
         certificate_pdf_view, name='print-certificate'),
-    url(r'^(?P<project_slug>[\w-]+)/certifyingorganisation/'
-        '(?P<organisation_slug>[\w-]+)/course/'
-        '(?P<course_slug>[\w-]+)/revoke/(?P<pk>[\w-]+)/$',
+    url(r'^(?P<project_slug>[\w-]+)/certifyingorganisation/(?P<organisation_slug>[\w-]+)/course/(?P<course_slug>[\w-]+)/revoke/(?P<pk>[\w-]+)/$',
         CertificateRevokeView.as_view(), name='revoke-certificate'),
-    url(r'^(?P<project_slug>[\w-]+)/certifyingorganisation/'
-        '(?P<organisation_slug>[\w-]+)/course/'
-        '(?P<course_slug>[\w-]+)/download_zip/$',
+    url(r'^(?P<project_slug>[\w-]+)/certifyingorganisation/(?P<organisation_slug>[\w-]+)/course/(?P<course_slug>[\w-]+)/download_zip/$',
         download_certificates_zip, name='download_zip_all'),
-    url(r'^(?P<project_slug>[\w-]+)/certifyingorganisation/'
-        '(?P<organisation_slug>[\w-]+)/course/'
-        '(?P<course_slug>[\w-]+)/send_email/$',
+    url(r'^(?P<project_slug>[\w-]+)/certifyingorganisation/(?P<organisation_slug>[\w-]+)/course/(?P<course_slug>[\w-]+)/send_email/$',
         email_all_attendees, name='send_email'),
-    url(r'^(?P<project_slug>[\w-]+)/certifyingorganisation/'
-        '(?P<organisation_slug>[\w-]+)/course/'
-        '(?P<course_slug>[\w-]+)/regenerate-certificate/(?P<pk>[\w-]+)/$',
+    url(r'^(?P<project_slug>[\w-]+)/certifyingorganisation/(?P<organisation_slug>[\w-]+)/course/(?P<course_slug>[\w-]+)/regenerate-certificate/(?P<pk>[\w-]+)/$',
         regenerate_certificate, name='regenerate-certificate'),
-    url(r'^(?P<project_slug>[\w-]+)/certifyingorganisation/'
-        '(?P<organisation_slug>[\w-]+)/course/'
-        '(?P<course_slug>[\w-]+)/regenerate-all-certificate/$',
+    url(r'^(?P<project_slug>[\w-]+)/certifyingorganisation/(?P<organisation_slug>[\w-]+)/course/(?P<course_slug>[\w-]+)/regenerate-all-certificate/$',
         regenerate_all_certificate, name='regenerate-all-certificate'),
-    url(r'^(?P<project_slug>[\w-]+)/certifyingorganisation/'
-        '(?P<organisation_slug>[\w-]+)/course/'
-        '(?P<course_slug>[\w-]+)/generate-all-certificate/$',
+    url(r'^(?P<project_slug>[\w-]+)/certifyingorganisation/(?P<organisation_slug>[\w-]+)/course/(?P<course_slug>[\w-]+)/generate-all-certificate/$',
         generate_all_certificate, name='generate-all-certificate'),
-    url(r'^(?P<project_slug>[\w-]+)/certifyingorganisation/'
-        '(?P<organisation_slug>[\w-]+)/preview-certificate/$',
+    url(r'^(?P<project_slug>[\w-]+)/certifyingorganisation/(?P<organisation_slug>[\w-]+)/preview-certificate/$',
         preview_certificate, name='preview-certificate'),
 
     # Course.
-    url(regex='^(?P<project_slug>[\w-]+)/certifyingorganisation/'
-              '(?P<organisation_slug>[\w-]+)/create-course/',
+    url(r'^(?P<project_slug>[\w-]+)/certifyingorganisation/(?P<organisation_slug>[\w-]+)/create-course/',
         view=CourseCreateView.as_view(),
         name='course-create'),
-    url(regex='^(?P<project_slug>[\w-]+)/certifyingorganisation/'
-              '(?P<organisation_slug>[\w-]+)/course/'
-              '(?P<slug>[\w-]+)/update/$',
+    url(r'^(?P<project_slug>[\w-]+)/certifyingorganisation/(?P<organisation_slug>[\w-]+)/course/(?P<slug>[\w-]+)/update/$',
         view=CourseUpdateView.as_view(),
         name='course-update'),
-    url(regex='^(?P<project_slug>[\w-]+)/certifyingorganisation/'
-              '(?P<organisation_slug>[\w-]+)/course/'
-              '(?P<slug>[\w-]+)/delete/$',
+    url(r'^(?P<project_slug>[\w-]+)/certifyingorganisation/(?P<organisation_slug>[\w-]+)/course/(?P<slug>[\w-]+)/delete/$',
         view=CourseDeleteView.as_view(),
         name='course-delete'),
-    url(regex='^(?P<project_slug>[\w-]+)/certifyingorganisation/'
-              '(?P<organisation_slug>[\w-]+)/course/'
-              '(?P<slug>[\w-]+)/$',
+    url(r'^(?P<project_slug>[\w-]+)/certifyingorganisation/(?P<organisation_slug>[\w-]+)/course/(?P<slug>[\w-]+)/$',
         view=CourseDetailView.as_view(),
         name='course-detail'),
 
     # Search.
-    url(regex='^(?P<project_slug>[\w-]+)/organisationcertificate/$',
+    url(r'^(?P<project_slug>[\w-]+)/organisationcertificate/$',
         view=ValidateCertificateOrganisation.as_view(),
         name='validate-certificate-organisation'),
-    url(regex='^(?P<project_slug>[\w-]+)/certificate/$',
+    url(r'^(?P<project_slug>[\w-]+)/certificate/$',
         view=ValidateCertificate.as_view(), name='validate-certificate'),
 
     # API Views
-    url(regex='^(?P<project_slug>[\w-]+)/get-status-list/$',
+    url(r'^(?P<project_slug>[\w-]+)/get-status-list/$',
         view=GetStatus.as_view(), name='get-status-list'),
 
     # Feeds
-    url(regex='^(?P<project_slug>[\w-]+)/feed/upcoming-course/$',
+    url(r'^(?P<project_slug>[\w-]+)/feed/upcoming-course/$',
         view=GetUpcomingCourseProject.as_view(),
         name='feed-upcoming-project-course'),
-    url(regex='^(?P<project_slug>[\w-]+)/feed/past-course/$',
+    url(r'^(?P<project_slug>[\w-]+)/feed/past-course/$',
         view=GetPastCourseProject.as_view(),
         name='feed-past-project-course'),
-    url(regex='^(?P<project_slug>[\w-]+)/feed/training-center/$',
+    url(r'^(?P<project_slug>[\w-]+)/feed/training-center/$',
         view=GetTrainingCenterProjectLocation.as_view(),
         name='feed-training-center-project'),
-    url(regex='^(?P<project_slug>[\w-]+)/certifyingorganisation/'
-              '(?P<organisation_slug>[\w-]+)/feed/training-center/$',
+    url(r'^(?P<project_slug>[\w-]+)/certifyingorganisation/(?P<organisation_slug>[\w-]+)/feed/training-center/$',
         view=GetTrainingCenterOrganisationLocation.as_view(),
         name='feed-training-center'),
-    url(regex='^(?P<project_slug>[\w-]+)/certifyingorganisation/'
-              '(?P<organisation_slug>[\w-]+)/feed/upcoming-course/$',
+    url(r'^(?P<project_slug>[\w-]+)/certifyingorganisation/(?P<organisation_slug>[\w-]+)/feed/upcoming-course/$',
         view=GetUpcomingCourseOrganisation.as_view(),
         name='feed-upcoming-course'),
-    url(regex='^(?P<project_slug>[\w-]+)/certifyingorganisation/'
-              '(?P<organisation_slug>[\w-]+)/feed/past-course/$',
+    url(r'^(?P<project_slug>[\w-]+)/certifyingorganisation/(?P<organisation_slug>[\w-]+)/feed/past-course/$',
         view=GetPastCourseOrganisation.as_view(),
         name='feed-past-course'),
 
diff --git a/django_project/certification/views/certificate.py b/django_project/certification/views/certificate.py
index 81da6844d..a19c94db3 100644
--- a/django_project/certification/views/certificate.py
+++ b/django_project/certification/views/certificate.py
@@ -23,7 +23,7 @@
 from django.db import IntegrityError
 from django.core.exceptions import ValidationError
 from django.shortcuts import render
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 from braces.views import LoginRequiredMixin
 from djstripe.enums import PaymentIntentStatus
 from djstripe.models import Customer, PaymentIntent
diff --git a/django_project/changes/feeds/json_feed.py b/django_project/changes/feeds/json_feed.py
index 077a70f54..929d286d5 100644
--- a/django_project/changes/feeds/json_feed.py
+++ b/django_project/changes/feeds/json_feed.py
@@ -1,7 +1,7 @@
 # coding=utf-8
 import json
 
-from django.utils.encoding import force_text as force_unicode
+from django.utils.encoding import force_str as force_unicode
 from django.utils.feedgenerator import SyndicationFeed, rfc2822_date
 
 
diff --git a/django_project/changes/forms.py b/django_project/changes/forms.py
index b1c972c72..1f53ff934 100644
--- a/django_project/changes/forms.py
+++ b/django_project/changes/forms.py
@@ -53,8 +53,9 @@ def clean(self):
         cleaned_data = self.cleaned_data
 
         try:
-            Category.objects.get(
-                name=cleaned_data['name'], project=self.project)
+            if 'name' in cleaned_data:
+                Category.objects.get(
+                    name=cleaned_data['name'], project=self.project)
         except Category.DoesNotExist:
             pass
         else:
diff --git a/django_project/changes/models/category.py b/django_project/changes/models/category.py
index 7efd148b1..4d5433f62 100644
--- a/django_project/changes/models/category.py
+++ b/django_project/changes/models/category.py
@@ -5,7 +5,7 @@
 from core.settings.contrib import STOP_WORDS
 
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from changes.models.entry import Entry
 
 logger = logging.getLogger(__name__)
diff --git a/django_project/changes/models/entry.py b/django_project/changes/models/entry.py
index 238c8fa8d..dadb45df0 100644
--- a/django_project/changes/models/entry.py
+++ b/django_project/changes/models/entry.py
@@ -2,7 +2,7 @@
 """Models for changelog entries."""
 from django.urls import reverse
 from django.utils.text import slugify
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 import os
 import logging
 from core.settings.contrib import STOP_WORDS
diff --git a/django_project/changes/models/sponsor.py b/django_project/changes/models/sponsor.py
index 88b715138..9eb801516 100644
--- a/django_project/changes/models/sponsor.py
+++ b/django_project/changes/models/sponsor.py
@@ -7,7 +7,7 @@
 from core.settings.contrib import STOP_WORDS
 from django.conf.global_settings import MEDIA_ROOT
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from django.contrib.auth.models import User
 from django_countries.fields import CountryField
 from django.core.exceptions import ValidationError
diff --git a/django_project/changes/models/sponsorship_level.py b/django_project/changes/models/sponsorship_level.py
index 06f64005b..81066a0b1 100644
--- a/django_project/changes/models/sponsorship_level.py
+++ b/django_project/changes/models/sponsorship_level.py
@@ -6,7 +6,7 @@
 from django.utils.text import slugify
 from core.settings.contrib import STOP_WORDS
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from django.contrib.auth.models import User
 
 __author__ = 'rischan'
diff --git a/django_project/changes/models/sponsorship_period.py b/django_project/changes/models/sponsorship_period.py
index d2fd2f9d2..909790136 100644
--- a/django_project/changes/models/sponsorship_period.py
+++ b/django_project/changes/models/sponsorship_period.py
@@ -9,7 +9,7 @@
 # noinspection PyPackageRequirements
 from core.settings.contrib import STOP_WORDS
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from django.contrib.auth.models import User
 from easy_thumbnails.files import get_thumbnailer
 
diff --git a/django_project/changes/models/version.py b/django_project/changes/models/version.py
index 419abbafa..6cec22596 100644
--- a/django_project/changes/models/version.py
+++ b/django_project/changes/models/version.py
@@ -9,7 +9,7 @@
 from core.settings.contrib import STOP_WORDS
 from django.conf.global_settings import MEDIA_ROOT
 from django.contrib.auth.models import User
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from django.db import models
 from ..utils.custom_slugfield import CustomSlugField
 
diff --git a/django_project/changes/signals/handlers.py b/django_project/changes/signals/handlers.py
index cdb5cb46f..d8efdbbf7 100644
--- a/django_project/changes/signals/handlers.py
+++ b/django_project/changes/signals/handlers.py
@@ -1,4 +1,4 @@
-from django.utils.translation import ugettext_noop as _
+from django.utils.translation import gettext_noop as _
 from django.conf import settings
 from changes import (
     NOTICE_SUSTAINING_MEMBER_CREATED,
diff --git a/django_project/changes/templates/category/list.html b/django_project/changes/templates/category/list.html
index 78db52c76..ac15ad1fd 100644
--- a/django_project/changes/templates/category/list.html
+++ b/django_project/changes/templates/category/list.html
@@ -38,13 +38,13 @@ <h1 class="text-muted">
         </h1>
     </div>
 
-    {% ifequal num_categories 0 %}
+    {% if num_categories == 0 %}
         <h3>No categories are defined, but you can <a
                 class="btn btn-default btn-mini"
                 href='{% url "category-create" project_slug %}'>
             create one</a>.
         </h3>
-    {% endifequal %}
+    {% endif %}
 
     {% if user.is_authenticated and user.is_staff %}
         <ul id="sortable" data-url="{% url "category-submit-order" project_slug %}">
diff --git a/django_project/changes/templates/category/order.html b/django_project/changes/templates/category/order.html
index 62bf657b2..3abea4873 100644
--- a/django_project/changes/templates/category/order.html
+++ b/django_project/changes/templates/category/order.html
@@ -27,9 +27,9 @@ <h1 class="text-muted">
             </div>
         </h1>
     </div>
-    {% ifequal num_categories 0 %}
+    {% if num_categories == 0 %}
         <h3>No categories are defined, but you can</h3>
-    {% endifequal %}
+    {% endif %}
     <ul id="sortable" data-url="{% url "category-submit-order" project_slug %}">
     {% for category in categories %}
         <li class="row order" style="margin-top:6px;" id="{{ category.id }}-{{ category.name }}" >
diff --git a/django_project/changes/templates/sponsor/future-list.html b/django_project/changes/templates/sponsor/future-list.html
index 8d516adf7..3ce040add 100644
--- a/django_project/changes/templates/sponsor/future-list.html
+++ b/django_project/changes/templates/sponsor/future-list.html
@@ -80,13 +80,13 @@ <h1 class="text-muted">
                 </div>
         </h1>
     </div>
-    {% ifequal num_sponsors 0 %}
+    {% if num_sponsors == 0 %}
         {% if unapproved %}
             <h3>All sponsors are approved.</h3>
         {% else %}
             <h3>No sponsors are defined.</h3>
         {% endif %}
-    {% endifequal %}
+    {% endif %}
 
     {% if sponsors %}<h2 class="text-muted">List of Future Sponsors</h2> {% endif %}
 
@@ -131,9 +131,9 @@ <h3>{{ sponsor.sponsor }}</h3>
                         <h5>{{ sponsor.start_date }} - {{ sponsor.end_date }}</h5>
 
                         <h5>{{ sponsor.sponsorship_level }}</h5>
-                        {% ifnotequal sponsor.amount_sponsored None %}
+                        {% if sponsor.amount_sponsored != None %}
                         <h5>Amount sponsored : {{ sponsor.amount_sponsored }} {{ sponsor.currency }}</h5>
-                        {% endifnotequal %}
+                        {% endif %}
                     </div>
                     <div class="col-lg-2">
                         <div class="btn-group pull-right">
diff --git a/django_project/changes/templates/sponsor/list.html b/django_project/changes/templates/sponsor/list.html
index 29c43563a..6d4edb879 100644
--- a/django_project/changes/templates/sponsor/list.html
+++ b/django_project/changes/templates/sponsor/list.html
@@ -94,13 +94,13 @@ <h1 class="text-muted">
                 </div>
         </h1>
     </div>
-    {% ifequal num_sponsors 0 %}
+    {% if num_sponsors == 0 %}
         {% if unapproved %}
             <h3>All sustaining members are approved.</h3>
         {% else %}
             <h3>No sustaining members are defined.</h3>
         {% endif %}
-    {% endifequal %}
+    {% endif %}
 
     {% if sponsors %}<h2 class="text-muted">List of Current Sustaining Members</h2> {% endif %}
 
@@ -145,9 +145,9 @@ <h3 style="margin-top: 0 !important;">{{ sponsor.sponsor }}</h3>
                         <h5>{{ sponsor.start_date }} - {{ sponsor.end_date }}</h5>
 
                         <h5>{{ sponsor.sponsorship_level }}</h5>
-                        {% ifnotequal sponsor.amount_sponsored None %}
+                        {% if sponsor.amount_sponsored != None %}
                         <h5>Amount contributed : {{ sponsor.amount_sponsored }} {{ sponsor.currency }}</h5>
-                        {% endifnotequal %}
+                        {% endif %}
                     </div>
                     <div class="col-lg-2">
                         <div class="btn-group pull-right">
diff --git a/django_project/changes/templates/sponsor/pending-list.html b/django_project/changes/templates/sponsor/pending-list.html
index 223a484a1..90bb84a9b 100644
--- a/django_project/changes/templates/sponsor/pending-list.html
+++ b/django_project/changes/templates/sponsor/pending-list.html
@@ -44,7 +44,7 @@ <h2 class="text-muted">
             {% endif %}
         </h2>
     </div>
-    {% ifequal num_sponsors 0 %}
+    {% if num_sponsors == 0 %}
         {% if unapproved %}
             <h3>All sustaining members are approved.</h3>
         {% else %}
@@ -52,7 +52,7 @@ <h3>No sustaining members are defined, but you can <a
                     class="btn btn-default btn-mini"
                     href='{% url "sponsor-create" project_slug %}'>create one</a>.</h3>
         {% endif %}
-    {% endifequal %}
+    {% endif %}
 
     {% for sponsor in sponsors %}
         <script>console.debug("{{ sponsor }}");</script>
diff --git a/django_project/changes/templates/sponsor/rejected-list.html b/django_project/changes/templates/sponsor/rejected-list.html
index 6713c6dca..187808354 100644
--- a/django_project/changes/templates/sponsor/rejected-list.html
+++ b/django_project/changes/templates/sponsor/rejected-list.html
@@ -36,9 +36,9 @@ <h2 class="text-muted">
             {% endif %}
         </h2>
     </div>
-    {% ifequal num_sponsors 0 %}
+    {% if num_sponsors == 0 %}
         <h3>No rejected sustaining members.</h3>
-    {% endifequal %}
+    {% endif %}
 
     {% for sponsor in sustaining_members %}
         <div class="row" style="margin-top:10px;" data-id="{{ sponsor.id }}" data-project-slug="{{ sponsor.project.slug }}">
diff --git a/django_project/changes/templates/sponsorship_level/list.html b/django_project/changes/templates/sponsorship_level/list.html
index 50a5d0fe8..ea4af6d30 100644
--- a/django_project/changes/templates/sponsorship_level/list.html
+++ b/django_project/changes/templates/sponsorship_level/list.html
@@ -35,7 +35,7 @@ <h1 class="text-muted">
             {% endif %}
         </h1>
     </div>
-    {% ifequal num_sponsorshiplevels 0 %}
+    {% if num_sponsorshiplevels == 0 %}
         {% if unapproved %}
             <h3>All sustaining membership level are approved.</h3>
         {% else %}
@@ -43,7 +43,7 @@ <h3>No sustaining membership level are defined, but you can <a
                     class="btn btn-default btn-mini"
                     href='{% url "sponsorshiplevel-create" project_slug %}'>create one</a>.</h3>
         {% endif %}
-    {% endifequal %}
+    {% endif %}
 
     {% for sponsorshiplevel in sponsorshiplevels %}
         <script>console.debug("{{ sponsorshiplevel }}");</script>
diff --git a/django_project/changes/templates/sponsorship_period/detail.html b/django_project/changes/templates/sponsorship_period/detail.html
index a1b8379bd..b3067ee86 100644
--- a/django_project/changes/templates/sponsorship_period/detail.html
+++ b/django_project/changes/templates/sponsorship_period/detail.html
@@ -37,11 +37,11 @@ <h3>{{ sponsorshipperiod.sponsor.name }}</h3>
           Start Date : {{ sponsorshipperiod.start_date }}<br/>
           End Date : {{ sponsorshipperiod.end_date }}<br/>
           Amount Paid :
-            {% ifnotequal sponsorshipperiod.amount_sponsored None %}
+            {% if sponsorshipperiod.amount_sponsored != None %}
                 {{ sponsorshipperiod.amount_sponsored }} {{ sponsorshipperiod.currency }}<br/>
             {% else %}
                 n/a
-            {% endifnotequal %}
+            {% endif %}
         {% if sponsorshipperiod.sponsorshiplevel.logo %}
         <img class="img-responsive img-rounded"
              src="{{ sponsorshipperiod.sponsorshiplevel.logo.url }}" width="100" />
diff --git a/django_project/changes/templates/sponsorship_period/list.html b/django_project/changes/templates/sponsorship_period/list.html
index 11989aad5..00de6280b 100644
--- a/django_project/changes/templates/sponsorship_period/list.html
+++ b/django_project/changes/templates/sponsorship_period/list.html
@@ -36,7 +36,7 @@ <h1 class="text-muted">
             {% endif %}
         </h1>
     </div>
-    {% ifequal num_sponsorshipperiods 0 %}
+    {% if num_sponsorshipperiods == 0 %}
         {% if unapproved %}
             <h3>All sustaining membership period are approved.</h3>
         {% else %}
@@ -44,7 +44,7 @@ <h3>No sustaining membership period are defined, but you can <a
                     class="btn btn-default btn-mini"
                     href='{% url "sponsorshipperiod-create" project_slug %}'>create one</a>.</h3>
         {% endif %}
-    {% endifequal %}
+    {% endif %}
 
 
     <div class="container" style="margin-top: -18px !important;">
diff --git a/django_project/changes/templates/version/detail-thumbs.html b/django_project/changes/templates/version/detail-thumbs.html
index 00ed9e971..3908aea2f 100644
--- a/django_project/changes/templates/version/detail-thumbs.html
+++ b/django_project/changes/templates/version/detail-thumbs.html
@@ -72,10 +72,10 @@ <h2 class="muted pull-right">
     </div>
 {% endif %}
 </div>
-    {% ifequal num_entries 0 %}
+    {% if num_entries == 0 %}
         <h3>No entries are defined (use the 'add' menu above to create them).
         </h3>
-    {% endifequal %}
+    {% endif %}
     <hr />
 
     {% for entry in version.entries %}
diff --git a/django_project/changes/templates/version/list.html b/django_project/changes/templates/version/list.html
index a99a45382..64749c3cb 100644
--- a/django_project/changes/templates/version/list.html
+++ b/django_project/changes/templates/version/list.html
@@ -35,11 +35,11 @@ <h1 class="text-muted">
             </div>
         </h1>
     </div>
-    {%  ifequal num_versions 0 %}
+    {% if num_versions == 0 %}
         <h3>No versions are defined.</h3>
     {% else %}
         {% for version in versions %}
             {% include 'version/includes/version-list-detail.html' %}
         {%  endfor %}
-    {%  endifequal %}
+    {%  endif %}
 {% endblock %}
diff --git a/django_project/changes/tests/test_models.py b/django_project/changes/tests/test_models.py
index 24a338a53..0306dfd25 100644
--- a/django_project/changes/tests/test_models.py
+++ b/django_project/changes/tests/test_models.py
@@ -217,7 +217,7 @@ def test_formatted_release_date(self):
             description=u'New description',
             release_date=datetime(2016, 6, 6),
         )
-        self.assertEquals(model.formatted_release_date(), '6 June, 2016')
+        self.assertEqual(model.formatted_release_date(), '6 June, 2016')
 
     def test_Version_delete(self):
         """
diff --git a/django_project/changes/tests/test_views.py b/django_project/changes/tests/test_views.py
index 752b59a46..ccf1e63a0 100644
--- a/django_project/changes/tests/test_views.py
+++ b/django_project/changes/tests/test_views.py
@@ -756,7 +756,7 @@ def test_VersionDownload_no_login(self):
         self.assertEqual(response.status_code, 302)
 
     @override_settings(VALID_DOMAIN=['testserver', ])
-    @mock.patch('pypandoc.convert', side_effect=mocked_convert)
+    @mock.patch('pypandoc.convert_text', side_effect=mocked_convert)
     def test_VersionDownload_login(self, mocked_convert):
         self.client.login(username='timlinux', password='password')
         other_project = ProjectF.create(name='testproject2')
@@ -774,7 +774,7 @@ def test_VersionDownload_login(self, mocked_convert):
         self.assertEqual(response.status_code, 200)
 
     @override_settings(VALID_DOMAIN=['testserver', ])
-    @mock.patch('pypandoc.convert', side_effect=mocked_convert)
+    @mock.patch('pypandoc.convert_text', side_effect=mocked_convert)
     def test_VersionDownloadMd(self, mocked_convert):
         other_project = ProjectF.create(name='testproject2')
         version_same_name_from_other_project = VersionF.create(
@@ -791,7 +791,7 @@ def test_VersionDownloadMd(self, mocked_convert):
         self.assertEqual(response.status_code, 200)
 
     @override_settings(VALID_DOMAIN=['testserver', ])
-    @mock.patch('pypandoc.convert', side_effect=mocked_convert)
+    @mock.patch('pypandoc.convert_text', side_effect=mocked_convert)
     def test_VersionDownload_login_notfound(self, mocked_convert):
         self.client.login(username='timlinux', password='password')
         response = self.client.get(reverse('version-download', kwargs={
diff --git a/django_project/changes/urls.py b/django_project/changes/urls.py
index b89aba6e9..18a430a74 100644
--- a/django_project/changes/urls.py
+++ b/django_project/changes/urls.py
@@ -2,7 +2,7 @@
 # flake8: noqa
 """Urls for changelog application."""
 
-from django.conf.urls import url, include  # noqa
+from django.urls import re_path as url, include  # noqa
 from django.views.static import serve
 
 from django.conf import settings
@@ -105,153 +105,147 @@
     # Category management
 
     # This view is only accessible via ajax
-    url(regex='^json-category/list/(?P<version>\d+)/$',
+    url(r'^json-category/list/(?P<version>\d+)/$',
         view=JSONCategoryListView.as_view(),
         name='json-category-list'),
-    url(regex='^(?P<project_slug>[\w-]+)/category/list/$',
+    url(r'^(?P<project_slug>[\w-]+)/category/list/$',
         view=CategoryListView.as_view(),
         name='category-list'),
-    url(regex='^(?P<project_slug>[\w-]+)/category/order/$',
+    url(r'^(?P<project_slug>[\w-]+)/category/order/$',
         view=CategoryOrderView.as_view(),
         name='category-order'),
-    url(regex='^(?P<project_slug>[\w-]+)/category/submit_order/$',
+    url(r'^(?P<project_slug>[\w-]+)/category/submit_order/$',
         view=CategoryOrderSubmitView.as_view(),
         name='category-submit-order'),
-    url(regex='^(?P<project_slug>[\w-]+)/category/(?P<slug>[\w-]+)/$',
+    url(r'^(?P<project_slug>[\w-]+)/category/(?P<slug>[\w-]+)/$',
         view=CategoryDetailView.as_view(),
         name='category-detail'),
-    url(regex='^(?P<project_slug>[\w-]+)/category/(?P<slug>[\w-]+)/delete/$',
+    url(r'^(?P<project_slug>[\w-]+)/category/(?P<slug>[\w-]+)/delete/$',
         view=CategoryDeleteView.as_view(),
         name='category-delete'),
-    url(regex='^(?P<project_slug>[\w-]+)/create-category/$',
+    url(r'^(?P<project_slug>[\w-]+)/create-category/$',
         view=CategoryCreateView.as_view(),
         name='category-create'),
-    url(regex='^(?P<project_slug>[\w-]+)/category/(?P<slug>[\w-]+)/update/$',
+    url(r'^(?P<project_slug>[\w-]+)/category/(?P<slug>[\w-]+)/update/$',
         view=CategoryUpdateView.as_view(),
         name='category-update'),
 
     # Version management
-    url(regex='^(?P<project_pk>[\w-]+)/version/fetch-github-pr/$',
+    url(r'^(?P<project_pk>[\w-]+)/version/fetch-github-pr/$',
         view=FetchGithubPRs.as_view(),
         name='fetch-pr-github'),
-    url(regex='^(?P<project_pk>[\w-]+)/version/fetch-github-label/$',
+    url(r'^(?P<project_pk>[\w-]+)/version/fetch-github-label/$',
         view=FetchRepoLabels.as_view(),
         name='fetch-labels-github'),
-    url(regex='^(?P<project_pk>[\w-]+)/version/fetch-category/$',
+    url(r'^(?P<project_pk>[\w-]+)/version/fetch-category/$',
         view=FetchCategory.as_view(),
         name='fetch-category'),
-    url(regex='^(?P<project_slug>[\w-]+)/version/list/$',
+    url(r'^(?P<project_slug>[\w-]+)/version/list/$',
         view=VersionListView.as_view(),
         name='version-list'),
-    url(regex='^(?P<project_slug>[\w-]+)/version/(?P<slug>[\w.-]+)/'
-              'download-referenced-images/$',
+    url(r'^(?P<project_slug>[\w-]+)/version/(?P<slug>[\w.-]+)/download-referenced-images/$',
         view=download_all_referenced_images,
         name='download-referenced-images'),
-    url(regex='^(?P<project_slug>[\w-]+)/version/(?P<slug>[\w.-]+)/markdown/$',
+    url(r'^(?P<project_slug>[\w-]+)/version/(?P<slug>[\w.-]+)/markdown/$',
         view=VersionMarkdownView.as_view(),
         name='version-markdown'),
-    url(regex='^(?P<project_slug>[\w-]+)/version/(?P<slug>[\w.-]+)/$',
+    url(r'^(?P<project_slug>[\w-]+)/version/(?P<slug>[\w.-]+)/$',
         view=VersionDetailView.as_view(),
         name='version-detail'),
-    url(regex='^(?P<project_slug>[\w-]+)/version/(?P<slug>[\w.-]+)/thumbs/$',
+    url(r'^(?P<project_slug>[\w-]+)/version/(?P<slug>[\w.-]+)/thumbs/$',
         view=VersionThumbnailView.as_view(),
         name='version-thumbs'),
-    url(regex='^(?P<project_slug>[\w-]+)/version/(?P<slug>[\w.-]+)/delete/$',
+    url(r'^(?P<project_slug>[\w-]+)/version/(?P<slug>[\w.-]+)/delete/$',
         view=VersionDeleteView.as_view(),
         name='version-delete'),
-    url(regex='^(?P<project_slug>[\w-]+)/create-version/$',
+    url(r'^(?P<project_slug>[\w-]+)/create-version/$',
         view=VersionCreateView.as_view(),
         name='version-create'),
-    url(regex='^(?P<project_slug>[\w-]+)/version/(?P<slug>[\w.-]+)/update/$',
+    url(r'^(?P<project_slug>[\w-]+)/version/(?P<slug>[\w.-]+)/update/$',
         view=VersionUpdateView.as_view(),
         name='version-update'),
-    url(regex='^(?P<project_slug>[\w-]+)/version/(?P<slug>[\w.-]+)/download/$',
+    url(r'^(?P<project_slug>[\w-]+)/version/(?P<slug>[\w.-]+)/download/$',
         view=VersionDownload.as_view(),
         name='version-download'),
-    url(regex='^(?P<project_slug>[\w-]+)/version/(?P<slug>[\w.-]+)/md/$',
+    url(r'^(?P<project_slug>[\w-]+)/version/(?P<slug>[\w.-]+)/md/$',
         view=VersionDownloadMd.as_view(),
         name='version-download-md'),
-    url(regex='^(?P<project_slug>[\w-]+)/version/(?P<slug>[\w.-]+)/gnu/$',
+    url(r'^(?P<project_slug>[\w-]+)/version/(?P<slug>[\w.-]+)/gnu/$',
         view=VersionDownloadGnu.as_view(),
         name='version-download-gnu'),
-    url(regex='^(?P<project_slug>[\w-]+)/version/(?P<slug>[\w.-]+)/downloadmember/$',
+    url(r'^(?P<project_slug>[\w-]+)/version/(?P<slug>[\w.-]+)/downloadmember/$',
         view=VersionSponsorDownload.as_view(),
         name='version-sponsor-download'),
-    url(regex='^(?P<project_slug>[\w-]+)/version/(?P<slug>[\w.-]+)/locked/$',
+    url(r'^(?P<project_slug>[\w-]+)/version/(?P<slug>[\w.-]+)/locked/$',
         view=LockVersion.as_view(),
         name='version-locked'),
-    url(regex='^(?P<project_slug>[\w-]+)/version/(?P<slug>[\w.-]+)/unlocked/$',
+    url(r'^(?P<project_slug>[\w-]+)/version/(?P<slug>[\w.-]+)/unlocked/$',
         view=UnlockVersion.as_view(),
         name='version-unlocked'),
 
     # Changelog entry management
-    url(regex='^entry/(?P<pk>\d+)$',
+    url(r'^entry/(?P<pk>\d+)$',
         view=EntryDetailView.as_view(),
         name='entry-detail'),
-    url(regex='^entry/delete/(?P<pk>\d+)$',
+    url(r'^entry/delete/(?P<pk>\d+)$',
         view=EntryDeleteView.as_view(),
         name='entry-delete'),
-    url(regex='^(?P<project_slug>[\w-]+)/(?P<version_slug>[\w.-]+)/'
-              'create-entry/$',
+    url(r'^(?P<project_slug>[\w-]+)/(?P<version_slug>[\w.-]+)/create-entry/$',
         view=EntryCreateView.as_view(),
         name='entry-create'),
-    url(regex='^entry/update/(?P<pk>\d+)$',
+    url(r'^entry/update/(?P<pk>\d+)$',
         view=EntryUpdateView.as_view(),
         name='entry-update'),
-    url(regex='^(?P<project_pk>[\w-]+)/version/(?P<version_pk>[\w.-]+)/'
-              'order/(?P<category_pk>[\w-]+)$',
+    url(r'^(?P<project_pk>[\w-]+)/version/(?P<version_pk>[\w.-]+)/order/(?P<category_pk>[\w-]+)$',
         view=EntryOrderView.as_view(),
         name='entry-order'),
-    url(regex='^(?P<project_pk>[\w-]+)/version/(?P<version_pk>[\w.-]+)/'
-              'submit-order/(?P<category_pk>[\w-]+)$',
+    url(r'^(?P<project_pk>[\w-]+)/version/(?P<version_pk>[\w.-]+)/submit-order/(?P<category_pk>[\w-]+)$',
         view=EntryOrderSubmitView.as_view(),
         name='entry-submit-order'),
 
     # Feeds
-    url(regex='^(?P<project_slug>[\w-]+)/rss/latest-version/$',
+    url(r'^(?P<project_slug>[\w-]+)/rss/latest-version/$',
         view=RssVersionFeed(),
         name='latest-version-rss-feed'),
-    url(regex='^(?P<project_slug>[\w-]+)/atom/latest-version/$',
+    url(r'^(?P<project_slug>[\w-]+)/atom/latest-version/$',
         view=AtomVersionFeed(),
         name='latest-version-atom-feed'),
-    url(regex='^(?P<project_slug>[\w-]+)/rss/latest-entry/$',
+    url(r'^(?P<project_slug>[\w-]+)/rss/latest-entry/$',
         view=RssEntryFeed(),
         name='latest-entry-rss-feed'),
-    url(regex='^(?P<project_slug>[\w-]+)/atom/latest-entry/$',
+    url(r'^(?P<project_slug>[\w-]+)/atom/latest-entry/$',
         view=AtomEntryFeed(),
         name='latest-entry-atom-feed'),
 
     # Feeds specific version and projects
-    url(regex='^(?P<project_slug>[\w-]+)/version/(?P<version_slug>['
-              '\w.-]+)/rss$',
+    url(r'^(?P<project_slug>[\w-]+)/version/(?P<version_slug>[\w.-]+)/rss$',
         view=RssEntryFeed(),
         name='entry-rss-feed'),
-    url(regex='^(?P<project_slug>[\w-]+)/version/(?P<version_slug>['
-              '\w.-]+)/atom$',
+    url(r'^(?P<project_slug>[\w-]+)/version/(?P<version_slug>[\w.-]+)/atom$',
         view=AtomEntryFeed(),
         name='entry-atom-feed'),
 
-    url(regex='^(?P<project_slug>[\w-]+)/member/(?P<slug>[\w-]+)/invoice/$',
+    url(r'^(?P<project_slug>[\w-]+)/member/(?P<slug>[\w-]+)/invoice/$',
         view=GenerateSponsorPDFView.as_view(),
         name='sponsor-invoice'),
 
     # Feeds sponsors in a specific project
-    url(regex='^(?P<project_slug>[\w-]+)/members/rss/$',
+    url(r'^(?P<project_slug>[\w-]+)/members/rss/$',
         view=RssSponsorFeed(),
         name='sponsor-rss-feed'),
-    url(regex='^(?P<project_slug>[\w-]+)/past-members/rss/$',
+    url(r'^(?P<project_slug>[\w-]+)/past-members/rss/$',
         view=RssPastSponsorFeed(),
         name='past-sponsor-rss-feed'),
-    url(regex='^(?P<project_slug>[\w-]+)/members/atom/$',
+    url(r'^(?P<project_slug>[\w-]+)/members/atom/$',
         view=AtomSponsorFeed(),
         name='sponsor-atom-feed'),
-    url(regex='^(?P<project_slug>[\w-]+)/past-members/atom/$',
+    url(r'^(?P<project_slug>[\w-]+)/past-members/atom/$',
         view=AtomPastSponsorFeed(),
         name='past-sponsor-atom-feed'),
-    url(regex='^(?P<project_slug>[\w-]+)/members/json/$',
+    url(r'^(?P<project_slug>[\w-]+)/members/json/$',
         view=JSONSponsorFeed(),
         name='sponsor-json-feed'),
-    url(regex='^(?P<project_slug>[\w-]+)/past-members/json/$',
+    url(r'^(?P<project_slug>[\w-]+)/past-members/json/$',
         view=JSONPastSponsorFeed(),
         name='past-sponsor-json-feed'),
 
@@ -261,126 +255,123 @@
     # Sponsor management
 
     # This view is only accessible via ajax
-    url(regex='^json-member/list/(?P<version>\d+)/$',
+    url(r'^json-member/list/(?P<version>\d+)/$',
         view=JSONSponsorListView.as_view(),
         name='json-sponsor-list'),
-    url(regex='^(?P<project_slug>[\w-]+)/pending-members/list/$',
+    url(r'^(?P<project_slug>[\w-]+)/pending-members/list/$',
         view=PendingSponsorListView.as_view(),
         name='pending-sponsor-list'),
-    url(regex='^(?P<project_slug>[\w-]+)/sustaining-members-rejected/list/$',
+    url(r'^(?P<project_slug>[\w-]+)/sustaining-members-rejected/list/$',
         view=RejectedSustainingMemberList.as_view(),
         name='sustaining-members-rejected-list'),
-    url(regex='^(?P<project_slug>[\w-]+)/approve-member/(?P<slug>[\w-]+)/$',
+    url(r'^(?P<project_slug>[\w-]+)/approve-member/(?P<slug>[\w-]+)/$',
         view=ApproveSponsorView.as_view(),
         name='sponsor-approve'),
-    url(regex='^(?P<project_slug>[\w-]+)/reject-member/(?P<member_id>\d+)/$',
+    url(r'^(?P<project_slug>[\w-]+)/reject-member/(?P<member_id>\d+)/$',
         view=RejectSponsorView.as_view(),
         name='sponsor-reject'),
-    url(regex='^(?P<project_slug>[\w-]+)/members/list/$',
+    url(r'^(?P<project_slug>[\w-]+)/members/list/$',
         view=SponsorListView.as_view(),
         name='sponsor-list'),
-    url(regex='^(?P<project_slug>[\w-]+)/future-members/list/$',
+    url(r'^(?P<project_slug>[\w-]+)/future-members/list/$',
         view=FutureSponsorListView.as_view(),
         name='future-sponsor-list'),
-    url(regex='^(?P<project_slug>[\w-]+)/members/world-map/$',
+    url(r'^(?P<project_slug>[\w-]+)/members/world-map/$',
         view=SponsorWorldMapView.as_view(),
         name='sponsor-world-map'),
-    url(regex='^(?P<project_slug>[\w-]+)/member/(?P<slug>[\w-]+)/$',
+    url(r'^(?P<project_slug>[\w-]+)/member/(?P<slug>[\w-]+)/$',
         view=SponsorDetailView.as_view(),
         name='sponsor-detail'),
-    url(regex='^(?P<project_slug>[\w-]+)/member/(?P<slug>[\w-]+)/delete/$',
+    url(r'^(?P<project_slug>[\w-]+)/member/(?P<slug>[\w-]+)/delete/$',
         view=SponsorDeleteView.as_view(),
         name='sponsor-delete'),
-    url(regex='^(?P<project_slug>[\w-]+)/create-member/$',
+    url(r'^(?P<project_slug>[\w-]+)/create-member/$',
         view=SponsorCreateView.as_view(),
         name='sponsor-create'),
-    url(regex='^(?P<project_slug>[\w-]+)/member/(?P<slug>[\w-]+)/update/$',
+    url(r'^(?P<project_slug>[\w-]+)/member/(?P<slug>[\w-]+)/update/$',
         view=SponsorUpdateView.as_view(),
         name='sponsor-update'),
 
     # Sponsorship Level management
 
     # This view is only accessible via ajax
-    url(regex='^json-membershiplevel/list/(?P<version>\d+)/$',
+    url(r'^json-membershiplevel/list/(?P<version>\d+)/$',
         view=JSONSponsorshipLevelListView.as_view(),
         name='json-sponsorshiplevel-list'),
-    url(regex='^(?P<project_slug>[\w-]+)/pending-membershiplevel/list/$',
+    url(r'^(?P<project_slug>[\w-]+)/pending-membershiplevel/list/$',
         view=PendingSponsorshipLevelListView.as_view(),
         name='pending-sponsorshiplevel-list'),
-    url(regex='^(?P<project_slug>[\w-]+)/approve-membershiplevel/(?P<slug>[\w-]+)/$',
+    url(r'^(?P<project_slug>[\w-]+)/approve-membershiplevel/(?P<slug>[\w-]+)/$',
         view=ApproveSponsorshipLevelView.as_view(),
         name='sponsorshiplevel-approve'),
-    url(regex='^(?P<project_slug>[\w-]+)/membershiplevel/list/$',
+    url(r'^(?P<project_slug>[\w-]+)/membershiplevel/list/$',
         view=SponsorshipLevelListView.as_view(),
         name='sponsorshiplevel-list'),
-    url(regex='^(?P<project_slug>[\w-]+)/membershiplevel/(?P<slug>[\w-]+)/$',
+    url(r'^(?P<project_slug>[\w-]+)/membershiplevel/(?P<slug>[\w-]+)/$',
         view=SponsorshipLevelDetailView.as_view(),
         name='sponsorshiplevel-detail'),
-    url(regex='^(?P<project_slug>[\w-]+)/membershiplevel/(?P<slug>[\w-]+)/delete/$',
+    url(r'^(?P<project_slug>[\w-]+)/membershiplevel/(?P<slug>[\w-]+)/delete/$',
         view=SponsorshipLevelDeleteView.as_view(),
         name='sponsorshiplevel-delete'),
-    url(regex='^(?P<project_slug>[\w-]+)/create-membershiplevel/$',
+    url(r'^(?P<project_slug>[\w-]+)/create-membershiplevel/$',
         view=SponsorshipLevelCreateView.as_view(),
         name='sponsorshiplevel-create'),
-    url(regex='^(?P<project_slug>[\w-]+)/membershiplevel/(?P<slug>[\w-]+)/update/$',
+    url(r'^(?P<project_slug>[\w-]+)/membershiplevel/(?P<slug>[\w-]+)/update/$',
         view=SponsorshipLevelUpdateView.as_view(),
         name='sponsorshiplevel-update'),
 
     # Sponsorship Period management
 
     # This view is only accessible via ajax
-    url(regex='^json-membershipperiod/list/(?P<version>\d+)/$',
+    url(r'^json-membershipperiod/list/(?P<version>\d+)/$',
         view=JSONSponsorshipPeriodListView.as_view(),
         name='json-sponsorshipperiod-list'),
-    url(regex='^(?P<project_slug>[\w-]+)/pending-membershipperiod/list/$',
+    url(r'^(?P<project_slug>[\w-]+)/pending-membershipperiod/list/$',
         view=PendingSponsorshipPeriodListView.as_view(),
         name='pending-sponsorshipperiod-list'),
-    url(regex='^(?P<project_slug>[\w-]+)/approve-membershipperiod/(?P<slug>[\w-]+)/$',
+    url(r'^(?P<project_slug>[\w-]+)/approve-membershipperiod/(?P<slug>[\w-]+)/$',
         view=ApproveSponsorshipPeriodView.as_view(),
         name='sponsorshipperiod-approve'),
-    url(regex='^(?P<project_slug>[\w-]+)/membershipperiod/list/$',
+    url(r'^(?P<project_slug>[\w-]+)/membershipperiod/list/$',
         view=SponsorshipPeriodListView.as_view(),
         name='sponsorshipperiod-list'),
-    url(regex='^(?P<project_slug>[\w-]+)/membershipperiod/(?P<slug>[\w-]+)/$',
+    url(r'^(?P<project_slug>[\w-]+)/membershipperiod/(?P<slug>[\w-]+)/$',
         view=SponsorshipPeriodDetailView.as_view(),
         name='sponsorshipperiod-detail'),
-    url(regex='^(?P<project_slug>[\w-]+)/membershipperiod/(?P<slug>[\w-]+)/delete/$',
+    url(r'^(?P<project_slug>[\w-]+)/membershipperiod/(?P<slug>[\w-]+)/delete/$',
         view=SponsorshipPeriodDeleteView.as_view(),
         name='sponsorshipperiod-delete'),
-    url(regex='^(?P<project_slug>[\w-]+)/create-membershipperiod/$',
+    url(r'^(?P<project_slug>[\w-]+)/create-membershipperiod/$',
         view=SponsorshipPeriodCreateView.as_view(),
         name='sponsorshipperiod-create'),
-    url(regex='^(?P<project_slug>[\w-]+)/membershipperiod/(?P<slug>[\w-]+)/update/$',
+    url(r'^(?P<project_slug>[\w-]+)/membershipperiod/(?P<slug>[\w-]+)/update/$',
         view=SponsorshipPeriodUpdateView.as_view(),
         name='sponsorshipperiod-update'),
 
     # Sponsor Cloud
-    url(regex='^(?P<project_slug>[\w-]+)/member-cloud/$',
+    url(r'^(?P<project_slug>[\w-]+)/member-cloud/$',
         view=generate_sponsor_cloud,
         name='sponsor-cloud'),
 
     # Sustaining member
     url(
-        regex='^(?P<project_slug>[\w-]+)/sustaining-member/add/$',
+        r'^(?P<project_slug>[\w-]+)/sustaining-member/add/$',
         view=SustainingMemberCreateView.as_view(),
         name='sustaining-member-create'),
     url(
-        regex='^(?P<project_slug>[\w-]+)/membership/$',
+        r'^(?P<project_slug>[\w-]+)/membership/$',
         view=SustainingMembership.as_view(),
         name='sustaining-membership'),
     url(
-        regex='^(?P<project_slug>[\w-]+)/sustaining-member/update/'
-              '(?P<member_id>\d+)/$',
+        r'^(?P<project_slug>[\w-]+)/sustaining-member/update/(?P<member_id>\d+)/$',
         view=SustainingMemberUpdateView.as_view(),
         name='sustaining-member-update'),
     url(
-        regex='^(?P<project_slug>[\w-]+)/sustaining-member-period/create/'
-              '(?P<member_id>\d+)/$',
+        r'^(?P<project_slug>[\w-]+)/sustaining-member-period/create/(?P<member_id>\d+)/$',
         view=SustainingMemberPeriodCreateView.as_view(),
         name='sustaining-member-period-create'),
     url(
-        regex='^(?P<project_slug>[\w-]+)/sustaining-member-period/update/'
-              '(?P<member_id>\d+)/$',
+        r'^(?P<project_slug>[\w-]+)/sustaining-member-period/update/(?P<member_id>\d+)/$',
         view=SustainingMemberPeriodUpdateView.as_view(),
         name='sustaining-member-period-update'),
 ]
diff --git a/django_project/changes/views/category.py b/django_project/changes/views/category.py
index d5cc38f1c..d4b585892 100644
--- a/django_project/changes/views/category.py
+++ b/django_project/changes/views/category.py
@@ -276,7 +276,7 @@ def get_object(self, queryset=None):
 
 
 # noinspection PyAttributeOutsideInit
-class CategoryDeleteView(LoginRequiredMixin, CategoryMixin, DeleteView):
+class CategoryDeleteView(LoginRequiredMixin, DeleteView):
     """Delete view for Category."""
     context_object_name = 'category'
     template_name = 'category/delete.html'
diff --git a/django_project/changes/views/changelog_github.py b/django_project/changes/views/changelog_github.py
index bf0c784fe..ba39a06aa 100644
--- a/django_project/changes/views/changelog_github.py
+++ b/django_project/changes/views/changelog_github.py
@@ -214,17 +214,22 @@ def get(self, request, project_pk):
 
 
 class ImgExtractor(Treeprocessor):
-    def run(self, doc):
+    def __init__(self, md):
+        super().__init__(md)
+        self.markdown = md  # Store the reference to the Markdown instance
+
+    def run(self, root):
         """Find all images and append to markdown.images."""
         self.markdown.images = []
-        for image in doc.findall('.//img'):
+        for image in root.findall('.//img'):
             self.markdown.images.append(image.get('src'))
+        return root
 
 
 class ImgExtExtension(Extension):
-    def extendMarkdown(self, md, md_globals):
+    def extendMarkdown(self, md):
         img_ext = ImgExtractor(md)
-        md.treeprocessors.add('imgext', img_ext, '>inline')
+        md.treeprocessors.register(img_ext, 'imgext', 5)
 
 
 def download_all_referenced_images(request, **kwargs):
diff --git a/django_project/changes/views/entry.py b/django_project/changes/views/entry.py
index 365347107..dd6638e46 100644
--- a/django_project/changes/views/entry.py
+++ b/django_project/changes/views/entry.py
@@ -41,7 +41,7 @@ class EntryDetailView(EntryMixin, DetailView):
 
 
 # noinspection PyAttributeOutsideInit
-class EntryDeleteView(LoginRequiredMixin, EntryMixin, DeleteView):
+class EntryDeleteView(LoginRequiredMixin, DeleteView):
     """Delete view for Entry."""
     context_object_name = 'entry'
     template_name = 'entry/delete.html'
diff --git a/django_project/changes/views/sponsor.py b/django_project/changes/views/sponsor.py
index 42ed33141..8d4347b9a 100644
--- a/django_project/changes/views/sponsor.py
+++ b/django_project/changes/views/sponsor.py
@@ -364,7 +364,7 @@ def get_object(self, queryset=None):
 
 
 # noinspection PyAttributeOutsideInit
-class SponsorDeleteView(LoginRequiredMixin, SponsorMixin, DeleteView):
+class SponsorDeleteView(LoginRequiredMixin, DeleteView):
     """Delete view for Sponsor."""
     context_object_name = 'sponsor'
     template_name = 'sponsor/delete.html'
diff --git a/django_project/changes/views/sponsorship_level.py b/django_project/changes/views/sponsorship_level.py
index 60caca12c..ea1b7c00f 100644
--- a/django_project/changes/views/sponsorship_level.py
+++ b/django_project/changes/views/sponsorship_level.py
@@ -226,7 +226,6 @@ def get_context_data(self, **kwargs):
 # noinspection PyAttributeOutsideInit
 class SponsorshipLevelDeleteView(
         LoginRequiredMixin,
-        SponsorshipLevelMixin,
         DeleteView):
     """Delete view for Sponsorship Level."""
     context_object_name = 'sponsorshiplevel'
diff --git a/django_project/changes/views/version.py b/django_project/changes/views/version.py
index e74261c68..3ac65b59b 100644
--- a/django_project/changes/views/version.py
+++ b/django_project/changes/views/version.py
@@ -309,7 +309,7 @@ def get_object(self, queryset=None):
 
 
 # noinspection PyAttributeOutsideInit
-class VersionDeleteView(LoginRequiredMixin, VersionMixin, DeleteView):
+class VersionDeleteView(LoginRequiredMixin, DeleteView):
     """Delete view for Entry."""
     context_object_name = 'version'
     template_name = 'version/delete.html'
@@ -560,10 +560,11 @@ def render_to_response(self, context, **response_kwargs):
             context=context,
             **response_kwargs
         )
+
         # convert the html to rst
-        converted_doc = pypandoc.convert(
+        converted_doc = pypandoc.convert_text(
             document.rendered_content.encode('utf8', 'ignore'),
-            'rst', format='html', extra_args=['--no-wrap'])
+            'rst', format='html', extra_args=['--wrap=none'])
         converted_doc = converted_doc.replace('/media/images/', 'images/')
 
         # prepare the ZIP file
@@ -700,9 +701,9 @@ def render_to_response(self, context, **response_kwargs):
         )
 
         # convert the html to markdown
-        converted_doc = pypandoc.convert(
+        converted_doc = pypandoc.convert_text(
             document.rendered_content.encode('utf8', 'ignore'),
-            'md', format='html', extra_args=['--no-wrap'])
+            'md', format='html', extra_args=['--wrap=none'])
         converted_doc = converted_doc.replace('/media/images/', 'images/')
 
         # prepare the ZIP file
@@ -908,7 +909,7 @@ def render_to_response(self, context, **response_kwargs):
             **response_kwargs
         )
         # convert the html to html
-        converted_doc = pypandoc.convert(
+        converted_doc = pypandoc.convert_text(
             document.rendered_content.encode(
                 'utf8', 'ignore'), 'html', format='html')
         converted_doc = converted_doc.replace('/media/images/', 'images/')
diff --git a/django_project/core/base_templates/_pagination.html b/django_project/core/base_templates/_pagination.html
index 006de1d06..593703021 100644
--- a/django_project/core/base_templates/_pagination.html
+++ b/django_project/core/base_templates/_pagination.html
@@ -7,11 +7,11 @@
     {% endif %}
     {% for page in page_obj.pages %}
         {% if page %}
-            {% ifequal page page_obj.number %}
+            {% if page == page_obj.number %}
                 <span class="current page">{{ page }}</span>
             {% else %}
                 <a href="?{{ page.querystring }}" class="page">{{ page }}</a>
-            {% endifequal %}
+            {% endif %}
         {% else %}
             ...
         {% endif %}
diff --git a/django_project/core/settings/contrib.py b/django_project/core/settings/contrib.py
index 29500fd20..b1f07738a 100644
--- a/django_project/core/settings/contrib.py
+++ b/django_project/core/settings/contrib.py
@@ -13,6 +13,7 @@
     'modeltranslation',
     'raven.contrib.django.raven_compat',  # enable Raven plugin
     'crispy_forms',
+    'crispy_bootstrap3',
     'widget_tweaks',  # lets us add some bootstrap css to form elements
     'easy_thumbnails',
     'reversion',
diff --git a/django_project/core/settings/prod.py b/django_project/core/settings/prod.py
index 0bebe9b62..4b15814f1 100644
--- a/django_project/core/settings/prod.py
+++ b/django_project/core/settings/prod.py
@@ -28,6 +28,8 @@
 PIPELINE['PIPELINE_ENABLED'] = True
 PIPELINE['CSS_COMPRESSOR'] = 'pipeline.compressors.yuglify.YuglifyCompressor'
 PIPELINE['JS_COMPRESSOR'] = 'pipeline.compressors.yuglify.YuglifyCompressor'
+# PIPELINE['CSS_COMPRESSOR'] = 'pipeline.compressors.csshtmljsminify.CssHtmlJsMinifyCompressor'
+# PIPELINE['JS_COMPRESSOR'] = 'pipeline.compressors.csshtmljsminify.CssHtmlJsMinifyCompressor'
 
 # Comment if you are not running behind proxy
 USE_X_FORWARDED_HOST = True
@@ -128,3 +130,5 @@
             },
         },
     }
+
+ACCOUNT_DEFAULT_HTTP_PROTOCOL='https'
\ No newline at end of file
diff --git a/django_project/core/settings/project.py b/django_project/core/settings/project.py
index 248f0e7cb..459e5a10b 100644
--- a/django_project/core/settings/project.py
+++ b/django_project/core/settings/project.py
@@ -7,9 +7,10 @@
 """
 
 import os  # noqa
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from .utils import absolute_path
 from .contrib import *  # noqa
+import json
 
 # Project apps
 INSTALLED_APPS += [
@@ -47,6 +48,8 @@
 MIDDLEWARE += [
     # For nav bar generation
     'core.custom_middleware.NavContextMiddleware',
+    # Allauth middleware
+    'allauth.account.middleware.AccountMiddleware'
 ]
 
 # Project specific javascript files to be pipelined
@@ -78,14 +81,14 @@
     },
 }
 
-VALID_DOMAIN = [
-    'localhost',
-    'changelog.kartoza.com',
-    'staging.changelog.kartoza.com'
-]
+VALID_DOMAIN = json.loads(os.environ.get("VALID_DOMAIN", "[]"))
 
 EMAIL_HOST_USER = 'noreply@kartoza.com'
 LOGIN_URL = '/en/accounts/login/'
 
 # The numeric mode (i.e. 0o644) to set newly uploaded files to.
 FILE_UPLOAD_PERMISSIONS = 0o644
+
+
+# Default primary key type
+DEFAULT_AUTO_FIELD = 'django.db.models.AutoField'
\ No newline at end of file
diff --git a/django_project/core/tests/test_python_style.py b/django_project/core/tests/test_python_style.py
index 8913cccdb..0455a6569 100644
--- a/django_project/core/tests/test_python_style.py
+++ b/django_project/core/tests/test_python_style.py
@@ -35,10 +35,7 @@ def test_flake8(self):
         # make pep8 produces some extra lines by default.
         lines = len(output.splitlines()) - default_number_lines
         print(output)
-        message = (
-            'Hey mate, go back to your keyboard :) (expected %s, got %s '
-            'lines from PEP8.)' % (default_number_lines, lines))
-        self.assertEquals(lines, 0, message)
+        self.assertEqual(lines, 0)
 
     # I can't use the unittest.skip decorator because I got a strange bug from
     # unittest framework. I'm doing it in the old-way.
@@ -82,7 +79,4 @@ def xxtest_pep8(self):
         # make pep8 produces some extra lines by default.
         lines = len(output.splitlines()) - default_number_lines
         print(output)
-        message = (
-            'Hey mate, go back to your keyboard :) (expected %s, got %s '
-            'lines from PEP8.)' % (default_number_lines, lines))
-        self.assertEquals(lines, 0, message)
+        self.assertEqual(lines, 0)
diff --git a/django_project/core/urls.py b/django_project/core/urls.py
index 369936e3b..d5680650f 100644
--- a/django_project/core/urls.py
+++ b/django_project/core/urls.py
@@ -1,6 +1,7 @@
 # coding=utf-8
 """Project level url handler."""
-from django.conf.urls import include, url
+from django.conf.urls import include
+from django.urls import re_path as url
 from django.conf.urls.i18n import i18n_patterns
 from django.contrib.auth import views as auth_views  # noqa
 from django.contrib import admin
diff --git a/django_project/github_issue/urls.py b/django_project/github_issue/urls.py
index a877480c0..c322fa6f6 100644
--- a/django_project/github_issue/urls.py
+++ b/django_project/github_issue/urls.py
@@ -1,6 +1,6 @@
 # coding=utf-8
 """Urls for submitting github support requests."""
-from django.conf.urls import url
+from django.urls import re_path as url
 from django.conf import settings
 from django.views.static import serve
 
@@ -8,7 +8,7 @@
 
 urlpatterns = [
     # basic app views
-    url(regex='^github-issue$',
+    url(r'^github-issue$',
         view=GithubIssue.as_view(),
         name='github-issue'),
 ]
diff --git a/django_project/lesson/forms/answer.py b/django_project/lesson/forms/answer.py
index 1ab02a50e..db0c27bdb 100644
--- a/django_project/lesson/forms/answer.py
+++ b/django_project/lesson/forms/answer.py
@@ -1,7 +1,7 @@
 # coding=utf-8
 """Answer form."""
 
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from crispy_forms.helper import FormHelper
 from crispy_forms.layout import (
diff --git a/django_project/lesson/forms/further_reading.py b/django_project/lesson/forms/further_reading.py
index 01d5e1747..34e46153a 100644
--- a/django_project/lesson/forms/further_reading.py
+++ b/django_project/lesson/forms/further_reading.py
@@ -2,7 +2,7 @@
 """Further reading form."""
 
 from django import forms
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from crispy_forms.helper import FormHelper
 from crispy_forms.layout import (
diff --git a/django_project/lesson/forms/question.py b/django_project/lesson/forms/question.py
index 6785c7e11..f8b5b40d9 100644
--- a/django_project/lesson/forms/question.py
+++ b/django_project/lesson/forms/question.py
@@ -1,7 +1,7 @@
 # coding=utf-8
 """Question form."""
 
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from crispy_forms.helper import FormHelper
 from crispy_forms.layout import (
diff --git a/django_project/lesson/forms/section.py b/django_project/lesson/forms/section.py
index 0d3aad24c..bff6d5737 100644
--- a/django_project/lesson/forms/section.py
+++ b/django_project/lesson/forms/section.py
@@ -1,7 +1,7 @@
 # coding=utf-8
 """Section form."""
 
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from crispy_forms.helper import FormHelper
 from crispy_forms.layout import (
diff --git a/django_project/lesson/forms/specification.py b/django_project/lesson/forms/specification.py
index bdd9e34a5..6f044bada 100644
--- a/django_project/lesson/forms/specification.py
+++ b/django_project/lesson/forms/specification.py
@@ -1,7 +1,7 @@
 # coding=utf-8
 """Specifications form."""
 
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from crispy_forms.helper import FormHelper
 from crispy_forms.layout import (
diff --git a/django_project/lesson/forms/worksheet.py b/django_project/lesson/forms/worksheet.py
index 2d8ebdaf8..bab9058d8 100644
--- a/django_project/lesson/forms/worksheet.py
+++ b/django_project/lesson/forms/worksheet.py
@@ -1,7 +1,7 @@
 # coding=utf-8
 """Worksheet form."""
 
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from crispy_forms.helper import FormHelper
 from crispy_forms.layout import (
diff --git a/django_project/lesson/models/answer.py b/django_project/lesson/models/answer.py
index b04309113..69ee196a4 100644
--- a/django_project/lesson/models/answer.py
+++ b/django_project/lesson/models/answer.py
@@ -5,7 +5,7 @@
 import logging
 
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from model_utils import FieldTracker
 
diff --git a/django_project/lesson/models/curriculum.py b/django_project/lesson/models/curriculum.py
index 619907c59..78679e3ca 100644
--- a/django_project/lesson/models/curriculum.py
+++ b/django_project/lesson/models/curriculum.py
@@ -8,7 +8,7 @@
 from django.conf.global_settings import MEDIA_ROOT
 from django.contrib.auth.models import User
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from base.models.project import Project
 from lesson.utilities import custom_slug
diff --git a/django_project/lesson/models/curriculum_worksheets.py b/django_project/lesson/models/curriculum_worksheets.py
index 4a1931ab1..2e32e8e0f 100644
--- a/django_project/lesson/models/curriculum_worksheets.py
+++ b/django_project/lesson/models/curriculum_worksheets.py
@@ -3,7 +3,7 @@
 """Curriculum model definitions for lesson apps."""
 
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from lesson.models.curriculum import Curriculum
 from lesson.models.worksheet import Worksheet
diff --git a/django_project/lesson/models/further_reading.py b/django_project/lesson/models/further_reading.py
index 90626a163..a9197bb18 100644
--- a/django_project/lesson/models/further_reading.py
+++ b/django_project/lesson/models/further_reading.py
@@ -5,7 +5,7 @@
 import logging
 
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from model_utils import FieldTracker
 
diff --git a/django_project/lesson/models/license.py b/django_project/lesson/models/license.py
index d0a913e9d..2eefb5b21 100644
--- a/django_project/lesson/models/license.py
+++ b/django_project/lesson/models/license.py
@@ -4,7 +4,7 @@
 
 from django.db import models
 from django.conf.global_settings import MEDIA_ROOT
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from model_utils import FieldTracker
 
diff --git a/django_project/lesson/models/mixins.py b/django_project/lesson/models/mixins.py
index 8703348bc..956221205 100644
--- a/django_project/lesson/models/mixins.py
+++ b/django_project/lesson/models/mixins.py
@@ -2,7 +2,7 @@
 """Mixin for lesson app."""
 
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from django.utils.translation import override, get_language
 
 
diff --git a/django_project/lesson/models/section.py b/django_project/lesson/models/section.py
index 2b41eb3f1..68033456d 100644
--- a/django_project/lesson/models/section.py
+++ b/django_project/lesson/models/section.py
@@ -5,7 +5,7 @@
 import logging
 
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from model_utils import FieldTracker
 
diff --git a/django_project/lesson/models/specification.py b/django_project/lesson/models/specification.py
index 97045fc1c..543835429 100644
--- a/django_project/lesson/models/specification.py
+++ b/django_project/lesson/models/specification.py
@@ -5,7 +5,7 @@
 import logging
 
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from model_utils import FieldTracker
 
diff --git a/django_project/lesson/models/worksheet.py b/django_project/lesson/models/worksheet.py
index 59912e2ad..10d27e36f 100644
--- a/django_project/lesson/models/worksheet.py
+++ b/django_project/lesson/models/worksheet.py
@@ -7,7 +7,7 @@
 
 from django.conf.global_settings import MEDIA_ROOT
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from model_utils import FieldTracker
 
diff --git a/django_project/lesson/models/worksheet_question.py b/django_project/lesson/models/worksheet_question.py
index d02ddbaff..92769c4bd 100644
--- a/django_project/lesson/models/worksheet_question.py
+++ b/django_project/lesson/models/worksheet_question.py
@@ -7,7 +7,7 @@
 
 from django.conf.global_settings import MEDIA_ROOT
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from model_utils import FieldTracker
 
diff --git a/django_project/lesson/tests/test_worksheet_views.py b/django_project/lesson/tests/test_worksheet_views.py
index 5aa371eff..264f12bd2 100644
--- a/django_project/lesson/tests/test_worksheet_views.py
+++ b/django_project/lesson/tests/test_worksheet_views.py
@@ -229,8 +229,7 @@ def WorksheetModuleQuestionAnswersPDF(self):
         response = self.client.get(reverse('worksheet-module-answers-print',
                                            kwargs=self.kwargs_worksheet_full))
         self.assertEqual(response.status_code, 200)
-
-        self.assertEquals(
+        self.assertEqual(
             response.get('Content-Disposition'),
             'filename=Test Question Answer.pdf'
         )
@@ -248,7 +247,7 @@ def test_WorksheetPrintView(self):
             'worksheet-print', kwargs= self.kwargs_worksheet_full
         ) + '?q=1')
         self.assertEqual(response.status_code, 200)
-        self.assertEquals(
+        self.assertEqual(
             response.get('Content-Disposition'),
             'filename=1. Test section print-Test module print.pdf'
         )
@@ -266,7 +265,7 @@ def test_WorksheetPDFZipView(self):
             'worksheet-zip', kwargs=self.kwargs_worksheet_full
         ) + '?q=2')
         self.assertEqual(response.status_code, 200)
-        self.assertEquals(
+        self.assertEqual(
             response.get('Content-Disposition'),
             'attachment; filename=2. Test section zip-Test module zip.zip'
         )
@@ -299,7 +298,7 @@ def test_WorksheetDownloadSampledataView(self):
         response = self.client.get(reverse(
             'worksheet-sampledata', kwargs=self.kwargs_worksheet_full))
         self.assertEqual(response.status_code, 200)
-        self.assertEquals(
+        self.assertEqual(
             response.get('Content-Disposition'),
             'attachment; filename=Test section zip-Test module zip.zip'
         )
@@ -337,7 +336,7 @@ def test_download_multiple_worksheets(self):
             'download-multiple-worksheets', kwargs=self.kwargs_project
         ) + worksheet_obj)
         self.assertEqual(response.status_code, 200)
-        self.assertEquals(
+        self.assertEqual(
             response.get('Content-Disposition'),
             'attachment; '
             'filename=Test project name multiple zip-worksheet module 1.1.zip'
diff --git a/django_project/lesson/urls.py b/django_project/lesson/urls.py
index 357846388..7c972d3fe 100644
--- a/django_project/lesson/urls.py
+++ b/django_project/lesson/urls.py
@@ -1,7 +1,7 @@
 # coding=utf-8
 """Urls for lesson application."""
 
-from django.conf.urls import url
+from django.urls import re_path as url
 from django.views.generic.base import RedirectView
 from django.views.static import serve
 from django.conf import settings
@@ -58,186 +58,132 @@
 )
 
 urlpatterns = [
-    url(regex='^(?P<project_slug>[\w-]+)/lesson/about/$',
+    url(r'^(?P<project_slug>[\w-]+)/lesson/about/$',
         view=AboutLessonsApp.as_view(),
         name='about-lesson-app'),
     # Section
-    url(regex='^(?P<project_slug>[\w-]+)/lesson/create/$',
+    url(r'^(?P<project_slug>[\w-]+)/lesson/create/$',
         view=SectionCreateView.as_view(),
         name='section-create'),
-    url(regex='^(?P<project_slug>[\w-]+)/lessons/$',
+    url(r'^(?P<project_slug>[\w-]+)/lessons/$',
         view=SectionListView.as_view(),
         name='section-list'),
-    url(regex='^(?P<project_slug>[\w-]+)/lesson/order/$',
+    url(r'^(?P<project_slug>[\w-]+)/lesson/order/$',
         view=SectionOrderView.as_view(),
         name='section-order'),
-    url(regex='^(?P<project_slug>[\w-]+)/lesson/submit_order/$',
+    url(r'^(?P<project_slug>[\w-]+)/lesson/submit_order/$',
         view=SectionOrderSubmitView.as_view(),
         name='section-submit-order'),
-    url(regex='^(?P<project_slug>[\w-]+)/lesson/(?P<slug>[\w-]+)/update/$',
+    url(r'^(?P<project_slug>[\w-]+)/lesson/(?P<slug>[\w-]+)/update/$',
         view=SectionUpdateView.as_view(),
         name='section-update'),
-    url(regex='^(?P<project_slug>[\w-]+)/lesson/(?P<slug>[\w-]+)/delete/$',
+    url(r'^(?P<project_slug>[\w-]+)/lesson/(?P<slug>[\w-]+)/delete/$',
         view=SectionDeleteView.as_view(),
         name='section-delete'),
 
     # Worksheet
-    url(regex='^(?P<project_slug>[\w-]+)/lessons/'
-              'download-multiple-worksheet/$',
+    url(r'^(?P<project_slug>[\w-]+)/lessons/download-multiple-worksheet/$',
         view=download_multiple_worksheet,
         name='download-multiple-worksheets'),
-    url(regex='^(?P<project_slug>[\w-]+)/lesson/'
-              '(?P<section_slug>[\w-]+)/worksheet/create/$',
+    url(r'^(?P<project_slug>[\w-]+)/lesson/(?P<section_slug>[\w-]+)/worksheet/create/$',
         view=WorksheetCreateView.as_view(),
         name='worksheet-create'),
-    url(regex='^(?P<project_slug>[\w-]+)/lesson/'
-              '(?P<section_slug>[\w-]+)/update/(?P<pk>[\w-]+)/$',
+    url(r'^(?P<project_slug>[\w-]+)/lesson/(?P<section_slug>[\w-]+)/update/(?P<pk>[\w-]+)/$',
         view=WorksheetUpdateView.as_view(),
         name='worksheet-update'),
-    url(regex='^(?P<project_slug>[\w-]+)/lesson/'
-              '(?P<section_slug>[\w-]+)/delete/(?P<pk>[\w-]+)/$',
+    url(r'^(?P<project_slug>[\w-]+)/lesson/(?P<section_slug>[\w-]+)/delete/(?P<pk>[\w-]+)/$',
         view=WorksheetDeleteView.as_view(),
         name='worksheet-delete'),
-    url(regex='^(?P<project_slug>[\w-]+)/lesson/'
-              '(?P<section_slug>[\w-]+)/detail/(?P<pk>[\w-]+)/$',
+    url(r'^(?P<project_slug>[\w-]+)/lesson/(?P<section_slug>[\w-]+)/detail/(?P<pk>[\w-]+)/$',
         view=WorksheetDetailView.as_view(),
         name='worksheet-detail'),
 
-    url(regex='^(?P<project_slug>[\w-]+)/lesson/'
-              '(?P<section_slug>[\w-]+)/answers/(?P<pk>[\w-]+)/$',
+    url(r'^(?P<project_slug>[\w-]+)/lesson/(?P<section_slug>[\w-]+)/answers/(?P<pk>[\w-]+)/$',
         view=WorksheetModuleQuestionAnswers.as_view(),
         name='worksheet-module-answers'),
 
-    url(regex='^(?P<project_slug>[\w-]+)/lesson/'
-              '(?P<section_slug>[\w-]+)/answers/(?P<pk>[\w-]+)/print$',
+    url(r'^(?P<project_slug>[\w-]+)/lesson/(?P<section_slug>[\w-]+)/answers/(?P<pk>[\w-]+)/print$',
         view=WorksheetModuleQuestionAnswersPDF.as_view(),
         name='worksheet-module-answers-print'),
 
-    url(regex='^(?P<project_slug>[\w-]+)/lesson/'
-              '(?P<section_slug>[\w-]+)/zip/(?P<pk>[\w-]+)/$',
+    url(r'^(?P<project_slug>[\w-]+)/lesson/(?P<section_slug>[\w-]+)/zip/(?P<pk>[\w-]+)/$',
         view=WorksheetPDFZipView.as_view(),
         name='worksheet-zip'),
-    url(regex='^(?P<project_slug>[\w-]+)/lesson/'
-              '(?P<section_slug>[\w-]+)/print/(?P<pk>[\w-]+)/$',
+    url(r'^(?P<project_slug>[\w-]+)/lesson/(?P<section_slug>[\w-]+)/print/(?P<pk>[\w-]+)/$',
         view=WorksheetPrintView.as_view(),
         name='worksheet-print'),
-    url(regex='^(?P<project_slug>[\w-]+)/lesson/'
-              '(?P<section_slug>[\w-]+)/order$',
+    url(r'^(?P<project_slug>[\w-]+)/lesson/(?P<section_slug>[\w-]+)/order$',
         view=WorksheetOrderView.as_view(),
         name='worksheet-order'),
-    url(regex='^(?P<project_slug>[\w-]+)/lesson/'
-              '(?P<section_slug>[\w-]+)/submit_order/$',
+    url(r'^(?P<project_slug>[\w-]+)/lesson/(?P<section_slug>[\w-]+)/submit_order/$',
         view=WorksheetOrderSubmitView.as_view(),
         name='worksheet-submit-order'),
     # Specification
-    url(regex='^(?P<project_slug>[\w-]+)/lesson/'
-              '(?P<section_slug>[\w-]+)/worksheet/'
-              '(?P<worksheet_slug>[\w-]+)/specification/create/$',
+    url(r'^(?P<project_slug>[\w-]+)/lesson/(?P<section_slug>[\w-]+)/worksheet/(?P<worksheet_slug>[\w-]+)/specification/create/$',
         view=SpecificationCreateView.as_view(),
         name='specification-create'),
-    url(regex='^(?P<project_slug>[\w-]+)/lesson/'
-              '(?P<section_slug>[\w-]+)/worksheet/'
-              '(?P<worksheet_slug>[\w-]+)/specification/order/$',
+    url(r'^(?P<project_slug>[\w-]+)/lesson/(?P<section_slug>[\w-]+)/worksheet/(?P<worksheet_slug>[\w-]+)/specification/order/$',
         view=SpecificationOrderView.as_view(),
         name='specification-order'),
-    url(regex='^(?P<project_slug>[\w-]+)/lesson/'
-              '(?P<section_slug>[\w-]+)/worksheet/'
-              '(?P<worksheet_slug>[\w-]+)/specification/submit_order/$',
+    url(r'^(?P<project_slug>[\w-]+)/lesson/(?P<section_slug>[\w-]+)/worksheet/(?P<worksheet_slug>[\w-]+)/specification/submit_order/$',
         view=SpecificationOrderSubmitView.as_view(),
         name='specification-submit-order'),
-    url(regex='^(?P<project_slug>[\w-]+)/lesson/'
-              '(?P<section_slug>[\w-]+)/worksheet/'
-              '(?P<worksheet_slug>[\w-]+)/specification/'
-              'update/(?P<pk>[\w-]+)/$',
+    url(r'^(?P<project_slug>[\w-]+)/lesson/(?P<section_slug>[\w-]+)/worksheet/(?P<worksheet_slug>[\w-]+)/specification/update/(?P<pk>[\w-]+)/$',
         view=SpecificationUpdateView.as_view(),
         name='specification-update'),
-    url(regex='^(?P<project_slug>[\w-]+)/lesson/'
-              '(?P<section_slug>[\w-]+)/worksheet/'
-              '(?P<worksheet_slug>[\w-]+)/specification/'
-              'delete/(?P<pk>[\w-]+)/$',
+    url(r'^(?P<project_slug>[\w-]+)/lesson/(?P<section_slug>[\w-]+)/worksheet/(?P<worksheet_slug>[\w-]+)/specification/delete/(?P<pk>[\w-]+)/$',
         view=SpecificationDeleteView.as_view(),
         name='specification-delete'),
     # Further more
-    url(regex='^(?P<project_slug>[\w-]+)/lesson/'
-              '(?P<section_slug>[\w-]+)/worksheet/'
-              '(?P<worksheet_slug>[\w-]+)/further-reading/create/$',
+    url(r'^(?P<project_slug>[\w-]+)/lesson/(?P<section_slug>[\w-]+)/worksheet/(?P<worksheet_slug>[\w-]+)/further-reading/create/$',
         view=FurtherReadingCreateView.as_view(),
         name='further-reading-create'),
-    url(regex='^(?P<project_slug>[\w-]+)/lesson/'
-              '(?P<section_slug>[\w-]+)/worksheet/'
-              '(?P<worksheet_slug>[\w-]+)/further-reading/'
-              'update/(?P<pk>[\w-]+)/$',
+    url(r'^(?P<project_slug>[\w-]+)/lesson/(?P<section_slug>[\w-]+)/worksheet/(?P<worksheet_slug>[\w-]+)/further-reading/update/(?P<pk>[\w-]+)/$',
         view=FurtherReadingUpdateView.as_view(),
         name='further-reading-update'),
-    url(regex='^(?P<project_slug>[\w-]+)/lesson/'
-              '(?P<section_slug>[\w-]+)/worksheet/'
-              '(?P<worksheet_slug>[\w-]+)/further-reading/'
-              'delete/(?P<pk>[\w-]+)/$',
+    url(r'^(?P<project_slug>[\w-]+)/lesson/(?P<section_slug>[\w-]+)/worksheet/(?P<worksheet_slug>[\w-]+)/further-reading/delete/(?P<pk>[\w-]+)/$',
         view=FurtherReadingDeleteView.as_view(),
         name='further-reading-delete'),
     # Question
-    url(regex='^(?P<project_slug>[\w-]+)/lesson/'
-              '(?P<section_slug>[\w-]+)/worksheet/'
-              '(?P<worksheet_slug>[\w-]+)/question/create/$',
+    url(r'^(?P<project_slug>[\w-]+)/lesson/(?P<section_slug>[\w-]+)/worksheet/(?P<worksheet_slug>[\w-]+)/question/create/$',
         view=QuestionCreateView.as_view(),
         name='question-create'),
-    url(regex='^(?P<project_slug>[\w-]+)/lesson/'
-              '(?P<section_slug>[\w-]+)/worksheet/'
-              '(?P<worksheet_slug>[\w-]+)/question/'
-              'delete/(?P<pk>[\w-]+)/$',
+    url(r'^(?P<project_slug>[\w-]+)/lesson/(?P<section_slug>[\w-]+)/worksheet/(?P<worksheet_slug>[\w-]+)/question/delete/(?P<pk>[\w-]+)/$',
         view=QuestionDeleteView.as_view(),
         name='question-delete'),
-    url(regex='^(?P<project_slug>[\w-]+)/lesson/'
-              '(?P<section_slug>[\w-]+)/worksheet/'
-              '(?P<worksheet_slug>[\w-]+)/question/'
-              'update/(?P<pk>[\w-]+)/$',
+    url(r'^(?P<project_slug>[\w-]+)/lesson/(?P<section_slug>[\w-]+)/worksheet/(?P<worksheet_slug>[\w-]+)/question/update/(?P<pk>[\w-]+)/$',
         view=QuestionUpdateView.as_view(),
         name='question-update'),
-    url(regex='^(?P<project_slug>[\w-]+)/lesson/'
-              '(?P<section_slug>[\w-]+)/worksheet/'
-              '(?P<worksheet_slug>[\w-]+)/question/order/$',
+    url(r'^(?P<project_slug>[\w-]+)/lesson/(?P<section_slug>[\w-]+)/worksheet/(?P<worksheet_slug>[\w-]+)/question/order/$',
         view=QuestionOrderView.as_view(),
         name='question-order'),
-    url(regex='^(?P<project_slug>[\w-]+)/lesson/'
-              '(?P<section_slug>[\w-]+)/worksheet/'
-              '(?P<worksheet_slug>[\w-]+)/question/submit_order/$',
+    url(r'^(?P<project_slug>[\w-]+)/lesson/(?P<section_slug>[\w-]+)/worksheet/(?P<worksheet_slug>[\w-]+)/question/submit_order/$',
         view=QuestionOrderSubmitView.as_view(),
         name='question-submit-order'),
     # Answer
-    url(regex='^(?P<project_slug>[\w-]+)/lesson/'
-              '(?P<section_slug>[\w-]+)/worksheet/'
-              '(?P<worksheet_slug>[\w-]+)/question/'
-              '(?P<question_pk>[\w-]+)/answer/create$',
+    url(r'^(?P<project_slug>[\w-]+)/lesson/(?P<section_slug>[\w-]+)/worksheet/(?P<worksheet_slug>[\w-]+)/question/(?P<question_pk>[\w-]+)/answer/create$',
         view=AnswerCreateView.as_view(),
         name='answer-create'),
-    url(regex='^(?P<project_slug>[\w-]+)/lesson/'
-              '(?P<section_slug>[\w-]+)/worksheet/'
-              '(?P<worksheet_slug>[\w-]+)/answer/'
-              'update/(?P<pk>[\w-]+)/$',
+    url(r'^(?P<project_slug>[\w-]+)/lesson/(?P<section_slug>[\w-]+)/worksheet/(?P<worksheet_slug>[\w-]+)/answer/update/(?P<pk>[\w-]+)/$',
         view=AnswerUpdateView.as_view(),
         name='answer-update'),
-    url(regex='^(?P<project_slug>[\w-]+)/lesson/'
-              '(?P<section_slug>[\w-]+)/worksheet/'
-              '(?P<worksheet_slug>[\w-]+)/answer/'
-              'delete/(?P<pk>[\w-]+)/$',
+    url(r'^(?P<project_slug>[\w-]+)/lesson/(?P<section_slug>[\w-]+)/worksheet/(?P<worksheet_slug>[\w-]+)/answer/delete/(?P<pk>[\w-]+)/$',
         view=AnswerDeleteView.as_view(),
         name='answer-delete'),
 
     # download sample data
-    url(regex='^(?P<project_slug>[\w-]+)/lesson/'
-              '(?P<section_slug>[\w-]+)/sample-data/(?P<pk>[\w-]+)/$',
+    url(r'^(?P<project_slug>[\w-]+)/lesson/(?P<section_slug>[\w-]+)/sample-data/(?P<pk>[\w-]+)/$',
         view=WorksheetDownloadSampleDataView.as_view(),
         name='worksheet-sampledata'),
 
     # Json invalid Further reading Link
-    url(regex='(?P<project_slug>[\w-]+)/lessons/_further_reading_links/$',
+    url(r'(?P<project_slug>[\w-]+)/lessons/_further_reading_links/$',
         view=get_FurtherReading_links,
         name='further-reading-links'),
-    url(regex='(?P<project_slug>[\w-]+)/lessons/'
-              'print_invalid_further_reading/$',
+    url(r'(?P<project_slug>[\w-]+)/lessons/print_invalid_further_reading/$',
         view=print_invalid_FurterReading_links,
         name='print_invalid-further-reading-links'),
-    url(regex='^(?P<project_slug>[\w-]+)/lesson/_is_url_exist$',
+    url(r'^(?P<project_slug>[\w-]+)/lesson/_is_url_exist$',
         view=is_url_exist,
         name='is_url_exist'),
 ]
@@ -245,169 +191,117 @@
 # The original urlpatterns below will redirect to urlpatterns above
 # in order to make URL path for the lessons app more apparent.
 urlpatterns += [
-    url(regex='^(?P<project_slug>[\w-]+)/section/about/$',
+    url(r'^(?P<project_slug>[\w-]+)/section/about/$',
         view=RedirectView.as_view(pattern_name='about-lesson-app',
                                   permanent=False)),
     # Section
-    url(regex='^(?P<project_slug>[\w-]+)/section/create/$',
+    url(r'^(?P<project_slug>[\w-]+)/section/create/$',
         view=RedirectView.as_view(pattern_name='section-create',
                                   permanent=False)),
-    url(regex='^(?P<project_slug>[\w-]+)/section/list/$',
+    url(r'^(?P<project_slug>[\w-]+)/section/list/$',
         view=RedirectView.as_view(pattern_name='section-list',
                                   permanent=False)),
-    url(regex='^(?P<project_slug>[\w-]+)/section/order/$',
+    url(r'^(?P<project_slug>[\w-]+)/section/order/$',
         view=RedirectView.as_view(pattern_name='section-order',
                                   permanent=False)),
-    url(regex='^(?P<project_slug>[\w-]+)/section/submit_order/$',
+    url(r'^(?P<project_slug>[\w-]+)/section/submit_order/$',
         view=RedirectView.as_view(pattern_name='section-submit-order',
                                   permanent=False)),
-    url(regex='^(?P<project_slug>[\w-]+)/section/(?P<slug>[\w-]+)/update/$',
+    url(r'^(?P<project_slug>[\w-]+)/section/(?P<slug>[\w-]+)/update/$',
         view=RedirectView.as_view(pattern_name='section-update',
                                   permanent=False)),
-    url(regex='^(?P<project_slug>[\w-]+)/section/(?P<slug>[\w-]+)/delete/$',
+    url(r'^(?P<project_slug>[\w-]+)/section/(?P<slug>[\w-]+)/delete/$',
         view=RedirectView.as_view(pattern_name='section-delete',
                                   permanent=False)),
 
     # Worksheet
-    url(regex='^(?P<project_slug>[\w-]+)/section/'
-              'download-multiple-worksheet/$',
+    url(r'^(?P<project_slug>[\w-]+)/section/download-multiple-worksheet/$',
         view=RedirectView.as_view(pattern_name='download-multiple-worksheets',
                                   permanent=False)),
-    url(regex='^(?P<project_slug>[\w-]+)/section/'
-              '(?P<section_slug>[\w-]+)/worksheet/create/$',
+    url(r'^(?P<project_slug>[\w-]+)/section/(?P<section_slug>[\w-]+)/worksheet/create/$',
         view=RedirectView.as_view(pattern_name='worksheet-create',
                                   permanent=False)),
-    url(regex='^(?P<project_slug>[\w-]+)/section/'
-              '(?P<section_slug>[\w-]+)/update/(?P<pk>[\w-]+)/$',
+    url(r'^(?P<project_slug>[\w-]+)/section/(?P<section_slug>[\w-]+)/update/(?P<pk>[\w-]+)/$',
         view=RedirectView.as_view(pattern_name='worksheet-update',
                                   permanent=False)),
-    url(regex='^(?P<project_slug>[\w-]+)/section/'
-              '(?P<section_slug>[\w-]+)/delete/(?P<pk>[\w-]+)/$',
+    url(r'^(?P<project_slug>[\w-]+)/section/(?P<section_slug>[\w-]+)/delete/(?P<pk>[\w-]+)/$',
         view=RedirectView.as_view(pattern_name='worksheet-delete',
                                   permanent=False)),
-    url(regex='^(?P<project_slug>[\w-]+)/section/'
-              '(?P<section_slug>[\w-]+)/detail/(?P<pk>[\w-]+)/$',
+    url(r'^(?P<project_slug>[\w-]+)/section/(?P<section_slug>[\w-]+)/detail/(?P<pk>[\w-]+)/$',
         view=RedirectView.as_view(pattern_name='worksheet-detail',
                                   permanent=False)),
 
-    url(regex='^(?P<project_slug>[\w-]+)/section/'
-              '(?P<section_slug>[\w-]+)/answers/(?P<pk>[\w-]+)/$',
+    url(r'^(?P<project_slug>[\w-]+)/section/(?P<section_slug>[\w-]+)/answers/(?P<pk>[\w-]+)/$',
         view=RedirectView.as_view(pattern_name='worksheet-module-answers',
                                   permanent=False)),
 
-    url(regex='^(?P<project_slug>[\w-]+)/section/'
-              '(?P<section_slug>[\w-]+)/answers/(?P<pk>[\w-]+)/print$',
+    url(r'^(?P<project_slug>[\w-]+)/section/(?P<section_slug>[\w-]+)/answers/(?P<pk>[\w-]+)/print$',
         view=RedirectView.as_view(
             pattern_name='worksheet-module-answers-print',
             permanent=False)),
 
-    url(regex='^(?P<project_slug>[\w-]+)/section/'
-              '(?P<section_slug>[\w-]+)/zip/(?P<pk>[\w-]+)/$',
+    url(r'^(?P<project_slug>[\w-]+)/section/(?P<section_slug>[\w-]+)/zip/(?P<pk>[\w-]+)/$',
         view=RedirectView.as_view(pattern_name='worksheet-zip',
                                   permanent=False)),
-    url(regex='^(?P<project_slug>[\w-]+)/section/'
-              '(?P<section_slug>[\w-]+)/print/(?P<pk>[\w-]+)/$',
+    url(r'^(?P<project_slug>[\w-]+)/section/(?P<section_slug>[\w-]+)/print/(?P<pk>[\w-]+)/$',
         view=RedirectView.as_view(pattern_name='worksheet-print',
                                   permanent=False)),
-    url(regex='^(?P<project_slug>[\w-]+)/section/'
-              '(?P<section_slug>[\w-]+)/order$',
+    url(r'^(?P<project_slug>[\w-]+)/section/(?P<section_slug>[\w-]+)/order$',
         view=RedirectView.as_view(pattern_name='worksheet-order',
                                   permanent=False)),
-    url(regex='^(?P<project_slug>[\w-]+)/section/'
-              '(?P<section_slug>[\w-]+)/submit_order/$',
+    url(r'^(?P<project_slug>[\w-]+)/section/(?P<section_slug>[\w-]+)/submit_order/$',
         view=RedirectView.as_view(pattern_name='worksheet-submit-order',
                                   permanent=False)),
     # Specification
-    url(regex='^(?P<project_slug>[\w-]+)/section/'
-              '(?P<section_slug>[\w-]+)/worksheet/'
-              '(?P<worksheet_slug>[\w-]+)/specification/create/$',
+    url(r'^(?P<project_slug>[\w-]+)/section/(?P<section_slug>[\w-]+)/worksheet/(?P<worksheet_slug>[\w-]+)/specification/create/$',
         view=RedirectView.as_view(pattern_name='specification-create',
                                   permanent=False)),
-    url(regex='^(?P<project_slug>[\w-]+)/section/'
-              '(?P<section_slug>[\w-]+)/worksheet/'
-              '(?P<worksheet_slug>[\w-]+)/specification/order/$',
+    url(r'^(?P<project_slug>[\w-]+)/section/(?P<section_slug>[\w-]+)/worksheet/(?P<worksheet_slug>[\w-]+)/specification/order/$',
         view=RedirectView.as_view(pattern_name='specification-order',
                                   permanent=False)),
-    url(regex='^(?P<project_slug>[\w-]+)/section/'
-              '(?P<section_slug>[\w-]+)/worksheet/'
-              '(?P<worksheet_slug>[\w-]+)/specification/submit_order/$',
+    url(r'^(?P<project_slug>[\w-]+)/section/(?P<section_slug>[\w-]+)/worksheet/(?P<worksheet_slug>[\w-]+)/specification/submit_order/$',
         view=RedirectView.as_view(pattern_name='specification-submit-order',
                                   permanent=False)),
-    url(regex='^(?P<project_slug>[\w-]+)/section/'
-              '(?P<section_slug>[\w-]+)/worksheet/'
-              '(?P<worksheet_slug>[\w-]+)/specification/'
-              'update/(?P<pk>[\w-]+)/$',
+    url(r'^(?P<project_slug>[\w-]+)/section/(?P<section_slug>[\w-]+)/worksheet/(?P<worksheet_slug>[\w-]+)/specification/update/(?P<pk>[\w-]+)/$',
         view=RedirectView.as_view(pattern_name='specification-update',
                                   permanent=False)),
-    url(regex='^(?P<project_slug>[\w-]+)/section/'
-              '(?P<section_slug>[\w-]+)/worksheet/'
-              '(?P<worksheet_slug>[\w-]+)/specification/'
-              'delete/(?P<pk>[\w-]+)/$',
+    url(r'^(?P<project_slug>[\w-]+)/section/(?P<section_slug>[\w-]+)/worksheet/(?P<worksheet_slug>[\w-]+)/specification/delete/(?P<pk>[\w-]+)/$',
         view=RedirectView.as_view(pattern_name='specification-delete',
                                   permanent=False)),
     # Further more
-    url(regex='^(?P<project_slug>[\w-]+)/section/'
-              '(?P<section_slug>[\w-]+)/worksheet/'
-              '(?P<worksheet_slug>[\w-]+)/further-reading/create/$',
+    url(r'^(?P<project_slug>[\w-]+)/section/(?P<section_slug>[\w-]+)/worksheet/(?P<worksheet_slug>[\w-]+)/further-reading/create/$',
         view=RedirectView.as_view(pattern_name='further-reading-create',
                                   permanent=False)),
-    url(regex='^(?P<project_slug>[\w-]+)/section/'
-              '(?P<section_slug>[\w-]+)/worksheet/'
-              '(?P<worksheet_slug>[\w-]+)/further-reading/'
-              'update/(?P<pk>[\w-]+)/$',
+    url(r'^(?P<project_slug>[\w-]+)/section/(?P<section_slug>[\w-]+)/worksheet/(?P<worksheet_slug>[\w-]+)/further-reading/update/(?P<pk>[\w-]+)/$',
         view=RedirectView.as_view(pattern_name='further-reading-update',
                                   permanent=False)),
-    url(regex='^(?P<project_slug>[\w-]+)/section/'
-              '(?P<section_slug>[\w-]+)/worksheet/'
-              '(?P<worksheet_slug>[\w-]+)/further-reading/'
-              'delete/(?P<pk>[\w-]+)/$',
+    url(r'^(?P<project_slug>[\w-]+)/section/(?P<section_slug>[\w-]+)/worksheet/(?P<worksheet_slug>[\w-]+)/further-reading/delete/(?P<pk>[\w-]+)/$',
         view=RedirectView.as_view(pattern_name='further-reading-delete',
                                   permanent=False)),
     # Question
-    url(regex='^(?P<project_slug>[\w-]+)/section/'
-              '(?P<section_slug>[\w-]+)/worksheet/'
-              '(?P<worksheet_slug>[\w-]+)/question/create/$',
+    url(r'^(?P<project_slug>[\w-]+)/section/(?P<section_slug>[\w-]+)/worksheet/(?P<worksheet_slug>[\w-]+)/question/create/$',
         view=RedirectView.as_view(pattern_name='question-create',
                                   permanent=False)),
-    url(regex='^(?P<project_slug>[\w-]+)/section/'
-              '(?P<section_slug>[\w-]+)/worksheet/'
-              '(?P<worksheet_slug>[\w-]+)/question/'
-              'delete/(?P<pk>[\w-]+)/$',
+    url(r'^(?P<project_slug>[\w-]+)/section/(?P<section_slug>[\w-]+)/worksheet/(?P<worksheet_slug>[\w-]+)/question/delete/(?P<pk>[\w-]+)/$',
         view=RedirectView.as_view(pattern_name='question-delete',
                                   permanent=False)),
-    url(regex='^(?P<project_slug>[\w-]+)/section/'
-              '(?P<section_slug>[\w-]+)/worksheet/'
-              '(?P<worksheet_slug>[\w-]+)/question/'
-              'update/(?P<pk>[\w-]+)/$',
+    url(r'^(?P<project_slug>[\w-]+)/section/(?P<section_slug>[\w-]+)/worksheet/(?P<worksheet_slug>[\w-]+)/question/update/(?P<pk>[\w-]+)/$',
         view=RedirectView.as_view(pattern_name='question-update',
                                   permanent=False)),
-    url(regex='^(?P<project_slug>[\w-]+)/section/'
-              '(?P<section_slug>[\w-]+)/worksheet/'
-              '(?P<worksheet_slug>[\w-]+)/question/order/$',
+    url(r'^(?P<project_slug>[\w-]+)/section/(?P<section_slug>[\w-]+)/worksheet/(?P<worksheet_slug>[\w-]+)/question/order/$',
         view=RedirectView.as_view(pattern_name='question-order',
                                   permanent=False)),
-    url(regex='^(?P<project_slug>[\w-]+)/section/'
-              '(?P<section_slug>[\w-]+)/worksheet/'
-              '(?P<worksheet_slug>[\w-]+)/question/submit_order/$',
+    url(r'^(?P<project_slug>[\w-]+)/section/(?P<section_slug>[\w-]+)/worksheet/(?P<worksheet_slug>[\w-]+)/question/submit_order/$',
         view=RedirectView.as_view(pattern_name='question-submit-order',
                                   permanent=False)),
     # Answer
-    url(regex='^(?P<project_slug>[\w-]+)/section/'
-              '(?P<section_slug>[\w-]+)/worksheet/'
-              '(?P<worksheet_slug>[\w-]+)/question/'
-              '(?P<question_pk>[\w-]+)/answer/create$',
+    url(r'^(?P<project_slug>[\w-]+)/section/(?P<section_slug>[\w-]+)/worksheet/(?P<worksheet_slug>[\w-]+)/question/(?P<question_pk>[\w-]+)/answer/create$',
         view=RedirectView.as_view(pattern_name='answer-create',
                                   permanent=False)),
-    url(regex='^(?P<project_slug>[\w-]+)/section/'
-              '(?P<section_slug>[\w-]+)/worksheet/'
-              '(?P<worksheet_slug>[\w-]+)/answer/'
-              'update/(?P<pk>[\w-]+)/$',
+    url(r'^(?P<project_slug>[\w-]+)/section/(?P<section_slug>[\w-]+)/worksheet/(?P<worksheet_slug>[\w-]+)/answer/update/(?P<pk>[\w-]+)/$',
         view=RedirectView.as_view(pattern_name='answer-update',
                                   permanent=False)),
-    url(regex='^(?P<project_slug>[\w-]+)/section/'
-              '(?P<section_slug>[\w-]+)/worksheet/'
-              '(?P<worksheet_slug>[\w-]+)/answer/'
-              'delete/(?P<pk>[\w-]+)/$',
+    url(r'^(?P<project_slug>[\w-]+)/section/(?P<section_slug>[\w-]+)/worksheet/(?P<worksheet_slug>[\w-]+)/answer/delete/(?P<pk>[\w-]+)/$',
         view=RedirectView.as_view(pattern_name='answer-delete',
                                   permanent=False)),
 ]
diff --git a/django_project/lesson/utilities.py b/django_project/lesson/utilities.py
index 389084d0f..162624c87 100644
--- a/django_project/lesson/utilities.py
+++ b/django_project/lesson/utilities.py
@@ -12,7 +12,7 @@
 from django.http import Http404, HttpResponse
 from django.urls import reverse
 from django.utils.text import slugify
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from core.settings.contrib import STOP_WORDS
 
diff --git a/django_project/lesson/views/answer.py b/django_project/lesson/views/answer.py
index d6ccbf2a7..82296f948 100644
--- a/django_project/lesson/views/answer.py
+++ b/django_project/lesson/views/answer.py
@@ -8,7 +8,7 @@
     UpdateView,
 )
 from django.shortcuts import get_object_or_404
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from braces.views import LoginRequiredMixin
 
diff --git a/django_project/lesson/views/further_reading.py b/django_project/lesson/views/further_reading.py
index b591a8f4e..8285c3629 100644
--- a/django_project/lesson/views/further_reading.py
+++ b/django_project/lesson/views/further_reading.py
@@ -12,7 +12,7 @@
     UpdateView,
 )
 from django.shortcuts import get_object_or_404
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from braces.views import LoginRequiredMixin
 
diff --git a/django_project/lesson/views/question.py b/django_project/lesson/views/question.py
index 08ab77528..3d3e334ff 100644
--- a/django_project/lesson/views/question.py
+++ b/django_project/lesson/views/question.py
@@ -9,7 +9,7 @@
     UpdateView,
 )
 from django.shortcuts import get_object_or_404
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from braces.views import LoginRequiredMixin
 
diff --git a/django_project/lesson/views/section.py b/django_project/lesson/views/section.py
index 15f6d1f30..6c3642921 100644
--- a/django_project/lesson/views/section.py
+++ b/django_project/lesson/views/section.py
@@ -13,7 +13,7 @@
 )
 from django.http import Http404
 from django.shortcuts import get_object_or_404
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from braces.views import LoginRequiredMixin
 from pure_pagination.mixins import PaginationMixin
@@ -130,12 +130,12 @@ def get_queryset(self):
 # noinspection PyAttributeOutsideInit
 class SectionDeleteView(
         LoginRequiredMixin,
-        SectionMixin,
         DeleteView):
     """Delete view for Section."""
 
     context_object_name = 'section'
     template_name = 'section/delete.html'
+    model = Section
 
     def get_success_url(self):
         """Define the redirect URL.
diff --git a/django_project/lesson/views/specification.py b/django_project/lesson/views/specification.py
index 86d6af1b5..45be8454f 100644
--- a/django_project/lesson/views/specification.py
+++ b/django_project/lesson/views/specification.py
@@ -9,7 +9,7 @@
     UpdateView,
 )
 from django.shortcuts import get_object_or_404
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from braces.views import LoginRequiredMixin
 
diff --git a/django_project/lesson/views/worksheet.py b/django_project/lesson/views/worksheet.py
index 94bbeccd3..e85173ca1 100644
--- a/django_project/lesson/views/worksheet.py
+++ b/django_project/lesson/views/worksheet.py
@@ -17,7 +17,7 @@
     ListView,
 )
 from django.shortcuts import get_object_or_404, render
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from braces.views import LoginRequiredMixin
 from weasyprint import HTML
diff --git a/django_project/vota/models/ballot.py b/django_project/vota/models/ballot.py
index f0caed5f7..07dddf4c9 100644
--- a/django_project/vota/models/ballot.py
+++ b/django_project/vota/models/ballot.py
@@ -14,7 +14,7 @@
 from core.settings.contrib import STOP_WORDS
 
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from django.utils import timezone
 from vota.models.vote import Vote
 import datetime
diff --git a/django_project/vota/models/committee.py b/django_project/vota/models/committee.py
index 0fa12d0bb..d1f6ac8df 100644
--- a/django_project/vota/models/committee.py
+++ b/django_project/vota/models/committee.py
@@ -12,7 +12,7 @@
 from core.settings.contrib import STOP_WORDS
 
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from django.contrib.auth.models import User
 from vota.models.ballot import Ballot
 
diff --git a/django_project/vota/templates/committee/list.html b/django_project/vota/templates/committee/list.html
index 749b75df2..81fc6eb3d 100644
--- a/django_project/vota/templates/committee/list.html
+++ b/django_project/vota/templates/committee/list.html
@@ -25,13 +25,13 @@ <h1 class="text-muted">
             </div>
         </h1>
     </div>
-    {%  ifequal num_committees 0 %}
+    {% if num_committees == 0 %}
         {% if unapproved %}
             <h3>All teams are approved.</h3>
         {% else %}
             <h3>No teams are defined.</h3>
         {% endif %}
-    {%  endifequal %}
+    {%  endif %}
     {% for committee in committees %}
         {% include 'committee/includes/committee-panel.html' %}
     {%  endfor %}
diff --git a/django_project/vota/urls.py b/django_project/vota/urls.py
index 4a1066627..65eaf714a 100644
--- a/django_project/vota/urls.py
+++ b/django_project/vota/urls.py
@@ -2,7 +2,7 @@
 # flake8: noqa
 
 """Project level url handler."""
-from django.conf.urls import url
+from django.urls import re_path as url
 from .feeds.ballot import BallotFeed
 from .views.committee import (
     CommitteeDetailView,
@@ -22,53 +22,46 @@
 
 urlpatterns = [
     # Committee URLs
-    url(regex='^(?P<project_slug>[\w-]+)/committees/(?P<slug>[\w-]+)/$',
+    url(r'^(?P<project_slug>[\w-]+)/committees/(?P<slug>[\w-]+)/$',
         view=CommitteeDetailView.as_view(),
         name='committee-detail'),
-    url(regex='^(?P<project_slug>[\w-]+)/committees/$',
+    url(r'^(?P<project_slug>[\w-]+)/committees/$',
         view=CommitteeListView.as_view(),
         name='committee-list'),
-    url(regex='^(?P<project_slug>[\w-]+)/create-committee/$',
+    url(r'^(?P<project_slug>[\w-]+)/create-committee/$',
         view=CommitteeCreateView.as_view(),
         name='committee-create'),
-    url(regex='^(?P<project_slug>[\w-]+)/committees/(?P<slug>[\w-]+)/delete/$',
+    url(r'^(?P<project_slug>[\w-]+)/committees/(?P<slug>[\w-]+)/delete/$',
         view=CommitteeDeleteView.as_view(),
         name='committee-delete'),
-    url(regex='^(?P<project_slug>[\w-]+)/committees/(?P<slug>[\w-]+)/update/$',
+    url(r'^(?P<project_slug>[\w-]+)/committees/(?P<slug>[\w-]+)/update/$',
         view=CommitteeUpdateView.as_view(),
         name='committee-update'),
 
     # Voting URLs
-    url(regex='^(?P<project_slug>[\w-]+)/committees/(?P<committee_slug>[\w-]+)/'
-              'ballots/(?P<ballot_slug>[\w-]+)/vote/$',
+    url(r'^(?P<project_slug>[\w-]+)/committees/(?P<committee_slug>[\w-]+)/ballots/(?P<ballot_slug>[\w-]+)/vote/$',
         view=VoteCreateUpdateView.as_view(),
         name='vote-create'),
 
     # Ballot URLs
-    url(regex='^(?P<project_slug>[\w-]+)/committees/(?P<committee_slug>[\w-]+)/'
-              'ballots/(?P<slug>[\w-]+)/$',
+    url(r'^(?P<project_slug>[\w-]+)/committees/(?P<committee_slug>[\w-]+)/ballots/(?P<slug>[\w-]+)/$',
         view=BallotDetailView.as_view(),
         name='ballot-detail'),
-    url(regex='^(?P<project_slug>[\w-]+)/committees/(?P<committee_slug>[\w-]+)/'
-              'ballots/$',
+    url(r'^(?P<project_slug>[\w-]+)/committees/(?P<committee_slug>[\w-]+)/ballots/$',
         view=BallotListView.as_view(),
         name='ballot-list'),
-    url(regex='^(?P<project_slug>[\w-]+)/committees/(?P<committee_slug>[\w-]+)/'
-              'ballots/(?P<slug>[\w-]+)/delete/$',
+    url(r'^(?P<project_slug>[\w-]+)/committees/(?P<committee_slug>[\w-]+)/ballots/(?P<slug>[\w-]+)/delete/$',
         view=BallotDeleteView.as_view(),
         name='ballot-delete'),
-    url(regex='^(?P<project_slug>[\w-]+)/committees/(?P<committee_slug>[\w-]+)/'
-              'ballots/(?P<slug>[\w-]+)/update/$',
+    url(r'^(?P<project_slug>[\w-]+)/committees/(?P<committee_slug>[\w-]+)/ballots/(?P<slug>[\w-]+)/update/$',
         view=BallotUpdateView.as_view(),
         name='ballot-update'),
-    url(regex='^(?P<project_slug>[\w-]+)/committees/(?P<committee_slug>[\w-]+)/'
-              'create-ballot/$',
+    url(r'^(?P<project_slug>[\w-]+)/committees/(?P<committee_slug>[\w-]+)/create-ballot/$',
         view=BallotCreateView.as_view(),
         name='ballot-create'),
 
     # Feeds
-    url(regex='^(?P<project_slug>[\w-]+)/committees/(?P<committee_slug>[\w-]+)/'
-              'ballots-rss/$',
+    url(r'^(?P<project_slug>[\w-]+)/committees/(?P<committee_slug>[\w-]+)/ballots-rss/$',
         view=BallotFeed(),
         name='latest-ballot-rss'),
 ]
diff --git a/django_project/vota/views/ballot.py b/django_project/vota/views/ballot.py
index 8aa01f7c6..337f6f6d0 100644
--- a/django_project/vota/views/ballot.py
+++ b/django_project/vota/views/ballot.py
@@ -256,7 +256,7 @@ def form_valid(self, form):
 
 
 # noinspection PyAttributeOutsideInit
-class BallotDeleteView(StaffuserRequiredMixin, BallotMixin, DeleteView):
+class BallotDeleteView(StaffuserRequiredMixin, DeleteView):
     """The view for deleting a Ballot object.
 
     Accepts GET requests, returning a confirmation page and POST requests to
diff --git a/django_project/vota/views/committee.py b/django_project/vota/views/committee.py
index 5bef897b9..258c2cd48 100644
--- a/django_project/vota/views/committee.py
+++ b/django_project/vota/views/committee.py
@@ -233,7 +233,7 @@ def form_valid(self, form):
 
 
 # noinspection PyAttributeOutsideInit
-class CommitteeDeleteView(StaffuserRequiredMixin, CommitteeMixin, DeleteView):
+class CommitteeDeleteView(StaffuserRequiredMixin, DeleteView):
     """
     The view for deleting a Committee
     """