diff --git a/files/routes/comments.py b/files/routes/comments.py
index 4b1d20fa2..178588040 100644
--- a/files/routes/comments.py
+++ b/files/routes/comments.py
@@ -232,67 +232,68 @@ def api_comment(v):
 		body = body.replace(i.group(0), "")
 
 	if request.files.get("file") and request.headers.get("cf-ipcountry") != "T1":
-		file=request.files["file"]
-		if file.content_type.startswith('image/'):
-			oldname = f'/images/{time.time()}'.replace('.','')[:-5] + '.webp'
-			file.save(oldname)
-			image = process_image(oldname)
-			if image == "": return {"error":"Image upload failed"}
-			if v.admin_level > 2 and level == 1:
-				if parent_post.id == 37696:
-					filename = 'files/assets/images/Drama/sidebar/' + str(len(listdir('files/assets/images/Drama/sidebar'))+1) + '.webp'
-					copyfile(oldname, filename)
-					process_image(filename, 400)
-				elif parent_post.id == 37697:
-					filename = 'files/assets/images/Drama/banners_bhm/' + str(len(listdir('files/assets/images/Drama/banners_bhm'))+1) + '.webp'
-					copyfile(oldname, filename)
-					process_image(filename)
-				elif parent_post.id == 37833:
-					try:
-						badge_def = loads(body)
-						name = badge_def["name"]
-
-						existing = g.db.query(BadgeDef).filter_by(name=name).one_or_none()
-						if existing: return {"error": "A badge with this name already exists!"}, 403
-
-						badge = BadgeDef(name=name, description=badge_def["description"])
-						g.db.add(badge)
-						g.db.flush()
-						filename = f'files/assets/images/badges/{badge.id}.webp'
+		files = request.files.getlist('file')[:4]
+		for file in files:
+			if file.content_type.startswith('image/'):
+				oldname = f'/images/{time.time()}'.replace('.','')[:-5] + '.webp'
+				file.save(oldname)
+				image = process_image(oldname)
+				if image == "": return {"error":"Image upload failed"}
+				if v.admin_level > 2 and level == 1:
+					if parent_post.id == 37696:
+						filename = 'files/assets/images/Drama/sidebar/' + str(len(listdir('files/assets/images/Drama/sidebar'))+1) + '.webp'
 						copyfile(oldname, filename)
-						process_image(filename, 200)
-						requests.post(f'https://api.cloudflare.com/client/v4/zones/{CF_ZONE}/purge_cache', headers=CF_HEADERS, data={'files': [f"https://{request.host}/static/assets/images/badges/{badge.id}.webp"]}, timeout=5)
-					except Exception as e:
-						return {"error": str(e)}, 400
-				elif v.admin_level > 2 and parent_post.id == 37838:
-					try:
-						marsey = loads(body.lower())
-						name = marsey["name"]
-						if "author" in marsey: author_id = get_user(marsey["author"]).id
-						elif "author_id" in marsey: author_id = marsey["author_id"]
-						else: abort(400)
-
-						existing = g.db.query(Marsey.name).filter_by(name=name).one_or_none()
-						if existing: return {"error": "A marsey with this name already exists!"}, 403
-
-						marsey = Marsey(name=marsey["name"], author_id=author_id, tags=marsey["tags"], count=0)
-						g.db.add(marsey)
-						filename = f'files/assets/images/emojis/{name}.webp'
+						process_image(filename, 400)
+					elif parent_post.id == 37697:
+						filename = 'files/assets/images/Drama/banners_bhm/' + str(len(listdir('files/assets/images/Drama/banners_bhm'))+1) + '.webp'
 						copyfile(oldname, filename)
-						process_image(filename, 200)
-						requests.post(f'https://api.cloudflare.com/client/v4/zones/{CF_ZONE}/purge_cache', headers=CF_HEADERS, data={'files': [f"https://{request.host}/e/{name}"]}, timeout=5)
-						cache.delete_memoized(marsey_list)
-					except Exception as e:
-						return {"error": str(e)}, 400
-			body += f"\n\n![]({image})"
-		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)], timeout=5).json()['data']['link']
-				except: return {"error": "Imgur error"}, 400
-			if url.endswith('.'): url += 'mp4'
-			body += f"\n\n{url}"
-		else: return {"error": "Image/Video files only"}, 400
+						process_image(filename)
+					elif parent_post.id == 37833:
+						try:
+							badge_def = loads(body)
+							name = badge_def["name"]
+
+							existing = g.db.query(BadgeDef).filter_by(name=name).one_or_none()
+							if existing: return {"error": "A badge with this name already exists!"}, 403
+
+							badge = BadgeDef(name=name, description=badge_def["description"])
+							g.db.add(badge)
+							g.db.flush()
+							filename = f'files/assets/images/badges/{badge.id}.webp'
+							copyfile(oldname, filename)
+							process_image(filename, 200)
+							requests.post(f'https://api.cloudflare.com/client/v4/zones/{CF_ZONE}/purge_cache', headers=CF_HEADERS, data={'files': [f"https://{request.host}/static/assets/images/badges/{badge.id}.webp"]}, timeout=5)
+						except Exception as e:
+							return {"error": str(e)}, 400
+					elif v.admin_level > 2 and parent_post.id == 37838:
+						try:
+							marsey = loads(body.lower())
+							name = marsey["name"]
+							if "author" in marsey: author_id = get_user(marsey["author"]).id
+							elif "author_id" in marsey: author_id = marsey["author_id"]
+							else: abort(400)
+
+							existing = g.db.query(Marsey.name).filter_by(name=name).one_or_none()
+							if existing: return {"error": "A marsey with this name already exists!"}, 403
+
+							marsey = Marsey(name=marsey["name"], author_id=author_id, tags=marsey["tags"], count=0)
+							g.db.add(marsey)
+							filename = f'files/assets/images/emojis/{name}.webp'
+							copyfile(oldname, filename)
+							process_image(filename, 200)
+							requests.post(f'https://api.cloudflare.com/client/v4/zones/{CF_ZONE}/purge_cache', headers=CF_HEADERS, data={'files': [f"https://{request.host}/e/{name}"]}, timeout=5)
+							cache.delete_memoized(marsey_list)
+						except Exception as e:
+							return {"error": str(e)}, 400
+				body += f"\n\n![]({image})"
+			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)], timeout=5).json()['data']['link']
+					except: return {"error": "Imgur error"}, 400
+				if url.endswith('.'): url += 'mp4'
+				body += f"\n\n{url}"
+			else: return {"error": "Image/Video files only"}, 400
 
 	if v.agendaposter and not v.marseyawarded and parent_post.id not in (37696,37697,37749,37833,37838):
 		body = torture_ap(body, v.username)
@@ -808,20 +809,21 @@ def edit_comment(cid, v):
 				return {"error": "Too much spam!"}, 403
 
 		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 += f"\n\n![]({url})"
-			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)], timeout=5).json()['data']['link']
-					except: return {"error": "Imgur error"}, 400
-				if url.endswith('.'): url += 'mp4'
-				body += f"\n\n{url}"
-			else: return {"error": "Image/Video files only"}, 400
+			files = request.files.getlist('file')[:4]
+			for file in files:
+				if file.content_type.startswith('image/'):
+					name = f'/images/{time.time()}'.replace('.','')[:-5] + '.webp'
+					file.save(name)
+					url = process_image(name)
+					body += f"\n\n![]({url})"
+				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)], timeout=5).json()['data']['link']
+						except: return {"error": "Imgur error"}, 400
+					if url.endswith('.'): url += 'mp4'
+					body += f"\n\n{url}"
+				else: return {"error": "Image/Video files only"}, 400
 
 			body_html = sanitize(body, edit=True)
 
diff --git a/files/routes/posts.py b/files/routes/posts.py
index 8bf380d06..0574e42e6 100644
--- a/files/routes/posts.py
+++ b/files/routes/posts.py
@@ -481,20 +481,21 @@ def edit_post(pid, v):
 		p.title_html = title_html
 
 	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 += f"\n\n![]({url})"
-		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)], timeout=5).json()['data']['link']
-				except: return {"error": "Imgur error"}, 400
-			if url.endswith('.'): url += 'mp4'
-			body += f"\n\n{url}"
-		else: return {"error": "Image/Video files only"}, 400
+		files = request.files.getlist('file')[:4]
+		for file in files:
+			if file.content_type.startswith('image/'):
+				name = f'/images/{time.time()}'.replace('.','')[:-5] + '.webp'
+				file.save(name)
+				url = process_image(name)
+				body += f"\n\n![]({url})"
+			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)], timeout=5).json()['data']['link']
+					except: return {"error": "Imgur error"}, 400
+				if url.endswith('.'): url += 'mp4'
+				body += f"\n\n{url}"
+			else: return {"error": "Image/Video files only"}, 400
 
 	if body != p.body:
 		for i in re.finditer('^(https:\/\/.*\.(png|jpg|jpeg|gif|webp|PNG|JPG|JPEG|GIF|WEBP|9999)($|\s|\n))', body, flags=re.M|re.A):
@@ -1062,20 +1063,21 @@ def submit_post(v, sub=None):
 	if v.agendaposter and not v.marseyawarded: body = torture_ap(body, v.username)
 
 	if request.files.get("file2") and request.headers.get("cf-ipcountry") != "T1":
-		file=request.files["file2"]
-		if file.content_type.startswith('image/'):
-			name = f'/images/{time.time()}'.replace('.','')[:-5] + '.webp'
-			file.save(name)
-			body += f"\n\n![]({process_image(name)})"
-		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)], timeout=5).json()['data']['link']
-				except: return error( "Imgur error")
-			if url.endswith('.'): url += 'mp4'
-			body += f"\n\n{url}"
-		else:
-			return error("Image/Video files only.")
+		files = request.files.getlist('file2')[:4]
+		for file in files:
+			if file.content_type.startswith('image/'):
+				name = f'/images/{time.time()}'.replace('.','')[:-5] + '.webp'
+				file.save(name)
+				body += f"\n\n![]({process_image(name)})"
+			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)], timeout=5).json()['data']['link']
+					except: return error( "Imgur error")
+				if url.endswith('.'): url += 'mp4'
+				body += f"\n\n{url}"
+			else:
+				return error("Image/Video files only.")
 
 	if '#fortune' in body:
 		body = body.replace('#fortune', '')
diff --git a/files/templates/comments.html b/files/templates/comments.html
index c6c06619d..cab57ffcf 100644
--- a/files/templates/comments.html
+++ b/files/templates/comments.html
@@ -346,7 +346,7 @@
 							
 							<label class="btn btn-secondary format m-0" for="file-edit-reply-{{c.id}}">
 								<div id="filename-edit-reply-{{c.id}}"><i class="far fa-image"></i></div>
-								<input autocomplete="off" id="file-edit-reply-{{c.id}}" type="file" name="file" accept="image/*, video/*" {% if request.headers.get('cf-ipcountry')=="T1" %}disabled{% endif %} onchange="changename('filename-edit-reply-{{c.id}}','file-edit-reply-{{c.id}}')" hidden>
+								<input autocomplete="off" id="file-edit-reply-{{c.id}}" type="file" multiple="multiple" name="file" accept="image/*, video/*" {% if request.headers.get('cf-ipcountry')=="T1" %}disabled{% endif %} onchange="changename('filename-edit-reply-{{c.id}}','file-edit-reply-{{c.id}}')" hidden>
 							</label>
 						</div>
 						<a id="edit-btn-{{c.id}}" role="button" form="comment-edit-form-{{c.id}}" class="btn btn-primary ml-2 fl-r commentmob" onclick="comment_edit('{{c.id}}')">Save Edit</a> 
@@ -597,7 +597,7 @@
 						&nbsp;
 						<label class="btn btn-secondary format m-0" for="file-upload-reply-{{c.fullname}}">
 							<div id="filename-show-reply-{{c.fullname}}"><i class="far fa-image"></i></div>
-							<input autocomplete="off" id="file-upload-reply-{{c.fullname}}" type="file" name="file" accept="image/*, video/*" {% if request.headers.get('cf-ipcountry')=="T1" %}disabled{% endif %} onchange="changename('filename-show-reply-{{c.fullname}}','file-upload-reply-{{c.fullname}}')" hidden>
+							<input autocomplete="off" id="file-upload-reply-{{c.fullname}}" type="file" multiple="multiple" name="file" accept="image/*, video/*" {% if request.headers.get('cf-ipcountry')=="T1" %}disabled{% endif %} onchange="changename('filename-show-reply-{{c.fullname}}','file-upload-reply-{{c.fullname}}')" hidden>
 						</label>
 					</div>
 					<a id="save-reply-to-{{c.fullname}}" class="btn btn-primary ml-2 fl-r commentmob" onclick="post_comment('{{c.fullname}}', '{{c.post.id}}')"role="button">Comment</a>
diff --git a/files/templates/submission.html b/files/templates/submission.html
index 6d783d3a7..ddc22d62a 100644
--- a/files/templates/submission.html
+++ b/files/templates/submission.html
@@ -847,7 +847,7 @@
 
 										<label class="format btn btn-secondary m-0 ml-1 {% if v %}d-inline-block{% else %}d-none{% endif %}" for="file-upload-edit-{{p.id}}">
 											<div id="filename-show-edit-{{p.id}}"><i class="far fa-image"></i></div>
-											<input autocomplete="off" id="file-upload-edit-{{p.id}}" type="file" name="file" accept="image/*, video/*" {% if request.headers.get('cf-ipcountry')=="T1" %}disabled{% endif %} onchange="changename('filename-show-edit-{{p.id}}','file-upload-edit-{{p.id}}')" hidden>
+											<input autocomplete="off" id="file-upload-edit-{{p.id}}" type="file" multiple="multiple" name="file" accept="image/*, video/*" {% if request.headers.get('cf-ipcountry')=="T1" %}disabled{% endif %} onchange="changename('filename-show-edit-{{p.id}}','file-upload-edit-{{p.id}}')" hidden>
 										</label>
 						
 										<small class="format d-none"><i class="fas fa-link" aria-hidden="true"></i></small> 
@@ -1143,7 +1143,7 @@
 				</label> 
 				<label class="format btn btn-secondary m-0 ml-1 {% if v %}d-inline-block{% else %}d-none{% endif %}" for="file-upload-reply-{{p.fullname}}">
 					<div id="filename-show-reply-{{p.fullname}}"><i class="far fa-image"></i></div>
-					<input autocomplete="off" id="file-upload-reply-{{p.fullname}}" type="file" name="file" accept="image/*, video/*" {% if request.headers.get('cf-ipcountry')=="T1" %}disabled{% endif %} onchange="changename('filename-show-reply-{{p.fullname}}','file-upload-reply-{{p.fullname}}')" hidden>
+					<input autocomplete="off" id="file-upload-reply-{{p.fullname}}" type="file" multiple="multiple" name="file" accept="image/*, video/*" {% if request.headers.get('cf-ipcountry')=="T1" %}disabled{% endif %} onchange="changename('filename-show-reply-{{p.fullname}}','file-upload-reply-{{p.fullname}}')" hidden>
 				</label>
 			</div>
 			<a id="save-reply-to-{{p.fullname}}" role="button" form="reply-to-{{p.fullname}}" class="btn btn-primary text-whitebtn ml-auto fl-r" onclick="post_comment('{{p.fullname}}', '{{p.id}}')">Comment</a>
diff --git a/files/templates/submit.html b/files/templates/submit.html
index 13e745ec7..6995a3a2e 100644
--- a/files/templates/submit.html
+++ b/files/templates/submit.html
@@ -152,7 +152,7 @@
 																
 												<label class="format btn btn-secondary m-0 ml-1 {% if v %}d-inline-block{% else %}d-none{% endif %}" for="file-upload-submit">
 													<div id="filename-show-submit"><i class="far fa-image"></i></div>
-													<input autocomplete="off" id="file-upload-submit" type="file" name="file2" accept="image/*, video/*" {% if request.headers.get('cf-ipcountry')=="T1" %}disabled{% endif %} onchange="changename('filename-show-submit','file-upload-submit')" hidden>
+													<input autocomplete="off" id="file-upload-submit" multiple="multiple" type="file" name="file2" accept="image/*, video/*" {% if request.headers.get('cf-ipcountry')=="T1" %}disabled{% endif %} onchange="changename('filename-show-submit','file-upload-submit')" hidden>
 												</label>		
 
 												<pre></pre>