diff --git a/bot/commands/Bot/help.js b/bot/commands/Bot/help.js
index 2fad393..2644ba0 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, client.user.id));
+            embed.setColour(client.functions.displayHexColour(message.channel.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, client.user.id))
+                .setColour(client.functions.displayHexColour(message.channel.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, client.user.id))
+                .setColour(client.functions.displayHexColour(message.channel.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/Configuration/blocklist.js b/bot/commands/Configuration/blocklist.js
index fcb050c..0dbcb87 100644
--- a/bot/commands/Configuration/blocklist.js
+++ b/bot/commands/Configuration/blocklist.js
@@ -24,12 +24,12 @@ module.exports = class {
                 list.push(`${user.username}#${user.discriminator}`);
             }
 
-            if (list.length === 0) return message.channel.createMessage('The server blocklist is currently empty. Use `blocklist add <user>` to add people to the blocklist!');
+            if (list.length === 0) return message.channel.=('The server blocklist is currently empty. Use `blocklist add <user>` to add people to the blocklist!');
 
             const embed = new client.RichEmbed()
                 .setTitle('Users on blocklist: ' + data.guild.blocklist.length)
                 .setDescription('```' + list.join(', ') + '```')
-                .setColour(client.functions.displayHexColour(message.channel.guild, client.user.id));
+                .setColour(client.functions.displayHexColour(message.channel.guild));
                 
             message.channel.createMessage({ embed: embed });
             
diff --git a/bot/commands/Fun/garfield.js b/bot/commands/Fun/garfield.js
index 2b98cae..6f78a2f 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, client.user.id))
+                    .setColour(client.functions.displayHexColour(message.channel.guild))
                     .setURL('https://www.mezzacotta.net/garfield/?comic=' + json.data.number)
                     .setImage(json.data.image.src);
                 message.channel.createMessage({ embed: embed });
diff --git a/bot/commands/Pokemon/ability.js b/bot/commands/Pokemon/ability.js
index 3767024..dd0ad0c 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, client.user.id))
+                    .setColour(client.functions.displayHexColour(message.channel.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 e8be9c8..9ed03da 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, client.user.id))
+                    .setColour(client.functions.displayHexColour(message.channel.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 2f4b6ad..4a21612 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, client.user.id))
+                                    .setColour(client.functions.displayHexColour(message.channel.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, client.user.id))
+                                    .setColour(client.functions.displayHexColour(message.channel.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, client.user.id))
+                                .setColour(client.functions.displayHexColour(message.channel.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 c873a3f..ef1d5a8 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, client.user.id))
+                        .setColour(client.functions.displayHexColour(message.channel.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 a911171..3816464 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, client.user.id))
+                        .setColour(client.functions.displayHexColour(message.channel.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, client.user.id))
+                        .setColour(client.functions.displayHexColour(message.channel.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)