diff --git a/files/routes/static.py b/files/routes/static.py
index 43fd269aa..4b95065a4 100644
--- a/files/routes/static.py
+++ b/files/routes/static.py
@@ -155,7 +155,7 @@ def static_service(path):
 	resp = make_response(send_from_directory('./assets', path))
 	if request.path.endswith('.gif') or request.path.endswith('.ttf') or request.path.endswith('.woff') or request.path.endswith('.woff2'):
 		resp.headers.remove("Cache-Control")
-		resp.headers.add("Cache-Control", "public, max-age=31556952")
+		resp.headers.add("Cache-Control", "public, max-age=2628000")
 
 	return resp
 
diff --git a/files/templates/default.html b/files/templates/default.html
index 11f3c2b15..47a11b314 100644
--- a/files/templates/default.html
+++ b/files/templates/default.html
@@ -1129,7 +1129,7 @@
 
 {% include "expanded_image_modal.html" %}
 
-<script src="/assets/js/generaljs.js"></script>
+<script src="/assets/js/ilovemarsey.js"></script>
 
 <!-- ClipboardJS -->
 
diff --git a/files/templates/formatting.html b/files/templates/formatting.html
index 327245bba..cb43904cd 100644
--- a/files/templates/formatting.html
+++ b/files/templates/formatting.html
@@ -145,6 +145,6 @@ We also have some custom hooks for mentioning users and subreddits. Note that th
 {% include "expanded_image_modal.html" %}
 {% include "expanded_video_modal.html" %}
 
-<script src="/assets/js/generaljs.js"></script>
+<script src="/assets/js/ilovemarsey.js"></script>
 
 {% endblock %}
diff --git a/files/templates/login.html b/files/templates/login.html
index 0b16dd615..192f8109f 100644
--- a/files/templates/login.html
+++ b/files/templates/login.html
@@ -130,7 +130,7 @@
 
 {% include "bootstrap.html" %}
 
-<script src="/assets/js/generaljs.js"></script>
+<script src="/assets/js/ilovemarsey.js"></script>
 
 </body>
 
diff --git a/files/templates/settings.html b/files/templates/settings.html
index 93deded5d..b8718405a 100644
--- a/files/templates/settings.html
+++ b/files/templates/settings.html
@@ -254,7 +254,7 @@
 	</div>
 </div>
 
-<script src="/assets/js/generaljs.js"></script>
+<script src="/assets/js/ilovemarsey.js"></script>
 
 {% block onload %}{% endblock %}
 
diff --git a/files/templates/settings2.html b/files/templates/settings2.html
index 54af7e798..423cc64b3 100644
--- a/files/templates/settings2.html
+++ b/files/templates/settings2.html
@@ -226,7 +226,7 @@
 	});
 </script>
 
-<script src="/assets/js/generaljs.js"></script>
+<script src="/assets/js/ilovemarsey.js"></script>
 
 	{% block scripts %}
 	{% endblock %}
diff --git a/files/templates/sign_up.html b/files/templates/sign_up.html
index 648799d2d..3114b4c34 100644
--- a/files/templates/sign_up.html
+++ b/files/templates/sign_up.html
@@ -225,7 +225,7 @@
 
 <!-- {{'SITE_NAME' | app_config}} JS -->
 
-<script src="/assets/js/generaljs.js"></script>
+<script src="/assets/js/ilovemarsey.js"></script>
 
 </body>
 
diff --git a/files/templates/sign_up_failed_ref.html b/files/templates/sign_up_failed_ref.html
index 44866f42b..2dc5cb5d2 100644
--- a/files/templates/sign_up_failed_ref.html
+++ b/files/templates/sign_up_failed_ref.html
@@ -144,7 +144,7 @@
 
 <!-- {{'SITE_NAME' | app_config}} JS -->
 
-<script src="/assets/js/generaljs.js"></script>
+<script src="/assets/js/ilovemarsey.js"></script>
 
 </body>
 
diff --git a/files/templates/submit.html b/files/templates/submit.html
index 3012d61f8..f30d750fa 100644
--- a/files/templates/submit.html
+++ b/files/templates/submit.html
@@ -409,7 +409,7 @@
 
 		<!-- {{'SITE_NAME' | app_config}} JS -->
 
-		<script src="/assets/js/generaljs.js"></script>
+		<script src="/assets/js/ilovemarsey.js"></script>
 
 		<!-- ClipboardJS -->