diff --git a/build.gradle.kts b/build.gradle.kts
index 1d09246..cbb3127 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -22,9 +22,8 @@ subprojects {
     apply(plugin = "java")
 
     java {
-        toolchain {
-            languageVersion.set(JavaLanguageVersion.of(javaVersion.toInt()))
-        }
+        sourceCompatibility = JavaVersion.toVersion(javaVersion.toInt())
+        targetCompatibility = JavaVersion.toVersion(javaVersion.toInt())
     }
 
     tasks.withType<JavaCompile> {
diff --git a/nickcore-paper/src/main/java/com/nickcore/paper/NickCorePlugin.java b/nickcore-paper/src/main/java/com/nickcore/paper/NickCorePlugin.java
index ef27023..5e7a535 100644
--- a/nickcore-paper/src/main/java/com/nickcore/paper/NickCorePlugin.java
+++ b/nickcore-paper/src/main/java/com/nickcore/paper/NickCorePlugin.java
@@ -15,7 +15,13 @@ import com.nickcore.paper.listener.TabCompleteListener;
 import com.nickcore.paper.repository.DatabaseManager;
 import com.nickcore.paper.repository.SqlNickRepository;
 import com.nickcore.paper.scheduler.SchedulerAdapter;
-import com.nickcore.paper.service.*;
+import com.nickcore.paper.service.ChatService;
+import com.nickcore.paper.service.NameOverrideService;
+import com.nickcore.paper.service.NametagService;
+import com.nickcore.paper.service.NickService;
+import com.nickcore.paper.service.PlaceholderService;
+import com.nickcore.paper.service.RankService;
+import com.nickcore.paper.service.SkinService;
 
 import org.bukkit.Bukkit;
 import org.bukkit.configuration.ConfigurationSection;
@@ -24,7 +30,11 @@ import org.bukkit.plugin.java.JavaPlugin;
 
 import java.io.File;
 import java.time.Instant;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 import java.util.logging.Level;
 
 /**
diff --git a/nickcore-paper/src/main/java/com/nickcore/paper/command/NickCommand.java b/nickcore-paper/src/main/java/com/nickcore/paper/command/NickCommand.java
index 6f0c5e4..956cc8a 100644
--- a/nickcore-paper/src/main/java/com/nickcore/paper/command/NickCommand.java
+++ b/nickcore-paper/src/main/java/com/nickcore/paper/command/NickCommand.java
@@ -22,7 +22,8 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.command.TabCompleter;
 import org.bukkit.entity.Player;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.function.Supplier;
 import java.util.logging.Logger;
 
diff --git a/nickcore-paper/src/main/java/com/nickcore/paper/gui/AbstractGui.java b/nickcore-paper/src/main/java/com/nickcore/paper/gui/AbstractGui.java
index cade1f7..fd026a8 100644
--- a/nickcore-paper/src/main/java/com/nickcore/paper/gui/AbstractGui.java
+++ b/nickcore-paper/src/main/java/com/nickcore/paper/gui/AbstractGui.java
@@ -10,7 +10,9 @@ import org.bukkit.inventory.InventoryHolder;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.ItemMeta;
 
-import java.util.*;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.function.Consumer;
 
 /**
diff --git a/nickcore-paper/src/main/java/com/nickcore/paper/gui/GuiManager.java b/nickcore-paper/src/main/java/com/nickcore/paper/gui/GuiManager.java
index 55460b8..348bb21 100644
--- a/nickcore-paper/src/main/java/com/nickcore/paper/gui/GuiManager.java
+++ b/nickcore-paper/src/main/java/com/nickcore/paper/gui/GuiManager.java
@@ -1,7 +1,11 @@
 package com.nickcore.paper.gui;
 
 import com.nickcore.paper.cache.ProfileCache;
-import com.nickcore.paper.service.*;
+import com.nickcore.paper.service.NickService;
+import com.nickcore.paper.service.NametagService;
+import com.nickcore.paper.service.PlaceholderService;
+import com.nickcore.paper.service.RankService;
+import com.nickcore.paper.service.SkinService;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
@@ -10,7 +14,7 @@ import org.bukkit.event.inventory.InventoryCloseEvent;
 import org.bukkit.event.player.PlayerQuitEvent;
 import org.bukkit.plugin.Plugin;
 
-import java.util.*;
+import java.util.UUID;
 import java.util.concurrent.ConcurrentHashMap;
 
 /**
diff --git a/nickcore-paper/src/main/java/com/nickcore/paper/gui/NicknameMenuGui.java b/nickcore-paper/src/main/java/com/nickcore/paper/gui/NicknameMenuGui.java
index 3d95d46..ac7c133 100644
--- a/nickcore-paper/src/main/java/com/nickcore/paper/gui/NicknameMenuGui.java
+++ b/nickcore-paper/src/main/java/com/nickcore/paper/gui/NicknameMenuGui.java
@@ -1,6 +1,5 @@
 package com.nickcore.paper.gui;
 
-import com.nickcore.common.validation.InputSanitizer;
 import com.nickcore.paper.service.NickService;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.format.NamedTextColor;
diff --git a/nickcore-paper/src/main/java/com/nickcore/paper/integration/NickCoreExpansion.java b/nickcore-paper/src/main/java/com/nickcore/paper/integration/NickCoreExpansion.java
index 0347dfd..fa5d0ea 100644
--- a/nickcore-paper/src/main/java/com/nickcore/paper/integration/NickCoreExpansion.java
+++ b/nickcore-paper/src/main/java/com/nickcore/paper/integration/NickCoreExpansion.java
@@ -25,7 +25,7 @@ public final class NickCoreExpansion extends PlaceholderExpansion {
     public @NotNull String getIdentifier() { return "nickcore"; }
 
     @Override
-    public @NotNull String getAuthor() { return "NickCore Team"; }
+    public @NotNull String getAuthor() { return "BaileyCodes"; }
 
     @Override
     public @NotNull String getVersion() { return plugin.getPluginMeta().getVersion(); }
diff --git a/nickcore-paper/src/main/java/com/nickcore/paper/listener/PlayerConnectionListener.java b/nickcore-paper/src/main/java/com/nickcore/paper/listener/PlayerConnectionListener.java
index 8d5df5c..b668baf 100644
--- a/nickcore-paper/src/main/java/com/nickcore/paper/listener/PlayerConnectionListener.java
+++ b/nickcore-paper/src/main/java/com/nickcore/paper/listener/PlayerConnectionListener.java
@@ -1,7 +1,11 @@
 package com.nickcore.paper.listener;
 
 import com.nickcore.common.model.NickProfile;
-import com.nickcore.paper.service.*;
+import com.nickcore.paper.service.NameOverrideService;
+import com.nickcore.paper.service.NametagService;
+import com.nickcore.paper.service.NickService;
+import com.nickcore.paper.service.PlaceholderService;
+import com.nickcore.paper.service.SkinService;
 import com.nickcore.paper.scheduler.SchedulerAdapter;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
diff --git a/nickcore-paper/src/main/java/com/nickcore/paper/repository/DatabaseManager.java b/nickcore-paper/src/main/java/com/nickcore/paper/repository/DatabaseManager.java
index 3ff57f2..5ddcab7 100644
--- a/nickcore-paper/src/main/java/com/nickcore/paper/repository/DatabaseManager.java
+++ b/nickcore-paper/src/main/java/com/nickcore/paper/repository/DatabaseManager.java
@@ -5,8 +5,6 @@ import com.zaxxer.hikari.HikariConfig;
 import com.zaxxer.hikari.HikariDataSource;
 
 import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
diff --git a/nickcore-paper/src/main/java/com/nickcore/paper/service/NickService.java b/nickcore-paper/src/main/java/com/nickcore/paper/service/NickService.java
index ef3eba3..d7a52e3 100644
--- a/nickcore-paper/src/main/java/com/nickcore/paper/service/NickService.java
+++ b/nickcore-paper/src/main/java/com/nickcore/paper/service/NickService.java
@@ -8,8 +8,7 @@ import com.nickcore.paper.cache.ProfileCache;
 import com.nickcore.paper.integration.VelocityMessaging;
 import com.nickcore.paper.repository.NickRepository;
 
-import net.kyori.adventure.text.Component;
-import net.kyori.adventure.text.minimessage.MiniMessage;
+
 
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
@@ -37,7 +36,6 @@ public final class NickService {
     private final ProfileCache cache;
     private final NicknameValidator validator;
     private final Logger logger;
-    private final MiniMessage miniMessage;
 
     // Configurable name pool — loaded from names.yml, swapped atomically on reload
     private volatile List<String> namePool = List.of();
@@ -55,7 +53,6 @@ public final class NickService {
         this.cache = Objects.requireNonNull(cache);
         this.validator = Objects.requireNonNull(validator);
         this.logger = Objects.requireNonNull(logger);
-        this.miniMessage = MiniMessage.miniMessage();
     }
 
     /**
diff --git a/nickcore-paper/src/main/java/com/nickcore/paper/service/PlaceholderService.java b/nickcore-paper/src/main/java/com/nickcore/paper/service/PlaceholderService.java
index 6747fec..f8fbc34 100644
--- a/nickcore-paper/src/main/java/com/nickcore/paper/service/PlaceholderService.java
+++ b/nickcore-paper/src/main/java/com/nickcore/paper/service/PlaceholderService.java
@@ -3,7 +3,6 @@ package com.nickcore.paper.service;
 import com.nickcore.common.model.NickProfile;
 import com.nickcore.common.model.RankDefinition;
 import com.nickcore.paper.cache.ProfileCache;
-import org.bukkit.entity.Player;
 
 import java.util.Map;
 import java.util.Objects;
diff --git a/nickcore-paper/src/main/java/com/nickcore/paper/service/RankService.java b/nickcore-paper/src/main/java/com/nickcore/paper/service/RankService.java
index 23005f7..5dd7bc2 100644
--- a/nickcore-paper/src/main/java/com/nickcore/paper/service/RankService.java
+++ b/nickcore-paper/src/main/java/com/nickcore/paper/service/RankService.java
@@ -5,7 +5,13 @@ import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.minimessage.MiniMessage;
 import org.bukkit.entity.Player;
 
-import java.util.*;
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
 import java.util.logging.Logger;
 
 /**
diff --git a/nickcore-paper/src/main/java/com/nickcore/paper/service/SkinService.java b/nickcore-paper/src/main/java/com/nickcore/paper/service/SkinService.java
index a919b02..8e87145 100644
--- a/nickcore-paper/src/main/java/com/nickcore/paper/service/SkinService.java
+++ b/nickcore-paper/src/main/java/com/nickcore/paper/service/SkinService.java
@@ -6,15 +6,19 @@ import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.bukkit.plugin.Plugin;
 
-import java.io.InputStreamReader;
 import java.net.URI;
 import java.net.http.HttpClient;
 import java.net.http.HttpRequest;
 import java.net.http.HttpResponse;
 import java.time.Duration;
 import java.time.Instant;
-import java.util.*;
-import java.util.concurrent.*;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.Semaphore;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
diff --git a/nickcore-paper/src/main/resources/plugin.yml b/nickcore-paper/src/main/resources/plugin.yml
index 6eab475..1907632 100644
--- a/nickcore-paper/src/main/resources/plugin.yml
+++ b/nickcore-paper/src/main/resources/plugin.yml
@@ -4,7 +4,7 @@ main: com.nickcore.paper.NickCorePlugin
 api-version: '1.21'
 description: Enterprise Minecraft Nickname Plugin
 author: BaileyCodes
-website: https://nickcore.com
+website: https://balls.studio
 folia-supported: true
 
 softdepend:
diff --git a/nickcore-velocity/src/main/java/com/nickcore/velocity/NickCoreVelocity.java b/nickcore-velocity/src/main/java/com/nickcore/velocity/NickCoreVelocity.java
index 0339ce1..ba66440 100644
--- a/nickcore-velocity/src/main/java/com/nickcore/velocity/NickCoreVelocity.java
+++ b/nickcore-velocity/src/main/java/com/nickcore/velocity/NickCoreVelocity.java
@@ -19,7 +19,6 @@ import org.slf4j.Logger;
 import com.google.inject.Inject;
 
 import java.util.Map;
-import java.util.Optional;
 import java.util.UUID;
 import java.util.concurrent.ConcurrentHashMap;
 
@@ -108,10 +107,12 @@ public final class NickCoreVelocity {
                         (uuid, p) -> p.withNickname(message.nickname()));
                 case RANK_UPDATE -> proxyCache.computeIfPresent(message.playerUuid(),
                         (uuid, p) -> p.withRank(message.rankId()));
+                case SKIN_UPDATE -> proxyCache.computeIfPresent(message.playerUuid(),
+                        (uuid, p) -> p.withSkin(message.skinId(), message.skinValue(), message.skinSignature()));
                 case RESET -> proxyCache.computeIfPresent(message.playerUuid(),
                         (uuid, p) -> p.reset());
                 case CACHE_INVALIDATE -> proxyCache.remove(message.playerUuid());
-                default -> { /* ignore */ }
+                default -> { /* PLAYER_JOIN, PLAYER_QUIT — no proxy-side action needed */ }
             }
 
             // Forward to all OTHER servers