diff --git a/src/main/java/net/minestom/server/chat/ChatColor.java b/src/main/java/net/minestom/server/chat/ChatColor.java
index e61c957c3..73435bec4 100644
--- a/src/main/java/net/minestom/server/chat/ChatColor.java
+++ b/src/main/java/net/minestom/server/chat/ChatColor.java
@@ -31,15 +31,15 @@ public class ChatColor {
     public static final ChatColor DARK_GREEN = fromRGB((byte) 0, (byte) 170, (byte) 0, 2, "dark_green");
     public static final ChatColor DARK_CYAN = fromRGB((byte) 0, (byte) 170, (byte) 170, 3, "dark_cyan");
     public static final ChatColor DARK_RED = fromRGB((byte) 170, (byte) 0, (byte) 0, 4, "dark_red");
-    public static final ChatColor PURPLE = fromRGB((byte) 170, (byte) 0, (byte) 170, 5, "purple");
+    public static final ChatColor PURPLE = fromRGB((byte) 170, (byte) 0, (byte) 170, 5, "dark_purple");
     public static final ChatColor GOLD = fromRGB((byte) 255, (byte) 170, (byte) 0, 6, "gold");
     public static final ChatColor GRAY = fromRGB((byte) 170, (byte) 170, (byte) 170, 7, "gray");
     public static final ChatColor DARK_GRAY = fromRGB((byte) 85, (byte) 85, (byte) 85, 8, "dark_gray");
     public static final ChatColor BLUE = fromRGB((byte) 85, (byte) 85, (byte) 255, 9, "blue");
     public static final ChatColor BRIGHT_GREEN = fromRGB((byte) 85, (byte) 255, (byte) 85, 10, "green");
-    public static final ChatColor CYAN = fromRGB((byte) 85, (byte) 255, (byte) 255, 11, "cyan");
+    public static final ChatColor CYAN = fromRGB((byte) 85, (byte) 255, (byte) 255, 11, "aqua");
     public static final ChatColor RED = fromRGB((byte) 255, (byte) 85, (byte) 85, 12, "red");
-    public static final ChatColor PINK = fromRGB((byte) 255, (byte) 85, (byte) 255, 13, "pink");
+    public static final ChatColor PINK = fromRGB((byte) 255, (byte) 85, (byte) 255, 13, "light_purple");
     public static final ChatColor YELLOW = fromRGB((byte) 255, (byte) 255, (byte) 85, 14, "yellow");
     public static final ChatColor WHITE = fromRGB((byte) 255, (byte) 255, (byte) 255, 15, "white");
 
diff --git a/src/main/java/net/minestom/server/resourcepack/ResourcePack.java b/src/main/java/net/minestom/server/resourcepack/ResourcePack.java
index 6a1face8f..18c2f3faf 100644
--- a/src/main/java/net/minestom/server/resourcepack/ResourcePack.java
+++ b/src/main/java/net/minestom/server/resourcepack/ResourcePack.java
@@ -2,16 +2,18 @@ package net.minestom.server.resourcepack;
 
 import net.minestom.server.entity.Player;
 import net.minestom.server.utils.validate.Check;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 /**
- * Represents a resource pack which can be sent using {@link Player#setResourcePack(ResourcePack)}.
+ * Represents a resource pack which can be sent with {@link Player#setResourcePack(ResourcePack)}.
  */
 public class ResourcePack {
 
     private final String url;
     private final String hash;
 
-    public ResourcePack(String url, String hash) {
+    public ResourcePack(@NotNull String url, @Nullable String hash) {
         Check.notNull(url, "The resource pack url cannot be null");
         this.url = url;
         // Optional, set to empty if null
@@ -23,6 +25,7 @@ public class ResourcePack {
      *
      * @return the resource pack URL
      */
+    @NotNull
     public String getUrl() {
         return url;
     }
@@ -33,8 +36,9 @@ public class ResourcePack {
      * WARNING: if null or empty, the player will probably waste bandwidth by re-downloading
      * the resource pack.
      *
-     * @return the resource pack hash
+     * @return the resource pack hash, can be empty
      */
+    @NotNull
     public String getHash() {
         return hash;
     }