diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_gtfo.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_gtfo.java
index 85f9885a..e918a305 100644
--- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_gtfo.java
+++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_gtfo.java
@@ -81,9 +81,9 @@ public class Command_gtfo extends TFM_Command
         final StringBuilder bcast = new StringBuilder("Banning: ").append(player.getName()).append(", IP: ").append(ip);
         if (reason != null)
         {
-            bcast.append(ChatColor.RED).append(" - Reason: ").append(ChatColor.YELLOW).append(reason);
+            bcast.append(" - Reason: ").append(ChatColor.YELLOW).append(reason);
         }
-        TFM_Util.bcastMsg(bcast.toString());
+        TFM_Util.bcastMsg(bcast.toString(), ChatColor.RED);
 
         TFM_BanManager.addIpBan(new TFM_Ban(ip, player.getName(), sender.getName(), null, reason));
 
diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_list.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_list.java
index efb14132..20b8ef04 100644
--- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_list.java
+++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_list.java
@@ -3,12 +3,9 @@ package me.StevenLawson.TotalFreedomMod.Commands;
 import java.util.ArrayList;
 import java.util.List;
 import me.StevenLawson.TotalFreedomMod.TFM_PlayerRank;
-
-import me.StevenLawson.TotalFreedomMod.TFM_Admin;
 import me.StevenLawson.TotalFreedomMod.TFM_AdminList;
 import me.StevenLawson.TotalFreedomMod.TFM_Util;
-import org.apache.commons.lang.StringUtils;
-
+import net.minecraft.util.org.apache.commons.lang3.StringUtils;
 import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_nickclean.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_nickclean.java
index a7d9e57a..50780b7c 100644
--- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_nickclean.java
+++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_nickclean.java
@@ -18,7 +18,6 @@ public class Command_nickclean extends TFM_Command
     {
         ChatColor.MAGIC,
         ChatColor.STRIKETHROUGH,
-        ChatColor.BOLD,
         ChatColor.ITALIC,
         ChatColor.UNDERLINE,
         ChatColor.BLACK
diff --git a/src/me/StevenLawson/TotalFreedomMod/Config/TFM_Config.java b/src/me/StevenLawson/TotalFreedomMod/Config/TFM_Config.java
index 1d5019e7..644de111 100644
--- a/src/me/StevenLawson/TotalFreedomMod/Config/TFM_Config.java
+++ b/src/me/StevenLawson/TotalFreedomMod/Config/TFM_Config.java
@@ -4,7 +4,7 @@ import java.io.File;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import me.StevenLawson.TotalFreedomMod.TFM_Util;
-import org.apache.commons.lang.exception.ExceptionUtils;
+import net.minecraft.util.org.apache.commons.lang3.exception.ExceptionUtils;
 import org.bukkit.configuration.InvalidConfigurationException;
 import org.bukkit.configuration.file.YamlConfiguration;
 import org.bukkit.plugin.Plugin;
diff --git a/src/me/StevenLawson/TotalFreedomMod/TFM_Admin.java b/src/me/StevenLawson/TotalFreedomMod/TFM_Admin.java
index 0d827364..ecbed263 100644
--- a/src/me/StevenLawson/TotalFreedomMod/TFM_Admin.java
+++ b/src/me/StevenLawson/TotalFreedomMod/TFM_Admin.java
@@ -5,7 +5,7 @@ import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 import java.util.UUID;
-import org.apache.commons.lang.StringUtils;
+import net.minecraft.util.org.apache.commons.lang3.StringUtils;
 import org.bukkit.configuration.ConfigurationSection;
 
 public class TFM_Admin