diff --git a/classes/Message.ts b/classes/Message.ts
index a782d6a..de0d12b 100644
--- a/classes/Message.ts
+++ b/classes/Message.ts
@@ -12,4 +12,8 @@ export default class Message {
 		this.userUuid = user_uuid;
 		this.message = message;
 	}
+
+	getTimestamp() {
+		return uuidToTimestamp(this.uuid);
+	}
 }
\ No newline at end of file
diff --git a/components/Message.vue b/components/Message.vue
index c6207a1..c926616 100644
--- a/components/Message.vue
+++ b/components/Message.vue
@@ -1,22 +1,24 @@
 <template>
-	<div v-if="props.type == 'normal' || props.replyMessage" ref="messageElement" @contextmenu="showContextMenu($event, contextMenu, menuItems)"
-			class="message normal-message" :class="{ 'highlighted': (props.isMentioned || (props.replyMessage && props.message.member.user.uuid != me!.uuid && props.replyMessage?.member.user.uuid == me!.uuid)) }"
-			:data-message-id="props.message.uuid" :editing.sync="props.editing">
+	<div v-if="props.type == 'normal' || props.replyMessage" ref="messageElement" @contextmenu="showContextMenu($event, contextMenu, menuItems)" :id="props.last ? 'last-message' : undefined"
+			class="message normal-message" :class="{ 'mentioned': (props.replyMessage || props.isMentioned) && props.message.member.user.uuid != props.me.uuid && props.replyMessage?.member.user.uuid == props.me.uuid }" :data-message-id="props.messageId"
+			:editing.sync="props.editing" :replying-to.sync="props.replyingTo">
 		<div v-if="props.replyMessage" class="message-reply-svg">
 			<svg
 				width="1.5em" height="1.5em"
 				viewBox="0 0 150 87.5" version="1.1" id="svg1"
 				style="overflow: visible;">
 				<defs id="defs1" />
-				<g id="layer1" transform="translate(40,-35)">
-					<g id="g3" transform="translate(-35,-20)">
+				<g id="layer1"
+					transform="translate(40,-35)">
+					<g id="g3"
+						transform="translate(-35,-20)">
 					<path
 						style="stroke:var(--reply-text-color);stroke-width:8;stroke-opacity:1"
-						d="m 120,87.5 100,2.5e-5"
+						d="m 120.02168,87.850978 100.76157,2.4e-5"
 						id="path3-5" />
 					<path
 						style="stroke:var(--reply-text-color);stroke-width:8;stroke-opacity:1"
-						d="M 70,150 120,87.5"
+						d="M 69.899501,174.963 120.2803,87.700931"
 						id="path3-5-2" />
 					</g>
 				</g>
@@ -27,36 +29,36 @@
 			:text="props.replyMessage?.message"
 			:reply-id="props.replyMessage.uuid" max-width="reply" />
 		<div class="left-column">
-			<Avatar :profile="props.message.member" class="message-author-avatar"/>
+			<Avatar :profile="props.author" class="message-author-avatar"/>
 		</div>
 		<div class="message-data">
 			<div class="message-metadata">
-				<span class="message-author-username" tabindex="0" :style="`color: ${generateIrcColor(props.message.member.user.uuid)}`">
-					{{ getDisplayName(props.message.member) }}
+				<span class="message-author-username" tabindex="0" :style="`color: ${props.authorColor}`">
+					{{ getDisplayName(props.author) }}
 				</span>
 				<span class="message-date" :title="date.toString()">
 					<span v-if="getDayDifference(date, currentDate) === 1">Yesterday at</span>
 					<span v-else-if="getDayDifference(date, currentDate) > 1 ">{{ date.toLocaleDateString(undefined) }},</span>
 
-					{{ date.toLocaleTimeString(undefined, { hour12: getPreferredTimeFormat() == "12", timeStyle: "short" }) }}
+					{{ date.toLocaleTimeString(undefined, { hour12: props.format == "12", timeStyle: "short" }) }}
 				</span>
 			</div>
-			<div class="message-text" v-html="sanitized" :hidden="hideText" tabindex="0"></div>
-			<MessageMedia v-if="mediaLinks.length" :links="mediaLinks" />
+			<div class="message-text" v-html="sanitized" :hidden="hasEmbed" tabindex="0"></div>
 		</div>
+		<MessageMedia v-if="mediaLinks.length" :links="mediaLinks" />
 	</div>
-	<div v-else ref="messageElement" @contextmenu="showContextMenu($event, contextMenu, menuItems)"
-			class="message grouped-message" :class="{ 'mentioned': props.replyMessage || props.isMentioned }"
-			:data-message-id="props.message.uuid" :editing.sync="props.editing">
+	<div v-else ref="messageElement" @contextmenu="showContextMenu($event, contextMenu, menuItems)" :id="props.last ? 'last-message' : undefined"
+			class="message grouped-message" :class="{ 'message-margin-bottom': props.marginBottom, 'mentioned': props.replyMessage || props.isMentioned }"
+			:data-message-id="props.messageId" :editing.sync="props.editing" :replying-to.sync="props.replyingTo">
 		<div class="left-column">
 			<span :class="{ 'invisible': dateHidden }" class="message-date side-message-date" :title="date.toString()">
-				{{ date.toLocaleTimeString(undefined, { hour12: getPreferredTimeFormat() == "12", timeStyle: "short" }) }}
+				{{ date.toLocaleTimeString(undefined, { hour12: props.format == "12", timeStyle: "short" }) }}
 			</span>
 		</div>
 		<div class="message-data">
-			<div class="message-text" :class="$style['message-text']" v-html="sanitized" :hidden="hideText" tabindex="0"></div>
-			<MessageMedia v-if="mediaLinks.length" :links="mediaLinks"/>
+			<div class="message-text" :class="$style['message-text']" v-html="sanitized" :hidden="hasEmbed" tabindex="0"></div>
 		</div>
+		<MessageMedia v-if="mediaLinks.length" :links="mediaLinks" />
 	</div>
 </template>
 
@@ -69,37 +71,33 @@ import MessageReply from './UserInterface/MessageReply.vue';
 import type { ContextMenuInterface, ContextMenuItem } from '~/types/interfaces';
 
 const { getDisplayName } = useProfile()
-const { getUser } = useAuth()
 
 const props = defineProps<MessageProps>();
 
-const me = await getUser()
-
 const contextMenu = useState<ContextMenuInterface>("contextMenu", () => ({ show: false, pointerX: 0, pointerY: 0, items: [] }));
 
 const messageElement = ref<HTMLDivElement>();
 
 const dateHidden = ref<boolean>(true);
 
-const date = uuidToDate(props.message.uuid);
-
+const date = new Date(props.timestamp);
 const currentDate: Date = new Date()
 
 console.log("[MSG] message to render:", props.message);
-console.log("author:", props.message.member);
+console.log("author:", props.author);
 console.log("[MSG] reply message:", props.replyMessage);
 
 const linkRegex = /https?:\/\/(?:www\.)?[-a-zA-Z0-9@:%._\+~#=]{1,256}\.[a-zA-Z0-9()]{1,6}\b(?:[-a-zA-Z0-9()@:%_\+.~#?&\/=]*)/g;
 const linkMatches = props.message.message.matchAll(linkRegex).map(link => link[0]);
-const mediaLinks = ref<string[]>([]);
+const mediaLinks: string[] = [];
 console.log("link matches:", linkMatches);
 
-const hideText = ref(false);
+const hasEmbed = ref(false);
 
 const sanitized = ref<string>();
 
 onMounted(async () => {
-	const parsed = await parse(props.message.message, { gfm: true });
+	const parsed = await parse(props.text, { gfm: true });
 	sanitized.value = DOMPurify.sanitize(parsed, {
 		ALLOWED_TAGS: [
 			"strong", "em", "br", "blockquote",
@@ -123,35 +121,23 @@ onMounted(async () => {
 		console.log("added listeners");
 	}
 
-	const links: string[] = [];
 	for (const link of linkMatches) {
-		console.log("link:", link);
-		try {
-			const res = await $fetch.raw(link);
-			if (res.ok && res.headers.get("content-type")?.match(/^image\/(apng|gif|jpeg|png|webp)$/)) {
-				console.log("link is image");
-				links.push(link);
-			}
-		} catch (error) {
-			console.error(error);
+	console.log("link:", link);
+	try {
+		const res = await $fetch.raw(link);
+		if (res.ok && res.headers.get("content-type")?.match(/^image\/(apng|gif|jpeg|png|webp)$/)) {
+			console.log("link is image");
+			mediaLinks.push(link);
 		}
-
-		mediaLinks.value = [...links];
+		if (mediaLinks.length) {
+			hasEmbed.value = true
+		};
+	} catch (error) {
+		console.error(error);
 	}
+}
 
-	if (mediaLinks.value.length) {
-		const nonLinks = props.message.message.split(linkRegex);
-		let invalidContent = false;
-		for (const nonLink of nonLinks) {
-			if (nonLink != "" && nonLink != "\n" && nonLink != "<br>") {
-				invalidContent = true;
-				break;
-			}
-		}
-		hideText.value = !invalidContent;
-	};
-
-	console.log("media links:", mediaLinks);
+console.log("media links:", mediaLinks);
 });
 
 //function toggleTooltip(e: Event) {
@@ -162,13 +148,13 @@ const menuItems: ContextMenuItem[] = [
 	{ name: "Reply", icon: "lucide:reply", type: "normal", callback: () => { if (messageElement.value) replyToMessage(messageElement.value, props) } }
 ]
 
-console.log("me:", me);
-if (props.message.member.user.uuid == me!.uuid) {
+console.log("me:", props.me);
+if (props.author?.user.uuid == props.me.uuid) {
 	// Inserts "edit" option at index 1 (below the "reply" option)
 	menuItems.splice(1, 0, { name: "Edit (WIP)", icon: "lucide:square-pen", type: "normal", callback: () => { /* if (messageElement.value) editMessage(messageElement.value, props) */ } });
 }
 
-if (props.message.member.user.uuid == me!.uuid /* || check message delete permission*/) {
+if (props.author?.user.uuid == props.me.uuid /* || check message delete permission*/) {
 	// Inserts "edit" option at index 2 (below the "edit" option)
 	menuItems.splice(2, 0, { name: "Delete (WIP)", icon: "lucide:trash", type: "danger", callback: () => {} });
 }
@@ -188,20 +174,14 @@ function getDayDifference(date1: Date, date2: Date) {
 
 <style scoped>
 .message {
-	display: grid;
-	grid-template-columns: 4rem 1fr;
-	align-items: center;
-
 	text-align: left;
-	/* -4 dvw due to 2dvw of padding on both sides */
-	width: calc(100% - 4dvw);
+	/* border: 1px solid lightcoral; */
+	display: grid;
+	grid-template-columns: 2rem 1fr;
+	align-items: center;
+	column-gap: 1dvw;
+	width: 100%;
 	overflow-wrap: anywhere;
-
-	padding-top: .2rem;
-	padding-bottom: .2rem;
-	padding-left: 2dvw;
-	padding-right: 1dvw;
-	border-radius: 0 var(--minor-radius) var(--minor-radius) 0;
 }
 
 .message-reply-preview {
@@ -217,6 +197,14 @@ function getDayDifference(date1: Date, date2: Date) {
 	margin-top: 1dvh;
 }
 
+.grouped-message {
+	margin-top: .3em;
+}
+
+#last-message {
+	margin-bottom: 2dvh;
+}
+
 .message-metadata {
 	display: flex;
 	gap: .5dvw;
@@ -225,9 +213,10 @@ function getDayDifference(date1: Date, date2: Date) {
 
 .message-data {
 	/* border: 1px solid white; */
+	margin-left: .5dvw;
 	display: flex;
 	flex-direction: column;
-	height: 100%;
+	height: fit-content;
 	width: 100%;
 	grid-row: 2;
 	grid-column: 2;
@@ -239,10 +228,10 @@ function getDayDifference(date1: Date, date2: Date) {
 }
 
 .message-author-avatar {
-	min-height: 2.5em;
-	max-height: 2.5em;
-	min-width: 2.5em;
-	max-width: 2.5em;
+	min-height: 2em;
+	max-height: 2em;
+	min-width: 2em;
+	max-width: 2em;
 }
 
 .left-column {
@@ -253,11 +242,8 @@ function getDayDifference(date1: Date, date2: Date) {
 	white-space: nowrap;
 	grid-row: 2;
 	grid-column: 1;
-	height: 100%;
-	align-items: start;
 }
 
-
 .author-username {
 	margin-right: .5dvw;
 	color: white;
@@ -271,7 +257,9 @@ function getDayDifference(date1: Date, date2: Date) {
 
 .side-message-date {
 	font-size: .625em;
-	margin-top: .4em;
+	display: flex;
+	align-items: center;
+	align-content: center;
 }
 
 /*
@@ -281,11 +269,11 @@ function getDayDifference(date1: Date, date2: Date) {
 }
 */
 
-.highlighted {
+.mentioned {
 	background-color: var(--chat-important-background-color);
 }
 
-.highlighted:hover {
+.mentioned:hover {
 	background-color: var(--chat-important-highlighted-background-color);
 }
 
@@ -310,7 +298,6 @@ function getDayDifference(date1: Date, date2: Date) {
 
 <style>
 
-/* class used in utils/replyToMessage.ts */
 .replying-to {
 	background-color: var(--chat-featured-message-color);
 }
diff --git a/components/MessageArea.vue b/components/MessageArea.vue
index e2788ae..26645cd 100644
--- a/components/MessageArea.vue
+++ b/components/MessageArea.vue
@@ -1,12 +1,14 @@
 <template>
 	<div id="message-area">
 		<div id="messages" ref="messagesElement">
-			<Message v-for="(message, i) of messages" :key="message.uuid"
+			<Message v-for="(message, i) of messages" :username="getDisplayName(message.member.user)" :key="message.uuid"
+				:text="message.message" :timestamp="messageTimestamps[message.uuid]" :img="message.member.user.avatar"
+				:format="timeFormat" :type="messagesType[message.uuid]"
+				:margin-bottom="(messages[i + 1] && messagesType[messages[i + 1].uuid] == 'normal') ?? false"
+				:last="i == messages.length - 1" :message-id="message.uuid" :author="message.member" :me="me"
 				:message="message" :is-reply="message.reply_to"
-				:reply-message="message.reply_to ? getReplyMessage(message.reply_to) : undefined"
-				:type="messagesType[message.uuid]"
-				:editing="false"
-				:is-mentioned="false" />
+				:author-color="`${generateIrcColor(message.member.user.uuid)}`"
+				:reply-message="message.reply_to ? getReplyMessage(message.reply_to) : undefined" />
 		</div>
 		<div id="message-box" class="rounded-corners">
 			<form id="message-form" @submit="sendMessage">
@@ -318,6 +320,8 @@ router.beforeEach((to, from, next) => {
 #message-area {
 	display: flex;
 	flex-direction: column;
+	padding-left: 1dvw;
+	padding-right: 1dvw;
 	overflow: hidden;
 	flex-grow: 1;
 }
@@ -325,8 +329,8 @@ router.beforeEach((to, from, next) => {
 #message-box {
 	margin-top: auto; /* force it to the bottom of the screen */
 	margin-bottom: 2dvh;
-	margin-left: 2dvw;
-	margin-right: 2dvw;
+	margin-left: 1dvw;
+	margin-right: 1dvw;
 
 	padding-left: 2%;
 	padding-right: 2%;
@@ -378,7 +382,8 @@ router.beforeEach((to, from, next) => {
 	overflow-y: scroll;
 	display: flex;
 	flex-direction: column;
-	padding-bottom: 1em;
+	padding-left: 1dvw;
+	padding-right: 1dvw;
 }
 
 .message-box-button {
diff --git a/components/MessageMedia.vue b/components/MessageMedia.vue
index 11d436a..48a076b 100644
--- a/components/MessageMedia.vue
+++ b/components/MessageMedia.vue
@@ -1,9 +1,6 @@
 <template>
 	<div class="media-container">
-		<NuxtImg v-for="link of props.links"
-			class="media-item"
-			:src="link"
-			@click.prevent="createModal(link)" />
+		<NuxtImg v-for="link of props.links" class="media-item" :src="link" @click.prevent="createModal(link)" />
 	</div>
 </template>
 
@@ -11,6 +8,7 @@
 import { ModalBase } from '#components';
 import { render } from 'vue';
 
+
 const props = defineProps<{ links: string[] }>();
 
 function createModal(link: string) {
@@ -36,14 +34,15 @@ function createModal(link: string) {
 <style scoped>
 
 .media-container {
-	display: flex;
-	flex-wrap: wrap;
-	gap: .2rem;
-	max-width: 100%;
+	grid-column: 2;
+	grid-row: 3;
+	margin-left: .5dvw;
 }
 
 .media-item {
 	cursor: pointer;
 	max-width: 15dvw;
+	border-radius: var(--embed-radius);
 }
+
 </style>
\ No newline at end of file
diff --git a/components/Modal/Base.vue b/components/Modal/Base.vue
index a5d8ebd..f2360bc 100644
--- a/components/Modal/Base.vue
+++ b/components/Modal/Base.vue
@@ -1,18 +1,11 @@
 <template>
   <dialog ref="dialog" class="modal" :class="props.obscure ? 'modal-obscure' : 'modal-regular'">
-	<span class="modal-exit-button-container" style="position: absolute; right: 2em; top: .2em; width: .5em; height: .5em;">
-		<Button text="✕" variant="stealth" :callback="onCloseButton" />
-	</span>
-	<div class="modal-content">
-		<h1 class="modal-title">{{ title }}</h1>
-		<slot />
-	</div>
+    <slot />
   </dialog>
 </template>
 
 <script lang="ts" setup>
 import type { ModalProps } from '~/types/interfaces';
-import Button from '~/components/UserInterface/Button.vue';
 
 const props = defineProps<ModalProps>();
 const dialog = ref<HTMLDialogElement>();
@@ -20,75 +13,47 @@ const dialog = ref<HTMLDialogElement>();
 onMounted(() => {
   if (dialog.value) {
     dialog.value.showModal();
-    if (props.onClose) {
-      dialog.value.addEventListener("close", props.onClose);
-    }
-    if (props.onCancel) {
-      dialog.value.addEventListener("cancel", props.onCancel);
-    }
+
+    // close the modal if you click outside of it
+    dialog.value.addEventListener('click', (event) => {
+      if (event.target === dialog.value) {
+        dialog.value.close();
+      }
+    });
+
+    if (props.onClose) dialog.value.addEventListener("close", props.onClose);
+    if (props.onCancel) dialog.value.addEventListener("cancel", props.onCancel);
   }
 });
-
-function onCloseButton () {
-  if (dialog.value) {
-    if (props.onCloseButton) {
-      props.onCloseButton()
-    }
-    
-    dialog.value.remove
-  }
-}
-
 </script>
 
-<style>
+<style scoped>
 .modal {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  flex-direction: column;
-  gap: 1em;
-  opacity: 100%;
+  left: 0;
+  top: 0;
+  right: 0;
+  bottom: 0;
 
-  padding: var(--standard-radius); 
-	border-radius: var(--standard-radius);
-	background-color: var(--chat-highlighted-background-color);
-  color: var(--text-color);
+  /* preferably set these to 70dvh and 70dvw in your components, this is a failsafe if you forget */
+  max-height: 90dvh;
+	max-width: 90dvw;
 
-  overflow: hidden;
+	background-color: var(--modal-background-color);
+  border-radius: var(--standard-radius);
+  border-width: 0;
+  padding: 0;
+
+  /* completely transparent colour, fixes weird border radius stuff */
+  background-color: #b00b1e00; 
 }
 
 .modal-regular::backdrop {
 	background-color: var(--chat-background-color);
-	opacity: 0%;
+	opacity: 10%;
 }
 
 .modal-obscure::backdrop {
 	background-color: var(--chat-background-color);
 	opacity: 80%;
 }
-
-.modal-top-container {
-  position: fixed;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  height: 100%;
-  width: 100%;
-}
-
-.modal-title {
-  font-size: 1.5rem;
-  padding: 0;
-}
-
-.modal-content {
-	display: flex;
-	flex-direction: column;
-	align-items: center;
-	gap: 1em;
-	margin: 1em;
-	width: 100%;
-}
-
 </style>
\ No newline at end of file
diff --git a/components/Modal/ProfilePopup.vue b/components/Modal/ProfilePopup.vue
index b99a9ea..8eeee6c 100644
--- a/components/Modal/ProfilePopup.vue
+++ b/components/Modal/ProfilePopup.vue
@@ -114,16 +114,16 @@ function buttonEditProfile() {
 	text-align: left;
 
 	position: relative;
-	max-height: 60dvh;
-	max-width: 60dvw;
+	max-height: 70dvh;
+	max-width: 70dvw;
 	height: 30em;
 	width: 40em;
 
 	display: flex;
 	flex-direction: column;
 
-	background-color: var(--chat-background-color);
-	border-radius: var(--standard-radius);
+	color: var(--text-color);
+	background-color: var(--modal-background-color);
 
 	overflow-y: scroll;
 }
@@ -142,7 +142,6 @@ function buttonEditProfile() {
 	z-index: 0;
 
 	background-color: var(--primary-color);
-	border-radius: var(--standard-radius) var(--standard-radius) 0 0; /* top left and top right */
 }
 
 #avatar {
diff --git a/public/themes/layout/gorb.css b/public/themes/layout/gorb.css
index 1cee0b4..86ea465 100644
--- a/public/themes/layout/gorb.css
+++ b/public/themes/layout/gorb.css
@@ -9,8 +9,8 @@ complementaryColor = white
 	--sidebar-icon-gap: .25em;
 	--sidebar-margin: .5em;
 	
-	--minor-radius: .35em;
 	--standard-radius: .5em;
+	--embed-radius: .3em;
 	--button-radius: .6em;
 	--guild-icon-radius: 15%;
 	--pfp-radius: 50%;
diff --git a/public/themes/style/ash.css b/public/themes/style/ash.css
index e33fbf6..d4ed893 100644
--- a/public/themes/style/ash.css
+++ b/public/themes/style/ash.css
@@ -10,15 +10,16 @@ complementaryColor = white
 	--reply-text-color: #969696;
 	--danger-text-color: #ff0000;
 
-	--chat-background-color: #383432;
-    --chat-highlighted-background-color: #4c4a48;
+	--chat-background-color: #2f2e2d;
+    --chat-highlighted-background-color: #3f3b38;
 	--chat-important-background-color: #ffcf5f38;
 	--chat-important-highlighted-background-color: #ffa86f4f;
 	--chat-featured-message-color: #4f3f2f60;
 	--popup-background-color: #2f2828;
 	--popup-highlighted-background-color: #382f2f;
+	--modal-background-color: #3a352f;
 
-	--sidebar-background-color: #322f2d;
+	--sidebar-background-color: #3e3a37;
 	--sidebar-highlighted-background-color: #46423b;
 	--topbar-background-color: #3a3733;
 	--chatbox-background-color: #3a3733;
diff --git a/public/themes/style/dark.css b/public/themes/style/dark.css
index 420e8c9..4fddaf8 100644
--- a/public/themes/style/dark.css
+++ b/public/themes/style/dark.css
@@ -10,16 +10,17 @@ complementaryColor = white
 	--reply-text-color: #969696;
 	--danger-text-color: #ff0000;
 
-	--chat-background-color: #282624;
-    --chat-highlighted-background-color: #383430;
+	--chat-background-color: #1f1e1d;
+    --chat-highlighted-background-color: #2f2b28;
 	--chat-important-background-color: #ffc44f2f;
 	--chat-important-highlighted-background-color: #ffa45f4a;
 	--chat-featured-message-color: #4f2f1f58;
 	--popup-background-color: #2f1f1f;
 	--popup-highlighted-background-color: #3f2f2f;
+	--modal-background-color: #28241f;
 
-	--sidebar-background-color: #1f1e1d;
-	--sidebar-highlighted-background-color: #2f2b28;
+	--sidebar-background-color: #2e2a27;
+	--sidebar-highlighted-background-color: #36322b;
 	--topbar-background-color: #2a2723;
 	--chatbox-background-color: #1a1713;
 
diff --git a/public/themes/style/description.css b/public/themes/style/description.css
index 972821c..45829e0 100644
--- a/public/themes/style/description.css
+++ b/public/themes/style/description.css
@@ -18,6 +18,7 @@ complementaryColor = black
 	--chat-featured-message-color: #4f2f1f58;
 	--popup-background-color: #2f1f1f;
 	--popup-highlighted-background-color: #3f2f2f;
+	--modal-background-color: #181f1f;
 
 	--sidebar-background-color: #80808000;
 	--sidebar-highlighted-background-color: #ffffff20;
diff --git a/public/themes/style/light.css b/public/themes/style/light.css
index cd1f55b..6cfecf6 100644
--- a/public/themes/style/light.css
+++ b/public/themes/style/light.css
@@ -10,13 +10,14 @@ complementaryColor = black
 	--reply-text-color: #969696;
 	--danger-text-color: #ff0000;
 
-    --chat-background-color: #f0edeb;
-    --chat-highlighted-background-color: #aba8a4;
+    --chat-background-color: #f0ebe8;
+    --chat-highlighted-background-color: #e8e4e0;
     --chat-important-background-color: #df5f0b26;
     --chat-important-hightlighted-background-color: #df5f0b3d;
     --chat-featured-message-color: #e8ac841f;
-    --popup-background-color: #b8b4b0;
-    --popup-highlighted-background-color: #a6a4a2;
+    --popup-background-color: #e8e4e0;
+    --popup-highlighted-background-color: #dfdbd6;
+	--modal-background-color: #e8e4e0;
 
 	--sidebar-background-color: #dbd8d4;
 	--sidebar-highlighted-background-color: #d4d0ca;
diff --git a/public/themes/style/rainbow-capitalism.css b/public/themes/style/rainbow-capitalism.css
index 8ca3ed7..df01d39 100644
--- a/public/themes/style/rainbow-capitalism.css
+++ b/public/themes/style/rainbow-capitalism.css
@@ -17,6 +17,7 @@ complementaryColor = white
 	--chat-featured-message-color: #4f8f4f80;
 	--popup-background-color: #80808080;
 	--popup-highlighted-background-color: #9f9f9f9f;
+	--modal-background-color: #7fa87fff;
 
 	--sidebar-background-color: #80808000;
 	--sidebar-highlighted-background-color: #ffffff20;
diff --git a/types/props.ts b/types/props.ts
index 5796d83..f25ae8d 100644
--- a/types/props.ts
+++ b/types/props.ts
@@ -1,9 +1,21 @@
-import type { MessageResponse, UserResponse } from "./interfaces";
+import type { GuildMemberResponse, MessageResponse, UserResponse } from "./interfaces";
 
 export interface MessageProps {
-	message: MessageResponse,
-	replyMessage?: MessageResponse,
+	class?: string,
+	img?: string | null,
+	author: GuildMemberResponse
+	text: string,
+	timestamp: number,
+	format: "12" | "24",
 	type: "normal" | "grouped",
+	marginBottom: boolean,
+	authorColor: string,
+	last: boolean,
+	messageId: string,
+	replyingTo?: boolean,
 	editing?: boolean,
+	me: UserResponse
+	message: MessageResponse,
+	replyMessage?: MessageResponse
 	isMentioned?: boolean,
 }
\ No newline at end of file
diff --git a/utils/replyToMessage.ts b/utils/replyToMessage.ts
index 1ff4df7..83f4eda 100644
--- a/utils/replyToMessage.ts
+++ b/utils/replyToMessage.ts
@@ -9,7 +9,7 @@ export default (element: HTMLDivElement, props: MessageProps) => {
 	const messageBox = document.getElementById("message-box") as HTMLDivElement;
 	if (messageBox) {
 		const div = document.createElement("div");
-		const messageReply = h(MessageReply, { author: getDisplayName(props.message.member), text: props.message.message || "", id: props.message.uuid, replyId: props.replyMessage?.uuid || element.dataset.messageId!, maxWidth: "full" });
+		const messageReply = h(MessageReply, { author: getDisplayName(props.author), text: props.text || "", id: props.message.uuid, replyId: props.replyMessage?.uuid || element.dataset.messageId!, maxWidth: "full" });
 		messageBox.prepend(div);
 		render(messageReply, div);
 		const message = document.querySelector(`.message[data-message-id='${props.message.uuid}']`);