diff --git a/theme/templates/account/account_inactive.html b/theme/templates/account/account_inactive.html
new file mode 100644
index 0000000..e3ab9e6
--- /dev/null
+++ b/theme/templates/account/account_inactive.html
@@ -0,0 +1,14 @@
+{% extends 'base.html' %}
+{% load i18n %}
+{% load allauth %}
+
+{% block head_title %}{% trans "Account Inactive" %}{% endblock head_title %}
+
+{% block content %}
+<div class="container mx-auto max-w-md mt-6 text-center">
+  <h1 class="text-3xl font-bold mb-6">{% trans "Account Inactive" %}</h1>
+  <p class="text-gray-700">
+    {% trans "This account is inactive." %}
+  </p>
+</div>
+{% endblock content %}
diff --git a/theme/templates/account/confirm_email_verification_code.html b/theme/templates/account/confirm_email_verification_code.html
new file mode 100644
index 0000000..2f5266b
--- /dev/null
+++ b/theme/templates/account/confirm_email_verification_code.html
@@ -0,0 +1,25 @@
+{% extends 'base.html' %}
+{% load i18n %}
+{% load allauth account %}
+
+{% block head_title %}{% trans "Email Verification" %}{% endblock head_title %}
+
+{% block content %}
+<div class="container mx-auto max-w-md mt-6">
+  <h1 class="text-3xl font-bold text-center mb-6">{% trans "Enter Email Verification Code" %}</h1>
+  <p class="text-center mb-4">
+    <a class="text-primary underline" href="mailto:{{ email }}">{{ email }}</a>
+  </p>
+  {% url 'account_email_verification_sent' as action_url %}
+  <form method="post" action="{{ action_url }}" class="space-y-4">
+    {% csrf_token %}
+    {{ form.non_field_errors }}
+    <div>
+      <label for="{{ form.code.id_for_label }}" class="block font-medium text-gray-700">{% trans "Verification Code" %}</label>
+      {{ form.code }}
+      {{ form.code.errors }}
+    </div>
+    <button type="submit" class="btn btn-primary w-full">{% trans "Confirm" %}</button>
+  </form>
+</div>
+{% endblock content %}
diff --git a/theme/templates/account/confirm_login_code.html b/theme/templates/account/confirm_login_code.html
new file mode 100644
index 0000000..1349911
--- /dev/null
+++ b/theme/templates/account/confirm_login_code.html
@@ -0,0 +1,29 @@
+{% extends 'base.html' %}
+{% load i18n %}
+{% load allauth account %}
+
+{% block head_title %}{% trans "Sign In" %}{% endblock head_title %}
+
+{% block content %}
+<div class="container mx-auto max-w-md mt-6">
+  <h1 class="text-3xl font-bold text-center mb-6">{% trans "Enter Sign-In Code" %}</h1>
+  <p class="text-center mb-4">
+    {% if email %}
+      <a class="text-primary underline" href="mailto:{{ email }}">{{ email }}</a>
+    {% else %}
+      <a class="text-primary underline" href="tel:{{ phone }}">{{ phone }}</a>
+    {% endif %}
+  </p>
+  {% url 'account_confirm_login_code' as action_url %}
+  <form method="post" action="{{ action_url }}" class="space-y-4">
+    {% csrf_token %}
+    {{ form.non_field_errors }}
+    <div>
+      <label for="{{ form.code.id_for_label }}" class="block font-medium text-gray-700">{% trans "Sign-In Code" %}</label>
+      {{ form.code }}
+      {{ form.code.errors }}
+    </div>
+    <button type="submit" class="btn btn-primary w-full">{% trans "Confirm" %}</button>
+  </form>
+</div>
+{% endblock content %}
diff --git a/theme/templates/account/confirm_password_reset_code.html b/theme/templates/account/confirm_password_reset_code.html
new file mode 100644
index 0000000..6bced21
--- /dev/null
+++ b/theme/templates/account/confirm_password_reset_code.html
@@ -0,0 +1,25 @@
+{% extends 'base.html' %}
+{% load i18n %}
+{% load allauth account %}
+
+{% block head_title %}{% trans "Password Reset" %}{% endblock head_title %}
+
+{% block content %}
+<div class="container mx-auto max-w-md mt-6">
+  <h1 class="text-3xl font-bold text-center mb-6">{% trans "Enter Password Reset Code" %}</h1>
+  <p class="text-center mb-4">
+    <a class="text-primary underline" href="mailto:{{ email }}">{{ email }}</a>
+  </p>
+  {% url 'account_confirm_password_reset_code' as action_url %}
+  <form method="post" action="{{ action_url }}" class="space-y-4">
+    {% csrf_token %}
+    {{ form.non_field_errors }}
+    <div>
+      <label for="{{ form.code.id_for_label }}" class="block font-medium text-gray-700">{% trans "Reset Code" %}</label>
+      {{ form.code }}
+      {{ form.code.errors }}
+    </div>
+    <button type="submit" class="btn btn-primary w-full">{% trans "Confirm" %}</button>
+  </form>
+</div>
+{% endblock content %}
diff --git a/theme/templates/account/confirm_phone_verification_code.html b/theme/templates/account/confirm_phone_verification_code.html
new file mode 100644
index 0000000..8e0b366
--- /dev/null
+++ b/theme/templates/account/confirm_phone_verification_code.html
@@ -0,0 +1,25 @@
+{% extends 'base.html' %}
+{% load i18n %}
+{% load allauth account %}
+
+{% block head_title %}{% trans "Phone Verification" %}{% endblock head_title %}
+
+{% block content %}
+<div class="container mx-auto max-w-md mt-6">
+  <h1 class="text-3xl font-bold text-center mb-6">{% trans "Enter Phone Verification Code" %}</h1>
+  <p class="text-center mb-4">
+    <a class="text-primary underline" href="tel:{{ phone }}">{{ phone }}</a>
+  </p>
+  {% url 'account_verify_phone' as action_url %}
+  <form method="post" action="{{ action_url }}" class="space-y-4">
+    {% csrf_token %}
+    {{ form.non_field_errors }}
+    <div>
+      <label for="{{ form.code.id_for_label }}" class="block font-medium text-gray-700">{% trans "Verification Code" %}</label>
+      {{ form.code }}
+      {{ form.code.errors }}
+    </div>
+    <button type="submit" class="btn btn-primary w-full">{% trans "Confirm" %}</button>
+  </form>
+</div>
+{% endblock content %}
diff --git a/theme/templates/account/email.html b/theme/templates/account/email.html
new file mode 100644
index 0000000..e3e00be
--- /dev/null
+++ b/theme/templates/account/email.html
@@ -0,0 +1,67 @@
+{% extends 'base.html' %}
+{% load static allauth i18n %}
+
+{% block head_title %}{% trans "Email Addresses" %}{% endblock head_title %}
+
+{% block content %}
+<div class="container mx-auto max-w-md mt-6">
+  <h1 class="text-3xl font-bold text-center mb-6">{% trans "Email Addresses" %}</h1>
+
+  {% if emailaddresses %}
+    <p class="text-gray-700 mb-4">
+      {% trans "The following email addresses are associated with your account:" %}
+    </p>
+    {% url 'account_email' as email_url %}
+    <form method="post" action="{{ email_url }}" class="space-y-4">
+      {% csrf_token %}
+      {% for radio in emailaddress_radios %}
+        <div class="flex items-center">
+          <input type="radio" id="{{ radio.id }}" name="email" value="{{ radio.emailaddress.email }}" class="mr-2" {% if radio.checked %}checked{% endif %}>
+          <label for="{{ radio.id }}">
+            {{ radio.emailaddress.email }}
+            {% if radio.emailaddress.verified %}
+              <span class="ml-1 bg-green-200 text-green-800 px-2 py-1 rounded text-xs">{% trans "Verified" %}</span>
+            {% else %}
+              <span class="ml-1 bg-yellow-200 text-yellow-800 px-2 py-1 rounded text-xs">{% trans "Unverified" %}</span>
+            {% endif %}
+            {% if radio.emailaddress.primary %}
+              <span class="ml-1 bg-blue-200 text-blue-800 px-2 py-1 rounded text-xs">{% trans "Primary" %}</span>
+            {% endif %}
+          </label>
+        </div>
+      {% endfor %}
+      <div class="flex flex-col md:flex-row md:space-x-2">
+        <button type="submit" name="action_primary" class="btn btn-primary w-full">{% trans "Make Primary" %}</button>
+        <button type="submit" name="action_send" class="btn btn-secondary w-full">{% trans "Re-send Verification" %}</button>
+        <button type="submit" name="action_remove" class="btn btn-danger w-full">{% trans "Remove" %}</button>
+      </div>
+    </form>
+  {% else %}
+    {% include "account/snippets/warn_no_email.html" %}
+  {% endif %}
+
+  {% if can_add_email %}
+    <h2 class="text-2xl font-bold mt-8 mb-4">{% trans "Add Email Address" %}</h2>
+    {% url 'account_email' as action_url %}
+    <form method="post" action="{{ action_url }}" class="space-y-4">
+      {% csrf_token %}
+      <div>
+        <label for="{{ form.email.id_for_label }}" class="block font-medium text-gray-700">{{ form.email.label }}</label>
+        {{ form.email }}
+        {{ form.email.errors }}
+      </div>
+      <button type="submit" name="action_add" class="btn btn-primary w-full">{% trans "Add Email" %}</button>
+    </form>
+  {% endif %}
+</div>
+{% endblock content %}
+
+{% block extra_body %}
+  <script src="{% static 'account/js/account.js' %}"></script>
+  <script src="{% static 'account/js/onload.js' %}"></script>
+  <script data-allauth-onload="allauth.account.forms.manageEmailForm" type="application/json">
+  {
+    "i18n": {"confirmDelete": "{% trans 'Do you really want to remove the selected email address?' %}"}
+  }
+  </script>
+{% endblock extra_body %}
diff --git a/theme/templates/account/email_change.html b/theme/templates/account/email_change.html
new file mode 100644
index 0000000..b93fcb3
--- /dev/null
+++ b/theme/templates/account/email_change.html
@@ -0,0 +1,59 @@
+{% extends 'base.html' %}
+{% load i18n %}
+{% load allauth %}
+
+{% block head_title %}{% trans "Email Address" %}{% endblock head_title %}
+
+{% block content %}
+<div class="container mx-auto max-w-md mt-6">
+  <h1 class="text-3xl font-bold text-center mb-6">{% trans "Email Address" %}</h1>
+  {% if not emailaddresses %}
+    {% include "account/snippets/warn_no_email.html" %}
+  {% endif %}
+  {% url 'account_email' as action_url %}
+  <form method="post" action="{{ action_url }}" class="space-y-4">
+    {% csrf_token %}
+    {% if current_emailaddress %}
+      <div>
+        <label for="current_email" class="block font-medium text-gray-700">{% trans "Current email" %}:</label>
+        <input id="current_email" type="email" value="{{ current_emailaddress.email }}" disabled class="input input-bordered w-full">
+      </div>
+    {% endif %}
+    {% if new_emailaddress %}
+      <div>
+        <label for="new_email" class="block font-medium text-gray-700">
+          {% if not current_emailaddress %}
+            {% trans "Current email" %}:
+          {% else %}
+            {% trans "Changing to" %}:
+          {% endif %}
+        </label>
+        <input id="new_email" type="email" value="{{ new_emailaddress.email }}" disabled class="input input-bordered w-full">
+        <p class="text-sm text-gray-600 mt-1">
+          {% trans "Your email address is still pending verification." %}
+        </p>
+        <div class="flex space-x-2 mt-2">
+          <button form="pending-email" type="submit" name="action_send" class="btn btn-secondary btn-sm">{% trans "Re-send Verification" %}</button>
+          {% if current_emailaddress %}
+            <button form="pending-email" type="submit" name="action_remove" class="btn btn-danger btn-sm">{% trans "Cancel Change" %}</button>
+          {% endif %}
+        </div>
+      </div>
+    {% endif %}
+    <div>
+      <label for="{{ form.email.id_for_label }}" class="block font-medium text-gray-700">{% trans "Change to" %}:</label>
+      {{ form.email }}
+      {{ form.email.errors }}
+    </div>
+    {{ redirect_field }}
+    <button type="submit" name="action_add" class="btn btn-primary w-full">{% trans "Change Email" %}</button>
+  </form>
+
+  {% if new_emailaddress %}
+    <form style="display: none" id="pending-email" method="post" action="{% url 'account_email' %}">
+      {% csrf_token %}
+      <input type="hidden" name="email" value="{{ new_emailaddress.email }}">
+    </form>
+  {% endif %}
+</div>
+{% endblock content %}
diff --git a/theme/templates/account/email_confirm.html b/theme/templates/account/email_confirm.html
new file mode 100644
index 0000000..a566613
--- /dev/null
+++ b/theme/templates/account/email_confirm.html
@@ -0,0 +1,36 @@
+{% extends 'base.html' %}
+{% load i18n %}
+{% load account allauth %}
+
+{% block head_title %}{% trans "Confirm Email Address" %}{% endblock head_title %}
+
+{% block content %}
+<div class="container mx-auto max-w-md mt-6">
+  <h1 class="text-3xl font-bold text-center mb-6">{% trans "Confirm Email Address" %}</h1>
+  {% if confirmation %}
+    {% user_display confirmation.email_address.user as user_display %}
+    {% if can_confirm %}
+      <p class="text-gray-700 mb-4">
+        {% blocktrans with confirmation.email_address.email as email %}
+          Please confirm that <a class="text-primary underline" href="mailto:{{ email }}">{{ email }}</a> is an email address for user {{ user_display }}.
+        {% endblocktrans %}
+      </p>
+      {% url 'account_confirm_email' confirmation.key as action_url %}
+      <form method="post" action="{{ action_url }}" class="space-y-4">
+        {% csrf_token %}
+        {{ redirect_field }}
+        <button type="submit" class="btn btn-primary w-full">{% trans "Confirm" %}</button>
+      </form>
+    {% else %}
+      <p class="text-gray-700">
+        {% blocktrans %}Unable to confirm {{ confirmation.email_address.email }} because it is already confirmed by a different account.{% endblocktrans %}
+      </p>
+    {% endif %}
+  {% else %}
+    {% url 'account_email' as email_url %}
+    <p class="text-gray-700">
+      {% blocktrans %}This email confirmation link expired or is invalid. Please <a class="text-primary underline" href="{{ email_url }}">issue a new email confirmation request</a>.{% endblocktrans %}
+    </p>
+  {% endif %}
+</div>
+{% endblock content %}
diff --git a/theme/templates/account/new/account_inactive.html b/theme/templates/account/new/account_inactive.html
deleted file mode 100644
index 1ee9c72..0000000
--- a/theme/templates/account/new/account_inactive.html
+++ /dev/null
@@ -1,14 +0,0 @@
-{% extends "allauth/layouts/entrance.html" %}
-{% load i18n %}
-{% load allauth %}
-{% block head_title %}
-    {% translate "Account Inactive" %}
-{% endblock head_title %}
-{% block content %}
-    {% element h1 %}
-        {% translate "Account Inactive" %}
-    {% endelement %}
-    {% element p %}
-        {% translate "This account is inactive." %}
-    {% endelement %}
-{% endblock content %}
diff --git a/theme/templates/account/new/confirm_email_verification_code.html b/theme/templates/account/new/confirm_email_verification_code.html
deleted file mode 100644
index 8030831..0000000
--- a/theme/templates/account/new/confirm_email_verification_code.html
+++ /dev/null
@@ -1,14 +0,0 @@
-{% extends "account/base_confirm_code.html" %}
-{% load i18n %}
-{% load allauth account %}
-{% block head_title %}
-    {% translate "Email Verification" %}
-{% endblock head_title %}
-{% block title %}
-    {% translate "Enter Email Verification Code" %}
-{% endblock %}
-{% block recipient %}<a href="mailto:{{ email }}">{{ email }}</a>{% endblock %}
-{% block action_url %}
-    {% url 'account_email_verification_sent' %}
-{% endblock %}
-{% block extra_tags %}email,verification{% endblock %}
diff --git a/theme/templates/account/new/confirm_login_code.html b/theme/templates/account/new/confirm_login_code.html
deleted file mode 100644
index dc97d45..0000000
--- a/theme/templates/account/new/confirm_login_code.html
+++ /dev/null
@@ -1,20 +0,0 @@
-{% extends "account/base_confirm_code.html" %}
-{% load i18n %}
-{% load allauth account %}
-{% block head_title %}
-    {% translate "Sign In" %}
-{% endblock head_title %}
-{% block title %}
-    {% translate "Enter Sign-In Code" %}
-{% endblock %}
-{% block recipient %}
-    {% if email %}
-        <a href="mailto:{{ email }}">{{ email }}</a>
-    {% else %}
-        <a href="tel:{{ phone }}">{{ phone }}</a>
-    {% endif %}
-{% endblock %}
-{% block action_url %}
-    {% url 'account_confirm_login_code' %}
-{% endblock %}
-{% block extra_tags %}login{% endblock %}
diff --git a/theme/templates/account/new/confirm_password_reset_code.html b/theme/templates/account/new/confirm_password_reset_code.html
deleted file mode 100644
index 21a28bd..0000000
--- a/theme/templates/account/new/confirm_password_reset_code.html
+++ /dev/null
@@ -1,14 +0,0 @@
-{% extends "account/base_confirm_code.html" %}
-{% load i18n %}
-{% load allauth account %}
-{% block head_title %}
-    {% translate "Password Reset" %}
-{% endblock head_title %}
-{% block title %}
-    {% translate "Enter Password Reset Code" %}
-{% endblock %}
-{% block recipient %}<a href="mailto:{{ email }}">{{ email }}</a>{% endblock %}
-{% block action_url %}
-    {% url 'account_confirm_password_reset_code' %}
-{% endblock %}
-{% block extra_tags %}email,verification{% endblock %}
diff --git a/theme/templates/account/new/confirm_phone_verification_code.html b/theme/templates/account/new/confirm_phone_verification_code.html
deleted file mode 100644
index e34f630..0000000
--- a/theme/templates/account/new/confirm_phone_verification_code.html
+++ /dev/null
@@ -1,14 +0,0 @@
-{% extends "account/base_confirm_code.html" %}
-{% load i18n %}
-{% load allauth account %}
-{% block head_title %}
-    {% translate "Phone Verification" %}
-{% endblock head_title %}
-{% block title %}
-    {% translate "Enter Phone Verification Code" %}
-{% endblock %}
-{% block recipient %}<a href="tel:{{ phone }}">{{ phone }}</a>{% endblock %}
-{% block action_url %}
-    {% url 'account_verify_phone' %}
-{% endblock %}
-{% block extra_tags %}phone,verification{% endblock %}
diff --git a/theme/templates/account/new/email.html b/theme/templates/account/new/email.html
deleted file mode 100644
index 829d702..0000000
--- a/theme/templates/account/new/email.html
+++ /dev/null
@@ -1,83 +0,0 @@
-{% extends "account/base_manage_email.html" %}
-{% load static allauth i18n %}
-{% block head_title %}
-    {% trans "Email Addresses" %}
-{% endblock head_title %}
-{% block content %}
-    {% element h1 %}
-        {% trans "Email Addresses" %}
-    {% endelement %}
-    {% if emailaddresses %}
-        {% element p %}
-            {% trans 'The following email addresses are associated with your account:' %}
-        {% endelement %}
-        {% url 'account_email' as email_url %}
-        {% element form form=form action=email_url method="post" tags="email,list" %}
-            {% slot body %}
-                {% csrf_token %}
-                {% for radio in emailaddress_radios %}
-                    {% with emailaddress=radio.emailaddress %}
-                        {% element field type="radio" checked=radio.checked name="email" value=emailaddress.email id=radio.id %}
-                            {% slot label %}
-                                {{ emailaddress.email }}
-                                {% if emailaddress.verified %}
-                                    {% element badge tags="success,email,verified" %}
-                                        {% translate "Verified" %}
-                                    {% endelement %}
-                                {% else %}
-                                    {% element badge tags="warning,email,unverified" %}
-                                        {% translate "Unverified" %}
-                                    {% endelement %}
-                                {% endif %}
-                                {% if emailaddress.primary %}
-                                    {% element badge tags="email,primary" %}
-                                        {% translate "Primary" %}
-                                    {% endelement %}
-                                {% endif %}
-                            {% endslot %}
-                        {% endelement %}
-                    {% endwith %}
-                {% endfor %}
-            {% endslot %}
-            {% slot actions %}
-                {% element button type="submit" name="action_primary" %}
-                    {% trans 'Make Primary' %}
-                {% endelement %}
-                {% element button tags="secondary" type="submit" name="action_send" %}
-                    {% trans 'Re-send Verification' %}
-                {% endelement %}
-                {% element button tags="danger,delete" type="submit" name="action_remove" %}
-                    {% trans 'Remove' %}
-                {% endelement %}
-            {% endslot %}
-        {% endelement %}
-    {% else %}
-        {% include "account/snippets/warn_no_email.html" %}
-    {% endif %}
-    {% if can_add_email %}
-        {% element h2 %}
-            {% trans "Add Email Address" %}
-        {% endelement %}
-        {% url 'account_email' as action_url %}
-        {% element form form=form method="post" action=action_url tags="email,add" %}
-            {% slot body %}
-                {% csrf_token %}
-                {% element fields form=form %}
-                {% endelement %}
-            {% endslot %}
-            {% slot actions %}
-                {% element button name="action_add" type="submit" %}
-                    {% trans "Add Email" %}
-                {% endelement %}
-            {% endslot %}
-        {% endelement %}
-    {% endif %}
-{% endblock content %}
-{% block extra_body %}
-    <script src="{% static 'account/js/account.js' %}"></script>
-    <script src="{% static 'account/js/onload.js' %}"></script>
-    <script data-allauth-onload="allauth.account.forms.manageEmailForm" type="application/json">{
-    "i18n": {"confirmDelete": "{% trans 'Do you really want to remove the selected email address?' %}"}
-}
-    </script>
-{% endblock extra_body %}
diff --git a/theme/templates/account/new/email_change.html b/theme/templates/account/new/email_change.html
deleted file mode 100644
index 0ee140c..0000000
--- a/theme/templates/account/new/email_change.html
+++ /dev/null
@@ -1,68 +0,0 @@
-{% extends "account/base_manage_email.html" %}
-{% load i18n %}
-{% load allauth %}
-{% block head_title %}
-    {% trans "Email Address" %}
-{% endblock head_title %}
-{% block content %}
-    {% element h1 %}
-        {% trans "Email Address" %}
-    {% endelement %}
-    {% if not emailaddresses %}
-        {% include "account/snippets/warn_no_email.html" %}
-    {% endif %}
-    {% url 'account_email' as action_url %}
-    {% element form method="post" action=action_url %}
-        {% slot body %}
-            {% csrf_token %}
-            {% if current_emailaddress %}
-                {% element field id="current_email" disabled=True type="email" value=current_emailaddress.email %}
-                    {% slot label %}
-                        {% translate "Current email" %}:
-                    {% endslot %}
-                {% endelement %}
-            {% endif %}
-            {% if new_emailaddress %}
-                {% element field id="new_email" value=new_emailaddress.email disabled=True type="email" %}
-                    {% slot label %}
-                        {% if not current_emailaddress %}
-                            {% translate "Current email" %}:
-                        {% else %}
-                            {% translate "Changing to" %}:
-                        {% endif %}
-                    {% endslot %}
-                    {% slot help_text %}
-                        {% blocktranslate %}Your email address is still pending verification.{% endblocktranslate %}
-                        {% element button form="pending-email" type="submit" name="action_send" tags="minor,secondary" %}
-                            {% trans 'Re-send Verification' %}
-                        {% endelement %}
-                        {% if current_emailaddress %}
-                            {% element button form="pending-email" type="submit" name="action_remove" tags="danger,minor" %}
-                                {% trans 'Cancel Change' %}
-                            {% endelement %}
-                        {% endif %}
-                    {% endslot %}
-                {% endelement %}
-            {% endif %}
-            {% element field id=form.email.auto_id name="email" value=form.email.value errors=form.email.errors type="email" %}
-                {% slot label %}
-                    {% translate "Change to" %}:
-                {% endslot %}
-            {% endelement %}
-        {% endslot %}
-        {% slot actions %}
-            {% element button name="action_add" type="submit" %}
-                {% trans "Change Email" %}
-            {% endelement %}
-        {% endslot %}
-    {% endelement %}
-    {% if new_emailaddress %}
-        <form style="display: none"
-              id="pending-email"
-              method="post"
-              action="{% url 'account_email' %}">
-            {% csrf_token %}
-            <input type="hidden" name="email" value="{{ new_emailaddress.email }}">
-        </form>
-    {% endif %}
-{% endblock content %}
diff --git a/theme/templates/account/new/email_confirm.html b/theme/templates/account/new/email_confirm.html
deleted file mode 100644
index d03e4a2..0000000
--- a/theme/templates/account/new/email_confirm.html
+++ /dev/null
@@ -1,39 +0,0 @@
-{% extends "account/base_entrance.html" %}
-{% load i18n %}
-{% load account %}
-{% load allauth %}
-{% block head_title %}
-    {% trans "Confirm Email Address" %}
-{% endblock head_title %}
-{% block content %}
-    {% element h1 %}
-        {% trans "Confirm Email Address" %}
-    {% endelement %}
-    {% if confirmation %}
-        {% user_display confirmation.email_address.user as user_display %}
-        {% if can_confirm %}
-            {% element p %}
-                {% blocktrans with confirmation.email_address.email as email %}Please confirm that <a href="mailto:{{ email }}">{{ email }}</a> is an email address for user {{ user_display }}.{% endblocktrans %}
-            {% endelement %}
-            {% url 'account_confirm_email' confirmation.key as action_url %}
-            {% element form method="post" action=action_url %}
-                {% slot actions %}
-                    {% csrf_token %}
-                    {{ redirect_field }}
-                    {% element button type="submit" %}
-                        {% trans 'Confirm' %}
-                    {% endelement %}
-                {% endslot %}
-            {% endelement %}
-        {% else %}
-            {% element p %}
-                {% blocktrans %}Unable to confirm {{ email }} because it is already confirmed by a different account.{% endblocktrans %}
-            {% endelement %}
-        {% endif %}
-    {% else %}
-        {% url 'account_email' as email_url %}
-        {% element p %}
-            {% blocktrans %}This email confirmation link expired or is invalid. Please <a href="{{ email_url }}">issue a new email confirmation request</a>.{% endblocktrans %}
-        {% endelement %}
-    {% endif %}
-{% endblock content %}
diff --git a/theme/templates/account/new/reauthenticate.html b/theme/templates/account/new/reauthenticate.html
deleted file mode 100644
index d98c86a..0000000
--- a/theme/templates/account/new/reauthenticate.html
+++ /dev/null
@@ -1,22 +0,0 @@
-{% extends "account/base_reauthenticate.html" %}
-{% load allauth %}
-{% load i18n %}
-{% block reauthenticate_content %}
-    {% element p %}
-        {% blocktranslate %}Enter your password:{% endblocktranslate %}
-    {% endelement %}
-    {% url 'account_reauthenticate' as action_url %}
-    {% element form form=form method="post" action=action_url %}
-        {% slot body %}
-            {% csrf_token %}
-            {% element fields form=form unlabeled=True %}
-            {% endelement %}
-            {{ redirect_field }}
-        {% endslot %}
-        {% slot actions %}
-            {% element button type="submit" tags="primary,reauthenticate" %}
-                {% trans "Confirm" %}
-            {% endelement %}
-        {% endslot %}
-    {% endelement %}
-{% endblock %}
diff --git a/theme/templates/account/new/request_login_code.html b/theme/templates/account/new/request_login_code.html
deleted file mode 100644
index 6ef3905..0000000
--- a/theme/templates/account/new/request_login_code.html
+++ /dev/null
@@ -1,32 +0,0 @@
-{% extends "account/base_entrance.html" %}
-{% load i18n %}
-{% load allauth account %}
-{% block head_title %}
-    {% translate "Sign In" %}
-{% endblock head_title %}
-{% block content %}
-    {% element h1 %}
-        {% translate "Send me a sign-in code" %}
-    {% endelement %}
-    {% element p %}
-        {% blocktranslate %}You will receive a special code for a password-free sign-in.{% endblocktranslate %}
-    {% endelement %}
-    {% url 'account_request_login_code' as login_url %}
-    {% element form form=form method="post" action=login_url tags="entrance,login" %}
-        {% slot body %}
-            {% csrf_token %}
-            {% element fields form=form unlabeled=True %}
-            {% endelement %}
-            {{ redirect_field }}
-        {% endslot %}
-        {% slot actions %}
-            {% element button type="submit" tags="prominent,login" %}
-                {% translate "Request Code" %}
-            {% endelement %}
-        {% endslot %}
-    {% endelement %}
-    {% url 'account_login' as login_url %}
-    {% element button href=login_url tags="link" %}
-        {% translate "Other sign-in options" %}
-    {% endelement %}
-{% endblock content %}
diff --git a/theme/templates/account/new/signup_by_passkey.html b/theme/templates/account/new/signup_by_passkey.html
deleted file mode 100644
index 0863542..0000000
--- a/theme/templates/account/new/signup_by_passkey.html
+++ /dev/null
@@ -1,38 +0,0 @@
-{% extends "account/base_entrance.html" %}
-{% load allauth i18n %}
-{% block head_title %}
-    {% trans "Signup" %}
-{% endblock head_title %}
-{% block content %}
-    {% element h1 %}
-        {% trans "Passkey Sign Up" %}
-    {% endelement %}
-    {% setvar link %}
-        <a href="{{ login_url }}">
-        {% endsetvar %}
-        {% setvar end_link %}
-        </a>
-    {% endsetvar %}
-    {% element p %}
-        {% blocktranslate %}Already have an account? Then please {{ link }}sign in{{ end_link }}.{% endblocktranslate %}
-    {% endelement %}
-    {% url 'account_signup_by_passkey' as action_url %}
-    {% element form form=form method="post" action=action_url tags="entrance,signup" %}
-        {% slot body %}
-            {% csrf_token %}
-            {% element fields form=form unlabeled=True %}
-            {% endelement %}
-            {{ redirect_field }}
-        {% endslot %}
-        {% slot actions %}
-            {% element button tags="prominent,signup" type="submit" %}
-                {% trans "Sign Up" %}
-            {% endelement %}
-        {% endslot %}
-    {% endelement %}
-    {% element hr %}
-    {% endelement %}
-    {% element button href=signup_url tags="prominent,signup,outline,primary" %}
-        {% trans "Other options" %}
-    {% endelement %}
-{% endblock content %}
diff --git a/theme/templates/account/new/signup_closed.html b/theme/templates/account/new/signup_closed.html
deleted file mode 100644
index 1d70eef..0000000
--- a/theme/templates/account/new/signup_closed.html
+++ /dev/null
@@ -1,14 +0,0 @@
-{% extends "account/base_entrance.html" %}
-{% load i18n %}
-{% load allauth %}
-{% block head_title %}
-    {% trans "Sign Up Closed" %}
-{% endblock head_title %}
-{% block content %}
-    {% element h1 %}
-        {% trans "Sign Up Closed" %}
-    {% endelement %}
-    {% element p %}
-        {% trans "We are sorry, but the sign up is currently closed." %}
-    {% endelement %}
-{% endblock content %}
diff --git a/theme/templates/account/new/verification_sent.html b/theme/templates/account/new/verification_sent.html
deleted file mode 100644
index 2397367..0000000
--- a/theme/templates/account/new/verification_sent.html
+++ /dev/null
@@ -1,14 +0,0 @@
-{% extends "account/base_entrance.html" %}
-{% load i18n %}
-{% load allauth %}
-{% block head_title %}
-    {% trans "Verify Your Email Address" %}
-{% endblock head_title %}
-{% block content %}
-    {% element h1 %}
-        {% trans "Verify Your Email Address" %}
-    {% endelement %}
-    {% element p %}
-        {% blocktrans %}We have sent an email to you for verification. Follow the link provided to finalize the signup process. If you do not see the verification email in your main inbox, check your spam folder. Please contact us if you do not receive the verification email within a few minutes.{% endblocktrans %}
-    {% endelement %}
-{% endblock content %}
diff --git a/theme/templates/account/new/verified_email_required.html b/theme/templates/account/new/verified_email_required.html
deleted file mode 100644
index 65d7d1f..0000000
--- a/theme/templates/account/new/verified_email_required.html
+++ /dev/null
@@ -1,25 +0,0 @@
-{% extends "account/base_manage.html" %}
-{% load i18n %}
-{% load allauth %}
-{% block head_title %}
-    {% trans "Verify Your Email Address" %}
-{% endblock head_title %}
-{% block content %}
-    {% element h1 %}
-        {% trans "Verify Your Email Address" %}
-    {% endelement %}
-    {% url 'account_email' as email_url %}
-    {% element p %}
-        {% blocktrans %}This part of the site requires us to verify that
-you are who you claim to be. For this purpose, we require that you
-verify ownership of your email address. {% endblocktrans %}
-    {% endelement %}
-    {% element p %}
-        {% blocktrans %}We have sent an email to you for
-verification. Please click on the link inside that email. If you do not see the verification email in your main inbox, check your spam folder. Otherwise
-contact us if you do not receive it within a few minutes.{% endblocktrans %}
-    {% endelement %}
-    {% element p %}
-        {% blocktrans %}<strong>Note:</strong> you can still <a href="{{ email_url }}">change your email address</a>.{% endblocktrans %}
-    {% endelement %}
-{% endblock content %}
diff --git a/theme/templates/account/reauthenticate.html b/theme/templates/account/reauthenticate.html
new file mode 100644
index 0000000..cbcf250
--- /dev/null
+++ b/theme/templates/account/reauthenticate.html
@@ -0,0 +1,24 @@
+{% extends 'base.html' %}
+{% load allauth i18n %}
+
+{% block head_title %}{% trans "Reauthenticate" %}{% endblock head_title %}
+
+{% block content %}
+<div class="container mx-auto max-w-md mt-6">
+  <p class="text-gray-700 mb-4">{% trans "Enter your password:" %}</p>
+  {% url 'account_reauthenticate' as action_url %}
+  <form method="post" action="{{ action_url }}" class="space-y-4">
+    {% csrf_token %}
+    {{ form.non_field_errors }}
+    {% for field in form %}
+      <div>
+        <label for="{{ field.id_for_label }}" class="block font-medium text-gray-700">{{ field.label }}</label>
+        {{ field }}
+        {{ field.errors }}
+      </div>
+    {% endfor %}
+    {{ redirect_field }}
+    <button type="submit" class="btn btn-primary w-full">{% trans "Confirm" %}</button>
+  </form>
+</div>
+{% endblock content %}
diff --git a/theme/templates/account/request_login_code.html b/theme/templates/account/request_login_code.html
new file mode 100644
index 0000000..873832b
--- /dev/null
+++ b/theme/templates/account/request_login_code.html
@@ -0,0 +1,32 @@
+{% extends 'base.html' %}
+{% load i18n %}
+{% load allauth account %}
+
+{% block head_title %}{% trans "Sign In" %}{% endblock head_title %}
+
+{% block content %}
+<div class="container mx-auto max-w-md mt-6">
+  <h1 class="text-3xl font-bold text-center mb-6">{% trans "Send me a sign-in code" %}</h1>
+  <p class="text-gray-700 mb-4 text-center">
+    {% trans "You will receive a special code for a password-free sign-in." %}
+  </p>
+  {% url 'account_request_login_code' as login_url %}
+  <form method="post" action="{{ login_url }}" class="space-y-4">
+    {% csrf_token %}
+    {{ form.non_field_errors }}
+    {% for field in form %}
+      <div>
+        <label for="{{ field.id_for_label }}" class="block font-medium text-gray-700">{{ field.label }}</label>
+        {{ field }}
+        {{ field.errors }}
+      </div>
+    {% endfor %}
+    {{ redirect_field }}
+    <button type="submit" class="btn btn-primary w-full">{% trans "Request Code" %}</button>
+  </form>
+  {% url 'account_login' as login_url %}
+  <div class="mt-4 text-center">
+    <a href="{{ login_url }}" class="text-primary underline">{% trans "Other sign-in options" %}</a>
+  </div>
+</div>
+{% endblock content %}
diff --git a/theme/templates/account/signup_by_passkey.html b/theme/templates/account/signup_by_passkey.html
new file mode 100644
index 0000000..adc9f39
--- /dev/null
+++ b/theme/templates/account/signup_by_passkey.html
@@ -0,0 +1,33 @@
+{% extends 'base.html' %}
+{% load allauth i18n %}
+
+{% block head_title %}{% trans "Signup" %}{% endblock head_title %}
+
+{% block content %}
+<div class="container mx-auto max-w-md mt-6">
+  <h1 class="text-3xl font-bold text-center mb-6">{% trans "Passkey Sign Up" %}</h1>
+  <p class="text-gray-700 mb-4 text-center">
+    {% blocktranslate %}
+      Already have an account? Then please <a href="{{ login_url }}" class="text-primary underline">{% trans "sign in" %}</a>.
+    {% endblocktranslate %}
+  </p>
+  {% url 'account_signup_by_passkey' as action_url %}
+  <form method="post" action="{{ action_url }}" class="space-y-4">
+    {% csrf_token %}
+    {{ form.non_field_errors }}
+    {% for field in form %}
+      <div>
+        <label for="{{ field.id_for_label }}" class="block font-medium text-gray-700">{{ field.label }}</label>
+        {{ field }}
+        {{ field.errors }}
+      </div>
+    {% endfor %}
+    {{ redirect_field }}
+    <button type="submit" class="btn btn-primary w-full">{% trans "Sign Up" %}</button>
+  </form>
+  <hr class="my-6">
+  <div class="text-center">
+    <a href="{{ signup_url }}" class="btn btn-outline-primary">{% trans "Other options" %}</a>
+  </div>
+</div>
+{% endblock content %}
diff --git a/theme/templates/account/signup_closed.html b/theme/templates/account/signup_closed.html
new file mode 100644
index 0000000..a9bfa1c
--- /dev/null
+++ b/theme/templates/account/signup_closed.html
@@ -0,0 +1,14 @@
+{% extends 'base.html' %}
+{% load i18n %}
+{% load allauth %}
+
+{% block head_title %}{% trans "Sign Up Closed" %}{% endblock head_title %}
+
+{% block content %}
+<div class="container mx-auto max-w-md mt-6 text-center">
+  <h1 class="text-3xl font-bold mb-6">{% trans "Sign Up Closed" %}</h1>
+  <p class="text-gray-700">
+    {% trans "We are sorry, but the sign up is currently closed." %}
+  </p>
+</div>
+{% endblock content %}
diff --git a/theme/templates/account/verification_sent.html b/theme/templates/account/verification_sent.html
new file mode 100644
index 0000000..2d64c74
--- /dev/null
+++ b/theme/templates/account/verification_sent.html
@@ -0,0 +1,16 @@
+{% extends 'base.html' %}
+{% load i18n %}
+{% load allauth %}
+
+{% block head_title %}{% trans "Verify Your Email Address" %}{% endblock head_title %}
+
+{% block content %}
+<div class="container mx-auto max-w-md mt-6">
+  <h1 class="text-3xl font-bold text-center mb-6">{% trans "Verify Your Email Address" %}</h1>
+  <p class="text-gray-700">
+    {% blocktrans %}
+      We have sent an email to you for verification. Follow the link provided to finalize the signup process. If you do not see the verification email in your main inbox, check your spam folder. Please contact us if you do not receive the verification email within a few minutes.
+    {% endblocktrans %}
+  </p>
+</div>
+{% endblock content %}
diff --git a/theme/templates/account/verified_email_required.html b/theme/templates/account/verified_email_required.html
new file mode 100644
index 0000000..7b0cc40
--- /dev/null
+++ b/theme/templates/account/verified_email_required.html
@@ -0,0 +1,27 @@
+{% extends 'base.html' %}
+{% load i18n %}
+{% load allauth %}
+
+{% block head_title %}{% trans "Verify Your Email Address" %}{% endblock head_title %}
+
+{% block content %}
+<div class="container mx-auto max-w-md mt-6">
+  <h1 class="text-3xl font-bold text-center mb-6">{% trans "Verify Your Email Address" %}</h1>
+  {% url 'account_email' as email_url %}
+  <p class="text-gray-700 mb-4">
+    {% blocktrans %}
+      This part of the site requires us to verify that you are who you claim to be. For this purpose, we require that you verify ownership of your email address.
+    {% endblocktrans %}
+  </p>
+  <p class="text-gray-700 mb-4">
+    {% blocktrans %}
+      We have sent an email to you for verification. Please click on the link inside that email. If you do not see the verification email in your main inbox, check your spam folder. Otherwise contact us if you do not receive it within a few minutes.
+    {% endblocktrans %}
+  </p>
+  <p class="text-gray-700">
+    {% blocktrans %}
+      <strong>Note:</strong> you can still <a class="text-primary underline" href="{{ email_url }}">change your email address</a>.
+    {% endblocktrans %}
+  </p>
+</div>
+{% endblock content %}