diff --git a/TheButtonAutoFlair.jar b/TheButtonAutoFlair.jar
index 7935f10..bafabb6 100644
Binary files a/TheButtonAutoFlair.jar and b/TheButtonAutoFlair.jar differ
diff --git a/TheButtonAutoFlair/src/tk/sznp/thebuttonautoflair/MaybeOfflinePlayer.java b/TheButtonAutoFlair/src/tk/sznp/thebuttonautoflair/MaybeOfflinePlayer.java
index c4c944b..1b8691e 100644
--- a/TheButtonAutoFlair/src/tk/sznp/thebuttonautoflair/MaybeOfflinePlayer.java
+++ b/TheButtonAutoFlair/src/tk/sznp/thebuttonautoflair/MaybeOfflinePlayer.java
@@ -111,7 +111,7 @@ public class MaybeOfflinePlayer {
 		// Flairs from Command Block The Button - Teams
 		// PluginMain.Instance.getServer().getScoreboardManager().getMainScoreboard().getTeams().add()
 		Player p = Bukkit.getPlayer(UUID);
-		p.setPlayerListName(String.format("%s%s", p.getPlayerListName(),
+		p.setPlayerListName(String.format("%s%s", p.getName(),
 				GetFormattedFlair()));
 	}
 
diff --git a/TheButtonAutoFlair/src/tk/sznp/thebuttonautoflair/PlayerListener.java b/TheButtonAutoFlair/src/tk/sznp/thebuttonautoflair/PlayerListener.java
index 062c981..630bbbd 100644
--- a/TheButtonAutoFlair/src/tk/sznp/thebuttonautoflair/PlayerListener.java
+++ b/TheButtonAutoFlair/src/tk/sznp/thebuttonautoflair/PlayerListener.java
@@ -28,6 +28,7 @@ import java.util.Random;
 import java.util.Timer;
 import java.util.TimerTask;
 import java.util.UUID;
+import java.util.regex.Pattern;
 
 public class PlayerListener implements Listener { // 2015.07.16.
 	public static HashMap<String, UUID> nicknames = new HashMap<>();
@@ -97,7 +98,7 @@ public class PlayerListener implements Listener { // 2015.07.16.
 
 		mp.RPMode = true; // 2015.08.25.
 
-		mp.SetFlairColor(mp.GetFlairColor()); //Update display
+		mp.SetFlairColor(mp.GetFlairColor()); // Update display
 	}
 
 	@EventHandler
@@ -139,8 +140,11 @@ public class PlayerListener implements Listener { // 2015.07.16.
 						: mp.GetFlairColor())); // TODO: Quiz queue
 			}
 
-			message = message.replace(p.getName(), color + p.getName()
-					+ (event.getMessage().startsWith("§2>") ? "§2" : "§r"));
+			message = message.replaceAll("(?i)" + Pattern.quote(p.getName()),
+					color
+							+ p.getName()
+							+ (event.getMessage().startsWith("§2>") ? "§2"
+									: "§r"));
 		}
 		for (String n : nicknames.keySet()) {
 			Player p = null;
@@ -166,8 +170,10 @@ public class PlayerListener implements Listener { // 2015.07.16.
 				MaybeOfflinePlayer.AddPlayerIfNeeded(p.getUniqueId()); // 2015.08.17.
 			}
 			if (p != null) {
-				message = message.replace(nwithoutformatting, n
-						+ (event.getMessage().startsWith("§2>") ? "§2" : "§r"));
+				message = message.replaceAll(
+						"(?i)" + Pattern.quote(nwithoutformatting), n
+								+ (event.getMessage().startsWith("§2>") ? "§2"
+										: "§r"));
 			}
 		}
 
@@ -267,6 +273,7 @@ public class PlayerListener implements Listener { // 2015.07.16.
 				sb.append("\"},\"hoverEvent\":{\"action\":\"show_text\",\"value\":{\"text\":\"\",\"extra\":[{\"text\":\"Open on Twitter\",\"color\":\"blue\"}]}}}");
 			}
 			for (String original : list)
+				// Hashtags
 				e.setMessage(e.getMessage().replace(
 						original,
 						"§9"
diff --git a/TheButtonAutoFlair/target/classes/tk/sznp/thebuttonautoflair/MaybeOfflinePlayer.class b/TheButtonAutoFlair/target/classes/tk/sznp/thebuttonautoflair/MaybeOfflinePlayer.class
index 3e830e9..a112e1e 100644
Binary files a/TheButtonAutoFlair/target/classes/tk/sznp/thebuttonautoflair/MaybeOfflinePlayer.class and b/TheButtonAutoFlair/target/classes/tk/sznp/thebuttonautoflair/MaybeOfflinePlayer.class differ
diff --git a/TheButtonAutoFlair/target/classes/tk/sznp/thebuttonautoflair/PlayerListener$1.class b/TheButtonAutoFlair/target/classes/tk/sznp/thebuttonautoflair/PlayerListener$1.class
index 7d83a6c..0ff159d 100644
Binary files a/TheButtonAutoFlair/target/classes/tk/sznp/thebuttonautoflair/PlayerListener$1.class and b/TheButtonAutoFlair/target/classes/tk/sznp/thebuttonautoflair/PlayerListener$1.class differ
diff --git a/TheButtonAutoFlair/target/classes/tk/sznp/thebuttonautoflair/PlayerListener$2.class b/TheButtonAutoFlair/target/classes/tk/sznp/thebuttonautoflair/PlayerListener$2.class
index 8ea4932..a859fab 100644
Binary files a/TheButtonAutoFlair/target/classes/tk/sznp/thebuttonautoflair/PlayerListener$2.class and b/TheButtonAutoFlair/target/classes/tk/sznp/thebuttonautoflair/PlayerListener$2.class differ
diff --git a/TheButtonAutoFlair/target/classes/tk/sznp/thebuttonautoflair/PlayerListener.class b/TheButtonAutoFlair/target/classes/tk/sznp/thebuttonautoflair/PlayerListener.class
index b4b7910..c20cc49 100644
Binary files a/TheButtonAutoFlair/target/classes/tk/sznp/thebuttonautoflair/PlayerListener.class and b/TheButtonAutoFlair/target/classes/tk/sznp/thebuttonautoflair/PlayerListener.class differ