diff --git a/commands/avataredit/3000years.js b/commands/avataredit/3000years.js
index 60e056e9..be80b929 100644
--- a/commands/avataredit/3000years.js
+++ b/commands/avataredit/3000years.js
@@ -1,7 +1,7 @@
-const commando = require('discord.js-commando');
+const { Command } = require('discord.js-commando');
 const Jimp = require('jimp');
 
-module.exports = class YearsCommand extends commando.Command {
+module.exports = class YearsCommand extends Command {
     constructor(client) {
         super(client, {
             name: '3000years',
diff --git a/commands/avataredit/beautiful.js b/commands/avataredit/beautiful.js
index 015d2464..a4b3c7dd 100644
--- a/commands/avataredit/beautiful.js
+++ b/commands/avataredit/beautiful.js
@@ -1,7 +1,7 @@
-const commando = require('discord.js-commando');
+const { Command } = require('discord.js-commando');
 const Jimp = require('jimp');
 
-module.exports = class BeautifulCommand extends commando.Command {
+module.exports = class BeautifulCommand extends Command {
     constructor(client) {
         super(client, {
             name: 'beautiful',
diff --git a/commands/avataredit/bobross.js b/commands/avataredit/bobross.js
index 42b44b7a..a37aec56 100644
--- a/commands/avataredit/bobross.js
+++ b/commands/avataredit/bobross.js
@@ -1,7 +1,7 @@
-const commando = require('discord.js-commando');
+const { Command } = require('discord.js-commando');
 const Jimp = require('jimp');
 
-module.exports = class BobRossCommand extends commando.Command {
+module.exports = class BobRossCommand extends Command {
     constructor(client) {
         super(client, {
             name: 'bobross',
diff --git a/commands/avataredit/rip.js b/commands/avataredit/rip.js
index a04c5052..a96774ae 100644
--- a/commands/avataredit/rip.js
+++ b/commands/avataredit/rip.js
@@ -1,7 +1,7 @@
-const commando = require('discord.js-commando');
+const { Command } = require('discord.js-commando');
 const Jimp = require('jimp');
 
-module.exports = class RIPCommand extends commando.Command {
+module.exports = class RIPCommand extends Command {
     constructor(client) {
         super(client, {
             name: 'rip',
diff --git a/commands/avataredit/steamcard.js b/commands/avataredit/steamcard.js
index eca3dfaf..31946743 100644
--- a/commands/avataredit/steamcard.js
+++ b/commands/avataredit/steamcard.js
@@ -1,7 +1,7 @@
-const commando = require('discord.js-commando');
+const { Command } = require('discord.js-commando');
 const Jimp = require('jimp');
 
-module.exports = class SteamCardCommand extends commando.Command {
+module.exports = class SteamCardCommand extends Command {
     constructor(client) {
         super(client, {
             name: 'steamcard',
diff --git a/commands/botinfo/contact.js b/commands/botinfo/contact.js
index 65e5cc7d..127c4b97 100644
--- a/commands/botinfo/contact.js
+++ b/commands/botinfo/contact.js
@@ -1,6 +1,6 @@
-const commando = require('discord.js-commando');
+const { Command } = require('discord.js-commando');
 
-module.exports = class ContactCommand extends commando.Command {
+module.exports = class ContactCommand extends Command {
     constructor(client) {
         super(client, {
             name: 'contact',
diff --git a/commands/botinfo/info.js b/commands/botinfo/info.js
index e54aca43..9f7838a9 100644
--- a/commands/botinfo/info.js
+++ b/commands/botinfo/info.js
@@ -1,10 +1,10 @@
-const commando = require('discord.js-commando');
-const Discord = require('discord.js');
-const pkg = require('../../package.json');
+const { Command } = require('discord.js-commando');
+const { RichEmbed } = require('discord.js');
+const { version } = require('../../package.json');
 const moment = require('moment');
 require('moment-duration-format');
 
-module.exports = class InfoCommand extends commando.Command {
+module.exports = class InfoCommand extends Command {
     constructor(client) {
         super(client, {
             name: 'info',
@@ -36,9 +36,9 @@ module.exports = class InfoCommand extends commando.Command {
         const memory = await this.client.shard.broadcastEval('Math.round(process.memoryUsage().heapUsed / 1024 / 1024)');
         const uptime = await this.client.shard.fetchClientValues('uptime');
         const guilds = await this.client.shard.fetchClientValues('guilds.size');
-        const embed = new Discord.RichEmbed()
+        const embed = new RichEmbed()
             .setColor(0x00AE86)
-            .setFooter(`©2017 dragonfire535 | Version ${pkg.version} | Created ${moment.duration(Date.now() - this.client.user.createdTimestamp).format('y[ years], M[ months], w[ weeks, and ]d[ days]')} ago!`)
+            .setFooter(`©2017 dragonfire535 | Version ${version} | Created ${moment.duration(Date.now() - this.client.user.createdTimestamp).format('y[ years], M[ months], w[ weeks, and ]d[ days]')} ago!`)
             .addField('Servers',
                 `${guilds[shardID]} / ${guilds.reduce((prev, val) => prev + val, 0)}`, true)
             .addField('Shards',
diff --git a/commands/botinfo/invite.js b/commands/botinfo/invite.js
index 447e9260..ee6b5bfe 100644
--- a/commands/botinfo/invite.js
+++ b/commands/botinfo/invite.js
@@ -1,6 +1,6 @@
-const commando = require('discord.js-commando');
+const { Command } = require('discord.js-commando');
 
-module.exports = class InviteCommand extends commando.Command {
+module.exports = class InviteCommand extends Command {
     constructor(client) {
         super(client, {
             name: 'invite',
diff --git a/commands/botinfo/uptime.js b/commands/botinfo/uptime.js
index 2f1573ba..c0a59e01 100644
--- a/commands/botinfo/uptime.js
+++ b/commands/botinfo/uptime.js
@@ -1,8 +1,8 @@
-const commando = require('discord.js-commando');
+const { Command } = require('discord.js-commando');
 const moment = require('moment');
 require('moment-duration-format');
 
-module.exports = class UptimeCommand extends commando.Command {
+module.exports = class UptimeCommand extends Command {
     constructor(client) {
         super(client, {
             name: 'uptime',
diff --git a/commands/games/lottery.js b/commands/games/lottery.js
index 7b5bf7db..8e4fe5a2 100644
--- a/commands/games/lottery.js
+++ b/commands/games/lottery.js
@@ -1,6 +1,6 @@
-const commando = require('discord.js-commando');
+const { Command } = require('discord.js-commando');
 
-module.exports = class LotteryCommand extends commando.Command {
+module.exports = class LotteryCommand extends Command {
     constructor(client) {
         super(client, {
             name: 'lottery',
diff --git a/commands/games/mathgame.js b/commands/games/mathgame.js
index 96d98ffd..b50f4db1 100644
--- a/commands/games/mathgame.js
+++ b/commands/games/mathgame.js
@@ -1,8 +1,8 @@
-const commando = require('discord.js-commando');
-const Discord = require('discord.js');
+const { Command } = require('discord.js-commando');
+const { RichEmbed } = require('discord.js');
 const math = require('mathjs');
 
-module.exports = class MathGameCommand extends commando.Command {
+module.exports = class MathGameCommand extends Command {
     constructor(client) {
         super(client, {
             name: 'mathgame',
@@ -51,7 +51,7 @@ module.exports = class MathGameCommand extends commando.Command {
         const randomValue2 = Math.floor(Math.random() * randomValue) + 1;
         const randomExpression = randomValue1 + randomType + randomValue2;
         const solved = math.eval(randomExpression);
-        const embed = new Discord.RichEmbed()
+        const embed = new RichEmbed()
             .setTitle('You have **ten** seconds to answer:')
             .setDescription(randomExpression);
         const embedMsg = await message.embed(embed);
diff --git a/commands/games/quiz.js b/commands/games/quiz.js
index 878a0c6b..30cd7ee2 100644
--- a/commands/games/quiz.js
+++ b/commands/games/quiz.js
@@ -1,8 +1,8 @@
-const commando = require('discord.js-commando');
-const Discord = require('discord.js');
+const { Command } = require('discord.js-commando');
+const { RichEmbed } = require('discord.js');
 const request = require('superagent');
 
-module.exports = class QuizCommand extends commando.Command {
+module.exports = class QuizCommand extends Command {
     constructor(client) {
         super(client, {
             name: 'quiz',
@@ -29,7 +29,7 @@ module.exports = class QuizCommand extends commando.Command {
                 });
             const data = response.body[0];
             const answer = data.answer.toLowerCase().split('<i>').join('').split('</i>').join('');
-            const embed = new Discord.RichEmbed()
+            const embed = new RichEmbed()
                 .setTitle('You have **fifteen** seconds to answer this question:')
                 .setDescription(`**Category: ${data.category.title}**\n${data.question}`);
             const embedMsg = await message.embed(embed);
diff --git a/commands/games/rockpaperscissors.js b/commands/games/rockpaperscissors.js
index d4f2e69a..3570e81e 100644
--- a/commands/games/rockpaperscissors.js
+++ b/commands/games/rockpaperscissors.js
@@ -1,6 +1,6 @@
-const commando = require('discord.js-commando');
+const { Command } = require('discord.js-commando');
 
-module.exports = class RockPaperScissorsCommand extends commando.Command {
+module.exports = class RockPaperScissorsCommand extends Command {
     constructor(client) {
         super(client, {
             name: 'rps',
diff --git a/commands/games/slots.js b/commands/games/slots.js
index d03f9e69..331e20b7 100644
--- a/commands/games/slots.js
+++ b/commands/games/slots.js
@@ -1,6 +1,6 @@
-const commando = require('discord.js-commando');
+const { Command } = require('discord.js-commando');
 
-module.exports = class SlotsCommand extends commando.Command {
+module.exports = class SlotsCommand extends Command {
     constructor(client) {
         super(client, {
             name: 'slots',
diff --git a/commands/games/typinggame.js b/commands/games/typinggame.js
index 1d6124f5..9418a974 100644
--- a/commands/games/typinggame.js
+++ b/commands/games/typinggame.js
@@ -1,7 +1,7 @@
-const commando = require('discord.js-commando');
-const Discord = require('discord.js');
+const { Command } = require('discord.js-commando');
+const { RichEmbed } = require('discord.js');
 
-module.exports = class TypingGameCommand extends commando.Command {
+module.exports = class TypingGameCommand extends Command {
     constructor(client) {
         super(client, {
             name: 'typinggame',
@@ -51,7 +51,7 @@ module.exports = class TypingGameCommand extends commando.Command {
                 levelWord = 'ten';
                 break;
         }
-        const embed = new Discord.RichEmbed()
+        const embed = new RichEmbed()
             .setTitle(`You have **${levelWord}** seconds to type:`)
             .setDescription(randomSentence);
         const embedMsg = await message.embed(embed);
diff --git a/commands/guildinfo/emoji.js b/commands/guildinfo/emoji.js
index ecf6c786..2fe3368d 100644
--- a/commands/guildinfo/emoji.js
+++ b/commands/guildinfo/emoji.js
@@ -1,6 +1,6 @@
-const commando = require('discord.js-commando');
+const { Command } = require('discord.js-commando');
 
-module.exports = class EmojiCommand extends commando.Command {
+module.exports = class EmojiCommand extends Command {
     constructor(client) {
         super(client, {
             name: 'emoji',
diff --git a/commands/guildinfo/guildinfo.js b/commands/guildinfo/guildinfo.js
index bf73d842..6164aedd 100644
--- a/commands/guildinfo/guildinfo.js
+++ b/commands/guildinfo/guildinfo.js
@@ -1,9 +1,9 @@
-const commando = require('discord.js-commando');
-const Discord = require('discord.js');
+const { Command } = require('discord.js-commando');
+const { RichEmbed } = require('discord.js');
 const moment = require('moment');
 require('moment-duration-format');
 
-module.exports = class GuildInfoCommand extends commando.Command {
+module.exports = class GuildInfoCommand extends Command {
     constructor(client) {
         super(client, {
             name: 'server',
@@ -25,7 +25,7 @@ module.exports = class GuildInfoCommand extends commando.Command {
             if (!message.channel.permissionsFor(this.client.user).hasPermission(['SEND_MESSAGES', 'READ_MESSAGES'])) return;
             if (!message.channel.permissionsFor(this.client.user).hasPermission('EMBED_LINKS')) return message.say(':x: Error! I don\'t have the Embed Links Permission!');
         }
-        const embed = new Discord.RichEmbed()
+        const embed = new RichEmbed()
             .setColor(0x00AE86)
             .setThumbnail(message.guild.iconURL)
             .addField('**Name:**',
diff --git a/commands/imageedit/meme.js b/commands/imageedit/meme.js
index 0d373b72..3db2f89d 100644
--- a/commands/imageedit/meme.js
+++ b/commands/imageedit/meme.js
@@ -1,7 +1,7 @@
-const commando = require('discord.js-commando');
+const { Command } = require('discord.js-commando');
 const memecodes = ['tenguy', 'afraid', 'older', 'aag', 'tried', 'biw', 'blb', 'kermit', 'bd', 'ch', 'cbg', 'wonka', 'cb', 'keanu', 'dsm', 'live', 'ants', 'doge', 'alwaysonbeat', 'ermg', 'facepalm', 'fwp', 'fa', 'fbf', 'fry', 'hipster', 'icanhas', 'crazypills', 'mw', 'noidea', 'regret', 'boat', 'hagrid', 'sohappy', 'captain', 'inigo', 'iw', 'ackbar', 'happening', 'joker', 'ive', 'll', 'morpheus', 'mb', 'badchoice', 'mmm', 'jetpack', 'red', 'mordor', 'oprah', 'oag', 'remembers', 'philosoraptor', 'jw', 'patrick', 'rollsafe', 'sad-obama', 'sad-clinton', 'sadfrog', 'sad-bush', 'sad-biden', 'sad-boehner', 'saltbae', 'sarcasticbear', 'dwight', 'sb', 'ss', 'sf', 'dodgson', 'money', 'sohot', 'nice', 'awesome-awkward', 'awesome', 'awkward-awesome', 'awkward', 'fetch', 'success', 'scc', 'ski', 'officespace', 'interesting', 'toohigh', 'bs', 'center', 'both', 'winter', 'xy', 'buzz', 'yodawg', 'uno', 'yallgot', 'bad', 'elf', 'chosen'];
 
-module.exports = class MemeCommand extends commando.Command {
+module.exports = class MemeCommand extends Command {
     constructor(client) {
         super(client, {
             name: 'meme',
diff --git a/commands/moderation/ban.js b/commands/moderation/ban.js
index 66e884de..398b6e7b 100644
--- a/commands/moderation/ban.js
+++ b/commands/moderation/ban.js
@@ -1,7 +1,7 @@
-const commando = require('discord.js-commando');
-const Discord = require('discord.js');
+const { Command } = require('discord.js-commando');
+const { RichEmbed } = require('discord.js');
 
-module.exports = class BanCommand extends commando.Command {
+module.exports = class BanCommand extends Command {
     constructor(client) {
         super(client, {
             name: 'ban',
@@ -47,7 +47,7 @@ module.exports = class BanCommand extends commando.Command {
         try {
             const banUser = await message.guild.member(member).ban();
             const okHandMsg = await message.say(':ok_hand:');
-            const embed = new Discord.RichEmbed()
+            const embed = new RichEmbed()
                 .setAuthor(`${message.author.username}#${message.author.discriminator}`, message.author.avatarURL)
                 .setColor(0xFF0000)
                 .setFooter('XiaoBot Moderation', this.client.user.avatarURL)
diff --git a/commands/moderation/kick.js b/commands/moderation/kick.js
index 3d86a4a6..5cf41cae 100644
--- a/commands/moderation/kick.js
+++ b/commands/moderation/kick.js
@@ -1,7 +1,7 @@
-const commando = require('discord.js-commando');
-const Discord = require('discord.js');
+const { Command } = require('discord.js-commando');
+const { RichEmbed } = require('discord.js');
 
-module.exports = class KickCommand extends commando.Command {
+module.exports = class KickCommand extends Command {
     constructor(client) {
         super(client, {
             name: 'kick',
@@ -44,7 +44,7 @@ module.exports = class KickCommand extends commando.Command {
         try {
             const kickUser = await message.guild.member(member).kick();
             const okHandMsg = await message.say(':ok_hand:');
-            const embed = new Discord.RichEmbed()
+            const embed = new RichEmbed()
                 .setAuthor(`${message.author.username}#${message.author.discriminator}`, message.author.avatarURL)
                 .setColor(0xFFA500)
                 .setFooter('XiaoBot Moderation', this.client.user.avatarURL)
diff --git a/commands/moderation/lockdown.js b/commands/moderation/lockdown.js
index c14feac1..ecaeeebe 100644
--- a/commands/moderation/lockdown.js
+++ b/commands/moderation/lockdown.js
@@ -1,6 +1,6 @@
-const commando = require('discord.js-commando');
+const { Command } = require('discord.js-commando');
 
-module.exports = class LockdownCommand extends commando.Command {
+module.exports = class LockdownCommand extends Command {
     constructor(client) {
         super(client, {
             name: 'lockdown',
diff --git a/commands/moderation/prune.js b/commands/moderation/prune.js
index 8a9a4104..293f05f0 100644
--- a/commands/moderation/prune.js
+++ b/commands/moderation/prune.js
@@ -1,6 +1,6 @@
-const commando = require('discord.js-commando');
+const { Command } = require('discord.js-commando');
 
-module.exports = class PruneCommand extends commando.Command {
+module.exports = class PruneCommand extends Command {
     constructor(client) {
         super(client, {
             name: 'prune',
diff --git a/commands/moderation/unban.js b/commands/moderation/unban.js
index f24bb8d7..a9502a2c 100644
--- a/commands/moderation/unban.js
+++ b/commands/moderation/unban.js
@@ -1,7 +1,7 @@
-const commando = require('discord.js-commando');
-const Discord = require('discord.js');
+const { Command } = require('discord.js-commando');
+const { RichEmbed } = require('discord.js');
 
-module.exports = class UnbanCommand extends commando.Command {
+module.exports = class UnbanCommand extends Command {
     constructor(client) {
         super(client, {
             name: 'unban',
@@ -55,7 +55,7 @@ module.exports = class UnbanCommand extends commando.Command {
         try {
             const unbanUser = await message.guild.unban(unbanUserObj);
             const okHandMsg = await message.say(':ok_hand:');
-            const embed = new Discord.RichEmbed()
+            const embed = new RichEmbed()
                 .setAuthor(`${message.author.username}#${message.author.discriminator}`, message.author.avatarURL)
                 .setColor(0x00AE86)
                 .setFooter('XiaoBot Moderation', this.client.user.avatarURL)
diff --git a/commands/moderation/warn.js b/commands/moderation/warn.js
index faf6d8d2..f95ed8ad 100644
--- a/commands/moderation/warn.js
+++ b/commands/moderation/warn.js
@@ -1,7 +1,7 @@
-const commando = require('discord.js-commando');
-const Discord = require('discord.js');
+const { Command } = require('discord.js-commando');
+const { RichEmbed } = require('discord.js');
 
-module.exports = class WarnCommand extends commando.Command {
+module.exports = class WarnCommand extends Command {
     constructor(client) {
         super(client, {
             name: 'warn',
@@ -41,7 +41,7 @@ module.exports = class WarnCommand extends commando.Command {
         if (!message.guild.channels.exists('name', 'mod_logs')) return message.say(':x: Error! Could not find the mod_logs channel! Please create it!');
         try {
             const okHandMsg = await message.say(':ok_hand:');
-            const embed = new Discord.RichEmbed()
+            const embed = new RichEmbed()
                 .setAuthor(`${message.author.username}#${message.author.discriminator}`, message.author.avatarURL)
                 .setColor(0xFFFF00)
                 .setFooter('XiaoBot Moderation', this.client.user.avatarURL)
diff --git a/commands/numedit/math.js b/commands/numedit/math.js
index 8272db47..22f833dd 100644
--- a/commands/numedit/math.js
+++ b/commands/numedit/math.js
@@ -1,7 +1,7 @@
-const commando = require('discord.js-commando');
+const { Command } = require('discord.js-commando');
 const math = require('mathjs');
 
-module.exports = class MathCommand extends commando.Command {
+module.exports = class MathCommand extends Command {
     constructor(client) {
         super(client, {
             name: 'math',
diff --git a/commands/numedit/roman.js b/commands/numedit/roman.js
index c55152a9..9b93aafa 100644
--- a/commands/numedit/roman.js
+++ b/commands/numedit/roman.js
@@ -1,7 +1,7 @@
-const commando = require('discord.js-commando');
+const { Command } = require('discord.js-commando');
 const romanNumeralConverter = require('roman-numeral-converter-mmxvi');
 
-module.exports = class RomanCommand extends commando.Command {
+module.exports = class RomanCommand extends Command {
     constructor(client) {
         super(client, {
             name: 'roman',
diff --git a/commands/random/canyounot.js b/commands/random/canyounot.js
index f7b01f5a..d87dd149 100644
--- a/commands/random/canyounot.js
+++ b/commands/random/canyounot.js
@@ -1,6 +1,6 @@
-const commando = require('discord.js-commando');
+const { Command } = require('discord.js-commando');
 
-module.exports = class CanYouNotCommand extends commando.Command {
+module.exports = class CanYouNotCommand extends Command {
     constructor(client) {
         super(client, {
             name: 'canyounot',
diff --git a/commands/random/giveflower.js b/commands/random/giveflower.js
index 7375cdfd..7035e347 100644
--- a/commands/random/giveflower.js
+++ b/commands/random/giveflower.js
@@ -1,6 +1,6 @@
-const commando = require('discord.js-commando');
+const { Command } = require('discord.js-commando');
 
-module.exports = class GiveFlowerCommand extends commando.Command {
+module.exports = class GiveFlowerCommand extends Command {
     constructor(client) {
         super(client, {
             name: 'giveflower',
diff --git a/commands/random/lenny.js b/commands/random/lenny.js
index f95b9bd4..d9685a7b 100644
--- a/commands/random/lenny.js
+++ b/commands/random/lenny.js
@@ -1,6 +1,6 @@
-const commando = require('discord.js-commando');
+const { Command } = require('discord.js-commando');
 
-module.exports = class LennyCommand extends commando.Command {
+module.exports = class LennyCommand extends Command {
     constructor(client) {
         super(client, {
             name: 'lenny',
diff --git a/commands/random/nitro.js b/commands/random/nitro.js
index 775d1064..4dc505b9 100644
--- a/commands/random/nitro.js
+++ b/commands/random/nitro.js
@@ -1,7 +1,7 @@
-const commando = require('discord.js-commando');
-const Discord = require('discord.js');
+const { Command } = require('discord.js-commando');
+const { RichEmbed } = require('discord.js');
 
-module.exports = class NitroCommand extends commando.Command {
+module.exports = class NitroCommand extends Command {
     constructor(client) {
         super(client, {
             name: 'nitro',
@@ -17,7 +17,7 @@ module.exports = class NitroCommand extends commando.Command {
             if (!message.channel.permissionsFor(this.client.user).hasPermission(['SEND_MESSAGES', 'READ_MESSAGES'])) return;
             if (!message.channel.permissionsFor(this.client.user).hasPermission('EMBED_LINKS')) return message.say(':x: Error! I don\'t have the Embed Links Permission!');
         }
-        const embed = new Discord.RichEmbed()
+        const embed = new RichEmbed()
             .setAuthor('Discord Nitro')
             .setThumbnail('https://pbs.twimg.com/profile_images/814184180649197568/y2eZcVMq.jpg')
             .setColor(0x748BD9)
diff --git a/commands/random/slowclap.js b/commands/random/slowclap.js
index c385ad4a..cd6992b9 100644
--- a/commands/random/slowclap.js
+++ b/commands/random/slowclap.js
@@ -1,6 +1,6 @@
-const commando = require('discord.js-commando');
+const { Command } = require('discord.js-commando');
 
-module.exports = class SlowClapCommand extends commando.Command {
+module.exports = class SlowClapCommand extends Command {
     constructor(client) {
         super(client, {
             name: 'slowclap',
diff --git a/commands/random/spam.js b/commands/random/spam.js
index 4b7f8855..f937b157 100644
--- a/commands/random/spam.js
+++ b/commands/random/spam.js
@@ -1,6 +1,6 @@
-const commando = require('discord.js-commando');
+const { Command } = require('discord.js-commando');
 
-module.exports = class SpamCommand extends commando.Command {
+module.exports = class SpamCommand extends Command {
     constructor(client) {
         super(client, {
             name: 'spam',
diff --git a/commands/random/strawpoll.js b/commands/random/strawpoll.js
index 4acdaa9a..56146b96 100644
--- a/commands/random/strawpoll.js
+++ b/commands/random/strawpoll.js
@@ -1,7 +1,7 @@
-const commando = require('discord.js-commando');
+const { Command } = require('discord.js-commando');
 const request = require('superagent');
 
-module.exports = class StrawpollCommand extends commando.Command {
+module.exports = class StrawpollCommand extends Command {
     constructor(client) {
         super(client, {
             name: 'strawpoll',
diff --git a/commands/random/today.js b/commands/random/today.js
index 19dcee2d..3e348d9c 100644
--- a/commands/random/today.js
+++ b/commands/random/today.js
@@ -1,8 +1,8 @@
-const commando = require('discord.js-commando');
-const Discord = require('discord.js');
+const { Command } = require('discord.js-commando');
+const { RichEmbed } = require('discord.js');
 const request = require('superagent');
 
-module.exports = class TodayCommand extends commando.Command {
+module.exports = class TodayCommand extends Command {
     constructor(client) {
         super(client, {
             name: 'today',
@@ -31,7 +31,7 @@ module.exports = class TodayCommand extends commando.Command {
             const parsedResponse = JSON.parse(response.text);
             const events = parsedResponse.data.Events;
             const randomNumber = Math.floor(Math.random() * events.length);
-            const embed = new Discord.RichEmbed()
+            const embed = new RichEmbed()
                 .setColor(0x9797FF)
                 .setURL(parsedResponse.url)
                 .setTitle(`On this day (${parsedResponse.date})...`)
diff --git a/commands/response/8ball.js b/commands/response/8ball.js
index 4d97945e..791538ba 100644
--- a/commands/response/8ball.js
+++ b/commands/response/8ball.js
@@ -1,6 +1,6 @@
-const commando = require('discord.js-commando');
+const { Command } = require('discord.js-commando');
 
-module.exports = class MagicBallCommand extends commando.Command {
+module.exports = class MagicBallCommand extends Command {
     constructor(client) {
         super(client, {
             name: '8ball',
diff --git a/commands/response/cat.js b/commands/response/cat.js
index 7bab36b5..8cc98633 100644
--- a/commands/response/cat.js
+++ b/commands/response/cat.js
@@ -1,6 +1,6 @@
-const commando = require('discord.js-commando');
+const { Command } = require('discord.js-commando');
 
-module.exports = class CatCommand extends commando.Command {
+module.exports = class CatCommand extends Command {
     constructor(client) {
         super(client, {
             name: 'cat',
diff --git a/commands/response/choose.js b/commands/response/choose.js
index 2048a019..93287b9b 100644
--- a/commands/response/choose.js
+++ b/commands/response/choose.js
@@ -1,6 +1,6 @@
-const commando = require('discord.js-commando');
+const { Command } = require('discord.js-commando');
 
-module.exports = class ChooseCommand extends commando.Command {
+module.exports = class ChooseCommand extends Command {
     constructor(client) {
         super(client, {
             name: 'choose',
diff --git a/commands/response/coin.js b/commands/response/coin.js
index 12cf7a06..b6316691 100644
--- a/commands/response/coin.js
+++ b/commands/response/coin.js
@@ -1,6 +1,6 @@
-const commando = require('discord.js-commando');
+const { Command } = require('discord.js-commando');
 
-module.exports = class CoinFlipCommand extends commando.Command {
+module.exports = class CoinFlipCommand extends Command {
     constructor(client) {
         super(client, {
             name: 'coin',
diff --git a/commands/response/compliment.js b/commands/response/compliment.js
index bbe31558..b6433711 100644
--- a/commands/response/compliment.js
+++ b/commands/response/compliment.js
@@ -1,6 +1,6 @@
-const commando = require('discord.js-commando');
+const { Command } = require('discord.js-commando');
 
-module.exports = class ComplimentCommand extends commando.Command {
+module.exports = class ComplimentCommand extends Command {
     constructor(client) {
         super(client, {
             name: 'compliment',
diff --git a/commands/response/factcore.js b/commands/response/factcore.js
index e1094df2..87be0926 100644
--- a/commands/response/factcore.js
+++ b/commands/response/factcore.js
@@ -1,6 +1,6 @@
-const commando = require('discord.js-commando');
+const { Command } = require('discord.js-commando');
 
-module.exports = class FactCoreCommand extends commando.Command {
+module.exports = class FactCoreCommand extends Command {
     constructor(client) {
         super(client, {
             name: 'factcore',
diff --git a/commands/response/fishy.js b/commands/response/fishy.js
index c8859e25..562006ac 100644
--- a/commands/response/fishy.js
+++ b/commands/response/fishy.js
@@ -1,6 +1,6 @@
-const commando = require('discord.js-commando');
+const { Command } = require('discord.js-commando');
 
-module.exports = class FishyCommand extends commando.Command {
+module.exports = class FishyCommand extends Command {
     constructor(client) {
         super(client, {
             name: 'fishy',
diff --git a/commands/response/fortune.js b/commands/response/fortune.js
index 03bfeacc..8c59b58e 100644
--- a/commands/response/fortune.js
+++ b/commands/response/fortune.js
@@ -1,6 +1,6 @@
-const commando = require('discord.js-commando');
+const { Command } = require('discord.js-commando');
 
-module.exports = class FortuneCookieCommand extends commando.Command {
+module.exports = class FortuneCookieCommand extends Command {
     constructor(client) {
         super(client, {
             name: 'fortune',
diff --git a/commands/response/motivate.js b/commands/response/motivate.js
index 49d4f110..6316f40e 100644
--- a/commands/response/motivate.js
+++ b/commands/response/motivate.js
@@ -1,6 +1,6 @@
-const commando = require('discord.js-commando');
+const { Command } = require('discord.js-commando');
 
-module.exports = class MotivateCommand extends commando.Command {
+module.exports = class MotivateCommand extends Command {
     constructor(client) {
         super(client, {
             name: 'motivate',
diff --git a/commands/response/name.js b/commands/response/name.js
index 78409fc1..460c6996 100644
--- a/commands/response/name.js
+++ b/commands/response/name.js
@@ -1,6 +1,6 @@
-const commando = require('discord.js-commando');
+const { Command } = require('discord.js-commando');
 
-module.exports = class RandomNameCommand extends commando.Command {
+module.exports = class RandomNameCommand extends Command {
     constructor(client) {
         super(client, {
             name: 'name',
diff --git a/commands/response/offspring.js b/commands/response/offspring.js
index 638d7508..57fca0fe 100644
--- a/commands/response/offspring.js
+++ b/commands/response/offspring.js
@@ -1,6 +1,6 @@
-const commando = require('discord.js-commando');
+const { Command } = require('discord.js-commando');
 
-module.exports = class OffspringCommand extends commando.Command {
+module.exports = class OffspringCommand extends Command {
     constructor(client) {
         super(client, {
             name: 'offspring',
diff --git a/commands/response/potato.js b/commands/response/potato.js
index dc8f2ab5..5d242112 100644
--- a/commands/response/potato.js
+++ b/commands/response/potato.js
@@ -1,6 +1,6 @@
-const commando = require('discord.js-commando');
+const { Command } = require('discord.js-commando');
 
-module.exports = class PotatoCommand extends commando.Command {
+module.exports = class PotatoCommand extends Command {
     constructor(client) {
         super(client, {
             name: 'potato',
diff --git a/commands/response/pun.js b/commands/response/pun.js
index d241e2ce..d33dba35 100644
--- a/commands/response/pun.js
+++ b/commands/response/pun.js
@@ -1,6 +1,6 @@
-const commando = require('discord.js-commando');
+const { Command } = require('discord.js-commando');
 
-module.exports = class RandomPunCommand extends commando.Command {
+module.exports = class RandomPunCommand extends Command {
     constructor(client) {
         super(client, {
             name: 'pun',
diff --git a/commands/response/quantumcoin.js b/commands/response/quantumcoin.js
index cdd725e2..73e8414d 100644
--- a/commands/response/quantumcoin.js
+++ b/commands/response/quantumcoin.js
@@ -1,6 +1,6 @@
-const commando = require('discord.js-commando');
+const { Command } = require('discord.js-commando');
 
-module.exports = class QuantumCoinCommand extends commando.Command {
+module.exports = class QuantumCoinCommand extends Command {
     constructor(client) {
         super(client, {
             name: 'quantumcoin',
diff --git a/commands/response/ratewaifu.js b/commands/response/ratewaifu.js
index e489b1fd..e91f3ab5 100644
--- a/commands/response/ratewaifu.js
+++ b/commands/response/ratewaifu.js
@@ -1,6 +1,6 @@
-const commando = require('discord.js-commando');
+const { Command } = require('discord.js-commando');
 
-module.exports = class RateWaifuCommand extends commando.Command {
+module.exports = class RateWaifuCommand extends Command {
     constructor(client) {
         super(client, {
             name: 'ratewaifu',
diff --git a/commands/response/roast.js b/commands/response/roast.js
index feff86ad..df198aae 100644
--- a/commands/response/roast.js
+++ b/commands/response/roast.js
@@ -1,6 +1,6 @@
-const commando = require('discord.js-commando');
+const { Command } = require('discord.js-commando');
 
-module.exports = class RoastCommand extends commando.Command {
+module.exports = class RoastCommand extends Command {
     constructor(client) {
         super(client, {
             name: 'roast',
diff --git a/commands/response/roll.js b/commands/response/roll.js
index 1fdbee82..35617a1c 100644
--- a/commands/response/roll.js
+++ b/commands/response/roll.js
@@ -1,6 +1,6 @@
-const commando = require('discord.js-commando');
+const { Command } = require('discord.js-commando');
 
-module.exports = class RollCommand extends commando.Command {
+module.exports = class RollCommand extends Command {
     constructor(client) {
         super(client, {
             name: 'roll',
diff --git a/commands/response/roulette.js b/commands/response/roulette.js
index bfc523ba..f93ba4dd 100644
--- a/commands/response/roulette.js
+++ b/commands/response/roulette.js
@@ -1,6 +1,6 @@
-const commando = require('discord.js-commando');
+const { Command } = require('discord.js-commando');
 
-module.exports = class RouletteCommand extends commando.Command {
+module.exports = class RouletteCommand extends Command {
     constructor(client) {
         super(client, {
             name: 'roulette',
diff --git a/commands/response/ship.js b/commands/response/ship.js
index f8bb64c3..faac08e3 100644
--- a/commands/response/ship.js
+++ b/commands/response/ship.js
@@ -1,6 +1,6 @@
-const commando = require('discord.js-commando');
+const { Command } = require('discord.js-commando');
 
-module.exports = class ShipCommand extends commando.Command {
+module.exports = class ShipCommand extends Command {
     constructor(client) {
         super(client, {
             name: 'ship',
diff --git a/commands/response/vocaloid.js b/commands/response/vocaloid.js
index 4968afd4..d0bfea27 100644
--- a/commands/response/vocaloid.js
+++ b/commands/response/vocaloid.js
@@ -1,6 +1,6 @@
-const commando = require('discord.js-commando');
+const { Command } = require('discord.js-commando');
 
-module.exports = class VocaloidCommand extends commando.Command {
+module.exports = class VocaloidCommand extends Command {
     constructor(client) {
         super(client, {
             name: 'vocaloid',
diff --git a/commands/response/xiaopai.js b/commands/response/xiaopai.js
index 511731e4..eb1f1fd7 100644
--- a/commands/response/xiaopai.js
+++ b/commands/response/xiaopai.js
@@ -1,6 +1,6 @@
-const commando = require('discord.js-commando');
+const { Command } = require('discord.js-commando');
 
-module.exports = class XiaoCommand extends commando.Command {
+module.exports = class XiaoCommand extends Command {
     constructor(client) {
         super(client, {
             name: 'xiaopai',
diff --git a/commands/roleplay/cuddle.js b/commands/roleplay/cuddle.js
index 65afe5d3..5138fe13 100644
--- a/commands/roleplay/cuddle.js
+++ b/commands/roleplay/cuddle.js
@@ -1,6 +1,6 @@
-const commando = require('discord.js-commando');
+const { Command } = require('discord.js-commando');
 
-module.exports = class CuddleCommand extends commando.Command {
+module.exports = class CuddleCommand extends Command {
     constructor(client) {
         super(client, {
             name: 'cuddle',
diff --git a/commands/roleplay/divorce.js b/commands/roleplay/divorce.js
index 87fae4ce..ca2f5d37 100644
--- a/commands/roleplay/divorce.js
+++ b/commands/roleplay/divorce.js
@@ -1,6 +1,6 @@
-const commando = require('discord.js-commando');
+const { Command } = require('discord.js-commando');
 
-module.exports = class DivorceCommand extends commando.Command {
+module.exports = class DivorceCommand extends Command {
     constructor(client) {
         super(client, {
             name: 'divorce',
diff --git a/commands/roleplay/eat.js b/commands/roleplay/eat.js
index 8067ebd9..f70eff7c 100644
--- a/commands/roleplay/eat.js
+++ b/commands/roleplay/eat.js
@@ -1,6 +1,6 @@
-const commando = require('discord.js-commando');
+const { Command } = require('discord.js-commando');
 
-module.exports = class EatCommand extends commando.Command {
+module.exports = class EatCommand extends Command {
     constructor(client) {
         super(client, {
             name: 'eat',
diff --git a/commands/roleplay/falconpunch.js b/commands/roleplay/falconpunch.js
index 751e5e3a..c50d6b21 100644
--- a/commands/roleplay/falconpunch.js
+++ b/commands/roleplay/falconpunch.js
@@ -1,6 +1,6 @@
-const commando = require('discord.js-commando');
+const { Command } = require('discord.js-commando');
 
-module.exports = class FalconPunchCommand extends commando.Command {
+module.exports = class FalconPunchCommand extends Command {
     constructor(client) {
         super(client, {
             name: 'falconpunch',
diff --git a/commands/roleplay/fistbump.js b/commands/roleplay/fistbump.js
index 5c3dbbec..274e8a03 100644
--- a/commands/roleplay/fistbump.js
+++ b/commands/roleplay/fistbump.js
@@ -1,6 +1,6 @@
-const commando = require('discord.js-commando');
+const { Command } = require('discord.js-commando');
 
-module.exports = class FistBumpCommand extends commando.Command {
+module.exports = class FistBumpCommand extends Command {
     constructor(client) {
         super(client, {
             name: 'fistbump',
diff --git a/commands/roleplay/highfive.js b/commands/roleplay/highfive.js
index 5b190da0..787c0f42 100644
--- a/commands/roleplay/highfive.js
+++ b/commands/roleplay/highfive.js
@@ -1,6 +1,6 @@
-const commando = require('discord.js-commando');
+const { Command } = require('discord.js-commando');
 
-module.exports = class HighFivesCommand extends commando.Command {
+module.exports = class HighFivesCommand extends Command {
     constructor(client) {
         super(client, {
             name: 'highfive',
diff --git a/commands/roleplay/hitwithshovel.js b/commands/roleplay/hitwithshovel.js
index a1c12081..82669a50 100644
--- a/commands/roleplay/hitwithshovel.js
+++ b/commands/roleplay/hitwithshovel.js
@@ -1,6 +1,6 @@
-const commando = require('discord.js-commando');
+const { Command } = require('discord.js-commando');
 
-module.exports = class HitwithShovelCommand extends commando.Command {
+module.exports = class HitwithShovelCommand extends Command {
     constructor(client) {
         super(client, {
             name: 'hitwithshovel',
diff --git a/commands/roleplay/hug.js b/commands/roleplay/hug.js
index 3ce2c4e9..6e76de12 100644
--- a/commands/roleplay/hug.js
+++ b/commands/roleplay/hug.js
@@ -1,6 +1,6 @@
-const commando = require('discord.js-commando');
+const { Command } = require('discord.js-commando');
 
-module.exports = class HugCommand extends commando.Command {
+module.exports = class HugCommand extends Command {
     constructor(client) {
         super(client, {
             name: 'hug',
diff --git a/commands/roleplay/inhales.js b/commands/roleplay/inhales.js
index 043f44ab..80252146 100644
--- a/commands/roleplay/inhales.js
+++ b/commands/roleplay/inhales.js
@@ -1,6 +1,6 @@
-const commando = require('discord.js-commando');
+const { Command } = require('discord.js-commando');
 
-module.exports = class InhaleCommand extends commando.Command {
+module.exports = class InhaleCommand extends Command {
     constructor(client) {
         super(client, {
             name: 'inhale',
diff --git a/commands/roleplay/kill.js b/commands/roleplay/kill.js
index 890e81ab..4af6681c 100644
--- a/commands/roleplay/kill.js
+++ b/commands/roleplay/kill.js
@@ -1,6 +1,6 @@
-const commando = require('discord.js-commando');
+const { Command } = require('discord.js-commando');
 
-module.exports = class KillCommand extends commando.Command {
+module.exports = class KillCommand extends Command {
     constructor(client) {
         super(client, {
             name: 'kill',
diff --git a/commands/roleplay/kiss.js b/commands/roleplay/kiss.js
index 42428e9e..fdd194f7 100644
--- a/commands/roleplay/kiss.js
+++ b/commands/roleplay/kiss.js
@@ -1,6 +1,6 @@
-const commando = require('discord.js-commando');
+const { Command } = require('discord.js-commando');
 
-module.exports = class KissCommand extends commando.Command {
+module.exports = class KissCommand extends Command {
     constructor(client) {
         super(client, {
             name: 'kiss',
diff --git a/commands/roleplay/marries.js b/commands/roleplay/marries.js
index a76bbd45..0e3d7597 100644
--- a/commands/roleplay/marries.js
+++ b/commands/roleplay/marries.js
@@ -1,6 +1,6 @@
-const commando = require('discord.js-commando');
+const { Command } = require('discord.js-commando');
 
-module.exports = class MarryCommand extends commando.Command {
+module.exports = class MarryCommand extends Command {
     constructor(client) {
         super(client, {
             name: 'marry',
diff --git a/commands/roleplay/pat.js b/commands/roleplay/pat.js
index e81a2324..2d696df9 100644
--- a/commands/roleplay/pat.js
+++ b/commands/roleplay/pat.js
@@ -1,6 +1,6 @@
-const commando = require('discord.js-commando');
+const { Command } = require('discord.js-commando');
 
-module.exports = class PatCommand extends commando.Command {
+module.exports = class PatCommand extends Command {
     constructor(client) {
         super(client, {
             name: 'pat',
diff --git a/commands/roleplay/poke.js b/commands/roleplay/poke.js
index b1d4d662..871ab655 100644
--- a/commands/roleplay/poke.js
+++ b/commands/roleplay/poke.js
@@ -1,6 +1,6 @@
-const commando = require('discord.js-commando');
+const { Command } = require('discord.js-commando');
 
-module.exports = class PokeCommand extends commando.Command {
+module.exports = class PokeCommand extends Command {
     constructor(client) {
         super(client, {
             name: 'poke',
diff --git a/commands/roleplay/punch.js b/commands/roleplay/punch.js
index fdb96240..6755b6e3 100644
--- a/commands/roleplay/punch.js
+++ b/commands/roleplay/punch.js
@@ -1,6 +1,6 @@
-const commando = require('discord.js-commando');
+const { Command } = require('discord.js-commando');
 
-module.exports = class PunchCommand extends commando.Command {
+module.exports = class PunchCommand extends Command {
     constructor(client) {
         super(client, {
             name: 'punch',
diff --git a/commands/roleplay/slap.js b/commands/roleplay/slap.js
index 481e7086..25508285 100644
--- a/commands/roleplay/slap.js
+++ b/commands/roleplay/slap.js
@@ -1,6 +1,6 @@
-const commando = require('discord.js-commando');
+const { Command } = require('discord.js-commando');
 
-module.exports = class SlapCommand extends commando.Command {
+module.exports = class SlapCommand extends Command {
     constructor(client) {
         super(client, {
             name: 'slap',
diff --git a/commands/search/botinfo.js b/commands/search/botinfo.js
index 29f0f8d4..12002b42 100644
--- a/commands/search/botinfo.js
+++ b/commands/search/botinfo.js
@@ -1,8 +1,8 @@
-const commando = require('discord.js-commando');
-const Discord = require('discord.js');
+const { Command } = require('discord.js-commando');
+const { RichEmbed } = require('discord.js');
 const request = require('superagent');
 
-module.exports = class BotSearchCommand extends commando.Command {
+module.exports = class BotSearchCommand extends Command {
     constructor(client) {
         super(client, {
             name: 'botinfo',
@@ -35,7 +35,7 @@ module.exports = class BotSearchCommand extends commando.Command {
                     'Authorization': process.env.DISCORD_BOTS_KEY
                 });
             const data = response.body;
-            const embed = new Discord.RichEmbed()
+            const embed = new RichEmbed()
                 .setColor(0x9797FF)
                 .setAuthor('Discord Bots', 'https://cdn.discordapp.com/icons/110373943822540800/47336ad0631ac7aac0a48a2ba6246c65.jpg')
                 .setTitle(data.name)
diff --git a/commands/search/define.js b/commands/search/define.js
index d7598fa3..94950a55 100644
--- a/commands/search/define.js
+++ b/commands/search/define.js
@@ -1,8 +1,8 @@
-const commando = require('discord.js-commando');
-const Discord = require('discord.js');
+const { Command } = require('discord.js-commando');
+const { RichEmbed } = require('discord.js');
 const request = require('superagent');
 
-module.exports = class DefineCommand extends commando.Command {
+module.exports = class DefineCommand extends Command {
     constructor(client) {
         super(client, {
             name: 'define',
@@ -41,7 +41,7 @@ module.exports = class DefineCommand extends commando.Command {
                     api_key: process.env.WORDNIK_KEY
                 });
             const data = response.body[0];
-            const embed = new Discord.RichEmbed()
+            const embed = new RichEmbed()
                 .setColor(0x9797FF)
                 .setTitle(data.word)
                 .setDescription(data.text);
diff --git a/commands/search/discrim.js b/commands/search/discrim.js
index d209e018..bdee950a 100644
--- a/commands/search/discrim.js
+++ b/commands/search/discrim.js
@@ -1,7 +1,7 @@
-const commando = require('discord.js-commando');
-const Discord = require('discord.js');
+const { Command } = require('discord.js-commando');
+const { RichEmbed } = require('discord.js');
 
-module.exports = class DiscrimCommand extends commando.Command {
+module.exports = class DiscrimCommand extends Command {
     constructor(client) {
         super(client, {
             name: 'discrim',
@@ -34,7 +34,7 @@ module.exports = class DiscrimCommand extends commando.Command {
         }
         const userToSearch = args.discrim;
         const users = await this.client.users.filter(u => u.discriminator === userToSearch).map(u => u.username).sort();
-        const embed = new Discord.RichEmbed()
+        const embed = new RichEmbed()
             .setTitle(`${users.length} Users with the discriminator: ${userToSearch}`)
             .setDescription(users.join(', '));
         return message.embed(embed);
diff --git a/commands/search/forecast.js b/commands/search/forecast.js
index a73893b6..c1e37b58 100644
--- a/commands/search/forecast.js
+++ b/commands/search/forecast.js
@@ -1,8 +1,8 @@
-const commando = require('discord.js-commando');
-const Discord = require('discord.js');
+const { Command } = require('discord.js-commando');
+const { RichEmbed } = require('discord.js');
 const request = require('superagent');
 
-module.exports = class ForecastCommand extends commando.Command {
+module.exports = class ForecastCommand extends Command {
     constructor(client) {
         super(client, {
             name: 'forecast',
@@ -36,7 +36,7 @@ module.exports = class ForecastCommand extends commando.Command {
                 });
             const info = response.body.query.results.channel;
             const data = info.item.forecast;
-            const embed = new Discord.RichEmbed()
+            const embed = new RichEmbed()
                 .setColor(0x0000FF)
                 .setAuthor(info.title, 'http://media.idownloadblog.com/wp-content/uploads/2013/12/yahoo-weather-213x220.png')
                 .setURL(info.link)
diff --git a/commands/search/google.js b/commands/search/google.js
index 645c70ff..0d3d0e80 100644
--- a/commands/search/google.js
+++ b/commands/search/google.js
@@ -1,9 +1,9 @@
-const commando = require('discord.js-commando');
+const { Command } = require('discord.js-commando');
 const request = require('superagent');
 const cheerio = require('cheerio');
 const querystring = require('querystring');
 
-module.exports = class GoogleCommand extends commando.Command {
+module.exports = class GoogleCommand extends Command {
     constructor(client) {
         super(client, {
             name: 'google',
diff --git a/commands/search/imdb.js b/commands/search/imdb.js
index 77ca09dc..f4b3d244 100644
--- a/commands/search/imdb.js
+++ b/commands/search/imdb.js
@@ -1,8 +1,8 @@
-const commando = require('discord.js-commando');
-const Discord = require('discord.js');
+const { Command } = require('discord.js-commando');
+const { RichEmbed } = require('discord.js');
 const request = require('superagent');
 
-module.exports = class IMDBCommand extends commando.Command {
+module.exports = class IMDBCommand extends Command {
     constructor(client) {
         super(client, {
             name: 'imdb',
@@ -37,7 +37,7 @@ module.exports = class IMDBCommand extends commando.Command {
                     plot: 'full'
                 });
             const data = response.body;
-            const embed = new Discord.RichEmbed()
+            const embed = new RichEmbed()
                 .setColor(0xDBA628)
                 .setAuthor('IMDB', 'http://static.wixstatic.com/media/c65cbf_31901b544fe24f1890134553bf40c8be.png')
                 .setURL(`http://www.imdb.com/title/${data.imdbID}`)
diff --git a/commands/search/neopet.js b/commands/search/neopet.js
index 6fffd52a..f449e16c 100644
--- a/commands/search/neopet.js
+++ b/commands/search/neopet.js
@@ -1,6 +1,6 @@
-const commando = require('discord.js-commando');
+const { Command } = require('discord.js-commando');
 
-module.exports = class NeopetCommand extends commando.Command {
+module.exports = class NeopetCommand extends Command {
     constructor(client) {
         super(client, {
             name: 'neopet',
diff --git a/commands/search/osu.js b/commands/search/osu.js
index 179a0277..0a44b657 100644
--- a/commands/search/osu.js
+++ b/commands/search/osu.js
@@ -1,8 +1,8 @@
-const commando = require('discord.js-commando');
-const Discord = require('discord.js');
+const { Command } = require('discord.js-commando');
+const { RichEmbed } = require('discord.js');
 const request = require('superagent');
 
-module.exports = class OsuCommand extends commando.Command {
+module.exports = class OsuCommand extends Command {
     constructor(client) {
         super(client, {
             name: 'osu',
@@ -38,7 +38,7 @@ module.exports = class OsuCommand extends commando.Command {
                     type: 'string'
                 });
             const data = response.body[0];
-            const embed = new Discord.RichEmbed()
+            const embed = new RichEmbed()
                 .setColor(0xFF66AA)
                 .setAuthor('osu!', 'http://vignette3.wikia.nocookie.net/osugame/images/c/c9/Logo.png/revision/latest?cb=20151219073209')
                 .setURL('https://osu.ppy.sh/')
diff --git a/commands/search/pokedex.js b/commands/search/pokedex.js
index 886cc936..f58385fe 100644
--- a/commands/search/pokedex.js
+++ b/commands/search/pokedex.js
@@ -1,8 +1,8 @@
-const commando = require('discord.js-commando');
-const Discord = require('discord.js');
+const { Command } = require('discord.js-commando');
+const { RichEmbed } = require('discord.js');
 const pokedex = require('./pkdex.json');
 
-module.exports = class PokedexCommand extends commando.Command {
+module.exports = class PokedexCommand extends Command {
     constructor(client) {
         super(client, {
             name: 'pokedex',
@@ -33,7 +33,7 @@ module.exports = class PokedexCommand extends commando.Command {
             if (!message.channel.permissionsFor(this.client.user).hasPermission('EMBED_LINKS')) return message.say(':x: Error! I don\'t have the Embed Links Permission!');
         }
         const pokemon = args.pokemon.toLowerCase();
-        const embed = new Discord.RichEmbed()
+        const embed = new RichEmbed()
             .setTitle('Information')
             .setAuthor(`#${pokedex.index[pokemon]} ${pokedex.name[pokemon]}`, `http://www.serebii.net/pokedex-sm/icon/${pokedex.index[pokemon]}.png`)
             .setColor(0xFF0000)
diff --git a/commands/search/urban.js b/commands/search/urban.js
index 39347e06..758a2355 100644
--- a/commands/search/urban.js
+++ b/commands/search/urban.js
@@ -1,8 +1,8 @@
-const commando = require('discord.js-commando');
-const Discord = require('discord.js');
+const { Command } = require('discord.js-commando');
+const { RichEmbed } = require('discord.js');
 const request = require('superagent');
 
-module.exports = class UrbanCommand extends commando.Command {
+module.exports = class UrbanCommand extends Command {
     constructor(client) {
         super(client, {
             name: 'urban',
@@ -36,7 +36,7 @@ module.exports = class UrbanCommand extends commando.Command {
                     term: wordToDefine
                 });
             const data = response.body.list[0];
-            const embed = new Discord.RichEmbed()
+            const embed = new RichEmbed()
                 .setColor(0x32a8f0)
                 .setAuthor('Urban Dictionary', 'http://a1.mzstatic.com/eu/r30/Purple71/v4/66/54/68/6654683f-cacd-4a55-1784-f14257f77874/icon175x175.png')
                 .setURL(data.permalink)
diff --git a/commands/search/wattpad.js b/commands/search/wattpad.js
index af8bed36..e0c230da 100644
--- a/commands/search/wattpad.js
+++ b/commands/search/wattpad.js
@@ -1,8 +1,8 @@
-const commando = require('discord.js-commando');
-const Discord = require('discord.js');
+const { Command } = require('discord.js-commando');
+const { RichEmbed } = require('discord.js');
 const request = require('superagent');
 
-module.exports = class WattpadCommand extends commando.Command {
+module.exports = class WattpadCommand extends Command {
     constructor(client) {
         super(client, {
             name: 'wattpad',
@@ -35,7 +35,7 @@ module.exports = class WattpadCommand extends commando.Command {
                     limit: 1
                 });
             const data = response.body.stories[0];
-            const embed = new Discord.RichEmbed()
+            const embed = new RichEmbed()
                 .setColor(0xF89C34)
                 .setAuthor('Wattpad', 'http://www.selfpubtoolbox.com/wp-content/uploads/2015/05/a6044fd3a88acd5043860484db972ca6.png')
                 .setURL(data.url)
diff --git a/commands/search/weather.js b/commands/search/weather.js
index 73b5e9f1..b1263b66 100644
--- a/commands/search/weather.js
+++ b/commands/search/weather.js
@@ -1,8 +1,8 @@
-const commando = require('discord.js-commando');
-const Discord = require('discord.js');
+const { Command } = require('discord.js-commando');
+const { RichEmbed } = require('discord.js');
 const request = require('superagent');
 
-module.exports = class WeatherCommand extends commando.Command {
+module.exports = class WeatherCommand extends Command {
     constructor(client) {
         super(client, {
             name: 'weather',
@@ -32,7 +32,7 @@ module.exports = class WeatherCommand extends commando.Command {
                     format: 'json'
                 });
             const data = response.body.query.results.channel;
-            const embed = new Discord.RichEmbed()
+            const embed = new RichEmbed()
                 .setColor(0x0000FF)
                 .setAuthor(data.title, 'http://media.idownloadblog.com/wp-content/uploads/2013/12/yahoo-weather-213x220.png')
                 .setURL(data.link)
diff --git a/commands/search/wikipedia.js b/commands/search/wikipedia.js
index 42e7ce72..6bfbf9de 100644
--- a/commands/search/wikipedia.js
+++ b/commands/search/wikipedia.js
@@ -1,8 +1,8 @@
-const commando = require('discord.js-commando');
-const Discord = require('discord.js');
+const { Command } = require('discord.js-commando');
+const { RichEmbed } = require('discord.js');
 const request = require('superagent');
 
-module.exports = class WikipediaCommand extends commando.Command {
+module.exports = class WikipediaCommand extends Command {
     constructor(client) {
         super(client, {
             name: 'wikipedia',
@@ -40,7 +40,7 @@ module.exports = class WikipediaCommand extends commando.Command {
                 });
             const data = response.body.query.pages[0];
             const description = data.extract.substr(0, 1900).split('\n').join('\n\n');
-            const embed = new Discord.RichEmbed()
+            const embed = new RichEmbed()
                 .setColor(0xE7E7E7)
                 .setTitle(data.title)
                 .setURL(`https://en.wikipedia.org/wiki/${title}`)
diff --git a/commands/search/youtube.js b/commands/search/youtube.js
index 2d86a510..a6f5e275 100644
--- a/commands/search/youtube.js
+++ b/commands/search/youtube.js
@@ -1,8 +1,8 @@
-const commando = require('discord.js-commando');
-const Discord = require('discord.js');
+const { Command } = require('discord.js-commando');
+const { RichEmbed } = require('discord.js');
 const request = require('superagent');
 
-module.exports = class YouTubeCommand extends commando.Command {
+module.exports = class YouTubeCommand extends Command {
     constructor(client) {
         super(client, {
             name: 'youtube',
@@ -38,7 +38,7 @@ module.exports = class YouTubeCommand extends commando.Command {
                     key: process.env.YOUTUBE_KEY
                 });
             const data = response.body.items[0];
-            const embed = new Discord.RichEmbed()
+            const embed = new RichEmbed()
                 .setColor(0xDD2825)
                 .setTitle(data.snippet.title)
                 .setDescription(data.snippet.description)
diff --git a/commands/search/yugioh.js b/commands/search/yugioh.js
index 52a94e18..651b8fb2 100644
--- a/commands/search/yugioh.js
+++ b/commands/search/yugioh.js
@@ -1,8 +1,8 @@
-const commando = require('discord.js-commando');
-const Discord = require('discord.js');
+const { Command } = require('discord.js-commando');
+const { RichEmbed } = require('discord.js');
 const request = require('superagent');
 
-module.exports = class YuGiOhCommand extends commando.Command {
+module.exports = class YuGiOhCommand extends Command {
     constructor(client) {
         super(client, {
             name: 'yugioh',
@@ -29,7 +29,7 @@ module.exports = class YuGiOhCommand extends commando.Command {
                 .get(`http://yugiohprices.com/api/card_data/${cardName}`);
             const data = response.body.data;
             if (data.card_type === 'monster') {
-                const embed = new Discord.RichEmbed()
+                const embed = new RichEmbed()
                     .setColor(0xBE5F1F)
                     .setTitle(data.name)
                     .setDescription(data.text)
@@ -48,7 +48,7 @@ module.exports = class YuGiOhCommand extends commando.Command {
                         data.level, true);
                 return message.embed(embed);
             }
-            const embed = new Discord.RichEmbed()
+            const embed = new RichEmbed()
                 .setColor(0xBE5F1F)
                 .setTitle(data.name)
                 .setDescription(data.text)
diff --git a/commands/textedit/binary.js b/commands/textedit/binary.js
index 3d8b0a11..29d47e6d 100644
--- a/commands/textedit/binary.js
+++ b/commands/textedit/binary.js
@@ -1,7 +1,7 @@
-const commando = require('discord.js-commando');
+const { Command } = require('discord.js-commando');
 const stringToBinary = require('string-to-binary');
 
-module.exports = class BinaryCommand extends commando.Command {
+module.exports = class BinaryCommand extends Command {
     constructor(client) {
         super(client, {
             name: 'binary',
diff --git a/commands/textedit/cowsay.js b/commands/textedit/cowsay.js
index a603ebb3..f1c6f759 100644
--- a/commands/textedit/cowsay.js
+++ b/commands/textedit/cowsay.js
@@ -1,7 +1,7 @@
-const commando = require('discord.js-commando');
+const { Command } = require('discord.js-commando');
 const cowsay = require('cowsay');
 
-module.exports = class CowsayCommand extends commando.Command {
+module.exports = class CowsayCommand extends Command {
     constructor(client) {
         super(client, {
             name: 'cowsay',
diff --git a/commands/textedit/embed.js b/commands/textedit/embed.js
index 29ad7c71..f453413f 100644
--- a/commands/textedit/embed.js
+++ b/commands/textedit/embed.js
@@ -1,7 +1,7 @@
-const commando = require('discord.js-commando');
-const Discord = require('discord.js');
+const { Command } = require('discord.js-commando');
+const { RichEmbed } = require('discord.js');
 
-module.exports = class EmbedCommand extends commando.Command {
+module.exports = class EmbedCommand extends Command {
     constructor(client) {
         super(client, {
             name: 'embed',
@@ -25,7 +25,7 @@ module.exports = class EmbedCommand extends commando.Command {
             if (!message.channel.permissionsFor(this.client.user).hasPermission('MANAGE_MESSAGES')) return message.say(':x: Error! I don\'t have the Manage Messages Permission!');
         }
         const embedMessage = args.text;
-        const embed = new Discord.RichEmbed()
+        const embed = new RichEmbed()
             .setAuthor(message.author.username, message.author.avatarURL)
             .setColor(0x00AE86)
             .setTimestamp()
diff --git a/commands/textedit/morse.js b/commands/textedit/morse.js
index 9a4acadd..e3d55b30 100644
--- a/commands/textedit/morse.js
+++ b/commands/textedit/morse.js
@@ -1,7 +1,7 @@
-const commando = require('discord.js-commando');
+const { Command } = require('discord.js-commando');
 const morse = require('morse');
 
-module.exports = class MorseCommand extends commando.Command {
+module.exports = class MorseCommand extends Command {
     constructor(client) {
         super(client, {
             name: 'morse',
diff --git a/commands/textedit/pirate.js b/commands/textedit/pirate.js
index 907c696b..a14f62c1 100644
--- a/commands/textedit/pirate.js
+++ b/commands/textedit/pirate.js
@@ -1,7 +1,7 @@
-const commando = require('discord.js-commando');
+const { Command } = require('discord.js-commando');
 const pirateSpeak = require('pirate-speak');
 
-module.exports = class PirateCommand extends commando.Command {
+module.exports = class PirateCommand extends Command {
     constructor(client) {
         super(client, {
             name: 'pirate',
diff --git a/commands/textedit/reverse.js b/commands/textedit/reverse.js
index 55dbeb2d..e9697fe1 100644
--- a/commands/textedit/reverse.js
+++ b/commands/textedit/reverse.js
@@ -1,6 +1,6 @@
-const commando = require('discord.js-commando');
+const { Command } = require('discord.js-commando');
 
-module.exports = class ReverseCommand extends commando.Command {
+module.exports = class ReverseCommand extends Command {
     constructor(client) {
         super(client, {
             name: 'reverse',
diff --git a/commands/textedit/romaji.js b/commands/textedit/romaji.js
index 2fde6aaa..767c8ba9 100644
--- a/commands/textedit/romaji.js
+++ b/commands/textedit/romaji.js
@@ -1,7 +1,7 @@
-const commando = require('discord.js-commando');
+const { Command } = require('discord.js-commando');
 const hepburn = require('hepburn');
 
-module.exports = class RomajiCommand extends commando.Command {
+module.exports = class RomajiCommand extends Command {
     constructor(client) {
         super(client, {
             name: 'romaji',
diff --git a/commands/textedit/say.js b/commands/textedit/say.js
index ef3d1bcb..560d82ea 100644
--- a/commands/textedit/say.js
+++ b/commands/textedit/say.js
@@ -1,6 +1,6 @@
-const commando = require('discord.js-commando');
+const { Command } = require('discord.js-commando');
 
-module.exports = class SayCommand extends commando.Command {
+module.exports = class SayCommand extends Command {
     constructor(client) {
         super(client, {
             name: 'say',
diff --git a/commands/textedit/shuffle.js b/commands/textedit/shuffle.js
index fc276f5b..3ecb6a0b 100644
--- a/commands/textedit/shuffle.js
+++ b/commands/textedit/shuffle.js
@@ -1,4 +1,4 @@
-const commando = require('discord.js-commando');
+const { Command } = require('discord.js-commando');
 
 String.prototype.shuffle = function() {
     let a = this.split(''),
@@ -12,7 +12,7 @@ String.prototype.shuffle = function() {
     return a.join('');
 };
 
-module.exports = class ShuffleCommand extends commando.Command {
+module.exports = class ShuffleCommand extends Command {
     constructor(client) {
         super(client, {
             name: 'shuffle',
diff --git a/commands/textedit/temmie.js b/commands/textedit/temmie.js
index 354301c0..fdc50404 100644
--- a/commands/textedit/temmie.js
+++ b/commands/textedit/temmie.js
@@ -1,7 +1,7 @@
-const commando = require('discord.js-commando');
+const { Command } = require('discord.js-commando');
 const temmize = require('./temmize.js');
 
-module.exports = class TemmieCommand extends commando.Command {
+module.exports = class TemmieCommand extends Command {
 	constructor(Client) {
 		super(Client, {
 			name: 'temmie',
diff --git a/commands/textedit/translate.js b/commands/textedit/translate.js
index bb3afe6e..a1a0057f 100644
--- a/commands/textedit/translate.js
+++ b/commands/textedit/translate.js
@@ -1,5 +1,5 @@
-const commando = require('discord.js-commando');
-const Discord = require('discord.js');
+const { Command } = require('discord.js-commando');
+const { RichEmbed } = require('discord.js');
 const request = require('superagent');
 const languages = {
     "af": "Afrikaans",
@@ -97,7 +97,7 @@ const languages = {
     "zh": "Chinese"
 };
 
-module.exports = class TranslateCommand extends commando.Command {
+module.exports = class TranslateCommand extends Command {
     constructor(client) {
         super(client, {
             name: 'translate',
@@ -150,7 +150,7 @@ module.exports = class TranslateCommand extends commando.Command {
             const langs = data.lang.split('-');
             const langTo = langs[1];
             const langFrom = langs[0];
-            const embed = new Discord.RichEmbed()
+            const embed = new RichEmbed()
                 .setColor(0x00AE86)
                 .addField(`Input (From: ${languages[langFrom]}):`,
                     query)
diff --git a/commands/textedit/webhook.js b/commands/textedit/webhook.js
index 8e7ec2ea..e98b36b2 100644
--- a/commands/textedit/webhook.js
+++ b/commands/textedit/webhook.js
@@ -1,7 +1,7 @@
-const commando = require('discord.js-commando');
+const { Command } = require('discord.js-commando');
 const request = require('superagent');
 
-module.exports = class WebhookCommand extends commando.Command {
+module.exports = class WebhookCommand extends Command {
     constructor(client) {
         super(client, {
             name: 'webhook',
diff --git a/commands/textedit/yoda.js b/commands/textedit/yoda.js
index a04f1fb7..b4723c28 100644
--- a/commands/textedit/yoda.js
+++ b/commands/textedit/yoda.js
@@ -1,7 +1,7 @@
-const commando = require('discord.js-commando');
+const { Command } = require('discord.js-commando');
 const request = require('superagent');
 
-module.exports = class YodaCommand extends commando.Command {
+module.exports = class YodaCommand extends Command {
     constructor(client) {
         super(client, {
             name: 'yoda',
diff --git a/commands/textedit/zalgo.js b/commands/textedit/zalgo.js
index 6d684b02..27fe264a 100644
--- a/commands/textedit/zalgo.js
+++ b/commands/textedit/zalgo.js
@@ -1,7 +1,7 @@
-const commando = require('discord.js-commando');
+const { Command } = require('discord.js-commando');
 const zalgo = require('zalgolize');
 
-module.exports = class ZalgoCommand extends commando.Command {
+module.exports = class ZalgoCommand extends Command {
     constructor(client) {
         super(client, {
             name: 'zalgo',
diff --git a/commands/userinfo/avatar.js b/commands/userinfo/avatar.js
index 45e318d0..d5977e5f 100644
--- a/commands/userinfo/avatar.js
+++ b/commands/userinfo/avatar.js
@@ -1,6 +1,6 @@
-const commando = require('discord.js-commando');
+const { Command } = require('discord.js-commando');
 
-module.exports = class AvatarCommand extends commando.Command {
+module.exports = class AvatarCommand extends Command {
     constructor(client) {
         super(client, {
             name: 'avatar',
diff --git a/commands/userinfo/userinfo.js b/commands/userinfo/userinfo.js
index d3f2e474..c8fb785e 100644
--- a/commands/userinfo/userinfo.js
+++ b/commands/userinfo/userinfo.js
@@ -1,9 +1,9 @@
-const commando = require('discord.js-commando');
-const Discord = require('discord.js');
+const { Command } = require('discord.js-commando');
+const { RichEmbed } = require('discord.js');
 const moment = require('moment');
 require('moment-duration-format');
 
-module.exports = class UserInfoCommand extends commando.Command {
+module.exports = class UserInfoCommand extends Command {
     constructor(client) {
         super(client, {
             name: 'user',
@@ -52,7 +52,7 @@ module.exports = class UserInfoCommand extends commando.Command {
                 break;
         }
         const userGame = user.presence.game ? user.presence.game.name : 'None';
-        const embed = new Discord.RichEmbed()
+        const embed = new RichEmbed()
             .setColor(color)
             .setThumbnail(user.displayAvatarURL)
             .addField('**Name:**',
diff --git a/commands/util/sendDM.js b/commands/util/sendDM.js
index cbe802ed..b32b499f 100644
--- a/commands/util/sendDM.js
+++ b/commands/util/sendDM.js
@@ -1,6 +1,6 @@
-const commando = require('discord.js-commando');
+const { Command } = require('discord.js-commando');
 
-module.exports = class SendDMCommand extends commando.Command {
+module.exports = class SendDMCommand extends Command {
     constructor(client) {
         super(client, {
             name: 'senddm',
diff --git a/commands/util/servers.js b/commands/util/servers.js
index 1ed41543..8b0a13f0 100644
--- a/commands/util/servers.js
+++ b/commands/util/servers.js
@@ -1,6 +1,6 @@
-const commando = require('discord.js-commando');
+const { Command } = require('discord.js-commando');
 
-module.exports = class ServersCommand extends commando.Command {
+module.exports = class ServersCommand extends Command {
     constructor(client) {
         super(client, {
             name: 'servers',