From 0320c92dd6ff7f9ef8bddd808d168c038cf38c58 Mon Sep 17 00:00:00 2001
From: Jochen Klar <mail@jochenklar.de>
Date: Mon, 30 Mar 2026 21:25:03 +0200
Subject: [PATCH 01/16] Remove project views and tests

---
 rdmo/projects/tests/test_export.py            |  29 -
 rdmo/projects/tests/test_view_integration.py  | 240 -----
 rdmo/projects/tests/test_view_issue.py        | 226 -----
 rdmo/projects/tests/test_view_membership.py   | 301 ------
 .../tests/test_view_membership_multisite.py   | 106 ---
 rdmo/projects/tests/test_view_project.py      | 896 ------------------
 rdmo/projects/tests/test_view_project_copy.py | 207 ----
 .../tests/test_view_project_create_import.py  | 359 -------
 .../projects/tests/test_view_project_leave.py | 146 ---
 .../tests/test_view_project_update_import.py  | 471 ---------
 .../test_view_project_update_visibility.py    | 412 --------
 .../tests/test_view_project_visibility.py     | 147 ---
 rdmo/projects/tests/test_view_snapshot.py     | 229 -----
 rdmo/projects/tests/test_views.py             |  76 ++
 rdmo/projects/tests/test_viewset_project.py   |  27 +-
 rdmo/projects/urls/__init__.py                | 141 +--
 rdmo/projects/views.py                        |  79 ++
 rdmo/projects/views/__init__.py               |  31 -
 rdmo/projects/views/integration.py            |  92 --
 rdmo/projects/views/invite.py                 |  22 -
 rdmo/projects/views/issue.py                  | 197 ----
 rdmo/projects/views/membership.py             |  95 --
 rdmo/projects/views/project.py                | 223 -----
 rdmo/projects/views/project_answers.py        |  87 --
 rdmo/projects/views/project_copy.py           |  39 -
 rdmo/projects/views/project_create.py         |  85 --
 rdmo/projects/views/project_update.py         | 196 ----
 rdmo/projects/views/project_view.py           | 100 --
 rdmo/projects/views/snapshot.py               |  96 --
 29 files changed, 172 insertions(+), 5183 deletions(-)
 delete mode 100644 rdmo/projects/tests/test_export.py
 delete mode 100644 rdmo/projects/tests/test_view_integration.py
 delete mode 100644 rdmo/projects/tests/test_view_issue.py
 delete mode 100644 rdmo/projects/tests/test_view_membership.py
 delete mode 100644 rdmo/projects/tests/test_view_membership_multisite.py
 delete mode 100644 rdmo/projects/tests/test_view_project.py
 delete mode 100644 rdmo/projects/tests/test_view_project_copy.py
 delete mode 100644 rdmo/projects/tests/test_view_project_create_import.py
 delete mode 100644 rdmo/projects/tests/test_view_project_leave.py
 delete mode 100644 rdmo/projects/tests/test_view_project_update_import.py
 delete mode 100644 rdmo/projects/tests/test_view_project_update_visibility.py
 delete mode 100644 rdmo/projects/tests/test_view_project_visibility.py
 delete mode 100644 rdmo/projects/tests/test_view_snapshot.py
 create mode 100644 rdmo/projects/tests/test_views.py
 create mode 100644 rdmo/projects/views.py
 delete mode 100644 rdmo/projects/views/__init__.py
 delete mode 100644 rdmo/projects/views/integration.py
 delete mode 100644 rdmo/projects/views/invite.py
 delete mode 100644 rdmo/projects/views/issue.py
 delete mode 100644 rdmo/projects/views/membership.py
 delete mode 100644 rdmo/projects/views/project.py
 delete mode 100644 rdmo/projects/views/project_answers.py
 delete mode 100644 rdmo/projects/views/project_copy.py
 delete mode 100644 rdmo/projects/views/project_create.py
 delete mode 100644 rdmo/projects/views/project_update.py
 delete mode 100644 rdmo/projects/views/project_view.py
 delete mode 100644 rdmo/projects/views/snapshot.py

diff --git a/rdmo/projects/tests/test_export.py b/rdmo/projects/tests/test_export.py
deleted file mode 100644
index d52d0bfa37..0000000000
--- a/rdmo/projects/tests/test_export.py
+++ /dev/null
@@ -1,29 +0,0 @@
-import os
-
-from django.conf import settings
-from django.urls import reverse
-
-# def test_project_answers_export_html(db, client):
-#     client.login(username='admin', password='admin')
-
-#     url = reverse('project_answers_export', args=[1, 'html'])
-#     response = client.get(url)
-
-#     assert response.status_code == 200
-
-#    test_file = os.path.join(settings.BASE_DIR, 'export', 'project.html')
-#    for a, b in zip(response.content.decode().splitlines(), open(test_file).read().splitlines(), strict=True):
-#        assert a == b
-
-
-def test_project_export_csv(db, client):
-    client.login(username='admin', password='admin')
-
-    url = reverse('project_export', args=[1, 'csvcomma'])
-    response = client.get(url)
-
-    assert response.status_code == 200
-
-    test_file = os.path.join(settings.BASE_DIR, 'export', 'project.csv')
-    for a, b in zip(response.content.decode().splitlines(), open(test_file).read().splitlines(), strict=True):
-        assert a == b
diff --git a/rdmo/projects/tests/test_view_integration.py b/rdmo/projects/tests/test_view_integration.py
deleted file mode 100644
index 711b7790ee..0000000000
--- a/rdmo/projects/tests/test_view_integration.py
+++ /dev/null
@@ -1,240 +0,0 @@
-import pytest
-
-from django.urls import reverse
-
-from ..models import Integration, Issue
-
-users = (
-    ('owner', 'owner'),
-    ('manager', 'manager'),
-    ('author', 'author'),
-    ('guest', 'guest'),
-    ('user', 'user'),
-    ('site', 'site'),
-    ('anonymous', None),
-)
-
-add_integration_permission_map = change_integration_permission_map = delete_integration_permission_map = {
-    'owner': [1, 2, 3, 4, 5],
-    'manager': [1, 3, 5],
-    'api': [1, 2, 3, 4, 5],
-    'site': [1, 2, 3, 4, 5]
-}
-
-projects = [1, 2, 3, 4, 5]
-integrations = [1, 2]
-
-
-@pytest.mark.parametrize('username,password', users)
-@pytest.mark.parametrize('project_id', projects)
-def test_integration_create_get(db, client, username, password, project_id):
-    client.login(username=username, password=password)
-
-    url = reverse('integration_create', args=[project_id, 'simple'])
-    response = client.get(url)
-
-    if project_id in add_integration_permission_map.get(username, []):
-        assert response.status_code == 200
-    elif password:
-        assert response.status_code == 403
-    else:
-        assert response.status_code == 302
-
-
-@pytest.mark.parametrize('username,password', users)
-@pytest.mark.parametrize('project_id', projects)
-def test_integration_create_post(db, client, username, password, project_id):
-    client.login(username=username, password=password)
-
-    url = reverse('integration_create', args=[project_id, 'simple'])
-    data = {
-        'project_url': 'https://example.com/projects/1'
-    }
-    response = client.post(url, data)
-
-    if project_id in add_integration_permission_map.get(username, []):
-        assert response.status_code == 302
-        values = Integration.objects.order_by('id').last().options.values('key', 'value', 'secret')
-        assert sorted(values, key=lambda obj: obj['key']) == [
-            {
-                'key': 'project_url',
-                'value': 'https://example.com/projects/1',
-                'secret': False
-            },
-            {
-                'key': 'secret',
-                'value': '',
-                'secret': True
-            }
-        ]
-    elif password:
-        assert response.status_code == 403
-    else:
-        assert response.status_code == 302
-
-
-@pytest.mark.parametrize('username,password', users)
-@pytest.mark.parametrize('project_id', projects)
-@pytest.mark.parametrize('integration_id', integrations)
-def test_integration_update_get(db, client, username, password, project_id, integration_id):
-    client.login(username=username, password=password)
-    integration = Integration.objects.filter(project_id=project_id, id=integration_id).first()
-
-    url = reverse('integration_update', args=[project_id, integration_id])
-    response = client.get(url)
-
-    if integration:
-        if project_id in change_integration_permission_map.get(username, []):
-            assert response.status_code == 200
-        elif password:
-            assert response.status_code == 403
-        else:
-            assert response.status_code == 302
-    else:
-        assert response.status_code == 404
-
-
-@pytest.mark.parametrize('username,password', users)
-@pytest.mark.parametrize('project_id', projects)
-@pytest.mark.parametrize('integration_id', integrations)
-def test_integration_update_post(db, client, username, password, project_id, integration_id):
-    client.login(username=username, password=password)
-    integration = Integration.objects.filter(project_id=project_id, id=integration_id).first()
-
-    url = reverse('integration_update', args=[project_id, integration_id])
-    data = {
-        'project_url': 'https://example.com/projects/2',
-        'secret': 'super_secret'
-    }
-    response = client.post(url, data)
-
-    if integration:
-        if project_id in change_integration_permission_map.get(username, []):
-            assert response.status_code == 302
-            values = Integration.objects.filter(project_id=project_id, id=integration_id).first() \
-                                        .options.values('key', 'value', 'secret')
-            assert sorted(values, key=lambda obj: obj['key']) == [
-                {
-                    'key': 'project_url',
-                    'value': 'https://example.com/projects/2',
-                    'secret': False
-                },
-                {
-                    'key': 'secret',
-                    'value': 'super_secret',
-                    'secret': True
-                }
-            ]
-        elif password:
-            assert response.status_code == 403
-        else:
-            assert response.status_code == 302
-    else:
-        assert response.status_code == 404
-
-
-@pytest.mark.parametrize('username,password', users)
-@pytest.mark.parametrize('project_id', projects)
-@pytest.mark.parametrize('integration_id', integrations)
-def test_integration_delete_get(db, client, username, password, project_id, integration_id):
-    client.login(username=username, password=password)
-    integration = Integration.objects.filter(project_id=project_id, id=integration_id).first()
-
-    url = reverse('integration_delete', args=[project_id, integration_id])
-    response = client.get(url)
-
-    if integration:
-        if project_id in delete_integration_permission_map.get(username, []):
-            assert response.status_code == 200
-        elif password:
-            assert response.status_code == 403
-        else:
-            assert response.status_code == 302
-    else:
-        assert response.status_code == 404
-
-
-@pytest.mark.parametrize('username,password', users)
-@pytest.mark.parametrize('project_id', projects)
-@pytest.mark.parametrize('integration_id', integrations)
-def test_integration_delete_post(db, client, username, password, project_id, integration_id):
-    client.login(username=username, password=password)
-    integration = Integration.objects.filter(project_id=project_id, id=integration_id).first()
-
-    url = reverse('integration_delete', args=[project_id, integration_id])
-    response = client.delete(url)
-
-    if integration:
-        if project_id in delete_integration_permission_map.get(username, []):
-            assert response.status_code == 302
-            assert Integration.objects.filter(project_id=project_id, id=integration_id).first() is None
-        elif password:
-            assert response.status_code == 403
-        else:
-            assert response.status_code == 302
-    else:
-        assert response.status_code == 404
-
-
-@pytest.mark.parametrize('project_id', projects)
-@pytest.mark.parametrize('integration_id', integrations)
-def test_integration_webhook_get(db, client, project_id, integration_id):
-    url = reverse('integration_webhook', args=[project_id, integration_id])
-    response = client.get(url)
-
-    assert response.status_code == 405
-    assert Issue.objects.filter(status='closed').count() == 0
-
-
-@pytest.mark.parametrize('project_id', projects)
-@pytest.mark.parametrize('integration_id', integrations)
-def test_integration_webhook_post(db, client, project_id, integration_id):
-    integration = Integration.objects.filter(project_id=project_id, id=integration_id).first()
-
-    secret = 'super_duper_secret'
-    url = reverse('integration_webhook', args=[project_id, integration_id])
-    data = {
-        'action': 'closed',
-        'url': 'https://simple.example.com/issues/1'
-    }
-
-    response = client.post(url, data, **{'HTTP_X_SECRET': secret, 'content_type': 'application/json'})
-
-    if integration:
-        assert response.status_code == 200
-        assert Issue.objects.filter(status='closed').count() == (1 if integration_id == 1 else 0)
-    else:
-        assert response.status_code == 404
-        assert Issue.objects.filter(status='closed').count() == 0
-
-
-@pytest.mark.parametrize('project_id', projects)
-@pytest.mark.parametrize('integration_id', integrations)
-def test_integration_webhook_post_wrong_url(db, client, project_id, integration_id):
-    integration = Integration.objects.filter(project_id=project_id, id=integration_id).first()
-
-    secret = 'super_duper_secret'
-    url = reverse('integration_webhook', args=[project_id, integration_id])
-    data = {
-        'action': 'closed',
-        'url': 'https://simple.example.com/issues/2'
-    }
-
-    response = client.post(url, data, **{'HTTP_X_SECRET': secret, 'content_type': 'application/json'})
-
-    if integration:
-        assert response.status_code == 200
-        assert Issue.objects.filter(status='closed').count() == 0
-    else:
-        assert response.status_code == 404
-        assert Issue.objects.filter(status='closed').count() == 0
-
-
-@pytest.mark.parametrize('project_id', projects)
-@pytest.mark.parametrize('integration_id', integrations)
-def test_integration_webhook_post_no_secret(db, client, project_id, integration_id):
-    url = reverse('integration_webhook', args=[project_id, integration_id])
-    response = client.post(url, {})
-
-    assert response.status_code == 404
-    assert Issue.objects.filter(status='closed').count() == 0
diff --git a/rdmo/projects/tests/test_view_issue.py b/rdmo/projects/tests/test_view_issue.py
deleted file mode 100644
index cf4f6d745e..0000000000
--- a/rdmo/projects/tests/test_view_issue.py
+++ /dev/null
@@ -1,226 +0,0 @@
-from unittest.mock import Mock
-
-import pytest
-
-from django.core import mail
-from django.http import HttpResponseRedirect
-from django.urls import reverse
-
-from rdmo.core.constants import VALUE_TYPE_FILE
-
-from ..models import Issue, Project
-
-users = (
-    ('owner', 'owner'),
-    ('manager', 'manager'),
-    ('author', 'author'),
-    ('guest', 'guest'),
-    ('user', 'user'),
-    ('site', 'site'),
-    ('anonymous', None),
-)
-
-view_issue_permission_map = {
-    'owner': [1, 2, 3, 4, 12],
-    'manager': [1, 3, 5, 12],
-    'author': [1, 3, 5, 12],
-    'guest': [1, 3, 5, 12],
-    'user': [12],
-    'api': [1, 2, 3, 4, 5, 12],
-    'site': [1, 2, 3, 4, 5, 12]
-}
-
-change_issue_permission_map = delete_issue_permission_map = {
-    'owner': [1, 2, 3, 4, 12],
-    'manager': [1, 3],
-    'author': [1, 3],
-    'api': [1, 2, 3, 4, 12],
-    'site': [1, 2, 3, 4, 12],
-}
-
-issues = [1, 2, 3, 4, 9]
-
-integration_pk = 1
-
-issue_status = ('open', 'in_progress', 'closed')
-
-@pytest.mark.parametrize('username,password', users)
-@pytest.mark.parametrize('issue_id', issues)
-def test_issue(db, client, username, password, issue_id):
-    client.login(username=username, password=password)
-    issue = Issue.objects.get(id=issue_id)
-
-    url = reverse('issue', args=[issue.project_id, issue_id])
-    response = client.get(url)
-
-    if issue.project_id in view_issue_permission_map.get(username, []):
-        assert response.status_code == 200
-    elif password:
-        assert response.status_code == 403
-    else:
-        assert response.status_code == 302
-
-
-@pytest.mark.parametrize('username,password', users)
-@pytest.mark.parametrize('issue_id', issues)
-def test_issue_update_get(db, client, username, password, issue_id):
-    client.login(username=username, password=password)
-    issue = Issue.objects.get(id=issue_id)
-
-    url = reverse('issue_update', args=[issue.project_id, issue_id])
-    response = client.get(url)
-
-    if issue.project_id in change_issue_permission_map.get(username, []):
-        assert response.status_code == 200
-    elif password:
-        assert response.status_code == 403
-    else:
-        assert response.status_code == 302
-
-
-@pytest.mark.parametrize('username,password', users)
-@pytest.mark.parametrize('issue_id', issues)
-@pytest.mark.parametrize('status', issue_status)
-def test_issue_update_post(db, client, username, password, issue_id, status):
-    client.login(username=username, password=password)
-    issue = Issue.objects.get(id=issue_id)
-
-    url = reverse('issue_update', args=[issue.project_id, issue_id])
-    data = {
-        'status': status
-    }
-    response = client.post(url, data)
-
-    if issue.project_id in change_issue_permission_map.get(username, []):
-        assert response.status_code == 302
-        assert Issue.objects.get(id=issue_id).status == status
-    else:
-        if password:
-            assert response.status_code == 403
-        else:
-            assert response.status_code == 302
-
-        assert Issue.objects.get(id=issue_id).status == issue.status
-
-
-
-@pytest.mark.parametrize('username,password', users)
-@pytest.mark.parametrize('issue_id', issues)
-def test_issue_send_get(db, client, username, password, issue_id):
-    client.login(username=username, password=password)
-    issue = Issue.objects.get(id=issue_id)
-
-    url = reverse('issue_update', args=[issue.project_id, issue_id])
-    response = client.get(url)
-
-    if issue.project_id in change_issue_permission_map.get(username, []):
-        assert response.status_code == 200
-    elif password:
-        assert response.status_code == 403
-    else:
-        assert response.status_code == 302
-
-
-@pytest.mark.parametrize('username,password', users)
-@pytest.mark.parametrize('issue_id', issues)
-def test_issue_send_post_email(db, client, username, password, issue_id):
-    client.login(username=username, password=password)
-    issue = Issue.objects.get(id=issue_id)
-
-    url = reverse('issue_send', args=[issue.project_id, issue_id])
-    data = {
-        'subject': 'Subject',
-        'message': 'Message',
-        'recipients': ['email@example.com']
-    }
-    response = client.post(url, data)
-
-    if issue.project_id in change_issue_permission_map.get(username, []):
-        assert response.status_code == 302
-        assert len(mail.outbox) == 1
-        assert mail.outbox[0].subject == '[example.com] Subject'
-        assert mail.outbox[0].body == 'Message'
-    else:
-        if password:
-            assert response.status_code == 403
-        else:
-            assert response.status_code == 302
-
-        assert len(mail.outbox) == 0
-
-
-@pytest.mark.parametrize('username,password', users)
-@pytest.mark.parametrize('issue_id', issues)
-def test_issue_send_post_attachments(db, client, files, username, password, issue_id):
-    client.login(username=username, password=password)
-    issue = Issue.objects.get(id=issue_id)
-
-    view = issue.project.views.first()
-    file = issue.project.values.filter(snapshot=None, value_type=VALUE_TYPE_FILE).first()
-
-    if file and view:
-        url = reverse('issue_send', args=[issue.project_id, issue_id])
-        data = {
-            'subject': 'Subject',
-            'message': 'Message',
-            'recipients': 'email@example.com',
-            'attachments_answers': 'project_answers',
-            'attachments_views': str(view.id),
-            'attachments_files': str(file.id),
-            'attachments_snapshot': '',
-            'attachments_format': 'html'
-        }
-        response = client.post(url, data)
-
-        if issue.project_id in change_issue_permission_map.get(username, []):
-            assert response.status_code == 302
-            assert len(mail.outbox) == 1
-            assert mail.outbox[0].subject == '[example.com] Subject'
-            assert mail.outbox[0].body == 'Message'
-
-            attachments = mail.outbox[0].attachments
-            assert len(attachments) == 3
-            assert attachments[0][0] == 'Test.html'
-            assert attachments[0][2] == 'text/html; charset=utf-8'
-            assert attachments[1][0] == 'Test.html'
-            assert attachments[1][2] == 'text/html; charset=utf-8'
-            assert attachments[2][0] == 'test.txt'
-            assert attachments[2][2] == 'text/plain'
-        else:
-            if password:
-                assert response.status_code == 403
-            else:
-                assert response.status_code == 302
-
-            assert len(mail.outbox) == 0
-
-
-@pytest.mark.parametrize('username,password', users)
-@pytest.mark.parametrize('issue_id', issues)
-def test_issue_send_post_integration(db, client, mocker, username, password, issue_id):
-    mocked_send_issue = Mock(return_value=HttpResponseRedirect(redirect_to='https://example.com/login/oauth/authorize'))
-    mocker.patch('rdmo.projects.providers.SimpleIssueProvider.send_issue', mocked_send_issue)
-
-    client.login(username=username, password=password)
-    issue = Issue.objects.get(id=issue_id)
-
-    url = reverse('issue_send', args=[issue.project_id, issue_id])
-    data = {
-        'subject': 'Subject',
-        'message': 'Message',
-        'integration': [integration_pk]
-    }
-    response = client.post(url, data)
-
-    if issue.project_id in change_issue_permission_map.get(username, []):
-        if integration_pk in Project.objects.get(pk=issue.project_id).integrations.values_list('id', flat=True):
-            assert response.status_code == 302
-            assert response.url.startswith('https://example.com')
-        else:
-            assert response.status_code == 200
-    else:
-        if password:
-            assert response.status_code == 403
-        else:
-            assert response.status_code == 302
-            assert not response.url.startswith('https://example.com')
diff --git a/rdmo/projects/tests/test_view_membership.py b/rdmo/projects/tests/test_view_membership.py
deleted file mode 100644
index b8cc5e87d5..0000000000
--- a/rdmo/projects/tests/test_view_membership.py
+++ /dev/null
@@ -1,301 +0,0 @@
-import pytest
-
-from django.core import mail
-from django.urls import reverse
-
-from rdmo.projects.models import Invite, Membership
-
-users = (
-    ('owner', 'owner'),
-    ('manager', 'manager'),
-    ('author', 'author'),
-    ('guest', 'guest'),
-    ('user', 'user'),
-    ('site', 'site'),
-    ('anonymous', None),
-)
-
-add_membership_permission_map = {
-    'api': [1, 2, 3, 4, 5],
-    'site': [1, 2, 3, 4, 5]
-}
-
-change_membership_permission_map = delete_membership_permission_map = {
-    'owner': [1, 2, 3, 4, 5],
-    'api': [1, 2, 3, 4, 5],
-    'site': [1, 2, 3, 4, 5]
-}
-
-projects = [1, 2, 3, 4, 5]
-memberships = [1, 2, 3, 4]
-
-membership_roles = ('owner', 'manager', 'author', 'guest')
-
-excluded_invite_ids = [1, 2]
-
-
-@pytest.mark.parametrize('username,password', users)
-@pytest.mark.parametrize('project_id', projects)
-def test_membership_create_get(db, client, username, password, project_id):
-    client.login(username=username, password=password)
-
-    url = reverse('membership_create', args=[project_id])
-    response = client.get(url)
-
-    if project_id in add_membership_permission_map.get(username, []):
-        assert response.status_code == 200
-    elif password:
-        assert response.status_code == 403
-    else:
-        assert response.status_code == 302
-
-
-@pytest.mark.parametrize('PROJECT_SEND_INVITE', [False, True])
-@pytest.mark.parametrize('username,password', users)
-@pytest.mark.parametrize('project_id', projects)
-@pytest.mark.parametrize('membership_role', membership_roles)
-def test_membership_create_post(db, client, settings,
-                                username, password, project_id, membership_role, PROJECT_SEND_INVITE):
-    settings.PROJECT_SEND_INVITE = PROJECT_SEND_INVITE
-    client.login(username=username, password=password)
-
-    url = reverse('membership_create', args=[project_id])
-    data = {
-        'username_or_email': 'user',
-        'role': membership_role
-    }
-    response = client.post(url, data)
-
-    if project_id in add_membership_permission_map.get(username, []):
-        assert response.status_code == 302
-        assert Invite.objects.get(project_id=project_id, user__username='user',
-                                  email='user@example.com', role=membership_role)
-        assert not Membership.objects.filter(project_id=project_id,
-                                             user__username='user', role=membership_role).exists()
-        assert len(mail.outbox) == int(PROJECT_SEND_INVITE)
-    else:
-        if password:
-            assert response.status_code == 403
-        else:
-            assert response.status_code == 302
-
-        assert not Invite.objects.exclude(id__in=excluded_invite_ids).exists()
-        assert len(mail.outbox) == 0
-
-
-@pytest.mark.parametrize('PROJECT_SEND_INVITE', [False, True])
-@pytest.mark.parametrize('username,password', users)
-@pytest.mark.parametrize('project_id', projects)
-@pytest.mark.parametrize('membership_role', membership_roles)
-def test_membership_create_post_mail(db, client, settings,
-                                     username, password, project_id, membership_role, PROJECT_SEND_INVITE):
-    settings.PROJECT_SEND_INVITE = PROJECT_SEND_INVITE
-    client.login(username=username, password=password)
-
-    url = reverse('membership_create', args=[project_id])
-    data = {
-        'username_or_email': 'someuser@example.com',
-        'role': membership_role
-    }
-    response = client.post(url, data)
-
-    if project_id in add_membership_permission_map.get(username, []):
-        if not PROJECT_SEND_INVITE:
-            assert response.status_code == 200
-            assert not Invite.objects.filter(project_id=project_id, user=None,
-                                             email='someuser@example.com', role=membership_role)
-        else:
-            assert response.status_code == 302
-            assert Invite.objects.get(project_id=project_id, user=None,
-                                      email='someuser@example.com', role=membership_role)
-        assert len(mail.outbox) == int(PROJECT_SEND_INVITE)
-    else:
-        if password:
-            assert response.status_code == 403
-        else:
-            assert response.status_code == 302
-
-        assert not Invite.objects.exclude(id__in=excluded_invite_ids).exists()
-        assert len(mail.outbox) == 0
-
-
-@pytest.mark.parametrize('username,password', users)
-@pytest.mark.parametrize('membership_role', membership_roles)
-def test_membership_create_post_error(db, client, username, password, membership_role):
-    client.login(username=username, password=password)
-
-    project_id = 1
-    url = reverse('membership_create', args=[project_id])
-    data = {
-        'username_or_email': 'guest',
-        'role': membership_role
-    }
-    response = client.post(url, data)
-
-    assert not Invite.objects.exclude(id__in=excluded_invite_ids).exists()
-    assert len(mail.outbox) == 0
-
-    if project_id in add_membership_permission_map.get(username, []):
-        assert response.status_code == 200
-    else:
-        if password:
-            assert response.status_code == 403
-        else:
-            assert response.status_code == 302
-
-
-@pytest.mark.parametrize('username,password', users)
-@pytest.mark.parametrize('membership_role', membership_roles)
-def test_membership_create_post_mail_error(db, client, username, password, membership_role):
-    client.login(username=username, password=password)
-
-    project_id = 1
-    url = reverse('membership_create', args=[project_id])
-    data = {
-        'username_or_email': 'guest@example.com',
-        'role': membership_role
-    }
-    response = client.post(url, data)
-
-    assert not Invite.objects.exclude(id__in=excluded_invite_ids).exists()
-    assert len(mail.outbox) == 0
-
-    if project_id in add_membership_permission_map.get(username, []):
-        assert response.status_code == 200
-    else:
-        if password:
-            assert response.status_code == 403
-        else:
-            assert response.status_code == 302
-
-
-@pytest.mark.parametrize('username,password', users)
-@pytest.mark.parametrize('membership_role', membership_roles)
-def test_membership_create_post_silent(db, client, username, password, membership_role):
-    client.login(username=username, password=password)
-
-    project_id = 1
-    url = reverse('membership_create', args=[project_id])
-    data = {
-        'username_or_email': 'user',
-        'role': membership_role,
-        'silent': True
-    }
-    response = client.post(url, data)
-
-    if project_id in add_membership_permission_map.get(username, []):
-        assert response.status_code == 302
-
-        if username == 'site':
-            assert not Invite.objects.exclude(id__in=excluded_invite_ids).exists()
-            assert Membership.objects.get(project_id=project_id, user__username='user', role=membership_role)
-            assert len(mail.outbox) == 0
-        else:
-            assert Invite.objects.get(project_id=project_id, user__username='user',
-                                      email='user@example.com', role=membership_role)
-            assert not Membership.objects.filter(project_id=project_id, user__username='user',
-                                                 role=membership_role).exists()
-            assert len(mail.outbox) == 1
-
-    else:
-        if password:
-            assert response.status_code == 403
-        else:
-            assert response.status_code == 302
-
-
-@pytest.mark.parametrize('username,password', users)
-@pytest.mark.parametrize('project_id', projects)
-@pytest.mark.parametrize('membership_id', memberships)
-def test_membership_update_get(db, client, username, password, project_id, membership_id):
-    client.login(username=username, password=password)
-    membership = Membership.objects.filter(project_id=project_id, id=membership_id).first()
-
-    url = reverse('membership_update', args=[project_id, membership_id])
-    response = client.get(url)
-
-    if membership:
-        if project_id in change_membership_permission_map.get(username, []):
-            assert response.status_code == 200
-        elif password:
-            assert response.status_code == 403
-        else:
-            assert response.status_code == 302
-    else:
-        assert response.status_code == 404
-
-
-@pytest.mark.parametrize('username,password', users)
-@pytest.mark.parametrize('project_id', projects)
-@pytest.mark.parametrize('membership_id', memberships)
-@pytest.mark.parametrize('membership_role', membership_roles)
-def test_membership_update_post(db, client, username, password, project_id, membership_id, membership_role):
-    client.login(username=username, password=password)
-    membership = Membership.objects.filter(project_id=project_id, id=membership_id).first()
-
-    url = reverse('membership_update', args=[project_id, membership_id])
-    data = {
-        'role': membership_role
-    }
-    response = client.post(url, data)
-
-    if membership:
-        if project_id in change_membership_permission_map.get(username, []):
-            assert response.status_code == 302
-            assert Membership.objects.get(project_id=project_id, id=membership_id).role == membership_role
-
-        else:
-            if password:
-                assert response.status_code == 403
-            else:
-                assert response.status_code == 302
-
-            assert Membership.objects.get(project_id=project_id, id=membership_id).role == membership.role
-    else:
-        assert response.status_code == 404
-
-
-@pytest.mark.parametrize('username,password', users)
-@pytest.mark.parametrize('project_id', projects)
-@pytest.mark.parametrize('membership_id', memberships)
-def test_membership_delete_get(db, client, username, password, project_id, membership_id):
-    client.login(username=username, password=password)
-    membership = Membership.objects.filter(project_id=project_id, id=membership_id).first()
-
-    url = reverse('membership_delete', args=[project_id, membership_id])
-    response = client.get(url)
-
-    if membership:
-        if project_id in delete_membership_permission_map.get(username, []):
-            assert response.status_code == 200
-        elif password:
-            assert response.status_code == 403
-        else:
-            assert response.status_code == 302
-    else:
-        assert response.status_code == 404
-
-
-@pytest.mark.parametrize('username,password', users)
-@pytest.mark.parametrize('project_id', projects)
-@pytest.mark.parametrize('membership_id', memberships)
-def test_membership_delete_post(db, client, mocker, username, password, project_id, membership_id):
-    client.login(username=username, password=password)
-    membership = Membership.objects.filter(project_id=project_id, id=membership_id).first()
-
-    url = reverse('membership_delete', args=[project_id, membership_id])
-    response = client.post(url)
-
-    if membership:
-        if project_id in delete_membership_permission_map.get(username, []):
-            if membership.user.username == 'owner':
-                assert response.status_code == 400
-            else:
-                assert response.status_code == 302
-                assert not Membership.objects.filter(project_id=project_id, id=membership_id).first()
-        elif password:
-            assert response.status_code == 403
-        else:
-            assert response.status_code == 302
-    else:
-        assert response.status_code == 404
diff --git a/rdmo/projects/tests/test_view_membership_multisite.py b/rdmo/projects/tests/test_view_membership_multisite.py
deleted file mode 100644
index 603fe07afb..0000000000
--- a/rdmo/projects/tests/test_view_membership_multisite.py
+++ /dev/null
@@ -1,106 +0,0 @@
-import pytest
-
-from django.contrib.auth import get_user_model
-from django.contrib.sites.models import Site
-from django.core import mail
-from django.urls import reverse
-
-from ..models import Invite, Project
-from ..utils import get_invite_email_project_path
-
-users = (
-    ('owner', 'owner'),
-    ('manager', 'manager'),
-    ('author', 'author'),
-    ('guest', 'guest'),
-    ('user', 'user'),
-    ('site', 'site'),
-    ('anonymous', None),
-)
-
-add_membership_permission_map = {
-    'api': [1, 2, 3, 4, 5],
-    'site': [1, 2, 3, 4, 5]
-}
-
-projects = [1, 2, 3, 4, 5]
-memberships = [1, 2, 3, 4]
-
-membership_roles = ('owner', 'manager', 'author', 'guest')
-
-sites_domains = ('example.com', 'foo.com', 'bar.com')
-
-@pytest.mark.parametrize('username,password', users)
-@pytest.mark.parametrize('project_id', projects)
-@pytest.mark.parametrize('membership_role', membership_roles)
-@pytest.mark.parametrize('site_domain', sites_domains)
-def test_get_invite_email_project_path_function(db, client, settings, username, password, project_id,
-                                                membership_role, site_domain):
-    settings.MULTISITE = True
-
-    client.login(username=username, password=password)
-
-    current_site = Site.objects.get_current()
-    foo_site, _ = Site.objects.get_or_create(domain=site_domain, name=site_domain)
-    foo_username = f'{site_domain}-test-user'
-    foo_email = f'{foo_username}@{site_domain}'
-    foo_user, _ = get_user_model().objects.get_or_create(username=foo_username, email=foo_email,
-                                                                password=foo_username)
-    foo_user.role.member.set([foo_site])
-    project = Project.objects.get(pk=project_id)
-
-    invite = Invite(project=project, user=foo_user, role=membership_role)
-    invite.make_token()
-    invite.save()
-
-    invite_email_project_path = get_invite_email_project_path(invite)
-    if current_site.domain == site_domain:
-        assert invite_email_project_path.startswith('/projects')
-    else:
-        assert invite_email_project_path.startswith('http://' + site_domain + '/projects')
-
-
-@pytest.mark.parametrize('username,password', users)
-@pytest.mark.parametrize('project_id', projects)
-@pytest.mark.parametrize('membership_role', membership_roles)
-@pytest.mark.parametrize('site_domain', sites_domains)
-def test_invite_email_project_path_email_body(db, client, settings, username, password, project_id,
-                                              membership_role, site_domain):
-    settings.MULTISITE = True
-
-    client.login(username=username, password=password)
-
-    current_site = Site.objects.get_current()
-    foo_site, _ = Site.objects.get_or_create(domain=site_domain, name=site_domain)
-    foo_username = f'{site_domain}-user'
-    foo_email = f'{foo_username}@{site_domain}'
-    foo_user, _ = get_user_model().objects.get_or_create(username=f'{site_domain}-user', email=foo_email,
-                                                                password=foo_username)
-    foo_user.role.member.set([foo_site])
-    project = Project.objects.get(pk=project_id)
-
-    url = reverse('membership_create', args=[project_id])
-    data = {
-        'username_or_email': foo_email,
-        'role': membership_role
-    }
-    response = client.post(url, data)
-
-    invite = Invite(project=project, user=foo_user, role=membership_role)
-    invite.make_token()
-    invite.save()
-
-    if project_id in add_membership_permission_map.get(username, []):
-        if current_site.domain == site_domain:
-            assert 'http://testserver/' in mail.outbox[0].body
-        else:
-            assert f'http://{foo_site.domain}/' in mail.outbox[0].body
-
-        assert response.status_code == 302
-        assert len(mail.outbox) == 1
-    else:
-        if password:
-            assert response.status_code == 403
-        else:
-            assert response.status_code == 302
-        assert len(mail.outbox) == 0
diff --git a/rdmo/projects/tests/test_view_project.py b/rdmo/projects/tests/test_view_project.py
deleted file mode 100644
index 5cdabb181e..0000000000
--- a/rdmo/projects/tests/test_view_project.py
+++ /dev/null
@@ -1,896 +0,0 @@
-import re
-
-import pytest
-
-# from django.contrib.auth.models import Group, User
-# from django.urls import resolve
-from django.urls import reverse
-
-# from rdmo.questions.models import Catalog
-# from rdmo.tasks.models import Task
-# from rdmo.views.models import View
-
-# from ..forms import CatalogChoiceField
-# from ..models import Project
-
-users = (
-    ('owner', 'owner'),
-    ('manager', 'manager'),
-    ('author', 'author'),
-    ('guest', 'guest'),
-    ('user', 'user'),
-    ('editor', 'editor'),
-    ('reviewer', 'reviewer'),
-    ('api', 'api'),
-    ('site', 'site'),
-    ('anonymous', None)
-)
-
-view_project_permission_map = {
-    'owner': [1, 2, 3, 4, 5, 10, 12],
-    'manager': [1, 3, 5, 7, 12],
-    'author': [1, 3, 5, 8, 12],
-    'guest': [1, 3, 5, 9, 12],
-    'user': [12],
-    'editor': [12],
-    'reviewer': [12],
-    'api': [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12],
-    'site': [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12]
-}
-
-change_project_permission_map = {
-    'owner': [1, 2, 3, 4, 5, 10, 12],
-    'manager': [1, 3, 5, 7],
-    'api': [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12],
-    'site': [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12]
-}
-
-delete_project_permission_map = {
-    'owner': [1, 2, 3, 4, 5, 10, 12],
-    'api': [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12],
-    'site': [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12],
-}
-
-export_project_permission_map = {
-    'owner': [1, 2, 3, 4, 5, 10, 12],
-    'manager': [1, 3, 5, 7],
-    'api': [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12],
-    'site': [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12],
-}
-
-projects = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12]
-
-export_formats = ('html', )
-
-site_id = 1
-project_id = 1
-parent_id = 3
-parent_ancestors = [2, 3]
-catalog_id = 1
-view_id = 1
-task_id = 1
-
-@pytest.mark.parametrize('username,password', users)
-def test_list(db, client, username, password):
-    client.login(username=username, password=password)
-
-    url = reverse('projects')
-    response = client.get(url)
-
-    projects = re.findall(r'/projects/(\d+)/', response.content.decode())
-
-    if password:
-        assert response.status_code == 200
-        # assertTemplateUsed(response, 'projects/projects.html')
-
-        if username in ('site', 'api'):
-            assert projects == []
-            # assert response.context['number_of_projects'] == len([])
-            # assertContains(response, 'View all projects on')
-        else:
-            # user_projects_map = view_project_permission_map.get(username, [])
-            assert sorted(set(map(int, projects))) == []
-            # assert response.context['number_of_projects'] == len(user_projects_map)
-            # assertNotContains(response, 'View all projects on')
-    else:
-        assert response.status_code == 302
-
-
-@pytest.mark.parametrize('username,password', users)
-@pytest.mark.parametrize('project_id', projects)
-def test_detail(db, client, username, password, project_id):
-    client.login(username=username, password=password)
-
-    url = reverse('project', args=[project_id])
-    response = client.get(url)
-
-    if project_id in view_project_permission_map.get(username, []):
-        assert response.status_code == 200
-    else:
-        if password:
-            assert response.status_code == 403
-        else:
-            assert response.status_code == 302
-
-
-# @pytest.mark.parametrize('username,password', users)
-# def test_project_create_get(db, client, username, password):
-#     client.login(username=username, password=password)
-
-#     url = reverse('project_create')
-#     response = client.get(url)
-
-#     if password:
-#         assert response.status_code == 200
-
-#         # check the parent select dropdown
-#         for project_id in re.findall(r'<option value="(\d+)"', response.content.decode()):
-#             assert int(project_id) in view_project_permission_map.get(username, [])
-#     else:
-#         assert response.status_code == 302
-
-
-# def test_project_create_restricted_get(db, client, settings):
-#     settings.PROJECT_CREATE_RESTRICTED = True
-#     settings.PROJECT_CREATE_GROUPS = ['projects']
-
-#     group = Group.objects.create(name='projects')
-#     user = User.objects.get(username='user')
-#     user.groups.add(group)
-
-#     client.login(username='user', password='user')
-
-#     url = reverse('project_create')
-#     response = client.get(url)
-
-#     assert response.status_code == 200
-
-
-# def test_project_create_forbidden_get(db, client, settings):
-#     settings.PROJECT_CREATE_RESTRICTED = True
-
-#     client.login(username='user', password='user')
-
-#     url = reverse('project_create')
-#     response = client.get(url)
-
-#     assert response.status_code == 403
-
-
-# @pytest.mark.parametrize('username,password', users)
-# def test_project_create_get_for_extra_users_and_unavailable_catalogs(db, client, username, password):
-#     client.login(username=username, password=password)
-
-#     Catalog.objects.create(
-#         uri_prefix='https://experimental.com/terms',
-#         uri_path='unavailable-1',
-#         order=1,
-#         title_lang1='New Catalog 1',
-#         title_lang2='Neuer Katalog 1',
-#         help_lang1='Help text',
-#         help_lang2='Hilfe Text',
-#         available=False
-#     )
-
-#     Catalog.objects.create(
-#         uri_prefix='https://experimental.com/terms',
-#         uri_path='unavailable-2',
-#         order=2,
-#         title_lang1='New Catalog 2',
-#         title_lang2='Neuer Katalog 2',
-#         help_lang1='Help text',
-#         help_lang2='Hilfe Text',
-#         available=False
-#     )
-
-#     url = reverse('project_create')
-#     response = client.get(url)
-
-#     if password:
-#         assert response.status_code == 200
-#         # check the catalogs that are displayed in the form
-#         find_catalog_ids = re.findall(r'id="id_catalog_(\d+)', response.content.decode())
-#         catalogs_in_form = response.context_data['form'].fields['catalog'].queryset
-#         assert find_catalog_ids == list(map(str, range(catalogs_in_form.count())))
-
-#         # check the unavailable catalogs that are displayed in the form
-#         # should happen only for users that can see unavailable catalogs (editors, api,..)
-#         for unavailable_catalog in catalogs_in_form.filter(available=False):
-#             _label = unavailable_catalog.title + CatalogChoiceField._unavailable_icon
-#             assert _label in response.content.decode()
-
-#         # check the parent select dropdown
-#         for project_id in re.findall(r'<option value="(\d+)"', response.content.decode()):
-#             assert int(project_id) in view_project_permission_map.get(username, [])
-#     else:
-#         assert response.status_code == 302
-
-
-# @pytest.mark.parametrize('username,password', users)
-# def test_project_create_post(db, client, username, password):
-#     client.login(username=username, password=password)
-#     project_count = Project.objects.count()
-
-#     url = reverse('project_create')
-#     data = {
-#         'title': 'A new project',
-#         'description': 'Some description',
-#         'catalog': catalog_id
-#     }
-#     response = client.post(url, data)
-
-#     if password:
-#         assert response.status_code == 302
-#         assert Project.objects.count() == project_count + 1
-#     else:
-#         assert response.status_code == 302
-#         assert Project.objects.count() == project_count
-
-
-# def test_project_create_post_restricted(db, client, settings):
-#     settings.PROJECT_CREATE_RESTRICTED = True
-#     settings.PROJECT_CREATE_GROUPS = ['projects']
-
-#     group = Group.objects.create(name='projects')
-#     user = User.objects.get(username='user')
-#     user.groups.add(group)
-
-#     client.login(username='user', password='user')
-
-#     url = reverse('project_create')
-#     data = {
-#         'title': 'A new project',
-#         'description': 'Some description',
-#         'catalog': catalog_id
-#     }
-#     response = client.post(url, data)
-
-#     assert response.status_code == 302
-
-
-# def test_project_create_post_forbidden(db, client, settings):
-#     settings.PROJECT_CREATE_RESTRICTED = True
-
-#     client.login(username='user', password='user')
-
-#     url = reverse('project_create')
-#     data = {
-#         'title': 'A new project',
-#         'description': 'Some description',
-#         'catalog': catalog_id
-#     }
-#     response = client.post(url, data)
-
-#     assert response.status_code == 403
-
-
-# @pytest.mark.parametrize('username,password', users)
-# def test_project_create_parent_post(db, client, username, password):
-#     client.login(username=username, password=password)
-#     project_count = Project.objects.count()
-
-#     url = reverse('project_create')
-#     data = {
-#         'title': 'A new project',
-#         'description': 'Some description',
-#         'catalog': catalog_id,
-#         'parent': project_id
-#     }
-#     response = client.post(url, data)
-
-#     if username in ('user', 'editor', 'reviewer'):
-#         assert response.status_code == 200
-#         assert Project.objects.count() == project_count
-#     elif password:
-#         assert response.status_code == 302
-#         assert Project.objects.count() == project_count + 1
-#     else:
-#         assert response.status_code == 302
-#         assert Project.objects.count() == project_count
-
-
-# @pytest.mark.parametrize('username,password', users)
-# @pytest.mark.parametrize('sync', [True, False])
-# def test_project_create_post_tasks(db, client, settings, username, password, sync):
-#     settings.PROJECT_TASKS_SYNC = sync
-#
-#     client.login(username=username, password=password)
-#
-#     task = Task.objects.get(id=task_id)
-#     task.available = False
-#     task.save()
-#
-#     url = reverse('project_create')
-#     data = {
-#         'title': 'A new project',
-#         'description': 'Some description',
-#         'catalog': catalog_id
-#     }
-#     response = client.post(url, data)
-#
-#     if password:
-#         project = Project.objects.get(id=resolve(response.url).kwargs.get('pk'))
-#
-#         if username in ('editor', 'reviewer', 'api'):
-#             available_tasks = Task.objects.filter(sites=site_id)
-#         else:
-#             available_tasks = Task.objects.filter(sites=site_id).exclude(id=task_id)
-#
-#         assert {t.id for t in available_tasks} == {t.id for t in project.tasks.all()}
-
-
-# @pytest.mark.parametrize('username,password', users)
-# @pytest.mark.parametrize('sync', [True, False])
-# def test_project_create_post_views(db, client, settings, username, password, sync):
-#     settings.PROJECT_VIEWS_SYNC = sync
-#
-#     client.login(username=username, password=password)
-#
-#     view = View.objects.get(id=view_id)
-#     view.available = False
-#     view.save()
-#
-#     url = reverse('project_create')
-#     data = {
-#         'title': 'A new project',
-#         'description': 'Some description',
-#         'catalog': catalog_id
-#     }
-#     response = client.post(url, data)
-#
-#     if password:
-#         project = Project.objects.get(id=resolve(response.url).kwargs.get('pk'))
-#
-#         if username in ('editor', 'reviewer', 'api'):
-#             available_views = View.objects.filter(sites=site_id)
-#         else:
-#             available_views = View.objects.filter(sites=site_id).exclude(id=view_id)
-#
-#         assert {v.id for v in available_views} == {v.id for v in project.views.all()}
-
-
-# @pytest.mark.parametrize('username,password', users)
-# @pytest.mark.parametrize('project_id', projects)
-# def test_project_update_get(db, client, username, password, project_id):
-#     client.login(username=username, password=password)
-#
-#     url = reverse('project_update', args=[project_id])
-#     response = client.get(url)
-#
-#     if project_id in change_project_permission_map.get(username, []):
-#         assert response.status_code == 200
-#     else:
-#         if password:
-#             assert response.status_code == 403
-#         else:
-#             assert response.status_code == 302
-
-
-# @pytest.mark.parametrize('username,password', users)
-# @pytest.mark.parametrize('project_id', projects)
-# def test_project_update_post(db, client, username, password, project_id):
-#     client.login(username=username, password=password)
-#     project = Project.objects.get(pk=project_id)
-
-#     url = reverse('project_update', args=[project_id])
-#     data = {
-#         'title': 'New title',
-#         'description': project.description,
-#         'catalog': project.catalog.pk
-#     }
-#     response = client.post(url, data)
-
-#     if project_id in change_project_permission_map.get(username, []):
-#         assert response.status_code == 302
-#         assert Project.objects.get(pk=project_id).title == 'New title'
-#     else:
-#         if password:
-#             assert response.status_code == 403
-#         else:
-#             assert response.status_code == 302
-
-#         assert Project.objects.get(pk=project_id).title == project.title
-
-
-# @pytest.mark.parametrize('username,password', users)
-# @pytest.mark.parametrize('project_id', projects)
-# def test_project_update_post_parent(db, client, username, password, project_id):
-#     client.login(username=username, password=password)
-#     project = Project.objects.get(pk=project_id)
-#
-#     url = reverse('project_update', args=[project_id])
-#     data = {
-#         'title': project.title,
-#         'description': project.description,
-#         'catalog': project.catalog.pk,
-#         'parent': parent_id
-#     }
-#     response = client.post(url, data)
-#
-#     if project_id in change_project_permission_map.get(username, []):
-#         if parent_id in view_project_permission_map.get(username, []):
-#             if project_id in parent_ancestors:
-#                 assert response.status_code == 200
-#                 assert Project.objects.get(pk=project_id).parent == project.parent
-#             else:
-#                 assert response.status_code == 302
-#                 assert Project.objects.get(pk=project_id).parent_id == parent_id
-#         else:
-#             assert response.status_code == 200
-#             assert Project.objects.get(pk=project_id).parent == project.parent
-#     else:
-#         if password:
-#             assert response.status_code == 403
-#         else:
-#             assert response.status_code == 302
-
-#         assert Project.objects.get(pk=project_id).parent == project.parent
-
-
-# @pytest.mark.parametrize('username,password', users)
-# @pytest.mark.parametrize('project_id', projects)
-# def test_project_update_information_get(db, client, username, password, project_id):
-#     client.login(username=username, password=password)
-
-#     url = reverse('project_update_information', args=[project_id])
-#     response = client.get(url)
-
-#     if project_id in change_project_permission_map.get(username, []):
-#         assert response.status_code == 200
-#     else:
-#         if password:
-#             assert response.status_code == 403
-#         else:
-#             assert response.status_code == 302
-
-
-# @pytest.mark.parametrize('username,password', users)
-# @pytest.mark.parametrize('project_id', projects)
-# def test_project_update_information_post(db, client, username, password, project_id):
-#     client.login(username=username, password=password)
-#     project = Project.objects.get(pk=project_id)
-
-#     url = reverse('project_update_information', args=[project_id])
-#     data = {
-#         'title': 'Lorem ipsum dolor sit amet',
-#         'description': 'At vero eos et accusam et justo duo dolores et ea rebum.'
-#     }
-#     response = client.post(url, data)
-
-#     if project_id in change_project_permission_map.get(username, []):
-#         assert response.status_code == 302
-#         assert Project.objects.get(pk=project_id).title == 'Lorem ipsum dolor sit amet'
-#     else:
-#         if password:
-#             assert response.status_code == 403
-#         else:
-#             assert response.status_code == 302
-
-#         assert Project.objects.get(pk=project_id).title == project.title
-
-
-# @pytest.mark.parametrize('username,password', users)
-# @pytest.mark.parametrize('project_id', projects)
-# def test_project_update_catalog_get(db, client, username, password, project_id):
-#     client.login(username=username, password=password)
-
-#     url = reverse('project_update_catalog', args=[project_id])
-#     response = client.get(url)
-
-#     if project_id in change_project_permission_map.get(username, []):
-#         assert response.status_code == 200
-#     else:
-#         if password:
-#             assert response.status_code == 403
-#         else:
-#             assert response.status_code == 302
-
-
-# @pytest.mark.parametrize('username,password', users)
-# @pytest.mark.parametrize('project_id', projects)
-# def test_project_update_catalog_post(db, client, username, password, project_id):
-#     client.login(username=username, password=password)
-#     project = Project.objects.get(pk=project_id)
-
-#     url = reverse('project_update_catalog', args=[project_id])
-#     data = {
-#         'catalog': catalog_id
-#     }
-#     response = client.post(url, data)
-
-#     if project_id in change_project_permission_map.get(username, []):
-#         assert response.status_code == 302
-#         assert Project.objects.get(pk=project_id).catalog_id == catalog_id
-#     else:
-#         if password:
-#             assert response.status_code == 403
-#         else:
-#             assert response.status_code == 302
-
-#         assert Project.objects.get(pk=project_id).catalog == project.catalog
-
-
-# @pytest.mark.parametrize('username,password', users)
-# @pytest.mark.parametrize('project_id', projects)
-# def test_project_update_tasks_get(db, client, settings, username, password, project_id):
-#     client.login(username=username, password=password)
-
-#     url = reverse('project_update_tasks', args=[project_id])
-#     response = client.get(url)
-
-#     if project_id in change_project_permission_map.get(username, []):
-#         assert response.status_code == 200
-#     else:
-#         if password:
-#             assert response.status_code == 403
-#         else:
-#             assert response.status_code == 302
-
-
-# def test_project_update_tasks_get_not_allowed(db, client, settings):
-#     settings.PROJECT_TASKS_SYNC = True
-#
-#     client.login(username='owner', password='owner')
-#
-#     url = reverse('project_update_tasks', args=[project_id])
-#     data = {
-#         'tasks': [1]
-#     }
-#     response = client.get(url, data)
-#
-#     assert response.status_code == 404
-
-# @pytest.mark.parametrize('username,password', users)
-# @pytest.mark.parametrize('project_id', projects)
-# def test_project_update_tasks_post(db, client, settings, username, password, project_id):
-#     client.login(username=username, password=password)
-#     project = Project.objects.get(pk=project_id)
-
-#     url = reverse('project_update_tasks', args=[project_id])
-#     data = {
-#         'tasks': []
-#     }
-#     response = client.post(url, data)
-
-#     if project_id in change_project_permission_map.get(username, []):
-#         assert response.status_code == 302
-#         assert list(Project.objects.get(pk=project_id).tasks.values('id')) == []
-#     else:
-#         if password:
-#             assert response.status_code == 403
-#         else:
-#             assert response.status_code == 302
-
-#         assert list(Project.objects.get(pk=project_id).tasks.values('id')) == list(project.tasks.values('id'))
-
-
-# def test_project_update_tasks_post_not_allowed(db, client, settings):
-#     settings.PROJECT_TASKS_SYNC = True
-#
-#     client.login(username='owner', password='owner')
-#
-#     url = reverse('project_update_tasks', args=[project_id])
-#     data = {
-#         'tasks': [1]
-#     }
-#     response = client.post(url, data)
-#
-#     assert response.status_code == 404
-
-
-# @pytest.mark.parametrize('username,password', users)
-# @pytest.mark.parametrize('project_id', projects)
-# def test_project_update_views_get(db, client, settings, username, password, project_id):
-#     client.login(username=username, password=password)
-
-#     url = reverse('project_update_views', args=[project_id])
-#     response = client.get(url)
-
-#     if project_id in change_project_permission_map.get(username, []):
-#         assert response.status_code == 200
-#     else:
-#         if password:
-#             assert response.status_code == 403
-#         else:
-#             assert response.status_code == 302
-
-
-# def test_project_update_views_get_not_allowed(db, client, settings):
-#     settings.PROJECT_VIEWS_SYNC = True
-#
-#     client.login(username='owner', password='owner')
-#
-#     url = reverse('project_update_views', args=[project_id])
-#     data = {
-#         'tasks': [1]
-#     }
-#     response = client.get(url, data)
-#
-#     assert response.status_code == 404
-
-
-# @pytest.mark.parametrize('username,password', users)
-# @pytest.mark.parametrize('project_id', projects)
-# def test_project_update_views_post(db, client, settings, username, password, project_id):
-#     client.login(username=username, password=password)
-#     project = Project.objects.get(pk=project_id)
-
-#     url = reverse('project_update_views', args=[project_id])
-#     data = {
-#         'views': []
-#     }
-#     response = client.post(url, data)
-
-#     if project_id in change_project_permission_map.get(username, []):
-#         assert response.status_code == 302
-#         assert list(Project.objects.get(pk=project_id).views.values('id')) == []
-#     else:
-#         if password:
-#             assert response.status_code == 403
-#         else:
-#             assert response.status_code == 302
-
-#         assert list(Project.objects.get(pk=project_id).views.values('id')) == list(project.views.values('id'))
-
-
-# def test_project_update_views_post_not_allowed(db, client, settings):
-#     settings.PROJECT_VIEWS_SYNC = True
-#
-#     client.login(username='owner', password='owner')
-#
-#     url = reverse('project_update_views', args=[project_id])
-#     data = {
-#         'tasks': [1]
-#     }
-#     response = client.post(url, data)
-#
-#     assert response.status_code == 404
-
-# @pytest.mark.parametrize('username,password', users)
-# @pytest.mark.parametrize('project_id', projects)
-# def test_project_update_parent_get(db, client, username, password, project_id):
-#     client.login(username=username, password=password)
-
-#     url = reverse('project_update_parent', args=[project_id])
-#     response = client.get(url)
-
-#     if project_id in change_project_permission_map.get(username, []):
-#         assert response.status_code == 200
-#     else:
-#         if password:
-#             assert response.status_code == 403
-#         else:
-#             assert response.status_code == 302
-
-
-# @pytest.mark.parametrize('username,password', users)
-# @pytest.mark.parametrize('project_id', projects)
-# def test_project_update_parent_post(db, client, username, password, project_id):
-#     client.login(username=username, password=password)
-#     project = Project.objects.get(pk=project_id)
-
-#     url = reverse('project_update_parent', args=[project_id])
-#     data = {
-#         'parent': parent_id
-#     }
-#     response = client.post(url, data)
-
-#     if project_id in change_project_permission_map.get(username, []):
-#         if parent_id in view_project_permission_map.get(username, []):
-#             if project_id in parent_ancestors:
-#                 assert response.status_code == 200
-#                 assert Project.objects.get(pk=project_id).parent == project.parent
-#             else:
-#                 assert response.status_code == 302
-#                 assert Project.objects.get(pk=project_id).parent_id == parent_id
-#         else:
-#             assert response.status_code == 200
-#             assert Project.objects.get(pk=project_id).parent == project.parent
-#     else:
-#         if password:
-#             assert response.status_code == 403
-#         else:
-#             assert response.status_code == 302
-
-#         assert Project.objects.get(pk=project_id).parent == project.parent
-
-
-# @pytest.mark.parametrize('username,password', users)
-# @pytest.mark.parametrize('project_id', projects)
-# def test_project_delete_get(db, client, username, password, project_id):
-#     client.login(username=username, password=password)
-
-#     url = reverse('project_delete', args=[project_id])
-#     response = client.get(url)
-
-#     if project_id in delete_project_permission_map.get(username, []):
-#         assert response.status_code == 200
-#     else:
-#         if password:
-#             assert response.status_code == 403
-#         else:
-#             assert response.status_code == 302
-
-
-# @pytest.mark.parametrize('username,password', users)
-# @pytest.mark.parametrize('project_id', projects)
-# def test_project_delete_post(db, client, username, password, project_id):
-#     client.login(username=username, password=password)
-
-#     url = reverse('project_delete', args=[project_id])
-#     response = client.post(url)
-
-#     if project_id in delete_project_permission_map.get(username, []):
-#         assert response.status_code == 302
-#         assert not Project.objects.filter(pk=project_id).first()
-#     else:
-#         if password:
-#             assert response.status_code == 403
-#         else:
-#             assert response.status_code == 302
-
-#         assert Project.objects.filter(pk=project_id).first()
-
-
-@pytest.mark.parametrize('username,password', users)
-@pytest.mark.parametrize('project_id', projects)
-def test_project_export_xml(db, client, files, username, password, project_id):
-    client.login(username=username, password=password)
-
-    url = reverse('project_export', args=[project_id, 'xml'])
-    response = client.get(url)
-
-    if project_id in export_project_permission_map.get(username, []):
-        assert response.status_code == 200
-    else:
-        if password:
-            assert response.status_code == 403
-        else:
-            assert response.status_code == 302
-
-
-@pytest.mark.parametrize('username,password', users)
-@pytest.mark.parametrize('project_id', projects)
-def test_project_export_csv(db, client, username, password, project_id):
-    client.login(username=username, password=password)
-
-    url = reverse('project_export', args=[project_id, 'csvcomma'])
-    response = client.get(url)
-
-    if project_id in export_project_permission_map.get(username, []):
-        assert response.status_code == 200
-    else:
-        if password:
-            assert response.status_code == 403
-        else:
-            assert response.status_code == 302
-
-
-@pytest.mark.parametrize('username,password', users)
-@pytest.mark.parametrize('project_id', projects)
-def test_project_export_csvsemicolon(db, client, username, password, project_id):
-    client.login(username=username, password=password)
-
-    url = reverse('project_export', args=[project_id, 'csvsemicolon'])
-    response = client.get(url)
-
-    if project_id in export_project_permission_map.get(username, []):
-        assert response.status_code == 200
-    else:
-        if password:
-            assert response.status_code == 403
-        else:
-            assert response.status_code == 302
-
-
-@pytest.mark.parametrize('username,password', users)
-@pytest.mark.parametrize('project_id', projects)
-def test_project_export_json(db, client, username, password, project_id):
-    client.login(username=username, password=password)
-
-    url = reverse('project_export', args=[project_id, 'json'])
-    response = client.get(url)
-
-    if project_id in export_project_permission_map.get(username, []):
-        assert response.status_code == 200
-    else:
-        if password:
-            assert response.status_code == 403
-        else:
-            assert response.status_code == 302
-
-
-# @pytest.mark.parametrize('username,password', users)
-# @pytest.mark.parametrize('project_id', projects)
-# def test_project_answers(db, client, username, password, project_id):
-#     client.login(username=username, password=password)
-
-#     url = reverse('project_answers', args=[project_id])
-#     response = client.get(url)
-
-#     if project_id in view_project_permission_map.get(username, []):
-#         assert response.status_code == 200
-#     else:
-#         if password:
-#             assert response.status_code == 403
-#         else:
-#             assert response.status_code == 302
-
-
-# @pytest.mark.parametrize('username,password', users)
-# @pytest.mark.parametrize('project_id', projects)
-# @pytest.mark.parametrize('export_format', export_formats)
-# def test_project_answers_export(db, client, username, password, project_id, export_format):
-#     client.login(username=username, password=password)
-
-#     url = reverse('project_answers_export', args=[project_id, export_format])
-#     response = client.get(url)
-
-#     if project_id in view_project_permission_map.get(username, []):
-#         assert response.status_code == 200
-#     else:
-#         if password:
-#             assert response.status_code == 403
-#         else:
-#             assert response.status_code == 302
-
-
-# @pytest.mark.parametrize('username,password', users)
-# @pytest.mark.parametrize('project_id', projects)
-# def test_project_view(db, client, username, password, project_id):
-#     client.login(username=username, password=password)
-#     project_views = Project.objects.get(pk=project_id).views.all()
-
-#     for view in View.objects.all():
-#         url = reverse('project_view', args=[project_id, view.id])
-#         response = client.get(url)
-
-#         if project_id in view_project_permission_map.get(username, []):
-#             if view in project_views:
-#                 assert response.status_code == 200
-#             else:
-#                 assert response.status_code == 404
-#         else:
-#             if password:
-#                 assert response.status_code == 403
-#             else:
-#                 assert response.status_code == 302
-
-
-# @pytest.mark.parametrize('username,password', users)
-# @pytest.mark.parametrize('project_id', projects)
-# @pytest.mark.parametrize('export_format', export_formats)
-# def test_project_view_export(db, client, username, password, project_id, export_format, files):
-#     client.login(username=username, password=password)
-#     project_views = Project.objects.get(pk=project_id).views.all()
-
-#     for view in View.objects.all():
-#         url = reverse('project_view_export', args=[project_id, view.pk, export_format])
-#         response = client.get(url)
-
-#         if project_id in view_project_permission_map.get(username, []):
-#             if view in project_views:
-#                 assert response.status_code == 200
-#             else:
-#                 assert response.status_code == 404
-#         else:
-#             if password:
-#                 assert response.status_code == 403
-#             else:
-#                 assert response.status_code == 302
-
-
-# @pytest.mark.parametrize('username,password', users)
-# @pytest.mark.parametrize('project_id', projects)
-# def test_project_error(db, client, username, password, project_id):
-#     client.login(username=username, password=password)
-
-#     url = reverse('project_error', args=[project_id])
-#     response = client.get(url)
-
-#     if project_id in view_project_permission_map.get(username, []):
-#         assert response.status_code == 200
-#     elif password:
-#         assert response.status_code == 403
-#     else:
-#         assert response.status_code == 302
diff --git a/rdmo/projects/tests/test_view_project_copy.py b/rdmo/projects/tests/test_view_project_copy.py
deleted file mode 100644
index cc19681a7d..0000000000
--- a/rdmo/projects/tests/test_view_project_copy.py
+++ /dev/null
@@ -1,207 +0,0 @@
-# import pytest
-
-# from django.contrib.auth.models import Group, User
-# from django.urls import reverse
-
-# from ..models import Project, Snapshot, Value
-
-users = (
-    ('owner', 'owner'),
-    ('manager', 'manager'),
-    ('author', 'author'),
-    ('guest', 'guest'),
-    ('user', 'user'),
-    ('site', 'site'),
-    ('anonymous', None),
-    ('editor', 'editor'),
-    ('reviewer', 'reviewer'),
-    ('api', 'api'),
-)
-
-view_project_permission_map = {
-    'owner': [1, 2, 3, 4, 5, 10],
-    'manager': [1, 3, 5, 7],
-    'author': [1, 3, 5, 8],
-    'guest': [1, 3, 5, 9],
-    'api': [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11],
-    'site': [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11]
-}
-
-change_project_permission_map = {
-    'owner': [1, 2, 3, 4, 5, 10],
-    'manager': [1, 3, 5, 7],
-    'api': [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11],
-    'site': [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11]
-}
-
-delete_project_permission_map = {
-    'owner': [1, 2, 3, 4, 5, 10],
-    'api': [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11],
-    'site': [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11],
-}
-
-export_project_permission_map = {
-    'owner': [1, 2, 3, 4, 5, 10],
-    'manager': [1, 3, 5, 7],
-    'api': [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11],
-    'site': [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11],
-}
-
-projects = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]
-
-project_id = 1
-site_id = 1
-parent_id = 1
-catalog_id = 1
-
-
-# @pytest.mark.parametrize('username,password', users)
-# @pytest.mark.parametrize('project_id', projects)
-# def test_project_copy_get(db, client, username, password, project_id):
-#     client.login(username=username, password=password)
-
-#     url = reverse('project_copy', args=[project_id])
-#     response = client.get(url)
-
-#     if project_id in view_project_permission_map.get(username, []):
-#         assert response.status_code == 200
-#     else:
-#         if password:
-#             assert response.status_code == 403
-#         else:
-#             assert response.status_code == 302
-
-
-# def test_project_copy_restricted_get(db, client, settings):
-#     settings.PROJECT_CREATE_RESTRICTED = True
-#     settings.PROJECT_CREATE_GROUPS = ['projects']
-
-#     group = Group.objects.create(name='projects')
-#     guest = User.objects.get(username='guest')
-#     guest.groups.add(group)
-
-#     client.login(username='guest', password='guest')
-
-#     url = reverse('project_copy', args=[project_id])
-#     response = client.get(url)
-
-#     assert response.status_code == 200
-
-
-# def test_project_copy_forbidden_get(db, client, settings):
-#     settings.PROJECT_CREATE_RESTRICTED = True
-
-#     client.login(username='guest', password='guest')
-
-#     url = reverse('project_copy', args=[project_id])
-#     response = client.get(url)
-
-#     assert response.status_code == 403
-
-
-# @pytest.mark.parametrize('username,password', users)
-# @pytest.mark.parametrize('project_id', projects)
-# def test_project_copy_post(db, files, client, username, password, project_id):
-#     client.login(username=username, password=password)
-
-#     project_count = Project.objects.count()
-#     snapshot_count = Snapshot.objects.count()
-#     value_count = Value.objects.count()
-
-#     project = Project.objects.get(id=project_id)
-#     project_snapshots_count = project.snapshots.count()
-#     project_values_count = project.values.count()
-
-#     url = reverse('project_copy', args=[project_id])
-#     data = {
-#         'title': 'A new project',
-#         'description': 'Some description',
-#         'catalog': catalog_id
-#     }
-#     response = client.post(url, data)
-
-#     if project_id in view_project_permission_map.get(username, []):
-#         assert response.status_code == 302
-#         assert Project.objects.count() == project_count + 1
-#         assert Snapshot.objects.count() == snapshot_count + project_snapshots_count
-#         assert Value.objects.count() == value_count + project_values_count
-#     else:
-#         assert response.status_code == 403 if password else 302
-#         assert Project.objects.count() == project_count
-#         assert Value.objects.count() == value_count
-
-
-# def test_project_copy_post_restricted(db, files, client, settings):
-#     settings.PROJECT_CREATE_RESTRICTED = True
-#     settings.PROJECT_CREATE_GROUPS = ['projects']
-
-#     group = Group.objects.create(name='projects')
-#     guest = User.objects.get(username='guest')
-#     guest.groups.add(group)
-
-#     client.login(username='guest', password='guest')
-
-#     url = reverse('project_copy', args=[project_id])
-#     data = {
-#         'title': 'A new project',
-#         'description': 'Some description',
-#         'catalog': catalog_id
-#     }
-#     response = client.post(url, data)
-
-#     assert response.status_code == 302
-
-
-# def test_project_copy_post_forbidden(db, files, client, settings):
-#     settings.PROJECT_CREATE_RESTRICTED = True
-
-#     client.login(username='guest', password='guest')
-
-#     url = reverse('project_copy', args=[project_id])
-#     data = {
-#         'title': 'A new project',
-#         'description': 'Some description',
-#         'catalog': catalog_id
-#     }
-#     response = client.post(url, data)
-
-#     assert response.status_code == 403
-
-
-# @pytest.mark.parametrize('username,password', users)
-# @pytest.mark.parametrize('project_id', projects)
-# def test_project_copy_parent_post(db, files, client, username, password, project_id):
-#     client.login(username=username, password=password)
-#     project_count = Project.objects.count()
-
-#     project_count = Project.objects.count()
-#     snapshot_count = Snapshot.objects.count()
-#     value_count = Value.objects.count()
-
-#     project = Project.objects.get(id=project_id)
-#     project_snapshots_count = project.snapshots.count()
-#     project_values_count = project.values.count()
-
-#     url = reverse('project_copy', args=[project_id])
-#     data = {
-#         'title': 'A new project',
-#         'description': 'Some description',
-#         'catalog': catalog_id,
-#         'parent': parent_id
-#     }
-#     response = client.post(url, data)
-
-#     if project_id in view_project_permission_map.get(username, []):
-#         if parent_id in view_project_permission_map.get(username, []):
-#             assert response.status_code == 302
-#             assert Project.objects.count() == project_count + 1
-#             assert Snapshot.objects.count() == snapshot_count + project_snapshots_count
-#             assert Value.objects.count() == value_count + project_values_count
-#         else:
-#             assert response.status_code == 200
-#             assert Project.objects.count() == project_count
-#             assert Value.objects.count() == value_count
-#     else:
-#         assert response.status_code == 403 if password else 302
-#         assert Project.objects.count() == project_count
-#         assert Value.objects.count() == value_count
diff --git a/rdmo/projects/tests/test_view_project_create_import.py b/rdmo/projects/tests/test_view_project_create_import.py
deleted file mode 100644
index 123a7cb708..0000000000
--- a/rdmo/projects/tests/test_view_project_create_import.py
+++ /dev/null
@@ -1,359 +0,0 @@
-import os
-import re
-from pathlib import Path
-
-import pytest
-
-from django.contrib.auth.models import Group, User
-from django.urls import reverse
-
-from rdmo.core.constants import VALUE_TYPE_FILE
-
-from ..models import Project, Value
-
-users = (
-    ('owner', 'owner'),
-    ('manager', 'manager'),
-    ('author', 'author'),
-    ('guest', 'guest'),
-    ('user', 'user'),
-    ('site', 'site'),
-    ('anonymous', None),
-)
-
-change_project_permission_map = {
-    'owner': [1, 2, 3, 4, 5],
-    'manager': [1, 3, 5],
-    'api': [1, 2, 3, 4, 5],
-    'site': [1, 2, 3, 4, 5]
-}
-
-projects = [1, 2, 3, 4, 5]
-
-
-@pytest.mark.parametrize('username,password', users)
-def test_project_create_import_get(db, client, username, password):
-    client.login(username=username, password=password)
-
-    url = reverse('project_create_import')
-    response = client.get(url)
-    if password:
-        assert response.status_code == 400
-    else:
-        assert response.status_code == 302
-        assert response.url.startswith('/account/login/')
-
-
-def test_project_create_import_get_restricted(db, client, settings):
-    settings.PROJECT_CREATE_RESTRICTED = True
-    settings.PROJECT_CREATE_GROUPS = ['projects']
-
-    group = Group.objects.create(name='projects')
-    user = User.objects.get(username='user')
-    user.groups.add(group)
-
-    client.login(username='user', password='user')
-
-    url = reverse('project_create_import')
-    response = client.get(url)
-    assert response.status_code == 400
-
-
-def test_project_create_import_get_forbidden(db, client, settings):
-    settings.PROJECT_CREATE_RESTRICTED = True
-
-    client.login(username='user', password='user')
-
-    url = reverse('project_create_import')
-    response = client.get(url)
-    assert response.status_code == 403
-
-
-@pytest.mark.parametrize('username,password', users)
-def test_project_create_import_post_empty(db, settings, client, username, password):
-    client.login(username=username, password=password)
-
-    url = reverse('project_create_import')
-    response = client.post(url)
-
-    if password:
-        assert response.status_code == 404
-    else:
-        assert response.status_code == 302
-        assert response.url.startswith('/account/login/')
-
-
-@pytest.mark.parametrize('username,password', users)
-def test_project_create_import_post_upload_file(db, settings, client, username, password):
-    client.login(username=username, password=password)
-
-    url = reverse('project_create_import')
-    xml_file = os.path.join(settings.BASE_DIR, 'xml', 'project.xml')
-    with open(xml_file, encoding='utf8') as f:
-        response = client.post(url, {
-            'method': 'upload_file',
-            'uploaded_file': f
-        })
-
-    if password:
-        assert response.status_code == 302
-        assert response.url.startswith('/projects/import/')
-
-        # follow the redirect to the import form
-        response = client.get(response.url)
-        assert response.status_code == 200
-        assert b'Create project from project.xml' in response.content
-    else:
-        assert response.status_code == 302
-        assert response.url.startswith('/account/login/')
-
-
-@pytest.mark.parametrize('username,password', users)
-def test_project_create_import_post_upload_file_error(db, settings, client, username, password):
-    client.login(username=username, password=password)
-
-    url = reverse('project_create_import')
-    xml_file = os.path.join(settings.BASE_DIR, 'xml', 'error.xml')
-    with open(xml_file, encoding='utf8') as f:
-        response = client.post(url, {
-            'method': 'upload_file',
-            'uploaded_file': f
-        })
-
-    if password:
-        assert response.status_code == 302
-        assert response.url.startswith('/projects/import/')
-
-        # follow the redirect to the import form
-        response = client.get(response.url)
-        assert response.status_code == 400
-        assert b'Files of this type cannot be imported.' in response.content
-    else:
-        assert response.status_code == 302
-        assert response.url.startswith('/account/login/')
-
-
-@pytest.mark.parametrize('username,password', users)
-def test_project_create_import_post_upload_file_empty(db, client, username, password):
-    client.login(username=username, password=password)
-
-    url = reverse('project_create_import')
-    response = client.post(url, {
-        'method': 'upload_file'
-    })
-    if password:
-        assert response.status_code == 400
-    else:
-        assert response.status_code == 302
-        assert response.url.startswith('/account/login/')
-
-
-def test_project_create_import_post_upload_file_restricted(db, client, settings):
-    settings.PROJECT_CREATE_RESTRICTED = True
-    settings.PROJECT_CREATE_GROUPS = ['projects']
-
-    group = Group.objects.create(name='projects')
-    user = User.objects.get(username='user')
-    user.groups.add(group)
-
-    client.login(username='user', password='user')
-
-    url = reverse('project_create_import')
-    xml_file = os.path.join(settings.BASE_DIR, 'xml', 'project.xml')
-    with open(xml_file, encoding='utf8') as f:
-        response = client.post(url, {
-            'method': 'upload_file',
-            'uploaded_file': f
-        })
-    assert response.status_code == 302
-
-
-def test_project_create_import_post_upload_file_forbidden(db, client, settings):
-    settings.PROJECT_CREATE_RESTRICTED = True
-
-    client.login(username='user', password='user')
-
-    url = reverse('project_create_import')
-    xml_file = os.path.join(settings.BASE_DIR, 'xml', 'project.xml')
-    with open(xml_file, encoding='utf8') as f:
-        response = client.post(url, {
-            'method': 'upload_file',
-            'uploaded_file': f
-        })
-    assert response.status_code == 403
-
-
-@pytest.mark.parametrize('username,password', users)
-def test_project_create_import_post_import_file(db, settings, client, files, username, password):
-    client.login(username=username, password=password)
-    projects_count = Project.objects.count()
-
-    # upload file
-    url = reverse('project_create_import')
-    xml_file = os.path.join(settings.BASE_DIR, 'xml', 'project.xml')
-    with open(xml_file, encoding='utf8') as f:
-        response = client.post(url, {
-            'method': 'upload_file',
-            'uploaded_file': f
-        })
-
-    if password:
-        assert response.status_code == 302
-        assert response.url.startswith('/projects/import/')
-
-        # follow the redirect to the import form
-        response = client.get(response.url)
-
-        assert response.status_code == 200
-
-        # get keys from the response
-        keys = re.findall(r'name=\"(http.*?)\"', response.content.decode())
-
-        # import file
-        data = {key: ['on'] for key in keys}
-        data.update({'method': 'import_file'})
-        response = client.post(url, data)
-
-        # check if all the files are where are supposed to be
-        for file_value in Value.objects.filter(value_type=VALUE_TYPE_FILE):
-            assert Path(settings.MEDIA_ROOT).joinpath(file_value.file.name).exists()
-
-        # assert that the project exists and that there are values
-        if password:
-            project = Project.objects.order_by('updated').last()
-            assert response.status_code == 302
-            assert response.url == f'/projects/{project.pk}/'
-
-            # a new project, new values values
-            assert Project.objects.count() == projects_count + 1
-            assert project.values.count() > 0
-        else:
-            assert response.status_code == 302
-            assert response.url.startswith('/account/login/')
-
-            # no new project was created
-            assert Project.objects.count() == projects_count
-    else:
-        assert response.status_code == 302
-        assert response.url.startswith('/account/login/')
-
-
-@pytest.mark.parametrize('username,password', users)
-def test_project_create_import_post_import_file_cancel(db, settings, client, files, username, password):
-    client.login(username=username, password=password)
-    projects_count = Project.objects.count()
-
-    # upload file
-    url = reverse('project_create_import')
-    xml_file = os.path.join(settings.BASE_DIR, 'xml', 'project.xml')
-    with open(xml_file, encoding='utf8') as f:
-        response = client.post(url, {
-            'method': 'upload_file',
-            'uploaded_file': f
-        })
-
-    if password:
-        assert response.status_code == 302
-        assert response.url.startswith('/projects/import/')
-
-        # follow the redirect to the import form
-        response = client.get(response.url)
-
-        assert response.status_code == 200
-
-        # get keys from the response
-        keys = re.findall(r'name=\"(http.*?)\"', response.content.decode())
-
-        # import file
-        data = {key: ['on'] for key in keys}
-        data.update({'method': 'import_file', 'cancel': 'Cancel'})
-        response = client.post(url, data)
-
-        # check if all the files are where are supposed to be
-        for file_value in Value.objects.filter(value_type=VALUE_TYPE_FILE):
-            assert Path(settings.MEDIA_ROOT).joinpath(file_value.file.name).exists()
-
-        # assert that the project exists, but that there are not values
-        if password:
-            assert response.status_code == 302
-            assert response.url == '/projects/'
-
-            # no new project
-            assert Project.objects.count() == projects_count
-        else:
-            assert response.status_code == 302
-            assert response.url.startswith('/account/login/')
-
-            # no new project was created
-            assert Project.objects.count() == projects_count
-    else:
-        assert response.status_code == 302
-        assert response.url.startswith('/account/login/')
-
-
-@pytest.mark.parametrize('username,password', users)
-def test_project_create_import_post_import_empty(db, settings, files, client, username, password):
-    client.login(username=username, password=password)
-    projects_count = Project.objects.count()
-
-    # upload file
-    url = reverse('project_create_import')
-    xml_file = os.path.join(settings.BASE_DIR, 'xml', 'project.xml')
-    with open(xml_file, encoding='utf8') as f:
-        response = client.post(url, {
-            'method': 'upload_file',
-            'uploaded_file': f
-        })
-
-    if password:
-        assert response.status_code == 302
-        assert response.url.startswith('/projects/import/')
-
-        # follow the redirect to the import form, this will set import_key in the session
-        response = client.get(response.url)
-
-        assert response.status_code == 200
-
-        # post the form empty
-        response = client.post(url, {
-            'method': 'import_file'
-        })
-
-        # check if all the files are where are supposed to be
-        for file_value in Value.objects.filter(value_type=VALUE_TYPE_FILE):
-            assert Path(settings.MEDIA_ROOT).joinpath(file_value.file.name).exists()
-
-        # assert that the project exists, but that there are not values
-        if password:
-            new_project = Project.objects.order_by('updated').last()
-            assert response.status_code == 302
-            assert response.url == f'/projects/{new_project.id}/'
-
-            # a new project, but no values
-            assert Project.objects.count() == projects_count + 1
-            assert new_project.values.count() == 0
-        else:
-            assert response.status_code == 302
-            assert response.url.startswith('/account/login/')
-
-            # no new project was created
-            assert Project.objects.count() == projects_count
-    else:
-        assert response.status_code == 302
-        assert response.url.startswith('/account/login/')
-
-
-@pytest.mark.parametrize('username,password', users)
-def test_project_create_import_post_import_project(db, settings, client, username, password):
-    client.login(username=username, password=password)
-
-    url = reverse('project_create_import')
-    response = client.post(url, {
-        'method': 'import_project'
-    })
-
-    if password:
-        assert response.status_code == 404
-    else:
-        assert response.status_code == 302
-        assert response.url.startswith('/account/login/')
diff --git a/rdmo/projects/tests/test_view_project_leave.py b/rdmo/projects/tests/test_view_project_leave.py
deleted file mode 100644
index 43df7e6d67..0000000000
--- a/rdmo/projects/tests/test_view_project_leave.py
+++ /dev/null
@@ -1,146 +0,0 @@
-import pytest
-
-from django.urls import reverse
-
-from ..models import Membership
-
-users = (
-    ('owner', 'owner'),
-    ('manager', 'manager'),
-    ('author', 'author'),
-    ('guest', 'guest'),
-    ('user', 'user'),
-    ('site', 'site'),
-    ('anonymous', None),
-)
-
-leave_project_permission_map = {
-    'owner': [1, 2, 3, 4, 5, 12],
-    'manager': [1, 3],
-    'author': [1, 3],
-    'guest': [1, 3]
-}
-
-projects = [1, 2, 3, 4, 5, 12]
-
-@pytest.mark.parametrize('username,password', users)
-@pytest.mark.parametrize('project_id', projects)
-def test_project_leave_get(db, client, username, password, project_id):
-    client.login(username=username, password=password)
-
-    url = reverse('project_leave', args=[project_id])
-    response = client.get(url)
-
-    if project_id in leave_project_permission_map.get(username, []):
-        assert response.status_code == (403 if username == 'owner' else 200)
-    else:
-        if password:
-            assert response.status_code == 403
-        else:
-            assert response.status_code == 302
-
-
-@pytest.mark.parametrize('username,password', users)
-@pytest.mark.parametrize('project_id', projects)
-def test_project_leave_post(db, client, username, password, project_id):
-    client.login(username=username, password=password)
-
-    # add additional owner, so that the owner can leave
-    Membership.objects.create(user_id=1, project_id=project_id, role='owner')
-
-    # store if the membership exists
-    membership_existed = Membership.objects.filter(project_id=project_id, user__username=username).exists()
-
-    url = reverse('project_leave', args=[project_id])
-    response = client.post(url)
-
-    if project_id in leave_project_permission_map.get(username, []):
-        assert response.status_code == 302
-        if membership_existed:
-            assert not Membership.objects.filter(project_id=project_id, user__username=username).exists()
-    else:
-        if membership_existed:
-            assert Membership.objects.filter(project_id=project_id, user__username=username).exists()
-
-        if password:
-            assert response.status_code == 403
-        else:
-            assert response.status_code == 302
-
-
-@pytest.mark.parametrize('username,password', users)
-@pytest.mark.parametrize('project_id', projects)
-def test_project_leave_post_last_owner(db, client, username, password, project_id):
-    client.login(username=username, password=password)
-
-    # store if the membership exists
-    membership_existed = Membership.objects.filter(project_id=project_id, user__username=username).exists()
-
-    url = reverse('project_leave', args=[project_id])
-    response = client.post(url)
-
-    if project_id in leave_project_permission_map.get(username, []):
-
-        if username == 'owner':
-            assert response.status_code == 403
-            if membership_existed:
-                assert Membership.objects.filter(project_id=project_id, user__username=username).exists()
-        else:
-            assert response.status_code == 302
-            if membership_existed:
-                assert not Membership.objects.filter(project_id=project_id, user__username=username).exists()
-    else:
-        if membership_existed:
-            assert Membership.objects.filter(project_id=project_id, user__username=username).exists()
-
-        if password:
-            assert response.status_code == 403
-        else:
-            assert response.status_code == 302
-
-
-@pytest.mark.parametrize('username,password', users)
-@pytest.mark.parametrize('project_id', projects)
-def test_project_leave_post_cancel(db, client, username, password, project_id):
-    client.login(username=username, password=password)
-
-    # add additional owner, so that the owner can leave
-    Membership.objects.create(user_id=1, project_id=project_id, role='owner')
-
-    # store if the membership exists
-    membership_existed = Membership.objects.filter(project_id=project_id, user__username=username).exists()
-
-    url = reverse('project_leave', args=[project_id])
-    response = client.post(url, {'cancel': True})
-
-    if membership_existed:
-        assert Membership.objects.filter(project_id=project_id, user__username=username).exists()
-
-    if project_id in leave_project_permission_map.get(username, []):
-        assert response.status_code == 302
-    else:
-        if password:
-            assert response.status_code == 403
-        else:
-            assert response.status_code == 302
-
-
-# @pytest.mark.parametrize('username,password', users)
-# @pytest.mark.parametrize('project_id', projects)
-# def test_project_leave_post(db, client, username, password, project_id):
-#     client.login(username=username, password=password)
-
-#     # add additional owner, so that the owner can leave
-#     Membership.objects.create(user_id=1, project_id=project_id, role='owner')
-
-#     url = reverse('project_leave', args=[project_id])
-#     response = client.post(url)
-
-#     if project_id in leave_project_permission_map.get(username, []):
-#         assert response.status_code == 302
-#         assert not Membership.objects.filter(project_id=project_id, user__username=username).exists()
-#     else:
-#         if password:
-#             assert response.status_code == 403
-#         else:
-#             assert response.status_code == 302
diff --git a/rdmo/projects/tests/test_view_project_update_import.py b/rdmo/projects/tests/test_view_project_update_import.py
deleted file mode 100644
index 6f99bd8331..0000000000
--- a/rdmo/projects/tests/test_view_project_update_import.py
+++ /dev/null
@@ -1,471 +0,0 @@
-import os
-import re
-from pathlib import Path
-
-import pytest
-
-from django.urls import reverse
-
-from rdmo.core.constants import VALUE_TYPE_FILE
-
-from ..models import Project, Value
-
-users = (
-    ('owner', 'owner'),
-    ('manager', 'manager'),
-    ('author', 'author'),
-    ('guest', 'guest'),
-    ('user', 'user'),
-    ('site', 'site'),
-    ('anonymous', None),
-)
-
-view_project_permission_map = {
-    'owner': [1, 2, 3, 4, 5],
-    'manager': [1, 3, 5],
-    'author': [1, 3, 5],
-    'guest': [1, 3, 5],
-    'api': [1, 2, 3, 4, 5],
-    'site': [1, 2, 3, 4, 5]
-}
-
-change_project_permission_map = {
-    'owner': [1, 2, 3, 4, 5],
-    'manager': [1, 3, 5],
-    'api': [1, 2, 3, 4, 5],
-    'site': [1, 2, 3, 4, 5]
-}
-
-projects = [1, 2, 3, 4, 5]
-
-
-@pytest.mark.parametrize('username,password', users)
-@pytest.mark.parametrize('project_id', projects)
-def test_project_update_import_get(db, client, username, password, project_id):
-    client.login(username=username, password=password)
-
-    url = reverse('project_update_import', args=[project_id])
-    response = client.get(url)
-
-    if project_id in change_project_permission_map.get(username, []):
-        assert response.status_code == 400
-    elif password:
-        assert response.status_code == 403
-    else:
-        assert response.status_code == 302
-        assert response.url.startswith('/account/login/')
-
-
-@pytest.mark.parametrize('username,password', users)
-@pytest.mark.parametrize('project_id', projects)
-def test_project_update_import_post_error(db, settings, client, username, password, project_id):
-    client.login(username=username, password=password)
-
-    url = reverse('project_update_import', args=[project_id])
-    response = client.post(url, {
-        'method': 'wrong'
-    })
-
-    if project_id in change_project_permission_map.get(username, []):
-        assert response.status_code == 404
-    elif password:
-        assert response.status_code == 403
-    else:
-        assert response.status_code == 302
-        assert response.url.startswith('/account/login/')
-
-
-@pytest.mark.parametrize('username,password', users)
-@pytest.mark.parametrize('project_id', projects)
-def test_project_update_import_post_upload_file(db, settings, client, username, password, project_id):
-    client.login(username=username, password=password)
-
-    url = reverse('project_update_import', args=[project_id])
-    xml_file = os.path.join(settings.BASE_DIR, 'xml', 'project.xml')
-    with open(xml_file, encoding='utf8') as f:
-        response = client.post(url, {
-            'method': 'upload_file',
-            'uploaded_file': f
-        })
-
-        if project_id in change_project_permission_map.get(username, []):
-            assert response.status_code == 302
-            assert response.url.startswith(f'/projects/{project_id}/import/')
-
-            # follow the redirect to the import form
-            response = client.get(response.url)
-            assert response.status_code == 200
-            assert b'Import from project.xml' in response.content
-        elif password:
-            assert response.status_code == 403
-        else:
-            assert response.status_code == 302
-            assert response.url.startswith('/account/login/')
-
-
-@pytest.mark.parametrize('username,password', users)
-@pytest.mark.parametrize('project_id', projects)
-def test_project_update_import_post_upload_file_error(db, settings, client, username, password, project_id):
-    client.login(username=username, password=password)
-
-    url = reverse('project_update_import', args=[project_id])
-    xml_file = os.path.join(settings.BASE_DIR, 'xml', 'error.xml')
-    with open(xml_file, encoding='utf8') as f:
-        response = client.post(url, {
-            'method': 'upload_file',
-            'uploaded_file': f
-        })
-
-    if project_id in change_project_permission_map.get(username, []):
-        assert response.status_code == 302
-        assert response.url.startswith(f'/projects/{project_id}/import/')
-
-        # follow the redirect to the import form
-        response = client.get(response.url)
-        assert response.status_code == 400
-        assert b'Files of this type cannot be imported.' in response.content
-    elif password:
-        assert response.status_code == 403
-    else:
-        assert response.status_code == 302
-        assert response.url.startswith('/account/login/')
-
-
-@pytest.mark.parametrize('username,password', users)
-@pytest.mark.parametrize('project_id', projects)
-def test_project_update_import_post_upload_file_empty(db, client, username, password, project_id):
-    client.login(username=username, password=password)
-
-    url = reverse('project_update_import', args=[project_id])
-    response = client.post(url, {
-        'method': 'upload_file'
-    })
-
-    if project_id in change_project_permission_map.get(username, []):
-        assert response.status_code == 400
-        assert b'There has been an error with your import.' in response.content
-    elif password:
-        assert response.status_code == 403
-    else:
-        assert response.status_code == 302
-        assert response.url.startswith('/account/login/')
-
-
-@pytest.mark.parametrize('username,password', users)
-@pytest.mark.parametrize('project_id', projects)
-def test_project_update_import_post_import_file(db, settings, client, files, username, password, project_id):
-    client.login(username=username, password=password)
-    projects_count = Project.objects.count()
-
-    project = Project.objects.get(pk=project_id)
-    project_updated = project.updated
-    project_snapshot_count = project.snapshots.count()
-    project_snapshot_values_count = project.values.filter(snapshot=None).count()
-    project_values_count = project.values.count()
-
-    # upload file
-    url = reverse('project_update_import', args=[project_id])
-    xml_file = os.path.join(settings.BASE_DIR, 'xml', 'project.xml')
-    with open(xml_file, encoding='utf8') as f:
-        response = client.post(url,  {
-            'method': 'upload_file',
-            'uploaded_file': f
-        })
-
-    if project_id in change_project_permission_map.get(username, []):
-        assert response.status_code == 302
-        assert response.url.startswith(f'/projects/{project_id}/import/')
-
-        # follow the redirect to the import form
-        response = client.get(response.url)
-
-        assert response.status_code == 200
-
-        # get keys from the response
-        keys = re.findall(r'name=\"(http.*?)\"', response.content.decode())
-
-        # import file
-        url = reverse('project_update_import', args=[project_id])
-        data = {key: ['on'] for key in keys}
-        data.update({'method': 'import_file'})
-        response = client.post(url, data)
-
-        # check if all the files are where are supposed to be
-        for file_value in Value.objects.filter(value_type=VALUE_TYPE_FILE):
-            assert Path(settings.MEDIA_ROOT).joinpath(file_value.file.name).exists()
-
-        # no new project, snapshots, values were created
-        project = Project.objects.get(pk=project_id)
-
-        assert Project.objects.count() == projects_count
-        assert project.snapshots.count() == project_snapshot_count
-        if project_id == 1:
-            assert project.values.count() == project_values_count
-            assert project.values.filter(snapshot=None).count() == project_snapshot_values_count
-
-        assert project.updated == project_updated
-
-        if project_id in change_project_permission_map.get(username, []):
-            assert response.status_code == 302
-            assert response.url == f'/projects/{project_id}/'
-
-        else:
-            if password:
-                assert response.status_code == 403
-            else:
-                assert response.status_code == 302
-                assert response.url.startswith('/account/login/')
-
-    elif password:
-        assert response.status_code == 403
-    else:
-        assert response.status_code == 302
-        assert response.url.startswith('/account/login/')
-
-
-@pytest.mark.parametrize('username,password', users)
-@pytest.mark.parametrize('project_id', projects)
-def test_project_update_import_post_import_file_cancel(db, settings, client, files, username, password, project_id):
-    client.login(username=username, password=password)
-    projects_count = Project.objects.count()
-
-    project = Project.objects.get(pk=project_id)
-    project_updated = project.updated
-    project_snapshot_count = project.snapshots.count()
-    project_snapshot_values_count = project.values.filter(snapshot=None).count()
-    project_values_count = project.values.count()
-
-    # upload file
-    url = reverse('project_update_import', args=[project_id])
-    xml_file = os.path.join(settings.BASE_DIR, 'xml', 'project.xml')
-    with open(xml_file, encoding='utf8') as f:
-        response = client.post(url,  {
-            'method': 'upload_file',
-            'uploaded_file': f
-        })
-
-    if project_id in change_project_permission_map.get(username, []):
-        assert response.status_code == 302
-        assert response.url.startswith(f'/projects/{project_id}/import/')
-
-        # follow the redirect to the import form
-        response = client.get(response.url)
-
-        assert response.status_code == 200
-
-        # get keys from the response
-        keys = re.findall(r'name=\"(http.*?)\"', response.content.decode())
-
-        # import file
-        url = reverse('project_update_import', args=[project_id])
-        data = {key: ['on'] for key in keys}
-        data.update({'method': 'import_file', 'cancel': 'Cancel'})
-        response = client.post(url, data)
-
-        # check if all the files are where are supposed to be
-        for file_value in Value.objects.filter(value_type=VALUE_TYPE_FILE):
-            assert Path(settings.MEDIA_ROOT).joinpath(file_value.file.name).exists()
-
-        # no new project, snapshots, values were created
-        project = Project.objects.get(pk=project_id)
-        assert Project.objects.count() == projects_count
-        assert project.snapshots.count() == project_snapshot_count
-        assert project.values.count() == project_values_count
-        assert project.values.filter(snapshot=None).count() == project_snapshot_values_count
-        assert project.updated == project_updated
-
-        assert response.status_code == 302
-        assert response.url == f'/projects/{project_id}/'
-    elif password:
-        assert response.status_code == 403
-    else:
-        assert response.status_code == 302
-        assert response.url.startswith('/account/login/')
-
-
-@pytest.mark.parametrize('username,password', users)
-@pytest.mark.parametrize('project_id', projects)
-def test_project_update_import_post_import_file_empty(db, settings, files, client, username, password, project_id):
-    client.login(username=username, password=password)
-    projects_count = Project.objects.count()
-
-    project = Project.objects.get(pk=project_id)
-    project_updated = project.updated
-    project_snapshot_count = project.snapshots.count()
-    project_snapshot_values_count = project.values.filter(snapshot=None).count()
-    project_values_count = project.values.count()
-
-    # upload file
-    url = reverse('project_update_import', args=[project_id])
-    xml_file = os.path.join(settings.BASE_DIR, 'xml', 'project.xml')
-    with open(xml_file, encoding='utf8') as f:
-        response = client.post(url, {
-            'method': 'upload_file',
-            'uploaded_file': f
-        })
-
-    if project_id in change_project_permission_map.get(username, []):
-        assert response.status_code == 302
-        assert response.url.startswith(f'/projects/{project_id}/import/')
-
-        # follow the redirect to the import form, this will set import_key in the session
-        response = client.get(response.url)
-
-        assert response.status_code == 200
-
-        # post the form empty
-        response = client.post(url, {
-            'method': 'import_file'
-        })
-
-        # check if all the files are where are supposed to be
-        for file_value in Value.objects.filter(value_type=VALUE_TYPE_FILE):
-            assert Path(settings.MEDIA_ROOT).joinpath(file_value.file.name).exists()
-
-        # no new project, snapshots, values were created
-        project = Project.objects.get(pk=project_id)
-        assert Project.objects.count() == projects_count
-        assert project.snapshots.count() == project_snapshot_count
-        assert project.values.count() == project_values_count
-        assert project.values.filter(snapshot=None).count() == project_snapshot_values_count
-        assert project.updated == project_updated
-
-        assert response.status_code == 302
-        assert response.url == f'/projects/{project_id}/'
-    elif password:
-        assert response.status_code == 403
-    else:
-        assert response.status_code == 302
-        assert response.url.startswith('/account/login/')
-
-
-@pytest.mark.parametrize('username,password', users)
-@pytest.mark.parametrize('project_id', projects)
-@pytest.mark.parametrize('source_id', projects)
-def test_project_update_import_post_import_project_step1(db, settings, client, username, password,
-                                                         project_id, source_id):
-    client.login(username=username, password=password)
-
-    url = reverse('project_update_import', args=[project_id])
-    response = client.post(url, {
-        'method': 'import_project',
-        'source': source_id
-    })
-
-    if project_id in change_project_permission_map.get(username, []):
-        if source_id in view_project_permission_map.get(username, []):
-            assert response.status_code == 200
-        else:
-            assert response.status_code == 403
-
-    elif password:
-        assert response.status_code == 403
-    else:
-        assert response.status_code == 302
-        assert response.url.startswith('/account/login/')
-
-
-@pytest.mark.parametrize('username,password', users)
-@pytest.mark.parametrize('project_id', projects)
-@pytest.mark.parametrize('source_id', projects)
-def test_project_update_import_post_import_project_step2(db, settings, files, client, username, password,
-                                                         project_id, source_id):
-    client.login(username=username, password=password)
-    projects_count = Project.objects.count()
-
-    project = Project.objects.get(pk=project_id)
-    project_updated = project.updated
-    project_snapshot_count = project.snapshots.count()
-    project_snapshot_values_count = project.values.filter(snapshot=None).count()
-    project_values_count = project.values.count()
-
-    source = Project.objects.get(pk=source_id)
-    source_snapshot_count = source.snapshots.count()
-    source_snapshot_values_count = source.values.filter(snapshot=None).count()
-    source_values_count = source.values.count()
-
-    url = reverse('project_update_import', args=[project_id])
-    response = client.post(url, {
-        'method': 'import_project',
-        'source': source_id
-    })
-
-    if project_id in change_project_permission_map.get(username, []):
-        if source_id in view_project_permission_map.get(username, []):
-            assert response.status_code == 200
-
-            # get keys from the response
-            keys = re.findall(r'name=\"(http.*?)\"', response.content.decode())
-
-            # import file
-            url = reverse('project_update_import', args=[project_id])
-            data = {key: ['on'] for key in keys}
-            data.update({
-                'method': 'import_project',
-                'source': source_id
-            })
-            response = client.post(url, data)
-
-            # check if all the files are where are supposed to be
-            for file_value in Value.objects.filter(value_type=VALUE_TYPE_FILE):
-                assert Path(settings.MEDIA_ROOT).joinpath(file_value.file.name).exists()
-
-            # no new project, snapshots, values were created
-            project = Project.objects.get(pk=project_id)
-            source = Project.objects.get(pk=source_id)
-
-            # no new project was created
-            assert Project.objects.count() == projects_count
-
-            # the project has the correct count of snapshot and values
-            assert project.snapshots.count() == project_snapshot_count
-            if project_id == 1:
-                assert project.values.count() == project_values_count
-                assert project.values.filter(snapshot=None).count() == project_snapshot_values_count
-
-            # the source project has the correct count of snapshot and values
-            assert source.snapshots.count() == source_snapshot_count
-            if source_id == 1:
-                assert source.values.count() == source_values_count
-                assert source.values.filter(snapshot=None).count() == source_snapshot_values_count
-
-            assert project.updated == project_updated
-
-            if project_id in change_project_permission_map.get(username, []):
-                assert response.status_code == 302
-                assert response.url == f'/projects/{project_id}/'
-
-            else:
-                if password:
-                    assert response.status_code == 403
-                else:
-                    assert response.status_code == 302
-                    assert response.url.startswith('/account/login/')
-        else:
-            assert response.status_code == 403
-
-    elif password:
-        assert response.status_code == 403
-    else:
-        assert response.status_code == 302
-        assert response.url.startswith('/account/login/')
-
-
-@pytest.mark.parametrize('username,password', users)
-@pytest.mark.parametrize('project_id', projects)
-def test_project_update_import_post_import_project_error(db, settings, client, username, password, project_id):
-    client.login(username=username, password=password)
-
-    # upload file
-    url = reverse('project_update_import', args=[project_id])
-    response = client.post(url, {
-        'method': 'import_project'
-    })
-
-    if project_id in change_project_permission_map.get(username, []):
-        assert response.status_code == 404
-    elif password:
-        assert response.status_code == 403
-    else:
-        assert response.status_code == 302
-        assert response.url.startswith('/account/login/')
diff --git a/rdmo/projects/tests/test_view_project_update_visibility.py b/rdmo/projects/tests/test_view_project_update_visibility.py
deleted file mode 100644
index 0a26a5c541..0000000000
--- a/rdmo/projects/tests/test_view_project_update_visibility.py
+++ /dev/null
@@ -1,412 +0,0 @@
-import pytest
-
-from django.urls import reverse
-
-from ..models import Project, Visibility
-
-users = (
-    ('owner', 'owner'),
-    ('manager', 'manager'),
-    ('author', 'author'),
-    ('guest', 'guest'),
-    ('user', 'user'),
-    ('editor', 'editor'),
-    ('reviewer', 'reviewer'),
-    ('api', 'api'),
-    ('site', 'site'),
-    ('anonymous', None)
-)
-
-
-project_id = 12
-
-@pytest.mark.parametrize('username,password', users)
-def test_project_create_visibility_get(db, client, username, password):
-    client.login(username=username, password=password)
-
-    project = Project.objects.get(id=project_id)
-    project.visibility.delete()
-
-    url = reverse('project_update_visibility', args=[project_id])
-    response = client.get(url)
-
-    if username in ['admin', 'site', 'api']:
-        assert response.status_code == 200
-    else:
-        if password:
-            assert response.status_code == 403
-        else:
-            assert response.status_code == 302
-
-
-@pytest.mark.parametrize('username,password', users)
-def test_project_create_visibility_post(db, client, username, password):
-    client.login(username=username, password=password)
-
-    project = Project.objects.get(id=project_id)
-    project.visibility.delete()
-
-    url = reverse('project_update_visibility', args=[project_id])
-    data = {}
-    response = client.post(url, data)
-
-    if username in ['admin', 'site', 'api']:
-        assert response.status_code == 302
-        assert Project.objects.get(pk=project_id).visibility
-    else:
-        if password:
-            assert response.status_code == 403
-        else:
-            assert response.status_code == 302
-
-        with pytest.raises(Visibility.DoesNotExist):
-            assert Project.objects.get(pk=project_id).visibility
-
-
-def test_project_create_visibility_get_create(db, client, settings):
-    client.login(username='site', password='site')
-
-    project = Project.objects.get(id=project_id)
-    project.visibility.delete()
-
-    url = reverse('project_update_visibility', args=[project_id])
-    response = client.get(url)
-
-    assert response.status_code == 200
-    assert b'value="Make visible"' in response.content
-    assert b'value="Remove visibility"' not in response.content
-
-
-def test_project_create_visibility_get_remove(db, client, settings):
-    client.login(username='site', password='site')
-
-    url = reverse('project_update_visibility', args=[project_id])
-    response = client.get(url)
-
-    assert response.status_code == 200
-    assert b'value="Make visible"' not in response.content
-    assert b'value="Remove visibility"' in response.content
-
-
-def test_project_create_visibility_get_create_site(db, client, settings):
-    settings.MULTISITE = True
-
-    client.login(username='site', password='site')
-
-    project = Project.objects.get(id=project_id)
-    project.visibility.delete()
-
-    url = reverse('project_update_visibility', args=[project_id])
-    response = client.get(url)
-
-    assert response.status_code == 200
-    assert b'value="Make visible"' in response.content
-    assert b'value="Remove visibility"' not in response.content
-
-
-def test_project_create_visibility_get_create_site_existing(db, client, settings):
-    settings.MULTISITE = True
-
-    client.login(username='site', password='site')
-
-    project = Project.objects.get(id=project_id)
-    project.visibility.sites.set([2, 3])
-
-    url = reverse('project_update_visibility', args=[project_id])
-    response = client.get(url)
-
-    assert response.status_code == 200
-    assert b'value="Make visible for this site"' in response.content
-    assert b'value="Remove visibility"' not in response.content
-
-
-def test_project_create_visibility_get_remove_site(db, client, settings):
-    settings.MULTISITE = True
-
-    client.login(username='site', password='site')
-
-    url = reverse('project_update_visibility', args=[project_id])
-    response = client.get(url)
-
-    assert response.status_code == 200
-    assert b'value="Update visibility"' not in response.content
-    assert b'value="Remove visibility"' in response.content
-
-
-def test_project_create_visibility_get_update_site_group(db, client, settings):
-    settings.MULTISITE = True
-    settings.GROUPS = True
-
-    client.login(username='site', password='site')
-
-    url = reverse('project_update_visibility', args=[project_id])
-    response = client.get(url)
-
-    assert response.status_code == 200
-    assert b'value="Update visibility"' in response.content
-    assert b'value="Remove visibility"' in response.content
-
-
-def test_project_create_visibility_get_create_group(db, client, settings):
-    settings.GROUPS = True
-
-    client.login(username='site', password='site')
-
-    project = Project.objects.get(id=project_id)
-    project.visibility.delete()
-
-    url = reverse('project_update_visibility', args=[project_id])
-    response = client.get(url)
-
-    assert response.status_code == 200
-    assert b'value="Make visible"' in response.content
-    assert b'value="Remove visibility"' not in response.content
-
-
-def test_project_create_visibility_get_remove_group(db, client, settings):
-    settings.GROUPS = True
-
-    client.login(username='site', password='site')
-
-    url = reverse('project_update_visibility', args=[project_id])
-    response = client.get(url)
-
-    assert response.status_code == 200
-    assert b'value="Update visibility"' in response.content
-    assert b'value="Remove visibility"' in response.content
-
-
-def test_project_update_visibility_site_post_add(db, client, settings):
-    settings.MULTISITE = True
-
-    client.login(username='site', password='site')
-
-    project = Project.objects.get(id=project_id)
-    project.visibility.sites.set([])
-
-    url = reverse('project_update_visibility', args=[project_id])
-    data = {}
-    response = client.post(url, data)
-
-    assert response.status_code == 302
-
-    project = Project.objects.get(id=project_id)
-
-    assert project.visibility
-    assert [site.id for site in project.visibility.sites.all()] == [1]
-    assert not project.visibility.groups.exists()
-
-
-def test_project_update_visibility_site_post_add_double(db, client, settings):
-    settings.MULTISITE = True
-
-    client.login(username='site', password='site')
-
-    project = Project.objects.get(id=project_id)
-    project.visibility.sites.set([1])
-
-    url = reverse('project_update_visibility', args=[project_id])
-    data = {}
-    response = client.post(url, data)
-
-    assert response.status_code == 302
-
-    project = Project.objects.get(id=project_id)
-
-    assert project.visibility
-    assert [site.id for site in project.visibility.sites.all()] == [1]
-    assert not project.visibility.groups.exists()
-
-
-def test_project_update_visibility_site_post_add_additional(db, client, settings):
-    settings.MULTISITE = True
-
-    client.login(username='site', password='site')
-
-    project = Project.objects.get(id=project_id)
-    project.visibility.sites.set([2])
-
-    url = reverse('project_update_visibility', args=[project_id])
-    data = {}
-    response = client.post(url, data)
-
-    assert response.status_code == 302
-
-    project = Project.objects.get(id=project_id)
-
-    assert project.visibility
-    assert [site.id for site in project.visibility.sites.all()] == [1, 2]
-    assert not project.visibility.groups.exists()
-
-
-def test_project_update_visibility_site_post_remove(db, client, settings):
-    settings.MULTISITE = True
-
-    client.login(username='site', password='site')
-
-    project = Project.objects.get(id=project_id)
-    project.visibility.sites.set([1, 2, 3])
-
-    url = reverse('project_update_visibility', args=[project_id])
-    data = {
-        'delete': 'true'
-    }
-    response = client.post(url, data)
-
-    assert response.status_code == 302
-
-    project = Project.objects.get(id=project_id)
-
-    assert project.visibility
-    assert {site.id for site in project.visibility.sites.all()} == {2, 3}
-    assert not project.visibility.groups.exists()
-
-
-def test_project_update_visibility_site_post_remove_last(db, client, settings):
-    settings.MULTISITE = True
-
-    client.login(username='site', password='site')
-
-    project = Project.objects.get(id=project_id)
-    project.visibility.sites.set([1])
-
-    url = reverse('project_update_visibility', args=[project_id])
-    data = {
-        'delete': 'true'
-    }
-    response = client.post(url, data)
-
-    assert response.status_code == 302
-
-    project = Project.objects.get(id=project_id)
-
-    with pytest.raises(Visibility.DoesNotExist):
-        project.visibility  # noqa: B018
-
-
-def test_project_update_visibility_site_post_remove_empty(db, client, settings):
-    settings.MULTISITE = True
-
-    client.login(username='site', password='site')
-
-    project = Project.objects.get(id=project_id)
-    project.visibility.sites.set([])
-
-    url = reverse('project_update_visibility', args=[project_id])
-    data = {
-        'delete': 'true'
-    }
-    response = client.post(url, data)
-
-    assert response.status_code == 302
-
-    project = Project.objects.get(id=project_id)
-
-    assert project.visibility
-    assert {site.id for site in project.visibility.sites.all()} == {2, 3}
-    assert not project.visibility.groups.exists()
-
-
-def test_project_update_visibility_site_post_error(db, client, settings):
-    settings.MULTISITE = True
-
-    client.login(username='site', password='site')
-
-    url = reverse('project_update_visibility', args=[project_id])
-    data = {
-        'sites': [2]
-    }
-    response = client.post(url, data)
-
-    assert response.status_code == 302
-
-    project = Project.objects.get(id=project_id)
-
-    assert project.visibility
-    assert [site.id for site in project.visibility.sites.all()] == [1]  # nothing changed
-    assert not project.visibility.groups.exists()
-
-
-def test_project_update_visibility_site_post_api(db, client, settings):
-    settings.MULTISITE = True
-
-    client.login(username='api', password='api')
-
-    url = reverse('project_update_visibility', args=[project_id])
-    data = {
-        'sites': [2]
-    }
-    response = client.post(url, data)
-
-    assert response.status_code == 302
-
-    project = Project.objects.get(id=project_id)
-
-    assert project.visibility
-    assert [site.id for site in project.visibility.sites.all()] == [2]
-    assert not project.visibility.groups.exists()
-
-
-def test_project_update_visibility_group_post(db, client, settings):
-    settings.GROUPS = True
-
-    client.login(username='site', password='site')
-
-    url = reverse('project_update_visibility', args=[project_id])
-    data = {
-        'groups': [2]
-    }
-    response = client.post(url, data)
-
-    assert response.status_code == 302
-
-    project = Project.objects.get(id=project_id)
-
-    assert project.visibility
-    assert [site.id for site in project.visibility.sites.all()] == [1]  # this site is in the fixture
-    assert [group.id for group in project.visibility.groups.all()] == [2]
-
-
-def test_project_update_visibility_site_group_post_api(db, client, settings):
-    settings.MULTISITE = True
-    settings.GROUPS = True
-
-    client.login(username='api', password='api')
-
-    url = reverse('project_update_visibility', args=[project_id])
-    data = {
-        'sites': [2],
-        'groups': [2]
-    }
-    response = client.post(url, data)
-
-    assert response.status_code == 302
-
-    project = Project.objects.get(id=project_id)
-
-    assert project.visibility
-    assert [site.id for site in project.visibility.sites.all()] == [2]
-    assert [group.id for group in project.visibility.groups.all()] == [2]
-
-
-@pytest.mark.parametrize('username,password', users)
-def test_project_delete_visibility_post(db, client, username, password):
-    client.login(username=username, password=password)
-
-    url = reverse('project_update_visibility', args=[project_id])
-    data = {
-        'delete': 'some value'
-    }
-    response = client.post(url, data)
-
-    if username in ['admin', 'site', 'api']:
-        assert response.status_code == 302
-        with pytest.raises(Visibility.DoesNotExist):
-            assert Project.objects.get(pk=project_id).visibility
-    else:
-        if password:
-            assert response.status_code == 403
-        else:
-            assert response.status_code == 302
-
-        assert Project.objects.get(pk=project_id).visibility
diff --git a/rdmo/projects/tests/test_view_project_visibility.py b/rdmo/projects/tests/test_view_project_visibility.py
deleted file mode 100644
index 04b8c2a8c5..0000000000
--- a/rdmo/projects/tests/test_view_project_visibility.py
+++ /dev/null
@@ -1,147 +0,0 @@
-from django.contrib.auth.models import Group, User
-from django.contrib.sites.models import Site
-from django.urls import reverse
-
-from ..models import Project
-
-user_username = 'user'
-project_id = 12
-
-
-def test_detail_cleared(db, client):
-    client.login(username='user', password='user')
-
-    project = Project.objects.get(id=project_id)
-    project.visibility.sites.clear()
-    project.visibility.groups.clear()
-
-    url = reverse('project', args=[project_id])
-    response = client.get(url)
-    assert response.status_code == 200
-
-
-def test_detail_deleted(db, client):
-    client.login(username='user', password='user')
-
-    project = Project.objects.get(id=project_id)
-    project.visibility.delete()
-
-    url = reverse('project', args=[project_id])
-    response = client.get(url)
-    assert response.status_code == 403
-
-
-def test_detail_site(db, client):
-    client.login(username='user', password='user')
-
-    project = Project.objects.get(id=project_id)
-    project.visibility.sites.set(Site.objects.filter(id=1))
-    project.visibility.groups.clear()
-
-    url = reverse('project', args=[project_id])
-    response = client.get(url)
-    assert response.status_code == 200
-
-
-def test_detail_multiple_sites(db, client):
-    client.login(username='user', password='user')
-
-    project = Project.objects.get(id=project_id)
-    project.visibility.sites.set(Site.objects.filter(id__in=[1, 2]))
-    project.visibility.groups.clear()
-
-    url = reverse('project', args=[project_id])
-    response = client.get(url)
-    assert response.status_code == 200
-
-
-def test_detail_site_forbidden(db, client):
-    client.login(username='user', password='user')
-
-    project = Project.objects.get(id=project_id)
-    project.visibility.sites.set(Site.objects.filter(id=2))
-    project.visibility.groups.clear()
-
-    url = reverse('project', args=[project_id])
-    response = client.get(url)
-    assert response.status_code == 403
-
-
-def test_detail_group(db, client):
-    client.login(username='user', password='user')
-
-    group = Group.objects.create(name='test')
-    user = User.objects.get(username='user')
-    user.groups.add(group)
-
-    project = Project.objects.get(id=project_id)
-    project.visibility.sites.clear()
-    project.visibility.groups.add(group)
-
-    url = reverse('project', args=[project_id])
-    response = client.get(url)
-    assert response.status_code == 200
-
-
-def test_detail_multiple_groups(db, client):
-    client.login(username='user', password='user')
-
-    group = Group.objects.create(name='test')
-    user = User.objects.get(username='user')
-    user.groups.add(group)
-
-    project = Project.objects.get(id=project_id)
-    project.visibility.sites.clear()
-    project.visibility.groups.set([
-        group, Group.objects.create(name='test2')
-    ])
-
-    url = reverse('project', args=[project_id])
-    response = client.get(url)
-    assert response.status_code == 200
-
-
-def test_detail_group_forbidden(db, client):
-    client.login(username='user', password='user')
-
-    group = Group.objects.create(name='test')
-
-    project = Project.objects.get(id=project_id)
-    project.visibility.sites.clear()
-    project.visibility.groups.set([group])
-
-    url = reverse('project', args=[project_id])
-    response = client.get(url)
-    assert response.status_code == 403
-
-
-def test_detail_site_group(db, client):
-    client.login(username='user', password='user')
-
-    group = Group.objects.create(name='test')
-    user = User.objects.get(username='user')
-    user.groups.add(group)
-
-    project = Project.objects.get(id=project_id)
-    project.visibility.sites.set(Site.objects.filter(id=1))
-    project.visibility.groups.set([group])
-
-    url = reverse('project', args=[project_id])
-    response = client.get(url)
-    assert response.status_code == 200
-
-
-def test_detail_site_group_forbidden(db, client):
-    client.login(username='user', password='user')
-
-    group = Group.objects.create(name='test')
-    user = User.objects.get(username='user')
-    user.groups.add(group)
-
-    project = Project.objects.get(id=project_id)
-    project.visibility.sites.set(Site.objects.filter(id=2))
-    project.visibility.groups.set([group])
-
-    url = reverse('project', args=[project_id])
-    response = client.get(url)
-    assert response.status_code == 403
diff --git a/rdmo/projects/tests/test_view_snapshot.py b/rdmo/projects/tests/test_view_snapshot.py
deleted file mode 100644
index 8a6aa980eb..0000000000
--- a/rdmo/projects/tests/test_view_snapshot.py
+++ /dev/null
@@ -1,229 +0,0 @@
-# from pathlib import Path
-
-# import pytest
-
-# from django.conf import settings
-# from django.urls import reverse
-
-# from rdmo.core.constants import VALUE_TYPE_FILE
-
-# from ..models import Project, Snapshot, Value
-
-# users = (
-#     ('owner', 'owner'),
-#     ('manager', 'manager'),
-#     ('author', 'author'),
-#     ('guest', 'guest'),
-#     ('api', 'api'),
-#     ('site', 'site'),
-#     ('anonymous', None),
-# )
-
-# add_snapshot_permission_map = change_snapshot_permission_map = rollback_snapshot_permission_map = {
-#     'owner': [1, 2, 3, 4, 5, 12],
-#     'manager': [1, 3, 5],
-#     'api': [1, 2, 3, 4, 5, 12],
-#     'site': [1, 2, 3, 4, 5, 12]
-# }
-
-# export_snapshot_permission_map = {
-#     'owner': [1, 2, 3, 4, 5, 12],
-#     'manager': [1, 3, 5, 12],
-#     'api': [1, 2, 3, 4, 5, 12],
-#     'site': [1, 2, 3, 4, 5, 12]
-# }
-
-# projects = [1, 2, 3, 4, 5, 12]
-# snapshots = [1, 3, 7, 4, 5, 6]
-
-# snapshots_project = 1
-
-
-# @pytest.mark.parametrize('username,password', users)
-# @pytest.mark.parametrize('project_id', projects)
-# def test_snapshot_create_get(db, client, username, password, project_id):
-#     client.login(username=username, password=password)
-
-#     url = reverse('snapshot_create', args=[project_id])
-#     response = client.get(url)
-
-#     if project_id in add_snapshot_permission_map.get(username, []):
-#         assert response.status_code == 200
-#     elif password:
-#         assert response.status_code == 403
-#     else:
-#         assert response.status_code == 302
-
-
-# @pytest.mark.parametrize('username,password', users)
-# @pytest.mark.parametrize('project_id', projects)
-# def test_snapshot_create_post(db, client, files, username, password, project_id):
-#     client.login(username=username, password=password)
-#     project = Project.objects.get(pk=project_id)
-
-#     snapshot_count = project.snapshots.count()
-#     values_count = project.values.count()
-#     current_values_count = project.values.filter(snapshot=None).count()
-
-#     url = reverse('snapshot_create', args=[project.id])
-#     data = {
-#         'title': 'A new snapshot',
-#         'description': 'Some description'
-#     }
-#     response = client.post(url, data)
-
-#     # check if all the files are where are supposed to be
-#     for file_value in Value.objects.filter(value_type=VALUE_TYPE_FILE):
-#         assert Path(settings.MEDIA_ROOT).joinpath(file_value.file.name).exists()
-
-#     if project.id in add_snapshot_permission_map.get(username, []):
-#         assert response.status_code == 302
-#         assert project.snapshots.count() == snapshot_count + 1
-#         assert project.values.count() == values_count + current_values_count
-#         for file_value in project.values.filter(value_type=VALUE_TYPE_FILE):
-#             assert Path(settings.MEDIA_ROOT).joinpath(file_value.file.name).exists()
-#     else:
-#         if password:
-#             assert response.status_code == 403
-#         else:
-#             assert response.status_code == 302
-
-#         assert project.snapshots.count() == snapshot_count
-#         assert project.values.count() == values_count
-
-
-# @pytest.mark.parametrize('username,password', users)
-# @pytest.mark.parametrize('project_id', projects)
-# @pytest.mark.parametrize('snapshot_id', snapshots)
-# def test_snapshot_update_get(db, client, files, username, password, project_id, snapshot_id):
-#     client.login(username=username, password=password)
-#     project = Project.objects.get(pk=project_id)
-
-#     url = reverse('snapshot_update', args=[project_id, snapshot_id])
-#     response = client.get(url)
-
-#     # check if all the files are where are supposed to be
-#     for file_value in Value.objects.filter(value_type=VALUE_TYPE_FILE):
-#         assert Path(settings.MEDIA_ROOT).joinpath(file_value.file.name).exists()
-
-#     if snapshot_id in project.snapshots.values_list('id', flat=True):
-#         if project_id in change_snapshot_permission_map.get(username, []):
-#             assert response.status_code == 200
-#         elif password:
-#             assert response.status_code == 403
-#         else:
-#             assert response.status_code == 302
-#     else:
-#         assert response.status_code == 404
-
-
-# @pytest.mark.parametrize('username,password', users)
-# @pytest.mark.parametrize('project_id', projects)
-# @pytest.mark.parametrize('snapshot_id', snapshots)
-# def test_snapshot_update_post(db, client, files, username, password, project_id, snapshot_id):
-#     client.login(username=username, password=password)
-#     project = Project.objects.get(pk=project_id)
-#     snapshot = Snapshot.objects.get(pk=snapshot_id)
-
-#     snapshot_count = project.snapshots.count()
-#     values_count = project.values.count()
-#     values_files = [value.file.name for value in project.values.filter(value_type=VALUE_TYPE_FILE)]
-
-#     url = reverse('snapshot_update', args=[project_id, snapshot_id])
-#     data = {
-#         'title': snapshot.title,
-#         'description': snapshot.description
-#     }
-#     response = client.post(url, data)
-
-#     # check if all the files are where are supposed to be
-#     for file_value in Value.objects.filter(value_type=VALUE_TYPE_FILE):
-#         assert Path(settings.MEDIA_ROOT).joinpath(file_value.file.name).exists()
-
-#     if snapshot_id in Project.objects.get(pk=project_id).snapshots.values_list('id', flat=True):
-#         if project_id in change_snapshot_permission_map.get(username, []):
-#             assert response.status_code == 302
-#             for file_value in project.values.filter(value_type=VALUE_TYPE_FILE):
-#                 assert Path(settings.MEDIA_ROOT).joinpath(file_value.file.name).exists()
-#         elif password:
-#             assert response.status_code == 403
-#         else:
-#             assert response.status_code == 302
-#     else:
-#         assert response.status_code == 404
-
-#     assert Project.objects.get(pk=project_id).snapshots.count() == snapshot_count
-#     assert Project.objects.get(pk=project_id).values.count() == values_count
-#     for file_value in values_files:
-#         assert Path(settings.MEDIA_ROOT).joinpath(file_value).exists()
-
-
-# @pytest.mark.parametrize('username,password', users)
-# @pytest.mark.parametrize('project_id', projects)
-# @pytest.mark.parametrize('snapshot_id', snapshots)
-# def test_snapshot_rollback_get(db, client, username, password, project_id, snapshot_id):
-#     client.login(username=username, password=password)
-#     project = Project.objects.get(pk=project_id)
-#     project_snapshots = list(project.snapshots.values_list('id', flat=True))
-
-#     url = reverse('snapshot_rollback', args=[project_id, snapshot_id])
-#     response = client.get(url)
-
-#     if snapshot_id in project_snapshots:
-#         if project_id in rollback_snapshot_permission_map.get(username, []):
-#             assert response.status_code == 200
-#         elif password:
-#             assert response.status_code == 403
-#         else:
-#             assert response.status_code == 302
-#     else:
-#         assert response.status_code == 404
-
-
-# @pytest.mark.parametrize('username,password', users)
-# @pytest.mark.parametrize('project_id', projects)
-# @pytest.mark.parametrize('snapshot_id', snapshots)
-# def test_snapshot_rollback_post(db, client, files, username, password, project_id, snapshot_id):
-#     client.login(username=username, password=password)
-#     project = Project.objects.get(pk=project_id)
-#     project_snapshots = list(project.snapshots.values_list('id', flat=True))
-
-#     url = reverse('snapshot_rollback', args=[project_id, snapshot_id])
-#     response = client.post(url)
-
-#     # check if all the files are where are supposed to be
-#     for file_value in Value.objects.filter(value_type=VALUE_TYPE_FILE):
-#         assert Path(settings.MEDIA_ROOT).joinpath(file_value.file.name).exists()
-
-#     if snapshot_id in project_snapshots:
-#         if project_id in rollback_snapshot_permission_map.get(username, []):
-#             assert response.status_code == 302
-#         elif password:
-#             assert response.status_code == 403
-#         else:
-#             assert response.status_code == 302
-#     else:
-#         assert response.status_code == 404
-
-
-# @pytest.mark.parametrize('username,password', users)
-# @pytest.mark.parametrize('project_id', projects)
-# @pytest.mark.parametrize('snapshot_id', snapshots)
-# def test_snapshot_export_xml(db, client, files, username, password, project_id, snapshot_id):
-#     client.login(username=username, password=password)
-#     project = Project.objects.get(pk=project_id)
-#     project_snapshots = list(project.snapshots.values_list('id', flat=True))
-
-#     url = reverse('snapshot_export', args=[project_id, snapshot_id, 'xml'])
-#     response = client.get(url)
-
-#     if snapshot_id in project_snapshots:
-#         if project_id in export_snapshot_permission_map.get(username, []):
-#             assert response.status_code == 200
-#         else:
-#             if password:
-#                 assert response.status_code == 403
-#             else:
-#                 assert response.status_code == 302
-#     else:
-#         assert response.status_code == 404
diff --git a/rdmo/projects/tests/test_views.py b/rdmo/projects/tests/test_views.py
new file mode 100644
index 0000000000..ebe523cc8c
--- /dev/null
+++ b/rdmo/projects/tests/test_views.py
@@ -0,0 +1,76 @@
+import pytest
+
+from django.urls import reverse
+
+users = (
+    ('owner', 'owner'),
+    ('manager', 'manager'),
+    ('author', 'author'),
+    ('guest', 'guest'),
+    ('user', 'user'),
+    ('editor', 'editor'),
+    ('reviewer', 'reviewer'),
+    ('api', 'api'),
+    ('site', 'site'),
+    ('anonymous', None)
+)
+
+view_project_permission_map = {
+    'owner': [1, 2, 3, 4, 5, 10, 12],
+    'manager': [1, 3, 5, 7, 12],
+    'author': [1, 3, 5, 8, 12],
+    'guest': [1, 3, 5, 9, 12],
+    'user': [12],
+    'editor': [12],
+    'reviewer': [12],
+    'api': [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12],
+    'site': [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12]
+}
+
+projects = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12]
+
+
+@pytest.mark.parametrize('username,password', users)
+def test_list(db, client, username, password):
+    client.login(username=username, password=password)
+
+    url = reverse('projects')
+    response = client.get(url)
+
+    if password:
+        assert response.status_code == 200
+    else:
+        assert response.status_code == 302
+
+
+@pytest.mark.parametrize('username,password', users)
+@pytest.mark.parametrize('project_id', projects)
+def test_detail(db, client, username, password, project_id):
+    client.login(username=username, password=password)
+
+    url = reverse('project', args=[project_id])
+    response = client.get(url)
+
+    if project_id in view_project_permission_map.get(username, []):
+        assert response.status_code == 200
+    else:
+        if password:
+            assert response.status_code == 403
+        else:
+            assert response.status_code == 302
+
+
+@pytest.mark.parametrize('username,password', users)
+@pytest.mark.parametrize('project_id', projects)
+def test_project_error(db, client, username, password, project_id):
+    client.login(username=username, password=password)
+
+    url = reverse('project_error', args=[project_id])
+    response = client.get(url)
+
+    if project_id in view_project_permission_map.get(username, []):
+        assert response.status_code == 200
+    elif password:
+        assert response.status_code == 403
+    else:
+        assert response.status_code == 302
diff --git a/rdmo/projects/tests/test_viewset_project.py b/rdmo/projects/tests/test_viewset_project.py
index 2aac8d2c6c..69333f30c8 100644
--- a/rdmo/projects/tests/test_viewset_project.py
+++ b/rdmo/projects/tests/test_viewset_project.py
@@ -829,16 +829,17 @@ def test_upload_accept(db, client, username, password):
         assert response.status_code == 401
 
 
-@pytest.mark.parametrize('username,password', users)
-def test_imports(db, client, username, password):
-    client.login(username=username, password=password)
-
-    url = reverse(urlnames['imports'])
-    response = client.get(url)
-
-    if password:
-        assert response.status_code == 200
-        assert len(response.json()) == 1
-        assert response.json()[0]['key'] == 'url'
-    else:
-        assert response.status_code == 401
+# TODO: enable again once imports are reimplemented
+# @pytest.mark.parametrize('username,password', users)
+# def test_imports(db, client, username, password):
+#     client.login(username=username, password=password)
+
+#     url = reverse(urlnames['imports'])
+#     response = client.get(url)
+
+#     if password:
+#         assert response.status_code == 200
+#         assert len(response.json()) == 1
+#         assert response.json()[0]['key'] == 'url'
+#     else:
+#         assert response.status_code == 401
diff --git a/rdmo/projects/urls/__init__.py b/rdmo/projects/urls/__init__.py
index 4466a97c5c..50abf3fc57 100644
--- a/rdmo/projects/urls/__init__.py
+++ b/rdmo/projects/urls/__init__.py
@@ -1,151 +1,16 @@
 from django.urls import re_path
 
-from ..views import (
-    IntegrationCreateView,
-    IntegrationDeleteView,
-    IntegrationUpdateView,
-    IntegrationWebhookView,
-    InviteDeleteView,
-    IssueDetailView,
-    IssueSendView,
-    IssueUpdateView,
-    MembershipCreateView,
-    MembershipDeleteView,
-    MembershipUpdateView,
-    OldProjectDetailView,
-    # ProjectAnswersExportView,
-    # ProjectAnswersView,
-    ProjectCancelView,
-    # ProjectCopyView,
-    ProjectCreateImportView,
-    # ProjectCreateView,
-    # ProjectDeleteView,
-    ProjectDetailView,
-    ProjectErrorView,
-    ProjectExportView,
-    ProjectInterviewView,
-    ProjectJoinView,
-    ProjectLeaveView,
-    ProjectsView,
-    ProjectUpdateCatalogView,
-    ProjectUpdateImportView,
-    ProjectUpdateInformationView,
-    ProjectUpdateParentView,
-    ProjectUpdateTasksView,
-    # ProjectUpdateView,
-    ProjectUpdateViewsView,
-    ProjectUpdateVisibilityView,
-    # ProjectViewExportView,
-    # ProjectViewView,
-    # SnapshotCreateView,
-    # SnapshotExportView,
-    # SnapshotRollbackView,
-    # SnapshotUpdateView,
-)
+from ..views import ProjectDetailView, ProjectErrorView, ProjectInterviewView, ProjectJoinView, ProjectsView
 
 urlpatterns = [
     re_path(r'^$',
             ProjectsView.as_view(), name='projects'),
-    # re_path(r'^create/$',
-    #         ProjectCreateView.as_view(), name='project_create'),
+    re_path(r'^(?P<pk>[0-9]+)/',
+            ProjectDetailView.as_view(), name='project'),
     re_path(r'^join/(?P<token>.+)/$',
             ProjectJoinView.as_view(), name='project_join'),
-    re_path(r'^cancel/(?P<token>.+)/$',
-            ProjectCancelView.as_view(), name='project_cancel'),
-    re_path(r'^import/$',
-            ProjectCreateImportView.as_view(), name='project_create_import'),
-    re_path(r'^import/(?P<format>[a-z-]+)/$',
-            ProjectCreateImportView.as_view(), name='project_create_import'),
-
-    re_path(r'^(?P<pk>[0-9]+)/old/$',
-            OldProjectDetailView.as_view(), name='project_old'),
-    # re_path(r'^(?P<pk>[0-9]+)/copy/$',
-    #         ProjectCopyView.as_view(), name='project_copy'),
-    # re_path(r'^(?P<pk>[0-9]+)/update/$',
-    #         ProjectUpdateView.as_view(), name='project_update'),
-    re_path(r'^(?P<pk>[0-9]+)/update/information/$',
-            ProjectUpdateInformationView.as_view(), name='project_update_information'),
-    re_path(r'^(?P<pk>[0-9]+)/update/visibility/$',
-            ProjectUpdateVisibilityView.as_view(), name='project_update_visibility'),
-    re_path(r'^(?P<pk>[0-9]+)/update/catalog/$',
-            ProjectUpdateCatalogView.as_view(), name='project_update_catalog'),
-    re_path(r'^(?P<pk>[0-9]+)/update/parent/$',
-            ProjectUpdateParentView.as_view(), name='project_update_parent'),
-    re_path(r'^(?P<pk>[0-9]+)/update/tasks/$',
-            ProjectUpdateTasksView.as_view(), name='project_update_tasks'),
-    re_path(r'^(?P<pk>[0-9]+)/update/views/$',
-            ProjectUpdateViewsView.as_view(), name='project_update_views'),
-    # re_path(r'^(?P<pk>[0-9]+)/delete/$',
-    #         ProjectDeleteView.as_view(), name='project_delete'),
-    re_path(r'^(?P<pk>[0-9]+)/leave/$',
-            ProjectLeaveView.as_view(), name='project_leave'),
-    re_path(r'^(?P<pk>[0-9]+)/export/(?P<format>[a-z-]+)/$',
-            ProjectExportView.as_view(), name='project_export'),
-    re_path(r'^(?P<pk>[0-9]+)/import/$',
-            ProjectUpdateImportView.as_view(), name='project_update_import'),
-    re_path(r'^(?P<pk>[0-9]+)/import/(?P<format>[a-z-]+)/$',
-            ProjectUpdateImportView.as_view(), name='project_update_import'),
-
-    re_path(r'^(?P<project_id>[0-9]+)/memberships/create/$',
-            MembershipCreateView.as_view(), name='membership_create'),
-    re_path(r'^(?P<project_id>[0-9]+)/memberships/(?P<pk>[0-9]+)/update/$',
-            MembershipUpdateView.as_view(), name='membership_update'),
-    re_path(r'^(?P<project_id>[0-9]+)/memberships/(?P<pk>[0-9]+)/delete/$',
-            MembershipDeleteView.as_view(), name='membership_delete'),
-    re_path(r'^(?P<project_id>[0-9]+)/invite/(?P<pk>[0-9]+)/delete/$',
-            InviteDeleteView.as_view(), name='invite_delete'),
-
-    re_path(r'^(?P<project_id>[0-9]+)/integrations/create/(?P<provider_key>[a-z]+)/$',
-            IntegrationCreateView.as_view(), name='integration_create'),
-    re_path(r'^(?P<project_id>[0-9]+)/integrations/(?P<pk>[0-9]+)/update/$',
-            IntegrationUpdateView.as_view(), name='integration_update'),
-    re_path(r'^(?P<project_id>[0-9]+)/integrations/(?P<pk>[0-9]+)/delete/$',
-            IntegrationDeleteView.as_view(), name='integration_delete'),
-    re_path(r'^(?P<project_id>[0-9]+)/integrations/(?P<pk>[0-9]+)/webhook/$',
-            IntegrationWebhookView.as_view(), name='integration_webhook'),
-
-    re_path(r'^(?P<project_id>[0-9]+)/issues/(?P<pk>[0-9]+)/$',
-            IssueDetailView.as_view(), name='issue'),
-    re_path(r'^(?P<project_id>[0-9]+)/issues/(?P<pk>[0-9]+)/update/$',
-            IssueUpdateView.as_view(), name='issue_update'),
-    re_path(r'^(?P<project_id>[0-9]+)/issues/(?P<pk>[0-9]+)/send/$',
-            IssueSendView.as_view(), name='issue_send'),
-
-    # re_path(r'^(?P<project_id>[0-9]+)/snapshots/create/$',
-    #         SnapshotCreateView.as_view(), name='snapshot_create'),
-    # re_path(r'^(?P<project_id>[0-9]+)/snapshots/(?P<pk>[0-9]+)/update/$',
-    #         SnapshotUpdateView.as_view(), name='snapshot_update'),
-    # re_path(r'^(?P<project_id>[0-9]+)/snapshots/(?P<pk>[0-9]+)/rollback/$',
-    #         SnapshotRollbackView.as_view(), name='snapshot_rollback'),
-    # re_path(r'^(?P<project_id>[0-9]+)/snapshots/(?P<pk>[0-9]+)/export/(?P<format>[a-z-]+)/$',
-    #         SnapshotExportView.as_view(), name='snapshot_export'),
-
-    # re_path(r'^(?P<pk>[0-9]+)/answers/$',
-    #         ProjectAnswersView.as_view(), name='project_answers'),
-    # re_path(r'^(?P<pk>[0-9]+)/answers/export/(?P<format>[a-z]+)/$',
-    #         ProjectAnswersExportView.as_view(), name='project_answers_export'),
-
-    # re_path(r'^(?P<pk>[0-9]+)/snapshots/(?P<snapshot_id>[0-9]+)/answers/$',
-    #         ProjectAnswersView.as_view(), name='project_answers'),
-    # re_path(r'^(?P<pk>[0-9]+)/snapshots/(?P<snapshot_id>[0-9]+)/answers/export/(?P<format>[a-z]+)/$',
-    #         ProjectAnswersExportView.as_view(), name='project_answers_export'),
-
-    # re_path(r'^(?P<pk>[0-9]+)/views/(?P<view_id>[0-9]+)/$',
-    #         ProjectViewView.as_view(), name='project_view'),
-    # re_path(r'^(?P<pk>[0-9]+)/views/(?P<view_id>[0-9]+)/export/(?P<format>[a-z]+)/$',
-    #         ProjectViewExportView.as_view(), name='project_view_export'),
-
-    # re_path(r'^(?P<pk>[0-9]+)/snapshots/(?P<snapshot_id>[0-9]+)/views/(?P<view_id>[0-9]+)/$',
-    #         ProjectViewView.as_view(), name='project_view'),
-    # re_path(r'^(?P<pk>[0-9]+)/snapshots/(?P<snapshot_id>[0-9]+)/views/(?P<view_id>[0-9]+)/export/(?P<format>[a-z]+)
-    #$',
-    #         ProjectViewExportView.as_view(), name='project_view_export'),
-
     re_path(r'^(?P<pk>[0-9]+)/interview/',
             ProjectInterviewView.as_view(), name='project_interview'),
     re_path(r'^(?P<pk>[0-9]+)/error/',
             ProjectErrorView.as_view(), name='project_error'),
-
-    re_path(r'^(?P<pk>[0-9]+)/',
-            ProjectDetailView.as_view(), name='project'),
 ]
diff --git a/rdmo/projects/views.py b/rdmo/projects/views.py
new file mode 100644
index 0000000000..c7b6e43d90
--- /dev/null
+++ b/rdmo/projects/views.py
@@ -0,0 +1,79 @@
+import logging
+
+from django.contrib.auth.mixins import LoginRequiredMixin
+from django.shortcuts import redirect
+from django.utils.decorators import method_decorator
+from django.utils.translation import gettext_lazy as _
+from django.views.decorators.csrf import ensure_csrf_cookie
+from django.views.generic import DetailView, TemplateView
+
+from rdmo.core.views import CSRFViewMixin, ObjectPermissionMixin, RedirectViewMixin, StoreIdViewMixin
+
+from .models import Invite, Membership, Project
+
+logger = logging.getLogger(__name__)
+
+
+class ProjectsView(LoginRequiredMixin, CSRFViewMixin, StoreIdViewMixin, TemplateView):
+    template_name = 'projects/projects.html'
+
+
+class ProjectDetailView(ObjectPermissionMixin, CSRFViewMixin, StoreIdViewMixin, DetailView):
+    model = Project
+    permission_required = 'projects.view_project_object'
+
+
+class ProjectJoinView(LoginRequiredMixin, RedirectViewMixin, TemplateView):
+    template_name = 'core/error.html'
+
+    def get(self, request, token):
+        try:
+            invite = Invite.objects.get(token=token)
+
+            if invite.is_expired:
+                error = _('Sorry, your invitation has been expired.')
+                invite.delete()
+            elif invite.user and invite.user != request.user:
+                error = _('Sorry, but this invitation is for the user "%s".') % invite.user
+            elif Membership.objects.filter(project=invite.project, user=request.user).exists():
+                invite.delete()
+                return redirect(invite.project.get_absolute_url())
+            else:
+                Membership.objects.create(
+                    project=invite.project,
+                    user=request.user,
+                    role=invite.role
+                )
+                invite.delete()
+                return redirect(invite.project.get_absolute_url())
+
+        except Invite.DoesNotExist:
+            error = _('Sorry, the invitation link is not valid.')
+
+        return self.render_to_response({
+            'title': _('Error'),
+            'errors': [error]
+        })
+
+
+class ProjectInterviewView(ObjectPermissionMixin, CSRFViewMixin, StoreIdViewMixin, DetailView):
+    model = Project
+    queryset = Project.objects.all()
+    permission_required = 'projects.view_project_object'
+    template_name = 'projects/project_interview.html'
+
+    @method_decorator(ensure_csrf_cookie)
+    def get(self, request, *args, **kwargs):
+        self.object = self.get_object()
+
+        if self.object.catalog is None:
+            return redirect('project_error', pk=self.object.pk)
+        else:
+            return super().get(request, *args, **kwargs)
+
+
+class ProjectErrorView(ObjectPermissionMixin, DetailView):
+    model = Project
+    queryset = Project.objects.all()
+    permission_required = 'projects.view_project_object'
+    template_name = 'projects/project_error.html'
diff --git a/rdmo/projects/views/__init__.py b/rdmo/projects/views/__init__.py
deleted file mode 100644
index 28eb4fc93f..0000000000
--- a/rdmo/projects/views/__init__.py
+++ /dev/null
@@ -1,31 +0,0 @@
-from .integration import IntegrationCreateView, IntegrationDeleteView, IntegrationUpdateView, IntegrationWebhookView
-from .invite import InviteDeleteView
-from .issue import IssueDetailView, IssueSendView, IssueUpdateView
-from .membership import MembershipCreateView, MembershipDeleteView, MembershipUpdateView
-from .project import (
-    OldProjectDetailView,
-    ProjectCancelView,
-    ProjectDeleteView,
-    ProjectDetailView,
-    ProjectErrorView,
-    ProjectExportView,
-    ProjectInterviewView,
-    ProjectJoinView,
-    ProjectLeaveView,
-    ProjectsView,
-)
-from .project_answers import ProjectAnswersExportView, ProjectAnswersView
-from .project_copy import ProjectCopyView
-from .project_create import ProjectCreateImportView, ProjectCreateView
-from .project_update import (
-    ProjectUpdateCatalogView,
-    ProjectUpdateImportView,
-    ProjectUpdateInformationView,
-    ProjectUpdateParentView,
-    ProjectUpdateTasksView,
-    ProjectUpdateView,
-    ProjectUpdateViewsView,
-    ProjectUpdateVisibilityView,
-)
-from .project_view import ProjectViewExportView, ProjectViewView
-from .snapshot import SnapshotCreateView, SnapshotExportView, SnapshotRollbackView, SnapshotUpdateView
diff --git a/rdmo/projects/views/integration.py b/rdmo/projects/views/integration.py
deleted file mode 100644
index a0191c0b85..0000000000
--- a/rdmo/projects/views/integration.py
+++ /dev/null
@@ -1,92 +0,0 @@
-import logging
-
-from django.http import Http404
-from django.shortcuts import get_object_or_404
-from django.utils.decorators import method_decorator
-from django.views.decorators.csrf import csrf_exempt
-from django.views.generic import CreateView, DeleteView, UpdateView, View
-
-from rdmo.core.plugins import get_plugin
-from rdmo.core.views import ObjectPermissionMixin, RedirectViewMixin
-
-from ..forms import IntegrationForm
-from ..models import Integration, Project
-
-logger = logging.getLogger(__name__)
-
-
-class IntegrationCreateView(ObjectPermissionMixin, RedirectViewMixin, CreateView):
-    model = Integration
-    form_class = IntegrationForm
-    permission_required = 'projects.add_integration_object'
-
-    def dispatch(self, *args, **kwargs):
-        self.project = get_object_or_404(Project.objects.all(), pk=self.kwargs['project_id'])
-        self.provider_key = self.kwargs['provider_key']
-        return super().dispatch(*args, **kwargs)
-
-    def get_permission_object(self):
-        return self.project
-
-    def get_form_kwargs(self):
-        kwargs = super().get_form_kwargs()
-        kwargs['project'] = self.project
-        kwargs['provider_key'] = self.provider_key
-        return kwargs
-
-    def get_context_data(self, **kwargs):
-        kwargs['provider'] = get_plugin('PROJECT_ISSUE_PROVIDERS', self.provider_key)
-        return super().get_context_data(**kwargs)
-
-    def get_success_url(self):
-        return self.project.get_absolute_url()
-
-
-class IntegrationUpdateView(ObjectPermissionMixin, RedirectViewMixin, UpdateView):
-    form_class = IntegrationForm
-    permission_required = 'projects.change_integration_object'
-
-    def get_queryset(self):
-        return Integration.objects.filter(project_id=self.kwargs.get('project_id'))
-
-    def get_permission_object(self):
-        return self.get_object().project
-
-    def get_form_kwargs(self):
-        kwargs = super().get_form_kwargs()
-        kwargs['project'] = self.get_object().project
-        return kwargs
-
-    def get_context_data(self, **kwargs):
-        kwargs['provider'] = self.get_object().provider
-        return super().get_context_data(**kwargs)
-
-    def get_success_url(self):
-        return self.get_object().project.get_absolute_url()
-
-
-class IntegrationDeleteView(ObjectPermissionMixin, RedirectViewMixin, DeleteView):
-    permission_required = 'projects.delete_integration_object'
-
-    def get_queryset(self):
-        return Integration.objects.filter(project_id=self.kwargs.get('project_id'))
-
-    def get_permission_object(self):
-        return self.get_object().project
-
-    def get_success_url(self):
-        return self.get_object().project.get_absolute_url()
-
-
-@method_decorator(csrf_exempt, name='dispatch')
-class IntegrationWebhookView(View):
-
-    def post(self, request, *args, **kwargs):
-        pk = kwargs.get('pk')
-        project_id = kwargs.get('project_id')
-
-        try:
-            integration = Integration.objects.filter(project_id=project_id).get(pk=pk)
-            return integration.provider.webhook(request, integration)
-        except Integration.DoesNotExist as e:
-            raise Http404 from e
diff --git a/rdmo/projects/views/invite.py b/rdmo/projects/views/invite.py
deleted file mode 100644
index 87ede8b660..0000000000
--- a/rdmo/projects/views/invite.py
+++ /dev/null
@@ -1,22 +0,0 @@
-import logging
-
-from django.views.generic import DeleteView
-
-from rdmo.core.views import ObjectPermissionMixin, RedirectViewMixin
-
-from ..models import Invite
-
-logger = logging.getLogger(__name__)
-
-
-class InviteDeleteView(ObjectPermissionMixin, RedirectViewMixin, DeleteView):
-    permission_required = 'projects.delete_invite_object'
-
-    def get_queryset(self):
-        return Invite.objects.filter(project_id=self.kwargs.get('project_id'))
-
-    def get_permission_object(self):
-        return self.get_object().project
-
-    def get_success_url(self):
-        return self.get_object().project.get_absolute_url()
diff --git a/rdmo/projects/views/issue.py b/rdmo/projects/views/issue.py
deleted file mode 100644
index 9ec02de583..0000000000
--- a/rdmo/projects/views/issue.py
+++ /dev/null
@@ -1,197 +0,0 @@
-import logging
-
-from django.conf import settings
-from django.contrib.sites.models import Site
-from django.core.exceptions import ObjectDoesNotExist
-from django.http import Http404, HttpResponse, HttpResponseRedirect
-from django.template import TemplateSyntaxError
-from django.template.loader import render_to_string
-from django.views.generic import DetailView, UpdateView
-
-from rest_framework.reverse import reverse
-
-from rdmo.core.mail import send_mail
-from rdmo.core.utils import render_to_format
-from rdmo.core.views import ObjectPermissionMixin, RedirectViewMixin
-from rdmo.views.utils import ProjectWrapper
-
-from ..forms import IssueMailForm, IssueSendForm
-from ..models import Issue
-from ..utils import get_value_path
-
-logger = logging.getLogger(__name__)
-
-
-class IssueDetailView(ObjectPermissionMixin, DetailView):
-    permission_required = 'projects.view_issue_object'
-
-    def get_queryset(self):
-        return Issue.objects.filter(project_id=self.kwargs.get('project_id'))
-
-    def get_permission_object(self):
-        return self.get_object().project
-
-    def get_context_data(self, **kwargs):
-        project = self.get_object().project
-        project.catalog.prefetch_elements()
-        conditions = self.get_object().task.conditions.all()
-
-        sources = []
-        for condition in conditions:
-            sources.append({
-                'source': condition.source,
-                'questions': filter(lambda q: q.attribute == condition.source, project.catalog.questions),
-                'values': condition.source.values.filter(project=project, snapshot=None)
-            })
-
-        kwargs['project'] = project
-        kwargs['sources'] = sources
-        return super().get_context_data(**kwargs)
-
-
-class IssueUpdateView(ObjectPermissionMixin, RedirectViewMixin, UpdateView):
-    fields = ('status', )
-    permission_required = 'projects.change_issue_object'
-
-    def get_queryset(self):
-        return Issue.objects.filter(project_id=self.kwargs.get('project_id'))
-
-    def get_permission_object(self):
-        return self.get_object().project
-
-
-class IssueSendView(ObjectPermissionMixin, RedirectViewMixin, DetailView):
-    permission_required = 'projects.change_issue_object'
-    template_name = 'projects/issue_send.html'
-
-    def dispatch(self, *args, **kwargs):
-        if not settings.PROJECT_SEND_ISSUE:
-            raise Http404
-
-        return super().dispatch(*args, **kwargs)
-
-    def get_queryset(self):
-        return Issue.objects.filter(project_id=self.kwargs.get('project_id'))
-
-    def get_permission_object(self):
-        return self.get_object().project
-
-    def get_success_url(self):
-        if self.request.GET.get('next'):
-            return self.request.GET.get('next')
-        else:
-            return self.get_object().project.get_absolute_url()
-
-    def get_context_data(self, **kwargs):
-        self.object = self.get_object()
-
-        issue = self.object
-        project = self.get_object().project
-        project_url = self.request.build_absolute_uri(project.get_absolute_url())
-        site = Site.objects.get_current()
-        site_url = self.request.build_absolute_uri(reverse('home'))
-
-        if 'form' not in kwargs:
-            template_context = {
-                'issue': issue,
-                'project': project,
-                'project_url': project_url,
-                'site': site,
-                'site_url': site_url,
-                'user': self.request.user
-            }
-            subject = render_to_string('projects/issue_send_subject.txt', template_context, request=self.request)
-            message = render_to_string('projects/issue_send_message.txt', template_context, request=self.request)
-
-            kwargs['form'] = IssueSendForm(initial={
-                'subject': subject,
-                'message': message
-            }, project=project)
-
-        if 'mail_form' not in kwargs:
-            kwargs['mail_form'] = IssueMailForm()
-
-        context = super().get_context_data(**kwargs)
-        context['views'] = project.views.all()
-        context['integrations'] = project.integrations.all()
-        return context
-
-    def post(self, request, *args, **kwargs):
-        issue = self.get_object()
-        project = issue.project
-
-        form = IssueSendForm(request.POST, project=project)
-        mail_form = IssueMailForm(request.POST)
-
-        if form.is_valid():
-            subject = form.cleaned_data.get('subject')
-            message = form.cleaned_data.get('message')
-
-            snapshot = project.snapshots.filter(pk=form.cleaned_data.get('snapshot')).first()
-            attachments_format = form.cleaned_data.get('attachments_format')
-
-            attachments = []
-            if form.cleaned_data.get('attachments_answers'):
-                title = f'{project.title}.{attachments_format}'
-                response = self.render_project_answers(project, snapshot, attachments_format)
-                attachments.append((title, response.content, response['content-type']))
-
-            for view in form.cleaned_data.get('attachments_views'):
-                title = f'{project.title}.{attachments_format}'
-                response = self.render_project_views(project, snapshot, view, attachments_format)
-                attachments.append((title, response.content, response['content-type']))
-
-            for value in form.cleaned_data.get('attachments_files'):
-                attachments.append((value.file_name, value.file.read(), value.file_type))
-
-            integration_id = request.POST.get('integration')
-            if integration_id:
-                # send via integration
-                try:
-                    integration = project.integrations.get(pk=integration_id)
-                    return integration.provider.send_issue(request, issue, integration, subject, message, attachments)
-                except (ObjectDoesNotExist, AttributeError):
-                    pass
-            else:
-                if mail_form.is_valid():
-                    to_emails = [*mail_form.cleaned_data.get('recipients', []),
-                                 *mail_form.cleaned_data.get('recipients_input', [])]
-                    cc_emails = [request.user.email]
-                    reply_to = [request.user.email]
-
-                    # send the email
-                    send_mail(subject, message, to=to_emails, cc=cc_emails, reply_to=reply_to, attachments=attachments)
-
-                    # update issue status
-                    issue.status = Issue.ISSUE_STATUS_IN_PROGRESS
-                    issue.save()
-
-                    return HttpResponseRedirect(self.get_success_url())
-
-        return self.render_to_response(self.get_context_data(form=form, mail_form=mail_form))
-
-    def render_project_answers(self, project, snapshot, attachments_format):
-        return render_to_format(
-            self.request, attachments_format, project.title, 'projects/project_answers_export.html', {
-                'project': ProjectWrapper(project, snapshot),
-                'format': attachments_format,
-                'title': project.title,
-                'resource_path': get_value_path(project, snapshot)
-            }
-        )
-
-    def render_project_views(self, project, snapshot, view, attachments_format):
-        try:
-            rendered_view = view.render(project, snapshot)
-        except TemplateSyntaxError:
-            return HttpResponse()
-
-        return render_to_format(
-            self.request, attachments_format, project.title, 'projects/project_view_export.html', {
-                'format': attachments_format,
-                'title': project.title,
-                'view': view,
-                'rendered_view': rendered_view,
-                'resource_path': get_value_path(project, snapshot)
-            }
-        )
diff --git a/rdmo/projects/views/membership.py b/rdmo/projects/views/membership.py
deleted file mode 100644
index 899a34e842..0000000000
--- a/rdmo/projects/views/membership.py
+++ /dev/null
@@ -1,95 +0,0 @@
-import logging
-
-from django.conf import settings
-from django.http import HttpResponseBadRequest, HttpResponseForbidden, HttpResponseRedirect
-from django.shortcuts import get_object_or_404
-from django.urls import reverse
-from django.views.generic import DeleteView, UpdateView
-from django.views.generic.edit import FormView
-
-from rdmo.core.views import ObjectPermissionMixin, RedirectViewMixin
-
-from ..forms import MembershipCreateForm
-from ..models import Membership, Project
-from ..utils import is_last_owner, send_invite_email
-
-logger = logging.getLogger(__name__)
-
-
-class MembershipCreateView(ObjectPermissionMixin, RedirectViewMixin, FormView):
-    model = Membership
-    form_class = MembershipCreateForm
-    permission_required = 'projects.add_membership_object'
-    template_name = 'projects/membership_form.html'
-
-    def dispatch(self, *args, **kwargs):
-        self.project = get_object_or_404(Project.objects.all(), pk=self.kwargs['project_id'])
-        return super().dispatch(*args, **kwargs)
-
-    def get_queryset(self):
-        return Membership.objects.filter(project=self.project)
-
-    def get_permission_object(self):
-        return self.project
-
-    def get_form_kwargs(self):
-        kwargs = super().get_form_kwargs()
-        kwargs['project'] = self.project
-        kwargs['is_site_manager'] = self.request.user.role.is_site_manager
-        return kwargs
-
-    def get_success_url(self):
-        return self.project.get_absolute_url()
-
-    def form_valid(self, form):
-        invite = form.save()
-        if invite is not None and settings.PROJECT_SEND_INVITE:
-            send_invite_email(self.request, invite)
-        return super().form_valid(form)
-
-
-class MembershipUpdateView(ObjectPermissionMixin, RedirectViewMixin, UpdateView):
-    fields = ('role', )
-    permission_required = 'projects.change_membership_object'
-
-    def get_queryset(self):
-        return Membership.objects.filter(project_id=self.kwargs.get('project_id'))
-
-    def get_permission_object(self):
-        return self.get_object().project
-
-
-class MembershipDeleteView(ObjectPermissionMixin, RedirectViewMixin, DeleteView):
-    permission_required = 'projects.delete_membership_object'
-
-    def get_queryset(self):
-        return Membership.objects.filter(project_id=self.kwargs.get('project_id'))
-
-    def form_valid(self, form):
-        self.obj = self.get_object()
-
-        if (self.request.user in self.obj.project.owners) or self.request.user.role.is_site_manager:
-            # user is owner or site manager
-            if is_last_owner(self.obj.project, self.obj.user):
-                logger.info('User "%s" not allowed to remove last user "%s"',
-                            self.request.user.username, self.obj.user.username)
-                return HttpResponseBadRequest()
-            else:
-                logger.info('User "%s" deletes user "%s"', self.request.user.username, self.obj.user.username)
-                success_url = reverse('project', args=[self.get_object().project.id])
-                self.obj.delete()
-                return HttpResponseRedirect(success_url)
-
-        elif self.request.user == self.obj.user:
-            # user wants to remove him/herself
-            logger.info('User "%s" deletes himself.', self.request.user.username)
-            success_url = reverse('projects')
-            self.obj.delete()
-            return HttpResponseRedirect(success_url)
-
-        else:
-            logger.info('User "%s" not allowed to remove user "%s"', self.request.user.username, self.obj.user.username)
-            return HttpResponseForbidden()
-
-    def get_permission_object(self):
-        return self.get_object().project
diff --git a/rdmo/projects/views/project.py b/rdmo/projects/views/project.py
deleted file mode 100644
index b66111e0e6..0000000000
--- a/rdmo/projects/views/project.py
+++ /dev/null
@@ -1,223 +0,0 @@
-import logging
-
-from django.conf import settings
-from django.contrib.auth.mixins import LoginRequiredMixin
-from django.db.models import F, OuterRef, Subquery
-from django.forms import Form
-from django.http import Http404
-from django.shortcuts import get_object_or_404, redirect
-from django.urls import reverse_lazy
-from django.utils.decorators import method_decorator
-from django.utils.translation import gettext_lazy as _
-from django.views.decorators.csrf import ensure_csrf_cookie
-from django.views.generic import DeleteView, DetailView, TemplateView
-from django.views.generic.edit import FormMixin
-
-from rdmo.core.plugins import get_plugin, get_plugins
-from rdmo.core.views import CSRFViewMixin, ObjectPermissionMixin, RedirectViewMixin, StoreIdViewMixin
-from rdmo.questions.models import Catalog
-
-from ...tasks.models import Task
-from ...views.models import View
-from ..models import Integration, Invite, Membership, Project
-from ..sync import filter_tasks_or_views_for_project
-from ..utils import get_upload_accept
-
-logger = logging.getLogger(__name__)
-
-
-class ProjectsView(LoginRequiredMixin, CSRFViewMixin, StoreIdViewMixin, TemplateView):
-    template_name = 'projects/projects.html'
-
-
-class ProjectDetailView(ObjectPermissionMixin, DetailView):
-    model = Project
-    permission_required = 'projects.view_project_object'
-
-
-class OldProjectDetailView(ObjectPermissionMixin, DetailView):
-    model = Project
-    queryset = Project.objects.prefetch_related(
-        'issues',
-        'issues__task',
-        'issues__task__conditions',
-        'issues__task__conditions__source',
-        'issues__task__conditions__target_option',
-        'tasks',
-        'views',
-        'values'
-    )
-    permission_required = 'projects.view_project_object'
-    template_name = 'projects/old/project_detail.html'
-
-    def get_context_data(self, **kwargs):
-        context = super().get_context_data(**kwargs)
-        project = context['project']
-        ancestors = project.get_ancestors(include_self=True)
-        values = project.values.filter(snapshot=None).select_related('attribute', 'option')
-        highest = Membership.objects.filter(project__in=ancestors, user_id=OuterRef('user_id')) \
-                                    .order_by('-project__level')
-        memberships = Membership.objects.filter(project__in=ancestors) \
-                                        .annotate(highest=Subquery(highest.values('project__level')[:1])) \
-                                        .filter(highest=F('project__level')) \
-                                        .select_related('user')
-
-        if settings.SOCIALACCOUNT:
-            # prefetch the users social account, if that relation exists
-            memberships = memberships.prefetch_related('user__socialaccount_set')
-
-        integrations = Integration.objects.filter(project__in=ancestors)
-        context['catalogs'] = Catalog.objects.filter_for_user(self.request.user)
-
-        if settings.PROJECT_TASKS_SYNC:
-            # tasks should be synced, the user can not change them
-            context['tasks_available'] = project.tasks.exists()
-        else:
-            context['tasks_available'] = (
-                filter_tasks_or_views_for_project(Task, project).exists()
-            )
-
-        if settings.PROJECT_VIEWS_SYNC:
-            # views should be synced, the user can not change them
-            context['views_available'] = project.views.exists()
-        else:
-            context['views_available'] = (
-                filter_tasks_or_views_for_project(View, project).exists()
-            )
-
-        ancestors_import = []
-        for instance in ancestors.exclude(id=project.id):
-            if self.request.user.has_perm('projects.view_project_object', instance):
-                ancestors_import.append(instance)
-        context['ancestors_import'] = ancestors_import
-        context['memberships'] = memberships.order_by('user__last_name', '-project__level')
-        context['integrations'] = integrations.order_by('provider_key', '-project__level')
-        context['providers'] = get_plugins('PROJECT_ISSUE_PROVIDERS')
-        context['issues'] = [
-            issue for issue in project.issues.order_by('-status', 'task__order', 'task__uri') if issue.resolve(values)
-        ]
-        context['views'] = project.views.order_by('order', 'uri')
-        context['snapshots'] = project.snapshots.all()
-        context['invites'] = project.invites.all()
-        context['membership'] = Membership.objects.filter(project=project, user=self.request.user).first()
-        context['upload_accept'] = ','.join([
-            suffix for suffixes in get_upload_accept().values() for suffix in suffixes
-        ])
-        return context
-
-
-class ProjectDeleteView(ObjectPermissionMixin, RedirectViewMixin, DeleteView):
-    model = Project
-    queryset = Project.objects.all()
-    success_url = reverse_lazy('projects')
-    permission_required = 'projects.delete_project_object'
-
-
-class ProjectJoinView(LoginRequiredMixin, RedirectViewMixin, TemplateView):
-    template_name = 'core/error.html'
-
-    def get(self, request, token):
-        try:
-            invite = Invite.objects.get(token=token)
-
-            if invite.is_expired:
-                error = _('Sorry, your invitation has been expired.')
-                invite.delete()
-            elif invite.user and invite.user != request.user:
-                error = _('Sorry, but this invitation is for the user "%s".') % invite.user
-            elif Membership.objects.filter(project=invite.project, user=request.user).exists():
-                invite.delete()
-                return redirect(invite.project.get_absolute_url())
-            else:
-                Membership.objects.create(
-                    project=invite.project,
-                    user=request.user,
-                    role=invite.role
-                )
-                invite.delete()
-                return redirect(invite.project.get_absolute_url())
-
-        except Invite.DoesNotExist:
-            error = _('Sorry, the invitation link is not valid.')
-
-        return self.render_to_response({
-            'title': _('Error'),
-            'errors': [error]
-        })
-
-
-class ProjectCancelView(LoginRequiredMixin, RedirectViewMixin, TemplateView):
-    template_name = 'core/error.html'
-    success_url = reverse_lazy('projects')
-
-    def get(self, request, token=None):
-        invite = get_object_or_404(Invite, token=token)
-        if invite.user in [None, request.user]:
-            invite.delete()
-
-        return redirect(self.success_url)
-
-
-class ProjectLeaveView(ObjectPermissionMixin, RedirectViewMixin, FormMixin, DetailView):
-    model = Project
-    form_class = Form
-    queryset = Project.objects.all()
-    success_url = reverse_lazy('projects')
-    permission_required = 'projects.leave_project_object'
-    template_name = 'projects/project_confirm_leave.html'
-
-    def post(self, request, *args, **kwargs):
-        form = self.get_form()
-        if form.is_valid() and 'cancel' not in request.POST:
-            membership = Membership.objects.filter(project=self.get_object()).get(user=request.user)
-            if not membership.is_last_owner:
-                membership.delete()
-
-        return redirect(self.success_url)
-
-
-class ProjectExportView(ObjectPermissionMixin, DetailView):
-    model = Project
-    queryset = Project.objects.all()
-    permission_required = 'projects.export_project_object'
-
-    def get_export_plugin(self):
-        export_plugin = get_plugin('PROJECT_EXPORTS', self.kwargs.get('format'))
-        if export_plugin is None:
-            raise Http404
-
-        export_plugin.request = self.request
-        export_plugin.project = self.object
-
-        return export_plugin
-
-    def get(self, request, *args, **kwargs):
-        self.object = self.get_object()
-        return self.get_export_plugin().render()
-
-    def post(self, request, *args, **kwargs):
-        self.object = self.get_object()
-        return self.get_export_plugin().submit()
-
-
-class ProjectInterviewView(ObjectPermissionMixin, DetailView):
-    model = Project
-    queryset = Project.objects.all()
-    permission_required = 'projects.view_project_object'
-    template_name = 'projects/project_interview.html'
-
-    @method_decorator(ensure_csrf_cookie)
-    def get(self, request, *args, **kwargs):
-        self.object = self.get_object()
-
-        if self.object.catalog is None:
-            return redirect('project_error', pk=self.object.pk)
-        else:
-            return super().get(request, *args, **kwargs)
-
-
-class ProjectErrorView(ObjectPermissionMixin, DetailView):
-    model = Project
-    queryset = Project.objects.all()
-    permission_required = 'projects.view_project_object'
-    template_name = 'projects/project_error.html'
diff --git a/rdmo/projects/views/project_answers.py b/rdmo/projects/views/project_answers.py
deleted file mode 100644
index 754a2bd4ed..0000000000
--- a/rdmo/projects/views/project_answers.py
+++ /dev/null
@@ -1,87 +0,0 @@
-import logging
-
-from django.conf import settings
-from django.shortcuts import redirect
-from django.views.generic import DetailView
-
-from rdmo.core.constants import VALUE_TYPE_FILE
-from rdmo.core.utils import render_to_format
-from rdmo.core.views import ObjectPermissionMixin
-from rdmo.views.utils import ProjectWrapper
-
-from ..models import Project, Snapshot
-from ..utils import get_value_path
-
-logger = logging.getLogger(__name__)
-
-
-class ProjectAnswersView(ObjectPermissionMixin, DetailView):
-    model = Project
-    queryset = Project.objects.all()
-
-    permission_required = 'projects.view_project_object'
-    template_name = 'projects/project_answers.html'
-    no_catalog_error_template = 'projects/project_error_no_catalog.html'
-
-    def get(self, request, *args, **kwargs):
-        self.object = self.get_object()
-
-        if self.object.catalog is None:
-            return redirect('project_error', pk=self.object.pk)
-        else:
-            context = self.get_context_data(object=self.object)
-            return self.render_to_response(context)
-
-    def get_context_data(self, **kwargs):
-        context = super().get_context_data(**kwargs)
-
-        # prefetch most elements of the catalog
-        context['project'].catalog.prefetch_elements()
-
-        try:
-            context['current_snapshot'] = context['project'].snapshots.get(pk=self.kwargs.get('snapshot_id'))
-        except Snapshot.DoesNotExist:
-            context['current_snapshot'] = None
-
-        # collect values with files, remove double files and order them.
-        context['attachments'] = context['project'].values.filter(snapshot=context['current_snapshot']) \
-                                                          .filter(value_type=VALUE_TYPE_FILE) \
-                                                          .order_by('file')
-
-        context.update({
-            'project_wrapper': ProjectWrapper(context['project'], context['current_snapshot']),
-            'snapshots': list(context['project'].snapshots.values('id', 'title')),
-            'export_formats': settings.EXPORT_FORMATS
-        })
-
-        return context
-
-
-class ProjectAnswersExportView(ObjectPermissionMixin, DetailView):
-    model = Project
-    queryset = Project.objects.all()
-    permission_required = 'projects.view_project_object'
-
-    def get_context_data(self, **kwargs):
-        context = super().get_context_data(**kwargs)
-
-        # prefetch most elements of the catalog
-        context['project'].catalog.prefetch_elements()
-
-        try:
-            context['current_snapshot'] = context['project'].snapshots.get(pk=self.kwargs.get('snapshot_id'))
-        except Snapshot.DoesNotExist:
-            context['current_snapshot'] = None
-
-        context.update({
-            'project_wrapper': ProjectWrapper(context['project'], context['current_snapshot']),
-            'title': context['project'].title,
-            'format': self.kwargs.get('format'),
-            'resource_path': get_value_path(context['project'], context['current_snapshot'])
-        })
-
-        return context
-
-    def render_to_response(self, context, **response_kwargs):
-        return render_to_format(self.request, context['format'], context['title'],
-                                'projects/project_answers_export.html', context)
diff --git a/rdmo/projects/views/project_copy.py b/rdmo/projects/views/project_copy.py
deleted file mode 100644
index c162a48a9a..0000000000
--- a/rdmo/projects/views/project_copy.py
+++ /dev/null
@@ -1,39 +0,0 @@
-import logging
-
-from django.contrib.sites.shortcuts import get_current_site
-from django.http import HttpResponseRedirect
-from django.views.generic import UpdateView
-
-from rdmo.core.views import ObjectPermissionMixin, RedirectViewMixin
-from rdmo.questions.models import Catalog
-
-from ..forms import ProjectForm
-from ..models import Project
-from ..utils import copy_project
-
-logger = logging.getLogger(__name__)
-
-
-class ProjectCopyView(ObjectPermissionMixin, RedirectViewMixin, UpdateView):
-
-    model = Project
-    form_class = ProjectForm
-    permission_required = ('projects.add_project', 'projects.view_project_object')
-
-    def get_form_kwargs(self):
-        catalogs = Catalog.objects.filter_for_user(self.request.user)
-        projects = Project.objects.filter_user(self.request.user)
-
-        form_kwargs = super().get_form_kwargs()
-        form_kwargs.update({
-            'copy': True,
-            'catalogs': catalogs,
-            'projects': projects
-        })
-        return form_kwargs
-
-    def form_valid(self, form):
-        site = get_current_site(self.request)
-        owners = [self.request.user]
-        project = copy_project(form.instance, site, owners)
-        return HttpResponseRedirect(project.get_absolute_url())
diff --git a/rdmo/projects/views/project_create.py b/rdmo/projects/views/project_create.py
deleted file mode 100644
index ed0caec9c9..0000000000
--- a/rdmo/projects/views/project_create.py
+++ /dev/null
@@ -1,85 +0,0 @@
-import logging
-
-from django.conf import settings
-from django.contrib.auth.mixins import LoginRequiredMixin
-from django.contrib.sites.shortcuts import get_current_site
-from django.urls import reverse_lazy
-from django.views.generic import CreateView, TemplateView
-
-from rdmo.core.views import ObjectPermissionMixin, RedirectViewMixin
-from rdmo.questions.models import Catalog
-from rdmo.tasks.models import Task
-from rdmo.views.models import View
-
-from ..forms import ProjectForm
-from ..mixins import ProjectImportMixin
-from ..models import Membership, Project
-from ..sync import filter_tasks_or_views_for_project
-
-logger = logging.getLogger(__name__)
-
-
-class ProjectCreateView(ObjectPermissionMixin, LoginRequiredMixin,
-                        RedirectViewMixin, CreateView):
-    model = Project
-    form_class = ProjectForm
-    permission_required = 'projects.add_project'
-
-    def get_form_kwargs(self):
-        catalogs = Catalog.objects.filter_for_user(self.request.user)
-        projects = Project.objects.filter_user(self.request.user)
-
-        form_kwargs = super().get_form_kwargs()
-        form_kwargs.update({
-            'catalogs': catalogs,
-            'projects': projects
-        })
-        return form_kwargs
-
-    def form_valid(self, form):
-        # add current site
-        form.instance.site = get_current_site(self.request)
-
-        # save the project
-        response = super().form_valid(form)
-
-        # add current user as owner
-        membership = Membership(project=form.instance, user=self.request.user, role='owner')
-        membership.save()
-
-        # add all tasks to project
-        if not settings.PROJECT_TASKS_SYNC:
-            tasks = filter_tasks_or_views_for_project(Task, form.instance)
-            for task in tasks:
-                form.instance.tasks.add(task)
-
-        # add all views to project
-        if not settings.PROJECT_VIEWS_SYNC:
-            views = filter_tasks_or_views_for_project(View, form.instance)
-            for view in views:
-                form.instance.views.add(view)
-
-        return response
-
-
-class ProjectCreateImportView(ObjectPermissionMixin, LoginRequiredMixin,
-                              ProjectImportMixin, TemplateView):
-    success_url = reverse_lazy('projects')
-    permission_required = 'projects.add_project'
-
-    def get(self, request, *args, **kwargs):
-        self.object = None
-
-        if kwargs.get('format') is None:
-            return self.import_form()
-        else:
-            return self.get_import_plugin(self.kwargs.get('format'), self.object).render()
-
-    def post(self, request, *args, **kwargs):
-        self.object = None
-
-        method = request.POST.get('method')
-        if method in ['upload_file', 'import_file']:
-            return getattr(self, method)()
-        else:
-            return self.get_import_plugin(self.kwargs.get('format'), self.object).submit()
diff --git a/rdmo/projects/views/project_update.py b/rdmo/projects/views/project_update.py
deleted file mode 100644
index 64e19f5a5b..0000000000
--- a/rdmo/projects/views/project_update.py
+++ /dev/null
@@ -1,196 +0,0 @@
-import logging
-
-from django.conf import settings
-from django.contrib.sites.models import Site
-from django.http import Http404
-from django.utils.translation import gettext_lazy as _
-from django.views.generic import UpdateView
-
-from rdmo.core.views import ObjectPermissionMixin, RedirectViewMixin
-from rdmo.questions.models import Catalog
-from rdmo.tasks.models import Task
-from rdmo.views.models import View
-
-from ..forms import (
-    ProjectForm,
-    ProjectUpdateCatalogForm,
-    ProjectUpdateInformationForm,
-    ProjectUpdateParentForm,
-    ProjectUpdateTasksForm,
-    ProjectUpdateViewsForm,
-    ProjectUpdateVisibilityForm,
-)
-from ..mixins import ProjectImportMixin
-from ..models import Project, Visibility
-from ..sync import filter_tasks_or_views_for_project
-
-logger = logging.getLogger(__name__)
-
-
-class ProjectUpdateView(ObjectPermissionMixin, RedirectViewMixin, UpdateView):
-    model = Project
-    queryset = Project.objects.all()
-    form_class = ProjectForm
-    permission_required = 'projects.change_project_object'
-
-    def get_form_kwargs(self):
-        catalogs = Catalog.objects.filter_for_user(self.request.user)
-        projects = Project.objects.filter_user(self.request.user)
-
-        form_kwargs = super().get_form_kwargs()
-        form_kwargs.update({
-            'catalogs': catalogs,
-            'projects': projects
-        })
-        return form_kwargs
-
-
-class ProjectUpdateInformationView(ObjectPermissionMixin, RedirectViewMixin, UpdateView):
-    model = Project
-    queryset = Project.objects.all()
-    form_class = ProjectUpdateInformationForm
-    permission_required = 'projects.change_project_object'
-
-
-class ProjectUpdateVisibilityView(ObjectPermissionMixin, RedirectViewMixin, UpdateView):
-    model = Project
-    queryset = Project.objects.all()
-    form_class = ProjectUpdateVisibilityForm
-    permission_required = 'projects.change_visibility_object'
-    template_name = 'projects/project_form_visibility.html'
-
-    def get_form_kwargs(self):
-        form_kwargs = super().get_form_kwargs()
-        form_kwargs.update({
-            'user': self.request.user,
-            'site': Site.objects.get_current()
-        })
-        return form_kwargs
-
-    def get_context_data(self):
-        current_site = Site.objects.get_current()
-        context = super().get_context_data()
-
-        try:
-            visibility = self.get_object().visibility
-
-            if settings.MULTISITE:
-                if self.request.user.has_perm('projects.change_visibility'):
-                    context['submit_label'] = _('Update visibility')
-                    context['delete_label'] = _('Remove visibility')
-                elif visibility.sites.all() and current_site not in visibility.sites.all():
-                    context['submit_label'] = _('Make visible for this site')
-                elif settings.GROUPS:
-                    context['submit_label'] = _('Update visibility')
-                    context['delete_label'] = _('Remove visibility')
-                else:
-                    context['delete_label'] = _('Remove visibility')
-            elif settings.GROUPS:
-                context['submit_label'] = _('Update visibility')
-                context['delete_label'] = _('Remove visibility')
-            else:
-                context['delete_label'] = _('Remove visibility')
-
-        except Visibility.DoesNotExist:
-            context['submit_label'] = _('Make visible')
-
-        return context
-
-
-class ProjectUpdateCatalogView(ObjectPermissionMixin, RedirectViewMixin, UpdateView):
-    model = Project
-    queryset = Project.objects.all()
-    form_class = ProjectUpdateCatalogForm
-    permission_required = 'projects.change_project_object'
-
-    def get_form_kwargs(self):
-        catalogs = Catalog.objects.filter_for_user(self.request.user)
-
-        form_kwargs = super().get_form_kwargs()
-        form_kwargs.update({
-            'catalogs': catalogs
-        })
-        return form_kwargs
-
-
-class ProjectUpdateTasksView(ObjectPermissionMixin, RedirectViewMixin, UpdateView):
-    model = Project
-    queryset = Project.objects.all()
-    form_class = ProjectUpdateTasksForm
-    permission_required = 'projects.change_project_object'
-
-    def dispatch(self, request, *args, **kwargs):
-        if settings.PROJECT_TASKS_SYNC:
-            raise Http404
-        return super().dispatch(request, *args, **kwargs)
-
-    def get_form_kwargs(self):
-        form_kwargs = super().get_form_kwargs()
-        form_kwargs.update({
-            'tasks': filter_tasks_or_views_for_project(Task, self.object)
-        })
-        return form_kwargs
-
-    def get_success_url(self):
-        return self.get_object().get_absolute_url()
-
-
-class ProjectUpdateViewsView(ObjectPermissionMixin, RedirectViewMixin, UpdateView):
-    model = Project
-    queryset = Project.objects.all()
-    form_class = ProjectUpdateViewsForm
-    permission_required = 'projects.change_project_object'
-
-    def dispatch(self, request, *args, **kwargs):
-        if settings.PROJECT_VIEWS_SYNC:
-            raise Http404
-        return super().dispatch(request, *args, **kwargs)
-
-    def get_form_kwargs(self):
-        form_kwargs = super().get_form_kwargs()
-        form_kwargs.update({
-            'views': filter_tasks_or_views_for_project(View, self.object)
-        })
-        return form_kwargs
-
-    def get_success_url(self):
-        return self.get_object().get_absolute_url()
-
-
-class ProjectUpdateParentView(ObjectPermissionMixin, RedirectViewMixin, UpdateView):
-    model = Project
-    queryset = Project.objects.all()
-    form_class = ProjectUpdateParentForm
-    permission_required = 'projects.change_project_object'
-
-    def get_form_kwargs(self):
-        projects = Project.objects.filter_user(self.request.user)
-
-        form_kwargs = super().get_form_kwargs()
-        form_kwargs.update({
-            'projects': projects
-        })
-        return form_kwargs
-
-
-class ProjectUpdateImportView(ProjectImportMixin, ObjectPermissionMixin, RedirectViewMixin, UpdateView):
-    model = Project
-    queryset = Project.objects.all()
-    permission_required = 'projects.import_project_object'
-
-    def get(self, request, *args, **kwargs):
-        self.object = self.get_object()
-
-        if kwargs.get('format') is None:
-            return self.import_form()
-        else:
-            return self.get_import_plugin(self.kwargs.get('format'), self.object).render()
-
-    def post(self, request, *args, **kwargs):
-        self.object = self.get_object()
-
-        method = request.POST.get('method')
-        if method in ['upload_file', 'import_file', 'import_project']:
-            return getattr(self, method)()
-        else:
-            return self.get_import_plugin(self.kwargs.get('format'), self.object).submit()
diff --git a/rdmo/projects/views/project_view.py b/rdmo/projects/views/project_view.py
deleted file mode 100644
index d7d1d95e2c..0000000000
--- a/rdmo/projects/views/project_view.py
+++ /dev/null
@@ -1,100 +0,0 @@
-import logging
-
-from django.conf import settings
-from django.http import Http404
-from django.template import TemplateSyntaxError
-from django.views.generic import DetailView
-
-from rdmo.core.constants import VALUE_TYPE_FILE
-from rdmo.core.utils import render_to_format
-from rdmo.core.views import ObjectPermissionMixin
-from rdmo.views.models import View
-
-from ..models import Project, Snapshot
-from ..utils import get_value_path
-
-logger = logging.getLogger(__name__)
-
-
-class ProjectViewView(ObjectPermissionMixin, DetailView):
-    model = Project
-    queryset = Project.objects.all()
-    permission_required = 'projects.view_project_object'
-    template_name = 'projects/project_view.html'
-
-    def get_context_data(self, **kwargs):
-        context = super().get_context_data(**kwargs)
-
-        # prefetch most elements of the catalog
-        context['project'].catalog.prefetch_elements()
-
-        try:
-            context['current_snapshot'] = context['project'].snapshots.get(pk=self.kwargs.get('snapshot_id'))
-        except Snapshot.DoesNotExist:
-            context['current_snapshot'] = None
-
-        try:
-            context['view'] = context['project'].views.get(pk=self.kwargs.get('view_id'))
-        except View.DoesNotExist as e:
-            raise Http404 from e
-
-        try:
-            context['rendered_view'] = context['view'].render(context['project'],
-                                                              snapshot=context['current_snapshot'])
-        except TemplateSyntaxError:
-            context['rendered_view'] = None
-
-        # collect values with files, remove double files and order them.
-        context['attachments'] = context['project'].values.filter(snapshot=context['current_snapshot']) \
-                                                          .filter(value_type=VALUE_TYPE_FILE) \
-                                                          .order_by('file')
-
-        context.update({
-            'snapshots': list(context['project'].snapshots.values('id', 'title')),
-            'export_formats': settings.EXPORT_FORMATS
-        })
-
-        return context
-
-
-class ProjectViewExportView(ObjectPermissionMixin, DetailView):
-    model = Project
-    queryset = Project.objects.all()
-    permission_required = 'projects.view_project_object'
-
-    def get_context_data(self, **kwargs):
-        export_format = self.kwargs.get('format')
-
-        context = super().get_context_data(**kwargs)
-
-        # prefetch most elements of the catalog
-        context['project'].catalog.prefetch_elements()
-
-        try:
-            context['current_snapshot'] = context['project'].snapshots.get(pk=self.kwargs.get('snapshot_id'))
-        except Snapshot.DoesNotExist:
-            context['current_snapshot'] = None
-
-        try:
-            context['view'] = context['project'].views.get(pk=self.kwargs.get('view_id'))
-        except View.DoesNotExist as e:
-            raise Http404 from e
-
-        try:
-            context['rendered_view'] = context['view'].render(context['project'],
-                                                              snapshot=context['current_snapshot'],
-                                                              export_format=export_format)
-        except TemplateSyntaxError:
-            context['rendered_view'] = None
-
-        context.update({
-            'title': context['project'].title,
-            'format': export_format,
-            'resource_path': get_value_path(context['project'], context['current_snapshot'])
-        })
-
-        return context
-
-    def render_to_response(self, context, **response_kwargs):
-        return render_to_format(self.request, context['format'], context['title'],
-                                'projects/project_view_export.html', context)
diff --git a/rdmo/projects/views/snapshot.py b/rdmo/projects/views/snapshot.py
deleted file mode 100644
index 437f8acd01..0000000000
--- a/rdmo/projects/views/snapshot.py
+++ /dev/null
@@ -1,96 +0,0 @@
-import logging
-
-from django.http import Http404, HttpResponseRedirect
-from django.shortcuts import get_object_or_404
-from django.urls import reverse
-from django.views.generic import CreateView, DetailView, UpdateView
-
-from rdmo.core.plugins import get_plugin
-from rdmo.core.views import ObjectPermissionMixin, RedirectViewMixin
-
-from ..forms import SnapshotCreateForm
-from ..models import Project, Snapshot
-
-logger = logging.getLogger(__name__)
-
-
-class SnapshotCreateView(ObjectPermissionMixin, RedirectViewMixin, CreateView):
-    model = Snapshot
-    form_class = SnapshotCreateForm
-    permission_required = 'projects.add_snapshot_object'
-
-    def dispatch(self, *args, **kwargs):
-        self.project = get_object_or_404(Project.objects.all(), pk=self.kwargs['project_id'])
-        return super().dispatch(*args, **kwargs)
-
-    def get_permission_object(self):
-        return self.project
-
-    def get_form_kwargs(self):
-        kwargs = super().get_form_kwargs()
-        kwargs['project'] = self.project
-        return kwargs
-
-
-class SnapshotUpdateView(ObjectPermissionMixin, RedirectViewMixin, UpdateView):
-    model = Snapshot
-    queryset = Snapshot.objects.all()
-    fields = ['title', 'description']
-    permission_required = 'projects.change_snapshot_object'
-
-    def get_queryset(self):
-        return Snapshot.objects.filter(project_id=self.kwargs['project_id'])
-
-    def get_permission_object(self):
-        return self.get_object().project
-
-
-class SnapshotRollbackView(ObjectPermissionMixin, RedirectViewMixin, DetailView):
-    model = Snapshot
-    queryset = Snapshot.objects.all()
-    permission_required = 'projects.rollback_snapshot_object'
-    template_name = 'projects/snapshot_rollback.html'
-
-    def get_queryset(self):
-        return Snapshot.objects.filter(project_id=self.kwargs['project_id'])
-
-    def get_permission_object(self):
-        return self.get_object().project
-
-    def post(self, request, *args, **kwargs):
-        snapshot = self.get_object()
-
-        if 'cancel' not in request.POST:
-            snapshot.rollback()
-
-        return HttpResponseRedirect(reverse('project', args=[snapshot.project.id]))
-
-
-class SnapshotExportView(ObjectPermissionMixin, DetailView):
-    model = Snapshot
-    queryset = Snapshot.objects.all()
-    permission_required = 'projects.export_snapshot_object'
-
-    def get_queryset(self):
-        return Snapshot.objects.filter(project_id=self.kwargs['project_id'])
-
-    def get_permission_object(self):
-        return self.get_object().project
-
-    def get_export_plugin(self):
-        export_plugin = get_plugin('PROJECT_SNAPSHOT_EXPORTS', self.kwargs.get('format'))
-        if export_plugin is None:
-            raise Http404
-
-        export_plugin.request = self.request
-        export_plugin.snapshot = self.object
-
-        return export_plugin
-
-    def get(self, request, *args, **kwargs):
-        self.object = self.get_object()
-        return self.get_export_plugin().render()
-
-    def post(self, request, *args, **kwargs):
-        self.object = self.get_object()
-        return self.get_export_plugin().submit()

From 5fc76d34588d1f448e34d0c822c1d5e8c990c222 Mon Sep 17 00:00:00 2001
From: Jochen Klar <mail@jochenklar.de>
Date: Mon, 30 Mar 2026 21:26:24 +0200
Subject: [PATCH 02/16] Remove project templates

---
 .../{ => integration}/issue_send_message.txt  |   0
 .../{ => integration}/issue_send_subject.txt  |   0
 .../projects/integration_confirm_delete.html  |  19 --
 .../templates/projects/integration_form.html  |  25 ---
 .../projects/invite_confirm_delete.html       |  27 ---
 .../templates/projects/issue_detail.html      |  99 ----------
 .../templates/projects/issue_form.html        |  11 --
 .../templates/projects/issue_send.html        |  58 ------
 .../templates/projects/issue_send_email.html  |  32 ----
 .../projects/issue_send_integrations.html     |  38 ----
 .../projects/issue_send_sidebar.html          |   9 -
 .../projects/membership_confirm_delete.html   |  19 --
 .../templates/projects/membership_form.html   |  39 ----
 .../projects/old/project_detail.html          |  51 -----
 .../projects/old/project_detail_header.html   |  53 ------
 .../old/project_detail_header_catalog.html    |  17 --
 .../project_detail_header_description.html    |  14 --
 .../old/project_detail_header_hierarchy.html  |  32 ----
 .../old/project_detail_integrations.html      |  65 -------
 .../old/project_detail_integrations_help.html |   7 -
 .../projects/old/project_detail_invites.html  |  44 -----
 .../projects/old/project_detail_issues.html   |  92 ---------
 .../old/project_detail_issues_help.html       |   7 -
 .../old/project_detail_memberships.html       |  75 --------
 .../old/project_detail_memberships_help.html  |   7 -
 ...ect_detail_memberships_socialaccounts.html |   9 -
 .../projects/old/project_detail_sidebar.html  | 177 ------------------
 .../project_detail_sidebar_parent_import.html |  20 --
 .../old/project_detail_snapshots.html         |  98 ----------
 .../old/project_detail_snapshots_help.html    |   7 -
 .../projects/old/project_detail_views.html    |  64 -------
 .../old/project_detail_views_help.html        |   7 -
 .../issue_send_issue_attachments_de.html      |   8 -
 .../issue_send_issue_attachments_en.html      |   8 -
 .../issue_send_issue_attachments_fr.html      |   8 -
 .../issue_send_issue_attachments_it.html      |   8 -
 .../overlays/issue_send_issue_message_de.html |   8 -
 .../overlays/issue_send_issue_message_en.html |   8 -
 .../overlays/issue_send_issue_message_fr.html |   8 -
 .../overlays/issue_send_issue_message_it.html |   8 -
 .../overlays/issue_send_support_info_de.html  |   8 -
 .../overlays/issue_send_support_info_en.html  |   8 -
 .../overlays/issue_send_support_info_fr.html  |   8 -
 .../overlays/issue_send_support_info_it.html  |   8 -
 .../overlays/project_export_project_de.html   |   8 -
 .../overlays/project_export_project_en.html   |   8 -
 .../overlays/project_export_project_fr.html   |   8 -
 .../overlays/project_export_project_it.html   |   8 -
 .../overlays/project_import_project_de.html   |   8 -
 .../overlays/project_import_project_en.html   |   8 -
 .../overlays/project_import_project_fr.html   |   8 -
 .../overlays/project_import_project_it.html   |   8 -
 .../overlays/project_project_catalog_de.html  |   8 -
 .../overlays/project_project_catalog_en.html  |   8 -
 .../overlays/project_project_catalog_fr.html  |   8 -
 .../overlays/project_project_catalog_it.html  |   8 -
 .../overlays/project_project_issues_de.html   |   8 -
 .../overlays/project_project_issues_en.html   |   8 -
 .../overlays/project_project_issues_fr.html   |   8 -
 .../overlays/project_project_issues_it.html   |   8 -
 .../project_project_memberships_de.html       |   8 -
 .../project_project_memberships_en.html       |   8 -
 .../project_project_memberships_fr.html       |   8 -
 .../project_project_memberships_it.html       |   8 -
 .../project_project_questions_de.html         |  11 --
 .../project_project_questions_en.html         |  10 -
 .../project_project_questions_fr.html         |  10 -
 .../project_project_questions_it.html         |  10 -
 .../project_project_snapshots_de.html         |   8 -
 .../project_project_snapshots_en.html         |   8 -
 .../project_project_snapshots_fr.html         |   8 -
 .../project_project_snapshots_it.html         |   8 -
 .../overlays/project_project_views_de.html    |   8 -
 .../overlays/project_project_views_en.html    |   8 -
 .../overlays/project_project_views_fr.html    |   8 -
 .../overlays/project_project_views_it.html    |   8 -
 .../overlays/project_support_info_de.html     |   8 -
 .../overlays/project_support_info_en.html     |   8 -
 .../overlays/project_support_info_fr.html     |   8 -
 .../overlays/project_support_info_it.html     |   8 -
 .../overlays/projects_create_project_de.html  |   8 -
 .../overlays/projects_create_project_en.html  |   8 -
 .../overlays/projects_create_project_fr.html  |   8 -
 .../overlays/projects_create_project_it.html  |   8 -
 .../overlays/projects_import_project_de.html  |  10 -
 .../overlays/projects_import_project_en.html  |  10 -
 .../overlays/projects_import_project_fr.html  |  10 -
 .../overlays/projects_import_project_it.html  |  10 -
 .../overlays/projects_projects_table_de.html  |  11 --
 .../overlays/projects_projects_table_en.html  |  11 --
 .../overlays/projects_projects_table_fr.html  |  11 --
 .../overlays/projects_projects_table_it.html  |  11 --
 .../overlays/projects_support_info_de.html    |   8 -
 .../overlays/projects_support_info_en.html    |   8 -
 .../overlays/projects_support_info_fr.html    |   8 -
 .../overlays/projects_support_info_it.html    |   8 -
 .../projects/project_confirm_cancel.html      |  17 --
 .../projects/project_confirm_delete.html      |  35 ----
 .../projects/project_confirm_leave.html       |  21 ---
 .../project_detail_header_visibility.html     |  14 --
 .../templates/projects/project_form.html      |  49 -----
 .../projects/project_form_visibility.html     |  48 -----
 .../templates/projects/project_import.html    | 171 -----------------
 .../projects/project_import_form.html         |  20 --
 .../templates/projects/project_view.html      |  97 ----------
 .../projects/projects_pagination.html         |  23 ---
 .../templates/projects/snapshot_form.html     |  21 ---
 .../templates/projects/snapshot_rollback.html |  19 --
 108 files changed, 2298 deletions(-)
 rename rdmo/projects/templates/projects/{ => integration}/issue_send_message.txt (100%)
 rename rdmo/projects/templates/projects/{ => integration}/issue_send_subject.txt (100%)
 delete mode 100644 rdmo/projects/templates/projects/integration_confirm_delete.html
 delete mode 100644 rdmo/projects/templates/projects/integration_form.html
 delete mode 100644 rdmo/projects/templates/projects/invite_confirm_delete.html
 delete mode 100644 rdmo/projects/templates/projects/issue_detail.html
 delete mode 100644 rdmo/projects/templates/projects/issue_form.html
 delete mode 100644 rdmo/projects/templates/projects/issue_send.html
 delete mode 100644 rdmo/projects/templates/projects/issue_send_email.html
 delete mode 100644 rdmo/projects/templates/projects/issue_send_integrations.html
 delete mode 100644 rdmo/projects/templates/projects/issue_send_sidebar.html
 delete mode 100644 rdmo/projects/templates/projects/membership_confirm_delete.html
 delete mode 100644 rdmo/projects/templates/projects/membership_form.html
 delete mode 100644 rdmo/projects/templates/projects/old/project_detail.html
 delete mode 100644 rdmo/projects/templates/projects/old/project_detail_header.html
 delete mode 100644 rdmo/projects/templates/projects/old/project_detail_header_catalog.html
 delete mode 100644 rdmo/projects/templates/projects/old/project_detail_header_description.html
 delete mode 100644 rdmo/projects/templates/projects/old/project_detail_header_hierarchy.html
 delete mode 100644 rdmo/projects/templates/projects/old/project_detail_integrations.html
 delete mode 100644 rdmo/projects/templates/projects/old/project_detail_integrations_help.html
 delete mode 100644 rdmo/projects/templates/projects/old/project_detail_invites.html
 delete mode 100644 rdmo/projects/templates/projects/old/project_detail_issues.html
 delete mode 100644 rdmo/projects/templates/projects/old/project_detail_issues_help.html
 delete mode 100644 rdmo/projects/templates/projects/old/project_detail_memberships.html
 delete mode 100644 rdmo/projects/templates/projects/old/project_detail_memberships_help.html
 delete mode 100644 rdmo/projects/templates/projects/old/project_detail_memberships_socialaccounts.html
 delete mode 100644 rdmo/projects/templates/projects/old/project_detail_sidebar.html
 delete mode 100644 rdmo/projects/templates/projects/old/project_detail_sidebar_parent_import.html
 delete mode 100644 rdmo/projects/templates/projects/old/project_detail_snapshots.html
 delete mode 100644 rdmo/projects/templates/projects/old/project_detail_snapshots_help.html
 delete mode 100644 rdmo/projects/templates/projects/old/project_detail_views.html
 delete mode 100644 rdmo/projects/templates/projects/old/project_detail_views_help.html
 delete mode 100644 rdmo/projects/templates/projects/overlays/issue_send_issue_attachments_de.html
 delete mode 100644 rdmo/projects/templates/projects/overlays/issue_send_issue_attachments_en.html
 delete mode 100644 rdmo/projects/templates/projects/overlays/issue_send_issue_attachments_fr.html
 delete mode 100644 rdmo/projects/templates/projects/overlays/issue_send_issue_attachments_it.html
 delete mode 100644 rdmo/projects/templates/projects/overlays/issue_send_issue_message_de.html
 delete mode 100644 rdmo/projects/templates/projects/overlays/issue_send_issue_message_en.html
 delete mode 100644 rdmo/projects/templates/projects/overlays/issue_send_issue_message_fr.html
 delete mode 100644 rdmo/projects/templates/projects/overlays/issue_send_issue_message_it.html
 delete mode 100644 rdmo/projects/templates/projects/overlays/issue_send_support_info_de.html
 delete mode 100644 rdmo/projects/templates/projects/overlays/issue_send_support_info_en.html
 delete mode 100644 rdmo/projects/templates/projects/overlays/issue_send_support_info_fr.html
 delete mode 100644 rdmo/projects/templates/projects/overlays/issue_send_support_info_it.html
 delete mode 100644 rdmo/projects/templates/projects/overlays/project_export_project_de.html
 delete mode 100644 rdmo/projects/templates/projects/overlays/project_export_project_en.html
 delete mode 100644 rdmo/projects/templates/projects/overlays/project_export_project_fr.html
 delete mode 100644 rdmo/projects/templates/projects/overlays/project_export_project_it.html
 delete mode 100644 rdmo/projects/templates/projects/overlays/project_import_project_de.html
 delete mode 100644 rdmo/projects/templates/projects/overlays/project_import_project_en.html
 delete mode 100644 rdmo/projects/templates/projects/overlays/project_import_project_fr.html
 delete mode 100644 rdmo/projects/templates/projects/overlays/project_import_project_it.html
 delete mode 100644 rdmo/projects/templates/projects/overlays/project_project_catalog_de.html
 delete mode 100644 rdmo/projects/templates/projects/overlays/project_project_catalog_en.html
 delete mode 100644 rdmo/projects/templates/projects/overlays/project_project_catalog_fr.html
 delete mode 100644 rdmo/projects/templates/projects/overlays/project_project_catalog_it.html
 delete mode 100644 rdmo/projects/templates/projects/overlays/project_project_issues_de.html
 delete mode 100644 rdmo/projects/templates/projects/overlays/project_project_issues_en.html
 delete mode 100644 rdmo/projects/templates/projects/overlays/project_project_issues_fr.html
 delete mode 100644 rdmo/projects/templates/projects/overlays/project_project_issues_it.html
 delete mode 100644 rdmo/projects/templates/projects/overlays/project_project_memberships_de.html
 delete mode 100644 rdmo/projects/templates/projects/overlays/project_project_memberships_en.html
 delete mode 100644 rdmo/projects/templates/projects/overlays/project_project_memberships_fr.html
 delete mode 100644 rdmo/projects/templates/projects/overlays/project_project_memberships_it.html
 delete mode 100644 rdmo/projects/templates/projects/overlays/project_project_questions_de.html
 delete mode 100644 rdmo/projects/templates/projects/overlays/project_project_questions_en.html
 delete mode 100644 rdmo/projects/templates/projects/overlays/project_project_questions_fr.html
 delete mode 100644 rdmo/projects/templates/projects/overlays/project_project_questions_it.html
 delete mode 100644 rdmo/projects/templates/projects/overlays/project_project_snapshots_de.html
 delete mode 100644 rdmo/projects/templates/projects/overlays/project_project_snapshots_en.html
 delete mode 100644 rdmo/projects/templates/projects/overlays/project_project_snapshots_fr.html
 delete mode 100644 rdmo/projects/templates/projects/overlays/project_project_snapshots_it.html
 delete mode 100644 rdmo/projects/templates/projects/overlays/project_project_views_de.html
 delete mode 100644 rdmo/projects/templates/projects/overlays/project_project_views_en.html
 delete mode 100644 rdmo/projects/templates/projects/overlays/project_project_views_fr.html
 delete mode 100644 rdmo/projects/templates/projects/overlays/project_project_views_it.html
 delete mode 100644 rdmo/projects/templates/projects/overlays/project_support_info_de.html
 delete mode 100644 rdmo/projects/templates/projects/overlays/project_support_info_en.html
 delete mode 100644 rdmo/projects/templates/projects/overlays/project_support_info_fr.html
 delete mode 100644 rdmo/projects/templates/projects/overlays/project_support_info_it.html
 delete mode 100644 rdmo/projects/templates/projects/overlays/projects_create_project_de.html
 delete mode 100644 rdmo/projects/templates/projects/overlays/projects_create_project_en.html
 delete mode 100644 rdmo/projects/templates/projects/overlays/projects_create_project_fr.html
 delete mode 100644 rdmo/projects/templates/projects/overlays/projects_create_project_it.html
 delete mode 100644 rdmo/projects/templates/projects/overlays/projects_import_project_de.html
 delete mode 100644 rdmo/projects/templates/projects/overlays/projects_import_project_en.html
 delete mode 100644 rdmo/projects/templates/projects/overlays/projects_import_project_fr.html
 delete mode 100644 rdmo/projects/templates/projects/overlays/projects_import_project_it.html
 delete mode 100644 rdmo/projects/templates/projects/overlays/projects_projects_table_de.html
 delete mode 100644 rdmo/projects/templates/projects/overlays/projects_projects_table_en.html
 delete mode 100644 rdmo/projects/templates/projects/overlays/projects_projects_table_fr.html
 delete mode 100644 rdmo/projects/templates/projects/overlays/projects_projects_table_it.html
 delete mode 100644 rdmo/projects/templates/projects/overlays/projects_support_info_de.html
 delete mode 100644 rdmo/projects/templates/projects/overlays/projects_support_info_en.html
 delete mode 100644 rdmo/projects/templates/projects/overlays/projects_support_info_fr.html
 delete mode 100644 rdmo/projects/templates/projects/overlays/projects_support_info_it.html
 delete mode 100644 rdmo/projects/templates/projects/project_confirm_cancel.html
 delete mode 100644 rdmo/projects/templates/projects/project_confirm_delete.html
 delete mode 100644 rdmo/projects/templates/projects/project_confirm_leave.html
 delete mode 100644 rdmo/projects/templates/projects/project_detail_header_visibility.html
 delete mode 100644 rdmo/projects/templates/projects/project_form.html
 delete mode 100644 rdmo/projects/templates/projects/project_form_visibility.html
 delete mode 100644 rdmo/projects/templates/projects/project_import.html
 delete mode 100644 rdmo/projects/templates/projects/project_import_form.html
 delete mode 100644 rdmo/projects/templates/projects/project_view.html
 delete mode 100644 rdmo/projects/templates/projects/projects_pagination.html
 delete mode 100644 rdmo/projects/templates/projects/snapshot_form.html
 delete mode 100644 rdmo/projects/templates/projects/snapshot_rollback.html

diff --git a/rdmo/projects/templates/projects/issue_send_message.txt b/rdmo/projects/templates/projects/integration/issue_send_message.txt
similarity index 100%
rename from rdmo/projects/templates/projects/issue_send_message.txt
rename to rdmo/projects/templates/projects/integration/issue_send_message.txt
diff --git a/rdmo/projects/templates/projects/issue_send_subject.txt b/rdmo/projects/templates/projects/integration/issue_send_subject.txt
similarity index 100%
rename from rdmo/projects/templates/projects/issue_send_subject.txt
rename to rdmo/projects/templates/projects/integration/issue_send_subject.txt
diff --git a/rdmo/projects/templates/projects/integration_confirm_delete.html b/rdmo/projects/templates/projects/integration_confirm_delete.html
deleted file mode 100644
index b72de559d7..0000000000
--- a/rdmo/projects/templates/projects/integration_confirm_delete.html
+++ /dev/null
@@ -1,19 +0,0 @@
-{% extends 'core/page.html' %}
-{% load i18n %}
-{% load core_tags %}
-
-{% block page %}
-
-    <h1>{% trans "Delete integration" %}</h1>
-
-    <p>
-        {% blocktrans with label=object.provider.label %}You are about to permanently delete the <strong>{{ label }}</strong>.{% endblocktrans %}
-    </p>
-
-    <p class="text-danger">
-        {% trans 'This action cannot be undone!' %}
-    </p>
-
-    {% bootstrap_delete_form submit=_('Delete integration') %}
-
-{% endblock %}
diff --git a/rdmo/projects/templates/projects/integration_form.html b/rdmo/projects/templates/projects/integration_form.html
deleted file mode 100644
index ebfc4992b8..0000000000
--- a/rdmo/projects/templates/projects/integration_form.html
+++ /dev/null
@@ -1,25 +0,0 @@
-{% extends 'core/page.html' %}
-{% load i18n %}
-{% load core_tags %}
-
-{% block page %}
-
-{% if object %}
-
-    <h1>{% trans 'Update integration' %}</h1>
-
-    <p class="help-block">{{ provider.description }}</p>
-
-    {% bootstrap_form submit=_('Update integration') %}
-
-{% else %}
-
-    <h1>{% trans 'Add integration to project' %}</h1>
-
-    <p class="help-block">{{ provider.description }}</p>
-
-    {% bootstrap_form submit=_('Add integration') %}
-
-{% endif %}
-
-{% endblock %}
diff --git a/rdmo/projects/templates/projects/invite_confirm_delete.html b/rdmo/projects/templates/projects/invite_confirm_delete.html
deleted file mode 100644
index 3314159a36..0000000000
--- a/rdmo/projects/templates/projects/invite_confirm_delete.html
+++ /dev/null
@@ -1,27 +0,0 @@
-{% extends 'core/page.html' %}
-{% load i18n %}
-{% load core_tags %}
-{% load accounts_tags %}
-
-{% block page %}
-
-    <h1>{% trans 'Delete invite' %}</h1>
-
-    <p>
-        {% if object.user %}
-        {% full_name object.user as user %}
-        {% blocktrans with object.project.title as title trimmed %}
-        You are about to remove the invite of <strong>{{ user }}</strong> from the project <strong>{{ title }}</strong>.
-        {% endblocktrans %}
-        {% else %}
-        {% with object.email as user %}
-        {% blocktrans with object.project.title as title trimmed %}
-        You are about to remove the invite of <strong>{{ user }}</strong> from the project <strong>{{ title }}</strong>.
-        {% endblocktrans %}
-        {% endwith %}
-        {% endif %}
-    </p>
-
-    {% bootstrap_delete_form submit=_('Delete invite') %}
-
-{% endblock %}
diff --git a/rdmo/projects/templates/projects/issue_detail.html b/rdmo/projects/templates/projects/issue_detail.html
deleted file mode 100644
index 92abba4c88..0000000000
--- a/rdmo/projects/templates/projects/issue_detail.html
+++ /dev/null
@@ -1,99 +0,0 @@
-{% extends 'core/page.html' %}
-{% load i18n %}
-{% load core_tags %}
-
-{% block head %}
-<script>
-    $(document).ready(function() {
-        $('[data-toggle="tooltip"]').tooltip();
-    });
-</script>
-{% endblock %}
-
-{% block page %}
-
-<h1>{% trans 'Task' %}</h1>
-
-<h2>{{ issue.task.title }}</h2>
-
-<p>
-    {{ issue.task.text|markdown }}
-</p>
-
-{% if issue.dates %}
-
-<h3>{% trans 'Dates' %}</h3>
-
-{% for dates in issue.dates %}
-    {% if dates|length > 1 %}
-    <p>{{ dates.0 | date:"DATE_FORMAT" }}<br /> - {{ dates.1 | date:"DATE_FORMAT" }}</p>
-    {% else %}
-    <p>{{ dates.0 | date:"DATE_FORMAT" }}</p>
-    {% endif %}
-{% endfor %}
-
-{% endif %}
-
-<h3>{% trans 'Questions' %}</h3>
-
-<p>
-    {% trans 'This task is active, because of the answers to the following questions:' %}
-</p>
-
-<ul>
-{% for source in sources %}
-    <li>
-        {% for question in source.questions %}
-        <p><strong>{{ question.text }}</strong></p>
-        {% endfor %}
-
-        {% for value in source.values %}
-        <p>{{ value.value_and_unit }}</p>
-        {% endfor %}
-    </li>
-{% endfor %}
-</ul>
-
-{% if issue.resources.all %}
-
-<h3>{% trans 'External resources for this task' %}</h3>
-
-<ul>
-{% for resource in issue.resources.all %}
-    <li>
-        <a href="{{ resource.url }}">{{ resource.url }}</a>
-    </li>
-{% endfor %}
-</ul>
-
-{% endif %}
-
-{% endblock %}
-
-{% block sidebar %}
-
-    <h2>{% trans 'Status' %}</h2>
-
-    <p>
-        {{ issue.get_status_display }}
-    </p>
-
-    <h2>{% trans 'Options' %}</h2>
-
-    <ul class="list-unstyled">
-        <li>
-            <a href="{% url 'issue_update' project.pk issue.pk %}?next={{ request.path }}">
-                {% trans 'Update task status' %}
-            </a>
-        </li>
-        {% if settings.PROJECT_SEND_ISSUE %}
-        <li>
-            <a href="{% url 'issue_send' project.pk issue.pk %}?next={{ request.path }}">
-                {% trans 'Send task' %}
-            </a>
-        </li>
-        {% endif %}
-    </ul>
-
-{% endblock %}
-
diff --git a/rdmo/projects/templates/projects/issue_form.html b/rdmo/projects/templates/projects/issue_form.html
deleted file mode 100644
index 4c05ce2afc..0000000000
--- a/rdmo/projects/templates/projects/issue_form.html
+++ /dev/null
@@ -1,11 +0,0 @@
-{% extends 'core/page.html' %}
-{% load i18n %}
-{% load core_tags %}
-
-{% block page %}
-
-<h1>{% trans 'Update task' %}</h1>
-
-{% bootstrap_form submit=_('Update task') %}
-
-{% endblock %}
diff --git a/rdmo/projects/templates/projects/issue_send.html b/rdmo/projects/templates/projects/issue_send.html
deleted file mode 100644
index e43ad2f2aa..0000000000
--- a/rdmo/projects/templates/projects/issue_send.html
+++ /dev/null
@@ -1,58 +0,0 @@
-{% extends 'core/base.html' %}
-{% load i18n %}
-{% load static %}
-{% load compress %}
-{% load core_tags %}
-
-{% block head %}
-    {% compress css %}
-    <link rel="stylesheet" href="{% static 'overlays/css/overlays.scss' %}" type="text/x-scss" />
-    {% endcompress %}
-    {% compress js %}
-    <script type="text/javascript" src="{% static 'overlays/js/overlays.js' %}" ></script>
-    {% endcompress %}
-    <script>
-        $(document).ready(function() { initOverlays('issue_send'); });
-    </script>
-{% endblock %}
-
-{% block content %}
-
-<div class="container">
-    <div class="row">
-        <form method="post" novalidate>
-            {% csrf_token %}
-
-            <div class="page col-md-9">
-                <h1>{% trans 'Send task' %}</h1>
-
-                <p class="mb-20">{% trans 'Sending a task will set the status to "in progress".' %}</p>
-
-                <div id="issue-message">
-                    {% include 'core/bootstrap_form_field.html' with field=form.subject %}
-                    {% include 'core/bootstrap_form_field.html' with field=form.message %}
-
-                    {% if mail_form.fields %}
-                    {% include 'projects/issue_send_email.html'%}
-                    {% endif %}
-                </div>
-
-                {% if integrations %}
-                    {% include 'projects/issue_send_integrations.html'%}
-                {% endif %}
-
-                <div id="support-info"></div>
-            </div>
-            <div class="sidebar col-md-3">
-                {% include 'projects/issue_send_sidebar.html'%}
-            </div>
-        </form>
-    </div>
-</div>
-
-
-{% render_lang_template 'projects/overlays/issue_send_issue_message' %}
-{% render_lang_template 'projects/overlays/issue_send_issue_attachments' %}
-{% render_lang_template 'projects/overlays/issue_send_support_info' %}
-
-{% endblock %}
diff --git a/rdmo/projects/templates/projects/issue_send_email.html b/rdmo/projects/templates/projects/issue_send_email.html
deleted file mode 100644
index c3ec3c62d9..0000000000
--- a/rdmo/projects/templates/projects/issue_send_email.html
+++ /dev/null
@@ -1,32 +0,0 @@
-{% load i18n %}
-{% load widget_tweaks %}
-
-<h2>{% trans 'Send by mail' %}</h2>
-
-{% if mail_form.recipients %}
-    {% include 'core/bootstrap_form_field.html' with field=mail_form.recipients %}
-{% endif %}
-
-{% if mail_form.recipients_input %}
-    {% with field=mail_form.recipients_input %}
-    <div class="form-group{% if field.errors %} has-error{% endif %} field-{{field.html_name}}">
-        {% if not mail_form.recipients %}
-        {# only show the label no label is shown for the recipients field above #}
-        <label for="{{ field.id_for_label }}">{{ field.label }}</label>
-        {% endif %}
-
-        {% render_field field class="form-control" rows=2 aria-label=field.label %}
-        {% if field.errors %}
-            <div class="help-block error">
-                <p class="text-danger">{{ field.errors.as_text}}</p>
-            </div>
-        {% endif %}
-    </div>
-    {% endwith %}
-{% endif %}
-
-<div class="text-right">
-    <button type="submit" class="btn btn-primary btn-xs" name="integration" value="{{ integration.id }}">
-        {% trans 'Send by mail' %}
-    </button>
-</div>
diff --git a/rdmo/projects/templates/projects/issue_send_integrations.html b/rdmo/projects/templates/projects/issue_send_integrations.html
deleted file mode 100644
index a47812bd65..0000000000
--- a/rdmo/projects/templates/projects/issue_send_integrations.html
+++ /dev/null
@@ -1,38 +0,0 @@
-{% load i18n %}
-
-<h2>{% trans 'Send via integration' %}</h2>
-
-<table class="table">
-    <thead>
-        <th style="width: 10%">{% trans 'Provider' %}</th>
-        <th style="width: 40%">{% trans 'Description' %}</th>
-        <th style="width: 40%">{% trans 'Options' %}</th>
-        <th style="width: 10%" aria-label="{% trans 'Actions' %}"></th>
-    </thead>
-    <tbody>
-        {% for integration in integrations %}
-        {% if integration.provider %}
-        <tr>
-            <td>{{ integration.provider.label }}</td>
-            <td>{{ integration.provider.description }}</td>
-            <td>
-                {% for option in integration.options.all %}
-                {% if not option.secret %}
-                <p>{{ option.title }}: {{ option.value }}</p>
-                {% endif %}
-                {% endfor %}
-
-                {% if integration.resources.exists %}
-                <p class="text-info">{% trans 'This task has already been send using this integration.' %}</p>
-                {% endif %}
-            </td>
-            <td class="text-right">
-                <button type="submit" class="btn btn-primary btn-xs" name="integration" value="{{ integration.id }}">
-                    {{ integration.provider.send_label }}
-                </button>
-            </td>
-        </tr>
-        {% endif %}
-        {% endfor %}
-    </tbody>
-</table>
diff --git a/rdmo/projects/templates/projects/issue_send_sidebar.html b/rdmo/projects/templates/projects/issue_send_sidebar.html
deleted file mode 100644
index 92034c99a1..0000000000
--- a/rdmo/projects/templates/projects/issue_send_sidebar.html
+++ /dev/null
@@ -1,9 +0,0 @@
-{% load i18n %}
-
-<h2 id="issue-attachments">{% trans 'Attachments' %}</h2>
-
-{% include 'core/bootstrap_form_field.html' with field=form.attachments_answers %}
-{% include 'core/bootstrap_form_field.html' with field=form.attachments_views %}
-{% include 'core/bootstrap_form_field.html' with field=form.attachments_files %}
-{% include 'core/bootstrap_form_field.html' with field=form.attachments_snapshot %}
-{% include 'core/bootstrap_form_field.html' with field=form.attachments_format %}
diff --git a/rdmo/projects/templates/projects/membership_confirm_delete.html b/rdmo/projects/templates/projects/membership_confirm_delete.html
deleted file mode 100644
index 0d037c9d77..0000000000
--- a/rdmo/projects/templates/projects/membership_confirm_delete.html
+++ /dev/null
@@ -1,19 +0,0 @@
-{% extends 'core/page.html' %}
-{% load i18n %}
-{% load core_tags %}
-{% load accounts_tags %}
-
-{% block page %}
-
-    <h1>{% trans "Delete membership" %}</h1>
-
-    <p>
-        {% full_name object.user as user %}
-        {% blocktrans with object.project.title as title trimmed %}
-        You are about to remove the user <strong>{{ user }}</strong> from the project <strong>{{ title }}</strong>.
-        {% endblocktrans %}
-    </p>
-
-    {% bootstrap_delete_form submit=_('Delete membership') %}
-
-{% endblock %}
diff --git a/rdmo/projects/templates/projects/membership_form.html b/rdmo/projects/templates/projects/membership_form.html
deleted file mode 100644
index 5dfb6f12bd..0000000000
--- a/rdmo/projects/templates/projects/membership_form.html
+++ /dev/null
@@ -1,39 +0,0 @@
-{% extends 'core/page.html' %}
-{% load i18n %}
-{% load core_tags %}
-
-{% block page %}
-
-{% if object %}
-
-    <h1>{% trans 'Update membership' %}</h1>
-
-    {% bootstrap_form submit=_('Update membership') %}
-
-{% else %}
-
-    <h1>{% trans 'Invite member to project' %}</h1>
-
-    <p class="text-muted">
-        {% blocktrans trimmed %}
-        You can invite a new member to this project and assign one of the following roles:
-        <b>Guest</b> (who can only read),
-        <b>Author</b> (who can answer questions),
-        <b>Manager</b> (who can additionally create snapshots, export the project, import values, and update the project settings)
-        or <b>Owner</b> (like you).
-        {% endblocktrans %}
-    </p>
-
-    <p class="text-muted">
-        {% trans 'Users can be invited by their username (if they already have an account here), or by their e-mail address.' %}
-    </p>
-
-    <p class="text-muted">
-        {% trans 'Users will receive an e-mail with a link to join the project with the assigned role.' %}
-    </p>
-
-    {% bootstrap_form submit=_('Invite member') %}
-
-{% endif %}
-
-{% endblock %}
diff --git a/rdmo/projects/templates/projects/old/project_detail.html b/rdmo/projects/templates/projects/old/project_detail.html
deleted file mode 100644
index 759291d5b0..0000000000
--- a/rdmo/projects/templates/projects/old/project_detail.html
+++ /dev/null
@@ -1,51 +0,0 @@
-{% extends 'core/page.html' %}
-{% load i18n %}
-{% load static %}
-{% load compress %}
-{% load core_tags %}
-
-{% block head %}
-    {% compress css %}
-    <link rel="stylesheet" href="{% static 'projects/css/project.scss' %}" type="text/x-scss" />
-    <link rel="stylesheet" href="{% static 'overlays/css/overlays.scss' %}" type="text/x-scss" />
-    {% endcompress %}
-    {% compress js %}
-    <script type="text/javascript" src="{% static 'overlays/js/overlays.js' %}" ></script>
-    {% endcompress %}
-    <script>
-        $(document).ready(function() {
-            initOverlays('project');
-            $('[data-toggle="tooltip"]').tooltip()
-        });
-    </script>
-{% endblock %}
-
-{% block sidebar %}
-
-    {% include 'projects/old/project_detail_sidebar.html' %}
-
-{% endblock %}
-
-{% block page %}
-
-    {% include 'projects/old/project_detail_header.html' %}
-    {% include 'projects/old/project_detail_issues.html' %}
-    {% include 'projects/old/project_detail_views.html' %}
-    {% include 'projects/old/project_detail_memberships.html' %}
-    {% include 'projects/old/project_detail_invites.html' %}
-    {% include 'projects/old/project_detail_snapshots.html' %}
-    {% include 'projects/old/project_detail_integrations.html' %}
-
-    <div id="support-info"></div>
-
-    {% render_lang_template 'projects/overlays/project_project_questions' %}
-    {% render_lang_template 'projects/overlays/project_project_catalog' %}
-    {% render_lang_template 'projects/overlays/project_project_issues' %}
-    {% render_lang_template 'projects/overlays/project_project_views' %}
-    {% render_lang_template 'projects/overlays/project_project_memberships' %}
-    {% render_lang_template 'projects/overlays/project_project_snapshots' %}
-    {% render_lang_template 'projects/overlays/project_export_project' %}
-    {% render_lang_template 'projects/overlays/project_import_project' %}
-    {% render_lang_template 'projects/overlays/project_support_info' %}
-
-{% endblock %}
diff --git a/rdmo/projects/templates/projects/old/project_detail_header.html b/rdmo/projects/templates/projects/old/project_detail_header.html
deleted file mode 100644
index ca4c10e779..0000000000
--- a/rdmo/projects/templates/projects/old/project_detail_header.html
+++ /dev/null
@@ -1,53 +0,0 @@
-{% load i18n %}
-{% load rules %}
-{% load mptt_tags %}
-{% load accounts_tags %}
-
-{% has_perm 'projects.change_project_object' request.user project as can_change_project %}
-{% has_perm 'projects.change_visibility_object' request.user project as can_change_visibility %}
-
-<div class="project-header">
-    <h1>{{ project.title }}</h1>
-
-    <table class="table">
-        <tbody>
-            <tr>
-                <td style="width: 20%;">
-                    <strong>{% trans 'Description' %}</strong>
-                </td>
-                <td>
-                    {% include 'projects/old/project_detail_header_description.html' %}
-                </td>
-            </tr>
-            <tr id="project-catalog">
-                <td>
-                    <strong>{% trans 'Catalog' %}</strong>
-                </td>
-                <td>
-                    {% include 'projects/old/project_detail_header_catalog.html' %}
-                </td>
-            </tr>
-            {% if settings.PROJECT_VISIBILITY and project.visibility %}
-            <tr id="project-visibility">
-                <td>
-                    <strong>{% trans 'Visibility' %}</strong>
-                </td>
-                <td>
-                    {% include 'projects/project_detail_header_visibility.html' %}
-                </td>
-            </tr>
-            {% endif %}
-            {% if project.is_child_node or project.get_descendant_count %}
-            {% drilldown_tree_for_node project as project_tree all_descendants %}
-            <tr>
-                <td>
-                    <strong>{% trans 'Project hierarchy' %}</strong>
-                </td>
-                <td>
-                    {% include 'projects/old/project_detail_header_hierarchy.html' %}
-                </td>
-            </tr>
-            {% endif %}
-        </tbody>
-    </table>
-</div>
diff --git a/rdmo/projects/templates/projects/old/project_detail_header_catalog.html b/rdmo/projects/templates/projects/old/project_detail_header_catalog.html
deleted file mode 100644
index 2aa01f1f3c..0000000000
--- a/rdmo/projects/templates/projects/old/project_detail_header_catalog.html
+++ /dev/null
@@ -1,17 +0,0 @@
-{% load i18n %}
-{% load core_tags %}
-
-{% if can_change_project  %}
-<p class="pull-right">
-    <a href="{% url 'project_update_catalog' project.pk %}" title="{% trans 'Update project catalog' %}">
-        <i class="fa fa-pencil" aria-hidden="true"></i>
-    </a>
-</p>
-{% endif %}
-
-<p>
-    <strong>{{ project.catalog.title|markdown }}</strong>
-</p>
-<p>
-    {{ project.catalog.help|markdown }}
-</p>
diff --git a/rdmo/projects/templates/projects/old/project_detail_header_description.html b/rdmo/projects/templates/projects/old/project_detail_header_description.html
deleted file mode 100644
index 6b6ac86fbf..0000000000
--- a/rdmo/projects/templates/projects/old/project_detail_header_description.html
+++ /dev/null
@@ -1,14 +0,0 @@
-{% load i18n %}
-
-{% if can_change_project %}
-<p class="pull-right">
-    <a href="{% url 'project_update_information' project.pk %}" title="{% trans 'Update project information' %}">
-        <i class="fa fa-pencil" aria-hidden="true"></i>
-    </a>
-</p>
-{% endif %}
-{% if project.description %}
-{{ project.description }}
-{% else %}
-{% trans 'No description available.' %}
-{% endif %}
diff --git a/rdmo/projects/templates/projects/old/project_detail_header_hierarchy.html b/rdmo/projects/templates/projects/old/project_detail_header_hierarchy.html
deleted file mode 100644
index eb3b2b50e7..0000000000
--- a/rdmo/projects/templates/projects/old/project_detail_header_hierarchy.html
+++ /dev/null
@@ -1,32 +0,0 @@
-{% load i18n %}
-{% load rules %}
-{% load projects_tags %}
-
-{% if can_change_project %}
-<p class="pull-right">
-    <a href="{% url 'project_update_parent' project.pk %}" title="{% trans 'Update parent project' %}">
-        <i class="fa fa-pencil" aria-hidden="true"></i>
-    </a>
-</p>
-{% endif %}
-
-<ul class="list-unstyled">
-{% for node in project_tree %}
-    <li>
-        {% projects_indent node.level %}
-
-        {% has_perm 'projects.view_project_object' request.user node as can_view_parent_project %}
-        {% if can_view_parent_project %}
-           <a href="{% url 'project' node.id %}">
-                {% if node.id == project.id %}
-                <strong>{{ node.title }}</strong> {% project_progress_text node %}
-                {% else %}
-                {{ node.title }} {% project_progress_text node %}
-                {% endif %}
-            </a>
-        {% else %}
-        {{ node.title }} {% project_progress_text node %}
-        {% endif %}
-    </li>
-{% endfor %}
-</ul>
diff --git a/rdmo/projects/templates/projects/old/project_detail_integrations.html b/rdmo/projects/templates/projects/old/project_detail_integrations.html
deleted file mode 100644
index 4f2d69bcce..0000000000
--- a/rdmo/projects/templates/projects/old/project_detail_integrations.html
+++ /dev/null
@@ -1,65 +0,0 @@
-{% load i18n %}
-{% load rules %}
-{% load accounts_tags %}
-
-{% has_perm 'projects.add_integration_object' request.user project as can_add_integration %}
-{% has_perm 'projects.change_integration_object' request.user project as can_change_integration %}
-{% has_perm 'projects.delete_integration_object' request.user project as can_delete_integration %}
-
-{% if integrations %}
-
-    <h2>{% trans 'Integrations' %}</h2>
-
-    {% include 'projects/old/project_detail_integrations_help.html' %}
-
-    <table class="table">
-        <thead>
-            <th style="width: 10%">{% trans 'Provider' %}</th>
-            <th style="width: 50%">{% trans 'Description' %}</th>
-            <th style="width: 30%">{% trans 'Options' %}</th>
-            <th style="width: 10%" aria-label="{% trans 'Actions' %}"></th>
-        </thead>
-        <tbody>
-            {% for integration in integrations %}
-            {% if integration.provider %}
-            <tr>
-                <td>
-                    {{ integration.provider.label }}
-                </td>
-                <td>
-                    {{ integration.provider.description }}
-                </td>
-                <td>
-                    {% for option in integration.options.all %}
-                    {% if not option.secret %}
-                    {{ option.title }}: {{ option.value }}<br />
-                    {% endif %}
-                    {% endfor %}
-
-                    {% if integration.project != project %}
-                    ({% trans 'from' %} <a href="{% url 'project' integration.project.id %}">{{ integration.project.title }}</a>)
-                    {% endif %}
-                </td>
-                <td class="text-right">
-                    {% if integration.project == project %}
-
-                    {% if can_change_integration %}
-                    <a href="{% url 'integration_update' project.pk integration.pk %}" class="fa fa-pencil"
-                        title="{% trans 'Update integration' %}">
-                    </a>
-                    {% endif %}
-                    {% if can_delete_integration %}
-                    <a href="{% url 'integration_delete' project.pk integration.pk %}" class="fa fa-remove"
-                        title="{% trans 'Delete integration' %}">
-                    </a>
-                    {% endif %}
-
-                    {% endif %}
-                </td>
-            </tr>
-            {% endif %}
-            {% endfor %}
-        </tbody>
-    </table>
-
-{% endif %}
diff --git a/rdmo/projects/templates/projects/old/project_detail_integrations_help.html b/rdmo/projects/templates/projects/old/project_detail_integrations_help.html
deleted file mode 100644
index c3f0683023..0000000000
--- a/rdmo/projects/templates/projects/old/project_detail_integrations_help.html
+++ /dev/null
@@ -1,7 +0,0 @@
-{% load i18n %}
-
-    <p class="text-muted">
-        {% blocktrans trimmed %}
-        Integrations can be used to send tasks to various external tools. Please follow the descriptions of the integrations to use them.
-        {% endblocktrans %}
-    </p>
diff --git a/rdmo/projects/templates/projects/old/project_detail_invites.html b/rdmo/projects/templates/projects/old/project_detail_invites.html
deleted file mode 100644
index 23ed384600..0000000000
--- a/rdmo/projects/templates/projects/old/project_detail_invites.html
+++ /dev/null
@@ -1,44 +0,0 @@
-{% load i18n %}
-{% load rules %}
-{% load accounts_tags %}
-
-{% has_perm 'projects.view_invite_object' request.user project as can_view_invite %}
-{% has_perm 'projects.delete_invite_object' request.user project as can_delete_invite %}
-
-{% if can_view_invite and invites %}
-
-    <h2>{% trans 'Invites' %}</h2>
-
-    <table class="table">
-        <thead>
-            <th style="width: 30%">{% trans 'User' %}</th>
-            <th style="width: 30%">{% trans 'E-Mail' %}</th>
-            <th style="width: 30%">{% trans 'Role' %}</th>
-            <th style="width: 10%" aria-label="{% trans 'Actions' %}"></th>
-        </thead>
-        <tbody>
-            {% for invite in invites %}
-            <tr>
-                <td>
-                    {% if invite.user %}
-                    {% full_name invite.user %}
-                    {% endif %}
-                </td>
-                <td>
-                    <a href="mailto:{{ invite.email }}">{{ invite.email }}</a>
-                </td>
-                <td>
-                    {{ invite.get_role_display }}
-                </td>
-                <td class="text-right">
-                    {% if can_delete_invite %}
-                    <a href="{% url 'invite_delete' project.id invite.id %}" class="fa fa-remove"
-                        title="{% trans 'Delete invite' %}">
-                    </a>
-                    {% endif %}
-                </td>
-            {% endfor %}
-        </tbody>
-    </table>
-
-{% endif %}
diff --git a/rdmo/projects/templates/projects/old/project_detail_issues.html b/rdmo/projects/templates/projects/old/project_detail_issues.html
deleted file mode 100644
index 65f7c94665..0000000000
--- a/rdmo/projects/templates/projects/old/project_detail_issues.html
+++ /dev/null
@@ -1,92 +0,0 @@
-{% load i18n %}
-{% load rules %}
-{% load core_tags %}
-
-{% has_perm 'projects.change_project_object' request.user project as can_change_project %}
-
-{% if settings.PROJECT_ISSUES and tasks_available %}
-
-<div id="project-issues">
-
-    <h2>{% trans 'Tasks' %}</h2>
-
-    {% include 'projects/old/project_detail_issues_help.html' %}
-
-    {% if issues %}
-
-        <table class="table">
-            <thead>
-                <th style="width: 10%">{% trans 'Task' %}</th>
-                <th style="width: 50%">{% trans 'Description' %}</th>
-                <th style="width: 15%">{% trans 'Time frame' %}</th>
-                <th style="width: 15%">{% trans 'Status' %}</th>
-                <th style="width: 10%" class="text-right" aria-label="{% trans 'Actions' %}">
-                {% if can_change_project and not settings.PROJECT_TASKS_SYNC  %}
-                    <a href="{% url 'project_update_tasks' project.pk %}" title="{% trans 'Update project tasks.' %}">
-                        <i class="fa fa-pencil" aria-hidden="true"></i>
-                    </a>
-                {% endif %}
-                </th>
-            </thead>
-            <tbody>
-                {% for issue in issues %}
-                <tr>
-                    <td>
-                        <a href="{% url 'issue' project.pk issue.pk %}">
-                            {{ issue.task.title|markdown }}
-                        </a>
-                    </td>
-                    <td>{{ issue.task.text|markdown }}</td>
-                    <td>
-                    {% for dates in issue.dates %}
-                        {% if dates|length > 1 %}
-                        <p>{{ dates.0 | date:"DATE_FORMAT" }}<br /> - {{ dates.1 | date:"DATE_FORMAT" }}</p>
-                        {% else %}
-                        <p>{{ dates.0 | date:"DATE_FORMAT" }}</p>
-                        {% endif %}
-                    {% endfor %}
-                    </td>
-                    <td>{{ issue.get_status_display }}</td>
-                    <td class="text-right">
-                        <a href="{% url 'issue' project.pk issue.pk %}" class="fa fa-eye"
-                            title="{% trans 'Show task' %}">
-                        </a>
-                        <a href="{% url 'issue_update' project.pk issue.pk %}" class="fa fa-pencil"
-                            title="{% trans 'Update task status' %}">
-                        </a>
-                        {% if settings.PROJECT_SEND_ISSUE %}
-                        <a href="{% url 'issue_send' project.pk issue.pk %}" class="fa fa-paper-plane"
-                            title="{% trans 'Send task' %}">
-                        </a>
-                        {% endif %}
-                    </td>
-                </tr>
-                {% endfor %}
-            </tbody>
-        </table>
-
-    {% else %}
-
-        {% if can_change_project and not settings.PROJECT_TASKS_SYNC %}
-            <p class="project-update">
-                <a href="{% url 'project_update_tasks' project.pk %}" title="{% trans 'Update project tasks.' %}">
-                    <i class="fa fa-pencil" aria-hidden="true"></i>
-                </a>
-            </p>
-        {% endif %}
-
-        {% if project.tasks.exists %}
-            <p>
-                {% trans 'No active tasks found.' %}
-            </p>
-        {% else %}
-            <p>
-                {% trans 'No tasks are configured for this project.' %}
-            </p>
-        {% endif %}
-
-    {% endif %}
-
-</div>
-
-{% endif %}
diff --git a/rdmo/projects/templates/projects/old/project_detail_issues_help.html b/rdmo/projects/templates/projects/old/project_detail_issues_help.html
deleted file mode 100644
index 284fd3b100..0000000000
--- a/rdmo/projects/templates/projects/old/project_detail_issues_help.html
+++ /dev/null
@@ -1,7 +0,0 @@
-{% load i18n %}
-
-    <p class="text-muted">
-        {% blocktrans trimmed %}
-        Tasks are generated automatically from the answers given in the project. On the page of each task you can see which of your answers lead to the activation of the task.
-        {% endblocktrans %}
-    </p>
diff --git a/rdmo/projects/templates/projects/old/project_detail_memberships.html b/rdmo/projects/templates/projects/old/project_detail_memberships.html
deleted file mode 100644
index 05edbc5a7d..0000000000
--- a/rdmo/projects/templates/projects/old/project_detail_memberships.html
+++ /dev/null
@@ -1,75 +0,0 @@
-{% load i18n %}
-{% load rules %}
-{% load static %}
-{% load accounts_tags %}
-
-{% has_perm 'projects.add_membership_object' request.user project as can_add_membership %}
-{% has_perm 'projects.change_membership_object' request.user project as can_change_membership %}
-{% has_perm 'projects.delete_membership_object' request.user project as can_delete_membership %}
-
-{% has_perm 'projects.is_project_owner' request.user project as is_project_owner %}
-
-<div id="project-memberships">
-
-    <h2>{% trans 'Members' %}</h2>
-
-    {% include 'projects/old/project_detail_memberships_help.html' %}
-
-    <table class="table table-membership">
-        <thead>
-            <th style="width: 30%">{% trans 'User' %}</th>
-            <th style="width: 30%">{% trans 'E-Mail' %}</th>
-            <th style="width: 30%">{% trans 'Role' %}</th>
-            <th style="width: 10%" class="text-right" aria-label="{% trans 'Actions' %}">
-                {% if can_add_membership %}
-                    <a href="{% url 'membership_create' project.pk %}" title="{% trans 'Add member' %}">
-                        <i class="fa fa-plus" aria-hidden="true"></i>
-                    </a>
-                {% endif %}
-            </th>
-        </thead>
-        <tbody>
-            {% for membership in memberships %}
-            <tr>
-                <td>
-                    {% full_name membership.user %}
-                    {% include 'projects/old/project_detail_memberships_socialaccounts.html' %}
-                </td>
-                <td>
-                    <a href="mailto:{{ membership.user.email }}">{{ membership.user.email }}</a>
-                </td>
-                <td>
-                    {% if membership.project == project %}
-                    {{ membership.get_role_display }}
-                    {% else %}
-                    {{ membership.get_role_display }}
-                    {% trans 'of' %}
-                    <a href="{% url 'project' membership.project.id %}">{{ membership.project.title }}</a>
-                    {% endif %}
-                </td>
-                <td class="text-right">
-                    {% if membership.project == project %}
-
-                    {% if not membership.is_last_owner and can_change_membership %}
-                    <a href="{% url 'membership_update' project.pk membership.id %}" class="fa fa-pencil"
-                        title="{% trans 'Update membership' %}">
-                    </a>
-                    {% endif %}
-
-                    {% if membership.user == request.user and not membership.is_last_owner %}
-                    <a href="{% url 'project_leave' project.pk %}" class="fa fa-sign-out"
-                        title="{% trans 'Leave project' %}">
-                    </a>
-                    {% elif can_change_membership and not membership.is_last_owner %}
-                    <a href="{% url 'membership_delete' project.pk membership.id %}" class="fa fa-remove"
-                        title="{% trans 'Delete membership' %}">
-                    </a>
-                    {% endif %}
-
-                    {% endif %}
-                </td>
-            </tr>
-            {% endfor %}
-        </tbody>
-    </table>
-</div>
diff --git a/rdmo/projects/templates/projects/old/project_detail_memberships_help.html b/rdmo/projects/templates/projects/old/project_detail_memberships_help.html
deleted file mode 100644
index b7a2eb79e9..0000000000
--- a/rdmo/projects/templates/projects/old/project_detail_memberships_help.html
+++ /dev/null
@@ -1,7 +0,0 @@
-{% load i18n %}
-
-    <p class="text-muted">
-        {% blocktrans trimmed %}
-        Here you can see who can access the project and invite additional members. You can use the user roles to manage which rights the users have. Unless you are the last owner, you can leave the project with the button next to your name.
-        {% endblocktrans %}
-    </p>
diff --git a/rdmo/projects/templates/projects/old/project_detail_memberships_socialaccounts.html b/rdmo/projects/templates/projects/old/project_detail_memberships_socialaccounts.html
deleted file mode 100644
index 2ba72de77d..0000000000
--- a/rdmo/projects/templates/projects/old/project_detail_memberships_socialaccounts.html
+++ /dev/null
@@ -1,9 +0,0 @@
-{% load static %}
-
-{% for socialaccount in membership.user.socialaccount_set.all %}
-{% if socialaccount.provider == 'orcid' %}
-<a href="https://orcid.org/{{ socialaccount.uid }}">
-    <img alt="ORCID logo" src="{% static 'accounts/img/orcid_16x16.png' %}" width="16" height="16" />
-</a>
-{% endif %}
-{% endfor %}
diff --git a/rdmo/projects/templates/projects/old/project_detail_sidebar.html b/rdmo/projects/templates/projects/old/project_detail_sidebar.html
deleted file mode 100644
index fc51cee15a..0000000000
--- a/rdmo/projects/templates/projects/old/project_detail_sidebar.html
+++ /dev/null
@@ -1,177 +0,0 @@
-{% load i18n %}
-{% load rules %}
-{% load core_tags %}
-
-{% has_perm 'projects.change_project_object' request.user project as can_change_project %}
-{% has_perm 'projects.delete_project_object' request.user project as can_delete_project %}
-{% has_perm 'projects.leave_project_object' request.user project as can_leave_project %}
-
-{% has_perm 'projects.change_value_object' request.user project as can_change_value %}
-
-<h2>{% trans 'Options' %}</h2>
-
-<ul class="list-unstyled">
-    <li id="project-questions">
-        <strong>
-            {% if can_change_value %}
-            <a href="{% url 'project_interview' project.pk %}">{% trans 'Answer questions' %}</a>
-            {% else %}
-            <a href="{% url 'project_interview' project.pk %}">{% trans 'View questions' %}</a>
-            {% endif %}
-        </strong>
-    </li>
-</ul>
-
-<ul class="list-unstyled">
-    <li>
-        <strong>
-            <a href="{% url 'project_answers' project.pk %}">{% trans 'View answers' %}</a>
-        </strong>
-    </li>
-</ul>
-
-{% if can_leave_project and membership and not membership.is_last_owner %}
-<ul class="list-unstyled">
-    <li>
-        <a href="{% url 'project_leave' project.pk %}">{% trans 'Leave project' %}</a>
-    </li>
-</ul>
-{% endif %}
-
-<ul class="list-unstyled">
-    {% if can_change_project %}
-    <li>
-        <a href="{% url 'project_update_information' project.pk %}">{% trans 'Update project information' %}</a>
-    </li>
-    <li>
-        <a href="{% url 'project_update_catalog' project.pk %}">{% trans 'Update project catalog' %}</a>
-    </li>
-    {% if settings.NESTED_PROJECTS %}
-    <li>
-        <a href="{% url 'project_update_parent' project.pk %}">{% trans 'Update parent project' %}</a>
-    </li>
-    {% endif %}
-    {% if settings.PROJECT_ISSUES and tasks_available and not settings.PROJECT_TASKS_SYNC %}
-    <li>
-        <a href="{% url 'project_update_tasks' project.pk %}">{% trans 'Update project tasks' %}</a>
-    </li>
-    {% endif %}
-    {% if settings.PROJECT_VIEWS and views_available and not settings.PROJECT_VIEWS_SYNC %}
-    <li>
-        <a href="{% url 'project_update_views' project.pk %}">{% trans 'Update project views' %}</a>
-    </li>
-    {% endif %}
-    {% endif %}
-    <li>
-        <a href="{% url 'project_copy' project.pk %}">{% trans 'Copy project' %}</a>
-    </li>
-    {% if can_delete_project %}
-    <li>
-        <a href="{% url 'project_delete' project.pk %}">{% trans 'Delete project' %}</a>
-    </li>
-    {% endif %}
-</ul>
-
-{% has_perm 'projects.change_visibility_object' request.user project as can_change_visibility %}
-{% if settings.PROJECT_VISIBILITY and can_change_visibility %}
-<ul class="list-unstyled">
-    <li>
-        <a href="{% url 'project_update_visibility' project.pk %}">
-            {% if not project.visibility %}
-            {% trans 'Make project visible' %}
-            {% else %}
-            {% trans 'Update project visibility' %}
-            {% endif %}
-        </a>
-    </li>
-</ul>
-{% endif %}
-
-{% has_perm 'projects.add_membership_object' request.user project as can_add_membership %}
-{% if can_add_membership %}
-<ul class="list-unstyled">
-    <li>
-        <a href="{% url 'membership_create' project.pk %}">{% trans 'Add member' %}</a>
-    </li>
-</ul>
-{% endif %}
-
-{% has_perm 'projects.add_snapshot_object' request.user project as can_add_snapshot %}
-{% if can_add_snapshot %}
-<ul class="list-unstyled">
-    <li>
-        <a href="{% url 'snapshot_create' project.pk %}">{% trans 'Create snapshot' %}</a>
-    </li>
-</ul>
-{% endif %}
-
-{% has_perm 'projects.add_integration_object' request.user project as can_add_integration %}
-{% if providers and can_add_integration %}
-<ul class="list-unstyled">
-    {% for provider_key, provider in providers.items %}
-    <li>
-        <a href="{% url 'integration_create' project.pk provider_key %}">{{ provider.add_label }}</a>
-    </li>
-    {% endfor %}
-</ul>
-{% endif %}
-
-<ul class="list-unstyled">
-    <li>
-        <a href="{% url 'projects' %}">{% trans 'Back to projects overview' %}</a>
-    </li>
-</ul>
-
-{% has_perm 'projects.export_project_object' request.user project as can_export_project %}
-{% if settings.PROJECT_EXPORTS and can_export_project %}
-<h2 id="export-project">{% trans 'Export' %}</h2>
-
-<ul class="list-unstyled">
-    {% for key, label, class in settings.PROJECT_EXPORTS %}
-    <li>
-        <a href="{% url 'project_export' project.pk key %}" target="_blank">
-            {{ label }}
-        </a>
-    </li>
-    {% endfor %}
-</ul>
-{% endif %}
-
-{% has_perm 'projects.import_project_object' request.user project as can_import_project %}
-{% if settings.PROJECT_IMPORTS and can_import_project %}
-<h2 id="import-project">{% trans 'Import values' %}</h2>
-
-<ul class="list-unstyled">
-    <li>
-        <p>
-            <strong>{% trans 'Import from file' %}</strong>
-        </p>
-        {% url 'project_update_import' project.id as upload_url %}
-        {% include 'core/upload_form.html' with upload_url=upload_url label=True %}
-    </li>
-    {% if settings.NESTED_PROJECTS and ancestors_import %}
-    <li>
-        <p>
-            <strong>{% trans 'Import from parent project' %}</strong>
-        </p>
-        {% include 'projects/project_detail_sidebar_parent_import.html' %}
-    </li>
-    {% endif %}
-    {% if settings.PROJECT_IMPORTS_LIST %}
-    <li>
-        <p>
-            <strong>{% trans 'Import directly' %}</strong>
-        </p>
-    </li>
-    {% for key, label, class in settings.PROJECT_IMPORTS %}
-    {% if key in settings.PROJECT_IMPORTS_LIST %}
-    <li>
-        <a href="{% url 'project_update_import' project.id key %}" target="_blank">
-            {{ label }}
-        </a>
-    </li>
-    {% endif %}
-    {% endfor %}
-    {% endif %}
-</ul>
-{% endif %}
diff --git a/rdmo/projects/templates/projects/old/project_detail_sidebar_parent_import.html b/rdmo/projects/templates/projects/old/project_detail_sidebar_parent_import.html
deleted file mode 100644
index d9a47c8ff5..0000000000
--- a/rdmo/projects/templates/projects/old/project_detail_sidebar_parent_import.html
+++ /dev/null
@@ -1,20 +0,0 @@
-{% load i18n %}
-
-<form class="sidebar-form" action="{% url 'project_update_import' project.id %}" method="post">
-    {% csrf_token %}
-
-    <input type="hidden" name="method" value="import_project">
-
-    <select class="form-control" name="source">
-        {% for project in ancestors_import %}
-        <option value="{{ project.id }}">{{ project.title }}</option>
-        {% endfor %}
-    </select>
-
-    <div class="sidebar-form-button">
-        <button type="submit" class="btn btn-primary" type="submit"
-                title="{% trans 'Import' %}" aria-label="{% trans 'Import' %}">
-            <i class="fa fa-arrow-right" aria-hidden="true"></i>
-        </button>
-    </div>
-</form>
diff --git a/rdmo/projects/templates/projects/old/project_detail_snapshots.html b/rdmo/projects/templates/projects/old/project_detail_snapshots.html
deleted file mode 100644
index c1353c4c3c..0000000000
--- a/rdmo/projects/templates/projects/old/project_detail_snapshots.html
+++ /dev/null
@@ -1,98 +0,0 @@
-{% load i18n %}
-{% load rules %}
-
-{% has_perm 'projects.add_snapshot_object' request.user project as can_add_snapshot %}
-{% has_perm 'projects.change_snapshot_object' request.user project as can_change_snapshot %}
-{% has_perm 'projects.rollback_snapshot_object' request.user project as can_rollback_snapshot %}
-
-{% if snapshots or can_add_snapshot or can_change_snapshot or can_rollback_snapshot %}
-
-<div id="project-snapshots">
-
-    <h2>{% trans 'Snapshots' %}</h2>
-
-    {% include 'projects/old/project_detail_snapshots_help.html' %}
-
-    {% if snapshots %}
-
-        <table class="table">
-            <thead>
-                <th style="width: 20%">{% trans 'Snapshot' %}</th>
-                <th style="width: 30%">{% trans 'Description' %}</th>
-                <th style="width: 30%">{% trans 'Created' %}</th>
-                <th style="width: 20%" class="text-right" aria-label="{% trans 'Actions' %}">
-                {% if can_add_snapshot %}
-                    <a href="{% url 'snapshot_create' project.pk %}" title="{% trans 'Create snapshot' %}">
-                        <i class="fa fa-plus" aria-hidden="true"></i>
-                    </a>
-                {% endif %}
-                </th>
-            </thead>
-            <tbody>
-                {% for snapshot in snapshots %}
-                <tr>
-                    <td>
-                        {{ snapshot.title }}
-                    </td>
-                    <td>
-                        {{ snapshot.description }}
-                    </td>
-                    <td>
-                        {{ snapshot.created }}
-                    </td>
-                    <td class="text-right">
-                        <a href="{% url 'project_answers' project.pk snapshot.id %}" class="fa fa-eye"
-                            title="{% trans 'View answers' %}">
-                        </a>
-                        {% if can_change_snapshot %}
-                        <a href="{% url 'snapshot_update' project.pk snapshot.id %}" class="fa fa-pencil"
-                            title="{% trans 'Update snapshot' %}">
-                        </a>
-                        {% endif %}
-                        {% if can_rollback_snapshot %}
-                        <a href="{% url 'snapshot_rollback' project.pk snapshot.id %}" class="fa fa-reply"
-                            title="{% trans 'Rollback to snapshot' %}">
-                        </a>
-                        {% endif %}
-
-                        {% has_perm 'projects.export_project_object' request.user project as can_export_project %}
-                        {% if settings.PROJECT_SNAPSHOT_EXPORTS and can_export_project %}
-                        <span class="dropdown">
-                            <button type="submit" class="btn-link fa fa-download"
-                                    title="{% trans 'Export snapshot' %}" aria-label="{% trans 'Export snapshot' %}"
-                                    data-toggle="dropdown"></button>
-
-                            <ul class="dropdown-menu">
-                                {% for key, label, class in settings.PROJECT_SNAPSHOT_EXPORTS %}
-                                <li>
-                                    <a href="{% url 'snapshot_export' project.id snapshot.id key %}" target="_blank">
-                                        {{ label }}
-                                    </a>
-                                </li>
-                                {% endfor %}
-                            {% endif %}
-                            </ul>
-                        </span>
-                    </td>
-                </tr>
-                {% endfor %}
-            </tbody>
-        </table>
-
-    {% else %}
-
-        {% if can_add_snapshot %}
-            <p class="project-update">
-                <a href="{% url 'snapshot_create' project.pk %}" title="{% trans 'Create snapshot' %}">
-                    <i class="fa fa-plus" aria-hidden="true"></i>
-                </a>
-            </p>
-        {% endif %}
-
-        <p>{% trans 'No snapshots found.' %}</p>
-
-    {% endif %}
-
-</div>
-
-{% endif %}
diff --git a/rdmo/projects/templates/projects/old/project_detail_snapshots_help.html b/rdmo/projects/templates/projects/old/project_detail_snapshots_help.html
deleted file mode 100644
index d1578b4b1a..0000000000
--- a/rdmo/projects/templates/projects/old/project_detail_snapshots_help.html
+++ /dev/null
@@ -1,7 +0,0 @@
-{% load i18n %}
-
-    <p class="text-muted">
-        {% blocktrans trimmed %}
-        Snapshots allow you to save all responses at a given point in time and preserve a certain stage of the project. Later the snapshot can be used to create views, and the project can also be reset to a previous snapshot if needed.
-        {% endblocktrans %}
-    </p>
diff --git a/rdmo/projects/templates/projects/old/project_detail_views.html b/rdmo/projects/templates/projects/old/project_detail_views.html
deleted file mode 100644
index 71e15fc71d..0000000000
--- a/rdmo/projects/templates/projects/old/project_detail_views.html
+++ /dev/null
@@ -1,64 +0,0 @@
-{% load i18n %}
-{% load rules %}
-{% load core_tags %}
-
-{% has_perm 'projects.change_project_object' request.user project as can_change_project %}
-
-{% if settings.PROJECT_VIEWS and views_available %}
-
-<div id="project-views">
-
-    <h2>{% trans 'Views' %}</h2>
-
-    {% include 'projects/old/project_detail_views_help.html' %}
-
-    {% if views %}
-
-        <table class="table">
-            <thead>
-                <th style="width: 20%">{% trans 'View' %}</th>
-                <th style="width: 60%">{% trans 'Description' %}</th>
-                <th style="width: 20%" class="text-right" aria-label="{% trans 'Actions' %}">
-                    {% if can_change_project and not settings.PROJECT_VIEWS_SYNC %}
-                    <a href="{% url 'project_update_views' project.pk %}" title="{% trans 'Update project views' %}">
-                        <i class="fa fa-pencil" aria-hidden="true"></i>
-                    </a>
-                    {% endif %}
-                </th>
-            </thead>
-            <tbody>
-                {% for view in views %}
-                <tr>
-                    <td>
-                        <a href="{% url 'project_view' project.pk view.pk %}">{{ view.title|markdown }}</a>
-                    </td>
-                    <td>{{ view.help|markdown }}</td>
-                    <td class="text-right">
-                        <a href="{% url 'project_view' project.pk view.pk %}" class="fa fa-eye"
-                            title="{% trans 'Display view' %}">
-                        </a>
-                    </td>
-                </tr>
-                {% endfor %}
-            </tbody>
-        </table>
-
-    {% else %}
-
-        {% if can_change_project and not settings.PROJECT_VIEWS_SYNC %}
-            <p class="project-update">
-                <a href="{% url 'project_update_views' project.pk %}" title="{% trans 'Update project views' %}">
-                    <i class="fa fa-pencil" aria-hidden="true"></i>
-                </a>
-            </p>
-        {% endif %}
-
-        <p>
-            {% trans 'No views are configured for this project.' %}
-        </p>
-
-    {% endif %}
-
-</div>
-
-{% endif %}
diff --git a/rdmo/projects/templates/projects/old/project_detail_views_help.html b/rdmo/projects/templates/projects/old/project_detail_views_help.html
deleted file mode 100644
index 264e522b01..0000000000
--- a/rdmo/projects/templates/projects/old/project_detail_views_help.html
+++ /dev/null
@@ -1,7 +0,0 @@
-{% load i18n %}
-
-    <p class="text-muted">
-        {% blocktrans trimmed %}
-        Views are created using the answers given in the project and can then be exported in various formats. Initially, all views are empty. Please answer some questions by visiting <strong>Answer Questions</strong> (at the top of the sidebar).
-        {% endblocktrans %}
-    </p>
diff --git a/rdmo/projects/templates/projects/overlays/issue_send_issue_attachments_de.html b/rdmo/projects/templates/projects/overlays/issue_send_issue_attachments_de.html
deleted file mode 100644
index 33922e9490..0000000000
--- a/rdmo/projects/templates/projects/overlays/issue_send_issue_attachments_de.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<div class="overlay" id="issue-attachments-overlay"
-    data-title="Ansichten"
-    data-placement="left auto">
-
-    Hier können Sie eine passende Ansicht im gewünschten Format an Ihre Nachricht anhängen.
-
-    {% include 'overlays/buttons.html'%}
-</div>
diff --git a/rdmo/projects/templates/projects/overlays/issue_send_issue_attachments_en.html b/rdmo/projects/templates/projects/overlays/issue_send_issue_attachments_en.html
deleted file mode 100644
index c47a3328c6..0000000000
--- a/rdmo/projects/templates/projects/overlays/issue_send_issue_attachments_en.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<div class="overlay" id="issue-attachments-overlay"
-    data-title="Views"
-    data-placement="left auto">
-
-    Here you can attach a suitable view in the desired format to your message.
-
-    {% include 'overlays/buttons.html'%}
-</div>
diff --git a/rdmo/projects/templates/projects/overlays/issue_send_issue_attachments_fr.html b/rdmo/projects/templates/projects/overlays/issue_send_issue_attachments_fr.html
deleted file mode 100644
index b652e5f27a..0000000000
--- a/rdmo/projects/templates/projects/overlays/issue_send_issue_attachments_fr.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<div class="overlay" id="issue-attachments-overlay"
-    data-title="Vues"
-    data-placement="left auto">
-
-    Ici, vous pouvez joindre à votre message une vue appropriée dans le format souhaité.
-
-    {% include 'overlays/buttons.html'%}
-</div>
diff --git a/rdmo/projects/templates/projects/overlays/issue_send_issue_attachments_it.html b/rdmo/projects/templates/projects/overlays/issue_send_issue_attachments_it.html
deleted file mode 100644
index 2d96ec65ee..0000000000
--- a/rdmo/projects/templates/projects/overlays/issue_send_issue_attachments_it.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<div class="overlay" id="issue-attachments-overlay"
-    data-title="Viste"
-    data-placement="left auto">
-
-    Qui puoi allegare al tuo messaggio una vista adatta nel formato desiderato.
-
-    {% include 'overlays/buttons.html'%}
-</div>
diff --git a/rdmo/projects/templates/projects/overlays/issue_send_issue_message_de.html b/rdmo/projects/templates/projects/overlays/issue_send_issue_message_de.html
deleted file mode 100644
index bb72c1292a..0000000000
--- a/rdmo/projects/templates/projects/overlays/issue_send_issue_message_de.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<div class="overlay" id="issue-message-overlay"
-    data-title="Nachricht"
-    data-placement="bottom">
-
-    In den Aufgaben wird oft zu einer Kontaktaufnahme mit einer anderen Abteilung aufgefordert. Hier finden Sie eine vorgefertigte Nachricht mit den betreffenden Ansprechpartnerinnen bzw. Ansprechpartnern als Adressaten, die Sie als E-Mail versenden können.
-
-    {% include 'overlays/buttons.html'%}
-</div>
diff --git a/rdmo/projects/templates/projects/overlays/issue_send_issue_message_en.html b/rdmo/projects/templates/projects/overlays/issue_send_issue_message_en.html
deleted file mode 100644
index 71532d6e0b..0000000000
--- a/rdmo/projects/templates/projects/overlays/issue_send_issue_message_en.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<div class="overlay" id="issue-message-overlay"
-    data-title="Message"
-    data-placement="bottom">
-
-    The tasks often ask you to contact another department. Here you will find a ready-made message with the relevant contact persons as recipients, which you can send here as an e-mail.
-
-    {% include 'overlays/buttons.html'%}
-</div>
diff --git a/rdmo/projects/templates/projects/overlays/issue_send_issue_message_fr.html b/rdmo/projects/templates/projects/overlays/issue_send_issue_message_fr.html
deleted file mode 100644
index 8df168c0b7..0000000000
--- a/rdmo/projects/templates/projects/overlays/issue_send_issue_message_fr.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<div class="overlay" id="issue-message-overlay"
-    data-title="Message"
-    data-placement="bottom">
-
-    Les tâches vous demandent souvent de contacter un autre service. Vous trouverez ici un message prêt à l'emploi avec les personnes de contact concernées comme destinataires, que vous pouvez envoyer ici comme un e-mail.
-
-    {% include 'overlays/buttons.html'%}
-</div>
diff --git a/rdmo/projects/templates/projects/overlays/issue_send_issue_message_it.html b/rdmo/projects/templates/projects/overlays/issue_send_issue_message_it.html
deleted file mode 100644
index c47b46ae84..0000000000
--- a/rdmo/projects/templates/projects/overlays/issue_send_issue_message_it.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<div class="overlay" id="issue-message-overlay"
-    data-title="Messaggio"
-    data-placement="bottom">
-
-    I compiti spesso ti chiedono di contattare un altro dipartimento. Qui troverai un messaggio pronto con le persone di contatto interessate come destinatari, che puoi inviare qui come e-mail.
-
-    {% include 'overlays/buttons.html'%}
-</div>
diff --git a/rdmo/projects/templates/projects/overlays/issue_send_support_info_de.html b/rdmo/projects/templates/projects/overlays/issue_send_support_info_de.html
deleted file mode 100644
index d771642d29..0000000000
--- a/rdmo/projects/templates/projects/overlays/issue_send_support_info_de.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<div class="overlay" id="support-info-overlay"
-    data-title="Unterstützung"
-    data-placement="bottom">
-
-    Falls Sie weitere Fragen haben, wenden Sie sich gern an Ihre lokale Kontaktperson zum Thema Forschungsdaten.
-
-    {% include 'overlays/buttons.html'%}
-</div>
diff --git a/rdmo/projects/templates/projects/overlays/issue_send_support_info_en.html b/rdmo/projects/templates/projects/overlays/issue_send_support_info_en.html
deleted file mode 100644
index 4f709a2593..0000000000
--- a/rdmo/projects/templates/projects/overlays/issue_send_support_info_en.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<div class="overlay" id="support-info-overlay"
-    data-title="Support"
-    data-placement="bottom">
-
-    If you have further questions, please do not hesitate to ask your local contact person for research data management.
-
-    {% include 'overlays/buttons.html'%}
-</div>
diff --git a/rdmo/projects/templates/projects/overlays/issue_send_support_info_fr.html b/rdmo/projects/templates/projects/overlays/issue_send_support_info_fr.html
deleted file mode 100644
index 0369a5fce5..0000000000
--- a/rdmo/projects/templates/projects/overlays/issue_send_support_info_fr.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<div class="overlay" id="support-info-overlay"
-    data-title="Support"
-    data-placement="bottom">
-
-    Si vous avez d'autres questions, n'hésitez pas à vous adresser à votre personne de contact locale pour la gestion des données de recherche.
-
-    {% include 'overlays/buttons.html'%}
-</div>
diff --git a/rdmo/projects/templates/projects/overlays/issue_send_support_info_it.html b/rdmo/projects/templates/projects/overlays/issue_send_support_info_it.html
deleted file mode 100644
index dc6562253b..0000000000
--- a/rdmo/projects/templates/projects/overlays/issue_send_support_info_it.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<div class="overlay" id="support-info-overlay"
-    data-title="Supporto"
-    data-placement="bottom">
-
-    Per ulteriori domande, non esitate a rivolgervi al vostro referente locale per la gestione dei dati di ricerca.
-
-    {% include 'overlays/buttons.html'%}
-</div>
diff --git a/rdmo/projects/templates/projects/overlays/project_export_project_de.html b/rdmo/projects/templates/projects/overlays/project_export_project_de.html
deleted file mode 100644
index ac7ef1272d..0000000000
--- a/rdmo/projects/templates/projects/overlays/project_export_project_de.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<div class="overlay" id="export-project-overlay"
-    data-title="Export"
-    data-placement="left auto">
-
-    Sie können Ihr Projekt hier exportieren, falls Sie es zu einem späteren Zeitpunkt in RDMO importieren oder zu einer anderen RDMO Instanz mitnehmen möchten.
-
-    {% include 'overlays/buttons.html'%}
-</div>
diff --git a/rdmo/projects/templates/projects/overlays/project_export_project_en.html b/rdmo/projects/templates/projects/overlays/project_export_project_en.html
deleted file mode 100644
index b7781cafca..0000000000
--- a/rdmo/projects/templates/projects/overlays/project_export_project_en.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<div class="overlay" id="export-project-overlay"
-    data-title="Export"
-    data-placement="left auto">
-
-    You can export your project here if you want to import it into RDMO at a later date or to another RDMO instance.
-
-    {% include 'overlays/buttons.html'%}
-</div>
diff --git a/rdmo/projects/templates/projects/overlays/project_export_project_fr.html b/rdmo/projects/templates/projects/overlays/project_export_project_fr.html
deleted file mode 100644
index c8a1c58ac2..0000000000
--- a/rdmo/projects/templates/projects/overlays/project_export_project_fr.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<div class="overlay" id="export-project-overlay"
-    data-title="Exporter"
-    data-placement="left auto">
-
-    Vous pouvez exporter votre projet ici si vous souhaitez l'importer dans RDMO à une date ultérieure ou dans une autre instance de RDMO.
-
-    {% include 'overlays/buttons.html'%}
-</div>
diff --git a/rdmo/projects/templates/projects/overlays/project_export_project_it.html b/rdmo/projects/templates/projects/overlays/project_export_project_it.html
deleted file mode 100644
index 6a0a92e85b..0000000000
--- a/rdmo/projects/templates/projects/overlays/project_export_project_it.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<div class="overlay" id="export-project-overlay"
-    data-title="Esporta"
-    data-placement="left auto">
-
-    Puoi esportare qui il tuo progetto se vuoi importarlo in RDMO in una data successiva o in un'altra istanza di RDMO.
-
-    {% include 'overlays/buttons.html'%}
-</div>
diff --git a/rdmo/projects/templates/projects/overlays/project_import_project_de.html b/rdmo/projects/templates/projects/overlays/project_import_project_de.html
deleted file mode 100644
index 8a9d54ae5d..0000000000
--- a/rdmo/projects/templates/projects/overlays/project_import_project_de.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<div class="overlay" id="import-project-overlay"
-    data-title="Import"
-    data-placement="left auto">
-
-    Sollten Sie bereits ein Projekt in RDMO angelegt und exportiert haben und möchten es an dieser Stelle hinzufügen, so können Sie hier ein vorhandenes Projekt importieren.
-
-    {% include 'overlays/buttons.html'%}
-</div>
diff --git a/rdmo/projects/templates/projects/overlays/project_import_project_en.html b/rdmo/projects/templates/projects/overlays/project_import_project_en.html
deleted file mode 100644
index 5af51471bd..0000000000
--- a/rdmo/projects/templates/projects/overlays/project_import_project_en.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<div class="overlay" id="import-project-overlay"
-    data-title="Import"
-    data-placement="left auto">
-
-    If you have already created and exported a project in RDMO and would like to add it, you can import an existing project here.
-
-    {% include 'overlays/buttons.html'%}
-</div>
diff --git a/rdmo/projects/templates/projects/overlays/project_import_project_fr.html b/rdmo/projects/templates/projects/overlays/project_import_project_fr.html
deleted file mode 100644
index 86d9aef80c..0000000000
--- a/rdmo/projects/templates/projects/overlays/project_import_project_fr.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<div class="overlay" id="import-project-overlay"
-    data-title="Importer"
-    data-placement="left auto">
-
-    Si vous avez déjà créé et exporté un projet dans RDMO et que vous souhaitez l'ajouter, vous pouvez importer un projet existant ici.
-
-    {% include 'overlays/buttons.html'%}
-</div>
diff --git a/rdmo/projects/templates/projects/overlays/project_import_project_it.html b/rdmo/projects/templates/projects/overlays/project_import_project_it.html
deleted file mode 100644
index 4ebc1751c9..0000000000
--- a/rdmo/projects/templates/projects/overlays/project_import_project_it.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<div class="overlay" id="import-project-overlay"
-    data-title="Importa"
-    data-placement="left auto">
-
-    Se hai già creato ed esportato un progetto in RDMO e vuoi aggiungerlo, puoi importare un progetto esistente qui.
-
-    {% include 'overlays/buttons.html'%}
-</div>
diff --git a/rdmo/projects/templates/projects/overlays/project_project_catalog_de.html b/rdmo/projects/templates/projects/overlays/project_project_catalog_de.html
deleted file mode 100644
index 633f06d28e..0000000000
--- a/rdmo/projects/templates/projects/overlays/project_project_catalog_de.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<div class="overlay" id="project-catalog-overlay"
-    data-title="Katalog"
-    data-placement="bottom">
-
-    Sofern Sie berechtigt sind, können Sie hier die Auswahl des Fragenkatalogs ändern.
-
-    {% include 'overlays/buttons.html'%}
-</div>
diff --git a/rdmo/projects/templates/projects/overlays/project_project_catalog_en.html b/rdmo/projects/templates/projects/overlays/project_project_catalog_en.html
deleted file mode 100644
index 0533b371d5..0000000000
--- a/rdmo/projects/templates/projects/overlays/project_project_catalog_en.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<div class="overlay" id="project-catalog-overlay"
-    data-title="Catalog"
-    data-placement="bottom">
-
-    With the right permissions, you can change the selection of the question catalog here.
-
-    {% include 'overlays/buttons.html'%}
-</div>
diff --git a/rdmo/projects/templates/projects/overlays/project_project_catalog_fr.html b/rdmo/projects/templates/projects/overlays/project_project_catalog_fr.html
deleted file mode 100644
index 3b601861f6..0000000000
--- a/rdmo/projects/templates/projects/overlays/project_project_catalog_fr.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<div class="overlay" id="project-catalog-overlay"
-    data-title="Catalogue"
-    data-placement="bottom">
-
-    Avec les bonnes permissions, vous pouvez modifier la sélection du catalogue de questions ici.
-
-    {% include 'overlays/buttons.html'%}
-</div>
diff --git a/rdmo/projects/templates/projects/overlays/project_project_catalog_it.html b/rdmo/projects/templates/projects/overlays/project_project_catalog_it.html
deleted file mode 100644
index 2d6468f5d1..0000000000
--- a/rdmo/projects/templates/projects/overlays/project_project_catalog_it.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<div class="overlay" id="project-catalog-overlay"
-    data-title="Catalogo"
-    data-placement="bottom">
-
-    Con i permessi giusti, puoi cambiare la selezione del catalogo delle domande qui.
-
-    {% include 'overlays/buttons.html'%}
-</div>
diff --git a/rdmo/projects/templates/projects/overlays/project_project_issues_de.html b/rdmo/projects/templates/projects/overlays/project_project_issues_de.html
deleted file mode 100644
index 65f9c23a11..0000000000
--- a/rdmo/projects/templates/projects/overlays/project_project_issues_de.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<div class="overlay" id="project-issues-overlay"
-    data-title="Aufgaben"
-    data-placement="bottom auto">
-
-    Aufgaben werden automatisch aus Ihren innerhalb der Fragenkataloge gegebenen Antworten generiert. Auf der Seite jeder Aufgabe können Sie sehen, welche Ihrer Antworten zur Aktivierung der Aufgabe führen. Außerdem können Sie den Status Ihrer zu erledigenden Aufgaben mit dem Stiftsymbol ändern, wenn Sie eine Aufgabe begonnen oder beendet haben. Mit dem Papierflieger-Symbol können Sie eine E-Mail schicken und ggf. eine Ansicht im gewünschten Format als Anhang anfügen. Zu Beginn ist die Übersicht der Aufgaben leer.
-
-    {% include 'overlays/buttons.html'%}
-</div>
diff --git a/rdmo/projects/templates/projects/overlays/project_project_issues_en.html b/rdmo/projects/templates/projects/overlays/project_project_issues_en.html
deleted file mode 100644
index 69a80a5f58..0000000000
--- a/rdmo/projects/templates/projects/overlays/project_project_issues_en.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<div class="overlay" id="project-issues-overlay"
-    data-title="Tasks"
-    data-placement="bottom auto">
-
-    Tasks are automatically generated from the answers you give in the questionnaires. On the page of each task you can see which of your answers lead to the activation of the task. You can also change the status of your to-do tasks with the pencil icon when you have started or finished a task. With the paper airplane icon you can send an e-mail and attach a view in the desired format, if necessary. At the beginning, the overview of the tasks is empty.
-
-    {% include 'overlays/buttons.html'%}
-</div>
diff --git a/rdmo/projects/templates/projects/overlays/project_project_issues_fr.html b/rdmo/projects/templates/projects/overlays/project_project_issues_fr.html
deleted file mode 100644
index f49a51c71b..0000000000
--- a/rdmo/projects/templates/projects/overlays/project_project_issues_fr.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<div class="overlay" id="project-issues-overlay"
-    data-title="Tâches"
-    data-placement="bottom auto">
-
-    Les tâches sont générées automatiquement à partir des réponses que vous donnez dans les questionnaires. Sur la page de chaque tâche, vous pouvez voir lesquelles de vos réponses conduisent à l'activation de la tâche. Vous pouvez également modifier le statut de vos tâches à l'aide de l'icône en forme de crayon lorsque vous avez commencé ou terminé une tâche. Avec l'icône de l'avion en papier, vous pouvez envoyer un e-mail et joindre une vue dans le format souhaité, si nécessaire. Au début, l'aperçu des tâches est vide.
-
-    {% include 'overlays/buttons.html'%}
-</div>
diff --git a/rdmo/projects/templates/projects/overlays/project_project_issues_it.html b/rdmo/projects/templates/projects/overlays/project_project_issues_it.html
deleted file mode 100644
index 9600829440..0000000000
--- a/rdmo/projects/templates/projects/overlays/project_project_issues_it.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<div class="overlay" id="project-issues-overlay"
-    data-title="Attività"
-    data-placement="bottom auto">
-
-    I compiti sono generati automaticamente dalle risposte che dai nei questionari. Nella pagina di ogni compito puoi vedere quali delle tue risposte portano all'attivazione del compito. Puoi anche cambiare lo stato dei tuoi compiti con l'icona della matita quando hai iniziato o finito un compito. Con l'icona dell'aeroplano di carta puoi inviare una e-mail e allegare una vista nel formato desiderato, se necessario. All'inizio, la panoramica dei compiti è vuota.
-
-    {% include 'overlays/buttons.html'%}
-</div>
diff --git a/rdmo/projects/templates/projects/overlays/project_project_memberships_de.html b/rdmo/projects/templates/projects/overlays/project_project_memberships_de.html
deleted file mode 100644
index 7b04d3aa96..0000000000
--- a/rdmo/projects/templates/projects/overlays/project_project_memberships_de.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<div class="overlay" id="project-memberships-overlay"
-    data-title="Mitgliedschaften"
-    data-placement="top auto">
-
-    Hier können Sie sehen, wer auf das Projekt zugreifen kann und weitere Mitglieder einladen. Über die Rollen können Sie verwalten, welche Rechte die Nutzenden haben. Mit dem Kreuzsymbol können Mitgliedschaften entfernt werden.
-
-    {% include 'overlays/buttons.html'%}
-</div>
diff --git a/rdmo/projects/templates/projects/overlays/project_project_memberships_en.html b/rdmo/projects/templates/projects/overlays/project_project_memberships_en.html
deleted file mode 100644
index 681b0d2e1f..0000000000
--- a/rdmo/projects/templates/projects/overlays/project_project_memberships_en.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<div class="overlay" id="project-memberships-overlay"
-    data-title="Members"
-    data-placement="top auto">
-
-    Here you can see who can access the project and invite additional members.  The rights of the use can be managed by the roles. Members can be removed with the cross symbol.
-
-    {% include 'overlays/buttons.html'%}
-</div>
diff --git a/rdmo/projects/templates/projects/overlays/project_project_memberships_fr.html b/rdmo/projects/templates/projects/overlays/project_project_memberships_fr.html
deleted file mode 100644
index 1586272dab..0000000000
--- a/rdmo/projects/templates/projects/overlays/project_project_memberships_fr.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<div class="overlay" id="project-memberships-overlay"
-    data-title="Membres"
-    data-placement="top auto">
-
-    Ici, vous pouvez voir qui peut accéder au projet et inviter des membres supplémentaires.  Les droits d'utilisation peuvent être gérés par les rôles. Les membres peuvent être supprimés à l'aide du symbole de la croix.
-
-    {% include 'overlays/buttons.html'%}
-</div>
diff --git a/rdmo/projects/templates/projects/overlays/project_project_memberships_it.html b/rdmo/projects/templates/projects/overlays/project_project_memberships_it.html
deleted file mode 100644
index 950b1d04dc..0000000000
--- a/rdmo/projects/templates/projects/overlays/project_project_memberships_it.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<div class="overlay" id="project-memberships-overlay"
-    data-title="Membri"
-    data-placement="top auto">
-
-    Qui puoi vedere chi può accedere al progetto e invitare altri membri.  I diritti di utilizzo possono essere gestiti dai ruoli. I membri possono essere rimossi con il simbolo della croce.
-
-    {% include 'overlays/buttons.html'%}
-</div>
diff --git a/rdmo/projects/templates/projects/overlays/project_project_questions_de.html b/rdmo/projects/templates/projects/overlays/project_project_questions_de.html
deleted file mode 100644
index 6455b45628..0000000000
--- a/rdmo/projects/templates/projects/overlays/project_project_questions_de.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<div class="overlay" id="project-questions-overlay"
-    data-title="Fragen beantworten"
-    data-placement="left auto">
-
-    Klicken Sie an dieser Stelle "Fragen beantworten", um zum Interview des ausgewählten
-    Fragenkatalogs zu gelangen. Ihre Antworten werden dazu verwendet, individuelle Aufgaben
-    für Sie zu erstellen, die Sie in der Aufgabenübersicht finden, sowie um vorgefertigte
-    Vorlagen auszufüllen, die Sie für die weitere Verwendung exportieren können.
-
-    {% include 'overlays/buttons.html'%}
-</div>
diff --git a/rdmo/projects/templates/projects/overlays/project_project_questions_en.html b/rdmo/projects/templates/projects/overlays/project_project_questions_en.html
deleted file mode 100644
index 7f4d5988f7..0000000000
--- a/rdmo/projects/templates/projects/overlays/project_project_questions_en.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<div class="overlay" id="project-questions-overlay"
-    data-title="Answer questions"
-    data-placement="left auto">
-
-    Click "Answer questions" at this point to go to the interview for the selected questionnaire.
-    Your answers will be used to create individual tasks for you, which you will find in
-    the task overview, as well as to fill in ready-made templates that you can export for further use.
-
-    {% include 'overlays/buttons.html'%}
-</div>
diff --git a/rdmo/projects/templates/projects/overlays/project_project_questions_fr.html b/rdmo/projects/templates/projects/overlays/project_project_questions_fr.html
deleted file mode 100644
index 57b1190325..0000000000
--- a/rdmo/projects/templates/projects/overlays/project_project_questions_fr.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<div class="overlay" id="project-questions-overlay"
-    data-title="Répondez aux questions"
-    data-placement="left auto">
-
-    Cliquez sur "Répondre aux questions" à ce stade pour accéder à l'interview du questionnaire sélectionné.
-    Vos réponses seront utilisées pour créer des tâches individuelles pour vous, que vous trouverez dans
-    l'aperçu des tâches, ainsi que pour remplir des modèles prêts à l'emploi que vous pouvez exporter pour une utilisation ultérieure.
-
-    {% include 'overlays/buttons.html'%}
-</div>
diff --git a/rdmo/projects/templates/projects/overlays/project_project_questions_it.html b/rdmo/projects/templates/projects/overlays/project_project_questions_it.html
deleted file mode 100644
index 8b48ea1f1c..0000000000
--- a/rdmo/projects/templates/projects/overlays/project_project_questions_it.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<div class="overlay" id="project-questions-overlay"
-    data-title="Rispondi alle domande"
-    data-placement="left auto">
-
-    Clicca a questo punto su "Rispondi alle domande" per andare all'intervista del questionario selezionato.
-    Le tue risposte saranno utilizzate per creare compiti individuali per te, che troverai nella
-    nella panoramica dei compiti, così come per compilare modelli già pronti che puoi esportare per un ulteriore utilizzo.
-
-    {% include 'overlays/buttons.html'%}
-</div>
diff --git a/rdmo/projects/templates/projects/overlays/project_project_snapshots_de.html b/rdmo/projects/templates/projects/overlays/project_project_snapshots_de.html
deleted file mode 100644
index 625a341b76..0000000000
--- a/rdmo/projects/templates/projects/overlays/project_project_snapshots_de.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<div class="overlay" id="project-snapshots-overlay"
-    data-title="Snapshots"
-    data-placement="top auto">
-
-    Mit Snapshots können Sie alle Antworten zu einem bestimmten Zeitpunkt speichern und eine bestimmte Phase des Projekts einfrieren. Später kann der Snapshot zum Erstellen von Ansichten verwendet und das Projekt bei Bedarf auch auf einen früheren Snapshot zurückgesetzt werden.
-
-    {% include 'overlays/buttons.html'%}
-</div>
diff --git a/rdmo/projects/templates/projects/overlays/project_project_snapshots_en.html b/rdmo/projects/templates/projects/overlays/project_project_snapshots_en.html
deleted file mode 100644
index 37673ac882..0000000000
--- a/rdmo/projects/templates/projects/overlays/project_project_snapshots_en.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<div class="overlay" id="project-snapshots-overlay"
-    data-title="Snapshots"
-    data-placement="top auto">
-
-    Snapshots allow you to save all answers at a certain point in time and freeze a certain stage of the project. Later, the snapshot can be used to create views and the project can also be reset to a previous snapshot if needed.
-
-    {% include 'overlays/buttons.html'%}
-</div>
diff --git a/rdmo/projects/templates/projects/overlays/project_project_snapshots_fr.html b/rdmo/projects/templates/projects/overlays/project_project_snapshots_fr.html
deleted file mode 100644
index 0eee3b60b7..0000000000
--- a/rdmo/projects/templates/projects/overlays/project_project_snapshots_fr.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<div class="overlay" id="project-snapshots-overlay"
-    data-title="Instantanés"
-    data-placement="top auto">
-
-    Les instantanés vous permettent de sauvegarder toutes les réponses à un moment donné et de geler une certaine étape du projet. Plus tard, l'instantané peut être utilisé pour créer des vues et le projet peut également être réinitialisé à un instantané précédent si nécessaire.
-
-    {% include 'overlays/buttons.html'%}
-</div>
diff --git a/rdmo/projects/templates/projects/overlays/project_project_snapshots_it.html b/rdmo/projects/templates/projects/overlays/project_project_snapshots_it.html
deleted file mode 100644
index 7b7af42ca1..0000000000
--- a/rdmo/projects/templates/projects/overlays/project_project_snapshots_it.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<div class="overlay" id="project-snapshots-overlay"
-    data-title="Istantanee"
-    data-placement="top auto">
-
-    Le istantanee permettono di salvare tutte le risposte ad un certo punto nel tempo e congelare una certa fase del progetto. Più tardi, l'istantanea può essere usata per creare delle viste e il progetto può anche essere riportato a un'istantanea precedente, se necessario.
-
-    {% include 'overlays/buttons.html'%}
-</div>
diff --git a/rdmo/projects/templates/projects/overlays/project_project_views_de.html b/rdmo/projects/templates/projects/overlays/project_project_views_de.html
deleted file mode 100644
index 1207d383cf..0000000000
--- a/rdmo/projects/templates/projects/overlays/project_project_views_de.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<div class="overlay" id="project-views-overlay"
-    data-title="Ansichten"
-    data-placement="bottom auto">
-
-    Bei den Ansichten handelt es sich um Vorlagen für Formulare/Dokumente. Die Ansichten werden anhand der im Fragenkatalog gegebenen Antworten automatisch ausgefüllt und können anschließend in verschiedenen Formaten exportiert und versendet werden. Zu Beginn sind alle Ansichten leer. Damit die Vorlagen vollständig ausgefüllt werden, müssen alle relevanten Fragen beantwortet werden. Antworten, die in mehreren Vorlagen zur Anwendung kommen, werden automatisch in alle Fragenkataloge und Ansichten übernommen.
-
-    {% include 'overlays/buttons.html'%}
-</div>
diff --git a/rdmo/projects/templates/projects/overlays/project_project_views_en.html b/rdmo/projects/templates/projects/overlays/project_project_views_en.html
deleted file mode 100644
index edd63cc9f6..0000000000
--- a/rdmo/projects/templates/projects/overlays/project_project_views_en.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<div class="overlay" id="project-views-overlay"
-    data-title="Views"
-    data-placement="bottom auto">
-
-    The views are templates for forms/documents. The views are automatically filled in based on the answers given in the questionnaire and can then be exported and sent in different formats. At the beginning, all views are empty. In order for the templates to be filled in completely, all relevant questions must be answered. Answers that are used in several templates are automatically transferred to all question catalogues and views.
-
-    {% include 'overlays/buttons.html'%}
-</div>
diff --git a/rdmo/projects/templates/projects/overlays/project_project_views_fr.html b/rdmo/projects/templates/projects/overlays/project_project_views_fr.html
deleted file mode 100644
index 1b287b9eb6..0000000000
--- a/rdmo/projects/templates/projects/overlays/project_project_views_fr.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<div class="overlay" id="project-views-overlay"
-    data-title="Vues"
-    data-placement="bottom auto">
-
-    Les vues sont des modèles de formulaires/documents. Les vues sont automatiquement remplies sur la base des réponses données dans le questionnaire et peuvent ensuite être exportées et envoyées dans différents formats. Au départ, toutes les vues sont vides. Pour que les modèles soient complètement remplis, il faut répondre à toutes les questions pertinentes. Les réponses qui sont utilisées dans plusieurs modèles sont automatiquement transférées à tous les catalogues de questions et à toutes les vues.
-
-    {% include 'overlays/buttons.html'%}
-</div>
diff --git a/rdmo/projects/templates/projects/overlays/project_project_views_it.html b/rdmo/projects/templates/projects/overlays/project_project_views_it.html
deleted file mode 100644
index db979c3d53..0000000000
--- a/rdmo/projects/templates/projects/overlays/project_project_views_it.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<div class="overlay" id="project-views-overlay"
-    data-title="Viste"
-    data-placement="bottom auto">
-
-    Le viste sono modelli di moduli/documenti. Le viste sono compilate automaticamente in base alle risposte date nel questionario e possono poi essere esportate e inviate in diversi formati. All'inizio, tutte le viste sono vuote. Affinché i modelli siano compilati completamente, è necessario rispondere a tutte le domande pertinenti. Le risposte che vengono utilizzate in diversi modelli vengono automaticamente trasferite a tutti i cataloghi di domande e alle viste.
-
-    {% include 'overlays/buttons.html'%}
-</div>
diff --git a/rdmo/projects/templates/projects/overlays/project_support_info_de.html b/rdmo/projects/templates/projects/overlays/project_support_info_de.html
deleted file mode 100644
index d771642d29..0000000000
--- a/rdmo/projects/templates/projects/overlays/project_support_info_de.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<div class="overlay" id="support-info-overlay"
-    data-title="Unterstützung"
-    data-placement="bottom">
-
-    Falls Sie weitere Fragen haben, wenden Sie sich gern an Ihre lokale Kontaktperson zum Thema Forschungsdaten.
-
-    {% include 'overlays/buttons.html'%}
-</div>
diff --git a/rdmo/projects/templates/projects/overlays/project_support_info_en.html b/rdmo/projects/templates/projects/overlays/project_support_info_en.html
deleted file mode 100644
index 4f709a2593..0000000000
--- a/rdmo/projects/templates/projects/overlays/project_support_info_en.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<div class="overlay" id="support-info-overlay"
-    data-title="Support"
-    data-placement="bottom">
-
-    If you have further questions, please do not hesitate to ask your local contact person for research data management.
-
-    {% include 'overlays/buttons.html'%}
-</div>
diff --git a/rdmo/projects/templates/projects/overlays/project_support_info_fr.html b/rdmo/projects/templates/projects/overlays/project_support_info_fr.html
deleted file mode 100644
index 0369a5fce5..0000000000
--- a/rdmo/projects/templates/projects/overlays/project_support_info_fr.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<div class="overlay" id="support-info-overlay"
-    data-title="Support"
-    data-placement="bottom">
-
-    Si vous avez d'autres questions, n'hésitez pas à vous adresser à votre personne de contact locale pour la gestion des données de recherche.
-
-    {% include 'overlays/buttons.html'%}
-</div>
diff --git a/rdmo/projects/templates/projects/overlays/project_support_info_it.html b/rdmo/projects/templates/projects/overlays/project_support_info_it.html
deleted file mode 100644
index dc6562253b..0000000000
--- a/rdmo/projects/templates/projects/overlays/project_support_info_it.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<div class="overlay" id="support-info-overlay"
-    data-title="Supporto"
-    data-placement="bottom">
-
-    Per ulteriori domande, non esitate a rivolgervi al vostro referente locale per la gestione dei dati di ricerca.
-
-    {% include 'overlays/buttons.html'%}
-</div>
diff --git a/rdmo/projects/templates/projects/overlays/projects_create_project_de.html b/rdmo/projects/templates/projects/overlays/projects_create_project_de.html
deleted file mode 100644
index e01dceab88..0000000000
--- a/rdmo/projects/templates/projects/overlays/projects_create_project_de.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<div class="overlay" id="create-project-overlay"
-    data-title="Neues Projekt anlegen"
-    data-placement="bottom">
-
-    Als ersten Schritt können Sie mit diesem Link ein neues Projekt anlegen.
-
-    {% include 'overlays/buttons.html'%}
-</div>
diff --git a/rdmo/projects/templates/projects/overlays/projects_create_project_en.html b/rdmo/projects/templates/projects/overlays/projects_create_project_en.html
deleted file mode 100644
index 611353a84f..0000000000
--- a/rdmo/projects/templates/projects/overlays/projects_create_project_en.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<div class="overlay" id="create-project-overlay"
-    data-title="Create new project"
-    data-placement="bottom">
-
-    As a first step you can create a new project using this link.
-
-    {% include 'overlays/buttons.html'%}
-</div>
diff --git a/rdmo/projects/templates/projects/overlays/projects_create_project_fr.html b/rdmo/projects/templates/projects/overlays/projects_create_project_fr.html
deleted file mode 100644
index ea6bada50a..0000000000
--- a/rdmo/projects/templates/projects/overlays/projects_create_project_fr.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<div class="overlay" id="create-project-overlay"
-    data-title="Créer un nouveau projet "
-    data-placement="bottom">
-
-    Dans un premier temps, vous pouvez créer un nouveau projet en utilisant ce lien.
-
-    {% include 'overlays/buttons.html'%}
-</div>
diff --git a/rdmo/projects/templates/projects/overlays/projects_create_project_it.html b/rdmo/projects/templates/projects/overlays/projects_create_project_it.html
deleted file mode 100644
index 671269e6fb..0000000000
--- a/rdmo/projects/templates/projects/overlays/projects_create_project_it.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<div class="overlay" id="create-project-overlay"
-    data-title="Crea nuovo progetto "
-    data-placement="bottom">
-
-    Come primo passo puoi creare un nuovo progetto usando questo link.
-
-    {% include 'overlays/buttons.html'%}
-</div>
diff --git a/rdmo/projects/templates/projects/overlays/projects_import_project_de.html b/rdmo/projects/templates/projects/overlays/projects_import_project_de.html
deleted file mode 100644
index 2b53a274d2..0000000000
--- a/rdmo/projects/templates/projects/overlays/projects_import_project_de.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<div class="overlay" id="import-project-overlay"
-    data-title="Vorhandenes Projekt importieren"
-    data-placement="bottom">
-
-    Sollten Sie bereits ein Projekt in RDMO angelegt und exportiert haben
-    und möchten es Ihrer Projektliste an dieser Stelle hinzufügen,
-    so können Sie hier ein vorhandenes Projekt importieren.
-
-    {% include 'overlays/buttons.html'%}
-</div>
diff --git a/rdmo/projects/templates/projects/overlays/projects_import_project_en.html b/rdmo/projects/templates/projects/overlays/projects_import_project_en.html
deleted file mode 100644
index 241f02018c..0000000000
--- a/rdmo/projects/templates/projects/overlays/projects_import_project_en.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<div class="overlay" id="import-project-overlay"
-    data-title="Import existing project"
-    data-placement="bottom">
-
-    If you have already created and exported a project in
-    RDMO and would like to add it to your project list,
-    you can import an existing project here.
-
-    {% include 'overlays/buttons.html'%}
-</div>
diff --git a/rdmo/projects/templates/projects/overlays/projects_import_project_fr.html b/rdmo/projects/templates/projects/overlays/projects_import_project_fr.html
deleted file mode 100644
index a4451073f9..0000000000
--- a/rdmo/projects/templates/projects/overlays/projects_import_project_fr.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<div class="overlay" id="import-project-overlay"
-    data-title="Importer un projet existant"
-    data-placement="bottom">
-
-    Si vous avez déjà créé et exporté un projet dans
-    RDMO et que vous souhaitez l'ajouter à votre liste de projets,
-    vous pouvez importer un projet existant ici.
-
-    {% include 'overlays/buttons.html'%}
-</div>
diff --git a/rdmo/projects/templates/projects/overlays/projects_import_project_it.html b/rdmo/projects/templates/projects/overlays/projects_import_project_it.html
deleted file mode 100644
index 29e4155b40..0000000000
--- a/rdmo/projects/templates/projects/overlays/projects_import_project_it.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<div class="overlay" id="import-project-overlay"
-    data-title="Importazione di un progetto esistente"
-    data-placement="bottom">
-
-    Se hai già creato ed esportato un progetto in
-    RDMO e vuoi aggiungerlo alla tua lista di progetti
-    puoi importare un progetto esistente qui.
-
-    {% include 'overlays/buttons.html'%}
-</div>
diff --git a/rdmo/projects/templates/projects/overlays/projects_projects_table_de.html b/rdmo/projects/templates/projects/overlays/projects_projects_table_de.html
deleted file mode 100644
index 4da8e9b764..0000000000
--- a/rdmo/projects/templates/projects/overlays/projects_projects_table_de.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<div class="overlay" id="projects-table-overlay"
-    data-title="Meine Projekte"
-    data-placement="bottom">
-
-    Hier finden Sie alle Ihre selbst angelegten Projekte oder Projekte denen Sie hinzugefügt worden sind.
-    Zu Beginn wird diese Übersicht leer sein. Die angegebene Rolle (Besitzer, Manager, Autor, Gast) definiert
-    Ihre Zugriffsbeschränkung auf das Projekt. Sie können mit Hilfe der Symbole rechts in der jeweiligen Zeile
-    die Projekte bearbeiten oder löschen.
-
-    {% include 'overlays/buttons.html'%}
-</div>
diff --git a/rdmo/projects/templates/projects/overlays/projects_projects_table_en.html b/rdmo/projects/templates/projects/overlays/projects_projects_table_en.html
deleted file mode 100644
index 2de4c71995..0000000000
--- a/rdmo/projects/templates/projects/overlays/projects_projects_table_en.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<div class="overlay" id="projects-table-overlay"
-    data-title="My Projects"
-    data-placement="bottom">
-
-    Here you will find all your self-created projects, as well as projects to which you have been added.
-    At first, this overview will be empty. The specified role (owner, manager, author, guest) defines
-    your access restriction to the project. You can edit or delete the projects with the help
-    of the symbols on the right in the respective line.
-
-    {% include 'overlays/buttons.html'%}
-</div>
diff --git a/rdmo/projects/templates/projects/overlays/projects_projects_table_fr.html b/rdmo/projects/templates/projects/overlays/projects_projects_table_fr.html
deleted file mode 100644
index e156efe494..0000000000
--- a/rdmo/projects/templates/projects/overlays/projects_projects_table_fr.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<div class="overlay" id="projects-table-overlay"
-    data-title="Mes projets"
-    data-placement="bottom">
-
-    Vous trouverez ici tous les projets que vous avez créés vous-même, ainsi que les projets auxquels vous avez été ajouté.
-    Au début, cet aperçu sera vide. Le rôle spécifié (propriétaire, gestionnaire, auteur, invité) définit
-    votre restriction d'accès au projet. Vous pouvez éditer ou supprimer les projets à l'aide de
-    des symboles situés à droite dans la ligne correspondante.
-
-    {% include 'overlays/buttons.html'%}
-</div>
diff --git a/rdmo/projects/templates/projects/overlays/projects_projects_table_it.html b/rdmo/projects/templates/projects/overlays/projects_projects_table_it.html
deleted file mode 100644
index c38868c41e..0000000000
--- a/rdmo/projects/templates/projects/overlays/projects_projects_table_it.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<div class="overlay" id="projects-table-overlay"
-    data-title="I miei progetti"
-    data-placement="bottom">
-
-    Qui troverai tutti i tuoi progetti creati da te, così come i progetti a cui sei stato aggiunto.
-    All'inizio questa panoramica sarà vuota. Il ruolo specificato (proprietario, manager, autore, ospite) definisce
-    le tue restrizioni di accesso al progetto. Puoi modificare o cancellare i progetti con l'aiuto
-    dei simboli a destra nella rispettiva riga.
-
-    {% include 'overlays/buttons.html'%}
-</div>
diff --git a/rdmo/projects/templates/projects/overlays/projects_support_info_de.html b/rdmo/projects/templates/projects/overlays/projects_support_info_de.html
deleted file mode 100644
index d771642d29..0000000000
--- a/rdmo/projects/templates/projects/overlays/projects_support_info_de.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<div class="overlay" id="support-info-overlay"
-    data-title="Unterstützung"
-    data-placement="bottom">
-
-    Falls Sie weitere Fragen haben, wenden Sie sich gern an Ihre lokale Kontaktperson zum Thema Forschungsdaten.
-
-    {% include 'overlays/buttons.html'%}
-</div>
diff --git a/rdmo/projects/templates/projects/overlays/projects_support_info_en.html b/rdmo/projects/templates/projects/overlays/projects_support_info_en.html
deleted file mode 100644
index 4f709a2593..0000000000
--- a/rdmo/projects/templates/projects/overlays/projects_support_info_en.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<div class="overlay" id="support-info-overlay"
-    data-title="Support"
-    data-placement="bottom">
-
-    If you have further questions, please do not hesitate to ask your local contact person for research data management.
-
-    {% include 'overlays/buttons.html'%}
-</div>
diff --git a/rdmo/projects/templates/projects/overlays/projects_support_info_fr.html b/rdmo/projects/templates/projects/overlays/projects_support_info_fr.html
deleted file mode 100644
index 0369a5fce5..0000000000
--- a/rdmo/projects/templates/projects/overlays/projects_support_info_fr.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<div class="overlay" id="support-info-overlay"
-    data-title="Support"
-    data-placement="bottom">
-
-    Si vous avez d'autres questions, n'hésitez pas à vous adresser à votre personne de contact locale pour la gestion des données de recherche.
-
-    {% include 'overlays/buttons.html'%}
-</div>
diff --git a/rdmo/projects/templates/projects/overlays/projects_support_info_it.html b/rdmo/projects/templates/projects/overlays/projects_support_info_it.html
deleted file mode 100644
index dc6562253b..0000000000
--- a/rdmo/projects/templates/projects/overlays/projects_support_info_it.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<div class="overlay" id="support-info-overlay"
-    data-title="Supporto"
-    data-placement="bottom">
-
-    Per ulteriori domande, non esitate a rivolgervi al vostro referente locale per la gestione dei dati di ricerca.
-
-    {% include 'overlays/buttons.html'%}
-</div>
diff --git a/rdmo/projects/templates/projects/project_confirm_cancel.html b/rdmo/projects/templates/projects/project_confirm_cancel.html
deleted file mode 100644
index 6b614be98d..0000000000
--- a/rdmo/projects/templates/projects/project_confirm_cancel.html
+++ /dev/null
@@ -1,17 +0,0 @@
-{% extends 'core/page.html' %}
-{% load i18n %}
-{% load core_tags %}
-
-{% block page %}
-
-    <h1>{% trans 'Cancel invite' %}</h1>
-
-    <p>
-        {% blocktrans trimmed with project_title=invite.project.title %}
-        You are about to cancel the invite to <strong>{{ project_title }}</strong>.
-        {% endblocktrans %}
-    </p>
-
-    {% bootstrap_form submit=_('Cancel invite') %}
-
-{% endblock %}
diff --git a/rdmo/projects/templates/projects/project_confirm_delete.html b/rdmo/projects/templates/projects/project_confirm_delete.html
deleted file mode 100644
index ac711d3dff..0000000000
--- a/rdmo/projects/templates/projects/project_confirm_delete.html
+++ /dev/null
@@ -1,35 +0,0 @@
-{% extends 'core/page.html' %}
-{% load i18n %}
-{% load core_tags %}
-
-{% block page %}
-
-    <h1>{% trans "Delete project" %}</h1>
-
-    <p>
-        {% blocktrans trimmed %}
-        You are about to permanently delete the project <strong>{{ object }}</strong>.
-        {% endblocktrans %}
-
-        {% if object.get_children %}
-        {% if object.parent %}
-
-        {% blocktrans with parent=object.parent trimmed %}
-        Descendant projects will be moved to the project <strong>{{ parent }}</strong>.
-        {% endblocktrans %}
-
-        {% else %}
-
-        {% trans 'Descendant projects will be preserved.' %}
-
-        {% endif %}
-        {% endif %}
-    </p>
-
-    <p class="text-danger">
-        {% trans 'This action cannot be undone!' %}
-    </p>
-
-    {% bootstrap_delete_form submit=_('Delete project') %}
-
-{% endblock %}
diff --git a/rdmo/projects/templates/projects/project_confirm_leave.html b/rdmo/projects/templates/projects/project_confirm_leave.html
deleted file mode 100644
index d28e8fc02b..0000000000
--- a/rdmo/projects/templates/projects/project_confirm_leave.html
+++ /dev/null
@@ -1,21 +0,0 @@
-{% extends 'core/page.html' %}
-{% load i18n %}
-{% load core_tags %}
-
-{% block page %}
-
-    <h1>{% trans "Leave project" %}</h1>
-
-    <p>
-        {% blocktrans trimmed %}
-        You are about to leave the project <strong>{{ object }}</strong>.
-        {% endblocktrans %}
-    </p>
-
-    <p>
-        {% trans 'If you want to access this project again, somebody will need to invite you!' %}
-    </p>
-
-    {% bootstrap_form submit=_('Leave project') %}
-
-{% endblock %}
diff --git a/rdmo/projects/templates/projects/project_detail_header_visibility.html b/rdmo/projects/templates/projects/project_detail_header_visibility.html
deleted file mode 100644
index d0133973ae..0000000000
--- a/rdmo/projects/templates/projects/project_detail_header_visibility.html
+++ /dev/null
@@ -1,14 +0,0 @@
-{% load i18n %}
-{% load core_tags %}
-
-{% if can_change_visibility  %}
-<p class="pull-right">
-    <a href="{% url 'project_update_visibility' project.pk %}" title="{% trans 'Update project visibility' %}">
-        <i class="fa fa-pencil" aria-hidden="true"></i>
-    </a>
-</p>
-{% endif %}
-
-<span class="text-muted">
-{{ project.visibility.get_help_display }}
-</span>
diff --git a/rdmo/projects/templates/projects/project_form.html b/rdmo/projects/templates/projects/project_form.html
deleted file mode 100644
index 9fbd90f914..0000000000
--- a/rdmo/projects/templates/projects/project_form.html
+++ /dev/null
@@ -1,49 +0,0 @@
-{% extends 'core/page.html' %}
-{% load i18n %}
-{% load core_tags %}
-
-{% block head %}
-<script>
-    $(document).ready(function() {
-        $('[data-toggle="tooltip"]').tooltip();
-    });
-</script>
-{% endblock %}
-
-{% block page %}
-
-{% if object %}
-
-    {% if form.fields.catalogs %}
-
-        <h1>{% trans 'Update project catalog' %}</h1>
-
-    {% elif form.fields.tasks %}
-
-        <h1>{% trans 'Update project tasks' %}</h1>
-
-        <p class="help-block">{% trans 'Please note that their status is lost when you remove tasks from the project.' %}</p>
-
-        {% bootstrap_form submit=_('Save tasks') %}
-
-    {% elif form.fields.views %}
-
-        <h1>{% trans 'Update project views' %}</h1>
-        {% bootstrap_form submit=_('Save views') %}
-
-    {% else %}
-
-        <h1>{% trans 'Update project information' %}</h1>
-        {% bootstrap_form submit=_('Save project') %}
-
-    {% endif %}
-
-{% else %}
-
-    <h1>{% trans 'Create new project' %}</h1>
-
-    {% bootstrap_form submit=_('Create project') %}
-
-{% endif %}
-
-{% endblock %}
diff --git a/rdmo/projects/templates/projects/project_form_visibility.html b/rdmo/projects/templates/projects/project_form_visibility.html
deleted file mode 100644
index 92fcc079c3..0000000000
--- a/rdmo/projects/templates/projects/project_form_visibility.html
+++ /dev/null
@@ -1,48 +0,0 @@
-{% extends 'core/page.html' %}
-{% load i18n %}
-{% load core_tags %}
-
-{% block page %}
-
-    <h1>
-        {% if object.visibility %}
-        {% trans 'Update project visibility' %}
-        {% else %}
-        {% trans 'Make project visible' %}
-        {% endif %}
-    </h1>
-
-    <p class="mb-10 text-muted">
-        {% blocktrans trimmed %}
-        Projects can be made visible to all users, for example to be used as a template.
-        When a project is made visible, users can access it as if they were in the guest role.
-        {% endblocktrans %}
-    </p>
-
-    {% if settings.MULTISITE and object.visibility %}
-    <p class="mb-10">
-        {% if object.visibility.sites.all %}
-
-        {% blocktrans trimmed with object.visibility.sites.all|join:', ' as site_names %}
-        Currently, the project is available to users on {{ site_names }}.
-        {% endblocktrans %}
-
-        {% else %}
-
-        {% blocktrans trimmed %}
-        Currently, the project is accessible to users on all sites.
-        {% endblocktrans %}
-
-        {% endif %}
-    </p>
-    {% endif %}
-
-    {% if submit_label and delete_label %}
-    {% bootstrap_form submit=submit_label delete=delete_label %}
-    {% elif submit_label %}
-    {% bootstrap_form submit=submit_label %}
-    {% elif delete_label %}
-    {% bootstrap_form delete=delete_label %}
-    {% endif %}
-
-{% endblock %}
diff --git a/rdmo/projects/templates/projects/project_import.html b/rdmo/projects/templates/projects/project_import.html
deleted file mode 100644
index ddfe0a6819..0000000000
--- a/rdmo/projects/templates/projects/project_import.html
+++ /dev/null
@@ -1,171 +0,0 @@
-{% extends 'core/page.html' %}
-{% load i18n %}
-{% load core_tags %}
-
-{% block content %}
-
-<div class="container">
-    <div class="row">
-        <form method="post">
-            {% csrf_token %}
-
-            <input type="hidden" name="method" value="{{ method }}" />
-            <input type="hidden" name="source" value="{{ source }}" />
-
-            <div class="page col-md-9">
-                {% if not current_project %}
-                <h1>
-                    {% blocktrans %}Create project from {{ source_title }}{% endblocktrans %}
-                </h1>
-
-                    {% if source_project %}
-                    <table class="table table-bordered table-break-word">
-                        <tbody>
-                            <tr>
-                                <td style="width: 20%">{% trans 'Title' %}</td><td>{{ source_project.title }}</td>
-                            </tr>
-                            <tr>
-                                <td style="width: 20%">{% trans 'Description' %}</td><td>{{ source_project.description }}</td>
-                            </tr>
-                            <tr>
-                                <td style="width: 20%">{% trans 'Catalog' %}</td><td>{{ source_project.catalog.title }}</td>
-                            </tr>
-                            <tr>
-                                <td style="width: 20%">{% trans 'Created' %}</td><td>{{ source_project.created }}</td>
-                            </tr>
-                        </tbody>
-                    </table>
-                    {% endif %}
-
-                {% else %}
-                <h1>
-                    {% blocktrans %}Import from {{ source_title }}{% endblocktrans %}
-                </h1>
-                {% endif %}
-
-                {% if values %}
-                <table class="table table-bordered table-break-word">
-                    <thead>
-                        <tr>
-                            <th>{% trans 'Question' %}</th>
-                            {% if current_project %}
-                            <th>{% trans 'Current answer' %}</th>
-                            {% endif %}
-                            <th>{% trans 'Imported answer' %}</th>
-                            <th></th>
-                        </tr>
-                    </thead>
-                    <tbody>
-                        {% for value in values %}
-                        <tr>
-                            <td>
-                                {% if value.question %}
-                                {{ value.question.text }}
-                                {% elif value.attribute.key == 'id' %}
-                                <i>{% trans 'Title of a set.' %}</i>
-                                {% else %}
-                                <i>{% trans 'Not available in this catalog.' %}</i>
-                                {% endif %}
-                            </td>
-                            {% if current_project %}
-                            <td style="width: 30%">{{ value.current.value_and_unit }}</td>
-                            <td style="width: 30%">{% firstof value.value_and_unit value.file_import.name %}</td>
-                            {% else %}
-                            <td style="width: 60%">{% firstof value.value_and_unit value.file_import.name %}</td>
-                            {% endif %}
-                            <td style="width: 1%" class="import-checkbox">
-                                {% if value.attribute.uri %}
-                                <input class="import-checkbox" type="checkbox"
-                                    name="{{ value.attribute.uri }}[{{value.set_prefix}}][{{value.set_index}}][{{value.collection_index}}]" checked />
-                                {% else %}
-                                <i class="fa fa-ban" title="{% trans 'This Answer cannot be imported.' %}"
-                                   aria-hidden="true"></i>
-                                {% endif %}
-                            </td>
-                        </tr>
-                        {% endfor %}
-                    </tbody>
-                </table>
-                {% endif %}
-
-                {% if snapshots %}
-                {% for snapshot in snapshots %}
-
-                <h2>{% trans 'Snapshot' %}: {{ snapshot.title }}</h2>
-
-                <table class="table table-bordered table-break-word">
-                    <tbody>
-                        <tr>
-                            <td style="width: 20%">{% trans 'Title' %}</td><td>{{ snapshot.title }}</td>
-                        </tr>
-                        <tr>
-                            <td style="width: 20%">{% trans 'Description' %}</td><td>{{ snapshot.description }}</td>
-                        </tr>
-                        <tr>
-                            <td style="width: 20%">{% trans 'Created' %}</td><td>{{ snapshot.created }}</td>
-                        </tr>
-                    </tbody>
-                </table>
-
-                {% if snapshot.snapshot_values %}
-                <table class="table table-bordered table-break-word">
-                    <thead>
-                        <tr>
-                            <th>Question</th>
-                            {% if current_project %}
-                            <th>{% trans 'Current answer' %}</th>
-                            {% endif %}
-                            <th>{% trans 'Imported answer' %}</th>
-                            <th></th>
-                        </tr>
-                    </thead>
-                    <tbody>
-                        {% for value in snapshot.snapshot_values %}
-                        <tr>
-                            <td>
-                                {% if value.question %}
-                                {{ value.question.text }}
-                                {% elif value.attribute.key == 'id' %}
-                                <i>{% trans 'Title of a set.' %}</i>
-                                {% else %}
-                                <i>{% trans 'Not available in this catalog.' %}</i>
-                                {% endif %}
-                            </td>
-                            {% if current_project %}
-                            <td style="width: 30%">{{ value.current.value_and_unit }}</td>
-                            <td style="width: 30%">{% firstof value.value_and_unit value.file_import.name %}</td>
-                            {% else %}
-                            <td style="width: 60%">{% firstof value.value_and_unit value.file_import.name %}</td>
-                            {% endif %}
-                            <td style="width: 1%" class="import-checkbox">
-                                {% if value.attribute.uri %}
-                                <input type="checkbox" checked
-                                    name="{{ value.attribute.uri }}[{{snapshot.snapshot_index}}][{{value.set_prefix}}][{{value.set_index}}][{{value.collection_index}}]" />
-                                {% else %}
-                                <i class="fa fa-ban" title="{% trans 'This Answer cannot be imported.' %}"
-                                   aria-hidden="true"></i>
-                                {% endif %}
-                            </td>
-                        </tr>
-                        {% endfor %}
-                    </tbody>
-                </table>
-                {% endif %}
-                {% endfor %}
-                {% endif %}
-            </div>
-            <div class="sidebar col-md-3">
-                <div class="sidebar-mt import-buttons">
-                    {% if current_project %}
-                    <input type="submit" value="{% trans 'Import values' %}" class="btn btn-success"></input>
-                    {% else %}
-                    <input type="submit" value="{% trans 'Import project' %}" class="btn btn-success"></input>
-                    {% endif %}
-                    <input type="submit" value="{% trans 'Cancel' %}" name="cancel" class="btn"></input>
-                </div>
-            </div>
-        </form>
-    </div>
-</div>
-
-{% endblock %}
diff --git a/rdmo/projects/templates/projects/project_import_form.html b/rdmo/projects/templates/projects/project_import_form.html
deleted file mode 100644
index 079e3d63a9..0000000000
--- a/rdmo/projects/templates/projects/project_import_form.html
+++ /dev/null
@@ -1,20 +0,0 @@
-{% extends 'core/page.html' %}
-{% load i18n %}
-{% load core_tags %}
-
-{% block page %}
-
-    {% if not current_project %}
-    <h1>
-        {% blocktrans %}Create project from {{ source_title }}{% endblocktrans %}
-    </h1>
-
-    {% else %}
-    <h1>
-        {% blocktrans %}Import from {{ source_title }}{% endblocktrans %}
-    </h1>
-    {% endif %}
-
-    {% bootstrap_form submit=_('Import values') %}
-
-{% endblock %}
diff --git a/rdmo/projects/templates/projects/project_view.html b/rdmo/projects/templates/projects/project_view.html
deleted file mode 100644
index 4250b5bd53..0000000000
--- a/rdmo/projects/templates/projects/project_view.html
+++ /dev/null
@@ -1,97 +0,0 @@
-{% extends 'core/page.html' %}
-{% load i18n %}
-{% load core_tags %}
-
-{% block head %}
-<script>
-    $(document).ready(function() {
-        $('[data-toggle="tooltip"]').tooltip();
-    });
-</script>
-{% endblock %}
-
-{% block navbar %}
-    <li>
-        <a href="{% url 'project' project.pk %}">{% trans 'Back to project' %}</a>
-    </li>
-{% endblock %}
-
-{% block sidebar %}
-
-    {% if snapshots %}
-
-    <h2>{% trans 'Snapshots' %}</h2>
-
-    <ul class="list-unstyled list-arrow">
-        <li class="{% if current_snapshot == None %}active{% endif %}">
-            <a href="{% url 'project_view' project.id view.id %}">
-                {% trans 'Current' %}
-            </a>
-        </li>
-        {% for snapshot in snapshots %}
-        <li class="{% if current_snapshot.id == snapshot.id %}active{% endif %}">
-            <a href="{% url 'project_view' project.id snapshot.id view.id %}">
-                {{ snapshot.title }}
-            </a>
-        </li>
-        {% endfor %}
-    </ul>
-
-    {% endif %}
-
-    <h2>{% trans 'Options' %}</h2>
-
-    <ul class="list-unstyled">
-        <li>
-            <a href="{% url 'project' project.pk %}">{% trans 'Back to project overview' %}</a>
-        </li>
-    </ul>
-
-    <h2>{% trans 'Export' %}</h2>
-
-    <ul class="list-unstyled">
-        {% for format, text in export_formats %}
-        <li >
-            {% if current_snapshot %}
-            <a href="{% url 'project_view_export' project.id current_snapshot.id view.id format %}" target="_blank">
-                {{ text }}
-            </a>
-            {% else %}
-            <a href="{% url 'project_view_export' project.id view.id format %}" target="_blank">
-                {{ text }}
-            </a>
-            {% endif %}
-        </li>
-        {% endfor %}
-    </ul>
-
-    {% if attachments %}
-
-    <h2>{% trans 'Attachments' %}</h2>
-    <ul class="list-unstyled">
-        {% for value in attachments %}
-        <li >
-            <a href="{{ value.file_url }}" target="_blank">
-                {{ value.file_name }}
-            </a>
-        </li>
-        {% endfor %}
-    </ul>
-
-    {% endif %}
-
-{% endblock %}
-
-{% block page %}
-
-{% if rendered_view  %}
-    {{ rendered_view }}
-{% else %}
-    <h1>{% trans 'Error' %}</h1>
-
-    <p>
-        {% trans 'There has been a problem creating the view. Please contact support.' %}
-    </p>
-{% endif %}
-
-{% endblock %}
diff --git a/rdmo/projects/templates/projects/projects_pagination.html b/rdmo/projects/templates/projects/projects_pagination.html
deleted file mode 100644
index d0c6e28250..0000000000
--- a/rdmo/projects/templates/projects/projects_pagination.html
+++ /dev/null
@@ -1,23 +0,0 @@
-{% load i18n %}
-
-    {% if page_obj.has_other_pages %}
-    <div class="text-center">
-        <ul class="pager">
-            {% if page_obj.has_previous %}
-            <li class="previous"><a href="?page={{ page_obj.previous_page_number }}{% if querystring %}&amp;{{ querystring }}{% endif %}">{% trans 'Previous' %}</a></li>
-            {% else %}
-            <li class="previous disabled"><a href="">{% trans 'Previous' %}</a></li>
-            {% endif %}
-            <li>
-                {% blocktrans trimmed with number=page_obj.number num_pages=page_obj.paginator.num_pages %}
-                Page {{ number }} of {{ num_pages }}.
-                {% endblocktrans %}
-            </li>
-            {% if page_obj.has_next %}
-            <li class="next"><a href="?page={{ page_obj.next_page_number }}{% if querystring %}&amp;{{ querystring }}{% endif %}">{% trans 'Next' %}</a></li>
-            {% else %}
-            <li class="next disabled"><a href="">{% trans 'Next' %}</a></li>
-            {% endif %}
-        </ul>
-    </div>
-    {% endif %}
diff --git a/rdmo/projects/templates/projects/snapshot_form.html b/rdmo/projects/templates/projects/snapshot_form.html
deleted file mode 100644
index 65fbc4157c..0000000000
--- a/rdmo/projects/templates/projects/snapshot_form.html
+++ /dev/null
@@ -1,21 +0,0 @@
-{% extends 'core/page.html' %}
-{% load i18n %}
-{% load core_tags %}
-
-{% block page %}
-
-{% if object %}
-
-    <h1>{% trans 'Update snapshot' %}</h1>
-
-    {% bootstrap_form submit=_('Update snapshot') %}
-
-{% else %}
-
-    <h1>{% trans 'Create new snapshot' %}</h1>
-
-    {% bootstrap_form submit=_('Create snapshot') %}
-
-{% endif %}
-
-{% endblock %}
diff --git a/rdmo/projects/templates/projects/snapshot_rollback.html b/rdmo/projects/templates/projects/snapshot_rollback.html
deleted file mode 100644
index 2d5516f4c0..0000000000
--- a/rdmo/projects/templates/projects/snapshot_rollback.html
+++ /dev/null
@@ -1,19 +0,0 @@
-{% extends 'core/page.html' %}
-{% load i18n %}
-{% load core_tags %}
-
-{% block page %}
-
-    <h1>{% trans "Rollback to snapshot" %}</h1>
-
-    <p>
-        {% blocktrans with title=snapshot.title %}You are about to reset all values to the snapshot <strong>{{ title }}</strong>. All newer values will be deleted.{% endblocktrans %}
-    </p>
-
-    <p class="text-danger">
-        {% trans 'This action cannot be undone!' %}
-    </p>
-
-    {% bootstrap_delete_form submit=_('Rollback') %}
-
-{% endblock %}

From 6b9a709efee6992b3c6f59e7ce57d91c6f8ef632 Mon Sep 17 00:00:00 2001
From: Jochen Klar <mail@jochenklar.de>
Date: Mon, 30 Mar 2026 21:27:57 +0200
Subject: [PATCH 03/16] Remove project templatetags

---
 rdmo/projects/templatetags/__init__.py      |  0
 rdmo/projects/templatetags/projects_tags.py | 57 ---------------------
 2 files changed, 57 deletions(-)
 delete mode 100644 rdmo/projects/templatetags/__init__.py
 delete mode 100644 rdmo/projects/templatetags/projects_tags.py

diff --git a/rdmo/projects/templatetags/__init__.py b/rdmo/projects/templatetags/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/rdmo/projects/templatetags/projects_tags.py b/rdmo/projects/templatetags/projects_tags.py
deleted file mode 100644
index d41dae22d6..0000000000
--- a/rdmo/projects/templatetags/projects_tags.py
+++ /dev/null
@@ -1,57 +0,0 @@
-from django import template
-from django.template.defaultfilters import stringfilter
-from django.utils.safestring import mark_safe
-from django.utils.translation import gettext as _
-
-from ..models import Membership
-
-register = template.Library()
-
-
-@register.simple_tag()
-def projects_indent(level):
-    string = ''
-    if level > 0:
-        for _ in range(level - 1):
-            string += '&ensp;&ensp;'
-        string += '&#8226;&ensp;'
-
-    return mark_safe('<span class="projects-indent">' + string + '</span>')
-
-
-@register.simple_tag()
-def project_progress(project):
-    if project.progress_count is None or project.progress_total is None:
-        return ''
-
-    return _('%(count)s of %(total)s') % {
-        'count': project.progress_count,
-        'total': project.progress_total
-    }
-
-@register.simple_tag()
-def project_progress_ratio(project):
-    if project.progress_count is None or project.progress_total is None:
-        return ''
-
-    try:
-        ratio = project.progress_count / project.progress_total
-    except ZeroDivisionError:
-        ratio = 0
-
-    return f'{ratio:.0%}'
-
-
-@register.simple_tag()
-def project_progress_text(project):
-    progress = project_progress(project)
-    if progress:
-        return _('(%(progress)s progress)') % {'progress': progress}
-    else:
-        return ''
-
-
-@register.filter()
-@stringfilter
-def projects_role(role):
-    return dict(Membership.ROLE_CHOICES).get(role, '')

From b56bddd03a4e4f568fc883b1ede2acb67b2b485d Mon Sep 17 00:00:00 2001
From: Jochen Klar <mail@jochenklar.de>
Date: Mon, 30 Mar 2026 21:28:52 +0200
Subject: [PATCH 04/16] Remove project forms and mixins

---
 rdmo/projects/forms.py  | 480 ----------------------------------------
 rdmo/projects/mixins.py | 241 --------------------
 2 files changed, 721 deletions(-)
 delete mode 100644 rdmo/projects/forms.py
 delete mode 100644 rdmo/projects/mixins.py

diff --git a/rdmo/projects/forms.py b/rdmo/projects/forms.py
deleted file mode 100644
index 0fa78f22c1..0000000000
--- a/rdmo/projects/forms.py
+++ /dev/null
@@ -1,480 +0,0 @@
-from django import forms
-from django.conf import settings
-from django.contrib.auth import get_user_model
-from django.contrib.sites.models import Site
-from django.core.exceptions import ValidationError
-from django.core.validators import EmailValidator
-from django.db.models import Q
-from django.utils.safestring import mark_safe
-from django.utils.translation import gettext_lazy as _
-
-from rdmo.core.constants import VALUE_TYPE_FILE
-from rdmo.core.plugins import get_plugin
-from rdmo.core.utils import markdown2html
-
-from .constants import ROLE_CHOICES
-from .models import Integration, IntegrationOption, Invite, Membership, Project, Snapshot, Visibility
-from .validators import ProjectParentValidator
-
-
-class CatalogChoiceField(forms.ModelChoiceField):
-
-    _unavailable_icon = ' (<span class="fa fa-eye-slash" aria-hidden="true"></span>)'
-
-    def label_from_instance(self, obj):
-        rendered_title = markdown2html(obj.title)
-        rendered_help = markdown2html(obj.help)
-
-        if obj.available is False:
-            return mark_safe(f'<div class="text-muted"><p>{rendered_title}{self._unavailable_icon}</p>'
-                             f'<p>{rendered_help}</p></div>')
-
-        return mark_safe(f'<p><b>{rendered_title}</b></p><p>{rendered_help}</p>')
-
-
-class TasksMultipleChoiceField(forms.ModelMultipleChoiceField):
-
-    def label_from_instance(self, obj):
-        rendered_title = markdown2html(obj.title)
-        rendered_text = markdown2html(obj.text)
-
-        return mark_safe(f'<b>{rendered_title}</b></br>{rendered_text}')
-
-
-class ViewsMultipleChoiceField(forms.ModelMultipleChoiceField):
-
-    def label_from_instance(self, obj):
-        rendered_title = markdown2html(obj.title)
-        rendered_help = markdown2html(obj.help)
-
-        return mark_safe(f'<b>{rendered_title}</b></br>{rendered_help}')
-
-
-class ProjectForm(forms.ModelForm):
-
-    use_required_attribute = False
-
-    def __init__(self, *args, **kwargs):
-        self.copy = kwargs.pop('copy', False)
-
-        catalogs = kwargs.pop('catalogs')
-        projects = kwargs.pop('projects')
-        super().__init__(*args, **kwargs)
-        self.fields['title'].widget.attrs.update({
-            'autofocus': True
-        })
-        self.fields['catalog'].queryset = catalogs
-        self.fields['catalog'].empty_label = None
-        self.fields['catalog'].initial = catalogs.first()
-
-        if settings.NESTED_PROJECTS:
-            self.fields['parent'].queryset = projects
-
-    def clean(self):
-        if not self.copy:
-            ProjectParentValidator(self.instance)(self.cleaned_data)
-        super().clean()
-
-    class Meta:
-        model = Project
-
-        fields = ['title', 'description', 'catalog']
-        if settings.NESTED_PROJECTS:
-            fields += ['parent']
-
-        field_classes = {
-            'catalog': CatalogChoiceField
-        }
-        widgets = {
-            'catalog': forms.RadioSelect()
-        }
-
-
-class ProjectUpdateInformationForm(forms.ModelForm):
-
-    use_required_attribute = False
-
-    class Meta:
-        model = Project
-        fields = ('title', 'description')
-
-
-class ProjectUpdateVisibilityForm(forms.ModelForm):
-
-    use_required_attribute = False
-
-    def __init__(self, *args, **kwargs):
-        self.project = kwargs.pop('instance')
-        self.user = kwargs.pop('user')
-        self.site = kwargs.pop('site')
-
-        try:
-            instance = self.project.visibility
-        except Visibility.DoesNotExist:
-            instance = None
-
-        super().__init__(*args, instance=instance, **kwargs)
-
-        # remove the sites or group sets if they are not needed, doing this in Meta would break tests
-        if not (settings.MULTISITE and self.user.has_perm('projects.change_visibility')):
-            self.fields.pop('sites')
-        if not settings.GROUPS:
-            self.fields.pop('groups')
-
-    class Meta:
-        model = Visibility
-        fields = ('sites', 'groups')
-
-    def save(self, *args, **kwargs):
-        if 'cancel' in self.data:
-            pass
-        elif 'delete' in self.data:
-            if settings.MULTISITE and not self.user.has_perm('projects.delete_visibility'):
-                current_site = Site.objects.get(id=self.site.id)
-                self.instance.remove_site(current_site)
-            else:
-                self.instance.delete()
-        else:
-            visibility, _created = Visibility.objects.update_or_create(project=self.project)
-
-            if settings.MULTISITE:
-                if self.user.has_perm('projects.change_visibility'):
-                    visibility.sites.set(self.cleaned_data.get('sites'))
-                else:
-                    visibility.sites.add(self.site)
-
-            if settings.GROUPS:
-                visibility.groups.set(self.cleaned_data.get('groups'))
-
-        return self.project
-
-
-class ProjectUpdateCatalogForm(forms.ModelForm):
-
-    use_required_attribute = False
-
-    def __init__(self, *args, **kwargs):
-        catalogs = kwargs.pop('catalogs')
-        super().__init__(*args, **kwargs)
-        self.fields['catalog'].queryset = catalogs
-        self.fields['catalog'].empty_label = None
-
-    class Meta:
-        model = Project
-        fields = ('catalog', )
-        field_classes = {
-            'catalog': CatalogChoiceField
-        }
-        widgets = {
-            'catalog': forms.RadioSelect()
-        }
-
-    def save(self, *args, **kwargs):
-        # if the catalog is the same, do nothing
-        if self.instance.catalog.id == self.cleaned_data.get('catalog'):
-            return self.instance
-        return super().save(*args, **kwargs)
-
-
-class ProjectUpdateTasksForm(forms.ModelForm):
-
-    use_required_attribute = False
-
-    def __init__(self, *args, **kwargs):
-        if settings.PROJECT_TASKS_SYNC:
-            raise ValidationError(_("Editing tasks is disabled."))
-
-        tasks = kwargs.pop('tasks')
-        super().__init__(*args, **kwargs)
-        self.fields['tasks'].queryset = tasks
-
-    class Meta:
-        model = Project
-        fields = ('tasks', )
-        field_classes = {
-            'tasks': TasksMultipleChoiceField
-        }
-        widgets = {
-            'tasks': forms.CheckboxSelectMultiple()
-        }
-
-    def save(self, *args, **kwargs):
-        if settings.PROJECT_TASKS_SYNC:
-            raise ValidationError(_("Editing tasks is disabled."))
-        super().save(*args, **kwargs)
-
-
-class ProjectUpdateViewsForm(forms.ModelForm):
-
-    use_required_attribute = False
-
-    def __init__(self, *args, **kwargs):
-        if settings.PROJECT_VIEWS_SYNC:
-            raise ValidationError(_("Editing views is disabled."))
-
-        views = kwargs.pop('views')
-        super().__init__(*args, **kwargs)
-        self.fields['views'].queryset = views
-
-    class Meta:
-        model = Project
-        fields = ('views', )
-        field_classes = {
-            'views': ViewsMultipleChoiceField
-        }
-        widgets = {
-            'views': forms.CheckboxSelectMultiple()
-        }
-
-    def save(self, *args, **kwargs):
-        if settings.PROJECT_VIEWS_SYNC:
-            raise ValidationError(_("Editing views is disabled."))
-        super().save(*args, **kwargs)
-
-
-class ProjectUpdateParentForm(forms.ModelForm):
-
-    use_required_attribute = False
-
-    def __init__(self, *args, **kwargs):
-        projects = kwargs.pop('projects')
-        super().__init__(*args, **kwargs)
-        self.fields['parent'].queryset = projects
-
-    def clean(self):
-        ProjectParentValidator(self.instance)(self.cleaned_data)
-        super().clean()
-
-    class Meta:
-        model = Project
-        fields = ('parent', )
-
-
-class SnapshotCreateForm(forms.ModelForm):
-
-    use_required_attribute = False
-
-    class Meta:
-        model = Snapshot
-        fields = ('title', 'description')
-
-    def __init__(self, *args, **kwargs):
-        self.project = kwargs.pop('project')
-        super().__init__(*args, **kwargs)
-
-    def save(self, *args, **kwargs):
-        self.instance.project = self.project
-        return super().save(*args, **kwargs)
-
-
-class MembershipCreateForm(forms.Form):
-
-    use_required_attribute = False
-
-    username_or_email = forms.CharField(widget=forms.TextInput(attrs={'placeholder': _('Username or e-mail')}),
-                                        label=_('User'),
-                                        help_text=_('The username or e-mail of the new user.'))
-    role = forms.CharField(widget=forms.RadioSelect(choices=ROLE_CHOICES),
-                           initial='author', label=_('Role'))
-
-    def __init__(self, *args, **kwargs):
-        self.project = kwargs.pop('project')
-        self.is_site_manager = kwargs.pop('is_site_manager')
-        super().__init__(*args, **kwargs)
-
-        if self.is_site_manager:
-            self.fields['silent'] = forms.BooleanField(
-                required=False,
-                label=_('Add member silently'),
-                help_text=_('As site manager or admin, you can directly add users without notifying them via e-mail, '
-                            'when you check the following checkbox.')
-            )
-
-    def clean_username_or_email(self):
-        username_or_email = self.cleaned_data['username_or_email']
-        usermodel = get_user_model()
-
-        # check if it is a registered user
-        try:
-            self.cleaned_data['user'] = usermodel.objects.get(Q(username=username_or_email) |
-                                                              Q(email__iexact=username_or_email))
-            self.cleaned_data['email'] = self.cleaned_data['user'].email
-
-            if self.cleaned_data['user'] in self.project.user.all():
-                raise ValidationError(_('The user is already a member of the project.'))
-
-        except (usermodel.DoesNotExist, usermodel.MultipleObjectsReturned) as e:
-            if settings.PROJECT_SEND_INVITE:
-                # check if it is a valid email address, this will raise the correct ValidationError
-                EmailValidator()(username_or_email)
-
-                self.cleaned_data['user'] = None
-                self.cleaned_data['email'] = username_or_email
-            else:
-                self.cleaned_data['user'] = None
-                self.cleaned_data['email'] = None
-                raise ValidationError(_('A user with this username or e-mail was not found. '
-                                        'Only registered users can be invited.')) from e
-
-    def clean(self):
-        if self.cleaned_data.get('silent') is True and self.cleaned_data.get('user') is None:
-            raise ValidationError(_('Only existing users can be added silently.'))
-
-    def save(self):
-        if self.is_site_manager and self.cleaned_data.get('silent') is True:
-            Membership.objects.create(
-                project=self.project,
-                user=self.cleaned_data.get('user'),
-                role=self.cleaned_data.get('role')
-            )
-        else:
-            invite, _created = Invite.objects.get_or_create(
-                project=self.project,
-                user=self.cleaned_data.get('user'),
-                email=self.cleaned_data.get('email')
-            )
-            invite.role = self.cleaned_data.get('role')
-            invite.make_token()
-            invite.save()
-
-            return invite
-
-
-class IntegrationForm(forms.ModelForm):
-
-    class Meta:
-        model = Integration
-        fields = ()
-
-    def __init__(self, *args, **kwargs):
-        self.project = kwargs.pop('project')
-        self.provider_key = kwargs.pop('provider_key', None)
-        super().__init__(*args, **kwargs)
-
-        # get the provider
-        if self.provider_key:
-            self.provider = get_plugin('PROJECT_ISSUE_PROVIDERS', self.provider_key)
-        else:
-            self.provider = self.instance.provider
-
-        # add fields for the integration options
-        for field in self.provider.fields:
-            # new integration instance is going to be created
-            if self.instance.pk is None:
-                initial = None
-            # existing integration is going to be updated
-            else:
-                try:
-                    initial = IntegrationOption.objects.get(integration=self.instance, key=field.get('key')).value
-                except IntegrationOption.DoesNotExist:
-                    initial = None
-
-            if field.get('placeholder'):
-                attrs = {'placeholder': field.get('placeholder')}
-
-            self.fields[field.get('key')] = forms.CharField(widget=forms.TextInput(attrs=attrs),
-                                                            initial=initial, required=field.get('required', True),
-                                                            help_text=field.get('help'))
-
-    def save(self):
-        # the the project and the provider_key
-        self.instance.project = self.project
-        if self.provider_key:
-            self.instance.provider_key = self.provider_key
-
-        # call the form's save method
-        super().save()
-
-        # save the integration options
-        self.instance.save_options(self.cleaned_data)
-
-
-class IssueSendForm(forms.Form):
-
-    class AttachmentViewsField(forms.ModelMultipleChoiceField):
-        def label_from_instance(self, obj):
-            return _('Attach %s') % obj.title
-
-    class AttachmentFilesField(forms.ModelMultipleChoiceField):
-        def label_from_instance(self, obj):
-            return _('Attach %s') % obj.file_name
-
-    class AttachmentSnapshotField(forms.ModelChoiceField):
-        def label_from_instance(self, obj):
-            return obj.title
-
-    subject = forms.CharField(label=_('Subject'), max_length=128)
-    message = forms.CharField(label=_('Message'), widget=forms.Textarea)
-
-    def __init__(self, *args, **kwargs):
-        self.project = kwargs.pop('project')
-        super().__init__(*args, **kwargs)
-
-        self.fields['attachments_answers'] = forms.MultipleChoiceField(
-            label=_('Answers'), widget=forms.CheckboxSelectMultiple, required=False,
-            choices=[('project_answers', _('Attach the output of "View answers".'))]
-        )
-        self.fields['attachments_views'] = self.AttachmentViewsField(
-            label=_('Views'), widget=forms.CheckboxSelectMultiple, required=False,
-            queryset=self.project.views.all(), to_field_name='id'
-        )
-        self.fields['attachments_files'] = self.AttachmentFilesField(
-            label=_('Files'), widget=forms.CheckboxSelectMultiple, required=False,
-            queryset=self.project.values.filter(snapshot=None)
-                                        .filter(value_type=VALUE_TYPE_FILE)
-                                        .order_by('file'),
-            to_field_name='id'
-        )
-        self.fields['attachments_snapshot'] = self.AttachmentSnapshotField(
-            label=_('Snapshot'), widget=forms.RadioSelect, required=False,
-            queryset=self.project.snapshots.all(), empty_label=_('Current')
-        )
-        self.fields['attachments_format'] = forms.ChoiceField(
-            label=_('Format'), widget=forms.RadioSelect, required=False,
-            choices=settings.EXPORT_FORMATS
-        )
-
-    def clean(self):
-        cleaned_data = super().clean()
-
-        if cleaned_data.get('attachments_answers') or cleaned_data.get('attachments_views'):
-            if not cleaned_data.get('attachments_format'):
-                self.add_error('attachments_format', _('This field is required.'))
-
-
-class IssueMailForm(forms.Form):
-
-    if settings.EMAIL_RECIPIENTS_CHOICES:
-        recipients = forms.MultipleChoiceField(label=_('Recipients'), widget=forms.CheckboxSelectMultiple,
-                                               required=not settings.EMAIL_RECIPIENTS_INPUT,
-                                               choices=settings.EMAIL_RECIPIENTS_CHOICES)
-
-    if settings.EMAIL_RECIPIENTS_INPUT:
-        recipients_input = forms.CharField(label=_('Recipients'), widget=forms.Textarea(attrs={
-            'placeholder': _('Enter recipients line by line')
-        }), required=not settings.EMAIL_RECIPIENTS_CHOICES)
-
-    def clean(self):
-        cleaned_data = super().clean()
-
-        if settings.EMAIL_RECIPIENTS_INPUT and \
-                cleaned_data.get('recipients') == [] and \
-                cleaned_data.get('recipients_input') == []:
-            self.add_error('recipients_input', _('This field is required.'))
-
-    def clean_recipients_input(self):
-        email_validator = EmailValidator()
-        cleaned_data = []
-
-        for line in self.cleaned_data['recipients_input'].splitlines():
-            email = line.strip()
-            email_validator(email)
-            cleaned_data.append(email)
-
-        return cleaned_data
-
-
-class UploadFileForm(forms.Form):
-    uploaded_file = forms.FileField(
-        label='Select a file',
-    )
diff --git a/rdmo/projects/mixins.py b/rdmo/projects/mixins.py
deleted file mode 100644
index 1ce167ca0a..0000000000
--- a/rdmo/projects/mixins.py
+++ /dev/null
@@ -1,241 +0,0 @@
-from collections import defaultdict
-from pathlib import Path
-
-from django.contrib.sites.shortcuts import get_current_site
-from django.core.exceptions import ValidationError
-from django.http import Http404, HttpResponseRedirect
-from django.shortcuts import get_object_or_404, redirect, render
-from django.utils.translation import gettext_lazy as _
-
-from rdmo.core.imports import handle_uploaded_file
-from rdmo.core.plugins import get_plugin, get_plugins
-from rdmo.questions.models import Question
-
-from .models import Membership, Project
-from .utils import save_import_snapshot_values, save_import_tasks, save_import_values, save_import_views
-
-
-class ProjectImportMixin:
-
-    def get_current_values(self, current_project):
-        queryset = current_project.values.filter(snapshot=None).select_related('attribute', 'option')
-
-        current_values = defaultdict(lambda: defaultdict(lambda: defaultdict(lambda: defaultdict(list))))
-        for value in queryset:
-            current_values[value.attribute.uri][value.set_prefix][value.set_index][value.collection_index] = value
-        return current_values
-
-    def get_questions(self, catalog):
-        queryset = Question.objects.filter_by_catalog(catalog) \
-                                   .select_related('attribute') \
-                                   .order_by('attribute__uri')
-
-        questions = {}
-        for question in queryset:
-            if question.attribute and question.attribute.uri not in questions:
-                questions[question.attribute.uri] = question
-        return questions
-
-    def update_values(self, current_project, catalog, values, snapshots=None):
-        snapshots = snapshots or []
-        questions = self.get_questions(catalog)
-        current_values = self.get_current_values(current_project) if current_project else {}
-
-        for value in values:
-            if value.attribute:
-                value.pk = None
-                value.question = questions.get(value.attribute.uri)
-                value.current = current_values.get(value.attribute.uri, {}) \
-                                              .get(value.set_prefix, {}) \
-                                              .get(value.set_index, {}) \
-                                              .get(value.collection_index)
-
-        for snapshot in snapshots:
-            snapshot.pk = None
-
-            for value in snapshot.snapshot_values:
-                if value.attribute:
-                    value.pk = None
-                    value.question = questions.get(value.attribute.uri)
-                    value.current = current_values.get(value.attribute.uri, {}) \
-                                                  .get(value.set_prefix, {}) \
-                                                  .get(value.set_index, {}) \
-                                                  .get(value.collection_index)
-
-    def get_import_plugin(self, key, current_project=None):
-        import_plugin = get_plugin('PROJECT_IMPORTS', key)
-        if import_plugin is None:
-            raise Http404
-
-        import_plugin.request = self.request
-        import_plugin.current_project = current_project
-
-        return import_plugin
-
-    def upload_file(self):
-        try:
-            uploaded_file = self.request.FILES['uploaded_file']
-        except KeyError:
-            return render(self.request, 'core/error.html', {
-                'title': _('Import error'),
-                'errors': [_('There has been an error with your import.')]
-            }, status=400)
-        else:
-            self.request.session['import_file_name'] = handle_uploaded_file(uploaded_file)
-            self.request.session['import_source_title'] = uploaded_file.name
-
-            # redirect to the import form
-            return redirect(self.request.path)
-
-    def import_form(self):
-        current_project = self.object
-
-        import_file_name = self.request.session.get('import_file_name')
-        import_source_title = self.request.session.get('import_source_title')
-        if import_file_name is None or not Path(import_file_name).is_file():
-            return render(self.request, 'core/error.html', {
-                'title': _('Import error'),
-                'errors': [_('There has been an error with your import. No uploaded or retrieved file could be found.')]
-            }, status=400)
-
-        for import_key, import_plugin in get_plugins('PROJECT_IMPORTS').items():
-            import_plugin.current_project = current_project
-            import_plugin.file_name = import_file_name
-            import_plugin.source_title = import_source_title
-            import_plugin.request = self.request
-
-            if import_plugin.check():
-                try:
-                    import_plugin.process()
-                except ValidationError as e:
-                    return render(self.request, 'core/error.html', {
-                        'title': _('Import error'),
-                        'errors': e
-                    }, status=400)
-
-                # store information in session for ProjectCreateImportView
-                self.request.session['import_key'] = import_key
-
-                # attach questions and current values
-                self.update_values(current_project, import_plugin.catalog,
-                                   import_plugin.values, import_plugin.snapshots)
-
-                return render(self.request, 'projects/project_import.html', {
-                    'method': 'import_file',
-                    'current_project': current_project,
-                    'source_title': import_plugin.source_title,
-                    'source_project': import_plugin.project,
-                    'values': import_plugin.values,
-                    'snapshots': import_plugin.snapshots if not current_project else None,
-                    'tasks': import_plugin.tasks,
-                    'views': import_plugin.views
-                })
-
-        return render(self.request, 'core/error.html', {
-            'title': _('Import error'),
-            'errors': [_('Files of this type cannot be imported.')]
-        }, status=400)
-
-    def import_file(self):
-        current_project = self.object
-
-        if 'cancel' in self.request.POST:
-            if current_project:
-                return HttpResponseRedirect(current_project.get_absolute_url())
-            else:
-                return HttpResponseRedirect(self.success_url)
-
-        try:
-            import_tmpfile_name = self.request.session.pop('import_file_name')
-            import_key = self.request.session.pop('import_key')
-        except KeyError:
-            return render(self.request, 'core/error.html', {
-                'title': _('Import error'),
-                'errors': [_('There has been an error with your import.')]
-            }, status=400)
-
-        checked = [key for key, value in self.request.POST.items() if 'on' in value]
-
-        if import_tmpfile_name and import_key:
-            import_plugin = self.get_import_plugin(import_key, current_project)
-            import_plugin.file_name = import_tmpfile_name
-
-            if import_plugin.check():
-                try:
-                    import_plugin.process()
-                except ValidationError as e:
-                    return render(self.request, 'core/error.html', {
-                        'title': _('Import error'),
-                        'errors': e
-                    }, status=400)
-
-                # attach questions and current values
-                self.update_values(current_project, import_plugin.catalog,
-                                   import_plugin.values, import_plugin.snapshots)
-
-                if current_project:
-                    save_import_values(self.object, import_plugin.values, checked)
-                    save_import_tasks(self.object, import_plugin.tasks)
-                    save_import_views(self.object, import_plugin.views)
-
-                    return HttpResponseRedirect(current_project.get_absolute_url())
-
-                else:
-                    # add current site and save project
-                    import_plugin.project.site = get_current_site(self.request)
-                    import_plugin.project.save()
-
-                    # add user to project
-                    membership = Membership(project=import_plugin.project, user=self.request.user, role='owner')
-                    membership.save()
-
-                    for value in import_plugin.values:
-                        value.current = None
-
-                    save_import_values(import_plugin.project, import_plugin.values, checked)
-                    save_import_snapshot_values(import_plugin.project, import_plugin.snapshots, checked)
-                    save_import_tasks(import_plugin.project, import_plugin.tasks)
-                    save_import_views(import_plugin.project, import_plugin.views)
-
-                    return HttpResponseRedirect(import_plugin.project.get_absolute_url())
-
-        return render(self.request, 'core/error.html', {
-            'title': _('Import error'),
-            'errors': [_('There has been an error with your import.')]
-        }, status=400)
-
-    def import_project(self):
-        current_project = self.object
-
-        if 'cancel' in self.request.POST:
-            if current_project:
-                return HttpResponseRedirect(current_project.get_absolute_url())
-            else:
-                return HttpResponseRedirect(self.success_url)
-
-        # get the original project
-        project = get_object_or_404(Project.objects.all(), id=self.request.POST.get('source'))
-
-        # check if the user has the permission to access the original project
-        if not self.request.user.has_perm('projects.view_project_object', project):
-            self.handle_no_permission()
-
-        values = project.values.filter(snapshot=None) \
-                               .select_related('attribute', 'option')
-
-        # attach questions and current values
-        self.update_values(current_project, current_project.catalog, values)
-
-        checked = [key for key, value in self.request.POST.items() if 'on' in value]
-        if checked:
-            save_import_values(current_project, values, checked)
-            return HttpResponseRedirect(current_project.get_absolute_url())
-
-        else:
-            return render(self.request, 'projects/project_import.html', {
-                'method': 'import_project',
-                'source': project.id,
-                'source_title': project.title,
-                'current_project': current_project,
-                'values': values,
-            })

From 81170bdea8897ff3ccf0b30c1888500e850d84a3 Mon Sep 17 00:00:00 2001
From: Jochen Klar <mail@jochenklar.de>
Date: Mon, 30 Mar 2026 21:29:08 +0200
Subject: [PATCH 05/16] Remove project static

---
 .../projects/static/projects/css/project.scss | 24 -------------------
 1 file changed, 24 deletions(-)
 delete mode 100644 rdmo/projects/static/projects/css/project.scss

diff --git a/rdmo/projects/static/projects/css/project.scss b/rdmo/projects/static/projects/css/project.scss
deleted file mode 100644
index 1fda0c6b55..0000000000
--- a/rdmo/projects/static/projects/css/project.scss
+++ /dev/null
@@ -1,24 +0,0 @@
-@import 'core/css/variables';
-
-.project-header {
-    .table > tbody > tr:first-child > td {
-        border-top: none;
-    }
-}
-
-.table {
-    margin-bottom: 0;
-}
-
-.project-update {
-    .fa {
-        float: right;
-        margin-right: 8px;
-    }
-}
-
-.table {
-    .fa-sign-out {
-        width: 11px;
-    }
-}

From 71f90760818b7cac14863ec14c06c28d5df7fa89 Mon Sep 17 00:00:00 2001
From: Jochen Klar <mail@jochenklar.de>
Date: Mon, 30 Mar 2026 21:31:12 +0200
Subject: [PATCH 06/16] Remove overlays

---
 conftest.py                                   |  1 -
 rdmo/core/schema.py                           |  1 -
 rdmo/core/settings.py                         | 26 -------
 .../templates/core/bs53/base_navigation.html  |  6 --
 rdmo/core/urls/__init__.py                    |  1 -
 rdmo/core/urls/v1/__init__.py                 |  1 -
 rdmo/core/views.py                            |  1 -
 rdmo/overlays/__init__.py                     |  0
 rdmo/overlays/admin.py                        | 10 ---
 rdmo/overlays/apps.py                         |  7 --
 rdmo/overlays/migrations/0001_initial.py      | 33 --------
 rdmo/overlays/migrations/__init__.py          |  0
 rdmo/overlays/models.py                       | 36 ---------
 .../static/overlays/css/overlays.scss         | 28 -------
 rdmo/overlays/static/overlays/js/overlays.js  | 77 -------------------
 rdmo/overlays/templates/overlays/buttons.html |  6 --
 .../templates/overlays/reset_overlays.html    | 18 -----
 rdmo/overlays/tests/__init__.py               |  0
 rdmo/overlays/tests/test_views.py             | 38 ---------
 rdmo/overlays/tests/test_viewsets.py          | 70 -----------------
 rdmo/overlays/urls/__init__.py                |  7 --
 rdmo/overlays/urls/v1.py                      | 14 ----
 rdmo/overlays/views.py                        | 21 -----
 rdmo/overlays/viewsets.py                     | 72 -----------------
 testing/fixtures/overlays.json                | 22 ------
 25 files changed, 496 deletions(-)
 delete mode 100644 rdmo/overlays/__init__.py
 delete mode 100644 rdmo/overlays/admin.py
 delete mode 100644 rdmo/overlays/apps.py
 delete mode 100644 rdmo/overlays/migrations/0001_initial.py
 delete mode 100644 rdmo/overlays/migrations/__init__.py
 delete mode 100644 rdmo/overlays/models.py
 delete mode 100644 rdmo/overlays/static/overlays/css/overlays.scss
 delete mode 100644 rdmo/overlays/static/overlays/js/overlays.js
 delete mode 100644 rdmo/overlays/templates/overlays/buttons.html
 delete mode 100644 rdmo/overlays/templates/overlays/reset_overlays.html
 delete mode 100644 rdmo/overlays/tests/__init__.py
 delete mode 100644 rdmo/overlays/tests/test_views.py
 delete mode 100644 rdmo/overlays/tests/test_viewsets.py
 delete mode 100644 rdmo/overlays/urls/__init__.py
 delete mode 100644 rdmo/overlays/urls/v1.py
 delete mode 100644 rdmo/overlays/views.py
 delete mode 100644 rdmo/overlays/viewsets.py
 delete mode 100644 testing/fixtures/overlays.json

diff --git a/conftest.py b/conftest.py
index 46de3de7cc..841fb65bce 100644
--- a/conftest.py
+++ b/conftest.py
@@ -19,7 +19,6 @@ def fixtures():
         'domain',
         'groups',
         'options',
-        'overlays',
         'projects',
         'questions',
         'sites',
diff --git a/rdmo/core/schema.py b/rdmo/core/schema.py
index 91593b217f..66b8c29e32 100644
--- a/rdmo/core/schema.py
+++ b/rdmo/core/schema.py
@@ -8,7 +8,6 @@ def filter_endpoints(endpoints):
     for (path, path_regex, method, callback) in endpoints:
         if not path.startswith((
             '/api/v1/management/',
-            '/api/v1/overlays/'
         )):
             yield (path, path_regex, method, callback)
 
diff --git a/rdmo/core/settings.py b/rdmo/core/settings.py
index 9b85058b34..830a59359c 100644
--- a/rdmo/core/settings.py
+++ b/rdmo/core/settings.py
@@ -18,7 +18,6 @@
     # rdmo modules
     'rdmo',
     'rdmo.core',
-    'rdmo.overlays',
     'rdmo.accounts',
     'rdmo.services',
     'rdmo.domain',
@@ -293,31 +292,6 @@
 
 USER_API = True
 
-OVERLAYS = {
-    'projects': [
-        'projects-table',
-        'create-project',
-        'import-project',
-        'support-info'
-    ],
-    'project': [
-        'project-questions',
-        'project-catalog',
-        'project-issues',
-        'project-views',
-        'project-memberships',
-        'project-snapshots',
-        'export-project',
-        'import-project',
-        'support-info'
-    ],
-    'issue_send': [
-        'issue-message',
-        'issue-attachments',
-        'support-info'
-    ]
-}
-
 EXPORT_FORMATS = (
     ('pdf', _('PDF')),
     ('rtf', _('Rich Text Format')),
diff --git a/rdmo/core/templates/core/bs53/base_navigation.html b/rdmo/core/templates/core/bs53/base_navigation.html
index 83632ef429..ea8627ac45 100644
--- a/rdmo/core/templates/core/bs53/base_navigation.html
+++ b/rdmo/core/templates/core/bs53/base_navigation.html
@@ -94,12 +94,6 @@
                         </li>
                         {% endif %}
 
-                        <li class="nav-item">
-                            <a href="{% url 'reset_overlays' %}" class="nav-link">
-                                {% trans 'Reset tutorial overlays' %}
-                            </a>
-                        </li>
-
                         <li role="separator" class="divider"></li>
 
                         {% if settings.ACCOUNT or settings.SOCIALACCOUNT %}
diff --git a/rdmo/core/urls/__init__.py b/rdmo/core/urls/__init__.py
index e575385582..be212fc975 100644
--- a/rdmo/core/urls/__init__.py
+++ b/rdmo/core/urls/__init__.py
@@ -6,7 +6,6 @@
 urlpatterns = [
     path('account/', include('rdmo.accounts.urls')),
     path('management/', include('rdmo.management.urls')),
-    path('overlays/', include('rdmo.overlays.urls')),
     path('projects/', include('rdmo.projects.urls')),
     path('services/', include('rdmo.services.urls')),
 
diff --git a/rdmo/core/urls/v1/__init__.py b/rdmo/core/urls/v1/__init__.py
index 31119717b6..5a321d5cce 100644
--- a/rdmo/core/urls/v1/__init__.py
+++ b/rdmo/core/urls/v1/__init__.py
@@ -6,7 +6,6 @@
     path('domain/', include('rdmo.domain.urls.v1')),
     path('management/', include('rdmo.management.urls.v1')),
     path('options/', include('rdmo.options.urls.v1')),
-    path('overlays/', include('rdmo.overlays.urls.v1')),
     path('projects/', include('rdmo.projects.urls.v1')),
     path('questions/', include('rdmo.questions.urls.v1')),
     path('tasks/', include('rdmo.tasks.urls.v1')),
diff --git a/rdmo/core/views.py b/rdmo/core/views.py
index a85c0b812a..5c2481a78d 100644
--- a/rdmo/core/views.py
+++ b/rdmo/core/views.py
@@ -68,7 +68,6 @@ def api(request):
                 'domain',
                 'management',
                 'options',
-                'overlays',
                 'projects',
                 'questions',
                 'tasks',
diff --git a/rdmo/overlays/__init__.py b/rdmo/overlays/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/rdmo/overlays/admin.py b/rdmo/overlays/admin.py
deleted file mode 100644
index ee663ac45c..0000000000
--- a/rdmo/overlays/admin.py
+++ /dev/null
@@ -1,10 +0,0 @@
-from django.contrib import admin
-
-from .models import Overlay
-
-
-@admin.register(Overlay)
-class OverlayAdmin(admin.ModelAdmin):
-    search_fields = ('user__username', 'url_name', 'current')
-    list_display = ('user', 'site', 'url_name', 'current')
-    list_filter = ('url_name', 'current')
diff --git a/rdmo/overlays/apps.py b/rdmo/overlays/apps.py
deleted file mode 100644
index d88b9f23df..0000000000
--- a/rdmo/overlays/apps.py
+++ /dev/null
@@ -1,7 +0,0 @@
-from django.apps import AppConfig
-from django.utils.translation import gettext_lazy as _
-
-
-class OverlayConfig(AppConfig):
-    name = 'rdmo.overlays'
-    verbose_name = _('Overlays')
diff --git a/rdmo/overlays/migrations/0001_initial.py b/rdmo/overlays/migrations/0001_initial.py
deleted file mode 100644
index 7421f04089..0000000000
--- a/rdmo/overlays/migrations/0001_initial.py
+++ /dev/null
@@ -1,33 +0,0 @@
-# Generated by Django 2.2.18 on 2021-03-22 15:47
-
-from django.conf import settings
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    initial = True
-
-    dependencies = [
-        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
-        ('sites', '0002_alter_domain_unique'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='Overlay',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('url_name', models.SlugField(help_text='The url_name for this overlay.', max_length=128, verbose_name='Url name')),
-                ('current', models.SlugField(blank=True, help_text='The current state for this overlay.', max_length=128, verbose_name='Current')),
-                ('site', models.ForeignKey(help_text='The site for this overlay.', null=True, on_delete=django.db.models.deletion.SET_NULL, to='sites.Site', verbose_name='Site')),
-                ('user', models.ForeignKey(help_text='The user for this overlay.', on_delete=django.db.models.deletion.CASCADE, related_name='overlays', to=settings.AUTH_USER_MODEL, verbose_name='User')),
-            ],
-            options={
-                'verbose_name': 'Overlay',
-                'verbose_name_plural': 'Overlays',
-                'ordering': ('user', 'url_name'),
-            },
-        ),
-    ]
diff --git a/rdmo/overlays/migrations/__init__.py b/rdmo/overlays/migrations/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/rdmo/overlays/models.py b/rdmo/overlays/models.py
deleted file mode 100644
index 16703a497b..0000000000
--- a/rdmo/overlays/models.py
+++ /dev/null
@@ -1,36 +0,0 @@
-from django.conf import settings
-from django.contrib.sites.models import Site
-from django.db import models
-from django.utils.translation import gettext_lazy as _
-
-
-class Overlay(models.Model):
-
-    user = models.ForeignKey(
-        settings.AUTH_USER_MODEL, on_delete=models.CASCADE, related_name='overlays',
-        verbose_name=_('User'),
-        help_text=_('The user for this overlay.')
-    )
-    site = models.ForeignKey(
-        Site, on_delete=models.SET_NULL, null=True,
-        verbose_name=_('Site'),
-        help_text=_('The site for this overlay.')
-    )
-    url_name = models.SlugField(
-        max_length=128,
-        verbose_name=_('Url name'),
-        help_text=_('The url_name for this overlay.')
-    )
-    current = models.SlugField(
-        max_length=128, blank=True,
-        verbose_name=_('Current'),
-        help_text=_('The current state for this overlay.')
-    )
-
-    class Meta:
-        ordering = ('user', 'url_name')
-        verbose_name = _('Overlay')
-        verbose_name_plural = _('Overlays')
-
-    def __str__(self):
-        return f'{self.user} / {self.url_name}'
diff --git a/rdmo/overlays/static/overlays/css/overlays.scss b/rdmo/overlays/static/overlays/css/overlays.scss
deleted file mode 100644
index 0d1a2a60b7..0000000000
--- a/rdmo/overlays/static/overlays/css/overlays.scss
+++ /dev/null
@@ -1,28 +0,0 @@
-@import 'core/css/variables';
-
-.overlay {
-    display: none;
-}
-
-// hide popovers on mobile
-@media (max-width: $screen-sm-max) {
-    .popover {
-        position: fixed;
-        top: 60px !important;
-        left: 20px !important;
-        right: 20px !important;
-
-        &.top {
-            margin-top: 0;
-        }
-
-        .arrow {
-            display: none;
-        }
-    }
-}
-
-.popover-buttons {
-    margin-top: 9px;
-    text-align: right;
-}
diff --git a/rdmo/overlays/static/overlays/js/overlays.js b/rdmo/overlays/static/overlays/js/overlays.js
deleted file mode 100644
index 09833dc7f9..0000000000
--- a/rdmo/overlays/static/overlays/js/overlays.js
+++ /dev/null
@@ -1,77 +0,0 @@
-function initOverlays(url_name) {
-    var baseurl = $('meta[name="baseurl"').attr('content');
-    var csrftoken = getCookie('csrftoken');
-    var defaults = {
-        html: true,
-        sanitize: false,
-        trigger: 'manual',
-        template: '<div class="popover" role="tooltip"><div class="arrow"></div><div class="popover-title"></div><div class="popover-content"></div></div>',
-        viewport: {
-            selector: '.content > .container',
-            padding: 10
-        }
-    };
-
-    function showPopover(response) {
-        // close all popovers
-        $("[aria-describedby^='popover']").popover('hide');
-
-        if (response.overlay) {
-            var elementId = '#' + response.overlay,
-                overlayId = '#' + response.overlay + '-overlay'
-            var opts = $.extend({}, defaults, $(overlayId).data(), {
-                'content': $(overlayId).html(),
-            })
-
-            // if overlay element does not exist, proceed with next overlay
-            if (!$(elementId).length) {
-                fetchResponse('next');
-                return;
-            }
-
-            // show popover
-            $(elementId).popover(opts).popover('show');
-
-            // bind buttons
-            $('.popover-next').unbind().click(function() {
-                fetchResponse('next');
-            });
-            $('.popover-dismiss').unbind().click(function() {
-                fetchResponse('dismiss');
-            });
-        }
-
-        if (response.last) {
-            $('.popover-next').hide();
-            $('.popover-dismiss').addClass('btn-primary');
-        }
-    }
-
-    function getCookie(name) {
-        // from https://docs.djangoproject.com/en/stable/ref/csrf/
-        let cookieValue = null;
-        if (document.cookie && document.cookie !== '') {
-            const cookies = document.cookie.split(';');
-            for (let i = 0; i < cookies.length; i++) {
-                const cookie = cookies[i].trim();
-                // Does this cookie string begin with the name we want?
-                if (cookie.substring(0, name.length + 1) === (name + '=')) {
-                    cookieValue = decodeURIComponent(cookie.substring(name.length + 1));
-                    break;
-                }
-            }
-        }
-        return cookieValue;
-    }
-
-    function fetchResponse(action) {
-        $.ajax({
-            url: baseurl + 'api/v1/overlays/overlays/' + url_name + '/' + action + '/',
-            type: 'POST',
-            headers: {'X-CSRFToken': csrftoken},
-            success: showPopover
-        });
-    }
-
-    fetchResponse('current');
-}
diff --git a/rdmo/overlays/templates/overlays/buttons.html b/rdmo/overlays/templates/overlays/buttons.html
deleted file mode 100644
index db3b6fb05b..0000000000
--- a/rdmo/overlays/templates/overlays/buttons.html
+++ /dev/null
@@ -1,6 +0,0 @@
-{% load i18n %}
-
-<div class="popover-buttons">
-    <button type="button" class="btn btn-sm popover-dismiss" title="Dismiss all tips on this page">{% trans 'Dismiss' %}</button>
-    <button type="button" class="btn btn-primary btn-sm popover-next">{% trans 'Next tip' %}</button>
-</div>
diff --git a/rdmo/overlays/templates/overlays/reset_overlays.html b/rdmo/overlays/templates/overlays/reset_overlays.html
deleted file mode 100644
index 9faedfe846..0000000000
--- a/rdmo/overlays/templates/overlays/reset_overlays.html
+++ /dev/null
@@ -1,18 +0,0 @@
-{% extends 'core/page.html' %}
-{% load i18n %}
-
-{% block page %}
-
-    <h1>{% trans "Reset tutorial overlays" %}</h1>
-
-    <p>
-        {% trans 'RDMO uses overlays to introduce its functionality to new users. After that, these overlays will no longer be displayed. Please click the button below if you want to go through the tutorials again.' %}
-    </p>
-
-    <form method="post">
-        {% csrf_token %}
-        <input type="hidden" name="next" value="{{ next }}" />
-        <input type="submit" class="btn btn-primary" value="{% trans 'Reset overlays' %}" />
-    </form>
-
-{% endblock %}
diff --git a/rdmo/overlays/tests/__init__.py b/rdmo/overlays/tests/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/rdmo/overlays/tests/test_views.py b/rdmo/overlays/tests/test_views.py
deleted file mode 100644
index 8f6fa8aa0e..0000000000
--- a/rdmo/overlays/tests/test_views.py
+++ /dev/null
@@ -1,38 +0,0 @@
-import pytest
-
-from django.urls import reverse
-
-from ..models import Overlay
-
-users = (
-    ('user', 'user'),
-    ('anonymous', None)
-)
-
-
-@pytest.mark.parametrize('username,password', users)
-def test_reset_overlays_get(db, client, username, password):
-    client.login(username=username, password=password)
-
-    url = reverse('reset_overlays')
-    response = client.get(url)
-    if password:
-        assert response.status_code == 200
-    else:
-        assert response.status_code == 302
-
-
-@pytest.mark.parametrize('username,password', users)
-def test_reset_overlays_post(db, client, username, password):
-    client.login(username=username, password=password)
-
-    if password:
-        assert Overlay.objects.filter(user__username=username).exists() is True
-
-    url = reverse('reset_overlays')
-    response = client.post(url)
-    if password:
-        assert response.status_code == 302
-        assert Overlay.objects.filter(user__username=username).exists() is False
-    else:
-        assert response.status_code == 302
diff --git a/rdmo/overlays/tests/test_viewsets.py b/rdmo/overlays/tests/test_viewsets.py
deleted file mode 100644
index 931a71944a..0000000000
--- a/rdmo/overlays/tests/test_viewsets.py
+++ /dev/null
@@ -1,70 +0,0 @@
-import pytest
-
-from django.urls import reverse
-
-from ..models import Overlay
-
-users = (
-    ('user', 'user'),
-    ('anonymous', None)
-)
-
-urlnames = {
-    'current': 'v1-overlays:overlay-current',
-    'next': 'v1-overlays:overlay-next',
-    'dismiss': 'v1-overlays:overlay-dismiss'
-}
-
-url_names = [
-    'projects'
-]
-
-
-@pytest.mark.parametrize('username,password', users)
-@pytest.mark.parametrize('url_name', url_names)
-def test_current(db, client, username, password, url_name):
-    client.login(username=username, password=password)
-
-    url = reverse(urlnames['current'], args=[url_name])
-    response = client.post(url)
-
-    if password:
-        assert response.status_code == 200
-        assert Overlay.objects.get(user__username=username, url_name=url_name).current == response.json().get('overlay')
-    else:
-        assert response.status_code == 401
-
-
-@pytest.mark.parametrize('username,password', users)
-@pytest.mark.parametrize('url_name', url_names)
-def test_next(db, client, username, password, url_name):
-    client.login(username=username, password=password)
-
-    url = reverse(urlnames['next'], args=[url_name])
-    response = client.post(url)
-
-    if password:
-        assert response.status_code == 200
-        assert response.json().get('overlay') == Overlay.objects.get(
-            user__username=username, url_name=url_name
-        ).current
-    else:
-        assert response.status_code == 401
-
-
-@pytest.mark.parametrize('username,password', users)
-@pytest.mark.parametrize('url_name', url_names)
-def test_dismiss(db, client, username, password, url_name):
-    client.login(username=username, password=password)
-
-    url = reverse(urlnames['dismiss'], args=[url_name])
-    response = client.post(url)
-
-    if password:
-        assert response.status_code == 200
-        assert response.json().get('overlay') == ''
-        assert response.json().get('overlay') == Overlay.objects.get(
-            user__username=username, url_name=url_name
-        ).current
-    else:
-        assert response.status_code == 401
diff --git a/rdmo/overlays/urls/__init__.py b/rdmo/overlays/urls/__init__.py
deleted file mode 100644
index abe848d210..0000000000
--- a/rdmo/overlays/urls/__init__.py
+++ /dev/null
@@ -1,7 +0,0 @@
-from django.urls import path
-
-from ..views import reset_overlays
-
-urlpatterns = [
-    path('reset/', reset_overlays, name='reset_overlays')
-]
diff --git a/rdmo/overlays/urls/v1.py b/rdmo/overlays/urls/v1.py
deleted file mode 100644
index 9054f26c1d..0000000000
--- a/rdmo/overlays/urls/v1.py
+++ /dev/null
@@ -1,14 +0,0 @@
-from django.urls import include, path
-
-from rest_framework import routers
-
-from ..viewsets import OverlayViewSet
-
-app_name = 'v1-overlays'
-
-router = routers.DefaultRouter()
-router.register(r'overlays', OverlayViewSet, basename='overlay')
-
-urlpatterns = [
-    path('', include(router.urls)),
-]
diff --git a/rdmo/overlays/views.py b/rdmo/overlays/views.py
deleted file mode 100644
index 2665dc7bfe..0000000000
--- a/rdmo/overlays/views.py
+++ /dev/null
@@ -1,21 +0,0 @@
-import logging
-
-from django.contrib.auth.decorators import login_required
-from django.shortcuts import redirect, render
-
-from rdmo.core.utils import get_next, get_referer_path_info
-
-from .models import Overlay
-
-logger = logging.getLogger(__name__)
-
-
-@login_required()
-def reset_overlays(request):
-    if request.method == 'POST':
-        Overlay.objects.filter(user=request.user).delete()
-        return redirect(get_next(request))
-
-    return render(request, 'overlays/reset_overlays.html', {
-        'next': get_referer_path_info(request, default='/')
-    })
diff --git a/rdmo/overlays/viewsets.py b/rdmo/overlays/viewsets.py
deleted file mode 100644
index 20a1aa3895..0000000000
--- a/rdmo/overlays/viewsets.py
+++ /dev/null
@@ -1,72 +0,0 @@
-from django.conf import settings
-from django.contrib.sites.models import Site
-
-from rest_framework.decorators import action
-from rest_framework.exceptions import NotFound
-from rest_framework.permissions import IsAuthenticated
-from rest_framework.response import Response
-from rest_framework.viewsets import ViewSet
-
-from .models import Overlay
-
-
-class OverlayViewSet(ViewSet):
-
-    @action(detail=False, methods=['post'], url_path='(?P<url_name>[-\\w]+)/current',
-            permission_classes=[IsAuthenticated])
-    def current(self, request, url_name=None):
-        site = Site.objects.get_current()
-        overlays = settings.OVERLAYS.get(url_name)[:]
-
-        if not overlays:
-            raise NotFound()
-
-        try:
-            overlay = Overlay.objects.get(user=request.user, site=site, url_name=url_name)
-        except Overlay.DoesNotExist:
-            overlay = Overlay.objects.create(user=request.user, site=site, url_name=url_name, current=overlays[0])
-
-        return Response({
-            'overlay': overlay.current,
-            'last': overlay.current == overlays[-1]
-        })
-
-    @action(detail=False, methods=['post'], url_path='(?P<url_name>[-\\w]+)/next',
-            permission_classes=[IsAuthenticated])
-    def next(self, request, url_name=None):
-        site = Site.objects.get_current()
-        overlays = settings.OVERLAYS.get(url_name)[:]
-        if not overlays:
-            raise NotFound()
-
-        try:
-            overlay = Overlay.objects.get(user=request.user, site=site, url_name=url_name)
-            try:
-                overlay.current = overlays[overlays.index(overlay.current) + 1]
-            except (IndexError, ValueError):
-                overlay.current = ''
-            overlay.save()
-        except Overlay.DoesNotExist:
-            overlay = Overlay.objects.create(user=request.user, site=site, url_name=url_name, current=overlays[0])
-
-        return Response({
-            'overlay': overlay.current,
-            'last': overlay.current == overlays[-1]
-        })
-
-    @action(detail=False, methods=['post'], url_path='(?P<url_name>[-\\w]+)/dismiss',
-            permission_classes=[IsAuthenticated])
-    def dismiss(self, request, url_name=None):
-        site = Site.objects.get_current()
-        overlays = settings.OVERLAYS.get(url_name)[:]
-        if not overlays:
-            raise NotFound()
-
-        try:
-            overlay = Overlay.objects.get(user=request.user, site=site, url_name=url_name)
-            overlay.current = ''
-            overlay.save()
-        except Overlay.DoesNotExist:
-            overlay = Overlay.objects.create(user=request.user, site=site, url_name=url_name, current='')
-
-        return Response({'overlay': overlay.current})
diff --git a/testing/fixtures/overlays.json b/testing/fixtures/overlays.json
deleted file mode 100644
index 6a64b39281..0000000000
--- a/testing/fixtures/overlays.json
+++ /dev/null
@@ -1,22 +0,0 @@
-[
-  {
-    "model": "overlays.overlay",
-    "pk": 1,
-    "fields": {
-      "user": 1,
-      "site": 1,
-      "url_name": "projects",
-      "current": ""
-    }
-  },
-  {
-    "model": "overlays.overlay",
-    "pk": 2,
-    "fields": {
-      "user": 4,
-      "site": 1,
-      "url_name": "projects",
-      "current": "create-project"
-    }
-  }
-]

From a8756dd0d371792a4c473d138be8b9010b257611 Mon Sep 17 00:00:00 2001
From: Jochen Klar <mail@jochenklar.de>
Date: Mon, 30 Mar 2026 21:33:22 +0200
Subject: [PATCH 07/16] Remove core templates

---
 rdmo/core/templates/core/about.html           |   2 +-
 rdmo/core/templates/core/api.html             |   7 +-
 rdmo/core/templates/core/base.html            |  53 -------
 rdmo/core/templates/core/base_footer.html     |   7 -
 rdmo/core/templates/core/base_head.html       |  18 ---
 rdmo/core/templates/core/base_navigation.html | 135 ------------------
 .../templates/core/bootstrap_delete_form.html |   9 --
 rdmo/core/templates/core/bootstrap_form.html  |  16 ---
 .../templates/core/bootstrap_form_field.html  |  81 -----------
 .../templates/core/bootstrap_form_fields.html |  13 --
 rdmo/core/templates/core/bs53/base.html       |   2 +-
 rdmo/core/templates/core/home.html            |  64 ---------
 rdmo/core/templates/core/home_text_de.html    |  11 --
 rdmo/core/templates/core/home_text_en.html    |  10 --
 rdmo/core/templates/core/home_text_es.html    |  10 --
 rdmo/core/templates/core/home_text_fr.html    |  11 --
 rdmo/core/templates/core/home_text_it.html    |  10 --
 rdmo/core/templates/core/page.html            |  17 +--
 rdmo/core/templates/core/projects_page.html   |  13 --
 rdmo/core/templates/core/upload_form.html     |  37 -----
 20 files changed, 5 insertions(+), 521 deletions(-)
 delete mode 100644 rdmo/core/templates/core/base.html
 delete mode 100644 rdmo/core/templates/core/base_footer.html
 delete mode 100644 rdmo/core/templates/core/base_head.html
 delete mode 100644 rdmo/core/templates/core/base_navigation.html
 delete mode 100644 rdmo/core/templates/core/bootstrap_delete_form.html
 delete mode 100644 rdmo/core/templates/core/bootstrap_form.html
 delete mode 100644 rdmo/core/templates/core/bootstrap_form_field.html
 delete mode 100644 rdmo/core/templates/core/bootstrap_form_fields.html
 delete mode 100644 rdmo/core/templates/core/home.html
 delete mode 100644 rdmo/core/templates/core/home_text_de.html
 delete mode 100644 rdmo/core/templates/core/home_text_en.html
 delete mode 100644 rdmo/core/templates/core/home_text_es.html
 delete mode 100644 rdmo/core/templates/core/home_text_fr.html
 delete mode 100644 rdmo/core/templates/core/home_text_it.html
 delete mode 100644 rdmo/core/templates/core/projects_page.html
 delete mode 100644 rdmo/core/templates/core/upload_form.html

diff --git a/rdmo/core/templates/core/about.html b/rdmo/core/templates/core/about.html
index 0076a5da0b..9a9066d2d9 100644
--- a/rdmo/core/templates/core/about.html
+++ b/rdmo/core/templates/core/about.html
@@ -1,4 +1,4 @@
-{% extends 'core/base.html' %}
+{% extends 'core/bs53/base.html' %}
 {% load static core_tags %}
 {% load i18n %}
 
diff --git a/rdmo/core/templates/core/api.html b/rdmo/core/templates/core/api.html
index bc18cf7cae..b07cda4cf2 100644
--- a/rdmo/core/templates/core/api.html
+++ b/rdmo/core/templates/core/api.html
@@ -1,10 +1,8 @@
-{% extends 'core/base.html' %}
+{% extends 'core/bs53/main.html' %}
 {% load i18n %}
 {% load core_tags %}
 
-{% block content %}
-
-<div class="container page">
+{% block main %}
 
     <h1>API</h1>
 
@@ -52,6 +50,5 @@ <h2>Module endpoints</h2>
         <li><a href="{{ module_url }}">{{ module_url }}</a></li>
         {% endfor %}
     </ul>
-</div>
 
 {% endblock %}
diff --git a/rdmo/core/templates/core/base.html b/rdmo/core/templates/core/base.html
deleted file mode 100644
index 96e535fb03..0000000000
--- a/rdmo/core/templates/core/base.html
+++ /dev/null
@@ -1,53 +0,0 @@
-{% load static compress core_tags i18n %}{% get_current_language as lang_code %}<!DOCTYPE html>
-<html lang="{{ lang_code }}">
-<head>
-    {% include 'core/base_head.html' %}
-
-    {% block css %}
-    <link rel="stylesheet" href="{% static 'core/css/base.css' %}" />
-
-    {% compress css %}
-    <link rel="stylesheet" type="text/x-scss" href="{% static 'core/css/base.scss' %}" />
-    <link rel="stylesheet" type="text/x-scss" href="{% static 'core/css/fonts.scss' %}" />
-    <link rel="stylesheet" type="text/x-scss" href="{% static 'core/css/footer.scss' %}" />
-    <link rel="stylesheet" type="text/x-scss" href="{% static 'core/css/style.scss' %}" />
-    {% endcompress %}
-
-    {% endblock %}
-
-    {% block js %}
-    <script src="{% url 'javascript-catalog' %}"></script>
-    <script src="{% static 'core/js/base.js' %}"></script>
-    <script src="{% static 'core/js/utils.js' %}"></script>
-    {% endblock %}
-
-    {% block head %}
-    {% endblock %}
-</head>
-
-<body>
-
-<!-- navigation -->
-{% include 'core/base_navigation.html' %}
-<!-- end navigation -->
-
-<!-- content -->
-<div class="content">
-    {% block content %}{% endblock %}
-</div>
-<!-- end content -->
-
-<!-- footer -->
-{% include 'core/base_footer.html' %}
-<!-- end footer -->
-
-{% if not debug %}
-<!-- analytics -->
-{% include 'core/base_analytics.html' %}
-<!-- end analytics -->
-{% endif %}
-
-{% block extra_body %}{% endblock %}
-
-</body>
-</html>
diff --git a/rdmo/core/templates/core/base_footer.html b/rdmo/core/templates/core/base_footer.html
deleted file mode 100644
index a2f083eb53..0000000000
--- a/rdmo/core/templates/core/base_footer.html
+++ /dev/null
@@ -1,7 +0,0 @@
-{% load i18n core_tags %}
-
-<footer>
-    <div class="container">
-        {% render_lang_template 'core/footer_text' %}
-    </div>
-</footer>
diff --git a/rdmo/core/templates/core/base_head.html b/rdmo/core/templates/core/base_head.html
deleted file mode 100644
index d5e28ea95e..0000000000
--- a/rdmo/core/templates/core/base_head.html
+++ /dev/null
@@ -1,18 +0,0 @@
-{% load static %}
-{% load i18n %}
-{% get_current_language as LANGUAGE_CODE %}
-
-    <title>{{ request.site.name }}</title>
-
-    <meta charset="UTF-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
-
-    <meta property="og:title" content="{{ request.site.name }}" />
-    <meta property="og:url" content="{{ request.site.domain }}" />
-
-    <meta name='baseurl' content="{% url 'home' %}" />
-    <meta name='staticurl' content="{% static '' %}" />
-    <meta name='site_id' content="{{ settings.SITE_ID }}" />
-    <meta name='language' content="{{ LANGUAGE_CODE }}">
-
-    <link rel="shortcut icon" href="{% static 'core/img/favicon.png' %}" type="image/png" />
diff --git a/rdmo/core/templates/core/base_navigation.html b/rdmo/core/templates/core/base_navigation.html
deleted file mode 100644
index a4116cfdcc..0000000000
--- a/rdmo/core/templates/core/base_navigation.html
+++ /dev/null
@@ -1,135 +0,0 @@
-{% load i18n %}
-{% load core_tags %}
-{% load accounts_tags %}
-{% load rules %}
-
-<nav class="navbar navbar-default navbar-fixed-top" role="navigation">
-    <div class="container">
-        <div class="navbar-header">
-            <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#navbar-collapse"
-                    aria-label="{% trans 'Toggle navigation' %}">
-                <span class="icon-bar"></span>
-                <span class="icon-bar"></span>
-                <span class="icon-bar"></span>
-            </button>
-            <a class="navbar-brand" href="{% url 'home' %}">{{ request.site.name }}</a>
-        </div>
-
-        <div class="collapse navbar-collapse" id="navbar-collapse">
-            <ul class="nav navbar-nav">
-                {% back_to_project_link %}
-
-                {% has_perm 'management.view_management' request.user as can_view_management %}
-
-                {% if can_view_management %}
-                <li>
-                    <a href="{% url 'management' %}">{% trans 'Management' %}</a>
-                </li>
-                {% endif %}
-                {% if user.is_superuser %}
-                <li>
-                    <a href="{% url 'admin:index' %}">{% trans 'Admin' %}</a>
-                </li>
-                {% endif %}
-            </ul>
-
-            <ul class="nav navbar-nav navbar-right">
-                <li>
-                    <p class="navbar-text">
-                        <span id="pending"></span>
-                    </p>
-                </li>
-
-                <li class="dropdown">
-                    <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">{% trans 'Language' %}<span class="caret"></span></a>
-                    <ul class="dropdown-menu">
-                        {% i18n_switcher %}
-                    </ul>
-                </li>
-
-                {% if user.is_authenticated %}
-
-                <li class="dropdown">
-                    <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">{% full_name user %}<span class="caret"></span></a>
-                    <ul class="dropdown-menu">
-
-                        {% url 'about' as about_url %}
-                        {% if about_url %}
-                        <li>
-                            <a href="{{ about_url }}">
-                                {% trans 'About RDMO' %}
-                            </a>
-                        </li>
-                        <li role="separator" class="divider"></li>
-                        {% endif %}
-
-                        {% if settings.PROFILE_UPDATE %}
-                        <li>
-                            <a href="{% url 'profile_update' %}">
-                                {% trans 'Update profile' %}
-                            </a>
-                        </li>
-                        {% endif %}
-
-                        {% if settings.ACCOUNT %}
-                            {% include 'core/base_navigation_account.html' %}
-                        {% endif %}
-
-                        {% if settings.SOCIALACCOUNT %}
-                            {% include 'core/base_navigation_socialaccount.html' %}
-                        {% endif %}
-
-                        {% if settings.ACCOUNT_ALLOW_USER_TOKEN %}
-                        <li>
-                            <a href="{% url 'account_token' %}">
-                                {% trans 'API token' %}
-                            </a>
-                        </li>
-                        {% endif %}
-
-                        {% if settings.PROFILE_DELETE %}
-                        <li>
-                            <a href="{% url 'profile_remove' %}">
-                                {% trans 'Delete profile' %}
-                            </a>
-                        </li>
-                        {% endif %}
-
-                        <li>
-                            <a href="{% url 'reset_overlays' %}">
-                                {% trans 'Reset tutorial overlays' %}
-                            </a>
-                        </li>
-
-                        <li role="separator" class="divider"></li>
-
-                        {% if settings.ACCOUNT or settings.SOCIALACCOUNT %}
-                        <li>
-                            <form action="{{ settings.LOGOUT_URL }}" method="POST">
-                                {% csrf_token %}
-                                <button type="submit">{% trans 'Logout' %}</button>
-                            </form>
-                        </li>
-                        {% else %}
-                        <li>
-                            <a href="{{ settings.LOGOUT_URL }}">
-                                {% trans 'Logout' %}
-                            </a>
-                        </li>
-                        {% endif %}
-                    </ul>
-                </li>
-
-                {% else %}
-
-                <li>
-                    <a href="{{ settings.LOGIN_URL }}">
-                        {% trans 'Login' %}
-                    </a>
-                </li>
-
-                {% endif %}
-            </ul>
-        </div>
-    </div>
-</nav>
diff --git a/rdmo/core/templates/core/bootstrap_delete_form.html b/rdmo/core/templates/core/bootstrap_delete_form.html
deleted file mode 100644
index eb6d592b68..0000000000
--- a/rdmo/core/templates/core/bootstrap_delete_form.html
+++ /dev/null
@@ -1,9 +0,0 @@
-{% load i18n %}
-
-    <form method="post" action="">
-        {% csrf_token %}
-        <input type="hidden" name="next" value="{{ next }}" />
-
-        <input type="submit" value="{{ submit }}" class="btn btn-danger" />
-        <input type="submit" name="cancel" value="{% trans 'Cancel' %}" class="btn" />
-    </form>
diff --git a/rdmo/core/templates/core/bootstrap_form.html b/rdmo/core/templates/core/bootstrap_form.html
deleted file mode 100644
index 4cbced2125..0000000000
--- a/rdmo/core/templates/core/bootstrap_form.html
+++ /dev/null
@@ -1,16 +0,0 @@
-{% load i18n %}
-
-    <form method="post" action="{{ action }}" novalidate>
-        {% csrf_token %}
-        <input type="hidden" name="next" value="{{ next }}" />
-
-        {% include 'core/bootstrap_form_fields.html' %}
-
-        {% if submit %}
-        <input type="submit" value="{{ submit }}" class="btn btn-primary" />
-        {% endif %}
-        {% if delete %}
-        <input type="submit" name="delete" value="{{ delete }}" class="btn btn-danger" />
-        {% endif %}
-        <input type="submit" name="cancel" value="{% trans 'Cancel' %}" class="btn" />
-    </form>
diff --git a/rdmo/core/templates/core/bootstrap_form_field.html b/rdmo/core/templates/core/bootstrap_form_field.html
deleted file mode 100644
index 3883cb53f2..0000000000
--- a/rdmo/core/templates/core/bootstrap_form_field.html
+++ /dev/null
@@ -1,81 +0,0 @@
-{% load i18n %}
-{% load widget_tweaks %}
-{% load core_tags %}
-
-<div class="form-group{% if field.errors %} has-error{% endif %} field-{{field.html_name}}">
-
-    {% with field|widget_type as type %}
-
-    {% if type == 'radio' or type == 'checkboxinput' or type == 'checkboxselectmultiple' %}
-        <strong class="mb-5">{{ field.label }}</strong>
-    {% else %}
-        <label for="{{ field.id_for_label }}" class="control-label">{{ field.label }}</label>
-    {% endif %}
-
-    {% if field.help_text %}
-    <div class="help-block info">
-        {{ field.help_text }}
-    </div>
-    {% endif %}
-
-    {% if type == 'radioselect' %}
-
-    {% for choice in field %}
-    <div class="radio">
-        <label>
-            {{ choice.tag }}
-            {{ choice.choice_label }}
-        </label>
-    </div>
-    {% endfor %}
-
-    {% elif type == 'yesno' %}
-
-    <div class="radio">
-    {% for choice in field %}
-        <label class="radio-inline">
-            {{ choice.tag }}
-            {{ choice.choice_label }}
-        </label>
-    {% endfor %}
-    </div>
-
-    {% elif type == 'checkboxinput' %}
-
-    <div class="checkbox">
-        <label>
-            {{ field }}
-            {{ field.label }}
-        </label>
-    </div>
-
-    {% elif type == 'checkboxselectmultiple' %}
-
-    {% for choice in field %}
-    <div class="checkbox">
-        <label>
-            {{ choice.tag }}
-            {{ choice.choice_label }}
-        </label>
-    </div>
-    {% endfor %}
-
-    {% else %}
-
-    {% render_field field class="form-control" %}
-
-    {% if type == 'selectmultiple' %}
-    <p class="help-block">
-    {% trans 'Hold down "Control", or "Command" on a Mac, to select more than one.' %}
-    </p>
-    {% endif %}
-
-    {% endif %}
-    {% endwith %}
-
-    {% if field.errors %}
-    <div class="help-block error">
-        <p class="text-danger">{{ field.errors.as_text}}</p>
-    </div>
-    {% endif %}
-</div>
diff --git a/rdmo/core/templates/core/bootstrap_form_fields.html b/rdmo/core/templates/core/bootstrap_form_fields.html
deleted file mode 100644
index 342e8bbd09..0000000000
--- a/rdmo/core/templates/core/bootstrap_form_fields.html
+++ /dev/null
@@ -1,13 +0,0 @@
-{% for hidden in form.hidden_fields %}
-    {{ hidden }}
-{% endfor %}
-
-{% for field in form.visible_fields %}
-    {% include 'core/bootstrap_form_field.html' with field=field %}
-{% endfor %}
-
-{% for error in form.non_field_errors %}
-<ul class="text-danger list-unstyled form-errors">
-    <li>{{ error }}</li>
-</ul>
-{% endfor %}
diff --git a/rdmo/core/templates/core/bs53/base.html b/rdmo/core/templates/core/bs53/base.html
index 1d80eb9999..bb01286003 100644
--- a/rdmo/core/templates/core/bs53/base.html
+++ b/rdmo/core/templates/core/bs53/base.html
@@ -1,4 +1,4 @@
-{% load static compress core_tags %}<!DOCTYPE html>
+{% load static core_tags %}<!DOCTYPE html>
 <html>
 <head>
     {% include 'core/bs53/base_head.html' %}
diff --git a/rdmo/core/templates/core/home.html b/rdmo/core/templates/core/home.html
deleted file mode 100644
index 4c5cf20467..0000000000
--- a/rdmo/core/templates/core/home.html
+++ /dev/null
@@ -1,64 +0,0 @@
-{% extends 'core/base.html' %}
-{% load i18n compress static core_tags %}
-
-{% block head %}
-{% compress css %}
-<link rel="stylesheet" type="text/x-scss" href="{% static 'core/css/header.scss' %}" />
-{% endcompress %}
-
-{% compress js %}
-{{ block.super }}
-<script type="text/javascript" src="{% static 'core/js/header.js' %}"></script>
-{% endcompress %}
-{% endblock %}
-
-{% block content %}
-
-<header>
-    <div class="hidden-xs">
-        <div class="header-image header-image-0 visible">
-            <img src="{% static 'core/img/header/library.jpg' %}" alt="Stockholm Public Library"></img>
-            <p class="attribution">
-                <a href="https://www.flickr.com/photos/spam/5086168739">Stockholm Public Library (Samantha Marx)</a> / <a href="https://creativecommons.org/licenses/by/2.0/">CC BY 2.0</a>
-            </p>
-        </div>
-        <div class="header-image header-image-1">
-            <img src="{% static 'core/img/header/supercomputer.jpg' %}" alt="Discover Supercomputer 3"></img>
-            <p class="attribution">
-                <a href="https://www.flickr.com/photos/nasa_goddard/6559334541">Discover Supercomputer 3 (NASA Goddard Space Flight Center)</a> / <a href="https://creativecommons.org/licenses/by/2.0/">CC BY 2.0</a>
-            </p>
-        </div>
-        <div class="header-image header-image-2">
-            <img src="{% static 'core/img/header/collection.jpg' %}" alt=">Nasssammlung"></img>
-            <p class="attribution">
-                <a href="https://www.flickr.com/photos/bulle_de/9221247815">Nasssammlung (Christopher Bulle)</a> / <a href="https://creativecommons.org/licenses/by/2.0/">CC BY 2.0</a> <!-- spellchecker:disable-line -->
-            </p>
-        </div>
-    </div>
-    <div class="container header-text">
-
-        <h1>RDMO</h1>
-
-        <div class="row">
-            <div class="col-md-9">
-                <p>{% trans "A tool to support the planning, implementation, and organisation of research data management." %}</p>
-            </div>
-        </div>
-    </div>
-</header>
-
-<div class="container page">
-    <div class="row">
-        <div class="col-md-9">
-            {% render_lang_template "core/home_text" %}
-        </div>
-
-        <div class="col-md-3">
-            <h3>{% trans 'Login' %}</h3>
-
-            {% include 'account/login_form.html' %}
-        </div>
-    </div>
-</div>
-
-{% endblock %}
diff --git a/rdmo/core/templates/core/home_text_de.html b/rdmo/core/templates/core/home_text_de.html
deleted file mode 100644
index ff500446e4..0000000000
--- a/rdmo/core/templates/core/home_text_de.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<h2>Willkommen bei RDMO</h2>
-
-<p>
-    RDMO ist eine Webapplikation, die die strukturierte Planung, Umsetzung und Verwaltung der Daten in einem wissenschaftlichen Projekt unterstützt.<br />
-    Die gesammelten Informationen können in Forschungsworkflows weiterverwendet werden und zusätzlich in textueller Form ausgegeben werden -
-    als Datenmanagementplan für die Förderer oder als teil eines Forschungsberichts.
-</p>
-
-<p>
-    Wenn Sie mehr über die Nutzung von RDMO als Endnutzer oder Manager erfahren wollen, besuchen Sie <a href="https://rdmorganiser.github.io">rdmorganiser.github.io</a>.
-</p>
diff --git a/rdmo/core/templates/core/home_text_en.html b/rdmo/core/templates/core/home_text_en.html
deleted file mode 100644
index de9dcebfc2..0000000000
--- a/rdmo/core/templates/core/home_text_en.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<h2>Welcome to RDMO</h2>
-
-<p>
-  RDMO is a web application that supports the structured planning, realisation and management of data in a scientific project.<br />
-  The information collected can be used in research workflows and can also be output in textual form - as a data management plan for funders or as part of a research report.
-</p>
-
-<p>
-    For more information about the project visit <a href="https://rdmorganiser.github.io">rdmorganiser.github.io</a>.
-</p>
diff --git a/rdmo/core/templates/core/home_text_es.html b/rdmo/core/templates/core/home_text_es.html
deleted file mode 100644
index fce115f690..0000000000
--- a/rdmo/core/templates/core/home_text_es.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<h2>Bienvenido a RDMO</h2>
-
-<p>
-  RDMO es una aplicación web que apoya la planificación estructurada, la realización y la gestión de datos en un proyecto científico.<br />
-  La información recopilada puede utilizarse en flujos de trabajo de investigación y también puede ser exportada en forma de texto: como plan de gestión de datos para los financiadores o como parte de un informe de investigación.
-</p>
-
-<p>
-    Si desea obtener más información sobre el uso de RDMO como usuario final o gestor, visite <a href="https://rdmorganiser.github.io">rdmorganiser.github.io</a>.
-</p>
diff --git a/rdmo/core/templates/core/home_text_fr.html b/rdmo/core/templates/core/home_text_fr.html
deleted file mode 100644
index e4ace4f14b..0000000000
--- a/rdmo/core/templates/core/home_text_fr.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<h2>Bienvenue sur RDMO</h2>
-
-<p>
-  RDMO est une application web qui soutient la planification structurée, la mise en œuvre et la gestion des données dans un projet scientifique.<br />
-  Les informations collectées peuvent être réutilisées dans des workflows de recherche et peuvent en outre être éditées sous forme de texte -
-  comme plan de gestion des données pour les bailleurs de fonds ou comme partie d'un rapport de recherche.
-</p>
-
-<p>
-    Pour plus d'informations sur le projet, visitez <a href="https://rdmorganiser.github.io">rdmorganiser.github.io</a>.
-</p>
diff --git a/rdmo/core/templates/core/home_text_it.html b/rdmo/core/templates/core/home_text_it.html
deleted file mode 100644
index b0ca5c4409..0000000000
--- a/rdmo/core/templates/core/home_text_it.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<h2>Benvenuti a RDMO</h2>
-
-<p>
-  RDMO è un'applicazione web che supporta la pianificazione, la realizzazione e la gestione strutturata dei dati in un progetto scientifico.<br />
-  Le informazioni raccolte possono essere utilizzate nei flussi di lavoro della ricerca e possono anche essere prodotte in forma testuale - come piano di gestione dei dati per i finanziatori o come parte di una relazione di ricerca.
-</p>
-
-<p>
-    Maggiori informazioni sul progetto sono disponibili su <a href="https://rdmorganiser.github.io">rdmorganiser.github.io</a>.
-</p>
diff --git a/rdmo/core/templates/core/page.html b/rdmo/core/templates/core/page.html
index d7e24c3a17..73b8aa63dc 100644
--- a/rdmo/core/templates/core/page.html
+++ b/rdmo/core/templates/core/page.html
@@ -1,16 +1 @@
-{% extends 'core/base.html' %}
-
-{% block content %}
-
-<div class="container">
-    <div class="row">
-        <div class="page col-md-9">
-            {% block page %}{% endblock %}
-        </div>
-        <div class="sidebar col-md-3">
-            {% block sidebar %}{% endblock %}
-        </div>
-    </div>
-</div>
-
-{% endblock %}
+{% extends 'core/bs53/page.html' %}
\ No newline at end of file
diff --git a/rdmo/core/templates/core/projects_page.html b/rdmo/core/templates/core/projects_page.html
deleted file mode 100644
index be3cc66d7f..0000000000
--- a/rdmo/core/templates/core/projects_page.html
+++ /dev/null
@@ -1,13 +0,0 @@
-{% extends 'core/base.html' %}
-
-{% block content %}
-
-<div class="container">
-    <div class="row">
-        <div class="page col-md-12">
-            {% block page %}{% endblock %}
-        </div>
-    </div>
-</div>
-
-{% endblock %}
diff --git a/rdmo/core/templates/core/upload_form.html b/rdmo/core/templates/core/upload_form.html
deleted file mode 100644
index 9823f1719a..0000000000
--- a/rdmo/core/templates/core/upload_form.html
+++ /dev/null
@@ -1,37 +0,0 @@
-{% load i18n %}
-{% load compress %}
-{% load static %}
-{% load core_tags %}
-
-<form id="upload-form" class="upload-form sidebar-form" action="{{ upload_url }}" method="POST" enctype="multipart/form-data">
-    {% csrf_token %}
-
-    <input type="hidden" name="method" value="upload_file" />
-
-    <div class="upload-form-field">
-        <input type="file" name="uploaded_file" aria-label="{% trans 'Upload file' %}"
-               {% if upload_accept %}accept="{{ upload_accept }}"{% endif %} />
-        <p>{% trans "Select file" %}</p>
-    </div>
-
-    <div class="sidebar-form-button">
-        <button type="submit" class="btn btn-primary" title="{% trans 'Upload' %}" aria-label="{% trans 'Upload' %}">
-            <i class="fa fa-arrow-right" aria-hidden="true"></i>
-        </button>
-    </div>
-</form>
-
-<script>
-    $(document).ready(function() {
-        $('#upload-form button[type="submit"]').prop('disabled', true)
-        $('#upload-form input').change(function() {
-            if (this.files[0] == null) {
-                $('#upload-form button[type="submit"]').prop('disabled', true)
-                $('#upload-form p').text('{% trans "Select file" %}')
-            } else {
-                $('#upload-form button[type="submit"]').prop('disabled', false)
-                $('#upload-form p').text(this.files[0].name);
-            }
-        });
-    });
-</script>

From a94d486fe7c943b966b0003ab48b57201a1d368a Mon Sep 17 00:00:00 2001
From: Jochen Klar <mail@jochenklar.de>
Date: Mon, 30 Mar 2026 21:42:22 +0200
Subject: [PATCH 08/16] Remove core static and refactor assets

---
 .../{static/core => assets}/img/document.png  | Bin
 .../core => assets}/img/header/collection.jpg | Bin
 .../core => assets}/img/header/library.jpg    | Bin
 .../img/header/supercomputer.jpg              | Bin
 .../{static/core => assets}/img/rdmo-logo.png | Bin
 rdmo/core/assets/scss/base.scss               |   7 -
 rdmo/core/assets/scss/utils.scss              | 104 ----
 rdmo/core/static/core/css/base.scss           | 537 ------------------
 rdmo/core/static/core/css/fonts.scss          |  46 --
 rdmo/core/static/core/css/footer.scss         |  57 --
 rdmo/core/static/core/css/header.scss         |  91 ---
 rdmo/core/static/core/css/style-bs53.css      |  14 -
 rdmo/core/static/core/css/style.scss          |   0
 rdmo/core/static/core/css/utils.scss          | 104 ----
 rdmo/core/static/core/css/variables.scss      |  40 --
 rdmo/core/static/core/img/favicon.png         | Bin 1129 -> 0 bytes
 rdmo/core/static/core/img/rdmo-logo.svg       | 260 ---------
 rdmo/core/static/core/js/header.js            |  19 -
 rdmo/core/static/core/js/utils.js             |  11 -
 19 files changed, 1290 deletions(-)
 rename rdmo/core/{static/core => assets}/img/document.png (100%)
 rename rdmo/core/{static/core => assets}/img/header/collection.jpg (100%)
 rename rdmo/core/{static/core => assets}/img/header/library.jpg (100%)
 rename rdmo/core/{static/core => assets}/img/header/supercomputer.jpg (100%)
 rename rdmo/core/{static/core => assets}/img/rdmo-logo.png (100%)
 delete mode 100644 rdmo/core/assets/scss/base.scss
 delete mode 100644 rdmo/core/assets/scss/utils.scss
 delete mode 100644 rdmo/core/static/core/css/base.scss
 delete mode 100644 rdmo/core/static/core/css/fonts.scss
 delete mode 100644 rdmo/core/static/core/css/footer.scss
 delete mode 100644 rdmo/core/static/core/css/header.scss
 delete mode 100644 rdmo/core/static/core/css/style-bs53.css
 delete mode 100644 rdmo/core/static/core/css/style.scss
 delete mode 100644 rdmo/core/static/core/css/utils.scss
 delete mode 100644 rdmo/core/static/core/css/variables.scss
 delete mode 100644 rdmo/core/static/core/img/favicon.png
 delete mode 100644 rdmo/core/static/core/img/rdmo-logo.svg
 delete mode 100644 rdmo/core/static/core/js/header.js
 delete mode 100644 rdmo/core/static/core/js/utils.js

diff --git a/rdmo/core/static/core/img/document.png b/rdmo/core/assets/img/document.png
similarity index 100%
rename from rdmo/core/static/core/img/document.png
rename to rdmo/core/assets/img/document.png
diff --git a/rdmo/core/static/core/img/header/collection.jpg b/rdmo/core/assets/img/header/collection.jpg
similarity index 100%
rename from rdmo/core/static/core/img/header/collection.jpg
rename to rdmo/core/assets/img/header/collection.jpg
diff --git a/rdmo/core/static/core/img/header/library.jpg b/rdmo/core/assets/img/header/library.jpg
similarity index 100%
rename from rdmo/core/static/core/img/header/library.jpg
rename to rdmo/core/assets/img/header/library.jpg
diff --git a/rdmo/core/static/core/img/header/supercomputer.jpg b/rdmo/core/assets/img/header/supercomputer.jpg
similarity index 100%
rename from rdmo/core/static/core/img/header/supercomputer.jpg
rename to rdmo/core/assets/img/header/supercomputer.jpg
diff --git a/rdmo/core/static/core/img/rdmo-logo.png b/rdmo/core/assets/img/rdmo-logo.png
similarity index 100%
rename from rdmo/core/static/core/img/rdmo-logo.png
rename to rdmo/core/assets/img/rdmo-logo.png
diff --git a/rdmo/core/assets/scss/base.scss b/rdmo/core/assets/scss/base.scss
deleted file mode 100644
index be6083d61a..0000000000
--- a/rdmo/core/assets/scss/base.scss
+++ /dev/null
@@ -1,7 +0,0 @@
-$icon-font-path: "bootstrap-sass/assets/fonts/bootstrap/";
-
-@import '~bootstrap-sass';
-@import '~font-awesome/css/font-awesome.css';
-@import 'react-datepicker/dist/react-datepicker.css';
-
-@import 'utils.scss'
diff --git a/rdmo/core/assets/scss/utils.scss b/rdmo/core/assets/scss/utils.scss
deleted file mode 100644
index da255d7d82..0000000000
--- a/rdmo/core/assets/scss/utils.scss
+++ /dev/null
@@ -1,104 +0,0 @@
-.flip {
-    transform: rotate(180deg) scaleX(-1);
-}
-
-.w-100 {
-    width: 100%;
-}
-.mt-0 {
-    margin-top: 0;
-}
-.mt-5 {
-    margin-top: 5px;
-}
-.mt-10 {
-    margin-top: 10px;
-}
-.mt-15 {
-    margin-top: 15px;
-}
-.mt-20 {
-    margin-top: 20px;
-}
-.mr-0 {
-    margin-right: 0;
-}
-.mr-5 {
-    margin-right: 5px;
-}
-.mr-10 {
-    margin-right: 10px;
-}
-.mr-15 {
-    margin-right: 15px;
-}
-.mr-20 {
-    margin-right: 20px;
-}
-.mb-0 {
-    margin-bottom: 0;
-}
-.mb-5 {
-    margin-bottom: 5px;
-}
-.mb-10 {
-    margin-bottom: 10px;
-}
-.mb-15 {
-    margin-bottom: 15px;
-}
-.mb-20 {
-    margin-bottom: 20px;
-}
-.ml-0 {
-    margin-left: 0;
-}
-.ml-5 {
-    margin-left: 5px;
-}
-.ml-10 {
-    margin-left: 10px;
-}
-.ml-15 {
-    margin-left: 15px;
-}
-.ml-20 {
-    margin-left: 20px;
-}
-
-.pt-0 {
-    padding-top: 0;
-}
-.pt-10 {
-    padding-top: 10px;
-}
-.pt-20 {
-    padding-top: 20px;
-}
-.pr-0 {
-    padding-right: 0;
-}
-.pr-10 {
-    padding-right: 10px;
-}
-.pr-20 {
-    padding-right: 20px;
-}
-.pb-0 {
-    padding-bottom: 0;
-}
-.pb-10 {
-    padding-bottom: 10px;
-}
-.pb-20 {
-    padding-bottom: 20px;
-}
-.pl-0 {
-    padding-left: 0;
-}
-.pl-10 {
-    padding-left: 10px;
-}
-.pl-20 {
-    padding-left: 20px;
-}
diff --git a/rdmo/core/static/core/css/base.scss b/rdmo/core/static/core/css/base.scss
deleted file mode 100644
index 40373e48f0..0000000000
--- a/rdmo/core/static/core/css/base.scss
+++ /dev/null
@@ -1,537 +0,0 @@
-@import 'core/css/variables';
-
-html, body {
-    height: 100%;
-    background-color: $background-color;
-}
-
-h1, h2, h3, h4 {
-    color: $headline-color;
-    background-color: $headline-background-color;
-    line-height: 40px;
-}
-h5, h6 {
-    color: $headline-color;
-    background-color: $headline-background-color;
-    font-size: medium;
-    line-height: 20px;
-}
-h1 {
-    font-size: 28px;
-}
-h2 {
-    font-size: 24px;
-}
-.sidebar h2,
-.modal h2 {
-    font-size: 20px;
-}
-h3 {
-    font-size: 16px;
-}
-h4 {
-    font-size: 14px;
-}
-form {
-    margin-bottom: 20px;
-}
-textarea {
-    resize: vertical;
-}
-
-.extend {
-    width: 100%;
-}
-
-a {
-    color: $link-color;
-
-    &:visited {
-        color: $link-color-visited;
-    }
-    &:hover {
-        color: $link-color-hover;
-    }
-    &:focus {
-        color: $link-color-focus;
-    }
-
-    &.btn {
-        color: white;
-
-        &:visited,
-        &:hover,
-        &:focus {
-            color: white;
-        }
-    }
-    &.text-warning {
-        &:visited,
-        &:hover,
-        &:focus {
-            color: #8a6d3b;
-        }
-    }
-    &.text-danger {
-        &:visited,
-        &:hover,
-        &:focus {
-            color: #a94442;
-        }
-    }
-
-    &.disabled {
-        cursor: not-allowed;
-    }
-
-    &.fa {
-        text-decoration: none !important;
-
-        &:visited,
-        &:hover,
-        &:focus {
-            text-decoration: none !important;
-        }
-    }
-}
-
-.btn.btn-link {
-    color: $link-color;
-    padding: 0;
-    border: 0;
-    text-decoration: none;
-
-    &:hover {
-        color: $link-color-hover;
-        text-decoration: none;
-    }
-    &:active,
-    &:focus {
-        outline: none;
-    }
-}
-
-code {
-    word-wrap: break-word;
-
-    &.code-questions {
-        color: rgb(16, 31, 112);
-        background-color: rgba(16, 31, 112, 0.1);
-    }
-    &.code-options {
-        color: rgb(255, 100, 0);
-        background-color: rgba(255, 100, 0, 0.1);
-    }
-    &.code-options-provider {
-        color: white;
-        background-color: rgba(255, 100, 0, 0.8);
-    }
-    &.code-conditions {
-        color: rgb(128, 0, 128);
-        background-color: rgba(128, 0, 128, 0.1);
-    }
-    &.code-tasks {
-        color: rgb(128, 0, 0);
-        background-color: rgba(128, 0, 0, 0.1);
-    }
-    &.code-views {
-        color: rgb(0, 128, 0);
-        background-color: rgba(0, 128, 0, 0.1);
-    }
-    &.code-order {
-        color: rgb(96, 96, 96);
-        background-color: rgba(96, 96, 96, 0.1);
-    }
-    &.code-default {
-        color: rgb(96, 96, 96);
-        background-color: rgba(96, 96, 96, 0.1);
-    }
-    &.code-optional {
-        color: white;
-        background-color: rgb(119.085, 119.085, 119.085);
-    }
-    &.code-import {
-        color: black;
-        background-color: rgba(96, 96, 96, 0.1);
-    }
-}
-
-table {
-    p {
-        margin-bottom: 5px;
-    }
-    p:last-child {
-        margin-bottom: 0;
-    }
-}
-
-.table-break-word {
-    td {
-        word-break: break-all;
-    }
-}
-
-details {
-    margin-bottom: 10px;
-}
-
-summary {
-    display: list-item;
-    cursor: pointer;
-    margin-bottom: 5px;
-}
-
-metadata {
-    display: none;
-}
-
-/* navbar */
-
-.navbar-default {
-    background-color: $navigation-background-color;
-    border-bottom: none;
-
-    .navbar-brand,
-    .navbar-nav > li > a,
-    .navbar-nav > li > a:focus {
-        color: $navigation-color;
-        background-color: transparent;
-    }
-    .navbar-brand:hover,
-    .navbar-nav > li > a:hover,
-    .navbar-nav > .open > a,
-    .navbar-nav > .open > a:focus,
-    .navbar-nav > .open > a:hover {
-        color: $navigation-hover-color;
-        background-color: $navigation-hover-background-color;
-    }
-
-    .dropdown li.divider:first-child {
-        display: none;
-    }
-}
-
-/* content */
-
-.content {
-    padding-top: 50px; /* same height as the navbar */
-}
-.sidebar {
-    /* make the sidebar sticky */
-    position: -webkit-sticky;
-    position: sticky;
-    top: 0;
-}
-.page, .sidebar {
-    height: 100%;
-    margin-top: 10px;
-    margin-bottom: 60px;
-}
-.page h2:nth-child(2) {
-    margin-top: 0;
-}
-.sidebar h2:first-child,
-.sidebar-mt {
-    margin-top: 70px;
-}
-
-/* questions overview */
-
-.section-panel {
-
-}
-
-.subsection-panel {
-    margin-left: 40px;
-}
-
-.group-panel {
-    margin-left: 80px;
-
-    table th:first-child,
-    table td:first-child {
-        padding-left: 15px;
-    }
-
-    table th:last-child,
-    table td:last-child {
-        padding-right: 15px;
-    }
-}
-
-/* angular forms */
-
-.input-collection {
-    margin-bottom: 15px;
-}
-
-/* forms */
-
-.form-label {
-    margin-bottom: 5px;
-    font-weight: 700;
-}
-
-form .yesno label {
-    margin-right: 10px;
-}
-
-.row {
-    .checkbox,
-    .radio {
-        margin-top: 10px;
-        margin-bottom: 10px;
-    }
-
-    @media (min-width: $screen-xs-max) {
-        .checkbox-padding .checkbox,
-        .radio-padding .radio {
-            margin-top: 32px;
-            margin-bottom: 11px;
-        }
-    }
-}
-
-.input-xs {
-    height: 24px;
-    padding: 5px 10px;
-    font-size: 11px;
-    line-height: 1;
-    border-radius: 2px;
-}
-
-.help-block.info {
-    margin-top: 0;
-}
-
-.sidebar-form {
-    display: flex;
-    gap: 5px;
-}
-
-.upload-form {
-    .upload-form-field {
-        position: relative;
-
-        cursor: pointer;
-        border-radius: 4px;
-
-        flex-grow: 1;
-        overflow: hidden;
-
-        p,
-        input {
-            height: 34px;
-            margin: 0px;
-        }
-
-        p {
-            text-align: left;
-            cursor: pointer;
-
-            color: $link-color;
-            border: 1px solid silver;
-            border-radius: 4px;
-
-            width: calc(100% - 1px);
-            padding: 6px 14px;
-
-            white-space: nowrap;
-            overflow: hidden;
-            text-overflow: ellipsis;
-        }
-
-        input {
-            position: absolute;
-            z-index: 1;
-            padding: 0;
-            opacity: 0;
-        }
-
-        &:hover {
-            background-color: #e6e6e6;
-        }
-    }
-}
-
-/* modals */
-
-.modal-body {
-    > p:last-child,
-    formgroup:last-child .form-group {
-        margin-bottom: 0;
-    }
-
-    .copy-block {
-        margin-bottom: 20px;
-    }
-
-    .help-block {
-        font-size: small;
-        word-break: break-word;
-    }
-
-    .nav.nav-tabs {
-        margin-bottom: 20px;
-    }
-}
-
-/* options */
-
-.options-dropdown {
-    display: inline-block;
-
-    > a {
-        cursor: pointer;
-    }
-}
-
-/* panels */
-
-.panel-default {
-    min-height: 5px;
-}
-
-.panel-body {
-    padding-top: 10px;
-    padding-bottom: 10px;
-}
-
-.panel li > p:last-child {
-    margin-bottom: 0;
-}
-
-/* lists */
-
-ul.list-arrow li {
-    margin-left: 20px;
-
-    &.active {
-        margin-left: 0;
-    }
-
-    &.active a:before {
-        float: left;
-        width: 20px;
-        text-align: right;
-        content: '\2192\0000a0'; /* right-arrow followed by a space */
-    }
-}
-
-/* misc */
-.form-errors {
-    margin-bottom: 20px;
-}
-li > a.control-label > i {
-    display: none;
-}
-li.has-error > a.control-label > i,
-li.has-warning > a.control-label > i {
-    display: inline;
-}
-.email-form label,
-.connections-form label {
-    display: block;
-    margin: 0;
-    line-height: 40px;
-    border-bottom: 1px solid $modal-border-color;
-}
-.email-form label:first-child,
-.connections-form label:first-child {
-    border-top: 1px solid $modal-border-color;
-}
-.email-form label input,
-.connections-form label input {
-    margin-left: 5px;
-    margin-right: 5px;
-}
-.email-form .email-form-buttons,
-.connections-form .connections-form-buttons {
-    margin-top: 10px;
-}
-.socialaccount_providers {
-    margin: 0;
-    padding: 0;
-    height: 42px;
-}
-.socialaccount_providers li {
-    float: left;
-    margin: 0 5px 10px 5px;
-    list-style: none;
-}
-.socialaccount_providers li.socialaccount_provider_break {
-    float: none;
-    margin-left: 0;
-    margin-right: 0;
-}
-.socialaccount_provider_name {
-    line-height: 29px;
-    font-weight: bold;
-}
-.logout-form {
-    margin: 0;
-}
-.logout-form .btn-link {
-    padding: 3px 20px;
-    color: $navigation-dropdown-color;
-    display: block;
-    width: 100%;
-    text-align: left;
-    border: none;
-    clear: both;
-    font-weight: 400;
-    line-height: 1.42857143;
-    white-space: nowrap;
-}
-.logout-form .btn-link:hover {
-    color: $navigation-dropdown-hover-color;
-    background-color: $navigation-dropdown-hover-background-color;
-    text-decoration: none;
-}
-.logout-form .btn-link:focus {
-    color: $navigation-dropdown-hover-color;
-    background-color: $navigation-dropdown-hover-background-color;
-    text-decoration: none;
-    outline: none;
-}
-.rdmo-logo {
-    width: 240px;
-    margin-top: 40px;
-}
-
-// adjust background "hover" color in select2 to $link-color
-.select2-results__option--highlighted {
-    background-color: $link-color !important
-}
-
-.cc-myself {
-    .checkbox {
-        margin: 0;
-    }
-}
-
-.ng-binding {
-    :last-child {
-        margin-bottom: 0;
-    }
-}
-
-.inline_image {
-    max-width: 100%;
-}
-
-[data-toggle="tooltip"] {
-    cursor: help;
-    text-decoration: underline;
-    text-decoration-style: dotted;
-}
-
-.more,
-.show-less {
-    display: none;
-}
-.show-more,
-.show-less {
-    color: $link-color;
-    cursor: pointer;
-}
diff --git a/rdmo/core/static/core/css/fonts.scss b/rdmo/core/static/core/css/fonts.scss
deleted file mode 100644
index 233e08076f..0000000000
--- a/rdmo/core/static/core/css/fonts.scss
+++ /dev/null
@@ -1,46 +0,0 @@
-@font-face {
-    font-family: "DroidSans";
-    src: url(static('core/fonts/DroidSans.ttf'));
-}
-@font-face {
-    font-family: "DroidSans";
-    src: url(static('core/fonts/DroidSans-Bold.ttf'));
-    font-weight: bold;
-}
-@font-face {
-    font-family: "DroidSans-Mono";
-    src: url(static('core/fonts/DroidSansMono.ttf'));
-}
-@font-face {
-    font-family: "DroidSerif";
-    src: url(static('core/fonts/DroidSerif.ttf'));
-}
-@font-face {
-    font-family: "DroidSerif";
-    src: url(static('core/fonts/DroidSerif-Bold.ttf'));
-    font-weight: bold;
-}
-@font-face {
-    font-family: "DroidSerif";
-    src: url(static('core/fonts/DroidSerif-Italic.ttf'));
-    font-style: italic;
-}
-@font-face {
-    font-family: "DroidSerif";
-    src: url(static('core/fonts/DroidSerif-BoldItalic.ttf'));
-    font-style: italic;
-    font-weight: bold;
-}
-
-body {
-    font-family: DroidSans, sans;
-}
-h1, h2, h3, h4, h5, h6 {
-    font-family: DroidSerif, serif;
-}
-
-.react-datepicker {
-    h1, h2, h3, h4, h5, h6 {
-        font-family: DroidSans, sans;
-    }
-}
diff --git a/rdmo/core/static/core/css/footer.scss b/rdmo/core/static/core/css/footer.scss
deleted file mode 100644
index 0e7e1bcd9c..0000000000
--- a/rdmo/core/static/core/css/footer.scss
+++ /dev/null
@@ -1,57 +0,0 @@
-@import 'core/css/variables';
-
-$footer-height: 280px;
-$footer-height-md: 600px;
-$footer-height-sm: 260px;
-
-/* footer layout */
-
-.content {
-    min-height: 100%;
-    margin-bottom: -$footer-height;
-    padding-bottom: $footer-height;
-}
-footer {
-    height: $footer-height;
-}
-@media (max-width: $screen-sm-max) {
-    .content {
-        margin-bottom: -$footer-height-md;
-        padding-bottom: $footer-height-md;
-    }
-    footer {
-        height: $footer-height-md;
-    }
-}
-@media (max-width: $screen-xs-max) {
-    .content {
-        margin-bottom: -$footer-height-md;
-        padding-bottom: $footer-height-md;
-    }
-    footer {
-        height: $footer-height-md;
-    }
-}
-
-/* footer style */
-
-footer {
-    color: $footer-color;
-    background-color: $footer-background-color;
-    padding-top: 20px;
-
-    a,
-    a:visited,
-    a:hover {
-        color: $footer-link-color;
-    }
-    h4 {
-        color: $footer-link-color;
-    }
-    p {
-        text-align: left;
-    }
-    img {
-        display: block;
-    }
-}
diff --git a/rdmo/core/static/core/css/header.scss b/rdmo/core/static/core/css/header.scss
deleted file mode 100644
index 972439084e..0000000000
--- a/rdmo/core/static/core/css/header.scss
+++ /dev/null
@@ -1,91 +0,0 @@
-@import 'core/css/variables';
-
-$header-height: 400px;
-$header-height-md: 300px;
-
-header {
-    position: relative;
-
-    height: $header-height;
-    background-color: black;
-
-    .header-image {
-        position: absolute;
-        left: 0;
-        right: 0;
-
-        opacity: 0;
-        -webkit-transition: $image-transition;
-        -moz-transition: $image-transition;
-        -ms-transition: $image-transition;
-        -o-transition: $image-transition;
-        transition: $image-transition;
-
-        &.visible {
-            opacity: 1;
-        }
-        img {
-            display: block;
-            width: 100%;
-            height: $header-height;
-        }
-        p {
-            position: absolute;
-            bottom: 0;
-            right: 0;
-            z-index: 10;
-
-            padding-right: 5px;
-            margin-bottom: 5px;
-            font-size: 10px;
-            color: $footer-link-color;
-
-        }
-        a,
-        a:visited,
-        a:hover {
-            color: $footer-link-color;
-        }
-    }
-    .header-text {
-        position: relative;
-        padding-top: 100px;
-
-        h1 {
-            font-size: 60px;
-            color: white;
-        }
-        p {
-            font-size: 30px;
-            color: white;
-        }
-    }
-}
-@media (max-width: $screen-md-max) {
-    header {
-        height: $header-height-md;
-    }
-    header .header-image img {
-        height: $header-height-md;
-    }
-    header .header-text {
-        padding-top: 50px;
-    }
-}
-@media (max-width: $screen-xs-max) {
-    header {
-        background-color: inherit;
-        height: auto;
-    }
-    header .header-text {
-        padding-top: 0;
-    }
-    header .header-text h1 {
-        font-size: 40px;
-        color: $headline-color;
-    }
-    header .header-text p {
-        font-size: 20px;
-        color: $variant-color;
-    }
-}
diff --git a/rdmo/core/static/core/css/style-bs53.css b/rdmo/core/static/core/css/style-bs53.css
deleted file mode 100644
index 641e2e6460..0000000000
--- a/rdmo/core/static/core/css/style-bs53.css
+++ /dev/null
@@ -1,14 +0,0 @@
-:root,
-[data-bs-theme=light] {
-  --rdmo-blue: #101F70;
-  --rdmo-blue-dark: #0d195a;
-}
-
-.btn-primary {
-    --bs-btn-bg: var(--rdmo-blue);
-    --bs-btn-border-color: var(--rdmo-blue);
-    --bs-btn-hover-bg: var(--rdmo-blue-dark);
-    --bs-btn-hover-border-color: var(--rdmo-blue-dark);
-    --bs-btn-active-bg: var(--rdmo-blue);
-    --bs-btn-active-border-color: var(--rdmo-blue);
-}
diff --git a/rdmo/core/static/core/css/style.scss b/rdmo/core/static/core/css/style.scss
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/rdmo/core/static/core/css/utils.scss b/rdmo/core/static/core/css/utils.scss
deleted file mode 100644
index da255d7d82..0000000000
--- a/rdmo/core/static/core/css/utils.scss
+++ /dev/null
@@ -1,104 +0,0 @@
-.flip {
-    transform: rotate(180deg) scaleX(-1);
-}
-
-.w-100 {
-    width: 100%;
-}
-.mt-0 {
-    margin-top: 0;
-}
-.mt-5 {
-    margin-top: 5px;
-}
-.mt-10 {
-    margin-top: 10px;
-}
-.mt-15 {
-    margin-top: 15px;
-}
-.mt-20 {
-    margin-top: 20px;
-}
-.mr-0 {
-    margin-right: 0;
-}
-.mr-5 {
-    margin-right: 5px;
-}
-.mr-10 {
-    margin-right: 10px;
-}
-.mr-15 {
-    margin-right: 15px;
-}
-.mr-20 {
-    margin-right: 20px;
-}
-.mb-0 {
-    margin-bottom: 0;
-}
-.mb-5 {
-    margin-bottom: 5px;
-}
-.mb-10 {
-    margin-bottom: 10px;
-}
-.mb-15 {
-    margin-bottom: 15px;
-}
-.mb-20 {
-    margin-bottom: 20px;
-}
-.ml-0 {
-    margin-left: 0;
-}
-.ml-5 {
-    margin-left: 5px;
-}
-.ml-10 {
-    margin-left: 10px;
-}
-.ml-15 {
-    margin-left: 15px;
-}
-.ml-20 {
-    margin-left: 20px;
-}
-
-.pt-0 {
-    padding-top: 0;
-}
-.pt-10 {
-    padding-top: 10px;
-}
-.pt-20 {
-    padding-top: 20px;
-}
-.pr-0 {
-    padding-right: 0;
-}
-.pr-10 {
-    padding-right: 10px;
-}
-.pr-20 {
-    padding-right: 20px;
-}
-.pb-0 {
-    padding-bottom: 0;
-}
-.pb-10 {
-    padding-bottom: 10px;
-}
-.pb-20 {
-    padding-bottom: 20px;
-}
-.pl-0 {
-    padding-left: 0;
-}
-.pl-10 {
-    padding-left: 10px;
-}
-.pl-20 {
-    padding-left: 20px;
-}
diff --git a/rdmo/core/static/core/css/variables.scss b/rdmo/core/static/core/css/variables.scss
deleted file mode 100644
index 22d4f89735..0000000000
--- a/rdmo/core/static/core/css/variables.scss
+++ /dev/null
@@ -1,40 +0,0 @@
-/* colors */
-
-$text-color: #101F70;
-$variant-color: #666;
-$background-color: #fefefe;
-$variant-background-color: #f5f5f5;
-
-$headline-color: #101F70;
-$headline-background-color: transparent;
-
-$link-color: #337ab7;
-$link-color-visited: #337ab7;
-$link-color-hover: #337ab7;
-$link-color-focus: #337ab7;
-
-$navigation-color: #9d9d9d;
-$navigation-background-color: #101F70;
-$navigation-hover-color: #fff;
-$navigation-hover-background-color: rgba(255, 255, 255, 0.1);
-$navigation-dropdown-color: #333;
-$navigation-dropdown-hover-color: #262626;
-$navigation-dropdown-hover-background-color: #f5f5f5;
-
-$footer-color: #999;
-$footer-link-color: #999;
-$footer-background-color: #001;
-
-$danger-color: #a94442;
-$success-color: #5cb85c;
-$modal-border-color: #e5e5e5;
-
-/* transitions */
-
-$image-transition: opacity 2s ease-in-out;
-
-/* responsive thresholds */
-
-$screen-xs-max: 768px;
-$screen-sm-max: 992px;
-$screen-md-max: 1200px;
diff --git a/rdmo/core/static/core/img/favicon.png b/rdmo/core/static/core/img/favicon.png
deleted file mode 100644
index 042bcf2bbb2fdbc5100253d19cdda66fc2b434a2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1129
zcmV-v1eW`WP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800006VoOIv0RI60
z0RN!9r;`8x010qNS#tmYE+YT{E+YYWr9XB6000McNliru;R_ZH5gNBkthE3D1NKQo
zK~z}7?U!9>mSr5qfB*Y=-jBWSX7g3I{6g2}Hir_rOl72{g@PG=pfMtZBIu-(C<v08
zX%Nvt2SFzhC6QT_MN$}Kpj4U?n>shAs4r{nb<FA9-p}X$=-}N<gHHDx)CKp!ee*nA
z7uWy)zn=S%-EV&5<6OIl>;dYS8eDabeT97PLq7;iyNK)u#}r~A@PQwVCw*h=9uTHj
zzyze-*MX@+gpjbx*Txbi{8C`T6<~D84g@-62lRj50TcEV1QS!>oWt6`!$>KG$iJTh
zOo~@ZkUO$u^4#-Od2cP&I+PMTrT)<a#$YW>uTHRV{tS$@C?#~A8^9RDoY~dPOjY9h
z3K5~Z=T8d7fOsrIV?!-U30KnB$rnn9lu4T#?**W{cMz=&O%1gyYN+MX<so|eGDIU@
zIeY=71B=myn>VvO*t&r2o0m~4Y4*Rri}`a?WHO^X^VDiquc*gp!#jJov$m~~v9SUb
z@d$6dzJ+a@myyerD3uILn&<HL8`}{9Yb-mrENA_iX3qBv(6+Lk9b1-Tj6(+&9avPL
z4cb`7#*1{F8(?@O%aI??bM*KHHa^-yX6P1|)5G)+T<7TVKAwN^Q(k`IF;b}{J$-|G
z_d_?!@1IXB>XXZrSliafPsc8BC4HS}%xBe#dOkYvE4>$o_~i4GtZc0#7V`<TA<zaD
zXiK0i+E@^%s*KUnJe&HuS$zBb8OjA0oGsV-#%PZ2-a(eO%*9&A&09Ho`!X~ws%1th
z$#}NNShj$%mQ-~D5f~lIW1ZvHSOIGtwX>#CEExiAQCb@&mo=7TBF5fVpWxtEr#XKi
zgR|u(w9XM|gE1EC9L8D#V{s0S{c@4TjkDRYwUvX1P80Dxw6^7Et;1+L!C`R|?@n^w
z77zsGbtOH_D;<Z}{n93;RmI2`N?2nF0z*DuqB0p{(S0>^p6SN~WkEfC8R{0yq-I7H
z>HZO%b7*boAGm>aj*57MVo_5O_Yn~;UmeCyi12FWJ<_4IB{e<CuJ+X|X`aK!2Tq{1
z;kjK8F?em1C$~L7Wim$fJqdPhZROD6PJTXdiN`lAW!;))zCPT^rj1Ma?8{Rm6H%Uh
zx{b`WQ992K;CYI5Ynqr=6=(g!i#hdsny#~dU?!ZEmQ@`Nz*CAuGKvyme7pz(mC4xc
zk((@o2xPM*z!8r}iTEDl*#hxcghDaE^AyQMlwwhnFO>IX@fF+{&6CX*xikEvvGuhn
zxe7Vw?h32Bg6RLxakv7)zLJIB1I~rYk0NBK@cv0aDX~gK(xEAE{H8=?Uug93g;&?K
vp);E+j)+JKWZqQRF33p{dAF*v;=R8B{JACOzfO+{00000NkvXXu0mjfoc$N7

diff --git a/rdmo/core/static/core/img/rdmo-logo.svg b/rdmo/core/static/core/img/rdmo-logo.svg
deleted file mode 100644
index 93fc2eae24..0000000000
--- a/rdmo/core/static/core/img/rdmo-logo.svg
+++ /dev/null
@@ -1,260 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="400"
-   height="400"
-   id="svg13804"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="DMP-logo.svg"
-   inkscape:export-filename="/home/kristin/E-Science/DMP/DMP-logo-gradient-only.png"
-   inkscape:export-xdpi="300"
-   inkscape:export-ydpi="300">
-  <defs
-     id="defs13806">
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath6259">
-      <rect
-         style="color:#000000;fill:#00004e;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:20;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         id="rect6261"
-         width="219.96814"
-         height="246.47722"
-         x="737.59216"
-         y="-61.744358" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath6041-4">
-      <rect
-         style="color:#000000;fill:#999999;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:20;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         id="rect6043-1"
-         width="504.28574"
-         height="261.76663"
-         x="1353.1576"
-         y="-506.68793" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath6037-3">
-      <rect
-         style="color:#000000;fill:#999999;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:20;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         id="rect6039-5"
-         width="504.28574"
-         height="261.76663"
-         x="1353.1576"
-         y="-506.68793" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath6033-83">
-      <rect
-         style="color:#000000;fill:#999999;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:20;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         id="rect6035-7"
-         width="504.28574"
-         height="261.76663"
-         x="1353.1576"
-         y="-506.68793" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath6029-3">
-      <rect
-         style="color:#000000;fill:#999999;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:20;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         id="rect6031-2"
-         width="504.28574"
-         height="261.76663"
-         x="1353.1576"
-         y="-506.68793" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath6025-2">
-      <rect
-         style="color:#000000;fill:#999999;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:20;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         id="rect6027-1"
-         width="504.28574"
-         height="261.76663"
-         x="1353.1576"
-         y="-506.68793" />
-    </clipPath>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5225-9"
-       id="linearGradient13802"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-1487.8913,558.41765)"
-       x1="1158.5714"
-       y1="-41.923523"
-       x2="1158.5714"
-       y2="425.21933" />
-    <linearGradient
-       id="linearGradient5225-9">
-      <stop
-         style="stop-color:#101f70;stop-opacity:0.32283464;"
-         offset="0"
-         id="stop5227-1" />
-      <stop
-         style="stop-color:#101f70;stop-opacity:1;"
-         offset="1"
-         id="stop5229-7" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5225-9-2"
-       id="linearGradient13802-5"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-1487.8913,558.41765)"
-       x1="1158.5714"
-       y1="-41.923523"
-       x2="1158.5714"
-       y2="425.21933" />
-    <linearGradient
-       id="linearGradient5225-9-2">
-      <stop
-         style="stop-color:#101f70;stop-opacity:0.32283464;"
-         offset="0"
-         id="stop5227-1-7" />
-      <stop
-         style="stop-color:#101f70;stop-opacity:1;"
-         offset="1"
-         id="stop5229-7-6" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5225-9-22"
-       id="linearGradient13802-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-1487.8913,558.41765)"
-       x1="1158.5714"
-       y1="-41.923523"
-       x2="1158.5714"
-       y2="425.21933" />
-    <linearGradient
-       id="linearGradient5225-9-22">
-      <stop
-         style="stop-color:#101f70;stop-opacity:0.32283464;"
-         offset="0"
-         id="stop5227-1-2" />
-      <stop
-         style="stop-color:#101f70;stop-opacity:1;"
-         offset="1"
-         id="stop5229-7-9" />
-    </linearGradient>
-    <linearGradient
-       y2="425.21933"
-       x2="1158.5714"
-       y1="-41.923523"
-       x1="1158.5714"
-       gradientTransform="translate(-578.57144,7.1428929)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient14014"
-       xlink:href="#linearGradient5225-9-22"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="425.21933"
-       x2="1158.5714"
-       y1="-41.923523"
-       x1="1158.5714"
-       gradientTransform="translate(-578.57144,7.1428929)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient14014-1"
-       xlink:href="#linearGradient5225-9-22-4"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient5225-9-22-4">
-      <stop
-         style="stop-color:#101f70;stop-opacity:0.32283464;"
-         offset="0"
-         id="stop5227-1-2-3" />
-      <stop
-         style="stop-color:#101f70;stop-opacity:1;"
-         offset="1"
-         id="stop5229-7-9-5" />
-    </linearGradient>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="0.49497475"
-     inkscape:cx="-154.61278"
-     inkscape:cy="-17.14286"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="1062"
-     inkscape:window-height="786"
-     inkscape:window-x="2280"
-     inkscape:window-y="139"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true">
-    <sodipodi:guide
-       orientation="0,1"
-       position="-220.21325,492.95444"
-       id="guide14654" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata13809">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-179.99997,-115.21932)">
-    <rect
-       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:20;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect2985-5-9-0-9"
-       width="400"
-       height="400"
-       x="179.99997"
-       y="115.21932"
-       ry="41.42857" />
-    <rect
-       style="color:#000000;fill:url(#linearGradient14014);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:20;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect2985-5-9-0"
-       width="400"
-       height="400"
-       x="179.99997"
-       y="115.21932"
-       ry="41.42857" />
-    <text
-       xml:space="preserve"
-       style="font-size:112px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Droid Serif;-inkscape-font-specification:Droid Serif"
-       x="381.56635"
-       y="355.27792"
-       id="text3755-3-8-5"
-       sodipodi:linespacing="125%"><tspan
-         sodipodi:role="line"
-         x="381.56635"
-         y="355.27792"
-         style="font-size:112px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;writing-mode:lr-tb;text-anchor:middle;font-family:Droid Serif;-inkscape-font-specification:Droid Serif"
-         id="tspan3018">RDMO</tspan></text>
-  </g>
-</svg>
diff --git a/rdmo/core/static/core/js/header.js b/rdmo/core/static/core/js/header.js
deleted file mode 100644
index 98076b1633..0000000000
--- a/rdmo/core/static/core/js/header.js
+++ /dev/null
@@ -1,19 +0,0 @@
-var _current_image = 0;
-var _max_image = 2;
-var _timeout = 5000;
-
-function swap_image() {
-    $('.header-image-' + _current_image).removeClass('visible');
-    if (_current_image >= _max_image) {
-        _current_image = 0;
-    } else {
-        _current_image += 1;
-    }
-    $('.header-image-' + _current_image).addClass('visible');
-
-    setTimeout(swap_image, _timeout);
-}
-
-$(document).ready(function() {
-    setTimeout(swap_image, _timeout);
-});
diff --git a/rdmo/core/static/core/js/utils.js b/rdmo/core/static/core/js/utils.js
deleted file mode 100644
index 8c34a73526..0000000000
--- a/rdmo/core/static/core/js/utils.js
+++ /dev/null
@@ -1,11 +0,0 @@
-function showMore(element) {
-    $(element).siblings('.more').show();
-    $(element).siblings('.show-less').show();
-    $(element).hide();
-}
-
-function showLess(element) {
-    $(element).siblings('.more').hide();
-    $(element).siblings('.show-more').show();
-    $(element).hide();
-}

From 8181f2d83ad11b50ff650e02d114137516ff74db Mon Sep 17 00:00:00 2001
From: Jochen Klar <mail@jochenklar.de>
Date: Mon, 30 Mar 2026 21:51:30 +0200
Subject: [PATCH 09/16] Update .gitignore

---
 .gitignore | 26 ++------------------------
 1 file changed, 2 insertions(+), 24 deletions(-)

diff --git a/.gitignore b/.gitignore
index 50da21c10b..69293b7b06 100644
--- a/.gitignore
+++ b/.gitignore
@@ -34,30 +34,8 @@ dist
 .ruff_cache
 .on-save.json
 
+rdmo/core/static/
 rdmo/management/static
+rdmo/projects/static/
 
-rdmo/core/static/core/css/app-bs53.css
-rdmo/core/static/core/js/app-bs53.js
-rdmo/core/static/core/js/base.js
-rdmo/core/static/core/js/base.js.LICENSE.txt
-rdmo/core/static/core/js/base-bs53.js
-rdmo/core/static/core/js/base-bs53.js.LICENSE.txt
-rdmo/core/static/core/js/bootstrap-bs53.js
-rdmo/core/static/core/js/bootstrap-bs53.js.LICENSE.txt
-rdmo/core/static/core/css/base.css
-rdmo/core/static/core/css/base-bs53.css
-rdmo/core/static/core/css/bootstrap.css
-rdmo/core/static/core/css/bootstrap-bs53.css
-rdmo/core/static/core/fonts
-
-rdmo/projects/static/projects/css/interview.css
-rdmo/projects/static/projects/css/projects.css
-rdmo/projects/static/projects/css/project.css
-rdmo/projects/static/projects/fonts/
-rdmo/projects/static/projects/js/interview.js
-rdmo/projects/static/projects/js/interview.js.LICENSE.txt
-rdmo/projects/static/projects/js/projects.js
-rdmo/projects/static/projects/js/projects.js.LICENSE.txt
-rdmo/projects/static/projects/js/project.js
-rdmo/projects/static/projects/js/project.js.LICENSE.txt
 screenshots

From 73fd1aecd2d3d2ff58749baa7a8b3f3fc5965226 Mon Sep 17 00:00:00 2001
From: Jochen Klar <mail@jochenklar.de>
Date: Mon, 30 Mar 2026 21:51:38 +0200
Subject: [PATCH 10/16] Update pyproject.toml

---
 pyproject.toml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index 08fbaf2f4a..db5011420f 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -44,10 +44,8 @@ dependencies = [
   "defusedxml>=0.7.1,<1.0",
   "django>=5.2.8,<6.0",
   "django-cleanup>=8.0,<10.0",
-  "django-compressor>=4.4,<5.0",
   "django-extensions>=3.2,<5.0",
   "django-filter>=23.2,<26.0",
-  "django-libsass>=0.9,<1.0",
   "django-mathfilters>=1.0,<2.0",
   "django-mptt>=0.16.0,<1.0.0",
   "django-settings-export>=1.2,<2.0",

From 5847fb919450fdbeaea05b31b3a5d50f7f4633b3 Mon Sep 17 00:00:00 2001
From: Jochen Klar <mail@jochenklar.de>
Date: Fri, 10 Apr 2026 09:27:46 +0200
Subject: [PATCH 11/16] Remove old base entry from webpack

---
 webpack.config.js | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/webpack.config.js b/webpack.config.js
index a3bdd7be27..eb1cf59e9d 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -18,10 +18,6 @@ const configList = [
   {
     name: 'core',
     entry: {
-      base: [
-        './rdmo/core/assets/js/base.js',
-        './rdmo/core/assets/scss/base.scss'
-      ],
       'bootstrap-bs53': [
         './rdmo/core/assets/js/_bs53/bootstrap.js',
         './rdmo/core/assets/scss/_bs53/bootstrap.scss'

From 75f8cdd696c82b0aca9922c0fb411761ae84902a Mon Sep 17 00:00:00 2001
From: Jochen Klar <mail@jochenklar.de>
Date: Fri, 10 Apr 2026 09:38:55 +0200
Subject: [PATCH 12/16] Remove compressor from settings

---
 rdmo/core/settings.py | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/rdmo/core/settings.py b/rdmo/core/settings.py
index 830a59359c..dca977278e 100644
--- a/rdmo/core/settings.py
+++ b/rdmo/core/settings.py
@@ -33,7 +33,6 @@
     'rest_framework.authtoken',
     'widget_tweaks',
     'markdown',
-    'compressor',
     'django_cleanup',
     'django_extensions',
     'django_filters',
@@ -76,10 +75,6 @@
 
 MESSAGE_STORAGE = "django.contrib.messages.storage.session.SessionStorage"
 
-COMPRESS_PRECOMPILERS = (
-    ('text/x-scss', 'django_libsass.SassCompiler'),
-)
-
 WSGI_APPLICATION = 'config.wsgi.application'
 
 AUTHENTICATION_BACKENDS = [
@@ -161,7 +156,6 @@
 STATICFILES_FINDERS = (
     'django.contrib.staticfiles.finders.FileSystemFinder',
     'django.contrib.staticfiles.finders.AppDirectoriesFinder',
-    'compressor.finders.CompressorFinder',
 )
 
 DATABASES = {

From 50abb4b86f9189f36a41a11452dcc2087395f63f Mon Sep 17 00:00:00 2001
From: Jochen Klar <mail@jochenklar.de>
Date: Fri, 10 Apr 2026 13:22:30 +0200
Subject: [PATCH 13/16] Fix webpack.config.js

---
 webpack.config.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/webpack.config.js b/webpack.config.js
index eb1cf59e9d..3c18b21eb7 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -41,6 +41,11 @@ const configList = [
             from: '**/*',
             to: './/fonts/',
             context: './rdmo/core/assets/fonts/'
+          },
+          {
+            from: '**/*',
+            to: './/img/',
+            context: './rdmo/core/assets/img/'
           }
         ]
       })

From 2d32c758331c6294644dad0816340c68a1488a6b Mon Sep 17 00:00:00 2001
From: Jochen Klar <mail@jochenklar.de>
Date: Fri, 10 Apr 2026 13:22:40 +0200
Subject: [PATCH 14/16] Fix projects urls order

---
 rdmo/projects/urls/__init__.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/rdmo/projects/urls/__init__.py b/rdmo/projects/urls/__init__.py
index 50abf3fc57..08b604b3fe 100644
--- a/rdmo/projects/urls/__init__.py
+++ b/rdmo/projects/urls/__init__.py
@@ -5,12 +5,12 @@
 urlpatterns = [
     re_path(r'^$',
             ProjectsView.as_view(), name='projects'),
-    re_path(r'^(?P<pk>[0-9]+)/',
-            ProjectDetailView.as_view(), name='project'),
-    re_path(r'^join/(?P<token>.+)/$',
-            ProjectJoinView.as_view(), name='project_join'),
     re_path(r'^(?P<pk>[0-9]+)/interview/',
             ProjectInterviewView.as_view(), name='project_interview'),
     re_path(r'^(?P<pk>[0-9]+)/error/',
             ProjectErrorView.as_view(), name='project_error'),
+    re_path(r'^(?P<pk>[0-9]+)/',
+            ProjectDetailView.as_view(), name='project'),
+    re_path(r'^join/(?P<token>.+)/$',
+            ProjectJoinView.as_view(), name='project_join'),
 ]

From b6886e2b2b46a5c82b464c0f44d2f4a8a978e445 Mon Sep 17 00:00:00 2001
From: Jochen Klar <mail@jochenklar.de>
Date: Fri, 10 Apr 2026 16:42:54 +0200
Subject: [PATCH 15/16] Remove bs53 directories, refactor templates and assets
 and add home entry

---
 pyproject.toml                                |   2 +-
 .../templates/account/account_token.html      |   2 +-
 rdmo/accounts/templates/account/email.html    |   2 +-
 .../templates/account/email_confirm.html      |   2 +-
 rdmo/accounts/templates/account/login.html    |   2 +-
 rdmo/accounts/templates/account/logout.html   |   2 +-
 .../templates/account/password_change.html    |   2 +-
 .../templates/account/password_reset.html     |   2 +-
 .../account/password_reset_done.html          |   2 +-
 .../account/password_reset_from_key.html      |   2 +-
 .../account/password_reset_from_key_done.html |   2 +-
 .../templates/account/password_set.html       |   2 +-
 rdmo/accounts/templates/account/signup.html   |   2 +-
 .../templates/account/terms_of_use.html       |   2 +-
 .../templates/account/verification_sent.html  |   2 +-
 .../account/verified_email_required.html      |   2 +-
 .../profile/profile_remove_closed.html        |   2 +-
 .../profile/profile_remove_failed.html        |   2 +-
 .../profile/profile_remove_form.html          |   2 +-
 .../profile/profile_remove_success.html       |   2 +-
 .../profile/profile_update_closed.html        |   2 +-
 .../profile/profile_update_form.html          |   2 +-
 .../socialaccount/authentication_error.html   |   2 +-
 .../templates/socialaccount/connections.html  |   2 +-
 .../templates/socialaccount/login.html        |   2 +-
 .../socialaccount/login_cancelled.html        |   2 +-
 .../templates/socialaccount/signup.html       |   2 +-
 rdmo/core/assets/js/_bs53/components/Modal.js |  86 ---------------
 rdmo/core/assets/js/_bs53/components/index.js |   2 -
 rdmo/core/assets/js/{_bs53 => }/app.js        |   0
 rdmo/core/assets/js/base.js                   |   5 +-
 rdmo/core/assets/js/{_bs53 => }/bootstrap.js  |   0
 rdmo/core/assets/js/components/Modal.js       | 103 ++++++++++++------
 .../js/{_bs53 => }/components/Tooltip.js      |   0
 .../core/assets/js/{_bs53/base.js => home.js} |   0
 rdmo/core/assets/scss/{_bs53 => }/app.scss    |   0
 rdmo/core/assets/scss/{_bs53 => }/base.scss   |   0
 .../assets/scss/{_bs53 => }/base/card.scss    |   0
 .../assets/scss/{_bs53 => }/base/code.scss    |   0
 .../assets/scss/{_bs53 => }/base/content.scss |   0
 .../scss/{_bs53 => }/base/datepicker.scss     |   0
 .../scss/{_bs53 => }/base/dropdown.scss       |   0
 .../scss/{_bs53 => }/base/dropzone.scss       |   0
 .../assets/scss/{_bs53 => }/base/forms.scss   |   0
 .../assets/scss/{_bs53 => }/base/nav.scss     |   0
 .../assets/scss/{_bs53 => }/base/select.scss  |   0
 .../assets/scss/{_bs53 => }/base/sidebar.scss |   0
 .../assets/scss/{_bs53 => }/base/table.scss   |   0
 .../scss/{_bs53 => }/base/typography.scss     |   0
 .../scss/{_bs53 => }/base/variables.scss      |   0
 .../assets/scss/{_bs53 => }/bootstrap.scss    |   0
 .../assets/scss/{_bs53 => }/breakpoints.scss  |   0
 rdmo/core/assets/scss/home.scss               |   1 +
 rdmo/core/templates/core/about.html           |  18 ++-
 rdmo/core/templates/core/api.html             |   2 +-
 rdmo/core/templates/core/base.html            |  34 ++++++
 .../templates/core/{bs53 => }/base_head.html  |   0
 .../core/{bs53 => }/base_navigation.html      |   0
 rdmo/core/templates/core/bs53/base.html       |  36 ------
 rdmo/core/templates/core/bs53/home.html       |  14 ---
 rdmo/core/templates/core/bs53/main.html       |  11 --
 rdmo/core/templates/core/bs53/page.html       |  16 ---
 .../{bs53 => }/forms/bootstrap_checkbox.html  |   0
 .../{bs53 => }/forms/bootstrap_input.html     |   0
 .../{bs53 => }/forms/bootstrap_textarea.html  |   0
 rdmo/core/templates/core/home.html            |  20 ++++
 .../templates/core/{bs53 => }/home_de.html    |   4 +-
 .../templates/core/{bs53 => }/home_en.html    |   4 +-
 .../core/{bs53 => }/home_images.html          |   0
 .../templates/core/{bs53 => }/home_login.html |   0
 rdmo/core/templates/core/main.html            |  17 +++
 rdmo/core/templates/core/page.html            |  23 +++-
 rdmo/core/templatetags/core_tags.py           |   4 +-
 rdmo/core/views.py                            |   6 +-
 .../components/modals/DeleteAttributeModal.js |   2 +-
 .../components/modals/DeleteCatalogModal.js   |   2 +-
 .../components/modals/DeleteConditionModal.js |   2 +-
 .../js/components/modals/DeleteOptionModal.js |   2 +-
 .../components/modals/DeleteOptionSetModal.js |   2 +-
 .../js/components/modals/DeletePageModal.js   |   2 +-
 .../components/modals/DeleteQuestionModal.js  |   2 +-
 .../modals/DeleteQuestionSetModal.js          |   2 +-
 .../components/modals/DeleteSectionModal.js   |   2 +-
 .../js/components/modals/DeleteTaskModal.js   |   2 +-
 .../js/components/modals/DeleteViewModal.js   |   2 +-
 .../templates/management/management.html      |  11 +-
 .../js/project/components/areas/Dashboard.js  |   2 +-
 .../areas/information/ProjectDeleteModal.js   |   2 +-
 .../areas/information/ProjectForm.js          |   3 +-
 .../memberships/MembershipDeleteModal.js      |   2 +-
 .../memberships/MembershipInviteModal.js      |   4 +-
 .../areas/snapshots/SnapshotDeleteModal.js    |   2 +-
 .../areas/snapshots/SnapshotModal.js          |   2 +-
 .../areas/snapshots/SnapshotRollbackModal.js  |   2 +-
 .../assets/js/projects/components/Main.js     |   3 +-
 .../templates/projects/project_detail.html    |   7 +-
 .../templates/projects/project_error.html     |  10 --
 .../templates/projects/project_interview.html |  12 +-
 .../projects/templates/projects/projects.html |   9 +-
 webpack.config.js                             |  22 ++--
 100 files changed, 259 insertions(+), 316 deletions(-)
 delete mode 100644 rdmo/core/assets/js/_bs53/components/Modal.js
 delete mode 100644 rdmo/core/assets/js/_bs53/components/index.js
 rename rdmo/core/assets/js/{_bs53 => }/app.js (100%)
 rename rdmo/core/assets/js/{_bs53 => }/bootstrap.js (100%)
 rename rdmo/core/assets/js/{_bs53 => }/components/Tooltip.js (100%)
 rename rdmo/core/assets/js/{_bs53/base.js => home.js} (100%)
 rename rdmo/core/assets/scss/{_bs53 => }/app.scss (100%)
 rename rdmo/core/assets/scss/{_bs53 => }/base.scss (100%)
 rename rdmo/core/assets/scss/{_bs53 => }/base/card.scss (100%)
 rename rdmo/core/assets/scss/{_bs53 => }/base/code.scss (100%)
 rename rdmo/core/assets/scss/{_bs53 => }/base/content.scss (100%)
 rename rdmo/core/assets/scss/{_bs53 => }/base/datepicker.scss (100%)
 rename rdmo/core/assets/scss/{_bs53 => }/base/dropdown.scss (100%)
 rename rdmo/core/assets/scss/{_bs53 => }/base/dropzone.scss (100%)
 rename rdmo/core/assets/scss/{_bs53 => }/base/forms.scss (100%)
 rename rdmo/core/assets/scss/{_bs53 => }/base/nav.scss (100%)
 rename rdmo/core/assets/scss/{_bs53 => }/base/select.scss (100%)
 rename rdmo/core/assets/scss/{_bs53 => }/base/sidebar.scss (100%)
 rename rdmo/core/assets/scss/{_bs53 => }/base/table.scss (100%)
 rename rdmo/core/assets/scss/{_bs53 => }/base/typography.scss (100%)
 rename rdmo/core/assets/scss/{_bs53 => }/base/variables.scss (100%)
 rename rdmo/core/assets/scss/{_bs53 => }/bootstrap.scss (100%)
 rename rdmo/core/assets/scss/{_bs53 => }/breakpoints.scss (100%)
 create mode 100644 rdmo/core/assets/scss/home.scss
 create mode 100644 rdmo/core/templates/core/base.html
 rename rdmo/core/templates/core/{bs53 => }/base_head.html (100%)
 rename rdmo/core/templates/core/{bs53 => }/base_navigation.html (100%)
 delete mode 100644 rdmo/core/templates/core/bs53/base.html
 delete mode 100644 rdmo/core/templates/core/bs53/home.html
 delete mode 100644 rdmo/core/templates/core/bs53/main.html
 delete mode 100644 rdmo/core/templates/core/bs53/page.html
 rename rdmo/core/templates/core/{bs53 => }/forms/bootstrap_checkbox.html (100%)
 rename rdmo/core/templates/core/{bs53 => }/forms/bootstrap_input.html (100%)
 rename rdmo/core/templates/core/{bs53 => }/forms/bootstrap_textarea.html (100%)
 create mode 100644 rdmo/core/templates/core/home.html
 rename rdmo/core/templates/core/{bs53 => }/home_de.html (97%)
 rename rdmo/core/templates/core/{bs53 => }/home_en.html (97%)
 rename rdmo/core/templates/core/{bs53 => }/home_images.html (100%)
 rename rdmo/core/templates/core/{bs53 => }/home_login.html (100%)
 create mode 100644 rdmo/core/templates/core/main.html

diff --git a/pyproject.toml b/pyproject.toml
index db5011420f..5b1523d572 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -229,7 +229,7 @@ default.extend-ignore-re = [
   "(?Rm)^.*(#|//)\\s*spellchecker:disable-line$", # for .py files
   "(?Rm)^.*<!-- spellchecker:disable-line -->$", # for .html files
 ]
-files.extend-exclude = ["rdmo/core/templates/core/bs53/home.html"]
+files.extend-exclude = ["rdmo/core/templates/core/home.html"]
 
 [tool.check-wheel-contents] # Ref: https://github.com/jwodder/check-wheel-contents
 ignore = [
diff --git a/rdmo/accounts/templates/account/account_token.html b/rdmo/accounts/templates/account/account_token.html
index 3b08e2590e..35d1941cc5 100644
--- a/rdmo/accounts/templates/account/account_token.html
+++ b/rdmo/accounts/templates/account/account_token.html
@@ -1,4 +1,4 @@
-{% extends 'core/bs53/main.html' %}
+{% extends 'core/main.html' %}
 {% load i18n %}
 
 {% block main %}
diff --git a/rdmo/accounts/templates/account/email.html b/rdmo/accounts/templates/account/email.html
index 649a0f2ecf..12f06afe71 100644
--- a/rdmo/accounts/templates/account/email.html
+++ b/rdmo/accounts/templates/account/email.html
@@ -1,4 +1,4 @@
-{% extends 'core/bs53/main.html' %}
+{% extends 'core/main.html' %}
 {% load i18n %}
 
 {% block main %}
diff --git a/rdmo/accounts/templates/account/email_confirm.html b/rdmo/accounts/templates/account/email_confirm.html
index 5d3c1c3a0e..16a2e0f0cf 100644
--- a/rdmo/accounts/templates/account/email_confirm.html
+++ b/rdmo/accounts/templates/account/email_confirm.html
@@ -1,4 +1,4 @@
-{% extends 'core/bs53/main.html' %}
+{% extends 'core/main.html' %}
 {% load i18n %}
 {% load account %}
 
diff --git a/rdmo/accounts/templates/account/login.html b/rdmo/accounts/templates/account/login.html
index d99dac3654..7a19171a32 100644
--- a/rdmo/accounts/templates/account/login.html
+++ b/rdmo/accounts/templates/account/login.html
@@ -1,4 +1,4 @@
-{% extends 'core/bs53/main.html' %}
+{% extends 'core/main.html' %}
 {% load i18n %}
 
 {% block main %}
diff --git a/rdmo/accounts/templates/account/logout.html b/rdmo/accounts/templates/account/logout.html
index 1e80b5b0fd..4993690cb0 100644
--- a/rdmo/accounts/templates/account/logout.html
+++ b/rdmo/accounts/templates/account/logout.html
@@ -1,4 +1,4 @@
-{% extends 'core/bs53/main.html' %}
+{% extends 'core/main.html' %}
 {% load i18n %}
 
 {% block main %}
diff --git a/rdmo/accounts/templates/account/password_change.html b/rdmo/accounts/templates/account/password_change.html
index 14ead05a7c..6577a9a71e 100644
--- a/rdmo/accounts/templates/account/password_change.html
+++ b/rdmo/accounts/templates/account/password_change.html
@@ -1,4 +1,4 @@
-{% extends 'core/bs53/main.html' %}
+{% extends 'core/main.html' %}
 {% load i18n %}
 {% load core_tags %}
 
diff --git a/rdmo/accounts/templates/account/password_reset.html b/rdmo/accounts/templates/account/password_reset.html
index e6371cda4e..6c9cff6b6f 100644
--- a/rdmo/accounts/templates/account/password_reset.html
+++ b/rdmo/accounts/templates/account/password_reset.html
@@ -1,4 +1,4 @@
-{% extends 'core/bs53/main.html' %}
+{% extends 'core/main.html' %}
 {% load i18n %}
 {% load core_tags %}
 
diff --git a/rdmo/accounts/templates/account/password_reset_done.html b/rdmo/accounts/templates/account/password_reset_done.html
index 7d51430f31..5e1797c561 100644
--- a/rdmo/accounts/templates/account/password_reset_done.html
+++ b/rdmo/accounts/templates/account/password_reset_done.html
@@ -1,4 +1,4 @@
-{% extends 'core/bs53/main.html' %}
+{% extends 'core/main.html' %}
 {% load i18n %}
 
 {% block main %}
diff --git a/rdmo/accounts/templates/account/password_reset_from_key.html b/rdmo/accounts/templates/account/password_reset_from_key.html
index 599498964e..b516598ad0 100644
--- a/rdmo/accounts/templates/account/password_reset_from_key.html
+++ b/rdmo/accounts/templates/account/password_reset_from_key.html
@@ -1,4 +1,4 @@
-{% extends 'core/bs53/main.html' %}
+{% extends 'core/main.html' %}
 {% load i18n %}
 {% load core_tags %}
 
diff --git a/rdmo/accounts/templates/account/password_reset_from_key_done.html b/rdmo/accounts/templates/account/password_reset_from_key_done.html
index 1c58a125c2..0483009994 100644
--- a/rdmo/accounts/templates/account/password_reset_from_key_done.html
+++ b/rdmo/accounts/templates/account/password_reset_from_key_done.html
@@ -1,4 +1,4 @@
-{% extends 'core/bs53/main.html' %}
+{% extends 'core/main.html' %}
 {% load i18n %}
 {% load core_tags %}
 
diff --git a/rdmo/accounts/templates/account/password_set.html b/rdmo/accounts/templates/account/password_set.html
index fd2b9c4e90..37fcdaf291 100644
--- a/rdmo/accounts/templates/account/password_set.html
+++ b/rdmo/accounts/templates/account/password_set.html
@@ -1,4 +1,4 @@
-{% extends 'core/bs53/main.html' %}
+{% extends 'core/main.html' %}
 {% load i18n %}
 
 {% block main %}
diff --git a/rdmo/accounts/templates/account/signup.html b/rdmo/accounts/templates/account/signup.html
index f63275a753..e82f0333c9 100644
--- a/rdmo/accounts/templates/account/signup.html
+++ b/rdmo/accounts/templates/account/signup.html
@@ -1,4 +1,4 @@
-{% extends 'core/bs53/main.html' %}
+{% extends 'core/main.html' %}
 {% load i18n %}
 
 {% block main %}
diff --git a/rdmo/accounts/templates/account/terms_of_use.html b/rdmo/accounts/templates/account/terms_of_use.html
index 9f6ec292a9..6ecf658363 100644
--- a/rdmo/accounts/templates/account/terms_of_use.html
+++ b/rdmo/accounts/templates/account/terms_of_use.html
@@ -1,4 +1,4 @@
-{% extends 'core/bs53/main.html' %}
+{% extends 'core/main.html' %}
 {% load i18n %}
 
 {% block main %}
diff --git a/rdmo/accounts/templates/account/verification_sent.html b/rdmo/accounts/templates/account/verification_sent.html
index 061adedfaa..5f41a39e00 100644
--- a/rdmo/accounts/templates/account/verification_sent.html
+++ b/rdmo/accounts/templates/account/verification_sent.html
@@ -1,4 +1,4 @@
-{% extends 'core/bs53/main.html' %}
+{% extends 'core/main.html' %}
 {% load i18n %}
 
 {% block main %}
diff --git a/rdmo/accounts/templates/account/verified_email_required.html b/rdmo/accounts/templates/account/verified_email_required.html
index a9146d0172..8fd043160d 100644
--- a/rdmo/accounts/templates/account/verified_email_required.html
+++ b/rdmo/accounts/templates/account/verified_email_required.html
@@ -1,4 +1,4 @@
-{% extends 'core/bs53/main.html' %}
+{% extends 'core/main.html' %}
 {% load i18n %}
 
 {% block content %}
diff --git a/rdmo/accounts/templates/profile/profile_remove_closed.html b/rdmo/accounts/templates/profile/profile_remove_closed.html
index 74fb480a83..3e37cefa62 100644
--- a/rdmo/accounts/templates/profile/profile_remove_closed.html
+++ b/rdmo/accounts/templates/profile/profile_remove_closed.html
@@ -1,4 +1,4 @@
-{% extends 'core/bs53/main.html' %}
+{% extends 'core/main.html' %}
 {% load i18n %}
 
 {% block main %}
diff --git a/rdmo/accounts/templates/profile/profile_remove_failed.html b/rdmo/accounts/templates/profile/profile_remove_failed.html
index a27e753834..d164876d70 100644
--- a/rdmo/accounts/templates/profile/profile_remove_failed.html
+++ b/rdmo/accounts/templates/profile/profile_remove_failed.html
@@ -1,4 +1,4 @@
-{% extends 'core/bs53/main.html' %}
+{% extends 'core/main.html' %}
 {% load i18n %}
 
 {% block main %}
diff --git a/rdmo/accounts/templates/profile/profile_remove_form.html b/rdmo/accounts/templates/profile/profile_remove_form.html
index 955e8e3b2e..07b2389543 100644
--- a/rdmo/accounts/templates/profile/profile_remove_form.html
+++ b/rdmo/accounts/templates/profile/profile_remove_form.html
@@ -1,4 +1,4 @@
-{% extends 'core/bs53/main.html' %}
+{% extends 'core/main.html' %}
 {% load i18n %}
 {% load core_tags %}
 
diff --git a/rdmo/accounts/templates/profile/profile_remove_success.html b/rdmo/accounts/templates/profile/profile_remove_success.html
index 77d7c827e6..d81256496e 100644
--- a/rdmo/accounts/templates/profile/profile_remove_success.html
+++ b/rdmo/accounts/templates/profile/profile_remove_success.html
@@ -1,4 +1,4 @@
-{% extends 'core/bs53/main.html' %}
+{% extends 'core/main.html' %}
 {% load i18n %}
 
 {% block main %}
diff --git a/rdmo/accounts/templates/profile/profile_update_closed.html b/rdmo/accounts/templates/profile/profile_update_closed.html
index 26c09b46a2..acff246b2a 100644
--- a/rdmo/accounts/templates/profile/profile_update_closed.html
+++ b/rdmo/accounts/templates/profile/profile_update_closed.html
@@ -1,4 +1,4 @@
-{% extends 'core/bs53/main.html' %}
+{% extends 'core/main.html' %}
 {% load i18n %}
 
 {% block main %}
diff --git a/rdmo/accounts/templates/profile/profile_update_form.html b/rdmo/accounts/templates/profile/profile_update_form.html
index f1f0623495..5aba4b9508 100644
--- a/rdmo/accounts/templates/profile/profile_update_form.html
+++ b/rdmo/accounts/templates/profile/profile_update_form.html
@@ -1,4 +1,4 @@
-{% extends 'core/bs53/main.html' %}
+{% extends 'core/main.html' %}
 {% load i18n %}
 {% load core_tags %}
 
diff --git a/rdmo/accounts/templates/socialaccount/authentication_error.html b/rdmo/accounts/templates/socialaccount/authentication_error.html
index 9611cf6b76..58cdb917f1 100644
--- a/rdmo/accounts/templates/socialaccount/authentication_error.html
+++ b/rdmo/accounts/templates/socialaccount/authentication_error.html
@@ -1,4 +1,4 @@
-{% extends 'core/bs53/main.html' %}
+{% extends 'core/main.html' %}
 {% load i18n %}
 {% load account %}
 {% load socialaccount %}
diff --git a/rdmo/accounts/templates/socialaccount/connections.html b/rdmo/accounts/templates/socialaccount/connections.html
index a839348c54..33330cbbbf 100644
--- a/rdmo/accounts/templates/socialaccount/connections.html
+++ b/rdmo/accounts/templates/socialaccount/connections.html
@@ -1,4 +1,4 @@
-{% extends 'core/bs53/main.html' %}
+{% extends 'core/main.html' %}
 {% load i18n %}
 
 {% block main %}
diff --git a/rdmo/accounts/templates/socialaccount/login.html b/rdmo/accounts/templates/socialaccount/login.html
index d98550de2b..90c97cb446 100644
--- a/rdmo/accounts/templates/socialaccount/login.html
+++ b/rdmo/accounts/templates/socialaccount/login.html
@@ -1,4 +1,4 @@
-{% extends 'core/bs53/main.html' %}
+{% extends 'core/main.html' %}
 {% load i18n %}
 
 {% block head_title %}
diff --git a/rdmo/accounts/templates/socialaccount/login_cancelled.html b/rdmo/accounts/templates/socialaccount/login_cancelled.html
index 0434a6e107..5ceca0781c 100644
--- a/rdmo/accounts/templates/socialaccount/login_cancelled.html
+++ b/rdmo/accounts/templates/socialaccount/login_cancelled.html
@@ -1,4 +1,4 @@
-{% extends 'core/bs53/main.html' %}
+{% extends 'core/main.html' %}
 {% load i18n %}
 {% load account %}
 {% load socialaccount %}
diff --git a/rdmo/accounts/templates/socialaccount/signup.html b/rdmo/accounts/templates/socialaccount/signup.html
index b1ee1866a2..56a7435b6f 100644
--- a/rdmo/accounts/templates/socialaccount/signup.html
+++ b/rdmo/accounts/templates/socialaccount/signup.html
@@ -1,4 +1,4 @@
-{% extends 'core/bs53/main.html' %}
+{% extends 'core/main.html' %}
 {% load i18n %}
 
 {% block main %}
diff --git a/rdmo/core/assets/js/_bs53/components/Modal.js b/rdmo/core/assets/js/_bs53/components/Modal.js
deleted file mode 100644
index 8f7b89d3b6..0000000000
--- a/rdmo/core/assets/js/_bs53/components/Modal.js
+++ /dev/null
@@ -1,86 +0,0 @@
-import React, { useEffect, useRef } from 'react'
-import PropTypes from 'prop-types'
-import { Modal as BootstrapModal } from 'bootstrap'
-
-const Modal = ({ title, show, onClose, onSubmit, submitLabel, submitProps, children, modalProps = {}, size = '' }) => {
-  const modalRef = useRef(null)
-
-  useEffect(() => {
-    const modalElement = modalRef.current
-    if (!modalElement) return
-
-    const modal = BootstrapModal.getOrCreateInstance(modalElement, {
-      backdrop: 'static',
-      keyboard: true,
-      ...modalProps
-    })
-
-    const handleHide = () => {
-      if (show) {
-        onClose()
-      }
-    }
-
-    modalElement.addEventListener('hide.bs.modal', handleHide)
-
-    if (show) {
-      modal.show()
-    }
-
-    return () => {
-      modalElement.removeEventListener('hide.bs.modal', handleHide)
-      modal.hide()
-    }
-  }, [show])
-
-  return (
-    <div ref={modalRef} className="modal fade" tabIndex="-1" aria-hidden={!show}>
-      <div className={`modal-dialog ${size}`}>
-        <div className="modal-content element-modal">
-          <div className="modal-header">
-            <h2 className="modal-title">{title}</h2>
-            <button type="button" className="btn-close" onClick={onClose} aria-label={gettext('Close')}></button>
-          </div>
-
-          {
-            children && (
-              <div className="modal-body">
-                {children}
-              </div>
-            )
-          }
-
-          <div className="modal-footer">
-            {
-              onSubmit && (
-                <button type="button" className="btn btn-primary" onClick={onSubmit} {...submitProps}>
-                  {submitLabel ?? gettext('Save')}
-                </button>
-              )
-            }
-            <button type="button" className="btn btn-secondary" onClick={onClose}>
-              {gettext('Cancel')}
-            </button>
-          </div>
-        </div>
-      </div>
-    </div>
-  )
-}
-
-Modal.propTypes = {
-  title: PropTypes.string.isRequired,
-  show: PropTypes.bool.isRequired,
-  onClose: PropTypes.func.isRequired,
-  onSubmit: PropTypes.func,
-  submitLabel: PropTypes.string,
-  submitProps: PropTypes.object,
-  children: PropTypes.oneOfType([
-    PropTypes.arrayOf(PropTypes.node),
-    PropTypes.node
-  ]),
-  modalProps: PropTypes.object,
-  size: PropTypes.string
-}
-
-export default Modal
diff --git a/rdmo/core/assets/js/_bs53/components/index.js b/rdmo/core/assets/js/_bs53/components/index.js
deleted file mode 100644
index 8306153fc5..0000000000
--- a/rdmo/core/assets/js/_bs53/components/index.js
+++ /dev/null
@@ -1,2 +0,0 @@
-export { default as Modal } from './Modal'
-export { default as Tooltip } from './Tooltip'
diff --git a/rdmo/core/assets/js/_bs53/app.js b/rdmo/core/assets/js/app.js
similarity index 100%
rename from rdmo/core/assets/js/_bs53/app.js
rename to rdmo/core/assets/js/app.js
diff --git a/rdmo/core/assets/js/base.js b/rdmo/core/assets/js/base.js
index 1653c3c47c..d4c0cde622 100644
--- a/rdmo/core/assets/js/base.js
+++ b/rdmo/core/assets/js/base.js
@@ -1,4 +1 @@
-import 'bootstrap-sass'
-
-window.$ = require('jquery')
-window.Cookies = require('js-cookie')
+// This file is intentionally left empty.
diff --git a/rdmo/core/assets/js/_bs53/bootstrap.js b/rdmo/core/assets/js/bootstrap.js
similarity index 100%
rename from rdmo/core/assets/js/_bs53/bootstrap.js
rename to rdmo/core/assets/js/bootstrap.js
diff --git a/rdmo/core/assets/js/components/Modal.js b/rdmo/core/assets/js/components/Modal.js
index acbaa59c45..8f7b89d3b6 100644
--- a/rdmo/core/assets/js/components/Modal.js
+++ b/rdmo/core/assets/js/components/Modal.js
@@ -1,47 +1,86 @@
-import React from 'react'
+import React, { useEffect, useRef } from 'react'
 import PropTypes from 'prop-types'
-import { Modal as BootstrapModal } from 'react-bootstrap'
+import { Modal as BootstrapModal } from 'bootstrap'
 
-const Modal = ({ title, show, modalProps, submitLabel, submitProps, onClose, onSubmit, children, buttons }) => {
-  return (
-    <BootstrapModal className="element-modal" onHide={onClose} show={show} {...modalProps}>
-      <BootstrapModal.Header closeButton>
-        <h2 className="modal-title">{title}</h2>
-      </BootstrapModal.Header>
-      {
-        children && (
-          <BootstrapModal.Body>
-            {children}
-          </BootstrapModal.Body>
-        )
+const Modal = ({ title, show, onClose, onSubmit, submitLabel, submitProps, children, modalProps = {}, size = '' }) => {
+  const modalRef = useRef(null)
+
+  useEffect(() => {
+    const modalElement = modalRef.current
+    if (!modalElement) return
+
+    const modal = BootstrapModal.getOrCreateInstance(modalElement, {
+      backdrop: 'static',
+      keyboard: true,
+      ...modalProps
+    })
+
+    const handleHide = () => {
+      if (show) {
+        onClose()
       }
-      <BootstrapModal.Footer>
-        <button type="button" className="btn btn-default" onClick={onClose}>
-          {gettext('Close')}
-        </button>
-        {buttons}
-        {
-          onSubmit && (
-            <button type="button" className="btn btn-primary" onClick={onSubmit} {...submitProps}>
-              {submitLabel ?? gettext('Save')}
+    }
+
+    modalElement.addEventListener('hide.bs.modal', handleHide)
+
+    if (show) {
+      modal.show()
+    }
+
+    return () => {
+      modalElement.removeEventListener('hide.bs.modal', handleHide)
+      modal.hide()
+    }
+  }, [show])
+
+  return (
+    <div ref={modalRef} className="modal fade" tabIndex="-1" aria-hidden={!show}>
+      <div className={`modal-dialog ${size}`}>
+        <div className="modal-content element-modal">
+          <div className="modal-header">
+            <h2 className="modal-title">{title}</h2>
+            <button type="button" className="btn-close" onClick={onClose} aria-label={gettext('Close')}></button>
+          </div>
+
+          {
+            children && (
+              <div className="modal-body">
+                {children}
+              </div>
+            )
+          }
+
+          <div className="modal-footer">
+            {
+              onSubmit && (
+                <button type="button" className="btn btn-primary" onClick={onSubmit} {...submitProps}>
+                  {submitLabel ?? gettext('Save')}
+                </button>
+              )
+            }
+            <button type="button" className="btn btn-secondary" onClick={onClose}>
+              {gettext('Cancel')}
             </button>
-          )
-        }
-      </BootstrapModal.Footer>
-    </BootstrapModal>
+          </div>
+        </div>
+      </div>
+    </div>
   )
 }
 
 Modal.propTypes = {
   title: PropTypes.string.isRequired,
   show: PropTypes.bool.isRequired,
-  modalProps: PropTypes.object,
-  submitLabel: PropTypes.string,
-  submitProps: PropTypes.object,
   onClose: PropTypes.func.isRequired,
   onSubmit: PropTypes.func,
-  children: PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.node), PropTypes.node]),
-  buttons: PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.node), PropTypes.node]),
+  submitLabel: PropTypes.string,
+  submitProps: PropTypes.object,
+  children: PropTypes.oneOfType([
+    PropTypes.arrayOf(PropTypes.node),
+    PropTypes.node
+  ]),
+  modalProps: PropTypes.object,
+  size: PropTypes.string
 }
 
 export default Modal
diff --git a/rdmo/core/assets/js/_bs53/components/Tooltip.js b/rdmo/core/assets/js/components/Tooltip.js
similarity index 100%
rename from rdmo/core/assets/js/_bs53/components/Tooltip.js
rename to rdmo/core/assets/js/components/Tooltip.js
diff --git a/rdmo/core/assets/js/_bs53/base.js b/rdmo/core/assets/js/home.js
similarity index 100%
rename from rdmo/core/assets/js/_bs53/base.js
rename to rdmo/core/assets/js/home.js
diff --git a/rdmo/core/assets/scss/_bs53/app.scss b/rdmo/core/assets/scss/app.scss
similarity index 100%
rename from rdmo/core/assets/scss/_bs53/app.scss
rename to rdmo/core/assets/scss/app.scss
diff --git a/rdmo/core/assets/scss/_bs53/base.scss b/rdmo/core/assets/scss/base.scss
similarity index 100%
rename from rdmo/core/assets/scss/_bs53/base.scss
rename to rdmo/core/assets/scss/base.scss
diff --git a/rdmo/core/assets/scss/_bs53/base/card.scss b/rdmo/core/assets/scss/base/card.scss
similarity index 100%
rename from rdmo/core/assets/scss/_bs53/base/card.scss
rename to rdmo/core/assets/scss/base/card.scss
diff --git a/rdmo/core/assets/scss/_bs53/base/code.scss b/rdmo/core/assets/scss/base/code.scss
similarity index 100%
rename from rdmo/core/assets/scss/_bs53/base/code.scss
rename to rdmo/core/assets/scss/base/code.scss
diff --git a/rdmo/core/assets/scss/_bs53/base/content.scss b/rdmo/core/assets/scss/base/content.scss
similarity index 100%
rename from rdmo/core/assets/scss/_bs53/base/content.scss
rename to rdmo/core/assets/scss/base/content.scss
diff --git a/rdmo/core/assets/scss/_bs53/base/datepicker.scss b/rdmo/core/assets/scss/base/datepicker.scss
similarity index 100%
rename from rdmo/core/assets/scss/_bs53/base/datepicker.scss
rename to rdmo/core/assets/scss/base/datepicker.scss
diff --git a/rdmo/core/assets/scss/_bs53/base/dropdown.scss b/rdmo/core/assets/scss/base/dropdown.scss
similarity index 100%
rename from rdmo/core/assets/scss/_bs53/base/dropdown.scss
rename to rdmo/core/assets/scss/base/dropdown.scss
diff --git a/rdmo/core/assets/scss/_bs53/base/dropzone.scss b/rdmo/core/assets/scss/base/dropzone.scss
similarity index 100%
rename from rdmo/core/assets/scss/_bs53/base/dropzone.scss
rename to rdmo/core/assets/scss/base/dropzone.scss
diff --git a/rdmo/core/assets/scss/_bs53/base/forms.scss b/rdmo/core/assets/scss/base/forms.scss
similarity index 100%
rename from rdmo/core/assets/scss/_bs53/base/forms.scss
rename to rdmo/core/assets/scss/base/forms.scss
diff --git a/rdmo/core/assets/scss/_bs53/base/nav.scss b/rdmo/core/assets/scss/base/nav.scss
similarity index 100%
rename from rdmo/core/assets/scss/_bs53/base/nav.scss
rename to rdmo/core/assets/scss/base/nav.scss
diff --git a/rdmo/core/assets/scss/_bs53/base/select.scss b/rdmo/core/assets/scss/base/select.scss
similarity index 100%
rename from rdmo/core/assets/scss/_bs53/base/select.scss
rename to rdmo/core/assets/scss/base/select.scss
diff --git a/rdmo/core/assets/scss/_bs53/base/sidebar.scss b/rdmo/core/assets/scss/base/sidebar.scss
similarity index 100%
rename from rdmo/core/assets/scss/_bs53/base/sidebar.scss
rename to rdmo/core/assets/scss/base/sidebar.scss
diff --git a/rdmo/core/assets/scss/_bs53/base/table.scss b/rdmo/core/assets/scss/base/table.scss
similarity index 100%
rename from rdmo/core/assets/scss/_bs53/base/table.scss
rename to rdmo/core/assets/scss/base/table.scss
diff --git a/rdmo/core/assets/scss/_bs53/base/typography.scss b/rdmo/core/assets/scss/base/typography.scss
similarity index 100%
rename from rdmo/core/assets/scss/_bs53/base/typography.scss
rename to rdmo/core/assets/scss/base/typography.scss
diff --git a/rdmo/core/assets/scss/_bs53/base/variables.scss b/rdmo/core/assets/scss/base/variables.scss
similarity index 100%
rename from rdmo/core/assets/scss/_bs53/base/variables.scss
rename to rdmo/core/assets/scss/base/variables.scss
diff --git a/rdmo/core/assets/scss/_bs53/bootstrap.scss b/rdmo/core/assets/scss/bootstrap.scss
similarity index 100%
rename from rdmo/core/assets/scss/_bs53/bootstrap.scss
rename to rdmo/core/assets/scss/bootstrap.scss
diff --git a/rdmo/core/assets/scss/_bs53/breakpoints.scss b/rdmo/core/assets/scss/breakpoints.scss
similarity index 100%
rename from rdmo/core/assets/scss/_bs53/breakpoints.scss
rename to rdmo/core/assets/scss/breakpoints.scss
diff --git a/rdmo/core/assets/scss/home.scss b/rdmo/core/assets/scss/home.scss
new file mode 100644
index 0000000000..d4c0cde622
--- /dev/null
+++ b/rdmo/core/assets/scss/home.scss
@@ -0,0 +1 @@
+// This file is intentionally left empty.
diff --git a/rdmo/core/templates/core/about.html b/rdmo/core/templates/core/about.html
index 9a9066d2d9..2299507dcd 100644
--- a/rdmo/core/templates/core/about.html
+++ b/rdmo/core/templates/core/about.html
@@ -1,18 +1,16 @@
-{% extends 'core/bs53/base.html' %}
+{% extends 'core/main.html' %}
 {% load static core_tags %}
 {% load i18n %}
 
 {% block content %}
 
-<div class="container page">
-    <div class="row">
-        <div class="col-md-2">
-        </div>
-        <div class="col-md-8">
-            {% render_lang_template "core/about_text" %}
-        </div>
-        <div class="col-md-2">
-        </div>
+<div class="row">
+    <div class="col-md-2">
+    </div>
+    <div class="col-md-8">
+        {% render_lang_template "core/about_text" %}
+    </div>
+    <div class="col-md-2">
     </div>
 </div>
 
diff --git a/rdmo/core/templates/core/api.html b/rdmo/core/templates/core/api.html
index b07cda4cf2..91c84fd461 100644
--- a/rdmo/core/templates/core/api.html
+++ b/rdmo/core/templates/core/api.html
@@ -1,4 +1,4 @@
-{% extends 'core/bs53/main.html' %}
+{% extends 'core/main.html' %}
 {% load i18n %}
 {% load core_tags %}
 
diff --git a/rdmo/core/templates/core/base.html b/rdmo/core/templates/core/base.html
new file mode 100644
index 0000000000..035468b44d
--- /dev/null
+++ b/rdmo/core/templates/core/base.html
@@ -0,0 +1,34 @@
+{% load static core_tags %}<!DOCTYPE html>
+<html>
+<head>
+    {% include 'core/base_head.html' %}
+
+    {% block css %}
+    <link rel="stylesheet" href="{% static 'core/css/bootstrap.css' %}" />
+    <link rel="stylesheet" href="{% static 'core/css/base.css' %}" />
+    <link rel="stylesheet" href="{% static 'core/css/app.css' %}" />
+    {% endblock %}
+
+    {% block js %}
+    <script src="{% static 'core/js/app.js' %}"></script>
+    <script src="{% url 'javascript-catalog' %}"></script>
+    {% endblock %}
+
+    {% block head %}
+    {% endblock %}
+</head>
+
+<body>
+
+{% include 'core/base_navigation.html' %}
+
+<div class="content">
+    {% block content %}{% endblock %}
+</div>
+
+{% if not debug %}
+    {% include 'core/base_analytics.html' %}
+{% endif %}
+
+</body>
+</html>
diff --git a/rdmo/core/templates/core/bs53/base_head.html b/rdmo/core/templates/core/base_head.html
similarity index 100%
rename from rdmo/core/templates/core/bs53/base_head.html
rename to rdmo/core/templates/core/base_head.html
diff --git a/rdmo/core/templates/core/bs53/base_navigation.html b/rdmo/core/templates/core/base_navigation.html
similarity index 100%
rename from rdmo/core/templates/core/bs53/base_navigation.html
rename to rdmo/core/templates/core/base_navigation.html
diff --git a/rdmo/core/templates/core/bs53/base.html b/rdmo/core/templates/core/bs53/base.html
deleted file mode 100644
index bb01286003..0000000000
--- a/rdmo/core/templates/core/bs53/base.html
+++ /dev/null
@@ -1,36 +0,0 @@
-{% load static core_tags %}<!DOCTYPE html>
-<html>
-<head>
-    {% include 'core/bs53/base_head.html' %}
-
-    {% block css %}
-    <link rel="stylesheet" href="{% static 'core/css/bootstrap-bs53.css' %}" />
-    <link rel="stylesheet" href="{% static 'core/css/base-bs53.css' %}" />
-    <link rel="stylesheet" href="{% static 'core/css/app-bs53.css' %}" />
-    {% endblock %}
-
-    {% block js %}
-    <script src="{% url 'javascript-catalog' %}"></script>
-    <script src="{% static 'core/js/bootstrap-bs53.js' %}"></script>
-    <script src="{% static 'core/js/base-bs53.js' %}"></script>
-    <script src="{% static 'core/js/app-bs53.js' %}"></script>
-    {% endblock %}
-
-    {% block head %}
-    {% endblock %}
-</head>
-
-<body>
-
-{% include 'core/bs53/base_navigation.html' %}
-
-<div class="content">
-    {% block content %}{% endblock %}
-</div>
-
-{% if not debug %}
-    {% include 'core/base_analytics.html' %}
-{% endif %}
-
-</body>
-</html>
diff --git a/rdmo/core/templates/core/bs53/home.html b/rdmo/core/templates/core/bs53/home.html
deleted file mode 100644
index d6aa512b31..0000000000
--- a/rdmo/core/templates/core/bs53/home.html
+++ /dev/null
@@ -1,14 +0,0 @@
-{% extends 'core/bs53/base.html' %}
-{% load static %}
-{% load i18n %}
-
-{% block content %}
-
-{% get_current_language as lang %}
-{% if lang == 'en' %}
-    {% include 'core/bs53/home_en.html' %}
-{% elif lang == 'de' %}
-    {% include 'core/bs53/home_de.html' %}
-{% endif %}
-
-{% endblock %}
diff --git a/rdmo/core/templates/core/bs53/main.html b/rdmo/core/templates/core/bs53/main.html
deleted file mode 100644
index 82558c023b..0000000000
--- a/rdmo/core/templates/core/bs53/main.html
+++ /dev/null
@@ -1,11 +0,0 @@
-{% extends 'core/bs53/base.html' %}
-
-{% block content %}
-
-<div class="container">
-    <main class="py-5">
-    {% block main %}{% endblock %}
-    </main>
-</div>
-
-{% endblock %}
diff --git a/rdmo/core/templates/core/bs53/page.html b/rdmo/core/templates/core/bs53/page.html
deleted file mode 100644
index 0e4f271396..0000000000
--- a/rdmo/core/templates/core/bs53/page.html
+++ /dev/null
@@ -1,16 +0,0 @@
-{% extends 'core/bs53/base.html' %}
-
-{% block content %}
-
-<main class="container">
-    <div class="row">
-        <section class="page col-md-9 py-5">
-            {% block page %}{% endblock %}
-        </section>
-        <aside class="sidebar col-md-3 py-5">
-            {% block sidebar %}{% endblock %}
-        </aside>
-    </div>
-</main>
-
-{% endblock %}
diff --git a/rdmo/core/templates/core/bs53/forms/bootstrap_checkbox.html b/rdmo/core/templates/core/forms/bootstrap_checkbox.html
similarity index 100%
rename from rdmo/core/templates/core/bs53/forms/bootstrap_checkbox.html
rename to rdmo/core/templates/core/forms/bootstrap_checkbox.html
diff --git a/rdmo/core/templates/core/bs53/forms/bootstrap_input.html b/rdmo/core/templates/core/forms/bootstrap_input.html
similarity index 100%
rename from rdmo/core/templates/core/bs53/forms/bootstrap_input.html
rename to rdmo/core/templates/core/forms/bootstrap_input.html
diff --git a/rdmo/core/templates/core/bs53/forms/bootstrap_textarea.html b/rdmo/core/templates/core/forms/bootstrap_textarea.html
similarity index 100%
rename from rdmo/core/templates/core/bs53/forms/bootstrap_textarea.html
rename to rdmo/core/templates/core/forms/bootstrap_textarea.html
diff --git a/rdmo/core/templates/core/home.html b/rdmo/core/templates/core/home.html
new file mode 100644
index 0000000000..e6aa725ad1
--- /dev/null
+++ b/rdmo/core/templates/core/home.html
@@ -0,0 +1,20 @@
+{% extends 'core/base.html' %}
+{% load static %}
+{% load i18n %}
+
+{% block js %}
+    {{ block.super }}
+    <script src="{% static 'core/js/bootstrap.js' %}"></script>
+    <script src="{% static 'core/js/home.js' %}"></script>
+{% endblock %}
+
+{% block content %}
+
+{% get_current_language as lang %}
+{% if lang == 'en' %}
+    {% include 'core/home_en.html' %}
+{% elif lang == 'de' %}
+    {% include 'core/home_de.html' %}
+{% endif %}
+
+{% endblock %}
diff --git a/rdmo/core/templates/core/bs53/home_de.html b/rdmo/core/templates/core/home_de.html
similarity index 97%
rename from rdmo/core/templates/core/bs53/home_de.html
rename to rdmo/core/templates/core/home_de.html
index 20319453f3..d2cc079ee0 100644
--- a/rdmo/core/templates/core/bs53/home_de.html
+++ b/rdmo/core/templates/core/home_de.html
@@ -1,7 +1,7 @@
 {% load static %}
 
 <header id="header" class="home">
-    {% include 'core/bs53/home_images.html' %}
+    {% include 'core/home_images.html' %}
 
     <div class="container">
         <div class="row justify-content-center text-center">
@@ -13,7 +13,7 @@ <h1 class="mb-4">
                     A tool to support the planning, implementation, and organisation of research data management.
                 </p>
 
-                {% include 'core/bs53/home_login.html' %}
+                {% include 'core/home_login.html' %}
             </div>
         </div>
     </div>
diff --git a/rdmo/core/templates/core/bs53/home_en.html b/rdmo/core/templates/core/home_en.html
similarity index 97%
rename from rdmo/core/templates/core/bs53/home_en.html
rename to rdmo/core/templates/core/home_en.html
index c095ed9be8..e2600f0e32 100644
--- a/rdmo/core/templates/core/bs53/home_en.html
+++ b/rdmo/core/templates/core/home_en.html
@@ -1,7 +1,7 @@
 {% load static %}
 
 <header id="header" class="home">
-    {% include 'core/bs53/home_images.html' %}
+    {% include 'core/home_images.html' %}
 
     <div class="container">
         <div class="row justify-content-center text-center">
@@ -13,7 +13,7 @@ <h1 class="mb-4">
                     A tool to support the planning, implementation, and organisation of research data management.
                 </p>
 
-                {% include 'core/bs53/home_login.html' %}
+                {% include 'core/home_login.html' %}
             </div>
         </div>
     </div>
diff --git a/rdmo/core/templates/core/bs53/home_images.html b/rdmo/core/templates/core/home_images.html
similarity index 100%
rename from rdmo/core/templates/core/bs53/home_images.html
rename to rdmo/core/templates/core/home_images.html
diff --git a/rdmo/core/templates/core/bs53/home_login.html b/rdmo/core/templates/core/home_login.html
similarity index 100%
rename from rdmo/core/templates/core/bs53/home_login.html
rename to rdmo/core/templates/core/home_login.html
diff --git a/rdmo/core/templates/core/main.html b/rdmo/core/templates/core/main.html
new file mode 100644
index 0000000000..a185e4fe3c
--- /dev/null
+++ b/rdmo/core/templates/core/main.html
@@ -0,0 +1,17 @@
+{% extends 'core/base.html' %}
+{% load static %}
+
+{% block js %}
+    {{ block.super }}
+    <script src="{% static 'core/js/bootstrap.js' %}"></script>
+{% endblock %}
+
+{% block content %}
+
+<div class="container">
+    <main class="py-5">
+    {% block main %}{% endblock %}
+    </main>
+</div>
+
+{% endblock %}
diff --git a/rdmo/core/templates/core/page.html b/rdmo/core/templates/core/page.html
index 73b8aa63dc..6b3f77fc50 100644
--- a/rdmo/core/templates/core/page.html
+++ b/rdmo/core/templates/core/page.html
@@ -1 +1,22 @@
-{% extends 'core/bs53/page.html' %}
\ No newline at end of file
+{% extends 'core/base.html' %}
+{% load static %}
+
+{% block js %}
+    {{ block.super }}
+    <script src="{% static 'core/js/bootstrap.js' %}"></script>
+{% endblock %}
+
+{% block content %}
+
+<main class="container">
+    <div class="row">
+        <section class="page col-md-9 py-5">
+            {% block page %}{% endblock %}
+        </section>
+        <aside class="sidebar col-md-3 py-5">
+            {% block sidebar %}{% endblock %}
+        </aside>
+    </div>
+</main>
+
+{% endblock %}
diff --git a/rdmo/core/templatetags/core_tags.py b/rdmo/core/templatetags/core_tags.py
index 495b802760..e6515b023b 100644
--- a/rdmo/core/templatetags/core_tags.py
+++ b/rdmo/core/templatetags/core_tags.py
@@ -57,9 +57,9 @@ def bootstrap_form_field(field, **kwargs):
     }
 
     if field.widget_type in ['text', 'email', 'password']:
-        return render_to_string('core/bs53/forms/bootstrap_input.html', context)
+        return render_to_string('core/forms/bootstrap_input.html', context)
     else:
-        return render_to_string(f'core/bs53/forms/bootstrap_{field.widget_type}.html', context)
+        return render_to_string(f'core/forms/bootstrap_{field.widget_type}.html', context)
 
 
 @register.simple_tag(takes_context=True)
diff --git a/rdmo/core/views.py b/rdmo/core/views.py
index 5c2481a78d..773a21cab2 100644
--- a/rdmo/core/views.py
+++ b/rdmo/core/views.py
@@ -33,15 +33,15 @@ def home(request):
         if settings.LOGIN_FORM:
             if settings.ACCOUNT or settings.SOCIALACCOUNT:
                 from rdmo.accounts.account import LoginForm
-                return render(request, 'core/bs53/home.html', {
+                return render(request, 'core/home.html', {
                     'form': LoginForm(),
                     'signup_url': reverse("account_signup")
                 })
             else:
                 from django.contrib.auth.forms import AuthenticationForm
-                return render(request, 'core/bs53/home.html', {'form': AuthenticationForm()})
+                return render(request, 'core/home.html', {'form': AuthenticationForm()})
         else:
-            return render(request, 'core/bs53/home.html')
+            return render(request, 'core/home.html')
 
 
 @login_required
diff --git a/rdmo/management/assets/js/components/modals/DeleteAttributeModal.js b/rdmo/management/assets/js/components/modals/DeleteAttributeModal.js
index 222a2c085e..1ee00ecbab 100644
--- a/rdmo/management/assets/js/components/modals/DeleteAttributeModal.js
+++ b/rdmo/management/assets/js/components/modals/DeleteAttributeModal.js
@@ -1,7 +1,7 @@
 import React from 'react'
 import PropTypes from 'prop-types'
 
-import Modal from 'rdmo/core/assets/js/_bs53/components/Modal'
+import Modal from 'rdmo/core/assets/js/components/Modal'
 
 const DeleteAttributeModal = ({ attribute, info, show, onClose, onDelete }) => (
   <Modal
diff --git a/rdmo/management/assets/js/components/modals/DeleteCatalogModal.js b/rdmo/management/assets/js/components/modals/DeleteCatalogModal.js
index da7be9692a..7e43c05191 100644
--- a/rdmo/management/assets/js/components/modals/DeleteCatalogModal.js
+++ b/rdmo/management/assets/js/components/modals/DeleteCatalogModal.js
@@ -1,7 +1,7 @@
 import React from 'react'
 import PropTypes from 'prop-types'
 
-import Modal from 'rdmo/core/assets/js/_bs53/components/Modal'
+import Modal from 'rdmo/core/assets/js/components/Modal'
 
 const DeleteCatalogModal = ({ catalog, info, show, onClose, onDelete }) => (
   <Modal
diff --git a/rdmo/management/assets/js/components/modals/DeleteConditionModal.js b/rdmo/management/assets/js/components/modals/DeleteConditionModal.js
index 0503f48ccd..71d882e767 100644
--- a/rdmo/management/assets/js/components/modals/DeleteConditionModal.js
+++ b/rdmo/management/assets/js/components/modals/DeleteConditionModal.js
@@ -1,7 +1,7 @@
 import React from 'react'
 import PropTypes from 'prop-types'
 
-import Modal from 'rdmo/core/assets/js/_bs53/components/Modal'
+import Modal from 'rdmo/core/assets/js/components/Modal'
 
 const DeleteConditionModal = ({ condition, info, show, onClose, onDelete }) => (
   <Modal
diff --git a/rdmo/management/assets/js/components/modals/DeleteOptionModal.js b/rdmo/management/assets/js/components/modals/DeleteOptionModal.js
index cf61c3a4fe..c5ec972aaa 100644
--- a/rdmo/management/assets/js/components/modals/DeleteOptionModal.js
+++ b/rdmo/management/assets/js/components/modals/DeleteOptionModal.js
@@ -1,7 +1,7 @@
 import React from 'react'
 import PropTypes from 'prop-types'
 
-import Modal from 'rdmo/core/assets/js/_bs53/components/Modal'
+import Modal from 'rdmo/core/assets/js/components/Modal'
 
 const DeleteOptionModal = ({ option, info, show, onClose, onDelete }) => (
   <Modal
diff --git a/rdmo/management/assets/js/components/modals/DeleteOptionSetModal.js b/rdmo/management/assets/js/components/modals/DeleteOptionSetModal.js
index ffa8228e4f..e1495e0955 100644
--- a/rdmo/management/assets/js/components/modals/DeleteOptionSetModal.js
+++ b/rdmo/management/assets/js/components/modals/DeleteOptionSetModal.js
@@ -1,7 +1,7 @@
 import React from 'react'
 import PropTypes from 'prop-types'
 
-import Modal from 'rdmo/core/assets/js/_bs53/components/Modal'
+import Modal from 'rdmo/core/assets/js/components/Modal'
 
 const DeleteOptionSetModal = ({ optionset, info, show, onClose, onDelete }) => (
   <Modal
diff --git a/rdmo/management/assets/js/components/modals/DeletePageModal.js b/rdmo/management/assets/js/components/modals/DeletePageModal.js
index ed2c134794..f6cc41fe7c 100644
--- a/rdmo/management/assets/js/components/modals/DeletePageModal.js
+++ b/rdmo/management/assets/js/components/modals/DeletePageModal.js
@@ -1,7 +1,7 @@
 import React from 'react'
 import PropTypes from 'prop-types'
 
-import Modal from 'rdmo/core/assets/js/_bs53/components/Modal'
+import Modal from 'rdmo/core/assets/js/components/Modal'
 
 const DeletePageModal = ({ page, info, show, onClose, onDelete }) => (
   <Modal
diff --git a/rdmo/management/assets/js/components/modals/DeleteQuestionModal.js b/rdmo/management/assets/js/components/modals/DeleteQuestionModal.js
index f6825b2640..4bc70101fb 100644
--- a/rdmo/management/assets/js/components/modals/DeleteQuestionModal.js
+++ b/rdmo/management/assets/js/components/modals/DeleteQuestionModal.js
@@ -1,7 +1,7 @@
 import React from 'react'
 import PropTypes from 'prop-types'
 
-import Modal from 'rdmo/core/assets/js/_bs53/components/Modal'
+import Modal from 'rdmo/core/assets/js/components/Modal'
 
 const DeleteQuestionModal = ({ question, info, show, onClose, onDelete }) => (
   <Modal
diff --git a/rdmo/management/assets/js/components/modals/DeleteQuestionSetModal.js b/rdmo/management/assets/js/components/modals/DeleteQuestionSetModal.js
index f72a11ecb8..9839b2b233 100644
--- a/rdmo/management/assets/js/components/modals/DeleteQuestionSetModal.js
+++ b/rdmo/management/assets/js/components/modals/DeleteQuestionSetModal.js
@@ -1,7 +1,7 @@
 import React from 'react'
 import PropTypes from 'prop-types'
 
-import Modal from 'rdmo/core/assets/js/_bs53/components/Modal'
+import Modal from 'rdmo/core/assets/js/components/Modal'
 
 const DeleteQuestionSetModal = ({ questionset, info, show, onClose, onDelete }) => (
   <Modal
diff --git a/rdmo/management/assets/js/components/modals/DeleteSectionModal.js b/rdmo/management/assets/js/components/modals/DeleteSectionModal.js
index b25ff58624..9b406336eb 100644
--- a/rdmo/management/assets/js/components/modals/DeleteSectionModal.js
+++ b/rdmo/management/assets/js/components/modals/DeleteSectionModal.js
@@ -1,7 +1,7 @@
 import React from 'react'
 import PropTypes from 'prop-types'
 
-import Modal from 'rdmo/core/assets/js/_bs53/components/Modal'
+import Modal from 'rdmo/core/assets/js/components/Modal'
 
 const DeleteSectionModal = ({ section, info, show, onClose, onDelete }) => (
   <Modal
diff --git a/rdmo/management/assets/js/components/modals/DeleteTaskModal.js b/rdmo/management/assets/js/components/modals/DeleteTaskModal.js
index 3ae58acede..9c7cd1b8e0 100644
--- a/rdmo/management/assets/js/components/modals/DeleteTaskModal.js
+++ b/rdmo/management/assets/js/components/modals/DeleteTaskModal.js
@@ -1,7 +1,7 @@
 import React from 'react'
 import PropTypes from 'prop-types'
 
-import Modal from 'rdmo/core/assets/js/_bs53/components/Modal'
+import Modal from 'rdmo/core/assets/js/components/Modal'
 
 const DeleteTaskModal = ({ task, info, show, onClose, onDelete }) => (
   <Modal
diff --git a/rdmo/management/assets/js/components/modals/DeleteViewModal.js b/rdmo/management/assets/js/components/modals/DeleteViewModal.js
index 43e16d129b..abfda80636 100644
--- a/rdmo/management/assets/js/components/modals/DeleteViewModal.js
+++ b/rdmo/management/assets/js/components/modals/DeleteViewModal.js
@@ -1,7 +1,7 @@
 import React from 'react'
 import PropTypes from 'prop-types'
 
-import Modal from 'rdmo/core/assets/js/_bs53/components/Modal'
+import Modal from 'rdmo/core/assets/js/components/Modal'
 
 const DeleteViewModal = ({ view, info, show, onClose, onDelete }) => (
   <Modal
diff --git a/rdmo/management/templates/management/management.html b/rdmo/management/templates/management/management.html
index 50f1ca55e3..f23a3776e9 100644
--- a/rdmo/management/templates/management/management.html
+++ b/rdmo/management/templates/management/management.html
@@ -1,16 +1,17 @@
-{% extends 'core/bs53/base.html' %}
+{% extends 'core/base.html' %}
 {% load static %}
 
+{% block head %}
+    <meta name="management" />
+{% endblock %}
+
 {% block css %}
-    <link rel="stylesheet" href="{% static 'core/css/base-bs53.css' %}" />
-    <link rel="stylesheet" href="{% static 'core/css/style-bs53.css' %}" />
     <link rel="stylesheet" href="{% static 'management/css/management.css' %}" />
     {{ block.super }}
 {% endblock %}
 
 {% block js %}
-    <script src="{% url 'javascript-catalog' %}"></script>
-    <script src="{% static 'core/js/base-bs53.js' %}" defer></script>
+    {{ block.super }}
     <script src="{% static 'management/js/management.js' %}" defer></script>
 {% endblock %}
 
diff --git a/rdmo/projects/assets/js/project/components/areas/Dashboard.js b/rdmo/projects/assets/js/project/components/areas/Dashboard.js
index 48577001c2..35ee866304 100644
--- a/rdmo/projects/assets/js/project/components/areas/Dashboard.js
+++ b/rdmo/projects/assets/js/project/components/areas/Dashboard.js
@@ -1,6 +1,6 @@
 import React, { useState } from 'react'
 
-import Tooltip from 'rdmo/core/assets/js/_bs53/components/Tooltip'
+import Tooltip from 'rdmo/core/assets/js/components/Tooltip'
 
 import { TileGrid } from '../helper'
 
diff --git a/rdmo/projects/assets/js/project/components/areas/information/ProjectDeleteModal.js b/rdmo/projects/assets/js/project/components/areas/information/ProjectDeleteModal.js
index f564302783..2869444cd1 100644
--- a/rdmo/projects/assets/js/project/components/areas/information/ProjectDeleteModal.js
+++ b/rdmo/projects/assets/js/project/components/areas/information/ProjectDeleteModal.js
@@ -2,8 +2,8 @@ import React from 'react'
 import PropTypes from 'prop-types'
 import { useDispatch } from 'react-redux'
 
-import Modal from 'rdmo/core/assets/js/_bs53/components/Modal'
 import Html from 'rdmo/core/assets/js/components/Html'
+import Modal from 'rdmo/core/assets/js/components/Modal'
 
 import { deleteProject } from '../../../actions/projectActions'
 
diff --git a/rdmo/projects/assets/js/project/components/areas/information/ProjectForm.js b/rdmo/projects/assets/js/project/components/areas/information/ProjectForm.js
index 70591e86b2..97c7835ed5 100644
--- a/rdmo/projects/assets/js/project/components/areas/information/ProjectForm.js
+++ b/rdmo/projects/assets/js/project/components/areas/information/ProjectForm.js
@@ -4,12 +4,11 @@ import { useDispatch, useSelector } from 'react-redux'
 import AsyncSelect from 'react-select/async'
 import { useDebouncedCallback } from 'use-debounce'
 
-import { Tooltip } from 'rdmo/core/assets/js/_bs53/components'
-
 import Input from 'rdmo/core/assets/js/components/forms/Input'
 import Select from 'rdmo/core/assets/js/components/forms/Select'
 import Textarea from 'rdmo/core/assets/js/components/forms/Textarea'
 import Html from 'rdmo/core/assets/js/components/Html'
+import Tooltip from 'rdmo/core/assets/js/components/Tooltip'
 
 import { copyProject, createProject } from '../../../../projects/actions/projectsActions'
 import { updateProject } from '../../../actions/projectActions'
diff --git a/rdmo/projects/assets/js/project/components/areas/memberships/MembershipDeleteModal.js b/rdmo/projects/assets/js/project/components/areas/memberships/MembershipDeleteModal.js
index 6ef5d24ba3..3ec975e08f 100644
--- a/rdmo/projects/assets/js/project/components/areas/memberships/MembershipDeleteModal.js
+++ b/rdmo/projects/assets/js/project/components/areas/memberships/MembershipDeleteModal.js
@@ -2,8 +2,8 @@ import React from 'react'
 import PropTypes from 'prop-types'
 import { useDispatch, useSelector } from 'react-redux'
 
-import Modal from 'rdmo/core/assets/js/_bs53/components/Modal'
 import Html from 'rdmo/core/assets/js/components/Html'
+import Modal from 'rdmo/core/assets/js/components/Modal'
 
 import { deleteProjectInvite, deleteProjectMember, leaveProject } from '../../../actions/projectActions'
 import { useFieldErrors } from '../../../hooks/useFieldErrors'
diff --git a/rdmo/projects/assets/js/project/components/areas/memberships/MembershipInviteModal.js b/rdmo/projects/assets/js/project/components/areas/memberships/MembershipInviteModal.js
index 4018953974..762b52efd5 100644
--- a/rdmo/projects/assets/js/project/components/areas/memberships/MembershipInviteModal.js
+++ b/rdmo/projects/assets/js/project/components/areas/memberships/MembershipInviteModal.js
@@ -3,9 +3,9 @@ import PropTypes from 'prop-types'
 import { useDispatch, useSelector } from 'react-redux'
 import { isEmpty } from 'lodash'
 
-import { Modal, Tooltip } from 'rdmo/core/assets/js/_bs53/components'
-
 import Html from 'rdmo/core/assets/js/components/Html'
+import Modal from 'rdmo/core/assets/js/components/Modal'
+import Tooltip from 'rdmo/core/assets/js/components/Tooltip'
 
 import { clearProjectErrors, createProjectMember, sendProjectInvite } from '../../../actions/projectActions'
 import { useFieldErrors } from '../../../hooks/useFieldErrors'
diff --git a/rdmo/projects/assets/js/project/components/areas/snapshots/SnapshotDeleteModal.js b/rdmo/projects/assets/js/project/components/areas/snapshots/SnapshotDeleteModal.js
index 9bc6823855..3f2696a7c0 100644
--- a/rdmo/projects/assets/js/project/components/areas/snapshots/SnapshotDeleteModal.js
+++ b/rdmo/projects/assets/js/project/components/areas/snapshots/SnapshotDeleteModal.js
@@ -2,8 +2,8 @@ import React from 'react'
 import PropTypes from 'prop-types'
 import { useDispatch } from 'react-redux'
 
-import Modal from 'rdmo/core/assets/js/_bs53/components/Modal'
 import Html from 'rdmo/core/assets/js/components/Html'
+import Modal from 'rdmo/core/assets/js/components/Modal'
 
 import { deleteSnapshot } from '../../../actions/projectActions'
 import { useFieldErrors } from '../../../hooks/useFieldErrors'
diff --git a/rdmo/projects/assets/js/project/components/areas/snapshots/SnapshotModal.js b/rdmo/projects/assets/js/project/components/areas/snapshots/SnapshotModal.js
index df9fdf7826..02870fd43b 100644
--- a/rdmo/projects/assets/js/project/components/areas/snapshots/SnapshotModal.js
+++ b/rdmo/projects/assets/js/project/components/areas/snapshots/SnapshotModal.js
@@ -2,10 +2,10 @@ import React, { useEffect, useState } from 'react'
 import PropTypes from 'prop-types'
 import { useDispatch, useSelector } from 'react-redux'
 
-import { Modal } from 'rdmo/core/assets/js/_bs53/components'
 import { Input, Textarea } from 'rdmo/core/assets/js/components/forms'
 
 import Html from 'rdmo/core/assets/js/components/Html'
+import Modal from 'rdmo/core/assets/js/components/Modal'
 
 import { clearProjectErrors, createSnapshot, updateSnapshot } from '../../../actions/projectActions'
 import { useFieldErrors } from '../../../hooks/useFieldErrors'
diff --git a/rdmo/projects/assets/js/project/components/areas/snapshots/SnapshotRollbackModal.js b/rdmo/projects/assets/js/project/components/areas/snapshots/SnapshotRollbackModal.js
index 276f1f39c0..3f3c3cee9e 100644
--- a/rdmo/projects/assets/js/project/components/areas/snapshots/SnapshotRollbackModal.js
+++ b/rdmo/projects/assets/js/project/components/areas/snapshots/SnapshotRollbackModal.js
@@ -2,8 +2,8 @@ import React from 'react'
 import PropTypes from 'prop-types'
 import { useDispatch } from 'react-redux'
 
-import Modal from 'rdmo/core/assets/js/_bs53/components/Modal'
 import Html from 'rdmo/core/assets/js/components/Html'
+import Modal from 'rdmo/core/assets/js/components/Modal'
 
 import { rollbackSnapshot } from '../../../actions/projectActions'
 import { useFieldErrors } from '../../../hooks/useFieldErrors'
diff --git a/rdmo/projects/assets/js/projects/components/Main.js b/rdmo/projects/assets/js/projects/components/Main.js
index 5cd320b23c..cb69cf792c 100644
--- a/rdmo/projects/assets/js/projects/components/Main.js
+++ b/rdmo/projects/assets/js/projects/components/Main.js
@@ -2,13 +2,14 @@ import React, { useState } from 'react'
 import { useDispatch, useSelector } from 'react-redux'
 import { get, isEmpty } from 'lodash'
 
-import { Modal } from 'rdmo/core/assets/js/_bs53/components'
 import * as configActions from 'rdmo/core/assets/js/actions/configActions'
 import { Link, SearchField } from 'rdmo/core/assets/js/components'
 import { useFormattedDateTime, useModal, useScrollToTop } from 'rdmo/core/assets/js/hooks'
 import { language } from 'rdmo/core/assets/js/utils'
 import { baseUrl } from 'rdmo/core/assets/js/utils/meta'
 
+import Modal from 'rdmo/core/assets/js/components/Modal'
+
 import * as projectsActions from '../actions/projectsActions'
 import { HEADER_FORMATTERS, SORTABLE_COLUMNS } from '../utils'
 
diff --git a/rdmo/projects/templates/projects/project_detail.html b/rdmo/projects/templates/projects/project_detail.html
index c7bbcd9894..a7b4b696e5 100644
--- a/rdmo/projects/templates/projects/project_detail.html
+++ b/rdmo/projects/templates/projects/project_detail.html
@@ -1,4 +1,4 @@
-{% extends 'core/bs53/base.html' %}
+{% extends 'core/base.html' %}
 {% load static %}
 
 {% block head %}
@@ -6,15 +6,12 @@
 {% endblock %}
 
 {% block css %}
-    <link rel="stylesheet" href="{% static 'core/css/base-bs53.css' %}" />
-    <link rel="stylesheet" href="{% static 'core/css/style-bs53.css' %}" />
     <link rel="stylesheet" href="{% static 'projects/css/project.css' %}" />
     {{ block.super }}
 {% endblock %}
 
 {% block js %}
-    <script src="{% url 'javascript-catalog' %}"></script>
-    <script src="{% static 'core/js/base-bs53.js' %}" defer></script>
+    {{ block.super }}
     <script src="{% static 'projects/js/project.js' %}" defer></script>
 {% endblock %}
 
diff --git a/rdmo/projects/templates/projects/project_error.html b/rdmo/projects/templates/projects/project_error.html
index 86eb8a31e9..2a5c9f47c6 100644
--- a/rdmo/projects/templates/projects/project_error.html
+++ b/rdmo/projects/templates/projects/project_error.html
@@ -11,14 +11,4 @@ <h2>{% trans 'No catalog configured' %}</h2>
         {% trans "The project does appear not to have a question catalog. Please update your project." %}
     </p>
 
-    <p>
-        {% trans "You will be redirected shortly." %}
-    </p>
-
-    <script type="text/javascript">
-        window.setTimeout(function(){
-            window.location.replace('{% url 'project_update' project.id %}');
-        }, 5000);
-    </script>
-
 {% endblock%}
diff --git a/rdmo/projects/templates/projects/project_interview.html b/rdmo/projects/templates/projects/project_interview.html
index 7e94ea0096..ebb548a062 100644
--- a/rdmo/projects/templates/projects/project_interview.html
+++ b/rdmo/projects/templates/projects/project_interview.html
@@ -1,7 +1,5 @@
-{% extends 'core/page.html' %}
+{% extends 'core/base.html' %}
 {% load static %}
-{% load i18n %}
-{% load core_tags %}
 
 {% block head %}
     <meta name='project' content="{{ project.id }}" />
@@ -18,13 +16,7 @@
     <script src="{% static 'projects/js/interview.js' %}" defer></script>
 {% endblock %}
 
-{% block sidebar %}
-
-    <div id="sidebar"></div>
-
-{% endblock %}
-
-{% block page %}
+{% block content %}
 
     <div id="main" class="interview"></div>
 
diff --git a/rdmo/projects/templates/projects/projects.html b/rdmo/projects/templates/projects/projects.html
index b8fa1eecdb..ad58f7a37a 100644
--- a/rdmo/projects/templates/projects/projects.html
+++ b/rdmo/projects/templates/projects/projects.html
@@ -1,20 +1,17 @@
-{% extends 'core/bs53/base.html' %}
+{% extends 'core/base.html' %}
 {% load static %}
 
 {% block head %}
-    <meta name='projects'" />
+    <meta name="projects" />
 {% endblock %}
 
 {% block css %}
-    <link rel="stylesheet" href="{% static 'core/css/base-bs53.css' %}" />
-    <link rel="stylesheet" href="{% static 'core/css/style-bs53.css' %}" />
     <link rel="stylesheet" href="{% static 'projects/css/projects.css' %}" />
     {{ block.super }}
 {% endblock %}
 
 {% block js %}
-    <script src="{% url 'javascript-catalog' %}"></script>
-    <script src="{% static 'core/js/base-bs53.js' %}" defer></script>
+    {{ block.super }}
     <script src="{% static 'projects/js/projects.js' %}" defer></script>
 {% endblock %}
 
diff --git a/webpack.config.js b/webpack.config.js
index 3c18b21eb7..5875727eb7 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -18,17 +18,21 @@ const configList = [
   {
     name: 'core',
     entry: {
-      'bootstrap-bs53': [
-        './rdmo/core/assets/js/_bs53/bootstrap.js',
-        './rdmo/core/assets/scss/_bs53/bootstrap.scss'
+      'bootstrap': [
+        './rdmo/core/assets/js/bootstrap.js',
+        './rdmo/core/assets/scss/bootstrap.scss'
       ],
-      'base-bs53': [
-        './rdmo/core/assets/js/_bs53/base.js',
-        './rdmo/core/assets/scss/_bs53/base.scss'
+      'base': [
+        './rdmo/core/assets/js/base.js',
+        './rdmo/core/assets/scss/base.scss'
       ],
-      'app-bs53': [
-        './rdmo/core/assets/js/_bs53/app.js',
-        './rdmo/core/assets/scss/_bs53/app.scss'
+      'home': [
+        './rdmo/core/assets/js/home.js',
+        './rdmo/core/assets/scss/home.scss'
+      ],
+      'app': [
+        './rdmo/core/assets/js/app.js',
+        './rdmo/core/assets/scss/app.scss'
       ]
     },
     output: {

From 4fa628e4decd2640f9eff6e3848acb1c2d23b196 Mon Sep 17 00:00:00 2001
From: Jochen Klar <mail@jochenklar.de>
Date: Fri, 10 Apr 2026 16:43:01 +0200
Subject: [PATCH 16/16] Fix tests

---
 rdmo/projects/imports.py  | 8 ++++----
 rdmo/projects/viewsets.py | 3 +--
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/rdmo/projects/imports.py b/rdmo/projects/imports.py
index bfb40937cc..7e04f2c218 100644
--- a/rdmo/projects/imports.py
+++ b/rdmo/projects/imports.py
@@ -265,10 +265,10 @@ def submit(self):
             response = requests.get(form.cleaned_data['url'])
             self.request.session['import_file_name'] = handle_fetched_file(response.content)
 
-            if self.current_project:
-                return redirect('project_update_import', self.current_project.id)
-            else:
-                return redirect('project_create_import')
+            # if self.current_project:
+            #     return redirect('project_update_import', self.current_project.id)
+            # else:
+            #     return redirect('project_create_import')
 
         return render(self.request, 'projects/project_import_form.html', {
             'source_title': 'URL',
diff --git a/rdmo/projects/viewsets.py b/rdmo/projects/viewsets.py
index 5cd2b3f7f4..ec89549474 100644
--- a/rdmo/projects/viewsets.py
+++ b/rdmo/projects/viewsets.py
@@ -631,10 +631,9 @@ def imports(self, request):
             'key': key,
             'label': label,
             'class_name': class_name,
-            'href': reverse('project_create_import', args=[key])
+            # 'href': reverse('project_create_import', args=[key])
         } for key, label, class_name in settings.PROJECT_IMPORTS if key in settings.PROJECT_IMPORTS_LIST] )
 
-
     def create(self, request, *args, **kwargs):
         response = super().create(request, *args, **kwargs)