diff --git a/app.vue b/app.vue
index 94244e0..9c8fb1c 100644
--- a/app.vue
+++ b/app.vue
@@ -65,7 +65,7 @@ useHead({
 <style>
 html,
 body {
-  font-family: var(--preferred-font), Arial, Helvetica, sans-serif;
+  font-family: Arial, Helvetica, sans-serif;
   box-sizing: border-box;
   color: var(--text-color);
 	background: var(--optional-body-background);
diff --git a/components/Avatar.vue b/components/Avatar.vue
deleted file mode 100644
index b2da51b..0000000
--- a/components/Avatar.vue
+++ /dev/null
@@ -1,46 +0,0 @@
-<template>
-	<NuxtImg v-if="displayAvatar" 
-		class="display-avatar"
-		:src="displayAvatar"
-		:alt="displayName" />
-	<Icon v-else
-		name="lucide:user"
-		:alt="displayName" />
-</template>
-
-<script lang="ts" setup>
-import { NuxtImg } from '#components';
-import type { GuildMemberResponse, UserResponse } from '~/types/interfaces';
-
-const props = defineProps<{
-	user?: UserResponse,
-	member?: GuildMemberResponse,
-}>();
-
-
-let displayName: string
-let displayAvatar: string | null
-
-const user = props.user || props.member?.user
-
-if (user) {
-	displayName = props.member?.nickname
-						|| user.display_name
-						|| user.username
-	
-	if (user.avatar) {
-		displayAvatar = user.avatar
-	} else if (!isCanvasBlocked()){
-		displayAvatar = generateDefaultIcon(displayName, user.uuid)
-	} else {
-		displayAvatar = null
-	}
-}
-
-</script>
-
-<style scoped>
-.display-avatar {
-	border-radius: var(--pfp-radius);
-}
-</style>
diff --git a/components/Me/DirectMessagesSidebar.vue b/components/Me/DirectMessagesSidebar.vue
index 7a92d39..cfe07fd 100644
--- a/components/Me/DirectMessagesSidebar.vue
+++ b/components/Me/DirectMessagesSidebar.vue
@@ -13,7 +13,7 @@
 			<VerticalSpacer />
 			
 			<div id="direct-message-list">
-				<UserEntry v-for="user of friends" :user="user"
+				<UserEntry v-for="user of friends" :user="user" :name="user.display_name || user.username"
 						:href="`/me/${user.uuid}`"/> 
 			</div>
 		</div>
diff --git a/components/Guild/MemberEntry.vue b/components/Member/MemberEntry.vue
similarity index 78%
rename from components/Guild/MemberEntry.vue
rename to components/Member/MemberEntry.vue
index bd4302a..1ea4170 100644
--- a/components/Guild/MemberEntry.vue
+++ b/components/Member/MemberEntry.vue
@@ -1,6 +1,7 @@
 <template>
     <div class="member-item" @click="togglePopup" @blur="hidePopup" tabindex="0">
-        <Avatar :member="props.member" class="member-avatar"/>
+        <img v-if="props.member.user.avatar" class="member-avatar" :src="props.member.user.avatar" :alt="props.member.user.display_name ?? props.member.user.username" />
+        <Icon v-else class="member-avatar" name="lucide:user" />
         <span class="member-display-name">{{ props.member.user.display_name || props.member.user.username }}</span>
         <UserPopup v-if="isPopupVisible" :user="props.member.user" id="profile-popup" />
     </div>
diff --git a/components/Message.vue b/components/Message.vue
index 919120d..06dc9cb 100644
--- a/components/Message.vue
+++ b/components/Message.vue
@@ -8,10 +8,14 @@
 				viewBox="0 0 150 87.5" version="1.1" id="svg1"
 				style="overflow: visible;">
 				<defs id="defs1" />
-				<g id="layer1"
+				<defs
+					id="defs1" />
+				<g
+					id="layer1"
 					transform="translate(40,-35)">
-					<g id="g3"
-						transform="translate(-35,-20)">
+					<g
+					id="g3"
+					transform="translate(-35,-20)">
 					<path
 						style="stroke:var(--reply-text-color);stroke-width:8;stroke-opacity:1"
 						d="m 120.02168,87.850978 100.76157,2.4e-5"
@@ -24,17 +28,16 @@
 				</g>
 			</svg>
 		</div>
-		<MessageReply v-if="props.replyMessage" :id="props.message.uuid"
-			:author="props.replyMessage.user.display_name || props.replyMessage.user.username"
-			:text="props.replyMessage?.message"
-			:reply-id="props.replyMessage.uuid" max-width="reply" />
+		<MessageReply v-if="props.replyMessage" :author="props.replyMessage.user.display_name || props.replyMessage.user.username" :text="props.replyMessage?.message"
+			:id="props.message.uuid" :reply-id="props.replyMessage.uuid" max-width="reply" />
 		<div class="left-column">
-			<Avatar :user="props.author" class="message-author-avatar"/>
+			<img v-if="props.img" class="message-author-avatar" :src="props.img" :alt="author?.display_name || author?.username" />
+			<Icon v-else name="lucide:user" class="message-author-avatar" />
 		</div>
 		<div class="message-data">
 			<div class="message-metadata">
 				<span class="message-author-username" tabindex="0" :style="`color: ${props.authorColor}`">
-					{{ displayName }}
+					{{ author?.display_name || author?.username }}
 				</span>
 				<span class="message-date" :title="date.toString()">
 					<span v-if="getDayDifference(date, currentDate) === 1">Yesterday at</span>
@@ -78,7 +81,6 @@ const dateHidden = ref<boolean>(true);
 
 const date = new Date(props.timestamp);
 const currentDate: Date = new Date()
-const displayName = props.author?.display_name || props.author?.username
 
 console.log("[MSG] message to render:", props.message);
 console.log("author:", props.author);
@@ -223,6 +225,7 @@ function getDayDifference(date1: Date, date2: Date) {
 
 .message-author-avatar {
 	width: 100%;
+	border-radius: 50%;
 }
 
 .left-column {
diff --git a/components/MessageArea.vue b/components/MessageArea.vue
index aadc07c..9a8f17f 100644
--- a/components/MessageArea.vue
+++ b/components/MessageArea.vue
@@ -42,7 +42,6 @@
 <script lang="ts" setup>
 import type { MessageResponse, ScrollPosition, UserResponse } from '~/types/interfaces';
 import scrollToBottom from '~/utils/scrollToBottom';
-import { generateIrcColor } from '#imports';
 
 const props = defineProps<{ channelUrl: string, amount?: number, offset?: number }>();
 
diff --git a/components/User/UserEntry.vue b/components/User/UserEntry.vue
index 1817816..b463759 100644
--- a/components/User/UserEntry.vue
+++ b/components/User/UserEntry.vue
@@ -1,8 +1,8 @@
 <template>
     <NuxtLink class="user-item" :href="`/me/${user.uuid}`" tabindex="0">
-        <Avatar :user="props.user" class="user-avatar"/>
-
-        <span class="user-display-name">{{ displayName }}</span>
+        <img v-if="props.user.avatar" class="user-avatar" :src="props.user.avatar" :alt="props.user.display_name ?? props.user.username" />
+        <Icon v-else class="user-avatar" name="lucide:user" />
+        <span class="user-display-name">{{ props.user.display_name || props.user.username }}</span>
 	</NuxtLink>
 </template>
 
@@ -12,8 +12,6 @@ import type { UserResponse } from '~/types/interfaces';
 const props = defineProps<{
     user: UserResponse
 }>();
-
-const displayName = props.user.display_name || props.user.username
 </script>
 
 <style>
@@ -37,5 +35,6 @@ const displayName = props.user.display_name || props.user.username
 .user-avatar {
     width: 2.3em;
     height: 2.3em;
+    border-radius: 50%;
 }
 </style>
diff --git a/components/User/UserPopup.vue b/components/User/UserPopup.vue
index f43d6d1..a3a15cb 100644
--- a/components/User/UserPopup.vue
+++ b/components/User/UserPopup.vue
@@ -1,6 +1,7 @@
 <template>
   <div id="profile-popup">
-    <Avatar :user="props.user" id="avatar"/>
+    <img v-if="props.user.avatar" id="avatar" :src="props.user.avatar" alt="profile avatar">
+    <Icon v-else id="avatar" name="lucide:user" />
 
     <div id="cover-color"></div>
     <div id="main-body">
diff --git a/layouts/client.vue b/layouts/client.vue
index 887dd47..65de20a 100644
--- a/layouts/client.vue
+++ b/layouts/client.vue
@@ -18,18 +18,8 @@
 				<VerticalSpacer />
 				<div class="left-column-segment" id="left-column-middle">
 					<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" />
-						<NuxtImg v-else-if="!blockedCanvas"
-							class="sidebar-icon guild-icon"
-							:alt="guild.name"
-							: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" />
+						<NuxtImg v-if="guild.icon" class="sidebar-icon" :src="guild.icon" :alt="guild.name"/>
+						<Icon v-else name="lucide:server" class="sidebar-icon white" :alt="guild.name" />
 					</NuxtLink>
 				</div>
 				<VerticalSpacer />
@@ -63,8 +53,6 @@ const createButtonContainer = ref<HTMLButtonElement>();
 
 const api = useApi();
 
-const blockedCanvas = isCanvasBlocked()
-
 const options = [
 	{ name: "Join", value: "join", callback: async () => {
 			console.log("join guild!");
@@ -218,8 +206,8 @@ function createDropdown() {
 	display: flex;
 	flex-direction: column;
 
-	padding-left: var(--sidebar-margin);
-	padding-right: var(--sidebar-margin);
+	padding-left: .25em;
+	padding-right: .25em;
 	padding-top: .5em;
 	
 	background: var(--optional-sidebar-background);
@@ -240,7 +228,6 @@ function createDropdown() {
 #left-column-middle {
 	overflow-y: scroll;
 	flex-grow: 1;
-	gap: var(--sidebar-icon-gap);
 }
 
 #middle-left-column {
@@ -254,16 +241,12 @@ function createDropdown() {
 }
 
 #home-button {
-	height: var(--sidebar-icon-width);
-}
-
-.guild-icon {
-	border-radius: var(--guild-icon-radius);
+	height: var(--sidebar-width);
 }
 
 .sidebar-icon {
-	width: var(--sidebar-icon-width);
-	height: var(--sidebar-icon-width);
+	width: var(--sidebar-width);
+	height: var(--sidebar-width);
 }
 
 .sidebar-bottom-buttons {
diff --git a/pages/servers/[serverId]/channels/[channelId].vue b/pages/servers/[serverId]/channels/[channelId].vue
index 8915c72..d9f6d97 100644
--- a/pages/servers/[serverId]/channels/[channelId].vue
+++ b/pages/servers/[serverId]/channels/[channelId].vue
@@ -26,7 +26,7 @@
 <script lang="ts" setup>
 import ChannelEntry from "~/components/Guild/ChannelEntry.vue";
 import GuildOptionsMenu from "~/components/Guild/GuildOptionsMenu.vue";
-import MemberEntry from "~/components/Guild/MemberEntry.vue";
+import MemberEntry from "~/components/Member/MemberEntry.vue";
 import type { ChannelResponse, GuildMemberResponse, GuildResponse, MessageResponse } from "~/types/interfaces";
 
 const route = useRoute();
diff --git a/public/themes/ash.css b/public/themes/ash.css
index 94f5e85..d1f09c8 100644
--- a/public/themes/ash.css
+++ b/public/themes/ash.css
@@ -12,17 +12,15 @@
 
     --padding-color: #e0e0e0;
 
+	--sidebar-width: 2.5em;
+	--standard-radius: .5em;
+	--button-radius: .6em;
+	--pfp-radius: 100%;
+    
 	--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/dark.css b/public/themes/dark.css
index a228889..6160194 100644
--- a/public/themes/dark.css
+++ b/public/themes/dark.css
@@ -19,13 +19,8 @@
 	--accent-color: #b35719;
 	--accent-highlighted-color: #c76a2e;
 
-	--sidebar-icon-width: 2.5em;
-	--sidebar-icon-gap: .25em;
-	--sidebar-margin: .5em;
-	
+	--sidebar-width: 2.5em;
 	--standard-radius: .5em;
 	--button-radius: .6em;
-	--guild-icon-radius: 15%;
-	--pfp-radius: 50%;
-	--preferred-font: Arial;
+	--pfp-radius: 100%;
 }
\ No newline at end of file
diff --git a/public/themes/description.css b/public/themes/description.css
index e30025f..f3738a5 100644
--- a/public/themes/description.css
+++ b/public/themes/description.css
@@ -23,8 +23,7 @@
 	--sidebar-width: 2.5em;
 	--standard-radius: .5em;
 	--button-radius: .6em;
-	--pfp-radius: 50%;
-	--preferred-font: Arial;
+	--pfp-radius: 100%;
 
     --optional-body-background: ; /* background element for the body */
     --optional-chat-background: ; /* background element for the chat box */
diff --git a/public/themes/light.css b/public/themes/light.css
index 556b64d..d11f5f5 100644
--- a/public/themes/light.css
+++ b/public/themes/light.css
@@ -11,6 +11,11 @@
 	--chatbox-background-color: #dfdbd6;
 
     --padding-color: #484848;
+
+    --sidebar-width: 2.5em;
+	--standard-radius: .5em;
+	--button-radius: .6em;
+	--pfp-radius: 100%;
     
     --primary-color: #df5f0b;
     --primary-highlighted-color: #ef6812;
@@ -18,10 +23,4 @@
     --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/rainbow-capitalism.css b/public/themes/rainbow-capitalism.css
index ca73e1f..1a5197b 100644
--- a/public/themes/rainbow-capitalism.css
+++ b/public/themes/rainbow-capitalism.css
@@ -19,11 +19,10 @@
     --accent-color: #ff218c80;
     --accent-highlighted-color: #df1b6f80;
 
-	--sidebar-width: 2.5em;
+    --sidebar-width: 2.5em;
 	--standard-radius: .5em;
 	--button-radius: .6em;
-	--pfp-radius: 50%;
-	--preferred-font: Arial;
+	--pfp-radius: 100%;
 
     /* --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);
diff --git a/types/props.ts b/types/props.ts
index 9a8e642..fe2b049 100644
--- a/types/props.ts
+++ b/types/props.ts
@@ -3,7 +3,7 @@ import type { MessageResponse, UserResponse } from "./interfaces";
 export interface MessageProps {
 	class?: string,
 	img?: string | null,
-	author: UserResponse
+	author?: UserResponse
 	text: string,
 	timestamp: number,
 	format: "12" | "24",
diff --git a/utils/generateDefaultIcon.ts b/utils/generateDefaultIcon.ts
deleted file mode 100644
index 0260830..0000000
--- a/utils/generateDefaultIcon.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-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'
-		const root = document.documentElement;
-		const preferredFont = getComputedStyle(root).getPropertyValue("--preferred-font");
-		ctx.font = `bold 96px ${preferredFont}, 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/generateIrcColor.ts b/utils/generateIrcColor.ts
index 03a30e7..24d4946 100644
--- a/utils/generateIrcColor.ts
+++ b/utils/generateIrcColor.ts
@@ -5,9 +5,11 @@ let h64: CallableFunction;
 	h64 = (await xxhash()).h64;
 })();
 
-export default (seed: string, saturation: number = 100, lightness: number = 50): string => {
-	const idHash = useState(`h64Hash-${seed}`, () => h64(seed))
-	const hashValue: bigint = idHash.value
+export default (seed: string): string => {
+	const lightness = 50
+	
+	// this should probably be cached eventually
+	const idHash = h64(seed)
 
-	return `hsl(${hashValue % 360n}, ${saturation}%, ${lightness}%)`
+	return `hsl(${idHash % 360n}, 100%, ${lightness}%)`
 }
\ No newline at end of file
diff --git a/utils/isCanvasBlocked.ts b/utils/isCanvasBlocked.ts
deleted file mode 100644
index 3bd191e..0000000
--- a/utils/isCanvasBlocked.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-//
-// 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