diff --git a/pom.xml b/pom.xml
index f1d921d..bcd612a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>ADHDMC</groupId>
     <artifactId>VillagerInfo</artifactId>
-    <version>2.5</version>
+    <version>2.6</version>
     <packaging>jar</packaging>
 
     <name>VillagerInfo</name>
diff --git a/src/main/java/adhdmc/villagerinfo/Commands/CommandHandler.java b/src/main/java/adhdmc/villagerinfo/Commands/CommandHandler.java
index e003666..fc293d3 100644
--- a/src/main/java/adhdmc/villagerinfo/Commands/CommandHandler.java
+++ b/src/main/java/adhdmc/villagerinfo/Commands/CommandHandler.java
@@ -1,7 +1,6 @@
 package adhdmc.villagerinfo.Commands;
 
-import adhdmc.villagerinfo.Config.ConfigValidator;
-import adhdmc.villagerinfo.Config.Message;
+import adhdmc.villagerinfo.Config.VIMessage;
 import adhdmc.villagerinfo.VillagerInfo;
 import net.kyori.adventure.text.minimessage.MiniMessage;
 import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
@@ -9,6 +8,7 @@
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.command.TabExecutor;
+import org.jetbrains.annotations.NotNull;
 
 import java.util.*;
 
@@ -19,7 +19,7 @@ public class CommandHandler implements CommandExecutor, TabExecutor {
 
     //TY Peashooter101
     @Override
-    public List<String> onTabComplete(CommandSender sender, Command command, String label, String[] args) {
+    public List<String> onTabComplete(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, String[] args) {
         ArrayList<String> subCommands1 = new ArrayList<>(Arrays.asList("help", "toggle", "reload"));
         if (args.length == 1) {
             return subCommands1;
@@ -29,10 +29,15 @@ public List<String> onTabComplete(CommandSender sender, Command command, String
 
 
     @Override
-    public boolean onCommand(CommandSender sender, Command cmd, String label, String[] args) {
+    public boolean onCommand(@NotNull CommandSender sender, @NotNull Command cmd, @NotNull String label, String[] args) {
         //Checking for arguments
         if (args.length == 0) {
-            String url = VillagerInfo.getInstance().getDescription().getWebsite();
+            String url;
+            if (VillagerInfo.getInstance().getDescription().getWebsite() != null) {
+                url = VillagerInfo.getInstance().getDescription().getWebsite();
+            } else {
+                url = "https://github.com/ADHDMC/VillagerInfo";
+            }
             String version = VillagerInfo.getInstance().getDescription().getVersion();
             List<String> authors = new ArrayList<>();
             for (String authorName : VillagerInfo.getInstance().getDescription().getAuthors()) {
@@ -48,12 +53,12 @@ public boolean onCommand(CommandSender sender, Command cmd, String label, String
             );
             return true;
         }
-        //if has an argument, check to see if it's contained in the list of arguments
+        //if there is an argument, check to see if it's contained in the list of arguments
         String command = args[0].toLowerCase();
         if (subcommandList.containsKey(command)) {
             subcommandList.get(command).execute(sender, Arrays.copyOfRange(args, 1, args.length));
         } else {
-            sender.sendMessage(miniMessage.deserialize(Message.NO_COMMAND.getMessage()));
+            sender.sendMessage(miniMessage.deserialize(VIMessage.NO_COMMAND.getMessage()));
         }
         return true;
     }
diff --git a/src/main/java/adhdmc/villagerinfo/Commands/SubCommands/HelpCommand.java b/src/main/java/adhdmc/villagerinfo/Commands/SubCommands/HelpCommand.java
index 5e7a07f..0c236a9 100644
--- a/src/main/java/adhdmc/villagerinfo/Commands/SubCommands/HelpCommand.java
+++ b/src/main/java/adhdmc/villagerinfo/Commands/SubCommands/HelpCommand.java
@@ -1,7 +1,7 @@
 package adhdmc.villagerinfo.Commands.SubCommands;
 
 import adhdmc.villagerinfo.Commands.SubCommand;
-import adhdmc.villagerinfo.Config.Message;
+import adhdmc.villagerinfo.Config.VIMessage;
 import adhdmc.villagerinfo.Config.Perms;
 import adhdmc.villagerinfo.VillagerInfo;
 import net.kyori.adventure.text.minimessage.MiniMessage;
@@ -19,14 +19,14 @@ public HelpCommand() {
     public void execute(CommandSender sender, String[] args) {
         MiniMessage miniMessage = VillagerInfo.getMiniMessage();
 
-        if (sender.hasPermission(Perms.USE.getPerm())) {
-            sender.sendMessage(miniMessage.deserialize(Message.PREFIX.getMessage()));
-            sender.sendMessage(miniMessage.deserialize(Message.HELP_MAIN.getMessage()));
-            sender.sendMessage(miniMessage.deserialize(Message.HELP_TOGGLE.getMessage()));
-            sender.sendMessage(miniMessage.deserialize(Message.HELP_RELOAD.getMessage()));
+        if (sender.hasPermission(Perms.USE.getVIPerm())) {
+            sender.sendMessage(miniMessage.deserialize(VIMessage.PLUGIN_PREFIX.getMessage()));
+            sender.sendMessage(miniMessage.deserialize(VIMessage.HELP_MAIN.getMessage()));
+            sender.sendMessage(miniMessage.deserialize(VIMessage.HELP_TOGGLE.getMessage()));
+            sender.sendMessage(miniMessage.deserialize(VIMessage.HELP_RELOAD.getMessage()));
             return;
         }
-        sender.sendMessage(miniMessage.deserialize(Message.NO_PERMISSION.getMessage()));
+        sender.sendMessage(miniMessage.deserialize(VIMessage.NO_PERMISSION.getMessage()));
     }
 
     @Override
diff --git a/src/main/java/adhdmc/villagerinfo/Commands/SubCommands/InventoryCommand.java b/src/main/java/adhdmc/villagerinfo/Commands/SubCommands/InventoryCommand.java
deleted file mode 100644
index acbfc70..0000000
--- a/src/main/java/adhdmc/villagerinfo/Commands/SubCommands/InventoryCommand.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package adhdmc.villagerinfo.Commands.SubCommands;
-
-import adhdmc.villagerinfo.Commands.SubCommand;
-import org.bukkit.command.CommandSender;
-
-import java.util.List;
-
-public class InventoryCommand extends SubCommand {
-
-
-    public InventoryCommand() {
-        super("inv", "gets the inventory of the specified villager", "/vill inv <UUID>");
-    }
-
-
-    @Override
-    public void execute(CommandSender sender, String[] args) {
-
-    }
-
-    @Override
-    public List<String> getSubcommandArguments(CommandSender sender, String[] args) {
-        return null;
-    }
-}
diff --git a/src/main/java/adhdmc/villagerinfo/Commands/SubCommands/ReloadCommand.java b/src/main/java/adhdmc/villagerinfo/Commands/SubCommands/ReloadCommand.java
index faca71e..fb047e8 100644
--- a/src/main/java/adhdmc/villagerinfo/Commands/SubCommands/ReloadCommand.java
+++ b/src/main/java/adhdmc/villagerinfo/Commands/SubCommands/ReloadCommand.java
@@ -2,7 +2,8 @@
 
 import adhdmc.villagerinfo.Commands.SubCommand;
 import adhdmc.villagerinfo.Config.ConfigValidator;
-import adhdmc.villagerinfo.Config.Message;
+import adhdmc.villagerinfo.Config.LocaleConfig;
+import adhdmc.villagerinfo.Config.VIMessage;
 import adhdmc.villagerinfo.Config.Perms;
 import adhdmc.villagerinfo.VillagerInfo;
 import net.kyori.adventure.text.minimessage.MiniMessage;
@@ -21,13 +22,13 @@ public ReloadCommand() {
     @Override
     public void execute(CommandSender sender, String[] args) {
         MiniMessage miniMessage = VillagerInfo.getMiniMessage();
-        if (!(sender instanceof Player) || sender.hasPermission(Perms.RELOAD.getPerm())) {
+        if (!(sender instanceof Player) || sender.hasPermission(Perms.RELOAD.getVIPerm())) {
             VillagerInfo.getInstance().reloadConfig();
-            VillagerInfo.getLocaleConfig().reloadConfig();
+            LocaleConfig.getInstance().reloadLocale();
             ConfigValidator.configValidator();
-            sender.sendMessage(miniMessage.deserialize(Message.CONFIG_RELOADED.getMessage()));
+            sender.sendMessage(miniMessage.deserialize(VIMessage.CONFIG_RELOADED.getMessage()));
         } else {
-            sender.sendMessage(miniMessage.deserialize((Message.NO_PERMISSION.getMessage())));
+            sender.sendMessage(miniMessage.deserialize((VIMessage.NO_PERMISSION.getMessage())));
         }
     }
 
diff --git a/src/main/java/adhdmc/villagerinfo/Commands/SubCommands/ToggleCommand.java b/src/main/java/adhdmc/villagerinfo/Commands/SubCommands/ToggleCommand.java
index 10a1a43..7e422ba 100644
--- a/src/main/java/adhdmc/villagerinfo/Commands/SubCommands/ToggleCommand.java
+++ b/src/main/java/adhdmc/villagerinfo/Commands/SubCommands/ToggleCommand.java
@@ -1,7 +1,7 @@
 package adhdmc.villagerinfo.Commands.SubCommands;
 
 import adhdmc.villagerinfo.Commands.SubCommand;
-import adhdmc.villagerinfo.Config.Message;
+import adhdmc.villagerinfo.Config.VIMessage;
 import adhdmc.villagerinfo.Config.Perms;
 import adhdmc.villagerinfo.VillagerInfo;
 import net.kyori.adventure.text.minimessage.MiniMessage;
@@ -22,20 +22,20 @@ public ToggleCommand() {
     @Override
     public void execute(CommandSender sender, String[] args) {
         if (!(sender instanceof Player)) {
-            sender.sendMessage(miniMessage.deserialize(Message.NOT_A_PLAYER.getMessage()));
+            sender.sendMessage(miniMessage.deserialize(VIMessage.NOT_A_PLAYER.getMessage()));
             return;
         }
-        if (!(sender.hasPermission(Perms.TOGGLE.getPerm()))) {
-            sender.sendMessage(miniMessage.deserialize(Message.NO_PERMISSION.getMessage()));
+        if (!(sender.hasPermission(Perms.TOGGLE.getVIPerm()))) {
+            sender.sendMessage(miniMessage.deserialize(VIMessage.NO_PERMISSION.getMessage()));
             return;
         }
         if (toggleSetting((Player) sender)) {
-            sender.sendMessage(miniMessage.deserialize(Message.PREFIX.getMessage())
-                    .append(miniMessage.deserialize(Message.TOGGLE_ON.getMessage())));
+            sender.sendMessage(miniMessage.deserialize(VIMessage.PLUGIN_PREFIX.getMessage())
+                    .append(miniMessage.deserialize(VIMessage.TOGGLE_ON.getMessage())));
             return;
         }
-        sender.sendMessage(miniMessage.deserialize(Message.PREFIX.getMessage())
-                .append(miniMessage.deserialize(Message.TOGGLE_OFF.getMessage())));
+        sender.sendMessage(miniMessage.deserialize(VIMessage.PLUGIN_PREFIX.getMessage())
+                .append(miniMessage.deserialize(VIMessage.TOGGLE_OFF.getMessage())));
     }
 
     private boolean toggleSetting(Player player) {
diff --git a/src/main/java/adhdmc/villagerinfo/Config/ConfigValidator.java b/src/main/java/adhdmc/villagerinfo/Config/ConfigValidator.java
index fd46ff0..91d1e46 100644
--- a/src/main/java/adhdmc/villagerinfo/Config/ConfigValidator.java
+++ b/src/main/java/adhdmc/villagerinfo/Config/ConfigValidator.java
@@ -4,10 +4,7 @@
 import org.bukkit.Sound;
 import org.bukkit.configuration.file.FileConfiguration;
 
-import java.util.Collections;
-import java.util.HashMap;
 import java.util.Locale;
-import java.util.Map;
 
 public class ConfigValidator {
 
@@ -50,7 +47,6 @@ public static void configValidator() {
             soundPitch = 1.5F;
         }
         ToggleSetting.reloadToggles();
-        Message.reloadLocale();
     }
 
     public static float getSoundPitch() {
diff --git a/src/main/java/adhdmc/villagerinfo/Config/Defaults.java b/src/main/java/adhdmc/villagerinfo/Config/Defaults.java
deleted file mode 100644
index 3a35569..0000000
--- a/src/main/java/adhdmc/villagerinfo/Config/Defaults.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package adhdmc.villagerinfo.Config;
-
-import adhdmc.villagerinfo.VillagerInfo;
-import org.bukkit.configuration.file.FileConfiguration;
-
-public class Defaults {
-
-    public static void localeDefaults() {
-        FileConfiguration locale = VillagerInfo.getLocaleConfig().getlocaleConfig();
-        locale.addDefault("prefix", "<#3256a8><bold>[</bold><#4dd5ff>Villager Info<#3256a8><bold>]<reset>");
-        locale.addDefault("toggle-on", "<green> Villager Info Toggled <u>ON");
-        locale.addDefault("toggle-off", "<red> Villager Info Toggled <u>OFF");
-        locale.addDefault("no-permission", "<red>You don't have permission to use this command!");
-        locale.addDefault("no-command", "<red>No subcommand by that name!");
-        locale.addDefault("config-reloaded", "<gold>VillagerInfo Config Reloaded!");
-        locale.addDefault("help-main", "<#4dd5ff> • How to use Villager Info\n<grey>Crouch-right-click a villager while toggle is on to have a villager's information displayed");
-        locale.addDefault("help-toggle", "<#4dd5ff> • /vill toggle\n<grey>Toggles the ability to receive villager information on or off.");
-        locale.addDefault("help-reload", "<#4dd5ff> • /vill reload\n<grey>Reloads the plugin, applies config values");
-        locale.addDefault("not-a-player", "<red>Sorry, you must be a player to use this command");
-        locale.addDefault("purpur-lobotomized","<#05bff7><hover:show_text:'<aqua>Lobotomized: <grey><state>'>[<#c4fff7>Lobotomized</#c4fff7>]");
-        locale.addDefault("zombie-villager-conversion-time", "<#05bff7><hover:show_text:'<aqua>Conversion Time: <grey><time>'>[<#c4fff7>Time Until Converted</#c4fff7>]</hover>");
-        locale.addDefault("villager-age", "<#05bff7><hover:show_text:'<aqua>Childhood Left: <grey><age>'>[<#c4fff7>Time Until Adult</#c4fff7>]");
-        locale.addDefault("villager-health", "<#05bff7><hover:show_text:'<aqua>Health: <grey><current><aqua>/</aqua><total>'>[<#c4fff7>Health</#c4fff7>]");
-        locale.addDefault("villager-profession", "<#05bff7><hover:show_text:'<aqua>Profession: <grey><profession>'>[<#c4fff7>Profession</#c4fff7>]");
-        locale.addDefault("villager-jobsite-msg", "<#05bff7><hover:show_text:'<aqua>POI: <grey><jobsitelocation>'>[<#c4fff7>Job Site</#c4fff7>]");
-        locale.addDefault("villager-last-worked-msg", "<#05bff7><hover:show_text:'<aqua>Last Worked: <grey><worktime>'>[<#c4fff7>Last Worked At Workstation</#c4fff7>]");
-        locale.addDefault("villager-num-restocks-msg", "<#05bff7><hover:show_text:'<aqua>Restocks: <grey><restockcount>'>[<#c4fff7>Restocks Today</#c4fff7>]");
-        locale.addDefault("villager-home-msg", "<#05bff7><hover:show_text:'<aqua>Bed: <grey><homelocation>'>[<#c4fff7>Home</#c4fff7>]");
-        locale.addDefault("villager-slept-msg", "<#05bff7><hover:show_text:'<aqua>Last Slept: <grey><sleeptime>'>[<#c4fff7>Last Slept</#c4fff7>]");
-        locale.addDefault("villager-inventory-msg", "<#05bff7><hover:show_text:'<aqua>Inventory: <grey><contents>'>[<#c4fff7>Villager Inventory</#c4fff7>]");
-        locale.addDefault("inventory-contents-msg", "\n • <item> (<amount>)");
-        locale.addDefault("player-reputation-msg", "<#05bff7><hover:show_text:'<#05bff7>[<#c4fff7>Player Reputation</#c4fff7>]'><reputation>");
-        locale.addDefault("true-msg", "<grey>True");
-        locale.addDefault("false-msg", "<grey>False");
-        locale.addDefault("none-msg", "<grey>None");
-        locale.addDefault("never-msg", "<grey>Never");
-        locale.addDefault("empty-msg", "\n<grey>Empty");
-        locale.addDefault("no-information", "<grey>No information to display on this villager");
-        locale.addDefault("hour", "h, ");
-        locale.addDefault("minute", "m, ");
-        locale.addDefault("second", "s");
-        locale.addDefault("ago", " Ago");
-        locale.addDefault("location-x", "<int>x, ");
-        locale.addDefault("location-y", "<int>y, ");
-        locale.addDefault("location-z", "<int>z");
-    }
-
-    public static void configDefaults() {
-        FileConfiguration config = VillagerInfo.getInstance().getConfig();
-        config.addDefault("hover-messages", true);
-        config.addDefault("purpur-lobotomized", false);
-        config.addDefault("baby-age", true);
-        config.addDefault("zombie-conversion", true);
-        config.addDefault("profession", true);
-        config.addDefault("job-site", true);
-        config.addDefault("last-worked", true);
-        config.addDefault("bed-location", true);
-        config.addDefault("last-slept", true);
-        config.addDefault("inventory", true);
-        config.addDefault("restocks", true);
-        config.addDefault("reputation", true);
-        config.addDefault("highlight-workstation", true);
-        config.addDefault("sound-toggle", true);
-        config.addDefault("sound", "BLOCK_AMETHYST_BLOCK_BREAK");
-        config.addDefault("sound-volume", 0.5);
-        config.addDefault("sound-pitch", 1.5);
-        config.addDefault("highlight-time", 10);
-    }
-
-}
diff --git a/src/main/java/adhdmc/villagerinfo/Config/LocaleConfig.java b/src/main/java/adhdmc/villagerinfo/Config/LocaleConfig.java
index 1630acc..9cbcc58 100644
--- a/src/main/java/adhdmc/villagerinfo/Config/LocaleConfig.java
+++ b/src/main/java/adhdmc/villagerinfo/Config/LocaleConfig.java
@@ -1,57 +1,45 @@
 package adhdmc.villagerinfo.Config;
 
 import adhdmc.villagerinfo.VillagerInfo;
+import org.bukkit.configuration.InvalidConfigurationException;
+import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.configuration.file.YamlConfiguration;
 
 import java.io.File;
 import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
+import java.util.Set;
 
 public class LocaleConfig {
-    private final VillagerInfo plugin;
-    private static final String localeName = "locale.yml";
-    private YamlConfiguration localeConfig = null;
-    private File localeFile = null;
 
-    public LocaleConfig(VillagerInfo plugin) {
-        this.plugin = plugin;
-    }
+    private static LocaleConfig instance;
+    private final String fileName = "locale.yml";
+    private final  File localeFile = new File(VillagerInfo.getInstance().getDataFolder(), fileName);
+    private final FileConfiguration localeConfig = new YamlConfiguration();
 
-    public void reloadConfig() {
-        if (this.localeFile == null) {
-            this.localeFile = new File(this.plugin.getDataFolder(), localeName);
-        }
-        this.localeConfig = YamlConfiguration.loadConfiguration(this.localeFile);
-        this.localeConfig.options().copyDefaults(true);
-        InputStream defaultStream = this.plugin.getResource(localeName);
-        if (defaultStream != null) {
-            YamlConfiguration defaultConfig = YamlConfiguration.loadConfiguration(new InputStreamReader(defaultStream));
-            this.localeConfig.setDefaults(defaultConfig);
-        }
+
+    private LocaleConfig() {
+        if (!localeFile.exists()) VillagerInfo.getInstance().saveResource(fileName, false);
+        reloadLocale();
     }
 
-    public YamlConfiguration getlocaleConfig() {
-        if (this.localeConfig == null) {
-            reloadConfig();
-        }
-        return this.localeConfig;
+    public static LocaleConfig getInstance() {
+        if (instance == null) instance = new LocaleConfig();
+        return instance;
     }
 
-    public void saveConfig() {
-        getlocaleConfig();
-        if (this.localeConfig == null || this.localeFile == null) {
-            return;
-        }
-        try {
-            this.getlocaleConfig().save(this.localeFile);
-        } catch (IOException e) {
-            plugin.getLogger().severe("[saveConfig()] Could not save config to " + this.localeFile);
-            e.printStackTrace();
-        }
-        if (!this.localeFile.exists()) {
-            this.plugin.saveResource(localeName, false);
+    public FileConfiguration getLocale() { return localeConfig; }
+
+    public void reloadLocale() {
+        try { localeConfig.load(localeFile); }
+        catch (IOException | InvalidConfigurationException e) { e.printStackTrace(); }
+        Set<String> keys = localeConfig.getKeys(false);
+        for (String key : keys) {
+            try {
+                VIMessage message = VIMessage.valueOf(key);
+                message.setMessage(localeConfig.getString(key, message.getMessage()));
+            } catch (IllegalArgumentException e) {
+                VillagerInfo.getVillagerInfoLogger().warning(VIMessage.LOGGER_INVALID_LOCALE_KEY.getMessage() + key);
+            }
         }
     }
 }
-
diff --git a/src/main/java/adhdmc/villagerinfo/Config/Message.java b/src/main/java/adhdmc/villagerinfo/Config/Message.java
deleted file mode 100644
index e0cc472..0000000
--- a/src/main/java/adhdmc/villagerinfo/Config/Message.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package adhdmc.villagerinfo.Config;
-
-import adhdmc.villagerinfo.VillagerInfo;
-import org.bukkit.configuration.file.FileConfiguration;
-
-public enum Message {
-    // General
-    PREFIX("<#3256a8><bold>[</bold><#4dd5ff>Villager Info<#3256a8><bold>]<reset>"),
-    TOGGLE_ON("<green> Villager Info Toggled <u>ON"),
-    TOGGLE_OFF("<red> Villager Info Toggled <u>OFF"),
-    NO_PERMISSION("<red>You don't have permission to use this command!"),
-    NO_COMMAND("<red>No command by that name!"),
-    CONFIG_RELOADED("<gold>VillagerInfo Config Reloaded!"),
-    HELP_MAIN("<#4dd5ff> • How to use Villager Info\n<grey>Crouch-right-click a villager while toggle is on to have a villager's information displayed"),
-    HELP_TOGGLE("<#4dd5ff> • /vill toggle\n<grey>Toggles the ability to receive villager information on or off."),
-    HELP_RELOAD("<#4dd5ff> • /vill reload\n<grey>Reloads the plugin, applies config values"),
-    NOT_A_PLAYER("<red>Sorry, you must be a player to use this command"),
-
-    // Villager Info
-    PURPUR_LOBOTOMIZED("<#05bff7><hover:show_text:'<aqua>Lobotomized: <grey><state>'>[<#c4fff7>Lobotomized</#c4fff7>]"),
-    ZOMBIE_VILLAGER_CONVERSION_TIME("<#05bff7><hover:show_text:'<aqua>Conversion Time: <grey><time>'>[<#c4fff7>Time Until Converted</#c4fff7>]</hover>"),
-    VILLAGER_AGE("<#05bff7><hover:show_text:'<aqua>Childhood Left: <grey><age>'>[<#c4fff7>Time Until Adult</#c4fff7>]"),
-    VILLAGER_PROFESSION("<#05bff7><hover:show_text:'<aqua>Profession: <grey><profession>'>[<#c4fff7>Profession</#c4fff7>]"),
-    VILLAGER_HEALTH("<#05bff7><hover:show_text:'<aqua>Health: <grey><current><aqua>/</aqua><total>'>[<#c4fff7>Health</#c4fff7>]"),
-    VILLAGER_JOBSITE("<#05bff7><hover:show_text:'<aqua>POI: <grey><jobsitelocation>'>[<#c4fff7>Job Site</#c4fff7>]"),
-    VILLAGER_LAST_WORKED("<#05bff7><hover:show_text:'<aqua>Last Worked: <grey><worktime>'>[<#c4fff7>Last Worked At Workstation</#c4fff7>]"),
-    VILLAGER_RESTOCKS("<#05bff7><hover:show_text:'<aqua>Restocks: <grey><restockcount>'>[<#c4fff7>Restocks Today</#c4fff7>]"),
-    VILLAGER_HOME("<#05bff7><hover:show_text:'<aqua>Bed: <grey><homelocation>'>[<#c4fff7>Home</#c4fff7>]"),
-    VILLAGER_SLEPT("<#05bff7><hover:show_text:'<aqua>Last Slept: <grey><sleeptime>'>[<#c4fff7>Last Slept</#c4fff7>]"),
-    VILLAGER_INVENTORY("<#05bff7><hover:show_text:'<aqua>Inventory: <grey><contents>'>[<#c4fff7>Villager Inventory</#c4fff7>]"),
-    INVENTORY_CONTENTS("\n • <item> (<amount>)"),
-    PLAYER_REPUTATION("<#05bff7><hover:show_text:'<#05bff7>[<#c4fff7>Player Reputation</#c4fff7>]'><reputation>"),
-
-    // Fillers
-    TRUE("<grey>True"), FALSE("<grey>False"),
-    NONE("<grey>None"), NEVER("<grey>Never"), EMPTY("\n<grey>Empty"),
-    NO_INFORMATION("<grey>No information to display on this villager"),
-
-    // Time
-    HOUR("h, "), MINUTE("m, "), SECOND("s"), AGO(" Ago"),
-
-    // Location
-    LOCATION_X("<int>x, "), LOCATION_Y("<int>y, "), LOCATION_Z("<int>z");
-
-    String message;
-    Message(String message) {
-        this.message = message;
-    }
-    public String getMessage() { return this.message; }
-    private void setMessage(String message) { this.message = message; }
-
-
-    public static void reloadLocale() {
-        FileConfiguration locale = VillagerInfo.getLocaleConfig().getlocaleConfig();
-        // General
-        PREFIX.setMessage(locale.getString("prefix"));
-        TOGGLE_ON.setMessage(locale.getString("toggle-on"));
-        TOGGLE_OFF.setMessage(locale.getString("toggle-off"));
-        NO_PERMISSION.setMessage(locale.getString("no-permission"));
-        // Commands
-        NO_COMMAND.setMessage(locale.getString("no-command"));
-        CONFIG_RELOADED.setMessage(locale.getString("config-reloaded"));
-        HELP_MAIN.setMessage(locale.getString("help-main"));
-        HELP_TOGGLE.setMessage(locale.getString("help-toggle"));
-        HELP_RELOAD.setMessage(locale.getString("help-reload"));
-        NOT_A_PLAYER.setMessage(locale.getString("not-a-player"));
-        // Villager Info
-        PURPUR_LOBOTOMIZED.setMessage(locale.getString("purpur-lobotomized"));
-        ZOMBIE_VILLAGER_CONVERSION_TIME.setMessage(locale.getString("zombie-villager-conversion-time"));
-        VILLAGER_AGE.setMessage(locale.getString("villager-age"));
-        VILLAGER_HEALTH.setMessage(locale.getString("villager-health"));
-        VILLAGER_PROFESSION.setMessage(locale.getString("villager-profession"));
-        VILLAGER_JOBSITE.setMessage(locale.getString("villager-jobsite-msg"));
-        VILLAGER_LAST_WORKED.setMessage(locale.getString("villager-last-worked-msg"));
-        VILLAGER_RESTOCKS.setMessage(locale.getString("villager-num-restocks-msg"));
-        VILLAGER_HOME.setMessage(locale.getString("villager-home-msg"));
-        VILLAGER_SLEPT.setMessage(locale.getString("villager-slept-msg"));
-        VILLAGER_INVENTORY.setMessage(locale.getString("villager-inventory-msg"));
-        INVENTORY_CONTENTS.setMessage(locale.getString("inventory-contents-msg"));
-        PLAYER_REPUTATION.setMessage(locale.getString("player-reputation-msg"));
-        // Fillers
-        TRUE.setMessage(locale.getString("true-msg"));
-        FALSE.setMessage(locale.getString("false-msg"));
-        NONE.setMessage(locale.getString("none-msg"));
-        NEVER.setMessage(locale.getString("never-msg"));
-        EMPTY.setMessage(locale.getString("empty-msg"));
-        NO_INFORMATION.setMessage(locale.getString("no-information"));
-        // Time
-        HOUR.setMessage(locale.getString("hour"));
-        MINUTE.setMessage(locale.getString("minute"));
-        SECOND.setMessage(locale.getString("second"));
-        AGO.setMessage(locale.getString("ago"));
-
-        // Location
-        LOCATION_X.setMessage(locale.getString("location-x"));
-        LOCATION_Y.setMessage(locale.getString("location-y"));
-        LOCATION_Z.setMessage(locale.getString("location-z"));
-    }
-}
diff --git a/src/main/java/adhdmc/villagerinfo/Config/Perms.java b/src/main/java/adhdmc/villagerinfo/Config/Perms.java
index 26181db..7fd87c8 100644
--- a/src/main/java/adhdmc/villagerinfo/Config/Perms.java
+++ b/src/main/java/adhdmc/villagerinfo/Config/Perms.java
@@ -1,15 +1,13 @@
 package adhdmc.villagerinfo.Config;
 
-import org.bukkit.permissions.Permission;
-
 public enum Perms {
     TOGGLE("villagerinfo.toggle"),
     RELOAD("villagerinfo.reload"),
     USE("villagerinfo.use");
 
-    String perm;
+    final String VIPerm;
     Perms(String perm) {
-        this.perm = perm;
+        this.VIPerm = perm;
     }
-    public String getPerm() { return this.perm; }
+    public String getVIPerm() { return this.VIPerm; }
 }
diff --git a/src/main/java/adhdmc/villagerinfo/Config/VIMessage.java b/src/main/java/adhdmc/villagerinfo/Config/VIMessage.java
new file mode 100644
index 0000000..cb5945e
--- /dev/null
+++ b/src/main/java/adhdmc/villagerinfo/Config/VIMessage.java
@@ -0,0 +1,50 @@
+package adhdmc.villagerinfo.Config;
+
+
+public enum VIMessage {
+    // General
+    PLUGIN_PREFIX("<#3256a8><bold>[</bold><#4dd5ff>Villager Info<#3256a8><bold>]<reset>"),
+    TOGGLE_ON("<plugin_prefix> <green> Villager Info Toggled <u>ON"),
+    TOGGLE_OFF("<plugin_prefix> <red> Villager Info Toggled <u>OFF"),
+    LOGGER_INVALID_LOCALE_KEY("Invalid locale key found: "),
+    NO_PERMISSION("<red>You don't have permission to use this command!"),
+    NO_COMMAND("<red>No command by that name!"),
+    CONFIG_RELOADED("<plugin_prefix> <gold>VillagerInfo Config Reloaded!"),
+    HELP_MAIN("<plugin_prefix> <#4dd5ff> • How to use Villager Info\n<grey>Crouch-right-click a villager while toggle is on to have a villager's information displayed"),
+    HELP_TOGGLE("<#4dd5ff> • /vill toggle\n<grey>Toggles the ability to receive villager information on or off."),
+    HELP_RELOAD("<#4dd5ff> • /vill reload\n<grey>Reloads the plugin, applies config values"),
+    NOT_A_PLAYER("<plugin_prefix> <red>Sorry, you must be a player to use this command"),
+
+    // Villager Info
+    PURPUR_LOBOTOMIZED("<#05bff7><hover:show_text:'<aqua>Lobotomized: <grey><state>'>[<#c4fff7>Lobotomized</#c4fff7>]"),
+    ZOMBIE_VILLAGER_CONVERSION_TIME("<#05bff7><hover:show_text:'<aqua>Conversion Time: <grey><time>'>[<#c4fff7>Time Until Converted</#c4fff7>]</hover>"),
+    VILLAGER_AGE("<#05bff7><hover:show_text:'<aqua>Childhood Left: <grey><age>'>[<#c4fff7>Time Until Adult</#c4fff7>]"),
+    VILLAGER_PROFESSION("<#05bff7><hover:show_text:'<aqua>Profession: <grey><profession>'>[<#c4fff7>Profession</#c4fff7>]"),
+    VILLAGER_HEALTH("<#05bff7><hover:show_text:'<aqua>Health: <grey><current><aqua>/</aqua><total>'>[<#c4fff7>Health</#c4fff7>]"),
+    VILLAGER_JOBSITE("<#05bff7><hover:show_text:'<aqua>POI: <grey><jobsitelocation>'>[<#c4fff7>Job Site</#c4fff7>]"),
+    VILLAGER_LAST_WORKED("<#05bff7><hover:show_text:'<aqua>Last Worked: <grey><worktime>'>[<#c4fff7>Last Worked At Workstation</#c4fff7>]"),
+    VILLAGER_RESTOCKS("<#05bff7><hover:show_text:'<aqua>Restocks: <grey><restockcount>'>[<#c4fff7>Restocks Today</#c4fff7>]"),
+    VILLAGER_HOME("<#05bff7><hover:show_text:'<aqua>Bed: <grey><homelocation>'>[<#c4fff7>Home</#c4fff7>]"),
+    VILLAGER_SLEPT("<#05bff7><hover:show_text:'<aqua>Last Slept: <grey><sleeptime>'>[<#c4fff7>Last Slept</#c4fff7>]"),
+    VILLAGER_INVENTORY("<#05bff7><hover:show_text:'<aqua>Inventory: <grey><contents>'>[<#c4fff7>Villager Inventory</#c4fff7>]"),
+    INVENTORY_CONTENTS("\n • <item> (<amount>)"),
+    PLAYER_REPUTATION("<#05bff7><hover:show_text:'<#05bff7>[<#c4fff7>Player Reputation</#c4fff7>]'><reputation>"),
+
+    // Fillers
+    TRUE("<grey>True"), FALSE("<grey>False"),
+    NONE("<grey>None"), NEVER("<grey>Never"), EMPTY("\n<grey>Empty"),
+    NO_INFORMATION("<grey>No information to display on this villager"),
+
+    // Time
+    HOUR("h, "), MINUTE("m, "), SECOND("s"), AGO(" Ago"),
+
+    // Location
+    LOCATION_X("<int>x, "), LOCATION_Y("<int>y, "), LOCATION_Z("<int>z");
+
+    String message;
+    VIMessage(String message) {
+        this.message = message;
+    }
+    public String getMessage() { return this.message; }
+    public void setMessage(String message) { this.message = message; }
+}
diff --git a/src/main/java/adhdmc/villagerinfo/VillagerHandling/ComponentHandler.java b/src/main/java/adhdmc/villagerinfo/VillagerHandling/ComponentHandler.java
index 2c6dc82..c3dff69 100644
--- a/src/main/java/adhdmc/villagerinfo/VillagerHandling/ComponentHandler.java
+++ b/src/main/java/adhdmc/villagerinfo/VillagerHandling/ComponentHandler.java
@@ -1,6 +1,6 @@
 package adhdmc.villagerinfo.VillagerHandling;
 
-import adhdmc.villagerinfo.Config.Message;
+import adhdmc.villagerinfo.Config.VIMessage;
 import adhdmc.villagerinfo.VillagerInfo;
 import com.destroystokyo.paper.entity.villager.Reputation;
 import com.destroystokyo.paper.entity.villager.ReputationType;
@@ -16,9 +16,11 @@
 import org.bukkit.entity.memory.MemoryKey;
 import org.bukkit.inventory.ItemStack;
 
+import java.util.Objects;
+
 public class ComponentHandler {
     private static final MiniMessage miniMessage = VillagerInfo.getMiniMessage();
-    private static boolean usingPurpur = VillagerInfo.usingPurpur;
+    private static final boolean usingPurpur = VillagerInfo.usingPurpur;
 
     /**
      * Checks and returns formatted 'time till adult' message component
@@ -33,22 +35,22 @@ public static Component timeTillAdult(Ageable ageable) {
             return null;
         }
         String timeCalc = timeMath(age);
-        timeTillAdultFinal = miniMessage.deserialize(Message.VILLAGER_AGE.getMessage(), Placeholder.unparsed("age", timeCalc));
+        timeTillAdultFinal = miniMessage.deserialize(VIMessage.VILLAGER_AGE.getMessage(), Placeholder.unparsed("age", timeCalc));
         return timeTillAdultFinal;
     }
 
     public static Component villagerHealth(LivingEntity entity) {
         Component villagerHealthFinal;
-        double maxHealth = entity.getAttribute(Attribute.GENERIC_MAX_HEALTH).getValue();
+        double maxHealth = Objects.requireNonNull(entity.getAttribute(Attribute.GENERIC_MAX_HEALTH)).getValue();
         double currentHealth = entity.getHealth();
-        villagerHealthFinal = miniMessage.deserialize(Message.VILLAGER_HEALTH.getMessage(),
+        villagerHealthFinal = miniMessage.deserialize(VIMessage.VILLAGER_HEALTH.getMessage(),
                 Placeholder.unparsed("current", String.valueOf(currentHealth)),
                 Placeholder.unparsed("total", String.valueOf(maxHealth)));
         return villagerHealthFinal;
     }
 
     public static Component villagerLobotomized(Villager villager) {
-        Component villagerLobotomizedFinal = null;
+        Component villagerLobotomizedFinal;
         if(usingPurpur) {
             try {
                 villager.isLobotomized();
@@ -57,9 +59,9 @@ public static Component villagerLobotomized(Villager villager) {
                 return null;
             }
             String state = "";
-            if (villager.isLobotomized()) state = Message.TRUE.getMessage();
-            if (!villager.isLobotomized()) state = Message.FALSE.getMessage();
-            villagerLobotomizedFinal = miniMessage.deserialize(Message.PURPUR_LOBOTOMIZED.getMessage(),
+            if (villager.isLobotomized()) state = VIMessage.TRUE.getMessage();
+            if (!villager.isLobotomized()) state = VIMessage.FALSE.getMessage();
+            villagerLobotomizedFinal = miniMessage.deserialize(VIMessage.PURPUR_LOBOTOMIZED.getMessage(),
                     Placeholder.parsed("state", state));
             return villagerLobotomizedFinal;
         }
@@ -74,9 +76,9 @@ public static Component villagerLobotomized(Villager villager) {
     public static Component villagerProfession(Villager.Profession profession) {
         Component professionFinal;
         if (profession == Villager.Profession.NONE) {
-            professionFinal = miniMessage.deserialize(Message.VILLAGER_PROFESSION.getMessage(), Placeholder.parsed("profession", Message.NONE.getMessage()));
+            professionFinal = miniMessage.deserialize(VIMessage.VILLAGER_PROFESSION.getMessage(), Placeholder.parsed("profession", VIMessage.NONE.getMessage()));
         } else {
-            professionFinal = miniMessage.deserialize(Message.VILLAGER_PROFESSION.getMessage(), Placeholder.parsed("profession", profession.toString()));
+            professionFinal = miniMessage.deserialize(VIMessage.VILLAGER_PROFESSION.getMessage(), Placeholder.parsed("profession", profession.toString()));
         }
         return professionFinal;
     }
@@ -90,16 +92,16 @@ public static Component villagerJobSite(Villager villager) {
         Location villagerJobLocation = villager.getMemory(MemoryKey.JOB_SITE);
         Component jobSiteFinal;
         if (villagerJobLocation == null) {
-            jobSiteFinal = miniMessage.deserialize(Message.VILLAGER_JOBSITE.getMessage(),
-                    Placeholder.parsed("jobsitelocation", Message.NONE.getMessage()));
+            jobSiteFinal = miniMessage.deserialize(VIMessage.VILLAGER_JOBSITE.getMessage(),
+                    Placeholder.parsed("jobsitelocation", VIMessage.NONE.getMessage()));
         } else {
-            Component jobX = miniMessage.deserialize(Message.LOCATION_X.getMessage(),
+            Component jobX = miniMessage.deserialize(VIMessage.LOCATION_X.getMessage(),
                     Placeholder.unparsed("int", String.valueOf(villagerJobLocation.getBlockX())));
-            Component jobY = miniMessage.deserialize(Message.LOCATION_Y.getMessage(),
+            Component jobY = miniMessage.deserialize(VIMessage.LOCATION_Y.getMessage(),
                     Placeholder.unparsed("int", String.valueOf(villagerJobLocation.getBlockY())));
-            Component jobZ = miniMessage.deserialize(Message.LOCATION_Z.getMessage(),
+            Component jobZ = miniMessage.deserialize(VIMessage.LOCATION_Z.getMessage(),
                     Placeholder.unparsed("int", String.valueOf(villagerJobLocation.getBlockZ())));
-            jobSiteFinal = miniMessage.deserialize(Message.VILLAGER_JOBSITE.getMessage(),
+            jobSiteFinal = miniMessage.deserialize(VIMessage.VILLAGER_JOBSITE.getMessage(),
                     Placeholder.component("jobsitelocation", jobX.append(jobY).append(jobZ)));
         }
         return jobSiteFinal;
@@ -114,12 +116,12 @@ public static Component villagerLastWorked(Villager villager) {
         Component villagerLastWorkedFinal;
         Long lastWorked = villager.getMemory(MemoryKey.LAST_WORKED_AT_POI);
         if (lastWorked == null) {
-            villagerLastWorkedFinal = miniMessage.deserialize(Message.VILLAGER_LAST_WORKED.getMessage(),
-                    Placeholder.parsed("worktime", Message.NEVER.getMessage()));
+            villagerLastWorkedFinal = miniMessage.deserialize(VIMessage.VILLAGER_LAST_WORKED.getMessage(),
+                    Placeholder.parsed("worktime", VIMessage.NEVER.getMessage()));
         } else {
             Long timeSinceWorked = villager.getWorld().getGameTime() - lastWorked;
-            String formattedTime = timeMath(timeSinceWorked) + Message.AGO.getMessage();
-            villagerLastWorkedFinal = miniMessage.deserialize(Message.VILLAGER_LAST_WORKED.getMessage(),
+            String formattedTime = timeMath(timeSinceWorked) + VIMessage.AGO.getMessage();
+            villagerLastWorkedFinal = miniMessage.deserialize(VIMessage.VILLAGER_LAST_WORKED.getMessage(),
                     Placeholder.unparsed("worktime", formattedTime));
         }
         return villagerLastWorkedFinal;
@@ -134,16 +136,16 @@ public static Component villagerBed(Villager villager) {
         Component villagerBedFinal;
         Location bedLocation = villager.getMemory(MemoryKey.HOME);
         if (bedLocation == null) {
-            villagerBedFinal = miniMessage.deserialize(Message.VILLAGER_HOME.getMessage(),
-                    Placeholder.parsed("homelocation", Message.NONE.getMessage()));
+            villagerBedFinal = miniMessage.deserialize(VIMessage.VILLAGER_HOME.getMessage(),
+                    Placeholder.parsed("homelocation", VIMessage.NONE.getMessage()));
         } else {
-            Component bedX = miniMessage.deserialize(Message.LOCATION_X.getMessage(),
+            Component bedX = miniMessage.deserialize(VIMessage.LOCATION_X.getMessage(),
                     Placeholder.unparsed("int", String.valueOf(bedLocation.getBlockX())));
-            Component bedY = miniMessage.deserialize(Message.LOCATION_Y.getMessage(),
+            Component bedY = miniMessage.deserialize(VIMessage.LOCATION_Y.getMessage(),
                     Placeholder.unparsed("int", String.valueOf(bedLocation.getBlockY())));
-            Component bedZ = miniMessage.deserialize(Message.LOCATION_Z.getMessage(),
+            Component bedZ = miniMessage.deserialize(VIMessage.LOCATION_Z.getMessage(),
                     Placeholder.unparsed("int", String.valueOf(bedLocation.getBlockZ())));
-            villagerBedFinal = miniMessage.deserialize(Message.VILLAGER_HOME.getMessage(),
+            villagerBedFinal = miniMessage.deserialize(VIMessage.VILLAGER_HOME.getMessage(),
                     Placeholder.component("homelocation", bedX.append(bedY).append(bedZ)));
         }
         return villagerBedFinal;
@@ -158,12 +160,12 @@ public static Component villagerLastSlept(Villager villager) {
         Component villagerLastSleptFinal;
         Long lastSlept = villager.getMemory(MemoryKey.LAST_SLEPT);
         if (lastSlept == null) {
-            villagerLastSleptFinal = miniMessage.deserialize(Message.VILLAGER_SLEPT.getMessage(),
-                    Placeholder.parsed("sleeptime", Message.NEVER.getMessage()));
+            villagerLastSleptFinal = miniMessage.deserialize(VIMessage.VILLAGER_SLEPT.getMessage(),
+                    Placeholder.parsed("sleeptime", VIMessage.NEVER.getMessage()));
         } else {
             Long timeSinceSlept = villager.getWorld().getGameTime() - lastSlept;
-            String formattedTime = timeMath(timeSinceSlept) + Message.AGO.getMessage() ;
-            villagerLastSleptFinal = miniMessage.deserialize(Message.VILLAGER_SLEPT.getMessage(),
+            String formattedTime = timeMath(timeSinceSlept) + VIMessage.AGO.getMessage() ;
+            villagerLastSleptFinal = miniMessage.deserialize(VIMessage.VILLAGER_SLEPT.getMessage(),
                     Placeholder.unparsed("sleeptime", formattedTime));
         }
         return villagerLastSleptFinal;
@@ -177,16 +179,16 @@ public static Component villagerLastSlept(Villager villager) {
     public static Component villagerInventory(Villager villager) {
         Component villagerInventoryFinal;
         if (villager.getInventory().isEmpty()) {
-            villagerInventoryFinal = miniMessage.deserialize(Message.VILLAGER_INVENTORY.getMessage(), Placeholder.parsed("contents", Message.EMPTY.getMessage()));
+            villagerInventoryFinal = miniMessage.deserialize(VIMessage.VILLAGER_INVENTORY.getMessage(), Placeholder.parsed("contents", VIMessage.EMPTY.getMessage()));
         } else {
             Component villagerInventory = Component.text("");
-            String inventoryOutput = Message.INVENTORY_CONTENTS.getMessage();
+            String inventoryOutput = VIMessage.INVENTORY_CONTENTS.getMessage();
             ItemStack[] inventoryItems = villager.getInventory().getContents();
             for (ItemStack items : inventoryItems) {
                 if (items == null) continue;
                 villagerInventory = villagerInventory.append(miniMessage.deserialize(inventoryOutput, Placeholder.parsed("item", items.getType().toString()), Placeholder.parsed("amount", String.valueOf(items.getAmount()))));
             }
-            villagerInventoryFinal = miniMessage.deserialize(Message.VILLAGER_INVENTORY.getMessage(), Placeholder.component("contents", villagerInventory));
+            villagerInventoryFinal = miniMessage.deserialize(VIMessage.VILLAGER_INVENTORY.getMessage(), Placeholder.component("contents", villagerInventory));
         }
         return villagerInventoryFinal;
     }
@@ -198,9 +200,9 @@ public static Component villagerInventory(Villager villager) {
      */
     public static Component villagerRestocks(Villager villager) {
         if (villager.getRestocksToday() == 0) {
-            return miniMessage.deserialize(Message.VILLAGER_RESTOCKS.getMessage(), Placeholder.parsed("restockcount", Message.NONE.getMessage()));
+            return miniMessage.deserialize(VIMessage.VILLAGER_RESTOCKS.getMessage(), Placeholder.parsed("restockcount", VIMessage.NONE.getMessage()));
         } else {
-            return miniMessage.deserialize(Message.VILLAGER_RESTOCKS.getMessage(), Placeholder.parsed("restockcount", String.valueOf(villager.getRestocksToday())));
+            return miniMessage.deserialize(VIMessage.VILLAGER_RESTOCKS.getMessage(), Placeholder.parsed("restockcount", String.valueOf(villager.getRestocksToday())));
         }
     }
 
@@ -213,21 +215,21 @@ public static Component villagerPlayerReputation(Reputation reputation) {
         Component villagerReputationFinal;
         int reputationRawTotal = reputationTotal(reputation);
         String playerReputation = ReputationHandler.villagerReputation(reputationRawTotal);
-        villagerReputationFinal = miniMessage.deserialize(Message.PLAYER_REPUTATION.getMessage(), Placeholder.unparsed("reputation", playerReputation));
+        villagerReputationFinal = miniMessage.deserialize(VIMessage.PLAYER_REPUTATION.getMessage(), Placeholder.unparsed("reputation", playerReputation));
         return villagerReputationFinal;
 
     }
 
     /**
-     * Checks and returnt formatted 'time till converted' message component
+     * Checks and returns formatted 'time till converted' message component
      * @param zombieVillager Clicked Zombie Villager
      * @return Formatted Time Component
      */
 
     public static Component timeTillConverted(ZombieVillager zombieVillager){
-        long converstionTime = zombieVillager.getConversionTime();
-        String timeCalc = ComponentHandler.timeMath(converstionTime);
-        return miniMessage.deserialize(Message.ZOMBIE_VILLAGER_CONVERSION_TIME.getMessage(), Placeholder.unparsed("time", timeCalc));
+        long conversionTime = zombieVillager.getConversionTime();
+        String timeCalc = ComponentHandler.timeMath(conversionTime);
+        return miniMessage.deserialize(VIMessage.ZOMBIE_VILLAGER_CONVERSION_TIME.getMessage(), Placeholder.unparsed("time", timeCalc));
     }
 
     /**
@@ -263,11 +265,11 @@ private static String timeMath(Long mathTime) {
         long mathTimeC = mathTime2 / 1200;
         //Normal number from dividing (seconds)
         long mathTimeD = mathTime3 / 20;
-        if (mathTimeB > 0) mathResult += mathTimeB + Message.HOUR.getMessage();
-        if (mathTimeC > 0) mathResult += mathTimeC + Message.MINUTE.getMessage();
-        if (mathTimeD > 0) mathResult += mathTimeD + Message.SECOND.getMessage();
+        if (mathTimeB > 0) mathResult += mathTimeB + VIMessage.HOUR.getMessage();
+        if (mathTimeC > 0) mathResult += mathTimeC + VIMessage.MINUTE.getMessage();
+        if (mathTimeD > 0) mathResult += mathTimeD + VIMessage.SECOND.getMessage();
         if (mathResult.isEmpty()) {
-            mathResult += "0" + Message.SECOND.getMessage();
+            mathResult += "0" + VIMessage.SECOND.getMessage();
         }
         return mathResult;
     }
diff --git a/src/main/java/adhdmc/villagerinfo/VillagerHandling/VillagerHandler.java b/src/main/java/adhdmc/villagerinfo/VillagerHandling/VillagerHandler.java
index 5aba9fd..e53e3de 100644
--- a/src/main/java/adhdmc/villagerinfo/VillagerHandling/VillagerHandler.java
+++ b/src/main/java/adhdmc/villagerinfo/VillagerHandling/VillagerHandler.java
@@ -1,7 +1,7 @@
 package adhdmc.villagerinfo.VillagerHandling;
 
 import adhdmc.villagerinfo.Config.ConfigValidator;
-import adhdmc.villagerinfo.Config.Message;
+import adhdmc.villagerinfo.Config.VIMessage;
 import adhdmc.villagerinfo.Config.Perms;
 import adhdmc.villagerinfo.Config.ToggleSetting;
 import adhdmc.villagerinfo.VillagerInfo;
@@ -23,7 +23,7 @@
 
 
 public class VillagerHandler implements Listener {
-    private boolean usingPurpur = VillagerInfo.usingPurpur;
+    private final boolean usingPurpur = VillagerInfo.usingPurpur;
 
     MiniMessage miniMessage = VillagerInfo.getMiniMessage();
 
@@ -42,7 +42,7 @@ public void onVillagerClick(PlayerInteractEntityEvent event) {
             return;
         }
         if (event.getRightClicked() instanceof Villager villager) {
-            if (!player.hasPermission(Perms.USE.getPerm())) {
+            if (!player.hasPermission(Perms.USE.getVIPerm())) {
                 return;
             }
             if (Arrays.stream(ToggleSetting.values()).noneMatch(ToggleSetting::isEnabled)) {
@@ -52,7 +52,7 @@ public void onVillagerClick(PlayerInteractEntityEvent event) {
             event.setCancelled(true);
             processVillager(player, villager);
         } else if (event.getRightClicked() instanceof ZombieVillager zombieVillager) {
-            if (!player.hasPermission(Perms.USE.getPerm())) {
+            if (!player.hasPermission(Perms.USE.getVIPerm())) {
                 return;
             }
             if (Arrays.stream(ToggleSetting.values()).noneMatch(ToggleSetting::isEnabled)) {
@@ -123,11 +123,11 @@ private void processVillager(Player player, Villager villager) {
             HighlightHandling.villagerJobsiteHighlight(villager.getPersistentDataContainer(), villager.getUniqueId(), villagerPOI);
         }
         //Messages
-        Component prefix = miniMessage.deserialize(Message.PREFIX.getMessage());
+        Component prefix = miniMessage.deserialize(VIMessage.PLUGIN_PREFIX.getMessage());
         player.playSound(player.getLocation(), ConfigValidator.getConfigSound(), ConfigValidator.getSoundVolume(), ConfigValidator.getSoundPitch());
         player.sendMessage(prefix);
         if (messageList.size() == 0) {
-            player.sendMessage(miniMessage.deserialize(Message.NO_INFORMATION.getMessage()));
+            player.sendMessage(miniMessage.deserialize(VIMessage.NO_INFORMATION.getMessage()));
             return;
         }
         for (Component component : messageList) {
@@ -155,11 +155,11 @@ private void processZombieVillager(Player player, ZombieVillager zombieVillager)
         //    messageList.add(villagerPlayerReputation(zombieVillager.getReputation(player.getUniqueId())));
         //}
         //Messages
-        Component prefix = miniMessage.deserialize(Message.PREFIX.getMessage());
+        Component prefix = miniMessage.deserialize(VIMessage.PLUGIN_PREFIX.getMessage());
         player.playSound(player.getLocation(), ConfigValidator.getConfigSound(), ConfigValidator.getSoundVolume(), ConfigValidator.getSoundPitch());
         player.sendMessage(prefix);
         if (messageList.size() == 0) {
-            player.sendMessage(miniMessage.deserialize(Message.NO_INFORMATION.getMessage()));
+            player.sendMessage(miniMessage.deserialize(VIMessage.NO_INFORMATION.getMessage()));
             return;
         }
         for (Component component : messageList) {
diff --git a/src/main/java/adhdmc/villagerinfo/VillagerInfo.java b/src/main/java/adhdmc/villagerinfo/VillagerInfo.java
index 00a0473..3930cfa 100644
--- a/src/main/java/adhdmc/villagerinfo/VillagerInfo.java
+++ b/src/main/java/adhdmc/villagerinfo/VillagerInfo.java
@@ -5,22 +5,20 @@
 import adhdmc.villagerinfo.Commands.SubCommands.ReloadCommand;
 import adhdmc.villagerinfo.Commands.SubCommands.ToggleCommand;
 import adhdmc.villagerinfo.Config.ConfigValidator;
-import adhdmc.villagerinfo.Config.Defaults;
 import adhdmc.villagerinfo.Config.LocaleConfig;
 import adhdmc.villagerinfo.VillagerHandling.HighlightHandling;
 import adhdmc.villagerinfo.VillagerHandling.VillagerHandler;
 import net.kyori.adventure.text.minimessage.MiniMessage;
 import org.bstats.bukkit.Metrics;
 import org.bukkit.NamespacedKey;
-import org.bukkit.entity.Villager;
 import org.bukkit.plugin.java.JavaPlugin;
 
 import java.util.Objects;
+import java.util.logging.Logger;
 
 public final class VillagerInfo extends JavaPlugin {
     private static VillagerInfo instance;
     private static final MiniMessage miniMessage = MiniMessage.miniMessage();
-    private static LocaleConfig localeConfig;
     public static final NamespacedKey INFO_ENABLED_KEY = new NamespacedKey("villagerinfo", "info-enabled");
     public static final NamespacedKey HIGHLIGHT_STATUS = new NamespacedKey("villagerinfo", "highlighted");
     public static boolean usingPurpur = true;
@@ -35,15 +33,12 @@ public void onEnable() {
             this.getLogger().severe("VillagerInfo relies on methods in classes not present on your server. Disabling plugin");
             this.getServer().getPluginManager().disablePlugin(this);
         }
-        localeConfig = new LocaleConfig(this);
-        localeConfig.getlocaleConfig();
+        LocaleConfig.getInstance();
+        this.saveDefaultConfig();
+        this.reloadConfig();
         Metrics metrics = new Metrics(this, 13653);
         getServer().getPluginManager().registerEvents(new VillagerHandler(), this);
         Objects.requireNonNull(this.getCommand("vill")).setExecutor(new CommandHandler());
-        this.saveDefaultConfig();
-        Defaults.localeDefaults();
-        Defaults.configDefaults();
-        localeConfig.saveConfig();
         ConfigValidator.configValidator();
         registerCommands();
     }
@@ -67,7 +62,7 @@ public static MiniMessage getMiniMessage(){
     public static VillagerInfo getInstance(){
         return instance;
     }
-    public static LocaleConfig getLocaleConfig(){
-        return localeConfig;
+    public static Logger getVillagerInfoLogger() {
+        return getInstance().getLogger();
     }
 }
diff --git a/src/main/resources/locale.yml b/src/main/resources/locale.yml
new file mode 100644
index 0000000..89b71c9
--- /dev/null
+++ b/src/main/resources/locale.yml
@@ -0,0 +1,36 @@
+"PLUGIN_PREFIX": "<#3256a8><bold>[</bold><#4dd5ff>Villager Info<#3256a8><bold>]<reset>"
+"TOGGLE_ON": "<green> Villager Info Toggled <u>ON"
+"TOGGLE_OFF": "<red> Villager Info Toggled <u>OFF"
+"NO_PERMISSION": "<red>You don't have permission to use this command!"
+"NO_COMMAND": "<red>No command by that name!"
+"CONFIG_RELOADED": "<gold>VillagerInfo Config Reloaded!"
+"HELP_MAIN": "<#4dd5ff> • How to use Villager Info\n<grey>Crouch-right-click a villager while toggle is on to have a villager's information displayed"
+"HELP_TOGGLE": "<#4dd5ff> • /vill toggle\n<grey>Toggles the ability to receive villager information on or off."
+"HELP_RELOAD": "<#4dd5ff> • /vill reload\n<grey>Reloads the plugin, applies config values"
+"NOT_A_PLAYER": "<red>Sorry, you must be a player to use this command"
+"PURPUR_LOBOTOMIZED": "<#05bff7><hover:show_text:'<aqua>Lobotomized: <grey><state>'>[<#c4fff7>Lobotomized</#c4fff7>]"
+"ZOMBIE_VILLAGER_CONVERSION_TIME": "<#05bff7><hover:show_text:'<aqua>Conversion Time: <grey><time>'>[<#c4fff7>Time Until Converted</#c4fff7>]</hover>"
+"VILLAGER_AGE": "<#05bff7><hover:show_text:'<aqua>Childhood Left: <grey><age>'>[<#c4fff7>Time Until Adult</#c4fff7>]"
+"VILLAGER_PROFESSION": "<#05bff7><hover:show_text:'<aqua>Profession: <grey><profession>'>[<#c4fff7>Profession</#c4fff7>]"
+"VILLAGER_HEALTH": "<#05bff7><hover:show_text:'<aqua>Health: <grey><current><aqua>/</aqua><total>'>[<#c4fff7>Health</#c4fff7>]"
+"VILLAGER_JOBSITE": "<#05bff7><hover:show_text:'<aqua>POI: <grey><jobsitelocation>'>[<#c4fff7>Job Site</#c4fff7>]"
+"VILLAGER_LAST_WORKED": "<#05bff7><hover:show_text:'<aqua>Last Worked: <grey><worktime>'>[<#c4fff7>Last Worked At Workstation</#c4fff7>]"
+"VILLAGER_RESTOCKS": "<#05bff7><hover:show_text:'<aqua>Restocks: <grey><restockcount>'>[<#c4fff7>Restocks Today</#c4fff7>]"
+"VILLAGER_HOME": "<#05bff7><hover:show_text:'<aqua>Bed: <grey><homelocation>'>[<#c4fff7>Home</#c4fff7>]"
+"VILLAGER_SLEPT": "<#05bff7><hover:show_text:'<aqua>Last Slept: <grey><sleeptime>'>[<#c4fff7>Last Slept</#c4fff7>]"
+"VILLAGER_INVENTORY": "<#05bff7><hover:show_text:'<aqua>Inventory: <grey><contents>'>[<#c4fff7>Villager Inventory</#c4fff7>]"
+"INVENTORY_CONTENTS": "\n • <item> (<amount>)"
+"PLAYER_REPUTATION": "<#05bff7><hover:show_text:'<#05bff7>[<#c4fff7>Player Reputation</#c4fff7>]'><reputation>"
+"TRUE": "<grey>True"
+"FALSE": "<grey>False"
+"NONE": "<grey>None"
+"NEVER": "<grey>Never"
+"EMPTY": "\n<grey>Empty"
+"NO_INFORMATION": "<grey>No information to display on this villager"
+"HOUR": "h, "
+"MINUTE": "m, "
+"SECOND": "s"
+"AGO": " Ago"
+"LOCATION_X": "<int>x, "
+"LOCATION_Y": "<int>y, "
+"LOCATION_Z": "<int>z"
\ No newline at end of file