diff --git a/bot/commands/Bot/help.js b/bot/commands/Bot/help.js
index 233b5f8..7321e29 100644
--- a/bot/commands/Bot/help.js
+++ b/bot/commands/Bot/help.js
@@ -32,7 +32,7 @@ module.exports = class {
         if (!args[0]) {
             const embed = new client.RichEmbed();
             embed.setTitle('Help & Commands');
-            embed.setColour(client.functions.displayHexColour(message.channel.guild));
+            embed.setColour(client.functions.displayHexColour(message.guild));
             embed.setDescription(
                 `
                 » Use \`${message.prefix}help [category]\` to get basic information on all commands in the category.   
@@ -66,7 +66,7 @@ module.exports = class {
 
             const embed = new client.RichEmbed()
                 .setTitle(prettified[cat].emoji + ' ' + cat)
-                .setColour(client.functions.displayHexColour(message.channel.guild))
+                .setColour(client.functions.displayHexColour(message.guild))
                 .setDescription(cmds)
                 .setFooter('<> = required, / = either/or, [] = optional');
             
@@ -77,7 +77,7 @@ module.exports = class {
             const command = client.commands.get(cmd) || client.commands.get(client.aliases.get(cmd));
             const embed = new client.RichEmbed()
                 .setTitle(prettified[command.category].emoji + ' ' + command.category + ' -> ' + command.name.toProperCase())
-                .setColour(client.functions.displayHexColour(message.channel.guild))
+                .setColour(client.functions.displayHexColour(message.guild))
                 .setDescription(command.help.description)
                 .addField('Format:', `\`${message.prefix + command.name} ${command.help.arguments}`.trim() + '`');
             if (command.help.details.length > 0) embed.addField('Parameters:', command.help.details);
diff --git a/bot/commands/Bot/ping.js b/bot/commands/Bot/ping.js
index 769aa1d..f7bfd3a 100644
--- a/bot/commands/Bot/ping.js
+++ b/bot/commands/Bot/ping.js
@@ -21,7 +21,7 @@ module.exports = class {
     run (client, message, args, data) { //eslint-disable-line no-unused-vars
         message.channel.send(replies.ping.random())
             .then(m => {
-                m.edit(`${m.content} \`roundtrip: ${m.timestamp - message.timestamp}ms | websocket: ${message.channel.guild.shard.latency}ms\``);
+                m.edit(`${m.content} \`roundtrip: ${m.timestamp - message.timestamp}ms | websocket: ${message.guild.shard.latency}ms\``);
             });
     }
 };
\ No newline at end of file
diff --git a/bot/commands/Configuration/blocklist.js b/bot/commands/Configuration/blocklist.js
index 714cc04..6a811cc 100644
--- a/bot/commands/Configuration/blocklist.js
+++ b/bot/commands/Configuration/blocklist.js
@@ -29,7 +29,7 @@ module.exports = class {
             const embed = new client.RichEmbed()
                 .setTitle('Users on blocklist: ' + data.guild.blocklist.length)
                 .setDescription('```' + list.join(', ') + '```')
-                .setColour(client.functions.displayHexColour(message.channel.guild));
+                .setColour(client.functions.displayHexColour(message.guild));
                 
             message.channel.send({ embed: embed });
             
@@ -49,12 +49,12 @@ module.exports = class {
         let member;
 
         if (message.mentions.length > 0) {
-            member = await client.functions.getMember(message.channel.guild, message.mentions[0].id);
+            member = await client.functions.getMember(message.guild, message.mentions[0].id);
         } else {
-            member = await client.functions.validateUserID(message.channel.guild, user[0]);
+            member = await client.functions.validateUserID(message.guild, user[0]);
 
             if (!member) {
-                member = await message.channel.guild.searchMembers(user.join(' '), 2);
+                member = await message.guild.searchMembers(user.join(' '), 2);
             
                 if (member.length === 0) return message.channel.send(
                     `${client.config.emojis.userError} No users found. Check for mispellings, or ping the user instead.`
@@ -71,11 +71,11 @@ module.exports = class {
         const blocklist = data.guild.blocklist;
 
         if (action === 'add') {
-            if (member.id === message.channel.guild.ownerID) return message.channel.send(
+            if (member.id === message.guild.ownerID) return message.channel.send(
                 `${client.config.emojis.userError} You can't block the owner, silly!`
             );
             
-            if (client.functions.highestRole(member).position >= client.functions.highestRole(message.member).position && message.member.id !== message.channel.guild.ownerID) {
+            if (client.functions.highestRole(member).position >= client.functions.highestRole(message.member).position && message.member.id !== message.guild.ownerID) {
                 return message.channel.send(`${client.config.emojis.userError} This user has a higher role than you, you can't add them to the blocklist!`);
             }
 
@@ -85,7 +85,7 @@ module.exports = class {
 
             blocklist.push(member.id);
 
-            client.db.updateGuild(message.channel.guild.id, 'blocklist', blocklist).then(() => {
+            client.db.updateGuild(message.guild.id, 'blocklist', blocklist).then(() => {
                 message.channel.send(`${client.config.emojis.success} Added \`${member.username}#${member.discriminator}\` to the blocklist.`);
             }).catch(error => {
                 client.logger.error('GUILD_UPDATE_ERROR', error);
@@ -96,7 +96,7 @@ module.exports = class {
         }
 
         if (action === 'remove') {            
-            if (client.functions.highestRole(member).position >= client.functions.highestRole(message.member).position && message.member.id !== message.channel.guild.ownerID) {
+            if (client.functions.highestRole(member).position >= client.functions.highestRole(message.member).position && message.member.id !== message.guild.ownerID) {
                 return message.channel.send(`${client.config.emojis.userError} This user has a higher role than you, you can't remove them to the blocklist!`);
             }
 
@@ -106,7 +106,7 @@ module.exports = class {
 
             blocklist.remove(member.id);
 
-            client.db.updateGuild(message.channel.guild.id, 'blocklist', blocklist).then(() => {
+            client.db.updateGuild(message.guild.id, 'blocklist', blocklist).then(() => {
                 message.channel.send(`${client.config.emojis.success} Removed \`${member.username}#${member.discriminator}\` from the blocklist.`);
             }).catch(error => {
                 client.logger.error('GUILD_UPDATE_ERROR', error);
diff --git a/bot/commands/Configuration/disable.js b/bot/commands/Configuration/disable.js
index 1bf46e0..e619715 100644
--- a/bot/commands/Configuration/disable.js
+++ b/bot/commands/Configuration/disable.js
@@ -57,7 +57,7 @@ module.exports = class {
 
             disabled.push(command.name);
 
-            await client.db.updateGuild(message.channel.guild.id, 'disabledcommands', disabled);
+            await client.db.updateGuild(message.guild.id, 'disabledcommands', disabled);
 
             return message.channel.send(
                 `${client.config.emojis.success} Added **${args[1]}** to the list of disabled commands for this server.`
@@ -85,7 +85,7 @@ module.exports = class {
 
             disabled.remove(command.name);
 
-            await client.db.updateGuild(message.channel.guild.id, 'disabledcommands', disabled);
+            await client.db.updateGuild(message.guild.id, 'disabledcommands', disabled);
             
             return message.channel.send(
                 `${client.config.emojis.success} Added **${args[1]}** to the list of disabled category for this server!`
diff --git a/bot/commands/Fun/garfield.js b/bot/commands/Fun/garfield.js
index dbd9740..f44e709 100644
--- a/bot/commands/Fun/garfield.js
+++ b/bot/commands/Fun/garfield.js
@@ -27,7 +27,7 @@ module.exports = class {
             .then(json => {
                 const embed = new client.RichEmbed()
                     .setTitle(`${json.data.name} (No. ${json.data.number})`)
-                    .setColour(client.functions.displayHexColour(message.channel.guild))
+                    .setColour(client.functions.displayHexColour(message.guild))
                     .setURL('https://www.mezzacotta.net/garfield/?comic=' + json.data.number)
                     .setImage(json.data.image.src);
                 message.channel.send({ embed: embed });
diff --git a/bot/commands/Pokemon/ability.js b/bot/commands/Pokemon/ability.js
index 1746bb9..38dce64 100644
--- a/bot/commands/Pokemon/ability.js
+++ b/bot/commands/Pokemon/ability.js
@@ -71,7 +71,7 @@ module.exports = class {
                 }
 
                 const embed = new client.RichEmbed()
-                    .setColour(client.functions.displayHexColour(message.channel.guild))
+                    .setColour(client.functions.displayHexColour(message.guild))
                     .setTitle(ability.name.toProperCase());
                 if (ability.desc) {
                     embed.setDescription(ability.desc + fieldEffects);
diff --git a/bot/commands/Pokemon/item.js b/bot/commands/Pokemon/item.js
index 3b8db71..29c4d4c 100644
--- a/bot/commands/Pokemon/item.js
+++ b/bot/commands/Pokemon/item.js
@@ -67,7 +67,7 @@ module.exports = class {
                 const item = json.data.getItemDetailsByFuzzy;
 
                 const embed = new client.RichEmbed()
-                    .setColour(client.functions.displayHexColour(message.channel.guild))
+                    .setColour(client.functions.displayHexColour(message.guild))
                     .setTitle(item.name)
                     .setThumbnail(item.sprite)
                     .addField('External Resources:', `[Bulbapedia](${item.bulbapediaPage}) • [Serebii](${item.serebiiPage}) • [Smogon](${item.smogonPage})`);
diff --git a/bot/commands/Splatoon/salmonrun.js b/bot/commands/Splatoon/salmonrun.js
index 2cbeb8a..1a19c2c 100644
--- a/bot/commands/Splatoon/salmonrun.js
+++ b/bot/commands/Splatoon/salmonrun.js
@@ -35,7 +35,7 @@ module.exports = class {
                             embeds.push(
                                 new client.RichEmbed()
                                     .setTitle('Upcoming Salmon Run')
-                                    .setColour(client.functions.displayHexColour(message.channel.guild))
+                                    .setColour(client.functions.displayHexColour(message.guild))
                                     .setImage('https://splatoon2.ink/assets/splatnet/'+json.details[0].stage.image)
                                     .addField('Map', json.details[0].stage.name, true)
                                     .setFooter(`Starting in ${prettifyMiliseconds(json.details[0].start_time * 1000 - Date.now(), { secondsDecimalDigits: 0 })} | Data provided by splatoon2.ink`)
@@ -44,7 +44,7 @@ module.exports = class {
                             embeds.push(
                                 new client.RichEmbed()
                                     .setTitle('Current Salmon Run')
-                                    .setColour(client.functions.displayHexColour(message.channel.guild))
+                                    .setColour(client.functions.displayHexColour(message.guild))
                                     .setThumbnail('https://splatoon2.ink/assets/splatnet'+timelineJson.coop.reward_gear.gear.image)
                                     .setImage('https://splatoon2.ink/assets/splatnet/'+json.details[0].stage.image)
                                     .addField('Map', json.details[0].stage.name, true)
@@ -57,7 +57,7 @@ module.exports = class {
                         embeds.push(
                             new client.RichEmbed()
                                 .setTitle('Upcoming Salmon Run')
-                                .setColour(client.functions.displayHexColour(message.channel.guild))
+                                .setColour(client.functions.displayHexColour(message.guild))
                                 .setImage('https://splatoon2.ink/assets/splatnet/'+json.details[1].stage.image)
                                 .addField('Map', json.details[1].stage.name, true)
                                 .addField('Weapons', json.details[1].weapons[1].weapon.name+', '+json.details[1].weapons[1].weapon.name+', '+json.details[1].weapons[2].weapon.name+', '+json.details[1].weapons[3].weapon.name)
diff --git a/bot/commands/Splatoon/splatnet.js b/bot/commands/Splatoon/splatnet.js
index 173a495..b1c02de 100644
--- a/bot/commands/Splatoon/splatnet.js
+++ b/bot/commands/Splatoon/splatnet.js
@@ -31,7 +31,7 @@ module.exports = class {
                     const embed = new client.RichEmbed()
                         .setTitle(json.merchandises[i].gear.name)
                         .setThumbnail('https://splatoon2.ink/assets/splatnet' + json.merchandises[i].gear.image)
-                        .setColour(client.functions.displayHexColour(message.channel.guild))
+                        .setColour(client.functions.displayHexColour(message.guild))
                         .addField('Price', (json.merchandises[i].price).toString(), true)
                         .addField('Brand', json.merchandises[i].gear.brand.name, true)
                         .addField('Ability Slots', (json.merchandises[i].gear.rarity + 1).toString(), true)
diff --git a/bot/commands/Splatoon/splatoonmaps.js b/bot/commands/Splatoon/splatoonmaps.js
index 439c72a..9c8c1e0 100644
--- a/bot/commands/Splatoon/splatoonmaps.js
+++ b/bot/commands/Splatoon/splatoonmaps.js
@@ -29,7 +29,7 @@ module.exports = class {
                 const embeds = [
                     new client.RichEmbed()
                         .setTitle('Current Splatoon 2 Maps')
-                        .setColour(client.functions.displayHexColour(message.channel.guild))
+                        .setColour(client.functions.displayHexColour(message.guild))
                         .addField('<:turf_war:814651383911153692> Turf War', `${json.regular[0].stage_a.name}\n${json.regular[0].stage_b.name}`, true)
                         .addField(`<:ranked:814651402479468544> Ranked: ${json.gachi[0].rule.name}`, `${json.gachi[0].stage_a.name}\n${json.gachi[0].stage_b.name}`, true)
                         .addField(`<:league:814651415409590363> League: ${json.league[0].rule.name}`, `${json.league[0].stage_a.name}\n${json.league[0].stage_b.name}`, true)
@@ -39,7 +39,7 @@ module.exports = class {
                 for ( let i = 1; i < json.regular.length; i++ ) {
                     const embed = new client.RichEmbed()
                         .setTitle('Upcoming Splatoon 2 Maps')
-                        .setColour(client.functions.displayHexColour(message.channel.guild))
+                        .setColour(client.functions.displayHexColour(message.guild))
                         .addField('<:turf_war:814651383911153692> Turf War', `${json.regular[i].stage_a.name}\n${json.regular[i].stage_b.name}`, true)
                         .addField(`<:ranked:814651402479468544> Ranked: ${json.gachi[i].rule.name}`, `${json.gachi[i].stage_a.name}\n${json.gachi[i].stage_b.name}`, true)
                         .addField(`<:league:814651415409590363> League: ${json.league[i].rule.name}`, `${json.league[i].stage_a.name}\n${json.league[i].stage_b.name}`, true)
diff --git a/bot/commands/Utility/avatar.js b/bot/commands/Utility/avatar.js
index 7ca3fe4..1eb765c 100644
--- a/bot/commands/Utility/avatar.js
+++ b/bot/commands/Utility/avatar.js
@@ -22,12 +22,12 @@ module.exports = class {
         
         if (args[0]) {
             if (message.mentions.length > 0) {
-                member = await client.functions.getMember(message.channel.guild, message.mentions[0].id);
+                member = await client.functions.getMember(message.guild, message.mentions[0].id);
             } else {
-                member = await client.functions.validateUserID(message.channel.guild, args[0]);
+                member = await client.functions.validateUserID(message.guild, args[0]);
 
                 if (!member) {
-                    member = await message.channel.guild.searchMembers(args.join(' '), 2);
+                    member = await message.guild.searchMembers(args.join(' '), 2);
                 
                     if (member.length === 0) return message.channel.send(
                         `${client.config.emojis.userError} No users found. Check for mispellings, or ping the user instead.`
@@ -44,7 +44,7 @@ module.exports = class {
 
         const embed = new client.RichEmbed()
             .setTitle(member.user.username + '#' + member.user.discriminator)
-            .setColour(client.functions.displayHexColour(message.channel.guild, member))
+            .setColour(client.functions.displayHexColour(message.guild, member))
             .setImage(member.user.avatarURL);
 
         message.channel.send({ embed: embed });
diff --git a/bot/commands/Utility/serverinfo.js b/bot/commands/Utility/serverinfo.js
index fef6a55..062d405 100644
--- a/bot/commands/Utility/serverinfo.js
+++ b/bot/commands/Utility/serverinfo.js
@@ -17,10 +17,10 @@ module.exports = class {
     }
 
     run (client, message, args, data) { //eslint-disable-line no-unused-vars
-        const guild = message.channel.guild;
+        const guild = message.guild;
         
         const embed = new client.RichEmbed()
-            .setColour(client.functions.displayHexColour(message.channel.guild))
+            .setColour(client.functions.displayHexColour(message.guild))
             .setTitle(guild.name)
             .setThumbnail(guild.iconURL)
             .addField('ID', guild.id, true)
diff --git a/bot/commands/Utility/userinfo.js b/bot/commands/Utility/userinfo.js
index 83b96eb..27f42c3 100644
--- a/bot/commands/Utility/userinfo.js
+++ b/bot/commands/Utility/userinfo.js
@@ -24,12 +24,12 @@ module.exports = class {
         
         if (args[0]) {
             if (message.mentions.length > 0) {
-                member = await client.functions.getMember(message.channel.guild, message.mentions[0].id);
+                member = await client.functions.getMember(message.guild, message.mentions[0].id);
             } else {
-                member = await client.functions.validateUserID(message.channel.guild, args[0]);
+                member = await client.functions.validateUserID(message.guild, args[0]);
 
                 if (!member) {
-                    member = await message.channel.guild.searchMembers(args.join(' '), 2);
+                    member = await message.guild.searchMembers(args.join(' '), 2);
                 
                     if (member.length === 0) return message.channel.send(
                         `${client.config.emojis.userError} No users found. Check for mispellings, or ping the user instead.`
@@ -63,7 +63,7 @@ module.exports = class {
 
         const embed = new client.RichEmbed()
             .setTitle(member.user.username + '#' + member.user.discriminator)
-            .setColour(client.functions.displayHexColour(message.channel.guild, member))
+            .setColour(client.functions.displayHexColour(message.guild, member))
             .setThumbnail(member.user.avatarURL || member.user.defaultAvatarURL)
             .addField('Display Name', member.nick || member.user.username, true)
             .addField('User ID', member.id, true)