diff --git a/authentication/tests.py b/authentication/tests.py
index a3b62d7..2635530 100644
--- a/authentication/tests.py
+++ b/authentication/tests.py
@@ -295,7 +295,7 @@ class TwoFactorPageTests(TestCase):
         self.assertNotContains(self.response, 'placeholder="Code"')
 
     def test_cancel_sits_beside_sign_in_and_is_not_primary(self):
-        self.assertContains(self.response, '<button class="btn btn-outline gap-2" type="submit" form="logout-from-stage">')
+        self.assertContains(self.response, '<button class="btn btn-outline btn-neutral gap-2" type="submit" form="logout-from-stage">')
         self.assertContains(self.response, '<button class="btn btn-primary gap-2" type="submit">')
 
     def test_cancel_has_a_form_to_submit(self):
@@ -388,7 +388,7 @@ class SignOutPageTests(TestCase):
 
     def test_sign_out_and_cancel_sit_side_by_side_with_icons(self):
         html = self.response.content.decode()
-        cancel = html[html.index('<a class="btn btn-outline gap-2" href="/">') :]
+        cancel = html[html.index('<a class="btn btn-outline btn-neutral gap-2" href="/">') :]
         sign_out = html[html.index('<button class="btn btn-primary gap-2"') :]
 
         self.assertIn("<svg", cancel[: cancel.index("</a>")])
diff --git a/controlpanel/templates/controlpanel/_club_billing_card.html b/controlpanel/templates/controlpanel/_club_billing_card.html
index beaabfb..52243c5 100644
--- a/controlpanel/templates/controlpanel/_club_billing_card.html
+++ b/controlpanel/templates/controlpanel/_club_billing_card.html
@@ -11,7 +11,7 @@
         <div class="flex flex-wrap items-center justify-between gap-2">
             <h2 class="card-title text-base">{% lucide "receipt-euro" size=18 %} Billing</h2>
             <div class="flex flex-wrap gap-2">
-                <button class="btn btn-outline btn-sm gap-2" type="button" onclick="document.getElementById('subscription_modal').showModal()">
+                <button class="btn btn-outline btn-neutral btn-sm gap-2" type="button" onclick="document.getElementById('subscription_modal').showModal()">
                     {% lucide "layers" size=14 %} {% if subscription %}Change plan{% else %}Start billing{% endif %}
                 </button>
                 {% if subscription %}
@@ -78,7 +78,7 @@
                                         {% if not due.payments.all %}
                                             <form class="inline" method="post" action="{% url 'controlpanel:due_waive' due.pk %}">
                                                 {% csrf_token %}
-                                                <button class="btn btn-outline btn-sm gap-1" type="submit">{% lucide "ban" size=14 %} Waive payment</button>
+                                                <button class="btn btn-outline btn-neutral btn-sm gap-1" type="submit">{% lucide "ban" size=14 %} Waive payment</button>
                                             </form>
                                         {% endif %}
                                     {% endif %}
diff --git a/controlpanel/templates/controlpanel/_club_features_card.html b/controlpanel/templates/controlpanel/_club_features_card.html
index e335918..8a88fca 100644
--- a/controlpanel/templates/controlpanel/_club_features_card.html
+++ b/controlpanel/templates/controlpanel/_club_features_card.html
@@ -8,7 +8,7 @@
     <div class="card-body">
         <div class="flex items-center justify-between">
             <h2 class="card-title text-base">{% lucide "toggle-right" size=18 %} Features</h2>
-            <a class="btn btn-outline btn-sm gap-2" href="{% url 'controlpanel:features' %}">{% lucide "wrench" size=14 %} Manage features</a>
+            <a class="btn btn-outline btn-neutral btn-sm gap-2" href="{% url 'controlpanel:features' %}">{% lucide "wrench" size=14 %} Manage features</a>
         </div>
         <div class="overflow-x-auto">
             <table class="table">
diff --git a/controlpanel/templates/controlpanel/_club_health_table.html b/controlpanel/templates/controlpanel/_club_health_table.html
index f85df8a..dc34d63 100644
--- a/controlpanel/templates/controlpanel/_club_health_table.html
+++ b/controlpanel/templates/controlpanel/_club_health_table.html
@@ -122,7 +122,7 @@
                     </td>
 
                     <td>
-                        <a class="btn btn-sm btn-outline gap-2" href="{% url "controlpanel:club_detail" club.pk %}">{% lucide "pencil" size=14 %} Edit</a>
+                        <a class="btn btn-sm btn-outline btn-neutral gap-2" href="{% url "controlpanel:club_detail" club.pk %}">{% lucide "pencil" size=14 %} Edit</a>
                     </td>
                 </tr>
             {% empty %}
diff --git a/controlpanel/templates/controlpanel/billing.html b/controlpanel/templates/controlpanel/billing.html
index a826711..f9496b0 100644
--- a/controlpanel/templates/controlpanel/billing.html
+++ b/controlpanel/templates/controlpanel/billing.html
@@ -53,7 +53,7 @@
                                 </td>
                                 <td class="flex flex-row gap-2 justify-end">
                                     <button class="btn btn-primary btn-sm btn-outline gap-1" type="button" onclick="document.getElementById('{{ tier.pk|dom_id:"tier_price_modal" }}').showModal()">{% lucide "euro" size=14 %} New price</button>
-                                    <button class="btn btn-sm btn-outline gap-1" type="button" onclick="document.getElementById('{{ tier.pk|dom_id:"tier_edit_modal" }}').showModal()">{% lucide "pencil" size=14 %} Edit</button>
+                                    <button class="btn btn-sm btn-outline btn-neutral gap-1" type="button" onclick="document.getElementById('{{ tier.pk|dom_id:"tier_edit_modal" }}').showModal()">{% lucide "pencil" size=14 %} Edit</button>
                                 </td>
                             </tr>
                         {% empty %}
diff --git a/controlpanel/templates/controlpanel/club_detail.html b/controlpanel/templates/controlpanel/club_detail.html
index 0da2336..0d334f6 100644
--- a/controlpanel/templates/controlpanel/club_detail.html
+++ b/controlpanel/templates/controlpanel/club_detail.html
@@ -34,7 +34,7 @@
 {% endblock subheading %}
 
 {% block actions %}
-    <a class="btn btn-outline gap-2" href="{% url 'controlpanel:club_update' club.pk %}">{% lucide "pencil" size=16 %} Edit</a>
+    <a class="btn btn-outline btn-neutral gap-2" href="{% url 'controlpanel:club_update' club.pk %}">{% lucide "pencil" size=16 %} Edit</a>
     <a class="btn btn-primary gap-2" href="https://{{ club.slug }}.rosterchief.app">{% lucide "external-link" size=16 %} Open</a>
     {% if club.is_archived %}
         <form method="post" action="{% url 'controlpanel:club_restore' club.pk %}">
diff --git a/controlpanel/templates/controlpanel/club_form.html b/controlpanel/templates/controlpanel/club_form.html
index be9a906..a300444 100644
--- a/controlpanel/templates/controlpanel/club_form.html
+++ b/controlpanel/templates/controlpanel/club_form.html
@@ -16,13 +16,21 @@
                 {% endfor %}
 
                 <div class="grid grid-cols-1 md:grid-cols-2 gap-4">
-                    {% for field in form %}
-                        {% form_field field %}
-                    {% endfor %}
+                    {% form_field form.name %}
+                    {% form_field form.slug %}
+
+                    {% form_field form.logo %}
+
+                    <div></div>
+
+                    {% form_field form.primary_color %}
+                    {% form_field form.secondary_color %}
+                    {% form_field form.season_start %}
+                    {% form_field form.season_duration_months %}
                 </div>
 
                 <div class="card-actions justify-start pt-2 mt-2">
-                    <a class="btn btn-outline gap-2" href="{% if update_view %}{% url "controlpanel:club_detail" object.pk %}{% else %}{% url "controlpanel:club_list" %}{% endif %}">{% lucide "arrow-left" size=16 %} Cancel</a>
+                    <a class="btn btn-outline btn-neutral gap-2" href="{% if update_view %}{% url "controlpanel:club_detail" object.pk %}{% else %}{% url "controlpanel:club_list" %}{% endif %}">{% lucide "arrow-left" size=16 %} Cancel</a>
                     <button class="btn btn-primary gap-2" type="submit">{% lucide "save" size=16 %} Save</button>
                 </div>
             </form>
diff --git a/controlpanel/templates/controlpanel/club_list.html b/controlpanel/templates/controlpanel/club_list.html
index a815aa4..e736d6a 100644
--- a/controlpanel/templates/controlpanel/club_list.html
+++ b/controlpanel/templates/controlpanel/club_list.html
@@ -5,9 +5,9 @@
 
 {% block actions %}
     {% if show_archived %}
-        <a class="btn btn-outline" href="{% url 'controlpanel:club_list' %}">{% lucide "archive-x" size=16 %} Hide archived clubs</a>
+        <a class="btn btn-outline btn-neutral" href="{% url 'controlpanel:club_list' %}">{% lucide "archive-x" size=16 %} Hide archived clubs</a>
     {% else %}
-        <a class="btn btn-outline" href="{% url 'controlpanel:club_list' %}?archived=1">{% lucide "archive" size=16 %} Show archived clubs</a>
+        <a class="btn btn-outline btn-neutral" href="{% url 'controlpanel:club_list' %}?archived=1">{% lucide "archive" size=16 %} Show archived clubs</a>
     {% endif %}
     <a class="btn btn-primary gap-2" href="{% url 'controlpanel:club_create' %}">{% lucide "plus" size=16 %} New club</a>
 {% endblock actions %}
@@ -24,7 +24,7 @@
                    class="input input-bordered w-full max-w-xs">
         </label>
 
-        <button class="btn btn-outline gap-2" type="submit">{% lucide "search" size=16 %} Search</button>
+        <button class="btn btn-outline btn-neutral gap-2" type="submit">{% lucide "search" size=16 %} Search</button>
         {% if search %}
             <a class="btn btn-primary gap-2" href="{% url "controlpanel:club_list" %}">{% lucide "x" size=16 %} Clear filter</a>
         {% endif %}
diff --git a/controlpanel/templates/controlpanel/features.html b/controlpanel/templates/controlpanel/features.html
index 64fa957..15c3209 100644
--- a/controlpanel/templates/controlpanel/features.html
+++ b/controlpanel/templates/controlpanel/features.html
@@ -93,7 +93,7 @@
                                 <td>{{ flag.clubs.count }}</td>
                                 <td class="max-w-xs truncate opacity-70">{{ flag.note|default:"-" }}</td>
                                 <td class="text-right">
-                                    <button class="btn btn-outline btn-sm gap-1" type="button" onclick="document.getElementById('{{ flag.pk|dom_id:"flag_edit_modal" }}').showModal()">{% lucide "pencil" size=14 %} Edit</button>
+                                    <button class="btn btn-outline btn-neutral btn-sm gap-1" type="button" onclick="document.getElementById('{{ flag.pk|dom_id:"flag_edit_modal" }}').showModal()">{% lucide "pencil" size=14 %} Edit</button>
                                 </td>
                             </tr>
                         {% empty %}
diff --git a/templates/account/logout.html b/templates/account/logout.html
index 0deb535..2fb25e6 100644
--- a/templates/account/logout.html
+++ b/templates/account/logout.html
@@ -26,7 +26,7 @@
         {{ redirect_field }}
 
         <div class="flex flex-wrap items-center justify-end gap-2">
-            <a class="btn btn-outline gap-2" href="/">{% lucide "arrow-left" size=16 %} {% trans "Cancel" %}</a>
+            <a class="btn btn-outline btn-neutral gap-2" href="/">{% lucide "arrow-left" size=16 %} {% trans "Cancel" %}</a>
             <button class="btn btn-primary gap-2" type="submit">{% lucide "log-out" size=16 %} {% trans "Sign Out" %}</button>
         </div>
     </form>
diff --git a/templates/mfa/authenticate.html b/templates/mfa/authenticate.html
index 925302c..f12c199 100644
--- a/templates/mfa/authenticate.html
+++ b/templates/mfa/authenticate.html
@@ -33,7 +33,7 @@
         </div>
 
         <div class="flex flex-wrap items-center justify-end gap-2">
-            <button class="btn btn-outline gap-2" type="submit" form="logout-from-stage">{% lucide "x" size=16 %} {% trans "Cancel" %}</button>
+            <button class="btn btn-outline btn-neutral gap-2" type="submit" form="logout-from-stage">{% lucide "x" size=16 %} {% trans "Cancel" %}</button>
             <button class="btn btn-primary gap-2" type="submit">{% lucide "log-in" size=16 %} {% trans "Sign In" %}</button>
         </div>
     </form>