diff --git a/.metadata/.mylyn/.tasks.xml.zip b/.metadata/.mylyn/.tasks.xml.zip
index c0614fb..e618df3 100644
Binary files a/.metadata/.mylyn/.tasks.xml.zip and b/.metadata/.mylyn/.tasks.xml.zip differ
diff --git a/.metadata/.mylyn/tasks.xml.zip b/.metadata/.mylyn/tasks.xml.zip
index 97aa640..4a0b225 100644
Binary files a/.metadata/.mylyn/tasks.xml.zip and b/.metadata/.mylyn/tasks.xml.zip differ
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.projects/TheButtonAutoFlair/.indexes/e4/77/69/e/history.index b/.metadata/.plugins/org.eclipse.core.resources/.projects/TheButtonAutoFlair/.indexes/e4/77/69/e/history.index
index b121ab3..e5df2a4 100644
Binary files a/.metadata/.plugins/org.eclipse.core.resources/.projects/TheButtonAutoFlair/.indexes/e4/77/69/e/history.index and b/.metadata/.plugins/org.eclipse.core.resources/.projects/TheButtonAutoFlair/.indexes/e4/77/69/e/history.index differ
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources b/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
index a68da6f..5fe446a 100644
Binary files a/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources and b/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources differ
diff --git a/.metadata/.plugins/org.eclipse.jdt.core/1508644233.index b/.metadata/.plugins/org.eclipse.jdt.core/1508644233.index
index 8cbc857..03428ea 100644
Binary files a/.metadata/.plugins/org.eclipse.jdt.core/1508644233.index and b/.metadata/.plugins/org.eclipse.jdt.core/1508644233.index differ
diff --git a/TheButtonAutoFlair.jar b/TheButtonAutoFlair.jar
index 1932498..01cdf2b 100644
Binary files a/TheButtonAutoFlair.jar and b/TheButtonAutoFlair.jar differ
diff --git a/TheButtonAutoFlair/bin/tk/sznp/thebuttonautoflair/PlayerListener.class b/TheButtonAutoFlair/bin/tk/sznp/thebuttonautoflair/PlayerListener.class
index e321a6d..3f89192 100644
Binary files a/TheButtonAutoFlair/bin/tk/sznp/thebuttonautoflair/PlayerListener.class and b/TheButtonAutoFlair/bin/tk/sznp/thebuttonautoflair/PlayerListener.class differ
diff --git a/TheButtonAutoFlair/plugin.yml b/TheButtonAutoFlair/plugin.yml
index 5b3245c..9626fec 100644
--- a/TheButtonAutoFlair/plugin.yml
+++ b/TheButtonAutoFlair/plugin.yml
@@ -10,4 +10,6 @@ commands:
         usage: "&cUsage: /nrp <message>&r"
     ooc:
         description: Send message in Out-of-Character
-        usage: "&cUsage: /ooc <message>&r"
\ No newline at end of file
+        usage: "&cUsage: /ooc <message>&r"
+author: NorbiPeti
+depend: [Essentials, Towny]
diff --git a/TheButtonAutoFlair/src/tk/sznp/thebuttonautoflair/PlayerListener.java b/TheButtonAutoFlair/src/tk/sznp/thebuttonautoflair/PlayerListener.java
index 1ddfd9b..5184162 100644
--- a/TheButtonAutoFlair/src/tk/sznp/thebuttonautoflair/PlayerListener.java
+++ b/TheButtonAutoFlair/src/tk/sznp/thebuttonautoflair/PlayerListener.java
@@ -174,12 +174,18 @@ public class PlayerListener implements Listener { // 2015.07.16.
 			}
 		}
 
-		event.setFormat("<"
-				+ (player.RPMode ? (ShowRPTag ? "§2[RP]§r" : "") : "§8[OOC]§r")
-				+ event.getFormat().substring(
-						event.getFormat().indexOf("<") + 1,
-						event.getFormat().indexOf(">")) + flair + "> "
-				+ message); // 2015.08.08.
+		/*
+		 * event.setFormat("<" + (player.RPMode ? (ShowRPTag ? "§2[RP]§r" : "")
+		 * : "§8[OOC]§r") + event.getFormat().substring(
+		 * event.getFormat().indexOf("<") + 1, event.getFormat().indexOf(">")) +
+		 * flair + "> " + message); // 2015.08.08.
+		 */
+		event.setFormat(event
+				.getFormat()
+				.replace(
+						"{rptag}",
+						(player.RPMode ? (ShowRPTag ? "§2[RP]§r" : "")
+								: "§8[OOC]§r")).replace("{buttonflair}", flair)); // 2015.09.04.
 	}
 
 	/*