diff --git a/files/templates/settings/advanced.html b/files/templates/settings/advanced.html
index 7f9a46378..050572447 100644
--- a/files/templates/settings/advanced.html
+++ b/files/templates/settings/advanced.html
@@ -1,4 +1,4 @@
-{% extends "settings.html" %}
+{% extends "settings/settings.html" %}
 {% block pagetitle %}Advanced Settings{% endblock %}
 {% block content %}
 	<div class="row settings-page" id="settings-page-advanced">
diff --git a/files/templates/settings/apps.html b/files/templates/settings/apps.html
index 86501dcf0..01d92af65 100644
--- a/files/templates/settings/apps.html
+++ b/files/templates/settings/apps.html
@@ -1,4 +1,4 @@
-{% extends "settings.html" %}
+{% extends "settings/settings.html" %}
 {% block pagetitle %}Apps/Bots{% endblock %}
 {% block content %}
 	<div class="row">
diff --git a/files/templates/settings/css.html b/files/templates/settings/css.html
index a53866a2c..d0ca311cf 100644
--- a/files/templates/settings/css.html
+++ b/files/templates/settings/css.html
@@ -1,4 +1,4 @@
-{% extends "settings.html" %}
+{% extends "settings/settings.html" %}
 {% block pagetitle %}Custom CSS{% endblock %}
 {% block content %}
 	<div class="row">
diff --git a/files/templates/settings/personal.html b/files/templates/settings/personal.html
index 6bd8b2f99..408ecd4bb 100644
--- a/files/templates/settings/personal.html
+++ b/files/templates/settings/personal.html
@@ -1,4 +1,4 @@
-{% extends "settings.html" %}
+{% extends "settings/settings.html" %}
 {% block pagetitle %}Personal Settings{% endblock %}
 {% block content %}
 	<div class="row settings-page" id="settings-page-personal">
diff --git a/files/templates/settings/security.html b/files/templates/settings/security.html
index 5c5a1b7a6..bd8d78d2d 100644
--- a/files/templates/settings/security.html
+++ b/files/templates/settings/security.html
@@ -1,4 +1,4 @@
-{% extends "settings.html" %}
+{% extends "settings/settings.html" %}
 {% block pagetitle %}Security Settings{% endblock %}
 {% block content %}
 	<script defer src="{{'js/settings_security.js' | asset}}"></script>
diff --git a/files/templates/settings.html b/files/templates/settings/settings.html
similarity index 100%
rename from files/templates/settings.html
rename to files/templates/settings/settings.html