diff --git a/pvpmanager/pom.xml b/pvpmanager/pom.xml
index 3a22c5cc..13eeed87 100644
--- a/pvpmanager/pom.xml
+++ b/pvpmanager/pom.xml
@@ -16,7 +16,7 @@
 	<url>https://github.com/ChanceSD/PvPManager</url>
 
 	<properties>
-		<config.version>78</config.version>
+		<config.version>79</config.version>
 		<database.version>1</database.version>
 	</properties>
 
@@ -58,6 +58,12 @@
 			<url>https://repo.md-5.net/content/groups/public/</url>
 		</repository>
 
+		<!-- TAB -->
+		<repository>
+			<id>krypton</id>
+			<url>https://repo.kryptonmc.org/releases</url>
+		</repository>
+
 		<repository>
 			<id>codemc-repo</id>
 			<url>https://repo.codemc.org/repository/maven-public</url>
@@ -194,6 +200,14 @@
 			</exclusions>
 		</dependency>
 
+		<!-- TAB -->
+		<dependency>
+			<groupId>me.neznamy</groupId>
+			<artifactId>tab-api</artifactId>
+			<version>4.0.2</version>
+			<scope>provided</scope>
+		</dependency>
+
 		<!-- Towny -->
 		<dependency>
 			<groupId>com.github.TownyAdvanced</groupId>
@@ -223,7 +237,7 @@
 			<version>1.16.8.1.1</version>
 			<scope>provided</scope>
 		</dependency>
-		
+
 		<!-- GriefPrevention -->
 		<dependency>
 			<groupId>com.github.TechFortress</groupId>
diff --git a/pvpmanager/src/main/java/me/chancesd/pvpmanager/PvPManager.java b/pvpmanager/src/main/java/me/chancesd/pvpmanager/PvPManager.java
index 834f32fb..7acd1e47 100644
--- a/pvpmanager/src/main/java/me/chancesd/pvpmanager/PvPManager.java
+++ b/pvpmanager/src/main/java/me/chancesd/pvpmanager/PvPManager.java
@@ -15,6 +15,7 @@
 import me.chancesd.pvpmanager.command.Tag;
 import me.chancesd.pvpmanager.command.Untag;
 import me.chancesd.pvpmanager.library.metrics.CustomMetrics;
+import me.chancesd.pvpmanager.listener.BlockedActionsListener;
 import me.chancesd.pvpmanager.listener.EntityListener;
 import me.chancesd.pvpmanager.listener.EntityListener1_9;
 import me.chancesd.pvpmanager.listener.PlayerListener;
@@ -97,6 +98,7 @@ private void startListeners() {
 			registerListener(new PlayerListener1_11(playerHandler));
 		}
 		registerListener(new PlayerListener(playerHandler));
+		registerListener(new BlockedActionsListener(playerHandler));
 		dependencyManager.startListeners(this);
 	}
 
@@ -111,7 +113,7 @@ private void registerCommands() {
 		registerCommand(getCommand("pvptag"), new Tag(playerHandler));
 		registerCommand(getCommand("untag"), new Untag(playerHandler));
 		registerCommand(getCommand("announce"), new Announce());
-		registerCommand(getCommand("pvpglobal"), new PvPGlobal());
+		registerCommand(getCommand("pvpglobal"), new PvPGlobal(playerHandler));
 	}
 
 	private void startMetrics() {
@@ -132,7 +134,7 @@ public ConfigManager getConfigM() {
 		return configM;
 	}
 
-	public PlayerManager getPlayerHandler() {
+	public PlayerManager getPlayerManager() {
 		return playerHandler;
 	}
 
diff --git a/pvpmanager/src/main/java/me/chancesd/pvpmanager/command/Newbie.java b/pvpmanager/src/main/java/me/chancesd/pvpmanager/command/Newbie.java
index 066b6495..cd3f75ea 100644
--- a/pvpmanager/src/main/java/me/chancesd/pvpmanager/command/Newbie.java
+++ b/pvpmanager/src/main/java/me/chancesd/pvpmanager/command/Newbie.java
@@ -17,7 +17,7 @@
 import me.chancesd.pvpmanager.player.CombatPlayer;
 import me.chancesd.pvpmanager.setting.Lang;
 import me.chancesd.pvpmanager.setting.Permissions;
-import me.chancesd.pvpmanager.setting.Settings;
+import me.chancesd.pvpmanager.setting.Conf;
 import me.chancesd.pvpmanager.utils.ChatUtils;
 import me.chancesd.pvpmanager.utils.CombatUtils;
 
@@ -41,7 +41,7 @@ public final boolean onCommand(final CommandSender sender, final Command command
 			return true;
 		} else if (args.length >= 1) {
 			final String subcommand = args[0];
-			if (Settings.isNewbieDisableAllowed() && subcommand.equalsIgnoreCase("disable") && sender instanceof final Player player) {
+			if (Conf.NEWBIE_ALLOW_DISABLE.asBool() && subcommand.equalsIgnoreCase("disable") && sender instanceof final Player player) {
 				final CombatPlayer combatPlayer = ph.get(player);
 				if (combatPlayer.isNewbie()) {
 					combatPlayer.setNewbie(false);
diff --git a/pvpmanager/src/main/java/me/chancesd/pvpmanager/command/PM.java b/pvpmanager/src/main/java/me/chancesd/pvpmanager/command/PM.java
index 2874029b..0bd6435e 100644
--- a/pvpmanager/src/main/java/me/chancesd/pvpmanager/command/PM.java
+++ b/pvpmanager/src/main/java/me/chancesd/pvpmanager/command/PM.java
@@ -9,6 +9,7 @@
 import java.util.concurrent.TimeUnit;
 
 import org.bukkit.Bukkit;
+import org.bukkit.ChatColor;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
@@ -31,7 +32,7 @@
 import me.chancesd.pvpmanager.setting.Locale;
 import me.chancesd.pvpmanager.setting.Lang;
 import me.chancesd.pvpmanager.setting.Permissions;
-import me.chancesd.pvpmanager.setting.Settings;
+import me.chancesd.pvpmanager.setting.Conf;
 import me.chancesd.pvpmanager.storage.DatabaseConfigBuilder.DatabaseType;
 import me.chancesd.pvpmanager.storage.fields.UserDataFields;
 import me.chancesd.pvpmanager.utils.ChatUtils;
@@ -60,8 +61,8 @@ public PM(final PvPManager plugin) {
 
 	@Override
 	public final boolean onCommand(final CommandSender sender, final Command cmd, final String label, final String[] args) {
-		if (args.length == 0 && sender.hasPermission("pvpmanager.menu")) {
-			Settings.helpMenu(sender);
+		if (args.length == 0 && Permissions.COMMAND_MENU.hasPerm(sender)) {
+			helpMenu(sender);
 			return true;
 		}
 		if (args.length == 1) {
@@ -81,7 +82,7 @@ public final boolean onCommand(final CommandSender sender, final Command cmd, fi
 			} else if (args[0].equalsIgnoreCase(CONVERT) && Permissions.ADMIN.hasPerm(sender)) {
 				convert(sender, args);
 				return true;
-			} else if (args[0].equalsIgnoreCase(DEBUG) && sender.hasPermission("pvpmanager.debug")) {
+			} else if (args[0].equalsIgnoreCase(DEBUG) && Permissions.COMMAND_DEBUG.hasPerm(sender)) {
 				debug(sender, args);
 				return true;
 			} else if (args[0].equalsIgnoreCase(LOCALE) && Permissions.ADMIN.hasPerm(sender)) {
@@ -172,31 +173,31 @@ private void convert(final CommandSender sender, final String[] args) {
 	private void debug(final CommandSender sender, final String[] args) {
 		CombatPlayer p = null;
 		if (args.length == 2 && sender instanceof final Player player) {
-			p = plugin.getPlayerHandler().get(player);
+			p = plugin.getPlayerManager().get(player);
 		}
 		if (args.length == 2 && args[1].equalsIgnoreCase("toggle")) {
-			Settings.setDEBUG(!Settings.isDebug());
-			Log.info("Debug mode: " + Settings.isDebug());
-			sender.sendMessage("Debug mode: " + Settings.isDebug());
+			Conf.setDebug(!Conf.DEBUG_MODE.asBool());
+			Log.info("Debug mode: " + Conf.DEBUG_MODE.asBool());
+			sender.sendMessage("Debug mode: " + Conf.DEBUG_MODE.asBool());
 		} else if (args.length == 2 && args[1].equalsIgnoreCase("damagedebug")) {
 			if (damageListener == null) {
 				sender.sendMessage("§4Warning §f- Some plugin features are disabled while in this mode");
 				sender.sendMessage("Enabling a damage listener for debugging, check the console for details on every entity hit");
 				sender.sendMessage("§cRun this command again §fafter you are done to disable debugging or reload the plugin");
-				Settings.setDEBUG(true);
-				damageListener = new DebugEntityListener(plugin.getPlayerHandler());
+				Conf.setDebug(true);
+				damageListener = new DebugEntityListener(plugin.getPlayerManager());
 				HandlerList.unregisterAll(plugin.getEntityListener());
 				Bukkit.getServer().getPluginManager().registerEvents(damageListener, plugin);
 			} else {
 				HandlerList.unregisterAll(damageListener);
 				Bukkit.getServer().getPluginManager().registerEvents(plugin.getEntityListener(), plugin);
 				damageListener = null;
-				Settings.setDEBUG(false);
+				Conf.setDebug(false);
 				sender.sendMessage("Debug damage listener disabled");
 			}
 		} else if (args[1].equalsIgnoreCase("tagall")) {
-			for (final CombatPlayer player : plugin.getPlayerHandler().getPlayers().values()) {
-				player.setTagged(true, player);
+			for (final CombatPlayer player : plugin.getPlayerManager().getPlayers().values()) {
+				player.tag(true, player);
 			}
 			sender.sendMessage("Tagged all players");
 		} else if (args.length == 3) {
@@ -204,24 +205,24 @@ private void debug(final CommandSender sender, final String[] args) {
 				sender.sendMessage("§4Player not online!");
 				return;
 			}
-			p = plugin.getPlayerHandler().get(Bukkit.getPlayer(args[2]));
+			p = plugin.getPlayerManager().get(Bukkit.getPlayer(args[2]));
 		}
 		if (p == null)
 			return;
 		if (args[1].equalsIgnoreCase("tag")) {
-			p.setTagged(true, p);
+			p.tag(true, p);
 		} else if (args[1].equalsIgnoreCase("attack")) {
 			plugin.getServer().getPluginManager()
 					.callEvent(new EntityDamageByEntityEvent(p.getPlayer(), p.getPlayer(), DamageCause.ENTITY_ATTACK,
 							DamageSource.builder(DamageType.PLAYER_ATTACK).build(), 5.0));
 			sender.sendMessage("Attacked player with 5 damage");
 		} else if (args[1].equalsIgnoreCase("players")) {
-			for (final CombatPlayer player : plugin.getPlayerHandler().getPlayers().values()) {
+			for (final CombatPlayer player : plugin.getPlayerManager().getPlayers().values()) {
 				if (!Bukkit.getOnlinePlayers().contains(player.getPlayer())) {
 					Log.info("UUID: " + player.getUUID() + " - Name: " + player.getName() + " - Metadata: " + player.getPlayer().hasMetadata("NPC"));
 				}
 			}
-			Log.info("Players: " + plugin.getPlayerHandler().getPlayers().size() + "/" + Bukkit.getOnlinePlayers().size());
+			Log.info("Players: " + plugin.getPlayerManager().getPlayers().size() + "/" + Bukkit.getOnlinePlayers().size());
 		}
 	}
 
@@ -244,7 +245,7 @@ private void locale(final CommandSender sender, final String[] args) {
 			return;
 		}
 
-		Settings.setLocale(locale.name());
+		Conf.LOCALE.set(locale.name());
 		changeConfigSetting("General.Locale", locale.name());
 		Lang.setup(plugin);
 		sender.sendMessage(Lang.PREFIXMSG + " §aLanguage changed to " + Lang.getLocale() + " - Filename: " + Lang.getLocale().fileName());
@@ -257,7 +258,7 @@ private void changeConfigSetting(final String path, final String value) {
 	}
 
 	private void reload(final CommandSender sender) {
-		if (!sender.hasPermission("pvpmanager.reload")) {
+		if (!Permissions.COMMAND_RELOAD.hasPerm(sender)) {
 			sender.sendMessage(Lang.ERROR_PERMISSION.msg());
 			return;
 		}
@@ -268,21 +269,21 @@ private void reload(final CommandSender sender) {
 
 	private void reload(final boolean silent) {
 		Log.setSilent(silent);
-		Settings.setReloading(true);
-		Settings.setUpdate(false);
+		plugin.setReloading(true);
+		plugin.getUpdateManager().setUpdateAvailable(false);
 		plugin.onDisable();
 		ScheduleUtils.cancelAllTasks();
 		HandlerList.unregisterAll(plugin);
 		plugin.onEnable();
-		Settings.setReloading(false);
+		plugin.setReloading(false);
 		if (silent)
 			Log.setSilent(false);
 	}
 
 	private void update(final CommandSender sender) {
-		if (Settings.isUpdateCheck()) {
+		if (Conf.CHECK_UPDATES.asBool()) {
 			final UpdateManager updateManager = plugin.getUpdateManager();
-			if (Settings.isUpdate()) {
+			if (updateManager.hasUpdateAvailable()) {
 				if (updateManager.getUpdater().downloadFile()) {
 					sender.sendMessage("§2Update Successful. On next restart you will have §e" + updateManager.getNewVersion());
 				} else {
@@ -310,4 +311,27 @@ public List<String> onTabComplete(final CommandSender sender, final Command comm
 		return Collections.emptyList();
 	}
 
+	public static void helpMenu(final CommandSender player) {
+		player.sendMessage(ChatColor.GOLD + "-------------- PvPManager Help Page --------------");
+		player.sendMessage(ChatColor.GOLD + "/pvp [player]" + helpSeparator() + ChatColor.WHITE + "Set PvP enabled or disabled");
+		player.sendMessage(ChatColor.GOLD + "/pvpinfo [player]" + helpSeparator() + ChatColor.WHITE + "Check your or other player info");
+		player.sendMessage(ChatColor.GOLD + "/pvplist [offline]" + helpSeparator() + ChatColor.WHITE + "List all online or offline players");
+		player.sendMessage(ChatColor.GOLD + "/pvpo " + helpSeparator() + ChatColor.WHITE + "Override all PvP protections");
+		player.sendMessage(ChatColor.GOLD + "/pvpstatus [player]" + helpSeparator() + ChatColor.WHITE + "Check your or other player PvP status");
+		player.sendMessage(ChatColor.GOLD + "/pvpglobal <on|off>" + helpSeparator() + ChatColor.WHITE + "Toggle PvP for the whole server");
+		player.sendMessage(ChatColor.GOLD + "/pvptag <player> <time>" + helpSeparator() + ChatColor.WHITE + "Check tag time left or tag a player");
+		player.sendMessage(ChatColor.GOLD + "/untag <player>" + helpSeparator() + ChatColor.WHITE + "Untags a player");
+		player.sendMessage(ChatColor.GOLD + "/newbie disable" + helpSeparator() + ChatColor.WHITE + "Disable newbie protection");
+		player.sendMessage(ChatColor.GOLD + "/pmr" + helpSeparator() + ChatColor.WHITE + "Shows this help page");
+		player.sendMessage(ChatColor.GOLD + "/pmr worlds" + helpSeparator() + ChatColor.WHITE + "Control panel to manage world PvP");
+		player.sendMessage(ChatColor.GOLD + "/pmr reload" + helpSeparator() + ChatColor.WHITE + "Reload PvPManager");
+		player.sendMessage(ChatColor.GOLD + "/pmr cleanup" + helpSeparator() + ChatColor.WHITE + "Cleanup inactive users from database");
+		player.sendMessage(ChatColor.GOLD + "/pmr update" + helpSeparator() + ChatColor.WHITE + "Update to latest version");
+		player.sendMessage(ChatColor.GOLD + "-------------------------------------------------");
+	}
+
+	private static String helpSeparator() {
+		return ChatColor.RED + " >> ";
+	}
+
 }
diff --git a/pvpmanager/src/main/java/me/chancesd/pvpmanager/command/PvP.java b/pvpmanager/src/main/java/me/chancesd/pvpmanager/command/PvP.java
index dce2891c..1e3b5773 100644
--- a/pvpmanager/src/main/java/me/chancesd/pvpmanager/command/PvP.java
+++ b/pvpmanager/src/main/java/me/chancesd/pvpmanager/command/PvP.java
@@ -10,7 +10,7 @@
 import me.chancesd.pvpmanager.player.world.CombatWorld;
 import me.chancesd.pvpmanager.setting.Lang;
 import me.chancesd.pvpmanager.setting.Permissions;
-import me.chancesd.pvpmanager.setting.Settings;
+import me.chancesd.pvpmanager.setting.Conf;
 import me.chancesd.pvpmanager.utils.ChatUtils;
 import me.chancesd.pvpmanager.utils.CombatUtils;
 import me.chancesd.pvpmanager.utils.TimeUtil;
@@ -33,7 +33,7 @@ public PvP(final PlayerManager playerHandler) {
 
 	@Override
 	public final boolean onCommand(final CommandSender sender, final Command cmd, final String label, final String[] args) {
-		if (!sender.hasPermission("pvpmanager.pvpstatus.change")) {
+		if (!Permissions.COMMAND_PVP_TOGGLE.hasPerm(sender)) {
 			sender.sendMessage(Lang.ERROR_PERMISSION.msg());
 			return true;
 		}
@@ -111,9 +111,9 @@ private void togglePvPAll(final CommandSender sender, final boolean state, final
 	}
 
 	public final boolean hasToggleCooldownPassed(final CombatPlayer player) {
-		if (!CombatUtils.hasTimePassed(player.getToggleTime(), Settings.getToggleCooldown())
+		if (!CombatUtils.hasTimePassed(player.getToggleTime(), Conf.TOGGLE_COOLDOWN.asInt())
 				&& !player.hasPerm(Permissions.EXEMPT_PVPTOGGLE_COOLDOWN)) {
-			final long timeLeft = CombatUtils.getTimeLeftMs(player.getToggleTime(), Settings.getToggleCooldown());
+			final long timeLeft = CombatUtils.getTimeLeftMs(player.getToggleTime(), Conf.TOGGLE_COOLDOWN.asInt());
 			player.message(Lang.ERROR_PVP_COOLDOWN.msg(TimeUtil.getDiffMsg(timeLeft)));
 			return false;
 		}
diff --git a/pvpmanager/src/main/java/me/chancesd/pvpmanager/command/PvPGlobal.java b/pvpmanager/src/main/java/me/chancesd/pvpmanager/command/PvPGlobal.java
index fef05a51..cfc99ef7 100644
--- a/pvpmanager/src/main/java/me/chancesd/pvpmanager/command/PvPGlobal.java
+++ b/pvpmanager/src/main/java/me/chancesd/pvpmanager/command/PvPGlobal.java
@@ -11,16 +11,22 @@
 import com.google.common.collect.Lists;
 
 import me.chancesd.pvpmanager.setting.Lang;
-import me.chancesd.pvpmanager.setting.Settings;
+import me.chancesd.pvpmanager.manager.PlayerManager;
 import me.chancesd.pvpmanager.utils.ChatUtils;
 
 public class PvPGlobal implements TabExecutor {
 
+	private final PlayerManager playerManager;
+
+	public PvPGlobal(final PlayerManager playerManager) {
+		this.playerManager = playerManager;
+	}
+
 	@Override
 	public final boolean onCommand(final CommandSender sender, final Command command, final String label, final String[] args) {
 		if (args.length == 1) {
 			final boolean status = args[0].equalsIgnoreCase("on");
-			Settings.setGlobalStatus(status);
+			playerManager.setGlobalStatus(status);
 			sender.sendMessage(Lang.PREFIXMSG + ChatColor.DARK_GREEN + "Server PvP was set to " + status);
 			return true;
 		}
diff --git a/pvpmanager/src/main/java/me/chancesd/pvpmanager/command/PvPInfo.java b/pvpmanager/src/main/java/me/chancesd/pvpmanager/command/PvPInfo.java
index d447c5a4..a6b4069e 100644
--- a/pvpmanager/src/main/java/me/chancesd/pvpmanager/command/PvPInfo.java
+++ b/pvpmanager/src/main/java/me/chancesd/pvpmanager/command/PvPInfo.java
@@ -31,7 +31,7 @@ public final boolean onCommand(final CommandSender sender, final Command cmd, fi
 		if (args.length == 0 && sender instanceof final Player player) {
 			sendInfo(sender, ph.get(player));
 			return true;
-		} else if (args.length == 1 && sender.hasPermission("pvpmanager.info.others")) {
+		} else if (args.length == 1 && Permissions.COMMAND_PVP_INFO_OTHERS.hasPerm(sender)) {
 			final String name = args[0];
 			Preconditions.checkNotNull(name);
 			if (CombatUtils.isOnline(name)) {
diff --git a/pvpmanager/src/main/java/me/chancesd/pvpmanager/command/PvPStatus.java b/pvpmanager/src/main/java/me/chancesd/pvpmanager/command/PvPStatus.java
index 85ef77e8..e066e285 100644
--- a/pvpmanager/src/main/java/me/chancesd/pvpmanager/command/PvPStatus.java
+++ b/pvpmanager/src/main/java/me/chancesd/pvpmanager/command/PvPStatus.java
@@ -9,6 +9,7 @@
 import me.chancesd.pvpmanager.manager.PlayerManager;
 import me.chancesd.pvpmanager.player.CombatPlayer;
 import me.chancesd.pvpmanager.setting.Lang;
+import me.chancesd.pvpmanager.setting.Permissions;
 import me.chancesd.pvpmanager.utils.CombatUtils;
 
 public class PvPStatus implements CommandExecutor {
@@ -30,7 +31,7 @@ public final boolean onCommand(final CommandSender sender, final Command cmd, fi
 			}
 			pvpPlayer.message(Lang.SELF_STATUS_ENABLED);
 			return true;
-		} else if (args.length == 1 && sender.hasPermission("pvpmanager.pvpstatus.others")) {
+		} else if (args.length == 1 && Permissions.COMMAND_PVP_TOGGLE_OTHERS.hasPerm(sender)) {
 			final String name = args[0];
 			if (CombatUtils.isOnline(name)) {
 				target = ph.get(Bukkit.getPlayer(name));
diff --git a/pvpmanager/src/main/java/me/chancesd/pvpmanager/command/Tag.java b/pvpmanager/src/main/java/me/chancesd/pvpmanager/command/Tag.java
index 2781a637..7028f3ed 100644
--- a/pvpmanager/src/main/java/me/chancesd/pvpmanager/command/Tag.java
+++ b/pvpmanager/src/main/java/me/chancesd/pvpmanager/command/Tag.java
@@ -10,7 +10,7 @@
 import me.chancesd.pvpmanager.player.CombatPlayer;
 import me.chancesd.pvpmanager.setting.Lang;
 import me.chancesd.pvpmanager.setting.Permissions;
-import me.chancesd.pvpmanager.setting.Settings;
+import me.chancesd.pvpmanager.setting.Conf;
 import me.chancesd.pvpmanager.utils.CombatUtils;
 import me.chancesd.pvpmanager.utils.TimeUtil;
 
@@ -29,7 +29,7 @@ public final boolean onCommand(final CommandSender sender, final Command command
 			if (!pvPlayer.isInCombat()) {
 				pvPlayer.message(Lang.TAG_NOT_IN_COMBAT.msg());
 			} else {
-				final long timeLeft = pvPlayer.getTaggedTime() + Settings.getTimeInCombat() * 1000 - System.currentTimeMillis();
+				final long timeLeft = pvPlayer.getTaggedTime() + Conf.TIME_IN_COMBAT.asInt() * 1000 - System.currentTimeMillis();
 				pvPlayer.message(Lang.TAG_TIME_LEFT.msg(TimeUtil.getDiffMsg(timeLeft)));
 			}
 			return true;
@@ -38,7 +38,7 @@ public final boolean onCommand(final CommandSender sender, final Command command
 			if (!CombatUtils.isOnlineWithFeedback(sender, name))
 				return true;
 
-			tagPlayer(sender, name, Settings.getTimeInCombatMs());
+			tagPlayer(sender, name, Conf.TIME_IN_COMBAT.asInt() * 1000L);
 			return true;
 		} else if (args.length == 2 && Permissions.ADMIN.hasPerm(sender)) {
 			final String name = args[0];
@@ -61,7 +61,7 @@ private void tagPlayer(final CommandSender sender, final String name, final long
 			sender.sendMessage(Lang.PREFIXMSG + " §cThat player is already in combat");
 			return;
 		}
-		target.setTagged(true, target, time);
+		target.tag(true, target, time);
 		sender.sendMessage(Lang.PREFIXMSG + " " + target.getName() + " §2has been tagged for §e" + time / 1000 + " §2seconds");
 	}
 
diff --git a/pvpmanager/src/main/java/me/chancesd/pvpmanager/command/Untag.java b/pvpmanager/src/main/java/me/chancesd/pvpmanager/command/Untag.java
index f5fdec66..34bb6bc1 100644
--- a/pvpmanager/src/main/java/me/chancesd/pvpmanager/command/Untag.java
+++ b/pvpmanager/src/main/java/me/chancesd/pvpmanager/command/Untag.java
@@ -7,6 +7,7 @@
 
 import me.chancesd.pvpmanager.manager.PlayerManager;
 import me.chancesd.pvpmanager.player.CombatPlayer;
+import me.chancesd.pvpmanager.player.UntagReason;
 import me.chancesd.pvpmanager.setting.Lang;
 import me.chancesd.pvpmanager.utils.CombatUtils;
 
@@ -33,7 +34,7 @@ public final boolean onCommand(final CommandSender sender, final Command command
 				sender.sendMessage(Lang.PREFIXMSG + " §cThat player is not in combat");
 				return true;
 			}
-			target.unTag();
+			target.untag(UntagReason.COMMAND);
 			sender.sendMessage(Lang.PREFIXMSG + " " + target.getName() + " §2has been untagged");
 			return true;
 		}
diff --git a/pvpmanager/src/main/java/me/chancesd/pvpmanager/command/Worlds.java b/pvpmanager/src/main/java/me/chancesd/pvpmanager/command/Worlds.java
index 120cc692..98a49afd 100644
--- a/pvpmanager/src/main/java/me/chancesd/pvpmanager/command/Worlds.java
+++ b/pvpmanager/src/main/java/me/chancesd/pvpmanager/command/Worlds.java
@@ -41,7 +41,7 @@ public void createWorldMenu(final Player player) {
 				Log.warning("Null world in world list!");
 				continue;
 			}
-			final List<CombatPlayer> pvPlayerList = world.getPlayers().stream().map(p -> plugin.getPlayerHandler().get(p)).toList();
+			final List<CombatPlayer> pvPlayerList = world.getPlayers().stream().map(p -> plugin.getPlayerManager().get(p)).toList();
 			worldItem.addExtra(createInfoText("Players", pvPlayerList.size()));
 			worldItem.addExtra(createSeparator());
 			worldItem.addExtra(createInfoText("In Combat", pvPlayerList.stream().filter(CombatPlayer::isInCombat).count()));
diff --git a/pvpmanager/src/main/java/me/chancesd/pvpmanager/event/PlayerTagEvent.java b/pvpmanager/src/main/java/me/chancesd/pvpmanager/event/PlayerTagEvent.java
index ce40a70f..45e6b4f6 100644
--- a/pvpmanager/src/main/java/me/chancesd/pvpmanager/event/PlayerTagEvent.java
+++ b/pvpmanager/src/main/java/me/chancesd/pvpmanager/event/PlayerTagEvent.java
@@ -91,4 +91,8 @@ public HandlerList getHandlers() {
 		return handlers;
 	}
 
+	public static HandlerList getHandlerList() {
+		return handlers;
+	}
+
 }
diff --git a/pvpmanager/src/main/java/me/chancesd/pvpmanager/event/PlayerUntagEvent.java b/pvpmanager/src/main/java/me/chancesd/pvpmanager/event/PlayerUntagEvent.java
index 895382d1..f780cfb0 100644
--- a/pvpmanager/src/main/java/me/chancesd/pvpmanager/event/PlayerUntagEvent.java
+++ b/pvpmanager/src/main/java/me/chancesd/pvpmanager/event/PlayerUntagEvent.java
@@ -5,6 +5,7 @@
 import org.bukkit.event.HandlerList;
 
 import me.chancesd.pvpmanager.player.CombatPlayer;
+import me.chancesd.pvpmanager.player.UntagReason;
 
 /**
  * This event is called before a player is set as no longer in combat.
@@ -16,10 +17,12 @@ public final class PlayerUntagEvent extends Event {
 	private static final HandlerList handlers = new HandlerList();
 	private final Player player;
 	private final CombatPlayer pvplayer;
+	private final UntagReason reason;
 
-	public PlayerUntagEvent(final Player player, final CombatPlayer pvplayer) {
+	public PlayerUntagEvent(final Player player, final CombatPlayer pvplayer, final UntagReason reason) {
 		this.player = player;
 		this.pvplayer = pvplayer;
+		this.reason = reason;
 	}
 
 	/**
@@ -40,9 +43,21 @@ public final CombatPlayer getPvPlayer() {
 		return pvplayer;
 	}
 
+
+	/**
+	 * @return The reason for this player being untagged
+	 */
+	public UntagReason getReason() {
+		return reason;
+	}
+
 	@Override
 	public HandlerList getHandlers() {
 		return handlers;
 	}
 
+	public static HandlerList getHandlerList() {
+		return handlers;
+	}
+
 }
diff --git a/pvpmanager/src/main/java/me/chancesd/pvpmanager/integration/Hook.java b/pvpmanager/src/main/java/me/chancesd/pvpmanager/integration/Hook.java
index 953c19ca..98e1d841 100644
--- a/pvpmanager/src/main/java/me/chancesd/pvpmanager/integration/Hook.java
+++ b/pvpmanager/src/main/java/me/chancesd/pvpmanager/integration/Hook.java
@@ -5,20 +5,21 @@
 import org.bukkit.plugin.PluginDescriptionFile;
 import org.jetbrains.annotations.NotNull;
 
-import me.chancesd.pvpmanager.setting.Settings;
+import me.chancesd.pvpmanager.setting.Conf;
 
 public enum Hook {
 	WORLDGUARD("WorldGuard"),
 	ESSENTIALS("Essentials"),
 	VAULT("Vault", "Vault not found! Features requiring Vault won't work!", () -> {
-		Settings.setFineAmount(0);
-		Settings.setMoneyPenalty(0);
-		Settings.setMoneyReward(0);
+		Conf.FINE_AMOUNT.disable();
+		Conf.MONEY_PENALTY.disable();
+		Conf.MONEY_REWARD.disable();
 	}),
 	SIMPLECLANS("SimpleClans"),
 	PLACEHOLDERAPI("PlaceholderAPI"),
 	LIBSDISGUISES("LibsDisguises"),
 	GRIEFPREVENTION("GriefPrevention"),
+	TAB("TAB"),
 	TOWNY("Towny"),
 	KINGDOMSX("Kingdoms");
 
diff --git a/pvpmanager/src/main/java/me/chancesd/pvpmanager/integration/hook/EssentialsHook.java b/pvpmanager/src/main/java/me/chancesd/pvpmanager/integration/hook/EssentialsHook.java
index 115cdebb..df6c8034 100644
--- a/pvpmanager/src/main/java/me/chancesd/pvpmanager/integration/hook/EssentialsHook.java
+++ b/pvpmanager/src/main/java/me/chancesd/pvpmanager/integration/hook/EssentialsHook.java
@@ -4,9 +4,9 @@
 
 import com.earth2me.essentials.Essentials;
 
-import me.chancesd.pvpmanager.integration.AFKDependency;
 import me.chancesd.pvpmanager.integration.BaseDependency;
 import me.chancesd.pvpmanager.integration.Hook;
+import me.chancesd.pvpmanager.integration.type.AFKDependency;
 import me.chancesd.pvpmanager.integration.type.GodDependency;
 
 public class EssentialsHook extends BaseDependency implements AFKDependency, GodDependency {
diff --git a/pvpmanager/src/main/java/me/chancesd/pvpmanager/integration/hook/GriefPreventionHook.java b/pvpmanager/src/main/java/me/chancesd/pvpmanager/integration/hook/GriefPreventionHook.java
index f8c6c7f8..1e3cd02d 100644
--- a/pvpmanager/src/main/java/me/chancesd/pvpmanager/integration/hook/GriefPreventionHook.java
+++ b/pvpmanager/src/main/java/me/chancesd/pvpmanager/integration/hook/GriefPreventionHook.java
@@ -2,7 +2,7 @@
 
 import me.chancesd.pvpmanager.integration.BaseDependency;
 import me.chancesd.pvpmanager.integration.Hook;
-import me.chancesd.pvpmanager.setting.Settings;
+import me.chancesd.pvpmanager.setting.Conf;
 import me.chancesd.sdutils.utils.Log;
 import me.ryanhamshire.GriefPrevention.GriefPrevention;
 
@@ -15,7 +15,7 @@ public GriefPreventionHook(final Hook hook) {
 			Log.warning("GriefPrevention has some combat features without showing any feedback messages. "
 			        + "Make sure to set PunishLogout to false and set CombatTimeoutSeconds to 0 seconds in GP config. "
 			        + "Conflicts with those features often get wrongly blamed on PvPManager due to the lack of GP feedback messages.");
-			if (Settings.isKillOnLogout() && gp.config_pvp_punishLogout) {
+			if (Conf.KILL_ON_LOGOUT.asBool() && gp.config_pvp_punishLogout) {
 				Log.severe("You have kill on logout enabled in PvPManager, so we automatically disabled the same feature on GriefPrevention. "
 				        + "Disable this setting in GP or PvPManager to remove this error, this is necessary as it could cause issues.");
 				gp.config_pvp_punishLogout = false;
diff --git a/pvpmanager/src/main/java/me/chancesd/pvpmanager/integration/hook/PlaceHolderAPI.java b/pvpmanager/src/main/java/me/chancesd/pvpmanager/integration/hook/PlaceHolderAPI.java
index 125eb807..92fba0f6 100644
--- a/pvpmanager/src/main/java/me/chancesd/pvpmanager/integration/hook/PlaceHolderAPI.java
+++ b/pvpmanager/src/main/java/me/chancesd/pvpmanager/integration/hook/PlaceHolderAPI.java
@@ -9,7 +9,7 @@
 
 import me.chancesd.pvpmanager.PvPManager;
 import me.chancesd.pvpmanager.player.CombatPlayer;
-import me.chancesd.pvpmanager.setting.Settings;
+import me.chancesd.pvpmanager.setting.Conf;
 import me.chancesd.pvpmanager.utils.CombatUtils;
 import me.clip.placeholderapi.PlaceholderAPIPlugin;
 import me.clip.placeholderapi.expansion.PlaceholderExpansion;
@@ -41,7 +41,7 @@ public String onPlaceholderRequest(final Player player, final String identifier)
 		if (player == null)
 			return "";
 
-		final CombatPlayer p = plugin.getPlayerHandler().get(player);
+		final CombatPlayer p = plugin.getPlayerManager().get(player);
 		switch (identifier) {
 		case "in_combat":
 			return getPAPIBoolean(p.isInCombat());
@@ -54,13 +54,13 @@ public String onPlaceholderRequest(final Player player, final String identifier)
 		case "has_respawn_prot":
 			return getPAPIBoolean(p.hasRespawnProtection());
 		case "combat_prefix":
-			return p.isInCombat() ? Settings.getNameTagPrefix() : "";
+			return p.isInCombat() ? Conf.NAMETAG_PREFIX.asString() : "";
 		case "combat_timeleft":
 			return String.valueOf(p.getTagTimeLeft() / 1000);
 		case "newbie_timeleft":
 			return String.valueOf(p.getNewbieTimeLeft() / 1000);
 		case "pvp_command_timeleft":
-			final int timeLeft = CombatUtils.getTimeLeft(p.getToggleTime(), Settings.getToggleCooldown());
+			final int timeLeft = CombatUtils.getTimeLeft(p.getToggleTime(), Conf.TOGGLE_COOLDOWN.asInt());
 			return String.valueOf(Math.max(timeLeft, 0));
 		case "current_enemy":
 			final CombatPlayer pPlayer = p.getEnemy();
diff --git a/pvpmanager/src/main/java/me/chancesd/pvpmanager/integration/hook/SimpleClansHook.java b/pvpmanager/src/main/java/me/chancesd/pvpmanager/integration/hook/SimpleClansHook.java
index 6926d9d0..e3102624 100644
--- a/pvpmanager/src/main/java/me/chancesd/pvpmanager/integration/hook/SimpleClansHook.java
+++ b/pvpmanager/src/main/java/me/chancesd/pvpmanager/integration/hook/SimpleClansHook.java
@@ -4,9 +4,9 @@
 
 import me.chancesd.pvpmanager.integration.BaseDependency;
 import me.chancesd.pvpmanager.integration.DependencyException;
-import me.chancesd.pvpmanager.integration.ForceToggleDependency;
-import me.chancesd.pvpmanager.integration.GroupDependency;
 import me.chancesd.pvpmanager.integration.Hook;
+import me.chancesd.pvpmanager.integration.type.ForceToggleDependency;
+import me.chancesd.pvpmanager.integration.type.GroupDependency;
 import me.chancesd.pvpmanager.player.ProtectionType;
 import net.sacredlabyrinth.phaed.simpleclans.ClanPlayer;
 import net.sacredlabyrinth.phaed.simpleclans.SimpleClans;
diff --git a/pvpmanager/src/main/java/me/chancesd/pvpmanager/integration/hook/TABHook.java b/pvpmanager/src/main/java/me/chancesd/pvpmanager/integration/hook/TABHook.java
new file mode 100644
index 00000000..dd28dcd5
--- /dev/null
+++ b/pvpmanager/src/main/java/me/chancesd/pvpmanager/integration/hook/TABHook.java
@@ -0,0 +1,61 @@
+package me.chancesd.pvpmanager.integration.hook;
+
+import java.util.concurrent.TimeUnit;
+
+import org.bukkit.entity.Player;
+import me.chancesd.pvpmanager.integration.BaseDependency;
+import me.chancesd.pvpmanager.integration.DependencyException;
+import me.chancesd.pvpmanager.integration.Hook;
+import me.chancesd.pvpmanager.player.CombatPlayer;
+import me.chancesd.pvpmanager.setting.Conf;
+import me.chancesd.pvpmanager.utils.ScheduleUtils;
+import me.chancesd.sdutils.utils.Utils;
+import me.neznamy.tab.api.TabAPI;
+import me.neznamy.tab.api.TabPlayer;
+import me.neznamy.tab.api.event.EventBus;
+import me.neznamy.tab.api.event.player.PlayerLoadEvent;
+
+public class TABHook extends BaseDependency {
+
+	private final boolean showInPlayerlist;
+	private final boolean showAboveHead;
+
+	public TABHook(final Hook hook) {
+		super(hook);
+		if (!Utils.isVersionAtLeast(Utils.stripTags(hook.getVersion()), "4.0.0")) {
+			throw new DependencyException("Can't hook into TAB, update TAB to 4.0.0 or above", hook);
+		}
+		this.showInPlayerlist = getConfigBoolean("Show In Tab", true);
+		this.showAboveHead =getConfigBoolean("Show Above Player", true);
+
+		registerLoadEvent();
+	}
+
+	private void registerLoadEvent() {
+		final EventBus eventBus = TabAPI.getInstance().getEventBus();
+		if (eventBus == null || !Conf.TOGGLE_NAMETAG_ENABLED.asBool())
+			return;
+		eventBus.register(PlayerLoadEvent.class, event -> {
+			final TabPlayer tabPlayer = event.getPlayer();
+			if (event.isJoin()) {
+				final CombatPlayer pvPlayer = CombatPlayer.get((Player) tabPlayer.getPlayer());
+				// wait 1 second because TAB was overwriting it
+				ScheduleUtils.runAsyncLater(() -> pvPlayer.getNameTag().setPvP(pvPlayer.hasPvPEnabled()), 1, TimeUnit.SECONDS);
+			}
+		});
+	}
+
+	@Override
+	public String onEnableMessage() {
+		return getName() + " Found! Using TAB to change nametags instead of scoreboards";
+	}
+
+	public boolean showAboveHead() {
+		return showAboveHead;
+	}
+
+	public boolean showInPlayerlist() {
+		return showInPlayerlist;
+	}
+
+}
diff --git a/pvpmanager/src/main/java/me/chancesd/pvpmanager/integration/hook/TownyHook.java b/pvpmanager/src/main/java/me/chancesd/pvpmanager/integration/hook/TownyHook.java
index dc3da20b..944da52c 100644
--- a/pvpmanager/src/main/java/me/chancesd/pvpmanager/integration/hook/TownyHook.java
+++ b/pvpmanager/src/main/java/me/chancesd/pvpmanager/integration/hook/TownyHook.java
@@ -5,8 +5,8 @@
 import com.palmergames.bukkit.towny.object.Resident;
 
 import me.chancesd.pvpmanager.integration.BaseDependency;
-import me.chancesd.pvpmanager.integration.ForceToggleDependency;
 import me.chancesd.pvpmanager.integration.Hook;
+import me.chancesd.pvpmanager.integration.type.ForceToggleDependency;
 import me.chancesd.pvpmanager.player.ProtectionType;
 
 public class TownyHook extends BaseDependency implements ForceToggleDependency {
diff --git a/pvpmanager/src/main/java/me/chancesd/pvpmanager/integration/hook/worldguard/WorldGuardModernHook.java b/pvpmanager/src/main/java/me/chancesd/pvpmanager/integration/hook/worldguard/WorldGuardModernHook.java
index f2ae6765..36703f48 100644
--- a/pvpmanager/src/main/java/me/chancesd/pvpmanager/integration/hook/worldguard/WorldGuardModernHook.java
+++ b/pvpmanager/src/main/java/me/chancesd/pvpmanager/integration/hook/worldguard/WorldGuardModernHook.java
@@ -13,14 +13,14 @@
 import com.sk89q.worldguard.protection.regions.RegionQuery;
 
 import me.chancesd.pvpmanager.integration.BaseDependency;
-import me.chancesd.pvpmanager.integration.ForceToggleDependency;
 import me.chancesd.pvpmanager.integration.Hook;
+import me.chancesd.pvpmanager.integration.type.ForceToggleDependency;
 import me.chancesd.pvpmanager.integration.type.WorldGuardDependency;
 import me.chancesd.pvpmanager.manager.PlayerManager;
 import me.chancesd.pvpmanager.player.CombatPlayer;
 import me.chancesd.pvpmanager.player.ProtectionType;
 import me.chancesd.pvpmanager.setting.Lang;
-import me.chancesd.pvpmanager.setting.Settings;
+import me.chancesd.pvpmanager.setting.Conf;
 
 public class WorldGuardModernHook extends BaseDependency implements WorldGuardDependency, ForceToggleDependency {
 
@@ -85,7 +85,7 @@ public boolean shouldDisable(final Player player) {
 
 	@Override
 	public boolean shouldDisable(final Player damager, final Player defender, final ProtectionType reason) {
-		if (hasAllowPvPFlag(defender) || containsRegionsAt(defender.getLocation(), Settings.getWorldguardOverridesList())) {
+		if (hasAllowPvPFlag(defender) || containsRegionsAt(defender.getLocation(), Conf.WORLDGUARD_OVERRIDES_LIST.asSet())) {
 			final CombatPlayer attacker = CombatPlayer.get(damager);
 			final CombatPlayer attacked = CombatPlayer.get(defender);
 			if (reason == ProtectionType.PVPDISABLED) {
@@ -116,7 +116,7 @@ private void disablePvP(final CombatPlayer player) {
 
 	@Override
 	public boolean shouldDisableProtection() {
-		return Settings.isWorldguardOverrides();
+		return Conf.WORLDGUARD_OVERRIDES.asBool();
 	}
 
 }
diff --git a/pvpmanager/src/main/java/me/chancesd/pvpmanager/integration/AFKDependency.java b/pvpmanager/src/main/java/me/chancesd/pvpmanager/integration/type/AFKDependency.java
similarity index 68%
rename from pvpmanager/src/main/java/me/chancesd/pvpmanager/integration/AFKDependency.java
rename to pvpmanager/src/main/java/me/chancesd/pvpmanager/integration/type/AFKDependency.java
index 73b4d465..de1332d5 100644
--- a/pvpmanager/src/main/java/me/chancesd/pvpmanager/integration/AFKDependency.java
+++ b/pvpmanager/src/main/java/me/chancesd/pvpmanager/integration/type/AFKDependency.java
@@ -1,9 +1,7 @@
-package me.chancesd.pvpmanager.integration;
+package me.chancesd.pvpmanager.integration.type;
 
 import org.bukkit.entity.Player;
 
-import me.chancesd.pvpmanager.integration.type.Dependency;
-
 public interface AFKDependency extends Dependency {
 
 	public boolean isAFK(Player player);
diff --git a/pvpmanager/src/main/java/me/chancesd/pvpmanager/integration/type/Dependency.java b/pvpmanager/src/main/java/me/chancesd/pvpmanager/integration/type/Dependency.java
index 210a8433..2238429b 100644
--- a/pvpmanager/src/main/java/me/chancesd/pvpmanager/integration/type/Dependency.java
+++ b/pvpmanager/src/main/java/me/chancesd/pvpmanager/integration/type/Dependency.java
@@ -3,7 +3,7 @@
 import org.bukkit.plugin.java.JavaPlugin;
 
 import me.chancesd.pvpmanager.integration.Hook;
-import me.chancesd.pvpmanager.setting.Settings;
+import me.chancesd.pvpmanager.setting.Conf;
 
 public interface Dependency {
 
@@ -18,7 +18,7 @@ default String onEnableMessage() {
 	}
 
 	default boolean getConfigBoolean(final String key, final boolean def) {
-		return Settings.getPLUGINHOOKS().getBoolean(getName() + "." + key, def);
+		return Conf.getPluginHooks().getBoolean(getName() + "." + key, def);
 	}
 
 }
diff --git a/pvpmanager/src/main/java/me/chancesd/pvpmanager/integration/ForceToggleDependency.java b/pvpmanager/src/main/java/me/chancesd/pvpmanager/integration/type/ForceToggleDependency.java
similarity index 82%
rename from pvpmanager/src/main/java/me/chancesd/pvpmanager/integration/ForceToggleDependency.java
rename to pvpmanager/src/main/java/me/chancesd/pvpmanager/integration/type/ForceToggleDependency.java
index 05838d5e..73b27861 100644
--- a/pvpmanager/src/main/java/me/chancesd/pvpmanager/integration/ForceToggleDependency.java
+++ b/pvpmanager/src/main/java/me/chancesd/pvpmanager/integration/type/ForceToggleDependency.java
@@ -1,9 +1,8 @@
-package me.chancesd.pvpmanager.integration;
+package me.chancesd.pvpmanager.integration.type;
 
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 
-import me.chancesd.pvpmanager.integration.type.Dependency;
 import me.chancesd.pvpmanager.player.ProtectionType;
 
 public interface ForceToggleDependency extends Dependency {
diff --git a/pvpmanager/src/main/java/me/chancesd/pvpmanager/integration/GroupDependency.java b/pvpmanager/src/main/java/me/chancesd/pvpmanager/integration/type/GroupDependency.java
similarity index 74%
rename from pvpmanager/src/main/java/me/chancesd/pvpmanager/integration/GroupDependency.java
rename to pvpmanager/src/main/java/me/chancesd/pvpmanager/integration/type/GroupDependency.java
index 7f7653d8..dbba756f 100644
--- a/pvpmanager/src/main/java/me/chancesd/pvpmanager/integration/GroupDependency.java
+++ b/pvpmanager/src/main/java/me/chancesd/pvpmanager/integration/type/GroupDependency.java
@@ -1,9 +1,7 @@
-package me.chancesd.pvpmanager.integration;
+package me.chancesd.pvpmanager.integration.type;
 
 import org.bukkit.entity.Player;
 
-import me.chancesd.pvpmanager.integration.type.Dependency;
-
 /**
  * Represents a plugin that groups players in clans/factions/teams/etc. <br>
  * Allows checking if two players can attack each other or not.
diff --git a/pvpmanager/src/main/java/me/chancesd/pvpmanager/integration/type/WorldGuardDependency.java b/pvpmanager/src/main/java/me/chancesd/pvpmanager/integration/type/WorldGuardDependency.java
index d5a3d3f1..25b1943d 100644
--- a/pvpmanager/src/main/java/me/chancesd/pvpmanager/integration/type/WorldGuardDependency.java
+++ b/pvpmanager/src/main/java/me/chancesd/pvpmanager/integration/type/WorldGuardDependency.java
@@ -8,7 +8,6 @@
 import com.sk89q.worldguard.protection.flags.StateFlag.State;
 import com.sk89q.worldguard.protection.regions.ProtectedRegion;
 
-import me.chancesd.pvpmanager.integration.GroupDependency;
 import me.chancesd.pvpmanager.manager.PlayerManager;
 
 public interface WorldGuardDependency extends GroupDependency, RegionDependency {
diff --git a/pvpmanager/src/main/java/me/chancesd/pvpmanager/library/metrics/CustomMetrics.java b/pvpmanager/src/main/java/me/chancesd/pvpmanager/library/metrics/CustomMetrics.java
index 76243e1d..9331547c 100644
--- a/pvpmanager/src/main/java/me/chancesd/pvpmanager/library/metrics/CustomMetrics.java
+++ b/pvpmanager/src/main/java/me/chancesd/pvpmanager/library/metrics/CustomMetrics.java
@@ -4,69 +4,67 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Map.Entry;
-
 import org.bukkit.Bukkit;
 
 import me.chancesd.pvpmanager.PvPManager;
-import me.chancesd.pvpmanager.integration.Hook;
 import me.chancesd.pvpmanager.integration.type.Dependency;
-import me.chancesd.pvpmanager.setting.Settings;
+import me.chancesd.pvpmanager.setting.Conf;
 import me.chancesd.sdutils.metrics.Metrics;
 
 public class CustomMetrics {
 
 	public CustomMetrics(final PvPManager plugin) {
-		if (Settings.isReloading())
+		if (plugin.isReloading())
 			return;
 		initMetrics(plugin);
 	}
 
 	private void initMetrics(final PvPManager plugin) {
 
-		final Metrics metrics = new Metrics(plugin, 5653, Settings.isOptOutMetrics());
+		final Metrics metrics = new Metrics(plugin, 5653, Conf.METRICS_OPT_OUT.asBool());
 
 		metrics.addCustomChart(
-				new Metrics.SimplePie("time_in_combat", () -> Settings.isInCombatEnabled() ? Settings.getTimeInCombat() + " seconds" : "Disabled"));
+				new Metrics.SimplePie("time_in_combat",
+						() -> Conf.COMBAT_TAG_ENABLED.asBool() ? Conf.TIME_IN_COMBAT.asInt() + " seconds" : "Disabled"));
 
 		metrics.addCustomChart(new Metrics.DrilldownPie("features", () -> {
 			final Map<String, Map<String, Integer>> map = new HashMap<>();
 
-			map.put("Newbie Protection", getMapEntryFeature(Settings.isNewbieProtectionEnabled()));
-			map.put("Kill Abuse", getMapEntryFeature(Settings.isKillAbuseEnabled()));
-			map.put("Update Check", getMapEntry(!Settings.isUpdateCheck() ? "Disabled" : !Settings.isAutoUpdate() ? "Update Check" : "Auto Update"));
-			map.put("PvP Blood", getMapEntryFeature(Settings.isPvpBlood()));
-			map.put("Drop Mode", getMapEntry(Settings.getDropMode().toString()));
-			map.put("Combat Nametags", getMapEntryFeature(Settings.useNameTag()));
+			map.put("Newbie Protection", getMapEntryFeature(Conf.NEWBIE_ENABLED.asBool()));
+			map.put("Kill Abuse", getMapEntryFeature(Conf.KILL_ABUSE_ENABLED.asBool()));
+			map.put("Update Check", getMapEntry(!Conf.CHECK_UPDATES.asBool() ? "Disabled" : !Conf.AUTO_UPDATE.asBool() ? "Update Check" : "Auto Update"));
+			map.put("PvP Blood", getMapEntryFeature(Conf.PVP_BLOOD.asBool()));
+			map.put("Drop Mode", getMapEntry(Conf.PLAYER_DROP_MODE.asEnum(Conf.DropMode.class).toString()));
+			map.put("Combat Nametags", getMapEntryFeature(Conf.NAMETAG_COMBAT_ENABLED.asBool() || Conf.TOGGLE_NAMETAG_ENABLED.asBool()));
 			map.put("Database Type", getMapEntry(plugin.getStorageManager().getStorage().getDatabaseType().toString()));
-			if (Settings.isBossBarEnabled() && Settings.isActionBarEnabled())
+			if (Conf.BOSS_BAR_ENABLED.asBool() && Conf.ACTION_BAR_ENABLED.asBool())
 				map.put("Display Type", getMapEntry("Both"));
-			else if (!Settings.isBossBarEnabled() && !Settings.isActionBarEnabled())
+			else if (!Conf.BOSS_BAR_ENABLED.asBool() && !Conf.ACTION_BAR_ENABLED.asBool())
 				map.put("Display Type", getMapEntry("None"));
 			else
-				map.put("Display Type", getMapEntry(Settings.isBossBarEnabled() ? "Only Bossbar" : "Only Actionbar"));
+				map.put("Display Type", getMapEntry(Conf.BOSS_BAR_ENABLED.asBool() ? "Only Bossbar" : "Only Actionbar"));
 			return map;
 		}));
 
-		if (Settings.isInCombatEnabled()) {
+		if (Conf.COMBAT_TAG_ENABLED.asBool()) {
 			metrics.addCustomChart(new Metrics.SimplePie("player_drops_on_logout", () -> {
-				if (!Settings.isKillOnLogout())
+				if (!Conf.KILL_ON_LOGOUT.asBool())
 					return "Kill On Logout Disabled";
-				else if (!Settings.isDropInventory() && !Settings.isDropExp() && !Settings.isDropArmor())
+				else if (!Conf.DROP_INVENTORY.asBool() && !Conf.DROP_EXP.asBool() && !Conf.DROP_ARMOR.asBool())
 					return "Keep Everything";
-				else if (Settings.isDropInventory() && Settings.isDropExp() && Settings.isDropArmor())
+				else if (Conf.DROP_INVENTORY.asBool() && Conf.DROP_EXP.asBool() && Conf.DROP_ARMOR.asBool())
 					return "Drop Everything";
-				else if (!Settings.isDropInventory() && !Settings.isDropArmor() && Settings.isDropExp())
+				else if (!Conf.DROP_INVENTORY.asBool() && !Conf.DROP_ARMOR.asBool() && Conf.DROP_EXP.asBool())
 					return "Only Drop Exp";
-				else if (!Settings.isDropInventory() && !Settings.isDropExp() && Settings.isDropArmor())
+				else if (!Conf.DROP_INVENTORY.asBool() && !Conf.DROP_EXP.asBool() && Conf.DROP_ARMOR.asBool())
 					return "Only Drop Armor";
-				else if (Settings.isDropInventory() && !Settings.isDropExp() && !Settings.isDropArmor())
+				else if (Conf.DROP_INVENTORY.asBool() && !Conf.DROP_EXP.asBool() && !Conf.DROP_ARMOR.asBool())
 					return "Only Drop Inventory";
-				else if (!Settings.isDropInventory() && Settings.isDropExp() && Settings.isDropArmor())
+				else if (!Conf.DROP_INVENTORY.asBool() && Conf.DROP_EXP.asBool() && Conf.DROP_ARMOR.asBool())
 					return "Only Keep Inventory";
-				else if (Settings.isDropInventory() && Settings.isDropExp() && !Settings.isDropArmor())
+				else if (Conf.DROP_INVENTORY.asBool() && Conf.DROP_EXP.asBool() && !Conf.DROP_ARMOR.asBool())
 					return "Only Keep Armor";
-				else if (Settings.isDropInventory() && !Settings.isDropExp() && Settings.isDropArmor())
+				else if (Conf.DROP_INVENTORY.asBool() && !Conf.DROP_EXP.asBool() && Conf.DROP_ARMOR.asBool())
 					return "Only Keep Exp";
 				return "";
 			}));
@@ -74,8 +72,8 @@ else if (Settings.isDropInventory() && !Settings.isDropExp() && Settings.isDropA
 
 		metrics.addCustomChart(new Metrics.AdvancedPie("hooks", () -> {
 			final Map<String, Integer> valueMap = new HashMap<>();
-			for (final Entry<Hook, Dependency> entry : plugin.getDependencyManager().getDependencies().entrySet()) {
-				valueMap.put(entry.getValue().getName(), 1);
+			for (final Dependency entry : plugin.getDependencyManager().getDependencies()) {
+				valueMap.put(entry.getName(), 1);
 			}
 			final List<String> extra = Arrays.asList("GSit", "NametagEdit", "RedProtect", "GriefDefender", "Citizens",
 					"CMI", "TAB");
@@ -87,26 +85,26 @@ else if (Settings.isDropInventory() && !Settings.isDropExp() && Settings.isDropA
 			return valueMap;
 		}));
 
-		metrics.addCustomChart(new Metrics.SimplePie("locale", Settings::getLocale));
+		metrics.addCustomChart(new Metrics.SimplePie("locale", Conf.LOCALE::asString));
 
 		metrics.addCustomChart(
-				new Metrics.SingleLineChart("players_in_combat", () -> PvPManager.getInstance().getPlayerHandler().getPlayersInCombat().size()));
+				new Metrics.SingleLineChart("players_in_combat", () -> PvPManager.getInstance().getPlayerManager().getPlayersInCombat().size()));
 
 		metrics.addCustomChart(new Metrics.DrilldownPie("blocked_actions", () -> {
 			final Map<String, Map<String, Integer>> map = new HashMap<>();
 
-			map.put("EnderPearls", getMapEntry(Settings.isBlockEnderPearl()));
-			map.put("ChorusFruits", getMapEntry(Settings.isBlockChorusFruit()));
-			map.put("Teleport", getMapEntry(Settings.isBlockTeleport()));
-			map.put("Place Blocks", getMapEntry(Settings.isBlockPlaceBlocks()));
-			map.put("Interact", getMapEntry(Settings.blockInteract()));
-			map.put("Elytra", getMapEntry(Settings.isBlockGlide()));
-			map.put("Eat", getMapEntry(Settings.isBlockEat()));
-			map.put("Totem of Undying", getMapEntry(Settings.isBlockTotemUndying()));
-			map.put("Open Inventory", getMapEntry(Settings.isBlockInventoryOpen()));
+			map.put("EnderPearls", getMapEntry(Conf.BLOCK_ENDERPEARL.asBool()));
+			map.put("ChorusFruits", getMapEntry(Conf.BLOCK_CHORUSFRUIT.asBool()));
+			map.put("Teleport", getMapEntry(Conf.BLOCK_TELEPORT.asBool()));
+			map.put("Place Blocks", getMapEntry(Conf.BLOCK_PLACE_BLOCKS.asBool()));
+			map.put("Interact", getMapEntry(Conf.BLOCK_INTERACT_IN_COMBAT.asBool()));
+			map.put("Elytra", getMapEntry(Conf.BLOCK_GLIDE_IN_COMBAT.asBool()));
+			map.put("Eat", getMapEntry(Conf.BLOCK_EAT.asBool()));
+			map.put("Totem of Undying", getMapEntry(Conf.BLOCK_TOTEM_UNDYING.asBool()));
+			map.put("Open Inventory", getMapEntry(Conf.BLOCK_INVENTORY_OPEN.asBool()));
 			final HashMap<String, Integer> result = new HashMap<>();
-			if (Settings.isStopCommands()) {
-				if (Settings.isCommandsWhitelist())
+			if (Conf.BLOCK_COMMANDS.asBool()) {
+				if (Conf.BLOCK_COMMANDS_WHITELIST.asBool())
 					result.put("Whitelist", 1);
 				else
 					result.put("Blacklist", 1);
diff --git a/pvpmanager/src/main/java/me/chancesd/pvpmanager/listener/BlockedActionsListener.java b/pvpmanager/src/main/java/me/chancesd/pvpmanager/listener/BlockedActionsListener.java
new file mode 100644
index 00000000..115433d0
--- /dev/null
+++ b/pvpmanager/src/main/java/me/chancesd/pvpmanager/listener/BlockedActionsListener.java
@@ -0,0 +1,116 @@
+package me.chancesd.pvpmanager.listener;
+
+import me.chancesd.sdutils.utils.MCVersion;
+
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
+import org.bukkit.event.block.BlockPlaceEvent;
+import org.bukkit.event.inventory.InventoryOpenEvent;
+import org.bukkit.event.player.PlayerCommandPreprocessEvent;
+import org.bukkit.event.player.PlayerPickupItemEvent;
+import org.bukkit.event.player.PlayerTeleportEvent;
+import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
+import org.bukkit.event.player.PlayerToggleFlightEvent;
+import me.chancesd.pvpmanager.manager.PlayerManager;
+import me.chancesd.pvpmanager.player.CombatPlayer;
+import me.chancesd.pvpmanager.setting.Lang;
+import me.chancesd.pvpmanager.setting.Permissions;
+import me.chancesd.pvpmanager.setting.Conf;
+import me.chancesd.pvpmanager.utils.CombatUtils;
+
+public class BlockedActionsListener implements Listener {
+
+	private final PlayerManager playerHandler;
+
+	public BlockedActionsListener(final PlayerManager ph) {
+		this.playerHandler = ph;
+	}
+
+	@EventHandler(ignoreCancelled = true)
+	public final void onBlockPlace(final BlockPlaceEvent event) {
+		if (!Conf.BLOCK_PLACE_BLOCKS.asBool() && !Conf.NEWBIE_BLOCK_PLACE.asBool())
+			return;
+
+		final CombatPlayer combatPlayer = playerHandler.get(event.getPlayer());
+		if (Conf.BLOCK_PLACE_BLOCKS.asBool() && combatPlayer.isInCombat() || Conf.NEWBIE_BLOCK_PLACE.asBool() && combatPlayer.isNewbie()) {
+			event.setCancelled(true);
+			combatPlayer.sendActionBar(Lang.BLOCK_PLACE_BLOCKED_IN_COMBAT.msg(), 1000);
+		}
+	}
+
+	@EventHandler(ignoreCancelled = true)
+	public final void onToggleFlight(final PlayerToggleFlightEvent event) {
+		if (Conf.DISABLE_FLY.asBool() && event.isFlying() && playerHandler.get(event.getPlayer()).isInCombat()) {
+			event.setCancelled(true);
+		}
+	}
+
+	@SuppressWarnings("deprecation")
+	@EventHandler(ignoreCancelled = true)
+	public final void onPlayerPickup(final PlayerPickupItemEvent e) {
+		if (Conf.NEWBIE_ENABLED.asBool() && Conf.NEWBIE_BLOCK_PICK.asBool()) {
+			final CombatPlayer player = playerHandler.get(e.getPlayer());
+			if (player.isNewbie()) {
+				e.setCancelled(true);
+				player.sendActionBar(Lang.NEWBIE_PICKUP_ITEM_BLOCKED.msg(), 1000);
+			}
+		}
+	}
+
+	@EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true)
+	public final void onPlayerTeleport(final PlayerTeleportEvent event) {
+		final Player player = event.getPlayer();
+		if (CombatUtils.isNPC(player)) // Citizens seems to teleport NPCs very often so let's avoid creating new PvPlayer instances
+			return;
+
+		final CombatPlayer pvplayer = playerHandler.get(player);
+		if (!Conf.COMBAT_TAG_ENABLED.asBool() || !pvplayer.isInCombat())
+			return;
+
+		if (event.getCause().equals(TeleportCause.ENDER_PEARL) && Conf.BLOCK_ENDERPEARL.asBool()) {
+			event.setCancelled(true);
+			pvplayer.message(Lang.ENDERPEARL_BLOCKED_INCOMBAT);
+		} else if (MCVersion.isAtLeast(MCVersion.V1_9) && event.getCause() == TeleportCause.CHORUS_FRUIT
+				&& Conf.BLOCK_CHORUSFRUIT.asBool()) {
+			event.setCancelled(true);
+			pvplayer.message(Lang.CHORUS_BLOCKED_IN_COMBAT);
+		} else if (event.getCause().equals(TeleportCause.COMMAND) && Conf.BLOCK_TELEPORT.asBool()) {
+			event.setCancelled(true);
+			pvplayer.message(Lang.TELEPORT_BLOCKED_IN_COMBAT);
+		}
+	}
+
+	@EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true)
+	public final void onCommand(final PlayerCommandPreprocessEvent event) {
+		if (Conf.COMBAT_TAG_ENABLED.asBool() && Conf.BLOCK_COMMANDS.asBool() || Conf.NEWBIE_ENABLED.asBool()) {
+			final CombatPlayer player = playerHandler.get(event.getPlayer());
+			final String[] givenCommand = event.getMessage().substring(1).split(" ", 3);
+
+			if (player.isInCombat() && !player.hasPerm(Permissions.EXEMPT_BLOCK_COMMANDS)) {
+				final boolean contains = CombatUtils.recursiveContainsCommand(givenCommand, Conf.COMMANDS_ALLOWED.asList());
+				if (Conf.BLOCK_COMMANDS_WHITELIST.asBool() != contains) {
+					event.setCancelled(true);
+					player.message(Lang.COMMAND_DENIED_INCOMBAT);
+				}
+			}
+			if (player.isNewbie() && CombatUtils.recursiveContainsCommand(givenCommand, Conf.NEWBIE_BLACKLIST.asList())) {
+				event.setCancelled(true);
+				player.message(Lang.NEWBIE_COMMAND_BLOCKED.msg());
+			}
+		}
+	}
+
+	@EventHandler
+	public final void onInventoryOpen(final InventoryOpenEvent event) {
+		if (!Conf.BLOCK_INVENTORY_OPEN.asBool())
+			return;
+		final CombatPlayer combatPlayer = playerHandler.get((Player) event.getPlayer());
+		if (combatPlayer.isInCombat()) {
+			event.setCancelled(true);
+			combatPlayer.sendActionBar(Lang.INVENTORY_BLOCKED_IN_COMBAT.msg(), 1000);
+		}
+	}
+
+}
diff --git a/pvpmanager/src/main/java/me/chancesd/pvpmanager/listener/DebugEntityListener.java b/pvpmanager/src/main/java/me/chancesd/pvpmanager/listener/DebugEntityListener.java
index c7669aea..e61c3b7d 100644
--- a/pvpmanager/src/main/java/me/chancesd/pvpmanager/listener/DebugEntityListener.java
+++ b/pvpmanager/src/main/java/me/chancesd/pvpmanager/listener/DebugEntityListener.java
@@ -29,7 +29,7 @@
 import me.chancesd.pvpmanager.player.ProtectionResult;
 import me.chancesd.pvpmanager.player.ProtectionType;
 import me.chancesd.pvpmanager.setting.Permissions;
-import me.chancesd.pvpmanager.setting.Settings;
+import me.chancesd.pvpmanager.setting.Conf;
 import me.chancesd.pvpmanager.utils.CombatUtils;
 import me.chancesd.sdutils.utils.Log;
 import me.chancesd.sdutils.utils.MCVersion;
@@ -64,7 +64,7 @@ public final void onPlayerDamage(final EntityDamageByEntityEvent event) {
 				return;
 			}
 			final CombatPlayer attacked = ph.get((Player) event.getEntity());
-			if (attacked.isNewbie() && Settings.isNewbieGodMode()) {
+			if (attacked.isNewbie() && Conf.NEWBIE_GODMODE.asBool()) {
 				event.setCancelled(true);
 				Log.debug("Blocking damage to newbie because newbie god mode is enabled");
 				return;
@@ -124,11 +124,11 @@ public void onDamageActions(final Player attacker, final Player defender) {
 		final CombatPlayer pvpAttacker = ph.get(attacker);
 		final CombatPlayer pvpDefender = ph.get(defender);
 
-		if (Settings.isPvpBlood()) {
+		if (Conf.PVP_BLOOD.asBool()) {
 			defender.getWorld().playEffect(defender.getLocation(), Effect.STEP_SOUND, Material.REDSTONE_BLOCK);
 		}
 		if (!pvpAttacker.hasPerm(Permissions.EXEMPT_DISABLE_ACTIONS)) {
-			if (Settings.isDisableFly()) {
+			if (Conf.DISABLE_FLY.asBool()) {
 				if (CombatUtils.canFly(attacker)) {
 					pvpAttacker.disableFly();
 				}
@@ -136,29 +136,29 @@ public void onDamageActions(final Player attacker, final Player defender) {
 					pvpDefender.disableFly();
 				}
 			}
-			if (Settings.isDisableGamemode() && !attacker.getGameMode().equals(GameMode.SURVIVAL)) {
+			if (Conf.DISABLE_GAMEMODE.asBool() && !attacker.getGameMode().equals(GameMode.SURVIVAL)) {
 				attacker.setGameMode(GameMode.SURVIVAL);
 			}
-			if (Settings.isDisableDisguise()) {
+			if (Conf.DISABLE_DISGUISE.asBool()) {
 				ph.getPlugin().getDependencyManager().disableDisguise(attacker);
 			}
-			if (Settings.isDisableInvisibility() && attacker.hasPotionEffect(PotionEffectType.INVISIBILITY)) {
+			if (Conf.DISABLE_INVISIBILITY.asBool() && attacker.hasPotionEffect(PotionEffectType.INVISIBILITY)) {
 				attacker.removePotionEffect(PotionEffectType.INVISIBILITY);
 			}
-			if (Settings.isDisableGodMode()) {
+			if (Conf.DISABLE_GODMODE.asBool()) {
 				ph.getPlugin().getDependencyManager().disableGodMode(attacker);
 			}
 		} else {
 			Log.debug("Didn't disable fly/gamemode/etc because attacker has permission " + Permissions.EXEMPT_DISABLE_ACTIONS);
 		}
-		if (Settings.isInCombatEnabled()) {
-			if (Settings.borderHoppingVulnerable() && wg != null && !Settings.borderHoppingResetCombatTag() && wg.hasDenyPvPFlag(attacker)
+		if (Conf.COMBAT_TAG_ENABLED.asBool()) {
+			if (Conf.VULNERABLE_ENABLED.asBool() && wg != null && !Conf.VULNERABLE_RENEW_TAG.asBool() && wg.hasDenyPvPFlag(attacker)
 					&& wg.hasDenyPvPFlag(defender)) {
 					return;
 			}
 			Log.debug("Tagging players " + pvpAttacker.getName() + " and " + pvpDefender.getName());
-			pvpAttacker.setTagged(true, pvpDefender);
-			pvpDefender.setTagged(false, pvpAttacker);
+			pvpAttacker.tag(true, pvpDefender);
+			pvpDefender.tag(false, pvpAttacker);
 		}
 	}
 
diff --git a/pvpmanager/src/main/java/me/chancesd/pvpmanager/listener/EntityListener.java b/pvpmanager/src/main/java/me/chancesd/pvpmanager/listener/EntityListener.java
index e410a96c..2f02dd03 100644
--- a/pvpmanager/src/main/java/me/chancesd/pvpmanager/listener/EntityListener.java
+++ b/pvpmanager/src/main/java/me/chancesd/pvpmanager/listener/EntityListener.java
@@ -42,7 +42,7 @@
 import me.chancesd.pvpmanager.player.ProtectionType;
 import me.chancesd.pvpmanager.setting.Lang;
 import me.chancesd.pvpmanager.setting.Permissions;
-import me.chancesd.pvpmanager.setting.Settings;
+import me.chancesd.pvpmanager.setting.Conf;
 import me.chancesd.pvpmanager.utils.CombatUtils;
 import me.chancesd.sdutils.utils.MCVersion;
 
@@ -66,7 +66,7 @@ public final void onPlayerDamage(final EntityDamageByEntityEvent event) {
 				return;
 
 			final CombatPlayer attacked = playerHandler.get((Player) event.getEntity());
-			if (attacked.isNewbie() && Settings.isNewbieGodMode()) {
+			if (attacked.isNewbie() && Conf.NEWBIE_GODMODE.asBool()) {
 				event.setCancelled(true);
 			} else if (event.getDamager() instanceof final LightningStrike lightning) {
 				if (!lightningCache.asMap().containsKey(lightning))
@@ -119,7 +119,7 @@ public final void onEntityCombust(final EntityCombustByEntityEvent event) {
 		if (CombatUtils.isWorldExcluded(event.getEntity().getWorld().getName()))
 			return;
 		if (!CombatUtils.isPvP(event)) {
-			if (event.getEntity() instanceof final Player player && playerHandler.get(player).isNewbie() && Settings.isNewbieGodMode()) {
+			if (event.getEntity() instanceof final Player player && playerHandler.get(player).isNewbie() && Conf.NEWBIE_GODMODE.asBool()) {
 				event.setCancelled(true);
 			}
 			return;
@@ -140,24 +140,24 @@ public void processDamage(final Player attacker, final Player defender) {
 		final CombatPlayer pvpAttacker = playerHandler.get(attacker);
 		final CombatPlayer pvpDefender = playerHandler.get(defender);
 
-		if (Settings.isPvpBlood()) {
+		if (Conf.PVP_BLOOD.asBool()) {
 			defender.getWorld().playEffect(defender.getLocation(), Effect.STEP_SOUND, Material.REDSTONE_BLOCK);
 		}
 		disableActions(attacker, defender, pvpAttacker, pvpDefender);
-		if (Settings.isInCombatEnabled()) {
-			if (Settings.borderHoppingVulnerable() && wg != null && !Settings.borderHoppingResetCombatTag() && wg.hasDenyPvPFlag(attacker)
+		if (Conf.COMBAT_TAG_ENABLED.asBool()) {
+			if (Conf.VULNERABLE_ENABLED.asBool() && wg != null && !Conf.VULNERABLE_RENEW_TAG.asBool() && wg.hasDenyPvPFlag(attacker)
 					&& wg.hasDenyPvPFlag(defender)) {
 				return;
 			}
-			pvpAttacker.setTagged(true, pvpDefender);
-			pvpDefender.setTagged(false, pvpAttacker);
+			pvpAttacker.tag(true, pvpDefender);
+			pvpDefender.tag(false, pvpAttacker);
 		}
 	}
 
 	@SuppressWarnings("null") // PotionEffectType.INVISIBILITY is not null
 	private void disableActions(final Player attacker, final Player defender, final CombatPlayer pvpAttacker, final CombatPlayer pvpDefender) {
 		final boolean hasExemptPerm = pvpAttacker.hasPerm(Permissions.EXEMPT_DISABLE_ACTIONS);
-		if (Settings.isDisableFly()) {
+		if (Conf.DISABLE_FLY.asBool()) {
 			if (CombatUtils.canFly(attacker) && !hasExemptPerm) {
 				pvpAttacker.disableFly();
 			}
@@ -165,7 +165,7 @@ private void disableActions(final Player attacker, final Player defender, final
 				pvpDefender.disableFly();
 			}
 		}
-		if (Settings.isDisableElytra()) {
+		if (Conf.DISABLE_ELYTRA.asBool()) {
 			if (!hasExemptPerm)
 				CombatUtils.checkGlide(attacker);
 			if (!pvpDefender.hasPerm(Permissions.EXEMPT_DISABLE_ACTIONS))
@@ -174,16 +174,16 @@ private void disableActions(final Player attacker, final Player defender, final
 
 		if (hasExemptPerm)
 			return;
-		if (Settings.isDisableGamemode() && attacker.getGameMode() != GameMode.SURVIVAL) {
+		if (Conf.DISABLE_GAMEMODE.asBool() && attacker.getGameMode() != GameMode.SURVIVAL) {
 			attacker.setGameMode(GameMode.SURVIVAL);
 		}
-		if (Settings.isDisableDisguise()) {
+		if (Conf.DISABLE_DISGUISE.asBool()) {
 			playerHandler.getPlugin().getDependencyManager().disableDisguise(attacker);
 		}
-		if (Settings.isDisableInvisibility() && attacker.hasPotionEffect(PotionEffectType.INVISIBILITY)) {
+		if (Conf.DISABLE_INVISIBILITY.asBool() && attacker.hasPotionEffect(PotionEffectType.INVISIBILITY)) {
 			attacker.removePotionEffect(PotionEffectType.INVISIBILITY);
 		}
-		if (Settings.isDisableGodMode()) {
+		if (Conf.DISABLE_GODMODE.asBool()) {
 			playerHandler.getPlugin().getDependencyManager().disableGodMode(attacker);
 		}
 	}
@@ -279,13 +279,13 @@ public void onBlockIgnite(final BlockIgniteEvent event) {
 	public void onProjectileHitEvent(final ProjectileHitEvent event) {
 		final Projectile entity = event.getEntity();
 		final ProjectileSource shooter = entity.getShooter();
-		if (!Settings.isEnderPearlRenewTag() || entity.getType() != EntityType.ENDER_PEARL || !(shooter instanceof final Player player))
+		if (!Conf.PEARL_RENEW_TAG.asBool() || entity.getType() != EntityType.ENDER_PEARL || !(shooter instanceof final Player player))
 			return;
 
 		final CombatPlayer pvPlayer = playerHandler.get(player);
 
 		if (pvPlayer.isInCombat()) {
-			pvPlayer.setTagged(true, pvPlayer);
+			pvPlayer.tag(true, pvPlayer);
 		}
 	}
 
diff --git a/pvpmanager/src/main/java/me/chancesd/pvpmanager/listener/EntityListener1_9.java b/pvpmanager/src/main/java/me/chancesd/pvpmanager/listener/EntityListener1_9.java
index 327ae1e3..c107c65e 100644
--- a/pvpmanager/src/main/java/me/chancesd/pvpmanager/listener/EntityListener1_9.java
+++ b/pvpmanager/src/main/java/me/chancesd/pvpmanager/listener/EntityListener1_9.java
@@ -7,20 +7,15 @@
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;
 
-import org.bukkit.Material;
 import org.bukkit.entity.AreaEffectCloud;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
-import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 import org.bukkit.event.entity.AreaEffectCloudApplyEvent;
 import org.bukkit.event.entity.EntityToggleGlideEvent;
-import org.bukkit.event.player.PlayerItemConsumeEvent;
-import org.bukkit.inventory.ItemStack;
-import org.bukkit.inventory.PlayerInventory;
 import org.bukkit.projectiles.ProjectileSource;
 import com.google.common.cache.Cache;
 import com.google.common.cache.CacheBuilder;
@@ -29,9 +24,8 @@
 import me.chancesd.pvpmanager.player.CombatPlayer;
 import me.chancesd.pvpmanager.player.ProtectionResult;
 import me.chancesd.pvpmanager.setting.Lang;
-import me.chancesd.pvpmanager.setting.Settings;
+import me.chancesd.pvpmanager.setting.Conf;
 import me.chancesd.pvpmanager.utils.CombatUtils;
-import me.chancesd.pvpmanager.utils.ScheduleUtils;
 
 public class EntityListener1_9 implements Listener {
 
@@ -44,7 +38,7 @@ public EntityListener1_9(final PlayerManager ph) {
 
 	@EventHandler(ignoreCancelled = true)
 	public void onEntityGlide(final EntityToggleGlideEvent event) {
-		if (!Settings.isBlockGlide() || !event.isGliding())
+		if (!Conf.BLOCK_GLIDE_IN_COMBAT.asBool() || !event.isGliding())
 			return;
 		final CombatPlayer combatPlayer = ph.get((Player) event.getEntity());
 		if (combatPlayer.isInCombat()) {
@@ -93,25 +87,4 @@ public final void onLingeringPotionSplash(final AreaEffectCloudApplyEvent event)
 		event.getAffectedEntities().removeAll(toRemove);
 	}
 
-	@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-	public void onConsume(final PlayerItemConsumeEvent e) {
-		if (!Settings.isRecyclePotionBottles() && !Settings.isRecycleMilkBucket())
-			return;
-
-		final Material type = e.getItem().getType();
-		if ((type != Material.POTION || !Settings.isRecyclePotionBottles()) && (type != Material.MILK_BUCKET || !Settings.isRecycleMilkBucket()))
-			return;
-		final Player player = e.getPlayer();
-		final PlayerInventory inventory = player.getInventory();
-		final int heldSlot = inventory.getHeldItemSlot();
-		ScheduleUtils.runPlatformTaskLater(() -> {
-			final ItemStack held = inventory.getItem(heldSlot);
-			final ItemStack off = inventory.getItemInOffHand();
-			if (held != null && (held.getType() == Material.GLASS_BOTTLE || held.getType() == Material.BUCKET))
-				held.setAmount(0);
-			if (off.getType() == Material.GLASS_BOTTLE || off.getType() == Material.BUCKET)
-				off.setAmount(0);
-		}, player, 1);
-	}
-
 }
diff --git a/pvpmanager/src/main/java/me/chancesd/pvpmanager/listener/PlayerListener.java b/pvpmanager/src/main/java/me/chancesd/pvpmanager/listener/PlayerListener.java
index e4f6b971..5c814ef4 100644
--- a/pvpmanager/src/main/java/me/chancesd/pvpmanager/listener/PlayerListener.java
+++ b/pvpmanager/src/main/java/me/chancesd/pvpmanager/listener/PlayerListener.java
@@ -2,8 +2,6 @@
 
 import me.chancesd.pvpmanager.utils.TimeUtil;
 import me.chancesd.sdutils.utils.Log;
-import me.chancesd.sdutils.utils.MCVersion;
-
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;
 
@@ -15,23 +13,16 @@
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 import org.bukkit.event.block.Action;
-import org.bukkit.event.block.BlockPlaceEvent;
 import org.bukkit.event.entity.PlayerDeathEvent;
-import org.bukkit.event.inventory.InventoryOpenEvent;
 import org.bukkit.event.player.PlayerChangedWorldEvent;
-import org.bukkit.event.player.PlayerCommandPreprocessEvent;
 import org.bukkit.event.player.PlayerFishEvent;
 import org.bukkit.event.player.PlayerFishEvent.State;
 import org.bukkit.event.player.PlayerInteractEvent;
 import org.bukkit.event.player.PlayerItemConsumeEvent;
 import org.bukkit.event.player.PlayerJoinEvent;
 import org.bukkit.event.player.PlayerKickEvent;
-import org.bukkit.event.player.PlayerPickupItemEvent;
 import org.bukkit.event.player.PlayerQuitEvent;
 import org.bukkit.event.player.PlayerRespawnEvent;
-import org.bukkit.event.player.PlayerTeleportEvent;
-import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
-import org.bukkit.event.player.PlayerToggleFlightEvent;
 import org.bukkit.inventory.ItemStack;
 
 import com.google.common.cache.Cache;
@@ -42,65 +33,40 @@
 import me.chancesd.pvpmanager.manager.PlayerManager;
 import me.chancesd.pvpmanager.player.CombatPlayer;
 import me.chancesd.pvpmanager.player.ProtectionResult;
+import me.chancesd.pvpmanager.player.UntagReason;
 import me.chancesd.pvpmanager.player.world.CombatWorld;
 import me.chancesd.pvpmanager.setting.Lang;
 import me.chancesd.pvpmanager.setting.Permissions;
-import me.chancesd.pvpmanager.setting.Settings;
+import me.chancesd.pvpmanager.setting.Conf;
 import me.chancesd.pvpmanager.utils.CombatUtils;
 import me.chancesd.pvpmanager.utils.ScheduleUtils;
 
-@SuppressWarnings("deprecation")
 public class PlayerListener implements Listener {
 
 	private final PlayerManager playerHandler;
 	private final WorldGuardDependency wg;
-	private Material mushroomSoup;
 	private final Cache<UUID, String> msgCooldown = CacheBuilder.newBuilder().weakValues().expireAfterWrite(800, TimeUnit.MILLISECONDS).build();
 
 	public PlayerListener(final PlayerManager ph) {
 		this.playerHandler = ph;
 		this.wg = (WorldGuardDependency) ph.getPlugin().getDependencyManager().getDependency(Hook.WORLDGUARD);
-		if (MCVersion.isAtLeast(MCVersion.V1_13)) {
-			mushroomSoup = Material.MUSHROOM_STEW;
-		} else if (MCVersion.isAtLeast(MCVersion.V1_8)) { // avoid loading Material class on unit tests
-			mushroomSoup = Material.getMaterial("MUSHROOM_SOUP");
-		}
-	}
-
-	@EventHandler(ignoreCancelled = true)
-	public final void onBlockPlace(final BlockPlaceEvent event) {
-		if (!Settings.isBlockPlaceBlocks() && !Settings.isBlockPlaceBlocksNewbie())
-			return;
-
-		final CombatPlayer combatPlayer = playerHandler.get(event.getPlayer());
-		if (Settings.isBlockPlaceBlocks() && combatPlayer.isInCombat() || Settings.isBlockPlaceBlocksNewbie() && combatPlayer.isNewbie()) {
-			event.setCancelled(true);
-			combatPlayer.sendActionBar(Lang.BLOCK_PLACE_BLOCKED_IN_COMBAT.msg(), 1000);
-		}
-	}
-
-	@EventHandler(ignoreCancelled = true)
-	public final void onToggleFlight(final PlayerToggleFlightEvent event) {
-		if (Settings.isDisableFly() && event.isFlying() && playerHandler.get(event.getPlayer()).isInCombat()) {
-			event.setCancelled(true);
-		}
 	}
 
 	@EventHandler(ignoreCancelled = true)
 	public final void onPlayerEat(final PlayerItemConsumeEvent event) {
 		final Material type = event.getItem().getType();
 		final CombatPlayer player = playerHandler.get(event.getPlayer());
-		if (Settings.isBlockEat() && player.isInCombat() && type.isEdible()) {
+		if (Conf.BLOCK_EAT.asBool() && player.isInCombat() && type.isEdible()) {
 			event.setCancelled(true);
 			playerHandler.get(event.getPlayer()).sendActionBar(Lang.EAT_BLOCKED_IN_COMBAT.msg(), 1000);
 		}
-		if (Settings.getItemCooldowns().containsKey(type)) {
+		if (Conf.ITEM_COOLDOWNS.asMap().containsKey(type)) {
 			if (player.hasItemCooldown(type)) {
 				event.setCancelled(true);
 				player.message(Lang.ITEM_COOLDOWN.msg(TimeUtil.getDiffMsg(player.getItemCooldown(type))));
 				return;
 			}
-			player.setItemCooldown(type, Settings.getItemCooldowns().get(type));
+			player.setItemCooldown(type, Conf.ITEM_COOLDOWNS.asMap().get(type));
 		}
 	}
 
@@ -109,12 +75,12 @@ public final void onPlayerKick(final PlayerKickEvent event) {
 		final Player player = event.getPlayer();
 		Log.debugLazy(() -> player.getName() + " was kicked with reason: " + event.getReason() + " | Leave message: " + event.getLeaveMessage()
 				+ " - In combat: " + playerHandler.get(player).isInCombat());
-		if (Settings.punishOnKick() && (!Settings.matchKickReason() || Settings.getPunishKickReasons().contains(event.getReason())))
+		if (Conf.PUNISH_ON_KICK.asBool() && (!Conf.MATCH_KICK_REASON.asBool() || Conf.PUNISH_KICK_REASONS.asList().contains(event.getReason())))
 			return;
 
 		final CombatPlayer pvPlayer = playerHandler.get(player);
 		if (pvPlayer.isInCombat()) {
-			pvPlayer.unTag();
+			pvPlayer.untag(UntagReason.KICKED);
 		}
 	}
 
@@ -124,10 +90,8 @@ public final void onPlayerLogout(final PlayerQuitEvent event) {
 		final CombatPlayer pvPlayer = playerHandler.get(player);
 		Log.debug(player.getName() + " quit with reason: " + event.getQuitMessage() + " - In combat: " + pvPlayer.isInCombat());
 		if (pvPlayer.isInCombat() && !pvPlayer.hasPerm(Permissions.EXEMPT_COMBAT_LOG)) {
-			if (Settings.isLogToFile()) {
-				playerHandler.getConfigManager().getLog().log(player.getName() + " tried to escape combat!");
-			}
-			CombatUtils.executeCommands(Settings.getCommandsOnPvPLog(), player, player.getName());
+			playerHandler.getConfigManager().getLog().log(player.getName() + " tried to escape combat!");
+			CombatUtils.executeCommands(Conf.COMMANDS_ON_COMBATLOG.asList(), player, player.getName());
 			playerHandler.applyPunishments(pvPlayer);
 		}
 	}
@@ -153,10 +117,10 @@ public final void onPlayerDeath(final PlayerDeathEvent event) {
 		}
 
 		if (pvPlayer.isInCombat()) {
-			pvPlayer.unTag();
+			pvPlayer.untag(UntagReason.DEATH);
 			final CombatPlayer enemy = pvPlayer.getEnemy();
-			if (Settings.isUntagEnemy() && enemy != null && pvPlayer.equals(enemy.getEnemy())) {
-				enemy.unTag();
+			if (Conf.UNTAG_ON_KILL.asBool() && enemy != null && pvPlayer.equals(enemy.getEnemy())) {
+				enemy.untag(UntagReason.KILLED_ENEMY);
 			}
 		}
 
@@ -170,53 +134,37 @@ public final void onPlayerDeath(final PlayerDeathEvent event) {
 	}
 
 	private void handlePvPDeath(final Player player, final CombatPlayer pvPlayer, final Player killer, final CombatPlayer pKiller, final PlayerDeathEvent event) {
-		if (Settings.isKillAbuseEnabled() && !pKiller.hasPerm(Permissions.EXEMPT_KILL_ABUSE)) {
+		if (Conf.KILL_ABUSE_ENABLED.asBool() && !pKiller.hasPerm(Permissions.EXEMPT_KILL_ABUSE)) {
 			pKiller.addVictim(player);
 		}
-		if (wg == null || !wg.containsRegionsAt(killer.getLocation(), Settings.getKillsWGExclusions())) {
-			if (Settings.getMoneyReward() > 0) {
+		if (wg == null || !wg.containsRegionsAt(killer.getLocation(), Conf.KILLS_WG_EXCLUSIONS.asSet())) {
+			if (Conf.MONEY_REWARD.asDouble() > 0) {
 				pKiller.giveReward(pvPlayer);
 			}
-			if (Settings.getMoneyPenalty() > 0) {
+			if (Conf.MONEY_PENALTY.asDouble() > 0) {
 				pvPlayer.applyPenalty();
 			}
-			if (Settings.getExpSteal() > 0) {
+			if (Conf.EXP_STEAL.asDouble() > 0) {
 				final int expWon = pKiller.giveExp(pvPlayer);
 				event.setDroppedExp(0);
 				event.setNewExp(player.getTotalExperience() - expWon);
 				pvPlayer.message(Lang.EXP_STOLEN.msg(pKiller.getName(), String.valueOf(expWon)));
 			}
-			CombatUtils.executeCommands(Settings.getCommandsOnKill(), killer, killer.getName(), player.getName());
+			CombatUtils.executeCommands(Conf.COMMANDS_ON_KILL.asList(), killer, killer.getName(), player.getName());
 		}
 	}
 
+	@SuppressWarnings("deprecation")
 	@EventHandler
-	public final void onPlayerUseSoup(final PlayerInteractEvent e) {
+	public final void onPlayerCooldown(final PlayerInteractEvent e) {
 		final Player player = e.getPlayer();
 		if (CombatUtils.isWorldExcluded(player.getWorld().getName()))
 			return;
 
 		final ItemStack i = player.getItemInHand();
 		final Material type = i.getType();
-		if (Settings.isAutoSoupEnabled() && type == mushroomSoup) {
-			if (player.getHealth() == player.getMaxHealth())
-				return;
-			player.setHealth(
-					player.getHealth() + Settings.getSoupHealth() > player.getMaxHealth() ? player.getMaxHealth()
-							: player.getHealth() + Settings.getSoupHealth());
-			if (Settings.isSoupBowlDisappear()) {
-				if (MCVersion.isAtLeast(MCVersion.V1_9)) {
-					player.getInventory().getItemInMainHand().setAmount(0);
-				} else {
-					player.getInventory().setItemInHand(null);
-					e.setCancelled(true);
-				}
-			} else {
-				i.setType(Material.BOWL);
-			}
-		}
 		final CombatPlayer pvplayer = playerHandler.get(player);
-		if ((e.getAction() == Action.RIGHT_CLICK_BLOCK || e.getAction() == Action.RIGHT_CLICK_AIR) && Settings.getItemCooldowns().containsKey(type)) {
+		if ((e.getAction() == Action.RIGHT_CLICK_BLOCK || e.getAction() == Action.RIGHT_CLICK_AIR) && Conf.ITEM_COOLDOWNS.asMap().containsKey(type)) {
 			if (pvplayer.hasItemCooldown(type)) {
 				final String msg = Lang.ITEM_COOLDOWN.msg(TimeUtil.getDiffMsg(pvplayer.getItemCooldown(type)));
 				if (!msg.equals(msgCooldown.getIfPresent(player.getUniqueId()))) {
@@ -225,7 +173,7 @@ public final void onPlayerUseSoup(final PlayerInteractEvent e) {
 				}
 				e.setCancelled(true);
 			} else if (!type.isEdible()) {
-				Bukkit.getScheduler().runTask(playerHandler.getPlugin(), () -> pvplayer.setItemCooldown(type, Settings.getItemCooldowns().get(type)));
+				Bukkit.getScheduler().runTask(playerHandler.getPlugin(), () -> pvplayer.setItemCooldown(type, Conf.ITEM_COOLDOWNS.asMap().get(type)));
 			}
 		}
 	}
@@ -256,9 +204,9 @@ public final void onPlayerInteract(final PlayerInteractEvent e) {
 				}
 			}
 		}
-		if (Settings.blockInteract() && pvplayer.isInCombat()) {
+		if (Conf.BLOCK_INTERACT_IN_COMBAT.asBool() && pvplayer.isInCombat()) {
 			final Material type = clickedBlock.getType();
-			for (final String material : Settings.getBlockInteractItemList()) {
+			for (final String material : Conf.BLOCK_INTERACT_ITEM_LIST.asList()) {
 				if (type.name().endsWith(material)) {
 					e.setCancelled(true);
 					pvplayer.sendActionBar(Lang.INTERACT_BLOCKED_IN_COMBAT.msg(), 1000);
@@ -268,17 +216,6 @@ public final void onPlayerInteract(final PlayerInteractEvent e) {
 		}
 	}
 
-	@EventHandler(ignoreCancelled = true)
-	public final void onPlayerPickup(final PlayerPickupItemEvent e) {
-		if (Settings.isNewbieProtectionEnabled() && Settings.isBlockPickNewbies()) {
-			final CombatPlayer player = playerHandler.get(e.getPlayer());
-			if (player.isNewbie()) {
-				e.setCancelled(true);
-				player.sendActionBar(Lang.NEWBIE_PICKUP_ITEM_BLOCKED.msg(), 1000);
-			}
-		}
-	}
-
 	@EventHandler
 	public final void onPlayerJoin(final PlayerJoinEvent event) {
 		final Player player = event.getPlayer();
@@ -290,49 +227,6 @@ public final void onPlayerJoin(final PlayerJoinEvent event) {
 		});
 	}
 
-	@EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true)
-	public final void onPlayerTeleport(final PlayerTeleportEvent event) {
-		final Player player = event.getPlayer();
-		if (CombatUtils.isNPC(player)) // Citizens seems to teleport NPCs very often so let's avoid creating new PvPlayer instances
-			return;
-
-		final CombatPlayer pvplayer = playerHandler.get(player);
-		if (!Settings.isInCombatEnabled() || !pvplayer.isInCombat())
-			return;
-
-		if (event.getCause().equals(TeleportCause.ENDER_PEARL) && Settings.isBlockEnderPearl()) {
-			event.setCancelled(true);
-			pvplayer.message(Lang.ENDERPEARL_BLOCKED_INCOMBAT);
-		} else if (MCVersion.isAtLeast(MCVersion.V1_9) && event.getCause() == TeleportCause.CHORUS_FRUIT
-		        && Settings.isBlockChorusFruit()) {
-			event.setCancelled(true);
-			pvplayer.message(Lang.CHORUS_BLOCKED_IN_COMBAT);
-		} else if (event.getCause().equals(TeleportCause.COMMAND) && Settings.isBlockTeleport()) {
-			event.setCancelled(true);
-			pvplayer.message(Lang.TELEPORT_BLOCKED_IN_COMBAT);
-		}
-	}
-
-	@EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true)
-	public final void onCommand(final PlayerCommandPreprocessEvent event) {
-		if (Settings.isInCombatEnabled() && Settings.isStopCommands() || Settings.isNewbieProtectionEnabled()) {
-			final CombatPlayer player = playerHandler.get(event.getPlayer());
-			final String[] givenCommand = event.getMessage().substring(1).split(" ", 3);
-
-			if (player.isInCombat() && !player.hasPerm(Permissions.EXEMPT_BLOCK_COMMANDS)) {
-				final boolean contains = CombatUtils.recursiveContainsCommand(givenCommand, Settings.getCommandsAllowed());
-				if (Settings.isCommandsWhitelist() != contains) {
-					event.setCancelled(true);
-					player.message(Lang.COMMAND_DENIED_INCOMBAT);
-				}
-			}
-			if (player.isNewbie() && CombatUtils.recursiveContainsCommand(givenCommand, Settings.getNewbieBlacklist())) {
-				event.setCancelled(true);
-				player.message(Lang.NEWBIE_COMMAND_BLOCKED.msg());
-			}
-		}
-	}
-
 	@EventHandler(ignoreCancelled = true)
 	public final void onPlayerFish(final PlayerFishEvent event) {
 		final Player player = event.getPlayer();
@@ -354,23 +248,12 @@ public final void onPlayerFish(final PlayerFishEvent event) {
 	public final void onPlayerRespawn(final PlayerRespawnEvent event) {
 		if (CombatUtils.isWorldExcluded(event.getPlayer().getWorld().getName()))
 			return;
-		if (Settings.isKillAbuseEnabled() && Settings.getRespawnProtection() != 0) {
+		if (Conf.KILL_ABUSE_ENABLED.asBool() && Conf.RESPAWN_PROTECTION.asInt() != 0) {
 			final CombatPlayer player = playerHandler.get(event.getPlayer());
 			player.setRespawnTime(System.currentTimeMillis());
 		}
 	}
 
-	@EventHandler
-	public final void onInventoryOpen(final InventoryOpenEvent event) {
-		if (!Settings.isBlockInventoryOpen())
-			return;
-		final CombatPlayer combatPlayer = playerHandler.get((Player) event.getPlayer());
-		if (combatPlayer.isInCombat()) {
-			event.setCancelled(true);
-			combatPlayer.sendActionBar(Lang.INVENTORY_BLOCKED_IN_COMBAT.msg(), 1000);
-		}
-	}
-
 	@EventHandler
 	public void onChangeWorld(final PlayerChangedWorldEvent event) {
 		final Player player = event.getPlayer();
diff --git a/pvpmanager/src/main/java/me/chancesd/pvpmanager/listener/PlayerListener1_11.java b/pvpmanager/src/main/java/me/chancesd/pvpmanager/listener/PlayerListener1_11.java
index 9b52f537..2b817cec 100644
--- a/pvpmanager/src/main/java/me/chancesd/pvpmanager/listener/PlayerListener1_11.java
+++ b/pvpmanager/src/main/java/me/chancesd/pvpmanager/listener/PlayerListener1_11.java
@@ -12,8 +12,9 @@
 
 import me.chancesd.pvpmanager.manager.PlayerManager;
 import me.chancesd.pvpmanager.player.CombatPlayer;
+import me.chancesd.pvpmanager.setting.ItemCooldown;
 import me.chancesd.pvpmanager.setting.Lang;
-import me.chancesd.pvpmanager.setting.Settings;
+import me.chancesd.pvpmanager.setting.Conf;
 import me.chancesd.pvpmanager.utils.ScheduleUtils;
 
 public class PlayerListener1_11 implements Listener {
@@ -28,21 +29,20 @@ public PlayerListener1_11(final PlayerManager ph) {
 	public void onProjectileLaunchEvent(final ProjectileLaunchEvent event) {
 		final Projectile entity = event.getEntity();
 		final ProjectileSource shooter = entity.getShooter();
-		if (Settings.getEnderPearlCooldown() <= 0 || entity.getType() != EntityType.ENDER_PEARL || !(shooter instanceof Player))
+		final ItemCooldown itemCooldown = Conf.ITEM_COOLDOWNS.asMap().get(Material.ENDER_PEARL);
+		if (itemCooldown == null || entity.getType() != EntityType.ENDER_PEARL || !(shooter instanceof Player))
 			return;
 
 		final Player player = (Player) shooter;
 		final CombatPlayer pvPlayer = playerHandler.get(player);
 
-		if (pvPlayer.isInCombat()) {
-			// TODO add feedback while on cooldown
-			ScheduleUtils.runPlatformTask(() -> player.setCooldown(Material.ENDER_PEARL, Settings.getEnderPearlCooldown() * 20), player);
-		}
+		// Run in next tick otherwise doesn't work
+		ScheduleUtils.runPlatformTask(() -> pvPlayer.setItemCooldown(Material.ENDER_PEARL, itemCooldown), player);
 	}
 
 	@EventHandler
 	public void onEntityRessurrect(final EntityResurrectEvent event) {
-		if (!Settings.isBlockTotemUndying() || event.isCancelled() || event.getEntityType() != EntityType.PLAYER)
+		if (!Conf.BLOCK_TOTEM_UNDYING.asBool() || event.isCancelled() || event.getEntityType() != EntityType.PLAYER)
 			return;
 
 		final Player player = (Player) event.getEntity();
diff --git a/pvpmanager/src/main/java/me/chancesd/pvpmanager/manager/ConfigManager.java b/pvpmanager/src/main/java/me/chancesd/pvpmanager/manager/ConfigManager.java
index 5ebc7b8e..51abfcbc 100644
--- a/pvpmanager/src/main/java/me/chancesd/pvpmanager/manager/ConfigManager.java
+++ b/pvpmanager/src/main/java/me/chancesd/pvpmanager/manager/ConfigManager.java
@@ -16,10 +16,12 @@
 import org.bukkit.configuration.Configuration;
 import org.bukkit.configuration.file.YamlConfiguration;
 
+import com.google.common.collect.Lists;
+
 import me.chancesd.pvpmanager.PvPManager;
 import me.chancesd.pvpmanager.setting.LogFile;
 import me.chancesd.pvpmanager.setting.Lang;
-import me.chancesd.pvpmanager.setting.Settings;
+import me.chancesd.pvpmanager.setting.Conf;
 import me.chancesd.sdutils.config.ConfigUpdater;
 import me.chancesd.sdutils.utils.Log;
 
@@ -27,18 +29,21 @@ public class ConfigManager {
 
 	private static final String CONFIG_VERSION = "Config Version";
 	private static final String CONFIG_NAME = "config.yml";
+	private static final String HOOKS_CONFIG_NAME = "plugin-hooks.yml";
 	private final PvPManager plugin;
 	private final File configFile;
-	private YamlConfiguration config;
-	private LogFile log;
+	private final LogFile log;
+	private final File pluginHooksFile;
+	private final YamlConfiguration pluginHooksConfig;
 
 	public ConfigManager(final PvPManager plugin) {
 		this.plugin = plugin;
 		this.configFile = new File(plugin.getDataFolder(), CONFIG_NAME);
+		pluginHooksFile = new File(plugin.getDataFolder(), HOOKS_CONFIG_NAME);
+		prepareFile(pluginHooksFile, HOOKS_CONFIG_NAME);
 		loadConfig();
-		if (Settings.isLogToFile()) {
-			log = new LogFile(new File(plugin.getDataFolder(), "combatlogs.log"));
-		}
+		log = new LogFile(new File(plugin.getDataFolder(), "combatlogs.log"));
+		pluginHooksConfig = loadYamlConfiguration(pluginHooksFile);
 	}
 
 	private void loadConfig() {
@@ -62,6 +67,7 @@ private void checkConfigVersion() {
 		if (oldVersion < currentVersion) {
 			try {
 				ConfigUpdater.update(plugin, CONFIG_NAME, configFile, Arrays.asList(CONFIG_VERSION, "Metrics", "Update Check.Enabled"));
+				ConfigUpdater.update(plugin, HOOKS_CONFIG_NAME, pluginHooksFile, Lists.newArrayList());
 				Log.infoColor("§aConfig file updated from version §c" + oldVersion + " §ato version §c" + currentVersion);
 				Log.warning("Checking the config file and adjusting the new settings is highly recommended");
 				Lang.queueAdminMsg(Lang.PREFIXMSG + " §aConfiguration updated from version §c" + oldVersion + " §ato §c" + currentVersion);
@@ -78,12 +84,16 @@ private void initConfig() {
 			this.prepareFile(configFile, CONFIG_NAME);
 			Log.infoColor(ChatColor.DARK_GREEN + "New config file created successfully!");
 		}
-		try (InputStreamReader inputStream = new InputStreamReader(new FileInputStream(configFile), StandardCharsets.UTF_8)) {
-			this.config = YamlConfiguration.loadConfiguration(inputStream);
+		Conf.initialize(plugin, loadYamlConfiguration(configFile));
+	}
+
+	private YamlConfiguration loadYamlConfiguration(final File file) {
+		try (InputStreamReader inputStream = new InputStreamReader(new FileInputStream(file), StandardCharsets.UTF_8)) {
+			return YamlConfiguration.loadConfiguration(inputStream);
 		} catch (final IOException e) {
 			Log.severe("Config file not found", e);
+			return null;
 		}
-		Settings.initizalizeVariables(config);
 	}
 
 	private void resetConfig() {
@@ -126,6 +136,10 @@ private void copyResource(final InputStream resource, final File file1) {
 		}
 	}
 
+	public YamlConfiguration getHooksConfig() {
+		return pluginHooksConfig;
+	}
+
 	public LogFile getLog() {
 		return log;
 	}
diff --git a/pvpmanager/src/main/java/me/chancesd/pvpmanager/manager/DependencyManager.java b/pvpmanager/src/main/java/me/chancesd/pvpmanager/manager/DependencyManager.java
index 68a4b3fb..0038b801 100644
--- a/pvpmanager/src/main/java/me/chancesd/pvpmanager/manager/DependencyManager.java
+++ b/pvpmanager/src/main/java/me/chancesd/pvpmanager/manager/DependencyManager.java
@@ -2,7 +2,8 @@
 
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.HashMap;
+import java.util.Collection;
+import java.util.EnumMap;
 import java.util.List;
 import java.util.Map;
 
@@ -14,30 +15,31 @@
 import org.jetbrains.annotations.NotNull;
 
 import me.chancesd.pvpmanager.PvPManager;
-import me.chancesd.pvpmanager.integration.AFKDependency;
 import me.chancesd.pvpmanager.integration.BaseDependency;
 import me.chancesd.pvpmanager.integration.DependencyException;
-import me.chancesd.pvpmanager.integration.ForceToggleDependency;
-import me.chancesd.pvpmanager.integration.GroupDependency;
 import me.chancesd.pvpmanager.integration.Hook;
 import me.chancesd.pvpmanager.integration.hook.EssentialsHook;
 import me.chancesd.pvpmanager.integration.hook.GriefPreventionHook;
 import me.chancesd.pvpmanager.integration.hook.LibsDisguisesHook;
 import me.chancesd.pvpmanager.integration.hook.PlaceHolderAPIHook;
 import me.chancesd.pvpmanager.integration.hook.SimpleClansHook;
+import me.chancesd.pvpmanager.integration.hook.TABHook;
 import me.chancesd.pvpmanager.integration.hook.TownyHook;
 import me.chancesd.pvpmanager.integration.hook.VaultHook;
 import me.chancesd.pvpmanager.integration.hook.worldguard.WorldGuardLegacyHook;
 import me.chancesd.pvpmanager.integration.hook.worldguard.WorldGuardModernHook;
+import me.chancesd.pvpmanager.integration.type.AFKDependency;
 import me.chancesd.pvpmanager.integration.type.Dependency;
 import me.chancesd.pvpmanager.integration.type.DisguiseDependency;
+import me.chancesd.pvpmanager.integration.type.ForceToggleDependency;
 import me.chancesd.pvpmanager.integration.type.GodDependency;
+import me.chancesd.pvpmanager.integration.type.GroupDependency;
 import me.chancesd.pvpmanager.integration.type.RegionDependency;
 import me.chancesd.pvpmanager.integration.type.WorldGuardDependency;
 import me.chancesd.pvpmanager.listener.MoveListener;
 import me.chancesd.pvpmanager.listener.MoveListener1_9;
 import me.chancesd.pvpmanager.player.ProtectionType;
-import me.chancesd.pvpmanager.setting.Settings;
+import me.chancesd.pvpmanager.setting.Conf;
 import me.chancesd.pvpmanager.utils.ScheduleUtils;
 import me.chancesd.sdutils.utils.Log;
 import me.chancesd.sdutils.utils.MCVersion;
@@ -46,7 +48,7 @@
 
 public class DependencyManager {
 
-	private final HashMap<Hook, Dependency> dependencies = new HashMap<>();
+	private final Map<Hook, Dependency> dependencies = new EnumMap<>(Hook.class);
 	private final ArrayList<GroupDependency> attackChecks = new ArrayList<>();
 	private final ArrayList<RegionDependency> regionChecks = new ArrayList<>();
 	private final ArrayList<GodDependency> godChecks = new ArrayList<>();
@@ -55,11 +57,6 @@ public class DependencyManager {
 	private final ArrayList<AFKDependency> afkChecks = new ArrayList<>();
 
 	public DependencyManager() {
-		if (Bukkit.getPluginManager().getPlugin("TAB") != null && Settings.useNameTag()) {
-			Log.info("TAB detected. If you want nametags to change while in combat, set 'anti-override' to false in TAB's config."
-					+ " (Doing that will prevent TAB from changing nametags)");
-			Log.info("Or use the premium version of PvPManager which hooks into TAB for nametag/tablist changes.");
-		}
 		final List<Hook> failedHooks = setupHooks(Hook.values());
 		// Delayed check for hooks that do not use softdepend
 		ScheduleUtils.runPlatformTask(() -> {
@@ -105,30 +102,25 @@ private List<Hook> setupHooks(final Hook... hooks) {
 	}
 
 	private boolean attemptHookingInto(final Hook hook) {
-		switch (hook) {
-		case SIMPLECLANS:
-			return registerDependency(new SimpleClansHook(hook));
-		case VAULT:
-			return registerDependency(new VaultHook(hook));
-		case WORLDGUARD:
+		final Dependency dependency = switch (hook) {
+		case SIMPLECLANS -> new SimpleClansHook(hook);
+		case VAULT -> new VaultHook(hook);
+		case WORLDGUARD -> {
 			if (Utils.isVersionAtLeast(Utils.stripTags(hook.getVersion()), "7.0")) {
-				return registerDependency(new WorldGuardModernHook(hook));
+				yield new WorldGuardModernHook(hook);
 			} else {
-				return registerDependency(new WorldGuardLegacyHook(hook));
+				yield new WorldGuardLegacyHook(hook);
 			}
-		case ESSENTIALS:
-			return registerDependency(new EssentialsHook(hook));
-		case PLACEHOLDERAPI:
-			return registerDependency(new PlaceHolderAPIHook(hook));
-		case LIBSDISGUISES:
-			return registerDependency(new LibsDisguisesHook(hook));
-		case TOWNY:
-			return registerDependency(new TownyHook(hook));
-		case GRIEFPREVENTION:
-			return registerDependency(new GriefPreventionHook(hook));
-		default:
-			return registerDependency(new BaseDependency(hook));
 		}
+		case ESSENTIALS -> new EssentialsHook(hook);
+		case PLACEHOLDERAPI -> new PlaceHolderAPIHook(hook);
+		case LIBSDISGUISES -> new LibsDisguisesHook(hook);
+		case TOWNY -> new TownyHook(hook);
+		case GRIEFPREVENTION -> new GriefPreventionHook(hook);
+		case TAB -> new TABHook(hook);
+		default -> new BaseDependency(hook);
+		};
+		return registerDependency(dependency);
 	}
 
 	public final boolean canAttack(final Player attacker, final Player defender) {
@@ -179,18 +171,18 @@ public final boolean shouldProtectAFK(final Player player) {
 	}
 
 	public void startListeners(final PvPManager plugin) {
-		if (Settings.borderHoppingPushback() && !regionChecks.isEmpty()) {
+		if (Conf.PUSHBACK_ENABLED.asBool() && !regionChecks.isEmpty()) {
 			if (MCVersion.isAtLeast(MCVersion.V1_9)) {
-				Bukkit.getPluginManager().registerEvents(new MoveListener1_9(plugin.getPlayerHandler()), plugin);
+				Bukkit.getPluginManager().registerEvents(new MoveListener1_9(plugin.getPlayerManager()), plugin);
 			} else if (MCVersion.isAtLeast(MCVersion.V1_8)) {
-				Bukkit.getPluginManager().registerEvents(new MoveListener(plugin.getPlayerHandler()), plugin);
+				Bukkit.getPluginManager().registerEvents(new MoveListener(plugin.getPlayerManager()), plugin);
 			} else {
 				Log.warning("Pushback on border hopping not available for 1.7.10 or below! Feature disabled!");
-				Settings.setBorderHoppingPushback(false);
+				Conf.PUSHBACK_ENABLED.disable();
 			}
 		}
 		if (isDependencyEnabled(Hook.WORLDGUARD)) {
-			((WorldGuardDependency) getDependency(Hook.WORLDGUARD)).startListener(plugin.getPlayerHandler());
+			((WorldGuardDependency) getDependency(Hook.WORLDGUARD)).startListener(plugin.getPlayerManager());
 		}
 	}
 
@@ -246,9 +238,8 @@ public final Economy getEconomy() {
 		return null;
 	}
 
-	@SuppressWarnings("unchecked")
-	public Map<Hook, Dependency> getDependencies() {
-		return (Map<Hook, Dependency>) dependencies.clone();
+	public Collection<Dependency> getDependencies() {
+		return dependencies.values();
 	}
 
 }
diff --git a/pvpmanager/src/main/java/me/chancesd/pvpmanager/manager/DisplayManager.java b/pvpmanager/src/main/java/me/chancesd/pvpmanager/manager/DisplayManager.java
index 44d5ec0d..4dc0367a 100644
--- a/pvpmanager/src/main/java/me/chancesd/pvpmanager/manager/DisplayManager.java
+++ b/pvpmanager/src/main/java/me/chancesd/pvpmanager/manager/DisplayManager.java
@@ -5,10 +5,12 @@
 import java.util.concurrent.ConcurrentHashMap;
 
 import org.bukkit.Bukkit;
+import org.bukkit.boss.BarColor;
+import org.bukkit.boss.BarStyle;
 import org.bukkit.boss.BossBar;
 import me.chancesd.pvpmanager.player.CombatPlayer;
 import me.chancesd.pvpmanager.player.display.ProgressBar;
-import me.chancesd.pvpmanager.setting.Settings;
+import me.chancesd.pvpmanager.setting.Conf;
 import me.chancesd.pvpmanager.utils.ChatUtils;
 import me.chancesd.sdutils.utils.Log;
 
@@ -19,7 +21,7 @@ public class DisplayManager {
 
 	public void updateBossbar(final CombatPlayer player, final double timePassed, final int totalTime) {
 		final BossBar bossBar = bossBars.computeIfAbsent(player, this::setupBossbar);
-		final String message = Settings.getBossBarMessage().replace("<time>", Long.toString(totalTime - Math.round(timePassed)));
+		final String message = Conf.BOSS_BAR_MESSAGE.asString().replace("<time>", Long.toString(totalTime - Math.round(timePassed)));
 		final String placeHolderMessage = ChatUtils.setPlaceholders(player.getPlayer(), message);
 		if (!bossBar.getTitle().equals(placeHolderMessage))
 			bossBar.setTitle(placeHolderMessage);
@@ -27,7 +29,7 @@ public void updateBossbar(final CombatPlayer player, final double timePassed, fi
 	}
 
 	private BossBar setupBossbar(final CombatPlayer player) {
-		final BossBar bossBar = Bukkit.createBossBar("", Settings.getBossBarColor(), Settings.getBossBarStyle());
+		final BossBar bossBar = Bukkit.createBossBar("", Conf.BOSS_BAR_COLOR.asEnum(BarColor.class), Conf.BOSS_BAR_STYLE.asEnum(BarStyle.class));
 		bossBar.addPlayer(player.getPlayer());
 		return bossBar;
 	}
@@ -43,7 +45,7 @@ public void discardBossbar(final CombatPlayer player) {
 	}
 
 	private ProgressBar setupProgressBar(final long time, final int goal) {
-		return new ProgressBar(Settings.getActionBarMessage(), Settings.getActionBarBars(), goal, Settings.getActionBarSymbol(), time);
+		return new ProgressBar(Conf.ACTION_BAR_MESSAGE.asString(), Conf.ACTION_BAR_BARS.asInt(), goal, Conf.ACTION_BAR_SYMBOL.asString(), time);
 	}
 
 	public void showProgress(final CombatPlayer p, final double timePassed, final int goal) {
diff --git a/pvpmanager/src/main/java/me/chancesd/pvpmanager/manager/PlayerManager.java b/pvpmanager/src/main/java/me/chancesd/pvpmanager/manager/PlayerManager.java
index a04bb367..fb1bab1c 100644
--- a/pvpmanager/src/main/java/me/chancesd/pvpmanager/manager/PlayerManager.java
+++ b/pvpmanager/src/main/java/me/chancesd/pvpmanager/manager/PlayerManager.java
@@ -23,7 +23,8 @@
 import me.chancesd.pvpmanager.player.CombatPlayer;
 import me.chancesd.pvpmanager.player.ProtectionResult;
 import me.chancesd.pvpmanager.player.ProtectionType;
-import me.chancesd.pvpmanager.setting.Settings;
+import me.chancesd.pvpmanager.player.UntagReason;
+import me.chancesd.pvpmanager.setting.Conf;
 import me.chancesd.pvpmanager.tasks.CleanKillersTask;
 import me.chancesd.pvpmanager.tasks.PvPToggleFeeTask;
 import me.chancesd.pvpmanager.tasks.TagTask;
@@ -38,16 +39,17 @@ public class PlayerManager {
 	@NotNull
 	private final PvPManager plugin;
 	private final TagTask tagTask;
+	private boolean globalStatus = true;
 
 	public PlayerManager(@NotNull final PvPManager plugin) {
 		this.plugin = plugin;
 		this.configManager = plugin.getConfigM();
 		this.dependencyManager = plugin.getDependencyManager();
 		this.tagTask = new TagTask(plugin.getDisplayManager());
-		if (Settings.isKillAbuseEnabled()) {
-			ScheduleUtils.runAsyncTimer(new CleanKillersTask(this), Settings.getKillAbuseTime(), Settings.getKillAbuseTime(), TimeUnit.SECONDS);
+		if (Conf.KILL_ABUSE_ENABLED.asBool()) {
+			ScheduleUtils.runAsyncTimer(new CleanKillersTask(this), Conf.KILL_ABUSE_TIME.asInt(), Conf.KILL_ABUSE_TIME.asInt(), TimeUnit.SECONDS);
 		}
-		if (Settings.getPvPDisabledFee() != 0) {
+		if (Conf.PVP_DISABLED_FEE.asInt() != 0) {
 			ScheduleUtils.runAsyncTimer(new PvPToggleFeeTask(this), 0, 1, TimeUnit.HOURS);
 		}
 
@@ -58,9 +60,9 @@ public final ProtectionResult checkProtection(@NotNull final Player damager, @No
 		final CombatPlayer attacker = get(damager);
 		final CombatPlayer attacked = get(defender);
 
-		if (attacker.hasOverride() || Settings.borderHoppingVulnerable() && canAttackHooks(attacker, attacked))
+		if (attacker.hasOverride() || Conf.VULNERABLE_ENABLED.asBool() && canAttackHooks(attacker, attacked))
 			return new ProtectionResult(ProtectionType.FAIL_OVERRIDE);
-		if (!Settings.isGlobalStatus())
+		if (!globalStatus)
 			return new ProtectionResult(ProtectionType.GLOBAL_PROTECTION);
 		if (!attacked.getCombatWorld().isCombatAllowed())
 			return new ProtectionResult(ProtectionType.WORLD_PROTECTION);
@@ -110,7 +112,7 @@ private boolean canAttackHooks(final CombatPlayer attacker, final CombatPlayer d
 	@NotNull
 	public final CombatPlayer get(final Player player) {
 		final CombatPlayer pvPlayer = players.get(player.getUniqueId());
-		return pvPlayer != null ? pvPlayer : addUser(new CombatPlayer(player, plugin));
+		return pvPlayer != null ? pvPlayer : addUser(new CombatPlayer(player, plugin, tagTask));
 	}
 
 	@NotNull
@@ -126,7 +128,7 @@ private CombatPlayer addUser(final CombatPlayer p) {
 
 	public final void removeUser(final CombatPlayer player) {
 		if (player.isInCombat()) {
-			player.unTag();
+			player.untag(UntagReason.LOGOUT);
 		}
 		player.cleanForRemoval();
 		players.remove(player.getUUID());
@@ -136,34 +138,34 @@ public final void applyPunishments(final CombatPlayer player) {
 		final Player p = player.getPlayer();
 		final PlayerCombatLogEvent event = new PlayerCombatLogEvent(p, player);
 		Bukkit.getPluginManager().callEvent(event);
-		if (Settings.isKillOnLogout()) {
+		if (Conf.KILL_ON_LOGOUT.asBool()) {
 			player.setPvpLogged(true);
 			p.setHealth(0);
 			player.setPvpLogged(false);
 		}
-		if (Settings.getFineAmount() != 0) {
+		if (Conf.FINE_AMOUNT.asDouble() != 0) {
 			player.applyFine();
 		}
 	}
 
 	public void handleCombatLogDrops(final PlayerDeathEvent event, final Player player) {
-		if (!Settings.isDropExp()) {
+		if (!Conf.DROP_EXP.asBool()) {
 			keepExp(event);
 		}
-		if (!Settings.isDropInventory() && Settings.isDropArmor()) {
+		if (!Conf.DROP_INVENTORY.asBool() && Conf.DROP_ARMOR.asBool()) {
 			CombatUtils.fakeItemStackDrop(player, player.getInventory().getArmorContents());
 			player.getInventory().setArmorContents(null);
-		} else if (Settings.isDropInventory() && !Settings.isDropArmor()) {
+		} else if (Conf.DROP_INVENTORY.asBool() && !Conf.DROP_ARMOR.asBool()) {
 			CombatUtils.fakeItemStackDrop(player, player.getInventory().getContents());
 			player.getInventory().clear();
 		}
-		if (!Settings.isDropInventory() || !Settings.isDropArmor()) {
+		if (!Conf.DROP_INVENTORY.asBool() || !Conf.DROP_ARMOR.asBool()) {
 			keepInv(event);
 		}
 	}
 
 	public void handlePlayerDrops(final PlayerDeathEvent event, final Player player, final Player killer) {
-		switch (Settings.getDropMode()) {
+		switch (Conf.PLAYER_DROP_MODE.asEnum(Conf.DropMode.class)) {
 		case DROP:
 			if (killer == null) {
 				keepInv(event);
@@ -242,13 +244,8 @@ private void removeTeams() {
 		}
 	}
 
-	// TODO replace untag and tag with gettagtask
-	public final void removeFromTagTask(final CombatPlayer p) {
-		tagTask.untag(p);
-	}
-
-	public final void addToTagTask(final CombatPlayer p) {
-		tagTask.addTagged(p);
+	public void setGlobalStatus(final boolean globalStatus) {
+		this.globalStatus = globalStatus;
 	}
 
 	public final Map<UUID, CombatPlayer> getPlayers() {
diff --git a/pvpmanager/src/main/java/me/chancesd/pvpmanager/manager/UpdateManager.java b/pvpmanager/src/main/java/me/chancesd/pvpmanager/manager/UpdateManager.java
index 0380bd21..cd69e872 100644
--- a/pvpmanager/src/main/java/me/chancesd/pvpmanager/manager/UpdateManager.java
+++ b/pvpmanager/src/main/java/me/chancesd/pvpmanager/manager/UpdateManager.java
@@ -7,7 +7,7 @@
 import me.chancesd.pvpmanager.PvPManager;
 import me.chancesd.pvpmanager.setting.Lang;
 import me.chancesd.pvpmanager.setting.Permissions;
-import me.chancesd.pvpmanager.setting.Settings;
+import me.chancesd.pvpmanager.setting.Conf;
 import me.chancesd.pvpmanager.utils.ScheduleUtils;
 import me.chancesd.sdutils.updater.BukkitUpdater;
 import me.chancesd.sdutils.updater.SpigotUpdater;
@@ -23,6 +23,7 @@ public class UpdateManager {
 	private Updater updater;
 	private String newVersion;
 	private final String currentVersion;
+	private boolean updateAvailable;
 
 	public UpdateManager(final PvPManager plugin) {
 		this.plugin = plugin;
@@ -31,7 +32,7 @@ public UpdateManager(final PvPManager plugin) {
 	}
 
 	private void setup() {
-		if (Settings.isUpdateCheck()) {
+		if (Conf.CHECK_UPDATES.asBool()) {
 			ScheduleUtils.runAsyncTimer(this::checkForUpdates, 3, 18000, TimeUnit.SECONDS);
 		}
 	}
@@ -48,7 +49,7 @@ public void checkForUpdates() {
 					+ getCurrentversion();
 			Lang.queueAdminMsg(updateMsg);
 			Bukkit.broadcast(updateMsg, Permissions.ADMIN.getPermission());
-			if (Settings.isAutoUpdate() && Utils.isVersionAtLeast(getNewVersion(), "4.0")
+			if (Conf.AUTO_UPDATE.asBool() && Utils.isVersionAtLeast(getNewVersion(), "4.0")
 					&& !Utils.isVersionAtLeast(getNewVersion(), "4.1")) {
 				final String v4message = Lang.PREFIXMSG
 						+ " §aSince §b§lv4.0 is a huge update§a, it changes a lot of the config and messages file. "
@@ -56,7 +57,7 @@ public void checkForUpdates() {
 						+ "Please §b§lmanually download the update§a from the link below and copy any settings you need from the old config.";
 				Lang.queueAdminMsg(v4message);
 				Bukkit.broadcast(v4message, Permissions.ADMIN.getPermission());
-			} else if (Settings.isAutoUpdate()) {
+			} else if (Conf.AUTO_UPDATE.asBool()) {
 				if (updater.downloadFile()) {
 					Lang.queueAdminMsg(Lang.PREFIXMSG + " §aUpdate downloaded, it will be applied automatically on the next server restart");
 					Bukkit.broadcast(
@@ -66,7 +67,7 @@ public void checkForUpdates() {
 				}
 				Log.info("Could not download latest update. Please update manually from one of the links below.");
 			}
-			Settings.setUpdate(true);
+			updateAvailable = true;
 			final String linkMsg = Lang.PREFIXMSG + " §aFollow the link to download: §7" + updater.getUpdateLink();
 			Lang.queueAdminMsg(linkMsg);
 			Bukkit.broadcast(linkMsg, Permissions.ADMIN.getPermission());
@@ -87,6 +88,14 @@ public void setNewVersion(final String newVersion) {
 		this.newVersion = newVersion;
 	}
 
+	public boolean hasUpdateAvailable() {
+		return updateAvailable;
+	}
+
+	public void setUpdateAvailable(final boolean updateAvailable) {
+		this.updateAvailable = updateAvailable;
+	}
+
 	public Updater getUpdater() {
 		return updater;
 	}
diff --git a/pvpmanager/src/main/java/me/chancesd/pvpmanager/player/BasePlayer.java b/pvpmanager/src/main/java/me/chancesd/pvpmanager/player/BasePlayer.java
index 97761d7b..02cdb881 100644
--- a/pvpmanager/src/main/java/me/chancesd/pvpmanager/player/BasePlayer.java
+++ b/pvpmanager/src/main/java/me/chancesd/pvpmanager/player/BasePlayer.java
@@ -76,6 +76,12 @@ public final void message(final Lang message, final String... args) {
 		}
 	}
 
+	public final void message(final Lang message) {
+		if (isOnline()) {
+			getPlayer().sendMessage(message.msg());
+		}
+	}
+
 	/**
 	 * Sends an action bar message with the specified duration
 	 *
diff --git a/pvpmanager/src/main/java/me/chancesd/pvpmanager/player/CombatPlayer.java b/pvpmanager/src/main/java/me/chancesd/pvpmanager/player/CombatPlayer.java
index f6eaad82..25f44d45 100644
--- a/pvpmanager/src/main/java/me/chancesd/pvpmanager/player/CombatPlayer.java
+++ b/pvpmanager/src/main/java/me/chancesd/pvpmanager/player/CombatPlayer.java
@@ -22,15 +22,20 @@
 import me.chancesd.pvpmanager.event.PlayerTagEvent;
 import me.chancesd.pvpmanager.event.PlayerTogglePvPEvent;
 import me.chancesd.pvpmanager.event.PlayerUntagEvent;
+import me.chancesd.pvpmanager.integration.Hook;
+import me.chancesd.pvpmanager.integration.hook.TABHook;
 import me.chancesd.pvpmanager.library.rollbar.PMRUncaughExceptionHandler;
 import me.chancesd.pvpmanager.player.nametag.BukkitNameTag;
 import me.chancesd.pvpmanager.player.nametag.NameTag;
+import me.chancesd.pvpmanager.player.nametag.TABNameTag;
 import me.chancesd.pvpmanager.player.world.CombatWorld;
+import me.chancesd.pvpmanager.setting.ItemCooldown;
 import me.chancesd.pvpmanager.setting.Lang;
 import me.chancesd.pvpmanager.setting.Permissions;
-import me.chancesd.pvpmanager.setting.Settings;
+import me.chancesd.pvpmanager.setting.Conf;
 import me.chancesd.pvpmanager.storage.fields.UserDataFields;
 import me.chancesd.pvpmanager.tasks.NewbieTask;
+import me.chancesd.pvpmanager.tasks.TagTask;
 import me.chancesd.pvpmanager.utils.CombatUtils;
 import me.chancesd.pvpmanager.utils.ScheduleUtils;
 import me.chancesd.sdutils.utils.Log;
@@ -54,13 +59,15 @@ public class CombatPlayer extends EcoPlayer {
 	private final Map<String, Integer> victim = new HashMap<>();
 	private final Map<Material, Long> itemCooldown = new EnumMap<>(Material.class);
 	private final PvPManager plugin;
+	private final TagTask tagTask;
 	private NameTag nametag;
 	private static ExecutorService executor;
 
-	public CombatPlayer(@NotNull final Player player, final PvPManager plugin) {
+	public CombatPlayer(@NotNull final Player player, final PvPManager plugin, final TagTask tagTask) {
 		super(player, plugin.getDependencyManager().getEconomy());
-		this.pvpState = Settings.isDefaultPvp();
+		this.pvpState = Conf.DEFAULT_PVP.asBool();
 		this.plugin = plugin;
+		this.tagTask = tagTask;
 		setCombatWorld(plugin.getWorldManager().getWorld(getPlayer().getWorld()));
 		if (!CombatUtils.isNPC(player))
 			executor.execute(this::loadData);
@@ -114,13 +121,13 @@ public final void setNewbie(final boolean newbie) {
 			message(Lang.NEWBIE_PROTECTION.msg(TimeUtil.getDiffMsg(newbieTask.getFinishTime())));
 		} else if (this.newbie && newbieTask != null) {
 			if (newbieTask.isExpired()) {
-				message(Lang.NEWBIE_PROTECTION_END.msg());
+				message(Lang.NEWBIE_PROTECTION_END);
 			} else {
-				message(Lang.NEWBIE_PROTECTION_REMOVED.msg());
+				message(Lang.NEWBIE_PROTECTION_REMOVED);
 				newbieTask.cancel();
 			}
 		} else {
-			message(Lang.ERROR_NOT_NEWBIE.msg());
+			message(Lang.ERROR_NOT_NEWBIE);
 		}
 		this.newbie = newbie;
 	}
@@ -132,7 +139,7 @@ public final void setNewbie(final boolean newbie) {
 	 * @param other           The other player involved in the attack
 	 * @param timeMiliseconds How long the player should be tagged for
 	 */
-	public final void setTagged(final boolean isAttacker, final CombatPlayer other, final long timeMiliseconds) {
+	public final void tag(final boolean isAttacker, final CombatPlayer other, final long timeMiliseconds) {
 		if (hasPerm(Permissions.EXEMPT_COMBAT_TAG)) {
 			Log.debug("Not tagging " + getName() + " because player has permission: " + Permissions.EXEMPT_COMBAT_TAG);
 			return;
@@ -150,11 +157,11 @@ public final void setTagged(final boolean isAttacker, final CombatPlayer other,
 		if (event.isCancelled())
 			return;
 
-		if (Settings.isGlowingInCombat() && MCVersion.isAtLeast(MCVersion.V1_9)) {
+		if (Conf.GLOWING_IN_COMBAT.asBool() && MCVersion.isAtLeast(MCVersion.V1_9)) {
 			getPlayer().setGlowing(true);
 		}
 
-		if (nametag != null && Settings.useNameTag()) {
+		if (nametag != null) {
 			executor.execute(nametag::setInCombat);
 		}
 
@@ -172,7 +179,7 @@ public final void setTagged(final boolean isAttacker, final CombatPlayer other,
 
 		this.tagged = true;
 		this.totalTagTime = timeMiliseconds;
-		plugin.getPlayerHandler().addToTagTask(this);
+		tagTask.startTracking(this);
 	}
 
 	/**
@@ -181,32 +188,31 @@ public final void setTagged(final boolean isAttacker, final CombatPlayer other,
 	 * @param isAttacker Whether this player initiated the attack or not
 	 * @param other      The other player involved in the attack
 	 */
-	public final void setTagged(final boolean isAttacker, final CombatPlayer other) {
-		setTagged(isAttacker, other, Settings.getTimeInCombatMs());
+	public final void tag(final boolean isAttacker, final CombatPlayer other) {
+		tag(isAttacker, other, Conf.TIME_IN_COMBAT.asInt() * 1000L);
 	}
 
 	/**
 	 * Takes the player out of combat
 	 */
-	public final void unTag() {
-		final PlayerUntagEvent event = new PlayerUntagEvent(getPlayer(), this);
+	public final void untag(final UntagReason reason) {
+		final PlayerUntagEvent event = new PlayerUntagEvent(getPlayer(), this, reason);
 		ScheduleUtils.ensureMainThread(() -> Bukkit.getPluginManager().callEvent(event), getPlayer());
 
-		if (isOnline()) {
-			if (nametag != null && Settings.useNameTag()) {
-				nametag.restoreNametag();
-			}
-			if (Settings.isGlowingInCombat() && MCVersion.isAtLeast(MCVersion.V1_9)) {
-				getPlayer().setGlowing(false);
-			}
+		if (Conf.GLOWING_IN_COMBAT.asBool() && MCVersion.isAtLeast(MCVersion.V1_9)) {
+			getPlayer().setGlowing(false);
+		}
 
-			message(Lang.OUT_OF_COMBAT);
-			sendActionBar(Lang.OUT_OF_COMBAT_ACTIONBAR.msg());
+		if (nametag != null) {
+			executor.execute(nametag::restoreNametag);
 		}
 
+		message(Lang.OUT_OF_COMBAT);
+		sendActionBar(Lang.OUT_OF_COMBAT_ACTIONBAR.msg());
+
 		this.lastHitters.clear();
 		this.tagged = false;
-		plugin.getPlayerHandler().removeFromTagTask(this);
+		tagTask.stopTracking(this);
 	}
 
 	/**
@@ -226,15 +232,15 @@ public final void setPvP(final boolean pvpState) {
 		this.pvpState = pvpState;
 		this.toggleTime = System.currentTimeMillis();
 
-		if (nametag != null && Settings.isToggleNametagsEnabled()) {
+		if (nametag != null && Conf.TOGGLE_NAMETAG_ENABLED.asBool()) {
 			nametag.setPvP(pvpState);
 		}
 		if (!pvpState) {
 			message(Lang.PVPDISABLED);
-			CombatUtils.executeCommands(Settings.getCommandsPvPOff(), getPlayer(), getName());
+			CombatUtils.executeCommands(Conf.COMMANDS_PVP_OFF.asList(), getPlayer(), getName());
 		} else {
 			message(Lang.PVPENABLED);
-			CombatUtils.executeCommands(Settings.getCommandsPvPOn(), getPlayer(), getName());
+			CombatUtils.executeCommands(Conf.COMMANDS_PVP_ON.asList(), getPlayer(), getName());
 		}
 	}
 
@@ -244,16 +250,16 @@ public final void addVictim(final Player victimPlayer) {
 			victim.put(victimName, 1);
 		} else {
 			int totalKills = victim.get(victimName);
-			if (totalKills < Settings.getKillAbuseMaxKills()) {
+			if (totalKills < Conf.KILL_ABUSE_MAX.asInt()) {
 				totalKills++;
 				victim.put(victimName, totalKills);
 			}
-			if (Settings.isKillAbuseWarn() && totalKills + 1 == Settings.getKillAbuseMaxKills()) {
+			if (Conf.KILL_ABUSE_WARN.asBool() && totalKills + 1 == Conf.KILL_ABUSE_MAX.asInt()) {
 				message(Lang.KILL_ABUSE_WARNING.msg());
 			}
-			if (totalKills >= Settings.getKillAbuseMaxKills()) {
-				unTag();
-				CombatUtils.executeCommands(Settings.getKillAbuseCommands(), getPlayer(), getName(), victimName);
+			if (totalKills >= Conf.KILL_ABUSE_MAX.asInt()) {
+				untag(UntagReason.KICKED);
+				CombatUtils.executeCommands(Conf.KILL_ABUSE_COMMANDS.asList(), getPlayer(), getName(), victimName);
 			}
 		}
 	}
@@ -281,16 +287,18 @@ public final boolean hasItemCooldown(final Material material) {
 		return true;
 	}
 
-	public final void setItemCooldown(@NotNull final Material material, final int time) {
+	public final void setItemCooldown(@NotNull final Material material, final ItemCooldown cooldown) {
+		final int time = isInCombat() ? cooldown.getCombatCooldown() : cooldown.getGlobalCooldown();
+		if (time < 0)
+			return;
 		itemCooldown.put(material, System.currentTimeMillis() + time * 1000);
 		if (MCVersion.isAtLeast(MCVersion.V1_11_2)) {
 			getPlayer().setCooldown(material, time * 20);
 		}
 	}
 
-	@Nullable
 	public final Long getItemCooldown(final Material material) {
-		return itemCooldown.get(material);
+		return itemCooldown.getOrDefault(material, 0L);
 	}
 
 	public final void clearVictims() {
@@ -304,11 +312,11 @@ public final void setPvpLogged(final boolean pvpLogged) {
 	public final boolean hasRespawnProtection() {
 		if (respawnTime == 0)
 			return false;
-		if (CombatUtils.hasTimePassed(respawnTime, Settings.getRespawnProtection())) {
+		if (CombatUtils.hasTimePassed(respawnTime, Conf.RESPAWN_PROTECTION.asInt())) {
 			respawnTime = 0;
 			return false;
 		}
-		return !getPlayer().hasPermission("pvpmanager.bypass.protection.respawn");
+		return !hasPerm(Permissions.EXEMPT_PROTECTION_RESPAWN);
 	}
 
 	public final void setRespawnTime(final long respawnTime) {
@@ -343,23 +351,24 @@ public long getTagTimeLeft() {
 	private synchronized void loadData() {
 		if (plugin.getStorageManager().getStorage().userExists(this)) {
 			loadUserData(plugin.getStorageManager().getStorage().getUserData(this));
-		} else if (Settings.isNewbieProtectionEnabled() && !getPlayer().hasPlayedBefore()) {
+		} else if (Conf.NEWBIE_ENABLED.asBool() && !getPlayer().hasPlayedBefore()) {
 			setNewbie(true);
 		}
-		if (getCombatWorld().isPvPForced() == CombatWorld.WorldOptionState.ON) {
-			this.pvpState = true;
-		} else if (getCombatWorld().isPvPForced() == CombatWorld.WorldOptionState.OFF) {
-			this.pvpState = false;
+		if (getCombatWorld().isPvPForced() != CombatWorld.WorldOptionState.NONE) {
+			this.pvpState = getCombatWorld().isPvPForced() == CombatWorld.WorldOptionState.ON;
 		}
-		if (Settings.useNameTag()) {
+		if (Conf.NAMETAG_COMBAT_ENABLED.asBool() || Conf.TOGGLE_NAMETAG_ENABLED.asBool()) {
 			try {
-				this.nametag = new BukkitNameTag(this);
+				final TABHook tab = (TABHook) plugin.getDependencyManager().getDependency(Hook.TAB);
+				this.nametag = tab != null && (tab.showAboveHead() || tab.showInPlayerlist()) ? new TABNameTag(tab, this) : new BukkitNameTag(this);
 			} catch (final NoSuchMethodError e) {
-				Settings.setUseNameTag(false);
+				Conf.NAMETAG_COMBAT_ENABLED.disable();
+				Conf.TOGGLE_NAMETAG_ENABLED.disable();
 				this.nametag = null;
 				Log.warning("Colored nametags disabled. You need to update your Spigot version.");
 			} catch (final UnsupportedOperationException e) {
-				Settings.setUseNameTag(false);
+				Conf.NAMETAG_COMBAT_ENABLED.disable();
+				Conf.TOGGLE_NAMETAG_ENABLED.disable();
 				this.nametag = null;
 				Log.infoColor(ChatColor.RED
 						+ "Nametag support disabled until Folia supports the scoreboard API or use the TAB plugin with PvPManager premium");
@@ -413,12 +422,16 @@ public final void cleanForRemoval() {
 		if (newbieTask != null) {
 			newbieTask.cancel();
 		}
-		if (nametag != null && Settings.useNameTag()) {
+		if (nametag != null) {
 			nametag.cleanup();
 		}
 		executor.execute(() -> plugin.getStorageManager().getStorage().saveUserData(this));
 	}
 
+	public NameTag getNameTag() {
+		return nametag;
+	}
+
 	public boolean isLoaded() {
 		return loaded;
 	}
@@ -458,7 +471,7 @@ public static void startExecutor() {
 	 * @return PvPlayer instance for the provided player
 	 */
 	public static CombatPlayer get(final Player player) {
-		return PvPManager.getInstance().getPlayerHandler().get(player);
+		return PvPManager.getInstance().getPlayerManager().get(player);
 	}
 
 	@Override
diff --git a/pvpmanager/src/main/java/me/chancesd/pvpmanager/player/EcoPlayer.java b/pvpmanager/src/main/java/me/chancesd/pvpmanager/player/EcoPlayer.java
index 07390a9a..3a72da11 100644
--- a/pvpmanager/src/main/java/me/chancesd/pvpmanager/player/EcoPlayer.java
+++ b/pvpmanager/src/main/java/me/chancesd/pvpmanager/player/EcoPlayer.java
@@ -5,7 +5,7 @@
 import org.jetbrains.annotations.NotNull;
 
 import me.chancesd.pvpmanager.setting.Lang;
-import me.chancesd.pvpmanager.setting.Settings;
+import me.chancesd.pvpmanager.setting.Conf;
 import me.chancesd.pvpmanager.utils.CombatUtils;
 import me.chancesd.sdutils.utils.Log;
 import net.milkbowl.vault.economy.Economy;
@@ -34,28 +34,28 @@ private void depositMoney(final double amount) {
 	}
 
 	public final void applyFine() {
-		final double penalty = getMoneyPercentage(Settings.getFineAmount());
+		final double penalty = getMoneyPercentage(Conf.FINE_AMOUNT.asDouble());
 		withdrawMoney(penalty);
 	}
 
 	public final void applyPenalty() {
-		final double penalty = getMoneyPercentage(Settings.getMoneyPenalty());
+		final double penalty = getMoneyPercentage(Conf.MONEY_PENALTY.asDouble());
 		withdrawMoney(penalty);
 		message(Lang.MONEY_PENALTY.msg(CombatUtils.formatTo2Digits(penalty)));
 	}
 
 	public final void applyPvPDisabledFee() {
-		withdrawMoney(Settings.getPvPDisabledFee());
-		message(Lang.PVP_DISABLED_FEE.msg(CombatUtils.formatTo2Digits(Settings.getPvPDisabledFee())));
+		withdrawMoney(Conf.PVP_DISABLED_FEE.asInt());
+		message(Lang.PVP_DISABLED_FEE.msg(CombatUtils.formatTo2Digits(Conf.PVP_DISABLED_FEE.asInt())));
 	}
 
 	public final void giveReward(final EcoPlayer victim) {
-		double moneyWon = getMoneyPercentage(Settings.getMoneyReward());
-		if (Settings.isMoneySteal()) {
+		double moneyWon = getMoneyPercentage(Conf.MONEY_REWARD.asDouble());
+		if (Conf.MONEY_STEAL.asBool()) {
 			final double vbalance = economy.getBalance(victim.getPlayer());
-			if (Settings.getMoneyReward() <= 1) {
-				moneyWon = roundMoney(Settings.getMoneyReward() * vbalance);
-			} else if (Settings.getMoneyReward() > vbalance) {
+			if (Conf.MONEY_REWARD.asDouble() <= 1) {
+				moneyWon = roundMoney(Conf.MONEY_REWARD.asDouble() * vbalance);
+			} else if (Conf.MONEY_REWARD.asDouble() > vbalance) {
 				moneyWon = vbalance;
 			}
 			victim.withdrawMoney(moneyWon);
@@ -68,8 +68,8 @@ public final void giveReward(final EcoPlayer victim) {
 	public final int giveExp(final EcoPlayer victim) {
 		int expWon = 0;
 		final int exp = victim.getPlayer().getTotalExperience();
-		if (Settings.getExpSteal() <= 1) {
-			expWon = (int) (Settings.getExpSteal() * exp);
+		if (Conf.EXP_STEAL.asDouble() <= 1) {
+			expWon = (int) (Conf.EXP_STEAL.asDouble() * exp);
 		} else {
 			expWon = exp;
 		}
diff --git a/pvpmanager/src/main/java/me/chancesd/pvpmanager/player/UntagReason.java b/pvpmanager/src/main/java/me/chancesd/pvpmanager/player/UntagReason.java
new file mode 100644
index 00000000..203a655b
--- /dev/null
+++ b/pvpmanager/src/main/java/me/chancesd/pvpmanager/player/UntagReason.java
@@ -0,0 +1,14 @@
+package me.chancesd.pvpmanager.player;
+
+public enum UntagReason {
+
+	TIME_EXPIRED,
+	DEATH,
+	KILLED_ENEMY,
+	KICKED,
+	COMMAND,
+	LOGOUT,
+	PLUGIN_DISABLE,
+	PLUGIN_API;
+
+}
diff --git a/pvpmanager/src/main/java/me/chancesd/pvpmanager/player/nametag/BukkitNameTag.java b/pvpmanager/src/main/java/me/chancesd/pvpmanager/player/nametag/BukkitNameTag.java
index ce48b745..87653f1a 100644
--- a/pvpmanager/src/main/java/me/chancesd/pvpmanager/player/nametag/BukkitNameTag.java
+++ b/pvpmanager/src/main/java/me/chancesd/pvpmanager/player/nametag/BukkitNameTag.java
@@ -12,7 +12,7 @@
 import org.jetbrains.annotations.NotNull;
 
 import me.chancesd.pvpmanager.player.CombatPlayer;
-import me.chancesd.pvpmanager.setting.Settings;
+import me.chancesd.pvpmanager.setting.Conf;
 import me.chancesd.sdutils.utils.Log;
 import me.chancesd.sdutils.utils.MCVersion;
 
@@ -29,7 +29,7 @@ public class BukkitNameTag extends NameTag {
 	private static final String PVPOFF = "PvPOff";
 	private static final String PVPON = "PvPOn";
 	private static final String HEALTHOBJ = "PvP_Health";
-	private static Objective health;
+	private Objective health;
 
 	public BukkitNameTag(final CombatPlayer p) {
 		super(p);
@@ -40,69 +40,64 @@ public BukkitNameTag(final CombatPlayer p) {
 
 	@SuppressWarnings({ "deprecation", "null" })
 	private void setup() {
-		if (!combatPrefix.isEmpty() || !combatSuffix.isEmpty()) {
-			if (scoreboard.getTeam(combatTeamID) != null) {
-				inCombat = scoreboard.getTeam(combatTeamID);
-			} else {
-				inCombat = scoreboard.registerNewTeam(combatTeamID);
-				Log.debug("Creating combat team with name " + combatTeamID);
-				inCombat.setPrefix(combatPrefix);
-				if (MCVersion.isAtLeast(MCVersion.V1_13)) {
-					final ChatColor nameColor = getLastColor(combatPrefix);
-					if (nameColor != null) {
-						inCombat.setColor(nameColor);
-					}
-				}
-			}
-		}
-		if (Settings.isToggleNametagsEnabled()) {
-			if (!pvpOnPrefix.isEmpty()) {
-				if (scoreboard.getTeam(PVPON) != null) {
-					pvpOnTeam = scoreboard.getTeam(PVPON);
-				} else {
-					pvpOnTeam = scoreboard.registerNewTeam(PVPON);
-					pvpOnTeam.setCanSeeFriendlyInvisibles(false);
-					pvpOnTeam.setPrefix(pvpOnPrefix);
-					if (MCVersion.isAtLeast(MCVersion.V1_13)) {
-						final ChatColor nameColor = getLastColor(pvpOnPrefix);
-						if (nameColor != null) {
-							pvpOnTeam.setColor(nameColor);
-						}
-					}
-				}
-			}
-			if (!pvpOffPrefix.isEmpty()) {
-				if (scoreboard.getTeam(PVPOFF) != null) {
-					pvpOffTeam = scoreboard.getTeam(PVPOFF);
-				} else {
-					pvpOffTeam = scoreboard.registerNewTeam(PVPOFF);
-					pvpOffTeam.setCanSeeFriendlyInvisibles(false);
-					pvpOffTeam.setPrefix(pvpOffPrefix);
-					if (MCVersion.isAtLeast(MCVersion.V1_13)) {
-						final ChatColor nameColor = getLastColor(pvpOffPrefix);
-						if (nameColor != null) {
-							pvpOffTeam.setColor(nameColor);
-						}
-					}
-				}
-			}
+		setupCombatTeam();
+		if (Conf.TOGGLE_NAMETAG_ENABLED.asBool()) {
+			pvpOnTeam = setupToggleTeam(pvpOnPrefix, PVPON);
+			pvpOffTeam = setupToggleTeam(pvpOffPrefix, PVPOFF);
 			// set pvp tag if player has pvp nametags on
 			setPvP(pvPlayer.hasPvPEnabled());
 		}
-		if (Settings.isHealthBelowName() && (health == null || scoreboard.getObjective(HEALTHOBJ) == null)) {
+		if (Conf.HEALTH_BELOW_NAME.asBool() && (health == null || scoreboard.getObjective(HEALTHOBJ) == null)) {
 			if (scoreboard.getObjective(HEALTHOBJ) != null) {
 				health = scoreboard.getObjective(HEALTHOBJ);
 			} else if (MCVersion.isAtLeast(MCVersion.V1_19)) {
-				health = scoreboard.registerNewObjective(HEALTHOBJ, Criteria.HEALTH, Settings.getHealthBelowNameSymbol(), RenderType.HEARTS);
+				health = scoreboard.registerNewObjective(HEALTHOBJ, Criteria.HEALTH, Conf.HEALTH_BELOW_NAME_SYMBOL.asString(), RenderType.HEARTS);
 				health.setDisplaySlot(DisplaySlot.BELOW_NAME);
 			} else {
 				health = scoreboard.registerNewObjective(HEALTHOBJ, "health");
-				health.setDisplayName(Settings.getHealthBelowNameSymbol());
+				health.setDisplayName(Conf.HEALTH_BELOW_NAME_SYMBOL.asString());
 				health.setDisplaySlot(DisplaySlot.BELOW_NAME);
 			}
 		}
 	}
 
+	private void setupCombatTeam() {
+		if (combatPrefix.isEmpty() && combatSuffix.isEmpty())
+			return;
+		if (scoreboard.getTeam(combatTeamID) != null) {
+			inCombat = scoreboard.getTeam(combatTeamID);
+		} else {
+			inCombat = scoreboard.registerNewTeam(combatTeamID);
+			Log.debug("Creating combat team with name " + combatTeamID);
+			inCombat.setPrefix(combatPrefix);
+			setTeamColor(inCombat, combatPrefix);
+		}
+	}
+
+	private void setTeamColor(final Team team, final String teamPrefix) {
+		if (MCVersion.isAtLeast(MCVersion.V1_13)) {
+			final ChatColor nameColor = getLastColor(teamPrefix);
+			if (nameColor != null) {
+				team.setColor(nameColor);
+			}
+		}
+	}
+
+	private Team setupToggleTeam(final String teamPrefix, @NotNull final String teamName) {
+		if (teamPrefix.isEmpty())
+			return null;
+		Team toggleTeam;
+		if (scoreboard.getTeam(teamName) != null) {
+			toggleTeam = scoreboard.getTeam(teamName);
+		} else {
+			toggleTeam = scoreboard.registerNewTeam(teamName);
+			toggleTeam.setCanSeeFriendlyInvisibles(false);
+			toggleTeam.setPrefix(teamPrefix);
+			setTeamColor(toggleTeam, teamPrefix);
+		}
+		return toggleTeam;
+	}
+
 	private String processPlayerID(final UUID uuid) {
 		final String idResult = uuid.toString().replace("-", "");
 		if (idResult.startsWith("000000000000"))
diff --git a/pvpmanager/src/main/java/me/chancesd/pvpmanager/player/nametag/NameTag.java b/pvpmanager/src/main/java/me/chancesd/pvpmanager/player/nametag/NameTag.java
index d1b2a32c..28e63069 100644
--- a/pvpmanager/src/main/java/me/chancesd/pvpmanager/player/nametag/NameTag.java
+++ b/pvpmanager/src/main/java/me/chancesd/pvpmanager/player/nametag/NameTag.java
@@ -1,7 +1,7 @@
 package me.chancesd.pvpmanager.player.nametag;
 
 import me.chancesd.pvpmanager.player.CombatPlayer;
-import me.chancesd.pvpmanager.setting.Settings;
+import me.chancesd.pvpmanager.setting.Conf;
 import me.chancesd.pvpmanager.utils.ChatUtils;
 
 public abstract class NameTag {
@@ -14,10 +14,10 @@ public abstract class NameTag {
 
 	protected NameTag(final CombatPlayer p) {
 		this.pvPlayer = p;
-		this.combatPrefix = ChatUtils.colorize(Settings.getNameTagPrefix());
-		this.combatSuffix = ChatUtils.colorize(Settings.getNameTagSuffix());
-		this.pvpOnPrefix = Settings.getToggleColorOn().equalsIgnoreCase("none") ? "" : ChatUtils.colorize(Settings.getToggleColorOn());
-		this.pvpOffPrefix = Settings.getToggleColorOff().equalsIgnoreCase("none") ? "" : ChatUtils.colorize(Settings.getToggleColorOff());
+		this.combatPrefix = ChatUtils.colorize(Conf.NAMETAG_PREFIX.asString());
+		this.combatSuffix = ChatUtils.colorize(Conf.NAMETAG_SUFFIX.asString());
+		this.pvpOnPrefix = ChatUtils.colorize(Conf.TOGGLE_PREFIX_ON.asString());
+		this.pvpOffPrefix = ChatUtils.colorize(Conf.TOGGLE_PREFIX_OFF.asString());
 	}
 
 	public abstract void setInCombat();
diff --git a/pvpmanager/src/main/java/me/chancesd/pvpmanager/player/nametag/TABNameTag.java b/pvpmanager/src/main/java/me/chancesd/pvpmanager/player/nametag/TABNameTag.java
new file mode 100644
index 00000000..c3903388
--- /dev/null
+++ b/pvpmanager/src/main/java/me/chancesd/pvpmanager/player/nametag/TABNameTag.java
@@ -0,0 +1,112 @@
+package me.chancesd.pvpmanager.player.nametag;
+
+import org.jetbrains.annotations.Nullable;
+
+import me.chancesd.pvpmanager.integration.hook.TABHook;
+import me.chancesd.pvpmanager.player.CombatPlayer;
+import me.chancesd.pvpmanager.setting.Conf;
+import me.neznamy.tab.api.TabAPI;
+import me.neznamy.tab.api.TabPlayer;
+import me.neznamy.tab.api.nametag.NameTagManager;
+import me.neznamy.tab.api.tablist.TabListFormatManager;
+
+public class TABNameTag extends NameTag {
+
+	private boolean needsRestore;
+	private final TABHook tab;
+
+	public TABNameTag(final TABHook hook, final CombatPlayer p) {
+		super(p);
+		this.tab = hook;
+	}
+
+	private boolean changeTABPrefix(final String tabPrefix, final String tabSuffix) {
+		final TabPlayer tabPlayer = getTABPlayer();
+		if (tabPlayer == null)
+			return false;
+		final NameTagManager teamManager = TabAPI.getInstance().getNameTagManager();
+		if (teamManager != null && tab.showAboveHead()) {
+			if (!tabPrefix.isEmpty()) {
+				teamManager.setPrefix(tabPlayer, tabPrefix);
+			}
+			if (!tabSuffix.isEmpty()) {
+				teamManager.setSuffix(tabPlayer, tabSuffix);
+			}
+		}
+		final TabListFormatManager tabManager = TabAPI.getInstance().getTabListFormatManager();
+		if (tabManager != null && tab.showInPlayerlist()) {
+			if (!tabPrefix.isEmpty()) {
+				tabManager.setPrefix(tabPlayer, tabPrefix);
+			}
+			if (!tabSuffix.isEmpty()) {
+				tabManager.setSuffix(tabPlayer, tabSuffix);
+			}
+		}
+		this.needsRestore = true;
+		return true;
+	}
+
+	private boolean restoreTABPrefix() {
+		final TabPlayer tabPlayer = getTABPlayer();
+		if (tabPlayer == null)
+			return false;
+
+		final NameTagManager teamManager = TabAPI.getInstance().getNameTagManager();
+		if (teamManager != null && tab.showAboveHead()) {
+			teamManager.setPrefix(tabPlayer, null);
+			teamManager.setSuffix(tabPlayer, null);
+		}
+		final TabListFormatManager tabManager = TabAPI.getInstance().getTabListFormatManager();
+		if (tabManager != null && tab.showInPlayerlist()) {
+			tabManager.setPrefix(tabPlayer, null);
+			tabManager.setSuffix(tabPlayer, null);
+		}
+
+		if (Conf.TOGGLE_NAMETAG_ENABLED.asBool()) {
+			setPvP(pvPlayer.hasPvPEnabled());
+		}
+
+		this.needsRestore = false;
+		return true;
+	}
+
+	@Nullable
+	private TabPlayer getTABPlayer() {
+		return TabAPI.getInstance().getPlayer(pvPlayer.getUUID());
+	}
+
+	@Override
+	public final void setInCombat() {
+		changeTABPrefix(combatPrefix, combatSuffix);
+	}
+
+	@Override
+	public final void restoreNametag() {
+		if (needsRestore)
+			restoreTABPrefix();
+	}
+
+	@Override
+	public final void setPvP(final boolean state) {
+		if (getTABPlayer() == null)
+			return;
+
+		if (state) {
+			if (pvpOnPrefix.isEmpty()) {
+				restoreNametag();
+			} else {
+				changeTABPrefix(pvpOnPrefix, "");
+			}
+		} else if (pvpOffPrefix.isEmpty()) {
+			restoreNametag();
+		} else {
+			changeTABPrefix(pvpOffPrefix, "");
+		}
+	}
+
+	@Override
+	public void cleanup() {
+		// no cleanup needed for TAB
+	}
+
+}
diff --git a/pvpmanager/src/main/java/me/chancesd/pvpmanager/setting/Conf.java b/pvpmanager/src/main/java/me/chancesd/pvpmanager/setting/Conf.java
new file mode 100644
index 00000000..e0f5ad5c
--- /dev/null
+++ b/pvpmanager/src/main/java/me/chancesd/pvpmanager/setting/Conf.java
@@ -0,0 +1,400 @@
+package me.chancesd.pvpmanager.setting;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.EnumMap;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.stream.Stream;
+
+import java.util.Set;
+import java.util.function.Function;
+
+import org.bukkit.ChatColor;
+import org.bukkit.Material;
+import org.bukkit.configuration.ConfigurationSection;
+import org.bukkit.configuration.file.YamlConfiguration;
+import org.jetbrains.annotations.NotNull;
+
+import me.chancesd.pvpmanager.PvPManager;
+import me.chancesd.pvpmanager.setting.conf.ConfSection;
+import me.chancesd.pvpmanager.utils.ChatUtils;
+import me.chancesd.sdutils.utils.Log;
+import me.chancesd.sdutils.utils.MCVersion;
+
+public enum Conf {
+	// General section
+	LOCALE(ConfSection.GENERAL, "Locale", "EN", String.class),
+	USE_TEAMS(ConfSection.GENERAL, "Use Scoreboard Teams", true, Boolean.class),
+	WORLD_EXCLUSIONS(ConfSection.GENERAL, "World Exclusions", Conf::getSet, List.class, Set.class),
+
+	// Combat tag section
+	COMBAT_TAG_ENABLED(ConfSection.COMBAT_TAG, ConfSection.ENABLED, true, Boolean.class),
+	TIME_IN_COMBAT(ConfSection.COMBAT_TAG, "Time", 20, Integer.class),
+	GLOWING_IN_COMBAT(ConfSection.COMBAT_TAG, "Glowing", true, Boolean.class),
+	UNTAG_ON_KILL(ConfSection.COMBAT_TAG, "Untag On Kill", false, Boolean.class),
+	SELF_TAG(ConfSection.COMBAT_TAG, "Self Tag", false, Boolean.class),
+	PEARL_RENEW_TAG(ConfSection.COMBAT_TAG, "EnderPearl Renews Tag", true, Boolean.class),
+
+	NAMETAG_COMBAT_ENABLED(ConfSection.NAMETAG, ConfSection.ENABLED, true, Boolean.class),
+	NAMETAG_PREFIX(ConfSection.NAMETAG, "Prefix", "&4&lCombat &c", String.class),
+	NAMETAG_SUFFIX(ConfSection.NAMETAG, "Suffix", "", String.class),
+
+	ACTION_BAR_ENABLED(ConfSection.ACTION_BAR, ConfSection.ENABLED, true, Boolean.class),
+	ACTION_BAR_MESSAGE(ConfSection.ACTION_BAR, "Message", ChatUtils::colorize, String.class, String.class),
+	ACTION_BAR_SYMBOL(ConfSection.ACTION_BAR, "Symbol", "▊", String.class),
+	ACTION_BAR_BARS(ConfSection.ACTION_BAR, "Total Bars", 20, Integer.class),
+
+	BOSS_BAR_ENABLED(ConfSection.BOSS_BAR, ConfSection.ENABLED, bool -> MCVersion.isAtLeast(MCVersion.V1_9) && bool, Boolean.class, Boolean.class),
+	BOSS_BAR_MESSAGE(ConfSection.BOSS_BAR, "Message", ChatUtils::colorize, String.class, String.class),
+	BOSS_BAR_COLOR(ConfSection.BOSS_BAR, "BarColor", s -> Conf.loadEnum("org.bukkit.boss.BarColor", (String) s, MCVersion.V1_9)),
+	BOSS_BAR_STYLE(ConfSection.BOSS_BAR, "BarStyle", s -> Conf.loadEnum("org.bukkit.boss.BarStyle", (String) s, MCVersion.V1_9)),
+
+	// Actions blocked in combat
+	BLOCK_ENDERPEARL(ConfSection.ACTIONS_BLOCKED, "EnderPearls", false, Boolean.class),
+	BLOCK_CHORUSFRUIT(ConfSection.ACTIONS_BLOCKED, "ChorusFruits", false, Boolean.class),
+	BLOCK_TELEPORT(ConfSection.ACTIONS_BLOCKED, "Teleport", true, Boolean.class),
+	BLOCK_GLIDE_IN_COMBAT(ConfSection.ACTIONS_BLOCKED, "Elytra", false, Boolean.class),
+	BLOCK_EAT(ConfSection.ACTIONS_BLOCKED, "Eat", false, Boolean.class),
+	BLOCK_TOTEM_UNDYING(ConfSection.ACTIONS_BLOCKED, "Totem of Undying", false, Boolean.class),
+	BLOCK_PLACE_BLOCKS(ConfSection.ACTIONS_BLOCKED, "Place Blocks", false, Boolean.class),
+	BLOCK_INVENTORY_OPEN(ConfSection.ACTIONS_BLOCKED, "Open Inventory", false, Boolean.class),
+	BLOCK_INTERACT_IN_COMBAT(ConfSection.ACTIONS_BLOCKED, "Interact.Enabled", false, Boolean.class),
+	BLOCK_INTERACT_ITEM_LIST(ConfSection.ACTIONS_BLOCKED, "Interact.List", new ArrayList<>(), List.class),
+	BLOCK_COMMANDS(ConfSection.ACTIONS_BLOCKED, "Commands.Enabled", true, Boolean.class),
+	BLOCK_COMMANDS_WHITELIST(ConfSection.ACTIONS_BLOCKED, "Commands.Whitelist", true, Boolean.class),
+	COMMANDS_ALLOWED(ConfSection.ACTIONS_BLOCKED, "Commands.Command List", Conf::getList, List.class, List.class),
+
+	// Combat log punishments
+	FINE_AMOUNT(ConfSection.COMBAT_LOG, "Money Penalty", 0.0, Double.class),
+	KILL_ON_LOGOUT(ConfSection.COMBAT_LOG, "Kill on Logout.Enabled", true, Boolean.class),
+	DROP_INVENTORY(ConfSection.COMBAT_LOG, "Kill on Logout.Player Drops.Inventory", true, Boolean.class),
+	DROP_EXP(ConfSection.COMBAT_LOG, "Kill on Logout.Player Drops.Experience", true, Boolean.class),
+	DROP_ARMOR(ConfSection.COMBAT_LOG, "Kill on Logout.Player Drops.Armor", true, Boolean.class),
+
+	PUNISH_ON_KICK(ConfSection.COMBAT_LOG, "Punish On Kick.Enabled", true, Boolean.class),
+	MATCH_KICK_REASON(ConfSection.COMBAT_LOG, "Punish On Kick.Match Kick Reason", false, Boolean.class),
+	PUNISH_KICK_REASONS(ConfSection.COMBAT_LOG, "Punish On Kick.Kick Reasons", Conf::getList, List.class, List.class),
+	COMMANDS_ON_COMBATLOG(ConfSection.COMBAT_LOG, "Commands On Combat Log", Conf::getCommandList, List.class, List.class),
+
+	// PvP Toggle
+	DEFAULT_PVP(ConfSection.PVP_TOGGLE, "Default PvP", true, Boolean.class),
+	TOGGLE_COOLDOWN(ConfSection.PVP_TOGGLE, "Cooldown", 15, Integer.class),
+	TOGGLE_NAMETAG_ENABLED(ConfSection.PVP_TOGGLE, "NameTags.Enabled", false, Boolean.class),
+	TOGGLE_PREFIX_ON(ConfSection.PVP_TOGGLE, "NameTags.Prefix On", "&1", String.class),
+	TOGGLE_PREFIX_OFF(ConfSection.PVP_TOGGLE, "NameTags.Prefix Off", "&2", String.class),
+	PVP_DISABLED_FEE(ConfSection.PVP_TOGGLE, "PvP Disabled Money Fee", 0, Integer.class),
+	COMMANDS_PVP_ON(ConfSection.PVP_TOGGLE, "Commands PvP On", Conf::getCommandList, List.class, List.class),
+	COMMANDS_PVP_OFF(ConfSection.PVP_TOGGLE, "Commands PvP Off", Conf::getCommandList, List.class, List.class),
+	WORLDGUARD_OVERRIDES(ConfSection.PVP_TOGGLE, "WorldGuard Overrides.Enabled", true, Boolean.class),
+	WORLDGUARD_OVERRIDES_LIST(ConfSection.PVP_TOGGLE, "WorldGuard Overrides.Region List", Conf::getSet, List.class, Set.class),
+
+	// Anti border hopping
+	VULNERABLE_ENABLED(ConfSection.BORDER_HOPPING, "Vulnerable.Enabled", true, Boolean.class),
+	VULNERABLE_RENEW_TAG(ConfSection.BORDER_HOPPING, "Vulnerable.Renew Combat Tag", true, Boolean.class),
+	PUSHBACK_ENABLED(ConfSection.BORDER_HOPPING, "Push Back.Enabled", true, Boolean.class),
+	PUSHBACK_FORCE(ConfSection.BORDER_HOPPING, "Push Back.Force", 1.2, Double.class),
+	PUSHBACK_REMOVE_ELYTRA(ConfSection.BORDER_HOPPING, "Push Back.Remove Elytra", false, Boolean.class),
+
+	// Newbie protection
+	NEWBIE_ENABLED(ConfSection.NEWBIE_PROTECTION, ConfSection.ENABLED, true, Boolean.class),
+	NEWBIE_TIME(ConfSection.NEWBIE_PROTECTION, "Time", 600, Integer.class),
+	NEWBIE_ALLOW_DISABLE(ConfSection.NEWBIE_PROTECTION, "Allow Player Disable", true, Boolean.class),
+	NEWBIE_BLOCK_PICK(ConfSection.NEWBIE_PROTECTION, "Block Pick Items", false, Boolean.class),
+	NEWBIE_BLOCK_PLACE(ConfSection.NEWBIE_PROTECTION, "Block Place Blocks", false, Boolean.class),
+	NEWBIE_GODMODE(ConfSection.NEWBIE_PROTECTION, "Protect From Everything", false, Boolean.class),
+	NEWBIE_BLACKLIST(ConfSection.NEWBIE_PROTECTION, "Command Blacklist", Conf::getList, List.class, List.class),
+
+	// Item cooldowns
+	ITEM_COOLDOWNS(ConfSection.ITEM_COOLDOWNS, "", Conf::loadItemCooldowns, ConfigurationSection.class, Map.class),
+
+	// Player kills
+	MONEY_REWARD(ConfSection.PLAYER_KILLS, "Money Reward", 0.0, Double.class),
+	MONEY_PENALTY(ConfSection.PLAYER_KILLS, "Money Penalty", 0.0, Double.class),
+	MONEY_STEAL(ConfSection.PLAYER_KILLS, "Money Steal", false, Boolean.class),
+	EXP_STEAL(ConfSection.PLAYER_KILLS, "Exp Steal", 0.0, Double.class),
+	COMMANDS_ON_KILL(ConfSection.PLAYER_KILLS, "Commands On Kill", Conf::getCommandList, List.class, List.class),
+	KILLS_WG_EXCLUSIONS(ConfSection.PLAYER_KILLS, "WorldGuard Exclusions", Conf::getSet, List.class, Set.class),
+
+	KILL_ABUSE_ENABLED(ConfSection.ANTI_KILL_ABUSE, ConfSection.ENABLED, true, Boolean.class),
+	KILL_ABUSE_MAX(ConfSection.ANTI_KILL_ABUSE, "Max Kills", 5, Integer.class),
+	KILL_ABUSE_TIME(ConfSection.ANTI_KILL_ABUSE, "Time Limit", 20, Integer.class),
+	KILL_ABUSE_WARN(ConfSection.ANTI_KILL_ABUSE, "Warn Before", true, Boolean.class),
+	KILL_ABUSE_COMMANDS(ConfSection.ANTI_KILL_ABUSE, "Commands on Abuse", Conf::getCommandList, List.class, List.class),
+	RESPAWN_PROTECTION(ConfSection.ANTI_KILL_ABUSE, "Respawn Protection", 3, Integer.class),
+
+	// Other settings
+	PVP_BLOOD(ConfSection.OTHER_SETTINGS, "PvP Blood", true, Boolean.class),
+	IGNORE_NO_DMG_HITS(ConfSection.OTHER_SETTINGS, "Ignore No Damage Hits", true, Boolean.class),
+	PLAYER_DROP_MODE(ConfSection.OTHER_SETTINGS, "Player Drop Mode", s -> Conf.loadEnum(DropMode.class, s), String.class, DropMode.class),
+	HEALTH_BELOW_NAME(ConfSection.OTHER_SETTINGS, "Show health under name.Enabled", true, Boolean.class),
+	HEALTH_BELOW_NAME_SYMBOL(ConfSection.OTHER_SETTINGS, "Show health under name.Display Name", ChatUtils::colorize, String.class, String.class),
+
+	// Disable on hit
+	DISABLE_FLY(ConfSection.DISABLE_ON_HIT, "Fly", true, Boolean.class),
+	DISABLE_GAMEMODE(ConfSection.DISABLE_ON_HIT, "GameMode", true, Boolean.class),
+	DISABLE_DISGUISE(ConfSection.DISABLE_ON_HIT, "Disguise", true, Boolean.class),
+	DISABLE_GODMODE(ConfSection.DISABLE_ON_HIT, "GodMode", true, Boolean.class),
+	DISABLE_ELYTRA(ConfSection.DISABLE_ON_HIT, "Elytra", false, Boolean.class),
+	DISABLE_INVISIBILITY(ConfSection.DISABLE_ON_HIT, "Invisibility", false, Boolean.class),
+
+	CHECK_UPDATES("Update Check", ConfSection.ENABLED, true, Boolean.class),
+	AUTO_UPDATE("Update Check", "Auto Update", true, Boolean.class),
+	METRICS_OPT_OUT("Metrics", "Opt-out", false, Boolean.class),
+	HARMFUL_POTIONS("Harmful Potions", "", Conf::getSet, List.class, Set.class),
+
+	DEBUG_MODE("Debug Mode", "", Conf::setDebug, Boolean.class, Boolean.class);
+
+	public enum DropMode {
+		ALWAYS, DROP, KEEP, TRANSFER, CLEAR
+	}
+
+	private final String section;
+	private final String configKey;
+	private final Object def;
+	private Function<Object, ?> function;
+	private final Class<?> clazz;
+	private final Class<?> clazzResult;
+
+	private static YamlConfiguration config;
+	private static PvPManager plugin;
+
+	// This isn't pretty but not sure how else to do it without extra casting overhead/complications
+	private boolean boolValue;
+	private String stringValue;
+	private int intValue;
+	private double doubleValue;
+	private List<String> stringList;
+	private Set<String> stringSet;
+	private Enum<?> enumValue;
+	private Map<Material, ItemCooldown> map;
+
+	private <T> Conf(final String section, final String configKey, final T def, final Class<T> clazz) {
+		this.section = section;
+		this.configKey = configKey;
+		this.def = def;
+		this.clazz = clazz;
+		this.clazzResult = null;
+	}
+
+	@SuppressWarnings("unchecked")
+	private <T, R> Conf(final String section, final String configKey, final Function<T, R> function, final Class<T> clazz, final Class<R> clazzResult) {
+		this.section = section;
+		this.configKey = configKey;
+		this.def = null;
+		this.clazz = clazz;
+		this.function = (Function<Object, ?>) function;
+		this.clazzResult = clazzResult;
+	}
+
+	private <R> Conf(final String section, final String configKey, final Function<Object, R> function) {
+		this.section = section;
+		this.configKey = configKey;
+		this.def = null;
+		this.clazz = null;
+		this.function = function;
+		this.clazzResult = null;
+	}
+
+	private void loadSetting() {
+		final String path;
+		if(configKey.isEmpty()) {
+			path = section;
+		} else {
+			path = section + "." + configKey;
+		}
+
+		if (function == null) {
+			loadRegular(path);
+		} else {
+			loadFunction(path);
+		}
+	}
+
+	private void loadRegular(final @NotNull String path) {
+		if (clazz == Boolean.class) {
+			boolValue = config.getBoolean(path, (boolean) def);
+		} else if (clazz == String.class) {
+			stringValue = config.getString(path, (String) def);
+		} else if (clazz == Integer.class) {
+			intValue = config.getInt(path, (int) def);
+		} else if (clazz == Double.class) {
+			doubleValue = config.getDouble(path, (double) def);
+		} else if (clazz == List.class) {
+			stringList = config.getStringList(path);
+		}
+	}
+
+	@SuppressWarnings("unchecked")
+	private void loadFunction(final @NotNull String path) {
+		if (clazzResult == Set.class) {
+			stringSet = (Set<String>) function.apply(config.getStringList(path));
+		} else if (clazzResult == List.class) {
+			stringList = (List<String>) function.apply(config.getStringList(path));
+		} else if (clazzResult == null || clazzResult.isEnum()) { // Null check for some class that didn't exist in lower MC versions
+			enumValue = (Enum<?>) function.apply(config.getString(path));
+		} else if (clazzResult == Map.class) {
+			map = (Map<Material, ItemCooldown>) function.apply(config.getConfigurationSection(path));
+		} else if (clazzResult == String.class) {
+			stringValue = (String) function.apply(config.getString(path));
+		} else if (clazzResult == Boolean.class) {
+			boolValue = (boolean) function.apply(config.getBoolean(path));
+		}
+	}
+
+	public boolean asBool() {
+		return boolValue;
+	}
+
+	@NotNull
+	public String asString() {
+		return stringValue;
+	}
+
+	public int asInt() {
+		return intValue;
+	}
+
+	public double asDouble() {
+		return doubleValue;
+	}
+
+	public List<String> asList() {
+		return stringList;
+	}
+
+	public Set<String> asSet() {
+		return stringSet;
+	}
+
+	@NotNull
+	public <E extends Enum<E>> E asEnum(final Class<E> en) {
+		return en.cast(enumValue);
+	}
+
+	public Map<Material, ItemCooldown> asMap() {
+		return map;
+	}
+
+	public void set(final String stringValue) {
+		this.stringValue = stringValue;
+	}
+
+	public void set(final boolean booleanValue) {
+		this.boolValue = booleanValue;
+	}
+
+	public void disable() {
+		if (clazz == Boolean.class) {
+			boolValue = false;
+		} else if (clazz == List.class) {
+			stringList.clear();
+		} else if (clazz == Double.class) {
+			doubleValue = 0;
+		}
+	}
+
+	public static void initialize(final PvPManager pl, final YamlConfiguration yamlConfig) {
+		Conf.plugin = pl;
+		Conf.config = yamlConfig;
+		Stream.of(Conf.values()).forEach(Conf::loadSetting);
+		Log.infoColor(ChatColor.GREEN + "Using player nametags: " + ChatColor.AQUA + (NAMETAG_COMBAT_ENABLED.asBool() || TOGGLE_NAMETAG_ENABLED.asBool()));
+	}
+
+	private static <R extends Enum<R>> R loadEnum(final Class<R> clazz, final String value) {
+		try {
+			return Enum.valueOf(clazz, value);
+		} catch (final IllegalArgumentException e) {
+			Log.warning("Error! " + clazz.getSimpleName() + " '" + value + "' does not exist!");
+			return null;
+		}
+	}
+
+	@SuppressWarnings("unchecked")
+	private static <R extends Enum<R>> R loadEnum(final String className, final String value, final MCVersion minVersion) {
+		if (MCVersion.isAtLeast(minVersion)) {
+			try {
+				return loadEnum((Class<R>) Class.forName(className), value);
+			} catch (final ClassNotFoundException e) {
+				Log.severe(e.getMessage(), e);
+			}
+		}
+		return null;
+	}
+
+	public static ConfigurationSection getPluginHooks() {
+		return plugin.getConfigM().getHooksConfig().getConfigurationSection(ConfSection.PLUGIN_HOOKS);
+	}
+
+	private static List<String> getList(final List<String> list) {
+		list.removeIf(string -> string.startsWith("example"));
+		return list;
+	}
+
+	private static Set<String> getSet(final List<String> list) {
+		return new HashSet<>(getList(list));
+	}
+
+	private static List<String> getCommandList(final List<String> list) {
+		for (final Iterator<String> iterator = list.iterator(); iterator.hasNext();) {
+			String string = iterator.next().toLowerCase();
+			if (string.startsWith("!console")) {
+				string = string.substring(9);
+			}
+			if (string.startsWith("!player")) {
+				string = string.substring(8);
+			}
+			if (string.isEmpty() || string.startsWith("example")) {
+				iterator.remove();
+			}
+		}
+		return list;
+	}
+
+	private static Map<Material, ItemCooldown> loadItemCooldowns(final ConfigurationSection section) {
+		final EnumMap<Material, ItemCooldown> itemCooldowns = new EnumMap<>(Material.class);
+		if (section == null)
+			return Collections.emptyMap();
+
+		final ConfigurationSection combat = section.getConfigurationSection("Combat");
+		final Map<Material, Integer> combatCooldowns = readItemCooldowns(combat);
+
+		final ConfigurationSection global = section.getConfigurationSection("Global");
+		final Map<Material, Integer> globalCooldowns = readItemCooldowns(global);
+
+		final Set<Material> materials = new HashSet<>(combatCooldowns.keySet());
+		materials.addAll(globalCooldowns.keySet());
+
+		for (final Material material : materials) {
+			itemCooldowns.put(material, new ItemCooldown(combatCooldowns.getOrDefault(material, 0), globalCooldowns.getOrDefault(material, 0)));
+		}
+		return itemCooldowns;
+	}
+
+	private static Map<Material, Integer> readItemCooldowns(final ConfigurationSection cooldownSection) {
+		if (cooldownSection == null)
+			return Collections.emptyMap();
+		final Map<Material, Integer> results = new HashMap<>();
+		for (final Entry<String, Object> e : cooldownSection.getValues(false).entrySet()) {
+			final Material material = Material.getMaterial(e.getKey().toUpperCase());
+			if (material == null) {
+				Log.warning("The material " + e.getKey()
+						+ " in Item Cooldowns doesn't exist. You might have typed it incorrectly or it might not exist in this MC version");
+				continue;
+			}
+			results.put(material, (int) e.getValue());
+		}
+		return results;
+	}
+
+	public static boolean setDebug(final Boolean debug) {
+		Log.setDebug(debug);
+		Conf.DEBUG_MODE.set(debug);
+		return debug;
+	}
+
+}
diff --git a/pvpmanager/src/main/java/me/chancesd/pvpmanager/setting/ItemCooldown.java b/pvpmanager/src/main/java/me/chancesd/pvpmanager/setting/ItemCooldown.java
new file mode 100644
index 00000000..9d2fc8e3
--- /dev/null
+++ b/pvpmanager/src/main/java/me/chancesd/pvpmanager/setting/ItemCooldown.java
@@ -0,0 +1,29 @@
+package me.chancesd.pvpmanager.setting;
+
+public class ItemCooldown {
+
+	private int combatCooldown;
+	private int globalCooldown;
+
+	public ItemCooldown(final int combatCooldown, final int globalCooldown) {
+		this.combatCooldown = combatCooldown;
+		this.globalCooldown = globalCooldown;
+	}
+
+	public int getCombatCooldown() {
+		return combatCooldown;
+	}
+
+	public int getGlobalCooldown() {
+		return globalCooldown;
+	}
+
+	public void setCombatCooldown(final int combatCooldown) {
+		this.combatCooldown = combatCooldown;
+	}
+
+	public void setGlobalCooldown(final int globalCooldown) {
+		this.globalCooldown = globalCooldown;
+	}
+
+}
diff --git a/pvpmanager/src/main/java/me/chancesd/pvpmanager/setting/Lang.java b/pvpmanager/src/main/java/me/chancesd/pvpmanager/setting/Lang.java
index 961d4c87..fa01c5e2 100644
--- a/pvpmanager/src/main/java/me/chancesd/pvpmanager/setting/Lang.java
+++ b/pvpmanager/src/main/java/me/chancesd/pvpmanager/setting/Lang.java
@@ -28,6 +28,11 @@
 import me.chancesd.pvpmanager.utils.ChatUtils;
 import me.chancesd.sdutils.utils.Log;
 
+/**
+ * Message class to easily send messages to players, with replacements if necessary
+ *
+ * @author ChanceSD
+ */
 public enum Lang {
 
 	PREFIX("Prefix", Lang.PREFIXMSG),
@@ -112,7 +117,6 @@ public enum Lang {
 	public static final String PREFIXMSG = "§c[§8PvPManager§c]";
 	private static File messagesFile;
 	private static Locale locale;
-
 	private final String messageKey;
 	private final String[] replacements;
 	private String message;
@@ -153,10 +157,11 @@ public String msg(final String... arguments) {
 	public static void setup(final PvPManager plugin) {
 		Lang.plugin = plugin;
 		messageQueue.clear();
+		final String localeString = Conf.LOCALE.asString();
 		try {
-			locale = Locale.valueOf(Settings.getLocale());
+			locale = Locale.valueOf(localeString);
 		} catch (final IllegalArgumentException e) {
-			Log.warning("Error! Locale '" + Settings.getLocale() + "' does not exist! Using default messages");
+			Log.warning("Error! Locale '" + localeString + "' does not exist! Using default messages");
 			locale = Locale.EN;
 		}
 		load();
@@ -249,7 +254,7 @@ private static void addMessage(final String a) {
 
 	public static void messageProtection(final ProtectionResult result, final Player player, final Player attacked) {
 		final String message = getProtectionMessage(result, attacked);
-		final CombatPlayer receiver = plugin.getPlayerHandler().get(player);
+		final CombatPlayer receiver = plugin.getPlayerManager().get(player);
 		receiver.message(message);
 	}
 
diff --git a/pvpmanager/src/main/java/me/chancesd/pvpmanager/setting/Permissions.java b/pvpmanager/src/main/java/me/chancesd/pvpmanager/setting/Permissions.java
index a294e998..9e2b44a5 100644
--- a/pvpmanager/src/main/java/me/chancesd/pvpmanager/setting/Permissions.java
+++ b/pvpmanager/src/main/java/me/chancesd/pvpmanager/setting/Permissions.java
@@ -9,11 +9,18 @@
 public enum Permissions {
 
 	ADMIN("pvpmanager.admin"),
+	COMMAND_DEBUG("pvpmanager.debug"),
+	COMMAND_MENU("pvpmanager.menu"),
+	COMMAND_PVP_INFO_OTHERS("pvpmanager.info.others"),
+	COMMAND_PVP_TOGGLE("pvpmanager.pvpstatus.change"),
+	COMMAND_PVP_TOGGLE_OTHERS("pvpmanager.pvpstatus.others"),
+	COMMAND_RELOAD("pvpmanager.reload"),
 	EXEMPT_BLOCK_COMMANDS("pvpmanager.exempt.block.commands"),
 	EXEMPT_COMBAT_LOG("pvpmanager.nocombatlog"),
 	EXEMPT_COMBAT_TAG("pvpmanager.nocombattag"),
 	EXEMPT_DISABLE_ACTIONS("pvpmanager.nodisable"),
 	EXEMPT_KILL_ABUSE("pvpmanager.nokillabuse"),
+	EXEMPT_PROTECTION_RESPAWN("pvpmanager.bypass.protection.respawn"),
 	EXEMPT_PVPTOGGLE_COOLDOWN("pvpmanager.pvpstatus.nocooldown");
 
 	@NotNull
diff --git a/pvpmanager/src/main/java/me/chancesd/pvpmanager/setting/Settings.java b/pvpmanager/src/main/java/me/chancesd/pvpmanager/setting/Settings.java
deleted file mode 100644
index 5a349f63..00000000
--- a/pvpmanager/src/main/java/me/chancesd/pvpmanager/setting/Settings.java
+++ /dev/null
@@ -1,818 +0,0 @@
-package me.chancesd.pvpmanager.setting;
-
-import java.util.EnumMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-
-import org.bukkit.ChatColor;
-import org.bukkit.boss.BarColor;
-import org.bukkit.boss.BarStyle;
-import org.bukkit.command.CommandSender;
-import org.bukkit.Material;
-import org.bukkit.configuration.ConfigurationSection;
-import org.bukkit.configuration.file.YamlConfiguration;
-import org.jetbrains.annotations.NotNull;
-
-import me.chancesd.pvpmanager.utils.ChatUtils;
-import me.chancesd.sdutils.utils.Log;
-import me.chancesd.sdutils.utils.MCVersion;
-
-public final class Settings {
-
-	public enum DropMode {
-		ALWAYS, DROP, KEEP, TRANSFER, CLEAR
-	}
-
-	private static boolean debug = false;
-	private static boolean globalStatus = true;
-	private static int configVersion;
-	private static boolean isReloading;
-	private static boolean autoUpdate;
-	private static boolean blockEnderPearl;
-	private static boolean blockChorusFruit;
-	private static boolean blockTeleport;
-	private static boolean blockPickNewbies;
-	private static boolean blockPlaceBlocksNewbie;
-	private static boolean blockPlaceBlocks;
-	private static boolean blockGlideInCombat;
-	private static boolean blockEat;
-	private static boolean blockTotemUndying;
-	private static boolean blockInventoryOpen;
-	private static List<String> commandsAllowed;
-	private static List<String> commandsOnKill;
-	private static List<String> commandsOnPvPLog;
-	private static List<String> commandsPvPOff;
-	private static List<String> commandsPvPOn;
-	private static boolean commandsWhitelist;
-	private static boolean defaultPvp;
-	private static boolean disableDisguise;
-	private static boolean disableFly;
-	private static boolean disableGamemode;
-	private static boolean disableInvisibility;
-	private static boolean disableGodMode;
-	private static boolean disableELytra;
-	private static boolean dropArmor;
-	private static boolean dropExp;
-	private static boolean dropInventory;
-	private static DropMode dropMode;
-	private static double fineAmount;
-	private static boolean ignoreNoDamageHits;
-	private static boolean inCombatEnabled;
-	private static boolean useNameTag;
-	private static List<String> killAbuseCommands;
-	private static boolean killAbuseEnabled;
-	private static int killAbuseMaxKills;
-	private static int killAbuseTime;
-	private static boolean killOnLogout;
-	private static String locale;
-	private static boolean logToFile;
-	private static double moneyPenalty;
-	private static double moneyReward;
-	private static boolean moneySteal;
-	private static double expSteal;
-	private static String nameTagPrefix;
-	private static String nameTagSuffix;
-	private static boolean newbieGodMode;
-	private static boolean newbieProtectionEnabled;
-	private static int newbieProtectionTime;
-	private static boolean newbieAllowDisable;
-	private static boolean punishOnKick;
-	private static boolean matchKickReason;
-	private static List<String> forcePunishKickReason;
-	private static boolean pvpBlood;
-	private static int respawnProtection;
-	private static boolean stopCommands;
-	private static int timeInCombat;
-	private static long timeInCombatMs;
-	private static String toggleColorOff;
-	private static String toggleColorOn;
-	private static int toggleCooldown;
-	private static boolean toggleNametagsEnabled;
-	private static int pvpDisabledFee;
-	private static boolean update = false;
-	private static boolean checkUpdates;
-	private static boolean optOutMetrics;
-	private static double soupHealth;
-	private static boolean soupBowlDisappear;
-	private static boolean recyclePotionBottles;
-	private static boolean recycleMilkBucket;
-	private static boolean borderHoppingVulnerable;
-	private static boolean borderHoppingPushback;
-	private static boolean borderPushbackTakeElytra;
-	private static boolean borderHoppingResetCombatTag;
-	private static boolean worldguardOverrides;
-	private static Set<String> worldguardOverridesList;
-	private static int enderPearlCooldown;
-	private static boolean enderPearlRenewTag;
-	private static boolean glowingInCombat;
-	private static boolean selfTag;
-	private static boolean blockInteractInCombat;
-	private static List<String> blockInteractItemList;
-	private static boolean untagEnemy;
-	private static boolean killAbuseWarn;
-	private static boolean actionBarEnabled;
-	private static String actionBarMessage;
-	private static String actionBarSymbol;
-	private static int actionBarTotalBars;
-	private static boolean bossBarEnabled;
-	private static String bossBarMessage;
-	private static BarColor bossBarColor;
-	private static BarStyle bossBarStyle;
-	private static boolean healthBelowName;
-	private static String healthBelowNameSymbol;
-	private static List<String> newbieBlacklist;
-	private static Set<String> worldsExcluded;
-	private static Set<String> playerKillsWGExclusions;
-	private static String cooldownsxEnderpearlID;
-	private static Set<String> harmfulPotions;
-	private static Map<Material, Integer> itemCooldowns;
-	private static ConfigurationSection generalSection;
-	private static ConfigurationSection borderHoppingSection;
-	private static ConfigurationSection disableActionsSection;
-	private static ConfigurationSection combatTagSection;
-	private static ConfigurationSection newbieSection;
-	private static ConfigurationSection killAbuseSection;
-	private static ConfigurationSection playerKillsSection;
-	private static ConfigurationSection pvpToggleSection;
-	private static ConfigurationSection pluginHookSection;
-	private static ConfigurationSection updateSection;
-
-	private Settings() {
-	}
-
-	private static void assignSections(final YamlConfiguration config) {
-		generalSection = config.getConfigurationSection("General");
-		borderHoppingSection = config.getConfigurationSection("Anti Border Hopping");
-		disableActionsSection = config.getConfigurationSection("Disable");
-		combatTagSection = config.getConfigurationSection("Tagged In Combat");
-		newbieSection = config.getConfigurationSection("Newbie Protection");
-		killAbuseSection = config.getConfigurationSection("Kill Abuse");
-		playerKillsSection = config.getConfigurationSection("Player Kills");
-		pvpToggleSection = config.getConfigurationSection("PvP Toggle");
-		pluginHookSection = config.getConfigurationSection("Plugin Hooks");
-		updateSection = config.getConfigurationSection("Update Check");
-	}
-
-	public static void initizalizeVariables(final YamlConfiguration c) {
-		assignSections(c);
-
-		locale = generalSection.getString("Locale", "en").toUpperCase();
-		defaultPvp = generalSection.getBoolean("Default PvP", true);
-		pvpBlood = generalSection.getBoolean("PvP Blood", true);
-		dropMode = DropMode.valueOf(generalSection.getString("Player Drop Mode", "ALWAYS").toUpperCase());
-		ignoreNoDamageHits = generalSection.getBoolean("Ignore No Damage Hits", true);
-		soupHealth = generalSection.getDouble("Auto Soup.Health", 0);
-		soupBowlDisappear = generalSection.getBoolean("Auto Soup.Bowl Disappear", false);
-		recyclePotionBottles = generalSection.getBoolean("Recycling.Potion Bottle", false);
-		recycleMilkBucket = generalSection.getBoolean("Recycling.Milk Bucket", false);
-		healthBelowName = generalSection.getBoolean("Show health under name.Enabled", true);
-		healthBelowNameSymbol = ChatUtils.colorize(generalSection.getString("Show health under name.Display Name", "&c❤"));
-		worldsExcluded = new HashSet<>(getList(generalSection.getStringList("World Exclusions")));
-
-		borderHoppingVulnerable = borderHoppingSection.getBoolean("Vulnerable", true);
-		borderHoppingPushback = borderHoppingSection.getBoolean("Push Back.Enabled", true);
-		borderPushbackTakeElytra = borderHoppingSection.getBoolean("Push Back.Remove Elytra", false);
-		borderHoppingResetCombatTag = borderHoppingSection.getBoolean("Reset Combat Tag", true);
-
-		disableFly = disableActionsSection.getBoolean("Fly", true);
-		disableGamemode = disableActionsSection.getBoolean("GameMode", true);
-		disableDisguise = disableActionsSection.getBoolean("Disguise", true);
-		disableGodMode = disableActionsSection.getBoolean("GodMode", true);
-		disableELytra = disableActionsSection.getBoolean("Elytra", false);
-		disableInvisibility = disableActionsSection.getBoolean("Invisibility", false);
-
-		inCombatEnabled = combatTagSection.getBoolean("Enabled", true);
-		timeInCombat = combatTagSection.getInt("Time", 10);
-		timeInCombatMs = timeInCombat * 1000L;
-		nameTagPrefix = combatTagSection.getString("NameTag Prefix", "&c");
-		nameTagSuffix = combatTagSection.getString("NameTag Suffix", "");
-		glowingInCombat = combatTagSection.getBoolean("Glowing", true);
-		selfTag = combatTagSection.getBoolean("Self Tag", false);
-		actionBarEnabled = combatTagSection.getBoolean("Action Bar.Enabled", true);
-		actionBarMessage = ChatUtils.colorize(combatTagSection.getString("Action Bar.Message", ""));
-		actionBarSymbol = combatTagSection.getString("Action Bar.Symbol", "▊");
-		actionBarTotalBars = combatTagSection.getInt("Action Bar.Total Bars", 10);
-		bossBarEnabled = MCVersion.isAtLeast(MCVersion.V1_9) && combatTagSection.getBoolean("Boss Bar.Enabled", true);
-		bossBarMessage = ChatUtils.colorize(combatTagSection.getString("Boss Bar.Message", ""));
-		bossBarColor = MCVersion.isAtLeast(MCVersion.V1_9) ? BarColor.valueOf(combatTagSection.getString("Boss Bar.BarColor", "RED")) : null;
-		bossBarStyle = MCVersion.isAtLeast(MCVersion.V1_9) ? BarStyle.valueOf(combatTagSection.getString("Boss Bar.BarStyle", "SEGMENTED_10")) : null;
-		untagEnemy = combatTagSection.getBoolean("Untag Enemy", false);
-		enderPearlCooldown = combatTagSection.getInt("EnderPearl.Cooldown", 15);
-		enderPearlRenewTag = combatTagSection.getBoolean("EnderPearl.Renew Tag", true);
-
-		blockEnderPearl = combatTagSection.getBoolean("Block.EnderPearls", true);
-		blockChorusFruit = combatTagSection.getBoolean("Block.ChorusFruits", true);
-		blockTeleport = combatTagSection.getBoolean("Block.Teleport", true);
-		blockPlaceBlocks = combatTagSection.getBoolean("Block.Place Blocks", false);
-		blockInteractInCombat = combatTagSection.getBoolean("Block.Interact.Enabled", false);
-		blockInteractItemList = combatTagSection.getStringList("Block.Interact.List");
-		blockGlideInCombat = combatTagSection.getBoolean("Block.Elytra", false);
-		blockEat = combatTagSection.getBoolean("Block.Eat", false);
-		blockTotemUndying = combatTagSection.getBoolean("Block.Totem of Undying", false);
-		blockInventoryOpen = combatTagSection.getBoolean("Block.Open Inventory", true);
-		stopCommands = combatTagSection.getBoolean("Block.Commands.Enabled", true);
-		commandsWhitelist = combatTagSection.getBoolean("Block.Commands.Whitelist", true);
-		commandsAllowed = getList(combatTagSection.getStringList("Block.Commands.Command List"));
-		punishOnKick = combatTagSection.getBoolean("Punishments.Punish On Kick.Enabled", true);
-		matchKickReason = combatTagSection.getBoolean("Punishments.Punish On Kick.Match Kick Reason", false);
-		forcePunishKickReason = getList(combatTagSection.getStringList("Punishments.Punish On Kick.Kick Reasons"));
-		fineAmount = combatTagSection.getDouble("Punishments.Money Penalty", 0.00);
-		logToFile = combatTagSection.getBoolean("Punishments.Log To File", true);
-		killOnLogout = combatTagSection.getBoolean("Punishments.Kill on Logout.Enabled", true);
-		dropInventory = combatTagSection.getBoolean("Punishments.Kill on Logout.Player Drops.Inventory", true);
-		dropExp = combatTagSection.getBoolean("Punishments.Kill on Logout.Player Drops.Experience", true);
-		dropArmor = combatTagSection.getBoolean("Punishments.Kill on Logout.Player Drops.Armor", true);
-		commandsOnPvPLog = getCommandList(combatTagSection.getStringList("Punishments.Commands On PvPLog"));
-
-		itemCooldowns = new EnumMap<>(Material.class);
-		for (final Entry<String, Object> e : c.getConfigurationSection("Item Cooldowns").getValues(false).entrySet()) {
-			final Material material = Material.getMaterial(e.getKey().toUpperCase());
-			if (material == null) {
-				Log.warning("The material " + e.getKey()
-						+ " in Item Cooldowns doesn't exist. You might have typed it incorrectly or it might not exist in this MC version");
-				continue;
-			}
-			itemCooldowns.put(material, (Integer) e.getValue());
-		}
-
-		newbieProtectionEnabled = newbieSection.getBoolean("Enabled", true);
-		newbieProtectionTime = newbieSection.getInt("Time(minutes)", 5);
-		newbieAllowDisable = newbieSection.getBoolean("Allow Player Disable", true);
-		blockPickNewbies = newbieSection.getBoolean("Block Pick Items", false);
-		blockPlaceBlocksNewbie = newbieSection.getBoolean("Block Place Blocks", false);
-		newbieGodMode = newbieSection.getBoolean("Protect From Everything", false);
-		newbieBlacklist = getList(newbieSection.getStringList("Command Blacklist"));
-
-		killAbuseEnabled = killAbuseSection.getBoolean("Enabled", true);
-		killAbuseMaxKills = killAbuseSection.getInt("Max Kills", 5);
-		killAbuseTime = killAbuseSection.getInt("Time Limit", 60);
-		killAbuseWarn = killAbuseSection.getBoolean("Warn Before", true);
-		killAbuseCommands = getCommandList(killAbuseSection.getStringList("Commands on Abuse"));
-		respawnProtection = killAbuseSection.getInt("Respawn Protection", 5);
-
-		setMoneyReward(playerKillsSection.getDouble("Money Reward", 10));
-		setMoneyPenalty(playerKillsSection.getDouble("Money Penalty", 10));
-		moneySteal = playerKillsSection.getBoolean("Money Steal", false);
-		expSteal = playerKillsSection.getDouble("Exp Steal", 0.0);
-		commandsOnKill = getCommandList(playerKillsSection.getStringList("Commands On Kill"));
-		playerKillsWGExclusions = new HashSet<>(getList(playerKillsSection.getStringList("WorldGuard Exclusions")));
-
-		toggleCooldown = pvpToggleSection.getInt("Cooldown", 15);
-		setToggleNametagsEnabled(pvpToggleSection.getBoolean("NameTags.Enabled", false));
-		toggleColorOn = pvpToggleSection.getString("NameTags.Prefix On", "&1");
-		toggleColorOff = pvpToggleSection.getString("NameTags.Prefix Off", "&2");
-		pvpDisabledFee = pvpToggleSection.getInt("PvP Disabled Money Fee", 0);
-		commandsPvPOn = getCommandList(pvpToggleSection.getStringList("Commands PvP On"));
-		commandsPvPOff = getCommandList(pvpToggleSection.getStringList("Commands PvP Off"));
-		worldguardOverrides = pvpToggleSection.getBoolean("WorldGuard Overrides", true);
-		worldguardOverridesList = new HashSet<>(getList(pvpToggleSection.getStringList("WorldGuard Overrides Region List")));
-
-		cooldownsxEnderpearlID = pluginHookSection.getString("CooldownsX.Enderpearl", "");
-
-		useNameTag = !nameTagPrefix.isEmpty() || !nameTagSuffix.isEmpty() || toggleNametagsEnabled;
-		Log.infoColor(ChatColor.GREEN + "Using player nametags: " + ChatColor.AQUA + useNameTag);
-
-		checkUpdates = updateSection.getBoolean("Enabled", true);
-		autoUpdate = updateSection.getBoolean("Auto Update", true);
-
-		optOutMetrics = c.getBoolean("Metrics.Opt-out", false);
-
-		harmfulPotions = new HashSet<>(c.getStringList("Harmful Potions"));
-		Settings.setDEBUG(c.getBoolean("Debug Mode", false));
-		configVersion = c.getInt("Config Version");
-	}
-
-	public static void helpMenu(final CommandSender player) {
-		player.sendMessage(ChatColor.GOLD + "-------------- PvPManager Help Page --------------");
-		player.sendMessage(ChatColor.GOLD + "/pvp [player]" + helpSeparator() + ChatColor.WHITE + "Set PvP enabled or disabled");
-		player.sendMessage(ChatColor.GOLD + "/pvpinfo [player]" + helpSeparator() + ChatColor.WHITE + "Check your or other player info");
-		player.sendMessage(ChatColor.GOLD + "/pvplist [offline]" + helpSeparator() + ChatColor.WHITE + "List all online or offline players");
-		player.sendMessage(ChatColor.GOLD + "/pvpo " + helpSeparator() + ChatColor.WHITE + "Override all PvP protections");
-		player.sendMessage(ChatColor.GOLD + "/pvpstatus [player]" + helpSeparator() + ChatColor.WHITE + "Check your or other player PvP status");
-		player.sendMessage(ChatColor.GOLD + "/pvpglobal <on|off>" + helpSeparator() + ChatColor.WHITE + "Toggle PvP for the whole server");
-		player.sendMessage(ChatColor.GOLD + "/pvptag <player> <time>" + helpSeparator() + ChatColor.WHITE + "Check tag time left or tag a player");
-		player.sendMessage(ChatColor.GOLD + "/untag <player>" + helpSeparator() + ChatColor.WHITE + "Untags a player");
-		player.sendMessage(ChatColor.GOLD + "/newbie disable" + helpSeparator() + ChatColor.WHITE + "Disable newbie protection");
-		player.sendMessage(ChatColor.GOLD + "/pmr" + helpSeparator() + ChatColor.WHITE + "Shows this help page");
-		player.sendMessage(ChatColor.GOLD + "/pmr worlds" + helpSeparator() + ChatColor.WHITE + "Control panel to manage world PvP");
-		player.sendMessage(ChatColor.GOLD + "/pmr reload" + helpSeparator() + ChatColor.WHITE + "Reload PvPManager");
-		player.sendMessage(ChatColor.GOLD + "/pmr cleanup" + helpSeparator() + ChatColor.WHITE + "Cleanup inactive users from database");
-		player.sendMessage(ChatColor.GOLD + "/pmr update" + helpSeparator() + ChatColor.WHITE + "Update to latest version");
-		player.sendMessage(ChatColor.GOLD + "-------------------------------------------------");
-	}
-
-	private static String helpSeparator() {
-		return ChatColor.RED + " >> ";
-	}
-
-	private static List<String> getList(final List<String> list) {
-		list.removeIf(string -> string.startsWith("example"));
-		return list;
-	}
-
-	private static List<String> getCommandList(final List<String> list) {
-		for (final Iterator<String> iterator = list.iterator(); iterator.hasNext();) {
-			String string = iterator.next().toLowerCase();
-			if (string.startsWith("!console")) {
-				string = string.substring(9);
-			}
-			if (string.startsWith("!player")) {
-				string = string.substring(8);
-			}
-			if (string.isEmpty() || string.startsWith("example")) {
-				iterator.remove();
-			}
-		}
-		return list;
-	}
-
-	public static List<String> getNewbieBlacklist() {
-		return newbieBlacklist;
-	}
-
-	public static List<String> getCommandsAllowed() {
-		return commandsAllowed;
-	}
-
-	public static List<String> getCommandsOnKill() {
-		return commandsOnKill;
-	}
-
-	public static List<String> getCommandsOnPvPLog() {
-		return commandsOnPvPLog;
-	}
-
-	public static List<String> getCommandsPvPOff() {
-		return commandsPvPOff;
-	}
-
-	public static List<String> getCommandsPvPOn() {
-		return commandsPvPOn;
-	}
-
-	public static DropMode getDropMode() {
-		return dropMode;
-	}
-
-	public static double getFineAmount() {
-		return fineAmount;
-	}
-
-	public static void setFineAmount(final double fineAmount) {
-		Settings.fineAmount = fineAmount;
-	}
-
-	public static List<String> getKillAbuseCommands() {
-		return killAbuseCommands;
-	}
-
-	public static int getKillAbuseMaxKills() {
-		return killAbuseMaxKills;
-	}
-
-	public static int getKillAbuseTime() {
-		return killAbuseTime;
-	}
-
-	public static String getLocale() {
-		return locale;
-	}
-
-	public static void setLocale(final String locale) {
-		Settings.locale = locale;
-	}
-
-	public static double getMoneyPenalty() {
-		return moneyPenalty;
-	}
-
-	public static double getMoneyReward() {
-		return moneyReward;
-	}
-
-	public static String getNameTagPrefix() {
-		return nameTagPrefix;
-	}
-
-	public static String getNameTagSuffix() {
-		return nameTagSuffix;
-	}
-
-	public static int getNewbieProtectionTime() {
-		return newbieProtectionTime;
-	}
-
-	public static boolean isNewbieDisableAllowed() {
-		return newbieAllowDisable;
-	}
-
-	public static int getRespawnProtection() {
-		return respawnProtection;
-	}
-
-	public static int getTimeInCombat() {
-		return timeInCombat;
-	}
-
-	public static long getTimeInCombatMs() {
-		return timeInCombatMs;
-	}
-
-	public static String getToggleColorOff() {
-		return toggleColorOff;
-	}
-
-	public static String getToggleColorOn() {
-		return toggleColorOn;
-	}
-
-	public static int getToggleCooldown() {
-		return toggleCooldown;
-	}
-
-	public static Set<String> getWorldsExcluded() {
-		return worldsExcluded;
-	}
-
-	public static boolean isAutoUpdate() {
-		return autoUpdate;
-	}
-
-	public static boolean isBlockEnderPearl() {
-		return blockEnderPearl;
-	}
-
-	public static boolean isBlockChorusFruit() {
-		return blockChorusFruit;
-	}
-
-	public static boolean isBlockPickNewbies() {
-		return blockPickNewbies;
-	}
-
-	public static boolean isBlockPlaceBlocksNewbie() {
-		return blockPlaceBlocksNewbie;
-	}
-
-	public static boolean isBlockPlaceBlocks() {
-		return blockPlaceBlocks;
-	}
-
-	public static boolean isBlockGlide() {
-		return blockGlideInCombat;
-	}
-
-	public static boolean isBlockEat() {
-		return blockEat;
-	}
-
-	public static boolean isBlockTotemUndying() {
-		return blockTotemUndying;
-	}
-
-	public static boolean isBlockInventoryOpen() {
-		return blockInventoryOpen;
-	}
-
-	public static boolean isCommandsWhitelist() {
-		return commandsWhitelist;
-	}
-
-	public static boolean isDefaultPvp() {
-		return defaultPvp;
-	}
-
-	public static boolean isDisableDisguise() {
-		return disableDisguise;
-	}
-
-	public static boolean isDisableFly() {
-		return disableFly;
-	}
-
-	public static boolean isDisableGamemode() {
-		return disableGamemode;
-	}
-
-	public static boolean isDisableInvisibility() {
-		return disableInvisibility;
-	}
-
-	public static boolean isDisableElytra() {
-		return disableELytra;
-	}
-
-	public static boolean isDropArmor() {
-		return dropArmor;
-	}
-
-	public static boolean isDropExp() {
-		return dropExp;
-	}
-
-	public static boolean isDropInventory() {
-		return dropInventory;
-	}
-
-	public static boolean isIgnoreNoDamageHits() {
-		return ignoreNoDamageHits;
-	}
-
-	public static void setIgnoreNoDamageHits(final boolean ignoreNoDamageHits) {
-		Settings.ignoreNoDamageHits = ignoreNoDamageHits;
-	}
-
-	public static boolean isInCombatEnabled() {
-		return inCombatEnabled;
-	}
-
-	public static boolean isKillAbuseEnabled() {
-		return killAbuseEnabled;
-	}
-
-	public static boolean isKillOnLogout() {
-		return killOnLogout;
-	}
-
-	public static boolean isLogToFile() {
-		return logToFile;
-	}
-
-	public static boolean isNewbieGodMode() {
-		return newbieGodMode;
-	}
-
-	public static boolean isNewbieProtectionEnabled() {
-		return newbieProtectionEnabled;
-	}
-
-	public static boolean isPvpBlood() {
-		return pvpBlood;
-	}
-
-	public static boolean isMoneySteal() {
-		return moneySteal;
-	}
-
-	public static double getExpSteal() {
-		return expSteal;
-	}
-
-	public static boolean isUntagEnemy() {
-		return untagEnemy;
-	}
-
-	public static void setUntagEnemy(final boolean untagEnemy) {
-		Settings.untagEnemy = untagEnemy;
-	}
-
-	public static boolean borderHoppingVulnerable() {
-		return borderHoppingVulnerable;
-	}
-
-	public static boolean borderHoppingPushback() {
-		return borderHoppingPushback;
-	}
-
-	public static void setBorderHoppingPushback(final boolean borderHoppingPushback) {
-		Settings.borderHoppingPushback = borderHoppingPushback;
-	}
-
-	public static boolean isBorderPushbackTakeElytra() {
-		return borderPushbackTakeElytra;
-	}
-
-	public static boolean borderHoppingResetCombatTag() {
-		return borderHoppingResetCombatTag;
-	}
-
-	public static boolean isStopCommands() {
-		return stopCommands;
-	}
-
-	public static boolean isToggleNametagsEnabled() {
-		return toggleNametagsEnabled;
-	}
-
-	public static boolean isUpdate() {
-		return update;
-	}
-
-	public static boolean isUpdateCheck() {
-		return checkUpdates;
-	}
-
-	public static boolean isOptOutMetrics() {
-		return optOutMetrics;
-	}
-
-	public static boolean punishOnKick() {
-		return punishOnKick;
-	}
-
-	public static boolean matchKickReason() {
-		return matchKickReason;
-	}
-
-	public static void setMatchKickReason(final boolean matchKickReason) {
-		Settings.matchKickReason = matchKickReason;
-	}
-
-	public static List<String> getPunishKickReasons() {
-		return forcePunishKickReason;
-	}
-
-	public static boolean isDisableGodMode() {
-		return disableGodMode;
-	}
-
-	public static void setPvpBlood(final boolean pvpBlood) {
-		Settings.pvpBlood = pvpBlood;
-	}
-
-	public static void setMoneyPenalty(final double moneyPenalty) {
-		Settings.moneyPenalty = moneyPenalty;
-	}
-
-	public static void setMoneyReward(final double moneyReward) {
-		Settings.moneyReward = moneyReward;
-	}
-
-	public static void setToggleNametagsEnabled(final boolean toggleNametagsEnabled) {
-		Settings.toggleNametagsEnabled = toggleNametagsEnabled;
-	}
-
-	public static void setUpdate(final boolean update) {
-		Settings.update = update;
-	}
-
-	public static boolean useNameTag() {
-		return useNameTag;
-	}
-
-	public static void setUseNameTag(final boolean useNameTag) {
-		Settings.useNameTag = useNameTag;
-	}
-
-	public static int getConfigVersion() {
-		return configVersion;
-	}
-
-	public static boolean isAutoSoupEnabled() {
-		return getSoupHealth() > 0;
-	}
-
-	public static double getSoupHealth() {
-		return soupHealth;
-	}
-
-	public static boolean isSoupBowlDisappear() {
-		return soupBowlDisappear;
-	}
-
-	public static boolean isRecyclePotionBottles() {
-		return recyclePotionBottles;
-	}
-
-	public static boolean isRecycleMilkBucket() {
-		return recycleMilkBucket;
-	}
-
-	public static boolean isBlockTeleport() {
-		return blockTeleport;
-	}
-
-	public static boolean isWorldguardOverrides() {
-		return worldguardOverrides;
-	}
-
-	public static int getEnderPearlCooldown() {
-		return enderPearlCooldown;
-	}
-
-	public static boolean isEnderPearlRenewTag() {
-		return enderPearlRenewTag;
-	}
-
-	public static boolean isGlowingInCombat() {
-		return glowingInCombat;
-	}
-
-	public static boolean blockInteract() {
-		return blockInteractInCombat;
-	}
-
-	public static List<String> getBlockInteractItemList() {
-		return blockInteractItemList;
-	}
-
-	public static boolean isGlobalStatus() {
-		return globalStatus;
-	}
-
-	public static void setGlobalStatus(final boolean globalStatus) {
-		Settings.globalStatus = globalStatus;
-	}
-
-	public static boolean isActionBarEnabled() {
-		return actionBarEnabled;
-	}
-
-	public static String getActionBarMessage() {
-		return actionBarMessage;
-	}
-
-	public static String getActionBarSymbol() {
-		return actionBarSymbol;
-	}
-
-	public static int getActionBarBars() {
-		return actionBarTotalBars;
-	}
-
-	public static boolean isBossBarEnabled() {
-		return bossBarEnabled;
-	}
-
-	public static String getBossBarMessage() {
-		return bossBarMessage;
-	}
-
-	public static BarColor getBossBarColor() {
-		return bossBarColor;
-	}
-
-	public static BarStyle getBossBarStyle() {
-		return bossBarStyle;
-	}
-
-	public static Set<String> getKillsWGExclusions() {
-		return playerKillsWGExclusions;
-	}
-
-	public static boolean isKillAbuseWarn() {
-		return killAbuseWarn;
-	}
-
-	public static Map<Material, Integer> getItemCooldowns() {
-		return itemCooldowns;
-	}
-
-	public static boolean isHealthBelowName() {
-		return healthBelowName;
-	}
-
-	@NotNull
-	public static String getHealthBelowNameSymbol() {
-		return healthBelowNameSymbol;
-	}
-
-	public static String getCooldownsxEnderpearlID() {
-		return cooldownsxEnderpearlID;
-	}
-
-	public static boolean isSelfTag() {
-		return selfTag;
-	}
-
-	public static void setSelfTag(final boolean selfTag) {
-		Settings.selfTag = selfTag;
-	}
-
-	public static boolean isReloading() {
-		return isReloading;
-	}
-
-	public static void setReloading(final boolean isReloading) {
-		Settings.isReloading = isReloading;
-	}
-
-	public static Set<String> getHarmfulPotions() {
-		return harmfulPotions;
-	}
-
-	public static void setDEBUG(final boolean dEBUG) {
-		Settings.debug = dEBUG;
-		Log.setDebug(dEBUG);
-	}
-
-	public static boolean isDebug() {
-		return Settings.debug;
-	}
-
-	public static Set<String> getWorldguardOverridesList() {
-		return worldguardOverridesList;
-	}
-
-	public static int getPvPDisabledFee() {
-		return pvpDisabledFee;
-	}
-
-	public static ConfigurationSection getPLUGINHOOKS() {
-		return pluginHookSection;
-	}
-}
diff --git a/pvpmanager/src/main/java/me/chancesd/pvpmanager/setting/conf/ConfSection.java b/pvpmanager/src/main/java/me/chancesd/pvpmanager/setting/conf/ConfSection.java
new file mode 100644
index 00000000..ee8f909e
--- /dev/null
+++ b/pvpmanager/src/main/java/me/chancesd/pvpmanager/setting/conf/ConfSection.java
@@ -0,0 +1,38 @@
+package me.chancesd.pvpmanager.setting.conf;
+
+public class ConfSection {
+
+	public static final String YAML_SEPARATOR = ".";
+	public static final String ENABLED = "Enabled";
+	public static final String GENERAL = "General Settings";
+
+	public static final String COMBAT_TAG = "Combat Tag";
+	public static final String DISPLAY = COMBAT_TAG + YAML_SEPARATOR + "Display";
+	public static final String NAMETAG = DISPLAY + YAML_SEPARATOR + "Nametags";
+	public static final String ACTION_BAR = DISPLAY + YAML_SEPARATOR + "Action Bar";
+	public static final String BOSS_BAR = DISPLAY + YAML_SEPARATOR + "Boss Bar";
+	public static final String ACTIONS_BLOCKED = COMBAT_TAG + YAML_SEPARATOR + "Actions Blocked";
+
+	public static final String COMBAT_LOG = "Combat Log Punishments";
+
+	public static final String PVP_TOGGLE = "PvP Toggle";
+
+	public static final String BORDER_HOPPING = "Anti Border Hopping";
+
+	public static final String NEWBIE_PROTECTION = "Newbie Protection";
+
+	public static final String ITEM_COOLDOWNS = "Item Cooldowns";
+
+	public static final String PLAYER_KILLS = "Player Kills";
+	public static final String ANTI_KILL_ABUSE = PLAYER_KILLS + YAML_SEPARATOR + "Anti Kill Abuse";
+
+	public static final String OTHER_SETTINGS = "Other Settings";
+
+	public static final String DISABLE_ON_HIT = "Disable On Hit";
+
+	public static final String PLUGIN_HOOKS = "Plugin Hooks";
+
+	private ConfSection() {
+	}
+
+}
diff --git a/pvpmanager/src/main/java/me/chancesd/pvpmanager/setting/lang/Replacement.java b/pvpmanager/src/main/java/me/chancesd/pvpmanager/setting/lang/Replacement.java
index 97030114..2cc2b5c3 100644
--- a/pvpmanager/src/main/java/me/chancesd/pvpmanager/setting/lang/Replacement.java
+++ b/pvpmanager/src/main/java/me/chancesd/pvpmanager/setting/lang/Replacement.java
@@ -10,6 +10,9 @@ public class Replacement {
 	public static final String STATE = prepare("state");
 	public static final String PREFIX = prepare("prefix");
 
+	private Replacement() {
+	}
+
 	private static String prepare(final String value) {
 		return "{" + value + "}";
 	}
diff --git a/pvpmanager/src/main/java/me/chancesd/pvpmanager/storage/Database.java b/pvpmanager/src/main/java/me/chancesd/pvpmanager/storage/Database.java
index 1346e64b..519c521d 100644
--- a/pvpmanager/src/main/java/me/chancesd/pvpmanager/storage/Database.java
+++ b/pvpmanager/src/main/java/me/chancesd/pvpmanager/storage/Database.java
@@ -37,6 +37,11 @@ public class Database {
 	private boolean converted;
 	private final HikariDataSource connectionPool;
 
+	private static final String SQL_SELECT_ALL = "SELECT * FROM ";
+	private static final String SQL_INSERT_INTO = "INSERT INTO ";
+	private static final String SQL_WHERE = " WHERE ";
+	private static final String SQL_VALUES = " VALUES(";
+
 	protected Database(final DatabaseFactory databaseFactory, final DatabaseConfigBuilder builder) {
 		this.plugin = databaseFactory.getPlugin();
 		this.databaseType = builder.getType();
@@ -62,7 +67,7 @@ protected Database(final DatabaseFactory databaseFactory, final DatabaseConfigBu
 			config.setUsername(builder.getUser());
 			config.setPassword(builder.getPassword());
 		}
-		config.setPoolName("PvPManager");
+		config.setPoolName(plugin.getName());
 		config.addDataSourceProperty("cachePrepStmts", "true");
 		config.addDataSourceProperty("prepStmtCacheSize", "250");
 		config.addDataSourceProperty("prepStmtCacheSqlLimit", "2048");
@@ -184,7 +189,7 @@ public boolean columnExists(final String table, final String column) {
 	public void insertDefault(final Table table, final Object... values) {
 		try (Connection connection = getConnection()) {
 			final StringBuilder valueCount = getValueParameteres(Arrays.asList(values));
-			try (PreparedStatement ps = connection.prepareStatement("INSERT INTO " + table.getName() + " VALUES(" + valueCount + ");")) {
+			try (PreparedStatement ps = connection.prepareStatement(SQL_INSERT_INTO + table.getName() + SQL_VALUES + valueCount + ");")) {
 				for (int i = 0; i < values.length; i++) {
 					ps.setObject(i + 1, values[i]);
 				}
@@ -216,7 +221,7 @@ public boolean insertColumns(final Table table, final Collection<String> columns
 				}
 			}
 			columnList.append(")");
-			try (PreparedStatement ps = connection.prepareStatement("INSERT INTO " + table.getName() + columnList + " VALUES(" + valueCount + ");")) {
+			try (PreparedStatement ps = connection.prepareStatement(SQL_INSERT_INTO + table.getName() + columnList + SQL_VALUES + valueCount + ");")) {
 				int i = 0;
 				for (final Object object : values) {
 					ps.setObject(++i, object);
@@ -254,7 +259,7 @@ public void insertColumnsBatch(final Table table, final Collection<String> colum
 				}
 			}
 			columnList.append(")");
-			try (PreparedStatement ps = connection.prepareStatement("INSERT INTO " + table.getName() + columnList + " VALUES(" + valueCount + ");")) {
+			try (PreparedStatement ps = connection.prepareStatement(SQL_INSERT_INTO + table.getName() + columnList + SQL_VALUES + valueCount + ");")) {
 				int inserts = 0;
 				for (final Collection<Object> object : values) {
 					int i = 0;
@@ -284,7 +289,7 @@ public void insertColumnsBatch(final Table table, final Collection<String> colum
 	 */
 	public Object getValue(final Table table, final String index, final String toGet, final Object value) {
 		try (Connection connection = getConnection();
-				final PreparedStatement ps = connection.prepareStatement("SELECT * FROM " + table.getName() + " WHERE " + index + "=?;")) {
+				final PreparedStatement ps = connection.prepareStatement(SQL_SELECT_ALL + table.getName() + SQL_WHERE + index + "=?")) {
 			ps.setObject(1, value);
 			try (ResultSet result = ps.executeQuery()) {
 				if (result.next())
@@ -307,7 +312,7 @@ public Object getValue(final Table table, final String index, final String toGet
 	 */
 	public Map<String, Object> getRow(final Table table, final String index, final Object value) {
 		try (Connection connection = getConnection();
-				final PreparedStatement ps = connection.prepareStatement("SELECT * FROM " + table.getName() + " WHERE " + index + "=?;")) {
+				final PreparedStatement ps = connection.prepareStatement(SQL_SELECT_ALL + table.getName() + SQL_WHERE + index + "=?")) {
 			ps.setObject(1, value);
 			try (final ResultSet result = ps.executeQuery()) {
 				if (result.next()) {
@@ -334,7 +339,7 @@ public Map<String, Object> getRow(final Table table, final String index, final O
 	 */
 	public List<Map<String, Object>> getAllRows(final Table table) {
 		try (Connection connection = getConnection();
-				final PreparedStatement ps = connection.prepareStatement("SELECT * FROM " + table.getName() + ";")) {
+				final PreparedStatement ps = connection.prepareStatement(SQL_SELECT_ALL + table.getName() + ";")) {
 			try (final ResultSet result = ps.executeQuery()) {
 				final List<Map<String, Object>> rows = new ArrayList<>();
 				while (result.next()) {
@@ -363,7 +368,7 @@ public List<Map<String, Object>> getAllRows(final Table table) {
 	 */
 	public boolean contains(final Table table, final String index, final Object value) {
 		try (Connection connection = getConnection();
-				PreparedStatement ps = connection.prepareStatement("SELECT * FROM " + table.getName() + " WHERE " + index + "=?;")) {
+				PreparedStatement ps = connection.prepareStatement(SQL_SELECT_ALL + table.getName() + SQL_WHERE + index + "=?")) {
 			ps.setObject(1, value);
 			try (ResultSet result = ps.executeQuery()) {
 				return result.next();
@@ -389,7 +394,7 @@ public void update(final Table table, final String index, final String toUpdate,
 		try (Connection connection = getConnection()) {
 			final String update = extra.isEmpty() ? "?" : updateValue + extra;
 			try (PreparedStatement ps = connection
-					.prepareStatement("UPDATE " + table.getName() + " SET " + toUpdate + "=" + update + " WHERE " + index + "=?;")) {
+					.prepareStatement("UPDATE " + table.getName() + " SET " + toUpdate + "=" + update + SQL_WHERE + index + "=?;")) {
 				if (extra.isEmpty()) {
 					ps.setObject(1, updateValue);
 					ps.setObject(2, indexValue);
@@ -438,7 +443,7 @@ public boolean updateValues(final Table table, final String index, final Object
 				}
 			}
 			try (PreparedStatement ps = connection
-					.prepareStatement("UPDATE " + table.getName() + " SET " + updateString + " WHERE " + index + "=?;")) {
+					.prepareStatement("UPDATE " + table.getName() + " SET " + updateString + SQL_WHERE + index + "=?;")) {
 				i = 0;
 				for (final Object object : values) {
 					ps.setObject(++i, object);
@@ -462,7 +467,7 @@ public boolean updateValues(final Table table, final String index, final Object
 	 */
 	public void remove(final Table table, final String index, final Object value) {
 		try (Connection connection = getConnection();
-				PreparedStatement ps = connection.prepareStatement("DELETE FROM " + table.getName() + " WHERE " + index + "=?;")) {
+				PreparedStatement ps = connection.prepareStatement("DELETE FROM " + table.getName() + SQL_WHERE + index + "=?;")) {
 			ps.setObject(1, value);
 			ps.executeUpdate();
 		} catch (final SQLException e) {
@@ -515,9 +520,9 @@ public DatabaseType getDatabaseType() {
 	}
 
 	private void setLogLevel(final Level level) {
-		try (LoggerContext ctx = (LoggerContext) LogManager.getContext(false)) {
-			ctx.getConfiguration().getLoggerConfig("com.zaxxer.hikari.HikariDataSource").setLevel(level);
-		}
+		@SuppressWarnings("resource")
+		final LoggerContext ctx = (LoggerContext) LogManager.getContext(false);
+		ctx.getConfiguration().getLoggerConfig("com.zaxxer.hikari.HikariDataSource").setLevel(level);
 	}
 
 	private StringBuilder getValueParameteres(final Collection<Object> values) {
diff --git a/pvpmanager/src/main/java/me/chancesd/pvpmanager/tasks/NewbieTask.java b/pvpmanager/src/main/java/me/chancesd/pvpmanager/tasks/NewbieTask.java
index eebc05ff..06bb0d11 100644
--- a/pvpmanager/src/main/java/me/chancesd/pvpmanager/tasks/NewbieTask.java
+++ b/pvpmanager/src/main/java/me/chancesd/pvpmanager/tasks/NewbieTask.java
@@ -5,7 +5,7 @@
 
 import me.chancesd.pvpmanager.player.CombatPlayer;
 import me.chancesd.pvpmanager.setting.Lang;
-import me.chancesd.pvpmanager.setting.Settings;
+import me.chancesd.pvpmanager.setting.Conf;
 import me.chancesd.pvpmanager.utils.ScheduleUtils;
 import me.chancesd.pvpmanager.utils.TimeUtil;
 
@@ -18,7 +18,7 @@ public class NewbieTask implements Runnable {
 
 	public NewbieTask(final CombatPlayer player, final long time) {
 		this.player = player;
-		final long timeLeft = time == 0 ? Settings.getNewbieProtectionTime() * 60000 : time;
+		final long timeLeft = time == 0 ? Conf.NEWBIE_TIME.asInt() * 1000 : time;
 		this.finishTime = System.currentTimeMillis() + timeLeft;
 		task = ScheduleUtils.runAsyncLater(this, timeLeft / 1000, TimeUnit.SECONDS);
 		if (time != 0) {
diff --git a/pvpmanager/src/main/java/me/chancesd/pvpmanager/tasks/StorageSaveTask.java b/pvpmanager/src/main/java/me/chancesd/pvpmanager/tasks/StorageSaveTask.java
index 9272d4ee..2025f3e3 100644
--- a/pvpmanager/src/main/java/me/chancesd/pvpmanager/tasks/StorageSaveTask.java
+++ b/pvpmanager/src/main/java/me/chancesd/pvpmanager/tasks/StorageSaveTask.java
@@ -23,7 +23,7 @@ public StorageSaveTask(final PvPManager plugin, final Storage storage) {
 	public void run() {
 		final long start = System.nanoTime();
 		Log.debug("Saving all player data to storage asynchronously");
-		final Map<UUID, CombatPlayer> players = new HashMap<>(plugin.getPlayerHandler().getPlayers());
+		final Map<UUID, CombatPlayer> players = new HashMap<>(plugin.getPlayerManager().getPlayers());
 		players.values().forEach(storage::saveUserData);
 		Log.debug("Finished saving all player data" + " - " + (System.nanoTime() - start) / 1_000_000D + " ms");
 	}
diff --git a/pvpmanager/src/main/java/me/chancesd/pvpmanager/tasks/TagTask.java b/pvpmanager/src/main/java/me/chancesd/pvpmanager/tasks/TagTask.java
index eaa97d67..b28c071d 100644
--- a/pvpmanager/src/main/java/me/chancesd/pvpmanager/tasks/TagTask.java
+++ b/pvpmanager/src/main/java/me/chancesd/pvpmanager/tasks/TagTask.java
@@ -8,7 +8,8 @@
 
 import me.chancesd.pvpmanager.manager.DisplayManager;
 import me.chancesd.pvpmanager.player.CombatPlayer;
-import me.chancesd.pvpmanager.setting.Settings;
+import me.chancesd.pvpmanager.player.UntagReason;
+import me.chancesd.pvpmanager.setting.Conf;
 import me.chancesd.sdutils.utils.Log;
 
 public class TagTask extends TimerTask {
@@ -28,21 +29,20 @@ public final void run() {
 		try {
 			final Iterator<CombatPlayer> iterator = tagged.iterator();
 			while (iterator.hasNext()) {
-				final CombatPlayer p = iterator.next();
+				final CombatPlayer combatPlayer = iterator.next();
 				final long currentTime = System.currentTimeMillis();
-				if (currentTime >= p.getUntagTime()) {
-					p.unTag();
-					display.discardBossbar(p);
+				if (currentTime >= combatPlayer.getUntagTime()) {
+					combatPlayer.untag(UntagReason.TIME_EXPIRED);
 					iterator.remove();
 					continue;
 				}
-				final double timePassed = (currentTime - p.getTaggedTime()) / 1000D;
-				final int totalTagTimeInSeconds = (int) (p.getTotalTagTime() / 1000);
-				if (Settings.isActionBarEnabled()) {
-					display.showProgress(p, timePassed, totalTagTimeInSeconds);
+				final double timePassed = (currentTime - combatPlayer.getTaggedTime()) / 1000D;
+				final int totalTagTimeInSeconds = (int) (combatPlayer.getTotalTagTime() / 1000);
+				if (Conf.ACTION_BAR_ENABLED.asBool()) {
+					display.showProgress(combatPlayer, timePassed, totalTagTimeInSeconds);
 				}
-				if (Settings.isBossBarEnabled()) {
-					display.updateBossbar(p, timePassed, totalTagTimeInSeconds);
+				if (Conf.BOSS_BAR_ENABLED.asBool()) {
+					display.updateBossbar(combatPlayer, timePassed, totalTagTimeInSeconds);
 				}
 			}
 		} catch (final Exception e) {
@@ -53,24 +53,25 @@ public final void run() {
 
 	@Override
 	public final boolean cancel() {
-		for (final CombatPlayer pvPlayer : tagged)
-			if (pvPlayer.isInCombat()) {
-				display.discardBossbar(pvPlayer);
-				pvPlayer.unTag();
+		for (final CombatPlayer combatPlayer : tagged) {
+			if (combatPlayer.isInCombat()) {
+				display.discardBossbar(combatPlayer);
+				combatPlayer.untag(UntagReason.PLUGIN_DISABLE);
 			}
+		}
 		tagged.clear();
 		super.cancel();
 		timer.cancel();
 		return false;
 	}
 
-	public final void addTagged(final CombatPlayer p) {
-		tagged.add(p);
+	public final void startTracking(final CombatPlayer combatPlayer) {
+		tagged.add(combatPlayer);
 	}
 
-	public final void untag(final CombatPlayer p) {
-		display.discardBossbar(p);
-		tagged.remove(p);
+	public final void stopTracking(final CombatPlayer combatPlayer) {
+		display.discardBossbar(combatPlayer);
+		tagged.remove(combatPlayer);
 	}
 
 	public Set<CombatPlayer> getTaggedPlayers() {
diff --git a/pvpmanager/src/main/java/me/chancesd/pvpmanager/utils/CombatUtils.java b/pvpmanager/src/main/java/me/chancesd/pvpmanager/utils/CombatUtils.java
index e10a05e3..879df315 100644
--- a/pvpmanager/src/main/java/me/chancesd/pvpmanager/utils/CombatUtils.java
+++ b/pvpmanager/src/main/java/me/chancesd/pvpmanager/utils/CombatUtils.java
@@ -13,12 +13,14 @@
 import org.bukkit.command.CommandException;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.AreaEffectCloud;
+import org.bukkit.entity.EnderCrystal;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
 import org.bukkit.entity.Projectile;
 import org.bukkit.entity.TNTPrimed;
 import org.bukkit.event.entity.EntityCombustByEntityEvent;
 import org.bukkit.event.entity.EntityDamageByEntityEvent;
+import org.bukkit.event.entity.EntityDamageEvent;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.potion.PotionEffect;
 import org.bukkit.potion.PotionEffectType;
@@ -27,7 +29,7 @@
 import org.jetbrains.annotations.NotNull;
 
 import me.chancesd.pvpmanager.setting.Lang;
-import me.chancesd.pvpmanager.setting.Settings;
+import me.chancesd.pvpmanager.setting.Conf;
 import me.chancesd.sdutils.utils.Log;
 import me.chancesd.sdutils.utils.ReflectionUtil;
 import me.chancesd.sdutils.utils.MCVersion;
@@ -101,16 +103,32 @@ public static final boolean isPvP(final EntityDamageByEntityEvent event) {
 			final ProjectileSource projSource = getSource(attacker);
 			if (projSource instanceof Player) {
 				final Entity shooter = (Entity) projSource;
-				if (Settings.isSelfTag() || !shooter.equals(defender) && !isNPC(shooter))
-					return !Settings.isIgnoreNoDamageHits() || event.getDamage() != 0;
+				if (Conf.SELF_TAG.asBool() || !shooter.equals(defender) && !isNPC(shooter))
+					return !Conf.IGNORE_NO_DMG_HITS.asBool() || event.getDamage() != 0;
 			}
 		}
 		if (attacker instanceof final TNTPrimed tnt) {
 			final Entity tntAttacker = tnt.getSource();
-			if (tntAttacker instanceof Player && (Settings.isSelfTag() || !tntAttacker.equals(defender))) {
+			if (tntAttacker instanceof Player && (Conf.SELF_TAG.asBool() || !tntAttacker.equals(defender))) {
 				return true;
 			}
 		}
+		if (attacker instanceof final EnderCrystal endercrystal) {
+			final EntityDamageEvent lastDamageCause = endercrystal.getLastDamageCause();
+			if (!(lastDamageCause instanceof final EntityDamageByEntityEvent damageEvent))
+				return false;
+			final Entity crystalSource = damageEvent.getDamager();
+			if (crystalSource instanceof Player && !crystalSource.equals(defender))
+				return true;
+			if (crystalSource instanceof final Projectile projectile) {
+				final ProjectileSource projSource = projectile.getShooter();
+				if (projSource instanceof Player) {
+					final Entity shooter = (Entity) projSource;
+					if (Conf.SELF_TAG.asBool() || !shooter.equals(defender))
+						return true;
+				}
+			}
+		}
 
 		return false;
 	}
@@ -151,7 +169,7 @@ public static void checkGlide(final Player p) {
 		p.setGliding(false);
 		ScheduleUtils.teleport(p, playerLocation);
 		p.setFallDistance(-200);
-		if (!Settings.isBorderPushbackTakeElytra())
+		if (!Conf.PUSHBACK_REMOVE_ELYTRA.asBool())
 			return;
 		final ItemStack chestplate = p.getInventory().getChestplate();
 		if (chestplate == null || chestplate.getType() != Material.ELYTRA)
@@ -193,7 +211,7 @@ public static boolean isReal(@NotNull final UUID id) {
 	}
 
 	public static boolean isWorldExcluded(final String worldName) {
-		return Settings.getWorldsExcluded().contains(worldName);
+		return Conf.WORLD_EXCLUSIONS.asSet().contains(worldName);
 	}
 
 	public static boolean hasHarmfulPotion(final AreaEffectCloud areaCloud) {
@@ -215,7 +233,7 @@ public static boolean hasHarmfulPotion(final AreaEffectCloud areaCloud) {
 
 	@SuppressWarnings("deprecation")
 	public static boolean isHarmfulPotion(final PotionEffectType type) {
-		return Settings.getHarmfulPotions().contains(type.getName());
+		return Conf.HARMFUL_POTIONS.asSet().contains(type.getName());
 	}
 
 	public static boolean recursiveContainsCommand(final String[] givenCommand, final List<String> list) {
diff --git a/pvpmanager/src/main/resources/config.yml b/pvpmanager/src/main/resources/config.yml
index 84d091b2..dec4c6d3 100644
--- a/pvpmanager/src/main/resources/config.yml
+++ b/pvpmanager/src/main/resources/config.yml
@@ -1,121 +1,69 @@
 # +--------------------------------------------------------------------------+ #
 # <                     PvPManager Configuration File                        > #
 # <--------------------------------------------------------------------------> #
-# <               For help understanding a config option go to               > #
+# <                  For help with the config options go to                  > #
 # <            https://www.spigotmc.org/threads/pvpmanager.25420/            > #
 # <                  or Discord https://discord.gg/w7gyBuw                   > #
 # +--------------------------------------------------------------------------+ #
 
-# Default PvP -> Leave it at true unless you want no PvP for new players
-# PvP Blood -> Enable blood particles on PvP
-# Player Drop Mode -> What happens to a player's drops and exp on death
-# The options are 'ALWAYS' - (PvPManager does nothing, so feature is disabled),
-# mode 'DROP' - (Players drop items when killed in PvP but not in PvE),
-# mode 'KEEP' - (Players keep items when killed in PvP but not in PvE) and
-# mode 'TRANSFER' - (Same as 'DROP' but transfer items(not exp) directly to killer's inventory without drops)
-# mode 'CLEAR' - (Clear all drops and exp on death, this deletes everything on death so make sure it is what you want)
-# Ignore No Damage Hits -> Ignore hits from snowballs, eggs, fishing rod and others
-General:
-  # Changes messages language, options are - EN | BG | DE | ES | FI | FR | HR | IT | JA | PL | pt_BR | RU | TR | zh_TW | ZH
+General Settings:
+  # Changes the language, to see all options use '/pmr locale' ingame
   Locale: EN
-  Default PvP: true
-  PvP Blood: true
-  Player Drop Mode: ALWAYS
-  Ignore No Damage Hits: true
-  Auto Soup:
-     # How much health does soup heal, use 0 to disable
-     Health: 0
-     # Should empty bowls just be deleted
-     Bowl Disappear: false
-  # Removes empty potion bottles and milk buckets after they are consumed
-  Recycling:
-    Potion Bottle: false
-    Milk Bucket: false
-  # Show player health, uses scoreboards so might conflict with other plugins
-  Show health under name:
-    Enabled: true
-    Display Name: '&c❤'
+  # Controls if the plugin will use teams, needed for changing nametags and some other things, disable if there are conflicts with other plugins
+  Use Scoreboard Teams: true
   # List of worlds where PvPManager will have no effect
   World Exclusions:
     - 'example'
-    
-# Here you can choose which methods to use to stop 'border hopping' while players are tagged
-# Border hopping is when a player gets in PvP and tries to run into a safe zone to escape
-# Vulnerable -> Makes players still vulnerable to PvP in safe zones
-# Push Back -> Players will be launched back when trying to enter a safe zone (Disabling this might improve performance)  
-# Reset Combat Tag -> Only meant for when Vulnerable is true. Toggles whether combat tagging resets while fighting in a safe zone. Works for WorldGuard Only
-Anti Border Hopping:
-  Vulnerable: true
-  Push Back:
-    Enabled: true
-    # Takes elytra from player chest slot and puts it in their inventory
-    Remove Elytra: false
-  Reset Combat Tag: true
-
-# What should be disabled when a player(except operators) enters PvP
-# Fly -> Disable any kind of fly mode
-# GameMode -> Anything not Survival gets disabled
-# Disguise -> Disguises from LibsDisguises
-# GodMode -> GodMode from Essentials or CommandBook
-# Invisibility -> Invisibility potions, defaults to false as it's a vanilla feature
-Disable:
-  Fly: true
-  GameMode: true
-  Disguise: true
-  GodMode: true
-  # Makes player fall down if they're tagged while elytra gliding
-  Elytra: false
-  Invisibility: false
 
-# Section about the combat tag system
-# Time -> How long should the tag last in seconds
-# NameTag Prefix -> Choose the player's nametag prefix while tagged, '&c' would just color their name red
-# while empty quotes '' will disable this feature completely
-# Glowing -> For 1.9+ only, sets the player glowing while tagged
-# Self Tag -> Allow players to tag themselves with a bow
-# Untag Enemy -> When the player kills the enemy he was fighting he gets untagged
-# Block -> Section is self-explanatory, what to block in combat
-# Command whitelist is recursive, allowing 'tell' will allow 'tell' with any number of arguments
-# Punish On Kick -> Punish the player even if he gets kicked by other plugin while tagged
-# Money Penalty -> Money lost on combat log, use less or equal to 1 for percentage like 0.05 for 5%, 1 for 100% (0 to disable)
-# Log To File -> Logs all combat loggers to a file that you can read later
-# Kill on Logout -> Should the player be killed and, if so, what will he drop
-# Commands On PvPLog -> List of commands to execute on combat log, use '%p' for player name
-# And use the 'announce' command to broadcast, to disable just delete the command
-Tagged In Combat:
+######################
+####  Combat Tag  ####
+######################
+Combat Tag:
   Enabled: true
-  Time: 10
-  NameTag Prefix: '&4&lCombat &c'
-  # Currently only on premium version and when using the TAB plugin
-  NameTag Suffix: ''
+  # How long should the combat tag last in seconds
+  Time: 20
+  # Sets the player glowing while tagged, for MC 1.9+
   Glowing: true
-  # Symbol to use for the bar and how many times to repeat it. Other symbols ▊,▮,▯,|
-  Action Bar:
-    Enabled: true
-    # You can use any PlaceholderAPI placeholders here
-    Message: '&b&lCombat &a<barsLeft>&c<barsPassed> &e&l<time> &b[sec]'
-    Symbol: '▊'
-    Total Bars: 20
-  Boss Bar:
-    Enabled: true
-    # You can use any PlaceholderAPI placeholders here
-    Message: '&8&l[&c&lIn Combat&8&l] &e&l<time> seconds'
-    # See here for bar color options - https://hub.spigotmc.org/javadocs/spigot/org/bukkit/boss/BarColor.html
-    BarColor: RED
-    # See here for bar style options - https://hub.spigotmc.org/javadocs/spigot/org/bukkit/boss/BarStyle.html
-    BarStyle: SOLID
+  # Will untag the player when they kill their current enemies
+  Untag On Kill: false
+  # Allow players to tag themselves with a bow, enderpearl, etc
   Self Tag: false
-  Untag Enemy: false
-  EnderPearl:
-    # Time in seconds before the player can throw another enderpearl
-    Cooldown: 10
-    # If enabled, will retag the player when they throw an enderpearl
-    Renew Tag: true
-  Block:
+  # If enabled, will retag the player when they throw an enderpearl
+  EnderPearl Renews Tag: true
+  
+  Display:
+    # Adds a prefix or suffix while the player is in combat
+    Nametags:
+      Enabled: true
+      # Choose the player's nametag prefix while tagged, '&c' would just color their name red
+      Prefix: '&4&lCombat &c'
+      Suffix: ''
+    Action Bar:
+      Enabled: true
+      # You can use any PlaceholderAPI placeholders here
+      Message: '&b&lCombat &a<barsLeft>&c<barsPassed> &e&l<time> &b[sec]'
+      # Symbol to use for the bar and how many times to repeat it. Other symbols ▊,▮,▯,|
+      Symbol: '▊'
+      Total Bars: 20
+    Boss Bar:
+      Enabled: true
+      # You can use any PlaceholderAPI placeholders here
+      Message: '&8&l[&c&lIn Combat&8&l] &e&l<time> seconds'
+      # See here for bar color options - https://hub.spigotmc.org/javadocs/spigot/org/bukkit/boss/BarColor.html
+      BarColor: RED
+      # See here for bar style options - https://hub.spigotmc.org/javadocs/spigot/org/bukkit/boss/BarStyle.html
+      BarStyle: SOLID
+  
+  # Section is self-explanatory, what actions to block in combat
+  Actions Blocked:
     EnderPearls: false
     ChorusFruits: false
     Teleport: true
+    Elytra: false
+    Eat: false
+    Totem of Undying: false
     Place Blocks: false
+    Open Inventory: false
     Interact:
       Enabled: false
       # List of materials to block interaction, adding DOOR means all materials that end with DOOR like IRON_DOOR and so on
@@ -123,132 +71,190 @@ Tagged In Combat:
         - 'DOOR'
         - 'BUTTON'
         - 'BED'
-    Elytra: false
-    Eat: false
-    Totem of Undying: false
-    Open Inventory: false
+    # Command whitelist is recursive, allowing 'tell' will allow 'tell' with any number of arguments
     Commands:
       Enabled: true
       Whitelist: true
       Command List:
         - 'tell'
         - 'combattag'
-  Punishments:
-    Punish On Kick:
-      Enabled: true
-      # If Match Kick Reason is enabled, the punishment will be applied only if the kick reason matches the list below
-      Match Kick Reason: false
-      Kick Reasons:
+
+##################################
+####  Combat Log Punishments  ####
+##################################
+Combat Log Punishments:
+  # Money lost on combat log, you can use less or equal to 1 for percentages like 0.05 for 5%, 1 for 100% (0 to disable)
+  Money Penalty: 0.0
+  # Should the player be killed and, if so, what will the player drop
+  Kill on Logout:
+    Enabled: true
+    Player Drops:
+      Inventory: true
+      Experience: true
+      Armor: true
+  # Punish the player even if he gets kicked by other plugins or by an admin
+  Punish On Kick:
+    Enabled: true
+    # If Match Kick Reason is enabled, the punishment will be applied only if the kick reason matches the list below
+    Match Kick Reason: false
+    Kick Reasons:
       - 'Kicked for spamming'
       - 'disconnect.spam'
-    Money Penalty: 0.0
-    Log To File: true
-    Kill on Logout:
-      Enabled: true
-      Player Drops:
-        Inventory: true
-        Experience: true
-        Armor: true
-    Commands On PvPLog:
-      - 'announce &6[&8PvPManager&6]&c %p tried to escape combat and died!'
+  # List of commands to execute on combat log, use '{player}' for player name
+  # The 'announce' command can be optionally used to broadcast, you can add more or to disable just delete the command
+  Commands On Combat Log:
+    - 'announce {prefix} {player} tried to escape combat and died!'
 
-# Here you can set a cooldown, in seconds, to any item such as golden apples and enchanted golden apples
-# You can check for other material types here: https://hub.spigotmc.org/javadocs/spigot/org/bukkit/Material.html
-# If the item is not edible the cooldown will only be activated for right clicks
-Item Cooldowns:
-   GOLDEN_APPLE: 30
-   ENCHANTED_GOLDEN_APPLE: 60
+######################
+####  PvP Toggle  ####
+######################
+# Section for PvP Toggle feature - /pvp or /pvptoggle
+PvP Toggle:
+  # Leave it at true unless you want no PvP for new players
+  Default PvP: true
+  # How many seconds until players can use the command again
+  Cooldown: 15
+  # What should the player's prefix/suffix be when pvp is on/off
+  # You can leave one of them empty '' to disable one of the nametags, or set 'Enabled' to false to disable both
+  NameTags:
+    Enabled: false
+    Prefix On: '&1'
+    Prefix Off: '&2'
+  # This setting runs every hour and applies a money fee to every player with PvP disabled, it's a very simplified system 
+  # so it doesn't track how long PvP has been off for that player. Leave as 0 to disable
+  PvP Disabled Money Fee: 0
+  # Command list to execute on PvP toggle, use '{player}' for player name
+  Commands PvP On:
+    - 'examplecommand {player} turned pvp on'
+  Commands PvP Off:
+    - 'examplecommand {player} turned pvp off'
+  # PvP Toggle is forcibly enabled on an attack in all regions with WG's pvp flag set to allow
+  WorldGuard Overrides:
+    Enabled: true
+    #  PvP Toggle is force enabled in the listed regions, regardless of the WG's pvp flag
+    Region List:
+      - 'example'
 
+###############################
+####  Anti Border Hopping  ####
+###############################
+# Here you can choose which methods to use to stop 'border hopping' while players are tagged
+# Block barriers, like red glass blocks around a region, is a feature only on the premium version for MC 1.13+
+# Border hopping is when a player enters combat and tries to run into a safe zone to escape
+Anti Border Hopping:
+  # Makes players still vulnerable to PvP inside safe zones
+  Vulnerable:
+    Enabled: true
+    # Toggles whether combat tagging renews while fighting in a safe zone. Works for WorldGuard only
+    Renew Combat Tag: true
+  # Players will be launched back when trying to enter a safe zone
+  Push Back:
+    Enabled: true
+    # How much force for the pushback (Minimum 0.1 and Maximum 4)
+    Force: 1.2
+    # Takes elytra from player chest slot and puts it in their inventory
+    Remove Elytra: false
+
+#############################
+####  Newbie Protection  ####
+#############################
 # Should new players on your server be protected from PvP (If they want to PvP they can use /newbie disable)
 Newbie Protection:
   Enabled: true
-  # How many minutes should newbie protection last, persists through restarts
-  Time(minutes): 5
+  # How many seconds should newbie protection last, persists through restarts
+  Time: 600
   # If players should be allowed to remove their protection with /newbie disable
   Allow Player Disable: true
   # Block players from picking up items or place blocks while they have protection
   Block Pick Items: false
   Block Place Blocks: false
-  # Protect newbies from all types of damage including PvE
+  # Protect newbies from all types of damage including PvE, essentially godmode
   Protect From Everything: false
   Command Blacklist:
     - 'examplecommand'
 
-# Prevent player abuse by killing the same player several times to rise in rank or even just grief
-# Example - If a player X kills player Y more than 5 times, it executes the commands defined(kick, jail, etc)
-# In this case, it would check every 30 seconds for abusers
-# Warn Before - Warn the player 1 kill before he is punished with the commands
-# Respawn Protection - After respawn, how many seconds should players be protected (0 to disable)
-Kill Abuse:
-  Enabled: true
-  Max Kills: 5
-  Time Limit: 20
-  Warn Before: true
-  # Possible variables are <player> and <victim>
-  Commands on Abuse:
-    - 'kick <player> &cKill Abuse Is Not Allowed!'
-  Respawn Protection: 3
+#####################
+####  Cooldowns  ####
+#####################
+# Here you can set a cooldown, in seconds, to any item such as golden apples and enchanted golden apples
+# You can add other material types from here: https://hub.spigotmc.org/javadocs/spigot/org/bukkit/Material.html
+# If the item is not edible the cooldown will only be activated for right clicks
+# Combat section sets cooldowns only while in combat, global means cooldowns will always apply
+# You can disable the Minecraft builtin cooldown for an item by setting it to 0, like for enderpearls, or -1 for default cooldown
+Item Cooldowns:
+  Combat:
+    ENDER_PEARL: 10
+  Global:
+    GOLDEN_APPLE: 30
+    ENCHANTED_GOLDEN_APPLE: 60
 
+########################
+####  Player Kills  ####
+########################
 # Section with settings triggered when a player kills another player
-# Money Reward - Money won as reward, use less or equal to 1 for percentage like 0.05 for 5%, 1 for 100% (0 to disable)
-# Money Penalty - Money lost on PvP death, use less or equal to 1 for percentage like 0.1 for 10%, 1 for 100% (0 to disable)
-# Money Steal - Should the amount won from money reward be stolen from the dead player
-# WorldGuard Exclusions - WorldGuard regions where rewards, penalties and commands will not be executed
 Player Kills:
+  # Money won as reward, use less or equal to 1 for percentage like 0.05 for 5%, 1 for 100% (0 to disable)
   Money Reward: 0.0
+  # Money lost on PvP death, use less or equal to 1 for percentage like 0.1 for 10%, 1 for 100% (0 to disable)
   Money Penalty: 0.0
+  # Should the amount won from money reward be stolen from the dead player
   Money Steal: false
   # Similar to how money steal works, get a percentage of XP from the player you killed, 1 for 100% (0 to disable)
   Exp Steal: 0.0
-  # Commands to execute on kill (<player> is the killer, <victim> is the victim, <item> is the item material in hand)
+  # Commands to execute on kill ({player} is the killer, {victim} is the victim, {item} is the item material in hand)
   Commands On Kill:
-    - 'examplecommand <player> killed <victim> with <item>'
+    - 'examplecommand {player} killed {victim} with {item}'
+  # WorldGuard regions where rewards, penalties and commands will not be executed
   WorldGuard Exclusions:
     - 'exampleregion'
+    
+  # Prevent player abuse by killing the same player several times to rise in rank or even just grief
+  # Example - If a player X kills player Y more than 5 times, it executes the commands defined (kick, jail, etc)
+  Anti Kill Abuse:
+    Enabled: true
+    Max Kills: 5
+    Time Limit: 20
+    # Warn the player 1 kill before they are punished with the commands
+    Warn Before: true
+    # Possible variables are {player} and {victim}
+    Commands on Abuse:
+      - 'kick {player} &cKill Abuse Is Not Allowed!'
+    # After respawn, how many seconds should players be protected (0 to disable)
+    Respawn Protection: 3
 
-# Section for PvP Toggle command - /pvp
-# Players can't use the command unless they have permission
-# Cooldown - How many seconds until players can use the command again
-# NameTags - What should the player's prefix be when pvp is on/off
-# You can write 'none' to disable one of the nametags, or set 'Enabled' to false to disable both
-# Commands -> Command list to execute on PvP toggle, use '%p' for player name
-# WorldGuard Overrides -> PvP Toggle is forcibly enabled on an attack in all regions with WG's pvp flag set to allow
-# WorldGuard overrides region list -> PvP Toggle is forcibly enabled on an attack in the listed regions, regardless of the WG's pvp flag
-PvP Toggle:
-  Cooldown: 15
-  NameTags:
-    Enabled: false
-    Prefix On: '&1'
-    Prefix Off: '&2'
-  # This setting runs every hour and applies a money fee to every player with PvP disabled, it's a very simplified system 
-  # so it doesn't track how long PvP has been off for that player. Leave as 0 to disable
-  PvP Disabled Money Fee: 0
-  Commands PvP On:
-    - 'examplecommand %p turned pvp on'
-  Commands PvP Off:
-    - 'examplecommand %p turned pvp off'
-  WorldGuard Overrides: true
-  WorldGuard Overrides Region List:
-    - 'example'
+##########################
+####  Other Settings  ####
+##########################
+Other Settings:
+  # Enable blood particles on PvP hits
+  PvP Blood: true
+  # Ignore hits from snowballs, eggs, fishing rod and others
+  Ignore No Damage Hits: true
+  # Player Drop Mode -> What happens to a player's drops and exp on death
+  # The options are 'ALWAYS' - (PvPManager does nothing, feature is disabled, usually best to avoid conflicts with death chest plugins, etc),
+  # mode 'DROP' - (Players drop items when killed in PvP but not in PvE),
+  # mode 'KEEP' - (Players keep items when killed in PvP but not in PvE),
+  # mode 'TRANSFER' - (Same as 'DROP' but transfer items(not exp) directly to killer's inventory without drops)
+  # mode 'CLEAR' - (Clear all drops and exp on death, this DELETES everything on death so make sure it is what you want)
+  Player Drop Mode: ALWAYS
+  # Show player health, uses scoreboards so might conflict with other plugins
+  Show health under name:
+    Enabled: true
+    Display Name: '&c❤'
 
-# Section to configure interactions with other plugins
-Plugin Hooks:
-  Essentials:
-    # Should AFK players be protected from other players
-    Protect AFK: true
-  Kingdoms:
-    # Disable PvP and newbie protection if the players are in an invasion
-    No Protection In War: true
-  SimpleClans:
-    # Disable PvP and newbie protection if the players are in a SimpleClans war
-    No Protection In War: true
-  Towny:
-    # Disable PvP and newbie protection if the players are in a siege war
-    No Protection In War: true
-  CooldownsX:
-    # Change this into the cooldown id for enderpearls in CooldownsX, by default they have it as exampleOne in cooldowns.yml
-    # If setup correctly PvPManager will use a different cooldown while in combat and then revert back to CooldownsX
-    Enderpearl: exampleOne
+# What should be disabled when a player enters PvP
+Disable On Hit:
+  Fly: true
+  # Anything not Survival gets disabled
+  GameMode: true
+  # Disguises from LibsDisguises
+  Disguise: true
+  # GodMode from Essentials or CMI (in premium version)
+  GodMode: true
+  # Makes player fall down if they're tagged while elytra gliding
+  Elytra: false
+  # Invisibility potions, defaults to false as it's a vanilla feature
+  Invisibility: false
 
 Database:
   # Database type, supported databases: SQLite or MySQL
@@ -262,7 +268,7 @@ Database:
     Database: minecraft
 
 # Should PvPManager be allowed to check for updates and tell you about them
-# Auto Update - After checking should we download it automatically for you?
+# Auto Update - After checking should the update be downloaded automatically for you?
 Update Check:
   Enabled: true
   Auto Update: true
diff --git a/pvpmanager/src/main/resources/plugin-hooks.yml b/pvpmanager/src/main/resources/plugin-hooks.yml
new file mode 100644
index 00000000..b24fd357
--- /dev/null
+++ b/pvpmanager/src/main/resources/plugin-hooks.yml
@@ -0,0 +1,20 @@
+# In this file you can configure how PvPManager interacts with other supported plugins
+Plugin Hooks:
+  Essentials:
+    # Should AFK players be protected from other players
+    Protect AFK: true
+  Kingdoms:
+    # Disable PvP and newbie protection if the players are in an invasion
+    No Protection In War: true
+  SimpleClans:
+    # Disable PvP and newbie protection if the players are in a SimpleClans war
+    No Protection In War: true
+  Towny:
+    # Disable PvP and newbie protection if the players are in a siege war
+    No Protection In War: true
+  # This only works if you have the TAB plugin, disabling both options will make PvPManager use normal scoreboard teams
+  TAB:
+    # Show combat prefix/suffix in the playerlist (tab)
+    Show In Tab: true
+    # Show combat prefix/suffix above the player's head
+    Show Above Player: true
\ No newline at end of file
diff --git a/pvpmanager/src/main/resources/plugin.yml b/pvpmanager/src/main/resources/plugin.yml
index 4523ad81..73a78417 100644
--- a/pvpmanager/src/main/resources/plugin.yml
+++ b/pvpmanager/src/main/resources/plugin.yml
@@ -12,7 +12,6 @@ softdepend:
   - WorldGuard
   - LibsDisguises
   - SimpleClans
-  - EZRanksLite
   - Essentials
   - PlaceholderAPI
   - GriefPrevention
diff --git a/pvpmanager/src/test/java/me/chancesd/pvpmanager/InstanceCreator.java b/pvpmanager/src/test/java/me/chancesd/pvpmanager/InstanceCreator.java
index 0bb01e34..908d7c3e 100644
--- a/pvpmanager/src/test/java/me/chancesd/pvpmanager/InstanceCreator.java
+++ b/pvpmanager/src/test/java/me/chancesd/pvpmanager/InstanceCreator.java
@@ -6,16 +6,17 @@
 import org.junit.platform.suite.api.SelectClasses;
 import org.junit.platform.suite.api.Suite;
 
+import me.chancesd.pvpmanager.listener.BlockedActionsListenerTest;
 import me.chancesd.pvpmanager.listener.EntityListenerTest;
 import me.chancesd.pvpmanager.listener.PlayerListenerTest;
 import me.chancesd.pvpmanager.manager.DependencyTest;
 
 @Suite
-@SelectClasses({ UpdaterTest.class, DependencyTest.class, EntityListenerTest.class, PlayerListenerTest.class })
+@SelectClasses({ UpdaterTest.class, DependencyTest.class, EntityListenerTest.class, PlayerListenerTest.class, BlockedActionsListenerTest.class })
 public final class InstanceCreator implements BeforeAllCallback, ExtensionContext.Store.CloseableResource {
 
 	private static boolean started = false;
-	private static PluginTest pt;
+	private static PluginSetup pt;
 
 	private InstanceCreator() {
 	}
@@ -24,7 +25,7 @@ private InstanceCreator() {
 	public void beforeAll(final ExtensionContext context) throws Exception {
 		if (!started) {
 			started = true;
-			pt = new PluginTest();
+			pt = new PluginSetup();
 			pt.setup();
 			context.getRoot().getStore(Namespace.GLOBAL).put("pvpmanager", this);
 		}
@@ -35,7 +36,7 @@ public void close() {
 		pt.tearDown();
 	}
 
-	public static PluginTest getPt() {
+	public static PluginSetup getPt() {
 		return pt;
 	}
 
diff --git a/pvpmanager/src/test/java/me/chancesd/pvpmanager/PluginTest.java b/pvpmanager/src/test/java/me/chancesd/pvpmanager/PluginSetup.java
similarity index 92%
rename from pvpmanager/src/test/java/me/chancesd/pvpmanager/PluginTest.java
rename to pvpmanager/src/test/java/me/chancesd/pvpmanager/PluginSetup.java
index 4da0188b..d81347bb 100644
--- a/pvpmanager/src/test/java/me/chancesd/pvpmanager/PluginTest.java
+++ b/pvpmanager/src/test/java/me/chancesd/pvpmanager/PluginSetup.java
@@ -24,7 +24,7 @@
 import org.mockito.ArgumentMatchers;
 import org.mockito.Mockito;
 
-public class PluginTest {
+public class PluginSetup {
 
 	private PvPManager plugin;
 	private Server server;
@@ -33,7 +33,7 @@ public class PluginTest {
 	private Player defender;
 
 	public final void setup() throws Exception {
-		filePath = URLDecoder.decode(PluginTest.class.getClassLoader().getResource("").getPath(), "UTF-8");
+		filePath = URLDecoder.decode(PluginSetup.class.getClassLoader().getResource("").getPath(), "UTF-8");
 		final String decoded = filePath + "TestServer/plugins/PvPManager";
 		final File pluginDirectory = new File(decoded);
 		pluginDirectory.mkdirs();
@@ -47,11 +47,12 @@ public final void setup() throws Exception {
 		Mockito.when(server.getWorlds()).thenReturn(Arrays.asList(world));
 		Bukkit.setServer(server);
 		plugin = Mockito.mock(PvPManager.class, Mockito.CALLS_REAL_METHODS);
-		final PluginDescriptionFile pdf = new PluginDescriptionFile(PluginTest.class.getClassLoader().getResource("plugin.yml").openStream());
+		@SuppressWarnings({ "resource", "null" })
+		final PluginDescriptionFile pdf = new PluginDescriptionFile(PluginSetup.class.getClassLoader().getResource("plugin.yml").openStream());
 		final Method method = JavaPlugin.class.getDeclaredMethod("init", PluginLoader.class, Server.class, PluginDescriptionFile.class, File.class, File.class,
 		        ClassLoader.class);
 		method.setAccessible(true);
-		method.invoke(plugin, (Object) null, server, pdf, pluginDirectory, new File(filePath), PluginTest.class.getClassLoader());
+		method.invoke(plugin, (Object) null, server, pdf, pluginDirectory, new File(filePath), PluginSetup.class.getClassLoader());
 		Mockito.doReturn(mock(PluginCommand.class)).when(plugin).getCommand(ArgumentMatchers.anyString());
 		plugin.onLoad();
 		plugin.onEnable();
diff --git a/pvpmanager/src/test/java/me/chancesd/pvpmanager/listener/BlockedActionsListenerTest.java b/pvpmanager/src/test/java/me/chancesd/pvpmanager/listener/BlockedActionsListenerTest.java
new file mode 100644
index 00000000..df631c8f
--- /dev/null
+++ b/pvpmanager/src/test/java/me/chancesd/pvpmanager/listener/BlockedActionsListenerTest.java
@@ -0,0 +1,70 @@
+package me.chancesd.pvpmanager.listener;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.Mockito.atMostOnce;
+import static org.mockito.Mockito.verify;
+import org.bukkit.entity.Player;
+import org.bukkit.event.player.PlayerCommandPreprocessEvent;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import me.chancesd.pvpmanager.InstanceCreator;
+import me.chancesd.pvpmanager.PluginSetup;
+import me.chancesd.pvpmanager.PvPManager;
+import me.chancesd.pvpmanager.manager.PlayerManager;
+import me.chancesd.pvpmanager.player.CombatPlayer;
+import me.chancesd.pvpmanager.setting.Lang;
+
+@ExtendWith(InstanceCreator.class)
+public class BlockedActionsListenerTest {
+
+	private static BlockedActionsListener listener;
+	private static PlayerManager ph;
+	private static PluginSetup pt;
+
+	@BeforeAll
+	public static void setupClass() {
+		pt = InstanceCreator.getPt();
+		final PvPManager plugin = pt.getPlugin();
+		ph = plugin.getPlayerManager();
+		listener = new BlockedActionsListener(plugin.getPlayerManager());
+	}
+
+	@BeforeEach
+	public final void setup() {
+		ph.getPlayers().clear();
+	}
+
+	private void tagPlayer(final CombatPlayer player, final CombatPlayer enemy) {
+		player.tag(true, enemy);
+		assertTrue(player.isInCombat());
+	}
+
+	private void tagPlayer(final CombatPlayer player) {
+		tagPlayer(player, ph.get(pt.createPlayer("Attacker")));
+	}
+
+	@Test
+	final void onCommandTest() {
+		final Player player = pt.createPlayer("onCommandTest");
+		final CombatPlayer pvPlayer = ph.get(player);
+		final PlayerCommandPreprocessEvent commandPreprocessEvent = new PlayerCommandPreprocessEvent(player, "/spawn");
+
+		assertFalse(commandPreprocessEvent.isCancelled());
+		listener.onCommand(commandPreprocessEvent);
+		assertFalse(commandPreprocessEvent.isCancelled());
+
+		tagPlayer(pvPlayer);
+		listener.onCommand(commandPreprocessEvent);
+		assertTrue(commandPreprocessEvent.isCancelled());
+		verify(player, atMostOnce()).sendMessage(Lang.COMMAND_DENIED_INCOMBAT.msg());
+
+		final PlayerCommandPreprocessEvent commandPreprocessEvent2 = new PlayerCommandPreprocessEvent(player, "/tell");
+		tagPlayer(pvPlayer);
+		listener.onCommand(commandPreprocessEvent2);
+		assertFalse(commandPreprocessEvent2.isCancelled());
+	}
+
+}
diff --git a/pvpmanager/src/test/java/me/chancesd/pvpmanager/listener/EntityListenerTest.java b/pvpmanager/src/test/java/me/chancesd/pvpmanager/listener/EntityListenerTest.java
index 83020186..ff95d560 100644
--- a/pvpmanager/src/test/java/me/chancesd/pvpmanager/listener/EntityListenerTest.java
+++ b/pvpmanager/src/test/java/me/chancesd/pvpmanager/listener/EntityListenerTest.java
@@ -23,18 +23,18 @@
 import org.mockito.Mockito;
 
 import me.chancesd.pvpmanager.InstanceCreator;
-import me.chancesd.pvpmanager.PluginTest;
+import me.chancesd.pvpmanager.PluginSetup;
 import me.chancesd.pvpmanager.PvPManager;
 import me.chancesd.pvpmanager.manager.PlayerManager;
 import me.chancesd.pvpmanager.player.ProtectionType;
 import me.chancesd.pvpmanager.setting.Lang;
-import me.chancesd.pvpmanager.setting.Settings;
+import me.chancesd.pvpmanager.setting.Conf;
 import me.chancesd.pvpmanager.utils.CombatUtils;
 
 @ExtendWith(InstanceCreator.class)
 public class EntityListenerTest {
 
-	private static final PluginTest PT = InstanceCreator.getPt();
+	private static final PluginSetup PT = InstanceCreator.getPt();
 	private static EntityListener damageListener;
 	private EntityDamageByEntityEvent mockEvent;
 	private EntityDamageByEntityEvent projMockEvent;
@@ -45,9 +45,9 @@ public class EntityListenerTest {
 	@BeforeAll
 	public static void setupClass() {
 		final PvPManager plugin = PT.getPlugin();
-		ph = plugin.getPlayerHandler();
+		ph = plugin.getPlayerManager();
 		damageListener = new EntityListener(ph);
-		Settings.setPvpBlood(false); // avoid loading Material class while testing
+		Conf.PVP_BLOOD.disable(); // avoid loading Material class while testing
 		attacker = PT.getAttacker();
 		defender = PT.getDefender();
 	}
@@ -129,7 +129,7 @@ final void testSelfTag() {
 		final Projectile proj = mock(Projectile.class);
 		projMockEvent = createDamageEvent(proj, defender, false);
 
-		assertFalse(Settings.isSelfTag());
+		assertFalse(Conf.SELF_TAG.asBool());
 		// attacker different from defender
 		when(proj.getShooter()).thenReturn(attacker);
 		assertEquals(proj.getShooter(), attacker);
@@ -141,8 +141,8 @@ final void testSelfTag() {
 		assertFalse(CombatUtils.isPvP(projMockEvent));
 
 		// now allow self tagging
-		Settings.setSelfTag(true);
-		assertTrue(Settings.isSelfTag());
+		Conf.SELF_TAG.set(true);
+		assertTrue(Conf.SELF_TAG.asBool());
 		// attacker different from defender
 		when(proj.getShooter()).thenReturn(attacker);
 		assertEquals(proj.getShooter(), attacker);
@@ -160,7 +160,7 @@ final void testNoDamageHits() {
 		when(proj.getShooter()).thenReturn(attacker);
 
 		// ignore no damage hits
-		assertTrue(Settings.isIgnoreNoDamageHits());
+		assertTrue(Conf.IGNORE_NO_DMG_HITS.asBool());
 
 		projMockEvent = createDamageEvent(proj, defender, false);
 		when(projMockEvent.getDamage()).thenReturn(5.0);
@@ -171,8 +171,8 @@ final void testNoDamageHits() {
 		assertFalse(CombatUtils.isPvP(projMockEvent));
 
 		// don't ignore any hits
-		Settings.setIgnoreNoDamageHits(false);
-		assertFalse(Settings.isIgnoreNoDamageHits());
+		Conf.IGNORE_NO_DMG_HITS.set(false);
+		assertFalse(Conf.IGNORE_NO_DMG_HITS.asBool());
 
 		projMockEvent = createDamageEvent(proj, defender, false);
 		when(projMockEvent.getDamage()).thenReturn(5.0);
@@ -216,8 +216,6 @@ final void failCancel() {
 
 		when(playerAttacker.isFlying()).thenReturn(true);
 		when(playerDefender.isFlying()).thenReturn(true);
-		assertTrue(playerAttacker.isFlying());
-		assertTrue(playerDefender.isFlying());
 		assertEquals(ProtectionType.FAIL, ph.checkProtection(playerAttacker, playerDefender).type());
 		createAttack(playerAttacker, playerDefender, false);
 		assertTrue(ph.get(playerAttacker).isInCombat());
diff --git a/pvpmanager/src/test/java/me/chancesd/pvpmanager/listener/PlayerListenerTest.java b/pvpmanager/src/test/java/me/chancesd/pvpmanager/listener/PlayerListenerTest.java
index 578c9a98..0d20fdc2 100644
--- a/pvpmanager/src/test/java/me/chancesd/pvpmanager/listener/PlayerListenerTest.java
+++ b/pvpmanager/src/test/java/me/chancesd/pvpmanager/listener/PlayerListenerTest.java
@@ -3,7 +3,6 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.mockito.Mockito.atMostOnce;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
@@ -11,7 +10,6 @@
 
 import org.bukkit.entity.Player;
 import org.bukkit.event.entity.PlayerDeathEvent;
-import org.bukkit.event.player.PlayerCommandPreprocessEvent;
 import org.bukkit.event.player.PlayerJoinEvent;
 import org.bukkit.event.player.PlayerKickEvent;
 import org.bukkit.event.player.PlayerQuitEvent;
@@ -20,26 +18,25 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import me.chancesd.pvpmanager.InstanceCreator;
-import me.chancesd.pvpmanager.PluginTest;
+import me.chancesd.pvpmanager.PluginSetup;
 import me.chancesd.pvpmanager.PvPManager;
 import me.chancesd.pvpmanager.manager.PlayerManager;
 import me.chancesd.pvpmanager.player.CombatPlayer;
-import me.chancesd.pvpmanager.setting.Lang;
-import me.chancesd.pvpmanager.setting.Settings;
+import me.chancesd.pvpmanager.setting.Conf;
 
 @ExtendWith(InstanceCreator.class)
 public class PlayerListenerTest {
 
 	private static PlayerListener listener;
 	private static PlayerManager ph;
-	private static PluginTest pt;
+	private static PluginSetup pt;
 
 	@BeforeAll
 	public static void setupClass() {
 		pt = InstanceCreator.getPt();
 		final PvPManager plugin = pt.getPlugin();
-		ph = plugin.getPlayerHandler();
-		listener = new PlayerListener(plugin.getPlayerHandler());
+		ph = plugin.getPlayerManager();
+		listener = new PlayerListener(plugin.getPlayerManager());
 	}
 
 	@BeforeEach
@@ -48,7 +45,7 @@ public final void setup() {
 	}
 
 	private void tagPlayer(final CombatPlayer player, final CombatPlayer enemy) {
-		player.setTagged(true, enemy);
+		player.tag(true, enemy);
 		assertTrue(player.isInCombat());
 	}
 
@@ -90,7 +87,7 @@ void onPlayerKickTest() {
 		listener.onPlayerKick(new PlayerKickEvent(kickPlayer, "", ""));
 		assertTrue(pvPlayer.isInCombat());
 
-		Settings.setMatchKickReason(true);
+		Conf.MATCH_KICK_REASON.set(true);
 		tagPlayer(pvPlayer);
 		listener.onPlayerKick(new PlayerKickEvent(kickPlayer, "", ""));
 		assertFalse(pvPlayer.isInCombat());
@@ -125,7 +122,7 @@ final void inCombatDeath() {
 		listener.onPlayerDeath(createDeathEvent(defender));
 		assertFalse(pDefender.isInCombat());
 
-		Settings.setUntagEnemy(true);
+		Conf.UNTAG_ON_KILL.set(true);
 		tagPlayer(pDefender, pAttacker);
 		tagPlayer(pAttacker, pDefender);
 		listener.onPlayerDeath(createDeathEvent(defender));
@@ -133,25 +130,4 @@ final void inCombatDeath() {
 		assertFalse(pAttacker.isInCombat());
 	}
 
-	@Test
-	final void onCommandTest() {
-		final Player player = pt.createPlayer("onCommandTest");
-		final CombatPlayer pvPlayer = ph.get(player);
-		final PlayerCommandPreprocessEvent commandPreprocessEvent = new PlayerCommandPreprocessEvent(player, "/spawn");
-
-		assertFalse(commandPreprocessEvent.isCancelled());
-		listener.onCommand(commandPreprocessEvent);
-		assertFalse(commandPreprocessEvent.isCancelled());
-
-		tagPlayer(pvPlayer);
-		listener.onCommand(commandPreprocessEvent);
-		assertTrue(commandPreprocessEvent.isCancelled());
-		verify(player, atMostOnce()).sendMessage(Lang.COMMAND_DENIED_INCOMBAT.msg());
-
-		final PlayerCommandPreprocessEvent commandPreprocessEvent2 = new PlayerCommandPreprocessEvent(player, "/tell");
-		tagPlayer(pvPlayer);
-		listener.onCommand(commandPreprocessEvent2);
-		assertFalse(commandPreprocessEvent2.isCancelled());
-	}
-
 }
diff --git a/pvpmanager/src/test/java/me/chancesd/pvpmanager/manager/DependencyTest.java b/pvpmanager/src/test/java/me/chancesd/pvpmanager/manager/DependencyTest.java
index e04d2c46..fb8bc77d 100644
--- a/pvpmanager/src/test/java/me/chancesd/pvpmanager/manager/DependencyTest.java
+++ b/pvpmanager/src/test/java/me/chancesd/pvpmanager/manager/DependencyTest.java
@@ -17,8 +17,7 @@
 import org.mockito.Mockito;
 
 import me.chancesd.pvpmanager.InstanceCreator;
-import me.chancesd.pvpmanager.PluginTest;
-import me.chancesd.pvpmanager.manager.DependencyManager;
+import me.chancesd.pvpmanager.PluginSetup;
 import me.chancesd.sdutils.utils.Utils;
 
 @ExtendWith(InstanceCreator.class)
@@ -28,7 +27,7 @@ public class DependencyTest {
 
 	@BeforeAll
 	public static void setupClass() {
-		final PluginTest pt = InstanceCreator.getPt();
+		final PluginSetup pt = InstanceCreator.getPt();
 		server = pt.getServer();
 		when(server.getServicesManager()).thenReturn(mock(ServicesManager.class));
 	}