41 changed files with 303 additions and 578 deletions
--- a/app.vue
+++ b/app.vue
@ -9,13 +9,14 @@
 <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) => {
--- 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);
+	}
 }
--- 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 {
--- a/components/Guild/MemberEntry.vue
+++ b/components/Guild/MemberEntry.vue
@ -1,9 +1,7 @@
 <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>
+        <span class="member-display-name">{{ getDisplayName(props.member) }}</span>
    </div>
    <ModalProfilePopup v-if="modalPopupVisible" :profile="props.member"
        :onFinish="hideModalPopup" :keepalive="false"/>
--- 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?.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?.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,12 +269,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 {
@ -310,9 +298,8 @@ function getDayDifference(date1: Date, date2: Date) {

 <style>

-/* class used in utils/replyToMessage.ts */
 .replying-to {
-	background-color: var(--chat-featured-message-color);
+	background-color: var(--primary-highlighted-color);
 }

 </style>
--- 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.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 {
--- 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>
--- 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);
    }
--- a/components/Modal/ProfilePopup.vue
+++ b/components/Modal/ProfilePopup.vue
@ -214,21 +214,8 @@ function buttonEditProfile() {
 	
 	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;
 }


--- 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>
--- 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;
 }
--- a/components/User/UserEntry.vue
+++ b/components/User/UserEntry.vue
@ -2,9 +2,7 @@
    <NuxtLink class="user-item" :href="`/me/${user.uuid}`" tabindex="0">
        <Avatar :profile="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>

--- a/components/User/UserPopup.vue
+++ b/components/User/UserPopup.vue
@ -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>
@ -84,12 +84,5 @@ const props = defineProps<{
  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>
--- a/components/UserInterface/ContextMenu.vue
+++ b/components/UserInterface/ContextMenu.vue
@ -50,7 +50,7 @@ function runCallback(item: ContextMenuItem) {
 	height: 2rem;
 	width: 100%;
 	color: var(--text-color);
-	background-color: var(--popup-background-color);
+	background-color: var(--sidebar-highlighted-background-color);
 	border: none;
 	text-align: left;
 	padding-left: 1rem;
@ -58,7 +58,7 @@ function runCallback(item: ContextMenuItem) {
 }

 .context-menu-item:hover {
-	background-color: var(--popup-highlighted-background-color);
+	background-color: rgb(50, 50, 50);
 }

 .context-menu-item-danger {
--- a/components/UserInterface/MessageReply.vue
+++ b/components/UserInterface/MessageReply.vue
@ -58,7 +58,7 @@ function scrollToReply(e: MouseEvent) {
 		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)";
+		reply.style.backgroundColor = "var(--primary-highlighted-color)";
 		setTimeout(() => {
 			reply.style.backgroundColor = "";
 		}, 1000);
--- a/components/UserInterface/ResizableSidebar.vue
+++ b/components/UserInterface/ResizableSidebar.vue
@ -34,7 +34,7 @@ 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) {
--- 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: {
--- a/pages/servers/[serverId]/channels/[channelId].vue
+++ b/pages/servers/[serverId]/channels/[channelId].vue
@ -79,6 +79,8 @@ onActivated(async () => {
 async function setArrayVariables() {
 	const membersRes = await fetchMembers(route.params.serverId as string);
 	members.value = membersRes.objects;
+	members.value = await fetchMembers(route.params.serverId as string);
+	console.log("Placeholder count:", totalMemberCount.value);
 	const guildUrl = `guilds/${route.params.serverId}`;
 	channels.value = await fetchWithApi(`${guildUrl}/channels`);
 	console.log("channels:", channels.value);
--- a/public/themes/ash.css
+++ b/public/themes/ash.css
@ -0,0 +1,29 @@
+:root {
+	--text-color: #f0e5e0;
+	--secondary-text-color: #e8e0db;
+	--reply-text-color: #969696;
+	--danger-text-color: #ff0000;
+
+	--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;
+}
--- a/public/themes/ash.json
+++ b/public/themes/ash.json
@ -0,0 +1,6 @@
+{
+	"displayName": "Ash",
+	"previewGradient": "45deg, #2f2e2d, #46423b",
+	"complementaryColor": "white",
+	"themeUrl": "ash.css"
+}
--- a/public/themes/dark.css
+++ b/public/themes/dark.css
@ -0,0 +1,32 @@
+:root {
+	--text-color: #f7eee8;
+	--secondary-text-color: #f0e8e4;
+	--reply-text-color: #969696;
+	--danger-text-color: #ff0000;
+
+	--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;
+}
--- a/public/themes/dark.json
+++ b/public/themes/dark.json
@ -0,0 +1,6 @@
+{
+	"displayName": "Dark",
+	"previewGradient": "45deg, #1f1e1d, #36322b",
+	"complementaryColor": "white",
+	"themeUrl": "dark.css"
+}
--- a/public/themes/style/description.css
+++ b/public/themes/style/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 */
--- a/public/themes/layout/gorb.css
+++ b/public/themes/layout/gorb.css
@ -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;
-}
--- a/public/themes/layout/gorb.jpg
+++ b/public/themes/layout/gorb.jpg
--- a/public/themes/layout/layouts.json
+++ b/public/themes/layout/layouts.json
@ -1,3 +0,0 @@
-[
-	"gorb.css"
-]
--- a/public/themes/style/light.css
+++ b/public/themes/style/light.css
@ -1,23 +1,11 @@
-/*
-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 +19,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;
 }
--- a/public/themes/light.json
+++ b/public/themes/light.json
@ -0,0 +1,6 @@
+{
+	"displayName": "Light",
+	"previewGradient": "45deg, #f0ebe8, #d4d0ca",
+	"complementaryColor": "black",
+	"themeUrl": "light.css"
+}
--- a/public/themes/style/rainbow-capitalism.css
+++ b/public/themes/style/rainbow-capitalism.css
@ -1,23 +1,11 @@
-/*
-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 +20,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);
--- a/public/themes/rainbow-capitalism.json
+++ 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"
+}
--- a/public/themes/style/ash.css
+++ b/public/themes/style/ash.css
@ -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;
-}
--- a/public/themes/style/dark.css
+++ b/public/themes/style/dark.css
@ -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;
-}
--- a/public/themes/style/styles.json
+++ b/public/themes/style/styles.json
@ -1,6 +0,0 @@
-[
-	"ash.css",
-	"dark.css",
-	"light.css",
-	"rainbow-capitalism.css"
-]
--- a/types/enums.ts
+++ b/types/enums.ts
@ -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
-}
--- a/types/interfaces.ts
+++ b/types/interfaces.ts
@ -19,17 +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[]
+	user: UserResponse
 }

 export interface GuildMembersResponse {
--- 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,
 }
--- 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 {
--- a/utils/hasPermission.ts
+++ b/utils/hasPermission.ts
@ -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;
-}
--- a/utils/loadPreferredTheme.ts
+++ 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}`
+}
--- a/utils/loadPreferredThemes.ts
+++ b/utils/loadPreferredThemes.ts
@ -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
-}
--- a/utils/replyToMessage.ts
+++ b/utils/replyToMessage.ts
@ -2,14 +2,12 @@ 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}']`);