diff --git a/src/commands/help.rs b/src/commands/help.rs
index e52af16..f862569 100644
--- a/src/commands/help.rs
+++ b/src/commands/help.rs
@@ -5,7 +5,11 @@ use crate::types::Context;
 type Error = Box<dyn std::error::Error + Send + Sync>;
 
 /// Show help message
-#[poise::command(slash_command, track_edits, category = "Utility")]
+#[poise::command(
+    slash_command,
+    track_edits,
+    category = "Help")
+]
 pub async fn help(
     ctx: Context<'_>,
     #[description = "Command to get help for"]
diff --git a/src/commands/user_interactions/headpat.rs b/src/commands/user_interactions/headpat.rs
index 8d33ad8..dd67445 100644
--- a/src/commands/user_interactions/headpat.rs
+++ b/src/commands/user_interactions/headpat.rs
@@ -6,7 +6,8 @@ use crate::types::{Error, Context};
 
 #[poise::command(
     slash_command,
-    description_localized("en-US", "Headpat all your friends!")
+    description_localized("en-US", "Headpat all your friends!"),
+    category = "Interaction"
 )]
 pub async fn headpat(ctx: Context<'_>,
     #[description = "Who is the lucky one?"]
diff --git a/src/commands/user_interactions/hug.rs b/src/commands/user_interactions/hug.rs
index 31dbe8c..3f7e63a 100644
--- a/src/commands/user_interactions/hug.rs
+++ b/src/commands/user_interactions/hug.rs
@@ -6,7 +6,8 @@ use crate::types::{Error, Context};
 
 #[poise::command(
     slash_command,
-    description_localized("en-US", "Hug all your friends!")
+    description_localized("en-US", "Hug all your friends!"),
+    category = "Interaction"
 )]
 pub async fn hug(ctx: Context<'_>,
     #[description = "Who is the lucky one?"]
diff --git a/src/commands/voice/general_player.rs b/src/commands/voice/general_player.rs
index 9f1c43c..00ca5dd 100644
--- a/src/commands/voice/general_player.rs
+++ b/src/commands/voice/general_player.rs
@@ -10,7 +10,8 @@ use super::connect;
 // For list of supported URLs visit https://github.com/yt-dlp/yt-dlp/blob/master/supportedsites.md
 #[poise::command(
     slash_command,
-    description_localized("en-US", "Plays music from supported URL")
+    description_localized("en-US", "Plays music from supported URL"),
+    category = "Voice"
 )]
 pub async fn play(ctx: Context<'_>,
     #[autocomplete = "autocomplete_channel"]
diff --git a/src/commands/voice/player_common.rs b/src/commands/voice/player_common.rs
index 2c00877..90babb8 100644
--- a/src/commands/voice/player_common.rs
+++ b/src/commands/voice/player_common.rs
@@ -17,7 +17,8 @@ use super::voice_utils::{connect, autocomplete_channel};
 /// Disconnect bot from voice channel
 #[poise::command(
     slash_command,
-    description_localized("en-US", "Disconnect from voice channel")
+    description_localized("en-US", "Disconnect from voice channel"),
+    category = "Voice"
 )]
 pub async fn disconnect(
     ctx: Context<'_>
@@ -66,7 +67,8 @@ async fn autocomplete_song(
 
 #[poise::command(
     slash_command,
-    description_localized("en-US", "Play song from server storage")
+    description_localized("en-US", "Play song from server storage"),
+    category = "Voice"
 )]
 pub async fn play_local(ctx: Context<'_>,
     #[autocomplete = "autocomplete_channel"]
@@ -121,7 +123,8 @@ pub async fn play_local(ctx: Context<'_>,
 /// Sends embed with some info about currently playing source
 #[poise::command(
     slash_command,
-    description_localized("en-US", "Display currently playing info")
+    description_localized("en-US", "Display currently playing info"),
+    category = "Voice"
 )]
 pub async fn playing(ctx: Context<'_>) -> Result<(), Error> {
 
@@ -150,8 +153,6 @@ pub async fn playing(ctx: Context<'_>) -> Result<(), Error> {
         playing_info.generate_embed().await    
     };
 
-    dbg!(&embed);
-
     ctx.send(
         CreateReply::default()
             .embed(embed)
diff --git a/src/commands/voice/radio/radio_player.rs b/src/commands/voice/radio/radio_player.rs
index 0f57526..d30c60c 100644
--- a/src/commands/voice/radio/radio_player.rs
+++ b/src/commands/voice/radio/radio_player.rs
@@ -30,7 +30,8 @@ pub async fn radio(_ctx: Context<'_>) -> Result<(), Error> {
 /// Play online radio stream directly from URL or autocompleted string
 #[poise::command(
     slash_command,
-    description_localized("en-US", "Plays music from URL source")
+    description_localized("en-US", "Plays music from URL source"),
+    category = "Voice"
 )]
 pub async fn play(ctx: Context<'_>,
     #[autocomplete = "autocomplete_channel"]
@@ -153,7 +154,8 @@ async fn autocomplete_radio(
 /// Search online radios (you can use stream URL from output for /play) 
 #[poise::command(
     slash_command,
-    description_localized("en-US", "Search for a radio")
+    description_localized("en-US", "Search for a radio"),
+    category = "Voice"
 )]
 pub async fn search(ctx: Context<'_>,
     #[description = "Radio station: "]
diff --git a/src/commands/voice/spotify/spotify.rs b/src/commands/voice/spotify/spotify.rs
deleted file mode 100644
index e69de29..0000000
diff --git a/src/commands/voice/spotify/spotify_player.rs b/src/commands/voice/spotify/spotify_player.rs
deleted file mode 100644
index e69de29..0000000