diff --git a/commands/Administration/addcommand.js b/commands/Administration/addcommand.js
index e9e3db6f..1bbb4058 100644
--- a/commands/Administration/addcommand.js
+++ b/commands/Administration/addcommand.js
@@ -7,12 +7,12 @@ class Addcommand extends Command {
 			dirname: __dirname,
 			enabled: true,
 			guildOnly: true,
-			aliases: ["custom-command"],
+			aliases: ["addc"],
 			memberPermissions: ["MANAGE_GUILD"],
 			botPermissions: ["SEND_MESSAGES", "EMBED_LINKS"],
 			nsfw: false,
 			ownerOnly: false,
-			cooldown: 2000
+			cooldown: 1000
 		});
 	}
 
diff --git a/commands/Administration/addemoji.js b/commands/Administration/addemoji.js
index 3196e345..de37c90a 100644
--- a/commands/Administration/addemoji.js
+++ b/commands/Administration/addemoji.js
@@ -7,12 +7,12 @@ class Addemoji extends Command {
 			dirname: __dirname,
 			enabled: true,
 			guildOnly: true,
-			aliases: [],
+			aliases: ["adde"],
 			memberPermissions: ["MANAGE_GUILD"],
 			botPermissions: ["SEND_MESSAGES", "EMBED_LINKS"],
 			nsfw: false,
 			ownerOnly: false,
-			cooldown: 2000
+			cooldown: 1000
 		});
 	}
 
diff --git a/commands/Administration/automod.js b/commands/Administration/automod.js
index a6c61cbb..5d7d13d7 100644
--- a/commands/Administration/automod.js
+++ b/commands/Administration/automod.js
@@ -7,12 +7,12 @@ class Automod extends Command {
 			dirname: __dirname,
 			enabled: true,
 			guildOnly: true,
-			aliases: [],
+			aliases: ["autom"],
 			memberPermissions: ["MANAGE_GUILD"],
 			botPermissions: ["SEND_MESSAGES", "EMBED_LINKS"],
 			nsfw: false,
 			ownerOnly: false,
-			cooldown: 2000
+			cooldown: 1000
 		});
 	}
 
diff --git a/commands/Administration/autorole.js b/commands/Administration/autorole.js
index 2e4901f9..dbfee8b8 100644
--- a/commands/Administration/autorole.js
+++ b/commands/Administration/autorole.js
@@ -8,12 +8,12 @@ class Autorole extends Command {
 			dirname: __dirname,
 			enabled: true,
 			guildOnly: true,
-			aliases: ["ar"],
+			aliases: ["autor"],
 			memberPermissions: ["MANAGE_GUILD"],
 			botPermissions: ["SEND_MESSAGES", "EMBED_LINKS"],
 			nsfw: false,
 			ownerOnly: false,
-			cooldown: 2000
+			cooldown: 1000
 		});
 	}
 
diff --git a/commands/Administration/backup.js b/commands/Administration/backup.js
index db0bb715..02669a3e 100644
--- a/commands/Administration/backup.js
+++ b/commands/Administration/backup.js
@@ -10,12 +10,12 @@ class Backup extends Command {
 			dirname: __dirname,
 			enabled: true,
 			guildOnly: true,
-			aliases: [],
+			aliases: ["ba"],
 			memberPermissions: ["MANAGE_GUILD"],
 			botPermissions: ["SEND_MESSAGES", "EMBED_LINKS", "ADMINISTRATOR"],
 			nsfw: false,
 			ownerOnly: false,
-			cooldown: 30000
+			cooldown: 10000
 		});
 	}
 
diff --git a/commands/Administration/configuration.js b/commands/Administration/configuration.js
index 7bbcf472..96ec1fdf 100644
--- a/commands/Administration/configuration.js
+++ b/commands/Administration/configuration.js
@@ -13,7 +13,7 @@ class Configuration extends Command {
 			botPermissions: ["SEND_MESSAGES", "EMBED_LINKS"],
 			nsfw: false,
 			ownerOnly: false,
-			cooldown: 3000
+			cooldown: 2000
 		});
 	}
 
diff --git a/commands/Administration/delcommand.js b/commands/Administration/delcommand.js
index 4fe3a177..4df87e00 100644
--- a/commands/Administration/delcommand.js
+++ b/commands/Administration/delcommand.js
@@ -7,12 +7,12 @@ class Delcommand extends Command {
 			dirname: __dirname,
 			enabled: true,
 			guildOnly: true,
-			aliases: [],
+			aliases: ["delc"],
 			memberPermissions: ["MANAGE_GUILD"],
 			botPermissions: ["SEND_MESSAGES", "EMBED_LINKS"],
 			nsfw: false,
 			ownerOnly: false,
-			cooldown: 2000
+			cooldown: 1000
 		});
 	}
 
diff --git a/commands/Administration/deletemod.js b/commands/Administration/deletemod.js
index 43c61553..7c9b4a6c 100644
--- a/commands/Administration/deletemod.js
+++ b/commands/Administration/deletemod.js
@@ -7,12 +7,12 @@ class Deletemod extends Command {
 			dirname: __dirname,
 			enabled: true,
 			guildOnly: true,
-			aliases: ["autodeletemodcommands"],
+			aliases: ["delm"],
 			memberPermissions: ["MANAGE_MESSAGES"],
 			botPermissions: ["SEND_MESSAGES", "EMBED_LINKS"],
 			nsfw: false,
 			ownerOnly: false,
-			cooldown: 2000
+			cooldown: 1000
 		});
 	}
 
diff --git a/commands/Administration/goodbye.js b/commands/Administration/goodbye.js
index feb6af32..5e26f00b 100644
--- a/commands/Administration/goodbye.js
+++ b/commands/Administration/goodbye.js
@@ -8,12 +8,12 @@ class Goodbye extends Command {
 			dirname: __dirname,
 			enabled: true,
 			guildOnly: true,
-			aliases: ["au-revoir"],
+			aliases: ["gb"],
 			memberPermissions: ["MANAGE_GUILD"],
 			botPermissions: ["SEND_MESSAGES", "EMBED_LINKS"],
 			nsfw: false,
 			ownerOnly: false,
-			cooldown: 2000
+			cooldown: 1000
 		});
 	}
 
diff --git a/commands/Administration/ignore.js b/commands/Administration/ignore.js
index c452f8ce..8babbb57 100644
--- a/commands/Administration/ignore.js
+++ b/commands/Administration/ignore.js
@@ -7,7 +7,7 @@ class Ignore extends Command {
 			dirname: __dirname,
 			enabled: true,
 			guildOnly: true,
-			aliases: ["disableChannel"],
+			aliases: ["ig"],
 			memberPermissions: ["MANAGE_GUILD"],
 			botPermissions: ["SEND_MESSAGES", "EMBED_LINKS"],
 			nsfw: false,
diff --git a/commands/Administration/set.js b/commands/Administration/set.js
index e5fd5a88..040f1407 100644
--- a/commands/Administration/set.js
+++ b/commands/Administration/set.js
@@ -12,7 +12,7 @@ class Set extends Command {
 			botPermissions: ["SEND_MESSAGES"],
 			nsfw: false,
 			ownerOnly: false,
-			cooldown: 3000
+			cooldown: 2000
 		});
 	}
 
diff --git a/commands/Administration/setbirthdays.js b/commands/Administration/setbirthdays.js
index e56eed79..d55fefe3 100644
--- a/commands/Administration/setbirthdays.js
+++ b/commands/Administration/setbirthdays.js
@@ -8,12 +8,12 @@ class Setbirthdays extends Command {
 			dirname: __dirname,
 			enabled: true,
 			guildOnly: true,
-			aliases: [],
+			aliases: ["setb"],
 			memberPermissions: ["MANAGE_GUILD"],
 			botPermissions: ["SEND_MESSAGES", "EMBED_LINKS"],
 			nsfw: false,
 			ownerOnly: false,
-			cooldown: 2000
+			cooldown: 1000
 		});
 	}
 
diff --git a/commands/Administration/setfortniteshop.js b/commands/Administration/setfortniteshop.js
index a2988676..e2c36b1d 100644
--- a/commands/Administration/setfortniteshop.js
+++ b/commands/Administration/setfortniteshop.js
@@ -14,7 +14,7 @@ class Setfortniteshop extends Command {
 			botPermissions: ["SEND_MESSAGES", "EMBED_LINKS"],
 			nsfw: false,
 			ownerOnly: false,
-			cooldown: 2000
+			cooldown: 1000
 		});
 	}
 
diff --git a/commands/Administration/setlang.js b/commands/Administration/setlang.js
index b8708b10..ce214036 100644
--- a/commands/Administration/setlang.js
+++ b/commands/Administration/setlang.js
@@ -7,12 +7,12 @@ class Setlang extends Command {
 			dirname: __dirname,
 			enabled: true,
 			guildOnly: true,
-			aliases: [],
+			aliases: ["setl"],
 			memberPermissions: ["MANAGE_GUILD"],
 			botPermissions: ["SEND_MESSAGES", "EMBED_LINKS"],
 			nsfw: false,
 			ownerOnly: false,
-			cooldown: 2000
+			cooldown: 1000
 		});
 	}
 
diff --git a/commands/Administration/setmodlogs.js b/commands/Administration/setmodlogs.js
index e4927578..6e49723f 100644
--- a/commands/Administration/setmodlogs.js
+++ b/commands/Administration/setmodlogs.js
@@ -8,12 +8,12 @@ class Setmodlogs extends Command {
 			dirname: __dirname,
 			enabled: true,
 			guildOnly: true,
-			aliases: ["setmodlogs"],
+			aliases: ["setm"],
 			memberPermissions: ["MANAGE_GUILD"],
 			botPermissions: ["SEND_MESSAGES", "EMBED_LINKS"],
 			nsfw: false,
 			ownerOnly: false,
-			cooldown: 2000
+			cooldown: 1000
 		});
 	}
 
diff --git a/commands/Administration/setprefix.js b/commands/Administration/setprefix.js
index 427d3da8..bc84f298 100644
--- a/commands/Administration/setprefix.js
+++ b/commands/Administration/setprefix.js
@@ -7,12 +7,12 @@ class Setprefix extends Command {
 			dirname: __dirname,
 			enabled: true,
 			guildOnly: true,
-			aliases: [],
+			aliases: ["setp"],
 			memberPermissions: ["MANAGE_GUILD"],
 			botPermissions: ["SEND_MESSAGES", "EMBED_LINKS"],
 			nsfw: false,
 			ownerOnly: false,
-			cooldown: 2000
+			cooldown: 1000
 		});
 	}
 
diff --git a/commands/Administration/setreports.js b/commands/Administration/setreports.js
index ef6cb3f9..11855035 100644
--- a/commands/Administration/setreports.js
+++ b/commands/Administration/setreports.js
@@ -8,12 +8,12 @@ class Setreports extends Command {
 			dirname: __dirname,
 			enabled: true,
 			guildOnly: true,
-			aliases: ["setreport"],
+			aliases: ["setr"],
 			memberPermissions: ["MANAGE_GUILD"],
 			botPermissions: ["SEND_MESSAGES", "EMBED_LINKS"],
 			nsfw: false,
 			ownerOnly: false,
-			cooldown: 2000
+			cooldown: 1000
 		});
 	}
 
diff --git a/commands/Administration/setsuggests.js b/commands/Administration/setsuggests.js
index b600fbd4..5e50b2ce 100644
--- a/commands/Administration/setsuggests.js
+++ b/commands/Administration/setsuggests.js
@@ -8,12 +8,12 @@ class Setsuggests extends Command {
 			dirname: __dirname,
 			enabled: true,
 			guildOnly: true,
-			aliases: ["setsuggest", "setsuggestions", "setsuggestion"],
+			aliases: ["setsu"],
 			memberPermissions: ["MANAGE_GUILD"],
 			botPermissions: ["SEND_MESSAGES", "EMBED_LINKS"],
 			nsfw: false,
 			ownerOnly: false,
-			cooldown: 2000
+			cooldown: 1000
 		});
 	}
 
diff --git a/commands/Administration/slowmode.js b/commands/Administration/slowmode.js
index a117f893..eaac95e7 100644
--- a/commands/Administration/slowmode.js
+++ b/commands/Administration/slowmode.js
@@ -8,12 +8,12 @@ class Slowmode extends Command {
 			dirname: __dirname,
 			enabled: true,
 			guildOnly: true,
-			aliases: ["slowmotion"],
+			aliases: ["sl"],
 			memberPermissions: ["MANAGE_GUILD"],
 			botPermissions: ["SEND_MESSAGES", "EMBED_LINKS"],
 			nsfw: false,
 			ownerOnly: false,
-			cooldown: 3000
+			cooldown: 2000
 		});
 	}
 
diff --git a/commands/Administration/welcome.js b/commands/Administration/welcome.js
index dbda5806..f997d8f9 100644
--- a/commands/Administration/welcome.js
+++ b/commands/Administration/welcome.js
@@ -8,12 +8,12 @@ class Welcome extends Command {
 			dirname: __dirname,
 			enabled: true,
 			guildOnly: true,
-			aliases: ["bienvenue"],
+			aliases: ["welc"],
 			memberPermissions: ["MANAGE_GUILD"],
 			botPermissions: ["SEND_MESSAGES", "EMBED_LINKS"],
 			nsfw: false,
 			ownerOnly: false,
-			cooldown: 2000
+			cooldown: 1000
 		});
 	}
 
diff --git a/commands/Economy/birthdate.js b/commands/Economy/birthdate.js
index e535c40a..3c9df19e 100644
--- a/commands/Economy/birthdate.js
+++ b/commands/Economy/birthdate.js
@@ -7,7 +7,7 @@ class Birthdate extends Command {
 			dirname: __dirname,
 			enabled: true,
 			guildOnly: false,
-			aliases: ["anniversaire"],
+			aliases: ["bd"],
 			memberPermissions: [],
 			botPermissions: ["SEND_MESSAGES", "EMBED_LINKS"],
 			nsfw: false,
diff --git a/commands/Economy/deposit.js b/commands/Economy/deposit.js
index 8ca35158..1f7528eb 100644
--- a/commands/Economy/deposit.js
+++ b/commands/Economy/deposit.js
@@ -7,7 +7,7 @@ class Deposit extends Command {
 			dirname: __dirname,
 			enabled: true,
 			guildOnly: true,
-			aliases: ["bank", "banque", "dep"],
+			aliases: ["bank", "dep"],
 			memberPermissions: [],
 			botPermissions: ["SEND_MESSAGES", "EMBED_LINKS"],
 			nsfw: false,
diff --git a/commands/Economy/divorce.js b/commands/Economy/divorce.js
index 6a82ad3b..ae8a86e1 100644
--- a/commands/Economy/divorce.js
+++ b/commands/Economy/divorce.js
@@ -7,7 +7,7 @@ class Divorce extends Command {
 			dirname: __dirname,
 			enabled: true,
 			guildOnly: false,
-			aliases: ["profil"],
+			aliases: ["di"],
 			memberPermissions: [],
 			botPermissions: ["SEND_MESSAGES", "EMBED_LINKS"],
 			nsfw: false,
diff --git a/commands/Economy/leaderboard.js b/commands/Economy/leaderboard.js
index e51fdc2a..caad195a 100644
--- a/commands/Economy/leaderboard.js
+++ b/commands/Economy/leaderboard.js
@@ -13,7 +13,7 @@ class Leaderboard extends Command {
 			botPermissions: ["SEND_MESSAGES", "EMBED_LINKS"],
 			nsfw: false,
 			ownerOnly: false,
-			cooldown: 3000
+			cooldown: 2000
 		});
 	}
 
diff --git a/commands/Economy/marry.js b/commands/Economy/marry.js
index e061dadd..56c6aed7 100644
--- a/commands/Economy/marry.js
+++ b/commands/Economy/marry.js
@@ -10,12 +10,12 @@ class Marry extends Command {
 			dirname: __dirname,
 			enabled: true,
 			guildOnly: true,
-			aliases: ["mariage"],
+			aliases: [],
 			memberPermissions: [],
 			botPermissions: ["SEND_MESSAGES", "EMBED_LINKS"],
 			nsfw: false,
 			ownerOnly: false,
-			cooldown: 5000
+			cooldown: 2000
 		});
 	}
 
diff --git a/commands/Economy/money.js b/commands/Economy/money.js
index 5641d927..ad3b141f 100644
--- a/commands/Economy/money.js
+++ b/commands/Economy/money.js
@@ -14,7 +14,7 @@ class Credits extends Command {
 			dirname: __dirname,
 			enabled: true,
 			guildOnly: true,
-			aliases: ["credits", "balance"],
+			aliases: ["credits", "balance", "mon"],
 			memberPermissions: [],
 			botPermissions: ["SEND_MESSAGES", "EMBED_LINKS"],
 			nsfw: false,
diff --git a/commands/Economy/pay.js b/commands/Economy/pay.js
index 40d785d7..f26e61b4 100644
--- a/commands/Economy/pay.js
+++ b/commands/Economy/pay.js
@@ -12,7 +12,7 @@ class Pay extends Command {
 			botPermissions: ["SEND_MESSAGES", "EMBED_LINKS"],
 			nsfw: false,
 			ownerOnly: false,
-			cooldown: 5000
+			cooldown: 2000
 		});
 	}
 
diff --git a/commands/Economy/profile.js b/commands/Economy/profile.js
index 5e4ea733..47ca039d 100644
--- a/commands/Economy/profile.js
+++ b/commands/Economy/profile.js
@@ -19,7 +19,7 @@ class Profile extends Command {
 			botPermissions: ["SEND_MESSAGES", "EMBED_LINKS"],
 			nsfw: false,
 			ownerOnly: false,
-			cooldown: 2000
+			cooldown: 1000
 		});
 	}
 
diff --git a/commands/Economy/rep.js b/commands/Economy/rep.js
index 2a8f2d5a..d56ab96b 100644
--- a/commands/Economy/rep.js
+++ b/commands/Economy/rep.js
@@ -12,7 +12,7 @@ class Rep extends Command {
 			botPermissions: ["SEND_MESSAGES", "EMBED_LINKS"],
 			nsfw: false,
 			ownerOnly: false,
-			cooldown: 2000
+			cooldown: 1000
 		});
 	}
 
diff --git a/commands/Economy/rob.js b/commands/Economy/rob.js
index 518b1dd8..641ca18e 100644
--- a/commands/Economy/rob.js
+++ b/commands/Economy/rob.js
@@ -12,7 +12,7 @@ class Rob extends Command {
 			botPermissions: ["SEND_MESSAGES", "EMBED_LINKS"],
 			nsfw: false,
 			ownerOnly: false,
-			cooldown: 5000
+			cooldown: 2000
 		});
 	}
 
diff --git a/commands/Economy/setbio.js b/commands/Economy/setbio.js
index 037d5f5d..38056596 100644
--- a/commands/Economy/setbio.js
+++ b/commands/Economy/setbio.js
@@ -7,12 +7,12 @@ class Setbio extends Command {
 			dirname: __dirname,
 			enabled: true,
 			guildOnly: false,
-			aliases: ["biography", "setdesc"],
+			aliases: ["biography", "setdesc", "sb"],
 			memberPermissions: [],
 			botPermissions: ["SEND_MESSAGES", "EMBED_LINKS"],
 			nsfw: false,
 			ownerOnly: false,
-			cooldown: 3000
+			cooldown: 1000
 		});
 	}
 
diff --git a/commands/Economy/work.js b/commands/Economy/work.js
index df30245a..a1b99c5c 100644
--- a/commands/Economy/work.js
+++ b/commands/Economy/work.js
@@ -8,12 +8,12 @@ class Work extends Command {
 			dirname: __dirname,
 			enabled: true,
 			guildOnly: true,
-			aliases: ["salaire", "salary", "travail", "daily", "dailies"],
+			aliases: ["salary", "daily"],
 			memberPermissions: [],
 			botPermissions: ["SEND_MESSAGES", "EMBED_LINKS"],
 			nsfw: false,
 			ownerOnly: false,
-			cooldown: 2000
+			cooldown: 1000
 		});
 	}
 
diff --git a/commands/Fun/8ball.js b/commands/Fun/8ball.js
index 4b7f5bb2..a7cd9b37 100644
--- a/commands/Fun/8ball.js
+++ b/commands/Fun/8ball.js
@@ -7,7 +7,7 @@ class Eightball extends Command {
 			dirname: __dirname,
 			enabled: true,
 			guildOnly: false,
-			aliases: ["eight-ball", "eightball"],
+			aliases: ["8b"],
 			memberPermissions: [],
 			botPermissions: ["SEND_MESSAGES", "EMBED_LINKS"],
 			nsfw: false,
diff --git a/commands/Fun/findwords.js b/commands/Fun/findwords.js
index a2f71492..30752671 100644
--- a/commands/Fun/findwords.js
+++ b/commands/Fun/findwords.js
@@ -10,7 +10,7 @@ class FindWords extends Command {
 			dirname: __dirname,
 			enabled: true,
 			guildOnly: true,
-			aliases: [],
+			aliases: ["findw"],
 			memberPermissions: [],
 			botPermissions: ["SEND_MESSAGES", "EMBED_LINKS"],
 			nsfw: false,
diff --git a/commands/Fun/fml.js b/commands/Fun/fml.js
index 9f31b8eb..d272b808 100644
--- a/commands/Fun/fml.js
+++ b/commands/Fun/fml.js
@@ -8,7 +8,7 @@ class Fml extends Command {
 			dirname: __dirname,
 			enabled: true,
 			guildOnly: false,
-			aliases: ["vdm"],
+			aliases: [],
 			memberPermissions: [],
 			botPermissions: ["SEND_MESSAGES", "EMBED_LINKS"],
 			nsfw: false,
diff --git a/commands/Fun/joke.js b/commands/Fun/joke.js
index 1ef31e34..bfe40667 100644
--- a/commands/Fun/joke.js
+++ b/commands/Fun/joke.js
@@ -8,7 +8,7 @@ class Joke extends Command {
 			dirname: __dirname,
 			enabled: true,
 			guildOnly: false,
-			aliases: ["blague"],
+			aliases: [],
 			memberPermissions: [],
 			botPermissions: ["SEND_MESSAGES", "EMBED_LINKS"],
 			nsfw: false,
diff --git a/commands/Fun/number.js b/commands/Fun/number.js
index b914a36e..220a8263 100644
--- a/commands/Fun/number.js
+++ b/commands/Fun/number.js
@@ -10,7 +10,7 @@ class Number extends Command {
 			dirname: __dirname,
 			enabled: true,
 			guildOnly: true,
-			aliases: [],
+			aliases: ["num"],
 			memberPermissions: [],
 			botPermissions: ["SEND_MESSAGES", "EMBED_LINKS"],
 			nsfw: false,
diff --git a/commands/Fun/tictactoe.js b/commands/Fun/tictactoe.js
new file mode 100644
index 00000000..9d434c4d
--- /dev/null
+++ b/commands/Fun/tictactoe.js
@@ -0,0 +1,26 @@
+const Command = require("../../base/Command.js"),
+	TTT = require("discord-tictactoe");
+
+class TicTacToe extends Command {
+	constructor(client) {
+		super(client, {
+			name: "tictactoe",
+			dirname: __dirname,
+			enabled: true,
+			guildOnly: false,
+			aliases: ["ttt"],
+			memberPermissions: [],
+			botPermissions: ["SEND_MESSAGES", "EMBED_LINKS"],
+			nsfw: false,
+			ownerOnly: false,
+			cooldown: 2000
+		});
+	}
+
+	async run(message, args) {
+		const game = new TTT({ language: "ru" })
+		game.handleMessage(message);
+	}
+};
+
+module.exports = TicTacToe;
\ No newline at end of file
diff --git a/commands/General/activity.js b/commands/General/activity.js
index ea67d656..d3288450 100644
--- a/commands/General/activity.js
+++ b/commands/General/activity.js
@@ -8,12 +8,12 @@ class Activity extends Command {
 			dirname: __dirname,
 			enabled: true,
 			guildOnly: true,
-			aliases: [],
+			aliases: ["act"],
 			memberPermissions: [],
 			botPermissions: ["SEND_MESSAGES", "EMBED_LINKS"],
 			nsfw: false,
 			ownerOnly: false,
-			cooldown: 3000
+			cooldown: 2000
 		});
 	}
 
diff --git a/commands/General/fortnite.js b/commands/General/fortnite.js
index 273ec817..722a6dc4 100644
--- a/commands/General/fortnite.js
+++ b/commands/General/fortnite.js
@@ -14,7 +14,7 @@ class Fortnite extends Command {
 			botPermissions: ["SEND_MESSAGES", "EMBED_LINKS"],
 			nsfw: false,
 			ownerOnly: false,
-			cooldown: 3000
+			cooldown: 2000
 		});
 	}
 
diff --git a/commands/General/fortniteshop.js b/commands/General/fortniteshop.js
index ac762930..c0dcf700 100644
--- a/commands/General/fortniteshop.js
+++ b/commands/General/fortniteshop.js
@@ -9,12 +9,12 @@ class Fortniteshop extends Command {
 			dirname: __dirname,
 			enabled: true,
 			guildOnly: false,
-			aliases: ["fnshop"],
+			aliases: ["fns"],
 			memberPermissions: [],
 			botPermissions: ["SEND_MESSAGES", "EMBED_LINKS"],
 			nsfw: false,
 			ownerOnly: false,
-			cooldown: 3000
+			cooldown: 2000
 		});
 	}
 
diff --git a/commands/General/github.js b/commands/General/github.js
index 48c0b1cc..5876c539 100644
--- a/commands/General/github.js
+++ b/commands/General/github.js
@@ -14,7 +14,7 @@ class Github extends Command {
 			botPermissions: ["SEND_MESSAGES", "EMBED_LINKS"],
 			nsfw: false,
 			ownerOnly: false,
-			cooldown: 3000
+			cooldown: 1000
 		});
 	}
 
diff --git a/commands/General/hastebin.js b/commands/General/hastebin.js
index f42be0d5..7b9553d2 100644
--- a/commands/General/hastebin.js
+++ b/commands/General/hastebin.js
@@ -9,12 +9,12 @@ class Hastebin extends Command {
 			dirname: __dirname,
 			enabled: true,
 			guildOnly: false,
-			aliases: ["pastebin"],
+			aliases: ["hb"],
 			memberPermissions: [],
 			botPermissions: ["SEND_MESSAGES", "EMBED_LINKS"],
 			nsfw: false,
 			ownerOnly: false,
-			cooldown: 3000
+			cooldown: 1000
 		});
 	}
 
diff --git a/commands/General/help.js b/commands/General/help.js
index eb8c122f..17e1dce4 100644
--- a/commands/General/help.js
+++ b/commands/General/help.js
@@ -8,12 +8,12 @@ class Help extends Command {
 			dirname: __dirname,
 			enabled: true,
 			guildOnly: false,
-			aliases: ["aide", "h", "commands"],
+			aliases: ["h", "commands"],
 			memberPermissions: [],
 			botPermissions: ["SEND_MESSAGES", "EMBED_LINKS"],
 			nsfw: false,
 			ownerOnly: false,
-			cooldown: 2000
+			cooldown: 1000
 		});
 	}
 
diff --git a/commands/General/invitations.js b/commands/General/invitations.js
index 3a65af68..570f89d1 100644
--- a/commands/General/invitations.js
+++ b/commands/General/invitations.js
@@ -8,12 +8,12 @@ class Invitations extends Command {
 			dirname: __dirname,
 			enabled: true,
 			guildOnly: true,
-			aliases: [],
+			aliases: ["invs"],
 			memberPermissions: [],
 			botPermissions: ["SEND_MESSAGES", "EMBED_LINKS", "MANAGE_GUILD"],
 			nsfw: false,
 			ownerOnly: false,
-			cooldown: 2000
+			cooldown: 1000
 		});
 	}
 
diff --git a/commands/General/invite.js b/commands/General/invite.js
index 6ddfd855..5e5c81c7 100644
--- a/commands/General/invite.js
+++ b/commands/General/invite.js
@@ -13,7 +13,7 @@ class Invite extends Command {
 			botPermissions: ["SEND_MESSAGES", "EMBED_LINKS"],
 			nsfw: false,
 			ownerOnly: false,
-			cooldown: 2000
+			cooldown: 1000
 		});
 	}
 
diff --git a/commands/General/minecraft.js b/commands/General/minecraft.js
index e274ee42..0a7f2883 100644
--- a/commands/General/minecraft.js
+++ b/commands/General/minecraft.js
@@ -16,7 +16,7 @@ class Minecraft extends Command {
 			botPermissions: ["SEND_MESSAGES", "EMBED_LINKS"],
 			nsfw: false,
 			ownerOnly: false,
-			cooldown: 2000
+			cooldown: 1000
 		});
 	}
 
diff --git a/commands/General/permissions.js b/commands/General/permissions.js
index 7cd22dc9..b4b18338 100644
--- a/commands/General/permissions.js
+++ b/commands/General/permissions.js
@@ -15,7 +15,7 @@ class Permissions extends Command {
 			botPermissions: ["SEND_MESSAGES", "EMBED_LINKS"],
 			nsfw: false,
 			ownerOnly: false,
-			cooldown: 2000
+			cooldown: 1000
 		});
 	}
 
diff --git a/commands/General/quote.js b/commands/General/quote.js
index 1753803b..4318b3a7 100644
--- a/commands/General/quote.js
+++ b/commands/General/quote.js
@@ -13,7 +13,7 @@ class Quote extends Command {
 			botPermissions: ["SEND_MESSAGES", "EMBED_LINKS"],
 			nsfw: false,
 			ownerOnly: false,
-			cooldown: 2000
+			cooldown: 1000
 		});
 	}
 
diff --git a/commands/General/remindme.js b/commands/General/remindme.js
index f057eadc..aa991c6d 100644
--- a/commands/General/remindme.js
+++ b/commands/General/remindme.js
@@ -8,12 +8,12 @@ class Remindme extends Command {
 			dirname: __dirname,
 			enabled: true,
 			guildOnly: false,
-			aliases: ["reminder"],
+			aliases: ["reminder", "remind", "rem"],
 			memberPermissions: [],
 			botPermissions: ["SEND_MESSAGES", "EMBED_LINKS"],
 			nsfw: false,
 			ownerOnly: false,
-			cooldown: 2000
+			cooldown: 1000
 		});
 	}
 
diff --git a/commands/General/report.js b/commands/General/report.js
index 42fcc44d..9f920677 100644
--- a/commands/General/report.js
+++ b/commands/General/report.js
@@ -13,7 +13,7 @@ class Report extends Command {
 			botPermissions: ["SEND_MESSAGES", "EMBED_LINKS"],
 			nsfw: false,
 			ownerOnly: false,
-			cooldown: 3000
+			cooldown: 2000
 		});
 	}
 
diff --git a/commands/General/serverinfo.js b/commands/General/serverinfo.js
index fc38a312..06c984bd 100644
--- a/commands/General/serverinfo.js
+++ b/commands/General/serverinfo.js
@@ -13,7 +13,7 @@ class Serverinfo extends Command {
 			botPermissions: ["SEND_MESSAGES", "EMBED_LINKS"],
 			nsfw: false,
 			ownerOnly: false,
-			cooldown: 2000
+			cooldown: 1000
 		});
 	}
 
diff --git a/commands/General/setafk.js b/commands/General/setafk.js
index 765c50d6..c1abfe07 100644
--- a/commands/General/setafk.js
+++ b/commands/General/setafk.js
@@ -12,7 +12,7 @@ class Setafk extends Command {
 			botPermissions: ["SEND_MESSAGES", "EMBED_LINKS"],
 			nsfw: false,
 			ownerOnly: false,
-			cooldown: 3000
+			cooldown: 2000
 		});
 	}
 
diff --git a/commands/General/shorturl.js b/commands/General/shorturl.js
index e02ffe97..e6a3de44 100644
--- a/commands/General/shorturl.js
+++ b/commands/General/shorturl.js
@@ -14,7 +14,7 @@ class ShortURL extends Command {
 			botPermissions: ["SEND_MESSAGES", "EMBED_LINKS"],
 			nsfw: false,
 			ownerOnly: false,
-			cooldown: 3000
+			cooldown: 1000
 		});
 	}
 
diff --git a/commands/General/someone.js b/commands/General/someone.js
index 505b43fa..281d08fd 100644
--- a/commands/General/someone.js
+++ b/commands/General/someone.js
@@ -8,7 +8,7 @@ class Someone extends Command {
 			dirname: __dirname,
 			enabled: true,
 			guildOnly: true,
-			aliases: ["somebody", "something"],
+			aliases: ["somebody"],
 			memberPermissions: [],
 			botPermissions: ["SEND_MESSAGES", "EMBED_LINKS"],
 			nsfw: false,
diff --git a/commands/General/staff.js b/commands/General/staff.js
index 241a7df0..b426cae1 100644
--- a/commands/General/staff.js
+++ b/commands/General/staff.js
@@ -8,12 +8,12 @@ class Staff extends Command {
 			dirname: __dirname,
 			enabled: true,
 			guildOnly: true,
-			aliases: ["stafflist", "staffliste"],
+			aliases: ["stafflist"],
 			memberPermissions: [],
 			botPermissions: ["SEND_MESSAGES", "EMBED_LINKS"],
 			nsfw: false,
 			ownerOnly: false,
-			cooldown: 2000
+			cooldown: 1000
 		});
 	}
 
diff --git a/commands/General/stats.js b/commands/General/stats.js
index ed781a0f..63675281 100644
--- a/commands/General/stats.js
+++ b/commands/General/stats.js
@@ -8,12 +8,12 @@ class Stats extends Command {
 			dirname: __dirname,
 			enabled: true,
 			guildOnly: false,
-			aliases: ["statistics", "infobot", "botinfos", "bot-infos", "bot-info", "infos-bot", "info-bot"],
+			aliases: [],
 			memberPermissions: [],
 			botPermissions: ["SEND_MESSAGES", "EMBED_LINKS"],
 			nsfw: false,
 			ownerOnly: false,
-			cooldown: 2000
+			cooldown: 1000
 		});
 	}
 
diff --git a/commands/General/suggest.js b/commands/General/suggest.js
index 40712743..f31342c0 100644
--- a/commands/General/suggest.js
+++ b/commands/General/suggest.js
@@ -8,12 +8,12 @@ class Suggest extends Command {
 			dirname: __dirname,
 			enabled: true,
 			guildOnly: true,
-			aliases: ["suggestion", "sugg"],
+			aliases: ["sugg"],
 			memberPermissions: [],
 			botPermissions: ["SEND_MESSAGES", "EMBED_LINKS"],
 			nsfw: false,
 			ownerOnly: false,
-			cooldown: 3000
+			cooldown: 2000
 		});
 	}
 
diff --git a/commands/General/translate.js b/commands/General/translate.js
index 235c6ee6..6262e669 100644
--- a/commands/General/translate.js
+++ b/commands/General/translate.js
@@ -11,12 +11,12 @@ class Translate extends Command {
 			dirname: __dirname,
 			enabled: true,
 			guildOnly: false,
-			aliases: ["traduction", "translation", "trad"],
+			aliases: ["tr"],
 			memberPermissions: [],
 			botPermissions: ["SEND_MESSAGES", "EMBED_LINKS"],
 			nsfw: false,
 			ownerOnly: false,
-			cooldown: 5000
+			cooldown: 3000
 		});
 	}
 
diff --git a/commands/General/userinfo.js b/commands/General/userinfo.js
index 8af2fc71..2b4260c6 100644
--- a/commands/General/userinfo.js
+++ b/commands/General/userinfo.js
@@ -14,7 +14,7 @@ class Userinfo extends Command {
 			botPermissions: ["SEND_MESSAGES", "EMBED_LINKS"],
 			nsfw: false,
 			ownerOnly: false,
-			cooldown: 3000
+			cooldown: 1000
 		});
 	}
 
diff --git a/commands/Moderation/announcement.js b/commands/Moderation/announcement.js
index 9b4e5201..b178cd86 100644
--- a/commands/Moderation/announcement.js
+++ b/commands/Moderation/announcement.js
@@ -8,12 +8,12 @@ class Announcement extends Command {
 			dirname: __dirname,
 			enabled: true,
 			guildOnly: true,
-			aliases: [],
+			aliases: ["ann"],
 			memberPermissions: ["MENTION_EVERYONE"],
 			botPermissions: ["SEND_MESSAGES", "EMBED_LINKS"],
 			nsfw: false,
 			ownerOnly: false,
-			cooldown: 2000
+			cooldown: 1000
 		});
 	}
 
diff --git a/commands/Moderation/ban.js b/commands/Moderation/ban.js
index 64c630fc..3a656d62 100644
--- a/commands/Moderation/ban.js
+++ b/commands/Moderation/ban.js
@@ -8,12 +8,12 @@ class Ban extends Command {
 			dirname: __dirname,
 			enabled: true,
 			guildOnly: true,
-			aliases: [],
+			aliases: ["b"],
 			memberPermissions: ["BAN_MEMBERS"],
 			botPermissions: ["SEND_MESSAGES", "EMBED_LINKS", "BAN_MEMBERS"],
 			nsfw: false,
 			ownerOnly: false,
-			cooldown: 2000
+			cooldown: 1000
 		});
 	}
 
diff --git a/commands/Moderation/checkinvites.js b/commands/Moderation/checkinvites.js
index a695810f..47720838 100644
--- a/commands/Moderation/checkinvites.js
+++ b/commands/Moderation/checkinvites.js
@@ -8,12 +8,12 @@ class Checkinvites extends Command {
 			dirname: __dirname,
 			enabled: true,
 			guildOnly: true,
-			aliases: ["checkinvite", "checki"],
+			aliases: ["checkinvite", "checkinv"],
 			memberPermissions: [],
 			botPermissions: ["SEND_MESSAGES", "EMBED_LINKS"],
 			nsfw: false,
 			ownerOnly: false,
-			cooldown: 2000
+			cooldown: 1000
 		});
 	}
 
diff --git a/commands/Moderation/clear.js b/commands/Moderation/clear.js
index 3fddf5ac..76711816 100644
--- a/commands/Moderation/clear.js
+++ b/commands/Moderation/clear.js
@@ -12,7 +12,7 @@ class Clear extends Command {
 			botPermissions: ["SEND_MESSAGES", "EMBED_LINKS", "MANAGE_MESSAGES"],
 			nsfw: false,
 			ownerOnly: false,
-			cooldown: 2000
+			cooldown: 1000
 		});
 	}
 
diff --git a/commands/Moderation/clearsanctions.js b/commands/Moderation/clearsanctions.js
index 4ee71a04..a30ed9d6 100644
--- a/commands/Moderation/clearsanctions.js
+++ b/commands/Moderation/clearsanctions.js
@@ -12,7 +12,7 @@ class Clearsanctions extends Command {
 			botPermissions: ["SEND_MESSAGES", "EMBED_LINKS"],
 			nsfw: false,
 			ownerOnly: false,
-			cooldown: 2000
+			cooldown: 1000
 		});
 	}
 
diff --git a/commands/Moderation/giveaway.js b/commands/Moderation/giveaway.js
index 09d315f4..fbc78c17 100644
--- a/commands/Moderation/giveaway.js
+++ b/commands/Moderation/giveaway.js
@@ -13,7 +13,7 @@ class Giveaway extends Command {
 			botPermissions: ["SEND_MESSAGES", "EMBED_LINKS"],
 			nsfw: false,
 			ownerOnly: false,
-			cooldown: 3000
+			cooldown: 2000
 		});
 	}
 
diff --git a/commands/Moderation/kick.js b/commands/Moderation/kick.js
index 759e3f89..755ce838 100644
--- a/commands/Moderation/kick.js
+++ b/commands/Moderation/kick.js
@@ -8,12 +8,12 @@ class Kick extends Command {
 			dirname: __dirname,
 			enabled: true,
 			guildOnly: true,
-			aliases: [],
+			aliases: ["k"],
 			memberPermissions: ["KICK_MEMBERS"],
 			botPermissions: ["SEND_MESSAGES", "EMBED_LINKS", "KICK_MEMBERS"],
 			nsfw: false,
 			ownerOnly: false,
-			cooldown: 2000
+			cooldown: 1000
 		});
 	}
 
diff --git a/commands/Moderation/mute.js b/commands/Moderation/mute.js
index d1c03812..3fdd5e20 100644
--- a/commands/Moderation/mute.js
+++ b/commands/Moderation/mute.js
@@ -9,12 +9,12 @@ class Mute extends Command {
 			dirname: __dirname,
 			enabled: true,
 			guildOnly: true,
-			aliases: [],
+			aliases: ["m"],
 			memberPermissions: ["MANAGE_MESSAGES"],
 			botPermissions: ["SEND_MESSAGES", "EMBED_LINKS", "MANAGE_CHANNELS"],
 			nsfw: false,
 			ownerOnly: false,
-			cooldown: 2000
+			cooldown: 1000
 		});
 	}
 
diff --git a/commands/Moderation/poll.js b/commands/Moderation/poll.js
index e02dc751..96486f0a 100644
--- a/commands/Moderation/poll.js
+++ b/commands/Moderation/poll.js
@@ -13,7 +13,7 @@ class Poll extends Command {
 			botPermissions: ["SEND_MESSAGES", "EMBED_LINKS"],
 			nsfw: false,
 			ownerOnly: false,
-			cooldown: 2000
+			cooldown: 1000
 		});
 	}
 
diff --git a/commands/Moderation/sanctions.js b/commands/Moderation/sanctions.js
index 4a4b48f3..0e30fec6 100644
--- a/commands/Moderation/sanctions.js
+++ b/commands/Moderation/sanctions.js
@@ -13,7 +13,7 @@ class Sanctions extends Command {
 			botPermissions: ["SEND_MESSAGES", "EMBED_LINKS"],
 			nsfw: false,
 			ownerOnly: false,
-			cooldown: 2000
+			cooldown: 1000
 		});
 	}
 
diff --git a/commands/Moderation/setwarns.js b/commands/Moderation/setwarns.js
index 4d0adfd1..cdc735f3 100644
--- a/commands/Moderation/setwarns.js
+++ b/commands/Moderation/setwarns.js
@@ -12,7 +12,7 @@ class Setwarns extends Command {
 			botPermissions: ["SEND_MESSAGES", "EMBED_LINKS", "BAN_MEMBERS", "KICK_MEMBERS"],
 			nsfw: false,
 			ownerOnly: false,
-			cooldown: 2000
+			cooldown: 1000
 		});
 	}
 
diff --git a/commands/Moderation/unban.js b/commands/Moderation/unban.js
index 13c3b311..e397e3b8 100644
--- a/commands/Moderation/unban.js
+++ b/commands/Moderation/unban.js
@@ -7,12 +7,12 @@ class Unban extends Command {
 			dirname: __dirname,
 			enabled: true,
 			guildOnly: true,
-			aliases: [],
+			aliases: ["ub"],
 			memberPermissions: ["BAN_MEMBERS"],
 			botPermissions: ["SEND_MESSAGES", "EMBED_LINKS", "BAN_MEMBERS"],
 			nsfw: false,
 			ownerOnly: false,
-			cooldown: 2000
+			cooldown: 1000
 		});
 	}
 
diff --git a/commands/Moderation/unmute.js b/commands/Moderation/unmute.js
index f999278a..560ec391 100644
--- a/commands/Moderation/unmute.js
+++ b/commands/Moderation/unmute.js
@@ -7,12 +7,12 @@ class Unmute extends Command {
 			dirname: __dirname,
 			enabled: true,
 			guildOnly: true,
-			aliases: [],
+			aliases: ["um"],
 			memberPermissions: ["MANAGE_MESSAGES"],
 			botPermissions: ["SEND_MESSAGES", "EMBED_LINKS", "MANAGE_CHANNELS"],
 			nsfw: false,
 			ownerOnly: false,
-			cooldown: 2000
+			cooldown: 1000
 		});
 	}
 
diff --git a/commands/Moderation/warn.js b/commands/Moderation/warn.js
index eb6748a6..5c7388a7 100644
--- a/commands/Moderation/warn.js
+++ b/commands/Moderation/warn.js
@@ -8,12 +8,12 @@ class Warn extends Command {
 			dirname: __dirname,
 			enabled: true,
 			guildOnly: true,
-			aliases: [],
+			aliases: ["w"],
 			memberPermissions: ["MANAGE_MESSAGES"],
 			botPermissions: ["SEND_MESSAGES", "EMBED_LINKS"],
 			nsfw: false,
 			ownerOnly: false,
-			cooldown: 2000
+			cooldown: 1000
 		});
 	}
 
diff --git a/commands/Music/autoplay.js b/commands/Music/autoplay.js
index 34c68357..e015fc72 100644
--- a/commands/Music/autoplay.js
+++ b/commands/Music/autoplay.js
@@ -7,12 +7,12 @@ class AutoPlay extends Command {
 			dirname: __dirname,
 			enabled: true,
 			guildOnly: true,
-			aliases: [],
+			aliases: ["autop"],
 			memberPermissions: [],
 			botPermissions: ["SEND_MESSAGES", "EMBED_LINKS"],
 			nsfw: false,
 			ownerOnly: false,
-			cooldown: 3000
+			cooldown: 1000
 		});
 	}
 
diff --git a/commands/Music/back.js b/commands/Music/back.js
index 093da521..f459234c 100644
--- a/commands/Music/back.js
+++ b/commands/Music/back.js
@@ -13,7 +13,7 @@ class Back extends Command {
 			botPermissions: ["SEND_MESSAGES", "EMBED_LINKS"],
 			nsfw: false,
 			ownerOnly: false,
-			cooldown: 3000
+			cooldown: 1000
 		});
 	}
 
diff --git a/commands/Music/clip.js b/commands/Music/clip.js
index 6cba3a2a..10713edc 100644
--- a/commands/Music/clip.js
+++ b/commands/Music/clip.js
@@ -13,7 +13,7 @@ class Clip extends Command {
 			botPermissions: ["SEND_MESSAGES", "EMBED_LINKS"],
 			nsfw: false,
 			ownerOnly: false,
-			cooldown: 3000
+			cooldown: 2000
 		});
 	}
 
@@ -23,6 +23,7 @@ class Clip extends Command {
 		const clip = args[0];
 
 		if (!voice) return message.error("music/play:NO_VOICE_CHANNEL");
+		if (voice.members.find(user => user.id === this.client.user.id)) return message.error("music/clip:ACTIVE_CLIP");
 		if (queue) return message.error("music/clip:ACTIVE_QUEUE");
 		if (!clip) return message.error("music/clip:NO_ARG");
 		if (!fs.existsSync(`./clips/${clip}.mp3`)) return message.error("music/clip:NO_FILE", { file: clip });
diff --git a/commands/Music/clips.js b/commands/Music/clips.js
index d956fd21..a6127365 100644
--- a/commands/Music/clips.js
+++ b/commands/Music/clips.js
@@ -14,7 +14,7 @@ class Clips extends Command {
 			botPermissions: ["SEND_MESSAGES", "EMBED_LINKS"],
 			nsfw: false,
 			ownerOnly: false,
-			cooldown: 3000
+			cooldown: 2000
 		});
 	}
 
diff --git a/commands/Music/filters.js b/commands/Music/filters.js
index f77114fc..5953212f 100644
--- a/commands/Music/filters.js
+++ b/commands/Music/filters.js
@@ -8,7 +8,7 @@ class Filters extends Command {
 			dirname: __dirname,
 			enabled: true,
 			guildOnly: true,
-			aliases: [],
+			aliases: ["fs"],
 			memberPermissions: [],
 			botPermissions: ["SEND_MESSAGES", "EMBED_LINKS"],
 			nsfw: false,
diff --git a/commands/Music/jump.js b/commands/Music/jump.js
index 43ed8fff..eefb4087 100644
--- a/commands/Music/jump.js
+++ b/commands/Music/jump.js
@@ -8,7 +8,7 @@ class Jump extends Command {
 			dirname: __dirname,
 			enabled: true,
 			guildOnly: true,
-			aliases: [],
+			aliases: ["j"],
 			memberPermissions: [],
 			botPermissions: ["SEND_MESSAGES", "EMBED_LINKS"],
 			nsfw: false,
diff --git a/commands/Music/loop.js b/commands/Music/loop.js
index 77f92b25..73f287e5 100644
--- a/commands/Music/loop.js
+++ b/commands/Music/loop.js
@@ -7,7 +7,7 @@ class Loop extends Command {
 			dirname: __dirname,
 			enabled: true,
 			guildOnly: true,
-			aliases: ["repeat"],
+			aliases: ["repeat", "l"],
 			memberPermissions: [],
 			botPermissions: ["SEND_MESSAGES"],
 			nsfw: false,
diff --git a/commands/Music/lyrics.js b/commands/Music/lyrics.js
index 73448d24..a8e8a444 100644
--- a/commands/Music/lyrics.js
+++ b/commands/Music/lyrics.js
@@ -9,7 +9,7 @@ class Lyrics extends Command {
 			dirname: __dirname,
 			enabled: true,
 			guildOnly: false,
-			aliases: [],
+			aliases: ["ly"],
 			memberPermissions: [],
 			botPermissions: ["SEND_MESSAGES", "EMBED_LINKS"],
 			nsfw: false,
diff --git a/commands/Music/np.js b/commands/Music/np.js
index f61905a2..030211ac 100644
--- a/commands/Music/np.js
+++ b/commands/Music/np.js
@@ -8,7 +8,7 @@ class Np extends Command {
 			dirname: __dirname,
 			enabled: true,
 			guildOnly: true,
-			aliases: ["nowplaying", "now-playing"],
+			aliases: ["nowplaying"],
 			memberPermissions: [],
 			botPermissions: ["SEND_MESSAGES", "EMBED_LINKS"],
 			nsfw: false,
diff --git a/commands/Music/queue.js b/commands/Music/queue.js
index 8d817087..366e959d 100644
--- a/commands/Music/queue.js
+++ b/commands/Music/queue.js
@@ -9,7 +9,7 @@ class Queue extends Command {
 			dirname: __dirname,
 			enabled: true,
 			guildOnly: true,
-			aliases: ["playlist"],
+			aliases: ["qu"],
 			memberPermissions: [],
 			botPermissions: ["SEND_MESSAGES", "EMBED_LINKS"],
 			nsfw: false,
diff --git a/commands/Music/skip.js b/commands/Music/skip.js
index c2a821f3..e039c67d 100644
--- a/commands/Music/skip.js
+++ b/commands/Music/skip.js
@@ -8,7 +8,7 @@ class Skip extends Command {
 			dirname: __dirname,
 			enabled: true,
 			guildOnly: true,
-			aliases: ["next"],
+			aliases: ["s"],
 			memberPermissions: [],
 			botPermissions: ["SEND_MESSAGES", "EMBED_LINKS"],
 			nsfw: false,
diff --git a/commands/Music/stop.js b/commands/Music/stop.js
index e9de4d50..6ad0fbea 100644
--- a/commands/Music/stop.js
+++ b/commands/Music/stop.js
@@ -8,7 +8,7 @@ class Stop extends Command {
 			dirname: __dirname,
 			enabled: true,
 			guildOnly: true,
-			aliases: ["leave"],
+			aliases: ["leave", "st"],
 			memberPermissions: [],
 			botPermissions: ["SEND_MESSAGES", "EMBED_LINKS"],
 			nsfw: false,
diff --git a/commands/NSFW/hentai.js b/commands/NSFW/hentai.js
index 03e8ff7e..849b7d92 100644
--- a/commands/NSFW/hentai.js
+++ b/commands/NSFW/hentai.js
@@ -9,7 +9,7 @@ class Hentai extends Command {
 			dirname: __dirname,
 			enabled: true,
 			guildOnly: true,
-			aliases: [],
+			aliases: ["hen"],
 			memberPermissions: [],
 			botPermissions: ["SEND_MESSAGES", "EMBED_LINKS", "ATTACH_FILES"],
 			nsfw: true,
diff --git a/commands/Owner/debug.js b/commands/Owner/debug.js
index 33785d03..96148ed0 100644
--- a/commands/Owner/debug.js
+++ b/commands/Owner/debug.js
@@ -7,7 +7,7 @@ class Debug extends Command {
 			dirname: __dirname,
 			enabled: true,
 			guildOnly: true,
-			aliases: [],
+			aliases: ["deb"],
 			memberPermissions: [],
 			botPermissions: ["SEND_MESSAGES"],
 			nsfw: false,
diff --git a/commands/Owner/eval.js b/commands/Owner/eval.js
index 58651349..0665b037 100644
--- a/commands/Owner/eval.js
+++ b/commands/Owner/eval.js
@@ -7,7 +7,7 @@ class Eval extends Command {
 			dirname: __dirname,
 			enabled: true,
 			guildOnly: false,
-			aliases: [],
+			aliases: ["ev"],
 			memberPermissions: [],
 			botPermissions: ["SEND_MESSAGES", "EMBED_LINKS"],
 			nsfw: false,
diff --git a/commands/Owner/reload.js b/commands/Owner/reload.js
index f5c2d2d7..116ae0b8 100644
--- a/commands/Owner/reload.js
+++ b/commands/Owner/reload.js
@@ -7,7 +7,7 @@ class Reload extends Command {
 			dirname: __dirname,
 			enabled: true,
 			guildOnly: false,
-			aliases: [],
+			aliases: ["rel"],
 			memberPermissions: [],
 			botPermissions: [],
 			nsfw: false,
diff --git a/helpers/functions.js b/helpers/functions.js
index 60291346..419e15e9 100644
--- a/helpers/functions.js
+++ b/helpers/functions.js
@@ -14,6 +14,8 @@ module.exports = {
 			const prefixes = [
 				`<@!${message.client.user.id}> `,
 				`<@${message.client.user.id}> `,
+				`<@!${message.client.user.id}>`,
+				`<@${message.client.user.id}>`,
 				message.client.user.username.toLowerCase(),
 				data.guild.prefix
 			];
diff --git a/languages/ru-RU/music/clip.json b/languages/ru-RU/music/clip.json
index 81c1946f..bb239237 100644
--- a/languages/ru-RU/music/clip.json
+++ b/languages/ru-RU/music/clip.json
@@ -2,7 +2,8 @@
 	"DESCRIPTION": "Воспроизвести клип",
 	"USAGE": "{{prefix}}clip [название-файла]",
 	"EXAMPLES": "{{prefix}}clip haha",
-	"NO_ARG": "Укажите название файла",
+	"NO_ARG": "Укажите название файла!",
 	"NO_FILE": "Файл {{file}} отсутствует!",
-	"ACTIVE_QUEUE": "Не могу воспроизвести клип, т.к. на сервере есть активная очередь"
+	"ACTIVE_QUEUE": "Не могу воспроизвести клип, т.к. на сервере есть активная очередь!",
+	"ACTIVE_CLIP": "Уже воспроизводится какой-то файл!"
 }
\ No newline at end of file
diff --git a/package.json b/package.json
index eb3f44a5..25ef99d3 100644
--- a/package.json
+++ b/package.json
@@ -33,6 +33,7 @@
         "discord-canvas": "^1.3.2",
         "discord-giveaways": "^4.4.3",
         "discord-paginationembed": "^2.1.0",
+        "discord-tictactoe": "^2.2.0",
         "discord-together": "^1.3.25",
         "discord.js": "^12.5.3",
         "distube": "^3.0.4",