diff --git a/files/assets/images/emojis/marseybattered.gif b/files/assets/images/emojis/marseybattered.gif
new file mode 100644
index 000000000..3b9722120
Binary files /dev/null and b/files/assets/images/emojis/marseybattered.gif differ
diff --git a/files/assets/images/emojis/marseybiden.gif b/files/assets/images/emojis/marseybiden.gif
new file mode 100644
index 000000000..2fb432c8d
Binary files /dev/null and b/files/assets/images/emojis/marseybiden.gif differ
diff --git a/files/assets/images/emojis/marseyboomer.gif b/files/assets/images/emojis/marseyboomer.gif
new file mode 100644
index 000000000..34064b24b
Binary files /dev/null and b/files/assets/images/emojis/marseyboomer.gif differ
diff --git a/files/assets/images/emojis/marseybrainlet.gif b/files/assets/images/emojis/marseybrainlet.gif
new file mode 100644
index 000000000..124ebceb5
Binary files /dev/null and b/files/assets/images/emojis/marseybrainlet.gif differ
diff --git a/files/assets/images/emojis/marseybush.gif b/files/assets/images/emojis/marseybush.gif
new file mode 100644
index 000000000..6df2a0d63
Binary files /dev/null and b/files/assets/images/emojis/marseybush.gif differ
diff --git a/files/assets/images/emojis/marseycamus.gif b/files/assets/images/emojis/marseycamus.gif
new file mode 100644
index 000000000..3241ee7f0
Binary files /dev/null and b/files/assets/images/emojis/marseycamus.gif differ
diff --git a/files/assets/images/emojis/marseycarp.gif b/files/assets/images/emojis/marseycarp.gif
new file mode 100644
index 000000000..183baf5c6
Binary files /dev/null and b/files/assets/images/emojis/marseycarp.gif differ
diff --git a/files/assets/images/emojis/marseychef.gif b/files/assets/images/emojis/marseychef.gif
new file mode 100644
index 000000000..8bd6f7b92
Binary files /dev/null and b/files/assets/images/emojis/marseychef.gif differ
diff --git a/files/assets/images/emojis/marseyclown.gif b/files/assets/images/emojis/marseyclown.gif
new file mode 100644
index 000000000..1996fbf80
Binary files /dev/null and b/files/assets/images/emojis/marseyclown.gif differ
diff --git a/files/assets/images/emojis/marseycop.gif b/files/assets/images/emojis/marseycop.gif
new file mode 100644
index 000000000..45b62755f
Binary files /dev/null and b/files/assets/images/emojis/marseycop.gif differ
diff --git a/files/assets/images/emojis/marseycorn.gif b/files/assets/images/emojis/marseycorn.gif
new file mode 100644
index 000000000..5da128358
Binary files /dev/null and b/files/assets/images/emojis/marseycorn.gif differ
diff --git a/files/assets/images/emojis/marseycwc.gif b/files/assets/images/emojis/marseycwc.gif
new file mode 100644
index 000000000..c0e1846ed
Binary files /dev/null and b/files/assets/images/emojis/marseycwc.gif differ
diff --git a/files/assets/images/emojis/marseydrunk.gif b/files/assets/images/emojis/marseydrunk.gif
new file mode 100644
index 000000000..3f83945f8
Binary files /dev/null and b/files/assets/images/emojis/marseydrunk.gif differ
diff --git a/files/assets/images/emojis/marseydynamite.gif b/files/assets/images/emojis/marseydynamite.gif
new file mode 100644
index 000000000..a4265f426
Binary files /dev/null and b/files/assets/images/emojis/marseydynamite.gif differ
diff --git a/files/assets/images/emojis/marseyfamily.gif b/files/assets/images/emojis/marseyfamily.gif
new file mode 100644
index 000000000..d2c68fdb2
Binary files /dev/null and b/files/assets/images/emojis/marseyfamily.gif differ
diff --git a/files/assets/images/emojis/marseyfbi.gif b/files/assets/images/emojis/marseyfbi.gif
new file mode 100644
index 000000000..d1e35a5c5
Binary files /dev/null and b/files/assets/images/emojis/marseyfbi.gif differ
diff --git a/files/assets/images/emojis/marseyfeet.gif b/files/assets/images/emojis/marseyfeet.gif
new file mode 100644
index 000000000..aa479194d
Binary files /dev/null and b/files/assets/images/emojis/marseyfeet.gif differ
diff --git a/files/assets/images/emojis/marseyfeminist.gif b/files/assets/images/emojis/marseyfeminist.gif
new file mode 100644
index 000000000..7bdb0d04e
Binary files /dev/null and b/files/assets/images/emojis/marseyfeminist.gif differ
diff --git a/files/assets/images/emojis/marseyflamethrower.gif b/files/assets/images/emojis/marseyflamethrower.gif
new file mode 100644
index 000000000..24fd12aaa
Binary files /dev/null and b/files/assets/images/emojis/marseyflamethrower.gif differ
diff --git a/files/assets/images/emojis/marseyghost.gif b/files/assets/images/emojis/marseyghost.gif
new file mode 100644
index 000000000..8153419a2
Binary files /dev/null and b/files/assets/images/emojis/marseyghost.gif differ
diff --git a/files/assets/images/emojis/marseygigaretard.gif b/files/assets/images/emojis/marseygigaretard.gif
new file mode 100644
index 000000000..d91281541
Binary files /dev/null and b/files/assets/images/emojis/marseygigaretard.gif differ
diff --git a/files/assets/images/emojis/marseygigavaxxer.gif b/files/assets/images/emojis/marseygigavaxxer.gif
new file mode 100644
index 000000000..702b56592
Binary files /dev/null and b/files/assets/images/emojis/marseygigavaxxer.gif differ
diff --git a/files/assets/images/emojis/marseygodfather.gif b/files/assets/images/emojis/marseygodfather.gif
new file mode 100644
index 000000000..3d104c0dd
Binary files /dev/null and b/files/assets/images/emojis/marseygodfather.gif differ
diff --git a/files/assets/images/emojis/marseygrass.gif b/files/assets/images/emojis/marseygrass.gif
new file mode 100644
index 000000000..401b5f677
Binary files /dev/null and b/files/assets/images/emojis/marseygrass.gif differ
diff --git a/files/assets/images/emojis/marseyilluminati.gif b/files/assets/images/emojis/marseyilluminati.gif
new file mode 100644
index 000000000..29db5f17e
Binary files /dev/null and b/files/assets/images/emojis/marseyilluminati.gif differ
diff --git a/files/assets/images/emojis/marseymyeisha.gif b/files/assets/images/emojis/marseymyeisha.gif
new file mode 100644
index 000000000..23441ad4e
Binary files /dev/null and b/files/assets/images/emojis/marseymyeisha.gif differ
diff --git a/files/assets/images/emojis/marseypharoh.gif b/files/assets/images/emojis/marseypharoh.gif
new file mode 100644
index 000000000..d0e83bd68
Binary files /dev/null and b/files/assets/images/emojis/marseypharoh.gif differ
diff --git a/files/assets/images/emojis/marseypinochet.gif b/files/assets/images/emojis/marseypinochet.gif
new file mode 100644
index 000000000..2ef42511f
Binary files /dev/null and b/files/assets/images/emojis/marseypinochet.gif differ
diff --git a/files/assets/images/emojis/marseypoggers.gif b/files/assets/images/emojis/marseypoggers.gif
new file mode 100644
index 000000000..433d46d49
Binary files /dev/null and b/files/assets/images/emojis/marseypoggers.gif differ
diff --git a/files/assets/images/emojis/marseyqoomer.gif b/files/assets/images/emojis/marseyqoomer.gif
new file mode 100644
index 000000000..904745e8b
Binary files /dev/null and b/files/assets/images/emojis/marseyqoomer.gif differ
diff --git a/files/assets/images/emojis/marseyradioactive.gif b/files/assets/images/emojis/marseyradioactive.gif
new file mode 100644
index 000000000..d50c96aae
Binary files /dev/null and b/files/assets/images/emojis/marseyradioactive.gif differ
diff --git a/files/assets/images/emojis/marseyshisha.gif b/files/assets/images/emojis/marseyshisha.gif
new file mode 100644
index 000000000..7ba287b6f
Binary files /dev/null and b/files/assets/images/emojis/marseyshisha.gif differ
diff --git a/files/assets/images/emojis/marseystroke.gif b/files/assets/images/emojis/marseystroke.gif
new file mode 100644
index 000000000..568bfb9bb
Binary files /dev/null and b/files/assets/images/emojis/marseystroke.gif differ
diff --git a/files/assets/images/emojis/marseytea.gif b/files/assets/images/emojis/marseytea.gif
new file mode 100644
index 000000000..aa6deffe4
Binary files /dev/null and b/files/assets/images/emojis/marseytea.gif differ
diff --git a/files/assets/images/emojis/marseytrans2.gif b/files/assets/images/emojis/marseytrans2.gif
new file mode 100644
index 000000000..c4b42be47
Binary files /dev/null and b/files/assets/images/emojis/marseytrans2.gif differ
diff --git a/files/assets/images/emojis/marseytwerk.gif b/files/assets/images/emojis/marseytwerk.gif
new file mode 100644
index 000000000..5bb83ba1f
Binary files /dev/null and b/files/assets/images/emojis/marseytwerk.gif differ
diff --git a/files/assets/images/emojis/marseyzoomer.gif b/files/assets/images/emojis/marseyzoomer.gif
new file mode 100644
index 000000000..1c2040134
Binary files /dev/null and b/files/assets/images/emojis/marseyzoomer.gif differ
diff --git a/files/assets/images/emojis/marseyzwei.gif b/files/assets/images/emojis/marseyzwei.gif
new file mode 100644
index 000000000..9c15843f1
Binary files /dev/null and b/files/assets/images/emojis/marseyzwei.gif differ
diff --git a/files/assets/js/generaljs.js b/files/assets/js/ilovemarsey.js
similarity index 92%
rename from files/assets/js/generaljs.js
rename to files/assets/js/ilovemarsey.js
index 3ad413727..e929f1b75 100644
--- a/files/assets/js/generaljs.js
+++ b/files/assets/js/ilovemarsey.js
@@ -40,7 +40,7 @@ document.body.addEventListener('keydown', function(event) {
const emojis = [
{
type:'marsey',
- emojis: ['marseyjam','marseyhmm','marseyhmmm','marseythonk','marseyworried','marseysus','marsey420','marsey4chan','marseyandmarcus','marseybluecheck','marseybong','marseybooba','marseybride','marseychonker','marseyconfused','marseydespair','marseyjunkie','marseylizard','marseylolcow','marseymommy','marseyneckbeard','marseyowow','marseyproctologist','marseyrealwork','marseyrowling','marseyschizo','marseyspider','marseyuwuw','marseyvaxmaxx','marseyxd','marsoyhype','marmsey','marsey1984','marseyakshually','marseycanned','marseycoomer','marseycope','marseycumjar1','marseycumjar2','marseycumjar3','marseydeux','marseydoomer','marseyflamewar','marseyfug','marseygasp','marseyglow','marseygoodnight','marseyhacker','marseyking','marseylawlz','marseylifting','marseymanlet','marseymaoist','marseymouse','marseyniqab','marseynpc','marseyorthodox','marseypainter','marseypeacekeeper','marseypickle','marseypipe','marseypirate','marseypope','marseyrat','marseyrick','marseyrope','marseyseethe','marseysneed','marseysociety','marseysrdine','marseytaliban','marseytank','marseytankushanka','marseytrans','marseytroll','marseyunabomber','marseyvan','marseyyeezus','marsoy','marseyasian','marseyblm','marseyburger','marseydildo','marseyfacepalm','marseygrilling','marseyjanny','marseymermaid','marseyrentfree','marseyretard','marseysadcat','marseysick','marseysmug','marseytrain', 'marseysipping', 'marseyjamming','marseyangel','marseyblowkiss','marseycry','marseydead','marseyexcited','marseygift','marseyinabox','marseylaugh','marseylove','marseymad','marseyparty','marseyrain','marseyreading','marseyready','marseysad','marseyscarf','marseyshook','marseysleep','marseythumbsup','marseywave', 'marsey69', 'marseycomrade', 'marseyira', 'marseyisis', 'marseymerchant', 'marseynut', 'marseyreich', 'marseyglam', 'marseycowboy', 'marseypat', 'marseypanties', 'marseybingus', 'marseydepressed']
+ emojis: ['marseybattered','marseybiden','marseyboomer','marseybrainlet','marseybush','marseycamus','marseycarp','marseychef','marseyclown','marseycop','marseycorn','marseycwc','marseydrunk','marseydynamite','marseyfamily','marseyfbi','marseyfeet','marseyfeminist','marseyflamethrower','marseyghost','marseygigaretard','marseygigavaxxer','marseygodfather','marseygrass','marseyilluminati','marseymyeisha','marseypharoh','marseypinochet','marseypoggers','marseyqoomer','marseyradioactive','marseyshisha','marseystroke','marseytea','marseytrans2','marseytwerk','marseyzoomer','marseyzwei','marseyjam','marseyhmm','marseyhmmm','marseythonk','marseyworried','marseysus','marsey420','marsey4chan','marseyandmarcus','marseybluecheck','marseybong','marseybooba','marseybride','marseychonker','marseyconfused','marseydespair','marseyjunkie','marseylizard','marseylolcow','marseymommy','marseyneckbeard','marseyowow','marseyproctologist','marseyrealwork','marseyrowling','marseyschizo','marseyspider','marseyuwuw','marseyvaxmaxx','marseyxd','marsoyhype','marmsey','marsey1984','marseyakshually','marseycanned','marseycoomer','marseycope','marseycumjar1','marseycumjar2','marseycumjar3','marseydeux','marseydoomer','marseyflamewar','marseyfug','marseygasp','marseyglow','marseygoodnight','marseyhacker','marseyking','marseylawlz','marseylifting','marseymanlet','marseymaoist','marseymouse','marseyniqab','marseynpc','marseyorthodox','marseypainter','marseypeacekeeper','marseypickle','marseypipe','marseypirate','marseypope','marseyrat','marseyrick','marseyrope','marseyseethe','marseysneed','marseysociety','marseysrdine','marseytaliban','marseytank','marseytankushanka','marseytrans','marseytroll','marseyunabomber','marseyvan','marseyyeezus','marsoy','marseyasian','marseyblm','marseyburger','marseydildo','marseyfacepalm','marseygrilling','marseyjanny','marseymermaid','marseyrentfree','marseyretard','marseysadcat','marseysick','marseysmug','marseytrain', 'marseysipping', 'marseyjamming','marseyangel','marseyblowkiss','marseycry','marseydead','marseyexcited','marseygift','marseyinabox','marseylaugh','marseylove','marseymad','marseyparty','marseyrain','marseyreading','marseyready','marseysad','marseyscarf','marseyshook','marseysleep','marseythumbsup','marseywave', 'marsey69', 'marseycomrade', 'marseyira', 'marseyisis', 'marseymerchant', 'marseynut', 'marseyreich', 'marseyglam', 'marseycowboy', 'marseypat', 'marseypanties', 'marseybingus', 'marseydepressed']
},
{
type:'platy',
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" %}
-
+
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" %}
-
+
{% 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" %}
-
+
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 @@
-