diff --git a/package.json b/package.json
index f9bf4df..beda726 100644
--- a/package.json
+++ b/package.json
@@ -18,9 +18,14 @@
     "@babel/preset-env": "^7.9.5",
     "@types/config": "^0.0.36",
     "@types/express": "^4.17.6",
+    "@types/express-session": "^1.17.0",
     "@types/formidable": "^1.0.31",
-    "@types/jest": "^25.2.1",
+    "@types/jest": "^26.0.4",
+    "@types/mysql": "^2.15.15",
     "@types/node": "^13.13.2",
+    "@types/nodemailer": "^6.4.0",
+    "@types/nunjucks": "^3.1.3",
+    "@types/ws": "^7.2.6",
     "babel-loader": "^8.1.0",
     "concurrently": "^5.1.0",
     "css-loader": "^3.5.2",
@@ -28,16 +33,16 @@
     "file-loader": "^6.0.0",
     "imagemin": "^7.0.1",
     "imagemin-gifsicle": "^7.0.0",
-    "imagemin-mozjpeg": "^8.0.0",
-    "imagemin-pngquant": "^8.0.0",
-    "imagemin-svgo": "^7.1.0",
+    "imagemin-mozjpeg": "^9.0.0",
+    "imagemin-pngquant": "^9.0.0",
+    "imagemin-svgo": "^8.0.0",
     "img-loader": "^3.0.1",
-    "jest": "^25.4.0",
+    "jest": "^26.1.0",
     "mini-css-extract-plugin": "^0.9.0",
     "node-sass": "^4.14.0",
     "nodemon": "^2.0.3",
-    "sass-loader": "^8.0.2",
-    "ts-jest": "^25.4.0",
+    "sass-loader": "^9.0.2",
+    "ts-jest": "^26.1.1",
     "typescript": "^3.8.3",
     "uglifyjs-webpack-plugin": "^2.2.0",
     "webpack": "^4.43.0",
diff --git a/views/errors/400.njk b/views/errors/400.njk
deleted file mode 100644
index a5bc022..0000000
--- a/views/errors/400.njk
+++ /dev/null
@@ -1,2 +0,0 @@
-{% extends './error.njk' %}
-{% import 'macros.njk' as macros %}
diff --git a/views/errors/401.njk b/views/errors/401.njk
deleted file mode 100644
index a5bc022..0000000
--- a/views/errors/401.njk
+++ /dev/null
@@ -1,2 +0,0 @@
-{% extends './error.njk' %}
-{% import 'macros.njk' as macros %}
diff --git a/views/errors/403.njk b/views/errors/403.njk
deleted file mode 100644
index a5bc022..0000000
--- a/views/errors/403.njk
+++ /dev/null
@@ -1,2 +0,0 @@
-{% extends './error.njk' %}
-{% import 'macros.njk' as macros %}
diff --git a/views/errors/404.njk b/views/errors/404.njk
deleted file mode 100644
index a5bc022..0000000
--- a/views/errors/404.njk
+++ /dev/null
@@ -1,2 +0,0 @@
-{% extends './error.njk' %}
-{% import 'macros.njk' as macros %}
diff --git a/views/errors/429.njk b/views/errors/429.njk
deleted file mode 100644
index a5bc022..0000000
--- a/views/errors/429.njk
+++ /dev/null
@@ -1,2 +0,0 @@
-{% extends './error.njk' %}
-{% import 'macros.njk' as macros %}
diff --git a/views/errors/500.njk b/views/errors/500.njk
deleted file mode 100644
index a5bc022..0000000
--- a/views/errors/500.njk
+++ /dev/null
@@ -1,2 +0,0 @@
-{% extends './error.njk' %}
-{% import 'macros.njk' as macros %}
diff --git a/views/errors/503.njk b/views/errors/503.njk
deleted file mode 100644
index a5bc022..0000000
--- a/views/errors/503.njk
+++ /dev/null
@@ -1,2 +0,0 @@
-{% extends './error.njk' %}
-{% import 'macros.njk' as macros %}
diff --git a/views/errors/error.njk b/views/errors/error.njk
deleted file mode 100644
index 3d05ea9..0000000
--- a/views/errors/error.njk
+++ /dev/null
@@ -1,36 +0,0 @@
-{% extends '../layouts/barebone.njk' %}
-
-{% set title = error_code + ' - ' + error_message %}
-
-{% block _stylesheets %}
-    <link rel="stylesheet" href="/css/error.css">
-{% endblock %}
-
-{% block _body %}
-    <div class="logo"><a href="/">{{ app.name }}</a></div>
-
-    <main class="{% block class %}{% endblock %}">
-        {% if flash %}
-            {{ macros.messages(flash) }}
-        {% endif %}
-
-        <div class="error-code">{{ error_code }}</div>
-        <div class="error-message">{{ error_message }}</div>
-        <div class="error-instructions">{{ error_instructions|safe }}</div>
-
-        <nav>
-            {% if session.previousUrl and session.previousUrl != '/' and session.previousUrl != url %}
-                <a href="{{ session.previousUrl }}" class="button"><i data-feather="arrow-left"></i> Go back</a>
-            {% endif %}
-
-            <a href="/" class="button"><i data-feather="home"></i> Go to homepage</a>
-        </nav>
-    </main>
-
-    <div class="contact">
-        Error ID: {{ error_id }}
-        <br>
-        If you think this isn't right, please contact us with the above error ID at
-        <a href="mailto:{{ app.contact_email }}">{{ app.contact_email }}</a>.
-    </div>
-{% endblock %}
\ No newline at end of file
diff --git a/views/layouts/barebone.njk b/views/layouts/barebone.njk
deleted file mode 100644
index 3a82d94..0000000
--- a/views/layouts/barebone.njk
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <title>{{ title }}</title>
-
-    <link rel="shortcut icon" type="image/png" href="/img/logox1024.png">
-    <link rel="shortcut icon" type="image/png" href="/img/logox128.png">
-    <link rel="shortcut icon" type="image/svg" href="/img/logo.svg">
-
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-
-    {% if description %}
-        <meta name="description" content="{{ description }}">
-    {% endif %}
-
-    {% if refresh_after %}
-        <meta http-equiv="refresh" content="{{ refresh_after }}">
-    {% endif %}
-
-    {% block _stylesheets %}{% endblock %}
-    {% block _scripts %}
-        <script src="/js/app.js" defer></script>
-    {% endblock %}
-</head>
-<body>
-
-<header>
-    {% block header %}{% endblock %}
-</header>
-
-{% block _body %}{% endblock %}
-
-<footer>{% block footer %}{% endblock %}</footer>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/views/layouts/base.njk b/views/layouts/base.njk
index f87c6aa..cb76570 100644
--- a/views/layouts/base.njk
+++ b/views/layouts/base.njk
@@ -1,4 +1,4 @@
-{% extends './barebone.njk' %}
+{% extends 'layouts/barebone.njk' %}
 {% import 'macros.njk' as macros %}
 
 {% block _stylesheets %}
diff --git a/views/macros.njk b/views/macros.njk
deleted file mode 100644
index 789700a..0000000
--- a/views/macros.njk
+++ /dev/null
@@ -1,142 +0,0 @@
-{% macro message(type, content, raw=false, discreet=false) %}
-    <div class="message{{ ' message-discreet' if discreet }}" data-type="{{ type }}">
-        <i class="icon"></i>
-        <span class="content">
-            {{ content|safe if raw else content }}
-        </span>
-    </div>
-{% endmacro %}
-
-{% macro messages(flash) %}
-    {% set flashed = flash() %}
-    {% set display = 0 %}
-
-    {% for type, bag in flashed %}
-        {% if bag|length %}
-            {% set display = 1 %}
-        {% endif %}
-    {% endfor %}
-
-    {% if display %}
-        <div class="messages">
-            {% for type, bag in flashed %}
-                {% for content in bag %}
-                    {{ message(type, content) }}
-                {% endfor %}
-            {% endfor %}
-        </div>
-    {% endif %}
-{% endmacro %}
-
-{% macro csrf(getCSRFToken) %}
-    <input type="hidden" name="csrf" value="{{ getCSRFToken() }}">
-{% endmacro %}
-
-{% macro field(_locals, type, name, value, placeholder, hint, validation_attributes='', extraData='') %}
-    {% set validation = _locals.validation() %}
-    {% set validation = validation[name] if validation[name] or null %}
-    {% set previousFormData = _locals.previousFormData() %}
-    {% set value = previousFormData[name] or value or validation.value or '' %}
-
-    {% if type == 'hidden' %}
-        {% if validation %}
-            {{ message('error', validation.message) }}
-        {% endif %}
-        <input type="hidden" name="{{ name }}" value="{{ value }}">
-    {% else %}
-        <div class="form-field{{ ' inline' if type == 'checkbox' }}">
-            {% if type == 'duration' %}
-                <div class="input-group">
-                    {% for f in extraData %}
-                        <div class="time-input">
-                            {% if previousFormData[name] %}
-                                {% set v = value[f] %}
-                            {% else %}
-                                {% set v = (value % 60) if f == 's' else (((value - value % 60) / 60 % 60) if f == 'm' else ((value - value % 3600) / 3600 if f == 'h')) %}
-                            {% endif %}
-                            <input type="number" name="{{ name }}[{{ f }}]" id="field-{{ name }}-{{ f }}"
-                                   value="{{ v }}"
-                                   min="0" {{ 'max=60' if (f == 's' or f == 'm') }}
-                                    {{ validation_attributes }}>
-                            <label for="field-{{ name }}-{{ f }}">{{ f }}</label>
-                        </div>
-                    {% endfor %}
-                </div>
-            {% elseif type == 'select' %}
-                <select name="{{ name }}" id="field-{{ name }}" {{ validation_attributes|safe }}>
-                    {% for option in extraData %}
-                        <option value="{{ option }}" {{ 'selected' if value == option }}>{{ option }}</option>
-                    {% endfor %}
-                </select>
-                <i data-feather="chevron-down"></i>
-            {% else %}
-                <input type="{{ type }}" name="{{ name }}" id="field-{{ name }}"
-                        {% if type != 'checkbox' %} value="{{ value }}" {% endif %}
-                        {{ 'checked' if (type == 'checkbox' and value == 'on') }}
-                        {{ validation_attributes|safe }}>
-            {% endif %}
-
-            <label for="field-{{ name }}{{ '-' + extraData[0] if type == 'duration' }}">{{ placeholder }}</label>
-            {{ fieldError(_locals, name) }}
-            {% if hint %}
-                <div class="hint"><i data-feather="info"></i> {{ hint }}</div>
-            {% endif %}
-        </div>
-    {% endif %}
-{% endmacro %}
-
-{% macro fieldError(_locals, name) %}
-    {% set validation = _locals.validation() %}
-    {% set validation = validation[name] if validation[name] or null %}
-    {% if validation %}
-        <div class="error"><i data-feather="x-circle"></i> {{ validation.message }}</div>
-    {% endif %}
-{% endmacro %}
-
-{% macro websocket(websocketUrl, listener, reconnectOnClose = 1, checkFunction = 0) %}
-    <script>
-        document.addEventListener('DOMContentLoaded', () => {
-            {% if checkFunction %}
-            if (!{{ checkFunction }}()) return;
-            {% endif %}
-
-            const run = () => {
-                const websocket = new WebSocket('{{ websocketUrl }}');
-                websocket.onopen = (e) => {
-                    console.debug('Websocket connected');
-                };
-                websocket.onmessage = (e) => {
-                    {{ listener }}(websocket, e);
-                };
-                websocket.onerror = (e) => {
-                    console.error('Websocket error', e);
-                };
-                websocket.onclose = (e) => {
-                    console.debug('Websocket closed', e.code, e.reason);
-
-                    {% if reconnectOnClose %}
-                    setTimeout(run, 1000);
-                    {% endif %}
-                };
-            };
-
-            run();
-        });
-    </script>
-{% endmacro %}
-
-{% macro paginate(pagination, routeName) %}
-    {% if pagination.hasPrevious() or pagination.hasNext() %}
-        <div class="pagination">
-            {% if pagination.hasPrevious() %}
-                <a href="{{ route(routeName, {page: pagination.page - 1}) }}"><i data-feather="chevron-left"></i></a>
-            {% endif %}
-
-            <span>{{ pagination.page }}</span>
-
-            {% if pagination.hasNext() %}
-                <a href="{{ route(routeName, {page: pagination.page + 1}) }}"><i data-feather="chevron-right"></i></a>
-            {% endif %}
-        </div>
-    {% endif %}
-{% endmacro %}
\ No newline at end of file