diff --git a/app.vue b/app.vue
index 8f0571f..8ca7948 100644
--- a/app.vue
+++ b/app.vue
@@ -1,21 +1,17 @@
 <template>
-  	<div>
+	<div>
 		<Banner v-if="banner" />
-		<ContextMenu v-if="contextMenu && contextMenu.show" :pointer-x="contextMenu.pointerX" :pointer-y="contextMenu.pointerY" :menu-items="contextMenu.items" />
-    	<NuxtPage :keepalive="true" />
-  	</div>
+		<NuxtPage :keepalive="true" />
+	</div>
 </template>
 
 <script lang="ts" setup>
-import ContextMenu from '~/components/UserInterface/ContextMenu.vue';
-import type { ContextMenuInterface } from './types/interfaces';
+import loadPreferredTheme from '~/utils/loadPreferredTheme';
 
 const banner = useState("banner", () => false);
 
-const contextMenu = useState<ContextMenuInterface>("contextMenu");
-
 onMounted(() => {
-	loadPreferredThemes()
+	loadPreferredTheme()
 
 	document.removeEventListener("contextmenu", contextMenuHandler);
 	document.addEventListener("contextmenu", (e) => {
@@ -23,11 +19,11 @@ onMounted(() => {
 		contextMenuHandler(e);
 	});
 	document.addEventListener("mousedown", (e) => {
-		if (e.target instanceof HTMLElement && e.target.closest("#context-menu")) return;
+		if (e.target instanceof HTMLDivElement && e.target.closest("#context-menu")) return;
 		console.log("click");
 		console.log("target:", e.target);
 		console.log(e.target instanceof HTMLDivElement);
-		removeContextMenu(contextMenu);
+		removeContextMenu();
 		if (e.target instanceof HTMLElement && e.target.classList.contains("message-text") && e.target.contentEditable) {
 			e.target.contentEditable = "false";
 		}
@@ -44,10 +40,6 @@ onMounted(() => {
 		if (e.key == "Escape" && messageReply) {
 			e.preventDefault();
 			messageReply.remove();
-			const replyToMessage = document.querySelector(`.message[data-message-id='${messageReply.dataset.messageId}']`);
-			if (replyToMessage) {
-				replyToMessage.classList.remove("replying-to");
-			}
 		}
 	});
 });
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/Avatar.vue b/components/Avatar.vue
index 06d36ad..ddfe1dc 100644
--- a/components/Avatar.vue
+++ b/components/Avatar.vue
@@ -3,10 +3,8 @@
 		class="display-avatar"
 		:src="displayAvatar"
 		:alt="displayName" />
-	<DefaultIcon v-else
-		class="display-avatar"
-		:name="displayName"
-		:seed="user.uuid"
+	<Icon v-else
+		name="lucide:user"
 		:alt="displayName" />
 </template>
 
@@ -14,24 +12,27 @@
 import { NuxtImg } from '#components';
 import type { GuildMemberResponse, UserResponse } from '~/types/interfaces';
 
-const { getDisplayName } = useProfile()
-
 const props = defineProps<{
-	profile: UserResponse | GuildMemberResponse,
+	user?: UserResponse,
+	member?: GuildMemberResponse,
 }>();
 
-const displayName = getDisplayName(props.profile)
-let user: UserResponse
+
+let displayName: string
 let displayAvatar: string | null
 
-if ("username" in props.profile) {
-	// assume it's a UserResponse
-	displayAvatar = props.profile.avatar
-	user = props.profile
-} else {
-	// assume it's a GuildMemberResponse
-	displayAvatar = props.profile.user.avatar
-	user = props.profile.user
+const user = props.user || props.member?.user
+
+if (user) {
+	displayName = getDisplayName(user, props.member)
+	
+	if (user.avatar) {
+		displayAvatar = user.avatar
+	} else if (!isCanvasBlocked()){
+		displayAvatar = generateDefaultIcon(displayName, user.uuid)
+	} else {
+		displayAvatar = null
+	}
 }
 
 </script>
diff --git a/components/DefaultIcon.vue b/components/DefaultIcon.vue
deleted file mode 100644
index 6fc6891..0000000
--- a/components/DefaultIcon.vue
+++ /dev/null
@@ -1,55 +0,0 @@
-<template>
-  <div :style="`background-color: ${generateIrcColor(seed, 50)}`"
-	class="default-icon">
-		<div class="default-icon-text-container">
-			<span class="default-icon-text">
-				{{ previewName }}
-			</span>
-		</div>
-  </div>
-</template>
-
-<script lang="ts" setup>
-
-const props = defineProps<{
-	seed: string,
-	name: string	
-}>();
-
-let previewName = "";
-if (props.name.length > 3) {
-	let guildName: string[] = props.name.split(' ')
-	for (let i = 0; i < 3; i ++) {
-		if (guildName.length > i) {
-			previewName += guildName[i].charAt(0)
-		} else {
-			break
-		}
-	}
-} else {
-	previewName = props.name
-}
-
-</script>
-
-<style scoped>
-.default-icon, .default-icon-text-container {
-	display: flex;
-	align-items: center;
-	justify-content: center;
-}
-
-.default-icon-text-container {
-	height: 100%;
-	width: 100%;
-}
-
-.default-icon-text {
-	/* helps centre the icon, yes, this is NOT perfect */
-	margin-top: -0.15em;
-
-	font-weight: bold;
-
-	color: var(--secondary-text-color)
-}
-</style>
diff --git a/components/Guild/GuildDropdown.vue b/components/Guild/GuildDropdown.vue
index b08bfd9..89be6d6 100644
--- a/components/Guild/GuildDropdown.vue
+++ b/components/Guild/GuildDropdown.vue
@@ -27,7 +27,7 @@ const props = defineProps<{ options: DropdownOption[] }>();
 }
 
 .dropdown-option {
-  border: .09rem solid var(--padding-color);
+  border: .09rem solid rgb(70, 70, 70);
 }
 
 .dropdown-button {
diff --git a/components/Guild/MemberEntry.vue b/components/Guild/MemberEntry.vue
index baf0e67..12e36a0 100644
--- a/components/Guild/MemberEntry.vue
+++ b/components/Guild/MemberEntry.vue
@@ -1,44 +1,33 @@
 <template>
-    <div class="member-item" @click.prevent="showModalPopup" tabindex="0">
-        <Avatar :profile="props.member" class="member-avatar"/>
-        <span class="member-display-name" :style="`color: ${generateIrcColor(props.member.user.uuid)}`">
-            {{ getDisplayName(props.member) }}
-        </span>
+    <div class="member-item" @click="togglePopup" @blur="hidePopup" tabindex="0">
+        <Avatar :member="props.member" class="member-avatar"/>
+        <span class="member-display-name">{{ getDisplayName(props.member.user, props.member) }}</span>
+        <UserPopup v-if="isPopupVisible" :user="props.member.user" id="profile-popup" />
     </div>
-    <ModalProfilePopup v-if="modalPopupVisible" :profile="props.member"
-        :onFinish="hideModalPopup" :keepalive="false"/>
 </template>
 
 <script lang="ts" setup>
-import { ModalProfilePopup } from '#components';
+import { ref } from 'vue';
 import type { GuildMemberResponse } from '~/types/interfaces';
 
-const { getDisplayName } = useProfile()
-
 const props = defineProps<{
     member: GuildMemberResponse
 }>();
 
-const modalPopupVisible = ref<boolean>(false);
+const isPopupVisible = ref(false);
 
-function showModalPopup() {
-    modalPopupVisible.value = true
-}
+const togglePopup = () => {
+    isPopupVisible.value = false;
+    // isPopupVisible.value = !isPopupVisible.value;
+};
 
-function hideModalPopup() {
-    modalPopupVisible.value = false
-}
+const hidePopup = () => {
+    isPopupVisible.value = false;
+};
 </script>
 
 <style>
 .member-item {
-    position: relative;
-}
-
-.member-avatar {
-    min-height: 2.3em;
-	max-height: 2.3em;
-	min-width: 2.3em;
-	max-width: 2.3em;
+    position: relative; /* Set the position to relative for absolute positioning of the popup */
 }
 </style>
diff --git a/components/Me/AddFriend.vue b/components/Me/AddFriend.vue
index 43249fb..6d2d888 100644
--- a/components/Me/AddFriend.vue
+++ b/components/Me/AddFriend.vue
@@ -23,11 +23,9 @@ async function sendRequest() {
 		try {
 			await addFriend(inputField.value.value)
 			alert("Friend request sent!")
-		} catch (error: any) {
-			if (error?.response?.status !== 200) {
-				alert(`error ${error?.response?.status} met whilst trying to add friend\n"${error?.response._data?.message}"`)
-			}
-		}
+		} catch {
+			alert("Request failed :(")
+		} 
 	}
 }
 </script>
diff --git a/components/Me/FriendsList.vue b/components/Me/FriendsList.vue
index 25b9924..0a1481e 100644
--- a/components/Me/FriendsList.vue
+++ b/components/Me/FriendsList.vue
@@ -24,8 +24,6 @@
 </template>
 
 <script lang="ts" setup>
-
-const { getDisplayName } = useProfile()
 const { fetchFriends } = useApi();
 
 const friends = sortUsers(await fetchFriends())
diff --git a/components/Message.vue b/components/Message.vue
index c6207a1..2db7bfd 100644
--- a/components/Message.vue
+++ b/components/Message.vue
@@ -1,62 +1,64 @@
 <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="createContextMenu($event, menuItems)" :id="props.last ? 'last-message' : undefined"
+			class="message normal-message" :class="{ 'mentioned': (props.replyMessage || props.isMentioned) && props.message.user.uuid != props.me.uuid && props.replyMessage?.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>
 			</svg>
 		</div>
 		<MessageReply v-if="props.replyMessage" :id="props.message.uuid"
-			:author="getDisplayName(props.replyMessage.member)"
+			:author="getDisplayName(props.replyMessage.user)"
 			: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 :user="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="createContextMenu($event, 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>
 
@@ -66,40 +68,31 @@ import { parse } from 'marked';
 import type { MessageProps } from '~/types/props';
 import MessageMedia from './MessageMedia.vue';
 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,54 +116,36 @@ 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) {
 //	showHover.value = !showHover.value;
 //}
 
-const menuItems: ContextMenuItem[] = [
-	{ name: "Reply", icon: "lucide:reply", type: "normal", callback: () => { if (messageElement.value) replyToMessage(messageElement.value, props) } }
+const menuItems = [
+	{ name: "Reply", callback: () => { if (messageElement.value) replyToMessage(messageElement.value, props) } }
 ]
 
-console.log("me:", me);
-if (props.message.member.user.uuid == 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*/) {
-	// Inserts "edit" option at index 2 (below the "edit" option)
-	menuItems.splice(2, 0, { name: "Delete (WIP)", icon: "lucide:trash", type: "danger", callback: () => {} });
+console.log("me:", props.me);
+if (props.author?.uuid == props.me.uuid) {
+	menuItems.push({ name: "Edit", callback: () => { if (messageElement.value) editMessage(messageElement.value, props) } });
 }
 
 function getDayDifference(date1: Date, date2: Date) {
@@ -188,20 +163,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 +186,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 +202,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 +217,7 @@ 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;
+	width: 100%;
 }
 
 .left-column {
@@ -253,11 +228,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 +243,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,12 +255,12 @@ function getDayDifference(date1: Date, date2: Date) {
 }
 */
 
-.highlighted {
-	background-color: var(--chat-important-background-color);
+.mentioned {
+	background-color: rgba(0, 255, 166, 0.123);
 }
 
-.highlighted:hover {
-	background-color: var(--chat-important-highlighted-background-color);
+.mentioned:hover {
+	background-color: rgba(90, 255, 200, 0.233);
 }
 
 .message-reply-svg {
@@ -307,12 +281,3 @@ function getDayDifference(date1: Date, date2: Date) {
 	padding-left: 1em;
 }
 </style>
-
-<style>
-
-/* class used in utils/replyToMessage.ts */
-.replying-to {
-	background-color: var(--chat-featured-message-color);
-}
-
-</style>
diff --git a/components/MessageArea.vue b/components/MessageArea.vue
index e2788ae..caf4079 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.user)" :key="message.uuid"
+				:text="message.message" :timestamp="messageTimestamps[message.uuid]" :img="message.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.user" :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.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">
@@ -42,12 +44,9 @@ import type { MessageResponse, ScrollPosition, UserResponse } from '~/types/inte
 import scrollToBottom from '~/utils/scrollToBottom';
 import { generateIrcColor } from '#imports';
 
-const { getDisplayName } = useProfile()
-const { fetchMe } = useApi()
-
 const props = defineProps<{ channelUrl: string, amount?: number, offset?: number }>();
 
-const me = await fetchMe() as UserResponse;
+const me = await fetchWithApi("/me") as UserResponse;
 
 const messageTimestamps = ref<Record<string, number>>({});
 const messagesType = ref<Record<string, "normal" | "grouped">>({});
@@ -65,33 +64,33 @@ const previousMessage = ref<MessageResponse>();
 function groupMessage(message: MessageResponse, options?: { prevMessage?: MessageResponse, reverse?: boolean }) {
 	messageTimestamps.value[message.uuid] = uuidToTimestamp(message.uuid);
 	console.log("message:", message.message);
-	console.log("author:", message.member.user.username, `(${message.member.uuid})`);
+	console.log("author:", message.user.username, `(${message.user.uuid})`);
 
-	if (!previousMessage.value || previousMessage.value && message.member.uuid != previousMessage.value.member.uuid) {
+	if (!previousMessage.value || previousMessage.value && message.user.uuid != previousMessage.value.user.uuid) {
 		console.log("no previous message or author is different than last messsage's");
 		messagesType.value[message.uuid] = "normal";
 		previousMessage.value = message;
 		console.log("set previous message to:", previousMessage.value.message);
-		console.log(`setting first post by user ${message.member.user.username} to "${message.message}" with timestamp ${messageTimestamps.value[message.uuid]}`);
-		firstMessageByUsers.value[message.member.uuid] = message;
+		console.log(`setting first post by user ${message.user.username} to "${message.message}" with timestamp ${messageTimestamps.value[message.uuid]}`);
+		firstMessageByUsers.value[message.user.uuid] = message;
 		return;
 	}
 
 
-	const firstByUser = firstMessageByUsers.value[message.member.uuid];
+	const firstByUser = firstMessageByUsers.value[message.user.uuid];
 	if (firstByUser) {
 		console.log("first by user exists:", firstByUser);
-		if (message.member.uuid != firstByUser.member.uuid) {
+		if (message.user.uuid != firstByUser.user.uuid) {
 			console.log("message is by new user, setting their first message")
-			firstMessageByUsers.value[message.member.uuid] = message;
+			firstMessageByUsers.value[message.user.uuid] = message;
 			console.log("RETURNING FALSE");
 			messagesType.value[message.uuid] = "normal";
 			return;
 		}
 	} else {
 		console.log("first by user doesn't exist");
-		console.log(`setting first post by user ${message.member.user.username} to "${message.message}" with timestamp ${messageTimestamps.value[message.uuid]}`);
-		firstMessageByUsers.value[message.member.uuid] = message;
+		console.log(`setting first post by user ${message.user.username} to "${message.message}" with timestamp ${messageTimestamps.value[message.uuid]}`);
+		firstMessageByUsers.value[message.user.uuid] = message;
 		console.log("RETURNING FALSE");
 		messagesType.value[message.uuid] = "normal";
 		return;
@@ -109,8 +108,8 @@ function groupMessage(message: MessageResponse, options?: { prevMessage?: Messag
 	console.log("group?", lessThanMax);
 	if (!lessThanMax) {
 		console.log("diff exceeds max");
-		console.log(`setting first post by user ${message.member.user.username} to "${message.message}" with timestamp ${messageTimestamps.value[message.uuid]}`)
-		firstMessageByUsers.value[message.member.uuid] = message;
+		console.log(`setting first post by user ${message.user.username} to "${message.message}" with timestamp ${messageTimestamps.value[message.uuid]}`)
+		firstMessageByUsers.value[message.user.uuid] = message;
 		messagesType.value[message.uuid] = "normal";
 		return;
 	}
@@ -222,10 +221,6 @@ function sendMessage(e: Event) {
 		if (messageReply && messageReply.dataset.messageId) {
 			console.log("[MSG] message is a reply");
 			message.reply_to = messageReply.dataset.messageId;
-			const replyToMessage = document.querySelector(`.message[data-message-id='${message.reply_to}']`);
-			if (replyToMessage) {
-				replyToMessage.classList.remove("replying-to");
-			}
 		}
 
 		console.log("[MSG] sent message:", message);
@@ -318,6 +313,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 +322,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 +375,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..ab62387 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,14 @@ 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;
 }
+
 </style>
\ No newline at end of file
diff --git a/components/Modal/Base.vue b/components/Modal/Base.vue
index a5d8ebd..1f57901 100644
--- a/components/Modal/Base.vue
+++ b/components/Modal/Base.vue
@@ -1,7 +1,7 @@
 <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" />
+		<Button text="X" variant="neutral" :callback="() => dialog?.remove()" />
 	</span>
 	<div class="modal-content">
 		<h1 class="modal-title">{{ title }}</h1>
@@ -17,6 +17,8 @@ import Button from '~/components/UserInterface/Button.vue';
 const props = defineProps<ModalProps>();
 const dialog = ref<HTMLDialogElement>();
 
+console.log("props:", props);
+
 onMounted(() => {
   if (dialog.value) {
     dialog.value.showModal();
@@ -29,15 +31,6 @@ onMounted(() => {
   }
 });
 
-function onCloseButton () {
-  if (dialog.value) {
-    if (props.onCloseButton) {
-      props.onCloseButton()
-    }
-    
-    dialog.value.remove
-  }
-}
 
 </script>
 
@@ -49,12 +42,9 @@ function onCloseButton () {
   flex-direction: column;
   gap: 1em;
   opacity: 100%;
-
-  padding: var(--standard-radius); 
-	border-radius: var(--standard-radius);
-	background-color: var(--chat-highlighted-background-color);
+  padding: 1%;
+  background-color: var(--sidebar-highlighted-background-color);
   color: var(--text-color);
-
   overflow: hidden;
 }
 
diff --git a/components/Modal/Invite.vue b/components/Modal/Invite.vue
index de842a2..232114c 100644
--- a/components/Modal/Invite.vue
+++ b/components/Modal/Invite.vue
@@ -40,8 +40,7 @@ function copyInvite(type: "link" | "code") {
   if (!invite.value) return;
 
   if (type == "link") {
-	const runtimeConfig = useRuntimeConfig();
-    const inviteUrl = URL.parse(`invite/${invite.value}`, `${window.location.protocol}//${window.location.host}${runtimeConfig.app.baseURL}`);
+    const inviteUrl = URL.parse(`invite/${invite.value}`, `${window.location.protocol}//${window.location.host}`);
     if (inviteUrl) {
       navigator.clipboard.writeText(inviteUrl.href);
     }
diff --git a/components/Modal/ProfilePopup.vue b/components/Modal/ProfilePopup.vue
deleted file mode 100644
index b99a9ea..0000000
--- a/components/Modal/ProfilePopup.vue
+++ /dev/null
@@ -1,256 +0,0 @@
-<template>
-	<ModalBase :obscure="true" :onClose="props.onFinish" :onCloseButton="props.onFinish">
-		<div id="profile-container">
-			<div id="profile-header">
-				<div id="header-mask"></div>
-				<Avatar :profile="props.profile" id="avatar"/>
-			</div>
-
-			<div id="profile-sub-header">
-				<div id="display-name">{{ displayName }}</div>
-				<div id="username-and-pronouns">
-					{{ username }}
-					<span v-if="pronouns">
-						•
-						{{ pronouns }}
-					</span>
-				</div>
-				<!-- <div id="status">Status goes here lorem ipsum or something</div> -->
-
-				<div v-if="me.uuid != uuid" id="action-buttons-container">
-					<Button text="Message" variant="normal" :callback="buttonSendMessage"></Button>
-					<Button text="Friend" variant="neutral" :callback="buttonAddFriend"></Button>
-				</div>
-				<div v-else id="action-buttons-container">
-					<Button text="Edit Profile" variant="normal" :callback="buttonEditProfile"></Button>
-				</div>
-			</div>
-			<VerticalSpacer />
-
-			<div v-if="aboutMe" id="profile-body">
-				<div v-if="aboutMe" id="about-me-container">
-					<div><Icon name="lucide:info" size="1.1em"/></div>
-					<div id="about-me-text">
-						{{ " " + aboutMe }}
-					</div>
-				</div>
-			</div>
-			<VerticalSpacer v-if="aboutMe" />
-
-			<div id="profile-footer">
-				<div id="dates">
-					<div v-if="registrationDate" class="date-entry">
-						<span class="date-entry-title">Registered at</span><br>
-						<span class="date-entry-value" :title="registrationDate.toLocaleTimeString()">{{ toDateString(registrationDate) }}</span>
-					</div>
-					<div v-if="joinDate" class="date-entry">
-						<span class="date-entry-title">Joined at</span><br>
-						<span class="date-entry-value" :title="joinDate.toLocaleTimeString()">{{ toDateString(joinDate) }}</span>
-					</div>
-					<div v-if="friendsSince" class="date-entry">
-						<span class="date-entry-title">Friends since</span><br>
-						<span class="date-entry-value" :title="friendsSince.toLocaleTimeString()">{{ toDateString(friendsSince) }}</span>
-					</div>
-				</div>
-			</div>
-		</div>
-	</ModalBase>
-</template>
-
-<script lang="ts" setup>
-import type { GuildMemberResponse, ModalProps, UserResponse } from '~/types/interfaces';
-import VerticalSpacer from '../UserInterface/VerticalSpacer.vue';
-import Button from '../UserInterface/Button.vue';
-
-const { getDisplayName, getUsername, getPronouns, getAboutMe, getRegistrationDate, getGuildJoinDate, getFriendsSince, getUuid } = useProfile()
-const { addFriend, fetchMe } = useApi();
-
-const props = defineProps<ModalProps & {
-	profile: GuildMemberResponse,
-	onFinish: () => void
-}>();
-
-const me = await fetchMe() as UserResponse
-
-const displayName = getDisplayName(props.profile)
-const username = getUsername(props.profile)
-const pronouns = getPronouns(props.profile)
-const aboutMe = getAboutMe(props.profile)
-
-const registrationDate = getRegistrationDate(props.profile)
-const joinDate = getGuildJoinDate(props.profile)
-const friendsSince = await getFriendsSince(props.profile)
-
-const uuid = getUuid(props.profile)
-
-
-function toDateString(date: Date): string {
-	return date.toLocaleDateString(undefined, { day: '2-digit', month: 'short', year: 'numeric' })
-}
-
-function buttonSendMessage() {
-	navigateTo(`/me/${uuid}`)
-}
-
-async function buttonAddFriend() {
-	try {
-		await addFriend(username)
-		alert("sent!")
-	} catch (error: any) {
-		if (error?.response?.status !== 200) {
-			alert(`error ${error?.response?.status} met whilst trying to add friend\n"${error?.response._data?.message}"`)
-		}
-	}
-}
-
-function buttonEditProfile() {
-	navigateTo(`/settings#profile`)
-}
-</script>
-
-<style scoped>
-
-#profile-container { 
-	text-align: left;
-
-	position: relative;
-	max-height: 60dvh;
-	max-width: 60dvw;
-	height: 30em;
-	width: 40em;
-
-	display: flex;
-	flex-direction: column;
-
-	background-color: var(--chat-background-color);
-	border-radius: var(--standard-radius);
-
-	overflow-y: scroll;
-}
-
-#profile-header {
-	flex-shrink: 0;
-	min-height: 9em;
-	width: 100%;
-}
-
-#header-mask {
-	display: relative;
-	width: 100%;
-	min-height: 7em;
-
-	z-index: 0;
-
-	background-color: var(--primary-color);
-	border-radius: var(--standard-radius) var(--standard-radius) 0 0; /* top left and top right */
-}
-
-#avatar {
-	display: block;
-	position: absolute;
-	left: 2em;
-	top: 2.5em;
-
-	z-index: 1;
-
-	width: 6em;
-	height: 6em;
-
-	border: .15em solid var(--accent-color);
-}
-
-#profile-sub-header {
-	margin-left: 1em;
-	margin-right: 1em;
-}
-
-#display-name {
-	font-weight: 800;
-	font-size: 2em;
-}
-
-#username-and-pronouns {
-	font-size: .9em;
-	color: var(--secondary-text-color);
-}
-
-#status {
-	width: fit-content;
-	margin-top: .75em;
-
-	margin-left: -0.2em;
-	padding: .3em .5em;
-	
-	background-color: var(--chatbox-background-color);
-	border-radius: 1em;
-}
-
-#action-buttons-container {
-	display: flex;
-	gap: .6em;
-
-	margin-top: .4em;
-	margin-bottom: .3em;
-}
-
-
-#profile-body {
-	margin-left: 1em;
-	margin-right: 1em;
-}
-
-#about-me-container {
-	display: flex;
-	flex-direction: row;
-	gap: .5em;
-
-	margin-top: .75em;
-	margin-bottom: .75em;
-}
-
-#about-me-text {
-	display: inline;
-	margin-top: -0.5em;
-	
-	align-self: center;
-
-	width: 100%;
-	font-size: .8em;
-	font-weight: lighter;
-
-	white-space: pre-line;
-	line-height: 1;
-	max-height: 7em; /* 7 x 1 */
-
-	overflow-y: auto;
-	overflow-x: hidden;
-	scrollbar-width: none;
-}
-
-#about-me-text::-webkit-scrollbar {
-	display: none;
-}
-
-
-#profile-footer {
-	margin-left: 1em;
-	margin-right: 1em;
-	padding-bottom: 5em;
-}
-
-#dates {
-	display: flex
-}
-
-.date-entry {
-	flex-grow: 1;
-}
-
-.date-entry-title {
-	font-size: .8em;
-}
-
-.date-entry-value {
-	font-size: 1em;
-}
-</style>
\ No newline at end of file
diff --git a/components/Settings/AppSettings/Appearance.vue b/components/Settings/AppSettings/Appearance.vue
index f6f40f4..579ccdd 100644
--- a/components/Settings/AppSettings/Appearance.vue
+++ b/components/Settings/AppSettings/Appearance.vue
@@ -2,43 +2,18 @@
   <div>
     <h1>Appearance</h1>
     
-    <h2>Themes</h2>
+    <p class="subtitle">THEMES</p>
     <div class="themes">
-      <p class="subtitle">STYLES</p>
-      <div class="styles">
-        <div v-for="style of styles" class="theme-preview-container">
-          <span class="theme-instance"
-              :title="style.displayName"
-              @click="changeTheme(StyleLayout.Style, style)">
-            <div class="theme-content-container">
-              <span class="style-background"
-                :style="{background:`linear-gradient(${style.previewGradient})`}"
-              ></span>
-              <span class="theme-title" :style="{color:`${style.complementaryColor}`}">
-                {{ style.displayName }}
-              </span>
-            </div>
+      <div v-for="theme of themes" class="theme-preview-container">
+        <span class="theme-preview"
+          :title="theme.displayName"
+          :style="{background:`linear-gradient(${theme.previewGradient})`}"
+          @click="changeTheme(theme.id, theme.themeUrl)"
+        >
+          <span class="theme-title" :style="{color:`${theme.complementaryColor}`}">
+            {{ theme.displayName }}
           </span>
-        </div>
-      </div>
-      <p class="subtitle">LAYOUTS</p>
-      <div class="layouts">
-        <div v-for="layout of layouts" class="theme-preview-container">
-          <div class="theme-instance"
-              :title="layout.displayName"
-              @click="changeTheme(StyleLayout.Layout, layout)">
-            <div class="theme-content-container">
-              <span class="layout-background"
-                :style="{backgroundImage:`url(${layout.previewImageUrl})`}"
-              ></span>
-              <span class="theme-title" :style="{color:`${layout.complementaryColor}`}">
-                {{ layout.displayName }}
-              </span>
-              <!-- this breaks if it's a nuxtimg, i don't know why -->
-              <img class="layout-preview" :src="layout.previewImageUrl"></img>
-            </div>
-          </div>
-        </div>
+        </span>
       </div>
     </div>
 
@@ -57,120 +32,39 @@
 <script lang="ts" setup>
 import RadioButtons from '~/components/UserInterface/RadioButtons.vue';
 import type { TimeFormat } from '~/types/settings';
-import { settingSave, settingsLoad } from '#imports';
+import loadPreferredTheme from '~/utils/loadPreferredTheme';
+import settingSave from '~/utils/settingSave';
 
 const runtimeConfig = useRuntimeConfig()
+const defaultThemes = runtimeConfig.public.defaultThemes
 const baseURL = runtimeConfig.app.baseURL;
-const styleFolder = `${baseURL}/themes/style`
-const layoutFolder = `${baseURL}/themes/layout`
-
 const timeFormatTextStrings = ["Auto", "12-Hour", "24-Hour"]
 
-enum StyleLayout {
-  Style,
-  Layout
-}
+const themes: Array<Theme> = []
 
 interface Theme {
+  id: string
   displayName: string
+  previewGradient: string
   complementaryColor: string
-  cssData: string
   themeUrl: string
-  previewGradient?: string
-  previewImageUrl?: string
 }
 
-async function parseTheme(url: string): Promise<Theme | void> {
-  const styleData: any = await $fetch(url)
+function changeTheme(id: string, url: string) {
+  settingSave("selectedThemeId", id)
+  loadPreferredTheme()
+}
 
-  if (typeof styleData != "string") {
-    return
-  }
+async function fetchThemes() {
+  for (const theme of defaultThemes) {
+    const themeConfig = await $fetch(`${baseURL}themes/${theme}.json`) as Theme
+    themeConfig.id = theme
 
-  const metadataMatch = styleData.match(/\/\*([\s\S]*?)\*\//);
-  if (!metadataMatch) {
-    alert(`Failed to fetch metadata for a theme, panicking`)
-    return
-  }
-
-  const commentContent = metadataMatch[0].trim().split("\n");
-  const cssData = styleData.substring(metadataMatch[0].length).trim();
-
-  let displayName: string | undefined
-  let complementaryColor: string | undefined
-  let previewGradient: string | undefined
-  let previewImageUrl: string | undefined
-
-  for (const line of commentContent) {
-    const lineArray = line.split("=")
-    if (lineArray.length === 2) {
-      switch (lineArray[0].trim()) {
-        case "displayName":
-          displayName = lineArray[1].trim()
-          break
-        case "complementaryColor":
-          complementaryColor = lineArray[1].trim()
-          break
-        case "previewGradient":
-          previewGradient = lineArray[1].trim()
-          break
-        case "previewImageUrl":
-          previewImageUrl = `${layoutFolder}/${lineArray[1].trim()}`
-          console.log(previewImageUrl)
-          break
-      }
-    }
-  }
-  
-  console.log(displayName, complementaryColor, previewGradient, previewImageUrl, cssData)
-  if (!(displayName && complementaryColor && cssData && (previewGradient || previewImageUrl))) {
-    return
-  }
-
-  return {
-    displayName,
-    complementaryColor,
-    cssData,
-    themeUrl: url,
-    previewGradient,
-    previewImageUrl,
+    themes.push(themeConfig)
   }
 }
 
-async function parseThemeLayout(
-  folder: string,
-  incomingThemeList: string[],
-  outputThemeList: Theme[]) {
-    for (const theme of incomingThemeList) {
-      const parsedThemeData = await parseTheme(`${folder}/${theme}`)
-      
-      if (parsedThemeData) {
-        outputThemeList.push(parsedThemeData)
-      }
-    }
-}
-
-const styles: Theme[] = [];
-const layouts: Theme[] = [];
-
-const styleList = await $fetch(`${styleFolder}/styles.json`)
-const layoutList = await $fetch(`${layoutFolder}/layouts.json`)
-
-if (Array.isArray(styleList)) {
-  await parseThemeLayout(styleFolder, styleList, styles)
-}
-if (Array.isArray(layoutList)) {
-  await parseThemeLayout(layoutFolder, layoutList, layouts)
-}
-
-function changeTheme(themeType: StyleLayout, theme: Theme) {
-  if (themeType == StyleLayout.Style) {
-    settingSave("selectedThemeStyle", theme.themeUrl)
-  } else {
-    settingSave("selectedThemeLayout", theme.themeUrl)
-  }
-  loadPreferredThemes()
-}
+await fetchThemes()
 
 async function onTimeFormatClicked(index: number) {
   let format: "auto" | "12" | "24" = "auto"
@@ -190,89 +84,29 @@ async function onTimeFormatClicked(index: number) {
 
 <style scoped>
 .themes {
-  --instance-size: 5em;
-}
-.styles, .layouts {
   display: flex;
 }
 
 .theme-preview-container {
   margin: .5em;
-  width: var(--instance-size);
-  height: var(--instance-size);
+  width: 5em;
+  height: 5em;
 }
 
-.theme-instance {
-  width: var(--instance-size);
-  height: var(--instance-size);
+.theme-preview {
+  width: 5em;
+  height: 5em;
   border-radius: 100%;
   border: .1em solid var(--primary-color);
 
   display: inline-block;
+  text-align: center;
+  align-content: center;
   cursor: pointer;
 }
 
-.theme-content-container {
-  position: relative;
-
-  text-align: center;
-  align-content: center;
-}
-
-.style-background, .layout-background {
-  position: absolute;
-
-  top: 0;
-  left: 0;
-  right: 0;
-  bottom: 0;
-
-  width: var(--instance-size);
-  height: var(--instance-size);
-
-  border-radius: 100%;
-}
-
-.layout-background {
-  background-size: cover;
-  background-repeat: no-repeat;
-  filter: brightness(35%);
-}
-
-.layout-preview {
-  position: absolute;
-  pointer-events: none;
-
-  border: 0 solid var(--primary-color);
-  transform: translate(0, calc(var(--instance-size) / 2));
-  transition: all 250ms;
-
-  height: 0;
-  width: calc((height / 9) * 16);
-  max-height: 40dvh;
-}
-
-.theme-instance:hover .layout-preview {
-  border: .1em solid var(--primary-color);
-  filter: drop-shadow(0 0 .2em var(--secondary-color));
-  transform: translate(3.5em, -4em);
-  
-  height: 40dvw;
-}
-
 .theme-title {
-  position: absolute;
-  
-  top: 0;
-  left: 0;
-  right: 0;
-  bottom: 0;
-  
-  width: 100%;
-  height: 100%;
-  
   font-size: .8em;
-  /* i CANNOT explain this line height calculation, but it works for a font size of .8em no matter what size the instances are */
-  line-height: calc(var(--instance-size) * 1.25); 
+  line-height: 5em; /* same height as the parent to centre it vertically */
 }
 </style>
diff --git a/components/Settings/UserSettings/Profile.vue b/components/Settings/UserSettings/Profile.vue
index 64b522e..5e85095 100644
--- a/components/Settings/UserSettings/Profile.vue
+++ b/components/Settings/UserSettings/Profile.vue
@@ -15,11 +15,8 @@
         <label for="profile-pronouns-input" class="subtitle">PRONOUNS</label>
         <input id="profile-pronouns-input" class="profile-data-input" type="text" v-model="user.pronouns" placeholder="Enter pronouns" />
         <label for="profile-about-me-input" class="subtitle">ABOUT ME</label>
-        <div id="profile-about-me-input" class="profile-data-input profile-textarea-input"
-          placeholder="About Me" maxlength="240" wrap="soft" rows="8"
-          autocorrect="off" spellcheck="true" contenteditable="true"
-          @keyup="handleAboutMeKeyUp" ref="aboutMeInput">
-        </div>
+        <input id="profile-about-me-input" class="profile-data-input" type="text" v-model="user.about" placeholder="About me" />
+
         <Button style="margin-top: 2dvh" text="Save Changes" :callback="saveChanges"></Button>
       </div>
 
@@ -45,7 +42,6 @@ import type { UserResponse } from '~/types/interfaces';
 let newPfpFile: File;
 const isCropPopupVisible = ref(false);
 const cropImageSrc = ref("")
-const aboutMeInput = ref<HTMLDivElement>()
 
 const { fetchUser } = useAuth();
 
@@ -129,12 +125,6 @@ function handleCrop(blob: Blob, url: string) {
 function closeCropPopup() {
   isCropPopupVisible.value = false
 }
-
-function handleAboutMeKeyUp(event: KeyboardEvent) {
-  if (user && aboutMeInput.value) {
-    user.about = aboutMeInput.value.innerText
-  }
-}
 </script>
 
 <style scoped>
@@ -149,9 +139,8 @@ function handleAboutMeKeyUp(event: KeyboardEvent) {
 
 .profile-data-input {
   min-width: 30dvw;
-  max-width: 30dvw;
   margin: 0.07dvh;
-  padding: .1em .7em;
+  padding: 0.1dvh 0.7dvw;
   height: 2.5em;
   font-size: 1em;
   border-radius: 8px;
@@ -160,12 +149,6 @@ function handleAboutMeKeyUp(event: KeyboardEvent) {
   background-color: var(--accent-color);
 }
 
-.profile-textarea-input {
-  padding: .6em .7em;
-
-  height: fit-content;
-}
-
 #profile-popup {
   margin-left: 2dvw;
 }
diff --git a/components/User/UserEntry.vue b/components/User/UserEntry.vue
index 09bf1ff..5abea85 100644
--- a/components/User/UserEntry.vue
+++ b/components/User/UserEntry.vue
@@ -1,18 +1,14 @@
 <template>
     <NuxtLink class="user-item" :href="`/me/${user.uuid}`" tabindex="0">
-        <Avatar :profile="props.user" class="user-avatar"/>
+        <Avatar :user="props.user" class="user-avatar"/>
 
-        <span class="user-display-name" :style="`color: ${generateIrcColor(props.user.uuid)}`">
-            {{ getDisplayName(props.user) }}
-        </span>
+        <span class="user-display-name">{{ getDisplayName(props.user) }}</span>
 	</NuxtLink>
 </template>
 
 <script lang="ts" setup>
 import type { UserResponse } from '~/types/interfaces';
 
-const { getDisplayName } = useProfile()
-
 const props = defineProps<{
     user: UserResponse
 }>();
@@ -40,7 +36,7 @@ const props = defineProps<{
 .user-avatar {
     min-width: 2.3em;
     max-width: 2.3em;
-    min-height: 2.3em;
+    min-width: 2.3em;
     max-height: 2.3em;
 }
 
diff --git a/components/User/UserPopup.vue b/components/User/UserPopup.vue
index 0c89d51..6674c9e 100644
--- a/components/User/UserPopup.vue
+++ b/components/User/UserPopup.vue
@@ -1,6 +1,6 @@
 <template>
   <div id="profile-popup">
-    <Avatar :profile="props.user" id="avatar"/>
+    <Avatar :user="props.user" id="avatar"/>
 
     <div id="cover-color"></div>
     <div id="main-body">
@@ -12,7 +12,7 @@
         <span v-if="props.user.pronouns"> - {{ props.user.pronouns }}</span>
       </p>
       <div id="about-me" v-if="props.user.about">
-        {{ props.user.about.trim() }}
+        {{ props.user.about }}
       </div>
     </div>
   </div>
@@ -21,8 +21,6 @@
 <script lang="ts" setup>
 import type { UserResponse } from '~/types/interfaces';
 
-const { getDisplayName } = useProfile()
-
 const props = defineProps<{
 	user: UserResponse
 }>();
@@ -80,16 +78,9 @@ const props = defineProps<{
 #about-me {
   background-color: var(--secondary-color);
   border-radius: 12px;
-  
+
   margin-top: 32px;
   padding: 16px;
   font-size: 16px;
-  
-  white-space: pre-line;
-  line-height: 1;
-  max-height: 7em; /* 7 x 1 */
-
-  overflow-y: auto;
-  overflow-x: hidden;
 }
 </style>
\ No newline at end of file
diff --git a/components/UserInterface/Button.vue b/components/UserInterface/Button.vue
index ad4cdb5..467b65e 100644
--- a/components/UserInterface/Button.vue
+++ b/components/UserInterface/Button.vue
@@ -1,7 +1,6 @@
 <template>
-	<button class="button" :class="props.variant + '-button'"
-	@click="props.callback ? props.callback() : null">
-			{{ props.text }}
+	<button @click="props.callback ? props.callback() : null" class="button" :class="props.variant + '-button'">
+		{{ props.text }}
 	</button>
 </template>
 
@@ -10,7 +9,7 @@
 const props = defineProps<{
 	text: string,
 	callback?: CallableFunction,
-	variant?: "normal" | "scary" | "neutral" | "stealth",
+	variant?: "normal" | "scary" | "neutral",
 }>();
 
 </script>
@@ -22,12 +21,11 @@ const props = defineProps<{
 	background-color: var(--primary-color);
 	color: var(--text-color);
 
-	padding: 0.35em 0.65em;
-	font-size: 1em;
-	
+	padding: 0.4em 0.75em;
+	font-size: 1.1em;
 	transition: background-color 0.2s;
 
-	border-radius: var(--standard-radius);
+	border-radius: 0.7rem;
 	text-decoration: none;
 	display: inline-block;
 
@@ -52,11 +50,4 @@ const props = defineProps<{
 	background-color: var(--accent-highlighted-color);
 }
 
-.stealth-button {
-	background-color: unset;
-}
-.stealth-button:hover {
-	background-color: unset;
-}
-
 </style>
\ No newline at end of file
diff --git a/components/UserInterface/ContextMenu.vue b/components/UserInterface/ContextMenu.vue
index 1767657..5342b8c 100644
--- a/components/UserInterface/ContextMenu.vue
+++ b/components/UserInterface/ContextMenu.vue
@@ -1,15 +1,11 @@
 <template>
-	<div id="context-menu">
-		<button v-for="item of props.menuItems" class="context-menu-item"
-				:class="'context-menu-item-' + item.type"
-				@click="runCallback(item)">
-			{{ item.name }} <Icon v-if="item.icon" :name="item.icon" />
-		</button>
+	<div v-for="item of props.menuItems" class="context-menu-item" @click="runCallback(item)">
+		{{ item.name }}
 	</div>
 </template>
 
 <script lang="ts" setup>
-import type { ContextMenuInterface, ContextMenuItem } from '~/types/interfaces';
+import type { ContextMenuItem } from '~/types/interfaces';
 
 const props = defineProps<{ menuItems: ContextMenuItem[], pointerX: number, pointerY: number }>();
 
@@ -23,8 +19,7 @@ onMounted(() => {
 
 
 function runCallback(item: ContextMenuItem) {
-	const contextMenu = useState<ContextMenuInterface>("contextMenu");
-	removeContextMenu(contextMenu);
+	removeContextMenu();
 	item.callback();
 }
 
@@ -36,33 +31,14 @@ function runCallback(item: ContextMenuItem) {
 	position: absolute;
 	display: flex;
 	flex-direction: column;
-	width: 10rem;
-	border: .1rem solid var(--reply-text-color);
-	background-color: var(--sidebar-highlighted-background-color);
-	text-align: left;
-	z-index: 100;
-}
-
-.context-menu-item {
-	display: flex;
-	align-items: center;
-	justify-content: space-between;
-	height: 2rem;
-	width: 100%;
-	color: var(--text-color);
-	background-color: var(--popup-background-color);
-	border: none;
-	text-align: left;
-	padding-left: 1rem;
-	padding-right: 1rem;
+	width: 10dvw;
+	border: .15rem solid cyan;
+	background-color: var(--background-color);
+	text-align: center;
 }
 
 .context-menu-item:hover {
-	background-color: var(--popup-highlighted-background-color);
-}
-
-.context-menu-item-danger {
-	color: var(--danger-text-color);
+	background-color: rgb(50, 50, 50);
 }
 
 </style>
\ No newline at end of file
diff --git a/components/UserInterface/HorizontalSpacer.vue b/components/UserInterface/HorizontalSpacer.vue
deleted file mode 100644
index cc95c92..0000000
--- a/components/UserInterface/HorizontalSpacer.vue
+++ /dev/null
@@ -1,12 +0,0 @@
-<template>
-  <span class="horizontal-spacer"></span>
-</template>
-
-<style scoped>
-.spacer {
-  display: block;
-  min-width: 0.2dvh;
-  margin: 0.2dvh 0.8dvw;
-  background-color: var(--padding-color);
-}
-</style>
diff --git a/components/UserInterface/MessageReply.vue b/components/UserInterface/MessageReply.vue
index f3214b5..f60c0bc 100644
--- a/components/UserInterface/MessageReply.vue
+++ b/components/UserInterface/MessageReply.vue
@@ -46,22 +46,11 @@ onMounted(async () => {
 function scrollToReply(e: MouseEvent) {
 	e.preventDefault();
 	console.log("clicked on reply box");
-	let replyId: string;
-	if (props.maxWidth == "reply") {
-		replyId = props.replyId;
-	} else {
-		replyId = props.id;
-	}
-	const reply = document.querySelector(`.message[data-message-id="${replyId}"]`);
-	if (reply instanceof HTMLDivElement) {
+	const reply = document.querySelector(`.message[data-message-id="${props.replyId}"]`);
+	if (reply) {
 		console.log("reply:", reply);
 		console.log("scrolling into view");
 		reply.scrollIntoView({ behavior: "smooth", block: "center" });
-		reply.style.transition = "background-color .3s";
-		reply.style.backgroundColor = "var(--chat-featured-message-color)";
-		setTimeout(() => {
-			reply.style.backgroundColor = "";
-		}, 1000);
 	}
 }
 
diff --git a/components/UserInterface/ResizableSidebar.vue b/components/UserInterface/ResizableSidebar.vue
index 79e95bd..c6acca2 100644
--- a/components/UserInterface/ResizableSidebar.vue
+++ b/components/UserInterface/ResizableSidebar.vue
@@ -21,7 +21,7 @@
 </template>
 
 <script lang="ts" setup>
-import type { ContextMenuInterface, ContextMenuItem } from '~/types/interfaces';
+import type { ContextMenuItem } from '~/types/interfaces';
 
 const props = defineProps<{ width?: string, minWidth: string, maxWidth: string, borderSides: "all" | "top" | "right" | "bottom" | "left" | ("top" | "right" | "bottom" | "left")[], localStorageName?: string }>();
 
@@ -31,10 +31,8 @@ const resizableSidebar = ref<HTMLDivElement>();
 const widthResizer = ref<HTMLDivElement>();
 const storedWidth = ref<string>();
 
-const contextMenu = useState<ContextMenuInterface>("contextMenu");
-
 const menuItems: ContextMenuItem[] = [
-	{ name: "Reset", type: "normal", callback: () => {
+	{ name: "Reset", callback: () => {
 		const defaultWidth = props.width ?? props.minWidth;
 		resizableSidebar.value!.style.width = defaultWidth;
 		if (props.localStorageName) {
@@ -50,7 +48,7 @@ onMounted(() => {
 		widthResizer.value.addEventListener("pointerdown", (e) => {
 			e.preventDefault();
 			if (e.button == 2) {
-				showContextMenu(e, contextMenu.value, menuItems);
+				createContextMenu(e, menuItems);
 				return
 			};
 			document.body.style.cursor = "ew-resize";
diff --git a/components/UserInterface/VerticalSpacer.vue b/components/UserInterface/VerticalSpacer.vue
index 9f0e304..8ac1bd6 100644
--- a/components/UserInterface/VerticalSpacer.vue
+++ b/components/UserInterface/VerticalSpacer.vue
@@ -1,11 +1,11 @@
 <template>
-  <span class="vertical-spacer"></span>
+  <span class="spacer"></span>
 </template>
 
 <style scoped>
-.vertical-spacer {
+.spacer {
+  height: 0.2dvh;
   display: block;
-  min-height: 0.2dvh;
   margin: 0.8dvh 0.2dvw;
   background-color: var(--padding-color);
 }
diff --git a/composables/api.ts b/composables/api.ts
index c949bc0..75a3811 100644
--- a/composables/api.ts
+++ b/composables/api.ts
@@ -1,4 +1,4 @@
-import type { ChannelResponse, GuildMemberResponse, GuildMembersResponse, GuildResponse, MessageResponse, StatsResponse, UserResponse } from "~/types/interfaces";
+import type { ChannelResponse, GuildMemberResponse, GuildResponse, MessageResponse, StatsResponse, UserResponse } from "~/types/interfaces";
 
 function ensureIsArray(list: any) {
 	if (Array.isArray(list)) {
@@ -21,10 +21,6 @@ export const useApi = () => {
 		return ensureIsArray(await fetchWithApi(`/me/guilds`));
 	}
 
-	async function fetchMe(): Promise<UserResponse | undefined> {
-		return await fetchWithApi("/me")
-	}
-
 	async function fetchChannels(guildId: string): Promise<ChannelResponse[]> {
 		return ensureIsArray(await fetchWithApi(`/guilds/${guildId}/channels`));
 	}
@@ -33,15 +29,8 @@ export const useApi = () => {
 		return await fetchWithApi(`/channels/${channelId}`)
 	}
 
-	async function fetchMembers(guildId: string, options?: { per_page?: number, page?: number }): Promise<GuildMembersResponse> {
-		const query = new URLSearchParams();
-		query.set("page", options?.page ? options.page.toString() : "1");
-		if (options?.per_page) {
-			query.set("per_page", options.per_page.toString());
-		}
-
-		console.log("members query:", query);
-		return await fetchWithApi(`/guilds/${guildId}/members?${query.toString()}`) as GuildMembersResponse;
+	async function fetchMembers(guildId: string): Promise<GuildMemberResponse[]> {
+		return ensureIsArray(await fetchWithApi(`/guilds/${guildId}/members`));
 	}
 
 	async function fetchMember(guildId: string, memberId: string): Promise<GuildMemberResponse | undefined> {
@@ -113,7 +102,6 @@ export const useApi = () => {
 		fetchGuilds,
 		fetchGuild,
 		fetchMyGuilds,
-		fetchMe,
 		fetchChannels,
 		fetchChannel,
 		fetchMembers,
diff --git a/composables/profile.ts b/composables/profile.ts
deleted file mode 100644
index f3515e6..0000000
--- a/composables/profile.ts
+++ /dev/null
@@ -1,95 +0,0 @@
-import type { GuildMemberResponse, UserResponse } from "~/types/interfaces"
-
-const { fetchFriends } = useApi();
-
-export const useProfile = () => {
-	function getAboutMe (profile: UserResponse | GuildMemberResponse): string | null {
-		if ("username" in profile) {
-			return profile.about
-		} else {
-			return profile.user.about
-		}
-	}
-
-	function getDisplayName (profile: UserResponse | GuildMemberResponse): string  {
-		if ("username" in profile) {
-			// assume it's a UserResponse
-			if (profile.display_name) return profile.display_name
-			return profile.username
-		} else {
-			// assume it's a GuildMemberResponse
-			if (profile.nickname) return profile.nickname
-			if (profile.user.display_name) return profile.user.display_name
-			return profile.user.username
-		}
-	}
-
-	async function getFriendsSince (profile: UserResponse | GuildMemberResponse): Promise<Date | null> {
-		let user_uuid: string;
-
-		if ("username" in profile) {
-			user_uuid = profile.uuid
-		} else {
-			user_uuid = profile.user.uuid
-		}
-
-		const friends = await fetchFriends()
-		const friend = friends.find(friend => friend.uuid === user_uuid);
-		if (friend?.friends_since) {
-			return new Date(friend.friends_since);
-		}
-
-		return null
-	}
-
-	function getGuildJoinDate (profile: UserResponse | GuildMemberResponse): Date | null {
-		if ("username" in profile) {
-			return null
-		} else {
-			return uuidToDate(profile.uuid)
-		}
-	}
-
-	function getPronouns (profile: UserResponse | GuildMemberResponse): string | null  {
-		if ("username" in profile) {
-			return profile.pronouns
-		} else {
-			return profile.user.pronouns
-		}
-	}
-
-	function getRegistrationDate (profile: UserResponse | GuildMemberResponse): Date | null {
-		if ("username" in profile) {
-			return uuidToDate(profile.uuid)
-		} else {
-			return uuidToDate(profile.user.uuid)
-		}
-	}
-
-	function getUsername (profile: UserResponse | GuildMemberResponse): string {
-		if ("username" in profile) {
-			return profile.username
-		} else {
-			return profile.user.username
-		}
-	}
-
-	function getUuid (profile: UserResponse | GuildMemberResponse): string | null {
-		if ("username" in profile) {
-			return profile.uuid
-		} else {
-			return profile.user.uuid
-		}
-	}
-	
-	return {
-		getAboutMe,
-		getDisplayName,
-		getFriendsSince,
-		getGuildJoinDate,
-		getRegistrationDate,
-		getPronouns,
-		getUsername,
-		getUuid		
-	}
-}
diff --git a/layouts/client.vue b/layouts/client.vue
index 800a097..d1477e1 100644
--- a/layouts/client.vue
+++ b/layouts/client.vue
@@ -17,15 +17,19 @@
 				</div>
 				<VerticalSpacer />
 				<div class="left-column-segment" id="left-column-middle">
-					<NuxtLink v-for="guild of guilds" :href="`/servers/${guild.uuid}`" id="guild-icon-container">
+					<NuxtLink v-for="guild of guilds" :href="`/servers/${guild.uuid}`">
 						<NuxtImg v-if="guild.icon"
 							class="sidebar-icon guild-icon"
 							:alt="guild.name"
 							:src="guild.icon" />
-						<DefaultIcon v-else 
-							class="sidebar-icon guild-icon" 
+						<NuxtImg v-else-if="!blockedCanvas"
+							class="sidebar-icon guild-icon"
 							:alt="guild.name"
-							:name="guild.name" :seed="guild.uuid"/>
+							:src="generateDefaultIcon(guild.name, guild.uuid)" />
+						<Icon v-else name="lucide:server"
+							:style="`color: ${generateIrcColor(guild.uuid, 50)}`"
+							class="sidebar-icon guild-icon"
+							:alt="guild.name" />
 					</NuxtLink>
 				</div>
 				<VerticalSpacer />
@@ -48,24 +52,20 @@
 <script lang="ts" setup>
 import { ModalBase } from '#components';
 import { render } from 'vue';
-import DefaultIcon from '~/components/DefaultIcon.vue';
 import GuildDropdown from '~/components/Guild/GuildDropdown.vue';
 import Loading from '~/components/Popups/Loading.vue';
 import Button from '~/components/UserInterface/Button.vue';
 import VerticalSpacer from '~/components/UserInterface/VerticalSpacer.vue';
 import type { GuildResponse } from '~/types/interfaces';
 
-definePageMeta({
-	keepalive: true
-});
-
 const loading = useState("loading", () => false);
 
 const createButtonContainer = ref<HTMLButtonElement>();
 
-const { getDisplayName } = useProfile()
 const api = useApi();
 
+const blockedCanvas = isCanvasBlocked()
+
 const options = [
 	{ name: "Join", value: "join", callback: async () => {
 			console.log("join guild!");
@@ -250,10 +250,6 @@ function createDropdown() {
 	height: var(--sidebar-icon-width);
 }
 
-#guild-icon-container {
-	text-decoration: none;
-}
-
 .guild-icon {
 	border-radius: var(--guild-icon-radius);
 }
diff --git a/nuxt.config.ts b/nuxt.config.ts
index 05a40fa..46890d1 100644
--- a/nuxt.config.ts
+++ b/nuxt.config.ts
@@ -30,6 +30,9 @@ export default defineNuxtConfig({
       messageGroupingMaxDifference: 300000,
       buildTimeString: new Date().toISOString(),
       gitHash: process.env.GIT_SHORT_REV || "N/A",
+      defaultThemes: [
+        "light", "ash", "dark", "rainbow-capitalism"
+      ]
     }
   },
   /* nitro: {
diff --git a/pages/servers/[serverId]/channels/[channelId].vue b/pages/servers/[serverId]/channels/[channelId].vue
index f07dabd..00d4ebe 100644
--- a/pages/servers/[serverId]/channels/[channelId].vue
+++ b/pages/servers/[serverId]/channels/[channelId].vue
@@ -77,8 +77,7 @@ onActivated(async () => {
 });
 
 async function setArrayVariables() {
-	const membersRes = await fetchMembers(route.params.serverId as string);
-	members.value = membersRes.objects;
+	members.value = sortMembers(await fetchMembers(route.params.serverId as string))
 	const guildUrl = `guilds/${route.params.serverId}`;
 	channels.value = await fetchWithApi(`${guildUrl}/channels`);
 	console.log("channels:", channels.value);
@@ -134,6 +133,13 @@ function handleMemberClick(member: GuildMemberResponse) {
 	text-overflow: ellipsis;
 }
 
+.member-avatar {
+    min-width: 2.3em;
+    max-width: 2.3em;
+    min-width: 2.3em;
+    max-height: 2.3em;
+}
+
 .member-display-name {
 	overflow: hidden;
 	text-overflow: ellipsis;
diff --git a/public/themes/ash.css b/public/themes/ash.css
new file mode 100644
index 0000000..94f5e85
--- /dev/null
+++ b/public/themes/ash.css
@@ -0,0 +1,28 @@
+:root {
+	--text-color: #f0e5e0;
+	--secondary-text-color: #e8e0db;
+	--reply-text-color: #969696;
+
+	--chat-background-color: #2f2e2d;
+    --chat-highlighted-background-color: #3f3b38;
+	--sidebar-background-color: #3e3a37;
+	--sidebar-highlighted-background-color: #46423b;
+	--topbar-background-color: #3a3733;
+	--chatbox-background-color: #3a3733;
+
+    --padding-color: #e0e0e0;
+
+	--primary-color: #f07028;
+	--primary-highlighted-color: #f28f4b;
+	--secondary-color: #683820;
+	--secondary-highlighted-color: #885830;
+	--accent-color: #a04b24;
+	--accent-highlighted-color: #b86038;
+
+	--sidebar-width: 2.5em;
+	--standard-radius: .5em;
+	--button-radius: .6em;
+	--guild-icon-radius: 20%;
+	--pfp-radius: 50%;
+	--preferred-font: Arial;
+}
\ No newline at end of file
diff --git a/public/themes/ash.json b/public/themes/ash.json
new file mode 100644
index 0000000..d5d2a59
--- /dev/null
+++ b/public/themes/ash.json
@@ -0,0 +1,6 @@
+{
+	"displayName": "Ash",
+	"previewGradient": "45deg, #2f2e2d, #46423b",
+	"complementaryColor": "white",
+	"themeUrl": "ash.css"
+}
\ No newline at end of file
diff --git a/public/themes/dark.css b/public/themes/dark.css
new file mode 100644
index 0000000..a228889
--- /dev/null
+++ b/public/themes/dark.css
@@ -0,0 +1,31 @@
+:root {
+	--text-color: #f7eee8;
+	--secondary-text-color: #f0e8e4;
+	--reply-text-color: #969696;
+
+	--chat-background-color: #1f1e1d;
+    --chat-highlighted-background-color: #2f2b28;
+	--sidebar-background-color: #2e2a27;
+	--sidebar-highlighted-background-color: #36322b;
+	--topbar-background-color: #2a2723;
+	--chatbox-background-color: #1a1713;
+
+    --padding-color: #484848;
+    
+	--primary-color: #f4741f;
+	--primary-highlighted-color: #f68a3f;
+	--secondary-color: #7c4018;
+	--secondary-highlighted-color: #8f5b2c;
+	--accent-color: #b35719;
+	--accent-highlighted-color: #c76a2e;
+
+	--sidebar-icon-width: 2.5em;
+	--sidebar-icon-gap: .25em;
+	--sidebar-margin: .5em;
+	
+	--standard-radius: .5em;
+	--button-radius: .6em;
+	--guild-icon-radius: 15%;
+	--pfp-radius: 50%;
+	--preferred-font: Arial;
+}
\ No newline at end of file
diff --git a/public/themes/dark.json b/public/themes/dark.json
new file mode 100644
index 0000000..4731d43
--- /dev/null
+++ b/public/themes/dark.json
@@ -0,0 +1,6 @@
+{
+	"displayName": "Dark",
+	"previewGradient": "45deg, #1f1e1d, #36322b",
+	"complementaryColor": "white",
+	"themeUrl": "dark.css"
+}
\ No newline at end of file
diff --git a/public/themes/style/description.css b/public/themes/description.css
similarity index 78%
rename from public/themes/style/description.css
rename to public/themes/description.css
index 972821c..e30025f 100644
--- a/public/themes/style/description.css
+++ b/public/themes/description.css
@@ -1,11 +1,4 @@
-/*
-displayName = Description
-previewGradient = 45deg, #ff8f8f, #8f8fff
-complementaryColor = black
-*/
-
 /* this is not a real theme, but rather a template for themes */
-
 :root {
 	--text-color: #161518;
 	--secondary-text-color: #2b2930;
@@ -13,12 +6,6 @@ complementaryColor = black
 
     --chat-background-color: #80808000;
     --chat-highlighted-background-color: #ffffff20;
-	--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;
-
 	--sidebar-background-color: #80808000;
 	--sidebar-highlighted-background-color: #ffffff20;
 	--topbar-background-color: #80808000;
@@ -33,6 +20,12 @@ complementaryColor = black
     --accent-color: #ff218c80;
     --accent-highlighted-color: #df1b6f80;
 
+	--sidebar-width: 2.5em;
+	--standard-radius: .5em;
+	--button-radius: .6em;
+	--pfp-radius: 50%;
+	--preferred-font: Arial;
+
     --optional-body-background: ; /* background element for the body */
     --optional-chat-background: ; /* background element for the chat box */
 	--optional-topbar-background: ; /* background element for the topbar */
diff --git a/public/themes/layout/gorb.css b/public/themes/layout/gorb.css
deleted file mode 100644
index 1cee0b4..0000000
--- a/public/themes/layout/gorb.css
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-displayName = Gorb
-previewImageUrl = gorb.jpg
-complementaryColor = white
-*/
-
-:root {
-	--sidebar-icon-width: 2.5em;
-	--sidebar-icon-gap: .25em;
-	--sidebar-margin: .5em;
-	
-	--minor-radius: .35em;
-	--standard-radius: .5em;
-	--button-radius: .6em;
-	--guild-icon-radius: 15%;
-	--pfp-radius: 50%;
-	--preferred-font: Arial;
-}
\ No newline at end of file
diff --git a/public/themes/layout/gorb.jpg b/public/themes/layout/gorb.jpg
deleted file mode 100644
index 301d459..0000000
Binary files a/public/themes/layout/gorb.jpg and /dev/null differ
diff --git a/public/themes/layout/layouts.json b/public/themes/layout/layouts.json
deleted file mode 100644
index 48c3932..0000000
--- a/public/themes/layout/layouts.json
+++ /dev/null
@@ -1,3 +0,0 @@
-[
-	"gorb.css"
-]
\ No newline at end of file
diff --git a/public/themes/style/light.css b/public/themes/light.css
similarity index 52%
rename from public/themes/style/light.css
rename to public/themes/light.css
index cd1f55b..556b64d 100644
--- a/public/themes/style/light.css
+++ b/public/themes/light.css
@@ -1,23 +1,10 @@
-/*
-displayName = Light
-previewGradient = 45deg, #f0ebe8, #d4d0ca
-complementaryColor = black
-*/
-
 :root {
 	--text-color: #170f08;
 	--secondary-text-color: #2f2b28;
 	--reply-text-color: #969696;
-	--danger-text-color: #ff0000;
-
-    --chat-background-color: #f0edeb;
-    --chat-highlighted-background-color: #aba8a4;
-    --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;
 
+    --chat-background-color: #f0ebe8;
+    --chat-highlighted-background-color: #e8e4e0;
 	--sidebar-background-color: #dbd8d4;
 	--sidebar-highlighted-background-color: #d4d0ca;
 	--topbar-background-color: #dfdbd6;
@@ -31,4 +18,10 @@ complementaryColor = black
     --secondary-highlighted-color: #f8b68a;
     --accent-color: #e68b4e;
     --accent-highlighted-color: #f69254;
+
+	--sidebar-width: 2.5em;
+	--standard-radius: .5em;
+	--button-radius: .6em;
+	--pfp-radius: 50%;
+	--preferred-font: Arial;
 }
\ No newline at end of file
diff --git a/public/themes/light.json b/public/themes/light.json
new file mode 100644
index 0000000..b95c78b
--- /dev/null
+++ b/public/themes/light.json
@@ -0,0 +1,6 @@
+{
+	"displayName": "Light",
+	"previewGradient": "45deg, #f0ebe8, #d4d0ca",
+	"complementaryColor": "black",
+	"themeUrl": "light.css"
+}
\ No newline at end of file
diff --git a/public/themes/style/rainbow-capitalism.css b/public/themes/rainbow-capitalism.css
similarity index 69%
rename from public/themes/style/rainbow-capitalism.css
rename to public/themes/rainbow-capitalism.css
index 8ca3ed7..ca73e1f 100644
--- a/public/themes/style/rainbow-capitalism.css
+++ b/public/themes/rainbow-capitalism.css
@@ -1,23 +1,10 @@
-/*
-displayName = Woke
-previewGradient = 45deg, #ed2224, #ed2224, #f35b22, #f99621, #f5c11e, #f1eb1b 27%, #f1eb1b, #f1eb1b 33%, #63c720, #0c9b49, #21878d, #3954a5, #61379b, #93288e, #93288e
-complementaryColor = white
-*/
-
 :root {
-	--text-color: #000000;
-	--secondary-text-color: #1f1f1f;
+	--text-color: #161518;
+	--secondary-text-color: #2b2930;
 	--reply-text-color: #969696;
-	--danger-text-color: #ff0000;
 
-    --chat-background-color: #b0b0b040;
+    --chat-background-color: #80808000;
     --chat-highlighted-background-color: #ffffff20;
-	--chat-important-background-color: #ff4f4f80;
-	--chat-important-highlighted-background-color: #ff6f6fa0;
-	--chat-featured-message-color: #4f8f4f80;
-	--popup-background-color: #80808080;
-	--popup-highlighted-background-color: #9f9f9f9f;
-
 	--sidebar-background-color: #80808000;
 	--sidebar-highlighted-background-color: #ffffff20;
 	--topbar-background-color: #80808000;
@@ -32,6 +19,12 @@ complementaryColor = white
     --accent-color: #ff218c80;
     --accent-highlighted-color: #df1b6f80;
 
+	--sidebar-width: 2.5em;
+	--standard-radius: .5em;
+	--button-radius: .6em;
+	--pfp-radius: 50%;
+	--preferred-font: Arial;
+
     /* --optional-body-background: background */
     --optional-body-background: linear-gradient(45deg, #ed222480, #ed222480, #ed222480, #ed222480, #ed222480, #ed222480, #f35b2280, #f9962180, #f5c11e80, #f1eb1b80, #f1eb1b80, #f1eb1b80, #63c72080, #0c9b4980, #21878d80, #3954a580, #61379b80, #93288e80);
 	--optional-topbar-background: linear-gradient(-12.5deg, cyan, pink, white, pink, cyan);
diff --git a/public/themes/rainbow-capitalism.json b/public/themes/rainbow-capitalism.json
new file mode 100644
index 0000000..e110ea2
--- /dev/null
+++ b/public/themes/rainbow-capitalism.json
@@ -0,0 +1,6 @@
+{
+	"displayName": "Woke",
+	"previewGradient": "45deg, #ed2224, #ed2224, #f35b22, #f99621, #f5c11e, #f1eb1b 27%, #f1eb1b, #f1eb1b 33%, #63c720, #0c9b49, #21878d, #3954a5, #61379b, #93288e, #93288e",
+	"complementaryColor": "white",
+	"themeUrl": "rainbow-capitalism.css"
+}
\ No newline at end of file
diff --git a/public/themes/style/ash.css b/public/themes/style/ash.css
deleted file mode 100644
index e33fbf6..0000000
--- a/public/themes/style/ash.css
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
-displayName = Ash
-previewGradient = 45deg, #2f2e2d, #46423b
-complementaryColor = white
-*/
-
-:root {
-	--text-color: #f0e5e0;
-	--secondary-text-color: #e8e0db;
-	--reply-text-color: #969696;
-	--danger-text-color: #ff0000;
-
-	--chat-background-color: #383432;
-    --chat-highlighted-background-color: #4c4a48;
-	--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;
-
-	--sidebar-background-color: #322f2d;
-	--sidebar-highlighted-background-color: #46423b;
-	--topbar-background-color: #3a3733;
-	--chatbox-background-color: #3a3733;
-
-    --padding-color: #4f4f4f;
-
-	--primary-color: #f07028;
-	--primary-highlighted-color: #f28f4b;
-	--secondary-color: #683820;
-	--secondary-highlighted-color: #885830;
-	--accent-color: #a04b24;
-	--accent-highlighted-color: #b86038;
-}
\ No newline at end of file
diff --git a/public/themes/style/dark.css b/public/themes/style/dark.css
deleted file mode 100644
index 420e8c9..0000000
--- a/public/themes/style/dark.css
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
-displayName = Dark
-previewGradient = 45deg, #1f1e1d, #36322b
-complementaryColor = white
-*/
-
-:root {
-	--text-color: #f7eee8;
-	--secondary-text-color: #f0e8e4;
-	--reply-text-color: #969696;
-	--danger-text-color: #ff0000;
-
-	--chat-background-color: #282624;
-    --chat-highlighted-background-color: #383430;
-	--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;
-
-	--sidebar-background-color: #1f1e1d;
-	--sidebar-highlighted-background-color: #2f2b28;
-	--topbar-background-color: #2a2723;
-	--chatbox-background-color: #1a1713;
-
-    --padding-color: #484848;
-    
-	--primary-color: #f4741f;
-	--primary-highlighted-color: #f68a3f;
-	--secondary-color: #7c4018;
-	--secondary-highlighted-color: #8f5b2c;
-	--accent-color: #b35719;
-	--accent-highlighted-color: #c76a2e;
-}
\ No newline at end of file
diff --git a/public/themes/style/styles.json b/public/themes/style/styles.json
deleted file mode 100644
index 955102e..0000000
--- a/public/themes/style/styles.json
+++ /dev/null
@@ -1,6 +0,0 @@
-[
-	"ash.css",
-	"dark.css",
-	"light.css",
-	"rainbow-capitalism.css"
-]
\ No newline at end of file
diff --git a/types/enums.ts b/types/enums.ts
deleted file mode 100644
index ac2daba..0000000
--- a/types/enums.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-export const enum Permission {
-	SendMessage = 1,
-	ManageChannel = 2,
-	ManageRole = 4,
-	CreateInvite = 8,
-	ManageInvite = 16,
-	ManageGuild = 32,
-	ManageMember = 64,
-	BanMember = 128,
-	KickMember = 256
-}
\ No newline at end of file
diff --git a/types/interfaces.ts b/types/interfaces.ts
index d175d76..2a05c38 100644
--- a/types/interfaces.ts
+++ b/types/interfaces.ts
@@ -19,24 +19,16 @@ export interface GuildResponse {
     description: string | null,
     icon: string | null,
     owner_uuid: string,
-    roles: RoleResponse[],
+    roles: [],
     member_count: number
 }
 
 export interface GuildMemberResponse {
 	uuid: string,
 	nickname: string,
+	user_uuid: string,
 	guild_uuid: string,
-	is_owner: boolean,
-	user: UserResponse,
-	roles: RoleResponse[]
-}
-
-export interface GuildMembersResponse {
-	objects: GuildMemberResponse[],
-	amount: number,
-	pages: number,
-	page: number
+	user: UserResponse
 }
 
 export interface ChannelResponse {
@@ -53,7 +45,7 @@ export interface MessageResponse {
 	user_uuid: string,
 	message: string,
 	reply_to: string | null,
-	member: GuildMemberResponse,
+	user: UserResponse,
 }
 
 export interface InviteResponse {
@@ -104,20 +96,10 @@ export interface ModalProps {
 	title?: string,
 	obscure?: boolean,
 	onClose?: () => void,
-	onCancel?: () => void,
-	onCloseButton?: () => void,
+	onCancel?: () => void
 }
 
 export interface ContextMenuItem {
 	name: string,
-	icon?: string,
-	type: "normal" | "danger"
 	callback: (...args: any[]) => any;
 }
-
-export interface ContextMenuInterface {
-	show: boolean,
-	pointerX: number,
-	pointerY: number,
-	items: ContextMenuItem[]
-}
diff --git a/types/props.ts b/types/props.ts
index 5796d83..9a8e642 100644
--- a/types/props.ts
+++ b/types/props.ts
@@ -1,9 +1,21 @@
 import type { MessageResponse, UserResponse } from "./interfaces";
 
 export interface MessageProps {
-	message: MessageResponse,
-	replyMessage?: MessageResponse,
+	class?: string,
+	img?: string | null,
+	author: UserResponse
+	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/types/settings.ts b/types/settings.ts
index 8d24904..28e3bfc 100644
--- a/types/settings.ts
+++ b/types/settings.ts
@@ -1,7 +1,6 @@
 export interface ClientSettings {
+	selectedThemeId?: string, // the ID of the theme, not the URL, for example "dark"
 	timeFormat?: TimeFormat
-	selectedThemeStyle?: string // URL
-	selectedThemeLayout?: string // URL
 }
 
 export interface TimeFormat {
diff --git a/utils/createContextMenu.ts b/utils/createContextMenu.ts
new file mode 100644
index 0000000..cf93a37
--- /dev/null
+++ b/utils/createContextMenu.ts
@@ -0,0 +1,21 @@
+import { render } from "vue";
+import ContextMenu from "~/components/UserInterface/ContextMenu.vue";
+import type { ContextMenuItem } from "~/types/interfaces";
+
+export default (e: PointerEvent | MouseEvent, menuItems: ContextMenuItem[]) => {
+  console.log("Rendering new context menu");
+  const menuContainer = document.createElement("div");
+  console.log("hello");
+  menuContainer.id = "context-menu";
+  document.body.appendChild(menuContainer);
+  console.log("pointer x:", e.clientX);
+  console.log("pointer y:", e.clientY);
+  console.log("menu items:", menuItems);
+  const contextMenu = h(ContextMenu, {
+  	menuItems,
+  	pointerX: e.clientX,
+  	pointerY: e.clientY 
+  });
+  render(contextMenu, menuContainer);
+  console.log("Rendered");
+}
diff --git a/utils/editMessage.ts b/utils/editMessage.ts
index d8ad005..5cc3ce8 100644
--- a/utils/editMessage.ts
+++ b/utils/editMessage.ts
@@ -1,12 +1,9 @@
 import type { MessageProps } from "~/types/props";
 
-const { fetchMe } = useApi()
-
 export default async (element: HTMLDivElement, props: MessageProps) => {
 	console.log("message:", element);
-	const me = await fetchMe();
-
-	if (me && props.author?.uuid == me.uuid) {
+	const me = await fetchWithApi("/me") as any;
+	if (props.author?.uuid == me.uuid) {
 		const text = element.getElementsByClassName("message-text")[0] as HTMLDivElement;
 		text.contentEditable = "true";
 		text.focus();
diff --git a/utils/generateDefaultIcon.ts b/utils/generateDefaultIcon.ts
new file mode 100644
index 0000000..1cc8d43
--- /dev/null
+++ b/utils/generateDefaultIcon.ts
@@ -0,0 +1,38 @@
+export default (name: string, seed: string): string => {
+	const canvas = document.createElement("canvas");
+	const ctx = canvas.getContext("2d");
+	if (canvas && ctx) {
+		canvas.width = 256;
+		canvas.height = 256;
+
+		// get the first char from every word in the guild name
+		let previewName = "";
+		if (name.length > 3) {
+			let guildName: string[] = name.split(' ')
+			for (let i = 0; i < 3; i ++) {
+				if (guildName.length > i) {
+					previewName += guildName[i].charAt(0)
+				} else {
+					break
+				}
+			}
+		} else {
+			previewName = name
+		}
+
+		// fill background using seeded colour
+		ctx.fillStyle = generateIrcColor(seed, 50)
+		ctx.fillRect(0, 0, 256, 256)
+
+		ctx.fillStyle = 'white'
+		ctx.textAlign = 'center'
+		ctx.textBaseline = 'middle'
+		ctx.font = `bold 96px Arial, Helvetica, sans-serif`
+		// 136 isn't actually centered, but it *looks* centered
+		ctx.fillText(previewName, 128, 136)
+
+		return canvas.toDataURL("image/png");
+	}
+
+	return "https://tenor.com/view/dame-da-ne-guy-kiryukazuma-kiryu-yakuza-yakuza-0-gif-14355451116903905918"
+}
\ No newline at end of file
diff --git a/utils/getDisplayName.ts b/utils/getDisplayName.ts
new file mode 100644
index 0000000..015edbc
--- /dev/null
+++ b/utils/getDisplayName.ts
@@ -0,0 +1,7 @@
+import type { GuildMemberResponse, UserResponse } from "~/types/interfaces";
+
+export default (user: UserResponse, member?: GuildMemberResponse): string => {
+	if (member?.nickname) return member.nickname
+	if (user.display_name) return user.display_name
+	return user.username
+}
\ No newline at end of file
diff --git a/utils/hasPermission.ts b/utils/hasPermission.ts
deleted file mode 100644
index 750716e..0000000
--- a/utils/hasPermission.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import type { Permission } from "~/types/enums";
-import type { GuildMemberResponse } from "~/types/interfaces";
-
-export default (member: GuildMemberResponse, permission: Permission) => {
-	for (const role of member.roles) {
-		if (role.permissions & permission) {
-			return true;
-		}
-	}
-	return false;
-}
diff --git a/utils/isCanvasBlocked.ts b/utils/isCanvasBlocked.ts
new file mode 100644
index 0000000..3bd191e
--- /dev/null
+++ b/utils/isCanvasBlocked.ts
@@ -0,0 +1,50 @@
+//
+// Canvas Blocker &								  
+// Firefox privacy.resistFingerprinting Detector. 
+// (c) 2018 // JOHN OZBAY // CRYPT.EE 			  
+// MIT License
+//
+export default () => {
+	// create a 1px image data
+	var blocked = false;
+	var canvas = document.createElement("canvas");
+	var ctx = canvas.getContext("2d");
+	
+	// some blockers just return an undefined ctx. So let's check that first. 
+	if (ctx) {
+		var imageData = ctx.createImageData(1,1);
+		var originalImageData  = imageData.data;
+
+		// set pixels to RGB 128
+		originalImageData[0]=128; 
+		originalImageData[1]=128; 
+		originalImageData[2]=128; 
+		originalImageData[3]=255;
+		
+		// set this to canvas
+		ctx.putImageData(imageData,1,1); 
+		
+		try {
+			// now get the data back from canvas.
+			var checkData = ctx.getImageData(1, 1, 1, 1).data;
+
+			// If this is firefox, and privacy.resistFingerprinting is enabled,
+			// OR a browser extension blocking the canvas, 
+			// This will return RGB all white (255,255,255) instead of the (128,128,128) we put.
+
+			// so let's check the R and G to see if they're 255 or 128 (matching what we've initially set)
+			if (originalImageData[0] !== checkData[0] && originalImageData[1] !== checkData[1]) {
+				blocked = true;
+				console.log("Canvas is blocked. Will display warning.");
+			}
+		} catch (error) {
+			// some extensions will return getImageData null. this is to account for that.
+			blocked = true;
+			console.log("Canvas is blocked. Will display warning.");
+		}
+	} else {
+		blocked = true;
+		console.log("Canvas is blocked. Will display warning.");
+	}
+	return blocked;
+}
\ No newline at end of file
diff --git a/utils/loadPreferredTheme.ts b/utils/loadPreferredTheme.ts
new file mode 100644
index 0000000..6eb8099
--- /dev/null
+++ b/utils/loadPreferredTheme.ts
@@ -0,0 +1,28 @@
+let themeLinkElement: HTMLLinkElement | null;
+
+export default function loadPreferredTheme() {
+  const currentTheme = settingsLoad().selectedThemeId ?? "dark"
+
+  if (themeLinkElement) {
+    themeLinkElement.href = getThemeUrl(currentTheme);
+  } else {
+    // create the theme link if one doesn't already exist
+    useHead({
+      link: [{
+        id: "main-theme",
+        rel: "stylesheet",
+        href: getThemeUrl(currentTheme)
+      }]
+    })
+
+    themeLinkElement = document.getElementById('main-theme') as HTMLLinkElement;
+  }
+}
+
+function getThemeUrl(id: string): string {
+  const runtimeConfig = useRuntimeConfig()
+  const baseURL = runtimeConfig.app.baseURL;
+
+  // this should preferrably use version hash, but that's not implemented yet
+  return `${baseURL}themes/${id}.css?v=${runtimeConfig.public.buildTimeString}`
+}
\ No newline at end of file
diff --git a/utils/loadPreferredThemes.ts b/utils/loadPreferredThemes.ts
deleted file mode 100644
index 00a4d1b..0000000
--- a/utils/loadPreferredThemes.ts
+++ /dev/null
@@ -1,52 +0,0 @@
-let styleLinkElement: HTMLLinkElement | null;
-let layoutLinkElement: HTMLLinkElement | null;
-
-
-export default () => {
-  const runtimeConfig = useRuntimeConfig()
-  const baseURL = runtimeConfig.app.baseURL;
-  
-  let currentStyle = settingsLoad().selectedThemeStyle ?? undefined
-  let currentLayout = settingsLoad().selectedThemeLayout ?? `${baseURL}themes/layout/gorb.css`
-
-  if (!currentStyle) {
-    if (prefersLight()) {
-      currentStyle = `${baseURL}themes/style/light.css`
-    } else {
-      currentStyle = `${baseURL}themes/style/dark.css`
-    }
-  }
-
-  if (styleLinkElement) {
-    styleLinkElement.href = currentStyle;
-  } else {
-    createStyleHead("style-theme", currentStyle)
-    styleLinkElement = document.getElementById('style-theme') as HTMLLinkElement;
-  }
-
-  if (layoutLinkElement) {
-    layoutLinkElement.href = currentLayout;
-  } else {
-    createStyleHead("style-layout", currentLayout)
-    layoutLinkElement = document.getElementById('style-layout') as HTMLLinkElement;
-  }
-}
-
-// create a new theme link if one doesn't already exist
-function createStyleHead(id: string, themeUrl: string) {
-  useHead({
-    link: [{
-      id: id,
-      rel: "stylesheet",
-      href: themeUrl
-    }]
-  })
-}
-
-function prefersLight(): boolean {
-  if (window.matchMedia && window.matchMedia('(prefers-color-scheme: light)').matches) {
-    return true
-  }
-
-  return false
-}
\ No newline at end of file
diff --git a/utils/removeContextMenu.ts b/utils/removeContextMenu.ts
index 7e10737..3b42c8b 100644
--- a/utils/removeContextMenu.ts
+++ b/utils/removeContextMenu.ts
@@ -1,12 +1,6 @@
-import type { ContextMenuInterface } from "~/types/interfaces";
-
-export default (contextMenu: Ref<ContextMenuInterface>) => {
-	console.log("resetting and hiding context menu");
-	contextMenu.value = {
-		show: false,
-		pointerX: 0,
-		pointerY: 0,
-		items: []
+export default () => {
+	const contextMenu = document.getElementById("context-menu");
+	if (contextMenu) {
+		contextMenu.remove();
 	}
-	console.log("hidden context menu");
 }
diff --git a/utils/replyToMessage.ts b/utils/replyToMessage.ts
index 1ff4df7..8ee0c28 100644
--- a/utils/replyToMessage.ts
+++ b/utils/replyToMessage.ts
@@ -2,19 +2,13 @@ import { render } from "vue";
 import MessageReply from "~/components/UserInterface/MessageReply.vue";
 import type { MessageProps } from "~/types/props";
 
-const { getDisplayName } = useProfile()
-
 export default (element: HTMLDivElement, props: MessageProps) => {
 	console.log("element:", element);
 	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}']`);
-		if (message) {
-			message.classList.add("replying-to");
-		}
 	}
 }
diff --git a/utils/showContextMenu.ts b/utils/showContextMenu.ts
deleted file mode 100644
index fdf5243..0000000
--- a/utils/showContextMenu.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { render } from "vue";
-import ContextMenu from "~/components/UserInterface/ContextMenu.vue";
-import type { ContextMenuInterface, ContextMenuItem } from "~/types/interfaces";
-
-export default (e: MouseEvent | PointerEvent, contextMenu: ContextMenuInterface, menuItems: ContextMenuItem[]) => {
-  console.log("Showing context menu");
-  contextMenu.show = true;
-  contextMenu.pointerX = e.clientX;
-  contextMenu.pointerY = e.clientY;
-  contextMenu.items = menuItems;
-  console.log("Showed");
-}
diff --git a/utils/sortMembers.ts b/utils/sortMembers.ts
index b232763..87a1a2a 100644
--- a/utils/sortMembers.ts
+++ b/utils/sortMembers.ts
@@ -1,8 +1,7 @@
 import type { GuildMemberResponse } from "~/types/interfaces";
-const { getDisplayName } = useProfile()
 
 export default (members: GuildMemberResponse[]): GuildMemberResponse[] => {
 	return members.sort((a, b) => {
-		return getDisplayName(a).localeCompare(getDisplayName(b))
+		return getDisplayName(a.user, a).localeCompare(getDisplayName(b.user, b))
 	})
 }
\ No newline at end of file
diff --git a/utils/sortUsers.ts b/utils/sortUsers.ts
index 83f5713..8708366 100644
--- a/utils/sortUsers.ts
+++ b/utils/sortUsers.ts
@@ -1,5 +1,4 @@
 import type { UserResponse } from "~/types/interfaces";
-const { getDisplayName } = useProfile()
 
 export default (users: UserResponse[]): UserResponse[] => {
 	return users.sort((a, b) => {
diff --git a/utils/uuidToDate.ts b/utils/uuidToDate.ts
deleted file mode 100644
index f0ab6f3..0000000
--- a/utils/uuidToDate.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export default (uuid: string): Date => {
-  const timeHex = uuid.substring(0, 8) + uuid.substring(9, 13);
-  const timestamp = parseInt(timeHex, 16);
-
-  return new Date(timestamp);
-}
\ No newline at end of file