diff --git a/Changelog.txt b/Changelog.txt
index 71b744929..465eb3abf 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -23,6 +23,7 @@ Version 1.4.07-dev
  = Fixed a bug where teleport location was never reset if warmup was set to 0 for Chimaera Wing.
  = Fixed a bug where the Dodge DamageModifier wasn't being read from advanced.yml
  ! Changed the way Repair hands out XP, also added config options to control Repair XP
+ ! Admin and Party chat prefixes are now customizable
  ! Improved profile saving
  ! Updated localization files
  ! Party item share category states are now saved when the server shuts down.
diff --git a/src/main/java/com/gmail/nossr50/chat/AdminChatManager.java b/src/main/java/com/gmail/nossr50/chat/AdminChatManager.java
index 70da46c3c..bdc8b676b 100644
--- a/src/main/java/com/gmail/nossr50/chat/AdminChatManager.java
+++ b/src/main/java/com/gmail/nossr50/chat/AdminChatManager.java
@@ -7,7 +7,7 @@ import com.gmail.nossr50.events.chat.McMMOAdminChatEvent;
 
 public class AdminChatManager extends ChatManager {
     protected AdminChatManager(Plugin plugin) {
-        super(plugin, Config.getInstance().getAdminDisplayNames(), "Commands.AdminChat.Prefix");
+        super(plugin, Config.getInstance().getAdminDisplayNames(), Config.getInstance().getAdminChatPrefix());
     }
 
     @Override
diff --git a/src/main/java/com/gmail/nossr50/chat/ChatManager.java b/src/main/java/com/gmail/nossr50/chat/ChatManager.java
index ca290ff62..c566ddf3a 100644
--- a/src/main/java/com/gmail/nossr50/chat/ChatManager.java
+++ b/src/main/java/com/gmail/nossr50/chat/ChatManager.java
@@ -28,7 +28,7 @@ public abstract class ChatManager {
         }
 
         displayName = useDisplayNames ? event.getDisplayName() : event.getSender();
-        message = LocaleLoader.getString(chatPrefix, displayName) + event.getMessage();
+        message = LocaleLoader.formatString(chatPrefix, displayName) + " " + event.getMessage();
 
         sendMessage();
     }
diff --git a/src/main/java/com/gmail/nossr50/chat/PartyChatManager.java b/src/main/java/com/gmail/nossr50/chat/PartyChatManager.java
index 2f50d8116..c5777d5d5 100644
--- a/src/main/java/com/gmail/nossr50/chat/PartyChatManager.java
+++ b/src/main/java/com/gmail/nossr50/chat/PartyChatManager.java
@@ -11,7 +11,7 @@ public class PartyChatManager extends ChatManager {
     private Party party;
 
     protected PartyChatManager(Plugin plugin) {
-        super(plugin, Config.getInstance().getPartyDisplayNames(), "Commands.Party.Chat.Prefix");
+        super(plugin, Config.getInstance().getPartyDisplayNames(), Config.getInstance().getPartyChatPrefix());
     }
 
     public void setParty(Party party) {
diff --git a/src/main/java/com/gmail/nossr50/config/Config.java b/src/main/java/com/gmail/nossr50/config/Config.java
index 9cee9d9c2..7b2f9fe53 100644
--- a/src/main/java/com/gmail/nossr50/config/Config.java
+++ b/src/main/java/com/gmail/nossr50/config/Config.java
@@ -225,7 +225,9 @@ public class Config extends AutoUpdateConfigLoader {
     public boolean getVerboseLoggingEnabled() { return config.getBoolean("General.Verbose_Logging", false); }
     public boolean getConfigOverwriteEnabled() { return config.getBoolean("General.Config_Update_Overwrite", true); }
 
+    public String getPartyChatPrefix() { return config.getString("Commands.p.Chat_Prefix_Format", "[[GREEN]]([[WHITE]]{0}[[GREEN]])"); }
     public boolean getPartyDisplayNames() { return config.getBoolean("Commands.p.Use_Display_Names", true); }
+    public String getAdminChatPrefix() { return config.getString("Commands.a.Chat_Prefix_Format", "[[AQUA]][[[WHITE]]{0}[[AQUA]]]"); }
     public boolean getAdminDisplayNames() { return config.getBoolean("Commands.a.Use_Display_Names", true); }
 
     /* Mob Healthbar */
diff --git a/src/main/java/com/gmail/nossr50/locale/LocaleLoader.java b/src/main/java/com/gmail/nossr50/locale/LocaleLoader.java
index e52f7e175..085c8d521 100644
--- a/src/main/java/com/gmail/nossr50/locale/LocaleLoader.java
+++ b/src/main/java/com/gmail/nossr50/locale/LocaleLoader.java
@@ -46,17 +46,19 @@ public final class LocaleLoader {
     }
 
     private static String getString(String key, ResourceBundle bundle, Object... messageArguments) throws MissingResourceException {
-        String output = bundle.getString(key);
+        return formatString(bundle.getString(key), messageArguments);
+    }
 
+    public static String formatString(String string, Object... messageArguments) {
         if (messageArguments != null) {
             MessageFormat formatter = new MessageFormat("");
-            formatter.applyPattern(output);
-            output = formatter.format(messageArguments);
+            formatter.applyPattern(string);
+            string = formatter.format(messageArguments);
         }
 
-        output = addColors(output);
+        string = addColors(string);
 
-        return output;
+        return string;
     }
 
     public static Locale getCurrentLocale() {
diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml
index 3f4a1e69b..3d6f05d01 100644
--- a/src/main/resources/config.yml
+++ b/src/main/resources/config.yml
@@ -426,9 +426,13 @@ Commands:
         # to teleport to, from, or within any given world.
         World_Based_Permissions: false
     p:
+        Chat_Prefix_Format: '[[GREEN]]([[WHITE]]{0}[[GREEN]])'
+
         # Allow mcMMO to use player display names in chat instead of their usernames
         Use_Display_Names: true
     a:
+        Chat_Prefix_Format: '[[AQUA]][[[WHITE]]{0}[[AQUA]]]'
+
         # Allow mcMMO to use player display names in chat instead of their usernames
         Use_Display_Names: true
 
diff --git a/src/main/resources/locale/locale_cs_CZ.properties b/src/main/resources/locale/locale_cs_CZ.properties
index b0f77c2c4..4dee7bec3 100644
--- a/src/main/resources/locale/locale_cs_CZ.properties
+++ b/src/main/resources/locale/locale_cs_CZ.properties
@@ -362,7 +362,6 @@ Commands.Ability.Off=Pou\u017eit\u00ed schopnosti bylo [[RED]] vypnuto
 Commands.Ability.On=Pou\u017eit\u00ed schopnosti bylo [[GREEN]]zapnuto
 Commands.AdminChat.Off=Admin chat [[RED]]Vypnuty
 Commands.AdminChat.On=Admin Chat[[GREEN]]Zapnut\u00fd
-Commands.AdminChat.Prefix=[[AQUA]][[[WHITE]]{0}[[AQUA]]]
 Commands.AdminToggle=[[RED]]- Prepnout admin chat
 Commands.Chat.Console=*\u0158\u00edd\u00edc\u00ed panel*
 Commands.Disabled=[[RED]]Tento prikaz je vypnuty.
@@ -406,7 +405,6 @@ Commands.Party.MembersNear=[[DARK_GRAY]]BL\u00cdZKO TEBE[[DARK_AQUA]]{0}[[DARK_G
 Commands.Party.Accept=[[RED]]- Potvrdit pozvanku do party
 Commands.Party.Chat.Off=Chat jenom pro partu [[RED]]Vypnuty
 Commands.Party.Chat.On=Party chat [[RED]]Off
-Commands.Party.Chat.Prefix=[[GREEN]]([[WHITE]]{0}[[GREEN]])
 Commands.Party.Commands=[[GREEN]]--P\u0158\u00cdKAZY PARTY--
 Commands.Party.Invite.0=[[RED]]VAROVANI: [[GREEN]]Obdrzel jsi pozvanku do party {0} od {1}
 Commands.Party.Invite.1=[[YELLOW]]Napi\u0161te [[GREEN]]/party accept[[YELLOW]] abyste p\u0159ijali pozv\u00e1nku
diff --git a/src/main/resources/locale/locale_cy.properties b/src/main/resources/locale/locale_cy.properties
index 66a86f4d9..5bc72fc38 100644
--- a/src/main/resources/locale/locale_cy.properties
+++ b/src/main/resources/locale/locale_cy.properties
@@ -357,7 +357,6 @@ Commands.Other=[[GREEN]]--OTHER COMMANDS--
 Commands.Party.Accept=[[RED]]- Accept party invite
 Commands.Party.Chat.Off=Party Chat only [[RED]]Off
 Commands.Party.Chat.On=Party Chat only [[GREEN]]On
-Commands.Party.Chat.Prefix=[[GREEN]]([[WHITE]]{0}[[GREEN]])
 Commands.Party.Commands=[[GREEN]]--PARTY COMMANDS--
 Commands.Party.Invite.0=[[RED]] RHYBUDD: [[GREEN]] fod wedi derbyn gwahoddiad i barti {0} o {1}
 Commands.Party.Kick=[[RED]] oeddech yn cicio o blaid {0}!
diff --git a/src/main/resources/locale/locale_da.properties b/src/main/resources/locale/locale_da.properties
index 646eaf61d..cc72526db 100644
--- a/src/main/resources/locale/locale_da.properties
+++ b/src/main/resources/locale/locale_da.properties
@@ -357,7 +357,6 @@ Commands.Other=[[GREEN]]--ANDRE KOMMANDOER--
 Commands.Party.Accept=[[RED]]- Accepter gruppe invitation
 Commands.Party.Chat.Off=Gruppe Chat kun [[RED]]Slukket
 Commands.Party.Chat.On=Kun Gruppe Chat [[GREEN]]Rigtigt
-Commands.Party.Chat.Prefix=[[GREEN]]([[WHITE]]{0}[[GREEN]])
 Commands.Party.Commands=[[GREEN]]--GRUPPE KOMMANDOER--
 Commands.Party.Invite.0=[[RED]]INFORMATION: [[GREEN]]Du har modtaget en gruppe invitation for {0} from {1}
 Commands.Party.Kick=[[RED]]Du er blevet fjernet fra gruppen {0}!
diff --git a/src/main/resources/locale/locale_de.properties b/src/main/resources/locale/locale_de.properties
index fd1957ff5..b631ffc8a 100644
--- a/src/main/resources/locale/locale_de.properties
+++ b/src/main/resources/locale/locale_de.properties
@@ -335,7 +335,6 @@ Commands.Ability.Off=F\u00e4higkeiten [[RED]]deaktiviert
 Commands.Ability.On=F\u00e4higkeiten [[GREEN]]aktivivert
 Commands.AdminChat.Off=Admin Chat only [[RED]]deaktiviert
 Commands.AdminChat.On=Admin Chat only [[GREEN]]aktiviert
-Commands.AdminChat.Prefix=[[AQUA]][[[WHITE]]{0}[[AQUA]]]
 Commands.AdminToggle=[[RED]]- Admin Chat umschalten
 Commands.Chat.Console=*Console*
 Commands.Disabled=[[RED]]Dieser Command ist deaktiviert.
@@ -367,7 +366,6 @@ Commands.Other=[[GREEN]]--ANDERE COMMANDS--
 Commands.Party.Accept=[[RED]]- Gruppen-Einladung akzeptieren
 Commands.Party.Chat.Off=Gruppen-Chat only [[RED]]deaktiviert
 Commands.Party.Chat.On=Gruppen-Chat only [[GREEN]]aktiviert
-Commands.Party.Chat.Prefix=[[GREEN]]([[WHITE]]{0}[[GREEN]])
 Commands.Party.Commands=[[GREEN]]--GRUPPEN COMMANDS--
 Commands.Party.Invite.0=[[RED]]INFO: [[GREEN]]Du hast eine Gruppen-Einladung f\u00fcr {0} von {1} bekommen
 Commands.Party.Kick=[[RED]]Du wurdest von folgender Gruppe gekickt: {0}!
diff --git a/src/main/resources/locale/locale_en_US.properties b/src/main/resources/locale/locale_en_US.properties
index c73590fa2..67d38510c 100644
--- a/src/main/resources/locale/locale_en_US.properties
+++ b/src/main/resources/locale/locale_en_US.properties
@@ -415,7 +415,6 @@ Commands.Ability.Off=Ability use toggled [[RED]]off
 Commands.Ability.On=Ability use toggled [[GREEN]]on
 Commands.AdminChat.Off=Admin Chat only [[RED]]Off
 Commands.AdminChat.On=Admin Chat only [[GREEN]]On
-Commands.AdminChat.Prefix=[[AQUA]][[[WHITE]]{0}[[AQUA]]] 
 Commands.AdminToggle=[[RED]]- Toggle admin chat
 Commands.Chat.Console=*Console*
 Commands.Disabled=[[RED]]This command is disabled.
@@ -464,7 +463,6 @@ Commands.Party.MembersNear=[[DARK_GRAY]]NEAR YOU [[DARK_AQUA]]{0}[[DARK_GRAY]]/[
 Commands.Party.Accept=[[RED]]- Accept party invite
 Commands.Party.Chat.Off=Party Chat only [[RED]]Off
 Commands.Party.Chat.On=Party Chat only [[GREEN]]On
-Commands.Party.Chat.Prefix=[[GREEN]]([[WHITE]]{0}[[GREEN]]) 
 Commands.Party.Commands=[[GREEN]]--PARTY COMMANDS--
 Commands.Party.Invite.0=[[RED]]ALERT: [[GREEN]]You have received a party invite for {0} from {1}
 Commands.Party.Invite.1=[[YELLOW]]Type [[GREEN]]/party accept[[YELLOW]] to accept the invite
diff --git a/src/main/resources/locale/locale_es.properties b/src/main/resources/locale/locale_es.properties
index 9b1af45fe..1cc4614c5 100644
--- a/src/main/resources/locale/locale_es.properties
+++ b/src/main/resources/locale/locale_es.properties
@@ -362,7 +362,6 @@ Commands.Ability.Off=Habilidades [[RED]]desactivadas
 Commands.Ability.On=Habilidades [[GREEN]]activadas
 Commands.AdminChat.Off=Chat s\u00f3lo para Admins [[RED]]desactivado
 Commands.AdminChat.On=Chat s\u00f3lo para Admins [[GREEN]]activado
-Commands.AdminChat.Prefix=[[AQUA]][[[WHITE]]{0}[[AQUA]]]
 Commands.AdminToggle=[[RED]]- Alternar chat de admin
 Commands.Chat.Console=*Consola*
 Commands.Disabled=[[RED]]Este comando est\u00e1 deshabilitado.
@@ -406,7 +405,6 @@ Commands.Party.MembersNear=[[DARK_GRAY]]CERCA DE TI [[DARK_AQUA]]{0}[[DARK_GRAY]
 Commands.Party.Accept=[[RED]]- Aceptar invitaci\u00f3n al grupo
 Commands.Party.Chat.Off=S\u00f3lo chat de grupo [[RED]]desactivado
 Commands.Party.Chat.On=S\u00f3lo chat de grupo [[RED]]activado
-Commands.Party.Chat.Prefix=[[GREEN]]([[WHITE]]{0}[[GREEN]])
 Commands.Party.Commands=[[GREEN]]--COMANDOS DEL GRUPO--
 Commands.Party.Invite.0=[[RED]]ATENCI\u00d3N: [[GREEN]]Fuiste invitado al grupo {0} por {1}
 Commands.Party.Invite.1=[[YELLOW]]Teclea [[GREEN]]/party accept[[YELLOW]] para aceptar la invitacion al grupo
diff --git a/src/main/resources/locale/locale_it.properties b/src/main/resources/locale/locale_it.properties
index cb3aeeed3..7470456b2 100644
--- a/src/main/resources/locale/locale_it.properties
+++ b/src/main/resources/locale/locale_it.properties
@@ -357,7 +357,6 @@ Commands.Ability.Off=Uso delle capacit\u00e0 [[RED]]disattivato
 Commands.Ability.On=Uso delle capacit\u00e0 [[GREEN]]attivato
 Commands.AdminChat.Off=Chat solo Amministratori [[RED]]Inattiva
 Commands.AdminChat.On=Chat solo Amministratori [[GREEN]]Attiva
-Commands.AdminChat.Prefix=[[AQUA]][[[WHITE]]{0}[[AQUA]]]
 Commands.AdminToggle=[[RED]]- Attiva o Disattiva la chat amministratori
 Commands.Chat.Console=*Console*
 Commands.Disabled=[[RED]]Questo comando \u00e8 disabilitato.
@@ -400,7 +399,6 @@ Commands.Party.MembersNear=[[DARK_GRAY]]VICINO A TE [[DARK_AQUA]]{0}[[DARK_GRAY]
 Commands.Party.Accept=[[RED]]- Accetta l\'invito a unirti alla compagnia
 Commands.Party.Chat.Off=Chat di Compagnia [[GREEN]]Inattiva
 Commands.Party.Chat.On=Chat di Compagnia [[GREEN]]Attiva
-Commands.Party.Chat.Prefix=[[GREEN]]([[WHITE]]{0}[[GREEN]])
 Commands.Party.Commands=[[GREEN]]--COMANDI DI COMPAGNIA--
 Commands.Party.Invite.0=[[RED]]AVVISO: [[GREEN]]Hai ricevuto un invito ad unirti alla compagnia {0} da {1}
 Commands.Party.Invite.1=[[YELLOW]]Digita [[GREEN]]/party accept[[YELLOW]] per accettare l\'invito
diff --git a/src/main/resources/locale/locale_ko.properties b/src/main/resources/locale/locale_ko.properties
index bd05d5775..7b217a406 100644
--- a/src/main/resources/locale/locale_ko.properties
+++ b/src/main/resources/locale/locale_ko.properties
@@ -361,7 +361,6 @@ Commands.Ability.Off=\uae30\uc220 \uc0ac\uc6a9 \ud1a0\uae00 [[GREEN]]\ube44\ud65
 Commands.Ability.On=\uae30\uc220 \uc0ac\uc6a9 \ud1a0\uae00 [[GREEN]]\ud65c\uc131\ud654
 Commands.AdminChat.Off=\uad00\ub9ac\uc790\ub9cc \ub300\ud654 \uae30\ub2a5 [[RED]]\ube44\ud65c\uc131\ud654
 Commands.AdminChat.On=\uad00\ub9ac\uc790\ub9cc \ub300\ud654 \uae30\ub2a5 [[GREEN]]\ud65c\uc131\ud654
-Commands.AdminChat.Prefix=[[AQUA]][[[WHITE]]{0}[[AQUA]]]
 Commands.AdminToggle=[[RED]]- \uad00\ub9ac\uc790 \ucc44\ud305 \ud1a0\uae00
 Commands.Chat.Console=*\ucf58\uc194*
 Commands.Disabled=[[RED]]\uc774 \uba85\ub839\uc5b4\ub294 \uc0ac\uc6a9\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4.
@@ -410,7 +409,6 @@ Commands.Party.MembersNear=[[DARK_GRAY]]\ub2f9\uc2e0\uc758 \uadfc\ucc98\uc5d0 [[
 Commands.Party.Accept=[[RED]]- \ud30c\ud2f0 \ucd08\ub300 \uc218\ub77d
 Commands.Party.Chat.Off=Party Chat only [[RED]]\ube44\ud65c\uc131\ud654
 Commands.Party.Chat.On=Party Chat only [[RED]]\ud65c\uc131\ud654
-Commands.Party.Chat.Prefix=[[GREEN]]([[WHITE]]{0}[[GREEN]])
 Commands.Party.Commands=[[GREEN]]--\ud30c\ud2f0 \uba85\ub839\uc5b4--
 Commands.Party.Invite.0=[[RED]]\uc54c\ub9bc: [[GREEN]]\ub2f9\uc2e0\uc740 {0} \ud30c\ud2f0\uc5d0 {1}\ub85c\ubd80\ud130 \uac00\uc785 \uc694\uccad\uc744 \ubc1b\uc558\uc2b5\ub2c8\ub2e4.
 Commands.Party.Invite.1=[[YELLOW]]\ud30c\ud2f0 \uac00\uc785 \uc694\uccad\uc744 \uc218\ub77d\ud558\uae30 \uc704\ud574\uc11c, [[GREEN]]/party accept[[YELLOW]]\ub97c \uc785\ub825\ud558\uc138\uc694.
diff --git a/src/main/resources/locale/locale_pl.properties b/src/main/resources/locale/locale_pl.properties
index 9df371caf..729865cc9 100644
--- a/src/main/resources/locale/locale_pl.properties
+++ b/src/main/resources/locale/locale_pl.properties
@@ -351,7 +351,6 @@ Commands.Ability.Off=Umiej\u0119tno\u015b\u0107 wy\u0142\u0105czona [[RED]]
 Commands.Ability.On=Umiej\u0119tno\u015b\u0107 w\u0142\u0105czona [[GREEN]]
 Commands.AdminChat.Off=Czat tylko dla adminow [[RED]] Wylaczony
 Commands.AdminChat.On=Czat tylko dla adminow [[RED]] W\u0142\u0105czony
-Commands.AdminChat.Prefix=[[AQUA]][[[WHITE]]{0}[[AQUA]]]
 Commands.AdminToggle=[[RED]]- Wlacza/wylacza czat adminow
 Commands.Chat.Console=\"Konsola\"
 Commands.Disabled=[[RED]]Komenda ta jest wylaczona.
@@ -391,7 +390,6 @@ Commands.Party.MembersNear=[[DARK_GRAY]]OBOK CIEBIE [[DARK_AQUA]]{0}[[DARK_GRAY]
 Commands.Party.Accept=[[RED]]- Akceptuje zaproszenie grupy
 Commands.Party.Chat.Off=Czat wy\u0142acznie dla dru\u017cyny [[RED]]Off
 Commands.Party.Chat.On=Czat wy\u0142acznie dla dru\u017cyny w\u0142\u0105czony [[RED]]
-Commands.Party.Chat.Prefix=[[GREEN]]([[WHITE]]{0}[[GREEN]])
 Commands.Party.Commands=[[GREEN]]--KOMENDY DLA DRU\u017bYN--
 Commands.Party.Invite.0=[[RED]]ALERT: [[GREEN]]Otrzyma\u0142e\u015b zaproszenie do dru\u017cyny {0} od {1}
 Commands.Party.Invite.1=[[YELLOW]]Wpisz [[GREEN]]/party accept[[YELLOW]] by akceptowac zaproszenie
diff --git a/src/main/resources/locale/locale_ru.properties b/src/main/resources/locale/locale_ru.properties
index 915dc2000..7f84b9537 100644
--- a/src/main/resources/locale/locale_ru.properties
+++ b/src/main/resources/locale/locale_ru.properties
@@ -344,7 +344,6 @@ Commands.Ability.Off=\u0412\u043e\u0437\u043c\u043e\u0436\u043d\u043e\u0441\u044
 Commands.Ability.On=\u0412\u043e\u0437\u043c\u043e\u0436\u043d\u043e\u0441\u0442\u044c \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u044c \u0443\u043c\u0435\u043d\u0438\u044f [[GREEN]]\u0432\u043a\u043b\u044e\u0447\u0435\u043d\u0430
 Commands.AdminChat.Off=\u0420\u0435\u0436\u0438\u043c \u0447\u0430\u0442\u0430 \u0442\u043e\u043b\u044c\u043a\u043e \u043c\u0435\u0436\u0434\u0443 \u0430\u0434\u043c\u0438\u043d\u0430\u043c\u0438 [[RED]]\u043e\u0442\u043a\u043b\u044e\u0447\u0435\u043d
 Commands.AdminChat.On=\u0420\u0435\u0436\u0438\u043c \u0447\u0430\u0442\u0430 \u0442\u043e\u043b\u044c\u043a\u043e \u043c\u0435\u0436\u0434\u0443 \u0430\u0434\u043c\u0438\u043d\u0430\u043c\u0438 [[RED]]\u0432\u043a\u043b\u044e\u0447\u0435\u043d
-Commands.AdminChat.Prefix=[[AQUA]][[[WHITE]]{0}[[AQUA]]]
 Commands.AdminToggle=[[RED]]- \u0412\u043a\u043b./\u043e\u0442\u043a\u043b. \u0440\u0435\u0436\u0438\u043c \u0447\u0430\u0442\u0430 \u0442\u043e\u043b\u044c\u043a\u043e \u043c\u0435\u0436\u0434\u0443 \u0430\u0434\u043c\u0438\u043d\u0430\u043c\u0438
 Commands.Chat.Console=*\u041a\u043e\u043d\u0441\u043e\u043b\u044c*
 Commands.Disabled=[[RED]]\u042d\u0442\u0430 \u043a\u043e\u043c\u0430\u043d\u0434\u0430 \u043e\u0442\u043a\u043b\u044e\u0447\u0435\u043d\u0430.
@@ -386,7 +385,6 @@ Commands.Party.MembersNear=[[DARK_GRAY]]\u0412\u041e\u0417\u041b\u0415 \u0412\u0
 Commands.Party.Accept=[[RED]]- \u041f\u0440\u0438\u043d\u044f\u0442\u044c \u043f\u0440\u0438\u0433\u043b\u0430\u0448\u0435\u043d\u0438\u0435 \u0432 \u0433\u0440\u0443\u043f\u043f\u0443
 Commands.Party.Chat.Off=\u0413\u0440\u0443\u043f\u043f\u043e\u0432\u043e\u0439 \u0427\u0430\u0442 [[RED]]\u043e\u0442\u043a\u043b\u044e\u0447\u0435\u043d
 Commands.Party.Chat.On=\u0413\u0440\u0443\u043f\u043f\u043e\u0432\u043e\u0439 \u0427\u0430\u0442 [[RED]]\u0432\u043a\u043b\u044e\u0447\u0435\u043d
-Commands.Party.Chat.Prefix=[[GREEN]]([[WHITE]]{0}[[GREEN]])
 Commands.Party.Commands=[[GREEN]]--\u0413\u0420\u0423\u041f\u041f\u041e\u0412\u042b\u0415 \u041a\u041e\u041c\u0410\u041d\u0414\u042b--
 Commands.Party.Invite.0=[[RED]]\u0412\u041d\u0418\u041c\u0410\u041d\u0418\u0415: [[GREEN]]\u0412\u044b \u043f\u043e\u043b\u0443\u0447\u0438\u043b\u0438 \u043f\u0440\u0438\u0433\u043b\u0430\u0448\u0435\u043d\u0438\u0435 \u0432 \u0433\u0440\u0443\u043f\u043f\u0443 {0} \u043e\u0442 {1}
 Commands.Party.Invite.1=[[YELLOW]]\u041d\u0430\u043f\u0435\u0447\u0430\u0442\u0430\u0439\u0442\u0435 [[GREEN]]/party accept[[YELLOW]], \u0447\u0442\u043e\u0431\u044b \u043f\u0440\u0438\u043d\u044f\u0442\u044c \u043f\u0440\u0438\u0433\u043b\u0430\u0448\u0435\u043d\u0438\u0435 \u0432 \u0433\u0440\u0443\u043f\u043f\u0443 
diff --git a/src/main/resources/locale/locale_th_TH.properties b/src/main/resources/locale/locale_th_TH.properties
index 6f1add525..c8acaccb3 100644
--- a/src/main/resources/locale/locale_th_TH.properties
+++ b/src/main/resources/locale/locale_th_TH.properties
@@ -362,7 +362,6 @@ Commands.Ability.Off=Ability \u0e2d\u0e22\u0e39\u0e48\u0e43\u0e19\u0e42\u0e2b\u0
 Commands.Ability.On=Ability \u0e2d\u0e22\u0e39\u0e48\u0e43\u0e19\u0e42\u0e2b\u0e21\u0e14[[GREEN]]\u0e40\u0e1b\u0e34\u0e14
 Commands.AdminChat.Off=Admin Chat [[RED]]\u0e16\u0e39\u0e01\u0e1b\u0e34\u0e14
 Commands.AdminChat.On=Admin Chat [[GREEN]]\u0e40\u0e1b\u0e34\u0e14\u0e43\u0e0a\u0e49\u0e07\u0e32\u0e19
-Commands.AdminChat.Prefix=[[AQUA]][[[WHITE]]{0}[[AQUA]]]
 Commands.AdminToggle=[[RED]]- \u0e40\u0e1b\u0e25\u0e35\u0e48\u0e22\u0e19\u0e42\u0e2b\u0e21\u0e14 admin chat
 Commands.Chat.Console=*Console*
 Commands.Disabled=[[RED]]\u0e04\u0e33\u0e2a\u0e31\u0e48\u0e07\u0e19\u0e35\u0e49\u0e16\u0e39\u0e01\u0e1b\u0e34\u0e14\u0e44\u0e27\u0e49.
@@ -406,7 +405,6 @@ Commands.Party.MembersNear=[[DARK_GRAY]]\u0e17\u0e35\u0e48\u0e2d\u0e22\u0e39\u0e
 Commands.Party.Accept=[[RED]]- \u0e22\u0e34\u0e19\u0e22\u0e2d\u0e21\u0e04\u0e33\u0e40\u0e0a\u0e34\u0e0d
 Commands.Party.Chat.Off=Party Chat [[RED]]\u0e16\u0e39\u0e01\u0e1b\u0e34\u0e14
 Commands.Party.Chat.On=Party Chat [[GREEN]]\u0e40\u0e1b\u0e34\u0e14
-Commands.Party.Chat.Prefix=[[GREEN]]([[WHITE]]{0}[[GREEN]])
 Commands.Party.Commands=[[GREEN]]--\u0e04\u0e33\u0e2a\u0e31\u0e48\u0e07 PARTY--
 Commands.Party.Invite.0=[[RED]]ALERT: [[GREEN]]\u0e04\u0e38\u0e13\u0e16\u0e39\u0e01\u0e40\u0e0a\u0e34\u0e0d\u0e40\u0e02\u0e49\u0e32 party {0} \u0e08\u0e32\u0e01 {1}
 Commands.Party.Invite.1=[[YELLOW]]\u0e43\u0e0a\u0e49 [[GREEN]]/party accept[[YELLOW]] \u0e40\u0e1e\u0e34\u0e48\u0e2d\u0e22\u0e2d\u0e21\u0e23\u0e31\u0e1a\u0e01\u0e32\u0e23\u0e23\u0e31\u0e1a\u0e40\u0e0a\u0e34\u0e0d
diff --git a/src/main/resources/locale/locale_zh_CN.properties b/src/main/resources/locale/locale_zh_CN.properties
index 5e93962df..edb6b7a19 100644
--- a/src/main/resources/locale/locale_zh_CN.properties
+++ b/src/main/resources/locale/locale_zh_CN.properties
@@ -362,7 +362,6 @@ Commands.Ability.Off=\u6280\u80fd\u4f7f\u7528 [[GREEN]]\u5173\u95ed
 Commands.Ability.On=\u6280\u80fd\u4f7f\u7528 [[GREEN]]\u5f00\u542f
 Commands.AdminChat.Off=\u4ec5\u7ba1\u7406\u804a\u5929\u6a21\u5f0f [[RED]]\u5173\u95ed
 Commands.AdminChat.On=\u4ec5\u7ba1\u7406\u804a\u5929\u6a21\u5f0f [[GREEN]]\u5f00\u542f
-Commands.AdminChat.Prefix=[[AQUA]][[[WHITE]]{0}[[AQUA]]]
 Commands.AdminToggle=[[RED]]- \u5207\u6362\u7ba1\u7406\u5458\u804a\u5929
 Commands.Chat.Console=*\u63a7\u5236\u53f0*
 Commands.Disabled=[[RED]]\u8fd9\u4e2a\u6307\u4ee4\u88ab\u7981\u7528\u4e86.
@@ -406,7 +405,6 @@ Commands.Party.MembersNear=[[DARK_GRAY]]\u4f60\u9644\u8fd1 [[DARK_AQUA]]{0}[[DAR
 Commands.Party.Accept=[[RED]]- \u63a5\u53d7\u961f\u4f0d\u9080\u8bf7
 Commands.Party.Chat.Off=\u53ea\u5141\u8bb8\u961f\u4f0d\u804a\u5929 [[RED]]\u5173\u95ed
 Commands.Party.Chat.On=\u56e2\u961f\u804a\u5929 [[GREEN]]\u5f00\u542f
-Commands.Party.Chat.Prefix=[[GREEN]]([[WHITE]]{0}[[GREEN]])
 Commands.Party.Commands=[[GREEN]]--\u7ec4\u961f\u547d\u4ee4--
 Commands.Party.Invite.0=[[RED]]\u6ce8\u610f: [[GREEN]]\u4f60\u6536\u5230\u4e86\u4e00\u4e2a\u7ec4\u961f\u9080\u8bf7 {0} \u6765\u81ea {1}
 Commands.Party.Invite.1=[[YELLOW]]\u8f93\u5165 [[GREEN]]/party accept[[YELLOW]] \u6765\u63a5\u53d7\u9080\u8bf7
diff --git a/src/main/resources/locale/locale_zh_TW.properties b/src/main/resources/locale/locale_zh_TW.properties
index 561ab33f7..221e281fc 100644
--- a/src/main/resources/locale/locale_zh_TW.properties
+++ b/src/main/resources/locale/locale_zh_TW.properties
@@ -362,7 +362,6 @@ Commands.Ability.Off=\u6280\u80fd\u4f7f\u7528 [[RED]]\u95dc\u9589
 Commands.Ability.On=\u6280\u80fd\u4f7f\u7528 [[GREEN]]\u555f\u52d5
 Commands.AdminChat.Off=\u7ba1\u7406\u54e1\u804a\u5929\u6a21\u5f0f [[RED]]\u95dc\u9589
 Commands.AdminChat.On=\u7ba1\u7406\u804a\u5929\u6a21\u5f0f [[GREEN]]\u958b\u555f
-Commands.AdminChat.Prefix=[[AQUA]][[[WHITE]]{0}[[AQUA]]]
 Commands.AdminToggle=[[RED]]- \u5207\u63db\u7ba1\u7406\u54e1\u804a\u5929
 Commands.Chat.Console=*\u63a7\u5236\u53f0*
 Commands.Disabled=[[RED]]\u9019\u500b\u6307\u4ee4\u88ab\u7981\u7528\u4e86.
@@ -411,7 +410,6 @@ Commands.Party.MembersNear=[[DARK_GRAY]]\u63a5\u8fd1\u4f60 [[DARK_AQUA]]{0}[[DAR
 Commands.Party.Accept=[[RED]]- \u63a5\u53d7\u968a\u4f0d\u9080\u8acb
 Commands.Party.Chat.Off=\u968a\u4f0d\u804a\u5929\u6a21\u5f0f[[RED]]\u53d6\u6d88
 Commands.Party.Chat.On=\u968a\u4f0d\u804a\u5929\u6a21\u5f0f [[GREEN]]\u958b\u555f
-Commands.Party.Chat.Prefix=[[GREEN]]([[WHITE]]{0}[[GREEN]])
 Commands.Party.Commands=[[GREEN]]--\u7d44\u968a\u6307\u4ee4--
 Commands.Party.Invite.0=[[RED]]\u6ce8\u610f: [[GREEN]]\u4f60\u6536\u5230\u4e86\u4f86\u81ea {1} \u7684\u968a\u4f0d\u9080\u8acb {0} 
 Commands.Party.Invite.1=[[YELLOW]]\u8f38\u5165 [[GREEN]]/party accept[[YELLOW]] \u4f86\u63a5\u53d7\u9080\u8acb