diff --git a/API/src/main/java/dev/lrxh/api/features/cosmetics/shieldpatterns/IShieldPatternCosmetic.java b/API/src/main/java/dev/lrxh/api/features/cosmetics/shieldpatterns/IShieldPatternCosmetic.java
new file mode 100644
index 00000000..39d07e64
--- /dev/null
+++ b/API/src/main/java/dev/lrxh/api/features/cosmetics/shieldpatterns/IShieldPatternCosmetic.java
@@ -0,0 +1,12 @@
+package dev.lrxh.api.features.cosmetics.shieldpatterns;
+
+import dev.lrxh.api.features.cosmetics.ICosmetic;
+
+import java.util.Map;
+
+public interface IShieldPatternCosmetic extends ICosmetic {
+    Map<String, ? extends IShieldPatternPackage> getPackages();
+    IShieldPatternPackage getDefault();
+    IShieldPatternPackage getOrDefault(String packageName);
+    void addPackage(IShieldPatternPackage killMessagePackage);
+}
diff --git a/API/src/main/java/dev/lrxh/api/features/cosmetics/shieldpatterns/IShieldPatternPackage.java b/API/src/main/java/dev/lrxh/api/features/cosmetics/shieldpatterns/IShieldPatternPackage.java
new file mode 100644
index 00000000..2ff64629
--- /dev/null
+++ b/API/src/main/java/dev/lrxh/api/features/cosmetics/shieldpatterns/IShieldPatternPackage.java
@@ -0,0 +1,11 @@
+package dev.lrxh.api.features.cosmetics.shieldpatterns;
+
+import dev.lrxh.api.features.cosmetics.ICosmeticPackage;
+import org.bukkit.block.banner.Pattern;
+
+import java.util.List;
+
+public interface IShieldPatternPackage extends ICosmeticPackage {
+    List<Pattern> getPatterns();
+    String permission();
+}
diff --git a/Plugin/src/main/java/dev/lrxh/neptune/configs/ConfigService.java b/Plugin/src/main/java/dev/lrxh/neptune/configs/ConfigService.java
index d8f6cf73..1c398bc0 100644
--- a/Plugin/src/main/java/dev/lrxh/neptune/configs/ConfigService.java
+++ b/Plugin/src/main/java/dev/lrxh/neptune/configs/ConfigService.java
@@ -19,6 +19,7 @@ public class ConfigService {
     private ConfigFile cosmeticsConfig;
     private ConfigFile killMessagesConfig;
     private ConfigFile armorTrimsConfig;
+    private ConfigFile shieldPatternsConfig;
     private ConfigFile soundsConfig;
 
     public static ConfigService get() {
@@ -40,7 +41,7 @@ public void load() {
         killMessagesConfig = new ConfigFile("kill-messages");
         armorTrimsConfig = new ConfigFile("armor-trims");
         soundsConfig = new ConfigFile("sounds");
-
+        shieldPatternsConfig = new ConfigFile("shield-patterns");
 
         initialize();
     }
diff --git a/Plugin/src/main/java/dev/lrxh/neptune/configs/impl/MenusLocale.java b/Plugin/src/main/java/dev/lrxh/neptune/configs/impl/MenusLocale.java
index 52c968d2..01fbe8f9 100644
--- a/Plugin/src/main/java/dev/lrxh/neptune/configs/impl/MenusLocale.java
+++ b/Plugin/src/main/java/dev/lrxh/neptune/configs/impl/MenusLocale.java
@@ -442,7 +442,7 @@ public enum MenusLocale implements IDataAccessor {
             "&7Set Max ping you",
             "&7can match against.",
             "",
-            " &7Current Ping-range: &b<ping>",
+            " &7Current Ping-range: &b<max-ping>",
             " ",
             "&a + Left Click to increase",
             "&c - Right Click to decrease"),
@@ -455,6 +455,7 @@ public enum MenusLocale implements IDataAccessor {
             " &7Current Kill Effect: &b<kill-effect>",
             " &7Current Kill Message: &b<kill-message>",
             " &7Current Armor Trim: &b<armor-trim>",
+            " &7Current Shield Pattern: &b<shield-pattern>",
             " ",
             "&aClick to open cosmetics menu"),
     SETTINGS_COSMETICS_SLOT("SETTINGS.SETTINGS.COSMETICS.SLOT", DataType.INT, "15"),
@@ -551,6 +552,32 @@ public enum MenusLocale implements IDataAccessor {
             " ",
             "<description>",
             " ",
+            "&cNo permission"),
+    SHIELD_PATTERNS_TITLE("SETTINGS.SHIELD-PATTERNS.TITLE", DataType.STRING, "&7Shield Patterns"),
+    SHIELD_PATTERNS_SIZE("SETTINGS.SHIELD-PATTERNS.SIZE", DataType.INT, "27"),
+    SHIELD_PATTERNS_FILTER("SETTINGS.SHIELD-PATTERNS.FILTER-TYPE", "FILL, BORDER, NONE", DataType.STRING, "FILL"),
+    SHIELD_PATTERNS_SLOT("SETTINGS.COSMETICS.SHIELD-PATTERNS.SLOT", DataType.INT, "13"),
+    SHIELD_PATTERNS_NAME("SETTINGS.COSMETICS.SHIELD-PATTERNS.NAME", DataType.STRING, "&bShield Patterns"),
+    SHIELD_PATTERNS_MATERIAL("SETTINGS.COSMETICS.SHIELD-PATTERNS.MATERIAL", DataType.STRING, "SHIELD"),
+    SHIELD_PATTERNS_LORE("SETTINGS.COSMETICS.SHIELD-PATTERNS.LORE", DataType.STRING_LIST,
+            "&7View all available shield pattern", " ", "&aClick to open"),
+    SHIELD_PATTERNS_NAME_SELECTED("SETTINGS.SHIELD-PATTERNS.SELECTED.NAME", DataType.STRING,
+            "<display-name> &7&o(Selected)"),
+    SHIELD_PATTERNS_NAME_NOT_SELECTED("SETTINGS.SHIELD-PATTERNS.UNSELECTED.NAME", DataType.STRING, "<display-name>"),
+    SHIELD_PATTERNS_SELECTED_LORE("SETTINGS.SHIELD-PATTERNS.SELECTED.LORE", DataType.STRING_LIST,
+            " ",
+            "<description> ",
+            " ",
+            "&eCurrently Selected"),
+    SHIELD_PATTERNS_UNSELECTED_LORE("SETTINGS.SHIELD-PATTERNS.UNSELECTED.LORE", DataType.STRING_LIST,
+            " ",
+            "<description> ",
+            " ",
+            "&aClick to select"),
+    SHIELD_PATTERNS_NO_PERMISSION_LORE("SETTINGS.SHIELD-PATTERNS.NO-PERMISSION.LORE", DataType.STRING_LIST,
+            " ",
+            "<description> ",
+            " ",
             "&cNo permission");
 
     private final String path;
@@ -597,6 +624,12 @@ public void update() {
                                 .replaceAll("<kill_death_ratio>", "<kdr>")
                 ).toList()
         );
+        SETTINGS_PING_RANGE_LORE.set(
+                SETTINGS_PING_RANGE_LORE.getStringList().stream().map(str ->
+                        str
+                                .replaceAll("<ping>", "<max-ping>")
+                ).toList()
+        );
         if (MATCH_LIST_SIZE.getInt() == 36) MATCH_LIST_SIZE.set(54);
         if (MATCH_LIST_STARTING_SLOT.getInt() == 10 && MATCH_LIST_FILTER.getString().equals("FILTER")) MATCH_LIST_FILTER.set("BORDER");
         if (MATCH_LIST_STARTING_SLOT.getInt() == 10) MATCH_LIST_STARTING_SLOT.set(1);
diff --git a/Plugin/src/main/java/dev/lrxh/neptune/configs/impl/handler/DataType.java b/Plugin/src/main/java/dev/lrxh/neptune/configs/impl/handler/DataType.java
index e71b7af5..16ebdb7e 100644
--- a/Plugin/src/main/java/dev/lrxh/neptune/configs/impl/handler/DataType.java
+++ b/Plugin/src/main/java/dev/lrxh/neptune/configs/impl/handler/DataType.java
@@ -4,5 +4,6 @@ public enum DataType {
     BOOLEAN,
     STRING,
     STRING_LIST,
+    LIST,
     INT
 }
diff --git a/Plugin/src/main/java/dev/lrxh/neptune/configs/impl/handler/IDataAccessor.java b/Plugin/src/main/java/dev/lrxh/neptune/configs/impl/handler/IDataAccessor.java
index 0ae65833..753b7b34 100644
--- a/Plugin/src/main/java/dev/lrxh/neptune/configs/impl/handler/IDataAccessor.java
+++ b/Plugin/src/main/java/dev/lrxh/neptune/configs/impl/handler/IDataAccessor.java
@@ -6,6 +6,7 @@
 
 import java.util.Collections;
 import java.util.List;
+import java.util.Objects;
 import java.util.Set;
 import java.util.stream.Collectors;
 
@@ -25,6 +26,14 @@ default int getInt() {
         return getConfigFile().getConfiguration().getInt(getPath());
     }
 
+    default <T> List<T> getList(Class<T> type) {
+        return Objects.requireNonNull(getConfigFile().getConfiguration().getList(getPath()))
+                .stream()
+                .filter(type::isInstance)
+                .map(type::cast)
+                .toList();
+    }
+
     default boolean getBoolean() {
         return getConfigFile().getConfiguration().getBoolean(getPath());
     }
@@ -52,12 +61,13 @@ default void applyHeader() {
         }
     }
 
-    default void setValue(String path, List<String> rawValue, DataType type) {
+    default void setValue(String path, List<?> rawValue, DataType type) {
         switch (type) {
-            case STRING_LIST -> getConfigFile().getConfiguration().set(path, rawValue);
-            case STRING -> getConfigFile().getConfiguration().set(path, rawValue.get(0));
-            case INT -> getConfigFile().getConfiguration().set(path, Integer.parseInt(rawValue.get(0)));
-            case BOOLEAN -> getConfigFile().getConfiguration().set(path, Boolean.parseBoolean(rawValue.get(0)));
+            case LIST -> getConfigFile().getConfiguration().set(path, rawValue);
+            case STRING_LIST -> getConfigFile().getConfiguration().set(path, rawValue.stream().map(String::valueOf).toList());
+            case STRING -> getConfigFile().getConfiguration().set(path, String.valueOf(rawValue.getFirst()));
+            case INT -> getConfigFile().getConfiguration().set(path, Integer.parseInt(String.valueOf(rawValue.getFirst())));
+            case BOOLEAN -> getConfigFile().getConfiguration().set(path, Boolean.parseBoolean(String.valueOf(rawValue.getFirst())));
         }
     }
 
diff --git a/Plugin/src/main/java/dev/lrxh/neptune/feature/cosmetics/CosmeticService.java b/Plugin/src/main/java/dev/lrxh/neptune/feature/cosmetics/CosmeticService.java
index 0e8b56dd..ceb1fe16 100644
--- a/Plugin/src/main/java/dev/lrxh/neptune/feature/cosmetics/CosmeticService.java
+++ b/Plugin/src/main/java/dev/lrxh/neptune/feature/cosmetics/CosmeticService.java
@@ -5,10 +5,12 @@
 import dev.lrxh.neptune.configs.ConfigService;
 import dev.lrxh.neptune.feature.cosmetics.impl.Cosmetic;
 import dev.lrxh.neptune.feature.cosmetics.impl.CosmeticPackage;
-import dev.lrxh.neptune.feature.cosmetics.impl.armortrims.ArmorTrimCosmetic;
-import dev.lrxh.neptune.feature.cosmetics.impl.armortrims.ArmorTrimPackage;
-import dev.lrxh.neptune.feature.cosmetics.impl.killmessage.KillMessageCosmetic;
-import dev.lrxh.neptune.feature.cosmetics.impl.killmessage.KillMessagePackage;
+import dev.lrxh.neptune.feature.cosmetics.impl.cosmetics.armortrims.ArmorTrimCosmetic;
+import dev.lrxh.neptune.feature.cosmetics.impl.cosmetics.armortrims.ArmorTrimPackage;
+import dev.lrxh.neptune.feature.cosmetics.impl.cosmetics.killmessage.KillMessageCosmetic;
+import dev.lrxh.neptune.feature.cosmetics.impl.cosmetics.killmessage.KillMessagePackage;
+import dev.lrxh.neptune.feature.cosmetics.impl.cosmetics.shieldpatterns.ShieldPatternCosmetic;
+import dev.lrxh.neptune.feature.cosmetics.impl.cosmetics.shieldpatterns.ShieldPatternPackage;
 import dev.lrxh.neptune.providers.manager.IService;
 import dev.lrxh.neptune.utils.ConfigFile;
 
@@ -31,11 +33,12 @@ public static CosmeticService get() {
     public void load() {
         KillMessageCosmetic.get().load();
         ArmorTrimCosmetic.get().load();
+        ShieldPatternCosmetic.get().load();
     }
 
     @Override
     public void save() {
-
+        ShieldPatternCosmetic.get().getConfigFile().save();
     }
 
     public void registerCosmetic(ICosmetic cosmetic) {
@@ -51,6 +54,9 @@ public Map<String, KillMessagePackage> getKillMessagePackages() {
     public Map<String, ArmorTrimPackage> getArmorTrimPackages() {
         return (Map<String, ArmorTrimPackage>) getPackages(ArmorTrimCosmetic.get());
     }
+    public Map<String, ShieldPatternPackage> getShieldPatternPackages() {
+        return (Map<String, ShieldPatternPackage>) getPackages(ShieldPatternCosmetic.get());
+    }
 
     @Override
     public ConfigFile getConfigFile() {
diff --git a/Plugin/src/main/java/dev/lrxh/neptune/feature/cosmetics/impl/armortrims/ArmorTrimCosmetic.java b/Plugin/src/main/java/dev/lrxh/neptune/feature/cosmetics/impl/cosmetics/armortrims/ArmorTrimCosmetic.java
similarity index 98%
rename from Plugin/src/main/java/dev/lrxh/neptune/feature/cosmetics/impl/armortrims/ArmorTrimCosmetic.java
rename to Plugin/src/main/java/dev/lrxh/neptune/feature/cosmetics/impl/cosmetics/armortrims/ArmorTrimCosmetic.java
index cacd27c1..4acacadb 100644
--- a/Plugin/src/main/java/dev/lrxh/neptune/feature/cosmetics/impl/armortrims/ArmorTrimCosmetic.java
+++ b/Plugin/src/main/java/dev/lrxh/neptune/feature/cosmetics/impl/cosmetics/armortrims/ArmorTrimCosmetic.java
@@ -1,4 +1,4 @@
-package dev.lrxh.neptune.feature.cosmetics.impl.armortrims;
+package dev.lrxh.neptune.feature.cosmetics.impl.cosmetics.armortrims;
 
 import dev.lrxh.api.features.cosmetics.armortrims.IArmorTrimCosmetic;
 import dev.lrxh.api.features.cosmetics.armortrims.IArmorTrimPackage;
diff --git a/Plugin/src/main/java/dev/lrxh/neptune/feature/cosmetics/impl/armortrims/ArmorTrimPackage.java b/Plugin/src/main/java/dev/lrxh/neptune/feature/cosmetics/impl/cosmetics/armortrims/ArmorTrimPackage.java
similarity index 95%
rename from Plugin/src/main/java/dev/lrxh/neptune/feature/cosmetics/impl/armortrims/ArmorTrimPackage.java
rename to Plugin/src/main/java/dev/lrxh/neptune/feature/cosmetics/impl/cosmetics/armortrims/ArmorTrimPackage.java
index ee9b2ec3..fa854d0e 100644
--- a/Plugin/src/main/java/dev/lrxh/neptune/feature/cosmetics/impl/armortrims/ArmorTrimPackage.java
+++ b/Plugin/src/main/java/dev/lrxh/neptune/feature/cosmetics/impl/cosmetics/armortrims/ArmorTrimPackage.java
@@ -1,4 +1,4 @@
-package dev.lrxh.neptune.feature.cosmetics.impl.armortrims;
+package dev.lrxh.neptune.feature.cosmetics.impl.cosmetics.armortrims;
 
 import dev.lrxh.api.features.cosmetics.armortrims.IArmorTrimPackage;
 import dev.lrxh.neptune.feature.cosmetics.impl.CosmeticPackage;
diff --git a/Plugin/src/main/java/dev/lrxh/neptune/feature/cosmetics/impl/killmessage/KillMessageCosmetic.java b/Plugin/src/main/java/dev/lrxh/neptune/feature/cosmetics/impl/cosmetics/killmessage/KillMessageCosmetic.java
similarity index 93%
rename from Plugin/src/main/java/dev/lrxh/neptune/feature/cosmetics/impl/killmessage/KillMessageCosmetic.java
rename to Plugin/src/main/java/dev/lrxh/neptune/feature/cosmetics/impl/cosmetics/killmessage/KillMessageCosmetic.java
index 95024602..cc9591ef 100644
--- a/Plugin/src/main/java/dev/lrxh/neptune/feature/cosmetics/impl/killmessage/KillMessageCosmetic.java
+++ b/Plugin/src/main/java/dev/lrxh/neptune/feature/cosmetics/impl/cosmetics/killmessage/KillMessageCosmetic.java
@@ -1,8 +1,9 @@
-package dev.lrxh.neptune.feature.cosmetics.impl.killmessage;
+package dev.lrxh.neptune.feature.cosmetics.impl.cosmetics.killmessage;
 
 import dev.lrxh.api.features.cosmetics.killmessages.IKillMessageCosmetic;
 import dev.lrxh.api.features.cosmetics.killmessages.IKillMessagePackage;
 import dev.lrxh.neptune.configs.ConfigService;
+import dev.lrxh.neptune.feature.cosmetics.CosmeticService;
 import dev.lrxh.neptune.feature.cosmetics.impl.Cosmetic;
 import lombok.Getter;
 import org.bukkit.Material;
@@ -42,6 +43,7 @@ public void load() {
                 packages.put(packageName, new KillMessagePackage(packageName, displayName, material, description, slot, messages));
             }
         }
+        CosmeticService.get().registerCosmetic(this);
     }
 
     public KillMessagePackage getDefault() {
diff --git a/Plugin/src/main/java/dev/lrxh/neptune/feature/cosmetics/impl/killmessage/KillMessagePackage.java b/Plugin/src/main/java/dev/lrxh/neptune/feature/cosmetics/impl/cosmetics/killmessage/KillMessagePackage.java
similarity index 93%
rename from Plugin/src/main/java/dev/lrxh/neptune/feature/cosmetics/impl/killmessage/KillMessagePackage.java
rename to Plugin/src/main/java/dev/lrxh/neptune/feature/cosmetics/impl/cosmetics/killmessage/KillMessagePackage.java
index 8c90602e..1b7dc6d0 100644
--- a/Plugin/src/main/java/dev/lrxh/neptune/feature/cosmetics/impl/killmessage/KillMessagePackage.java
+++ b/Plugin/src/main/java/dev/lrxh/neptune/feature/cosmetics/impl/cosmetics/killmessage/KillMessagePackage.java
@@ -1,4 +1,4 @@
-package dev.lrxh.neptune.feature.cosmetics.impl.killmessage;
+package dev.lrxh.neptune.feature.cosmetics.impl.cosmetics.killmessage;
 
 import dev.lrxh.api.features.cosmetics.killmessages.IKillMessagePackage;
 import dev.lrxh.neptune.feature.cosmetics.impl.CosmeticPackage;
diff --git a/Plugin/src/main/java/dev/lrxh/neptune/feature/cosmetics/impl/cosmetics/shieldpatterns/ShieldPatternCosmetic.java b/Plugin/src/main/java/dev/lrxh/neptune/feature/cosmetics/impl/cosmetics/shieldpatterns/ShieldPatternCosmetic.java
new file mode 100644
index 00000000..647fcd53
--- /dev/null
+++ b/Plugin/src/main/java/dev/lrxh/neptune/feature/cosmetics/impl/cosmetics/shieldpatterns/ShieldPatternCosmetic.java
@@ -0,0 +1,79 @@
+package dev.lrxh.neptune.feature.cosmetics.impl.cosmetics.shieldpatterns;
+
+import dev.lrxh.api.features.cosmetics.shieldpatterns.IShieldPatternCosmetic;
+import dev.lrxh.api.features.cosmetics.shieldpatterns.IShieldPatternPackage;
+import dev.lrxh.neptune.configs.ConfigService;
+import dev.lrxh.neptune.feature.cosmetics.CosmeticService;
+import dev.lrxh.neptune.feature.cosmetics.impl.Cosmetic;
+import dev.lrxh.neptune.utils.ConfigFile;
+import dev.lrxh.neptune.utils.ItemUtils;
+import io.papermc.paper.registry.RegistryAccess;
+import io.papermc.paper.registry.RegistryKey;
+import lombok.Getter;
+import org.bukkit.DyeColor;
+import org.bukkit.Material;
+import org.bukkit.NamespacedKey;
+import org.bukkit.block.banner.Pattern;
+import org.bukkit.configuration.file.FileConfiguration;
+import org.bukkit.configuration.file.YamlConfiguration;
+
+import java.util.*;
+
+@Getter
+public class ShieldPatternCosmetic extends Cosmetic implements IShieldPatternCosmetic {
+    private static ShieldPatternCosmetic instance;
+    public static ShieldPatternCosmetic get() {
+        if (instance == null) instance = new ShieldPatternCosmetic();
+        return instance;
+    }
+
+    public String key() {
+        return "shieldpatterns";
+    }
+
+    public Map<String, ShieldPatternPackage> packages = new HashMap<>();
+    public void load() {
+        packages.clear();
+        FileConfiguration shieldPatternsConfig = getConfig();
+        if (shieldPatternsConfig.contains("SHIELD_PATTERNS")) {
+            for (String packageName : getKeys(shieldPatternsConfig, "SHIELD_PATTERNS")) {
+                String path = "SHIELD_PATTERNS." + packageName + ".";
+                String displayName = shieldPatternsConfig.getString(path + "DISPLAY_NAME");
+                Material material = ItemUtils.getMaterial(Objects.requireNonNull(shieldPatternsConfig.getString(path + "MATERIAL")));
+                List<String> description = shieldPatternsConfig.getStringList(path + "DESCRIPTION");
+                int slot = shieldPatternsConfig.getInt(path + "SLOT");
+                List<Pattern> patterns = new ArrayList<>();
+                List<?> configPatterns = shieldPatternsConfig.getList(path + "PATTERNS");
+                if (configPatterns != null) {
+                    for (Object pattern : configPatterns) {
+                        Map<String, String> map = (Map<String, String>) pattern;
+                        patterns.add(new Pattern(DyeColor.valueOf(map.get("DYE")),
+                                Objects.requireNonNull(RegistryAccess.registryAccess().getRegistry(RegistryKey.BANNER_PATTERN)
+                                        .get(Objects.requireNonNull(NamespacedKey.fromString((map.get("PATTERN"))))))));
+                    }
+                }
+
+                packages.put(packageName, new ShieldPatternPackage(packageName, displayName, material, description, slot, patterns));
+            }
+        }
+        CosmeticService.get().registerCosmetic(this);
+    }
+
+    public ShieldPatternPackage getDefault() {
+        return packages.get("DEFAULT");
+    }
+    public ShieldPatternPackage getOrDefault(String packageName) {
+        if (packages.containsKey(packageName)) return packages.get(packageName);
+        return getDefault();
+    }
+
+    public void addPackage(IShieldPatternPackage shieldPatternPackage) {
+        packages.put(shieldPatternPackage.getName(), (ShieldPatternPackage) shieldPatternPackage);
+    }
+    public YamlConfiguration getConfig() {
+        return getConfigFile().getConfiguration();
+    }
+    public ConfigFile getConfigFile() {
+        return ConfigService.get().getShieldPatternsConfig();
+    }
+}
diff --git a/Plugin/src/main/java/dev/lrxh/neptune/feature/cosmetics/impl/cosmetics/shieldpatterns/ShieldPatternPackage.java b/Plugin/src/main/java/dev/lrxh/neptune/feature/cosmetics/impl/cosmetics/shieldpatterns/ShieldPatternPackage.java
new file mode 100644
index 00000000..ac201df0
--- /dev/null
+++ b/Plugin/src/main/java/dev/lrxh/neptune/feature/cosmetics/impl/cosmetics/shieldpatterns/ShieldPatternPackage.java
@@ -0,0 +1,30 @@
+package dev.lrxh.neptune.feature.cosmetics.impl.cosmetics.shieldpatterns;
+
+import dev.lrxh.api.features.cosmetics.shieldpatterns.IShieldPatternPackage;
+import dev.lrxh.neptune.feature.cosmetics.impl.CosmeticPackage;
+import lombok.Getter;
+import org.bukkit.Material;
+import org.bukkit.block.banner.Pattern;
+
+import java.util.List;
+
+@Getter
+public class ShieldPatternPackage extends CosmeticPackage implements IShieldPatternPackage {
+    private final List<Pattern> patterns;
+
+    public ShieldPatternPackage(
+            String name,
+            String displayName,
+            Material material,
+            List<String> description,
+            int slot,
+            List<Pattern> patterns
+    ) {
+        super(name, displayName, material, description, slot);
+        this.patterns = patterns;
+    }
+
+    public String permission() {
+        return "neptune.cosmetics.killmessages." + name.toLowerCase();
+    }
+}
diff --git a/Plugin/src/main/java/dev/lrxh/neptune/feature/cosmetics/menu/CosmeticsManageMenu.java b/Plugin/src/main/java/dev/lrxh/neptune/feature/cosmetics/menu/CosmeticsManageMenu.java
index ab5efc8d..63e4850c 100644
--- a/Plugin/src/main/java/dev/lrxh/neptune/feature/cosmetics/menu/CosmeticsManageMenu.java
+++ b/Plugin/src/main/java/dev/lrxh/neptune/feature/cosmetics/menu/CosmeticsManageMenu.java
@@ -4,6 +4,7 @@
 import dev.lrxh.neptune.feature.cosmetics.menu.armorTrims.ArmorTrimsMenu;
 import dev.lrxh.neptune.feature.cosmetics.menu.killEffects.KillEffectsMenu;
 import dev.lrxh.neptune.feature.cosmetics.menu.killMessages.KillMessagesMenu;
+import dev.lrxh.neptune.feature.cosmetics.menu.shieldPatterns.ShieldPatternMenu;
 import dev.lrxh.neptune.utils.menu.Button;
 import dev.lrxh.neptune.utils.menu.Filter;
 import dev.lrxh.neptune.utils.menu.Menu;
@@ -42,6 +43,13 @@ public List<Button> getButtons(Player player) {
                 MenusLocale.ARMOR_TRIMS_LORE.getStringList(),
                 Material.valueOf(MenusLocale.ARMOR_TRIMS_MATERIAL.getString()),
                 new ArmorTrimsMenu()));
+
+        buttons.add(new CosmeticsManagementButton(
+                MenusLocale.SHIELD_PATTERNS_SLOT.getInt(),
+                MenusLocale.SHIELD_PATTERNS_NAME.getString(),
+                MenusLocale.SHIELD_PATTERNS_LORE.getStringList(),
+                Material.valueOf(MenusLocale.SHIELD_PATTERNS_MATERIAL.getString()),
+                new ShieldPatternMenu()));
         return buttons;
     }
 }
diff --git a/Plugin/src/main/java/dev/lrxh/neptune/feature/cosmetics/menu/CosmeticsManagementButton.java b/Plugin/src/main/java/dev/lrxh/neptune/feature/cosmetics/menu/CosmeticsManagementButton.java
index 0022925c..2918127f 100644
--- a/Plugin/src/main/java/dev/lrxh/neptune/feature/cosmetics/menu/CosmeticsManagementButton.java
+++ b/Plugin/src/main/java/dev/lrxh/neptune/feature/cosmetics/menu/CosmeticsManagementButton.java
@@ -1,13 +1,9 @@
 package dev.lrxh.neptune.feature.cosmetics.menu;
 
-import dev.lrxh.neptune.API;
-import dev.lrxh.neptune.profile.impl.Profile;
 import dev.lrxh.neptune.utils.ItemBuilder;
 import dev.lrxh.neptune.utils.ItemUtils;
 import dev.lrxh.neptune.utils.menu.Button;
 import dev.lrxh.neptune.utils.menu.Menu;
-import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
-import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
 
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
@@ -37,11 +33,6 @@ public void onClick(ClickType type, Player player) {
 
     @Override
     public ItemStack getItemStack(Player player) {
-        Profile profile = API.getProfile(player);
-        return new ItemBuilder(material).name(title).componentLore(ItemUtils.getLore(lore, TagResolver.resolver(
-            Placeholder.parsed("kill-effect", profile.getSettingData().getKillEffect().getDisplayName()),
-            Placeholder.parsed("kill-message", profile.getSettingData().getKillMessagePackage().getDisplayName()),
-            Placeholder.parsed("armor-trim", profile.getSettingData().getArmorTrimPackage().getDisplayName())
-        )), player).build();
+        return new ItemBuilder(material).name(title).componentLore(ItemUtils.getLore(lore), player).build();
     }
 }
diff --git a/Plugin/src/main/java/dev/lrxh/neptune/feature/cosmetics/menu/armorTrims/ArmorTrimButton.java b/Plugin/src/main/java/dev/lrxh/neptune/feature/cosmetics/menu/armorTrims/ArmorTrimButton.java
index 2318ac42..2a9ad480 100644
--- a/Plugin/src/main/java/dev/lrxh/neptune/feature/cosmetics/menu/armorTrims/ArmorTrimButton.java
+++ b/Plugin/src/main/java/dev/lrxh/neptune/feature/cosmetics/menu/armorTrims/ArmorTrimButton.java
@@ -2,7 +2,7 @@
 
 import dev.lrxh.neptune.API;
 import dev.lrxh.neptune.configs.impl.MenusLocale;
-import dev.lrxh.neptune.feature.cosmetics.impl.armortrims.ArmorTrimPackage;
+import dev.lrxh.neptune.feature.cosmetics.impl.cosmetics.armortrims.ArmorTrimPackage;
 import dev.lrxh.neptune.profile.impl.Profile;
 import dev.lrxh.neptune.utils.CC;
 import dev.lrxh.neptune.utils.ItemBuilder;
diff --git a/Plugin/src/main/java/dev/lrxh/neptune/feature/cosmetics/menu/armorTrims/ArmorTrimDisplayButton.java b/Plugin/src/main/java/dev/lrxh/neptune/feature/cosmetics/menu/armorTrims/ArmorTrimDisplayButton.java
index ef0e59a4..f69baa93 100644
--- a/Plugin/src/main/java/dev/lrxh/neptune/feature/cosmetics/menu/armorTrims/ArmorTrimDisplayButton.java
+++ b/Plugin/src/main/java/dev/lrxh/neptune/feature/cosmetics/menu/armorTrims/ArmorTrimDisplayButton.java
@@ -1,6 +1,6 @@
 package dev.lrxh.neptune.feature.cosmetics.menu.armorTrims;
 
-import dev.lrxh.neptune.feature.cosmetics.impl.armortrims.ArmorTrimPackage;
+import dev.lrxh.neptune.feature.cosmetics.impl.cosmetics.armortrims.ArmorTrimPackage;
 import dev.lrxh.neptune.utils.ItemBuilder;
 import dev.lrxh.neptune.utils.menu.Button;
 import net.kyori.adventure.key.Key;
diff --git a/Plugin/src/main/java/dev/lrxh/neptune/feature/cosmetics/menu/armorTrims/ArmorTrimsMenu.java b/Plugin/src/main/java/dev/lrxh/neptune/feature/cosmetics/menu/armorTrims/ArmorTrimsMenu.java
index 890cd77e..4ded522f 100644
--- a/Plugin/src/main/java/dev/lrxh/neptune/feature/cosmetics/menu/armorTrims/ArmorTrimsMenu.java
+++ b/Plugin/src/main/java/dev/lrxh/neptune/feature/cosmetics/menu/armorTrims/ArmorTrimsMenu.java
@@ -3,7 +3,7 @@
 import dev.lrxh.neptune.API;
 import dev.lrxh.neptune.configs.impl.MenusLocale;
 import dev.lrxh.neptune.feature.cosmetics.CosmeticService;
-import dev.lrxh.neptune.feature.cosmetics.impl.armortrims.ArmorTrimPackage;
+import dev.lrxh.neptune.feature.cosmetics.impl.cosmetics.armortrims.ArmorTrimPackage;
 import dev.lrxh.neptune.utils.menu.Button;
 import dev.lrxh.neptune.utils.menu.Filter;
 import dev.lrxh.neptune.utils.menu.PaginatedMenu;
diff --git a/Plugin/src/main/java/dev/lrxh/neptune/feature/cosmetics/menu/killMessages/KillMessageButton.java b/Plugin/src/main/java/dev/lrxh/neptune/feature/cosmetics/menu/killMessages/KillMessageButton.java
index 8e8657d8..ec91b32c 100644
--- a/Plugin/src/main/java/dev/lrxh/neptune/feature/cosmetics/menu/killMessages/KillMessageButton.java
+++ b/Plugin/src/main/java/dev/lrxh/neptune/feature/cosmetics/menu/killMessages/KillMessageButton.java
@@ -2,7 +2,7 @@
 
 import dev.lrxh.neptune.API;
 import dev.lrxh.neptune.configs.impl.MenusLocale;
-import dev.lrxh.neptune.feature.cosmetics.impl.killmessage.KillMessagePackage;
+import dev.lrxh.neptune.feature.cosmetics.impl.cosmetics.killmessage.KillMessagePackage;
 import dev.lrxh.neptune.profile.impl.Profile;
 import dev.lrxh.neptune.utils.CC;
 import dev.lrxh.neptune.utils.ItemBuilder;
diff --git a/Plugin/src/main/java/dev/lrxh/neptune/feature/cosmetics/menu/killMessages/KillMessagesMenu.java b/Plugin/src/main/java/dev/lrxh/neptune/feature/cosmetics/menu/killMessages/KillMessagesMenu.java
index 835dc8b9..7ab1bdf5 100644
--- a/Plugin/src/main/java/dev/lrxh/neptune/feature/cosmetics/menu/killMessages/KillMessagesMenu.java
+++ b/Plugin/src/main/java/dev/lrxh/neptune/feature/cosmetics/menu/killMessages/KillMessagesMenu.java
@@ -2,7 +2,7 @@
 
 import dev.lrxh.neptune.configs.impl.MenusLocale;
 import dev.lrxh.neptune.feature.cosmetics.CosmeticService;
-import dev.lrxh.neptune.feature.cosmetics.impl.killmessage.KillMessagePackage;
+import dev.lrxh.neptune.feature.cosmetics.impl.cosmetics.killmessage.KillMessagePackage;
 import dev.lrxh.neptune.utils.menu.Button;
 import dev.lrxh.neptune.utils.menu.Filter;
 import dev.lrxh.neptune.utils.menu.Menu;
diff --git a/Plugin/src/main/java/dev/lrxh/neptune/feature/cosmetics/menu/shieldPatterns/ShieldPatternButton.java b/Plugin/src/main/java/dev/lrxh/neptune/feature/cosmetics/menu/shieldPatterns/ShieldPatternButton.java
new file mode 100644
index 00000000..888df0be
--- /dev/null
+++ b/Plugin/src/main/java/dev/lrxh/neptune/feature/cosmetics/menu/shieldPatterns/ShieldPatternButton.java
@@ -0,0 +1,70 @@
+package dev.lrxh.neptune.feature.cosmetics.menu.shieldPatterns;
+
+import dev.lrxh.neptune.API;
+import dev.lrxh.neptune.configs.impl.MenusLocale;
+import dev.lrxh.neptune.feature.cosmetics.impl.cosmetics.shieldpatterns.ShieldPatternPackage;
+import dev.lrxh.neptune.profile.impl.Profile;
+import dev.lrxh.neptune.utils.CC;
+import dev.lrxh.neptune.utils.ItemBuilder;
+import dev.lrxh.neptune.utils.ItemUtils;
+import dev.lrxh.neptune.utils.menu.Button;
+import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
+import org.bukkit.Material;
+import org.bukkit.entity.Player;
+import org.bukkit.event.inventory.ClickType;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.meta.BannerMeta;
+import org.bukkit.inventory.meta.ItemMeta;
+import org.bukkit.inventory.meta.ShieldMeta;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class ShieldPatternButton extends Button {
+    private final ShieldPatternPackage shieldPatternPackage;
+
+    public ShieldPatternButton(int slot, ShieldPatternPackage shieldPatternPackage) {
+        super(slot);
+        this.shieldPatternPackage = shieldPatternPackage;
+    }
+
+    @Override
+    public void onClick(ClickType type, Player player) {
+        if (!player.hasPermission(shieldPatternPackage.permission())) return;
+        API.getProfile(player).getSettingData().setShieldPatternPackage(shieldPatternPackage);
+    }
+
+    @Override
+    public ItemStack getItemStack(Player player) {
+        Profile profile = API.getProfile(player);
+        if (profile == null) return null;
+        boolean selected = profile.getSettingData().getShieldPatternPackage().equals(shieldPatternPackage);
+        List<String> lore;
+
+        if (player.hasPermission(shieldPatternPackage.permission())) {
+            lore = selected ? MenusLocale.SHIELD_PATTERNS_SELECTED_LORE.getStringList() : MenusLocale.SHIELD_PATTERNS_UNSELECTED_LORE.getStringList();
+        } else {
+            lore = MenusLocale.SHIELD_PATTERNS_NO_PERMISSION_LORE.getStringList();
+        }
+        List<Component> loreToUse = new ArrayList<>();
+        for (String line : lore) {
+            if (line.contains("<description>")) {
+                for (String descLine : shieldPatternPackage.getDescription()) {
+                    loreToUse.add(CC.returnMessage(player, line, Placeholder.parsed("description", descLine)));
+                }
+            }
+            else loreToUse.add(CC.returnMessage(player, line));
+        }
+        Material material = shieldPatternPackage.getMaterial();
+        ItemStack stack = new ItemBuilder(material)
+                .name(selected ? MenusLocale.SHIELD_PATTERNS_NAME_SELECTED.getString().replace("<display-name>", shieldPatternPackage.getDisplayName()) : MenusLocale.SHIELD_PATTERNS_NAME_NOT_SELECTED.getString().replace("<display-name>", shieldPatternPackage.getDisplayName()))
+                .componentLore(ItemUtils.getComponentLore(loreToUse), player)
+                .build();
+        ItemMeta meta = stack.getItemMeta();
+        if (meta instanceof BannerMeta) ((BannerMeta) meta).setPatterns(shieldPatternPackage.getPatterns());
+        if (meta instanceof ShieldMeta) ((ShieldMeta) meta).setPatterns(shieldPatternPackage.getPatterns());
+        stack.setItemMeta(meta);
+        return stack;
+    }
+}
diff --git a/Plugin/src/main/java/dev/lrxh/neptune/feature/cosmetics/menu/shieldPatterns/ShieldPatternMenu.java b/Plugin/src/main/java/dev/lrxh/neptune/feature/cosmetics/menu/shieldPatterns/ShieldPatternMenu.java
new file mode 100644
index 00000000..b5d31c32
--- /dev/null
+++ b/Plugin/src/main/java/dev/lrxh/neptune/feature/cosmetics/menu/shieldPatterns/ShieldPatternMenu.java
@@ -0,0 +1,29 @@
+package dev.lrxh.neptune.feature.cosmetics.menu.shieldPatterns;
+
+import dev.lrxh.neptune.configs.impl.MenusLocale;
+import dev.lrxh.neptune.feature.cosmetics.CosmeticService;
+import dev.lrxh.neptune.feature.cosmetics.impl.cosmetics.shieldpatterns.ShieldPatternPackage;
+import dev.lrxh.neptune.utils.menu.Button;
+import dev.lrxh.neptune.utils.menu.Filter;
+import dev.lrxh.neptune.utils.menu.Menu;
+import org.bukkit.entity.Player;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class ShieldPatternMenu extends Menu {
+    public ShieldPatternMenu() {
+        super(MenusLocale.SHIELD_PATTERNS_TITLE.getString(), MenusLocale.SHIELD_PATTERNS_SIZE.getInt(), Filter.valueOf(MenusLocale.SHIELD_PATTERNS_FILTER.getString()), true);
+    }
+
+    @Override
+    public List<Button> getButtons(Player player) {
+        List<Button> buttons = new ArrayList<>();
+
+        for (ShieldPatternPackage shieldPatternPackage : CosmeticService.get().getShieldPatternPackages().values()) {
+            buttons.add(new ShieldPatternButton(shieldPatternPackage.getSlot(), shieldPatternPackage));
+        }
+
+        return buttons;
+    }
+}
diff --git a/Plugin/src/main/java/dev/lrxh/neptune/feature/settings/menu/SettingsButton.java b/Plugin/src/main/java/dev/lrxh/neptune/feature/settings/menu/SettingsButton.java
index 87ee063b..833788e0 100644
--- a/Plugin/src/main/java/dev/lrxh/neptune/feature/settings/menu/SettingsButton.java
+++ b/Plugin/src/main/java/dev/lrxh/neptune/feature/settings/menu/SettingsButton.java
@@ -3,11 +3,10 @@
 import dev.lrxh.neptune.API;
 import dev.lrxh.neptune.feature.settings.Setting;
 import dev.lrxh.neptune.profile.impl.Profile;
+import dev.lrxh.neptune.providers.placeholder.PlaceholderUtil;
 import dev.lrxh.neptune.utils.ItemBuilder;
 import dev.lrxh.neptune.utils.ItemUtils;
 import dev.lrxh.neptune.utils.menu.Button;
-import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
-import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
 
 import org.bukkit.entity.Player;
 import org.bukkit.event.inventory.ClickType;
@@ -27,11 +26,7 @@ public ItemStack getItemStack(Player player) {
 
         return new ItemBuilder(setting.getMaterial(), player.getUniqueId())
                 .name(setting.getDisplayName())
-                .componentLore(ItemUtils.getLore(setting.toggled(player) ? setting.getEnabledLore() : setting.getDisabledLore(), TagResolver.resolver(
-                        Placeholder.unparsed("ping", String.valueOf(profile.getSettingData().getMaxPing())),
-                        Placeholder.parsed("kill-effect", profile.getSettingData().getKillEffect().getDisplayName()),
-                        Placeholder.parsed("kill-message", profile.getSettingData().getKillMessagePackage().getDisplayName()),
-                        Placeholder.parsed("armor-trim", profile.getSettingData().getArmorTrimPackage().getDisplayName()))), player)
+                .componentLore(ItemUtils.getLore(setting.toggled(player) ? setting.getEnabledLore() : setting.getDisabledLore(), PlaceholderUtil.getSettingsResolvers(profile)), player)
                 .build();
     }
 
diff --git a/Plugin/src/main/java/dev/lrxh/neptune/game/kit/Kit.java b/Plugin/src/main/java/dev/lrxh/neptune/game/kit/Kit.java
index 3a671723..b750ce03 100644
--- a/Plugin/src/main/java/dev/lrxh/neptune/game/kit/Kit.java
+++ b/Plugin/src/main/java/dev/lrxh/neptune/game/kit/Kit.java
@@ -22,6 +22,8 @@
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.meta.ItemMeta;
+import org.bukkit.inventory.meta.ShieldMeta;
 import org.bukkit.potion.PotionEffect;
 
 import java.util.*;
@@ -247,6 +249,14 @@ public void giveLoadout(Participant participant) {
         }
         player.addPotionEffects(potionEffects);
         ItemUtils.applyArmorTrim(profile);
+        for(ItemStack item : player.getInventory()) {
+            if (item == null) continue;
+            ItemMeta meta = item.getItemMeta();
+            if (meta instanceof ShieldMeta shield) {
+                shield.setPatterns(profile.getSettingData().getShieldPatternPackage().getPatterns());
+                item.setItemMeta(shield);
+            }
+        }
         player.updateInventory();
     }
 
diff --git a/Plugin/src/main/java/dev/lrxh/neptune/main/MainCommand.java b/Plugin/src/main/java/dev/lrxh/neptune/main/MainCommand.java
index cb4a5106..b2e47f1b 100644
--- a/Plugin/src/main/java/dev/lrxh/neptune/main/MainCommand.java
+++ b/Plugin/src/main/java/dev/lrxh/neptune/main/MainCommand.java
@@ -7,6 +7,8 @@
 import dev.lrxh.neptune.Neptune;
 import dev.lrxh.neptune.configs.ConfigService;
 import dev.lrxh.neptune.feature.cosmetics.CosmeticService;
+import dev.lrxh.neptune.feature.cosmetics.impl.cosmetics.shieldpatterns.ShieldPatternCosmetic;
+import dev.lrxh.neptune.feature.cosmetics.impl.cosmetics.shieldpatterns.ShieldPatternPackage;
 import dev.lrxh.neptune.feature.hotbar.HotbarService;
 import dev.lrxh.neptune.game.kit.Kit;
 import dev.lrxh.neptune.game.match.Match;
@@ -17,9 +19,20 @@
 import dev.lrxh.neptune.utils.CC;
 import dev.lrxh.neptune.utils.GithubUtils;
 
+import dev.lrxh.neptune.utils.PlayerUtil;
+import io.papermc.paper.registry.RegistryAccess;
+import io.papermc.paper.registry.RegistryKey;
 import org.bukkit.Bukkit;
+import org.bukkit.block.banner.Pattern;
 import org.bukkit.command.CommandSender;
+import org.bukkit.configuration.file.YamlConfiguration;
 import org.bukkit.entity.Player;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.meta.BannerMeta;
+import org.bukkit.inventory.meta.ItemMeta;
+import org.bukkit.inventory.meta.ShieldMeta;
+
+import java.util.*;
 
 public class MainCommand {
 
@@ -85,4 +98,45 @@ public void resetkitloadout(@Sender Player player, Kit kit) {
         }
         player.sendMessage(CC.color("&aAll users' kit loadouts have been reset."));
     }
+
+    @Command(name = "addshield", desc = "", usage = "<name>")
+    @Require("neptune.admin")
+    public void addShield(@Sender Player player, String name) {
+        ItemStack holding = player.getInventory().getItemInMainHand();
+        ItemMeta holdingMeta = holding.getItemMeta();
+        List<Pattern> patterns = null;
+        if (holdingMeta instanceof BannerMeta meta) patterns = meta.getPatterns();
+        if (holdingMeta instanceof ShieldMeta meta) patterns = meta.getPatterns();
+        if (patterns == null || patterns.isEmpty()) {
+            PlayerUtil.sendMessage(player.getUniqueId(), CC.error("No patterns found! (Are you holding a banner?)"));
+            return;
+        }
+        List<Object> objectPatterns = new ArrayList<>();
+        for (Pattern pattern : patterns) {
+            Map<String, Object> map = new LinkedHashMap<>();
+            map.put("DYE", pattern.getColor().name());
+            map.put("PATTERN",
+                    Objects.requireNonNull(
+                            RegistryAccess.registryAccess()
+                                    .getRegistry(RegistryKey.BANNER_PATTERN)
+                                    .getKey(pattern.getPattern())
+                    ).getKey()
+            );
+            objectPatterns.add(map);
+        }
+        YamlConfiguration config = ShieldPatternCosmetic.get().getConfig();
+        name = name.replaceAll(" ", "_").toUpperCase();
+        int highestSlot = 9;
+        for (ShieldPatternPackage shieldPatternPackage : ShieldPatternCosmetic.get().getPackages().values()) {
+            int slot = shieldPatternPackage.getSlot();
+            if (slot > highestSlot) highestSlot = slot;
+        }
+        config.set("SHIELD_PATTERNS." + name + ".DISPLAY_NAME", name);
+        config.set("SHIELD_PATTERNS." + name + ".DESCRIPTION", List.of(name));
+        config.set("SHIELD_PATTERNS." + name + ".MATERIAL", "shield");
+        config.set("SHIELD_PATTERNS." + name + ".SLOT", highestSlot + 1);
+        config.set("SHIELD_PATTERNS." + name + ".PATTERNS", objectPatterns);
+        ShieldPatternCosmetic.get().getConfigFile().save();
+        PlayerUtil.sendMessage(player.getUniqueId(), CC.success("Added the banner"));
+    }
 }
\ No newline at end of file
diff --git a/Plugin/src/main/java/dev/lrxh/neptune/profile/data/SettingData.java b/Plugin/src/main/java/dev/lrxh/neptune/profile/data/SettingData.java
index c41fbdbb..0e257291 100644
--- a/Plugin/src/main/java/dev/lrxh/neptune/profile/data/SettingData.java
+++ b/Plugin/src/main/java/dev/lrxh/neptune/profile/data/SettingData.java
@@ -2,10 +2,12 @@
 
 import dev.lrxh.neptune.Neptune;
 import dev.lrxh.neptune.feature.cosmetics.KillEffect;
-import dev.lrxh.neptune.feature.cosmetics.impl.armortrims.ArmorTrimCosmetic;
-import dev.lrxh.neptune.feature.cosmetics.impl.armortrims.ArmorTrimPackage;
-import dev.lrxh.neptune.feature.cosmetics.impl.killmessage.KillMessageCosmetic;
-import dev.lrxh.neptune.feature.cosmetics.impl.killmessage.KillMessagePackage;
+import dev.lrxh.neptune.feature.cosmetics.impl.cosmetics.armortrims.ArmorTrimCosmetic;
+import dev.lrxh.neptune.feature.cosmetics.impl.cosmetics.armortrims.ArmorTrimPackage;
+import dev.lrxh.neptune.feature.cosmetics.impl.cosmetics.killmessage.KillMessageCosmetic;
+import dev.lrxh.neptune.feature.cosmetics.impl.cosmetics.killmessage.KillMessagePackage;
+import dev.lrxh.neptune.feature.cosmetics.impl.cosmetics.shieldpatterns.ShieldPatternCosmetic;
+import dev.lrxh.neptune.feature.cosmetics.impl.cosmetics.shieldpatterns.ShieldPatternPackage;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -26,12 +28,14 @@ public class SettingData {
     private boolean menuSound = true;
     private KillMessagePackage killMessagePackage;
     private ArmorTrimPackage armorTrimPackage;
+    private ShieldPatternPackage shieldPatternPackage;
     private List<UUID> followings = new ArrayList<>();
 
     public SettingData(Neptune plugin) {
         this.plugin = plugin;
         this.killMessagePackage = KillMessageCosmetic.get().getDefault();
         this.armorTrimPackage = ArmorTrimCosmetic.get().getDefault();
+        this.shieldPatternPackage = ShieldPatternCosmetic.get().getDefault();
     }
 
     public void increasePing() {
diff --git a/Plugin/src/main/java/dev/lrxh/neptune/profile/impl/Profile.java b/Plugin/src/main/java/dev/lrxh/neptune/profile/impl/Profile.java
index 32a92038..2e422102 100644
--- a/Plugin/src/main/java/dev/lrxh/neptune/profile/impl/Profile.java
+++ b/Plugin/src/main/java/dev/lrxh/neptune/profile/impl/Profile.java
@@ -6,8 +6,9 @@
 import dev.lrxh.neptune.Neptune;
 import dev.lrxh.neptune.configs.impl.MessagesLocale;
 import dev.lrxh.neptune.feature.cosmetics.KillEffect;
-import dev.lrxh.neptune.feature.cosmetics.impl.armortrims.ArmorTrimCosmetic;
-import dev.lrxh.neptune.feature.cosmetics.impl.killmessage.KillMessageCosmetic;
+import dev.lrxh.neptune.feature.cosmetics.impl.cosmetics.armortrims.ArmorTrimCosmetic;
+import dev.lrxh.neptune.feature.cosmetics.impl.cosmetics.killmessage.KillMessageCosmetic;
+import dev.lrxh.neptune.feature.cosmetics.impl.cosmetics.shieldpatterns.ShieldPatternCosmetic;
 import dev.lrxh.neptune.feature.divisions.DivisionService;
 import dev.lrxh.neptune.feature.hotbar.HotbarService;
 import dev.lrxh.neptune.feature.party.Party;
@@ -128,6 +129,7 @@ public static CompletableFuture<Profile> load(Profile profile) {
                     settingData.setMenuSound(settings.getBoolean("menuSound", false));
                     settingData.setKillMessagePackage(KillMessageCosmetic.get().getOrDefault(settings.getString("deathMessagePackage")));
                     settingData.setArmorTrimPackage(ArmorTrimCosmetic.get().getOrDefault(settings.getString("armorTrimPackage")));
+                    settingData.setShieldPatternPackage(ShieldPatternCosmetic.get().getOrDefault(settings.getString("shieldPatternPackage")));
 
                     DataDocument globalCustomPersistentData = dataDocument.getDataDocument("customPersistentData");
                     if (globalCustomPersistentData != null) {
@@ -196,6 +198,7 @@ public static CompletableFuture<Void> save(Profile profile) {
             settingsDoc.put("menuSound", settingData.isMenuSound());
             settingsDoc.put("deathMessagePackage", settingData.getKillMessagePackage().getName());
             settingsDoc.put("armorTrimPackage", settingData.getArmorTrimPackage().getName());
+            settingsDoc.put("shieldPatternPackage", settingData.getShieldPatternPackage().getName());
             dataDocument.put("settings", settingsDoc);
 
             DataDocument globalCustomPersistentData = new DataDocument();
diff --git a/Plugin/src/main/java/dev/lrxh/neptune/providers/placeholder/PlaceholderUtil.java b/Plugin/src/main/java/dev/lrxh/neptune/providers/placeholder/PlaceholderUtil.java
index 35cbac0c..6faec2f2 100644
--- a/Plugin/src/main/java/dev/lrxh/neptune/providers/placeholder/PlaceholderUtil.java
+++ b/Plugin/src/main/java/dev/lrxh/neptune/providers/placeholder/PlaceholderUtil.java
@@ -17,6 +17,7 @@
 import dev.lrxh.neptune.profile.data.GlobalStats;
 import dev.lrxh.neptune.profile.data.KitData;
 import dev.lrxh.neptune.profile.data.ProfileState;
+import dev.lrxh.neptune.profile.data.SettingData;
 import dev.lrxh.neptune.profile.impl.Profile;
 import dev.lrxh.neptune.utils.PlayerUtil;
 import lombok.experimental.UtilityClass;
@@ -45,7 +46,7 @@ public TagResolver getPlaceholders(Player player) {
         Party party = profile.getGameData().getParty();
         Match match = profile.getGameData().getMatch();
         QueueEntry queue = QueueService.get().get(profile.getPlayerUUID());
-        placeholders = TagResolver.resolver(placeholders,
+        placeholders = TagResolver.resolver(placeholders, getSettingsResolvers(profile),
             Placeholder.parsed("division", globalStats.getDivision().getDisplayName()),
             Placeholder.parsed("kill-effect", profile.getSettingData().getKillEffect().getDisplayName()),
             Placeholder.parsed("kill-message", profile.getSettingData().getKillMessagePackage().getDisplayName()),
@@ -205,4 +206,13 @@ else if (profile.hasState(ProfileState.IN_GAME, ProfileState.IN_SPECTATOR) && ma
         }
         return placeholders;
     }
+    public TagResolver getSettingsResolvers(Profile profile) {
+        SettingData settings = profile.getSettingData();
+        return TagResolver.resolver(Placeholder.unparsed("max-ping", String.valueOf(settings.getMaxPing())),
+                Placeholder.parsed("kill-effect", settings.getKillEffect().getDisplayName()),
+                Placeholder.parsed("kill-message", settings.getKillMessagePackage().getDisplayName()),
+                Placeholder.parsed("armor-trim", settings.getArmorTrimPackage().getDisplayName()),
+                Placeholder.parsed("shield-pattern", settings.getShieldPatternPackage().getDisplayName())
+        );
+    }
 }
\ No newline at end of file
diff --git a/Plugin/src/main/java/dev/lrxh/neptune/utils/CC.java b/Plugin/src/main/java/dev/lrxh/neptune/utils/CC.java
index 47deb355..1e98b2ca 100644
--- a/Plugin/src/main/java/dev/lrxh/neptune/utils/CC.java
+++ b/Plugin/src/main/java/dev/lrxh/neptune/utils/CC.java
@@ -106,7 +106,18 @@ public Component returnMessage(Player player, Component message, TagResolver res
         String serialized = mm.serialize(message);
         return returnMessage(player, serialized, resolver);
     }
-
+    public Component returnMessage(Component message) {
+        return returnMessage(message, TagResolver.empty());
+    }
+    public Component returnMessage(Component message, TagResolver resolver) {
+        return returnMessage(mm.serialize(message), resolver);
+    }
+    public Component returnMessage(String message) {
+        return returnMessage(message, TagResolver.empty());
+    }
+    public Component returnMessage(String message, TagResolver resolver) {
+        return MiniMessage.miniMessage().deserialize(replaceLegacy(message), resolver);
+    }
     public List<Component> getComponentsArray(Player player, List<String> lines)  {
         List<Component> components = new ArrayList<>();
         for (String string : lines) {
diff --git a/Plugin/src/main/java/dev/lrxh/neptune/utils/ItemUtils.java b/Plugin/src/main/java/dev/lrxh/neptune/utils/ItemUtils.java
index 551eaab9..12d2c9f3 100644
--- a/Plugin/src/main/java/dev/lrxh/neptune/utils/ItemUtils.java
+++ b/Plugin/src/main/java/dev/lrxh/neptune/utils/ItemUtils.java
@@ -1,6 +1,6 @@
 package dev.lrxh.neptune.utils;
 
-import dev.lrxh.neptune.feature.cosmetics.impl.armortrims.ArmorTrimPackage;
+import dev.lrxh.neptune.feature.cosmetics.impl.cosmetics.armortrims.ArmorTrimPackage;
 import dev.lrxh.neptune.profile.impl.Profile;
 import io.papermc.paper.datacomponent.DataComponentTypes;
 import io.papermc.paper.datacomponent.item.TooltipDisplay;
diff --git a/Plugin/src/main/resources/armor-trims.yml b/Plugin/src/main/resources/armor-trims.yml
index c0281ff9..319c64b5 100644
--- a/Plugin/src/main/resources/armor-trims.yml
+++ b/Plugin/src/main/resources/armor-trims.yml
@@ -1,5 +1,5 @@
-# trim pattern names here: https://github.com/misode/mcmeta/tree/data-json/data/minecraft/trim_pattern
-# trim material names here: https://github.com/misode/mcmeta/tree/data-json/data/minecraft/trim_material
+# trim pattern names here: https://raw.githubusercontent.com/misode/mcmeta/refs/heads/registries/trim_pattern/data.json
+# trim material names here: https://raw.githubusercontent.com/misode/mcmeta/refs/heads/registries/trim_material/data.json
 # names in above links apply only for MATERIAL inside HELMET, CHESTPLATE, LEGGINGS, BOOTS. use normal minecraft names for material outside those
 ARMOR_TRIMS:
   DEFAULT:
diff --git a/Plugin/src/main/resources/shield-patterns.yml b/Plugin/src/main/resources/shield-patterns.yml
new file mode 100644
index 00000000..d05823b3
--- /dev/null
+++ b/Plugin/src/main/resources/shield-patterns.yml
@@ -0,0 +1,19 @@
+# use "/neptune addshield <name>" while holding a shield/banner with patterns to easily add a new shield pattern
+# pattern type names from https://raw.githubusercontent.com/misode/mcmeta/refs/heads/registries/banner_pattern/data.json
+SHIELD_PATTERNS:
+  DEFAULT:
+    DISPLAY_NAME: "<gray>None"
+    MATERIAL: barrier
+    SLOT: 10
+    PATTERNS: []
+  CREEPER:
+    DISPLAY_NAME: <green>Creeper
+    DESCRIPTION:
+      - <italic>hisss
+    MATERIAL: shield
+    SLOT: 11
+    PATTERNS:
+      - DYE: LIME
+        PATTERN: base
+      - DYE: BLACK
+        PATTERN: creeper