diff --git a/bookwyrm/templates/settings/announcements/announcement.html b/bookwyrm/templates/settings/announcements/announcement.html
index b3375bb5..37dba06f 100644
--- a/bookwyrm/templates/settings/announcements/announcement.html
+++ b/bookwyrm/templates/settings/announcements/announcement.html
@@ -26,7 +26,7 @@
 {% block panel %}
 
 <form name="edit-announcement" method="post" action="{% url 'settings-announcements' announcement.id %}" class="block">
-    {% include 'settings/announcement_form.html' with controls_text="edit_announcement" %}
+    {% include 'settings/announcements/announcement_form.html' with controls_text="edit_announcement" %}
 </form>
 
 <div class="block content">
diff --git a/bookwyrm/templates/settings/announcements/announcements.html b/bookwyrm/templates/settings/announcements/announcements.html
index 2c57ae78..2c97b053 100644
--- a/bookwyrm/templates/settings/announcements/announcements.html
+++ b/bookwyrm/templates/settings/announcements/announcements.html
@@ -11,7 +11,7 @@
 
 {% block panel %}
 <form name="create-announcement" method="post" action="{% url 'settings-announcements' %}" class="block">
-    {% include 'settings/announcement_form.html' with controls_text="create_announcement" %}
+    {% include 'settings/announcements/announcement_form.html' with controls_text="create_announcement" %}
 </form>
 
 <div class="block">
diff --git a/bookwyrm/templates/settings/dashboard/dashboard.html b/bookwyrm/templates/settings/dashboard/dashboard.html
index 608d32c9..add28d45 100644
--- a/bookwyrm/templates/settings/dashboard/dashboard.html
+++ b/bookwyrm/templates/settings/dashboard/dashboard.html
@@ -115,6 +115,6 @@
 
 {% block scripts %}
 <script src="https://cdn.jsdelivr.net/npm/chart.js@3.5.1/dist/chart.min.js"></script>
-{% include 'settings/dashboard_user_chart.html' %}
-{% include 'settings/dashboard_status_chart.html' %}
+{% include 'settings/dashboard/dashboard_user_chart.html' %}
+{% include 'settings/dashboard/dashboard_status_chart.html' %}
 {% endblock %}
diff --git a/bookwyrm/templates/settings/email_blocklist/email_blocklist.html b/bookwyrm/templates/settings/email_blocklist/email_blocklist.html
index ea63b954..4f7bbf4b 100644
--- a/bookwyrm/templates/settings/email_blocklist/email_blocklist.html
+++ b/bookwyrm/templates/settings/email_blocklist/email_blocklist.html
@@ -12,7 +12,7 @@
 {% endblock %}
 
 {% block panel %}
-{% include 'settings/domain_form.html' with controls_text="add_domain" class="block" %}
+{% include 'settings/email_blocklist/domain_form.html' with controls_text="add_domain" class="block" %}
 
 <p class="notification block">
     {% trans "When someone tries to register with an email from this domain, no account will be created. The registration process will appear to have worked." %}
diff --git a/bookwyrm/templates/settings/invites/invite_request_filters.html b/bookwyrm/templates/settings/invites/invite_request_filters.html
index c55cc069..a29518d8 100644
--- a/bookwyrm/templates/settings/invites/invite_request_filters.html
+++ b/bookwyrm/templates/settings/invites/invite_request_filters.html
@@ -1,6 +1,6 @@
 {% extends 'snippets/filters_panel/filters_panel.html' %}
 
 {% block filter_fields %}
-{% include 'settings/status_filter.html' %}
+{% include 'settings/invites/status_filter.html' %}
 {% endblock %}
 
diff --git a/bookwyrm/templates/settings/invites/manage_invite_requests.html b/bookwyrm/templates/settings/invites/manage_invite_requests.html
index e0cfd646..10b9bb50 100644
--- a/bookwyrm/templates/settings/invites/manage_invite_requests.html
+++ b/bookwyrm/templates/settings/invites/manage_invite_requests.html
@@ -26,7 +26,7 @@
         {% endif %} ({{ count }})
     </h2>
 
-    {% include 'settings/invite_request_filters.html' %}
+    {% include 'settings/invites/invite_request_filters.html' %}
 
     <table class="table is-striped is-fullwidth">
         {% url 'settings-invite-requests' as url %}
diff --git a/bookwyrm/templates/settings/ip_blocklist/ip_blocklist.html b/bookwyrm/templates/settings/ip_blocklist/ip_blocklist.html
index c978c126..56a78ac1 100644
--- a/bookwyrm/templates/settings/ip_blocklist/ip_blocklist.html
+++ b/bookwyrm/templates/settings/ip_blocklist/ip_blocklist.html
@@ -12,7 +12,7 @@
 {% endblock %}
 
 {% block panel %}
-{% include 'settings/ip_address_form.html' with controls_text="add_address" class="block" %}
+{% include 'settings/ip_blocklist/ip_address_form.html' with controls_text="add_address" class="block" %}
 
 <p class="notification block">
     {% trans "Any traffic from this IP address will get a 404 response when trying to access any part of the application." %}