diff --git a/pvpmanager/src/main/resources/locale/messages_pt_BR.properties b/pvpmanager/src/main/resources/locale/messages_pt_BR.properties
index 5bc10172..2dd0c4ac 100644
--- a/pvpmanager/src/main/resources/locale/messages_pt_BR.properties
+++ b/pvpmanager/src/main/resources/locale/messages_pt_BR.properties
@@ -13,9 +13,9 @@
 Prefix = &\#992222&lPvP &\#FF5555➤
 
 # PvP Toggle
-PvP_Disabled = {prefix} &aPvP disabled\! You are now protected
-PvP_Enabled = {prefix} &cPvP enabled\! You can now attack and be attacked
-Attack_Denied_You = \!actionbar {prefix} &\#c9453eYou have PvP protection\!
+PvP_Disabled = {prefix} &aPvP desativado\! Agora você está protegido
+PvP_Enabled = {prefix} &cPvP habilitado\! Agora você pode atacar e ser atacado
+Attack_Denied_You = \!actionbar {prefix} &\#c9453eVocê está protegido contra PvP\!
 Attack_Denied_Other = \!actionbar {prefix} &f{player} &\#c9453ehas PvP protection\!
 PvP_Force_Enabled_WorldGuard = {prefix} &6PvP ligado por estar dentro de uma região PvP
 PvP_Disabled_Fee = {prefix} &aVocê pagou uma taxa de &\#FFD700{money} &apor ter PvP desativado
diff --git a/pvpmanager/src/main/resources/locale/messages_uk.properties b/pvpmanager/src/main/resources/locale/messages_uk.properties
new file mode 100644
index 00000000..ab9a695c
--- /dev/null
+++ b/pvpmanager/src/main/resources/locale/messages_uk.properties
@@ -0,0 +1,128 @@
+# You can customize these messages to your language, change colors, etc
+# You can disable any message by deleting everything after the equals (=)
+# Example: Newbie_Protection = (leave this empty)
+# You may also use Hex color codes such as &#FFFFFF in MC 1.16+
+# There are some variables you can use in this file that work in all messages
+# such as {prefix} and some that only work where they make sense such as {player}, {time} and {money}
+#
+# You can prefix any message with !actionbar or !chat to control where it appears
+# - !actionbar = Message shows above hotbar (recommended for frequent spam messages)
+# - !chat = Message shows in chat (default if no prefix)
+# Example: Item_Cooldown = !actionbar {prefix} &cYou can't use this yet! Available in &e{time}
+
+Prefix = &\#992222&lPvP &\#FF5555➤
+
+# PvP Toggle
+PvP_Disabled = {prefix} &aPvP disabled\! You are now protected
+PvP_Enabled = {prefix} &cPvP enabled\! You can now attack and be attacked
+Attack_Denied_You = \!actionbar {prefix} &\#c9453eYou have PvP protection\!
+Attack_Denied_Other = \!actionbar {prefix} &f{player} &\#c9453ehas PvP protection\!
+PvP_Force_Enabled_WorldGuard = {prefix} &6PvP protection disabled in this PvP region
+PvP_Disabled_Fee = {prefix} &aYou paid a &\#FFD700{money} &afee for having PvP disabled
+PvP_Disabled_Fee_Not_Enough = {prefix} &6PvP protection disabled - insufficient funds for the fee
+
+# Combat Tag
+Tagged_Attacker = {prefix} &7You tagged &f{player}&7\! Do not log out\!
+Tagged_Defender = {prefix} &7Tagged by &f{player}&7\! Do not log out\!
+Out_Of_Combat = {prefix} &aYou are no longer in combat
+Out_Of_Combat_ActionBar = &aYou are no longer in combat
+Duel_Mode_Protection = \!actionbar {prefix} &\#c9453eThat player is fighting someone else\!
+Command_Denied_InCombat = {prefix} &cCommand denied\! You are still in combat\!
+Block_Place_Blocked_InCombat = \!actionbar {prefix} &cYou can''t place blocks while in combat\!
+Block_Break_Blocked_InCombat = \!actionbar {prefix} &cYou can''t break blocks while in combat\!
+Eating_Blocked_InCombat = \!actionbar {prefix} &cEating is blocked while in combat\!
+Elytra_Blocked_InCombat = \!actionbar {prefix} &cYou can''t use an elytra while in combat\!
+Firework_Blocked_InCombat = \!actionbar {prefix} &cYou can''t use fireworks while gliding in combat\!
+Firework_Power_Limited_InCombat = \!actionbar {prefix} &cYou can''t use fireworks with power level &f{power} &cwhile in combat\!
+EnderPearl_Blocked_InCombat = {prefix} &cYou can''t use enderpearls while in combat\!
+ChorusFruit_Blocked_InCombat = {prefix} &cYou can''t eat chorus fruits while in combat\!
+Interact_Blocked_InCombat = \!actionbar {prefix} &cYou can''t right-click while in combat\!
+Teleport_Blocked_InCombat = {prefix} &cYou can''t teleport while in combat\!
+Totem_Blocked_InCombat = {prefix} &cTotems of undying are blocked while in combat\!
+Inventory_Blocked_InCombat = \!actionbar {prefix} &cYou can''t open an inventory while in combat\!
+Pushback_Warning = {prefix} &\#c9453eYou can''t run away to safezones while in combat\!
+
+# Newbie Protection
+Newbie_Protection = {prefix} &aWelcome\! You are protected against PvP for &e{time}
+Newbie_Protection_End = {prefix} &6Your PvP protection expired\! You can be attacked\!
+Newbie_Protection_Removed = {prefix} &aYou removed your PvP protection\! Be careful
+Newbie_Protection_On_Hit = {prefix} &\#c9453eYou have PvP protection\! If you really want to do PvP, remove it with &f/newbie disable
+Newbie_Protection_Attacker = \!actionbar {prefix} &f{player} &\#c9453ehas Newbie protection\!
+Newbie_Time_Check = {prefix} &7You are protected from PvP for &e{time}
+Newbie_Time_Check_Other = {prefix} &f{player} &7is protected from PvP for another &e{time}
+Newbie_Command_Blocked = {prefix} &cYou cannot use this command while you have Newbie protection\!
+Newbie_Pickup_Items_Blocked = \!actionbar {prefix} &cYou can''t pickup items while you have Newbie protection\!
+Newbie_Force_Removed_WorldGuard = {prefix} &6Your new player protection was removed for being inside a PvP region
+
+# Respawn Protection
+Respawn_Protection = \!actionbar {prefix} &\#c9453eYou have respawn protection\!
+Respawn_Protection_Other = \!actionbar {prefix} &f{player} &\#c9453ehas respawn protection\!
+
+# World Protection
+World_Protection = \!actionbar {prefix} &\#c9453ePvP is disabled in this world\!
+
+# AFK Protection
+AFK_Protection = \!actionbar {prefix} &\#c9453eThis player can''t be attacked while AFK
+
+# Global Protection
+Global_Protection = \!actionbar {prefix} &\#c9453ePvP combat is globally disabled
+
+# Player Kills
+Money_Reward = {prefix} &aYou got &\#FFD700{money} &acoins for killing player &f{victim}&a\!
+Money_Penalty = {prefix} &cYou lost &\#FFD700{money} &ccoins for getting killed\!
+Money_Steal = {prefix} &f{player} &cstole &\#FFD700{money} &ccoins from you\!
+Exp_Won = {prefix} &aYou got &e{exp} &aexperience for killing &f{victim}&a\!
+Exp_Stolen = {prefix} &f{player} &6stole &e{exp} &6experience from you\!
+
+# Kill Abuse
+Kill_Abuse_Warning = {prefix} &cYou will be punished if you kill this player again\! Please stop.
+
+# Item Cooldown
+Item_Cooldown = \!actionbar {prefix} &cYou can''t use this yet\! Available in &e{time}
+
+# Commands
+Error_Permission = &cYou don't have permission\!
+Error_Player_Not_Found = &cPlayer not found\: &f{player}
+Error_Not_Player = &cThis command is only available for players
+# Newbie Command
+Error_Not_Newbie = {prefix} &cYou are not a newbie\!
+# PvP Command
+Error_PvP_Cooldown = {prefix} &cYou can''t toggle PvP yet\! Wait &e{time}
+Error_PvPToggle_NoPvP = {prefix} &cYou are blocked from enabling PvP
+Error_PvPToggle_ForcePvP = {prefix} &cYou are blocked from disabling PvP
+PvPToggle_Admin_Changed = {prefix} &aPvP state for &f{player} &awas changed to &f{state}
+PvPToggle_Already_Disabled = {prefix} &cYou already have PvP disabled\!
+PvPToggle_Already_Enabled = {prefix} &cYou already have PvP enabled\!
+# PvPInfo Command
+PvPInfo_Header = &\#FFD700▬▬▬▬▬ Player Info\: \#f09a11{player} &\#FFD700▬▬▬▬▬
+PvPInfo_UUID = &8├ &7UUID\: &f
+PvPInfo_Combat = &8├ &7Combat\: &f
+PvPInfo_Protection = &8├ &7Protection\: &f
+PvPInfo_World = &8├ &7World\: &f
+PvPInfo_Override = &8├ &7Override\: &f
+PvPInfo_Enemies = &8├ &7Enemies\: &f
+PvPInfo_Exemptions = &8└ &7Exemptions\: &f
+PvPInfo_Footer = &\#FFD700▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬
+# PvPList Command
+PvPList_Title = &\#FFD700&l---- Players With PvP ----
+PvPList_Enabled = &a&lEnabled
+PvPList_Disabled = &c&lDisabled
+PvPList_Nothing_Found = &8No players found
+# PvPStatus Command
+Other_Status_Enabled = {prefix} &7Player &f{player} &7has PvP enabled
+Others_Status_Disabled = {prefix} &7Player &f{player} &7has PvP disabled
+Self_Status_Disabled = {prefix} &7You have PvP disabled
+Self_Status_Enabled = {prefix} &7You have PvP enabled
+# Tag Command
+Tag_Timeleft = &7You are in combat for another &e{time}
+Tag_Not_In_Combat = &7You are currently not in combat
+
+# Variables
+Enabled = \#6fc93eEnabled
+Disabled = \#c9453eDisabled
+# The times below are what will show wherever {time} is used
+Time_Days = \ days
+Time_Hours = \ hours
+Time_Minutes = \ min
+Time_Seconds = \ sec
+Time_Now = now
diff --git a/pvpmanager/src/main/resources/locale/messages_zh_TW.properties b/pvpmanager/src/main/resources/locale/messages_zh_TW.properties
index d026565f..db557f1b 100644
--- a/pvpmanager/src/main/resources/locale/messages_zh_TW.properties
+++ b/pvpmanager/src/main/resources/locale/messages_zh_TW.properties
@@ -13,10 +13,10 @@
 Prefix = &\#992222&lPvP &\#FF5555➤
 
 # PvP Toggle
-PvP_Disabled = {prefix} &aPvP disabled\! You are now protected
-PvP_Enabled = {prefix} &cPvP enabled\! You can now attack and be attacked
-Attack_Denied_You = \!actionbar {prefix} &\#c9453eYou have PvP protection\!
-Attack_Denied_Other = \!actionbar {prefix} &f{player} &\#c9453ehas PvP protection\!
+PvP_Disabled = {prefix} &aPvP 已停用！你現在被保護了
+PvP_Enabled = {prefix} &cPvP 已啟用！你現在可以攻擊和被攻擊了
+Attack_Denied_You = \!actionbar {prefix} &\#c9453e你有 PvP 保護！
+Attack_Denied_Other = \!actionbar {prefix} &f{player} &\#c9453e有 PvP 保護！
 PvP_Force_Enabled_WorldGuard = {prefix} &6因為你在 PvP 區域內，所以強制啟用 PvP
 PvP_Disabled_Fee = {prefix} &a你花費了 &\#FFD700{money} &a元&a停用 PvP
 PvP_Disabled_Fee_Not_Enough = {prefix} &6因為你沒有足夠的金錢，所以已啟用 PvP
@@ -26,20 +26,20 @@ Tagged_Attacker = {prefix} &7你被標記了 &f{player} &7！不要離開，否
 Tagged_Defender = {prefix} &7你被 &f{player} &7標記了！不要登出伺服器，否則你將受到懲罰！
 Out_Of_Combat = {prefix} &a你不再處於戰鬥狀態。
 Out_Of_Combat_ActionBar = &a你已不處於戰鬥狀態
-Duel_Mode_Protection = \!actionbar {prefix} &\#c9453eThat player is fighting someone else\!
+Duel_Mode_Protection = \!actionbar {prefix} &\#c9453e該玩家正在和其他人戰鬥！
 Command_Denied_InCombat = {prefix} &c指令已經被拒絕使用！你還在戰鬥中！
-Block_Place_Blocked_InCombat = \!actionbar {prefix} &cYou can''t place blocks while in combat\!
-Block_Break_Blocked_InCombat = \!actionbar {prefix} &cYou can''t break blocks while in combat\!
-Eating_Blocked_InCombat = \!actionbar {prefix} &cEating is blocked while in combat\!
-Elytra_Blocked_InCombat = \!actionbar {prefix} &cYou can''t use an elytra while in combat\!
-Firework_Blocked_InCombat = \!actionbar {prefix} &cYou can''t use fireworks while gliding in combat\!
-Firework_Power_Limited_InCombat = \!actionbar {prefix} &cYou can''t use fireworks with power level &f{power} &cwhile in combat\!
+Block_Place_Blocked_InCombat = \!actionbar {prefix} &c你無法在戰鬥中放置方塊！
+Block_Break_Blocked_InCombat = \!actionbar {prefix} &c你無法在戰鬥中破壞方塊！
+Eating_Blocked_InCombat = \!actionbar {prefix} &c你無法在戰鬥中吃東西！
+Elytra_Blocked_InCombat = \!actionbar {prefix} &c你無法在戰鬥中使用鞘翅！
+Firework_Blocked_InCombat = \!actionbar {prefix} &c你無法在戰鬥中使用煙火飛行！
+Firework_Power_Limited_InCombat = \!actionbar {prefix} &c你無法在戰鬥中使用 &f{power} &c級煙火！
 EnderPearl_Blocked_InCombat = {prefix} &c你無法在戰鬥中使用終界珍珠！
 ChorusFruit_Blocked_InCombat = {prefix} &c你無法在戰鬥中吃歌萊果！
-Interact_Blocked_InCombat = \!actionbar {prefix} &cYou can''t right-click while in combat\!
+Interact_Blocked_InCombat = \!actionbar {prefix} &c你無法在戰鬥中按右鍵！
 Teleport_Blocked_InCombat = {prefix} &c你無法在戰鬥中使用傳送！
 Totem_Blocked_InCombat = {prefix} &c無法在戰鬥中使用不死圖騰！
-Inventory_Blocked_InCombat = \!actionbar {prefix} &cYou can''t open an inventory while in combat\!
+Inventory_Blocked_InCombat = \!actionbar {prefix} &c你無法在戰鬥中打開物品欄！
 Pushback_Warning = {prefix} &\#c9453e無法在戰鬥中跑到安全區域！
 
 # Newbie Protection
@@ -51,15 +51,15 @@ Newbie_Protection_Attacker = \!actionbar {prefix} &f{player} &\#c9453ehas Newbie
 Newbie_Time_Check = {prefix} &7你在 &e{time}�免受 PvP 攻擊
 Newbie_Time_Check_Other = {prefix} &f{player} &7is protected from PvP for another &e{time}
 Newbie_Command_Blocked = {prefix} &c當你有新手保護時，你不能使用此指令！
-Newbie_Pickup_Items_Blocked = \!actionbar {prefix} &cYou can''t pickup items while you have Newbie protection\!
+Newbie_Pickup_Items_Blocked = \!actionbar {prefix} &c當你有新手保護時不能撿起物品！
 Newbie_Force_Removed_WorldGuard = {prefix} &6你的新手保護因處於 PvP 區域內而被移除
 
 # Respawn Protection
 Respawn_Protection = \!actionbar {prefix} &\#c9453eYou have respawn protection\!
-Respawn_Protection_Other = \!actionbar {prefix} &f{player} &\#c9453ehas respawn protection\!
+Respawn_Protection_Other = \!actionbar {prefix} &f{player} &\#c9453e有重生保護！
 
 # World Protection
-World_Protection = \!actionbar {prefix} &\#c9453ePvP is disabled in this world\!
+World_Protection = \!actionbar {prefix} &\#c9453ePvP 已在此世界停用！
 
 # AFK Protection
 AFK_Protection = \!actionbar {prefix} &\#c9453eThis player can''t be attacked while AFK
@@ -68,8 +68,8 @@ AFK_Protection = \!actionbar {prefix} &\#c9453eThis player can''t be attacked wh
 Global_Protection = \!actionbar {prefix} &\#c9453ePvP combat is globally disabled
 
 # Player Kills
-Money_Reward = &a你殺死玩家 &f{victim} &a獲得了 &\#FFD700{money} &a！
-Money_Penalty = &c你因為被殺而損失了 &\#FFD700{money} &c！
+Money_Reward = {prefix} &a你殺死玩家 &f{victim} &a獲得了 &\#FFD700{money} &a！
+Money_Penalty = {prefix} &c你因為被殺而損失了 &\#FFD700{money} &c！
 Money_Steal = {prefix} &f{player} &cstole &\#FFD700{money} &ccoins from you\!
 Exp_Won = {prefix} &aYou got &e{exp} &aexperience for killing &f{victim}&a\!
 Exp_Stolen = {prefix} &f{player} &6stole &e{exp} &6experience from you\!
@@ -81,15 +81,15 @@ Kill_Abuse_Warning = {prefix} &cYou will be punished if you kill this player aga
 Item_Cooldown = \!actionbar {prefix} &cYou can''t use this yet\! Available in &e{time}
 
 # Commands
-Error_Permission = &4你沒有使用該指令的權限！
-Error_Player_Not_Found = &c玩家 &f{player} 不存在或離線！
-Error_Not_Player = 此指令僅適用於玩家
+Error_Permission = &c你沒有使用該指令的權限！
+Error_Player_Not_Found = &c玩家 &f{player} 不存在或離線
+Error_Not_Player = &c此指令僅適用於玩家
 # Newbie Command
 Error_Not_Newbie = {prefix} &c你不是新手！
 # PvP Command
 Error_PvP_Cooldown = {prefix} &c你還不能切換 PvP！等待 &e{time}。
-Error_PvPToggle_NoPvP = {prefix} &cYou are blocked from enabling PvP
-Error_PvPToggle_ForcePvP = {prefix} &cYou are blocked from disabling PvP
+Error_PvPToggle_NoPvP = {prefix} &c你被禁止啟用 PvP
+Error_PvPToggle_ForcePvP = {prefix} &c你被禁止停用 PvP
 PvPToggle_Admin_Changed = {prefix} &f{player} &a的 &aPvP 狀態已變更為 {state}
 PvPToggle_Already_Disabled = {prefix} &c你已停用 PvP！
 PvPToggle_Already_Enabled = {prefix} &c你已啟用 PvP！
@@ -115,11 +115,11 @@ Self_Status_Disabled = {prefix} &7你已停用 PVP
 Self_Status_Enabled = {prefix} &7你已啟用 PVP
 # Tag Command
 Tag_Timeleft = &7你還有 &e{time} 秒的戰鬥時間
-Tag_Not_In_Combat = &c你目前不在戰鬥中
+Tag_Not_In_Combat = &7你目前不在戰鬥中
 
 # Variables
-Enabled = &c已啟用
-Disabled = &a已停用
+Enabled = \#6fc93e已啟用
+Disabled = \#c9453e已停用
 # The times below are what will show wherever {time} is used
 Time_Days = \ days
 Time_Hours = \ hours