diff --git a/files/assets/images/custombackgrounds/fantasy/1.gif b/files/assets/images/backgrounds/fantasy/1.gif
similarity index 100%
rename from files/assets/images/custombackgrounds/fantasy/1.gif
rename to files/assets/images/backgrounds/fantasy/1.gif
diff --git a/files/assets/images/custombackgrounds/fantasy/2.gif b/files/assets/images/backgrounds/fantasy/2.gif
similarity index 100%
rename from files/assets/images/custombackgrounds/fantasy/2.gif
rename to files/assets/images/backgrounds/fantasy/2.gif
diff --git a/files/assets/images/custombackgrounds/fantasy/3.gif b/files/assets/images/backgrounds/fantasy/3.gif
similarity index 100%
rename from files/assets/images/custombackgrounds/fantasy/3.gif
rename to files/assets/images/backgrounds/fantasy/3.gif
diff --git a/files/assets/images/custombackgrounds/fantasy/4.gif b/files/assets/images/backgrounds/fantasy/4.gif
similarity index 100%
rename from files/assets/images/custombackgrounds/fantasy/4.gif
rename to files/assets/images/backgrounds/fantasy/4.gif
diff --git a/files/assets/images/custombackgrounds/fantasy/5.gif b/files/assets/images/backgrounds/fantasy/5.gif
similarity index 100%
rename from files/assets/images/custombackgrounds/fantasy/5.gif
rename to files/assets/images/backgrounds/fantasy/5.gif
diff --git a/files/assets/images/custombackgrounds/pixelart/1.gif b/files/assets/images/backgrounds/pixelart/1.gif
similarity index 100%
rename from files/assets/images/custombackgrounds/pixelart/1.gif
rename to files/assets/images/backgrounds/pixelart/1.gif
diff --git a/files/assets/images/custombackgrounds/pixelart/2.gif b/files/assets/images/backgrounds/pixelart/2.gif
similarity index 100%
rename from files/assets/images/custombackgrounds/pixelart/2.gif
rename to files/assets/images/backgrounds/pixelart/2.gif
diff --git a/files/assets/images/custombackgrounds/pixelart/3.gif b/files/assets/images/backgrounds/pixelart/3.gif
similarity index 100%
rename from files/assets/images/custombackgrounds/pixelart/3.gif
rename to files/assets/images/backgrounds/pixelart/3.gif
diff --git a/files/assets/images/custombackgrounds/pixelart/4.gif b/files/assets/images/backgrounds/pixelart/4.gif
similarity index 100%
rename from files/assets/images/custombackgrounds/pixelart/4.gif
rename to files/assets/images/backgrounds/pixelart/4.gif
diff --git a/files/assets/images/custombackgrounds/pixelart/5.gif b/files/assets/images/backgrounds/pixelart/5.gif
similarity index 100%
rename from files/assets/images/custombackgrounds/pixelart/5.gif
rename to files/assets/images/backgrounds/pixelart/5.gif
diff --git a/files/assets/images/custombackgrounds/solarpunk/1.gif b/files/assets/images/backgrounds/solarpunk/1.gif
similarity index 100%
rename from files/assets/images/custombackgrounds/solarpunk/1.gif
rename to files/assets/images/backgrounds/solarpunk/1.gif
diff --git a/files/assets/images/custombackgrounds/solarpunk/10.gif b/files/assets/images/backgrounds/solarpunk/10.gif
similarity index 100%
rename from files/assets/images/custombackgrounds/solarpunk/10.gif
rename to files/assets/images/backgrounds/solarpunk/10.gif
diff --git a/files/assets/images/custombackgrounds/solarpunk/11.gif b/files/assets/images/backgrounds/solarpunk/11.gif
similarity index 100%
rename from files/assets/images/custombackgrounds/solarpunk/11.gif
rename to files/assets/images/backgrounds/solarpunk/11.gif
diff --git a/files/assets/images/custombackgrounds/solarpunk/12.gif b/files/assets/images/backgrounds/solarpunk/12.gif
similarity index 100%
rename from files/assets/images/custombackgrounds/solarpunk/12.gif
rename to files/assets/images/backgrounds/solarpunk/12.gif
diff --git a/files/assets/images/custombackgrounds/solarpunk/13.gif b/files/assets/images/backgrounds/solarpunk/13.gif
similarity index 100%
rename from files/assets/images/custombackgrounds/solarpunk/13.gif
rename to files/assets/images/backgrounds/solarpunk/13.gif
diff --git a/files/assets/images/custombackgrounds/solarpunk/14.gif b/files/assets/images/backgrounds/solarpunk/14.gif
similarity index 100%
rename from files/assets/images/custombackgrounds/solarpunk/14.gif
rename to files/assets/images/backgrounds/solarpunk/14.gif
diff --git a/files/assets/images/custombackgrounds/solarpunk/15.gif b/files/assets/images/backgrounds/solarpunk/15.gif
similarity index 100%
rename from files/assets/images/custombackgrounds/solarpunk/15.gif
rename to files/assets/images/backgrounds/solarpunk/15.gif
diff --git a/files/assets/images/custombackgrounds/solarpunk/16.gif b/files/assets/images/backgrounds/solarpunk/16.gif
similarity index 100%
rename from files/assets/images/custombackgrounds/solarpunk/16.gif
rename to files/assets/images/backgrounds/solarpunk/16.gif
diff --git a/files/assets/images/custombackgrounds/solarpunk/17.gif b/files/assets/images/backgrounds/solarpunk/17.gif
similarity index 100%
rename from files/assets/images/custombackgrounds/solarpunk/17.gif
rename to files/assets/images/backgrounds/solarpunk/17.gif
diff --git a/files/assets/images/custombackgrounds/solarpunk/18.gif b/files/assets/images/backgrounds/solarpunk/18.gif
similarity index 100%
rename from files/assets/images/custombackgrounds/solarpunk/18.gif
rename to files/assets/images/backgrounds/solarpunk/18.gif
diff --git a/files/assets/images/custombackgrounds/solarpunk/19.gif b/files/assets/images/backgrounds/solarpunk/19.gif
similarity index 100%
rename from files/assets/images/custombackgrounds/solarpunk/19.gif
rename to files/assets/images/backgrounds/solarpunk/19.gif
diff --git a/files/assets/images/custombackgrounds/solarpunk/2.gif b/files/assets/images/backgrounds/solarpunk/2.gif
similarity index 100%
rename from files/assets/images/custombackgrounds/solarpunk/2.gif
rename to files/assets/images/backgrounds/solarpunk/2.gif
diff --git a/files/assets/images/custombackgrounds/solarpunk/3.gif b/files/assets/images/backgrounds/solarpunk/3.gif
similarity index 100%
rename from files/assets/images/custombackgrounds/solarpunk/3.gif
rename to files/assets/images/backgrounds/solarpunk/3.gif
diff --git a/files/assets/images/custombackgrounds/solarpunk/4.gif b/files/assets/images/backgrounds/solarpunk/4.gif
similarity index 100%
rename from files/assets/images/custombackgrounds/solarpunk/4.gif
rename to files/assets/images/backgrounds/solarpunk/4.gif
diff --git a/files/assets/images/custombackgrounds/solarpunk/5.gif b/files/assets/images/backgrounds/solarpunk/5.gif
similarity index 100%
rename from files/assets/images/custombackgrounds/solarpunk/5.gif
rename to files/assets/images/backgrounds/solarpunk/5.gif
diff --git a/files/assets/images/custombackgrounds/solarpunk/6.gif b/files/assets/images/backgrounds/solarpunk/6.gif
similarity index 100%
rename from files/assets/images/custombackgrounds/solarpunk/6.gif
rename to files/assets/images/backgrounds/solarpunk/6.gif
diff --git a/files/assets/images/custombackgrounds/solarpunk/7.gif b/files/assets/images/backgrounds/solarpunk/7.gif
similarity index 100%
rename from files/assets/images/custombackgrounds/solarpunk/7.gif
rename to files/assets/images/backgrounds/solarpunk/7.gif
diff --git a/files/assets/images/custombackgrounds/solarpunk/8.gif b/files/assets/images/backgrounds/solarpunk/8.gif
similarity index 100%
rename from files/assets/images/custombackgrounds/solarpunk/8.gif
rename to files/assets/images/backgrounds/solarpunk/8.gif
diff --git a/files/assets/images/custombackgrounds/solarpunk/9.gif b/files/assets/images/backgrounds/solarpunk/9.gif
similarity index 100%
rename from files/assets/images/custombackgrounds/solarpunk/9.gif
rename to files/assets/images/backgrounds/solarpunk/9.gif
diff --git a/files/templates/default.html b/files/templates/default.html
index d16b47344..9fc87f5a2 100644
--- a/files/templates/default.html
+++ b/files/templates/default.html
@@ -1001,7 +1001,7 @@
 
  </head>
 
- <body id="{% if request.path != '/comments' %}{% block pagetype %}frontpage{% endblock %}{% endif %}" style="overflow-x: hidden; {% if v and v.background %} background:url(/assets/images/custombackgrounds/{{v.background}}.gif){% endif %} no-repeat center center fixed">
+ <body id="{% if request.path != '/comments' %}{% block pagetype %}frontpage{% endblock %}{% endif %}" style="overflow-x: hidden; {% if v and v.background %} background:url(/assets/images/backgrounds/{{v.background}}.gif){% endif %} no-repeat center center fixed">
 
 <a href="https://secure.transequality.org/site/Donation2?df_id=1480"><img src="/assets/images/banner.png" width="100%"></a>
 
diff --git a/files/templates/settings.html b/files/templates/settings.html
index 02ff6a4e1..16985e09a 100644
--- a/files/templates/settings.html
+++ b/files/templates/settings.html
@@ -87,7 +87,7 @@
 	</script>
 </head>
 
-<body id="settings" style="overflow-x: hidden; {% if v and v.background %} background:url(/assets/images/custombackgrounds/{{v.background}}.gif){% endif %} no-repeat center center fixed">
+<body id="settings" style="overflow-x: hidden; {% if v and v.background %} background:url(/assets/images/backgrounds/{{v.background}}.gif){% endif %} no-repeat center center fixed">
 
 	{% include "header.html" %}
 	<!-- Page Content -->
diff --git a/files/templates/settings2.html b/files/templates/settings2.html
index adbb8dff3..13aaf3cd9 100644
--- a/files/templates/settings2.html
+++ b/files/templates/settings2.html
@@ -57,7 +57,7 @@
 
 </head>
 
-<body id="settings-guild" style="overflow-x: hidden; {% if v and v.background %} background:url(/assets/images/custombackgrounds/{{v.background}}.gif){% endif %} no-repeat center center fixed">
+<body id="settings-guild" style="overflow-x: hidden; {% if v and v.background %} background:url(/assets/images/backgrounds/{{v.background}}.gif){% endif %} no-repeat center center fixed">
 
 	{% include "header.html" %}
 
diff --git a/files/templates/settings_profile.html b/files/templates/settings_profile.html
index 9797db962..d01c4178c 100644
--- a/files/templates/settings_profile.html
+++ b/files/templates/settings_profile.html
@@ -145,7 +145,7 @@
 							let bgsDir = backgrounds[bgselector.selectedIndex].folder;
 							for (i=0; i < bgsToDisplay.length; i++) {
 								let onclickPost = bgsDir + "/" + bgsToDisplay[i];
-								str += `<button class="btn btn-secondary m-1 p-0" style="width:15rem; overflow: hidden;"><img style="padding:0.25rem; width: 15rem" src="/assets/images/custombackgrounds/${bgsDir}/${bgsToDisplay[i]}" alt="${bgsToDisplay[i]}-background" onclick="post('/settings/profile?background=${onclickPost}', function(){window.location.reload(true);})"/></button>`;
+								str += `<button class="btn btn-secondary m-1 p-0" style="width:15rem; overflow: hidden;"><img style="padding:0.25rem; width: 15rem" src="/assets/images/backgrounds/${bgsDir}/${bgsToDisplay[i]}" alt="${bgsToDisplay[i]}-background" onclick="post('/settings/profile?background=${onclickPost}', function(){window.location.reload(true);})"/></button>`;
 							}
 							bgContainer.innerHTML = str;
 						}
diff --git a/files/templates/submit.html b/files/templates/submit.html
index 19fd6a1ea..49dd1c0c6 100644
--- a/files/templates/submit.html
+++ b/files/templates/submit.html
@@ -286,7 +286,7 @@
 
 </head>
 
-<body id="submit" style="overflow-x: hidden; {% if v and v.background %} background:url(/assets/images/custombackgrounds/{{v.background}}.gif){% endif %} no-repeat center center fixed">
+<body id="submit" style="overflow-x: hidden; {% if v and v.background %} background:url(/assets/images/backgrounds/{{v.background}}.gif){% endif %} no-repeat center center fixed">
 
 		<!-- Navigation -->
 		{% include "header.html" %}