diff --git a/biome.json b/biome.json
index 4f089219a..27538ab80 100644
--- a/biome.json
+++ b/biome.json
@@ -48,11 +48,7 @@
     },
     "files": {
         "ignoreUnknown": true,
-        "ignore": [
-            ".vscode",
-            "node_modules",
-            "dist"
-        ]
+        "ignore": [".vscode", "node_modules", "dist"]
     },
     "json": {
         "formatter": {
@@ -77,4 +73,4 @@
             "semicolons": "always"
         }
     }
-}
\ No newline at end of file
+}
diff --git a/package.json b/package.json
index 90e77b1df..b3479b937 100644
--- a/package.json
+++ b/package.json
@@ -11,14 +11,8 @@
         "build": "tsc --project tsconfig.json",
         "clean": "node ./scripts/clean.js && npm run build",
         "clean:no-log": "node ./scripts/clean-no-log.js && npm run build",
-        "lint": "biome lint --write ./src",
-        "format": "biome format --write ./src"
-    },
-    "lint-staged": {
-        "*.ts": [
-            "biome check --write",
-            "biome format --write"
-        ]
+        "lint": "biome lint --fix ./src",
+        "format": "biome format --fix ./src"
     },
     "repository": {
         "type": "git",
diff --git a/src/commands/config/Prefix.ts b/src/commands/config/Prefix.ts
index 4af7eb4c2..044169f6f 100644
--- a/src/commands/config/Prefix.ts
+++ b/src/commands/config/Prefix.ts
@@ -10,7 +10,7 @@ export default class Prefix extends Command {
                 usage: "prefix [set <prefix> | reset]",
             },
             category: "general",
-            aliases: ["prefix"],
+            aliases: ["pf"],
             cooldown: 3,
             args: true,
             player: {
diff --git a/src/commands/config/Setup.ts b/src/commands/config/Setup.ts
index 9c4896740..b025383ec 100644
--- a/src/commands/config/Setup.ts
+++ b/src/commands/config/Setup.ts
@@ -12,7 +12,7 @@ export default class Setup extends Command {
                 usage: "setup",
             },
             category: "config",
-            aliases: ["setup"],
+            aliases: ["set"],
             cooldown: 3,
             args: true,
             player: {
diff --git a/src/commands/dev/GuildList.ts b/src/commands/dev/GuildList.ts
index dba4a21e4..1a9ab47d7 100644
--- a/src/commands/dev/GuildList.ts
+++ b/src/commands/dev/GuildList.ts
@@ -10,7 +10,7 @@ export default class GuildList extends Command {
                 usage: "guildlist",
             },
             category: "dev",
-            aliases: ["glt"],
+            aliases: ["glst"],
             cooldown: 3,
             args: false,
             player: {
diff --git a/src/commands/filters/Reset.ts b/src/commands/filters/Reset.ts
index 56f496f9d..a26404fe7 100644
--- a/src/commands/filters/Reset.ts
+++ b/src/commands/filters/Reset.ts
@@ -10,7 +10,7 @@ export default class Reset extends Command {
                 usage: "reset",
             },
             category: "filters",
-            aliases: ["reset"],
+            aliases: ["rs"],
             cooldown: 3,
             args: false,
             player: {
diff --git a/src/commands/info/Botinfo.ts b/src/commands/info/Botinfo.ts
index 2ea453945..c939c32a5 100644
--- a/src/commands/info/Botinfo.ts
+++ b/src/commands/info/Botinfo.ts
@@ -13,7 +13,7 @@ export default class Botinfo extends Command {
                 usage: "botinfo",
             },
             category: "info",
-            aliases: ["info", "bi"],
+            aliases: ["bi", "info", "stats", "status"],
             cooldown: 3,
             args: false,
             player: {
diff --git a/src/commands/info/Invite.ts b/src/commands/info/Invite.ts
index 5bd572ae8..6b35c2cbb 100644
--- a/src/commands/info/Invite.ts
+++ b/src/commands/info/Invite.ts
@@ -11,7 +11,7 @@ export default class Invite extends Command {
                 usage: "invite",
             },
             category: "info",
-            aliases: ["inv"],
+            aliases: ["iv"],
             cooldown: 3,
             args: false,
             player: {
diff --git a/src/commands/music/Grab.ts b/src/commands/music/Grab.ts
index cff93bc43..bf7026067 100644
--- a/src/commands/music/Grab.ts
+++ b/src/commands/music/Grab.ts
@@ -10,7 +10,7 @@ export default class Grab extends Command {
                 usage: "grab",
             },
             category: "music",
-            aliases: [],
+            aliases: ["gr"],
             cooldown: 3,
             args: false,
             player: {
diff --git a/src/commands/music/Join.ts b/src/commands/music/Join.ts
index 12c4131fb..b8753c061 100644
--- a/src/commands/music/Join.ts
+++ b/src/commands/music/Join.ts
@@ -10,7 +10,7 @@ export default class Join extends Command {
                 usage: "join",
             },
             category: "music",
-            aliases: ["j"],
+            aliases: ["come", "j"],
             cooldown: 3,
             args: false,
             player: {
diff --git a/src/commands/music/Pause.ts b/src/commands/music/Pause.ts
index cc8b0902f..176efad69 100644
--- a/src/commands/music/Pause.ts
+++ b/src/commands/music/Pause.ts
@@ -10,7 +10,7 @@ export default class Pause extends Command {
                 usage: "pause",
             },
             category: "music",
-            aliases: [],
+            aliases: ["pu"],
             cooldown: 3,
             args: false,
             player: {
diff --git a/src/commands/music/Play.ts b/src/commands/music/Play.ts
index 68b25b34f..c018122a0 100644
--- a/src/commands/music/Play.ts
+++ b/src/commands/music/Play.ts
@@ -6,10 +6,12 @@ export default class Play extends Command {
         super(client, {
             name: "play",
             description: {
-                content: "Plays a song from YouTube or Spotify",
+                content: "Plays a song from YouTube, Spotify or http",
                 examples: [
-                    "play https://www.youtube.com/watch?v=QH2-TGUlwu4",
-                    "play https://open.spotify.com/track/6WrI0LAC5M1Rw2MnX2ZvEg",
+                    "play example",
+                    "play https://www.youtube.com/watch?v=example",
+                    "play https://open.spotify.com/track/example",
+                    "play http://www.example.com/example.mp3",
                 ],
                 usage: "play <song>",
             },
diff --git a/src/commands/music/PlayNext.ts b/src/commands/music/PlayNext.ts
index 3bb8e9ea1..e8f552257 100644
--- a/src/commands/music/PlayNext.ts
+++ b/src/commands/music/PlayNext.ts
@@ -8,8 +8,10 @@ export default class PlayNext extends Command {
             description: {
                 content: "Add the song to play next in queue",
                 examples: [
-                    "playnext https://www.youtube.com/watch?v=QH2-TGUlwu4",
-                    "playnext https://open.spotify.com/track/6WrI0LAC5M1Rw2MnX2ZvEg",
+                    "playnext example",
+                    "playnext https://www.youtube.com/watch?v=example",
+                    "playnext https://open.spotify.com/track/example",
+                    "playnext http://www.example.com/example.mp3",
                 ],
                 usage: "playnext <song>",
             },
diff --git a/src/commands/music/Resume.ts b/src/commands/music/Resume.ts
index 6ec9fe73f..7e3f90350 100644
--- a/src/commands/music/Resume.ts
+++ b/src/commands/music/Resume.ts
@@ -7,7 +7,7 @@ export default class Resume extends Command {
             description: {
                 content: "Resumes the current song",
                 examples: ["resume"],
-                usage: "resume",
+                usage: "re",
             },
             category: "music",
             aliases: ["r"],
diff --git a/src/commands/music/Search.ts b/src/commands/music/Search.ts
index 951508ce8..612d1ba56 100644
--- a/src/commands/music/Search.ts
+++ b/src/commands/music/Search.ts
@@ -9,8 +9,8 @@ export default class Search extends Command {
             name: "search",
             description: {
                 content: "Searches for a song",
-                examples: ["search", "search <song>"],
-                usage: "search",
+                examples: ["search example"],
+                usage: "search <song>",
             },
             category: "music",
             aliases: ["sc"],
diff --git a/src/commands/music/Seek.ts b/src/commands/music/Seek.ts
index c9b6e9b0a..f510d117a 100644
--- a/src/commands/music/Seek.ts
+++ b/src/commands/music/Seek.ts
@@ -6,11 +6,11 @@ export default class Seek extends Command {
             name: "seek",
             description: {
                 content: "Seeks to a certain time in the song",
-                examples: ["seek 1m, seek 1h 30m"],
-                usage: "seek <time>",
+                examples: ["seek 1m, seek 1h 30m", "seek 1h 30m 30s"],
+                usage: "seek <duration>",
             },
             category: "music",
-            aliases: ["se"],
+            aliases: ["s"],
             cooldown: 3,
             args: true,
             player: {
diff --git a/src/commands/music/Skipto.ts b/src/commands/music/Skipto.ts
index 472f9a6d4..5ff44bade 100644
--- a/src/commands/music/Skipto.ts
+++ b/src/commands/music/Skipto.ts
@@ -10,7 +10,7 @@ export default class Skipto extends Command {
                 usage: "skipto <number>",
             },
             category: "music",
-            aliases: ["st"],
+            aliases: ["skt"],
             cooldown: 3,
             args: true,
             player: {
diff --git a/src/commands/filters/Volume.ts b/src/commands/music/Volume.ts
similarity index 98%
rename from src/commands/filters/Volume.ts
rename to src/commands/music/Volume.ts
index bc6773747..d9176681c 100644
--- a/src/commands/filters/Volume.ts
+++ b/src/commands/music/Volume.ts
@@ -10,7 +10,7 @@ export default class Volume extends Command {
                 usage: "volume <number>",
             },
             category: "music",
-            aliases: ["vol"],
+            aliases: ["v", "vol"],
             cooldown: 3,
             args: true,
             player: {
diff --git a/src/commands/playlist/Add.ts b/src/commands/playlist/Add.ts
index 621507921..b55a4f4ed 100644
--- a/src/commands/playlist/Add.ts
+++ b/src/commands/playlist/Add.ts
@@ -12,7 +12,7 @@ export default class AddPlaylist extends Command {
                 usage: "add <playlist> <song>",
             },
             category: "playlist",
-            aliases: ["add"],
+            aliases: ["a"],
             cooldown: 3,
             args: true,
             player: {
@@ -89,7 +89,6 @@ export default class AddPlaylist extends Command {
     }
 }
 
-
 /**
  * Project: lavamusic
  * Author: Appu
diff --git a/src/commands/playlist/Create.ts b/src/commands/playlist/Create.ts
index b243ba4bf..95cf6f965 100644
--- a/src/commands/playlist/Create.ts
+++ b/src/commands/playlist/Create.ts
@@ -10,7 +10,7 @@ export default class CreatePlaylist extends Command {
                 usage: "create <name>",
             },
             category: "playlist",
-            aliases: ["create"],
+            aliases: ["cre"],
             cooldown: 3,
             args: true,
             player: {
diff --git a/src/commands/playlist/Delete.ts b/src/commands/playlist/DeletePl.ts
similarity index 92%
rename from src/commands/playlist/Delete.ts
rename to src/commands/playlist/DeletePl.ts
index 07db5c14e..f9f9dce83 100644
--- a/src/commands/playlist/Delete.ts
+++ b/src/commands/playlist/DeletePl.ts
@@ -3,14 +3,14 @@ import { Command, type Context, type Lavamusic } from "../../structures/index.js
 export default class DeletePlaylist extends Command {
     constructor(client: Lavamusic) {
         super(client, {
-            name: "delete",
+            name: "deletepl",
             description: {
                 content: "Deletes a playlist",
-                examples: ["delete <playlist name>"],
-                usage: "delete <playlist name>",
+                examples: ["deletepl <playlist name>"],
+                usage: "deletepl <playlist name>",
             },
             category: "playlist",
-            aliases: ["del"],
+            aliases: ["delpl"],
             cooldown: 3,
             args: true,
             player: {
diff --git a/src/commands/playlist/Load.ts b/src/commands/playlist/Load.ts
index e254f6b21..7e9ceb083 100644
--- a/src/commands/playlist/Load.ts
+++ b/src/commands/playlist/Load.ts
@@ -10,7 +10,7 @@ export default class LoadPlaylist extends Command {
                 usage: "load <playlist>",
             },
             category: "playlist",
-            aliases: [],
+            aliases: ["lo"],
             cooldown: 3,
             args: true,
             player: {
@@ -73,7 +73,7 @@ export default class LoadPlaylist extends Command {
                 player.queue.push(track);
                 player.isPlaying();
             }
-            await player.isPlaying()
+            await player.isPlaying();
             return await ctx.sendMessage({
                 embeds: [
                     {
diff --git a/src/commands/playlist/Remove.ts b/src/commands/playlist/Remove.ts
index 64bbeb75b..625256aaa 100644
--- a/src/commands/playlist/Remove.ts
+++ b/src/commands/playlist/Remove.ts
@@ -4,14 +4,14 @@ import { Command, type Context, type Lavamusic } from "../../structures/index.js
 export default class RemoveSong extends Command {
     constructor(client: Lavamusic) {
         super(client, {
-            name: "deletus",
+            name: "remove",
             description: {
                 content: "Removes a song from the playlist",
-                examples: ["deletus <playlist> <song>"],
-                usage: "deletus <playlist> <song>",
+                examples: ["remove <playlist> <song>"],
+                usage: "remove <playlist> <song>",
             },
             category: "playlist",
-            aliases: ["dl"],
+            aliases: ["del"],
             cooldown: 3,
             args: true,
             player: {
@@ -60,7 +60,10 @@ export default class RemoveSong extends Command {
         const playlistData = await client.db.getPlaylist(ctx.author.id, playlist);
 
         if (!playlistData) {
-            const playlistNotFoundError = this.client.embed().setDescription("[That playlist doesn't exist]").setColor(this.client.color.red);
+            const playlistNotFoundError = this.client
+                .embed()
+                .setDescription("[That playlist doesn't exist]")
+                .setColor(this.client.color.red);
             return await ctx.sendMessage({ embeds: [playlistNotFoundError] });
         }
 
@@ -84,8 +87,22 @@ export default class RemoveSong extends Command {
             ctx.sendMessage({ embeds: [successMessage] });
         } catch (error) {
             console.error(error);
-            const genericError = this.client.embed().setDescription("[An error occurred while removing the song]").setColor(this.client.color.red);
+            const genericError = this.client
+                .embed()
+                .setDescription("[An error occurred while removing the song]")
+                .setColor(this.client.color.red);
             return await ctx.sendMessage({ embeds: [genericError] });
         }
     }
 }
+
+/**
+ * Project: lavamusic
+ * Author: Appu
+ * Main Contributor: LucasB25
+ * Company: Coders
+ * Copyright (c) 2024. All rights reserved.
+ * This code is the property of Coder and may not be reproduced or
+ * modified without permission. For more information, contact us at
+ * https://discord.gg/ns8CTk9J3e
+ */
diff --git a/src/commands/playlist/StealPlaylist.ts b/src/commands/playlist/Steal.ts
similarity index 80%
rename from src/commands/playlist/StealPlaylist.ts
rename to src/commands/playlist/Steal.ts
index 2772d7638..8ad5e22c1 100644
--- a/src/commands/playlist/StealPlaylist.ts
+++ b/src/commands/playlist/Steal.ts
@@ -5,12 +5,12 @@ export default class StealPlaylist extends Command {
         super(client, {
             name: "steal",
             description: {
-                content: "Steals a playlist from another user and adds it to your account",
+                content: "Steals a playlist from another user",
                 examples: ["steal <playlist_name> <@user>"],
                 usage: "steal <playlist_name> <@user>",
             },
             category: "playlist",
-            aliases: ["steal"],
+            aliases: ["st"],
             cooldown: 3,
             args: true,
             player: {
@@ -34,9 +34,9 @@ export default class StealPlaylist extends Command {
                 },
                 {
                     name: "user",
-                    description: "The user from whom you want to steal the playlist",
+                    description: "The user from who you want to steal the playlist",
                     type: 6,
-                    required: true, // 6 represents a USER type in Discord API
+                    required: true,
                 },
             ],
         });
@@ -47,10 +47,10 @@ export default class StealPlaylist extends Command {
         let userId;
         let targetUser = ctx.args[0];
 
-        if (targetUser && targetUser.startsWith('<@') && targetUser.endsWith('>')) {
+        if (targetUser && targetUser.startsWith("<@") && targetUser.endsWith(">")) {
             targetUser = targetUser.slice(2, -1);
 
-            if (targetUser.startsWith('!')) {
+            if (targetUser.startsWith("!")) {
                 targetUser = targetUser.slice(1);
             }
 
@@ -77,7 +77,10 @@ export default class StealPlaylist extends Command {
             const targetPlaylist = await client.db.getPlaylist(targetUserId, playlistName);
 
             if (!targetPlaylist) {
-                const playlistNotFoundError = this.client.embed().setDescription("[That playlist doesn't exist for the mentioned user]").setColor(this.client.color.red);
+                const playlistNotFoundError = this.client
+                    .embed()
+                    .setDescription("[That playlist doesn't exist for the mentioned user]")
+                    .setColor(this.client.color.red);
                 return await ctx.sendMessage({ embeds: [playlistNotFoundError] });
             }
 
@@ -91,7 +94,10 @@ export default class StealPlaylist extends Command {
             await ctx.sendMessage({ embeds: [successMessage] });
         } catch (error) {
             console.error(error);
-            const errorMessage = this.client.embed().setDescription("[An error occurred while stealing the playlist]").setColor(this.client.color.red);
+            const errorMessage = this.client
+                .embed()
+                .setDescription("[An error occurred while stealing the playlist]")
+                .setColor(this.client.color.red);
             await ctx.sendMessage({ embeds: [errorMessage] });
         }
     }
diff --git a/src/commands/playlist/GetPLayLists.ts b/src/commands/playlist/list.ts
similarity index 74%
rename from src/commands/playlist/GetPLayLists.ts
rename to src/commands/playlist/list.ts
index 4e55a817b..9d8a9872e 100644
--- a/src/commands/playlist/GetPLayLists.ts
+++ b/src/commands/playlist/list.ts
@@ -1,16 +1,16 @@
-import { Command, Context, Lavamusic } from "../../structures/index.js";
+import { Command, type Context, type Lavamusic } from "../../structures/index.js";
 
 export default class GetPlaylists extends Command {
     constructor(client: Lavamusic) {
         super(client, {
-            name: "playlists",
+            name: "list",
             description: {
                 content: "Retrieves all playlists for the user",
-                examples: ["playlists", "playlists @user"],
-                usage: "playlists [@user]",
+                examples: ["list", "list @user"],
+                usage: "list [@user]",
             },
             category: "playlist",
-            aliases: ["playlists"],
+            aliases: ["lst"],
             cooldown: 3,
             args: false,
             player: {
@@ -41,10 +41,10 @@ export default class GetPlaylists extends Command {
             let userId;
             let targetUser = ctx.args[0];
 
-            if (targetUser && targetUser.startsWith('<@') && targetUser.endsWith('>')) {
+            if (targetUser && targetUser.startsWith("<@") && targetUser.endsWith(">")) {
                 targetUser = targetUser.slice(2, -1);
 
-                if (targetUser.startsWith('!')) {
+                if (targetUser.startsWith("!")) {
                     targetUser = targetUser.slice(1);
                 }
 
@@ -59,7 +59,10 @@ export default class GetPlaylists extends Command {
             const playlists = await client.db.getUserPlaylists(userId);
 
             if (!playlists || playlists.length === 0) {
-                const noPlaylistsMessage = this.client.embed().setDescription("[This user has no playlists]").setColor(this.client.color.red);
+                const noPlaylistsMessage = this.client
+                    .embed()
+                    .setDescription("[This user has no playlists]")
+                    .setColor(this.client.color.red);
                 return await ctx.sendMessage({ embeds: [noPlaylistsMessage] });
             }
 
@@ -72,7 +75,10 @@ export default class GetPlaylists extends Command {
             await ctx.sendMessage({ embeds: [successMessage] });
         } catch (error) {
             console.error(error);
-            const errorMessage = this.client.embed().setDescription("[An error occurred while retrieving the playlists]").setColor(this.client.color.red);
+            const errorMessage = this.client
+                .embed()
+                .setDescription("[An error occurred while retrieving the playlists]")
+                .setColor(this.client.color.red);
             await ctx.sendMessage({ embeds: [errorMessage] });
         }
     }
diff --git a/src/database/server.ts b/src/database/server.ts
index 2420bff75..6517fc7d9 100644
--- a/src/database/server.ts
+++ b/src/database/server.ts
@@ -135,7 +135,7 @@ export default class ServerData {
                 userId,
                 name,
                 songs: {
-                    create: songs.map(song => ({ track: song.track })),
+                    create: songs.map((song) => ({ track: song.track })),
                 },
             },
         });
diff --git a/src/events/client/MessageCreate.ts b/src/events/client/MessageCreate.ts
index 562aea363..9a2c193c2 100644
--- a/src/events/client/MessageCreate.ts
+++ b/src/events/client/MessageCreate.ts
@@ -122,7 +122,7 @@ export default class MessageCreate extends Event {
 
             if (command.player.active) {
                 const queue = this.client.queue.get(message.guildId);
-                if (!(queue?.queue && !queue.current)) {
+                if (!queue?.queue && queue.current) {
                     await message.reply({
                         content: "Nothing is playing right now.",
                     });
@@ -140,19 +140,20 @@ export default class MessageCreate extends Event {
                         });
                         return;
                     }
-
-                    const hasDJRole = message.member.roles.cache.some((role) => djRole.map((r) => r.roleId).includes(role.id));
-                    if (!(hasDJRole && !message.member.permissions.has(PermissionFlagsBits.ManageGuild))) {
-                        await message
-                            .reply({
-                                content: "You need to have the DJ role to use this command.",
-                            })
-                            .then((msg) => setTimeout(() => msg.delete(), 5000));
-                        return;
+                    const findDJRole = message.member.roles.cache.find((x: any) => djRole.map((y: any) => y.roleId).includes(x.id));
+                    if (!findDJRole) {
+                        if (!message.member.permissions.has(PermissionFlagsBits.ManageGuild)) {
+                            await message
+                                .reply({
+                                    content: "You need to have the DJ role to use this command.",
+                                })
+                                .then((msg) => setTimeout(() => msg.delete(), 5000));
+                            return;
+                        }
                     }
                 }
             }
-        }
+       }
 
         if (command.args && !args.length) {
             const embed = this.client