diff --git a/files/assets/css/main.css b/files/assets/css/main.css
index d96e56f0e..48a8c4d5b 100644
--- a/files/assets/css/main.css
+++ b/files/assets/css/main.css
@@ -4527,6 +4527,7 @@ blockquote p {
     border-radius: 0.2rem !important;
     margin-top: 0.5rem !important;
     margin-bottom: 0.5rem !important;
+    cursor: pointer;
 }
 .embedvid {
     max-height: 20rem !important;
diff --git a/files/assets/images/emojis/marseycope.webp b/files/assets/images/emojis/marseycope.webp
index be62d976d..d71936de3 100644
Binary files a/files/assets/images/emojis/marseycope.webp and b/files/assets/images/emojis/marseycope.webp differ
diff --git a/files/assets/images/emojis/marseyflamewar.webp b/files/assets/images/emojis/marseyflamewar.webp
index 3911c4962..f5e88dd4f 100644
Binary files a/files/assets/images/emojis/marseyflamewar.webp and b/files/assets/images/emojis/marseyflamewar.webp differ
diff --git a/files/assets/images/emojis/marseyrope.webp b/files/assets/images/emojis/marseyrope.webp
index 5674b4a91..63c9187aa 100644
Binary files a/files/assets/images/emojis/marseyrope.webp and b/files/assets/images/emojis/marseyrope.webp differ
diff --git a/files/assets/images/emojis/marseyseethe.webp b/files/assets/images/emojis/marseyseethe.webp
index 38cf4e937..8222a3a6e 100644
Binary files a/files/assets/images/emojis/marseyseethe.webp and b/files/assets/images/emojis/marseyseethe.webp differ
diff --git a/files/helpers/alerts.py b/files/helpers/alerts.py
index 30c93a75b..c23585beb 100644
--- a/files/helpers/alerts.py
+++ b/files/helpers/alerts.py
@@ -61,25 +61,6 @@ def add_notif(cid, uid):
 		g.db.add(notif)
 
 
-def send_admin(vid, text):
-
-	text_html = sanitize(text, noimages=True)
-
-	new_comment = Comment(author_id=vid,
-						  parent_submission=None,
-						  level=1,
-						  sentto=0,
-						  body_html=text_html,
-						  )
-	g.db.add(new_comment)
-	g.db.flush()
-
-	admins = g.db.query(User).filter(User.admin_level > 2).all()
-	for admin in admins:
-		notif = Notification(comment_id=new_comment.id, user_id=admin.id)
-		g.db.add(notif)
-
-
 def NOTIFY_USERS(text, v):
 	notify_users = set()
 	for word, id in NOTIFIED_USERS.items():
diff --git a/files/helpers/sanitize.py b/files/helpers/sanitize.py
index 866233edc..602dc0fdb 100644
--- a/files/helpers/sanitize.py
+++ b/files/helpers/sanitize.py
@@ -154,22 +154,14 @@ def sanitize(sanitized, noimages=False, alert=False, comment=False):
 	for tag in soup.find_all("img"):
 
 		if tag.get("src") and "pp20" not in tag.get("class", ""):
-
-			if site not in tag["src"] and not tag["src"].startswith('/'): tag["rel"] = "nofollow noopener noreferrer"
 			tag["class"] = "in-comment-image"
 			tag["loading"] = "lazy"
 			tag["data-src"] = tag["src"]
 			tag["src"] = "/static/assets/images/loading.webp"
 			tag['alt'] = f'![]({tag["data-src"]})'
-
-			link = soup.new_tag("a")
-			link["href"] = tag["data-src"]
-			if site not in link["href"] and not link["href"].startswith('/'): link["rel"] = "nofollow noopener noreferrer"
-			link["onclick"] = f"expandDesktopImage('{tag['data-src']}');"
-			link["data-bs-toggle"] = "modal"
-			link["data-bs-target"] = "#expandImageModal"
-
-			tag.wrap(link)
+			tag["onclick"] = f"expandDesktopImage(this.data-src);"
+			tag["data-bs-toggle"] = "modal"
+			tag["data-bs-target"] = "#expandImageModal"
 
 	for tag in soup.find_all("a"):
 		if tag.get("href"):
diff --git a/files/routes/oauth.py b/files/routes/oauth.py
index b1377e3c2..e949ae1ba 100644
--- a/files/routes/oauth.py
+++ b/files/routes/oauth.py
@@ -50,7 +50,23 @@ def request_api_keys(v):
 
 	g.db.add(new_app)
 
-	send_admin(NOTIFICATIONS_ID, f"{v.username} has requested API keys for `{request.values.get('name')}`. You can approve or deny the request [here](/admin/apps).")
+	text = f"{v.username} has requested API keys for `{request.values.get('name')}`. You can approve or deny the request [here](/admin/apps)."
+
+	text_html = sanitize(text, noimages=True)
+
+	new_comment = Comment(author_id=NOTIFICATIONS_ID,
+						  parent_submission=None,
+						  level=1,
+						  sentto=0,
+						  body_html=text_html,
+						  )
+	g.db.add(new_comment)
+	g.db.flush()
+
+	admins = g.db.query(User).filter(User.admin_level > 2).all()
+	for admin in admins:
+		notif = Notification(comment_id=new_comment.id, user_id=admin.id)
+		g.db.add(notif)
 
 	g.db.commit()
 
diff --git a/files/routes/static.py b/files/routes/static.py
index aeb770871..7a8277a4b 100644
--- a/files/routes/static.py
+++ b/files/routes/static.py
@@ -280,8 +280,42 @@ def contact(v):
 @limiter.limit("6/hour")
 @auth_required
 def submit_contact(v):
-	message = f'This message has been sent automatically to all admins via [/contact](/contact), user email is "{v.email}"\n\nMessage:\n\n' + request.values.get("message", "")
-	send_admin(v.id, message)
+	body = request.values.get("message")
+	if not body: abort(400)
+
+	body = f'This message has been sent automatically to all admins via [/contact](/contact), user email is "{v.email}"\n\nMessage:\n\n' + body
+	body_html = sanitize(body, noimages=True)
+
+	if request.files.get("file") and request.headers.get("cf-ipcountry") != "T1":
+		file=request.files["file"]
+		if file.content_type.startswith('image/'):
+			name = f'/images/{time.time()}'.replace('.','')[:-5] + '.webp'
+			file.save(name)
+			url = process_image(name)
+			body_html += f'<img data-bs-target="#expandImageModal" data-bs-toggle="modal" onclick="expandDesktopImage(this.src)" class="in-comment-image" src="{url}" loading="lazy">'
+		elif file.content_type.startswith('video/'):
+			file.save("video.mp4")
+			with open("video.mp4", 'rb') as f:
+				try: url = requests.request("POST", "https://api.imgur.com/3/upload", headers={'Authorization': f'Client-ID {IMGUR_KEY}'}, files=[('video', f)]).json()['data']['link']
+				except: return {"error": "Imgur error"}, 400
+			if url.endswith('.'): url += 'mp4'
+			body_html += f"<p>{url}</p>"
+		else: return {"error": "Image/Video files only"}, 400
+
+	new_comment = Comment(author_id=v.id,
+						  parent_submission=None,
+						  level=1,
+						  sentto=0,
+						  body_html=body_html,
+						  )
+	g.db.add(new_comment)
+	g.db.flush()
+
+	admins = g.db.query(User).filter(User.admin_level > 2).all()
+	for admin in admins:
+		notif = Notification(comment_id=new_comment.id, user_id=admin.id)
+		g.db.add(notif)
+
 	g.db.commit()
 	if not v or v.oldsite: template = ''
 	else: template = 'CHRISTMAS/'
diff --git a/files/templates/authforms.html b/files/templates/authforms.html
index 4773cc642..c7fdb944d 100644
--- a/files/templates/authforms.html
+++ b/files/templates/authforms.html
@@ -15,7 +15,7 @@
 
 		{% if v %}
 			<style>:root{--primary:#{{v.themecolor}}}</style>
-			<link rel="stylesheet" href="/static/assets/css/main.css?a=75"><link rel="stylesheet" href="/static/assets/css/{{v.theme}}.css?a=11">
+			<link rel="stylesheet" href="/static/assets/css/main.css?a=76"><link rel="stylesheet" href="/static/assets/css/{{v.theme}}.css?a=11">
 			{% if v.agendaposter %}
 				<style>
 					html {
@@ -39,7 +39,7 @@
 			{% endif %}
 		{% else %}
 			<style>:root{--primary:#{{'DEFAULT_COLOR' | app_config}}</style>
-			<link rel="stylesheet" href="/static/assets/css/main.css?a=75"><link rel="stylesheet" href="/static/assets/css/{{'DEFAULT_THEME' | app_config}}.css?a=3">
+			<link rel="stylesheet" href="/static/assets/css/main.css?a=76"><link rel="stylesheet" href="/static/assets/css/{{'DEFAULT_THEME' | app_config}}.css?a=3">
 		{% endif %}
 
 </head>
diff --git a/files/templates/contact.html b/files/templates/contact.html
index 37219df8e..b86654f0e 100644
--- a/files/templates/contact.html
+++ b/files/templates/contact.html
@@ -26,13 +26,16 @@
 	<label class="mt-3">Your Email</label>
 	<input autocomplete="off" class="form-control" value="{{v.email}}" readonly="readonly" disabled>
 
-	<form id="contactform" action="/send_admin" method="post">
+	<form id="contactform" action="/send_admin" method="post" enctype="multipart/form-data">
 
 		<label for="input-message" class="mt-3">Your message</label>
 		<input autocomplete="off" type="hidden" name="formkey" value="{{v.formkey}}">
 		<textarea autocomplete="off" maxlength="10000" id="input-message" form="contactform" name="message" class="form-control" required></textarea>
+		<label class="btn btn-secondary m-0 mt-3" for="file-upload">
+			<div id="filename"><i class="far fa-image"></i></div>
+			<input autocomplete="off" id="file-upload" type="file" name="file" accept="image/*, video/*" {% if request.headers.get('cf-ipcountry')=="T1" %}disabled{% endif %} onchange="document.getElementById('filename').innerHTML='image/video';" hidden>
+		</label>
 		<input autocomplete="off" type="submit" value="Submit" class="btn btn-primary mt-3">
-
 	</form>
 
 	<pre>
diff --git a/files/templates/default.html b/files/templates/default.html
index 5dc108171..80b05d7f2 100644
--- a/files/templates/default.html
+++ b/files/templates/default.html
@@ -7,7 +7,7 @@
 	<script src="/static/assets/js/bootstrap.js?a=3"></script>
 	{% if v %}
 		<style>:root{--primary:#{{v.themecolor}}}</style>
-		<link rel="stylesheet" href="/static/assets/css/main.css?a=75">
+		<link rel="stylesheet" href="/static/assets/css/main.css?a=76">
 		<link rel="stylesheet" href="/static/assets/css/{{v.theme}}.css?a=11">
 		{% if v.agendaposter %}
 			<style>
@@ -32,7 +32,7 @@
 		{% endif %}
 	{% else %}
 		<style>:root{--primary:#{{'DEFAULT_COLOR' | app_config}}</style>
-		<link rel="stylesheet" href="/static/assets/css/main.css?a=75"><link rel="stylesheet" href="/static/assets/css/{{'DEFAULT_THEME' | app_config}}.css?a=3">
+		<link rel="stylesheet" href="/static/assets/css/main.css?a=76"><link rel="stylesheet" href="/static/assets/css/{{'DEFAULT_THEME' | app_config}}.css?a=3">
 	{% endif %}
 
 	<meta charset="utf-8">
diff --git a/files/templates/log.html b/files/templates/log.html
index 9a62d030f..8e0e484e2 100644
--- a/files/templates/log.html
+++ b/files/templates/log.html
@@ -6,7 +6,7 @@
 {% block content %}
 {% if v %}
 	<style>:root{--primary:#{{v.themecolor}}}</style>
-	<link rel="stylesheet" href="/static/assets/css/main.css?a=75"><link rel="stylesheet" href="/static/assets/css/{{v.theme}}.css?a=11">
+	<link rel="stylesheet" href="/static/assets/css/main.css?a=76"><link rel="stylesheet" href="/static/assets/css/{{v.theme}}.css?a=11">
 	{% if v.agendaposter %}
 		<style>
 			html {
@@ -30,7 +30,7 @@
 	{% endif %}
 {% else %}
 	<style>:root{--primary:#{{'DEFAULT_COLOR' | app_config}}</style>
-	<link rel="stylesheet" href="/static/assets/css/main.css?a=75"><link rel="stylesheet" href="/static/assets/css/{{'DEFAULT_THEME' | app_config}}.css?a=3">
+	<link rel="stylesheet" href="/static/assets/css/main.css?a=76"><link rel="stylesheet" href="/static/assets/css/{{'DEFAULT_THEME' | app_config}}.css?a=3">
 {% endif %}
 
 <div class="row justify-content-around">
diff --git a/files/templates/login.html b/files/templates/login.html
index 29177bf98..559d4d64b 100644
--- a/files/templates/login.html
+++ b/files/templates/login.html
@@ -18,7 +18,7 @@
 	{% endblock %}
 	
 	<style>:root{--primary:#{{'DEFAULT_COLOR' | app_config}}</style>
-	<link rel="stylesheet" href="/static/assets/css/main.css?a=75">
+	<link rel="stylesheet" href="/static/assets/css/main.css?a=76">
 	<link rel="stylesheet" href="/static/assets/css/{{'DEFAULT_THEME' | app_config}}.css?a=3">
 
 </head>
diff --git a/files/templates/login_2fa.html b/files/templates/login_2fa.html
index 87dd1e1a1..b000ef34f 100644
--- a/files/templates/login_2fa.html
+++ b/files/templates/login_2fa.html
@@ -14,7 +14,7 @@
 		<title>2-Step Login - {{SITE_NAME}}</title>
 
 		<style>:root{--primary:#{{'DEFAULT_COLOR' | app_config}}</style>
-		<link rel="stylesheet" href="/static/assets/css/main.css?a=75"><link rel="stylesheet" href="/static/assets/css/{{'DEFAULT_THEME' | app_config}}.css?a=3">
+		<link rel="stylesheet" href="/static/assets/css/main.css?a=76"><link rel="stylesheet" href="/static/assets/css/{{'DEFAULT_THEME' | app_config}}.css?a=3">
 
 </head>
 
diff --git a/files/templates/marseys.html b/files/templates/marseys.html
index c2314f24b..79ee459f8 100644
--- a/files/templates/marseys.html
+++ b/files/templates/marseys.html
@@ -19,7 +19,7 @@
 	<tr>
 		<td style="font-weight: bold">{{loop.index}}</td>
 		<td style="font-weight: bold">{{k[0]}}</td>
-		<td><img class="marsey" loading="lazy" data-bs-toggle="tooltip" alt=":{{k[0]}}:" title=":{{k[0]}}:" delay="0" src="/static/assets/images/emojis/{{k[0]}}.webp?a=1001" ></td>
+		<td><img class="marsey" loading="lazy" data-bs-toggle="tooltip" alt=":{{k[0]}}:" title=":{{k[0]}}:" delay="0" src="/static/assets/images/emojis/{{k[0]}}.webp?a=1002" ></td>
 		<td style="font-weight: bold">{{k[2]}}</td>
 		<td>{% if k[1] in ('anton-d','unknown') %}{{k[1]}}{% else %}<a style="font-weight:bold;" href="/@{{k[1]}}"><img alt="@{{k[1]}}'s profile picture" loading="lazy" src="/@{{k[1]}}/pic" class="pp20">{{k[1]}}</a>{% endif %}</td>
 	</tr>
diff --git a/files/templates/settings.html b/files/templates/settings.html
index 29bf472ba..bd45aebd9 100644
--- a/files/templates/settings.html
+++ b/files/templates/settings.html
@@ -34,7 +34,7 @@
 
 
 	<style>:root{--primary:#{{v.themecolor}}}</style>
-	<link rel="stylesheet" href="/static/assets/css/main.css?a=75"><link rel="stylesheet" href="/static/assets/css/{{v.theme}}.css?a=11">
+	<link rel="stylesheet" href="/static/assets/css/main.css?a=76"><link rel="stylesheet" href="/static/assets/css/{{v.theme}}.css?a=11">
 	{% if v.agendaposter %}
 		<style>
 			html {
diff --git a/files/templates/settings2.html b/files/templates/settings2.html
index dfeacbe17..ab1ed146c 100644
--- a/files/templates/settings2.html
+++ b/files/templates/settings2.html
@@ -39,10 +39,10 @@
 	
 	{% if v %}
 		<style>:root{--primary:#{{v.themecolor}}}</style>
-		<link rel="stylesheet" href="/static/assets/css/main.css?a=75"><link rel="stylesheet" href="/static/assets/css/{{v.theme}}.css?a=11">
+		<link rel="stylesheet" href="/static/assets/css/main.css?a=76"><link rel="stylesheet" href="/static/assets/css/{{v.theme}}.css?a=11">
 	{% else %}
 		<style>:root{--primary:#{{'DEFAULT_COLOR' | app_config}}</style>
-		<link rel="stylesheet" href="/static/assets/css/main.css?a=75"><link rel="stylesheet" href="/static/assets/css/{{'DEFAULT_THEME' | app_config}}.css?a=3">
+		<link rel="stylesheet" href="/static/assets/css/main.css?a=76"><link rel="stylesheet" href="/static/assets/css/{{'DEFAULT_THEME' | app_config}}.css?a=3">
 	{% endif %}
 </head>
 
diff --git a/files/templates/sign_up.html b/files/templates/sign_up.html
index 57ff95f83..c8024d904 100644
--- a/files/templates/sign_up.html
+++ b/files/templates/sign_up.html
@@ -31,7 +31,7 @@
 		<title>{% if ref_user %}{{ref_user.username}} invites you to {{SITE_NAME}}{% else %}Sign up - {{SITE_NAME}}{% endif %}</title>
 
 		<style>:root{--primary:#{{'DEFAULT_COLOR' | app_config}}</style>
-		<link rel="stylesheet" href="/static/assets/css/main.css?a=75"><link rel="stylesheet" href="/static/assets/css/{{'DEFAULT_THEME' | app_config}}.css?a=3">
+		<link rel="stylesheet" href="/static/assets/css/main.css?a=76"><link rel="stylesheet" href="/static/assets/css/{{'DEFAULT_THEME' | app_config}}.css?a=3">
 
 </head>
 
diff --git a/files/templates/sign_up_failed_ref.html b/files/templates/sign_up_failed_ref.html
index 6b1ef5c91..d908e4e95 100644
--- a/files/templates/sign_up_failed_ref.html
+++ b/files/templates/sign_up_failed_ref.html
@@ -32,7 +32,7 @@
 		<title>{% if ref_user %}{{ref_user.username}} invites you to {{SITE_NAME}}{% else %}{{SITE_NAME}}{% endif %}</title>
 
 		<style>:root{--primary:#{{'DEFAULT_COLOR' | app_config}}</style>
-		<link rel="stylesheet" href="/static/assets/css/main.css?a=75"><link rel="stylesheet" href="/static/assets/css/{{'DEFAULT_THEME' | app_config}}.css?a=3">
+		<link rel="stylesheet" href="/static/assets/css/main.css?a=76"><link rel="stylesheet" href="/static/assets/css/{{'DEFAULT_THEME' | app_config}}.css?a=3">
 
 </head>
 
diff --git a/files/templates/submit.html b/files/templates/submit.html
index 2f9154b0b..0cc3369b0 100644
--- a/files/templates/submit.html
+++ b/files/templates/submit.html
@@ -26,7 +26,7 @@
 		{% block stylesheets %}
 		{% if v %}
 			<style>:root{--primary:#{{v.themecolor}}}</style>
-			<link rel="stylesheet" href="/static/assets/css/main.css?a=75"><link rel="stylesheet" href="/static/assets/css/{{v.theme}}.css?a=11">
+			<link rel="stylesheet" href="/static/assets/css/main.css?a=76"><link rel="stylesheet" href="/static/assets/css/{{v.theme}}.css?a=11">
 			{% if v.agendaposter %}
 				<style>
 					html {
@@ -50,7 +50,7 @@
 			{% endif %}
 		{% else %}
 			<style>:root{--primary:#{{'DEFAULT_COLOR' | app_config}}</style>
-			<link rel="stylesheet" href="/static/assets/css/main.css?a=75">
+			<link rel="stylesheet" href="/static/assets/css/main.css?a=76">
 			<link rel="stylesheet" href="/static/assets/css/{{'DEFAULT_THEME' | app_config}}.css?a=3">
 		{% endif %}
 		{% endblock %}