I love breaking changes!!!!

33 files changed, 187 insertions, 183 deletions

diff --git a/src/listeners/bush/joinAutoBan.ts b/src/listeners/bush/joinAutoBan.ts
index 421e708..5ded5b4 100644
--- a/src/listeners/bush/joinAutoBan.ts
+++ b/src/listeners/bush/joinAutoBan.ts
@@ -40,7 +40,7 @@ export default class JoinAutoBanListener extends BushListener {
 							color: client.consts.colors.red,
 							author: {
 								name: member.user.tag,
-								iconURL: member.displayAvatarURL()
+								icon_url: member.displayAvatarURL()
 							}
 						}
 					]
diff --git a/src/listeners/bush/userUpdateAutoBan.ts b/src/listeners/bush/userUpdateAutoBan.ts
index 67d9f5c..97fcf48 100644
--- a/src/listeners/bush/userUpdateAutoBan.ts
+++ b/src/listeners/bush/userUpdateAutoBan.ts
@@ -46,7 +46,7 @@ export default class UserUpdateAutoBanListener extends BushListener {
 							color: client.consts.colors.red,
 							author: {
 								name: member.user.tag,
-								iconURL: member.displayAvatarURL()
+								icon_url: member.displayAvatarURL()
 							}
 						}
 					]
diff --git a/src/listeners/commands/commandBlocked.ts b/src/listeners/commands/commandBlocked.ts
index 2dfe4cd..c80b99a 100644
--- a/src/listeners/commands/commandBlocked.ts
+++ b/src/listeners/commands/commandBlocked.ts
@@ -116,7 +116,9 @@ export default class CommandBlockedListener extends BushListener {
 
 		// some inhibitors do not have message.util yet
 		function respond(content: string | MessagePayload | ReplyMessageOptions | InteractionReplyOptions) {
-			return message.util ? message.util.reply(content) : message.reply(content);
+			return message.util
+				? message.util.reply(<string | MessagePayload | ReplyMessageOptions>content)
+				: message.reply(<string | MessagePayload | (ReplyMessageOptions & InteractionReplyOptions)>content);
 		}
 	}
 }
diff --git a/src/listeners/commands/commandError.ts b/src/listeners/commands/commandError.ts
index 44d20a4..bd1ae7d 100644
--- a/src/listeners/commands/commandError.ts
+++ b/src/listeners/commands/commandError.ts
@@ -1,7 +1,7 @@
 import { type BushCommandHandlerEvents } from '#lib';
 import { Severity } from '@sentry/types';
 import { type AkairoMessage, type Command } from 'discord-akairo';
-import { Formatters, GuildTextBasedChannel, MessageEmbed, type Message } from 'discord.js';
+import { Embed, Formatters, GuildTextBasedChannel, type Message } from 'discord.js';
 import { BushListener } from '../../lib/extensions/discord-akairo/BushListener.js';
 
 export default class CommandErrorListener extends BushListener {
@@ -90,7 +90,7 @@ export default class CommandErrorListener extends BushListener {
 					channel?: string;
 			  }
 			| { error: Error | any; type: 'uncaughtException' | 'unhandledRejection'; context?: string }
-	): Promise<MessageEmbed> {
+	): Promise<Embed> {
 		const _haste = CommandErrorListener.getErrorHaste(options.error);
 		const _stack = CommandErrorListener.getErrorStack(options.error);
 		const [haste, stack] = await Promise.all([_haste, _stack]);
@@ -118,8 +118,8 @@ export default class CommandErrorListener extends BushListener {
 					haste: string[];
 					stack: string;
 			  }
-	): MessageEmbed {
-		const embed = new MessageEmbed().setColor(util.colors.error).setTimestamp();
+	): Embed {
+		const embed = new Embed().setColor(util.colors.error).setTimestamp();
 		if (options.type === 'command-user') {
 			return embed
 				.setTitle('An Error Occurred')
@@ -143,7 +143,7 @@ export default class CommandErrorListener extends BushListener {
 
 		description.push(...options.haste);
 
-		embed.addField('Stack Trace', options.stack).setDescription(description.join('\n'));
+		embed.addField({ name: 'Stack Trace', value: options.stack }).setDescription(description.join('\n'));
 
 		if (options.type === 'command-dev' || options.type === 'command-log')
 			embed.setTitle(`${options.isSlash ? 'Slash ' : ''}CommandError #\`${options.errorNum}\``);
diff --git a/src/listeners/guild-custom/bushLockdown.ts b/src/listeners/guild-custom/bushLockdown.ts
index d48ddf1..f3e72e7 100644
--- a/src/listeners/guild-custom/bushLockdown.ts
+++ b/src/listeners/guild-custom/bushLockdown.ts
@@ -1,5 +1,5 @@
 import { BushListener, type BushClientEvents } from '#lib';
-import { MessageEmbed } from 'discord.js';
+import { Embed } from 'discord.js';
 
 export default class BushLockdownListener extends BushListener {
 	public constructor() {
@@ -14,19 +14,19 @@ export default class BushLockdownListener extends BushListener {
 		const logChannel = await moderator.guild.getLogChannel('moderation');
 		if (!logChannel) return;
 
-		const logEmbed = new MessageEmbed()
+		const logEmbed = new Embed()
 			.setColor(util.colors.discord.BLURPLE)
 			.setTimestamp()
-			.addField('**Action**', `${'Lockdown'}`)
-			.addField('**Moderator**', `${moderator} (${moderator.user.tag})`)
+			.addField({ name: '**Action**', value: `${'Lockdown'}` })
+			.addField({ name: '**Moderator**', value: `${moderator} (${moderator.user.tag})` })
 			// eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
-			.addField('**Reason**', `${reason || '[No Reason Provided]'}`)
-			.addField(
-				`**Channel${channelsSuccessMap.size > 1 ? 's' : ''}**`,
-				channelsSuccessMap
+			.addField({ name: '**Reason**', value: `${reason || '[No Reason Provided]'}` })
+			.addField({
+				name: `**Channel${channelsSuccessMap.size > 1 ? 's' : ''}**`,
+				value: channelsSuccessMap
 					.map((success, channel) => `<#${channel}> ${success ? util.emojis.success : util.emojis.error}`)
 					.join('\n')
-			);
+			});
 		return await logChannel.send({ embeds: [logEmbed] });
 	}
 }
diff --git a/src/listeners/guild-custom/bushUnlockdown.ts b/src/listeners/guild-custom/bushUnlockdown.ts
index cfddc2f..0ac2a13 100644
--- a/src/listeners/guild-custom/bushUnlockdown.ts
+++ b/src/listeners/guild-custom/bushUnlockdown.ts
@@ -1,5 +1,5 @@
 import { BushListener, type BushClientEvents } from '#lib';
-import { MessageEmbed } from 'discord.js';
+import { Embed } from 'discord.js';
 
 export default class BushUnlockdownListener extends BushListener {
 	public constructor() {
@@ -14,19 +14,19 @@ export default class BushUnlockdownListener extends BushListener {
 		const logChannel = await moderator.guild.getLogChannel('moderation');
 		if (!logChannel) return;
 
-		const logEmbed = new MessageEmbed()
+		const logEmbed = new Embed()
 			.setColor(util.colors.discord.BLURPLE)
 			.setTimestamp()
-			.addField('**Action**', `${'Unlockdown'}`)
-			.addField('**Moderator**', `${moderator} (${moderator.user.tag})`)
+			.addField({ name: '**Action**', value: `${'Unlockdown'}` })
+			.addField({ name: '**Moderator**', value: `${moderator} (${moderator.user.tag})` })
 			// eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
-			.addField('**Reason**', `${reason || '[No Reason Provided]'}`)
-			.addField(
-				`**Channel${channelsSuccessMap.size > 1 ? 's' : ''}**`,
-				channelsSuccessMap
+			.addField({ name: '**Reason**', value: `${reason || '[No Reason Provided]'}` })
+			.addField({
+				name: `**Channel${channelsSuccessMap.size > 1 ? 's' : ''}**`,
+				value: channelsSuccessMap
 					.map((success, channel) => `<#${channel}> ${success ? util.emojis.success : util.emojis.error}`)
 					.join('\n')
-			);
+			});
 		return await logChannel.send({ embeds: [logEmbed] });
 	}
 }
diff --git a/src/listeners/guild/guildCreate.ts b/src/listeners/guild/guildCreate.ts
index b8c6d89..2df3268 100644
--- a/src/listeners/guild/guildCreate.ts
+++ b/src/listeners/guild/guildCreate.ts
@@ -23,8 +23,8 @@ export default class GuildCreateListener extends BushListener {
 					description: `${util.emojis.join} Joined ${util.format.input(
 						guild.name
 					)} with **${guild.memberCount?.toLocaleString()}** members. I am now in **${client.guilds.cache.size}** guilds.`,
-					timestamp: new Date(),
-					footer: { text: `${guild.id}`, iconURL: guild.iconURL() ?? undefined }
+					timestamp: new Date().toISOString(),
+					footer: { text: `${guild.id}`, icon_url: guild.iconURL() ?? undefined }
 				}
 			]
 		});
diff --git a/src/listeners/guild/guildDelete.ts b/src/listeners/guild/guildDelete.ts
index c9070df..8284c02 100644
--- a/src/listeners/guild/guildDelete.ts
+++ b/src/listeners/guild/guildDelete.ts
@@ -21,8 +21,8 @@ export default class GuildDeleteListener extends BushListener {
 					description: `${util.emojis.leave} Left ${util.format.input(
 						guild.name
 					)} with **${guild.memberCount?.toLocaleString()}** members. I am now in **${client.guilds.cache.size}** guilds.`,
-					timestamp: new Date(),
-					footer: { text: `${guild.id}`, iconURL: guild.iconURL() ?? undefined }
+					timestamp: new Date().toISOString(),
+					footer: { text: `${guild.id}`, icon_url: guild.iconURL() ?? undefined }
 				}
 			]
 		});
diff --git a/src/listeners/guild/guildMemberAdd.ts b/src/listeners/guild/guildMemberAdd.ts
index 22961e9..262cde3 100644
--- a/src/listeners/guild/guildMemberAdd.ts
+++ b/src/listeners/guild/guildMemberAdd.ts
@@ -1,5 +1,5 @@
 import { BushListener, type BushClientEvents, type BushGuildMember, type BushTextChannel } from '#lib';
-import { MessageEmbed } from 'discord.js';
+import { Embed } from 'discord.js';
 
 export default class GuildMemberAddListener extends BushListener {
 	public constructor() {
@@ -21,7 +21,7 @@ export default class GuildMemberAddListener extends BushListener {
 		const welcome = client.channels.cache.get(welcomeChannel) as BushTextChannel | undefined;
 		if (!welcome) return;
 		if (member.guild.id !== welcome?.guild.id) throw new Error('Welcome channel must be in the guild.');
-		const embed = new MessageEmbed()
+		const embed = new Embed()
 			.setDescription(
 				`${util.emojis.join} ${util.format.input(
 					member.user.tag
diff --git a/src/listeners/guild/guildMemberRemove.ts b/src/listeners/guild/guildMemberRemove.ts
index 323bd24..ac162f6 100644
--- a/src/listeners/guild/guildMemberRemove.ts
+++ b/src/listeners/guild/guildMemberRemove.ts
@@ -6,7 +6,7 @@ import {
 	type BushTextChannel,
 	type PartialBushGuildMember
 } from '#lib';
-import { MessageEmbed } from 'discord.js';
+import { Embed } from 'discord.js';
 
 export default class GuildMemberRemoveListener extends BushListener {
 	public constructor() {
@@ -31,7 +31,7 @@ export default class GuildMemberRemoveListener extends BushListener {
 		if (!welcomeChannel) return;
 		const welcome = client.channels.cache.get(welcomeChannel) as BushTextChannel | undefined;
 		if (member.guild.id !== welcome?.guild.id) throw new Error('Welcome channel must be in the guild.');
-		const embed: MessageEmbed = new MessageEmbed()
+		const embed: Embed = new Embed()
 			.setDescription(
 				`${util.emojis.leave} ${util.format.input(user.tag)} ${
 					isBan ? 'got banned from' : 'left'
diff --git a/src/listeners/member-custom/bushBan.ts b/src/listeners/member-custom/bushBan.ts
index dfa3292..90b7c27 100644
--- a/src/listeners/member-custom/bushBan.ts
+++ b/src/listeners/member-custom/bushBan.ts
@@ -1,5 +1,5 @@
 import { BushListener, type BushClientEvents } from '#lib';
-import { GuildMember, MessageEmbed } from 'discord.js';
+import { Embed, GuildMember } from 'discord.js';
 
 export default class BushBanListener extends BushListener {
 	public constructor() {
@@ -15,17 +15,17 @@ export default class BushBanListener extends BushListener {
 		if (!logChannel) return;
 		const user = victim instanceof GuildMember ? victim.user : victim;
 
-		const logEmbed = new MessageEmbed()
+		const logEmbed = new Embed()
 			.setColor(util.colors.discord.RED)
 			.setTimestamp()
 			.setFooter({ text: `CaseID: ${caseID}` })
 			.setAuthor({ name: user.tag, iconURL: user.avatarURL({ format: 'png', size: 4096 }) ?? undefined })
-			.addField('**Action**', `${duration ? 'Temp Ban' : 'Perm Ban'}`)
-			.addField('**User**', `${user} (${user.tag})`)
-			.addField('**Moderator**', `${moderator} (${moderator.tag})`)
-			.addField('**Reason**', `${reason ? reason : '[No Reason Provided]'}`);
-		if (duration) logEmbed.addField('**Duration**', util.humanizeDuration(duration));
-		if (dmSuccess === false) logEmbed.addField('**Additional Info**', 'Could not dm user.');
+			.addField({ name: '**Action**', value: `${duration ? 'Temp Ban' : 'Perm Ban'}` })
+			.addField({ name: '**User**', value: `${user} (${user.tag})` })
+			.addField({ name: '**Moderator**', value: `${moderator} (${moderator.tag})` })
+			.addField({ name: '**Reason**', value: `${reason ? reason : '[No Reason Provided]'}` });
+		if (duration) logEmbed.addField({ name: '**Duration**', value: util.humanizeDuration(duration) });
+		if (dmSuccess === false) logEmbed.addField({ name: '**Additional Info**', value: 'Could not dm user.' });
 		return await logChannel.send({ embeds: [logEmbed] });
 	}
 }
diff --git a/src/listeners/member-custom/bushBlock.ts b/src/listeners/member-custom/bushBlock.ts
index 6151f9d..d29261b 100644
--- a/src/listeners/member-custom/bushBlock.ts
+++ b/src/listeners/member-custom/bushBlock.ts
@@ -1,5 +1,5 @@
 import { BushListener, type BushClientEvents } from '#lib';
-import { GuildMember, MessageEmbed } from 'discord.js';
+import { Embed, GuildMember } from 'discord.js';
 
 export default class BushBlockListener extends BushListener {
 	public constructor() {
@@ -17,19 +17,19 @@ export default class BushBlockListener extends BushListener {
 		if (!logChannel) return;
 		const user = victim instanceof GuildMember ? victim.user : victim;
 
-		const logEmbed = new MessageEmbed()
+		const logEmbed = new Embed()
 			.setColor(util.colors.discord.PURPLE)
 			.setTimestamp()
 			.setFooter({ text: `CaseID: ${caseID}` })
 			.setAuthor({ name: user.tag, iconURL: user.avatarURL({ format: 'png', size: 4096 }) ?? undefined })
-			.addField('**Action**', `${duration ? 'Temp Block' : 'Perm Block'}`)
-			.addField('**Channel**', `<#${channel.id}>`)
-			.addField('**User**', `${user} (${user.tag})`)
-			.addField('**Moderator**', `${moderator} (${moderator.tag})`)
-			.addField('**Reason**', `${reason ? reason : '[No Reason Provided]'}`);
+			.addField({ name: '**Action**', value: `${duration ? 'Temp Block' : 'Perm Block'}` })
+			.addField({ name: '**Channel**', value: `<#${channel.id}>` })
+			.addField({ name: '**User**', value: `${user} (${user.tag})` })
+			.addField({ name: '**Moderator**', value: `${moderator} (${moderator.tag})` })
+			.addField({ name: '**Reason**', value: `${reason ? reason : '[No Reason Provided]'}` });
 
-		if (duration) logEmbed.addField('**Duration**', `${util.humanizeDuration(duration) || duration}`);
-		if (dmSuccess === false) logEmbed.addField('**Additional Info**', 'Could not dm user.');
+		if (duration) logEmbed.addField({ name: '**Duration**', value: `${util.humanizeDuration(duration) || duration}` });
+		if (dmSuccess === false) logEmbed.addField({ name: '**Additional Info**', value: 'Could not dm user.' });
 		return await logChannel.send({ embeds: [logEmbed] });
 	}
 }
diff --git a/src/listeners/member-custom/bushKick.ts b/src/listeners/member-custom/bushKick.ts
index 0e1d305..9d309ac 100644
--- a/src/listeners/member-custom/bushKick.ts
+++ b/src/listeners/member-custom/bushKick.ts
@@ -1,5 +1,5 @@
 import { BushListener, type BushClientEvents } from '#lib';
-import { GuildMember, MessageEmbed } from 'discord.js';
+import { Embed, GuildMember } from 'discord.js';
 
 export default class BushKickListener extends BushListener {
 	public constructor() {
@@ -15,16 +15,16 @@ export default class BushKickListener extends BushListener {
 		if (!logChannel) return;
 		const user = victim instanceof GuildMember ? victim.user : victim;
 
-		const logEmbed = new MessageEmbed()
+		const logEmbed = new Embed()
 			.setColor(util.colors.discord.RED)
 			.setTimestamp()
 			.setFooter({ text: `CaseID: ${caseID}` })
 			.setAuthor({ name: user.tag, iconURL: user.avatarURL({ format: 'png', size: 4096 }) ?? undefined })
-			.addField('**Action**', `${'Kick'}`)
-			.addField('**User**', `${user} (${user.tag})`)
-			.addField('**Moderator**', `${moderator} (${moderator.tag})`)
-			.addField('**Reason**', `${reason ? reason : '[No Reason Provided]'}`);
-		if (dmSuccess === false) logEmbed.addField('**Additional Info**', 'Could not dm user.');
+			.addField({ name: '**Action**', value: `${'Kick'}` })
+			.addField({ name: '**User**', value: `${user} (${user.tag})` })
+			.addField({ name: '**Moderator**', value: `${moderator} (${moderator.tag})` })
+			.addField({ name: '**Reason**', value: `${reason ? reason : '[No Reason Provided]'}` });
+		if (dmSuccess === false) logEmbed.addField({ name: '**Additional Info**', value: 'Could not dm user.' });
 		return await logChannel.send({ embeds: [logEmbed] });
 	}
 }
diff --git a/src/listeners/member-custom/bushMute.ts b/src/listeners/member-custom/bushMute.ts
index 53542a5..25146a2 100644
--- a/src/listeners/member-custom/bushMute.ts
+++ b/src/listeners/member-custom/bushMute.ts
@@ -1,5 +1,5 @@
 import { BushListener, type BushClientEvents } from '#lib';
-import { GuildMember, MessageEmbed } from 'discord.js';
+import { Embed, GuildMember } from 'discord.js';
 
 export default class BushMuteListener extends BushListener {
 	public constructor() {
@@ -15,17 +15,17 @@ export default class BushMuteListener extends BushListener {
 		if (!logChannel) return;
 		const user = victim instanceof GuildMember ? victim.user : victim;
 
-		const logEmbed = new MessageEmbed()
+		const logEmbed = new Embed()
 			.setColor(util.colors.discord.ORANGE)
 			.setTimestamp()
 			.setFooter({ text: `CaseID: ${caseID}` })
 			.setAuthor({ name: user.tag, iconURL: user.avatarURL({ format: 'png', size: 4096 }) ?? undefined })
-			.addField('**Action**', `${duration ? 'Temp Mute' : 'Perm Mute'}`)
-			.addField('**User**', `${user} (${user.tag})`)
-			.addField('**Moderator**', `${moderator} (${moderator.tag})`)
-			.addField('**Reason**', `${reason ? reason : '[No Reason Provided]'}`);
-		if (duration) logEmbed.addField('**Duration**', `${util.humanizeDuration(duration) || duration}`);
-		if (dmSuccess === false) logEmbed.addField('**Additional Info**', 'Could not dm user.');
+			.addField({ name: '**Action**', value: `${duration ? 'Temp Mute' : 'Perm Mute'}` })
+			.addField({ name: '**User**', value: `${user} (${user.tag})` })
+			.addField({ name: '**Moderator**', value: `${moderator} (${moderator.tag})` })
+			.addField({ name: '**Reason**', value: `${reason ? reason : '[No Reason Provided]'}` });
+		if (duration) logEmbed.addField({ name: '**Duration**', value: `${util.humanizeDuration(duration) || duration}` });
+		if (dmSuccess === false) logEmbed.addField({ name: '**Additional Info**', value: 'Could not dm user.' });
 		return await logChannel.send({ embeds: [logEmbed] });
 	}
 }
diff --git a/src/listeners/member-custom/bushPunishRole.ts b/src/listeners/member-custom/bushPunishRole.ts
index 0a066d9..cbcc925 100644
--- a/src/listeners/member-custom/bushPunishRole.ts
+++ b/src/listeners/member-custom/bushPunishRole.ts
@@ -1,5 +1,5 @@
 import { BushListener, type BushClientEvents } from '#lib';
-import { GuildMember, MessageEmbed } from 'discord.js';
+import { Embed, GuildMember } from 'discord.js';
 
 export default class BushPunishRoleListener extends BushListener {
 	public constructor() {
@@ -15,16 +15,16 @@ export default class BushPunishRoleListener extends BushListener {
 		if (!logChannel) return;
 		const user = victim instanceof GuildMember ? victim.user : victim;
 
-		const logEmbed = new MessageEmbed()
+		const logEmbed = new Embed()
 			.setColor(util.colors.discord.YELLOW)
 			.setTimestamp()
 			.setFooter({ text: `CaseID: ${caseID}` })
 			.setAuthor({ name: user.tag, iconURL: user.avatarURL({ format: 'png', size: 4096 }) ?? undefined })
-			.addField('**Action**', `${duration ? 'Temp Punishment Role' : 'Perm Punishment Role'}`)
-			.addField('**User**', `${user} (${user.tag})`)
-			.addField('**Moderator**', `${moderator} (${moderator.tag})`)
-			.addField('**Reason**', `${reason ? reason : '[No Reason Provided]'}`);
-		if (duration) logEmbed.addField('**Duration**', util.humanizeDuration(duration));
+			.addField({ name: '**Action**', value: `${duration ? 'Temp Punishment Role' : 'Perm Punishment Role'}` })
+			.addField({ name: '**User**', value: `${user} (${user.tag})` })
+			.addField({ name: '**Moderator**', value: `${moderator} (${moderator.tag})` })
+			.addField({ name: '**Reason**', value: `${reason ? reason : '[No Reason Provided]'}` });
+		if (duration) logEmbed.addField({ name: '**Duration**', value: util.humanizeDuration(duration) });
 		return await logChannel.send({ embeds: [logEmbed] });
 	}
 }
diff --git a/src/listeners/member-custom/bushPunishRoleRemove.ts b/src/listeners/member-custom/bushPunishRoleRemove.ts
index fe81d19..c68e8d5 100644
--- a/src/listeners/member-custom/bushPunishRoleRemove.ts
+++ b/src/listeners/member-custom/bushPunishRoleRemove.ts
@@ -1,5 +1,5 @@
 import { BushListener, type BushClientEvents } from '#lib';
-import { GuildMember, MessageEmbed } from 'discord.js';
+import { Embed, GuildMember } from 'discord.js';
 
 export default class BushPunishRoleRemoveListener extends BushListener {
 	public constructor() {
@@ -15,16 +15,16 @@ export default class BushPunishRoleRemoveListener extends BushListener {
 		if (!logChannel) return;
 		const user = victim instanceof GuildMember ? victim.user : victim;
 
-		const logEmbed = new MessageEmbed()
+		const logEmbed = new Embed()
 			.setColor(util.colors.discord.GREEN)
 			.setTimestamp()
 			.setFooter({ text: `CaseID: ${caseID}` })
 			.setAuthor({ name: user.tag, iconURL: user.avatarURL({ format: 'png', size: 4096 }) ?? undefined })
-			.addField('**Action**', `${'Remove Punishment Role'}`)
-			.addField('**Role**', `${role}`)
-			.addField('**User**', `${user} (${user.tag})`)
-			.addField('**Moderator**', `${moderator} (${moderator.tag})`)
-			.addField('**Reason**', `${reason ? reason : '[No Reason Provided]'}`);
+			.addField({ name: '**Action**', value: `${'Remove Punishment Role'}` })
+			.addField({ name: '**Role**', value: `${role}` })
+			.addField({ name: '**User**', value: `${user} (${user.tag})` })
+			.addField({ name: '**Moderator**', value: `${moderator} (${moderator.tag})` })
+			.addField({ name: '**Reason**', value: `${reason ? reason : '[No Reason Provided]'}` });
 
 		return await logChannel.send({ embeds: [logEmbed] });
 	}
diff --git a/src/listeners/member-custom/bushPurge.ts b/src/listeners/member-custom/bushPurge.ts
index 355569b..e3a43af 100644
--- a/src/listeners/member-custom/bushPurge.ts
+++ b/src/listeners/member-custom/bushPurge.ts
@@ -1,5 +1,5 @@
 import { BushListener, type BushClientEvents } from '#lib';
-import { MessageEmbed } from 'discord.js';
+import { Embed } from 'discord.js';
 
 export default class BushPurgeListener extends BushListener {
 	public constructor() {
@@ -23,18 +23,20 @@ export default class BushPurgeListener extends BushListener {
 		}));
 		const haste = await util.inspectCleanRedactHaste(mappedMessages);
 
-		const logEmbed = new MessageEmbed()
+		const logEmbed = new Embed()
 			.setColor(util.colors.discord.DARK_PURPLE)
 			.setTimestamp()
 			.setFooter({ text: `${messages.size.toLocaleString()} Messages` })
 			.setAuthor({ name: moderator.tag, iconURL: moderator.avatarURL({ format: 'png', size: 4096 }) ?? undefined })
-			.addField('**Action**', `${'Purge'}`)
-			.addField('**Moderator**', `${moderator} (${moderator.tag})`)
-			.addField('**Channel**', `<#${channel.id}> (${channel.name})`)
-			.addField(
-				'**Messages**',
-				`${haste.url ? `[haste](${haste.url})${haste.error ? `- ${haste.error}` : ''}` : `${util.emojis.error} ${haste.error}`}`
-			);
+			.addField({ name: '**Action**', value: `${'Purge'}` })
+			.addField({ name: '**Moderator**', value: `${moderator} (${moderator.tag})` })
+			.addField({ name: '**Channel**', value: `<#${channel.id}> (${channel.name})` })
+			.addField({
+				name: '**Messages**',
+				value: `${
+					haste.url ? `[haste](${haste.url})${haste.error ? `- ${haste.error}` : ''}` : `${util.emojis.error} ${haste.error}`
+				}`
+			});
 		return await logChannel.send({ embeds: [logEmbed] });
 	}
 }
diff --git a/src/listeners/member-custom/bushRemoveTimeout.ts b/src/listeners/member-custom/bushRemoveTimeout.ts
index af56dac..820a3b7 100644
--- a/src/listeners/member-custom/bushRemoveTimeout.ts
+++ b/src/listeners/member-custom/bushRemoveTimeout.ts
@@ -1,5 +1,5 @@
 import { BushListener, type BushClientEvents } from '#lib';
-import { GuildMember, MessageEmbed } from 'discord.js';
+import { Embed, GuildMember } from 'discord.js';
 
 export default class BushRemoveTimeoutListener extends BushListener {
 	public constructor() {
@@ -15,16 +15,16 @@ export default class BushRemoveTimeoutListener extends BushListener {
 		if (!logChannel) return;
 		const user = victim instanceof GuildMember ? victim.user : victim;
 
-		const logEmbed = new MessageEmbed()
+		const logEmbed = new Embed()
 			.setColor(util.colors.discord.GREEN)
 			.setTimestamp()
 			.setFooter({ text: `CaseID: ${caseID}` })
 			.setAuthor({ name: user.tag, iconURL: user.avatarURL({ format: 'png', size: 4096 }) ?? undefined })
-			.addField('**Action**', `${'Remove Timeout'}`)
-			.addField('**User**', `${user} (${user.tag})`)
-			.addField('**Moderator**', `${moderator} (${moderator.tag})`)
-			.addField('**Reason**', `${reason ? reason : '[No Reason Provided]'}`);
-		if (dmSuccess === false) logEmbed.addField('**Additional Info**', 'Could not dm user.');
+			.addField({ name: '**Action**', value: `${'Remove Timeout'}` })
+			.addField({ name: '**User**', value: `${user} (${user.tag})` })
+			.addField({ name: '**Moderator**', value: `${moderator} (${moderator.tag})` })
+			.addField({ name: '**Reason**', value: `${reason ? reason : '[No Reason Provided]'}` });
+		if (dmSuccess === false) logEmbed.addField({ name: '**Additional Info**', value: 'Could not dm user.' });
 		return await logChannel.send({ embeds: [logEmbed] });
 	}
 }
diff --git a/src/listeners/member-custom/bushTimeout.ts b/src/listeners/member-custom/bushTimeout.ts
index 0ec76bf..79fd739 100644
--- a/src/listeners/member-custom/bushTimeout.ts
+++ b/src/listeners/member-custom/bushTimeout.ts
@@ -1,5 +1,5 @@
 import { BushListener, type BushClientEvents } from '#lib';
-import { GuildMember, MessageEmbed } from 'discord.js';
+import { Embed, GuildMember } from 'discord.js';
 
 export default class BushTimeoutListener extends BushListener {
 	public constructor() {
@@ -17,17 +17,17 @@ export default class BushTimeoutListener extends BushListener {
 		if (!logChannel) return;
 		const user = victim instanceof GuildMember ? victim.user : victim;
 
-		const logEmbed = new MessageEmbed()
+		const logEmbed = new Embed()
 			.setColor(util.colors.discord.ORANGE)
 			.setTimestamp()
 			.setFooter({ text: `CaseID: ${caseID}` })
 			.setAuthor({ name: user.tag, iconURL: user.avatarURL({ format: 'png', size: 4096 }) ?? undefined })
-			.addField('**Action**', `${'Timeout'}`)
-			.addField('**User**', `${user} (${user.tag})`)
-			.addField('**Moderator**', `${moderator} (${moderator.tag})`)
-			.addField('**Reason**', `${reason ? reason : '[No Reason Provided]'}`)
-			.addField('**Duration**', `${util.humanizeDuration(duration) || duration}`);
-		if (dmSuccess === false) logEmbed.addField('**Additional Info**', 'Could not dm user.');
+			.addField({ name: '**Action**', value: `${'Timeout'}` })
+			.addField({ name: '**User**', value: `${user} (${user.tag})` })
+			.addField({ name: '**Moderator**', value: `${moderator} (${moderator.tag})` })
+			.addField({ name: '**Reason**', value: `${reason ? reason : '[No Reason Provided]'}` })
+			.addField({ name: '**Duration**', value: `${util.humanizeDuration(duration) || duration}` });
+		if (dmSuccess === false) logEmbed.addField({ name: '**Additional Info**', value: 'Could not dm user.' });
 		return await logChannel.send({ embeds: [logEmbed] });
 	}
 }
diff --git a/src/listeners/member-custom/bushUnban.ts b/src/listeners/member-custom/bushUnban.ts
index 7f3f812..b7f6346 100644
--- a/src/listeners/member-custom/bushUnban.ts
+++ b/src/listeners/member-custom/bushUnban.ts
@@ -1,5 +1,5 @@
 import { BushListener, type BushClientEvents } from '#lib';
-import { GuildMember, MessageEmbed } from 'discord.js';
+import { Embed, GuildMember } from 'discord.js';
 
 export default class BushUnbanListener extends BushListener {
 	public constructor() {
@@ -15,16 +15,16 @@ export default class BushUnbanListener extends BushListener {
 		if (!logChannel) return;
 		const user = victim instanceof GuildMember ? victim.user : victim;
 
-		const logEmbed = new MessageEmbed()
+		const logEmbed = new Embed()
 			.setColor(util.colors.discord.GREEN)
 			.setTimestamp()
 			.setFooter({ text: `CaseID: ${caseID}` })
 			.setAuthor({ name: user.tag, iconURL: user.avatarURL({ format: 'png', size: 4096 }) ?? undefined })
-			.addField('**Action**', `${'Unban'}`)
-			.addField('**User**', `${user} (${user.tag})`)
-			.addField('**Moderator**', `${moderator} (${moderator.tag})`)
-			.addField('**Reason**', `${reason ? reason : '[No Reason Provided]'}`);
-		if (dmSuccess === false) logEmbed.addField('**Additional Info**', 'Could not dm user.');
+			.addField({ name: '**Action**', value: `${'Unban'}` })
+			.addField({ name: '**User**', value: `${user} (${user.tag})` })
+			.addField({ name: '**Moderator**', value: `${moderator} (${moderator.tag})` })
+			.addField({ name: '**Reason**', value: `${reason ? reason : '[No Reason Provided]'}` });
+		if (dmSuccess === false) logEmbed.addField({ name: '**Additional Info**', value: 'Could not dm user.' });
 		return await logChannel.send({ embeds: [logEmbed] });
 	}
 }
diff --git a/src/listeners/member-custom/bushUnblock.ts b/src/listeners/member-custom/bushUnblock.ts
index 6be1888..580a424 100644
--- a/src/listeners/member-custom/bushUnblock.ts
+++ b/src/listeners/member-custom/bushUnblock.ts
@@ -1,5 +1,5 @@
 import { BushListener, type BushClientEvents } from '#lib';
-import { GuildMember, MessageEmbed } from 'discord.js';
+import { Embed, GuildMember } from 'discord.js';
 
 export default class BushUnblockListener extends BushListener {
 	public constructor() {
@@ -15,17 +15,17 @@ export default class BushUnblockListener extends BushListener {
 		if (!logChannel) return;
 		const user = victim instanceof GuildMember ? victim.user : victim;
 
-		const logEmbed = new MessageEmbed()
+		const logEmbed = new Embed()
 			.setColor(util.colors.discord.GREEN)
 			.setTimestamp()
 			.setFooter({ text: `CaseID: ${caseID}` })
 			.setAuthor({ name: user.tag, iconURL: user.avatarURL({ format: 'png', size: 4096 }) ?? undefined })
-			.addField('**Action**', `${'Unblock'}`)
-			.addField('**Channel**', `<#${channel.id}>`)
-			.addField('**User**', `${user} (${user.tag})`)
-			.addField('**Moderator**', `${moderator} (${moderator.tag})`)
-			.addField('**Reason**', `${reason ? reason : '[No Reason Provided]'}`);
-		if (dmSuccess === false) logEmbed.addField('**Additional Info**', 'Could not dm user.');
+			.addField({ name: '**Action**', value: `${'Unblock'}` })
+			.addField({ name: '**Channel**', value: `<#${channel.id}>` })
+			.addField({ name: '**User**', value: `${user} (${user.tag})` })
+			.addField({ name: '**Moderator**', value: `${moderator} (${moderator.tag})` })
+			.addField({ name: '**Reason**', value: `${reason ? reason : '[No Reason Provided]'}` });
+		if (dmSuccess === false) logEmbed.addField({ name: '**Additional Info**', value: 'Could not dm user.' });
 		return await logChannel.send({ embeds: [logEmbed] });
 	}
 }
diff --git a/src/listeners/member-custom/bushUnmute.ts b/src/listeners/member-custom/bushUnmute.ts
index 2ed5104..19c9a74 100644
--- a/src/listeners/member-custom/bushUnmute.ts
+++ b/src/listeners/member-custom/bushUnmute.ts
@@ -1,5 +1,5 @@
 import { BushListener, type BushClientEvents } from '#lib';
-import { GuildMember, MessageEmbed } from 'discord.js';
+import { Embed, GuildMember } from 'discord.js';
 
 export default class BushUnmuteListener extends BushListener {
 	public constructor() {
@@ -15,16 +15,16 @@ export default class BushUnmuteListener extends BushListener {
 		if (!logChannel) return;
 		const user = victim instanceof GuildMember ? victim.user : victim;
 
-		const logEmbed = new MessageEmbed()
+		const logEmbed = new Embed()
 			.setColor(util.colors.discord.GREEN)
 			.setTimestamp()
 			.setFooter({ text: `CaseID: ${caseID}` })
 			.setAuthor({ name: user.tag, iconURL: user.avatarURL({ format: 'png', size: 4096 }) ?? undefined })
-			.addField('**Action**', `${'Unmute'}`)
-			.addField('**User**', `${user} (${user.tag})`)
-			.addField('**Moderator**', `${moderator} (${moderator.tag})`)
-			.addField('**Reason**', `${reason ? reason : '[No Reason Provided]'}`);
-		if (dmSuccess === false) logEmbed.addField('**Additional Info**', 'Could not dm user.');
+			.addField({ name: '**Action**', value: `${'Unmute'}` })
+			.addField({ name: '**User**', value: `${user} (${user.tag})` })
+			.addField({ name: '**Moderator**', value: `${moderator} (${moderator.tag})` })
+			.addField({ name: '**Reason**', value: `${reason ? reason : '[No Reason Provided]'}` });
+		if (dmSuccess === false) logEmbed.addField({ name: '**Additional Info**', value: 'Could not dm user.' });
 		return await logChannel.send({ embeds: [logEmbed] });
 	}
 }
diff --git a/src/listeners/member-custom/bushUpdateModlog.ts b/src/listeners/member-custom/bushUpdateModlog.ts
index 065ec7e..86782f6 100644
--- a/src/listeners/member-custom/bushUpdateModlog.ts
+++ b/src/listeners/member-custom/bushUpdateModlog.ts
@@ -1,5 +1,5 @@
 import { BushListener, type BushClientEvents } from '#lib';
-import { MessageEmbed } from 'discord.js';
+import { Embed } from 'discord.js';
 
 export default class BushUpdateModlogListener extends BushListener {
 	public constructor() {
@@ -14,19 +14,19 @@ export default class BushUpdateModlogListener extends BushListener {
 		const logChannel = await moderator.guild.getLogChannel('moderation');
 		if (!logChannel) return;
 
-		const logEmbed = new MessageEmbed()
+		const logEmbed = new Embed()
 			.setColor(util.colors.discord.BLURPLE)
 			.setTimestamp()
 			.setAuthor({
 				name: moderator.user.tag,
 				iconURL: moderator.user.avatarURL({ format: 'png', size: 4096 }) ?? undefined
 			})
-			.addField('**Action**', `${'Update Modlog'}`)
-			.addField('**Moderator**', `${moderator} (${moderator.user.tag})`)
-			.addField('**ModLog Changed**', modlogID)
-			.addField('**Value Changed**', key)
-			.addField('**Old Value**', await util.inspectCleanRedactCodeblock(oldModlog, undefined, undefined, 1024))
-			.addField('**New Value**', await util.inspectCleanRedactCodeblock(newModlog, undefined, undefined, 1024));
+			.addField({ name: '**Action**', value: `${'Update Modlog'}` })
+			.addField({ name: '**Moderator**', value: `${moderator} (${moderator.user.tag})` })
+			.addField({ name: '**ModLog Changed**', value: modlogID })
+			.addField({ name: '**Value Changed**', value: key })
+			.addField({ name: '**Old Value**', value: await util.inspectCleanRedactCodeblock(oldModlog, undefined, undefined, 1024) })
+			.addField({ name: '**New Value**', value: await util.inspectCleanRedactCodeblock(newModlog, undefined, undefined, 1024) });
 
 		return await logChannel.send({ embeds: [logEmbed] });
 	}
diff --git a/src/listeners/member-custom/bushUpdateSettings.ts b/src/listeners/member-custom/bushUpdateSettings.ts
index 49f0aec..518f7b6 100644
--- a/src/listeners/member-custom/bushUpdateSettings.ts
+++ b/src/listeners/member-custom/bushUpdateSettings.ts
@@ -1,5 +1,5 @@
 import { BushListener, type BushClientEvents } from '#lib';
-import { MessageEmbed } from 'discord.js';
+import { Embed } from 'discord.js';
 
 export default class BushUpdateSettingsListener extends BushListener {
 	public constructor() {
@@ -14,19 +14,19 @@ export default class BushUpdateSettingsListener extends BushListener {
 		const logChannel = await guild.getLogChannel('moderation');
 		if (!logChannel) return;
 
-		const logEmbed = new MessageEmbed().setColor(util.colors.discord.BLURPLE).setTimestamp();
+		const logEmbed = new Embed().setColor(util.colors.discord.BLURPLE).setTimestamp();
 
 		if (moderator)
 			logEmbed.setAuthor({
 				name: moderator.user.tag,
 				iconURL: moderator.user.avatarURL({ format: 'png', size: 4096 }) ?? undefined
 			});
-		logEmbed.addField('**Action**', `${'Update Settings'}`);
-		if (moderator) logEmbed.addField('**Moderator**', `${moderator} (${moderator.user.tag})`);
+		logEmbed.addField({ name: '**Action**', value: `${'Update Settings'}` });
+		if (moderator) logEmbed.addField({ name: '**Moderator**', value: `${moderator} (${moderator.user.tag})` });
 		logEmbed
-			.addField('**Setting Changed**', setting)
-			.addField('**Old Value**', await util.inspectCleanRedactCodeblock(oldSettings, 'js', undefined, 1024))
-			.addField('**New Value**', await util.inspectCleanRedactCodeblock(newSettings, 'js', undefined, 1024));
+			.addField({ name: '**Setting Changed**', value: setting })
+			.addField({ name: '**Old Value**', value: await util.inspectCleanRedactCodeblock(oldSettings, 'js', undefined, 1024) })
+			.addField({ name: '**New Value**', value: await util.inspectCleanRedactCodeblock(newSettings, 'js', undefined, 1024) });
 
 		return await logChannel.send({ embeds: [logEmbed] });
 	}
diff --git a/src/listeners/member-custom/bushWarn.ts b/src/listeners/member-custom/bushWarn.ts
index 61ab2e1..a4e71a8 100644
--- a/src/listeners/member-custom/bushWarn.ts
+++ b/src/listeners/member-custom/bushWarn.ts
@@ -1,5 +1,5 @@
 import { BushListener, type BushClientEvents } from '#lib';
-import { GuildMember, MessageEmbed } from 'discord.js';
+import { Embed, GuildMember } from 'discord.js';
 
 export default class BushWarnListener extends BushListener {
 	public constructor() {
@@ -15,16 +15,16 @@ export default class BushWarnListener extends BushListener {
 		if (!logChannel) return;
 		const user = victim instanceof GuildMember ? victim.user : victim;
 
-		const logEmbed = new MessageEmbed()
+		const logEmbed = new Embed()
 			.setColor(util.colors.discord.YELLOW)
 			.setTimestamp()
 			.setFooter({ text: `CaseID: ${caseID}` })
 			.setAuthor({ name: user.tag, iconURL: user.avatarURL({ format: 'png', size: 4096 }) ?? undefined })
-			.addField('**Action**', `${'Warn'}`)
-			.addField('**User**', `${user} (${user.tag})`)
-			.addField('**Moderator**', `${moderator} (${moderator.tag})`)
-			.addField('**Reason**', `${reason ? reason : '[No Reason Provided]'}`);
-		if (dmSuccess === false) logEmbed.addField('**Additional Info**', 'Could not dm user.');
+			.addField({ name: '**Action**', value: `${'Warn'}` })
+			.addField({ name: '**User**', value: `${user} (${user.tag})` })
+			.addField({ name: '**Moderator**', value: `${moderator} (${moderator.tag})` })
+			.addField({ name: '**Reason**', value: `${reason ? reason : '[No Reason Provided]'}` });
+		if (dmSuccess === false) logEmbed.addField({ name: '**Additional Info**', value: 'Could not dm user.' });
 		return await logChannel.send({ embeds: [logEmbed] });
 	}
 }
diff --git a/src/listeners/message/autoThread.ts b/src/listeners/message/autoThread.ts
index 77ff33c..b753dc3 100644
--- a/src/listeners/message/autoThread.ts
+++ b/src/listeners/message/autoThread.ts
@@ -1,5 +1,5 @@
 import { BushListener, type BushClientEvents, type BushTextChannel } from '#lib';
-import { GuildTextBasedChannel, MessageEmbed, MessageType, Permissions } from 'discord.js';
+import { Embed, GuildTextBasedChannel, MessageType, Permissions } from 'discord.js';
 
 export default class autoThreadListener extends BushListener {
 	public constructor() {
@@ -45,12 +45,12 @@ export default class autoThreadListener extends BushListener {
 			})
 			.catch(() => null);
 		if (!thread) return;
-		const embed = new MessageEmbed()
+		const embed = new Embed()
 			.setTitle('NotEnoughUpdates Support')
 			.setDescription(
 				`Welcome to Moulberry Bush Support:tm:\n\nPlease make sure you have the latest version found in <#693586404256645231>.\nAdditionally if you need help installing the mod be sure to read <#737444942724726915> for a guide on how to do so.`
 			)
-			.setColor('BLURPLE');
+			.setColor(client.consts.colors.discord.BLURPLE);
 		void thread
 			.send({ embeds: [embed] })
 			.then(() =>
diff --git a/src/listeners/message/blacklistedFile.ts b/src/listeners/message/blacklistedFile.ts
index 9d52ab0..38803f5 100644
--- a/src/listeners/message/blacklistedFile.ts
+++ b/src/listeners/message/blacklistedFile.ts
@@ -68,9 +68,9 @@ export default class BlacklistedFileListener extends BushListener {
 	public override async exec(...[message]: BushClientEvents['messageCreate']) {
 		if (!message.guild || !(await message.guild.hasFeature('blacklistedFile'))) return;
 		// eslint-disable-next-line deprecation/deprecation
-		const embedAttachments = message.embeds.filter((e) => ['image', 'video', 'gifv'].includes(e.type));
+		// const embedAttachments = message.embeds.filter((e) => ['image', 'video', 'gifv'].includes(e.type));
 		const foundEmojis = [...message.content.matchAll(/<(?<animated>a?):\w+:(?<id>\d+)>/g)];
-		if (message.attachments.size + embedAttachments.length + foundEmojis.length < 1) return;
+		if (message.attachments.size + /* embedAttachments.length + */ foundEmojis.length < 1) return;
 		const foundFiles = [] as {
 			name: string;
 			hash: string[];
@@ -90,7 +90,7 @@ export default class BlacklistedFileListener extends BushListener {
 				continue;
 			}
 		}
-		for (const attachment of embedAttachments) {
+		/* for (const attachment of embedAttachments) {
 			try {
 				const req = await got.get(attachment.url!);
 				const rawHash = crypto.createHash('md5');
@@ -103,7 +103,7 @@ export default class BlacklistedFileListener extends BushListener {
 			} catch {
 				continue;
 			}
-		}
+		} */
 		for (const attachment of foundEmojis) {
 			try {
 				const req = await got.get(
diff --git a/src/listeners/message/directMessage.ts b/src/listeners/message/directMessage.ts
index dfc9222..c333e22 100644
--- a/src/listeners/message/directMessage.ts
+++ b/src/listeners/message/directMessage.ts
@@ -1,5 +1,5 @@
 import { BushListener, type BushClientEvents } from '#lib';
-import { ChannelType, MessageEmbed } from 'discord.js';
+import { ChannelType, Embed } from 'discord.js';
 
 export default class DirectMessageListener extends BushListener {
 	public constructor() {
@@ -14,7 +14,7 @@ export default class DirectMessageListener extends BushListener {
 		if (message.channel.type === ChannelType.DM) {
 			if (!(message.author.id == client.user!.id) && message.author.bot) return;
 			if (client.cache.global.blacklistedUsers.includes(message.author.id)) return;
-			const dmLogEmbed = new MessageEmbed().setTimestamp().setFooter({ text: `User ID • ${message.channel.recipient.id}` });
+			const dmLogEmbed = new Embed().setTimestamp().setFooter({ text: `User ID • ${message.channel.recipient.id}` });
 
 			if (message.author.id != client.user!.id) {
 				dmLogEmbed
@@ -37,7 +37,7 @@ export default class DirectMessageListener extends BushListener {
 			if (message.attachments.filter((a) => typeof a.size == 'number').size == 1) {
 				dmLogEmbed.setImage(message.attachments.filter((a) => typeof a.size == 'number').first()!.proxyURL);
 			} else if (message.attachments.size > 0) {
-				dmLogEmbed.addField('Attachments', message.attachments.map((a) => a.proxyURL).join('\n'));
+				dmLogEmbed.addField({ name: 'Attachments', value: message.attachments.map((a) => a.proxyURL).join('\n') });
 			}
 			const dmChannel = await util.getConfigChannel('dm');
 			await dmChannel.send({ embeds: [dmLogEmbed] });
diff --git a/src/listeners/other/consoleListener.ts b/src/listeners/other/consoleListener.ts
index 5a3e4e4..46f869f 100644
--- a/src/listeners/other/consoleListener.ts
+++ b/src/listeners/other/consoleListener.ts
@@ -28,7 +28,7 @@ export default class ConsoleListener extends BushListener {
 					ButtonComponent,
 					MessageCollector,
 					InteractionCollector,
-					MessageEmbed,
+					Embed,
 					SelectMenuComponent,
 					ReactionCollector,
 					Util,
diff --git a/src/listeners/track-manual-punishments/modlogSyncBan.ts b/src/listeners/track-manual-punishments/modlogSyncBan.ts
index 03024d8..7625357 100644
--- a/src/listeners/track-manual-punishments/modlogSyncBan.ts
+++ b/src/listeners/track-manual-punishments/modlogSyncBan.ts
@@ -1,6 +1,6 @@
 import { BushListener, BushUser, Moderation, ModLogType, type BushClientEvents } from '#lib';
 import { AuditLogEvent } from 'discord-api-types';
-import { MessageEmbed, Permissions } from 'discord.js';
+import { Embed, Permissions } from 'discord.js';
 
 export default class ModlogSyncBanListener extends BushListener {
 	public constructor() {
@@ -51,7 +51,7 @@ export default class ModlogSyncBanListener extends BushListener {
 		const logChannel = await ban.guild.getLogChannel('moderation');
 		if (!logChannel) return;
 
-		const logEmbed = new MessageEmbed()
+		const logEmbed = new Embed()
 			.setColor(util.colors.discord.RED)
 			.setTimestamp()
 			.setFooter({ text: `CaseID: ${log.id}` })
@@ -59,10 +59,10 @@ export default class ModlogSyncBanListener extends BushListener {
 				name: ban.user.tag,
 				iconURL: ban.user.avatarURL({ format: 'png', size: 4096 }) ?? undefined
 			})
-			.addField('**Action**', `${'Manual Ban'}`)
-			.addField('**User**', `${ban.user} (${ban.user.tag})`)
-			.addField('**Moderator**', `${first.executor} (${first.executor.tag})`)
-			.addField('**Reason**', `${first.reason ? first.reason : '[No Reason Provided]'}`);
+			.addField({ name: '**Action**', value: `${'Manual Ban'}` })
+			.addField({ name: '**User**', value: `${ban.user} (${ban.user.tag})` })
+			.addField({ name: '**Moderator**', value: `${first.executor} (${first.executor.tag})` })
+			.addField({ name: '**Reason**', value: `${first.reason ? first.reason : '[No Reason Provided]'}` });
 		return await logChannel.send({ embeds: [logEmbed] });
 	}
 }
diff --git a/src/listeners/track-manual-punishments/modlogSyncKick.ts b/src/listeners/track-manual-punishments/modlogSyncKick.ts
index 9ea6a9d..a369618 100644
--- a/src/listeners/track-manual-punishments/modlogSyncKick.ts
+++ b/src/listeners/track-manual-punishments/modlogSyncKick.ts
@@ -1,6 +1,6 @@
 import { BushListener, BushUser, Moderation, ModLogType, type BushClientEvents } from '#lib';
 import { AuditLogEvent } from 'discord-api-types';
-import { MessageEmbed, Permissions } from 'discord.js';
+import { Embed, Permissions } from 'discord.js';
 
 export default class ModlogSyncKickListener extends BushListener {
 	public constructor() {
@@ -51,7 +51,7 @@ export default class ModlogSyncKickListener extends BushListener {
 		const logChannel = await member.guild.getLogChannel('moderation');
 		if (!logChannel) return;
 
-		const logEmbed = new MessageEmbed()
+		const logEmbed = new Embed()
 			.setColor(util.colors.discord.RED)
 			.setTimestamp()
 			.setFooter({ text: `CaseID: ${log.id}` })
@@ -59,10 +59,10 @@ export default class ModlogSyncKickListener extends BushListener {
 				name: member.user.tag,
 				iconURL: member.user.avatarURL({ format: 'png', size: 4096 }) ?? undefined
 			})
-			.addField('**Action**', `${'Manual Kick'}`)
-			.addField('**User**', `${member.user} (${member.user.tag})`)
-			.addField('**Moderator**', `${first.executor} (${first.executor.tag})`)
-			.addField('**Reason**', `${first.reason ? first.reason : '[No Reason Provided]'}`);
+			.addField({ name: '**Action**', value: `${'Manual Kick'}` })
+			.addField({ name: '**User**', value: `${member.user} (${member.user.tag})` })
+			.addField({ name: '**Moderator**', value: `${first.executor} (${first.executor.tag})` })
+			.addField({ name: '**Reason**', value: `${first.reason ? first.reason : '[No Reason Provided]'}` });
 		return await logChannel.send({ embeds: [logEmbed] });
 	}
 }
diff --git a/src/listeners/track-manual-punishments/modlogSyncTimeout.ts b/src/listeners/track-manual-punishments/modlogSyncTimeout.ts
index 9b67f43..dd9391a 100644
--- a/src/listeners/track-manual-punishments/modlogSyncTimeout.ts
+++ b/src/listeners/track-manual-punishments/modlogSyncTimeout.ts
@@ -1,6 +1,6 @@
 import { BushListener, BushUser, Moderation, ModLogType, type BushClientEvents } from '#lib';
 import { AuditLogEvent } from 'discord-api-types';
-import { MessageEmbed, Permissions } from 'discord.js';
+import { Embed, Permissions } from 'discord.js';
 
 export default class ModlogSyncTimeoutListener extends BushListener {
 	public constructor() {
@@ -56,7 +56,7 @@ export default class ModlogSyncTimeoutListener extends BushListener {
 		const logChannel = await newMember.guild.getLogChannel('moderation');
 		if (!logChannel) return;
 
-		const logEmbed = new MessageEmbed()
+		const logEmbed = new Embed()
 			.setColor(util.colors.discord[newTime ? 'ORANGE' : 'GREEN'])
 			.setTimestamp()
 			.setFooter({ text: `CaseID: ${log.id}` })
@@ -64,10 +64,10 @@ export default class ModlogSyncTimeoutListener extends BushListener {
 				name: newMember.user.tag,
 				iconURL: newMember.user.avatarURL({ format: 'png', size: 4096 }) ?? undefined
 			})
-			.addField('**Action**', `${newTime ? 'Manual Timeout' : 'Manual Remove Timeout'}`)
-			.addField('**User**', `${newMember.user} (${newMember.user.tag})`)
-			.addField('**Moderator**', `${first.executor} (${first.executor.tag})`)
-			.addField('**Reason**', `${first.reason ? first.reason : '[No Reason Provided]'}`);
+			.addField({ name: '**Action**', value: `${newTime ? 'Manual Timeout' : 'Manual Remove Timeout'}` })
+			.addField({ name: '**User**', value: `${newMember.user} (${newMember.user.tag})` })
+			.addField({ name: '**Moderator**', value: `${first.executor} (${first.executor.tag})` })
+			.addField({ name: '**Reason**', value: `${first.reason ? first.reason : '[No Reason Provided]'}` });
 		return await logChannel.send({ embeds: [logEmbed] });
 	}
 }
diff --git a/src/listeners/track-manual-punishments/modlogSyncUnban.ts b/src/listeners/track-manual-punishments/modlogSyncUnban.ts
index 7cdecb0..84887e3 100644
--- a/src/listeners/track-manual-punishments/modlogSyncUnban.ts
+++ b/src/listeners/track-manual-punishments/modlogSyncUnban.ts
@@ -1,6 +1,6 @@
 import { BushListener, BushUser, Moderation, ModLogType, type BushClientEvents } from '#lib';
 import { AuditLogEvent } from 'discord-api-types';
-import { MessageEmbed, Permissions } from 'discord.js';
+import { Embed, Permissions } from 'discord.js';
 
 export default class ModlogSyncUnbanListener extends BushListener {
 	public constructor() {
@@ -50,7 +50,7 @@ export default class ModlogSyncUnbanListener extends BushListener {
 		const logChannel = await ban.guild.getLogChannel('moderation');
 		if (!logChannel) return;
 
-		const logEmbed = new MessageEmbed()
+		const logEmbed = new Embed()
 			.setColor(util.colors.discord.ORANGE)
 			.setTimestamp()
 			.setFooter({ text: `CaseID: ${log.id}` })
@@ -58,10 +58,10 @@ export default class ModlogSyncUnbanListener extends BushListener {
 				name: ban.user.tag,
 				iconURL: ban.user.avatarURL({ format: 'png', size: 4096 }) ?? undefined
 			})
-			.addField('**Action**', `${'Manual Unban'}`)
-			.addField('**User**', `${ban.user} (${ban.user.tag})`)
-			.addField('**Moderator**', `${first.executor} (${first.executor.tag})`)
-			.addField('**Reason**', `${first.reason ? first.reason : '[No Reason Provided]'}`);
+			.addField({ name: '**Action**', value: `${'Manual Unban'}` })
+			.addField({ name: '**User**', value: `${ban.user} (${ban.user.tag})` })
+			.addField({ name: '**Moderator**', value: `${first.executor} (${first.executor.tag})` })
+			.addField({ name: '**Reason**', value: `${first.reason ? first.reason : '[No Reason Provided]'}` });
 		return await logChannel.send({ embeds: [logEmbed] });
 	}
 }